From 733eaccac0b985c8224ac15ccde64ba6bbc7411f Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 07:33:58 +0100 Subject: [PATCH] postrans workaround to fix libtinfo.so.6 disappearing on upgrade [release 6.1.20200118-2mamba;Mon Feb 10 2020] --- ncurses-6.1-20190803.patch | 657 + ncurses-6.1-20190810.patch | 413 + ncurses-6.1-20190817.patch | 960 + ncurses-6.1-20190824.patch | 1843 ++ ncurses-6.1-20190831.patch | 6115 ++++++ ncurses-6.1-20190907.patch | 37005 +++++++++++++++++++++++++++++++++++ ncurses-6.1-20190914.patch | 406 + ncurses-6.1-20190921.patch | 2677 +++ ncurses-6.1-20190928.patch | 922 + ncurses-6.1-20191005.patch | 231 + ncurses-6.1-20191012.patch | 1359 ++ ncurses-6.1-20191015.patch | 304 + ncurses-6.1-20191019.patch | 256 + ncurses-6.1-20191026.patch | 740 + ncurses-6.1-20191102.patch | 3052 +++ ncurses-6.1-20191109.patch | 482 + ncurses-6.1-20191116.patch | 260 + ncurses-6.1-20191123.patch | 387 + ncurses-6.1-20191130.patch | 3764 ++++ ncurses-6.1-20191207.patch | 1686 ++ ncurses-6.1-20191214.patch | 1901 ++ ncurses-6.1-20191221.patch | 733 + ncurses-6.1-20191228.patch | 360 + ncurses-6.1-20200104.patch | 24399 +++++++++++++++++++++++ ncurses-6.1-20200111.patch | 14895 ++++++++++++++ ncurses-6.1-20200118.patch | 6219 ++++++ ncurses.spec | 85 +- 27 files changed, 112107 insertions(+), 4 deletions(-) create mode 100644 ncurses-6.1-20190803.patch create mode 100644 ncurses-6.1-20190810.patch create mode 100644 ncurses-6.1-20190817.patch create mode 100644 ncurses-6.1-20190824.patch create mode 100644 ncurses-6.1-20190831.patch create mode 100644 ncurses-6.1-20190907.patch create mode 100644 ncurses-6.1-20190914.patch create mode 100644 ncurses-6.1-20190921.patch create mode 100644 ncurses-6.1-20190928.patch create mode 100644 ncurses-6.1-20191005.patch create mode 100644 ncurses-6.1-20191012.patch create mode 100644 ncurses-6.1-20191015.patch create mode 100644 ncurses-6.1-20191019.patch create mode 100644 ncurses-6.1-20191026.patch create mode 100644 ncurses-6.1-20191102.patch create mode 100644 ncurses-6.1-20191109.patch create mode 100644 ncurses-6.1-20191116.patch create mode 100644 ncurses-6.1-20191123.patch create mode 100644 ncurses-6.1-20191130.patch create mode 100644 ncurses-6.1-20191207.patch create mode 100644 ncurses-6.1-20191214.patch create mode 100644 ncurses-6.1-20191221.patch create mode 100644 ncurses-6.1-20191228.patch create mode 100644 ncurses-6.1-20200104.patch create mode 100644 ncurses-6.1-20200111.patch create mode 100644 ncurses-6.1-20200118.patch diff --git a/ncurses-6.1-20190803.patch b/ncurses-6.1-20190803.patch new file mode 100644 index 0000000..cbbdb79 --- /dev/null +++ b/ncurses-6.1-20190803.patch @@ -0,0 +1,657 @@ +# ncurses 6.1 - patch 20190803 - 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-20190803.patch.gz +# patch by Thomas E. Dickey +# created Sun Aug 4 00:24:33 UTC 2019 +# ------------------------------------------------------------------------------ +# NEWS | 13 ++- +# VERSION | 2 +# dist.mk | 4 +# misc/terminfo.src | 155 +++++++++++++++++++++---------------- +# ncurses/base/lib_scroll.c | 14 +-- +# ncurses/tinfo/parse_entry.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 +# 13 files changed, 130 insertions(+), 87 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.3356 +--- ncurses-6.1-20190728+/NEWS 2019-07-28 18:49:10.000000000 +0000 ++++ ncurses-6.1-20190803/NEWS 2019-08-03 22:31:47.000000000 +0000 +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3356 2019/07/28 18:49:10 tom Exp $ ++-- $Id: NEWS,v 1.3359 2019/08/03 22:31:47 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. + ++20190803 ++ + improve loop limits in _nc_scroll_window() to handle a case where ++ the scrolled data is a pad which is taller than the window (patch ++ by Rob King). ++ + amend the change to screen, because tmux relies upon that entry ++ and does not support that feature (Debian #933572) -TD ++ + updated ms-terminal entry & notes -TD ++ + updated kitty entry & notes -TD ++ + updated alacritty+common entry & notes -TD ++ + use xterm+sl-twm for consistency -TD ++ + 20190728 + + fix a few more coverity warnings. + + more documentation updates based on tctest. +Index: VERSION +--- ncurses-6.1-20190728+/VERSION 2019-07-28 10:39:10.000000000 +0000 ++++ ncurses-6.1-20190803/VERSION 2019-08-03 13:57:42.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.1 20190728 ++5:0:10 6.1 20190803 +Index: dist.mk +Prereq: 1.1298 +--- ncurses-6.1-20190728+/dist.mk 2019-07-28 10:39:10.000000000 +0000 ++++ ncurses-6.1-20190803/dist.mk 2019-08-03 13:57:42.000000000 +0000 +@@ -25,7 +25,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1298 2019/07/28 10:39:10 tom Exp $ ++# $Id: dist.mk,v 1.1299 2019/08/03 13:57:42 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 = 20190728 ++NCURSES_PATCH = 20190803 + + # 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-20190728+/misc/terminfo.src 2019-07-06 20:35:26.000000000 +0000 ++++ ncurses-6.1-20190803/misc/terminfo.src 2019-08-03 21:42:15.000000000 +0000 +@@ -6,8 +6,8 @@ + # Report bugs and new terminal descriptions to + # bug-ncurses@gnu.org + # +-# $Revision: 1.757 $ +-# $Date: 2019/07/06 20:35:26 $ ++# $Revision: 1.763 $ ++# $Date: 2019/08/03 21:42: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 +@@ -4223,8 +4223,9 @@ + ms-vt-utf8|vt-utf8|UTF-8 flavor of vt100+, + use=ms-vt100+, + ++# Windows Terminal (Preview) + # Windows 10 1903 +-# Version 0.2.1715.0 ++# Version 0.2.1831.0 + # https://github.com/microsoft/terminal + # + # The task manager shows this as "OpenConsole.exe", which differs +@@ -4239,10 +4240,12 @@ + # fail in vttest, which does not pay attention to TERM. + # vttest: + # - menu 1 (tests for cursor movement) misbehaves like command-prompt ++# - primary DA says this is a vanilla VT100 + # - 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 ++# 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. ++# - in the generic VT100 tests, there are problems with character sets ++# (diamond shows as a double-width character, DEL as two replacement-chars). + # - outside of the generic VT100 tests, the program does poorly because most + # of the features are missing. + # - ECH does not work properly +@@ -4257,11 +4260,14 @@ + # or simply incorrect + # - sends escape+key rather than implementing meta mode + # other: +-# - color palette cannot be altered ++# - color palette can be altered, but OSC 104 for resetting does not work ++# - crashed with a script used for testing NRCS. ++# - does not recognize either xterm+direct or xterm+indirect escapes. + ms-terminal|Windows10 terminal, + npc, + rmkx=\E[?1l, rmm@, smkx=\E[?1h, smm@, use=xterm+256setaf, +- use=xterm+pcfkeys, use=xterm-basic, ++ use=xterm+pcfkeys, use=ansi+rep, use=ecma+index, ++ use=xterm-basic, + + #### Visual Studio + # Visual Studio Code 1.35.1 uses xterm.js (see https://xtermjs.org/). +@@ -6847,6 +6853,7 @@ + + #### Alacritty + # https://github.com/jwilm/alacritty ++# 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 + # terminal programs) is not designed to run with a remote server. +@@ -6854,21 +6861,24 @@ + # Packaged in Arch Linux - + # vttest: + # initial screensize 24x80 +-# does not switch between 80/132 columns +-# passes wrapping test +-# identifies as a vt100 ++# no DECCOLM (does not switch between 80/132 columns) ++# otherwise, passes wrapping test ++# no DECSCNM ++# identifies as a vt102 + # passes bce test + # vt220: +-# fails ECH, leaving text on right margin ++# ECH works (0.2.1 left text on right margin) + # no SRM, DECSCA + # vt320: + # fails DECXCPR + # does not implement any of the DECRQM/DECRPM controls + # does not implement any of the DECRQSS controls + # vt420: ++# no DECLRMM + # no DECBI, DECFI + # other: +-# fails REP, SL, SR ++# fails CHT, otherwise ECMA-48 cursor movement ok ++# fails ERM/SPA, SL, SR, passes REP, SD, SU + # xterm: + # no X10 mouse + # has normal and highlight mouse +@@ -6876,9 +6886,9 @@ + # cursor-position wrong after alternate-screen + # none of the dtterm controls work + # tack: +-# bell and flash do not work (perhaps Parallels problem) +-# italics works; crossed-out does not +-# function-keys work up to kf36; window manager interferes with remainder ++# bell and flash do 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 + # + # The program sources include "alacritty" and "alacritty-direct", which are + # copied from "xterm-256color" and "xterm-direct" (but using semicolon for +@@ -6891,18 +6901,19 @@ + use=xterm+indirect, use=alacritty+common, + + # removed ech, since it fails vttest -TD +-# removed ecma+strikeout, not implemented -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=^H, kcbt=\E[Z, kent=\EOM, Se=\E[0 q, ++ 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, +- use=ecma+italics, use=xterm+pce2, use=xterm+pcc2, +- use=xterm+pcf2, ++ use=ecma+strikeout, use=xterm+sl-twm, use=ecma+italics, ++ use=xterm+pce2, use=xterm+pcc2, use=xterm+pcf2, + + #### Kitty + # https://github.com/kovidgoyal/kitty +-# Version 0.12.3 ++# Version 0.13.3 + # Project started in 2016/10 (see alacritty), but is a Python script rather + # than Rust, using OpenGL. The same caveats regarding remote connections + # apply. This is not an X terminal, though (like alacritty), it copies +@@ -6959,8 +6970,10 @@ + # no mouse-highlight tracking + # no DEC locator + # dtterm - only supports report-size chars/pixels ++# recognizes tcap-query + # tack: + # flash doesn't work ++# italics do not work + # bce should be set (but see vttest) + #* developer's terminfo stopped at kf25, but the program continues, + # copying xterm for the rest of the control+fkey sequence +@@ -6971,6 +6984,7 @@ + # act like xterm for the editing/cursor-keys, e.g., alt+shift. While + # the implementation is incomplete, the building-blocks are consistent + # with what has been implemented -TD ++# DECKPAM does not work -TD + #* ka1, ka3, kc1, kc3 were bogus (removed) + #* meta sends escape (removed kmm) -TD + #* cvvis does not make cursor "more visible" -TD +@@ -6988,8 +7002,8 @@ + csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, + cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, + cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, +- dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, +- ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, ++ 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, 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, kbs=^?, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, +@@ -7007,13 +7021,13 @@ + 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, ++ sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%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=ecma+index, use=xterm+sl-twm, +- use=xterm+pce2, use=xterm+pcc2, use=ecma+italics, +- use=xterm+alt1049, ++ use=ecma+strikeout, use=xterm+pce2, use=xterm+pcc2, ++ use=ecma+italics, use=xterm+alt1049, + + ######## WEB CLIENTS + +@@ -7221,6 +7235,12 @@ + # the other capabilities will confuse screen. Curses applications which use + # sgr are not impacted (because that usually resets all capabilities before + # setting any), but termcap applications do not use sgr -TD ++# ++# The "screen" entry should use ecma+index rather than just indn, but tmux ++# defaults to using "screen". For background, screen supported ecma+index ++# since 1994 (i.e., screen 3.0.5), stating that it was an obscure code used by ++# the (Siemens Nixdorf) 97801 terminal. It was not shown in the termcap or ++# terminfo entries (which list about 60% of the control sequences). + screen|VT 100/ANSI X3.64 virtual terminal, + OTbs, OTpt, am, km, mir, msgr, xenl, G0, + colors#8, cols#80, it#8, lines#24, ncv@, pairs#64, U8#1, +@@ -7235,27 +7255,27 @@ + 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, 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, ++ 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, 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, 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, ++ E0=\E(B, S0=\E(%p1%c, 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, + bce, +- ech@, use=screen, ++ ech@, use=screen4, + screen-s|VT 100/ANSI X3.64 virtual terminal with hardstatus line, +- dsl=\E_\E\\, fsl=\E\\, tsl=\E_, use=screen, ++ dsl=\E_\E\\, fsl=\E\\, tsl=\E_, use=screen4, + + # ====================================================================== + # Entries for GNU Screen with 16 colors. +@@ -7266,7 +7286,7 @@ + # do all support 16 color palette. + + screen-16color|GNU Screen with 16 colors, +- use=ibm+16color, use=screen, ++ use=ibm+16color, use=screen4, + + screen-16color-s|GNU Screen with 16 colors and status line, + use=ibm+16color, use=screen-s, +@@ -7281,7 +7301,7 @@ + # Entries for GNU Screen 4.02 with --enable-colors256. + + screen-256color|GNU Screen with 256 colors, +- use=xterm+256setaf, use=screen, ++ use=xterm+256setaf, use=screen4, + + screen-256color-s|GNU Screen with 256 colors and status line, + use=xterm+256setaf, use=screen-s, +@@ -7367,14 +7387,14 @@ + acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i + \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u + \264v\301w\302x\263y\363z\362{\343|\330}\234~\376, +- use=screen+fkeys, use=xterm+x11mouse, use=screen, ++ use=screen+fkeys, use=xterm+x11mouse, use=screen4, + # Other terminals + screen.rxvt|screen in rxvt, + bw, XT, + cvvis@, flash@, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, + kcuu1=\EOA, use=screen+fkeys, use=vt100+enq, + use=rxvt+pcfkeys, use=xterm+x11mouse, use=vt220+keypad, +- use=screen, ++ use=screen4, + screen.Eterm|screen in Eterm, + use=xterm+x11mouse, use=screen+fkeys, use=Eterm, + screen.mrxvt|screen in mrxvt, +@@ -7392,7 +7412,7 @@ + screen.linux|screen in linux console, + bw, + kbs=^?, kcbt@, use=xterm+x11mouse, use=screen+fkeys, +- use=screen, ++ use=screen4, + screen.mlterm|screen in mlterm, + use=xterm+x11mouse, use=screen+fkeys, use=mlterm, + screen.putty|screen in putty, +@@ -7434,7 +7454,7 @@ + ech@, use=screen.linux, + + screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols, +- cols#132, use=screen, ++ cols#132, use=screen4, + + screen2|old VT 100/ANSI X3.64 virtual terminal, + cols#80, it#8, lines#24, +@@ -7470,7 +7490,7 @@ + # was last updated in 2009 to include 256-color support. The most recent + # release is 4.6.2 (October 2017). + screen4|VT 100/ANSI X3.64 virtual terminal, +- use=screen, ++ use=ecma+index, use=screen, + + # As of March 2019, screen 5.0 has not been released. + # +@@ -7488,7 +7508,7 @@ + rmso=\E[27m, + 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%;, +- smso=\E[7m, use=ecma+italics, use=screen, ++ smso=\E[7m, use=ecma+italics, use=screen4, + + #### Tmux + +@@ -20670,7 +20690,7 @@ + yzz||}}~~, + bel=\007\E\^ \E\\, bold@, csr@, flash=\Eg\E\^ \E\\, kmous@, + rmul@, smul@, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\EZ, +- use=xterm+x11mouse, use=screen, ++ use=xterm+x11mouse, use=screen4, + + screen.minitel1b|Screen specific for minitel1b, + kclr=\E[2J, kdl1=\E[M, kf13=^Y{1, kf14=^Y{2, kf15=^Y{3, +@@ -20798,7 +20818,7 @@ + \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n + \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n + \n\n\n\n\n\n\n\n\n\n, +- use=xterm+x11mouse, use=screen, ++ use=xterm+x11mouse, use=screen4, + + screen.linux-m1b|Linux m1b specific for screen, + colors@, pairs@, +@@ -20813,30 +20833,29 @@ + + putty-m1|Putty Minitel 1 "like" Couleurs, + hs, +- 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, ++ dim@, 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, .E3=\E[300S, ++ .WS=\E[8;%d;%dt, Z0=\E[?3h, Z1=\E[?3l, use=xterm+sl-twm, ++ use=ecma+index, use=linux-m1, + + putty-m1b|Putty Minitel 1B "like" Monochrome (Gris/Blanc/Noir), + hs, +- 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, ++ dim@, 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, .E3=\E[300S, ++ .WS=\E[8;%d;%dt, Z0=\E[?3h, Z1=\E[?3l, use=xterm+sl-twm, ++ 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, 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, +- ++ dim@, 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, .E3=\E[300S, ++ .WS=\E[8;%d;%dt, Z0=\E[?3h, Z1=\E[?3l, use=xterm+sl-twm, ++ use=ecma+index, use=linux-m2, + + screen.putty-m1|Putty m1 specific for screen, + dim@, rmul=\E[24m, smul=\E[4m, E3@, use=screen.linux-m1, +@@ -26345,4 +26364,12 @@ + # + add domterm -TD + # + improve comments for recent changes, add alias xterm.js -TD + # ++# 2019-08-03 ++# + amend the change to screen, because tmux relies upon that entry ++# and does not support that feature (Debian #933572) -TD ++# + updated ms-terminal entry & notes -TD ++# + updated kitty entry & notes -TD ++# + updated alacritty+common entry & notes -TD ++# + use xterm+sl-twm for consistency -TD ++# + ######## SHANTIH! SHANTIH! SHANTIH! +Index: ncurses/base/lib_scroll.c +Prereq: 1.29 +--- ncurses-6.1-20190728+/ncurses/base/lib_scroll.c 2011-10-22 16:34:50.000000000 +0000 ++++ ncurses-6.1-20190803/ncurses/base/lib_scroll.c 2019-08-03 22:27:55.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,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 @@ + + #include + +-MODULE_ID("$Id: lib_scroll.c,v 1.29 2011/10/22 16:34:50 tom Exp $") ++MODULE_ID("$Id: lib_scroll.c,v 1.31 2019/08/03 22:27:55 tom Exp $") + + NCURSES_EXPORT(void) + _nc_scroll_window(WINDOW *win, +@@ -77,11 +77,13 @@ + * setup cost. So there is no point in trying to be excessively + * clever -- esr. + */ ++#define BottomLimit(n) ((n) >= 0 && (n) >= top) ++#define TopLimit(n) ((n) <= win->_maxy && (n) <= bottom) + + /* shift n lines downwards */ + if (n < 0) { + limit = top - n; +- for (line = bottom; line >= limit && line >= 0; line--) { ++ for (line = bottom; line >= limit && BottomLimit(line); line--) { + TR(TRACE_MOVE, ("...copying %d to %d", line + n, line)); + memcpy(win->_line[line].text, + win->_line[line + n].text, +@@ -89,7 +91,7 @@ + if_USE_SCROLL_HINTS(win->_line[line].oldindex = + win->_line[line + n].oldindex); + } +- for (line = top; line < limit && line <= win->_maxy; line++) { ++ for (line = top; line < limit && TopLimit(line); line++) { + TR(TRACE_MOVE, ("...filling %d", line)); + for (j = 0; j <= win->_maxx; j++) + win->_line[line].text[j] = blank; +@@ -100,14 +102,14 @@ + /* shift n lines upwards */ + if (n > 0) { + limit = bottom - n; +- for (line = top; line <= limit && line <= win->_maxy; line++) { ++ for (line = top; line <= limit && TopLimit(line); line++) { + memcpy(win->_line[line].text, + win->_line[line + n].text, + to_copy); + if_USE_SCROLL_HINTS(win->_line[line].oldindex = + win->_line[line + n].oldindex); + } +- for (line = bottom; line > limit && line >= 0; line--) { ++ for (line = bottom; line > limit && BottomLimit(line); line--) { + for (j = 0; j <= win->_maxx; j++) + win->_line[line].text[j] = blank; + if_USE_SCROLL_HINTS(win->_line[line].oldindex = _NEWINDEX); +Index: ncurses/tinfo/parse_entry.c +Prereq: 1.96 +--- ncurses-6.1-20190728+/ncurses/tinfo/parse_entry.c 2019-03-16 23:31:40.000000000 +0000 ++++ ncurses-6.1-20190803/ncurses/tinfo/parse_entry.c 2019-08-03 23:10:38.000000000 +0000 +@@ -47,7 +47,7 @@ + #include + #include + +-MODULE_ID("$Id: parse_entry.c,v 1.96 2019/03/16 23:31:40 tom Exp $") ++MODULE_ID("$Id: parse_entry.c,v 1.97 2019/08/03 23:10:38 tom Exp $") + + #ifdef LINT + static short const parametrized[] = +@@ -530,9 +530,12 @@ + break; + + case NUMBER: ++#if !NCURSES_EXT_NUMBERS + if (_nc_curr_token.tk_valnumber > MAX_NUMBER) { + entryp->tterm.Numbers[entry_ptr->nte_index] = MAX_NUMBER; +- } else { ++ } else ++#endif ++ { + entryp->tterm.Numbers[entry_ptr->nte_index] = + (NCURSES_INT2) _nc_curr_token.tk_valnumber; + } +Index: package/debian-mingw/changelog +--- ncurses-6.1-20190728+/package/debian-mingw/changelog 2019-07-28 10:39:10.000000000 +0000 ++++ ncurses-6.1-20190803/package/debian-mingw/changelog 2019-08-03 13:57:42.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190728) unstable; urgency=low ++ncurses6 (6.1+20190803) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sun, 28 Jul 2019 06:39:10 -0400 ++ -- Thomas E. Dickey Sat, 03 Aug 2019 09:57:42 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.1-20190728+/package/debian-mingw64/changelog 2019-07-28 10:39:10.000000000 +0000 ++++ ncurses-6.1-20190803/package/debian-mingw64/changelog 2019-08-03 13:57:42.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190728) unstable; urgency=low ++ncurses6 (6.1+20190803) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sun, 28 Jul 2019 06:39:10 -0400 ++ -- Thomas E. Dickey Sat, 03 Aug 2019 09:57:42 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.1-20190728+/package/debian/changelog 2019-07-28 10:39:10.000000000 +0000 ++++ ncurses-6.1-20190803/package/debian/changelog 2019-08-03 13:57:42.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190728) unstable; urgency=low ++ncurses6 (6.1+20190803) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sun, 28 Jul 2019 06:39:10 -0400 ++ -- Thomas E. Dickey Sat, 03 Aug 2019 09:57:42 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.344 +--- ncurses-6.1-20190728+/package/mingw-ncurses.nsi 2019-07-28 10:39:10.000000000 +0000 ++++ ncurses-6.1-20190803/package/mingw-ncurses.nsi 2019-08-03 13:57:42.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.344 2019/07/28 10:39:10 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.345 2019/08/03 13:57:42 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 "0728" ++!define VERSION_MMDD "0803" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.1-20190728+/package/mingw-ncurses.spec 2019-07-28 10:39:10.000000000 +0000 ++++ ncurses-6.1-20190803/package/mingw-ncurses.spec 2019-08-03 13:57:42.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.1 +-Release: 20190728 ++Release: 20190803 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.1-20190728+/package/ncurses.spec 2019-07-28 10:39:10.000000000 +0000 ++++ ncurses-6.1-20190803/package/ncurses.spec 2019-08-03 13:57:42.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.1 +-Release: 20190728 ++Release: 20190803 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.1-20190728+/package/ncursest.spec 2019-07-28 10:39:10.000000000 +0000 ++++ ncurses-6.1-20190803/package/ncursest.spec 2019-08-03 13:57:42.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.1 +-Release: 20190728 ++Release: 20190803 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz diff --git a/ncurses-6.1-20190810.patch b/ncurses-6.1-20190810.patch new file mode 100644 index 0000000..6d84786 --- /dev/null +++ b/ncurses-6.1-20190810.patch @@ -0,0 +1,413 @@ +# ncurses 6.1 - patch 20190810 - 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-20190810.patch.gz +# patch by Thomas E. Dickey +# created Sat Aug 10 23:58:30 UTC 2019 +# ------------------------------------------------------------------------------ +# NEWS | 5 +++- +# VERSION | 2 - +# dist.mk | 4 +-- +# ncurses/base/lib_mouse.c | 4 +-- +# ncurses/tinfo/lib_setup.c | 33 +++++++++++++++++--------------- +# ncurses/tinfo/tinfo_driver.c | 38 ++++++++++++++++++++++--------------- +# 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/demo_menus.c | 5 +++- +# test/ncurses.c | 12 +++++++++-- +# 15 files changed, 75 insertions(+), 50 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.3359 +--- ncurses-6.1-20190803+/NEWS 2019-08-03 22:31:47.000000000 +0000 ++++ ncurses-6.1-20190810/NEWS 2019-08-10 19:05:52.000000000 +0000 +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3359 2019/08/03 22:31:47 tom Exp $ ++-- $Id: NEWS,v 1.3361 2019/08/10 19:05:52 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -45,6 +45,9 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20190810 ++ + fix a few more coverity warnings. ++ + 20190803 + + improve loop limits in _nc_scroll_window() to handle a case where + the scrolled data is a pad which is taller than the window (patch +Index: VERSION +--- ncurses-6.1-20190803+/VERSION 2019-08-03 13:57:42.000000000 +0000 ++++ ncurses-6.1-20190810/VERSION 2019-08-10 12:52:53.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.1 20190803 ++5:0:10 6.1 20190810 +Index: dist.mk +Prereq: 1.1299 +--- ncurses-6.1-20190803+/dist.mk 2019-08-03 13:57:42.000000000 +0000 ++++ ncurses-6.1-20190810/dist.mk 2019-08-10 12:52:53.000000000 +0000 +@@ -25,7 +25,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1299 2019/08/03 13:57:42 tom Exp $ ++# $Id: dist.mk,v 1.1300 2019/08/10 12:52: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 = 20190803 ++NCURSES_PATCH = 20190810 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: ncurses/base/lib_mouse.c +Prereq: 1.182 +--- ncurses-6.1-20190803+/ncurses/base/lib_mouse.c 2019-07-20 20:42:43.000000000 +0000 ++++ ncurses-6.1-20190810/ncurses/base/lib_mouse.c 2019-08-10 17:11:50.000000000 +0000 +@@ -84,7 +84,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_mouse.c,v 1.182 2019/07/20 20:42:43 tom Exp $") ++MODULE_ID("$Id: lib_mouse.c,v 1.183 2019/08/10 17:11:50 tom Exp $") + + #include + +@@ -438,7 +438,7 @@ + + #if USE_WEAK_SYMBOLS + /* Danger Robinson: do not use dlopen for libgpm if already loaded */ +- if ((Gpm_Wgetch)) { ++ if ((Gpm_Wgetch) != 0) { + if (!sp->_mouse_gpm_loaded) { + T(("GPM library was already dlopen'd, not by us")); + } +Index: ncurses/tinfo/lib_setup.c +Prereq: 1.202 +--- ncurses-6.1-20190803+/ncurses/tinfo/lib_setup.c 2019-07-28 19:33:40.000000000 +0000 ++++ ncurses-6.1-20190810/ncurses/tinfo/lib_setup.c 2019-08-10 17:08:00.000000000 +0000 +@@ -48,7 +48,7 @@ + #include + #endif + +-MODULE_ID("$Id: lib_setup.c,v 1.202 2019/07/28 19:33:40 tom Exp $") ++MODULE_ID("$Id: lib_setup.c,v 1.204 2019/08/10 17:08:00 tom Exp $") + + /**************************************************************************** + * +@@ -446,23 +446,24 @@ + int old_cols = columns; + #endif + +- TINFO_GET_SIZE(sp, sp->_term, &new_lines, &new_cols); +- +- /* +- * See is_term_resized() and resizeterm(). +- * We're doing it this way because those functions belong to the upper +- * ncurses library, while this resides in the lower terminfo library. +- */ +- if (sp != 0 && sp->_resize != 0) { +- if ((new_lines != old_lines) || (new_cols != old_cols)) { +- sp->_resize(NCURSES_SP_ARGx new_lines, new_cols); +- } else if (sp->_sig_winch && (sp->_ungetch != 0)) { +- sp->_ungetch(SP_PARM, KEY_RESIZE); /* so application can know this */ ++ if (sp != 0) { ++ TINFO_GET_SIZE(sp, sp->_term, &new_lines, &new_cols); ++ /* ++ * See is_term_resized() and resizeterm(). ++ * We're doing it this way because those functions belong to the upper ++ * ncurses library, while this resides in the lower terminfo library. ++ */ ++ if (sp->_resize != 0) { ++ if ((new_lines != old_lines) || (new_cols != old_cols)) { ++ sp->_resize(NCURSES_SP_ARGx new_lines, new_cols); ++ } else if (sp->_sig_winch && (sp->_ungetch != 0)) { ++ sp->_ungetch(SP_PARM, KEY_RESIZE); /* so application can know this */ ++ } ++ sp->_sig_winch = FALSE; + } +- sp->_sig_winch = FALSE; + } + } +-#endif ++#endif /* USE_SIZECHANGE */ + + /**************************************************************************** + * +@@ -776,6 +777,8 @@ + } else if (status == TGETENT_NO) { + ret_error1(status, "unknown terminal type.\n", + myname, free(myname)); ++ } else { ++ ret_error0(status, "unexpected return-code\n"); + } + } + #if NCURSES_EXT_NUMBERS +Index: ncurses/tinfo/tinfo_driver.c +Prereq: 1.64 +--- ncurses-6.1-20190803+/ncurses/tinfo/tinfo_driver.c 2019-07-28 18:43:09.000000000 +0000 ++++ ncurses-6.1-20190810/ncurses/tinfo/tinfo_driver.c 2019-08-10 18:36:08.000000000 +0000 +@@ -51,7 +51,7 @@ + # endif + #endif + +-MODULE_ID("$Id: tinfo_driver.c,v 1.64 2019/07/28 18:43:09 tom Exp $") ++MODULE_ID("$Id: tinfo_driver.c,v 1.66 2019/08/10 18:36:08 tom Exp $") + + /* + * SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS, +@@ -188,6 +188,8 @@ + } else if (status == TGETENT_NO) { + ret_error1(status, "unknown terminal type.\n", + tname, NO_COPY); ++ } else { ++ ret_error0(status, "unexpected return-code\n"); + } + } + result = TRUE; +@@ -1340,23 +1342,29 @@ + unsigned ch = (unsigned) c; + if (flag) { + while ((s = _nc_expand_try(sp->_key_ok, +- ch, &count, (size_t) 0)) != 0 +- && _nc_remove_key(&(sp->_key_ok), ch)) { +- code = _nc_add_to_try(&(sp->_keytry), s, ch); +- free(s); +- count = 0; +- if (code != OK) +- break; ++ ch, &count, (size_t) 0)) != 0) { ++ if (_nc_remove_key(&(sp->_key_ok), ch)) { ++ code = _nc_add_to_try(&(sp->_keytry), s, ch); ++ free(s); ++ count = 0; ++ if (code != OK) ++ break; ++ } else { ++ free(s); ++ } + } + } else { + while ((s = _nc_expand_try(sp->_keytry, +- ch, &count, (size_t) 0)) != 0 +- && _nc_remove_key(&(sp->_keytry), ch)) { +- code = _nc_add_to_try(&(sp->_key_ok), s, ch); +- free(s); +- count = 0; +- if (code != OK) +- break; ++ ch, &count, (size_t) 0)) != 0) { ++ if (_nc_remove_key(&(sp->_keytry), ch)) { ++ code = _nc_add_to_try(&(sp->_key_ok), s, ch); ++ free(s); ++ count = 0; ++ if (code != OK) ++ break; ++ } else { ++ free(s); ++ } + } + } + } +Index: package/debian-mingw/changelog +--- ncurses-6.1-20190803+/package/debian-mingw/changelog 2019-08-03 13:57:42.000000000 +0000 ++++ ncurses-6.1-20190810/package/debian-mingw/changelog 2019-08-10 12:52:53.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190803) unstable; urgency=low ++ncurses6 (6.1+20190810) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 03 Aug 2019 09:57:42 -0400 ++ -- Thomas E. Dickey Sat, 10 Aug 2019 08:52:53 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.1-20190803+/package/debian-mingw64/changelog 2019-08-03 13:57:42.000000000 +0000 ++++ ncurses-6.1-20190810/package/debian-mingw64/changelog 2019-08-10 12:52:53.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190803) unstable; urgency=low ++ncurses6 (6.1+20190810) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 03 Aug 2019 09:57:42 -0400 ++ -- Thomas E. Dickey Sat, 10 Aug 2019 08:52:53 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.1-20190803+/package/debian/changelog 2019-08-03 13:57:42.000000000 +0000 ++++ ncurses-6.1-20190810/package/debian/changelog 2019-08-10 12:52:53.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190803) unstable; urgency=low ++ncurses6 (6.1+20190810) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 03 Aug 2019 09:57:42 -0400 ++ -- Thomas E. Dickey Sat, 10 Aug 2019 08:52:53 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.345 +--- ncurses-6.1-20190803+/package/mingw-ncurses.nsi 2019-08-03 13:57:42.000000000 +0000 ++++ ncurses-6.1-20190810/package/mingw-ncurses.nsi 2019-08-10 12:52:53.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.345 2019/08/03 13:57:42 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.346 2019/08/10 12:52: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 "0803" ++!define VERSION_MMDD "0810" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.1-20190803+/package/mingw-ncurses.spec 2019-08-03 13:57:42.000000000 +0000 ++++ ncurses-6.1-20190810/package/mingw-ncurses.spec 2019-08-10 12:52:53.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.1 +-Release: 20190803 ++Release: 20190810 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.1-20190803+/package/ncurses.spec 2019-08-03 13:57:42.000000000 +0000 ++++ ncurses-6.1-20190810/package/ncurses.spec 2019-08-10 12:52:53.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.1 +-Release: 20190803 ++Release: 20190810 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.1-20190803+/package/ncursest.spec 2019-08-03 13:57:42.000000000 +0000 ++++ ncurses-6.1-20190810/package/ncursest.spec 2019-08-10 12:52:53.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.1 +-Release: 20190803 ++Release: 20190810 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: test/demo_menus.c +Prereq: 1.66 +--- ncurses-6.1-20190803+/test/demo_menus.c 2019-04-06 20:42:48.000000000 +0000 ++++ ncurses-6.1-20190810/test/demo_menus.c 2019-08-10 19:25:27.000000000 +0000 +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: demo_menus.c,v 1.66 2019/04/06 20:42:48 tom Exp $ ++ * $Id: demo_menus.c,v 1.67 2019/08/10 19:25:27 tom Exp $ + * + * Demonstrate a variety of functions from the menu library. + * Thomas Dickey - 2005/4/9 +@@ -110,6 +110,8 @@ + static bool loaded_file = FALSE; + + static char empty[1]; ++ ++#ifdef TRACE + static void failed(const char *s) GCC_NORETURN; + + static void +@@ -119,6 +121,7 @@ + endwin(); + ExitProgram(EXIT_FAILURE); + } ++#endif + + /* Common function to allow ^T to toggle trace-mode in the middle of a test + * so that trace-files can be made smaller. +Index: test/ncurses.c +Prereq: 1.515 +--- ncurses-6.1-20190803+/test/ncurses.c 2019-04-20 20:34:11.000000000 +0000 ++++ ncurses-6.1-20190810/test/ncurses.c 2019-08-10 19:38:41.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.515 2019/04/20 20:34:11 tom Exp $ ++$Id: ncurses.c,v 1.516 2019/08/10 19:38:41 tom Exp $ + + ***************************************************************************/ + +@@ -7876,11 +7876,15 @@ + { + int c; + int my_e_param = 1; ++#ifdef NCURSES_VERSION_PATCH + #if HAVE_USE_DEFAULT_COLORS + int default_fg = COLOR_WHITE; + int default_bg = COLOR_BLACK; +- bool assumed_colors = FALSE; + bool default_colors = FALSE; ++#if HAVE_ASSUME_DEFAULT_COLORS ++ bool assumed_colors = FALSE; ++#endif ++#endif + #endif + bool monochrome = FALSE; + #if HAVE_COLOR_CONTENT +@@ -7892,7 +7896,9 @@ + + while ((c = getopt(argc, argv, "a:dEe:fhmp:s:Tt:x")) != -1) { + switch (c) { ++#ifdef NCURSES_VERSION_PATCH + #if HAVE_USE_DEFAULT_COLORS ++#if HAVE_ASSUME_DEFAULT_COLORS + case 'a': + assumed_colors = TRUE; + switch (sscanf(optarg, "%d,%d", &default_fg, &default_bg)) { +@@ -7904,10 +7910,12 @@ + break; + } + break; ++#endif + case 'd': + default_colors = TRUE; + break; + #endif ++#endif + #if HAVE_USE_ENV + case 'E': + use_env(FALSE); diff --git a/ncurses-6.1-20190817.patch b/ncurses-6.1-20190817.patch new file mode 100644 index 0000000..9211cee --- /dev/null +++ b/ncurses-6.1-20190817.patch @@ -0,0 +1,960 @@ +# ncurses 6.1 - patch 20190817 - 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-20190817.patch.gz +# patch by Thomas E. Dickey +# created Sun Aug 18 00:33:55 UTC 2019 +# ------------------------------------------------------------------------------ +# NEWS | 7 ++++++- +# VERSION | 2 +- +# dist.mk | 4 ++-- +# ncurses/base/lib_bkgd.c | 24 ++++++++++++++++++------ +# 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/blue.c | 20 ++++++++++---------- +# test/bs.c | 31 +++++++++++++++++-------------- +# test/cardfile.c | 28 ++++++++++++++++------------ +# test/chgat.c | 7 ++++--- +# test/clip_printw.c | 9 +++++---- +# test/color_content.c | 4 ++-- +# test/color_set.c | 7 ++++--- +# test/demo_altkeys.c | 16 +++++++++------- +# test/demo_defkey.c | 17 +++++++++-------- +# test/demo_forms.c | 19 +++++++++++-------- +# test/demo_menus.c | 10 ++++------ +# test/test_sgr.c | 4 ++-- +# 23 files changed, 131 insertions(+), 100 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.3361 +--- ncurses-6.1-20190810+/NEWS 2019-08-10 19:05:52.000000000 +0000 ++++ ncurses-6.1-20190817/NEWS 2019-08-17 21:47:27.000000000 +0000 +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3361 2019/08/10 19:05:52 tom Exp $ ++-- $Id: NEWS,v 1.3364 2019/08/17 21:47:27 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -45,6 +45,11 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20190817 ++ + amend 20181208 changes for wbkgd() and wbkgrnd(), fixing a few ++ details where it still differed from SVr4. ++ + fix some cppcheck warnings, mostly style, in ncurses test-programs. ++ + 20190810 + + fix a few more coverity warnings. + +Index: VERSION +--- ncurses-6.1-20190810+/VERSION 2019-08-10 12:52:53.000000000 +0000 ++++ ncurses-6.1-20190817/VERSION 2019-08-17 13:26:39.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.1 20190810 ++5:0:10 6.1 20190817 +Index: dist.mk +Prereq: 1.1300 +--- ncurses-6.1-20190810+/dist.mk 2019-08-10 12:52:53.000000000 +0000 ++++ ncurses-6.1-20190817/dist.mk 2019-08-17 13:26:39.000000000 +0000 +@@ -25,7 +25,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1300 2019/08/10 12:52:53 tom Exp $ ++# $Id: dist.mk,v 1.1301 2019/08/17 13:26:39 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 = 20190810 ++NCURSES_PATCH = 20190817 + + # 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.52 +--- ncurses-6.1-20190810+/ncurses/base/lib_bkgd.c 2018-12-09 00:09:17.000000000 +0000 ++++ ncurses-6.1-20190817/ncurses/base/lib_bkgd.c 2019-08-17 20:59:41.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 * +@@ -36,7 +36,7 @@ + + #include + +-MODULE_ID("$Id: lib_bkgd.c,v 1.52 2018/12/09 00:09:17 tom Exp $") ++MODULE_ID("$Id: lib_bkgd.c,v 1.53 2019/08/17 20:59:41 tom Exp $") + + /* + * Set the window's background information. +@@ -145,6 +145,11 @@ + memset(&old_bkgd, 0, sizeof(old_bkgd)); + (void) wgetbkgrnd(win, &old_bkgd); + ++ if (!memcmp(&old_bkgd, &new_bkgd, sizeof(new_bkgd))) { ++ T(("...unchanged")); ++ returnCode(OK); ++ } ++ + old_char = old_bkgd; + RemAttr(old_char, ~A_CHARTEXT); + old_attr = AttrOf(old_bkgd); +@@ -153,6 +158,8 @@ + if (!(old_attr & A_COLOR)) { + old_pair = 0; + } ++ T(("... old background char %s, attr %s, pair %d", ++ _tracechar(CharOf(old_char)), _traceattr(old_attr), old_pair)); + + new_char = new_bkgd; + RemAttr(new_char, ~A_CHARTEXT); +@@ -163,15 +170,20 @@ + if (!Charable(new_bkgd)) { + new_char = old_char; + } ++ if (!(new_attr & A_COLOR)) { ++ new_pair = 0; ++ } ++ T(("... new background char %s, attr %s, pair %d", ++ _tracechar(CharOf(new_char)), _traceattr(new_attr), new_pair)); + + (void) wbkgrndset(win, CHREF(new_bkgd)); + + /* SVr4 updates color pair if old/new match, otherwise just attrs */ + if ((new_pair != 0) && (new_pair == old_pair)) { +- SetAttr(win->_nc_bkgd, new_attr); +- SetPair(win->_nc_bkgd, new_pair); ++ WINDOW_ATTRS(win) = new_attr; ++ SET_WINDOW_PAIR(win, new_pair); + } else { +- SetAttr(win->_nc_bkgd, new_attr); ++ WINDOW_ATTRS(win) = new_attr; + } + + for (y = 0; y <= win->_maxy; y++) { +@@ -195,7 +207,7 @@ + | (new_attr & ALL_BUT_COLOR)); + } + } else { +- SetAttr(*cp, new_attr); ++ SetAttr(*cp, (tmp_attr & ~old_attr) | new_attr); + SetPair(*cp, new_pair); + } + } +Index: package/debian-mingw/changelog +--- ncurses-6.1-20190810+/package/debian-mingw/changelog 2019-08-10 12:52:53.000000000 +0000 ++++ ncurses-6.1-20190817/package/debian-mingw/changelog 2019-08-17 13:26:39.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190810) unstable; urgency=low ++ncurses6 (6.1+20190817) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 10 Aug 2019 08:52:53 -0400 ++ -- Thomas E. Dickey Sat, 17 Aug 2019 09:26:39 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.1-20190810+/package/debian-mingw64/changelog 2019-08-10 12:52:53.000000000 +0000 ++++ ncurses-6.1-20190817/package/debian-mingw64/changelog 2019-08-17 13:26:39.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190810) unstable; urgency=low ++ncurses6 (6.1+20190817) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 10 Aug 2019 08:52:53 -0400 ++ -- Thomas E. Dickey Sat, 17 Aug 2019 09:26:39 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.1-20190810+/package/debian/changelog 2019-08-10 12:52:53.000000000 +0000 ++++ ncurses-6.1-20190817/package/debian/changelog 2019-08-17 13:26:39.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190810) unstable; urgency=low ++ncurses6 (6.1+20190817) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 10 Aug 2019 08:52:53 -0400 ++ -- Thomas E. Dickey Sat, 17 Aug 2019 09:26:39 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.346 +--- ncurses-6.1-20190810+/package/mingw-ncurses.nsi 2019-08-10 12:52:53.000000000 +0000 ++++ ncurses-6.1-20190817/package/mingw-ncurses.nsi 2019-08-17 13:26:39.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.346 2019/08/10 12:52:53 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.347 2019/08/17 13:26:39 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 "0810" ++!define VERSION_MMDD "0817" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.1-20190810+/package/mingw-ncurses.spec 2019-08-10 12:52:53.000000000 +0000 ++++ ncurses-6.1-20190817/package/mingw-ncurses.spec 2019-08-17 13:26:39.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.1 +-Release: 20190810 ++Release: 20190817 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.1-20190810+/package/ncurses.spec 2019-08-10 12:52:53.000000000 +0000 ++++ ncurses-6.1-20190817/package/ncurses.spec 2019-08-17 13:26:39.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.1 +-Release: 20190810 ++Release: 20190817 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.1-20190810+/package/ncursest.spec 2019-08-10 12:52:53.000000000 +0000 ++++ ncurses-6.1-20190817/package/ncursest.spec 2019-08-17 13:26:39.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.1 +-Release: 20190810 ++Release: 20190817 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: test/blue.c +Prereq: 1.51 +--- ncurses-6.1-20190810+/test/blue.c 2017-09-30 17:43:18.000000000 +0000 ++++ ncurses-6.1-20190817/test/blue.c 2019-08-17 21:49:19.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 * +@@ -36,7 +36,7 @@ + *****************************************************************************/ + + /* +- * $Id: blue.c,v 1.51 2017/09/30 17:43:18 tom Exp $ ++ * $Id: blue.c,v 1.52 2019/08/17 21:49:19 tom Exp $ + */ + + #include +@@ -153,14 +153,14 @@ + static void + shuffle(int size) + { +- int i, j, numswaps, swapnum, temp; ++ int numswaps, swapnum; + + numswaps = size * 10; /* an arbitrary figure */ + + for (swapnum = 0; swapnum < numswaps; swapnum++) { +- i = rand() % size; +- j = rand() % size; +- temp = deck[i]; ++ int i = rand() % size; ++ int j = rand() % size; ++ int temp = deck[i]; + deck[i] = deck[j]; + deck[j] = temp; + } +@@ -169,11 +169,11 @@ + static void + deal_cards(void) + { +- int ptr, card = 0, value, csuit, crank, suit, aces[4]; ++ int card = 0, value, csuit, crank, suit, aces[4]; + + memset(aces, 0, sizeof(aces)); + for (suit = HEARTS; suit <= CLUBS; suit++) { +- ptr = freeptr[suit]; ++ int ptr = freeptr[suit]; + grid[ptr++] = NOCARD; /* 1st card space is blank */ + while ((ptr % GRID_WIDTH) != 0) { + value = deck[card++]; +@@ -388,10 +388,10 @@ + static int + collect_discards(void) + { +- int row, col, cardno = 0, finish, gridno; ++ int row, col, cardno = 0, gridno; + + for (row = HEARTS; row <= CLUBS; row++) { +- finish = 0; ++ int finish = 0; + for (col = 1; col < GRID_WIDTH; col++) { + gridno = row * GRID_WIDTH + col; + +Index: test/bs.c +Prereq: 1.73 +--- ncurses-6.1-20190810+/test/bs.c 2018-05-12 15:07:51.000000000 +0000 ++++ ncurses-6.1-20190817/test/bs.c 2019-08-17 21:49:19.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 * +@@ -34,7 +34,7 @@ + * v2.0 featuring strict ANSI/POSIX conformance, November 1993. + * v2.1 with ncurses mouse support, September 1995 + * +- * $Id: bs.c,v 1.73 2018/05/12 15:07:51 tom Exp $ ++ * $Id: bs.c,v 1.74 2019/08/17 21:49:19 tom Exp $ + */ + + #include +@@ -548,14 +548,15 @@ + static int + getcoord(int atcpu) + { +- int ny, nx, c; +- + if (atcpu) + cgoto(cury, curx); + else + pgoto(cury, curx); + (void) refresh(); ++ + for (;;) { ++ int ny, nx, c; ++ + if (atcpu) { + MvPrintw(CYBASE + BDEPTH + 1, CXBASE + 11, "(%d, %c)", + curx, 'A' + cury); +@@ -731,10 +732,9 @@ + awinna(void) + { + int i, j; +- ship_t *ss; + + for (i = 0; i < 2; ++i) { +- ss = (i) ? cpuship : plyship; ++ ship_t *ss = (i) ? cpuship : plyship; + for (j = 0; j < SHIPTYPES; ++j, ++ss) + if (ss->length > ss->hits) + break; +@@ -761,9 +761,11 @@ + if (++ss->hits < ss->length) /* still afloat? */ + return ((ship_t *) NULL); + else { /* sunk! */ +- int i, j; ++ int i; ++ ++ if (!closepack) { ++ int j; + +- if (!closepack) + for (j = -1; j <= 1; j++) { + int bx = ss->x + j * xincr[(ss->dir + 2) % dir_MAX]; + int by = ss->y + j * yincr[(ss->dir + 2) % dir_MAX]; +@@ -792,6 +794,7 @@ + } + } + } ++ } + + for (i = 0; i < ss->length; ++i) { + int x1 = ss->x + i * xincr[ss->dir]; +@@ -884,12 +887,12 @@ + static int + sgetc(const char *s) + { +- const char *s1; +- int ch; +- + (void) refresh(); ++ + for (;;) { +- ch = getch(); ++ int ch = getch(); ++ const char *s1; ++ + if (islower(ch)) + ch = toupper(ch); + if (is_QUIT(ch)) +@@ -1161,9 +1164,9 @@ + static void + do_options(int c, char *op[]) + { +- register int i; +- + if (c > 1) { ++ int i; ++ + for (i = 1; i < c; i++) { + switch (op[i][0]) { + default: +Index: test/cardfile.c +Prereq: 1.45 +--- ncurses-6.1-20190810+/test/cardfile.c 2017-10-19 21:14:25.000000000 +0000 ++++ ncurses-6.1-20190817/test/cardfile.c 2019-08-17 21:49:40.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1999-2016,2017 Free Software Foundation, Inc. * ++ * Copyright (c) 1999-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: cardfile.c,v 1.45 2017/10/19 21:14:25 tom Exp $ ++ * $Id: cardfile.c,v 1.46 2019/08/17 21:49:40 tom Exp $ + * + * File format: text beginning in column 1 is a title; other text is content. + */ +@@ -125,10 +125,12 @@ + static void + add_content(CARD * card, const char *content) + { +- size_t total, offset; ++ size_t total; + + content = skip(content); + if ((total = strlen(content)) != 0) { ++ size_t offset; ++ + if (card->content != 0 && (offset = strlen(card->content)) != 0) { + total += 1 + offset; + card->content = typeRealloc(char, total + 1, card->content); +@@ -173,10 +175,11 @@ + read_data(char *fname) + { + FILE *fp; +- CARD *card = 0; +- char buffer[BUFSIZ]; + + if ((fp = fopen(fname, "r")) != 0) { ++ CARD *card = 0; ++ char buffer[BUFSIZ]; ++ + while (fgets(buffer, sizeof(buffer), fp)) { + trim(buffer); + if (isspace(UChar(*buffer))) { +@@ -197,15 +200,17 @@ + write_data(const char *fname) + { + FILE *fp; +- CARD *p = 0; +- int n; + + if (!strcmp(fname, default_name)) + fname = "cardfile.out"; + + if ((fp = fopen(fname, "w")) != 0) { ++ CARD *p = 0; ++ + for (p = all_cards; p != 0; p = p->link) { + FIELD **f = form_fields(p->form); ++ int n; ++ + for (n = 0; f[n] != 0; n++) { + char *s = field_buffer(f[n], 0); + if (s != 0 +@@ -365,7 +370,7 @@ + + #if (defined(KEY_RESIZE) && HAVE_WRESIZE) || NO_LEAKS + static void +-free_form_fields(FIELD ** f) ++free_form_fields(FIELD **f) + { + int n; + +@@ -391,7 +396,6 @@ + int form_high; + int y; + int x; +- int ch = ERR; + int finished = FALSE; + + show_legend(); +@@ -432,6 +436,8 @@ + order_cards(top_card, visible_cards); + + while (!finished) { ++ int ch = ERR; ++ + update_panels(); + doupdate(); + +@@ -522,13 +528,11 @@ + } + #if NO_LEAKS + while (all_cards != 0) { +- FIELD **f; +- + p = all_cards; + all_cards = all_cards->link; + + if (isVisible(p)) { +- f = form_fields(p->form); ++ FIELD **f = form_fields(p->form); + + unpost_form(p->form); /* ...so we can free it */ + free_form(p->form); /* this also disconnects the fields */ +Index: test/chgat.c +Prereq: 1.17 +--- ncurses-6.1-20190810+/test/chgat.c 2017-09-28 23:04:14.000000000 +0000 ++++ ncurses-6.1-20190817/test/chgat.c 2019-08-17 21:49:19.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2006-2012,2017 Free Software Foundation, Inc. * ++ * Copyright (c) 2006-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: chgat.c,v 1.17 2017/09/28 23:04:14 tom Exp $ ++ * $Id: chgat.c,v 1.18 2019/08/17 21:49:19 tom Exp $ + * + * test-driver for chgat/wchgat/mvchgat/mvwchgat + */ +@@ -75,10 +75,11 @@ + }; + /* *INDENT-ON* */ + +- static bool first = TRUE; + const char *result = 0; + + if (has_colors()) { ++ static bool first = TRUE; ++ + if (first) { + size_t n; + +Index: test/clip_printw.c +Prereq: 1.15 +--- ncurses-6.1-20190810+/test/clip_printw.c 2017-09-28 23:07:23.000000000 +0000 ++++ ncurses-6.1-20190817/test/clip_printw.c 2019-08-17 21:49:40.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2008-2016,2017 Free Software Foundation, Inc. * ++ * Copyright (c) 2008-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: clip_printw.c,v 1.15 2017/09/28 23:07:23 tom Exp $ ++ * $Id: clip_printw.c,v 1.16 2019/08/17 21:49:40 tom Exp $ + * + * demonstrate how to use printw without wrapping. + */ +@@ -56,7 +56,7 @@ + } STATUS; + + static int +-clip_wprintw(WINDOW *win, NCURSES_CONST char *fmt,...) ++clip_wprintw(WINDOW *win, NCURSES_CONST char *fmt, ...) + { + int y0, x0, y1, x1, width; + WINDOW *sub; +@@ -103,10 +103,11 @@ + }; + /* *INDENT-ON* */ + +- static bool first = TRUE; + const char *result = 0; + + if (has_colors()) { ++ static bool first = TRUE; ++ + if (first) { + unsigned n; + +Index: test/color_content.c +Prereq: 1.10 +--- ncurses-6.1-20190810+/test/color_content.c 2019-01-21 01:05:44.000000000 +0000 ++++ ncurses-6.1-20190817/test/color_content.c 2019-08-17 21:29:13.000000000 +0000 +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: color_content.c,v 1.10 2019/01/21 01:05:44 tom Exp $ ++ * $Id: color_content.c,v 1.11 2019/08/17 21:29:13 tom Exp $ + */ + + #define NEED_TIME_H +@@ -251,7 +251,6 @@ + main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) + { + int i; +- int repeat; + + while ((i = getopt(argc, argv, "f:il:npr:sx")) != -1) { + switch (i) { +@@ -305,6 +304,7 @@ + } + } + } else { ++ int repeat; + + for (repeat = 0; repeat < r_opt; ++repeat) { + run_test(); +Index: test/color_set.c +Prereq: 1.8 +--- ncurses-6.1-20190810+/test/color_set.c 2014-02-01 22:10:42.000000000 +0000 ++++ ncurses-6.1-20190817/test/color_set.c 2019-08-17 21:49:19.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2003-2012,2014 Free Software Foundation, Inc. * ++ * Copyright (c) 2003-2014,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: color_set.c,v 1.8 2014/02/01 22:10:42 tom Exp $ ++ * $Id: color_set.c,v 1.9 2019/08/17 21:49:19 tom Exp $ + */ + + #include +@@ -39,13 +39,14 @@ + main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) + { + NCURSES_COLOR_T f, b; +- int i; + + initscr(); + cbreak(); + noecho(); + + if (has_colors()) { ++ int i; ++ + start_color(); + + (void) pair_content(0, &f, &b); +Index: test/demo_altkeys.c +Prereq: 1.12 +--- ncurses-6.1-20190810+/test/demo_altkeys.c 2018-12-29 17:52:53.000000000 +0000 ++++ ncurses-6.1-20190817/test/demo_altkeys.c 2019-08-17 21:49:40.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2005-2017,2018 Free Software Foundation, Inc. * ++ * Copyright (c) 2005-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: demo_altkeys.c,v 1.12 2018/12/29 17:52:53 tom Exp $ ++ * $Id: demo_altkeys.c,v 1.13 2019/08/17 21:49:40 tom Exp $ + * + * Demonstrate the define_key() function. + * Thomas Dickey - 2005/10/22 +@@ -47,11 +47,12 @@ + log_last_line(WINDOW *win) + { + FILE *fp; +- int y, x, n; +- char temp[256]; + + if ((fp = fopen(MY_LOGFILE, "a")) != 0) { ++ char temp[256]; ++ int y, x, n; + int need = sizeof(temp) - 1; ++ + if (need > COLS) + need = COLS; + getyx(win, y, x); +@@ -75,8 +76,7 @@ + int n; + int ch; + #if HAVE_GETTIMEOFDAY +- int secs, msecs; +- struct timeval current, previous; ++ struct timeval previous; + #endif + + unlink(MY_LOGFILE); +@@ -119,8 +119,10 @@ + while ((ch = getch()) != ERR) { + bool escaped = (ch >= MY_KEYS); + const char *name = keyname(escaped ? (ch - MY_KEYS) : ch); +- + #if HAVE_GETTIMEOFDAY ++ int secs, msecs; ++ struct timeval current; ++ + gettimeofday(¤t, 0); + secs = (int) (current.tv_sec - previous.tv_sec); + msecs = (int) ((current.tv_usec - previous.tv_usec) / 1000); +Index: test/demo_defkey.c +Prereq: 1.28 +--- ncurses-6.1-20190810+/test/demo_defkey.c 2018-02-12 09:57:31.000000000 +0000 ++++ ncurses-6.1-20190817/test/demo_defkey.c 2019-08-17 21:49:19.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: demo_defkey.c,v 1.28 2018/02/12 09:57:31 tom Exp $ ++ * $Id: demo_defkey.c,v 1.29 2019/08/17 21:49:19 tom Exp $ + * + * Demonstrate the define_key() function. + * Thomas Dickey - 2002/11/23 +@@ -45,10 +45,10 @@ + log_last_line(WINDOW *win) + { + FILE *fp; +- int y, x, n; +- char temp[256]; + + if ((fp = fopen(MY_LOGFILE, "a")) != 0) { ++ char temp[256]; ++ int y, x, n; + int need = sizeof(temp) - 1; + if (need > COLS) + need = COLS; +@@ -98,11 +98,12 @@ + visible(const char *string) + { + char *result = 0; +- size_t need = 1; +- int pass; +- int n; + + if (string != 0 && *string != '\0') { ++ int pass; ++ int n; ++ size_t need = 1; ++ + for (pass = 0; pass < 2; ++pass) { + for (n = 0; string[n] != '\0'; ++n) { + char temp[80]; +@@ -185,7 +186,6 @@ + + if (value != 0) { + const char *prefix = 0; +- char temp[BUFSIZ]; + + if (!(strncmp) (value, "\033[", (size_t) 2)) { + prefix = "\033O"; +@@ -193,6 +193,7 @@ + prefix = "\033["; + } + if (prefix != 0) { ++ char temp[BUFSIZ]; + _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) + "%s%s", prefix, value + 2); + really_define_key(win, temp, code); +Index: test/demo_forms.c +Prereq: 1.55 +--- ncurses-6.1-20190810+/test/demo_forms.c 2018-07-14 23:26:02.000000000 +0000 ++++ ncurses-6.1-20190817/test/demo_forms.c 2019-08-17 21:49:19.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2003-2017,2018 Free Software Foundation, Inc. * ++ * Copyright (c) 2003-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: demo_forms.c,v 1.55 2018/07/14 23:26:02 tom Exp $ ++ * $Id: demo_forms.c,v 1.56 2019/08/17 21:49:19 tom Exp $ + * + * Demonstrate a variety of functions from the form library. + * Thomas Dickey - 2003/4/26 +@@ -338,9 +338,6 @@ + show_current_field(WINDOW *win, FORM *form) + { + FIELD *field; +- FIELDTYPE *type; +- char *buffer; +- int nbuf; + int field_rows, field_cols, field_max; + int currow, curcol; + +@@ -355,7 +352,11 @@ + if (data_behind(form)) + waddstr(win, " behind"); + waddch(win, '\n'); ++ + if ((field = current_field(form)) != 0) { ++ FIELDTYPE *type; ++ int nbuf; ++ + wprintw(win, "Page %d%s, Field %d/%d%s:", + form_page(form), + new_page(field) ? "*" : "", +@@ -411,6 +412,7 @@ + + waddstr(win, "\n"); + for (nbuf = 0; nbuf <= 2; ++nbuf) { ++ char *buffer; + if ((buffer = field_buffer(field, nbuf)) != 0) { + wprintw(win, "buffer %d:", nbuf); + (void) wattrset(win, A_REVERSE); +@@ -430,13 +432,11 @@ + static void + demo_forms(void) + { +- WINDOW *w; + FORM *form; + FIELD *f[100]; /* will memset to zero */ +- int finished = 0, c; ++ int c; + unsigned n = 0; + int pg; +- WINDOW *also; + const char *fname; + static const char *my_enum[] = + {"first", "second", "third", 0}; +@@ -544,6 +544,9 @@ + f[n] = (FIELD *) 0; + + if ((form = new_form(f)) != 0) { ++ WINDOW *w; ++ WINDOW *also; ++ int finished = 0; + + display_form(form); + +Index: test/demo_menus.c +Prereq: 1.67 +--- ncurses-6.1-20190810+/test/demo_menus.c 2019-08-10 19:25:27.000000000 +0000 ++++ ncurses-6.1-20190817/test/demo_menus.c 2019-08-17 21:45:32.000000000 +0000 +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: demo_menus.c,v 1.67 2019/08/10 19:25:27 tom Exp $ ++ * $Id: demo_menus.c,v 1.68 2019/08/17 21:45:32 tom Exp $ + * + * Demonstrate a variety of functions from the menu library. + * Thomas Dickey - 2005/4/9 +@@ -309,12 +309,11 @@ + static void + menu_destroy(MENU * m) + { +- int count; +- + Trace(("menu_destroy %p", (void *) m)); + if (m != 0) { + ITEM **items = menu_items(m); + const char *blob = 0; ++ int count; + + count = item_count(m); + Trace(("menu_destroy %p count %d", (void *) m, count)); +@@ -429,7 +428,6 @@ + && (sb.st_mode & S_IFMT) == S_IFREG + && sb.st_size != 0) { + size_t size = (size_t) sb.st_size; +- unsigned j, k; + char *blob = typeMalloc(char, size + 1); + MENU_DATA *list = typeCalloc(MENU_DATA, size + 1); + +@@ -442,6 +440,7 @@ + if (fp != 0) { + if (fread(blob, sizeof(char), size, fp) == size) { + bool mark = TRUE; ++ unsigned j, k; + for (j = k = 0; j < size; ++j) { + if (mark) { + list[k++].name = blob + j; +@@ -609,7 +608,6 @@ + /* interactively set the trace level */ + { + ITEM **ip; +- unsigned newtrace; + int result; + + for (ip = menu_items(mpTrace); *ip; ip++) { +@@ -625,7 +623,7 @@ + + if (result == E_OK) { + if (update_trace_menu(mpTrace) || cmd == REQ_TOGGLE_ITEM) { +- newtrace = 0; ++ unsigned newtrace = 0; + for (ip = menu_items(mpTrace); *ip; ip++) { + if (item_value(*ip)) { + MENU_DATA *td = (MENU_DATA *) item_userptr(*ip); +Index: test/test_sgr.c +Prereq: 1.13 +--- ncurses-6.1-20190810+/test/test_sgr.c 2019-07-28 18:13:39.000000000 +0000 ++++ ncurses-6.1-20190817/test/test_sgr.c 2019-08-17 21:36:44.000000000 +0000 +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey + * +- * $Id: test_sgr.c,v 1.13 2019/07/28 18:13:39 tom Exp $ ++ * $Id: test_sgr.c,v 1.14 2019/08/17 21:36:44 tom Exp $ + * + * A simple demo of the sgr/sgr0 terminal capabilities. + */ +@@ -147,7 +147,7 @@ + static char params[] = "SURBDBIPA"; + unsigned n; + +- printf("%4d ", bits); ++ printf("%4u ", bits); + bits &= ~ignore; + for (n = 0; n < MAXPAR; ++n) { + putchar((int) ((bits & (unsigned) (1 << n)) ? params[n] : '-')); diff --git a/ncurses-6.1-20190824.patch b/ncurses-6.1-20190824.patch new file mode 100644 index 0000000..88716fc --- /dev/null +++ b/ncurses-6.1-20190824.patch @@ -0,0 +1,1843 @@ +# ncurses 6.1 - patch 20190824 - 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-20190824.patch.gz +# patch by Thomas E. Dickey +# created Sun Aug 25 01:15:21 UTC 2019 +# ------------------------------------------------------------------------------ +# NEWS | 5 +- +# 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 | 2 +# package/ncurses.spec | 2 +# package/ncursest.spec | 2 +# test/demo_menus.c | 5 +- +# test/demo_panels.c | 35 +++++++++------ +# test/demo_termcap.c | 12 ++--- +# test/demo_terminfo.c | 12 ++--- +# test/dots.c | 16 +++--- +# test/dots_curses.c | 16 +++--- +# test/dots_mvcur.c | 16 +++--- +# test/dots_termcap.c | 20 ++++---- +# test/dots_xcurses.c | 14 ++---- +# test/echochar.c | 14 +++--- +# test/extended_color.c | 6 +- +# test/filter.c | 6 +- +# test/foldkeys.c | 14 +++--- +# test/gdc.c | 10 ++-- +# test/inch_wide.c | 7 +-- +# test/inchs.c | 7 +-- +# test/insdelln.c | 6 +- +# test/knight.c | 28 +++++------- +# test/list_keys.c | 14 +++--- +# test/ncurses.c | 86 ++++++++++++++++++++----------------- +# test/newdemo.c | 14 +++--- +# test/pair_content.c | 4 - +# test/picsmap.c | 35 +++++++++------ +# test/railroad.c | 8 +-- +# 34 files changed, 237 insertions(+), 201 deletions(-) +# ------------------------------------------------------------------------------ +Index: NEWS +Prereq: 1.3364 +--- ncurses-6.1-20190817+/NEWS 2019-08-17 21:47:27.000000000 +0000 ++++ ncurses-6.1-20190824/NEWS 2019-08-24 23:16:29.000000000 +0000 +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3364 2019/08/17 21:47:27 tom Exp $ ++-- $Id: NEWS,v 1.3366 2019/08/24 23:16:29 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -45,6 +45,9 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20190824 ++ + fix some cppcheck warnings, mostly style, in ncurses test-programs. ++ + 20190817 + + amend 20181208 changes for wbkgd() and wbkgrnd(), fixing a few + details where it still differed from SVr4. +Index: VERSION +--- ncurses-6.1-20190817+/VERSION 2019-08-17 13:26:39.000000000 +0000 ++++ ncurses-6.1-20190824/VERSION 2019-08-24 13:12:23.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.1 20190817 ++5:0:10 6.1 20190824 +Index: dist.mk +Prereq: 1.1301 +--- ncurses-6.1-20190817+/dist.mk 2019-08-17 13:26:39.000000000 +0000 ++++ ncurses-6.1-20190824/dist.mk 2019-08-24 13:12:23.000000000 +0000 +@@ -25,7 +25,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1301 2019/08/17 13:26:39 tom Exp $ ++# $Id: dist.mk,v 1.1302 2019/08/24 13:12: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 = 20190817 ++NCURSES_PATCH = 20190824 + + # 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-20190817+/package/debian-mingw/changelog 2019-08-17 13:26:39.000000000 +0000 ++++ ncurses-6.1-20190824/package/debian-mingw/changelog 2019-08-24 13:12:23.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190817) unstable; urgency=low ++ncurses6 (6.1+20190824) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 17 Aug 2019 09:26:39 -0400 ++ -- Thomas E. Dickey Sat, 24 Aug 2019 09:12:23 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.1-20190817+/package/debian-mingw64/changelog 2019-08-17 13:26:39.000000000 +0000 ++++ ncurses-6.1-20190824/package/debian-mingw64/changelog 2019-08-24 13:12:23.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190817) unstable; urgency=low ++ncurses6 (6.1+20190824) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 17 Aug 2019 09:26:39 -0400 ++ -- Thomas E. Dickey Sat, 24 Aug 2019 09:12:23 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.1-20190817+/package/debian/changelog 2019-08-17 13:26:39.000000000 +0000 ++++ ncurses-6.1-20190824/package/debian/changelog 2019-08-24 13:12:23.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190817) unstable; urgency=low ++ncurses6 (6.1+20190824) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 17 Aug 2019 09:26:39 -0400 ++ -- Thomas E. Dickey Sat, 24 Aug 2019 09:12:23 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.347 +--- ncurses-6.1-20190817+/package/mingw-ncurses.nsi 2019-08-17 13:26:39.000000000 +0000 ++++ ncurses-6.1-20190824/package/mingw-ncurses.nsi 2019-08-24 13:12:23.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.347 2019/08/17 13:26:39 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.348 2019/08/24 13:12: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 "0817" ++!define VERSION_MMDD "0824" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.1-20190817+/package/mingw-ncurses.spec 2019-08-17 13:26:39.000000000 +0000 ++++ ncurses-6.1-20190824/package/mingw-ncurses.spec 2019-08-24 13:12:23.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.1 +-Release: 20190817 ++Release: 20190824 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.1-20190817+/package/ncurses.spec 2019-08-17 13:26:39.000000000 +0000 ++++ ncurses-6.1-20190824/package/ncurses.spec 2019-08-24 13:12:23.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.1 +-Release: 20190817 ++Release: 20190824 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.1-20190817+/package/ncursest.spec 2019-08-17 13:26:39.000000000 +0000 ++++ ncurses-6.1-20190824/package/ncursest.spec 2019-08-24 13:12:23.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.1 +-Release: 20190817 ++Release: 20190824 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: test/demo_menus.c +Prereq: 1.68 +--- ncurses-6.1-20190817+/test/demo_menus.c 2019-08-17 21:45:32.000000000 +0000 ++++ ncurses-6.1-20190824/test/demo_menus.c 2019-08-24 21:41:50.000000000 +0000 +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: demo_menus.c,v 1.68 2019/08/17 21:45:32 tom Exp $ ++ * $Id: demo_menus.c,v 1.69 2019/08/24 21:41:50 tom Exp $ + * + * Demonstrate a variety of functions from the menu library. + * Thomas Dickey - 2005/4/9 +@@ -586,13 +586,14 @@ + update_trace_menu(MENU * m) + { + ITEM **items; +- ITEM *i, **p; ++ ITEM *i; + bool changed = FALSE; + + items = menu_items(m); + i = current_item(m); + if (i == items[0]) { + if (item_value(i)) { ++ ITEM **p; + for (p = items + 1; *p != 0; p++) + if (item_value(*p)) { + set_item_value(*p, FALSE); +Index: test/demo_panels.c +Prereq: 1.42 +--- ncurses-6.1-20190817+/test/demo_panels.c 2018-05-20 19:21:18.000000000 +0000 ++++ ncurses-6.1-20190824/test/demo_panels.c 2019-08-24 23:11:01.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2007-2017,2018 Free Software Foundation, Inc. * ++ * Copyright (c) 2007-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: demo_panels.c,v 1.42 2018/05/20 19:21:18 tom Exp $ ++ * $Id: demo_panels.c,v 1.43 2019/08/24 23:11:01 tom Exp $ + * + * Demonstrate a variety of functions from the panel library. + */ +@@ -250,7 +250,6 @@ + static void + my_create_panel(PANEL **pans, int which, FillPanel myFill) + { +- PANEL *pan = 0; + int code; + short pair = (short) which; + short fg = (short) ((pair == COLOR_BLUE) ? COLOR_WHITE : COLOR_BLACK); +@@ -281,7 +280,10 @@ + if (code > 0) { + int tly = MIN(y0, y1); + int tlx = MIN(x0, x1); +- pan = mkpanel(pair, ABS(y1 - y0) + 1, ABS(x1 - x0) + 1, tly, tlx); ++ PANEL *pan = mkpanel(pair, ++ ABS(y1 - y0) + 1, ++ ABS(x1 - x0) + 1, ++ tly, tlx); + /* finish */ + myFill(pan); + pans[which] = pan; +@@ -465,7 +467,7 @@ + } + + static void +-show_panels(PANEL *px[MAX_PANELS + 1]) ++show_help(WINDOW *win) + { + static const char *help[] = + { +@@ -481,7 +483,17 @@ + " s - show the panel", + " t - put the panel on the top of the stack" + }; ++ int j; ++ ++ for (j = 0; j < (int) SIZEOF(help); ++j) { ++ if (wprintw(win, "%s\n", help[j]) == ERR) ++ break; ++ } ++} + ++static void ++show_panels(PANEL *px[MAX_PANELS + 1]) ++{ + struct { + bool valid; + bool hidden; +@@ -490,7 +502,6 @@ + } table[MAX_PANELS + 1]; + + WINDOW *win; +- PANEL *pan; + int j; + + memset(table, 0, sizeof(table)); +@@ -504,6 +515,8 @@ + } + + if ((win = newwin(LINES - 1, COLS, 0, 0)) != 0) { ++ PANEL *pan; ++ + keypad(win, TRUE); + if ((pan = new_panel(win)) != 0) { + werase(win); +@@ -527,10 +540,7 @@ + waddch(win, '\n'); + } + } +- for (j = 0; j < (int) SIZEOF(help); ++j) { +- if (wprintw(win, "%s\n", help[j]) == ERR) +- break; +- } ++ show_help(win); + wgetch(win); + del_panel(pan); + pflush(); +@@ -626,7 +636,6 @@ + { + int length = 0; + int y0, x0; +- int c0, ch; + WINDOW *win; + + getyx(stdscr, y0, x0); +@@ -645,9 +654,9 @@ + } + (void) wgetch(win); + } else { +- c0 = 0; ++ int c0 = 0; + for (;;) { +- ch = wgetch(win); ++ int ch = wgetch(win); + if (ch == ERR || ch == QUIT || ch == ESCAPE) { + buffer[0] = '\0'; + break; +Index: test/demo_termcap.c +Prereq: 1.57 +--- ncurses-6.1-20190817+/test/demo_termcap.c 2019-01-21 22:50:46.000000000 +0000 ++++ ncurses-6.1-20190824/test/demo_termcap.c 2019-08-24 21:47:19.000000000 +0000 +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey + * +- * $Id: demo_termcap.c,v 1.57 2019/01/21 22:50:46 tom Exp $ ++ * $Id: demo_termcap.c,v 1.58 2019/08/24 21:47:19 tom Exp $ + * + * A simple demo of the termcap interface. + */ +@@ -159,7 +159,8 @@ + db_item++; + } + } +- printf("** %s\n", result); ++ if (result != 0) ++ printf("** %s\n", result); + return result; + } + +@@ -327,8 +328,6 @@ + static void + demo_termcap(NCURSES_CONST char *name) + { +- unsigned n; +- NCURSES_CONST char *cap; + char buffer[1024]; + + if (db_list) { +@@ -337,6 +336,8 @@ + if (!q_opt) + printf("Terminal type \"%s\"\n", name); + if (tgetent(buffer, name) >= 0) { ++ NCURSES_CONST char *cap; ++ unsigned n; + + if (b_opt) { + for (n = 0;; ++n) { +@@ -698,7 +699,6 @@ + size_t count; + size_t length = 1; + char **result = 0; +- char *blob = 0; + char *unused = 0; + + for (pass = 0; pass < 2; ++pass) { +@@ -713,7 +713,7 @@ + } + } + if (pass == 0) { +- blob = malloc(length); ++ char *blob = malloc(length); + result = typeCalloc(char *, count + 1); + unused = blob; + if (blob == 0 || result == 0) +Index: test/demo_terminfo.c +Prereq: 1.48 +--- ncurses-6.1-20190817+/test/demo_terminfo.c 2017-11-24 20:49:11.000000000 +0000 ++++ ncurses-6.1-20190824/test/demo_terminfo.c 2019-08-24 23:11:01.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2009-2016,2017 Free Software Foundation, Inc. * ++ * Copyright (c) 2009-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: demo_terminfo.c,v 1.48 2017/11/24 20:49:11 tom Exp $ ++ * $Id: demo_terminfo.c,v 1.49 2019/08/24 23:11:01 tom Exp $ + * + * A simple demo of the terminfo interface. + */ +@@ -150,7 +150,8 @@ + db_item++; + } + } +- printf("** %s\n", result); ++ if (result != 0) ++ printf("** %s\n", result); + return result; + } + +@@ -362,7 +363,6 @@ + } + #ifdef NCURSES_VERSION + if (x_opt && (my_blob == 0)) { +- int mod; + if (y_opt) { + #if NCURSES_XNAMES + TERMTYPE *term = (TERMTYPE *) cur_term; +@@ -389,6 +389,7 @@ + "kLFT", "kNXT", "kPRV", "kRIT", "kUP", + }; + for (n = 0; n < SIZEOF(xterm_keys); ++n) { ++ int mod; + for (mod = 0; mod < 8; ++mod) { + if (mod == 0) { + /* these happen to be standard - avoid duplicates */ +@@ -728,7 +729,6 @@ + size_t count; + size_t length = 1; + char **result = 0; +- char *blob = 0; + char *unused = 0; + + for (pass = 0; pass < 2; ++pass) { +@@ -743,7 +743,7 @@ + } + } + if (pass == 0) { +- blob = malloc(length); ++ char *blob = malloc(length); + result = typeCalloc(char *, count + 1); + unused = blob; + if (blob == 0 || result == 0) +Index: test/dots.c +Prereq: 1.34 +--- ncurses-6.1-20190817+/test/dots.c 2019-01-21 14:20:18.000000000 +0000 ++++ ncurses-6.1-20190824/test/dots.c 2019-08-24 21:49:50.000000000 +0000 +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey 1999 + * +- * $Id: dots.c,v 1.34 2019/01/21 14:20:18 tom Exp $ ++ * $Id: dots.c,v 1.35 2019/08/24 21:49:50 tom Exp $ + * + * A simple demo of the terminfo interface. + */ +@@ -136,7 +136,7 @@ + main(int argc, + char *argv[]) + { +- int x, y, z, p; ++ int ch; + double r; + double c; + int my_colors; +@@ -146,8 +146,8 @@ + size_t need; + char *my_env; + +- while ((x = getopt(argc, argv, "T:efm:s:")) != -1) { +- switch (x) { ++ while ((ch = getopt(argc, argv, "T:efm:s:")) != -1) { ++ switch (ch) { + case 'T': + need = 6 + strlen(optarg); + my_env = malloc(need); +@@ -195,13 +195,13 @@ + started = time((time_t *) 0); + + while (!interrupted) { +- x = (int) (c * ranf()) + m_option; +- y = (int) (r * ranf()) + m_option; +- p = (ranf() > 0.9) ? '*' : ' '; ++ int x = (int) (c * ranf()) + m_option; ++ int y = (int) (r * ranf()) + m_option; ++ int p = (ranf() > 0.9) ? '*' : ' '; + + tputs(tparm3(cursor_address, y, x), 1, outc); + if (my_colors > 0) { +- z = (int) (ranf() * my_colors); ++ int z = (int) (ranf() * my_colors); + if (ranf() > 0.01) { + tputs(tparm2(set_a_foreground, z), 1, outc); + } else { +Index: test/dots_curses.c +Prereq: 1.14 +--- ncurses-6.1-20190817+/test/dots_curses.c 2019-01-21 14:20:18.000000000 +0000 ++++ ncurses-6.1-20190824/test/dots_curses.c 2019-08-24 21:50:35.000000000 +0000 +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey + * +- * $Id: dots_curses.c,v 1.14 2019/01/21 14:20:18 tom Exp $ ++ * $Id: dots_curses.c,v 1.15 2019/08/24 21:50:35 tom Exp $ + * + * A simple demo of the curses interface used for comparison with termcap. + */ +@@ -113,7 +113,7 @@ + int + main(int argc, char *argv[]) + { +- int x, y, z, p; ++ int ch; + int fg, bg; + double r; + double c; +@@ -125,8 +125,8 @@ + size_t need; + char *my_env; + +- while ((x = getopt(argc, argv, "T:dem:s:")) != -1) { +- switch (x) { ++ while ((ch = getopt(argc, argv, "T:dem:s:")) != -1) { ++ switch (ch) { + case 'T': + need = 6 + strlen(optarg); + my_env = malloc(need); +@@ -185,13 +185,13 @@ + fg = COLOR_WHITE; + bg = COLOR_BLACK; + while (!interrupted) { +- x = (int) (c * ranf()) + m_option; +- y = (int) (r * ranf()) + m_option; +- p = (ranf() > 0.9) ? '*' : ' '; ++ int x = (int) (c * ranf()) + m_option; ++ int y = (int) (r * ranf()) + m_option; ++ int p = (ranf() > 0.9) ? '*' : ' '; + + move(y, x); + if (has_colors()) { +- z = (int) (ranf() * COLORS); ++ int z = (int) (ranf() * COLORS); + if (ranf() > 0.01) { + set_colors(fg = z, bg); + attron(COLOR_PAIR(mypair(fg, bg))); +Index: test/dots_mvcur.c +Prereq: 1.20 +--- ncurses-6.1-20190817+/test/dots_mvcur.c 2019-01-21 14:20:18.000000000 +0000 ++++ ncurses-6.1-20190824/test/dots_mvcur.c 2019-08-24 22:19:28.000000000 +0000 +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey - 2007 + * +- * $Id: dots_mvcur.c,v 1.20 2019/01/21 14:20:18 tom Exp $ ++ * $Id: dots_mvcur.c,v 1.21 2019/08/24 22:19:28 tom Exp $ + * + * A simple demo of the terminfo interface, and mvcur. + */ +@@ -138,7 +138,7 @@ + char *argv[]GCC_UNUSED) + { + int x0 = 1, y0 = 1; +- int x, y, z, p; ++ int ch; + double r; + double c; + SCREEN *sp; +@@ -149,8 +149,8 @@ + size_t need; + char *my_env; + +- while ((x = getopt(argc, argv, "T:efm:s:")) != -1) { +- switch (x) { ++ while ((ch = getopt(argc, argv, "T:efm:s:")) != -1) { ++ switch (ch) { + case 'T': + need = 6 + strlen(optarg); + my_env = malloc(need); +@@ -205,9 +205,9 @@ + started = time((time_t *) 0); + + while (!interrupted) { +- x = (int) (c * ranf()) + m_option; +- y = (int) (r * ranf()) + m_option; +- p = (ranf() > 0.9) ? '*' : ' '; ++ int x = (int) (c * ranf()) + m_option; ++ int y = (int) (r * ranf()) + m_option; ++ int p = (ranf() > 0.9) ? '*' : ' '; + + if (mvcur(y0, x0, y, x) != ERR) { + x0 = x; +@@ -215,7 +215,7 @@ + } + + if (my_colors > 0) { +- z = (int) (ranf() * my_colors); ++ int z = (int) (ranf() * my_colors); + if (ranf() > 0.01) { + tputs(tparm2(set_a_foreground, z), 1, outc); + } else { +Index: test/dots_termcap.c +Prereq: 1.18 +--- ncurses-6.1-20190817+/test/dots_termcap.c 2019-01-21 14:20:18.000000000 +0000 ++++ ncurses-6.1-20190824/test/dots_termcap.c 2019-08-24 22:25:55.000000000 +0000 +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey + * +- * $Id: dots_termcap.c,v 1.18 2019/01/21 14:20:18 tom Exp $ ++ * $Id: dots_termcap.c,v 1.19 2019/08/24 22:25:55 tom Exp $ + * + * A simple demo of the termcap interface. + */ +@@ -201,7 +201,7 @@ + int + main(int argc, char *argv[]) + { +- int x, y, z, p; ++ int ch; + int num_colors; + int num_lines; + int num_columns; +@@ -216,8 +216,8 @@ + size_t need; + char *my_env; + +- while ((x = getopt(argc, argv, "T:em:s:")) != -1) { +- switch (x) { ++ while ((ch = getopt(argc, argv, "T:em:s:")) != -1) { ++ switch (ch) { + case 'T': + need = 6 + strlen(optarg); + my_env = malloc(need); +@@ -246,8 +246,8 @@ + + srand((unsigned) time(0)); + +- InitAndCatch(z = tgetent(buffer, name), onsig); +- if (z < 0) { ++ InitAndCatch(ch = tgetent(buffer, name), onsig); ++ if (ch < 0) { + fprintf(stderr, "terminal description not found\n"); + ExitProgram(EXIT_FAILURE); + } else { +@@ -278,13 +278,13 @@ + started = time((time_t *) 0); + + while (!interrupted) { +- x = (int) (c * ranf()) + m_option; +- y = (int) (r * ranf()) + m_option; +- p = (ranf() > 0.9) ? '*' : ' '; ++ int x = (int) (c * ranf()) + m_option; ++ int y = (int) (r * ranf()) + m_option; ++ int p = (ranf() > 0.9) ? '*' : ' '; + + tputs(tgoto(t_cm, x, y), 1, outc); + if (num_colors > 0) { +- z = (int) (ranf() * num_colors); ++ int z = (int) (ranf() * num_colors); + if (ranf() > 0.01) { + tputs(tgoto(t_AF, 0, z), 1, outc); + } else { +Index: test/dots_xcurses.c +Prereq: 1.17 +--- ncurses-6.1-20190817+/test/dots_xcurses.c 2019-01-21 14:20:18.000000000 +0000 ++++ ncurses-6.1-20190824/test/dots_xcurses.c 2019-08-24 22:31:43.000000000 +0000 +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey + * +- * $Id: dots_xcurses.c,v 1.17 2019/01/21 14:20:18 tom Exp $ ++ * $Id: dots_xcurses.c,v 1.18 2019/08/24 22:31:43 tom Exp $ + * + * A simple demo of the wide-curses interface used for comparison with termcap. + */ +@@ -139,10 +139,8 @@ + int + main(int argc, char *argv[]) + { +- int x, y, z, p; + int fg, bg, ch; + wchar_t wch[2]; +- int pair; + double r; + double c; + #if HAVE_USE_DEFAULT_COLORS +@@ -205,6 +203,7 @@ + { + for (fg = 0; fg < COLORS; fg++) { + for (bg = 0; bg < COLORS; bg++) { ++ int pair; + if (interrupted) { + cleanup(); + ExitProgram(EXIT_FAILURE); +@@ -224,16 +223,15 @@ + + fg = COLOR_WHITE; + bg = COLOR_BLACK; +- pair = 0; + wch[1] = 0; + while (!interrupted) { +- x = (int) (c * ranf()) + m_option; +- y = (int) (r * ranf()) + m_option; +- p = (ranf() > 0.9) ? '*' : ' '; ++ int x = (int) (c * ranf()) + m_option; ++ int y = (int) (r * ranf()) + m_option; ++ int p = (ranf() > 0.9) ? '*' : ' '; + + move(y, x); + if (has_colors()) { +- z = (int) (ranf() * COLORS); ++ int z = (int) (ranf() * COLORS); + if (ranf() > 0.01) { + set_colors(fg = z, bg); + } else { +Index: test/echochar.c +Prereq: 1.18 +--- ncurses-6.1-20190817+/test/echochar.c 2017-10-18 23:04:52.000000000 +0000 ++++ ncurses-6.1-20190824/test/echochar.c 2019-08-24 23:11:01.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2006-2014,2017 Free Software Foundation, Inc. * ++ * Copyright (c) 2006-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: echochar.c,v 1.18 2017/10/18 23:04:52 tom Exp $ ++ * $Id: echochar.c,v 1.19 2019/08/24 23:11:01 tom Exp $ + * + * Demonstrate the echochar function (compare to dots.c). + * Thomas Dickey - 2006/11/4 +@@ -81,7 +81,7 @@ + main(int argc GCC_UNUSED, + char *argv[]GCC_UNUSED) + { +- int ch, x, y, z, p; ++ int ch; + double r; + double c; + bool use_colors; +@@ -121,13 +121,13 @@ + started = time((time_t *) 0); + + while (!interrupted) { +- x = (int) (c * ranf()) + 2; +- y = (int) (r * ranf()) + 2; +- p = (ranf() > 0.9) ? '*' : ' '; ++ int x = (int) (c * ranf()) + 2; ++ int y = (int) (r * ranf()) + 2; ++ int p = (ranf() > 0.9) ? '*' : ' '; + + move(y, x); + if (use_colors > 0) { +- z = (int) (ranf() * COLORS); ++ int z = (int) (ranf() * COLORS); + if (ranf() > 0.01) { + set_color(my_pairs, z, last_bg); + last_fg = z; +Index: test/extended_color.c +Prereq: 1.13 +--- ncurses-6.1-20190817+/test/extended_color.c 2019-01-21 14:59:34.000000000 +0000 ++++ ncurses-6.1-20190824/test/extended_color.c 2019-08-24 23:09:18.000000000 +0000 +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: extended_color.c,v 1.13 2019/01/21 14:59:34 tom Exp $ ++ * $Id: extended_color.c,v 1.14 2019/08/24 23:09:18 tom Exp $ + */ + + #include +@@ -209,8 +209,8 @@ + + printw("Drawing soft-key tabs with pair 2\n"); + slk_attrset(A_BOLD); /* reverse-video is hard to see */ +- i = if_opt_s(extended_slk_color_sp(sp, 2), +- extended_slk_color(2)); ++ (void) if_opt_s(extended_slk_color_sp(sp, 2), ++ extended_slk_color(2)); + for (i = 1; i <= 8; ++i) { + char temp[80]; + _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "(SLK-%d)", i); +Index: test/filter.c +Prereq: 1.32 +--- ncurses-6.1-20190817+/test/filter.c 2017-09-28 23:40:39.000000000 +0000 ++++ ncurses-6.1-20190824/test/filter.c 2019-08-24 23:11: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: Thomas E. Dickey 1998 + * +- * $Id: filter.c,v 1.32 2017/09/28 23:40:39 tom Exp $ ++ * $Id: filter.c,v 1.33 2019/08/24 23:11:01 tom Exp $ + * + * An example of the 'filter()' function in ncurses, this program prompts + * for commands and executes them (like a command shell). It illustrates +@@ -100,7 +100,6 @@ + new_command(char *buffer, int length, int underline, bool clocked, bool polled) + { + int code = OK; +- int limit; + + if (polled) { + bool done = FALSE; +@@ -113,6 +112,7 @@ + + timeout(20); /* no one types 50CPS... */ + while (!done) { ++ int limit; + int ch = getch(); + + buffer[used] = '\0'; +Index: test/foldkeys.c +Prereq: 1.7 +--- ncurses-6.1-20190817+/test/foldkeys.c 2018-12-29 17:53:03.000000000 +0000 ++++ ncurses-6.1-20190824/test/foldkeys.c 2019-08-24 23:11:01.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * 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 * +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey, 2006 + * +- * $Id: foldkeys.c,v 1.7 2018/12/29 17:53:03 tom Exp $ ++ * $Id: foldkeys.c,v 1.8 2019/08/24 23:11:01 tom Exp $ + * + * Demonstrate a method for altering key definitions at runtime. + * +@@ -53,10 +53,10 @@ + log_last_line(WINDOW *win) + { + FILE *fp; +- int y, x, n; +- char temp[256]; + + if ((fp = fopen(MY_LOGFILE, "a")) != 0) { ++ char temp[256]; ++ int y, x, n; + int need = sizeof(temp) - 1; + if (need > COLS) + need = COLS; +@@ -195,8 +195,7 @@ + { + int ch; + #if HAVE_GETTIMEOFDAY +- int secs, msecs; +- struct timeval current, previous; ++ struct timeval previous; + #endif + + if (newterm(0, stdout, stdin) == 0) { +@@ -224,6 +223,9 @@ + const char *name = keyname(escaped ? (ch - MY_KEYS) : ch); + + #if HAVE_GETTIMEOFDAY ++ int secs, msecs; ++ struct timeval current; ++ + gettimeofday(¤t, 0); + secs = (int) (current.tv_sec - previous.tv_sec); + msecs = (int) ((current.tv_usec - previous.tv_usec) / 1000); +Index: test/gdc.c +Prereq: 1.51 +--- ncurses-6.1-20190817+/test/gdc.c 2017-09-30 18:10:05.000000000 +0000 ++++ ncurses-6.1-20190824/test/gdc.c 2019-08-24 23:11: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 * +@@ -33,7 +33,7 @@ + * modified 10-18-89 for curses (jrl) + * 10-18-89 added signal handling + * +- * $Id: gdc.c,v 1.51 2017/09/30 18:10:05 tom Exp $ ++ * $Id: gdc.c,v 1.52 2019/08/24 23:11:01 tom Exp $ + */ + + #include +@@ -86,7 +86,6 @@ + drawbox(bool scrolling) + { + chtype bottom[XLENGTH + 1]; +- int n; + + if (hascolor) + (void) attrset(AttrArg(COLOR_PAIR(PAIR_FRAMES), 0)); +@@ -97,6 +96,7 @@ + + MvAddCh(YBASE + YDEPTH, XBASE - 1, ACS_LLCORNER); + if ((mvinchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH)) != ERR) { ++ int n; + for (n = 0; n < XLENGTH; n++) { + if (!scrolling) + bottom[n] &= ~A_COLOR; +@@ -251,9 +251,9 @@ + if (optind < argc) { + count = atoi(argv[optind++]); + assert(count >= 0); ++ if (optind < argc) ++ usage(); + } +- if (optind < argc) +- usage(); + + InitAndCatch({ + if (redirected) { +Index: test/inch_wide.c +Prereq: 1.9 +--- ncurses-6.1-20190817+/test/inch_wide.c 2017-04-29 22:03:21.000000000 +0000 ++++ ncurses-6.1-20190824/test/inch_wide.c 2019-08-24 23:11:01.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2007-2010,2017 Free Software Foundation, Inc. * ++ * Copyright (c) 2007-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: inch_wide.c,v 1.9 2017/04/29 22:03:21 tom Exp $ ++ * $Id: inch_wide.c,v 1.10 2019/08/24 23:11:01 tom Exp $ + */ + /* + int in_wch(cchar_t *wcval); +@@ -78,7 +78,6 @@ + int j; + int txt_x = 0, txt_y = 0; + int base_y; +- int limit; + cchar_t ch; + cchar_t text[MAX_COLS]; + +@@ -122,6 +121,8 @@ + } + + while (!Quit(j = mvwgetch(txtwin, txt_y, txt_x))) { ++ int limit; ++ + switch (j) { + case KEY_DOWN: + case 'j': +Index: test/inchs.c +Prereq: 1.16 +--- ncurses-6.1-20190817+/test/inchs.c 2017-09-06 09:20:42.000000000 +0000 ++++ ncurses-6.1-20190824/test/inchs.c 2019-08-24 23:11:01.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2007-2012,2017 Free Software Foundation, Inc. * ++ * Copyright (c) 2007-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: inchs.c,v 1.16 2017/09/06 09:20:42 tom Exp $ ++ * $Id: inchs.c,v 1.17 2019/08/24 23:11:01 tom Exp $ + * + * Author: Thomas E Dickey + */ +@@ -87,7 +87,6 @@ + int ch, j; + int txt_x = 0, txt_y = 0; + int base_y; +- int limit; + chtype text[MAX_COLS]; + + if (argv[level] == 0) { +@@ -132,6 +131,8 @@ + } + + while (!Quit(j = mvwgetch(txtwin, txt_y, txt_x))) { ++ int limit; ++ + switch (j) { + case KEY_DOWN: + case 'j': +Index: test/insdelln.c +Prereq: 1.12 +--- ncurses-6.1-20190817+/test/insdelln.c 2017-09-07 08:24:24.000000000 +0000 ++++ ncurses-6.1-20190824/test/insdelln.c 2019-08-24 23:11:01.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2008-2014,2017 Free Software Foundation, Inc. * ++ * Copyright (c) 2008-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: insdelln.c,v 1.12 2017/09/07 08:24:24 tom Exp $ ++ * $Id: insdelln.c,v 1.13 2019/08/24 23:11:01 tom Exp $ + * + * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln + */ +@@ -70,10 +70,10 @@ + }; + /* *INDENT-ON* */ + +- static bool first = TRUE; + const char *result = 0; + + if (has_colors()) { ++ static bool first = TRUE; + if (first) { + unsigned n; + +Index: test/knight.c +Prereq: 1.45 +--- ncurses-6.1-20190817+/test/knight.c 2019-04-20 20:34:55.000000000 +0000 ++++ ncurses-6.1-20190824/test/knight.c 2019-08-24 22:40:52.000000000 +0000 +@@ -33,7 +33,7 @@ + * Eric S. Raymond July 22 1995. Mouse support + * added September 20th 1995. + * +- * $Id: knight.c,v 1.45 2019/04/20 20:34:55 tom Exp $ ++ * $Id: knight.c,v 1.46 2019/08/24 22:40:52 tom Exp $ + */ + + #include +@@ -328,21 +328,20 @@ + static bool + find_next_move(SQUARES squares, HISTORY * doneData, int doneSize, int *y, int *x) + { +- unsigned j, k; +- int found = -1; +- int first = -1; +- int next = -1; +- int oldy, oldx; +- int newy, newx; + bool result = FALSE; + + if (doneSize > 1) { +- oldy = doneData[doneSize - 1].y; +- oldx = doneData[doneSize - 1].x; ++ unsigned j; ++ int oldy = doneData[doneSize - 1].y; ++ int oldx = doneData[doneSize - 1].x; ++ int found = -1; ++ int first = -1; ++ int next = -1; ++ + for (j = 0; j < MAX_OFFSET * 2; j++) { +- k = j % MAX_OFFSET; +- newy = oldy + offsets[k].y; +- newx = oldx + offsets[k].x; ++ unsigned k = j % MAX_OFFSET; ++ int newy = oldy + offsets[k].y; ++ int newx = oldx + offsets[k].x; + if (isUnusedYX(squares, newy, newx)) { + if (first < 0) + first = (int) k; +@@ -502,12 +501,11 @@ + int result; + + if (total < maxmoves) { +- int try_x, try_y; + unsigned k; + + for (k = 0; k < MAX_OFFSET; k++) { +- try_x = x + offsets[k].x; +- try_y = y + offsets[k].y; ++ int try_x = x + offsets[k].x; ++ int try_y = y + offsets[k].y; + if (isUnusedYX(squares, try_y, try_x)) { + ++test_test; + squares[try_y][try_x] = total + 1; +Index: test/list_keys.c +Prereq: 1.24 +--- ncurses-6.1-20190817+/test/list_keys.c 2018-05-20 18:56:56.000000000 +0000 ++++ ncurses-6.1-20190824/test/list_keys.c 2019-08-24 23:11:01.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2016-2017,2018 Free Software Foundation, Inc. * ++ * Copyright (c) 2016-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: list_keys.c,v 1.24 2018/05/20 18:56:56 tom Exp $ ++ * $Id: list_keys.c,v 1.25 2019/08/24 23:11:01 tom Exp $ + * + * Author: Thomas E Dickey + * +@@ -88,7 +88,6 @@ + show_key(const char *name, bool show) + { + int width = 0; +- char buffer[10]; + NCURSES_CONST char *value = tigetstr((NCURSES_CONST char *) name); + + if (show && t_opt) +@@ -96,6 +95,7 @@ + + if (value != 0 && value != (char *) -1) { + while (*value != 0) { ++ char buffer[10]; + int ch = UChar(*value++); + switch (ch) { + case '\177': +@@ -197,8 +197,8 @@ + static void + draw_line(int width) + { +- int j; + if (!t_opt) { ++ int j; + for (j = 0; j < width; ++j) { + printf("-"); + } +@@ -285,8 +285,8 @@ + } + #if NCURSES_XNAMES + if (x_opt) { +- TERMTYPE *term; + for (k = 0; k < count; ++k) { ++ TERMTYPE *term; + set_curterm(terms[k]); + term = (TERMTYPE *) cur_term; + total += (size_t) (NUM_STRINGS(term) - STRCOUNT); +@@ -305,9 +305,11 @@ + } + #if NCURSES_XNAMES + if (x_opt) { +- TERMTYPE *term; + int m, n; ++ + for (k = 0; k < count; ++k) { ++ TERMTYPE *term; ++ + set_curterm(terms[k]); + term = (TERMTYPE *) cur_term; + for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) { +Index: test/ncurses.c +Prereq: 1.516 +--- ncurses-6.1-20190817+/test/ncurses.c 2019-08-10 19:38:41.000000000 +0000 ++++ ncurses-6.1-20190824/test/ncurses.c 2019-08-24 23:09:03.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.516 2019/08/10 19:38:41 tom Exp $ ++$Id: ncurses.c,v 1.517 2019/08/24 23:09:03 tom Exp $ + + ***************************************************************************/ + +@@ -226,7 +226,7 @@ + static void + wGetstring(WINDOW *win, char *buffer, int limit) + { +- int y0, x0, x, ch; ++ int y0, x0, x; + bool done = FALSE; + + echo(); +@@ -235,6 +235,7 @@ + + x = (int) strlen(buffer); + while (!done) { ++ int ch; + if (x > (int) strlen(buffer)) + x = (int) strlen(buffer); + wmove(win, y0, x0); +@@ -579,7 +580,6 @@ + static void + show_mouse(WINDOW *win) + { +- int y, x; + MEVENT event; + bool outside; + bool show_loc; +@@ -602,6 +602,7 @@ + show_loc = wmouse_trafo(win, &event.y, &event.x, FALSE); + + if (show_loc) { ++ int y, x; + getyx(win, y, x); + wmove(win, event.y, event.x); + waddch(win, '*'); +@@ -818,7 +819,6 @@ + { + char buf[BUFSIZ]; + int first_y, first_x; +- int c; + int incount = 0; + GetchFlags flags; + +@@ -832,6 +832,8 @@ + scrollok(win, TRUE); + + for (;;) { ++ int c; ++ + while ((c = wGetchar(win)) == ERR) { + incount++; + if (blocking_getch(flags, delay)) { +@@ -1076,7 +1078,6 @@ + wint_t c; + int incount = 0; + GetchFlags flags; +- int code; + char *temp; + + init_getch(win, flags, delay); +@@ -1089,6 +1090,8 @@ + scrollok(win, TRUE); + + for (;;) { ++ int code; ++ + while ((code = wGet_wchar(win, &c)) == ERR) { + incount++; + if (blocking_getch(flags, delay)) { +@@ -1385,9 +1388,10 @@ + { + char save = attr_test_string[0]; + int first = ((int) UChar(save)) + adjust; +- int j, k; + + if (first >= ATTRSTRING_1ST) { ++ int j, k; ++ + for (j = 0, k = first; j < MAX_ATTRSTRING; ++j, ++k) { + if (k > ATTRSTRING_END) + break; +@@ -1451,10 +1455,9 @@ + werase(win); + if (attr & A_ALTCHARSET) { + const char *s; +- chtype ch; + + for (s = attr_test_string; *s != '\0'; ++s) { +- ch = UChar(*s); ++ chtype ch = UChar(*s); + (void) waddch(win, ch | attr); + } + } else { +@@ -1662,12 +1665,13 @@ + NCURSES_COLOR_T bg = COLOR_BLACK; + NCURSES_COLOR_T tx = -1; + int ac = 0; +- unsigned j, k; + WINDOW *my_wins[SIZEOF(attrs_to_test)]; + ATTR_TBL my_list[SIZEOF(attrs_to_test)]; + unsigned my_size = init_attr_list(my_list, termattrs()); + + if (my_size > 1) { ++ unsigned j, k; ++ + for (j = 0; j < my_size; ++j) { + my_wins[j] = subwin(stdscr, + 1, LEN_ATTRSTRING, +@@ -1791,9 +1795,10 @@ + { + wchar_t save = wide_attr_test_string[0]; + int first = ((int) normal_wchar(save)) + adjust; +- int j, k; + + if (first >= ATTRSTRING_1ST) { ++ int j, k; ++ + for (j = 0, k = first; j < MAX_ATTRSTRING; ++j, ++k) { + if (k > ATTRSTRING_END) + break; +@@ -1843,10 +1848,11 @@ + attr_t attr; + cchar_t ch; + NCURSES_PAIRS_T pair; +- wchar_t wch[CCHARW_MAX]; + + memset(&ch, 0, sizeof(ch)); + if (getbkgrnd(&ch) != ERR) { ++ wchar_t wch[CCHARW_MAX]; ++ + if (getcchar(&ch, wch, &attr, &pair, 0) != ERR) { + result = attr; + } +@@ -2022,12 +2028,13 @@ + NCURSES_COLOR_T bg = COLOR_BLACK; + NCURSES_COLOR_T tx = -1; + int ac = 0; +- unsigned j, k; + W_ATTR_TBL my_list[SIZEOF(w_attrs_to_test)]; + WINDOW *my_wins[SIZEOF(w_attrs_to_test)]; + unsigned my_size = init_w_attr_list(my_list, term_attrs()); + + if (my_size > 1) { ++ unsigned j, k; ++ + for (j = 0; j < my_size; ++j) { + my_wins[j] = subwin(stdscr, + 1, LEN_ATTRSTRING, +@@ -2133,13 +2140,11 @@ + int width = 8; + + if (wide || zoom) { +- int have; +- + _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) + "%02d", color); + if (wide) + width = 4; +- if ((have = (int) strlen(temp)) >= width) { ++ if ((int) strlen(temp) >= width) { + int pwr2 = 0; + while ((1 << pwr2) < color) + ++pwr2; +@@ -2516,7 +2521,7 @@ + int base_row = 0; + int grid_top = top + 3; + int page_size = (LINES - grid_top); +- int pairs_max = (unsigned short) (-1); ++ int pairs_max; + int colors_max = COLORS; + int col_limit; + int row_limit; +@@ -2839,14 +2844,16 @@ + */ + if (xterm_colors) { + int n; +- int got; + char result[BUFSIZ]; + int check_n; + unsigned check_r, check_g, check_b; + + raw(); + noecho(); ++ + for (n = 0; n < MaxColors; ++n) { ++ int got; ++ + fprintf(stderr, "\033]4;%d;?\007", n); + got = (int) read(0, result, sizeof(result) - 1); + if (got < 0) +@@ -3500,14 +3507,15 @@ + char *temp = strdup(s); + size_t used = strlen(temp); + size_t want = SLKLEN; +- size_t test; + #ifndef state_unused + mbstate_t state; + #endif + + buf[0] = L'\0'; + while (want > 0 && used != 0) { ++ size_t test; + const char *base = s; ++ + reset_mbytes(state); + test = count_mbytes(base, 0, &state); + if (test == (size_t) -1) { +@@ -3923,15 +3931,14 @@ + static cchar_t * + merge_wide_attr(cchar_t *dst, const cchar_t *src, attr_t attr, NCURSES_PAIRS_T pair) + { +- int count; + + *dst = *src; + do { ++ int count; + TEST_CCHAR(src, count, { + attr |= (test_attrs & A_ALTCHARSET); + setcchar(dst, test_wch, attr, pair, NULL); +- } +- , { ++ }, { + ; + }); + } while (0); +@@ -4003,7 +4010,6 @@ + wchar_t codes[10]; + char tmp[80]; + int count = repeat; +- int y, x; + + _nc_SPRINTF(tmp, _nc_SLIMIT(sizeof(tmp)) + "%3ld (0x%lx)", (long) code, (long) code); +@@ -4014,6 +4020,8 @@ + setcchar(&temp, codes, attr, pair, 0); + + do { ++ int y, x; ++ + /* + * Give non-spacing characters something to combine with. If we + * don't, they'll bunch up in a heap on the space after the ":". +@@ -4653,13 +4661,15 @@ + }; + #undef DATA + size_t n; +- int x; + bool do_keypad = HaveKeypad(curp); + bool do_scroll = HaveScroll(curp); + char buf[BUFSIZ]; + + move(LINES - 4, 0); ++ + for (n = 0; n < SIZEOF(legend); n++) { ++ int x; ++ + switch (legend[n].code) { + default: + _nc_STRCPY(buf, legend[n].msg, sizeof(buf)); +@@ -5003,7 +5013,7 @@ + case CTRL('X'): /* resize window */ + if (current) { + pair *tmp, ul, lr; +- int i, mx, my; ++ int mx, my; + + move(0, 0); + clrtoeol(); +@@ -5032,11 +5042,13 @@ + wclrtobot(current->wind); + wmove(current->wind, lr.y, lr.x); + } +- if (mx > tmp->x - ul.x) ++ if (mx > tmp->x - ul.x) { ++ int i; + for (i = 0; i < my; i++) { + wmove(current->wind, i, tmp->x - ul.x + 1); + wclrtoeol(current->wind); + } ++ } + wnoutrefresh(current->wind); + + memcpy(&lr, tmp, sizeof(pair)); +@@ -5850,13 +5862,13 @@ + { + static int count; + static int last; +- int c; + + if ((pending_pan = (count > 0)) != FALSE) { + count--; + pending_pan = (count != 0); + } else { + for (;;) { ++ int c; + switch (c = wGetchar(win)) { + case '!': + ShellOut(FALSE); +@@ -6210,10 +6222,10 @@ + tracetrace(unsigned tlevel) + { + static char *buf; +- static size_t need = 12; + int n; + + if (buf == 0) { ++ static size_t need = 12; + for (n = 0; t_tbl[n].name != 0; n++) + need += strlen(t_tbl[n].name) + 2; + buf = typeMalloc(char, need); +@@ -6425,9 +6437,9 @@ + size_t have = (source ? strlen(source) : 0) + 1; + size_t need = 80 + have; + char *temp = malloc(need); +- size_t len; + + if (temp != 0) { ++ size_t len; + _nc_STRNCPY(temp, source ? source : "", have + 1); + len = (size_t) (char *) field_userptr(me); + if (c <= KEY_MAX) { +@@ -6530,7 +6542,6 @@ + + static int mode = REQ_INS_MODE; + int c = wGetchar(w); +- unsigned n; + FIELD *me = current_field(f); + bool current = TRUE; + +@@ -6542,6 +6553,7 @@ + } + c = mode; + } else { ++ unsigned n; + for (n = 0; n < SIZEOF(lookup); n++) { + if (lookup[n].code == c) { + c = lookup[n].result; +@@ -6676,12 +6688,11 @@ + static int + form_test(bool recur GCC_UNUSED) + { +- WINDOW *w; + FORM *form; + FIELD *f[12], *secure; + FIELDTYPE *fty_middle = new_fieldtype(mi_field_check, mi_char_check); + FIELDTYPE *fty_passwd = new_fieldtype(pw_field_check, pw_char_check); +- int finished = 0, c; ++ int c; + unsigned n = 0; + + #ifdef NCURSES_MOUSE_VERSION +@@ -6731,6 +6742,8 @@ + f[n] = (FIELD *) 0; + + if ((form = new_form(f)) != 0) { ++ WINDOW *w; ++ int finished = 0; + + display_form(form); + +@@ -7024,11 +7037,8 @@ + static int + overlap_help(int state, int flavors[OVERLAP_FLAVORS]) + { +- int row; +- int col; + int item; + int limit[OVERLAP_FLAVORS]; +- const char *ths, *tht; + char msg[80]; + + if (state < 0) +@@ -7037,10 +7047,10 @@ + assert(state >= 0 && state < OVERLAP_FLAVORS); + + for (item = 0; item < (2 * OVERLAP_FLAVORS); ++item) { +- row = item / 2; +- col = item % 2; +- ths = col ? "B" : "A"; +- tht = col ? "A" : "B"; ++ int row = item / 2; ++ int col = item % 2; ++ const char *ths = col ? "B" : "A"; ++ const char *tht = col ? "A" : "B"; + + switch ((otBASE) row) { + case otBASE_refresh: +Index: test/newdemo.c +Prereq: 1.45 +--- ncurses-6.1-20190817+/test/newdemo.c 2017-09-30 15:43:08.000000000 +0000 ++++ ncurses-6.1-20190824/test/newdemo.c 2019-08-24 23:02:49.000000000 +0000 +@@ -2,7 +2,7 @@ + * newdemo.c - A demo program using PDCurses. The program illustrate + * the use of colours for text output. + * +- * $Id: newdemo.c,v 1.45 2017/09/30 15:43:08 tom Exp $ ++ * $Id: newdemo.c,v 1.46 2019/08/24 23:02:49 tom Exp $ + */ + + #include +@@ -61,11 +61,12 @@ + WaitForUser(WINDOW *win) + { + time_t t; +- chtype key; + + nodelay(win, TRUE); + t = time((time_t *) 0); ++ + while (1) { ++ chtype key; + if ((int) (key = (chtype) wgetch(win)) != ERR) { + if (key == 'q' || key == 'Q') + return 1; +@@ -221,12 +222,10 @@ + main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) + { + WINDOW *win; +- int w, x, y, i, j, k; ++ int x, y, i, k; + char buffer[SIZEOF(messages) * 80]; +- const char *message; + int width, height; + chtype save[80]; +- chtype c; + + setlocale(LC_ALL, ""); + +@@ -244,6 +243,11 @@ + } + + while (1) { ++ int w; ++ int j; ++ chtype c; ++ const char *message; ++ + set_colors(win, 1, COLOR_WHITE, COLOR_BLUE); + werase(win); + +Index: test/pair_content.c +Prereq: 1.12 +--- ncurses-6.1-20190817+/test/pair_content.c 2019-01-21 01:05:22.000000000 +0000 ++++ ncurses-6.1-20190824/test/pair_content.c 2019-08-24 23:02:49.000000000 +0000 +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: pair_content.c,v 1.12 2019/01/21 01:05:22 tom Exp $ ++ * $Id: pair_content.c,v 1.13 2019/08/24 23:02:49 tom Exp $ + */ + + #define NEED_TIME_H +@@ -237,7 +237,6 @@ + main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) + { + int i; +- int repeat; + + while ((i = getopt(argc, argv, "f:il:npr:sx")) != -1) { + switch (i) { +@@ -291,6 +290,7 @@ + } + } + } else { ++ int repeat; + + for (repeat = 0; repeat < r_opt; ++repeat) { + run_test(); +Index: test/picsmap.c +Prereq: 1.129 +--- ncurses-6.1-20190817+/test/picsmap.c 2019-04-20 20:33:51.000000000 +0000 ++++ ncurses-6.1-20190824/test/picsmap.c 2019-08-24 23:07:34.000000000 +0000 +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: picsmap.c,v 1.129 2019/04/20 20:33:51 tom Exp $ ++ * $Id: picsmap.c,v 1.130 2019/08/24 23:07:34 tom Exp $ + * + * Author: Thomas E. Dickey + * +@@ -430,9 +430,7 @@ + if (is_file(filename, &sb)) { + size_t size = (size_t) sb.st_size; + char *blob = typeCalloc(char, size + 1); +- bool had_line = TRUE; + bool binary = FALSE; +- unsigned j; + unsigned k = 0; + + result = typeCalloc(char *, size + 1); +@@ -442,7 +440,11 @@ + FILE *fp = fopen(filename, "r"); + if (fp != 0) { + logmsg("opened %s", filename); ++ + if (fread(blob, sizeof(char), size, fp) == size) { ++ bool had_line = TRUE; ++ unsigned j; ++ + for (j = 0; (size_t) j < size; ++j) { + if (blob[j] == '\0' || + (UChar(blob[j]) < 32 && +@@ -683,9 +685,9 @@ + if ((power2 != COLORS) || ((shift % 3) != 0)) { + if (all_colors == 0) { + init_palette(getenv("TERM")); +- } +- if (all_colors == 0) { +- giveup("With %d colors, you need a palette-file", COLORS); ++ if (all_colors == 0) { ++ giveup("With %d colors, you need a palette-file", COLORS); ++ } + } + } + } +@@ -876,7 +878,6 @@ + arg1[cpp] = '\0'; + result = 1; + } else { +- char *t; + const char *s = skip_cs(source); + size_t have = strlen(source); + +@@ -884,6 +885,7 @@ + memcpy(arg1, s, (size_t) cpp); + s += cpp; + while (*s++ == '\t') { ++ char *t; + for (t = arg2; (*s != '\0') && strchr("\t\"", *s) == 0;) { + if (*s == ' ') { + s = skip_cs(s); +@@ -1333,9 +1335,9 @@ + /* subsequent lines begin "col,row: (r,g,b,a) #RGB" */ + int r, g, b, nocolor; + unsigned check; +- int which, c; + char *t; + char *s = t = strchr(buffer, '#'); ++ + if (s != 0) { + /* after the "#RGB", there are differences - just ignore */ + while (*s != '\0' && !isspace(UChar(*s))) +@@ -1347,6 +1349,8 @@ + &col, &row, + &r, &g, &b, &nocolor, + &check)) { ++ int which, c; ++ + if ((s - t) > 8) /* 6 hex digits vs 8 */ + check /= 256; + if (r > MaxRGB || +@@ -1474,7 +1478,6 @@ + { + int y, x; + int n; +- int my_pair, my_color; + + debugmsg("called show_picture"); + logmsg("...using %dx%d screen", LINES, COLS); +@@ -1487,8 +1490,8 @@ + if (has_colors()) { + logmsg("...using %d colors", pics->colors); + for (n = 0; n < pics->colors; ++n) { +- my_pair = (n + 1); +- my_color = map_color(fg_color(pics, n)); ++ int my_pair = (n + 1); ++ int my_color = map_color(fg_color(pics, n)); + #if USE_EXTENDED_COLORS + if (use_extended_pairs) { + init_extended_pair(my_pair, my_color, my_color); +@@ -1507,7 +1510,10 @@ + if (y >= LINES) + break; + move(y, 0); ++ + for (x = 0; x < pics->wide; ++x) { ++ int my_pair; ++ + if (x >= COLS) + break; + n = (y * pics->wide + x); +@@ -1557,11 +1563,9 @@ + static void + report_colors(PICS_HEAD * pics) + { +- int j, k; +- int high; +- int wide = 4; + int accum; + double level; ++ int j; + int shift; + int total; + char buffer[256]; +@@ -1575,6 +1579,8 @@ + */ + if (debugging && (pics->colors < 1000)) { + int digits = 0; ++ int high; ++ int wide = 4; + for (j = pics->colors; j != 0; j /= 10) { + ++digits; + if (j < 10) +@@ -1585,6 +1591,7 @@ + logmsg("These colors were used:"); + high = (pics->colors + wide - 1) / wide; + for (j = 0; j < high && j < pics->colors; ++j) { ++ int k; + char *s = buffer; + *s = '\0'; + for (k = 0; k < wide; ++k) { +Index: test/railroad.c +Prereq: 1.22 +--- ncurses-6.1-20190817+/test/railroad.c 2017-09-30 17:55:22.000000000 +0000 ++++ ncurses-6.1-20190824/test/railroad.c 2019-08-24 23:11:01.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2000-2013,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 * +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey - 2000 + * +- * $Id: railroad.c,v 1.22 2017/09/30 17:55:22 tom Exp $ ++ * $Id: railroad.c,v 1.23 2019/08/24 23:11:01 tom Exp $ + * + * A simple demo of the termcap interface. + */ +@@ -113,7 +113,7 @@ + ShowSign(char *string) + { + char *base = string; +- int ch, first, last; ++ int first, last; + + if (moveit != 0) { + tputs(tgoto(moveit, 0, height - 1), 1, outc); +@@ -121,7 +121,7 @@ + } + + while (*string != 0) { +- ch = *string; ++ int ch = *string; + if (ch != ' ') { + if (moveit != 0) { + for (first = length - 2; first >= (string - base); first--) { diff --git a/ncurses-6.1-20190831.patch b/ncurses-6.1-20190831.patch new file mode 100644 index 0000000..c1b1545 --- /dev/null +++ b/ncurses-6.1-20190831.patch @@ -0,0 +1,6115 @@ +# ncurses 6.1 - patch 20190831 - 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-20190831.patch.gz +# patch by Thomas E. Dickey +# created Sun Sep 1 00:58:56 UTC 2019 +# ------------------------------------------------------------------------------ +# Ada95/configure | 46 - +# Ada95/configure.in | 12 +# Ada95/gen/Makefile.in | 4 +# Ada95/src/Makefile.in | 9 +# Ada95/src/library-cfg.sh | 31 +# NEWS | 7 +# VERSION | 2 +# configure | 8 +# 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 | 2 +# package/ncurses.spec | 2 +# package/ncursest.spec | 2 +# test/configure | 1620 ++++++++++++++++++------------------- +# test/demo_panels.c | 4 +# test/ncurses.c | 2 +# 19 files changed, 904 insertions(+), 867 deletions(-) +# ------------------------------------------------------------------------------ +Index: Ada95/configure +--- ncurses-6.1-20190824+/Ada95/configure 2019-01-01 01:46:17.000000000 +0000 ++++ ncurses-6.1-20190831/Ada95/configure 2019-08-31 21:40:31.000000000 +0000 +@@ -1,7 +1,7 @@ + #! /bin/sh +-# From configure.in Revision: 1.68 . ++# From configure.in Revision: 1.71 . + # Guess values for system-dependent variables and create Makefiles. +-# Generated by Autoconf 2.52.20181006. ++# Generated by Autoconf 2.52.20190828. + # + # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 + # Free Software Foundation, Inc. +@@ -817,7 +817,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by $as_me, which was +-generated by GNU Autoconf 2.52.20181006. Invocation command line was ++generated by GNU Autoconf 2.52.20190828. Invocation command line was + + $ $0 $@ + +@@ -16304,6 +16304,10 @@ + esac + fi + ++USE_ARG_SUFFIX=${DFT_ARG_SUFFIX} ++ ++USE_LIB_SUFFIX=${DFT_ARG_SUFFIX} ++ + USE_CFG_SUFFIX=${DFT_ARG_SUFFIX} + + ### Construct the list of subdirectories for which we'll customize makefiles +@@ -16526,7 +16530,7 @@ + : ${CONFIG_STATUS=./config.status} + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:16529: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:16533: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL +@@ -16658,7 +16662,7 @@ + cat >>$CONFIG_STATUS <&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -16721,7 +16725,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:16724: error: unrecognized option: $1 ++ -*) { { echo "$as_me:16728: 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;} +@@ -16740,7 +16744,7 @@ + ## Running config.status. ## + ## ----------------------- ## + +-This file was extended by $as_me 2.52.20181006, executed with ++This file was extended by $as_me 2.52.20190828, executed with + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS +@@ -16792,7 +16796,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:16795: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:16799: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -17001,6 +17005,8 @@ + s,@DFT_ARG_SUFFIX@,$DFT_ARG_SUFFIX,;t t + s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t + s,@DFT_OBJ_SUBDIR@,$DFT_OBJ_SUBDIR,;t t ++s,@USE_ARG_SUFFIX@,$USE_ARG_SUFFIX,;t t ++s,@USE_LIB_SUFFIX@,$USE_LIB_SUFFIX,;t t + s,@USE_CFG_SUFFIX@,$USE_CFG_SUFFIX,;t t + s,@TEST_ARG2@,$TEST_ARG2,;t t + s,@TEST_LIBS2@,$TEST_LIBS2,;t t +@@ -17142,7 +17148,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:17145: creating $ac_file" >&5 ++ { echo "$as_me:17151: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -17160,7 +17166,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:17163: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:17169: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -17173,7 +17179,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:17176: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:17182: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -17189,7 +17195,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' $ac_item` + if test -z "$ac_used"; then +- { echo "$as_me:17192: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:17198: 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;} +@@ -17198,7 +17204,7 @@ + fi + ac_seen=`grep '${datarootdir}' $ac_item` + if test -n "$ac_seen"; then +- { echo "$as_me:17201: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:17207: 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;} +@@ -17235,7 +17241,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:17238: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:17244: 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;} +@@ -17246,7 +17252,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:17249: WARNING: Some variables may not be substituted: ++ { echo "$as_me:17255: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -17295,7 +17301,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:17298: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:17304: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -17306,7 +17312,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:17315: 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 +17325,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:17322: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:17328: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -17377,7 +17383,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:17380: $ac_file is unchanged" >&5 ++ { echo "$as_me:17386: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +Index: Ada95/configure.in +Prereq: 1.68 +--- ncurses-6.1-20190824+/Ada95/configure.in 2018-11-10 22:08:09.000000000 +0000 ++++ ncurses-6.1-20190831/Ada95/configure.in 2019-08-31 21:16:49.000000000 +0000 +@@ -1,5 +1,5 @@ + dnl*************************************************************************** +-dnl Copyright (c) 2010-2016,2018 Free Software Foundation, Inc. * ++dnl Copyright (c) 2010-2018,2019 Free Software Foundation, Inc. * + dnl * + dnl Permission is hereby granted, free of charge, to any person obtaining a * + dnl copy of this software and associated documentation files (the * +@@ -28,14 +28,14 @@ + dnl + dnl Author: Thomas E. Dickey + dnl +-dnl $Id: configure.in,v 1.68 2018/11/10 22:08:09 tom Exp $ ++dnl $Id: configure.in,v 1.71 2019/08/31 21:16:49 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.20030208) +-AC_REVISION($Revision: 1.68 $) ++AC_REVISION($Revision: 1.71 $) + AC_INIT(gen/gen.c) + AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) + +@@ -545,6 +545,12 @@ + esac + fi + ++USE_ARG_SUFFIX=${DFT_ARG_SUFFIX} ++AC_SUBST(USE_ARG_SUFFIX) ++ ++USE_LIB_SUFFIX=${DFT_ARG_SUFFIX} ++AC_SUBST(USE_LIB_SUFFIX) ++ + USE_CFG_SUFFIX=${DFT_ARG_SUFFIX} + AC_SUBST(USE_CFG_SUFFIX) + +Index: Ada95/gen/Makefile.in +Prereq: 1.88 +--- ncurses-6.1-20190824+/Ada95/gen/Makefile.in 2019-03-16 21:43:34.000000000 +0000 ++++ ncurses-6.1-20190831/Ada95/gen/Makefile.in 2019-08-31 15:44:14.000000000 +0000 +@@ -28,7 +28,7 @@ + # + # Author: Juergen Pfeifer, 1996 + # +-# $Id: Makefile.in,v 1.88 2019/03/16 21:43:34 tom Exp $ ++# $Id: Makefile.in,v 1.89 2019/08/31 15:44:14 tom Exp $ + # + .SUFFIXES: + +@@ -98,7 +98,7 @@ + WRAPPER = @NCURSES_SHLIB2@ + + PROG_GENERATE = ./generate$x +-GENERATE = $(PROG_GENERATE) '@DFT_ARG_SUFFIX@' ++GENERATE = $(PROG_GENERATE) '@USE_ARG_SUFFIX@' + DEL_ADAMODE = sed -e '/^\-\-\ \ \-\*\-\ ada\ \-\*\-.*/d' + + GNATHTML = `type -p gnathtml || type -p gnathtml.pl 2>/dev/null` +Index: Ada95/src/Makefile.in +Prereq: 1.83 +--- ncurses-6.1-20190824+/Ada95/src/Makefile.in 2018-11-10 21:53:33.000000000 +0000 ++++ ncurses-6.1-20190831/Ada95/src/Makefile.in 2019-08-31 15:32:01.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 "Software"), # +@@ -28,7 +28,7 @@ + # + # Author: Juergen Pfeifer, 1996 + # +-# $Id: Makefile.in,v 1.83 2018/11/10 21:53:33 tom Exp $ ++# $Id: Makefile.in,v 1.84 2019/08/31 15:32:01 tom Exp $ + # + .SUFFIXES: + +@@ -56,6 +56,7 @@ + + INSTALL = @INSTALL@ @INSTALL_OPT_O@ + INSTALL_LIB = @INSTALL@ @INSTALL_LIB@ ++USE_LIB_SUFFIX = @USE_LIB_SUFFIX@ + + AR = @AR@ + ARFLAGS = @ARFLAGS@ +@@ -272,7 +273,7 @@ + @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 "$(USE_LIB_SUFFIX)" $(srcdir)/library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT) + @USE_GNAT_PROJECTS@ @echo "Using GNAT Project:" + @USE_GNAT_PROJECTS@ @-$(SHELL) -c "diff -u $(srcdir)/library.gpr $(GNAT_PROJECT); exit 0" + @USE_GNAT_PROJECTS@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static +@@ -310,7 +311,7 @@ + @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 "$(USE_LIB_SUFFIX)" $(srcdir)/library.gpr $(CFLAGS_SHARED) >$(GNAT_PROJECT) + @MAKE_ADA_SHAREDLIB@ @echo "Making Ada shared-lib:" + @MAKE_ADA_SHAREDLIB@ @-$(SHELL) -c "diff -u $(srcdir)/library.gpr $(GNAT_PROJECT); exit 0" + @MAKE_ADA_SHAREDLIB@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=dynamic +Index: Ada95/src/library-cfg.sh +Prereq: 1.4 +--- ncurses-6.1-20190824+/Ada95/src/library-cfg.sh 2018-11-10 22:58:52.000000000 +0000 ++++ ncurses-6.1-20190831/Ada95/src/library-cfg.sh 2019-08-31 15:32:51.000000000 +0000 +@@ -1,6 +1,6 @@ + #!/bin/sh + ############################################################################## +-# Copyright (c) 2016,2018 Free Software Foundation, Inc. # ++# Copyright (c) 2016-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"), # +@@ -27,7 +27,7 @@ + # authorization. # + ############################################################################## + # +-# $Id: library-cfg.sh,v 1.4 2018/11/10 22:58:52 tom Exp $ ++# $Id: library-cfg.sh,v 1.5 2019/08/31 15:32:51 tom Exp $ + # + # Work around incompatible behavior introduced with gnat6, which causes + # gnatmake to attempt to compile all of the C objects which might be part of +@@ -35,6 +35,8 @@ + # by making a copy of the project file with that information filled in). + model=$1 + shift 1 ++suffix=$1 ++shift 1 + input=$1 + shift 1 + param= +@@ -55,9 +57,22 @@ + SHARE="-- " + test "x$model" = "xdynamic" && SHARE= + +-sed \ +- -e '/for Library_Options use /s,-- ,'"$SHARE"',' \ +- -e '/for Default_Switches ("C") use/s,-- ,,' \ +- -e '/for Default_Switches ("C") use/s% use .*'%" use($param);"% \ +- $input +-exit 0 ++SCRIPT=library-cfg.tmp ++cat >$SCRIPT <>$CONFIG_STATUS < Sat, 24 Aug 2019 09:12:23 -0400 ++ -- Thomas E. Dickey Sat, 31 Aug 2019 09:43:44 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.1-20190824+/package/debian-mingw64/changelog 2019-08-24 13:12:23.000000000 +0000 ++++ ncurses-6.1-20190831/package/debian-mingw64/changelog 2019-08-31 13:43:44.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190824) unstable; urgency=low ++ncurses6 (6.1+20190831) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 24 Aug 2019 09:12:23 -0400 ++ -- Thomas E. Dickey Sat, 31 Aug 2019 09:43:44 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.1-20190824+/package/debian/changelog 2019-08-24 13:12:23.000000000 +0000 ++++ ncurses-6.1-20190831/package/debian/changelog 2019-08-31 13:43:44.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190824) unstable; urgency=low ++ncurses6 (6.1+20190831) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 24 Aug 2019 09:12:23 -0400 ++ -- Thomas E. Dickey Sat, 31 Aug 2019 09:43:44 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.348 +--- ncurses-6.1-20190824+/package/mingw-ncurses.nsi 2019-08-24 13:12:23.000000000 +0000 ++++ ncurses-6.1-20190831/package/mingw-ncurses.nsi 2019-08-31 13:43:44.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.348 2019/08/24 13:12:23 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.349 2019/08/31 13:43: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 "0824" ++!define VERSION_MMDD "0831" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.1-20190824+/package/mingw-ncurses.spec 2019-08-24 13:12:23.000000000 +0000 ++++ ncurses-6.1-20190831/package/mingw-ncurses.spec 2019-08-31 13:43:44.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.1 +-Release: 20190824 ++Release: 20190831 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.1-20190824+/package/ncurses.spec 2019-08-24 13:12:23.000000000 +0000 ++++ ncurses-6.1-20190831/package/ncurses.spec 2019-08-31 13:43:44.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.1 +-Release: 20190824 ++Release: 20190831 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.1-20190824+/package/ncursest.spec 2019-08-24 13:12:23.000000000 +0000 ++++ ncurses-6.1-20190831/package/ncursest.spec 2019-08-31 13:43:44.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.1 +-Release: 20190824 ++Release: 20190831 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: test/configure +--- ncurses-6.1-20190824+/test/configure 2019-04-13 22:56:11.000000000 +0000 ++++ ncurses-6.1-20190831/test/configure 2019-08-31 16:35:56.000000000 +0000 +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by Autoconf 2.52.20181006. ++# Generated by Autoconf 2.52.20190828. + # + # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 + # Free Software Foundation, Inc. +@@ -765,7 +765,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by $as_me, which was +-generated by GNU Autoconf 2.52.20181006. Invocation command line was ++generated by GNU Autoconf 2.52.20190828. Invocation command line was + + $ $0 $@ + +@@ -11143,21 +11143,25 @@ + # Check X11 before X11Rn because it is often a symlink to the current release. + ac_x_header_dirs=' + /usr/X11/include ++/usr/X11R7/include + /usr/X11R6/include + /usr/X11R5/include + /usr/X11R4/include + + /usr/include/X11 ++/usr/include/X11R7 + /usr/include/X11R6 + /usr/include/X11R5 + /usr/include/X11R4 + + /usr/local/X11/include ++/usr/local/X11R7/include + /usr/local/X11R6/include + /usr/local/X11R5/include + /usr/local/X11R4/include + + /usr/local/include/X11 ++/usr/local/include/X11R7 + /usr/local/include/X11R6 + /usr/local/include/X11R5 + /usr/local/include/X11R4 +@@ -11180,17 +11184,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 11183 "configure" ++#line 11187 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:11187: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:11191: \"$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:11193: \$? = $ac_status" >&5 ++ echo "$as_me:11197: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -11223,7 +11227,7 @@ + ac_save_LIBS=$LIBS + LIBS="-lXt $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11226 "configure" ++#line 11230 "configure" + #include "confdefs.h" + #include + int +@@ -11235,16 +11239,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11238: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11242: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11241: \$? = $ac_status" >&5 ++ echo "$as_me:11245: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11244: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11248: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11247: \$? = $ac_status" >&5 ++ echo "$as_me:11251: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + LIBS=$ac_save_LIBS + # We can link X programs with no special library path. +@@ -11282,7 +11286,7 @@ + fi # $with_x != no + + if test "$have_x" != yes; then +- echo "$as_me:11285: result: $have_x" >&5 ++ echo "$as_me:11289: result: $have_x" >&5 + echo "${ECHO_T}$have_x" >&6 + no_x=yes + else +@@ -11292,7 +11296,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:11295: result: libraries $x_libraries, headers $x_includes" >&5 ++ echo "$as_me:11299: result: libraries $x_libraries, headers $x_includes" >&5 + echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + fi + +@@ -11316,11 +11320,11 @@ + # others require no space. Words are not sufficient . . . . + case `(uname -sr) 2>/dev/null` in + "SunOS 5"*) +- echo "$as_me:11319: checking whether -R must be followed by a space" >&5 ++ echo "$as_me:11323: 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 11323 "configure" ++#line 11327 "configure" + #include "confdefs.h" + + int +@@ -11332,16 +11336,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11335: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11339: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11338: \$? = $ac_status" >&5 ++ echo "$as_me:11342: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11341: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11345: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11344: \$? = $ac_status" >&5 ++ echo "$as_me:11348: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_R_nospace=yes + else +@@ -11351,13 +11355,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test $ac_R_nospace = yes; then +- echo "$as_me:11354: result: no" >&5 ++ echo "$as_me:11358: 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 11360 "configure" ++#line 11364 "configure" + #include "confdefs.h" + + int +@@ -11369,16 +11373,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11372: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11376: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11375: \$? = $ac_status" >&5 ++ echo "$as_me:11379: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11378: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11382: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11381: \$? = $ac_status" >&5 ++ echo "$as_me:11385: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_R_space=yes + else +@@ -11388,11 +11392,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test $ac_R_space = yes; then +- echo "$as_me:11391: result: yes" >&5 ++ echo "$as_me:11395: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + X_LIBS="$X_LIBS -R $x_libraries" + else +- echo "$as_me:11395: result: neither works" >&5 ++ echo "$as_me:11399: result: neither works" >&5 + echo "${ECHO_T}neither works" >&6 + fi + fi +@@ -11412,7 +11416,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 11415 "configure" ++#line 11419 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11431,22 +11435,22 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11434: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11438: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11437: \$? = $ac_status" >&5 ++ echo "$as_me:11441: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11440: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11444: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11443: \$? = $ac_status" >&5 ++ echo "$as_me:11447: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:11449: checking for dnet_ntoa in -ldnet" >&5 ++echo "$as_me:11453: 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 +@@ -11454,7 +11458,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11457 "configure" ++#line 11461 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11473,16 +11477,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11476: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11480: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11479: \$? = $ac_status" >&5 ++ echo "$as_me:11483: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11482: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11486: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11485: \$? = $ac_status" >&5 ++ echo "$as_me:11489: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dnet_dnet_ntoa=yes + else +@@ -11493,14 +11497,14 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11496: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 ++echo "$as_me:11500: 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:11503: checking for dnet_ntoa in -ldnet_stub" >&5 ++ echo "$as_me:11507: 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 +@@ -11508,7 +11512,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet_stub $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11511 "configure" ++#line 11515 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11527,16 +11531,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11530: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11534: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11533: \$? = $ac_status" >&5 ++ echo "$as_me:11537: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11536: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11540: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11539: \$? = $ac_status" >&5 ++ echo "$as_me:11543: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes + else +@@ -11547,7 +11551,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11550: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 ++echo "$as_me:11554: 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" +@@ -11566,13 +11570,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:11569: checking for gethostbyname" >&5 ++ echo "$as_me:11573: 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 11575 "configure" ++#line 11579 "configure" + #include "confdefs.h" + #define gethostbyname autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -11603,16 +11607,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11606: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11610: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11609: \$? = $ac_status" >&5 ++ echo "$as_me:11613: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11612: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11616: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11615: \$? = $ac_status" >&5 ++ echo "$as_me:11619: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gethostbyname=yes + else +@@ -11622,11 +11626,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11625: result: $ac_cv_func_gethostbyname" >&5 ++echo "$as_me:11629: 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:11629: checking for gethostbyname in -lnsl" >&5 ++ echo "$as_me:11633: 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 +@@ -11634,7 +11638,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnsl $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11637 "configure" ++#line 11641 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11653,16 +11657,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11656: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11660: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11659: \$? = $ac_status" >&5 ++ echo "$as_me:11663: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11662: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11666: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11665: \$? = $ac_status" >&5 ++ echo "$as_me:11669: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_gethostbyname=yes + else +@@ -11673,14 +11677,14 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11676: result: $ac_cv_lib_nsl_gethostbyname" >&5 ++echo "$as_me:11680: 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:11683: checking for gethostbyname in -lbsd" >&5 ++ echo "$as_me:11687: 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 +@@ -11688,7 +11692,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11691 "configure" ++#line 11695 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11707,16 +11711,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11710: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11714: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11713: \$? = $ac_status" >&5 ++ echo "$as_me:11717: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11716: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11720: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11719: \$? = $ac_status" >&5 ++ echo "$as_me:11723: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_gethostbyname=yes + else +@@ -11727,7 +11731,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11730: result: $ac_cv_lib_bsd_gethostbyname" >&5 ++echo "$as_me:11734: 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" +@@ -11743,13 +11747,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:11746: checking for connect" >&5 ++ echo "$as_me:11750: 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 11752 "configure" ++#line 11756 "configure" + #include "confdefs.h" + #define connect autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -11780,16 +11784,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11783: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11787: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11786: \$? = $ac_status" >&5 ++ echo "$as_me:11790: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11789: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11793: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11792: \$? = $ac_status" >&5 ++ echo "$as_me:11796: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_connect=yes + else +@@ -11799,11 +11803,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11802: result: $ac_cv_func_connect" >&5 ++echo "$as_me:11806: 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:11806: checking for connect in -lsocket" >&5 ++ echo "$as_me:11810: 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 +@@ -11811,7 +11815,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsocket $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11814 "configure" ++#line 11818 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11830,16 +11834,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11833: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11837: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11836: \$? = $ac_status" >&5 ++ echo "$as_me:11840: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11839: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11843: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11842: \$? = $ac_status" >&5 ++ echo "$as_me:11846: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_socket_connect=yes + else +@@ -11850,7 +11854,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11853: result: $ac_cv_lib_socket_connect" >&5 ++echo "$as_me:11857: 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" +@@ -11859,13 +11863,13 @@ + fi + + # Guillermo Gomez says -lposix is necessary on A/UX. +- echo "$as_me:11862: checking for remove" >&5 ++ echo "$as_me:11866: 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 11868 "configure" ++#line 11872 "configure" + #include "confdefs.h" + #define remove autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -11896,16 +11900,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11899: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11903: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11902: \$? = $ac_status" >&5 ++ echo "$as_me:11906: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11905: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11909: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11908: \$? = $ac_status" >&5 ++ echo "$as_me:11912: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_remove=yes + else +@@ -11915,11 +11919,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11918: result: $ac_cv_func_remove" >&5 ++echo "$as_me:11922: 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:11922: checking for remove in -lposix" >&5 ++ echo "$as_me:11926: 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 +@@ -11927,7 +11931,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lposix $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11930 "configure" ++#line 11934 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11946,16 +11950,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11949: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11953: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11952: \$? = $ac_status" >&5 ++ echo "$as_me:11956: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11955: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11959: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11958: \$? = $ac_status" >&5 ++ echo "$as_me:11962: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_posix_remove=yes + else +@@ -11966,7 +11970,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11969: result: $ac_cv_lib_posix_remove" >&5 ++echo "$as_me:11973: 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" +@@ -11975,13 +11979,13 @@ + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. +- echo "$as_me:11978: checking for shmat" >&5 ++ echo "$as_me:11982: 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 11984 "configure" ++#line 11988 "configure" + #include "confdefs.h" + #define shmat autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -12012,16 +12016,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12015: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12019: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12018: \$? = $ac_status" >&5 ++ echo "$as_me:12022: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12021: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12025: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12024: \$? = $ac_status" >&5 ++ echo "$as_me:12028: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_shmat=yes + else +@@ -12031,11 +12035,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:12034: result: $ac_cv_func_shmat" >&5 ++echo "$as_me:12038: 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:12038: checking for shmat in -lipc" >&5 ++ echo "$as_me:12042: 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 +@@ -12043,7 +12047,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lipc $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 12046 "configure" ++#line 12050 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -12062,16 +12066,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12065: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12069: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12068: \$? = $ac_status" >&5 ++ echo "$as_me:12072: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12071: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12075: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12074: \$? = $ac_status" >&5 ++ echo "$as_me:12078: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ipc_shmat=yes + else +@@ -12082,7 +12086,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:12085: result: $ac_cv_lib_ipc_shmat" >&5 ++echo "$as_me:12089: 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" +@@ -12100,7 +12104,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:12103: checking for IceConnectionNumber in -lICE" >&5 ++ echo "$as_me:12107: 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 +@@ -12108,7 +12112,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lICE $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 12111 "configure" ++#line 12115 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -12127,16 +12131,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12130: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12134: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12133: \$? = $ac_status" >&5 ++ echo "$as_me:12137: \$? = $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:12140: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12139: \$? = $ac_status" >&5 ++ echo "$as_me:12143: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ICE_IceConnectionNumber=yes + else +@@ -12147,7 +12151,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:12150: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 ++echo "$as_me:12154: 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" +@@ -12159,7 +12163,7 @@ + + cf_x_athena=${cf_x_athena:-Xaw} + +-echo "$as_me:12162: checking if you want to link with Xaw 3d library" >&5 ++echo "$as_me:12166: 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= + +@@ -12170,14 +12174,14 @@ + fi; + if test "$withval" = yes ; then + cf_x_athena=Xaw3d +- echo "$as_me:12173: result: yes" >&5 ++ echo "$as_me:12177: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:12176: result: no" >&5 ++ echo "$as_me:12180: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:12180: checking if you want to link with Xaw 3d xft library" >&5 ++echo "$as_me:12184: 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= + +@@ -12188,14 +12192,14 @@ + fi; + if test "$withval" = yes ; then + cf_x_athena=Xaw3dxft +- echo "$as_me:12191: result: yes" >&5 ++ echo "$as_me:12195: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:12194: result: no" >&5 ++ echo "$as_me:12198: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:12198: checking if you want to link with neXT Athena library" >&5 ++echo "$as_me:12202: 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= + +@@ -12206,14 +12210,14 @@ + fi; + if test "$withval" = yes ; then + cf_x_athena=neXtaw +- echo "$as_me:12209: result: yes" >&5 ++ echo "$as_me:12213: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:12212: result: no" >&5 ++ echo "$as_me:12216: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:12216: checking if you want to link with Athena-Plus library" >&5 ++echo "$as_me:12220: 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= + +@@ -12224,10 +12228,10 @@ + fi; + if test "$withval" = yes ; then + cf_x_athena=XawPlus +- echo "$as_me:12227: result: yes" >&5 ++ echo "$as_me:12231: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:12230: result: no" >&5 ++ echo "$as_me:12234: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -12247,17 +12251,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}:12250: testing found package $cf_athena_pkg ..." 1>&5 ++echo "${as_me:-configure}:12254: 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}:12256: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:12260: 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}:12260: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:12264: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -12388,20 +12392,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}:12391: testing ..trimmed $LIBS ..." 1>&5 ++echo "${as_me:-configure}:12395: testing ..trimmed $LIBS ..." 1>&5 + + ;; + esac + done + +-echo "$as_me:12397: checking for usable $cf_x_athena/Xmu package" >&5 ++echo "$as_me:12401: 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 12404 "configure" ++#line 12408 "configure" + #include "confdefs.h" + + #include +@@ -12417,16 +12421,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12420: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12424: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12423: \$? = $ac_status" >&5 ++ echo "$as_me:12427: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12426: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12430: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12429: \$? = $ac_status" >&5 ++ echo "$as_me:12433: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xaw_compat=yes + else +@@ -12436,7 +12440,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:12439: result: $cf_cv_xaw_compat" >&5 ++echo "$as_me:12443: result: $cf_cv_xaw_compat" >&5 + echo "${ECHO_T}$cf_cv_xaw_compat" >&6 + + if test "$cf_cv_xaw_compat" = no +@@ -12448,7 +12452,7 @@ + (*) + test -n "$verbose" && echo " work around broken package" 1>&6 + +-echo "${as_me:-configure}:12451: testing work around broken package ..." 1>&5 ++echo "${as_me:-configure}:12455: testing work around broken package ..." 1>&5 + + cf_save_xmu="$LIBS" + cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'` +@@ -12456,17 +12460,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then + test -n "$verbose" && echo " found package xmu" 1>&6 + +-echo "${as_me:-configure}:12459: testing found package xmu ..." 1>&5 ++echo "${as_me:-configure}:12463: 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}:12465: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:12469: 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}:12469: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:12473: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -12586,12 +12590,12 @@ + + test -n "$verbose" && echo " ...before $LIBS" 1>&6 + +-echo "${as_me:-configure}:12589: testing ...before $LIBS ..." 1>&5 ++echo "${as_me:-configure}:12593: 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}:12594: testing ...after $LIBS ..." 1>&5 ++echo "${as_me:-configure}:12598: testing ...after $LIBS ..." 1>&5 + + else + cf_pkgconfig_incs= +@@ -12599,12 +12603,12 @@ + + test -n "$verbose" && echo " ...before $LIBS" 1>&6 + +-echo "${as_me:-configure}:12602: testing ...before $LIBS ..." 1>&5 ++echo "${as_me:-configure}:12606: 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}:12607: testing ...after $LIBS ..." 1>&5 ++echo "${as_me:-configure}:12611: testing ...after $LIBS ..." 1>&5 + + fi + +@@ -12615,7 +12619,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}:12618: testing ..trimmed $LIBS ..." 1>&5 ++echo "${as_me:-configure}:12622: testing ..trimmed $LIBS ..." 1>&5 + + ;; + esac +@@ -12640,17 +12644,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then + test -n "$verbose" && echo " found package Xext" 1>&6 + +-echo "${as_me:-configure}:12643: testing found package Xext ..." 1>&5 ++echo "${as_me:-configure}:12647: 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}:12649: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:12653: 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}:12653: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:12657: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -12771,7 +12775,7 @@ + cf_pkgconfig_incs= + cf_pkgconfig_libs= + +- echo "$as_me:12774: checking for XextCreateExtension in -lXext" >&5 ++ echo "$as_me:12778: 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 +@@ -12779,7 +12783,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXext $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 12782 "configure" ++#line 12786 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -12798,16 +12802,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12801: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12805: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12804: \$? = $ac_status" >&5 ++ echo "$as_me:12808: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12807: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12811: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12810: \$? = $ac_status" >&5 ++ echo "$as_me:12814: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xext_XextCreateExtension=yes + else +@@ -12818,7 +12822,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:12821: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 ++echo "$as_me:12825: 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 + +@@ -12854,17 +12858,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then + test -n "$verbose" && echo " found package x11" 1>&6 + +-echo "${as_me:-configure}:12857: testing found package x11 ..." 1>&5 ++echo "${as_me:-configure}:12861: 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}:12863: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:12867: 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}:12867: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:12871: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -12984,24 +12988,24 @@ + else + cf_pkgconfig_incs= + cf_pkgconfig_libs= +- { echo "$as_me:12987: WARNING: unable to find X11 library" >&5 ++ { echo "$as_me:12991: 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}:12994: testing found package ice ..." 1>&5 ++echo "${as_me:-configure}:12998: 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}:13000: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:13004: 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}:13004: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:13008: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -13121,24 +13125,24 @@ + else + cf_pkgconfig_incs= + cf_pkgconfig_libs= +- { echo "$as_me:13124: WARNING: unable to find ICE library" >&5 ++ { echo "$as_me:13128: 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}:13131: testing found package sm ..." 1>&5 ++echo "${as_me:-configure}:13135: 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}:13137: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:13141: 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}:13141: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:13145: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -13258,24 +13262,24 @@ + else + cf_pkgconfig_incs= + cf_pkgconfig_libs= +- { echo "$as_me:13261: WARNING: unable to find SM library" >&5 ++ { echo "$as_me:13265: 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}:13268: testing found package xt ..." 1>&5 ++echo "${as_me:-configure}:13272: 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}:13274: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:13278: 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}:13278: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:13282: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -13395,7 +13399,7 @@ + else + cf_pkgconfig_incs= + cf_pkgconfig_libs= +- { echo "$as_me:13398: WARNING: unable to find Xt library" >&5 ++ { echo "$as_me:13402: WARNING: unable to find Xt library" >&5 + echo "$as_me: WARNING: unable to find Xt library" >&2;} + fi + +@@ -13406,17 +13410,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then + test -n "$verbose" && echo " found package xt" 1>&6 + +-echo "${as_me:-configure}:13409: testing found package xt ..." 1>&5 ++echo "${as_me:-configure}:13413: 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}:13415: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:13419: 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}:13419: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:13423: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -13537,14 +13541,14 @@ + ;; + (*) + # we have an "xt" package, but it may omit Xt's dependency on X11 +-echo "$as_me:13540: checking for usable X dependency" >&5 ++echo "$as_me:13544: 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 13547 "configure" ++#line 13551 "configure" + #include "confdefs.h" + + #include +@@ -13563,16 +13567,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13566: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13570: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13569: \$? = $ac_status" >&5 ++ echo "$as_me:13573: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13572: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13576: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13575: \$? = $ac_status" >&5 ++ echo "$as_me:13579: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xt_x11_compat=yes + else +@@ -13582,30 +13586,30 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:13585: result: $cf_cv_xt_x11_compat" >&5 ++echo "$as_me:13589: 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}:13591: testing work around broken X11 dependency ..." 1>&5 ++echo "${as_me:-configure}:13595: 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}:13598: testing found package x11 ..." 1>&5 ++echo "${as_me:-configure}:13602: 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}:13604: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:13608: 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}:13608: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:13612: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -13728,12 +13732,12 @@ + + test -n "$verbose" && echo " ...before $LIBS" 1>&6 + +-echo "${as_me:-configure}:13731: testing ...before $LIBS ..." 1>&5 ++echo "${as_me:-configure}:13735: 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}:13736: testing ...after $LIBS ..." 1>&5 ++echo "${as_me:-configure}:13740: testing ...after $LIBS ..." 1>&5 + + fi + +@@ -13741,14 +13745,14 @@ + ;; + esac + +-echo "$as_me:13744: checking for usable X Toolkit package" >&5 ++echo "$as_me:13748: 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 13751 "configure" ++#line 13755 "configure" + #include "confdefs.h" + + #include +@@ -13763,16 +13767,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13766: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13770: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13769: \$? = $ac_status" >&5 ++ echo "$as_me:13773: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13772: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13776: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13775: \$? = $ac_status" >&5 ++ echo "$as_me:13779: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xt_ice_compat=yes + else +@@ -13782,7 +13786,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:13785: result: $cf_cv_xt_ice_compat" >&5 ++echo "$as_me:13789: result: $cf_cv_xt_ice_compat" >&5 + echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 + + if test "$cf_cv_xt_ice_compat" = no +@@ -13796,22 +13800,22 @@ + (*) + test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 + +-echo "${as_me:-configure}:13799: testing work around broken ICE dependency ..." 1>&5 ++echo "${as_me:-configure}:13803: 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}:13804: testing found package ice ..." 1>&5 ++echo "${as_me:-configure}:13808: 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}:13810: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:13814: 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}:13814: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:13818: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -13930,17 +13934,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then + test -n "$verbose" && echo " found package sm" 1>&6 + +-echo "${as_me:-configure}:13933: testing found package sm ..." 1>&5 ++echo "${as_me:-configure}:13937: 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}:13939: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:13943: 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}:13943: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:13947: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -14069,12 +14073,12 @@ + + test -n "$verbose" && echo " ...before $LIBS" 1>&6 + +-echo "${as_me:-configure}:14072: testing ...before $LIBS ..." 1>&5 ++echo "${as_me:-configure}:14076: 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}:14077: testing ...after $LIBS ..." 1>&5 ++echo "${as_me:-configure}:14081: testing ...after $LIBS ..." 1>&5 + + fi + +@@ -14094,7 +14098,7 @@ + + test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 + +-echo "${as_me:-configure}:14097: testing checking additions to CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:14101: testing checking additions to CFLAGS ..." 1>&5 + + cf_check_cflags="$CFLAGS" + cf_check_cppflags="$CPPFLAGS" +@@ -14179,7 +14183,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me:-configure}:14182: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me:-configure}:14186: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" +@@ -14189,7 +14193,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me:-configure}:14192: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me:-configure}:14196: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +@@ -14199,7 +14203,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}:14202: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me:-configure}:14206: 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" +@@ -14208,7 +14212,7 @@ + + if test "x$cf_check_cflags" != "x$CFLAGS" ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 14211 "configure" ++#line 14215 "configure" + #include "confdefs.h" + #include + int +@@ -14220,16 +14224,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14223: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14227: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14226: \$? = $ac_status" >&5 ++ echo "$as_me:14230: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14229: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14233: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14232: \$? = $ac_status" >&5 ++ echo "$as_me:14236: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -14237,12 +14241,12 @@ + cat conftest.$ac_ext >&5 + test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 + +-echo "${as_me:-configure}:14240: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:14244: 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}:14245: testing but keeping change to \$CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:14249: testing but keeping change to \$CPPFLAGS ..." 1>&5 + + fi + CFLAGS="$cf_check_flags" +@@ -14250,13 +14254,13 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + +- echo "$as_me:14253: checking for XOpenDisplay" >&5 ++ echo "$as_me:14257: 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 14259 "configure" ++#line 14263 "configure" + #include "confdefs.h" + #define XOpenDisplay autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -14287,16 +14291,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14290: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14294: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14293: \$? = $ac_status" >&5 ++ echo "$as_me:14297: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14296: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14300: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14299: \$? = $ac_status" >&5 ++ echo "$as_me:14303: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_XOpenDisplay=yes + else +@@ -14306,13 +14310,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:14309: result: $ac_cv_func_XOpenDisplay" >&5 ++echo "$as_me:14313: 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:14315: checking for XOpenDisplay in -lX11" >&5 ++ echo "$as_me:14319: 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 +@@ -14320,7 +14324,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 14323 "configure" ++#line 14327 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -14339,16 +14343,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14342: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14346: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14345: \$? = $ac_status" >&5 ++ echo "$as_me:14349: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14348: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14352: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14351: \$? = $ac_status" >&5 ++ echo "$as_me:14355: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_X11_XOpenDisplay=yes + else +@@ -14359,7 +14363,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:14362: result: $ac_cv_lib_X11_XOpenDisplay" >&5 ++echo "$as_me:14366: 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 + +@@ -14383,13 +14387,13 @@ + + fi + +- echo "$as_me:14386: checking for XtAppInitialize" >&5 ++ echo "$as_me:14390: 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 14392 "configure" ++#line 14396 "configure" + #include "confdefs.h" + #define XtAppInitialize autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -14420,16 +14424,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14423: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14427: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14426: \$? = $ac_status" >&5 ++ echo "$as_me:14430: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14429: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14433: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14432: \$? = $ac_status" >&5 ++ echo "$as_me:14436: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_XtAppInitialize=yes + else +@@ -14439,13 +14443,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:14442: result: $ac_cv_func_XtAppInitialize" >&5 ++echo "$as_me:14446: 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:14448: checking for XtAppInitialize in -lXt" >&5 ++ echo "$as_me:14452: 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 +@@ -14453,7 +14457,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 14456 "configure" ++#line 14460 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -14472,16 +14476,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14475: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14479: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14478: \$? = $ac_status" >&5 ++ echo "$as_me:14482: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14481: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14485: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14484: \$? = $ac_status" >&5 ++ echo "$as_me:14488: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xt_XtAppInitialize=yes + else +@@ -14492,7 +14496,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:14495: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 ++echo "$as_me:14499: 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 + +@@ -14509,7 +14513,7 @@ + fi + + if test $cf_have_X_LIBS = no ; then +- { echo "$as_me:14512: WARNING: Unable to successfully link X Toolkit library (-lXt) with ++ { echo "$as_me:14516: 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 +@@ -14535,14 +14539,14 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_path/include" + +- echo "$as_me:14538: checking for $cf_test in $cf_path" >&5 ++ echo "$as_me:14542: 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:14541: checking for $cf_test" >&5 ++ echo "$as_me:14545: checking for $cf_test" >&5 + echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 + fi + cat >conftest.$ac_ext <<_ACEOF +-#line 14545 "configure" ++#line 14549 "configure" + #include "confdefs.h" + + #include +@@ -14556,16 +14560,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14559: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14563: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14562: \$? = $ac_status" >&5 ++ echo "$as_me:14566: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14565: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14569: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14568: \$? = $ac_status" >&5 ++ echo "$as_me:14572: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -14574,7 +14578,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:14577: result: $cf_result" >&5 ++ echo "$as_me:14581: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = yes ; then + cf_x_athena_inc=$cf_path +@@ -14586,7 +14590,7 @@ + done + + if test -z "$cf_x_athena_inc" ; then +- { echo "$as_me:14589: WARNING: Unable to successfully find Athena header files with test program" >&5 ++ { echo "$as_me:14593: WARNING: Unable to successfully find Athena header files with test program" >&5 + echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;} + elif test "$cf_x_athena_inc" != default ; then + +@@ -14635,7 +14639,7 @@ + done + LIBS="$cf_add_libs" + +- echo "$as_me:14638: checking for $cf_libs in $cf_path" >&5 ++ echo "$as_me:14642: checking for $cf_libs in $cf_path" >&5 + echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6 + else + +@@ -14655,11 +14659,11 @@ + done + LIBS="$cf_add_libs" + +- echo "$as_me:14658: checking for $cf_test in $cf_libs" >&5 ++ echo "$as_me:14662: checking for $cf_test in $cf_libs" >&5 + echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6 + fi + cat >conftest.$ac_ext <<_ACEOF +-#line 14662 "configure" ++#line 14666 "configure" + #include "confdefs.h" + + #include +@@ -14675,16 +14679,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14678: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14682: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14681: \$? = $ac_status" >&5 ++ echo "$as_me:14685: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14684: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14688: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14687: \$? = $ac_status" >&5 ++ echo "$as_me:14691: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -14693,7 +14697,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:14696: result: $cf_result" >&5 ++ echo "$as_me:14700: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = yes ; then + cf_x_athena_lib="$cf_libs" +@@ -14707,7 +14711,7 @@ + done + + if test -z "$cf_x_athena_lib" ; then +- { { echo "$as_me:14710: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 ++ { { echo "$as_me:14714: 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 +@@ -14725,7 +14729,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:14728: checking for $ac_word" >&5 ++echo "$as_me:14732: 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 +@@ -14740,7 +14744,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:14743: found $ac_dir/$ac_word" >&5 ++echo "$as_me:14747: found $ac_dir/$ac_word" >&5 + break + done + +@@ -14748,10 +14752,10 @@ + fi + XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG + if test -n "$XCURSES_CONFIG"; then +- echo "$as_me:14751: result: $XCURSES_CONFIG" >&5 ++ echo "$as_me:14755: result: $XCURSES_CONFIG" >&5 + echo "${ECHO_T}$XCURSES_CONFIG" >&6 + else +- echo "$as_me:14754: result: no" >&5 ++ echo "$as_me:14758: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -14764,7 +14768,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:14767: checking for $ac_word" >&5 ++echo "$as_me:14771: 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 +@@ -14779,7 +14783,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:14782: found $ac_dir/$ac_word" >&5 ++echo "$as_me:14786: found $ac_dir/$ac_word" >&5 + break + done + +@@ -14787,10 +14791,10 @@ + fi + ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG + if test -n "$ac_ct_XCURSES_CONFIG"; then +- echo "$as_me:14790: result: $ac_ct_XCURSES_CONFIG" >&5 ++ echo "$as_me:14794: result: $ac_ct_XCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6 + else +- echo "$as_me:14793: result: no" >&5 ++ echo "$as_me:14797: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -14925,7 +14929,7 @@ + + test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 + +-echo "${as_me:-configure}:14928: testing checking additions to CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:14932: testing checking additions to CFLAGS ..." 1>&5 + + cf_check_cflags="$CFLAGS" + cf_check_cppflags="$CPPFLAGS" +@@ -15010,7 +15014,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me:-configure}:15013: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me:-configure}:15017: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" +@@ -15020,7 +15024,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me:-configure}:15023: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me:-configure}:15027: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +@@ -15030,7 +15034,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}:15033: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me:-configure}:15037: 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" +@@ -15039,7 +15043,7 @@ + + if test "x$cf_check_cflags" != "x$CFLAGS" ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 15042 "configure" ++#line 15046 "configure" + #include "confdefs.h" + #include + int +@@ -15051,16 +15055,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15054: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15058: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15057: \$? = $ac_status" >&5 ++ echo "$as_me:15061: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15060: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15064: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15063: \$? = $ac_status" >&5 ++ echo "$as_me:15067: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -15068,12 +15072,12 @@ + cat conftest.$ac_ext >&5 + test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15071: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15075: 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}:15076: testing but keeping change to \$CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15080: testing but keeping change to \$CPPFLAGS ..." 1>&5 + + fi + CFLAGS="$cf_check_flags" +@@ -15081,7 +15085,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + +-echo "$as_me:15084: checking for XOpenDisplay in -lX11" >&5 ++echo "$as_me:15088: 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 +@@ -15089,7 +15093,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 15092 "configure" ++#line 15096 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -15108,16 +15112,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15111: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15115: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15114: \$? = $ac_status" >&5 ++ echo "$as_me:15118: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15117: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15121: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15120: \$? = $ac_status" >&5 ++ echo "$as_me:15124: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_X11_XOpenDisplay=yes + else +@@ -15128,7 +15132,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:15131: result: $ac_cv_lib_X11_XOpenDisplay" >&5 ++echo "$as_me:15135: 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 + +@@ -15150,7 +15154,7 @@ + + fi + +-echo "$as_me:15153: checking for XCurses library" >&5 ++echo "$as_me:15157: 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 +@@ -15173,7 +15177,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 15176 "configure" ++#line 15180 "configure" + #include "confdefs.h" + + #include +@@ -15188,16 +15192,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15191: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15195: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15194: \$? = $ac_status" >&5 ++ echo "$as_me:15198: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15197: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15201: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15200: \$? = $ac_status" >&5 ++ echo "$as_me:15204: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_lib_XCurses=yes + else +@@ -15208,7 +15212,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:15211: result: $cf_cv_lib_XCurses" >&5 ++echo "$as_me:15215: result: $cf_cv_lib_XCurses" >&5 + echo "${ECHO_T}$cf_cv_lib_XCurses" >&6 + + fi +@@ -15223,23 +15227,23 @@ + #define XCURSES 1 + EOF + +- echo "$as_me:15226: checking for xcurses.h" >&5 ++ echo "$as_me:15230: 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 15232 "configure" ++#line 15236 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:15236: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:15240: \"$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:15242: \$? = $ac_status" >&5 ++ echo "$as_me:15246: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -15258,7 +15262,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:15261: result: $ac_cv_header_xcurses_h" >&5 ++echo "$as_me:15265: 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 + +@@ -15269,14 +15273,14 @@ + fi + + else +- { { echo "$as_me:15272: error: Cannot link with XCurses" >&5 ++ { { echo "$as_me:15276: error: Cannot link with XCurses" >&5 + echo "$as_me: error: Cannot link with XCurses" >&2;} + { (exit 1); exit 1; }; } + fi + + ;; + (*) +- { { echo "$as_me:15279: error: unexpected screen-value: $cf_cv_screen" >&5 ++ { { echo "$as_me:15283: error: unexpected screen-value: $cf_cv_screen" >&5 + echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -15284,7 +15288,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:15287: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5 ++echo "$as_me:15291: 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 +@@ -15292,7 +15296,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$cf_nculib_root $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 15295 "configure" ++#line 15299 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -15311,16 +15315,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15314: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15318: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15317: \$? = $ac_status" >&5 ++ echo "$as_me:15321: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15320: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15324: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15323: \$? = $ac_status" >&5 ++ echo "$as_me:15327: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -15331,7 +15335,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:15334: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "$as_me:15338: 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 +@@ -15366,7 +15370,7 @@ + ;; + esac + +-echo "$as_me:15369: checking for X11 rgb file" >&5 ++echo "$as_me:15373: 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. +@@ -15430,7 +15434,7 @@ + cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:15433: error: expected a pathname, not \"$cf_path\"" >&5 ++ { { echo "$as_me:15437: error: expected a pathname, not \"$cf_path\"" >&5 + echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -15438,7 +15442,7 @@ + + fi + +-echo "$as_me:15441: result: $RGB_PATH" >&5 ++echo "$as_me:15445: result: $RGB_PATH" >&5 + echo "${ECHO_T}$RGB_PATH" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:15486: 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. +@@ -15496,7 +15500,7 @@ + cf_enable_panel=$cf_default_panel + + fi; +-echo "$as_me:15499: result: $cf_enable_panel" >&5 ++echo "$as_me:15503: result: $cf_enable_panel" >&5 + echo "${ECHO_T}$cf_enable_panel" >&6 + if test $cf_enable_panel = yes + then +@@ -15507,13 +15511,13 @@ + if test "x${NCURSES_CONFIG_PKG}" = xnone; then + : + elif test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:15510: checking pkg-config for panel$cf_cv_libtype" >&5 ++ echo "$as_me:15514: 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:15513: result: yes" >&5 ++ echo "$as_me:15517: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:15516: checking if the panel$cf_cv_libtype package files work" >&5 ++ echo "$as_me:15520: 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" +@@ -15634,7 +15638,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 15637 "configure" ++#line 15641 "configure" + #include "confdefs.h" + #include + int +@@ -15646,37 +15650,37 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15649: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15653: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15652: \$? = $ac_status" >&5 ++ echo "$as_me:15656: \$? = $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:15659: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15658: \$? = $ac_status" >&5 ++ echo "$as_me:15662: \$? = $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 15664 "configure" ++#line 15668 "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:15671: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15675: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15674: \$? = $ac_status" >&5 ++ echo "$as_me:15678: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:15676: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15680: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15679: \$? = $ac_status" >&5 ++ echo "$as_me:15683: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_curses_lib=yes + else +@@ -15693,7 +15697,7 @@ + cf_have_curses_lib=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:15696: result: $cf_have_curses_lib" >&5 ++ echo "$as_me:15700: 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" +@@ -15713,7 +15717,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:15716: checking for new_panel in -lpanel$cf_cv_libtype" >&5 ++echo "$as_me:15720: 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 +@@ -15721,7 +15725,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpanel$cf_cv_libtype $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 15724 "configure" ++#line 15728 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -15740,16 +15744,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15743: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15747: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15746: \$? = $ac_status" >&5 ++ echo "$as_me:15750: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15749: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15753: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15752: \$? = $ac_status" >&5 ++ echo "$as_me:15756: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -15760,7 +15764,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:15763: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "$as_me:15767: 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 + +@@ -15793,7 +15797,7 @@ + cf_curses_headers="$cf_curses_headers panel.h" + fi + +-echo "$as_me:15796: checking if you want to check for menu functions" >&5 ++echo "$as_me:15800: 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. +@@ -15810,7 +15814,7 @@ + cf_enable_menu=$cf_default_menu + + fi; +-echo "$as_me:15813: result: $cf_enable_menu" >&5 ++echo "$as_me:15817: result: $cf_enable_menu" >&5 + echo "${ECHO_T}$cf_enable_menu" >&6 + if test $cf_enable_menu = yes + then +@@ -15819,14 +15823,14 @@ + ;; + (curses*) + +-echo "$as_me:15822: checking for NetBSD menu.h" >&5 ++echo "$as_me:15826: 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 15829 "configure" ++#line 15833 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -15844,16 +15848,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15847: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15851: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15850: \$? = $ac_status" >&5 ++ echo "$as_me:15854: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15853: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15857: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15856: \$? = $ac_status" >&5 ++ echo "$as_me:15860: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_netbsd_menu_h=yes + +@@ -15865,7 +15869,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:15868: result: $cf_cv_netbsd_menu_h" >&5 ++echo "$as_me:15872: result: $cf_cv_netbsd_menu_h" >&5 + echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6 + + test "$cf_cv_netbsd_menu_h" = yes && +@@ -15882,13 +15886,13 @@ + if test "x${NCURSES_CONFIG_PKG}" = xnone; then + : + elif test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:15885: checking pkg-config for menu$cf_cv_libtype" >&5 ++ echo "$as_me:15889: 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:15888: result: yes" >&5 ++ echo "$as_me:15892: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:15891: checking if the menu$cf_cv_libtype package files work" >&5 ++ echo "$as_me:15895: 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" +@@ -16009,7 +16013,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 16012 "configure" ++#line 16016 "configure" + #include "confdefs.h" + #include + int +@@ -16021,37 +16025,37 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16024: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16028: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16027: \$? = $ac_status" >&5 ++ echo "$as_me:16031: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16030: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16034: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16033: \$? = $ac_status" >&5 ++ echo "$as_me:16037: \$? = $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 16039 "configure" ++#line 16043 "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:16046: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16050: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16049: \$? = $ac_status" >&5 ++ echo "$as_me:16053: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:16051: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16055: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16054: \$? = $ac_status" >&5 ++ echo "$as_me:16058: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_curses_lib=yes + else +@@ -16068,7 +16072,7 @@ + cf_have_curses_lib=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:16071: result: $cf_have_curses_lib" >&5 ++ echo "$as_me:16075: 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" +@@ -16088,7 +16092,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:16091: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 ++echo "$as_me:16095: 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 +@@ -16096,7 +16100,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmenu$cf_cv_libtype $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 16099 "configure" ++#line 16103 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16115,16 +16119,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16118: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16122: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16121: \$? = $ac_status" >&5 ++ echo "$as_me:16125: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16124: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16128: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16127: \$? = $ac_status" >&5 ++ echo "$as_me:16131: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -16135,7 +16139,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16138: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "$as_me:16142: 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 + +@@ -16168,7 +16172,7 @@ + cf_curses_headers="$cf_curses_headers menu.h" + fi + +-echo "$as_me:16171: checking if you want to check for form functions" >&5 ++echo "$as_me:16175: 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. +@@ -16185,7 +16189,7 @@ + cf_enable_form=$cf_default_form + + fi; +-echo "$as_me:16188: result: $cf_enable_form" >&5 ++echo "$as_me:16192: result: $cf_enable_form" >&5 + echo "${ECHO_T}$cf_enable_form" >&6 + if test $cf_enable_form = yes + then +@@ -16194,14 +16198,14 @@ + ;; + (curses*) + +-echo "$as_me:16197: checking for NetBSD form.h" >&5 ++echo "$as_me:16201: 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 16204 "configure" ++#line 16208 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -16220,16 +16224,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:16223: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16227: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16226: \$? = $ac_status" >&5 ++ echo "$as_me:16230: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:16229: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16233: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16232: \$? = $ac_status" >&5 ++ echo "$as_me:16236: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_netbsd_form_h=yes + +@@ -16241,7 +16245,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:16244: result: $cf_cv_netbsd_form_h" >&5 ++echo "$as_me:16248: result: $cf_cv_netbsd_form_h" >&5 + echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6 + + test "$cf_cv_netbsd_form_h" = yes && +@@ -16258,13 +16262,13 @@ + if test "x${NCURSES_CONFIG_PKG}" = xnone; then + : + elif test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:16261: checking pkg-config for form$cf_cv_libtype" >&5 ++ echo "$as_me:16265: 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:16264: result: yes" >&5 ++ echo "$as_me:16268: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:16267: checking if the form$cf_cv_libtype package files work" >&5 ++ echo "$as_me:16271: 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" +@@ -16385,7 +16389,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 16388 "configure" ++#line 16392 "configure" + #include "confdefs.h" + #include + int +@@ -16397,37 +16401,37 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16400: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16404: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16403: \$? = $ac_status" >&5 ++ echo "$as_me:16407: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16406: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16410: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16409: \$? = $ac_status" >&5 ++ echo "$as_me:16413: \$? = $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 16415 "configure" ++#line 16419 "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:16422: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16426: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16425: \$? = $ac_status" >&5 ++ echo "$as_me:16429: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:16427: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16431: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16430: \$? = $ac_status" >&5 ++ echo "$as_me:16434: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_curses_lib=yes + else +@@ -16444,7 +16448,7 @@ + cf_have_curses_lib=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:16447: result: $cf_have_curses_lib" >&5 ++ echo "$as_me:16451: 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" +@@ -16464,7 +16468,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:16467: checking for form_driver in -lform$cf_cv_libtype" >&5 ++echo "$as_me:16471: 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 +@@ -16472,7 +16476,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lform$cf_cv_libtype $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 16475 "configure" ++#line 16479 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16491,16 +16495,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16494: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16498: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16497: \$? = $ac_status" >&5 ++ echo "$as_me:16501: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16500: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16504: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16503: \$? = $ac_status" >&5 ++ echo "$as_me:16507: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -16511,7 +16515,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16514: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "$as_me:16518: 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 + +@@ -16549,23 +16553,23 @@ + for ac_header in $cf_curses_headers + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:16552: checking for $ac_header" >&5 ++echo "$as_me:16556: 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 16558 "configure" ++#line 16562 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:16562: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:16566: \"$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:16568: \$? = $ac_status" >&5 ++ echo "$as_me:16572: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16584,7 +16588,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:16587: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:16591: 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:16601: 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 16603 "configure" ++#line 16607 "configure" + #include "confdefs.h" + #include + #include +@@ -16608,13 +16612,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:16611: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:16615: \"$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:16617: \$? = $ac_status" >&5 ++ echo "$as_me:16621: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16636,7 +16640,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 16639 "configure" ++#line 16643 "configure" + #include "confdefs.h" + #include + +@@ -16654,7 +16658,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 16657 "configure" ++#line 16661 "configure" + #include "confdefs.h" + #include + +@@ -16675,7 +16679,7 @@ + : + else + cat >conftest.$ac_ext <<_ACEOF +-#line 16678 "configure" ++#line 16682 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -16701,15 +16705,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:16704: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16708: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16707: \$? = $ac_status" >&5 ++ echo "$as_me:16711: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:16709: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16713: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16712: \$? = $ac_status" >&5 ++ echo "$as_me:16716: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -16722,7 +16726,7 @@ + fi + fi + fi +-echo "$as_me:16725: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:16729: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -16732,13 +16736,13 @@ + + fi + +-echo "$as_me:16735: checking whether time.h and sys/time.h may both be included" >&5 ++echo "$as_me:16739: 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 16741 "configure" ++#line 16745 "configure" + #include "confdefs.h" + #include + #include +@@ -16754,16 +16758,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:16757: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16761: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16760: \$? = $ac_status" >&5 ++ echo "$as_me:16764: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:16763: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16767: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16766: \$? = $ac_status" >&5 ++ echo "$as_me:16770: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_time=yes + else +@@ -16773,7 +16777,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:16776: result: $ac_cv_header_time" >&5 ++echo "$as_me:16780: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -16797,23 +16801,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:16800: checking for $ac_header" >&5 ++echo "$as_me:16804: 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 16806 "configure" ++#line 16810 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:16810: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:16814: \"$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:16816: \$? = $ac_status" >&5 ++ echo "$as_me:16820: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16832,7 +16836,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:16835: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:16839: 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:16852: 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 16854 "configure" ++#line 16858 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:16858: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:16862: \"$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:16864: \$? = $ac_status" >&5 ++ echo "$as_me:16868: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16880,7 +16884,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:16883: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:16887: 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:16897: 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 +@@ -16900,7 +16904,7 @@ + for cf_header in stdio.h stdlib.h unistd.h getopt.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 16903 "configure" ++#line 16907 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -16913,16 +16917,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:16916: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16920: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16919: \$? = $ac_status" >&5 ++ echo "$as_me:16923: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:16922: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16926: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16925: \$? = $ac_status" >&5 ++ echo "$as_me:16929: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_getopt_header=$cf_header + break +@@ -16934,7 +16938,7 @@ + done + + fi +-echo "$as_me:16937: result: $cf_cv_getopt_header" >&5 ++echo "$as_me:16941: result: $cf_cv_getopt_header" >&5 + echo "${ECHO_T}$cf_cv_getopt_header" >&6 + if test $cf_cv_getopt_header != none ; then + +@@ -16959,13 +16963,13 @@ + + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:16962: checking for $ac_func" >&5 ++echo "$as_me:16966: 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 16968 "configure" ++#line 16972 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -16996,16 +17000,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16999: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17003: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17002: \$? = $ac_status" >&5 ++ echo "$as_me:17006: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17005: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17009: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17008: \$? = $ac_status" >&5 ++ echo "$as_me:17012: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -17015,7 +17019,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:17018: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:17022: 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:17033: 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 17036 "configure" ++#line 17040 "configure" + #include "confdefs.h" + + #include +@@ -17054,16 +17058,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17057: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17061: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17060: \$? = $ac_status" >&5 ++ echo "$as_me:17064: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17063: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17067: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17066: \$? = $ac_status" >&5 ++ echo "$as_me:17070: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_termcap_h=yes + else +@@ -17073,7 +17077,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:17076: result: $cf_cv_have_termcap_h" >&5 ++echo "$as_me:17080: 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 +@@ -17082,14 +17086,14 @@ + EOF + + else +-echo "$as_me:17085: checking if we can use ncurses/termcap.h" >&5 ++echo "$as_me:17089: 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 17092 "configure" ++#line 17096 "configure" + #include "confdefs.h" + + #include +@@ -17110,16 +17114,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17113: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17117: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17116: \$? = $ac_status" >&5 ++ echo "$as_me:17120: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17119: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17123: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17122: \$? = $ac_status" >&5 ++ echo "$as_me:17126: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_ncurses_termcap_h=yes + else +@@ -17129,7 +17133,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:17132: result: $cf_cv_have_ncurses_termcap_h" >&5 ++echo "$as_me:17136: 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 + #define HAVE_NCURSES_TERMCAP_H 1 +@@ -17138,7 +17142,7 @@ + fi + + if test "x$ac_cv_func_getopt" = xno; then +- { { echo "$as_me:17141: error: getopt is required for building programs" >&5 ++ { { echo "$as_me:17145: error: getopt is required for building programs" >&5 + echo "$as_me: error: getopt is required for building programs" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -17157,13 +17161,13 @@ + + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:17160: checking for $ac_func" >&5 ++echo "$as_me:17164: 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 17166 "configure" ++#line 17170 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -17194,16 +17198,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17197: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17201: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17200: \$? = $ac_status" >&5 ++ echo "$as_me:17204: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17203: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17207: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17206: \$? = $ac_status" >&5 ++ echo "$as_me:17210: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -17213,7 +17217,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:17216: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:17220: 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:17232: 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 +@@ -17233,7 +17237,7 @@ + + cf_cv_need_xopen_extension=unknown + cat >conftest.$ac_ext <<_ACEOF +-#line 17236 "configure" ++#line 17240 "configure" + #include "confdefs.h" + + #include +@@ -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 + cf_cv_need_xopen_extension=none + else +@@ -17278,7 +17282,7 @@ + for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR + do + cat >conftest.$ac_ext <<_ACEOF +-#line 17281 "configure" ++#line 17285 "configure" + #include "confdefs.h" + + #define $cf_try_xopen_extension 1 +@@ -17300,16 +17304,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17303: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17307: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17306: \$? = $ac_status" >&5 ++ echo "$as_me:17310: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17309: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17313: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17312: \$? = $ac_status" >&5 ++ echo "$as_me:17316: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_need_xopen_extension=$cf_try_xopen_extension; break + else +@@ -17323,7 +17327,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:17326: result: $cf_cv_need_xopen_extension" >&5 ++echo "$as_me:17330: result: $cf_cv_need_xopen_extension" >&5 + echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 + + case $cf_cv_need_xopen_extension in +@@ -17335,7 +17339,7 @@ + ;; + esac + +-echo "$as_me:17338: checking for term.h" >&5 ++echo "$as_me:17342: 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 +@@ -17356,7 +17360,7 @@ + for cf_header in $cf_header_list + do + cat >conftest.$ac_ext <<_ACEOF +-#line 17359 "configure" ++#line 17363 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -17370,16 +17374,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17373: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17377: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17376: \$? = $ac_status" >&5 ++ echo "$as_me:17380: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17379: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17383: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17382: \$? = $ac_status" >&5 ++ echo "$as_me:17386: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_term_header=$cf_header + break +@@ -17398,7 +17402,7 @@ + for cf_header in ncurses/term.h ncursesw/term.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 17401 "configure" ++#line 17405 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -17416,16 +17420,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17419: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17423: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17422: \$? = $ac_status" >&5 ++ echo "$as_me:17426: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17425: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17429: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17428: \$? = $ac_status" >&5 ++ echo "$as_me:17432: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_term_header=$cf_header + break +@@ -17440,7 +17444,7 @@ + esac + + fi +-echo "$as_me:17443: result: $cf_cv_term_header" >&5 ++echo "$as_me:17447: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + case $cf_cv_term_header in +@@ -17467,7 +17471,7 @@ + ;; + esac + +-echo "$as_me:17470: checking for unctrl.h" >&5 ++echo "$as_me:17474: 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 +@@ -17488,7 +17492,7 @@ + for cf_header in $cf_header_list + do + cat >conftest.$ac_ext <<_ACEOF +-#line 17491 "configure" ++#line 17495 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -17502,16 +17506,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17505: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17509: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17508: \$? = $ac_status" >&5 ++ echo "$as_me:17512: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17511: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17515: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17514: \$? = $ac_status" >&5 ++ echo "$as_me:17518: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_unctrl_header=$cf_header + break +@@ -17524,12 +17528,12 @@ + done + + fi +-echo "$as_me:17527: result: $cf_cv_unctrl_header" >&5 ++echo "$as_me:17531: result: $cf_cv_unctrl_header" >&5 + echo "${ECHO_T}$cf_cv_unctrl_header" >&6 + + case $cf_cv_unctrl_header in + (no) +- { echo "$as_me:17532: WARNING: unctrl.h header not found" >&5 ++ { echo "$as_me:17536: WARNING: unctrl.h header not found" >&5 + echo "$as_me: WARNING: unctrl.h header not found" >&2;} + ;; + esac +@@ -17618,10 +17622,10 @@ + + cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +- echo "$as_me:17621: checking for ${cf_func}" >&5 ++ echo "$as_me:17625: checking for ${cf_func}" >&5 + echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 + +-echo "${as_me:-configure}:17624: testing ${cf_func} ..." 1>&5 ++echo "${as_me:-configure}:17628: testing ${cf_func} ..." 1>&5 + + if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17630,7 +17634,7 @@ + eval cf_result='$ac_cv_func_'$cf_func + if test ".$cf_result" != ".no"; then + cat >conftest.$ac_ext <<_ACEOF +-#line 17633 "configure" ++#line 17637 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -17663,16 +17667,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17666: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17670: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17669: \$? = $ac_status" >&5 ++ echo "$as_me:17673: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17672: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17676: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17675: \$? = $ac_status" >&5 ++ echo "$as_me:17679: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -17688,7 +17692,7 @@ + + # use the computed/retrieved cache-value: + eval 'cf_result=$cf_cv_func_'$cf_func +- echo "$as_me:17691: result: $cf_result" >&5 ++ echo "$as_me:17695: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result != no; then + cat >>confdefs.h <&5 ++ echo "$as_me:17710: checking for ${cf_func}" >&5 + echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 + +-echo "${as_me:-configure}:17709: testing ${cf_func} ..." 1>&5 ++echo "${as_me:-configure}:17713: testing ${cf_func} ..." 1>&5 + + if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17715,7 +17719,7 @@ + eval cf_result='$ac_cv_func_'$cf_func + if test ".$cf_result" != ".no"; then + cat >conftest.$ac_ext <<_ACEOF +-#line 17718 "configure" ++#line 17722 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -17748,16 +17752,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17751: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17755: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17754: \$? = $ac_status" >&5 ++ echo "$as_me:17758: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17757: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17761: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17760: \$? = $ac_status" >&5 ++ echo "$as_me:17764: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -17773,7 +17777,7 @@ + + # use the computed/retrieved cache-value: + eval 'cf_result=$cf_cv_func_'$cf_func +- echo "$as_me:17776: result: $cf_result" >&5 ++ echo "$as_me:17780: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result != no; then + cat >>confdefs.h <conftest.$ac_ext <<_ACEOF +-#line 17800 "configure" ++#line 17804 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -17817,21 +17821,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17820: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17824: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17823: \$? = $ac_status" >&5 ++ echo "$as_me:17827: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17826: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17830: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17829: \$? = $ac_status" >&5 ++ echo "$as_me:17833: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6 + +-echo "${as_me:-configure}:17834: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 ++echo "${as_me:-configure}:17838: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 + + cat >>confdefs.h <&5 ++echo "$as_me:17858: 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 17861 "configure" ++#line 17865 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -17873,16 +17877,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17876: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17880: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17879: \$? = $ac_status" >&5 ++ echo "$as_me:17883: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17882: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17886: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17885: \$? = $ac_status" >&5 ++ echo "$as_me:17889: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_ext_funcs=defined + else +@@ -17890,7 +17894,7 @@ + cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 17893 "configure" ++#line 17897 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -17915,16 +17919,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17918: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17922: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17921: \$? = $ac_status" >&5 ++ echo "$as_me:17925: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17924: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17928: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17927: \$? = $ac_status" >&5 ++ echo "$as_me:17931: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_ext_funcs=yes + else +@@ -17938,7 +17942,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:17941: result: $cf_cv_ncurses_ext_funcs" >&5 ++echo "$as_me:17945: 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 +@@ -17952,11 +17956,11 @@ + if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno + then + cf_define_xpg5=no +- echo "$as_me:17955: checking if _XPG5 should be defined to enable wide-characters" >&5 ++ echo "$as_me:17959: 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 17959 "configure" ++#line 17963 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -17969,16 +17973,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17972: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17976: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17975: \$? = $ac_status" >&5 ++ echo "$as_me:17979: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17978: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17982: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17981: \$? = $ac_status" >&5 ++ echo "$as_me:17985: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -17987,7 +17991,7 @@ + cf_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_XPG5" + cat >conftest.$ac_ext <<_ACEOF +-#line 17990 "configure" ++#line 17994 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -18000,16 +18004,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18003: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18007: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18006: \$? = $ac_status" >&5 ++ echo "$as_me:18010: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18009: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18013: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18012: \$? = $ac_status" >&5 ++ echo "$as_me:18016: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_define_xpg5=yes + else +@@ -18020,7 +18024,7 @@ + CPPFLAGS="$cf_save_cppflags" + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:18023: result: $cf_define_xpg5" >&5 ++ echo "$as_me:18027: result: $cf_define_xpg5" >&5 + echo "${ECHO_T}$cf_define_xpg5" >&6 + + if test "$cf_define_xpg5" = yes +@@ -18029,14 +18033,14 @@ + fi + fi + +- echo "$as_me:18032: checking for wide-character functions" >&5 ++ echo "$as_me:18036: 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 18039 "configure" ++#line 18043 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -18053,16 +18057,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18056: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18060: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18059: \$? = $ac_status" >&5 ++ echo "$as_me:18063: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18062: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18066: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18065: \$? = $ac_status" >&5 ++ echo "$as_me:18069: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_widechar_funcs=yes + else +@@ -18073,7 +18077,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:18076: result: $cf_cv_widechar_funcs" >&5 ++echo "$as_me:18080: result: $cf_cv_widechar_funcs" >&5 + echo "${ECHO_T}$cf_cv_widechar_funcs" >&6 + if test "$cf_cv_widechar_funcs" != no ; then + +@@ -18094,14 +18098,14 @@ + + fi + +-echo "$as_me:18097: checking if $cf_cv_screen library uses pthreads" >&5 ++echo "$as_me:18101: 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 18104 "configure" ++#line 18108 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -18119,16 +18123,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18122: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18126: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18125: \$? = $ac_status" >&5 ++ echo "$as_me:18129: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18128: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18132: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18131: \$? = $ac_status" >&5 ++ echo "$as_me:18135: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_use_pthreads=yes + else +@@ -18139,20 +18143,20 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:18142: result: $cf_cv_use_pthreads" >&5 ++echo "$as_me:18146: 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:18148: checking if sys/time.h works with sys/select.h" >&5 ++echo "$as_me:18152: 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 18155 "configure" ++#line 18159 "configure" + #include "confdefs.h" + + #include +@@ -18172,16 +18176,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18175: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18179: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18178: \$? = $ac_status" >&5 ++ echo "$as_me:18182: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18181: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18185: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18184: \$? = $ac_status" >&5 ++ echo "$as_me:18188: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sys_time_select=yes + else +@@ -18193,7 +18197,7 @@ + + fi + +-echo "$as_me:18196: result: $cf_cv_sys_time_select" >&5 ++echo "$as_me:18200: 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 +@@ -18202,7 +18206,7 @@ + + # special check for test/ditto.c + +-echo "$as_me:18205: checking for openpty in -lutil" >&5 ++echo "$as_me:18209: 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 +@@ -18210,7 +18214,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lutil $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 18213 "configure" ++#line 18217 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -18229,16 +18233,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18232: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18236: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18235: \$? = $ac_status" >&5 ++ echo "$as_me:18239: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18238: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18242: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18241: \$? = $ac_status" >&5 ++ echo "$as_me:18245: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_util_openpty=yes + else +@@ -18249,7 +18253,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:18252: result: $ac_cv_lib_util_openpty" >&5 ++echo "$as_me:18256: 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 +@@ -18257,7 +18261,7 @@ + cf_cv_lib_util=no + fi + +-echo "$as_me:18260: checking for openpty header" >&5 ++echo "$as_me:18264: 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 +@@ -18284,7 +18288,7 @@ + for cf_header in pty.h libutil.h util.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 18287 "configure" ++#line 18291 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -18301,16 +18305,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18304: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18308: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18307: \$? = $ac_status" >&5 ++ echo "$as_me:18311: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18310: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18314: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18313: \$? = $ac_status" >&5 ++ echo "$as_me:18317: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_func_openpty=$cf_header +@@ -18328,7 +18332,7 @@ + LIBS="$cf_save_LIBS" + + fi +-echo "$as_me:18331: result: $cf_cv_func_openpty" >&5 ++echo "$as_me:18335: result: $cf_cv_func_openpty" >&5 + echo "${ECHO_T}$cf_cv_func_openpty" >&6 + + if test "$cf_cv_func_openpty" != no ; then +@@ -18362,7 +18366,7 @@ + fi + fi + +-echo "$as_me:18365: checking for function curses_version" >&5 ++echo "$as_me:18369: 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 +@@ -18372,7 +18376,7 @@ + cf_cv_func_curses_version=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 18375 "configure" ++#line 18379 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -18385,15 +18389,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:18388: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18392: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18391: \$? = $ac_status" >&5 ++ echo "$as_me:18395: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:18393: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18397: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18396: \$? = $ac_status" >&5 ++ echo "$as_me:18400: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_curses_version=yes + +@@ -18408,14 +18412,14 @@ + fi + rm -f core + fi +-echo "$as_me:18411: result: $cf_cv_func_curses_version" >&5 ++echo "$as_me:18415: 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:18418: checking for alternate character set array" >&5 ++echo "$as_me:18422: 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 +@@ -18425,7 +18429,7 @@ + for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map + do + cat >conftest.$ac_ext <<_ACEOF +-#line 18428 "configure" ++#line 18432 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -18441,16 +18445,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18444: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18448: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18447: \$? = $ac_status" >&5 ++ echo "$as_me:18451: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18450: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18454: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18453: \$? = $ac_status" >&5 ++ echo "$as_me:18457: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_curses_acs_map=$name; break + else +@@ -18461,7 +18465,7 @@ + done + + fi +-echo "$as_me:18464: result: $cf_cv_curses_acs_map" >&5 ++echo "$as_me:18468: result: $cf_cv_curses_acs_map" >&5 + echo "${ECHO_T}$cf_cv_curses_acs_map" >&6 + + test "$cf_cv_curses_acs_map" != unknown && +@@ -18471,7 +18475,7 @@ + + if test "$cf_enable_widec" = yes; then + +-echo "$as_me:18474: checking for wide alternate character set array" >&5 ++echo "$as_me:18478: 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 +@@ -18481,7 +18485,7 @@ + for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char + do + cat >conftest.$ac_ext <<_ACEOF +-#line 18484 "configure" ++#line 18488 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -18497,16 +18501,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18500: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18504: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18503: \$? = $ac_status" >&5 ++ echo "$as_me:18507: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18506: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18510: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18509: \$? = $ac_status" >&5 ++ echo "$as_me:18513: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_curses_wacs_map=$name + break +@@ -18517,7 +18521,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done + fi +-echo "$as_me:18520: result: $cf_cv_curses_wacs_map" >&5 ++echo "$as_me:18524: result: $cf_cv_curses_wacs_map" >&5 + echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 + + test "$cf_cv_curses_wacs_map" != unknown && +@@ -18525,7 +18529,7 @@ + #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map + EOF + +-echo "$as_me:18528: checking for wide alternate character constants" >&5 ++echo "$as_me:18532: 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 +@@ -18535,7 +18539,7 @@ + if test "$cf_cv_curses_wacs_map" != unknown + then + cat >conftest.$ac_ext <<_ACEOF +-#line 18538 "configure" ++#line 18542 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -18552,16 +18556,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18555: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18559: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18558: \$? = $ac_status" >&5 ++ echo "$as_me:18562: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18561: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18565: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18564: \$? = $ac_status" >&5 ++ echo "$as_me:18568: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_curses_wacs_symbols=yes + else +@@ -18571,7 +18575,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + else + cat >conftest.$ac_ext <<_ACEOF +-#line 18574 "configure" ++#line 18578 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -18587,16 +18591,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18590: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18594: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18593: \$? = $ac_status" >&5 ++ echo "$as_me:18597: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18596: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18600: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18599: \$? = $ac_status" >&5 ++ echo "$as_me:18603: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_curses_wacs_symbols=yes + else +@@ -18607,7 +18611,7 @@ + fi + + fi +-echo "$as_me:18610: result: $cf_cv_curses_wacs_symbols" >&5 ++echo "$as_me:18614: result: $cf_cv_curses_wacs_symbols" >&5 + echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 + + test "$cf_cv_curses_wacs_symbols" != no && +@@ -18617,10 +18621,10 @@ + + fi + +-echo "$as_me:18620: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:18624: 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 18623 "configure" ++#line 18627 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -18638,16 +18642,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18641: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18645: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18644: \$? = $ac_status" >&5 ++ echo "$as_me:18648: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18647: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18651: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18650: \$? = $ac_status" >&5 ++ echo "$as_me:18654: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -18656,7 +18660,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:18659: result: $cf_result" >&5 ++echo "$as_me:18663: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -18677,14 +18681,14 @@ + if test "$cf_enable_widec" = yes; then + + # This is needed on Tru64 5.0 to declare mbstate_t +-echo "$as_me:18680: checking if we must include wchar.h to declare mbstate_t" >&5 ++echo "$as_me:18684: 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 18687 "configure" ++#line 18691 "configure" + #include "confdefs.h" + + #include +@@ -18702,23 +18706,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18705: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18709: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18708: \$? = $ac_status" >&5 ++ echo "$as_me:18712: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18711: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18715: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18714: \$? = $ac_status" >&5 ++ echo "$as_me:18718: \$? = $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 18721 "configure" ++#line 18725 "configure" + #include "confdefs.h" + + #include +@@ -18737,16 +18741,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18740: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18744: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18743: \$? = $ac_status" >&5 ++ echo "$as_me:18747: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18746: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18750: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18749: \$? = $ac_status" >&5 ++ echo "$as_me:18753: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_mbstate_t=yes + else +@@ -18758,7 +18762,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:18761: result: $cf_cv_mbstate_t" >&5 ++echo "$as_me:18765: result: $cf_cv_mbstate_t" >&5 + echo "${ECHO_T}$cf_cv_mbstate_t" >&6 + + if test "$cf_cv_mbstate_t" = yes ; then +@@ -18781,14 +18785,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wchar_t +-echo "$as_me:18784: checking if we must include wchar.h to declare wchar_t" >&5 ++echo "$as_me:18788: 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 18791 "configure" ++#line 18795 "configure" + #include "confdefs.h" + + #include +@@ -18806,23 +18810,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18809: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18813: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18812: \$? = $ac_status" >&5 ++ echo "$as_me:18816: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18815: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18819: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18818: \$? = $ac_status" >&5 ++ echo "$as_me:18822: \$? = $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 18825 "configure" ++#line 18829 "configure" + #include "confdefs.h" + + #include +@@ -18841,16 +18845,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18844: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18848: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18847: \$? = $ac_status" >&5 ++ echo "$as_me:18851: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18850: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18854: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18853: \$? = $ac_status" >&5 ++ echo "$as_me:18857: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wchar_t=yes + else +@@ -18862,7 +18866,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:18865: result: $cf_cv_wchar_t" >&5 ++echo "$as_me:18869: result: $cf_cv_wchar_t" >&5 + echo "${ECHO_T}$cf_cv_wchar_t" >&6 + + if test "$cf_cv_wchar_t" = yes ; then +@@ -18885,14 +18889,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wint_t +-echo "$as_me:18888: checking if we must include wchar.h to declare wint_t" >&5 ++echo "$as_me:18892: 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 18895 "configure" ++#line 18899 "configure" + #include "confdefs.h" + + #include +@@ -18910,23 +18914,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18913: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18917: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18916: \$? = $ac_status" >&5 ++ echo "$as_me:18920: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18919: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18923: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18922: \$? = $ac_status" >&5 ++ echo "$as_me:18926: \$? = $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 18929 "configure" ++#line 18933 "configure" + #include "confdefs.h" + + #include +@@ -18945,16 +18949,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18948: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18952: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18951: \$? = $ac_status" >&5 ++ echo "$as_me:18955: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18954: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18958: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18957: \$? = $ac_status" >&5 ++ echo "$as_me:18961: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wint_t=yes + else +@@ -18966,7 +18970,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:18969: result: $cf_cv_wint_t" >&5 ++echo "$as_me:18973: result: $cf_cv_wint_t" >&5 + echo "${ECHO_T}$cf_cv_wint_t" >&6 + + if test "$cf_cv_wint_t" = yes ; then +@@ -18990,10 +18994,10 @@ + + if test "$NCURSES_OK_MBSTATE_T" = 0 ; then + +-echo "$as_me:18993: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:18997: 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 18996 "configure" ++#line 19000 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -19011,16 +19015,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19014: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19018: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19017: \$? = $ac_status" >&5 ++ echo "$as_me:19021: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19020: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19024: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19023: \$? = $ac_status" >&5 ++ echo "$as_me:19027: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -19029,7 +19033,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:19032: result: $cf_result" >&5 ++echo "$as_me:19036: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -19051,10 +19055,10 @@ + + if test "$NCURSES_OK_WCHAR_T" = 0 ; then + +-echo "$as_me:19054: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:19058: 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 19057 "configure" ++#line 19061 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -19072,16 +19076,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19075: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19079: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19078: \$? = $ac_status" >&5 ++ echo "$as_me:19082: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19081: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19085: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19084: \$? = $ac_status" >&5 ++ echo "$as_me:19088: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -19090,7 +19094,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:19093: result: $cf_result" >&5 ++echo "$as_me:19097: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -19112,10 +19116,10 @@ + + if test "$NCURSES_OK_WINT_T" = 0 ; then + +-echo "$as_me:19115: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:19119: 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 19118 "configure" ++#line 19122 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -19133,16 +19137,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19136: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19140: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19139: \$? = $ac_status" >&5 ++ echo "$as_me:19143: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19142: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19146: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19145: \$? = $ac_status" >&5 ++ echo "$as_me:19149: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -19151,7 +19155,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:19154: result: $cf_result" >&5 ++echo "$as_me:19158: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -19180,11 +19184,11 @@ + boolfnames \ + ttytype + do +-echo "$as_me:19183: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:19187: 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 19187 "configure" ++#line 19191 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -19212,16 +19216,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19215: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19219: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19218: \$? = $ac_status" >&5 ++ echo "$as_me:19222: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19221: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19225: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19224: \$? = $ac_status" >&5 ++ echo "$as_me:19228: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + +@@ -19231,7 +19235,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:19234: result: $cf_result" >&5 ++echo "$as_me:19238: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + + if test $cf_result = yes ; then +@@ -19243,14 +19247,14 @@ + EOF + + else +- echo "$as_me:19246: checking for data $cf_data in library" >&5 ++ echo "$as_me:19250: 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 19253 "configure" ++#line 19257 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -19283,16 +19287,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19286: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19290: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19289: \$? = $ac_status" >&5 ++ echo "$as_me:19293: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:19292: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19296: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19295: \$? = $ac_status" >&5 ++ echo "$as_me:19299: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -19304,7 +19308,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 19307 "configure" ++#line 19311 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -19330,15 +19334,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:19333: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19337: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19336: \$? = $ac_status" >&5 ++ echo "$as_me:19340: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:19338: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19342: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19341: \$? = $ac_status" >&5 ++ echo "$as_me:19345: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + +@@ -19350,7 +19354,7 @@ + fi + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi +- echo "$as_me:19353: result: $cf_result" >&5 ++ echo "$as_me:19357: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -19367,7 +19371,7 @@ + + if ( test "$GCC" = yes || test "$GXX" = yes ) + then +-echo "$as_me:19370: checking if you want to turn on gcc warnings" >&5 ++echo "$as_me:19374: 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. +@@ -19384,7 +19388,7 @@ + with_warnings=no + + fi; +-echo "$as_me:19387: result: $with_warnings" >&5 ++echo "$as_me:19391: result: $with_warnings" >&5 + echo "${ECHO_T}$with_warnings" >&6 + if test "$with_warnings" = "yes" + then +@@ -19407,10 +19411,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:19410: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:19414: 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:19466: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19465: \$? = $ac_status" >&5 ++ echo "$as_me:19469: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:19467: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:19471: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case $cf_attribute in +@@ -19528,12 +19532,12 @@ + if test "$GCC" = yes ; then + case $host_os in + (linux*|gnu*) +- echo "$as_me:19531: checking if this is really Intel C compiler" >&5 ++ echo "$as_me:19535: 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 19536 "configure" ++#line 19540 "configure" + #include "confdefs.h" + + int +@@ -19550,16 +19554,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19553: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19557: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19556: \$? = $ac_status" >&5 ++ echo "$as_me:19560: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19559: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19563: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19562: \$? = $ac_status" >&5 ++ echo "$as_me:19566: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + INTEL_COMPILER=yes + cf_save_CFLAGS="$cf_save_CFLAGS -we147" +@@ -19570,7 +19574,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$cf_save_CFLAGS" +- echo "$as_me:19573: result: $INTEL_COMPILER" >&5 ++ echo "$as_me:19577: result: $INTEL_COMPILER" >&5 + echo "${ECHO_T}$INTEL_COMPILER" >&6 + ;; + esac +@@ -19579,12 +19583,12 @@ + CLANG_COMPILER=no + + if test "$GCC" = yes ; then +- echo "$as_me:19582: checking if this is really Clang C compiler" >&5 ++ echo "$as_me:19586: 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 19587 "configure" ++#line 19591 "configure" + #include "confdefs.h" + + int +@@ -19601,16 +19605,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19604: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19608: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19607: \$? = $ac_status" >&5 ++ echo "$as_me:19611: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19610: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19614: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19613: \$? = $ac_status" >&5 ++ echo "$as_me:19617: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + CLANG_COMPILER=yes + cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" +@@ -19621,12 +19625,12 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$cf_save_CFLAGS" +- echo "$as_me:19624: result: $CLANG_COMPILER" >&5 ++ echo "$as_me:19628: result: $CLANG_COMPILER" >&5 + echo "${ECHO_T}$CLANG_COMPILER" >&6 + fi + + cat > conftest.$ac_ext <&5 ++ { echo "$as_me:19650: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="-Wall" +@@ -19659,12 +19663,12 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:19662: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:19666: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19665: \$? = $ac_status" >&5 ++ echo "$as_me:19669: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:19667: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:19671: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -19673,7 +19677,7 @@ + + elif test "$GCC" = yes + then +- { echo "$as_me:19676: checking for $CC warning options..." >&5 ++ { echo "$as_me:19680: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS= +@@ -19697,12 +19701,12 @@ + Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:19700: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:19704: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19703: \$? = $ac_status" >&5 ++ echo "$as_me:19707: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:19705: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:19709: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + case $cf_opt in + (Wcast-qual) +@@ -19716,7 +19720,7 @@ + ([34].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:19719: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:19723: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -19726,7 +19730,7 @@ + ([12].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:19729: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:19733: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -19742,7 +19746,7 @@ + fi + fi + +-echo "$as_me:19745: checking if you want to use dmalloc for testing" >&5 ++echo "$as_me:19749: 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. +@@ -19759,7 +19763,7 @@ + else + with_dmalloc= + fi; +-echo "$as_me:19762: result: ${with_dmalloc:-no}" >&5 ++echo "$as_me:19766: result: ${with_dmalloc:-no}" >&5 + echo "${ECHO_T}${with_dmalloc:-no}" >&6 + + case .$with_cflags in +@@ -19873,23 +19877,23 @@ + esac + + if test "$with_dmalloc" = yes ; then +- echo "$as_me:19876: checking for dmalloc.h" >&5 ++ echo "$as_me:19880: 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 19882 "configure" ++#line 19886 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:19886: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:19890: \"$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:19892: \$? = $ac_status" >&5 ++ echo "$as_me:19896: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -19908,11 +19912,11 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:19911: result: $ac_cv_header_dmalloc_h" >&5 ++echo "$as_me:19915: 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:19915: checking for dmalloc_debug in -ldmalloc" >&5 ++echo "$as_me:19919: 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 +@@ -19920,7 +19924,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldmalloc $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 19923 "configure" ++#line 19927 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19939,16 +19943,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19942: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19946: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19945: \$? = $ac_status" >&5 ++ echo "$as_me:19949: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:19948: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19952: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19951: \$? = $ac_status" >&5 ++ echo "$as_me:19955: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dmalloc_dmalloc_debug=yes + else +@@ -19959,7 +19963,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19962: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 ++echo "$as_me:19966: 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:19981: 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. +@@ -19991,7 +19995,7 @@ + else + with_dbmalloc= + fi; +-echo "$as_me:19994: result: ${with_dbmalloc:-no}" >&5 ++echo "$as_me:19998: result: ${with_dbmalloc:-no}" >&5 + echo "${ECHO_T}${with_dbmalloc:-no}" >&6 + + case .$with_cflags in +@@ -20105,23 +20109,23 @@ + esac + + if test "$with_dbmalloc" = yes ; then +- echo "$as_me:20108: checking for dbmalloc.h" >&5 ++ echo "$as_me:20112: 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 20114 "configure" ++#line 20118 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:20118: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:20122: \"$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:20124: \$? = $ac_status" >&5 ++ echo "$as_me:20128: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -20140,11 +20144,11 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:20143: result: $ac_cv_header_dbmalloc_h" >&5 ++echo "$as_me:20147: 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:20147: checking for debug_malloc in -ldbmalloc" >&5 ++echo "$as_me:20151: 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 +@@ -20152,7 +20156,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldbmalloc $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 20155 "configure" ++#line 20159 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -20171,16 +20175,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20174: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20178: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20177: \$? = $ac_status" >&5 ++ echo "$as_me:20181: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20180: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20184: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20183: \$? = $ac_status" >&5 ++ echo "$as_me:20187: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dbmalloc_debug_malloc=yes + else +@@ -20191,7 +20195,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:20194: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 ++echo "$as_me:20198: 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:20213: 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. +@@ -20223,7 +20227,7 @@ + else + with_valgrind= + fi; +-echo "$as_me:20226: result: ${with_valgrind:-no}" >&5 ++echo "$as_me:20230: result: ${with_valgrind:-no}" >&5 + echo "${ECHO_T}${with_valgrind:-no}" >&6 + + case .$with_cflags in +@@ -20336,7 +20340,7 @@ + ;; + esac + +-echo "$as_me:20339: checking if you want to perform memory-leak testing" >&5 ++echo "$as_me:20343: 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. +@@ -20346,7 +20350,7 @@ + else + : ${with_no_leaks:=no} + fi; +-echo "$as_me:20349: result: $with_no_leaks" >&5 ++echo "$as_me:20353: result: $with_no_leaks" >&5 + echo "${ECHO_T}$with_no_leaks" >&6 + + if test "$with_no_leaks" = yes ; then +@@ -20364,7 +20368,7 @@ + LD_RPATH_OPT= + if test "x$cf_cv_enable_rpath" != xno + then +- echo "$as_me:20367: checking for an rpath option" >&5 ++ echo "$as_me:20371: checking for an rpath option" >&5 + echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 + case $cf_cv_system_name in + (irix*) +@@ -20395,12 +20399,12 @@ + (*) + ;; + esac +- echo "$as_me:20398: result: $LD_RPATH_OPT" >&5 ++ echo "$as_me:20402: result: $LD_RPATH_OPT" >&5 + echo "${ECHO_T}$LD_RPATH_OPT" >&6 + + case "x$LD_RPATH_OPT" in + (x-R*) +- echo "$as_me:20403: checking if we need a space after rpath option" >&5 ++ echo "$as_me:20407: 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" + +@@ -20421,7 +20425,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 20424 "configure" ++#line 20428 "configure" + #include "confdefs.h" + + int +@@ -20433,16 +20437,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20436: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20440: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20439: \$? = $ac_status" >&5 ++ echo "$as_me:20443: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20442: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20446: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20445: \$? = $ac_status" >&5 ++ echo "$as_me:20449: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_rpath_space=no + else +@@ -20452,14 +20456,14 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$cf_save_LIBS" +- echo "$as_me:20455: result: $cf_rpath_space" >&5 ++ echo "$as_me:20459: 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:20462: checking if rpath-hack should be disabled" >&5 ++echo "$as_me:20466: 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. +@@ -20476,21 +20480,21 @@ + cf_disable_rpath_hack=no + + fi; +-echo "$as_me:20479: result: $cf_disable_rpath_hack" >&5 ++echo "$as_me:20483: 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:20483: checking for updated LDFLAGS" >&5 ++echo "$as_me:20487: 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:20486: result: maybe" >&5 ++ echo "$as_me:20490: 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:20493: checking for $ac_word" >&5 ++echo "$as_me:20497: 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 +@@ -20505,7 +20509,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:20508: found $ac_dir/$ac_word" >&5 ++echo "$as_me:20512: found $ac_dir/$ac_word" >&5 + break + done + +@@ -20513,10 +20517,10 @@ + fi + cf_ldd_prog=$ac_cv_prog_cf_ldd_prog + if test -n "$cf_ldd_prog"; then +- echo "$as_me:20516: result: $cf_ldd_prog" >&5 ++ echo "$as_me:20520: result: $cf_ldd_prog" >&5 + echo "${ECHO_T}$cf_ldd_prog" >&6 + else +- echo "$as_me:20519: result: no" >&5 ++ echo "$as_me:20523: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -20530,7 +20534,7 @@ + cf_rpath_oops= + + cat >conftest.$ac_ext <<_ACEOF +-#line 20533 "configure" ++#line 20537 "configure" + #include "confdefs.h" + #include + int +@@ -20542,16 +20546,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20545: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20549: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20548: \$? = $ac_status" >&5 ++ echo "$as_me:20552: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20551: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20555: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20554: \$? = $ac_status" >&5 ++ echo "$as_me:20558: \$? = $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` +@@ -20579,7 +20583,7 @@ + then + test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 + +-echo "${as_me:-configure}:20582: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 ++echo "${as_me:-configure}:20586: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 + + LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" + break +@@ -20591,11 +20595,11 @@ + + test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:20594: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:20598: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:20598: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:20602: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LDFLAGS +@@ -20632,7 +20636,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:20635: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:20639: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -20645,11 +20649,11 @@ + + test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:20648: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:20652: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:20652: testing ...checking LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:20656: testing ...checking LIBS $LIBS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LIBS +@@ -20686,7 +20690,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:20689: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:20693: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -20699,14 +20703,14 @@ + + test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:20702: testing ...checked LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:20706: testing ...checked LIBS $LIBS ..." 1>&5 + + test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:20706: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:20710: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + else +- echo "$as_me:20709: result: no" >&5 ++ echo "$as_me:20713: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -20796,7 +20800,7 @@ + : ${CONFIG_STATUS=./config.status} + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:20799: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:20803: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL +@@ -20928,7 +20932,7 @@ + cat >>$CONFIG_STATUS <&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -20991,7 +20995,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:20994: error: unrecognized option: $1 ++ -*) { { echo "$as_me:20998: 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;} +@@ -21010,7 +21014,7 @@ + ## Running config.status. ## + ## ----------------------- ## + +-This file was extended by $as_me 2.52.20181006, executed with ++This file was extended by $as_me 2.52.20190828, executed with + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS +@@ -21041,7 +21045,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:21044: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:21048: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -21337,7 +21341,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:21340: creating $ac_file" >&5 ++ { echo "$as_me:21344: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -21355,7 +21359,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:21358: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:21362: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -21368,7 +21372,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:21371: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:21375: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -21384,7 +21388,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' $ac_item` + if test -z "$ac_used"; then +- { echo "$as_me:21387: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:21391: 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;} +@@ -21393,7 +21397,7 @@ + fi + ac_seen=`grep '${datarootdir}' $ac_item` + if test -n "$ac_seen"; then +- { echo "$as_me:21396: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:21400: 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;} +@@ -21430,7 +21434,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:21433: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:21437: 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;} +@@ -21441,7 +21445,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:21444: WARNING: Some variables may not be substituted: ++ { echo "$as_me:21448: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -21490,7 +21494,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:21493: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:21497: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -21501,7 +21505,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:21504: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:21508: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -21514,7 +21518,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:21517: error: cannot find input file: $f" >&5 ++ { { 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; }; } + fi;; +@@ -21572,7 +21576,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:21575: $ac_file is unchanged" >&5 ++ { echo "$as_me:21579: $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_panels.c +Prereq: 1.43 +--- ncurses-6.1-20190824+/test/demo_panels.c 2019-08-24 23:11:01.000000000 +0000 ++++ ncurses-6.1-20190831/test/demo_panels.c 2019-08-31 23:24:11.000000000 +0000 +@@ -204,7 +204,7 @@ + { + WINDOW *win; + PANEL *pan = 0; +- char *userdata = typeMalloc(char, 5); ++ char *userdata = typeMalloc(char, 6); + + if ((win = newwin(rows, cols, tly, tlx)) != 0) { + keypad(win, TRUE); +@@ -222,7 +222,7 @@ + wbkgdset(win, A_BOLD | ' '); + } + } +- _nc_SPRINTF(userdata, _nc_SLIMIT(3) "p%d", color % 8); ++ _nc_SPRINTF(userdata, _nc_SLIMIT(4) "p%d", color % 8); + set_panel_userptr(pan, (NCURSES_CONST void *) userdata); + return pan; + } +Index: test/ncurses.c +Prereq: 1.517 +--- ncurses-6.1-20190824+/test/ncurses.c 2019-08-24 23:09:03.000000000 +0000 ++++ ncurses-6.1-20190831/test/ncurses.c 2019-08-31 23:22:40.000000000 +0000 +@@ -6222,10 +6222,10 @@ + tracetrace(unsigned tlevel) + { + static char *buf; ++ static size_t need = 12; + int n; + + if (buf == 0) { +- static size_t need = 12; + for (n = 0; t_tbl[n].name != 0; n++) + need += strlen(t_tbl[n].name) + 2; + buf = typeMalloc(char, need); diff --git a/ncurses-6.1-20190907.patch b/ncurses-6.1-20190907.patch new file mode 100644 index 0000000..801e704 --- /dev/null +++ b/ncurses-6.1-20190907.patch @@ -0,0 +1,37005 @@ +# ncurses 6.1 - patch 20190907 - 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-20190907.patch.gz +# patch by Thomas E. Dickey +# created Sun Sep 8 01:44:15 UTC 2019 +# ------------------------------------------------------------------------------ +# Ada95/aclocal.m4 | 97 +# Ada95/configure | 2844 +++--- +# Ada95/configure.in | 7 +# Ada95/doc/Makefile.in | 6 +# Ada95/gen/adacurses-config.in | 8 +# Ada95/package/AdaCurses-doc.spec | 7 +# Ada95/package/AdaCurses.spec | 21 +# Ada95/samples/Makefile.in | 45 +# Ada95/src/Makefile.in | 21 +# Ada95/src/library-cfg.sh | 8 +# INSTALL | 5 +# MANIFEST | 4 +# NEWS | 10 +# VERSION | 2 +# aclocal.m4 | 37 +# configure | 4679 +++++----- +# configure.in | 19 +# dist.mk | 4 +# man/MKada_config.in | 16 +# ncurses-6.1-20190907/Ada95/samples/sample-explanation.adb_p | 441 +# ncurses-6.1-20190907/Ada95/src/library.gpr.in | 57 +# 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 | 84 +# test/configure | 3283 +++---- +# test/demo_panels.c | 2 +# test/ncurses.c | 2 +# 32 files changed, 6314 insertions(+), 5417 deletions(-) +# ------------------------------------------------------------------------------ +# Please remove the following files before applying this patch. +# (You can feed this patch to 'sh' to do so.) + +rm -f Ada95/samples/sample-explanation.adb +rm -f Ada95/src/library.gpr +exit + +Index: Ada95/aclocal.m4 +Prereq: 1.142 +--- ncurses-6.1-20190831+/Ada95/aclocal.m4 2019-01-01 01:46:17.000000000 +0000 ++++ ncurses-6.1-20190907/Ada95/aclocal.m4 2019-09-07 23:37:09.000000000 +0000 +@@ -1,5 +1,5 @@ + dnl*************************************************************************** +-dnl Copyright (c) 2010-2017,2018 Free Software Foundation, Inc. * ++dnl Copyright (c) 2010-2018,2019 Free Software Foundation, Inc. * + dnl * + dnl Permission is hereby granted, free of charge, to any person obtaining a * + dnl copy of this software and associated documentation files (the * +@@ -28,7 +28,7 @@ + dnl + dnl Author: Thomas E. Dickey + dnl +-dnl $Id: aclocal.m4,v 1.142 2019/01/01 01:46:17 tom Exp $ ++dnl $Id: aclocal.m4,v 1.145 2019/09/07 23:37:09 tom Exp $ + dnl Macros used in NCURSES Ada95 auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -710,6 +710,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_CURSES_HEADER version: 5 updated: 2015/04/23 20:35:30 + dnl ---------------- + dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common +@@ -1100,9 +1154,10 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GCC_VERSION version: 7 updated: 2012/10/18 06:46:33 ++dnl CF_GCC_VERSION version: 8 updated: 2019/09/07 13:38:36 + dnl -------------- +-dnl Find version of gcc ++dnl Find version of gcc, and (because icc/clang pretend to be gcc without being ++dnl compatible), attempt to determine if icc/clang is actually used. + AC_DEFUN([CF_GCC_VERSION],[ + AC_REQUIRE([AC_PROG_CC]) + GCC_VERSION=none +@@ -1112,9 +1167,11 @@ + test -z "$GCC_VERSION" && GCC_VERSION=unknown + AC_MSG_RESULT($GCC_VERSION) + fi ++CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) ++CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GCC_WARNINGS version: 33 updated: 2018/06/20 20:23:13 ++dnl CF_GCC_WARNINGS version: 36 updated: 2019/09/07 13:38:36 + 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: +@@ -1136,14 +1193,11 @@ + AC_DEFUN([CF_GCC_WARNINGS], + [ + 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 <&5 ++ { echo "$as_me:945: 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" +@@ -952,7 +953,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:955: loading cache $cache_file" >&5 ++ { echo "$as_me:956: loading cache $cache_file" >&5 + echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . $cache_file;; +@@ -960,7 +961,7 @@ + esac + fi + else +- { echo "$as_me:963: creating cache $cache_file" >&5 ++ { echo "$as_me:964: creating cache $cache_file" >&5 + echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi +@@ -976,21 +977,21 @@ + eval ac_new_val="\$ac_env_${ac_var}_value" + case $ac_old_set,$ac_new_set in + set,) +- { echo "$as_me:979: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++ { echo "$as_me:980: 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:983: error: \`$ac_var' was not set in the previous run" >&5 ++ { echo "$as_me:984: 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:989: error: \`$ac_var' has changed since the previous run:" >&5 ++ { echo "$as_me:990: 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:991: former value: $ac_old_val" >&5 ++ { echo "$as_me:992: former value: $ac_old_val" >&5 + echo "$as_me: former value: $ac_old_val" >&2;} +- { echo "$as_me:993: current value: $ac_new_val" >&5 ++ { echo "$as_me:994: current value: $ac_new_val" >&5 + echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: + fi;; +@@ -1009,9 +1010,9 @@ + fi + done + if $ac_cache_corrupted; then +- { echo "$as_me:1012: error: changes in the environment can compromise the build" >&5 ++ { echo "$as_me:1013: 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:1014: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 ++ { { echo "$as_me:1015: 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 +@@ -1032,10 +1033,10 @@ + echo "#! $SHELL" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh +-if { (echo "$as_me:1035: PATH=\".;.\"; conftest.sh") >&5 ++if { (echo "$as_me:1036: PATH=\".;.\"; conftest.sh") >&5 + (PATH=".;."; conftest.sh) 2>&5 + ac_status=$? +- echo "$as_me:1038: \$? = $ac_status" >&5 ++ echo "$as_me:1039: \$? = $ac_status" >&5 + (exit $ac_status); }; then + ac_path_separator=';' + else +@@ -1065,7 +1066,7 @@ + fi + done + if test -z "$ac_aux_dir"; then +- { { echo "$as_me:1068: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 ++ { { echo "$as_me:1069: 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 +@@ -1075,11 +1076,11 @@ + + # Make sure we can run config.sub. + $ac_config_sub sun4 >/dev/null 2>&1 || +- { { echo "$as_me:1078: error: cannot run $ac_config_sub" >&5 ++ { { echo "$as_me:1079: error: cannot run $ac_config_sub" >&5 + echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:1082: checking build system type" >&5 ++echo "$as_me:1083: 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 +@@ -1088,23 +1089,23 @@ + test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` + test -z "$ac_cv_build_alias" && +- { { echo "$as_me:1091: error: cannot guess build type; you must specify one" >&5 ++ { { echo "$as_me:1092: 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:1095: error: $ac_config_sub $ac_cv_build_alias failed." >&5 ++ { { echo "$as_me:1096: 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:1100: result: $ac_cv_build" >&5 ++echo "$as_me:1101: 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:1107: checking host system type" >&5 ++echo "$as_me:1108: 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 +@@ -1113,12 +1114,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:1116: error: $ac_config_sub $ac_cv_host_alias failed" >&5 ++ { { echo "$as_me:1117: 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:1121: result: $ac_cv_host" >&5 ++echo "$as_me:1122: 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/'` +@@ -1126,7 +1127,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:1129: checking target system type" >&5 ++ echo "$as_me:1130: 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 +@@ -1135,12 +1136,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:1138: error: $ac_config_sub $ac_cv_target_alias failed" >&5 ++ { { echo "$as_me:1139: 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:1143: result: $ac_cv_target" >&5 ++echo "$as_me:1144: 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/'` +@@ -1172,13 +1173,13 @@ + fi + + test -z "$system_name" && system_name="$cf_cv_system_name" +-test -n "$cf_cv_system_name" && echo "$as_me:1175: result: Configuring for $cf_cv_system_name" >&5 ++test -n "$cf_cv_system_name" && echo "$as_me:1176: 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:1179: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 ++ echo "$as_me:1180: 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:1181: error: \"Please remove config.cache and try again.\"" >&5 ++ { { echo "$as_me:1182: 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 +@@ -1186,7 +1187,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:1189: WARNING: overriding system type to $withval" >&5 ++ { echo "$as_me:1190: 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 +@@ -1198,7 +1199,7 @@ + + ### Default install-location + +-echo "$as_me:1201: checking for prefix" >&5 ++echo "$as_me:1202: 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 +@@ -1210,11 +1211,11 @@ + ;; + esac + fi +-echo "$as_me:1213: result: $prefix" >&5 ++echo "$as_me:1214: result: $prefix" >&5 + echo "${ECHO_T}$prefix" >&6 + + if test "x$prefix" = "xNONE" ; then +-echo "$as_me:1217: checking for default include-directory" >&5 ++echo "$as_me:1218: 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 \ +@@ -1237,7 +1238,7 @@ + fi + test -n "$verbose" && echo " tested $cf_dir" 1>&6 + done +-echo "$as_me:1240: result: $includedir" >&5 ++echo "$as_me:1241: result: $includedir" >&5 + echo "${ECHO_T}$includedir" >&6 + fi + +@@ -1254,7 +1255,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:1257: checking for $ac_word" >&5 ++echo "$as_me:1258: 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 +@@ -1269,7 +1270,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:1272: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1273: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1277,10 +1278,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:1280: result: $CC" >&5 ++ echo "$as_me:1281: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else +- echo "$as_me:1283: result: no" >&5 ++ echo "$as_me:1284: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1293,7 +1294,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:1296: checking for $ac_word" >&5 ++echo "$as_me:1297: 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 +@@ -1308,7 +1309,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:1311: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1312: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1316,10 +1317,10 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:1319: result: $ac_ct_CC" >&5 ++ echo "$as_me:1320: result: $ac_ct_CC" >&5 + echo "${ECHO_T}$ac_ct_CC" >&6 + else +- echo "$as_me:1322: result: no" >&5 ++ echo "$as_me:1323: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1329,32 +1330,32 @@ + CC=$ac_ct_CC + fi + +-test -z "$CC" && { { echo "$as_me:1332: error: no acceptable cc found in \$PATH" >&5 ++test -z "$CC" && { { echo "$as_me:1333: 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:1337:" \ ++echo "$as_me:1338:" \ + "checking for C compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:1340: \"$ac_compiler --version &5\"") >&5 ++{ (eval echo "$as_me:1341: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? +- echo "$as_me:1343: \$? = $ac_status" >&5 ++ echo "$as_me:1344: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:1345: \"$ac_compiler -v &5\"") >&5 ++{ (eval echo "$as_me:1346: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? +- echo "$as_me:1348: \$? = $ac_status" >&5 ++ echo "$as_me:1349: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:1350: \"$ac_compiler -V &5\"") >&5 ++{ (eval echo "$as_me:1351: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? +- echo "$as_me:1353: \$? = $ac_status" >&5 ++ echo "$as_me:1354: \$? = $ac_status" >&5 + (exit $ac_status); } + + cat >conftest.$ac_ext <<_ACEOF +-#line 1357 "configure" ++#line 1358 "configure" + #include "confdefs.h" + + int +@@ -1370,13 +1371,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:1373: checking for C compiler default output" >&5 ++echo "$as_me:1374: 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:1376: \"$ac_link_default\"") >&5 ++if { (eval echo "$as_me:1377: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 + ac_status=$? +- echo "$as_me:1379: \$? = $ac_status" >&5 ++ echo "$as_me:1380: \$? = $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 +@@ -1399,34 +1400,34 @@ + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-{ { echo "$as_me:1402: error: C compiler cannot create executables" >&5 ++{ { echo "$as_me:1403: 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:1408: result: $ac_file" >&5 ++echo "$as_me:1409: 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:1413: checking whether the C compiler works" >&5 ++echo "$as_me:1414: 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:1419: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1420: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1422: \$? = $ac_status" >&5 ++ echo "$as_me:1423: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { echo "$as_me:1429: error: cannot run C compiled programs. ++ { { echo "$as_me:1430: 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;} +@@ -1434,24 +1435,24 @@ + fi + fi + fi +-echo "$as_me:1437: result: yes" >&5 ++echo "$as_me:1438: 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:1444: checking whether we are cross compiling" >&5 ++echo "$as_me:1445: checking whether we are cross compiling" >&5 + echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +-echo "$as_me:1446: result: $cross_compiling" >&5 ++echo "$as_me:1447: result: $cross_compiling" >&5 + echo "${ECHO_T}$cross_compiling" >&6 + +-echo "$as_me:1449: checking for executable suffix" >&5 ++echo "$as_me:1450: checking for executable suffix" >&5 + echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 +-if { (eval echo "$as_me:1451: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:1452: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:1454: \$? = $ac_status" >&5 ++ echo "$as_me:1455: \$? = $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 +@@ -1467,25 +1468,25 @@ + esac + done + else +- { { echo "$as_me:1470: error: cannot compute EXEEXT: cannot compile and link" >&5 ++ { { echo "$as_me:1471: 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:1476: result: $ac_cv_exeext" >&5 ++echo "$as_me:1477: 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:1482: checking for object suffix" >&5 ++echo "$as_me:1483: 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 1488 "configure" ++#line 1489 "configure" + #include "confdefs.h" + + int +@@ -1497,10 +1498,10 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (eval echo "$as_me:1500: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1501: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1503: \$? = $ac_status" >&5 ++ echo "$as_me:1504: \$? = $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 +@@ -1512,24 +1513,24 @@ + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-{ { echo "$as_me:1515: error: cannot compute OBJEXT: cannot compile" >&5 ++{ { echo "$as_me:1516: 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:1522: result: $ac_cv_objext" >&5 ++echo "$as_me:1523: result: $ac_cv_objext" >&5 + echo "${ECHO_T}$ac_cv_objext" >&6 + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-echo "$as_me:1526: checking whether we are using the GNU C compiler" >&5 ++echo "$as_me:1527: 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 1532 "configure" ++#line 1533 "configure" + #include "confdefs.h" + + int +@@ -1544,16 +1545,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1547: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1548: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1550: \$? = $ac_status" >&5 ++ echo "$as_me:1551: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1553: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1554: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1556: \$? = $ac_status" >&5 ++ echo "$as_me:1557: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes + else +@@ -1565,19 +1566,19 @@ + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:1568: result: $ac_cv_c_compiler_gnu" >&5 ++echo "$as_me:1569: 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:1574: checking whether $CC accepts -g" >&5 ++echo "$as_me:1575: 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 1580 "configure" ++#line 1581 "configure" + #include "confdefs.h" + + int +@@ -1589,16 +1590,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1592: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1593: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1595: \$? = $ac_status" >&5 ++ echo "$as_me:1596: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1598: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1599: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1601: \$? = $ac_status" >&5 ++ echo "$as_me:1602: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes + else +@@ -1608,7 +1609,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:1611: result: $ac_cv_prog_cc_g" >&5 ++echo "$as_me:1612: 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 +@@ -1635,16 +1636,16 @@ + #endif + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1638: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1639: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1641: \$? = $ac_status" >&5 ++ echo "$as_me:1642: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1644: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1645: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1647: \$? = $ac_status" >&5 ++ echo "$as_me:1648: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + ''\ +@@ -1656,7 +1657,7 @@ + 'void exit (int);' + do + cat >conftest.$ac_ext <<_ACEOF +-#line 1659 "configure" ++#line 1660 "configure" + #include "confdefs.h" + #include + $ac_declaration +@@ -1669,16 +1670,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1672: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1673: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1675: \$? = $ac_status" >&5 ++ echo "$as_me:1676: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1678: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1679: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1681: \$? = $ac_status" >&5 ++ echo "$as_me:1682: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -1688,7 +1689,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 1691 "configure" ++#line 1692 "configure" + #include "confdefs.h" + $ac_declaration + int +@@ -1700,16 +1701,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1703: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1704: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1706: \$? = $ac_status" >&5 ++ echo "$as_me:1707: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1709: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1710: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1712: \$? = $ac_status" >&5 ++ echo "$as_me:1713: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -1739,15 +1740,117 @@ + + GCC_VERSION=none + if test "$GCC" = yes ; then +- echo "$as_me:1742: checking version of $CC" >&5 ++ echo "$as_me:1743: 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:1746: result: $GCC_VERSION" >&5 ++ echo "$as_me:1747: result: $GCC_VERSION" >&5 + echo "${ECHO_T}$GCC_VERSION" >&6 + fi + +-echo "$as_me:1750: checking for $CC option to accept ANSI C" >&5 ++INTEL_COMPILER=no ++ ++if test "$GCC" = yes ; then ++ case $host_os in ++ (linux*|gnu*) ++ echo "$as_me:1756: 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 1761 "configure" ++#include "confdefs.h" ++ ++int ++main (void) ++{ ++ ++#ifdef __INTEL_COMPILER ++#else ++make an error ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:1778: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:1781: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:1784: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:1787: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ INTEL_COMPILER=yes ++cf_save_CFLAGS="$cf_save_CFLAGS -we147" ++ ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$cf_save_CFLAGS" ++ echo "$as_me:1798: result: $INTEL_COMPILER" >&5 ++echo "${ECHO_T}$INTEL_COMPILER" >&6 ++ ;; ++ esac ++fi ++ ++CLANG_COMPILER=no ++ ++if test "$GCC" = yes ; then ++ echo "$as_me:1807: 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 1812 "configure" ++#include "confdefs.h" ++ ++int ++main (void) ++{ ++ ++#ifdef __clang__ ++#else ++make an error ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:1829: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:1832: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:1835: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:1838: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ CLANG_COMPILER=yes ++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" ++ ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$cf_save_CFLAGS" ++ echo "$as_me:1849: result: $CLANG_COMPILER" >&5 ++echo "${ECHO_T}$CLANG_COMPILER" >&6 ++fi ++ ++echo "$as_me:1853: 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 +@@ -1755,7 +1858,7 @@ + ac_cv_prog_cc_stdc=no + ac_save_CC=$CC + cat >conftest.$ac_ext <<_ACEOF +-#line 1758 "configure" ++#line 1861 "configure" + #include "confdefs.h" + #include + #include +@@ -1804,16 +1907,16 @@ + do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1807: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1910: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1810: \$? = $ac_status" >&5 ++ echo "$as_me:1913: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1813: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1916: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1816: \$? = $ac_status" >&5 ++ echo "$as_me:1919: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg + break +@@ -1830,10 +1933,10 @@ + + case "x$ac_cv_prog_cc_stdc" in + x|xno) +- echo "$as_me:1833: result: none needed" >&5 ++ echo "$as_me:1936: result: none needed" >&5 + echo "${ECHO_T}none needed" >&6 ;; + *) +- echo "$as_me:1836: result: $ac_cv_prog_cc_stdc" >&5 ++ echo "$as_me:1939: result: $ac_cv_prog_cc_stdc" >&5 + echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; + esac +@@ -1841,13 +1944,13 @@ + # This should have been defined by AC_PROG_CC + : ${CC:=cc} + +-echo "$as_me:1844: checking \$CFLAGS variable" >&5 ++echo "$as_me:1947: checking \$CFLAGS variable" >&5 + echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 + case "x$CFLAGS" in + (*-[IUD]*) +- echo "$as_me:1848: result: broken" >&5 ++ echo "$as_me:1951: result: broken" >&5 + echo "${ECHO_T}broken" >&6 +- { echo "$as_me:1850: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 ++ { echo "$as_me:1953: 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= +@@ -1955,18 +2058,18 @@ + done + ;; + (*) +- echo "$as_me:1958: result: ok" >&5 ++ echo "$as_me:2061: result: ok" >&5 + echo "${ECHO_T}ok" >&6 + ;; + esac + +-echo "$as_me:1963: checking \$CC variable" >&5 ++echo "$as_me:2066: checking \$CC variable" >&5 + echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 + case "$CC" in + (*[\ \ ]-*) +- echo "$as_me:1967: result: broken" >&5 ++ echo "$as_me:2070: result: broken" >&5 + echo "${ECHO_T}broken" >&6 +- { echo "$as_me:1969: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 ++ { echo "$as_me:2072: 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/[ ]*[ ]-[^ ].*//'` +@@ -2083,19 +2186,19 @@ + done + test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 + +-echo "${as_me:-configure}:2086: testing resulting CC: '$CC' ..." 1>&5 ++echo "${as_me:-configure}:2189: testing resulting CC: '$CC' ..." 1>&5 + + test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 + +-echo "${as_me:-configure}:2090: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 ++echo "${as_me:-configure}:2193: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 + + test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 + +-echo "${as_me:-configure}:2094: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ++echo "${as_me:-configure}:2197: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 + + ;; + (*) +- echo "$as_me:2098: result: ok" >&5 ++ echo "$as_me:2201: result: ok" >&5 + echo "${ECHO_T}ok" >&6 + ;; + esac +@@ -2106,7 +2209,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:2109: checking how to run the C preprocessor" >&5 ++echo "$as_me:2212: 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 +@@ -2127,18 +2230,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 2130 "configure" ++#line 2233 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:2135: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:2238: \"$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:2141: \$? = $ac_status" >&5 ++ echo "$as_me:2244: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2161,17 +2264,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 2164 "configure" ++#line 2267 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:2168: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:2271: \"$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:2174: \$? = $ac_status" >&5 ++ echo "$as_me:2277: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2208,7 +2311,7 @@ + else + ac_cv_prog_CPP=$CPP + fi +-echo "$as_me:2211: result: $CPP" >&5 ++echo "$as_me:2314: result: $CPP" >&5 + echo "${ECHO_T}$CPP" >&6 + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes +@@ -2218,18 +2321,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 2221 "configure" ++#line 2324 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:2226: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:2329: \"$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:2232: \$? = $ac_status" >&5 ++ echo "$as_me:2335: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2252,17 +2355,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 2255 "configure" ++#line 2358 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:2259: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:2362: \"$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:2265: \$? = $ac_status" >&5 ++ echo "$as_me:2368: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2290,7 +2393,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:2293: error: C preprocessor \"$CPP\" fails sanity check" >&5 ++ { { echo "$as_me:2396: error: C preprocessor \"$CPP\" fails sanity check" >&5 + echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -2303,14 +2406,14 @@ + ac_main_return=return + + if test $ac_cv_c_compiler_gnu = yes; then +- echo "$as_me:2306: checking whether $CC needs -traditional" >&5 ++ echo "$as_me:2409: 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 2313 "configure" ++#line 2416 "configure" + #include "confdefs.h" + #include + int Autoconf = TIOCGETP; +@@ -2325,7 +2428,7 @@ + + if test $ac_cv_prog_gcc_traditional = no; then + cat >conftest.$ac_ext <<_ACEOF +-#line 2328 "configure" ++#line 2431 "configure" + #include "confdefs.h" + #include + int Autoconf = TCGETA; +@@ -2338,14 +2441,14 @@ + + fi + fi +-echo "$as_me:2341: result: $ac_cv_prog_gcc_traditional" >&5 ++echo "$as_me:2444: 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:2348: checking whether $CC understands -c and -o together" >&5 ++echo "$as_me:2451: 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 +@@ -2360,15 +2463,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:2363: \"$ac_try\"") >&5 ++if { (eval echo "$as_me:2466: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2366: \$? = $ac_status" >&5 ++ echo "$as_me:2469: \$? = $ac_status" >&5 + (exit $ac_status); } && +- test -f conftest2.$ac_objext && { (eval echo "$as_me:2368: \"$ac_try\"") >&5 ++ test -f conftest2.$ac_objext && { (eval echo "$as_me:2471: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2371: \$? = $ac_status" >&5 ++ echo "$as_me:2474: \$? = $ac_status" >&5 + (exit $ac_status); }; + then + eval cf_cv_prog_CC_c_o=yes +@@ -2379,10 +2482,10 @@ + + fi + if test $cf_cv_prog_CC_c_o = yes; then +- echo "$as_me:2382: result: yes" >&5 ++ echo "$as_me:2485: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:2385: result: no" >&5 ++ echo "$as_me:2488: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2403,7 +2506,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:2406: checking for $ac_word" >&5 ++echo "$as_me:2509: 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 +@@ -2418,7 +2521,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AWK="$ac_prog" +-echo "$as_me:2421: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2524: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2426,21 +2529,21 @@ + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- echo "$as_me:2429: result: $AWK" >&5 ++ echo "$as_me:2532: result: $AWK" >&5 + echo "${ECHO_T}$AWK" >&6 + else +- echo "$as_me:2432: result: no" >&5 ++ echo "$as_me:2535: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + test -n "$AWK" && break + done + +-test -z "$AWK" && { { echo "$as_me:2439: error: No awk program found" >&5 ++test -z "$AWK" && { { echo "$as_me:2542: error: No awk program found" >&5 + echo "$as_me: error: No awk program found" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:2443: checking for egrep" >&5 ++echo "$as_me:2546: 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 +@@ -2450,11 +2553,11 @@ + else ac_cv_prog_egrep='egrep' + fi + fi +-echo "$as_me:2453: result: $ac_cv_prog_egrep" >&5 ++echo "$as_me:2556: 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:2457: error: No egrep program found" >&5 ++ test -z "$EGREP" && { { echo "$as_me:2560: error: No egrep program found" >&5 + echo "$as_me: error: No egrep program found" >&2;} + { (exit 1); exit 1; }; } + +@@ -2470,7 +2573,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:2473: checking for a BSD compatible install" >&5 ++echo "$as_me:2576: 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 +@@ -2519,7 +2622,7 @@ + INSTALL=$ac_install_sh + fi + fi +-echo "$as_me:2522: result: $INSTALL" >&5 ++echo "$as_me:2625: result: $INSTALL" >&5 + echo "${ECHO_T}$INSTALL" >&6 + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -2530,18 +2633,18 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-echo "$as_me:2533: checking whether ln -s works" >&5 ++echo "$as_me:2636: 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:2537: result: yes" >&5 ++ echo "$as_me:2640: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:2540: result: no, using $LN_S" >&5 ++ echo "$as_me:2643: result: no, using $LN_S" >&5 + echo "${ECHO_T}no, using $LN_S" >&6 + fi + +-echo "$as_me:2544: checking if $LN_S -f options work" >&5 ++echo "$as_me:2647: 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 +@@ -2553,7 +2656,7 @@ + cf_prog_ln_sf=no + fi + rm -f conf$$.dst conf$$src +-echo "$as_me:2556: result: $cf_prog_ln_sf" >&5 ++echo "$as_me:2659: 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" +@@ -2570,7 +2673,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:2573: checking for a BSD compatible install" >&5 ++echo "$as_me:2676: 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 +@@ -2619,7 +2722,7 @@ + INSTALL=$ac_install_sh + fi + fi +-echo "$as_me:2622: result: $INSTALL" >&5 ++echo "$as_me:2725: result: $INSTALL" >&5 + echo "${ECHO_T}$INSTALL" >&6 + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -2640,7 +2743,7 @@ + ;; + esac + +-echo "$as_me:2643: checking if you want to install stripped executables" >&5 ++echo "$as_me:2746: 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. +@@ -2657,7 +2760,7 @@ + with_stripping=yes + + fi; +-echo "$as_me:2660: result: $with_stripping" >&5 ++echo "$as_me:2763: result: $with_stripping" >&5 + echo "${ECHO_T}$with_stripping" >&6 + + if test "$with_stripping" = yes +@@ -2668,7 +2771,7 @@ + fi + + : ${INSTALL:=install} +-echo "$as_me:2671: checking if install accepts -p option" >&5 ++echo "$as_me:2774: 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 +@@ -2699,10 +2802,10 @@ + rm -rf conftest* + + fi +-echo "$as_me:2702: result: $cf_cv_install_p" >&5 ++echo "$as_me:2805: result: $cf_cv_install_p" >&5 + echo "${ECHO_T}$cf_cv_install_p" >&6 + +-echo "$as_me:2705: checking if install needs to be told about ownership" >&5 ++echo "$as_me:2808: 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) +@@ -2713,7 +2816,7 @@ + ;; + esac + +-echo "$as_me:2716: result: $with_install_o" >&5 ++echo "$as_me:2819: result: $with_install_o" >&5 + echo "${ECHO_T}$with_install_o" >&6 + if test "x$with_install_o" = xyes + then +@@ -2722,7 +2825,7 @@ + INSTALL_OPT_O= + fi + +-echo "$as_me:2725: checking for long file names" >&5 ++echo "$as_me:2828: 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 +@@ -2761,7 +2864,7 @@ + rm -rf $ac_xdir 2>/dev/null + done + fi +-echo "$as_me:2764: result: $ac_cv_sys_long_file_names" >&5 ++echo "$as_me:2867: 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 + +@@ -2773,7 +2876,7 @@ + + # if we find pkg-config, check if we should install the ".pc" files. + +-echo "$as_me:2776: checking if you want to use pkg-config" >&5 ++echo "$as_me:2879: 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. +@@ -2783,7 +2886,7 @@ + else + cf_pkg_config=yes + fi; +-echo "$as_me:2786: result: $cf_pkg_config" >&5 ++echo "$as_me:2889: result: $cf_pkg_config" >&5 + echo "${ECHO_T}$cf_pkg_config" >&6 + + case $cf_pkg_config in +@@ -2795,7 +2898,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:2798: checking for $ac_word" >&5 ++echo "$as_me:2901: 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 +@@ -2812,7 +2915,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:2815: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:2918: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -2823,10 +2926,10 @@ + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + + if test -n "$PKG_CONFIG"; then +- echo "$as_me:2826: result: $PKG_CONFIG" >&5 ++ echo "$as_me:2929: result: $PKG_CONFIG" >&5 + echo "${ECHO_T}$PKG_CONFIG" >&6 + else +- echo "$as_me:2829: result: no" >&5 ++ echo "$as_me:2932: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2835,7 +2938,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:2838: checking for $ac_word" >&5 ++echo "$as_me:2941: 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 +@@ -2852,7 +2955,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:2855: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:2958: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -2864,10 +2967,10 @@ + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + + if test -n "$ac_pt_PKG_CONFIG"; then +- echo "$as_me:2867: result: $ac_pt_PKG_CONFIG" >&5 ++ echo "$as_me:2970: result: $ac_pt_PKG_CONFIG" >&5 + echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 + else +- echo "$as_me:2870: result: no" >&5 ++ echo "$as_me:2973: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2910,24 +3013,24 @@ + PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:2913: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 ++ { { echo "$as_me:3016: 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:2920: WARNING: pkg-config is not installed" >&5 ++ { echo "$as_me:3023: 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:2926: checking for pkg-config library directory" >&5 ++ echo "$as_me:3029: checking for pkg-config library directory" >&5 + echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6 + ;; + (*) +- echo "$as_me:2930: checking for $PKG_CONFIG library directory" >&5 ++ echo "$as_me:3033: checking for $PKG_CONFIG library directory" >&5 + echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 + ;; + esac +@@ -2982,18 +3085,18 @@ + + test -n "$verbose" && echo " list..." 1>&6 + +-echo "${as_me:-configure}:2985: testing list... ..." 1>&5 ++echo "${as_me:-configure}:3088: 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}:2991: testing checking $cf_config/pkgconfig ..." 1>&5 ++echo "${as_me:-configure}:3094: testing checking $cf_config/pkgconfig ..." 1>&5 + + if test -d $cf_config/pkgconfig + then + PKG_CONFIG_LIBDIR=$cf_config/pkgconfig +- echo "$as_me:2996: checking done" >&5 ++ echo "$as_me:3099: checking done" >&5 + echo $ECHO_N "checking done... $ECHO_C" >&6 + break + fi +@@ -3004,11 +3107,11 @@ + esac + + if test "x$PKG_CONFIG_LIBDIR" != xno ; then +- echo "$as_me:3007: result: $PKG_CONFIG_LIBDIR" >&5 ++ echo "$as_me:3110: result: $PKG_CONFIG_LIBDIR" >&5 + echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 + fi + +-echo "$as_me:3011: checking if you want to build test-programs" >&5 ++echo "$as_me:3114: 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. +@@ -3018,10 +3121,10 @@ + else + cf_with_tests=yes + fi; +-echo "$as_me:3021: result: $cf_with_tests" >&5 ++echo "$as_me:3124: result: $cf_with_tests" >&5 + echo "${ECHO_T}$cf_with_tests" >&6 + +-echo "$as_me:3024: checking if we should assume mixed-case filenames" >&5 ++echo "$as_me:3127: 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. +@@ -3031,11 +3134,11 @@ + else + enable_mixedcase=auto + fi; +-echo "$as_me:3034: result: $enable_mixedcase" >&5 ++echo "$as_me:3137: result: $enable_mixedcase" >&5 + echo "${ECHO_T}$enable_mixedcase" >&6 + if test "$enable_mixedcase" = "auto" ; then + +-echo "$as_me:3038: checking if filesystem supports mixed-case filenames" >&5 ++echo "$as_me:3141: 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 +@@ -3062,7 +3165,7 @@ + fi + + fi +-echo "$as_me:3065: result: $cf_cv_mixedcase" >&5 ++echo "$as_me:3168: result: $cf_cv_mixedcase" >&5 + echo "${ECHO_T}$cf_cv_mixedcase" >&6 + test "$cf_cv_mixedcase" = yes && + cat >>confdefs.h <<\EOF +@@ -3080,7 +3183,7 @@ + fi + + # do this after mixed-case option (tags/TAGS is not as important as tic). +-echo "$as_me:3083: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "$as_me:3186: 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 +@@ -3100,11 +3203,11 @@ + rm -f conftest.make + fi + if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:3103: result: yes" >&5 ++ echo "$as_me:3206: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + SET_MAKE= + else +- echo "$as_me:3107: result: no" >&5 ++ echo "$as_me:3210: result: no" >&5 + echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" + fi +@@ -3113,7 +3216,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:3116: checking for $ac_word" >&5 ++echo "$as_me:3219: 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 +@@ -3128,7 +3231,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CTAGS="$ac_prog" +-echo "$as_me:3131: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3234: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3136,10 +3239,10 @@ + fi + CTAGS=$ac_cv_prog_CTAGS + if test -n "$CTAGS"; then +- echo "$as_me:3139: result: $CTAGS" >&5 ++ echo "$as_me:3242: result: $CTAGS" >&5 + echo "${ECHO_T}$CTAGS" >&6 + else +- echo "$as_me:3142: result: no" >&5 ++ echo "$as_me:3245: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3150,7 +3253,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:3153: checking for $ac_word" >&5 ++echo "$as_me:3256: 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 +@@ -3165,7 +3268,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ETAGS="$ac_prog" +-echo "$as_me:3168: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3271: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3173,10 +3276,10 @@ + fi + ETAGS=$ac_cv_prog_ETAGS + if test -n "$ETAGS"; then +- echo "$as_me:3176: result: $ETAGS" >&5 ++ echo "$as_me:3279: result: $ETAGS" >&5 + echo "${ECHO_T}$ETAGS" >&6 + else +- echo "$as_me:3179: result: no" >&5 ++ echo "$as_me:3282: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3185,7 +3288,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:3188: checking for $ac_word" >&5 ++echo "$as_me:3291: 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 +@@ -3200,7 +3303,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:3203: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3306: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3209,17 +3312,17 @@ + fi + MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS + if test -n "$MAKE_LOWER_TAGS"; then +- echo "$as_me:3212: result: $MAKE_LOWER_TAGS" >&5 ++ echo "$as_me:3315: result: $MAKE_LOWER_TAGS" >&5 + echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 + else +- echo "$as_me:3215: result: no" >&5 ++ echo "$as_me:3318: 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:3222: checking for $ac_word" >&5 ++echo "$as_me:3325: 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 +@@ -3234,7 +3337,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:3237: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3340: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3243,10 +3346,10 @@ + fi + MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS + if test -n "$MAKE_UPPER_TAGS"; then +- echo "$as_me:3246: result: $MAKE_UPPER_TAGS" >&5 ++ echo "$as_me:3349: result: $MAKE_UPPER_TAGS" >&5 + echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 + else +- echo "$as_me:3249: result: no" >&5 ++ echo "$as_me:3352: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3266,7 +3369,7 @@ + MAKE_LOWER_TAGS="#" + fi + +-echo "$as_me:3269: checking for makeflags variable" >&5 ++echo "$as_me:3372: 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 +@@ -3296,7 +3399,7 @@ + ;; + (*) + +-echo "${as_me:-configure}:3299: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ++echo "${as_me:-configure}:3402: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 + + ;; + esac +@@ -3304,13 +3407,13 @@ + rm -f cf_makeflags.tmp + + fi +-echo "$as_me:3307: result: $cf_cv_makeflags" >&5 ++echo "$as_me:3410: 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:3313: checking for $ac_word" >&5 ++echo "$as_me:3416: 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 +@@ -3325,7 +3428,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:3328: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3431: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3333,10 +3436,10 @@ + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- echo "$as_me:3336: result: $RANLIB" >&5 ++ echo "$as_me:3439: result: $RANLIB" >&5 + echo "${ECHO_T}$RANLIB" >&6 + else +- echo "$as_me:3339: result: no" >&5 ++ echo "$as_me:3442: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3345,7 +3448,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:3348: checking for $ac_word" >&5 ++echo "$as_me:3451: 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 +@@ -3360,7 +3463,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:3363: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3466: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3369,10 +3472,10 @@ + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- echo "$as_me:3372: result: $ac_ct_RANLIB" >&5 ++ echo "$as_me:3475: result: $ac_ct_RANLIB" >&5 + echo "${ECHO_T}$ac_ct_RANLIB" >&6 + else +- echo "$as_me:3375: result: no" >&5 ++ echo "$as_me:3478: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3384,7 +3487,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:3387: checking for $ac_word" >&5 ++echo "$as_me:3490: 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 +@@ -3399,7 +3502,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:3402: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3505: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3407,10 +3510,10 @@ + fi + LD=$ac_cv_prog_LD + if test -n "$LD"; then +- echo "$as_me:3410: result: $LD" >&5 ++ echo "$as_me:3513: result: $LD" >&5 + echo "${ECHO_T}$LD" >&6 + else +- echo "$as_me:3413: result: no" >&5 ++ echo "$as_me:3516: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3419,7 +3522,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:3422: checking for $ac_word" >&5 ++echo "$as_me:3525: 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 +@@ -3434,7 +3537,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:3437: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3540: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3443,10 +3546,10 @@ + fi + ac_ct_LD=$ac_cv_prog_ac_ct_LD + if test -n "$ac_ct_LD"; then +- echo "$as_me:3446: result: $ac_ct_LD" >&5 ++ echo "$as_me:3549: result: $ac_ct_LD" >&5 + echo "${ECHO_T}$ac_ct_LD" >&6 + else +- echo "$as_me:3449: result: no" >&5 ++ echo "$as_me:3552: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3458,7 +3561,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:3461: checking for $ac_word" >&5 ++echo "$as_me:3564: 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 +@@ -3473,7 +3576,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:3476: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3579: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3481,10 +3584,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:3484: result: $AR" >&5 ++ echo "$as_me:3587: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:3487: result: no" >&5 ++ echo "$as_me:3590: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3493,7 +3596,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:3496: checking for $ac_word" >&5 ++echo "$as_me:3599: 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 +@@ -3508,7 +3611,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:3511: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3614: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3517,10 +3620,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:3520: result: $ac_ct_AR" >&5 ++ echo "$as_me:3623: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:3523: result: no" >&5 ++ echo "$as_me:3626: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3532,7 +3635,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:3535: checking for $ac_word" >&5 ++echo "$as_me:3638: 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 +@@ -3547,7 +3650,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:3550: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3653: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3555,10 +3658,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:3558: result: $AR" >&5 ++ echo "$as_me:3661: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:3561: result: no" >&5 ++ echo "$as_me:3664: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3567,7 +3670,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:3570: checking for $ac_word" >&5 ++echo "$as_me:3673: 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 +@@ -3582,7 +3685,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:3585: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3688: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3591,10 +3694,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:3594: result: $ac_ct_AR" >&5 ++ echo "$as_me:3697: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:3597: result: no" >&5 ++ echo "$as_me:3700: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3603,7 +3706,7 @@ + AR="$ac_cv_prog_AR" + fi + +-echo "$as_me:3606: checking for options to update archives" >&5 ++echo "$as_me:3709: 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 +@@ -3626,13 +3729,13 @@ + rm -f conftest.a + + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:3735: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3635: \$? = $ac_status" >&5 ++ echo "$as_me:3738: \$? = $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 +@@ -3643,7 +3746,7 @@ + else + test -n "$verbose" && echo " cannot compile test-program" 1>&6 + +-echo "${as_me:-configure}:3646: testing cannot compile test-program ..." 1>&5 ++echo "${as_me:-configure}:3749: testing cannot compile test-program ..." 1>&5 + + break + fi +@@ -3651,7 +3754,7 @@ + rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext + + fi +-echo "$as_me:3654: result: $cf_cv_ar_flags" >&5 ++echo "$as_me:3757: result: $cf_cv_ar_flags" >&5 + echo "${ECHO_T}$cf_cv_ar_flags" >&6 + + if test -n "$ARFLAGS" ; then +@@ -3662,17 +3765,17 @@ + ARFLAGS=$cf_cv_ar_flags + fi + +- echo "$as_me:3665: checking for PATH separator" >&5 ++ echo "$as_me:3768: 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:3672: result: $PATH_SEPARATOR" >&5 ++ echo "$as_me:3775: result: $PATH_SEPARATOR" >&5 + echo "${ECHO_T}$PATH_SEPARATOR" >&6 + +-echo "$as_me:3675: checking if you have specified an install-prefix" >&5 ++echo "$as_me:3778: 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. +@@ -3685,7 +3788,7 @@ + ;; + esac + fi; +-echo "$as_me:3688: result: $DESTDIR" >&5 ++echo "$as_me:3791: result: $DESTDIR" >&5 + echo "${ECHO_T}$DESTDIR" >&6 + + ############################################################################### +@@ -3713,7 +3816,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:3716: checking for $ac_word" >&5 ++echo "$as_me:3819: 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 +@@ -3728,7 +3831,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:3731: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3834: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3736,10 +3839,10 @@ + fi + BUILD_CC=$ac_cv_prog_BUILD_CC + if test -n "$BUILD_CC"; then +- echo "$as_me:3739: result: $BUILD_CC" >&5 ++ echo "$as_me:3842: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + else +- echo "$as_me:3742: result: no" >&5 ++ echo "$as_me:3845: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3748,12 +3851,12 @@ + test -n "$BUILD_CC" || BUILD_CC="none" + + fi; +- echo "$as_me:3751: checking for native build C compiler" >&5 ++ echo "$as_me:3854: checking for native build C compiler" >&5 + echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 +- echo "$as_me:3753: result: $BUILD_CC" >&5 ++ echo "$as_me:3856: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + +- echo "$as_me:3756: checking for native build C preprocessor" >&5 ++ echo "$as_me:3859: 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. +@@ -3763,10 +3866,10 @@ + else + BUILD_CPP='${BUILD_CC} -E' + fi; +- echo "$as_me:3766: result: $BUILD_CPP" >&5 ++ echo "$as_me:3869: result: $BUILD_CPP" >&5 + echo "${ECHO_T}$BUILD_CPP" >&6 + +- echo "$as_me:3769: checking for native build C flags" >&5 ++ echo "$as_me:3872: 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. +@@ -3774,10 +3877,10 @@ + withval="$with_build_cflags" + BUILD_CFLAGS="$withval" + fi; +- echo "$as_me:3777: result: $BUILD_CFLAGS" >&5 ++ echo "$as_me:3880: result: $BUILD_CFLAGS" >&5 + echo "${ECHO_T}$BUILD_CFLAGS" >&6 + +- echo "$as_me:3780: checking for native build C preprocessor-flags" >&5 ++ echo "$as_me:3883: 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. +@@ -3785,10 +3888,10 @@ + withval="$with_build_cppflags" + BUILD_CPPFLAGS="$withval" + fi; +- echo "$as_me:3788: result: $BUILD_CPPFLAGS" >&5 ++ echo "$as_me:3891: result: $BUILD_CPPFLAGS" >&5 + echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 + +- echo "$as_me:3791: checking for native build linker-flags" >&5 ++ echo "$as_me:3894: 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. +@@ -3796,10 +3899,10 @@ + withval="$with_build_ldflags" + BUILD_LDFLAGS="$withval" + fi; +- echo "$as_me:3799: result: $BUILD_LDFLAGS" >&5 ++ echo "$as_me:3902: result: $BUILD_LDFLAGS" >&5 + echo "${ECHO_T}$BUILD_LDFLAGS" >&6 + +- echo "$as_me:3802: checking for native build linker-libraries" >&5 ++ echo "$as_me:3905: 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. +@@ -3807,7 +3910,7 @@ + withval="$with_build_libs" + BUILD_LIBS="$withval" + fi; +- echo "$as_me:3810: result: $BUILD_LIBS" >&5 ++ echo "$as_me:3913: result: $BUILD_LIBS" >&5 + echo "${ECHO_T}$BUILD_LIBS" >&6 + + # this assumes we're on Unix. +@@ -3817,7 +3920,7 @@ + : ${BUILD_CC:='${CC}'} + + if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then +- { { echo "$as_me:3820: error: Cross-build requires two compilers. ++ { { echo "$as_me:3923: 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;} +@@ -3842,7 +3945,7 @@ + ### shared, for example. + cf_list_models="" + +-echo "$as_me:3845: checking if you want to build shared C-objects" >&5 ++echo "$as_me:3948: checking if you want to build shared C-objects" >&5 + echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6 + + # Check whether --with-shared or --without-shared was given. +@@ -3852,27 +3955,27 @@ + else + with_shared=no + fi; +-echo "$as_me:3855: result: $with_shared" >&5 ++echo "$as_me:3958: result: $with_shared" >&5 + echo "${ECHO_T}$with_shared" >&6 + test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" + +-echo "$as_me:3859: checking for specified models" >&5 ++echo "$as_me:3962: checking for specified models" >&5 + echo $ECHO_N "checking for specified models... $ECHO_C" >&6 + test -z "$cf_list_models" && cf_list_models=normal +-echo "$as_me:3862: result: $cf_list_models" >&5 ++echo "$as_me:3965: 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:3867: checking for default model" >&5 ++echo "$as_me:3970: 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:3870: result: $DFT_LWR_MODEL" >&5 ++echo "$as_me:3973: result: $DFT_LWR_MODEL" >&5 + echo "${ECHO_T}$DFT_LWR_MODEL" >&6 + + DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +-echo "$as_me:3875: checking for specific curses-directory" >&5 ++echo "$as_me:3978: 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. +@@ -3882,7 +3985,7 @@ + else + cf_cv_curses_dir=no + fi; +-echo "$as_me:3885: result: $cf_cv_curses_dir" >&5 ++echo "$as_me:3988: 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" ) +@@ -3913,7 +4016,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:3916: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:4019: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -3949,7 +4052,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +-#line 3952 "configure" ++#line 4055 "configure" + #include "confdefs.h" + #include + int +@@ -3961,16 +4064,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3964: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4067: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3967: \$? = $ac_status" >&5 ++ echo "$as_me:4070: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3970: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4073: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3973: \$? = $ac_status" >&5 ++ echo "$as_me:4076: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -3987,7 +4090,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}:3990: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:4093: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -4023,7 +4126,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}:4026: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:4129: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -4038,13 +4141,13 @@ + cf_have_ncuconfig=no + + if test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:4041: checking pkg-config for $cf_ncuconfig_root" >&5 ++ echo "$as_me:4144: 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:4044: result: yes" >&5 ++ echo "$as_me:4147: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:4047: checking if the $cf_ncuconfig_root package files work" >&5 ++ echo "$as_me:4150: 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 + +@@ -4166,7 +4269,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 4169 "configure" ++#line 4272 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -4178,37 +4281,37 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:4181: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4284: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4184: \$? = $ac_status" >&5 ++ echo "$as_me:4287: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:4187: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4290: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4190: \$? = $ac_status" >&5 ++ echo "$as_me:4293: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe + else + cat >conftest.$ac_ext <<_ACEOF +-#line 4196 "configure" ++#line 4299 "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:4203: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4306: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4206: \$? = $ac_status" >&5 ++ echo "$as_me:4309: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:4208: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4311: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4211: \$? = $ac_status" >&5 ++ echo "$as_me:4314: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_ncuconfig=yes + else +@@ -4225,7 +4328,7 @@ + cf_have_ncuconfig=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:4228: result: $cf_have_ncuconfig" >&5 ++ echo "$as_me:4331: 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" +@@ -4241,7 +4344,7 @@ + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + +-echo "$as_me:4244: checking for terminfo header" >&5 ++echo "$as_me:4347: 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 +@@ -4259,7 +4362,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 4262 "configure" ++#line 4365 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -4274,16 +4377,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4277: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4380: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4280: \$? = $ac_status" >&5 ++ echo "$as_me:4383: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4283: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4386: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4286: \$? = $ac_status" >&5 ++ echo "$as_me:4389: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -4299,7 +4402,7 @@ + done + + fi +-echo "$as_me:4302: result: $cf_cv_term_header" >&5 ++echo "$as_me:4405: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -4334,7 +4437,7 @@ + fi + + else +- echo "$as_me:4337: result: no" >&5 ++ echo "$as_me:4440: result: no" >&5 + echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +@@ -4350,7 +4453,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:4353: checking for $ac_word" >&5 ++echo "$as_me:4456: 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 +@@ -4365,7 +4468,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:4368: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4471: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4373,10 +4476,10 @@ + fi + NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:4376: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:4479: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:4379: result: no" >&5 ++ echo "$as_me:4482: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4389,7 +4492,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:4392: checking for $ac_word" >&5 ++echo "$as_me:4495: 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 +@@ -4404,7 +4507,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:4407: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4510: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4412,10 +4515,10 @@ + fi + ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG + if test -n "$ac_ct_NCURSES_CONFIG"; then +- echo "$as_me:4415: result: $ac_ct_NCURSES_CONFIG" >&5 ++ echo "$as_me:4518: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:4418: result: no" >&5 ++ echo "$as_me:4521: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4544,7 +4647,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:4547: checking if we have identified curses headers" >&5 ++echo "$as_me:4650: 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 +@@ -4556,7 +4659,7 @@ + curses.h ncurses/curses.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 4559 "configure" ++#line 4662 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -4568,16 +4671,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4571: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4674: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4574: \$? = $ac_status" >&5 ++ echo "$as_me:4677: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4577: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4680: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4580: \$? = $ac_status" >&5 ++ echo "$as_me:4683: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -4588,11 +4691,11 @@ + done + + fi +-echo "$as_me:4591: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:4694: 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:4595: error: No curses header-files found" >&5 ++ { { echo "$as_me:4698: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -4602,23 +4705,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:4605: checking for $ac_header" >&5 ++echo "$as_me:4708: 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 4611 "configure" ++#line 4714 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:4615: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:4718: \"$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:4621: \$? = $ac_status" >&5 ++ echo "$as_me:4724: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -4637,7 +4740,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:4640: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:4743: 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 4696 "configure" ++#line 4799 "configure" + #include "confdefs.h" + #include + int +@@ -4705,16 +4808,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4708: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4811: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4711: \$? = $ac_status" >&5 ++ echo "$as_me:4814: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4714: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4817: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4717: \$? = $ac_status" >&5 ++ echo "$as_me:4820: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -4731,7 +4834,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}:4734: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:4837: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -4750,7 +4853,7 @@ + + } + +-echo "$as_me:4753: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:4856: 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 +@@ -4762,7 +4865,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 4765 "configure" ++#line 4868 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -4786,16 +4889,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4789: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4892: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4792: \$? = $ac_status" >&5 ++ echo "$as_me:4895: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4795: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4898: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4798: \$? = $ac_status" >&5 ++ echo "$as_me:4901: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -4810,14 +4913,14 @@ + done + + fi +-echo "$as_me:4813: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:4916: 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:4820: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:4923: 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 +@@ -4938,7 +5041,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +-#line 4941 "configure" ++#line 5044 "configure" + #include "confdefs.h" + #include + int +@@ -4950,16 +5053,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4953: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5056: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4956: \$? = $ac_status" >&5 ++ echo "$as_me:5059: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4959: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5062: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4962: \$? = $ac_status" >&5 ++ echo "$as_me:5065: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -4976,7 +5079,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}:4979: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:5082: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -4999,7 +5102,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 5002 "configure" ++#line 5105 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -5023,16 +5126,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5026: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5129: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5029: \$? = $ac_status" >&5 ++ echo "$as_me:5132: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5032: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5135: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5035: \$? = $ac_status" >&5 ++ echo "$as_me:5138: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -5053,12 +5156,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5056: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5159: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:5061: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:5164: 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%/[^/]*$%%'` +@@ -5094,7 +5197,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +-#line 5097 "configure" ++#line 5200 "configure" + #include "confdefs.h" + #include + int +@@ -5106,16 +5209,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5109: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5212: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5112: \$? = $ac_status" >&5 ++ echo "$as_me:5215: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5115: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5218: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5118: \$? = $ac_status" >&5 ++ echo "$as_me:5221: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -5132,7 +5235,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}:5135: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:5238: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -5180,7 +5283,7 @@ + ;; + esac + +-echo "$as_me:5183: checking for terminfo header" >&5 ++echo "$as_me:5286: 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 +@@ -5198,7 +5301,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 5201 "configure" ++#line 5304 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -5213,16 +5316,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5216: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5319: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5219: \$? = $ac_status" >&5 ++ echo "$as_me:5322: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5222: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5325: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5225: \$? = $ac_status" >&5 ++ echo "$as_me:5328: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -5238,7 +5341,7 @@ + done + + fi +-echo "$as_me:5241: result: $cf_cv_term_header" >&5 ++echo "$as_me:5344: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -5276,7 +5379,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:5279: checking for ncurses version" >&5 ++echo "$as_me:5382: 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 +@@ -5302,10 +5405,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:5305: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:5408: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:5308: \$? = $ac_status" >&5 ++ echo "$as_me:5411: \$? = $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%".*%%'` +@@ -5315,7 +5418,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 5318 "configure" ++#line 5421 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -5340,15 +5443,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:5343: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5446: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5346: \$? = $ac_status" >&5 ++ echo "$as_me:5449: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:5348: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5451: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5351: \$? = $ac_status" >&5 ++ echo "$as_me:5454: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -5362,7 +5465,7 @@ + rm -f $cf_tempfile + + fi +-echo "$as_me:5365: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:5468: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || + cat >>confdefs.h <<\EOF +@@ -5375,7 +5478,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:5378: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:5481: 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 +@@ -5383,7 +5486,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5386 "configure" ++#line 5489 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -5402,16 +5505,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5405: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5508: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5408: \$? = $ac_status" >&5 ++ echo "$as_me:5511: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5411: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5514: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5414: \$? = $ac_status" >&5 ++ echo "$as_me:5517: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -5422,10 +5525,10 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:5425: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:5528: 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:5428: checking for initscr in -lgpm" >&5 ++ echo "$as_me:5531: 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 +@@ -5433,7 +5536,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5436 "configure" ++#line 5539 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -5452,16 +5555,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5455: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5558: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5458: \$? = $ac_status" >&5 ++ echo "$as_me:5561: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5461: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5564: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5464: \$? = $ac_status" >&5 ++ echo "$as_me:5567: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -5472,7 +5575,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:5475: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:5578: 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" +@@ -5487,7 +5590,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:5490: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:5593: 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 +@@ -5495,7 +5598,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5498 "configure" ++#line 5601 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -5514,16 +5617,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5517: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5620: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5520: \$? = $ac_status" >&5 ++ echo "$as_me:5623: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5523: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5626: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5526: \$? = $ac_status" >&5 ++ echo "$as_me:5629: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -5534,7 +5637,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:5537: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:5640: 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" +@@ -5583,13 +5686,13 @@ + + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + cf_libdir="" +- echo "$as_me:5586: checking for initscr" >&5 ++ echo "$as_me:5689: 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 5592 "configure" ++#line 5695 "configure" + #include "confdefs.h" + #define initscr autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -5620,16 +5723,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5623: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5726: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5626: \$? = $ac_status" >&5 ++ echo "$as_me:5729: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5629: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5732: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5632: \$? = $ac_status" >&5 ++ echo "$as_me:5735: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_initscr=yes + else +@@ -5639,18 +5742,18 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:5642: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:5745: 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:5649: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:5752: 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 5653 "configure" ++#line 5756 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -5662,25 +5765,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5665: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5768: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5668: \$? = $ac_status" >&5 ++ echo "$as_me:5771: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5671: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5774: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5674: \$? = $ac_status" >&5 ++ echo "$as_me:5777: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:5676: result: yes" >&5 ++ echo "$as_me:5779: 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:5683: result: no" >&5 ++echo "$as_me:5786: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -5748,11 +5851,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:5751: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:5854: 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 5755 "configure" ++#line 5858 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -5764,25 +5867,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5767: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5870: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5770: \$? = $ac_status" >&5 ++ echo "$as_me:5873: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5773: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5876: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5776: \$? = $ac_status" >&5 ++ echo "$as_me:5879: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:5778: result: yes" >&5 ++ echo "$as_me:5881: 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:5785: result: no" >&5 ++echo "$as_me:5888: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -5797,7 +5900,7 @@ + eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root + + if test $cf_found_library = no ; then +- { { echo "$as_me:5800: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:5903: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5805,7 +5908,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:5808: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:5911: 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 +@@ -5815,7 +5918,7 @@ + fi + done + cat >conftest.$ac_ext <<_ACEOF +-#line 5818 "configure" ++#line 5921 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -5827,23 +5930,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5830: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5933: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5833: \$? = $ac_status" >&5 ++ echo "$as_me:5936: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5836: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5939: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5839: \$? = $ac_status" >&5 ++ echo "$as_me:5942: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:5841: result: yes" >&5 ++ echo "$as_me:5944: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:5846: result: no" >&5 ++echo "$as_me:5949: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -5861,7 +5964,7 @@ + NCURSES_CONFIG=none + fi + +-echo "$as_me:5864: checking if you want wide-character code" >&5 ++echo "$as_me:5967: 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. +@@ -5871,11 +5974,11 @@ + else + with_widec=no + fi; +-echo "$as_me:5874: result: $with_widec" >&5 ++echo "$as_me:5977: result: $with_widec" >&5 + echo "${ECHO_T}$with_widec" >&6 + if test "$with_widec" = yes ; then + +-echo "$as_me:5878: checking for multibyte character support" >&5 ++echo "$as_me:5981: 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 +@@ -5883,7 +5986,7 @@ + + cf_save_LIBS="$LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5886 "configure" ++#line 5989 "configure" + #include "confdefs.h" + + #include +@@ -5896,16 +5999,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5899: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6002: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5902: \$? = $ac_status" >&5 ++ echo "$as_me:6005: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5905: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6008: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5908: \$? = $ac_status" >&5 ++ echo "$as_me:6011: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_utf8_lib=yes + else +@@ -5917,12 +6020,12 @@ + cf_cv_header_path_utf8= + cf_cv_library_path_utf8= + +-echo "${as_me:-configure}:5920: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:6023: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 5925 "configure" ++#line 6028 "configure" + #include "confdefs.h" + + #include +@@ -5935,16 +6038,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5938: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6041: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5941: \$? = $ac_status" >&5 ++ echo "$as_me:6044: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5944: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6047: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5947: \$? = $ac_status" >&5 ++ echo "$as_me:6050: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -5958,7 +6061,7 @@ + LIBS="-lutf8 $cf_save_LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 5961 "configure" ++#line 6064 "configure" + #include "confdefs.h" + + #include +@@ -5971,16 +6074,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5974: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6077: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5977: \$? = $ac_status" >&5 ++ echo "$as_me:6080: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5980: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6083: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5983: \$? = $ac_status" >&5 ++ echo "$as_me:6086: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -5997,9 +6100,9 @@ + + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 + +-echo "${as_me:-configure}:6000: testing find linkage for utf8 library ..." 1>&5 ++echo "${as_me:-configure}:6103: testing find linkage for utf8 library ..." 1>&5 + +-echo "${as_me:-configure}:6002: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:6105: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -6090,7 +6193,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}:6093: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:6196: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS" + +@@ -6098,7 +6201,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" + + cat >conftest.$ac_ext <<_ACEOF +-#line 6101 "configure" ++#line 6204 "configure" + #include "confdefs.h" + + #include +@@ -6111,21 +6214,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6114: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6217: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6117: \$? = $ac_status" >&5 ++ echo "$as_me:6220: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6120: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6223: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6123: \$? = $ac_status" >&5 ++ echo "$as_me:6226: \$? = $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}:6128: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:6231: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -6143,7 +6246,7 @@ + + if test "$cf_cv_find_linkage_utf8" = maybe ; then + +-echo "${as_me:-configure}:6146: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:6249: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -6218,13 +6321,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}:6221: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:6324: 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 6227 "configure" ++#line 6330 "configure" + #include "confdefs.h" + + #include +@@ -6237,21 +6340,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6240: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6343: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6243: \$? = $ac_status" >&5 ++ echo "$as_me:6346: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6246: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6349: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6249: \$? = $ac_status" >&5 ++ echo "$as_me:6352: \$? = $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}:6254: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:6357: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=yes + cf_cv_library_file_utf8="-lutf8" +@@ -6293,7 +6396,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:6296: result: $cf_cv_utf8_lib" >&5 ++echo "$as_me:6399: 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 +@@ -6331,7 +6434,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +-#line 6334 "configure" ++#line 6437 "configure" + #include "confdefs.h" + #include + int +@@ -6343,16 +6446,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6346: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6449: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6349: \$? = $ac_status" >&5 ++ echo "$as_me:6452: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6352: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6455: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6355: \$? = $ac_status" >&5 ++ echo "$as_me:6458: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -6369,7 +6472,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}:6372: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:6475: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -6405,7 +6508,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}:6408: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:6511: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -6435,13 +6538,13 @@ + cf_have_ncuconfig=no + + if test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:6438: checking pkg-config for $cf_ncuconfig_root" >&5 ++ echo "$as_me:6541: 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:6441: result: yes" >&5 ++ echo "$as_me:6544: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:6444: checking if the $cf_ncuconfig_root package files work" >&5 ++ echo "$as_me:6547: 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 + +@@ -6563,7 +6666,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 6566 "configure" ++#line 6669 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6575,37 +6678,37 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6578: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6681: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6581: \$? = $ac_status" >&5 ++ echo "$as_me:6684: \$? = $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:6687: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6587: \$? = $ac_status" >&5 ++ echo "$as_me:6690: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe + else + cat >conftest.$ac_ext <<_ACEOF +-#line 6593 "configure" ++#line 6696 "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:6600: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6703: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6603: \$? = $ac_status" >&5 ++ echo "$as_me:6706: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:6605: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6708: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6608: \$? = $ac_status" >&5 ++ echo "$as_me:6711: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_ncuconfig=yes + else +@@ -6622,7 +6725,7 @@ + cf_have_ncuconfig=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:6625: result: $cf_have_ncuconfig" >&5 ++ echo "$as_me:6728: 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" +@@ -6638,7 +6741,7 @@ + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + +-echo "$as_me:6641: checking for terminfo header" >&5 ++echo "$as_me:6744: 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 +@@ -6656,7 +6759,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 6659 "configure" ++#line 6762 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -6671,16 +6774,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6674: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6777: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6677: \$? = $ac_status" >&5 ++ echo "$as_me:6780: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6680: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6783: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6683: \$? = $ac_status" >&5 ++ echo "$as_me:6786: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -6696,7 +6799,7 @@ + done + + fi +-echo "$as_me:6699: result: $cf_cv_term_header" >&5 ++echo "$as_me:6802: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -6731,7 +6834,7 @@ + fi + + else +- echo "$as_me:6734: result: no" >&5 ++ echo "$as_me:6837: result: no" >&5 + echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +@@ -6747,7 +6850,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:6750: checking for $ac_word" >&5 ++echo "$as_me:6853: 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 +@@ -6762,7 +6865,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:6765: found $ac_dir/$ac_word" >&5 ++echo "$as_me:6868: found $ac_dir/$ac_word" >&5 + break + done + +@@ -6770,10 +6873,10 @@ + fi + NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:6773: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:6876: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:6776: result: no" >&5 ++ echo "$as_me:6879: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -6786,7 +6889,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:6789: checking for $ac_word" >&5 ++echo "$as_me:6892: 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 +@@ -6801,7 +6904,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:6804: found $ac_dir/$ac_word" >&5 ++echo "$as_me:6907: found $ac_dir/$ac_word" >&5 + break + done + +@@ -6809,10 +6912,10 @@ + fi + ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG + if test -n "$ac_ct_NCURSES_CONFIG"; then +- echo "$as_me:6812: result: $ac_ct_NCURSES_CONFIG" >&5 ++ echo "$as_me:6915: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:6815: result: no" >&5 ++ echo "$as_me:6918: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -6941,7 +7044,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:6944: checking if we have identified curses headers" >&5 ++echo "$as_me:7047: 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 +@@ -6953,7 +7056,7 @@ + curses.h ncursesw/curses.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 6956 "configure" ++#line 7059 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -6965,16 +7068,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6968: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7071: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6971: \$? = $ac_status" >&5 ++ echo "$as_me:7074: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6974: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7077: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6977: \$? = $ac_status" >&5 ++ echo "$as_me:7080: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -6985,11 +7088,11 @@ + done + + fi +-echo "$as_me:6988: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:7091: 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:6992: error: No curses header-files found" >&5 ++ { { echo "$as_me:7095: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -6999,23 +7102,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:7002: checking for $ac_header" >&5 ++echo "$as_me:7105: 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 7008 "configure" ++#line 7111 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:7012: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:7115: \"$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:7018: \$? = $ac_status" >&5 ++ echo "$as_me:7121: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -7034,7 +7137,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:7037: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:7140: 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 7093 "configure" ++#line 7196 "configure" + #include "confdefs.h" + #include + int +@@ -7102,16 +7205,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7105: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7208: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7108: \$? = $ac_status" >&5 ++ echo "$as_me:7211: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7111: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7214: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7114: \$? = $ac_status" >&5 ++ echo "$as_me:7217: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -7128,7 +7231,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}:7131: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:7234: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -7147,7 +7250,7 @@ + + } + +-echo "$as_me:7150: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:7253: 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 +@@ -7159,7 +7262,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 7162 "configure" ++#line 7265 "configure" + #include "confdefs.h" + + #define _XOPEN_SOURCE_EXTENDED +@@ -7191,16 +7294,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7194: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7297: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7197: \$? = $ac_status" >&5 ++ echo "$as_me:7300: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7200: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7303: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7203: \$? = $ac_status" >&5 ++ echo "$as_me:7306: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -7215,14 +7318,14 @@ + done + + fi +-echo "$as_me:7218: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:7321: 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:7225: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:7328: 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 +@@ -7343,7 +7446,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +-#line 7346 "configure" ++#line 7449 "configure" + #include "confdefs.h" + #include + int +@@ -7355,16 +7458,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7358: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7461: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7361: \$? = $ac_status" >&5 ++ echo "$as_me:7464: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7364: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7467: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7367: \$? = $ac_status" >&5 ++ echo "$as_me:7470: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -7381,7 +7484,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}:7384: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:7487: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -7404,7 +7507,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 7407 "configure" ++#line 7510 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -7428,16 +7531,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7431: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7534: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7434: \$? = $ac_status" >&5 ++ echo "$as_me:7537: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7437: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7540: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7440: \$? = $ac_status" >&5 ++ echo "$as_me:7543: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -7458,12 +7561,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:7461: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:7564: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:7466: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:7569: 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%/[^/]*$%%'` +@@ -7499,7 +7602,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +-#line 7502 "configure" ++#line 7605 "configure" + #include "confdefs.h" + #include + int +@@ -7511,16 +7614,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7514: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7617: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7517: \$? = $ac_status" >&5 ++ echo "$as_me:7620: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7520: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7623: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7523: \$? = $ac_status" >&5 ++ echo "$as_me:7626: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -7537,7 +7640,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}:7540: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:7643: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -7585,7 +7688,7 @@ + ;; + esac + +-echo "$as_me:7588: checking for terminfo header" >&5 ++echo "$as_me:7691: 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 +@@ -7603,7 +7706,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 7606 "configure" ++#line 7709 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -7618,16 +7721,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7621: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7724: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7624: \$? = $ac_status" >&5 ++ echo "$as_me:7727: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7627: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7730: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7630: \$? = $ac_status" >&5 ++ echo "$as_me:7733: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -7643,7 +7746,7 @@ + done + + fi +-echo "$as_me:7646: result: $cf_cv_term_header" >&5 ++echo "$as_me:7749: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -7681,7 +7784,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:7684: checking for ncurses version" >&5 ++echo "$as_me:7787: 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 +@@ -7707,10 +7810,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:7710: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:7813: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:7713: \$? = $ac_status" >&5 ++ echo "$as_me:7816: \$? = $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%".*%%'` +@@ -7720,7 +7823,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 7723 "configure" ++#line 7826 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -7745,15 +7848,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:7748: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7851: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7751: \$? = $ac_status" >&5 ++ echo "$as_me:7854: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:7753: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7856: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7756: \$? = $ac_status" >&5 ++ echo "$as_me:7859: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -7767,7 +7870,7 @@ + rm -f $cf_tempfile + + fi +-echo "$as_me:7770: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:7873: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || + cat >>confdefs.h <<\EOF +@@ -7780,7 +7883,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:7783: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:7886: 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 +@@ -7788,7 +7891,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7791 "configure" ++#line 7894 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7807,16 +7910,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7810: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7913: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7813: \$? = $ac_status" >&5 ++ echo "$as_me:7916: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7816: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7919: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7819: \$? = $ac_status" >&5 ++ echo "$as_me:7922: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -7827,10 +7930,10 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7830: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:7933: 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:7833: checking for initscr in -lgpm" >&5 ++ echo "$as_me:7936: 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 +@@ -7838,7 +7941,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7841 "configure" ++#line 7944 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7857,16 +7960,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7860: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7963: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7863: \$? = $ac_status" >&5 ++ echo "$as_me:7966: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7866: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7969: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7869: \$? = $ac_status" >&5 ++ echo "$as_me:7972: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -7877,7 +7980,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7880: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:7983: 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" +@@ -7892,7 +7995,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:7895: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:7998: 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 +@@ -7900,7 +8003,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7903 "configure" ++#line 8006 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7919,16 +8022,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7922: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8025: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7925: \$? = $ac_status" >&5 ++ echo "$as_me:8028: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7928: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8031: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7931: \$? = $ac_status" >&5 ++ echo "$as_me:8034: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -7939,7 +8042,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7942: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:8045: 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" +@@ -7988,13 +8091,13 @@ + + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + cf_libdir="" +- echo "$as_me:7991: checking for initscr" >&5 ++ echo "$as_me:8094: 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 7997 "configure" ++#line 8100 "configure" + #include "confdefs.h" + #define initscr autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -8025,16 +8128,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8028: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8131: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8031: \$? = $ac_status" >&5 ++ echo "$as_me:8134: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8034: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8137: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8037: \$? = $ac_status" >&5 ++ echo "$as_me:8140: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_initscr=yes + else +@@ -8044,18 +8147,18 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:8047: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:8150: 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:8054: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:8157: 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 8058 "configure" ++#line 8161 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -8067,25 +8170,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8070: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8173: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8073: \$? = $ac_status" >&5 ++ echo "$as_me:8176: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8076: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8179: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8079: \$? = $ac_status" >&5 ++ echo "$as_me:8182: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:8081: result: yes" >&5 ++ echo "$as_me:8184: 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:8088: result: no" >&5 ++echo "$as_me:8191: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -8153,11 +8256,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:8156: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:8259: 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 8160 "configure" ++#line 8263 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -8169,25 +8272,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8172: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8275: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8175: \$? = $ac_status" >&5 ++ echo "$as_me:8278: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8178: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8281: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8181: \$? = $ac_status" >&5 ++ echo "$as_me:8284: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:8183: result: yes" >&5 ++ echo "$as_me:8286: 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:8190: result: no" >&5 ++echo "$as_me:8293: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -8202,7 +8305,7 @@ + eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root + + if test $cf_found_library = no ; then +- { { echo "$as_me:8205: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:8308: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -8210,7 +8313,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:8213: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:8316: 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 +@@ -8220,7 +8323,7 @@ + fi + done + cat >conftest.$ac_ext <<_ACEOF +-#line 8223 "configure" ++#line 8326 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -8232,23 +8335,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8235: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8338: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8238: \$? = $ac_status" >&5 ++ echo "$as_me:8341: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8241: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8344: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8244: \$? = $ac_status" >&5 ++ echo "$as_me:8347: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:8246: result: yes" >&5 ++ echo "$as_me:8349: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:8251: result: no" >&5 ++echo "$as_me:8354: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -8272,13 +8375,13 @@ + cf_have_ncuconfig=no + + if test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:8275: checking pkg-config for $cf_ncuconfig_root" >&5 ++ echo "$as_me:8378: 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:8278: result: yes" >&5 ++ echo "$as_me:8381: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:8281: checking if the $cf_ncuconfig_root package files work" >&5 ++ echo "$as_me:8384: 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 + +@@ -8400,7 +8503,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 8403 "configure" ++#line 8506 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -8412,37 +8515,37 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8415: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8518: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8418: \$? = $ac_status" >&5 ++ echo "$as_me:8521: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8421: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8524: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8424: \$? = $ac_status" >&5 ++ echo "$as_me:8527: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe + else + cat >conftest.$ac_ext <<_ACEOF +-#line 8430 "configure" ++#line 8533 "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:8437: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8540: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8440: \$? = $ac_status" >&5 ++ echo "$as_me:8543: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:8442: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8545: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8445: \$? = $ac_status" >&5 ++ echo "$as_me:8548: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_ncuconfig=yes + else +@@ -8459,7 +8562,7 @@ + cf_have_ncuconfig=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:8462: result: $cf_have_ncuconfig" >&5 ++ echo "$as_me:8565: 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" +@@ -8475,7 +8578,7 @@ + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + +-echo "$as_me:8478: checking for terminfo header" >&5 ++echo "$as_me:8581: 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 +@@ -8493,7 +8596,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 8496 "configure" ++#line 8599 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -8508,16 +8611,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8511: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8614: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8514: \$? = $ac_status" >&5 ++ echo "$as_me:8617: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8517: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8620: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8520: \$? = $ac_status" >&5 ++ echo "$as_me:8623: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -8533,7 +8636,7 @@ + done + + fi +-echo "$as_me:8536: result: $cf_cv_term_header" >&5 ++echo "$as_me:8639: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -8568,7 +8671,7 @@ + fi + + else +- echo "$as_me:8571: result: no" >&5 ++ echo "$as_me:8674: result: no" >&5 + echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +@@ -8584,7 +8687,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:8587: checking for $ac_word" >&5 ++echo "$as_me:8690: 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 +@@ -8599,7 +8702,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:8602: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8705: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8607,10 +8710,10 @@ + fi + NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:8610: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:8713: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:8613: result: no" >&5 ++ echo "$as_me:8716: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8623,7 +8726,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:8626: checking for $ac_word" >&5 ++echo "$as_me:8729: 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 +@@ -8638,7 +8741,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:8641: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8744: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8646,10 +8749,10 @@ + fi + ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG + if test -n "$ac_ct_NCURSES_CONFIG"; then +- echo "$as_me:8649: result: $ac_ct_NCURSES_CONFIG" >&5 ++ echo "$as_me:8752: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:8652: result: no" >&5 ++ echo "$as_me:8755: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8778,7 +8881,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:8781: checking if we have identified curses headers" >&5 ++echo "$as_me:8884: 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 +@@ -8790,7 +8893,7 @@ + curses.h ncurses/curses.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 8793 "configure" ++#line 8896 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -8802,16 +8905,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8805: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8908: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8808: \$? = $ac_status" >&5 ++ echo "$as_me:8911: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8811: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8914: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8814: \$? = $ac_status" >&5 ++ echo "$as_me:8917: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -8822,11 +8925,11 @@ + done + + fi +-echo "$as_me:8825: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:8928: 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:8829: error: No curses header-files found" >&5 ++ { { echo "$as_me:8932: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -8836,23 +8939,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:8839: checking for $ac_header" >&5 ++echo "$as_me:8942: 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 8845 "configure" ++#line 8948 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:8849: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:8952: \"$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:8855: \$? = $ac_status" >&5 ++ echo "$as_me:8958: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -8871,7 +8974,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:8874: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:8977: 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 8930 "configure" ++#line 9033 "configure" + #include "confdefs.h" + #include + int +@@ -8939,16 +9042,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8942: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9045: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8945: \$? = $ac_status" >&5 ++ echo "$as_me:9048: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8948: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9051: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8951: \$? = $ac_status" >&5 ++ echo "$as_me:9054: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -8965,7 +9068,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}:8968: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:9071: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8984,7 +9087,7 @@ + + } + +-echo "$as_me:8987: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:9090: 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 +@@ -8996,7 +9099,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 8999 "configure" ++#line 9102 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -9020,16 +9123,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9023: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9126: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9026: \$? = $ac_status" >&5 ++ echo "$as_me:9129: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9029: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9132: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9032: \$? = $ac_status" >&5 ++ echo "$as_me:9135: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -9044,14 +9147,14 @@ + done + + fi +-echo "$as_me:9047: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:9150: 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:9054: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:9157: 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 +@@ -9172,7 +9275,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +-#line 9175 "configure" ++#line 9278 "configure" + #include "confdefs.h" + #include + int +@@ -9184,16 +9287,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9187: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9290: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9190: \$? = $ac_status" >&5 ++ echo "$as_me:9293: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9193: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9296: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9196: \$? = $ac_status" >&5 ++ echo "$as_me:9299: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -9210,7 +9313,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}:9213: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:9316: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -9233,7 +9336,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 9236 "configure" ++#line 9339 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -9257,16 +9360,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9260: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9363: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9263: \$? = $ac_status" >&5 ++ echo "$as_me:9366: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9266: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9369: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9269: \$? = $ac_status" >&5 ++ echo "$as_me:9372: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -9287,12 +9390,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9290: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9393: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:9295: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:9398: 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%/[^/]*$%%'` +@@ -9328,7 +9431,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +-#line 9331 "configure" ++#line 9434 "configure" + #include "confdefs.h" + #include + int +@@ -9340,16 +9443,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9343: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9446: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9346: \$? = $ac_status" >&5 ++ echo "$as_me:9449: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9349: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9452: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9352: \$? = $ac_status" >&5 ++ echo "$as_me:9455: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -9366,7 +9469,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}:9369: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:9472: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -9414,7 +9517,7 @@ + ;; + esac + +-echo "$as_me:9417: checking for terminfo header" >&5 ++echo "$as_me:9520: 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 +@@ -9432,7 +9535,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 9435 "configure" ++#line 9538 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -9447,16 +9550,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9450: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9553: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9453: \$? = $ac_status" >&5 ++ echo "$as_me:9556: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9456: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9559: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9459: \$? = $ac_status" >&5 ++ echo "$as_me:9562: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -9472,7 +9575,7 @@ + done + + fi +-echo "$as_me:9475: result: $cf_cv_term_header" >&5 ++echo "$as_me:9578: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -9510,7 +9613,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:9513: checking for ncurses version" >&5 ++echo "$as_me:9616: 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 +@@ -9536,10 +9639,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:9539: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:9642: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:9542: \$? = $ac_status" >&5 ++ echo "$as_me:9645: \$? = $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%".*%%'` +@@ -9549,7 +9652,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 9552 "configure" ++#line 9655 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -9574,15 +9677,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:9577: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9680: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9580: \$? = $ac_status" >&5 ++ echo "$as_me:9683: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:9582: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9685: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9585: \$? = $ac_status" >&5 ++ echo "$as_me:9688: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -9596,7 +9699,7 @@ + rm -f $cf_tempfile + + fi +-echo "$as_me:9599: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:9702: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || + cat >>confdefs.h <<\EOF +@@ -9609,7 +9712,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:9612: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:9715: 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 +@@ -9617,7 +9720,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 9620 "configure" ++#line 9723 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -9636,16 +9739,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9639: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9742: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9642: \$? = $ac_status" >&5 ++ echo "$as_me:9745: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9645: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9748: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9648: \$? = $ac_status" >&5 ++ echo "$as_me:9751: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -9656,10 +9759,10 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:9659: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:9762: 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:9662: checking for initscr in -lgpm" >&5 ++ echo "$as_me:9765: 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 +@@ -9667,7 +9770,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 9670 "configure" ++#line 9773 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -9686,16 +9789,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9689: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9792: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9692: \$? = $ac_status" >&5 ++ echo "$as_me:9795: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9695: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9798: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9698: \$? = $ac_status" >&5 ++ echo "$as_me:9801: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -9706,7 +9809,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:9709: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:9812: 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" +@@ -9721,7 +9824,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:9724: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:9827: 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 +@@ -9729,7 +9832,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 9732 "configure" ++#line 9835 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -9748,16 +9851,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9751: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9854: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9754: \$? = $ac_status" >&5 ++ echo "$as_me:9857: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9757: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9860: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9760: \$? = $ac_status" >&5 ++ echo "$as_me:9863: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -9768,7 +9871,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:9771: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:9874: 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" +@@ -9817,13 +9920,13 @@ + + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + cf_libdir="" +- echo "$as_me:9820: checking for initscr" >&5 ++ echo "$as_me:9923: 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 9826 "configure" ++#line 9929 "configure" + #include "confdefs.h" + #define initscr autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -9854,16 +9957,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9857: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9960: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9860: \$? = $ac_status" >&5 ++ echo "$as_me:9963: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9863: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9966: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9866: \$? = $ac_status" >&5 ++ echo "$as_me:9969: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_initscr=yes + else +@@ -9873,18 +9976,18 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:9876: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:9979: 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:9883: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:9986: 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 9887 "configure" ++#line 9990 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9896,25 +9999,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9899: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10002: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9902: \$? = $ac_status" >&5 ++ echo "$as_me:10005: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9905: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10008: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9908: \$? = $ac_status" >&5 ++ echo "$as_me:10011: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:9910: result: yes" >&5 ++ echo "$as_me:10013: 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:9917: result: no" >&5 ++echo "$as_me:10020: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -9982,11 +10085,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:9985: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:10088: 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 9989 "configure" ++#line 10092 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9998,25 +10101,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10001: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10104: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10004: \$? = $ac_status" >&5 ++ echo "$as_me:10107: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10007: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10110: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10010: \$? = $ac_status" >&5 ++ echo "$as_me:10113: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:10012: result: yes" >&5 ++ echo "$as_me:10115: 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:10019: result: no" >&5 ++echo "$as_me:10122: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -10031,7 +10134,7 @@ + eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root + + if test $cf_found_library = no ; then +- { { echo "$as_me:10034: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:10137: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -10039,7 +10142,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:10042: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:10145: 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 +@@ -10049,7 +10152,7 @@ + fi + done + cat >conftest.$ac_ext <<_ACEOF +-#line 10052 "configure" ++#line 10155 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -10061,23 +10164,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10064: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10167: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10067: \$? = $ac_status" >&5 ++ echo "$as_me:10170: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10070: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10173: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10073: \$? = $ac_status" >&5 ++ echo "$as_me:10176: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:10075: result: yes" >&5 ++ echo "$as_me:10178: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:10080: result: no" >&5 ++echo "$as_me:10183: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -10130,10 +10233,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:10133: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:10236: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:10136: \$? = $ac_status" >&5 ++ echo "$as_me:10239: \$? = $ac_status" >&5 + (exit $ac_status); } + if test -f conftest.out ; then + cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[ ][ ]*//"` +@@ -10151,10 +10254,10 @@ + + cf_cv_timestamp=`date` + +-echo "$as_me:10154: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 ++echo "$as_me:10257: 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:10157: checking if you want to have a library-prefix" >&5 ++echo "$as_me:10260: 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. +@@ -10164,7 +10267,7 @@ + else + with_lib_prefix=auto + fi; +-echo "$as_me:10167: result: $with_lib_prefix" >&5 ++echo "$as_me:10270: result: $with_lib_prefix" >&5 + echo "${ECHO_T}$with_lib_prefix" >&6 + + if test $with_lib_prefix = auto +@@ -10199,7 +10302,7 @@ + test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT='' + fi + +-echo "$as_me:10202: checking for default loader flags" >&5 ++echo "$as_me:10305: 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='' ;; +@@ -10207,13 +10310,13 @@ + (profile) LD_MODEL='-pg';; + (shared) LD_MODEL='' ;; + esac +-echo "$as_me:10210: result: $LD_MODEL" >&5 ++echo "$as_me:10313: 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:10216: checking for an rpath option" >&5 ++ echo "$as_me:10319: checking for an rpath option" >&5 + echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 + case $cf_cv_system_name in + (irix*) +@@ -10244,12 +10347,12 @@ + (*) + ;; + esac +- echo "$as_me:10247: result: $LD_RPATH_OPT" >&5 ++ echo "$as_me:10350: result: $LD_RPATH_OPT" >&5 + echo "${ECHO_T}$LD_RPATH_OPT" >&6 + + case "x$LD_RPATH_OPT" in + (x-R*) +- echo "$as_me:10252: checking if we need a space after rpath option" >&5 ++ echo "$as_me:10355: 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" + +@@ -10270,7 +10373,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 10273 "configure" ++#line 10376 "configure" + #include "confdefs.h" + + int +@@ -10282,16 +10385,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10285: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10388: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10288: \$? = $ac_status" >&5 ++ echo "$as_me:10391: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10291: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10394: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10294: \$? = $ac_status" >&5 ++ echo "$as_me:10397: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_rpath_space=no + else +@@ -10301,7 +10404,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$cf_save_LIBS" +- echo "$as_me:10304: result: $cf_rpath_space" >&5 ++ echo "$as_me:10407: result: $cf_rpath_space" >&5 + echo "${ECHO_T}$cf_rpath_space" >&6 + test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " + ;; +@@ -10323,7 +10426,7 @@ + cf_ld_rpath_opt= + test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" + +- echo "$as_me:10326: checking if release/abi version should be used for shared libs" >&5 ++ echo "$as_me:10429: 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. +@@ -10338,9 +10441,9 @@ + cf_cv_shlib_version=$withval + ;; + (*) +- echo "$as_me:10341: result: $withval" >&5 ++ echo "$as_me:10444: result: $withval" >&5 + echo "${ECHO_T}$withval" >&6 +- { { echo "$as_me:10343: error: option value must be one of: rel, abi, or auto" >&5 ++ { { echo "$as_me:10446: 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; }; } + ;; +@@ -10349,7 +10452,7 @@ + else + cf_cv_shlib_version=auto + fi; +- echo "$as_me:10352: result: $cf_cv_shlib_version" >&5 ++ echo "$as_me:10455: result: $cf_cv_shlib_version" >&5 + echo "${ECHO_T}$cf_cv_shlib_version" >&6 + + cf_cv_rm_so_locs=no +@@ -10372,14 +10475,14 @@ + + if test "$cf_try_fPIC" = yes + then +- echo "$as_me:10375: checking which $CC option to use" >&5 ++ echo "$as_me:10478: 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 10382 "configure" ++#line 10485 "configure" + #include "confdefs.h" + #include + int +@@ -10391,16 +10494,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10394: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10497: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10397: \$? = $ac_status" >&5 ++ echo "$as_me:10500: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10400: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10503: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10403: \$? = $ac_status" >&5 ++ echo "$as_me:10506: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -10409,7 +10512,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + done +- echo "$as_me:10412: result: $CC_SHARED_OPTS" >&5 ++ echo "$as_me:10515: result: $CC_SHARED_OPTS" >&5 + echo "${ECHO_T}$CC_SHARED_OPTS" >&6 + CFLAGS="$cf_save_CFLAGS" + fi +@@ -10480,7 +10583,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:10483: checking if ld -search_paths_first works" >&5 ++ echo "$as_me:10586: 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 +@@ -10489,7 +10592,7 @@ + cf_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" + cat >conftest.$ac_ext <<_ACEOF +-#line 10492 "configure" ++#line 10595 "configure" + #include "confdefs.h" + + int +@@ -10501,16 +10604,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10504: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10607: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10507: \$? = $ac_status" >&5 ++ echo "$as_me:10610: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10510: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10613: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10513: \$? = $ac_status" >&5 ++ echo "$as_me:10616: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ldflags_search_paths_first=yes + else +@@ -10521,7 +10624,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$cf_save_LDFLAGS + fi +-echo "$as_me:10524: result: $cf_cv_ldflags_search_paths_first" >&5 ++echo "$as_me:10627: 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" +@@ -10746,7 +10849,7 @@ + do + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" + cat >conftest.$ac_ext <<_ACEOF +-#line 10749 "configure" ++#line 10852 "configure" + #include "confdefs.h" + #include + int +@@ -10758,16 +10861,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10761: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10864: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10764: \$? = $ac_status" >&5 ++ echo "$as_me:10867: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10767: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10870: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10770: \$? = $ac_status" >&5 ++ echo "$as_me:10873: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -10804,7 +10907,7 @@ + test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes + ;; + (*) +- { echo "$as_me:10807: WARNING: ignored --with-shlib-version" >&5 ++ { echo "$as_me:10910: WARNING: ignored --with-shlib-version" >&5 + echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} + ;; + esac +@@ -10814,7 +10917,7 @@ + if test -n "$cf_try_cflags" + then + cat > conftest.$ac_ext < + int main(int argc, char *argv[]) + { +@@ -10826,18 +10929,18 @@ + for cf_opt in $cf_try_cflags + do + CFLAGS="$cf_save_CFLAGS -$cf_opt" +- echo "$as_me:10829: checking if CFLAGS option -$cf_opt works" >&5 ++ echo "$as_me:10932: 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:10831: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:10934: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10834: \$? = $ac_status" >&5 ++ echo "$as_me:10937: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- echo "$as_me:10836: result: yes" >&5 ++ echo "$as_me:10939: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + cf_save_CFLAGS="$CFLAGS" + else +- echo "$as_me:10840: result: no" >&5 ++ echo "$as_me:10943: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + done +@@ -10852,17 +10955,17 @@ + + test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 + +-echo "${as_me:-configure}:10855: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 ++echo "${as_me:-configure}:10958: 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}:10859: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:10962: 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:10865: checking if you want to link sample programs with rpath option" >&5 ++ echo "$as_me:10968: 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. +@@ -10872,7 +10975,7 @@ + else + with_rpath_link=yes + fi; +- echo "$as_me:10875: result: $with_rpath_link" >&5 ++ echo "$as_me:10978: result: $with_rpath_link" >&5 + echo "${ECHO_T}$with_rpath_link" >&6 + if test "$with_rpath_link" = no + then +@@ -10884,7 +10987,7 @@ + ############################################################################### + + ### use option --enable-broken-linker to force on use of broken-linker support +-echo "$as_me:10887: checking if you want broken-linker support code" >&5 ++echo "$as_me:10990: 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. +@@ -10894,7 +10997,7 @@ + else + with_broken_linker=${BROKEN_LINKER:-no} + fi; +-echo "$as_me:10897: result: $with_broken_linker" >&5 ++echo "$as_me:11000: result: $with_broken_linker" >&5 + echo "${ECHO_T}$with_broken_linker" >&6 + + BROKEN_LINKER=0 +@@ -10914,7 +11017,7 @@ + BROKEN_LINKER=1 + test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 + +-echo "${as_me:-configure}:10917: testing cygwin linker is broken anyway ..." 1>&5 ++echo "${as_me:-configure}:11020: testing cygwin linker is broken anyway ..." 1>&5 + + ;; + esac +@@ -10922,14 +11025,14 @@ + + # Check to define _XOPEN_SOURCE "automatically" + +-echo "$as_me:10925: checking if the POSIX test-macros are already defined" >&5 ++echo "$as_me:11028: 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 10932 "configure" ++#line 11035 "configure" + #include "confdefs.h" + #include + int +@@ -10948,16 +11051,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10951: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11054: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10954: \$? = $ac_status" >&5 ++ echo "$as_me:11057: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10957: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11060: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10960: \$? = $ac_status" >&5 ++ echo "$as_me:11063: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_visible=no + else +@@ -10968,7 +11071,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:10971: result: $cf_cv_posix_visible" >&5 ++echo "$as_me:11074: result: $cf_cv_posix_visible" >&5 + echo "${ECHO_T}$cf_cv_posix_visible" >&6 + + if test "$cf_cv_posix_visible" = no; then +@@ -11013,14 +11116,14 @@ + + cf_gnu_xopen_source=$cf_XOPEN_SOURCE + +-echo "$as_me:11016: checking if this is the GNU C library" >&5 ++echo "$as_me:11119: 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 11023 "configure" ++#line 11126 "configure" + #include "confdefs.h" + #include + int +@@ -11039,16 +11142,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11042: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11145: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11045: \$? = $ac_status" >&5 ++ echo "$as_me:11148: \$? = $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:11151: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11051: \$? = $ac_status" >&5 ++ echo "$as_me:11154: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_library=yes + else +@@ -11059,7 +11162,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:11062: result: $cf_cv_gnu_library" >&5 ++echo "$as_me:11165: result: $cf_cv_gnu_library" >&5 + echo "${ECHO_T}$cf_cv_gnu_library" >&6 + + if test x$cf_cv_gnu_library = xyes; then +@@ -11067,7 +11170,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:11070: checking if _DEFAULT_SOURCE can be used as a basis" >&5 ++ echo "$as_me:11173: 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 +@@ -11079,7 +11182,7 @@ + CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + + cat >conftest.$ac_ext <<_ACEOF +-#line 11082 "configure" ++#line 11185 "configure" + #include "confdefs.h" + #include + int +@@ -11098,16 +11201,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11101: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11204: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11104: \$? = $ac_status" >&5 ++ echo "$as_me:11207: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11107: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11210: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11110: \$? = $ac_status" >&5 ++ echo "$as_me:11213: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_library_219=yes + else +@@ -11119,12 +11222,12 @@ + CPPFLAGS="$cf_save" + + fi +-echo "$as_me:11122: result: $cf_cv_gnu_library_219" >&5 ++echo "$as_me:11225: 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:11127: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 ++ echo "$as_me:11230: 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 +@@ -11229,7 +11332,7 @@ + fi + + cat >conftest.$ac_ext <<_ACEOF +-#line 11232 "configure" ++#line 11335 "configure" + #include "confdefs.h" + + #include +@@ -11249,16 +11352,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11252: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11355: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11255: \$? = $ac_status" >&5 ++ echo "$as_me:11358: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11258: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11361: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11261: \$? = $ac_status" >&5 ++ echo "$as_me:11364: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_dftsrc_219=yes + else +@@ -11269,7 +11372,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:11272: result: $cf_cv_gnu_dftsrc_219" >&5 ++echo "$as_me:11375: 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 +@@ -11278,14 +11381,14 @@ + + if test "x$cf_cv_gnu_dftsrc_219" != xyes; then + +- echo "$as_me:11281: checking if we must define _GNU_SOURCE" >&5 ++ echo "$as_me:11384: 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 11288 "configure" ++#line 11391 "configure" + #include "confdefs.h" + #include + int +@@ -11300,16 +11403,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11303: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11406: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11306: \$? = $ac_status" >&5 ++ echo "$as_me:11409: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11309: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11412: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11312: \$? = $ac_status" >&5 ++ echo "$as_me:11415: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no + else +@@ -11416,7 +11519,7 @@ + fi + + cat >conftest.$ac_ext <<_ACEOF +-#line 11419 "configure" ++#line 11522 "configure" + #include "confdefs.h" + #include + int +@@ -11431,16 +11534,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11434: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11537: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11437: \$? = $ac_status" >&5 ++ echo "$as_me:11540: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11440: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11543: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11443: \$? = $ac_status" >&5 ++ echo "$as_me:11546: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no + else +@@ -11455,12 +11558,12 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:11458: result: $cf_cv_gnu_source" >&5 ++echo "$as_me:11561: 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:11463: checking if we should also define _DEFAULT_SOURCE" >&5 ++ echo "$as_me:11566: 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 +@@ -11470,7 +11573,7 @@ + CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" + + cat >conftest.$ac_ext <<_ACEOF +-#line 11473 "configure" ++#line 11576 "configure" + #include "confdefs.h" + #include + int +@@ -11485,16 +11588,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11488: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11591: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11491: \$? = $ac_status" >&5 ++ echo "$as_me:11594: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11494: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11597: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11497: \$? = $ac_status" >&5 ++ echo "$as_me:11600: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_default_source=no + else +@@ -11505,7 +11608,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:11508: result: $cf_cv_default_source" >&5 ++echo "$as_me:11611: result: $cf_cv_default_source" >&5 + echo "${ECHO_T}$cf_cv_default_source" >&6 + if test "$cf_cv_default_source" = yes + then +@@ -11542,16 +11645,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:11545: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:11648: 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}:11551: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:11654: testing if the symbol is already defined go no further ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 11554 "configure" ++#line 11657 "configure" + #include "confdefs.h" + #include + int +@@ -11566,16 +11669,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11569: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11672: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11572: \$? = $ac_status" >&5 ++ echo "$as_me:11675: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11575: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11678: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11578: \$? = $ac_status" >&5 ++ echo "$as_me:11681: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_c_source=no + else +@@ -11596,7 +11699,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 11599 "configure" ++#line 11702 "configure" + #include "confdefs.h" + #include + int +@@ -11611,16 +11714,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11614: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11717: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11617: \$? = $ac_status" >&5 ++ echo "$as_me:11720: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11620: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11723: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11623: \$? = $ac_status" >&5 ++ echo "$as_me:11726: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -11631,7 +11734,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + +-echo "${as_me:-configure}:11634: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:11737: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -11639,10 +11742,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:11642: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:11745: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 11645 "configure" ++#line 11748 "configure" + #include "confdefs.h" + #include + int +@@ -11657,16 +11760,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11660: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11763: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11663: \$? = $ac_status" >&5 ++ echo "$as_me:11766: \$? = $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:11769: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11669: \$? = $ac_status" >&5 ++ echo "$as_me:11772: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -11682,7 +11785,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:11685: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:11788: 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 +@@ -11822,14 +11925,14 @@ + ;; + (*) + +-echo "$as_me:11825: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:11928: 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 11832 "configure" ++#line 11935 "configure" + #include "confdefs.h" + + #include +@@ -11848,16 +11951,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11851: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11954: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11854: \$? = $ac_status" >&5 ++ echo "$as_me:11957: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11857: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11960: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11860: \$? = $ac_status" >&5 ++ echo "$as_me:11963: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xopen_source=no + else +@@ -11869,7 +11972,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >conftest.$ac_ext <<_ACEOF +-#line 11872 "configure" ++#line 11975 "configure" + #include "confdefs.h" + + #include +@@ -11888,16 +11991,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11891: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11994: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11894: \$? = $ac_status" >&5 ++ echo "$as_me:11997: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11897: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12000: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11900: \$? = $ac_status" >&5 ++ echo "$as_me:12003: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xopen_source=no + else +@@ -11912,7 +12015,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:11915: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:12018: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -12042,16 +12145,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:12045: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:12148: 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}:12051: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:12154: testing if the symbol is already defined go no further ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 12054 "configure" ++#line 12157 "configure" + #include "confdefs.h" + #include + int +@@ -12066,16 +12169,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12069: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12172: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12072: \$? = $ac_status" >&5 ++ echo "$as_me:12175: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12075: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12178: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12078: \$? = $ac_status" >&5 ++ echo "$as_me:12181: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_c_source=no + else +@@ -12096,7 +12199,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 12099 "configure" ++#line 12202 "configure" + #include "confdefs.h" + #include + int +@@ -12111,16 +12214,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12114: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12217: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12117: \$? = $ac_status" >&5 ++ echo "$as_me:12220: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12120: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12223: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12123: \$? = $ac_status" >&5 ++ echo "$as_me:12226: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -12131,7 +12234,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + +-echo "${as_me:-configure}:12134: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:12237: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -12139,10 +12242,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:12142: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:12245: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 12145 "configure" ++#line 12248 "configure" + #include "confdefs.h" + #include + int +@@ -12157,16 +12260,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12160: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12263: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12163: \$? = $ac_status" >&5 ++ echo "$as_me:12266: \$? = $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:12269: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12169: \$? = $ac_status" >&5 ++ echo "$as_me:12272: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -12182,7 +12285,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:12185: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:12288: 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 +@@ -12376,7 +12479,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me:-configure}:12379: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me:-configure}:12482: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" +@@ -12386,7 +12489,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me:-configure}:12389: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me:-configure}:12492: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +@@ -12396,7 +12499,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}:12399: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me:-configure}:12502: 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" +@@ -12406,10 +12509,10 @@ + fi + + if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then +- echo "$as_me:12409: checking if _XOPEN_SOURCE really is set" >&5 ++ echo "$as_me:12512: 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 12412 "configure" ++#line 12515 "configure" + #include "confdefs.h" + #include + int +@@ -12424,16 +12527,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12427: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12530: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12430: \$? = $ac_status" >&5 ++ echo "$as_me:12533: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12433: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12536: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12436: \$? = $ac_status" >&5 ++ echo "$as_me:12539: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_XOPEN_SOURCE_set=yes + else +@@ -12442,12 +12545,12 @@ + cf_XOPEN_SOURCE_set=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:12445: result: $cf_XOPEN_SOURCE_set" >&5 ++ echo "$as_me:12548: 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 12450 "configure" ++#line 12553 "configure" + #include "confdefs.h" + #include + int +@@ -12462,16 +12565,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12465: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12568: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12468: \$? = $ac_status" >&5 ++ echo "$as_me:12571: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12471: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12574: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12474: \$? = $ac_status" >&5 ++ echo "$as_me:12577: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_XOPEN_SOURCE_set_ok=yes + else +@@ -12482,19 +12585,19 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + if test $cf_XOPEN_SOURCE_set_ok = no + then +- { echo "$as_me:12485: WARNING: _XOPEN_SOURCE is lower than requested" >&5 ++ { echo "$as_me:12588: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} + fi + else + +-echo "$as_me:12490: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:12593: 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 12497 "configure" ++#line 12600 "configure" + #include "confdefs.h" + + #include +@@ -12513,16 +12616,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12516: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12619: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12519: \$? = $ac_status" >&5 ++ echo "$as_me:12622: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12522: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12625: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12525: \$? = $ac_status" >&5 ++ echo "$as_me:12628: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xopen_source=no + else +@@ -12534,7 +12637,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >conftest.$ac_ext <<_ACEOF +-#line 12537 "configure" ++#line 12640 "configure" + #include "confdefs.h" + + #include +@@ -12553,16 +12656,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12556: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12659: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12559: \$? = $ac_status" >&5 ++ echo "$as_me:12662: \$? = $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:12665: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12565: \$? = $ac_status" >&5 ++ echo "$as_me:12668: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xopen_source=no + else +@@ -12577,7 +12680,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:12580: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:12683: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -12703,7 +12806,7 @@ + fi; + if test "$enable_largefile" != no; then + +- echo "$as_me:12706: checking for special C compiler options needed for large files" >&5 ++ echo "$as_me:12809: 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 +@@ -12715,7 +12818,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 12718 "configure" ++#line 12821 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -12735,16 +12838,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12738: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12841: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12741: \$? = $ac_status" >&5 ++ echo "$as_me:12844: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12744: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12847: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12747: \$? = $ac_status" >&5 ++ echo "$as_me:12850: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -12754,16 +12857,16 @@ + rm -f conftest.$ac_objext + CC="$CC -n32" + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12757: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12860: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12760: \$? = $ac_status" >&5 ++ echo "$as_me:12863: \$? = $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:12866: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12766: \$? = $ac_status" >&5 ++ echo "$as_me:12869: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_largefile_CC=' -n32'; break + else +@@ -12777,13 +12880,13 @@ + rm -f conftest.$ac_ext + fi + fi +-echo "$as_me:12780: result: $ac_cv_sys_largefile_CC" >&5 ++echo "$as_me:12883: 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:12786: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++ echo "$as_me:12889: 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 +@@ -12791,7 +12894,7 @@ + while :; do + ac_cv_sys_file_offset_bits=no + cat >conftest.$ac_ext <<_ACEOF +-#line 12794 "configure" ++#line 12897 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -12811,16 +12914,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12814: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12917: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12817: \$? = $ac_status" >&5 ++ echo "$as_me:12920: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12820: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12923: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12823: \$? = $ac_status" >&5 ++ echo "$as_me:12926: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -12829,7 +12932,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 12832 "configure" ++#line 12935 "configure" + #include "confdefs.h" + #define _FILE_OFFSET_BITS 64 + #include +@@ -12850,16 +12953,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12853: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12956: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12856: \$? = $ac_status" >&5 ++ echo "$as_me:12959: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12859: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12962: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12862: \$? = $ac_status" >&5 ++ echo "$as_me:12965: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_file_offset_bits=64; break + else +@@ -12870,7 +12973,7 @@ + break + done + fi +-echo "$as_me:12873: result: $ac_cv_sys_file_offset_bits" >&5 ++echo "$as_me:12976: 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 + +@@ -12880,7 +12983,7 @@ + + fi + rm -rf conftest* +- echo "$as_me:12883: checking for _LARGE_FILES value needed for large files" >&5 ++ echo "$as_me:12986: 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 +@@ -12888,7 +12991,7 @@ + while :; do + ac_cv_sys_large_files=no + cat >conftest.$ac_ext <<_ACEOF +-#line 12891 "configure" ++#line 12994 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -12908,16 +13011,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12911: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13014: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12914: \$? = $ac_status" >&5 ++ echo "$as_me:13017: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12917: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13020: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12920: \$? = $ac_status" >&5 ++ echo "$as_me:13023: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -12926,7 +13029,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 12929 "configure" ++#line 13032 "configure" + #include "confdefs.h" + #define _LARGE_FILES 1 + #include +@@ -12947,16 +13050,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12950: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13053: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12953: \$? = $ac_status" >&5 ++ echo "$as_me:13056: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12956: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13059: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12959: \$? = $ac_status" >&5 ++ echo "$as_me:13062: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_large_files=1; break + else +@@ -12967,7 +13070,7 @@ + break + done + fi +-echo "$as_me:12970: result: $ac_cv_sys_large_files" >&5 ++echo "$as_me:13073: 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 + +@@ -12980,7 +13083,7 @@ + fi + + if test "$enable_largefile" != no ; then +- echo "$as_me:12983: checking for _LARGEFILE_SOURCE value needed for large files" >&5 ++ echo "$as_me:13086: 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 +@@ -12988,7 +13091,7 @@ + while :; do + ac_cv_sys_largefile_source=no + cat >conftest.$ac_ext <<_ACEOF +-#line 12991 "configure" ++#line 13094 "configure" + #include "confdefs.h" + #include + int +@@ -13000,16 +13103,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13003: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13106: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13006: \$? = $ac_status" >&5 ++ echo "$as_me:13109: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13009: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13112: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13012: \$? = $ac_status" >&5 ++ echo "$as_me:13115: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -13018,7 +13121,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 13021 "configure" ++#line 13124 "configure" + #include "confdefs.h" + #define _LARGEFILE_SOURCE 1 + #include +@@ -13031,16 +13134,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13034: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13137: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13037: \$? = $ac_status" >&5 ++ echo "$as_me:13140: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13040: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13143: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13043: \$? = $ac_status" >&5 ++ echo "$as_me:13146: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_largefile_source=1; break + else +@@ -13051,7 +13154,7 @@ + break + done + fi +-echo "$as_me:13054: result: $ac_cv_sys_largefile_source" >&5 ++echo "$as_me:13157: 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 + +@@ -13065,13 +13168,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:13068: checking for fseeko" >&5 ++echo "$as_me:13171: 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 13074 "configure" ++#line 13177 "configure" + #include "confdefs.h" + #include + int +@@ -13083,16 +13186,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13086: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13189: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13089: \$? = $ac_status" >&5 ++ echo "$as_me:13192: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13092: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13195: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13095: \$? = $ac_status" >&5 ++ echo "$as_me:13198: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_fseeko=yes + else +@@ -13102,7 +13205,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:13105: result: $ac_cv_func_fseeko" >&5 ++echo "$as_me:13208: result: $ac_cv_func_fseeko" >&5 + echo "${ECHO_T}$ac_cv_func_fseeko" >&6 + if test $ac_cv_func_fseeko = yes; then + +@@ -13141,14 +13244,14 @@ + + fi + +- echo "$as_me:13144: checking whether to use struct dirent64" >&5 ++ echo "$as_me:13247: 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 13151 "configure" ++#line 13254 "configure" + #include "confdefs.h" + + #pragma GCC diagnostic error "-Wincompatible-pointer-types" +@@ -13170,16 +13273,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13173: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13276: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13176: \$? = $ac_status" >&5 ++ echo "$as_me:13279: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13179: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13282: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13182: \$? = $ac_status" >&5 ++ echo "$as_me:13285: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_struct_dirent64=yes + else +@@ -13190,7 +13293,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:13193: result: $cf_cv_struct_dirent64" >&5 ++echo "$as_me:13296: result: $cf_cv_struct_dirent64" >&5 + echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 + test "$cf_cv_struct_dirent64" = yes && + cat >>confdefs.h <<\EOF +@@ -13200,7 +13303,7 @@ + fi + + ### Enable compiling-in rcs id's +-echo "$as_me:13203: checking if RCS identifiers should be compiled-in" >&5 ++echo "$as_me:13306: 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. +@@ -13210,7 +13313,7 @@ + else + with_rcs_ids=no + fi; +-echo "$as_me:13213: result: $with_rcs_ids" >&5 ++echo "$as_me:13316: result: $with_rcs_ids" >&5 + echo "${ECHO_T}$with_rcs_ids" >&6 + test "$with_rcs_ids" = yes && + cat >>confdefs.h <<\EOF +@@ -13220,7 +13323,7 @@ + ############################################################################### + + ### Note that some functions (such as const) are normally disabled anyway. +-echo "$as_me:13223: checking if you want to build with function extensions" >&5 ++echo "$as_me:13326: 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. +@@ -13230,7 +13333,7 @@ + else + with_ext_funcs=yes + fi; +-echo "$as_me:13233: result: $with_ext_funcs" >&5 ++echo "$as_me:13336: result: $with_ext_funcs" >&5 + echo "${ECHO_T}$with_ext_funcs" >&6 + if test "$with_ext_funcs" = yes ; then + NCURSES_EXT_FUNCS=1 +@@ -13248,7 +13351,7 @@ + fi + + ### use option --enable-const to turn on use of const beyond that in XSI. +-echo "$as_me:13251: checking for extended use of const keyword" >&5 ++echo "$as_me:13354: 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. +@@ -13258,7 +13361,7 @@ + else + with_ext_const=no + fi; +-echo "$as_me:13261: result: $with_ext_const" >&5 ++echo "$as_me:13364: result: $with_ext_const" >&5 + echo "${ECHO_T}$with_ext_const" >&6 + NCURSES_CONST='/*nothing*/' + if test "$with_ext_const" = yes ; then +@@ -13268,7 +13371,7 @@ + ############################################################################### + # These options are relatively safe to experiment with. + +-echo "$as_me:13271: checking if you want all development code" >&5 ++echo "$as_me:13374: 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. +@@ -13278,7 +13381,7 @@ + else + with_develop=no + fi; +-echo "$as_me:13281: result: $with_develop" >&5 ++echo "$as_me:13384: result: $with_develop" >&5 + echo "${ECHO_T}$with_develop" >&6 + + ############################################################################### +@@ -13287,7 +13390,7 @@ + # This is still experimental (20080329), but should ultimately be moved to + # the script-block --with-normal, etc. + +-echo "$as_me:13290: checking if you want to link with the pthread library" >&5 ++echo "$as_me:13393: 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. +@@ -13297,27 +13400,27 @@ + else + with_pthread=no + fi; +-echo "$as_me:13300: result: $with_pthread" >&5 ++echo "$as_me:13403: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + + if test "$with_pthread" != no ; then +- echo "$as_me:13304: checking for pthread.h" >&5 ++ echo "$as_me:13407: 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 13310 "configure" ++#line 13413 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:13314: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:13417: \"$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:13320: \$? = $ac_status" >&5 ++ echo "$as_me:13423: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -13336,7 +13439,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:13339: result: $ac_cv_header_pthread_h" >&5 ++echo "$as_me:13442: 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 + +@@ -13346,7 +13449,7 @@ + + for cf_lib_pthread in pthread c_r + do +- echo "$as_me:13349: checking if we can link with the $cf_lib_pthread library" >&5 ++ echo "$as_me:13452: 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" + +@@ -13367,7 +13470,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 13370 "configure" ++#line 13473 "configure" + #include "confdefs.h" + + #include +@@ -13384,16 +13487,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13387: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13490: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13390: \$? = $ac_status" >&5 ++ echo "$as_me:13493: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13393: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13496: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13396: \$? = $ac_status" >&5 ++ echo "$as_me:13499: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + with_pthread=yes + else +@@ -13403,7 +13506,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$cf_save_LIBS" +- echo "$as_me:13406: result: $with_pthread" >&5 ++ echo "$as_me:13509: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + test "$with_pthread" = yes && break + done +@@ -13431,7 +13534,7 @@ + EOF + + else +- { { echo "$as_me:13434: error: Cannot link with pthread library" >&5 ++ { { echo "$as_me:13537: error: Cannot link with pthread library" >&5 + echo "$as_me: error: Cannot link with pthread library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -13440,7 +13543,7 @@ + + fi + +-echo "$as_me:13443: checking if you want to use weak-symbols for pthreads" >&5 ++echo "$as_me:13546: 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. +@@ -13450,18 +13553,18 @@ + else + use_weak_symbols=no + fi; +-echo "$as_me:13453: result: $use_weak_symbols" >&5 ++echo "$as_me:13556: result: $use_weak_symbols" >&5 + echo "${ECHO_T}$use_weak_symbols" >&6 + if test "$use_weak_symbols" = yes ; then + +-echo "$as_me:13457: checking if $CC supports weak symbols" >&5 ++echo "$as_me:13560: 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 13464 "configure" ++#line 13567 "configure" + #include "confdefs.h" + + #include +@@ -13487,16 +13590,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13490: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13593: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13493: \$? = $ac_status" >&5 ++ echo "$as_me:13596: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13496: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13599: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13499: \$? = $ac_status" >&5 ++ echo "$as_me:13602: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_weak_symbols=yes + else +@@ -13507,7 +13610,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:13510: result: $cf_cv_weak_symbols" >&5 ++echo "$as_me:13613: result: $cf_cv_weak_symbols" >&5 + echo "${ECHO_T}$cf_cv_weak_symbols" >&6 + + else +@@ -13536,13 +13639,13 @@ + fi + + # OpenSUSE is installing ncurses6, using reentrant option. +-echo "$as_me:13539: checking for _nc_TABSIZE" >&5 ++echo "$as_me:13642: 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 13545 "configure" ++#line 13648 "configure" + #include "confdefs.h" + #define _nc_TABSIZE autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -13573,16 +13676,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13576: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13679: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13579: \$? = $ac_status" >&5 ++ echo "$as_me:13682: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13582: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13685: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13585: \$? = $ac_status" >&5 ++ echo "$as_me:13688: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func__nc_TABSIZE=yes + else +@@ -13592,7 +13695,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:13595: result: $ac_cv_func__nc_TABSIZE" >&5 ++echo "$as_me:13698: 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 +@@ -13604,7 +13707,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:13607: checking if you want experimental reentrant code" >&5 ++echo "$as_me:13710: 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. +@@ -13614,7 +13717,7 @@ + else + with_reentrant=$assume_reentrant + fi; +-echo "$as_me:13617: result: $with_reentrant" >&5 ++echo "$as_me:13720: result: $with_reentrant" >&5 + echo "${ECHO_T}$with_reentrant" >&6 + if test "$with_reentrant" = yes ; then + cf_cv_enable_reentrant=1 +@@ -13637,7 +13740,7 @@ + + ### Allow using a different wrap-prefix + if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then +- echo "$as_me:13640: checking for prefix used to wrap public variables" >&5 ++ echo "$as_me:13743: 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. +@@ -13647,7 +13750,7 @@ + else + NCURSES_WRAP_PREFIX=_nc_ + fi; +- echo "$as_me:13650: result: $NCURSES_WRAP_PREFIX" >&5 ++ echo "$as_me:13753: result: $NCURSES_WRAP_PREFIX" >&5 + echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 + else + NCURSES_WRAP_PREFIX=_nc_ +@@ -13661,7 +13764,7 @@ + + ### use option --disable-echo to suppress full display compiling commands + +-echo "$as_me:13664: checking if you want to see long compiling messages" >&5 ++echo "$as_me:13767: 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. +@@ -13695,11 +13798,11 @@ + ECHO_CC='' + + fi; +-echo "$as_me:13698: result: $enableval" >&5 ++echo "$as_me:13801: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + + ### use option --enable-warnings to turn on all gcc warnings +-echo "$as_me:13702: checking if you want to see compiler warnings" >&5 ++echo "$as_me:13805: 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. +@@ -13707,120 +13810,118 @@ + enableval="$enable_warnings" + with_warnings=$enableval + fi; +-echo "$as_me:13710: result: $with_warnings" >&5 ++echo "$as_me:13813: result: $with_warnings" >&5 + echo "${ECHO_T}$with_warnings" >&6 + + if test "x$with_warnings" = "xyes"; then + + ADAFLAGS="$ADAFLAGS -gnatg" + +-INTEL_COMPILER=no +- +-if test "$GCC" = yes ; then +- case $host_os in +- (linux*|gnu*) +- echo "$as_me:13722: 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 13727 "configure" ++if test "x$have_x" = xyes; then ++cat >conftest.$ac_ext <<_ACEOF ++#line 13822 "configure" + #include "confdefs.h" + ++#include ++#include ++ + int + main (void) + { +- +-#ifdef __INTEL_COMPILER +-#else +-make an error +-#endif +- ++String foo = malloc(1) + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13744: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13837: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13747: \$? = $ac_status" >&5 ++ echo "$as_me:13840: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13750: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13843: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13753: \$? = $ac_status" >&5 ++ echo "$as_me:13846: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- INTEL_COMPILER=yes +-cf_save_CFLAGS="$cf_save_CFLAGS -we147" + ++echo "$as_me:13849: checking for X11/Xt const-feature" >&5 ++echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 ++if test "${cf_cv_const_x_string+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- echo "$as_me: failed program was:" >&5 +-cat conftest.$ac_ext >&5 +-fi +-rm -f conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$cf_save_CFLAGS" +- echo "$as_me:13764: result: $INTEL_COMPILER" >&5 +-echo "${ECHO_T}$INTEL_COMPILER" >&6 +- ;; +- esac +-fi + +-CLANG_COMPILER=no +- +-if test "$GCC" = yes ; then +- echo "$as_me:13773: 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 13778 "configure" ++#line 13856 "configure" + #include "confdefs.h" + ++#define _CONST_X_STRING /* X11R7.8 (perhaps) */ ++#undef XTSTRINGDEFINES /* X11R5 and later */ ++#include ++#include ++ + int + main (void) + { +- +-#ifdef __clang__ +-#else +-make an error +-#endif +- ++String foo = malloc(1); *foo = 0 + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13795: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13873: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13798: \$? = $ac_status" >&5 ++ echo "$as_me:13876: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13801: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13879: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13804: \$? = $ac_status" >&5 ++ echo "$as_me:13882: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- CLANG_COMPILER=yes +-cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" ++ ++ 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 +- CFLAGS="$cf_save_CFLAGS" +- echo "$as_me:13815: result: $CLANG_COMPILER" >&5 +-echo "${ECHO_T}$CLANG_COMPILER" >&6 ++ + fi ++echo "$as_me:13897: 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:13938: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="-Wall" +@@ -13850,21 +13951,20 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:13853: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:13954: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13856: \$? = $ac_status" >&5 ++ echo "$as_me:13957: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:13858: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:13959: 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:13867: checking for $CC warning options..." >&5 ++ { echo "$as_me:13967: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS= +@@ -13888,26 +13988,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:13891: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:13991: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13894: \$? = $ac_status" >&5 ++ echo "$as_me:13994: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:13896: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:13996: 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}:13910: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:14004: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -13917,7 +14011,7 @@ + ([12].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:13920: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:14014: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -13950,10 +14044,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:13953: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:14047: 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:14099: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14008: \$? = $ac_status" >&5 ++ echo "$as_me:14102: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:14010: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:14104: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case $cf_attribute in +@@ -14067,7 +14161,7 @@ + fi + + ### use option --enable-assertions to turn on generation of assertion code +-echo "$as_me:14070: checking if you want to enable runtime assertions" >&5 ++echo "$as_me:14164: 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. +@@ -14077,7 +14171,7 @@ + else + with_assertions=no + fi; +-echo "$as_me:14080: result: $with_assertions" >&5 ++echo "$as_me:14174: result: $with_assertions" >&5 + echo "${ECHO_T}$with_assertions" >&6 + if test -n "$GCC" + then +@@ -14130,7 +14224,7 @@ + ;; + esac + +-echo "$as_me:14133: checking whether to add trace feature to all models" >&5 ++echo "$as_me:14227: 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. +@@ -14140,7 +14234,7 @@ + else + cf_with_trace=$cf_all_traces + fi; +-echo "$as_me:14143: result: $cf_with_trace" >&5 ++echo "$as_me:14237: result: $cf_with_trace" >&5 + echo "${ECHO_T}$cf_with_trace" >&6 + + if test "$cf_with_trace" = yes ; then +@@ -14248,7 +14342,7 @@ + ADA_TRACE=FALSE + fi + +-echo "$as_me:14251: checking if we want to use GNAT projects" >&5 ++echo "$as_me:14345: 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. +@@ -14265,7 +14359,7 @@ + enable_gnat_projects=yes + + fi; +-echo "$as_me:14268: result: $enable_gnat_projects" >&5 ++echo "$as_me:14362: result: $enable_gnat_projects" >&5 + echo "${ECHO_T}$enable_gnat_projects" >&6 + + ### Checks for libraries. +@@ -14273,13 +14367,13 @@ + (*mingw32*) + ;; + (*) +-echo "$as_me:14276: checking for gettimeofday" >&5 ++echo "$as_me:14370: 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 14282 "configure" ++#line 14376 "configure" + #include "confdefs.h" + #define gettimeofday autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -14310,16 +14404,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14313: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14407: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14316: \$? = $ac_status" >&5 ++ echo "$as_me:14410: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14319: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14413: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14322: \$? = $ac_status" >&5 ++ echo "$as_me:14416: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gettimeofday=yes + else +@@ -14329,7 +14423,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:14332: result: $ac_cv_func_gettimeofday" >&5 ++echo "$as_me:14426: 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 +@@ -14338,7 +14432,7 @@ + + else + +-echo "$as_me:14341: checking for gettimeofday in -lbsd" >&5 ++echo "$as_me:14435: 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 +@@ -14346,7 +14440,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 14349 "configure" ++#line 14443 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -14365,16 +14459,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14368: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14462: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14371: \$? = $ac_status" >&5 ++ echo "$as_me:14465: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14374: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14468: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14377: \$? = $ac_status" >&5 ++ echo "$as_me:14471: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_gettimeofday=yes + else +@@ -14385,7 +14479,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:14388: result: $ac_cv_lib_bsd_gettimeofday" >&5 ++echo "$as_me:14482: 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 + +@@ -14401,13 +14495,13 @@ + esac + + ### Checks for header files. +-echo "$as_me:14404: checking for ANSI C header files" >&5 ++echo "$as_me:14498: 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 14410 "configure" ++#line 14504 "configure" + #include "confdefs.h" + #include + #include +@@ -14415,13 +14509,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:14418: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:14512: \"$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:14424: \$? = $ac_status" >&5 ++ echo "$as_me:14518: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -14443,7 +14537,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 14446 "configure" ++#line 14540 "configure" + #include "confdefs.h" + #include + +@@ -14461,7 +14555,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 14464 "configure" ++#line 14558 "configure" + #include "confdefs.h" + #include + +@@ -14482,7 +14576,7 @@ + : + else + cat >conftest.$ac_ext <<_ACEOF +-#line 14485 "configure" ++#line 14579 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -14508,15 +14602,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:14511: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14605: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14514: \$? = $ac_status" >&5 ++ echo "$as_me:14608: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:14516: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14610: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14519: \$? = $ac_status" >&5 ++ echo "$as_me:14613: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -14529,7 +14623,7 @@ + fi + fi + fi +-echo "$as_me:14532: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:14626: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -14545,28 +14639,28 @@ + inttypes.h stdint.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:14548: checking for $ac_header" >&5 ++echo "$as_me:14642: 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 14554 "configure" ++#line 14648 "configure" + #include "confdefs.h" + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14560: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14654: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14563: \$? = $ac_status" >&5 ++ echo "$as_me:14657: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14566: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14660: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14569: \$? = $ac_status" >&5 ++ echo "$as_me:14663: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" + else +@@ -14576,7 +14670,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:14579: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:14673: 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:14683: 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 14595 "configure" ++#line 14689 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14607,16 +14701,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14610: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14704: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14613: \$? = $ac_status" >&5 ++ echo "$as_me:14707: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14616: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14710: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14619: \$? = $ac_status" >&5 ++ echo "$as_me:14713: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_signed_char=yes + else +@@ -14626,10 +14720,10 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:14629: result: $ac_cv_type_signed_char" >&5 ++echo "$as_me:14723: result: $ac_cv_type_signed_char" >&5 + echo "${ECHO_T}$ac_cv_type_signed_char" >&6 + +-echo "$as_me:14632: checking size of signed char" >&5 ++echo "$as_me:14726: 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 +@@ -14638,7 +14732,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >conftest.$ac_ext <<_ACEOF +-#line 14641 "configure" ++#line 14735 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14650,21 +14744,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14653: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14747: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14656: \$? = $ac_status" >&5 ++ echo "$as_me:14750: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14659: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14753: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14662: \$? = $ac_status" >&5 ++ echo "$as_me:14756: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 14667 "configure" ++#line 14761 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14676,16 +14770,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14679: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14773: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14682: \$? = $ac_status" >&5 ++ echo "$as_me:14776: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14685: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14779: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14688: \$? = $ac_status" >&5 ++ echo "$as_me:14782: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break + else +@@ -14701,7 +14795,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 14704 "configure" ++#line 14798 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14713,16 +14807,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14716: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14810: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14719: \$? = $ac_status" >&5 ++ echo "$as_me:14813: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14722: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14816: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14725: \$? = $ac_status" >&5 ++ echo "$as_me:14819: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break + else +@@ -14738,7 +14832,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 14741 "configure" ++#line 14835 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14750,16 +14844,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14753: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14847: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14756: \$? = $ac_status" >&5 ++ echo "$as_me:14850: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14759: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14853: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14762: \$? = $ac_status" >&5 ++ echo "$as_me:14856: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid + else +@@ -14772,12 +14866,12 @@ + ac_cv_sizeof_signed_char=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:14775: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:14869: 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 14780 "configure" ++#line 14874 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -14793,15 +14887,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:14796: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14890: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14799: \$? = $ac_status" >&5 ++ echo "$as_me:14893: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:14801: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14895: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14804: \$? = $ac_status" >&5 ++ echo "$as_me:14898: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_signed_char=`cat conftest.val` + else +@@ -14817,19 +14911,19 @@ + ac_cv_sizeof_signed_char=0 + fi + fi +-echo "$as_me:14820: result: $ac_cv_sizeof_signed_char" >&5 ++echo "$as_me:14914: result: $ac_cv_sizeof_signed_char" >&5 + echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:14920: 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 14832 "configure" ++#line 14926 "configure" + #include "confdefs.h" + #include + #include +@@ -14837,13 +14931,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:14840: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:14934: \"$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:14846: \$? = $ac_status" >&5 ++ echo "$as_me:14940: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -14865,7 +14959,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 14868 "configure" ++#line 14962 "configure" + #include "confdefs.h" + #include + +@@ -14883,7 +14977,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 14886 "configure" ++#line 14980 "configure" + #include "confdefs.h" + #include + +@@ -14904,7 +14998,7 @@ + : + else + cat >conftest.$ac_ext <<_ACEOF +-#line 14907 "configure" ++#line 15001 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -14930,15 +15024,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:14933: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15027: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14936: \$? = $ac_status" >&5 ++ echo "$as_me:15030: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:14938: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15032: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14941: \$? = $ac_status" >&5 ++ echo "$as_me:15035: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -14951,7 +15045,7 @@ + fi + fi + fi +-echo "$as_me:14954: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:15048: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -14964,13 +15058,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:14967: checking for $ac_hdr that defines DIR" >&5 ++echo "$as_me:15061: 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 14973 "configure" ++#line 15067 "configure" + #include "confdefs.h" + #include + #include <$ac_hdr> +@@ -14985,16 +15079,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14988: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15082: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14991: \$? = $ac_status" >&5 ++ echo "$as_me:15085: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14994: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15088: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14997: \$? = $ac_status" >&5 ++ echo "$as_me:15091: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" + else +@@ -15004,7 +15098,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:15007: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:15101: 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:15114: 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 +@@ -15025,7 +15119,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldir $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 15028 "configure" ++#line 15122 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -15044,16 +15138,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15047: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15141: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15050: \$? = $ac_status" >&5 ++ echo "$as_me:15144: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15053: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15147: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15056: \$? = $ac_status" >&5 ++ echo "$as_me:15150: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dir_opendir=yes + else +@@ -15064,14 +15158,14 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:15067: result: $ac_cv_lib_dir_opendir" >&5 ++echo "$as_me:15161: 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:15074: checking for opendir in -lx" >&5 ++ echo "$as_me:15168: 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 +@@ -15079,7 +15173,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lx $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 15082 "configure" ++#line 15176 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -15098,16 +15192,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15101: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15195: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15104: \$? = $ac_status" >&5 ++ echo "$as_me:15198: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15107: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15201: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15110: \$? = $ac_status" >&5 ++ echo "$as_me:15204: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_x_opendir=yes + else +@@ -15118,7 +15212,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:15121: result: $ac_cv_lib_x_opendir" >&5 ++echo "$as_me:15215: 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" +@@ -15126,13 +15220,13 @@ + + fi + +-echo "$as_me:15129: checking whether time.h and sys/time.h may both be included" >&5 ++echo "$as_me:15223: 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 15135 "configure" ++#line 15229 "configure" + #include "confdefs.h" + #include + #include +@@ -15148,16 +15242,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15151: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15245: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15154: \$? = $ac_status" >&5 ++ echo "$as_me:15248: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15157: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15251: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15160: \$? = $ac_status" >&5 ++ echo "$as_me:15254: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_time=yes + else +@@ -15167,7 +15261,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:15170: result: $ac_cv_header_time" >&5 ++echo "$as_me:15264: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -15185,13 +15279,13 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return=return + +-echo "$as_me:15188: checking for an ANSI C-conforming const" >&5 ++echo "$as_me:15282: 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 15194 "configure" ++#line 15288 "configure" + #include "confdefs.h" + + int +@@ -15249,16 +15343,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15252: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15346: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15255: \$? = $ac_status" >&5 ++ echo "$as_me:15349: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15258: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15352: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15261: \$? = $ac_status" >&5 ++ echo "$as_me:15355: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_const=yes + else +@@ -15268,7 +15362,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:15271: result: $ac_cv_c_const" >&5 ++echo "$as_me:15365: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 + if test $ac_cv_c_const = no; then + +@@ -15280,7 +15374,7 @@ + + ### Checks for external-data + +-echo "$as_me:15283: checking if data-only library module links" >&5 ++echo "$as_me:15377: 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 +@@ -15288,20 +15382,20 @@ + + rm -f conftest.a + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:15388: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15297: \$? = $ac_status" >&5 ++ echo "$as_me:15391: \$? = $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:15411: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15320: \$? = $ac_status" >&5 ++ echo "$as_me:15414: \$? = $ac_status" >&5 + (exit $ac_status); }; then + mv conftest.o func.o && \ + ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null +@@ -15330,7 +15424,7 @@ + cf_cv_link_dataonly=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 15333 "configure" ++#line 15427 "configure" + #include "confdefs.h" + + int main(void) +@@ -15341,15 +15435,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:15344: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15438: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15347: \$? = $ac_status" >&5 ++ echo "$as_me:15441: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:15349: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15443: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15352: \$? = $ac_status" >&5 ++ echo "$as_me:15446: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_link_dataonly=yes + else +@@ -15364,7 +15458,7 @@ + + fi + +-echo "$as_me:15367: result: $cf_cv_link_dataonly" >&5 ++echo "$as_me:15461: result: $cf_cv_link_dataonly" >&5 + echo "${ECHO_T}$cf_cv_link_dataonly" >&6 + + if test "$cf_cv_link_dataonly" = no ; then +@@ -15383,23 +15477,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:15386: checking for $ac_header" >&5 ++echo "$as_me:15480: 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 15392 "configure" ++#line 15486 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:15396: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:15490: \"$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:15402: \$? = $ac_status" >&5 ++ echo "$as_me:15496: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -15418,7 +15512,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:15421: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:15515: 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:15525: 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 +@@ -15439,7 +15533,7 @@ + cf_cv_func_mkstemp=maybe + else + cat >conftest.$ac_ext <<_ACEOF +-#line 15442 "configure" ++#line 15536 "configure" + #include "confdefs.h" + + #include +@@ -15480,15 +15574,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:15483: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15577: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15486: \$? = $ac_status" >&5 ++ echo "$as_me:15580: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:15488: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15582: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15491: \$? = $ac_status" >&5 ++ echo "$as_me:15585: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_mkstemp=yes + +@@ -15503,16 +15597,16 @@ + fi + + fi +-echo "$as_me:15506: result: $cf_cv_func_mkstemp" >&5 ++echo "$as_me:15600: 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:15509: checking for mkstemp" >&5 ++ echo "$as_me:15603: 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 15515 "configure" ++#line 15609 "configure" + #include "confdefs.h" + #define mkstemp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -15543,16 +15637,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15546: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15640: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15549: \$? = $ac_status" >&5 ++ echo "$as_me:15643: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15552: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15646: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15555: \$? = $ac_status" >&5 ++ echo "$as_me:15649: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_mkstemp=yes + else +@@ -15562,7 +15656,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:15565: result: $ac_cv_func_mkstemp" >&5 ++echo "$as_me:15659: result: $ac_cv_func_mkstemp" >&5 + echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 + + fi +@@ -15586,7 +15680,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:15589: checking for $ac_word" >&5 ++echo "$as_me:15683: 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 +@@ -15601,7 +15695,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_gnatmake_exists="yes" +-echo "$as_me:15604: found $ac_dir/$ac_word" >&5 ++echo "$as_me:15698: found $ac_dir/$ac_word" >&5 + break + done + +@@ -15610,10 +15704,10 @@ + fi + gnatmake_exists=$ac_cv_prog_gnatmake_exists + if test -n "$gnatmake_exists"; then +- echo "$as_me:15613: result: $gnatmake_exists" >&5 ++ echo "$as_me:15707: result: $gnatmake_exists" >&5 + echo "${ECHO_T}$gnatmake_exists" >&6 + else +- echo "$as_me:15616: result: no" >&5 ++ echo "$as_me:15710: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -15623,7 +15717,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:15626: checking for $ac_word" >&5 ++echo "$as_me:15720: 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 +@@ -15638,7 +15732,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_gprconfig_exists="yes" +-echo "$as_me:15641: found $ac_dir/$ac_word" >&5 ++echo "$as_me:15735: found $ac_dir/$ac_word" >&5 + break + done + +@@ -15647,10 +15741,10 @@ + fi + gprconfig_exists=$ac_cv_prog_gprconfig_exists + if test -n "$gprconfig_exists"; then +- echo "$as_me:15650: result: $gprconfig_exists" >&5 ++ echo "$as_me:15744: result: $gprconfig_exists" >&5 + echo "${ECHO_T}$gprconfig_exists" >&6 + else +- echo "$as_me:15653: result: no" >&5 ++ echo "$as_me:15747: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -15663,7 +15757,7 @@ + cd conftest.src + for cf_gprconfig in Ada C + do +- echo "$as_me:15666: checking for gprconfig name for $cf_gprconfig" >&5 ++ echo "$as_me:15760: 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 +@@ -15682,10 +15776,10 @@ + if test -n "$cf_gprconfig_value" + then + eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value +- echo "$as_me:15685: result: $cf_gprconfig_value" >&5 ++ echo "$as_me:15779: result: $cf_gprconfig_value" >&5 + echo "${ECHO_T}$cf_gprconfig_value" >&6 + else +- echo "$as_me:15688: result: missing" >&5 ++ echo "$as_me:15782: result: missing" >&5 + echo "${ECHO_T}missing" >&6 + cf_ada_config="#" + break +@@ -15701,12 +15795,12 @@ + if test "x$cf_ada_config" != "x#" + then + +-echo "$as_me:15704: checking for gnat version" >&5 ++echo "$as_me:15798: 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:15709: result: $cf_gnat_version" >&5 ++echo "$as_me:15803: result: $cf_gnat_version" >&5 + echo "${ECHO_T}$cf_gnat_version" >&6 + + case $cf_gnat_version in +@@ -15714,7 +15808,7 @@ + cf_cv_prog_gnat_correct=yes + ;; + (*) +- { echo "$as_me:15717: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 ++ { echo "$as_me:15811: 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 + ;; +@@ -15722,7 +15816,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:15725: checking for $ac_word" >&5 ++echo "$as_me:15819: 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 +@@ -15737,7 +15831,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_M4_exists="yes" +-echo "$as_me:15740: found $ac_dir/$ac_word" >&5 ++echo "$as_me:15834: found $ac_dir/$ac_word" >&5 + break + done + +@@ -15746,10 +15840,10 @@ + fi + M4_exists=$ac_cv_prog_M4_exists + if test -n "$M4_exists"; then +- echo "$as_me:15749: result: $M4_exists" >&5 ++ echo "$as_me:15843: result: $M4_exists" >&5 + echo "${ECHO_T}$M4_exists" >&6 + else +- echo "$as_me:15752: result: no" >&5 ++ echo "$as_me:15846: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -15758,7 +15852,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:15761: checking if GNAT works" >&5 ++ echo "$as_me:15855: checking if GNAT works" >&5 + echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + + rm -rf conftest* *~conftest* +@@ -15786,7 +15880,7 @@ + fi + rm -rf conftest* *~conftest* + +- echo "$as_me:15789: result: $cf_cv_prog_gnat_correct" >&5 ++ echo "$as_me:15883: result: $cf_cv_prog_gnat_correct" >&5 + echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + else +@@ -15796,7 +15890,7 @@ + + if test "$cf_cv_prog_gnat_correct" = yes; then + +- echo "$as_me:15799: checking optimization options for ADAFLAGS" >&5 ++ echo "$as_me:15893: checking optimization options for ADAFLAGS" >&5 + echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 + case "$CFLAGS" in + (*-g*) +@@ -15813,10 +15907,10 @@ + + ;; + esac +- echo "$as_me:15816: result: $ADAFLAGS" >&5 ++ echo "$as_me:15910: result: $ADAFLAGS" >&5 + echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:15819: checking if GNATPREP supports -T option" >&5 ++echo "$as_me:15913: 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 +@@ -15826,11 +15920,11 @@ + gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes + + fi +-echo "$as_me:15829: result: $cf_cv_gnatprep_opt_t" >&5 ++echo "$as_me:15923: 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:15833: checking if GNAT supports generics" >&5 ++echo "$as_me:15927: 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].*) +@@ -15840,7 +15934,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:15843: result: $cf_gnat_generics" >&5 ++echo "$as_me:15937: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -15852,7 +15946,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:15855: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:15949: 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 +@@ -15900,7 +15994,7 @@ + rm -rf conftest* *~conftest* + + fi +-echo "$as_me:15903: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:15997: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test $cf_cv_gnat_sigint = yes ; then +@@ -15913,7 +16007,7 @@ + cf_gnat_projects=no + + if test "$enable_gnat_projects" != no ; then +-echo "$as_me:15916: checking if GNAT supports project files" >&5 ++echo "$as_me:16010: 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]*) +@@ -15976,15 +16070,15 @@ + esac + ;; + esac +-echo "$as_me:15979: result: $cf_gnat_projects" >&5 ++echo "$as_me:16073: 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:15985: checking if GNAT supports libraries" >&5 ++ echo "$as_me:16079: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:15987: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:16081: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -16004,7 +16098,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:16007: checking for ada-compiler" >&5 ++echo "$as_me:16101: 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. +@@ -16015,12 +16109,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:16018: result: $cf_ada_compiler" >&5 ++echo "$as_me:16112: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:16023: checking for ada-include" >&5 ++echo "$as_me:16117: 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. +@@ -16056,7 +16150,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:16059: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:16153: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -16065,10 +16159,10 @@ + fi + eval ADA_INCLUDE="$withval" + +-echo "$as_me:16068: result: $ADA_INCLUDE" >&5 ++echo "$as_me:16162: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:16071: checking for ada-objects" >&5 ++echo "$as_me:16165: 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. +@@ -16104,7 +16198,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:16107: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:16201: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -16113,10 +16207,10 @@ + fi + eval ADA_OBJECTS="$withval" + +-echo "$as_me:16116: result: $ADA_OBJECTS" >&5 ++echo "$as_me:16210: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:16119: checking if an Ada95 shared-library should be built" >&5 ++echo "$as_me:16213: 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. +@@ -16126,14 +16220,14 @@ + else + with_ada_sharedlib=no + fi; +-echo "$as_me:16129: result: $with_ada_sharedlib" >&5 ++echo "$as_me:16223: 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:16136: WARNING: disabling shared-library since GNAT projects are not supported" >&5 ++ { echo "$as_me:16230: 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 +@@ -16151,13 +16245,34 @@ + fi + fi + ++ # allow the Ada binding to be renamed ++ ++echo "$as_me:16250: 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. ++if test "${with_ada_libname+set}" = set; then ++ withval="$with_ada_libname" ++ ADA_LIBNAME=$withval ++else ++ ADA_LIBNAME=AdaCurses ++fi; ++case "x$ADA_LIBNAME" in ++(x|xyes|xno) ++ ADA_LIBNAME=AdaCurses ++ ;; ++esac ++ ++echo "$as_me:16266: result: $ADA_LIBNAME" >&5 ++echo "${ECHO_T}$ADA_LIBNAME" >&6 ++ + else +- { { echo "$as_me:16155: error: No usable Ada compiler found" >&5 ++ { { echo "$as_me:16270: 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:16160: error: The Ada compiler is needed for this package" >&5 ++ { { echo "$as_me:16275: 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 +@@ -16197,7 +16312,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:16200: checking default library suffix" >&5 ++echo "$as_me:16315: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -16208,10 +16323,10 @@ + (shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:16211: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:16326: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:16214: checking default library-dependency suffix" >&5 ++echo "$as_me:16329: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case X$DFT_LWR_MODEL in +@@ -16269,10 +16384,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:16272: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:16387: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:16275: checking default object directory" >&5 ++echo "$as_me:16390: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -16288,7 +16403,7 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:16291: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:16406: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + ### Set up low-level terminfo dependencies for makefiles. +@@ -16530,7 +16645,7 @@ + : ${CONFIG_STATUS=./config.status} + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:16533: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:16648: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL +@@ -16662,7 +16777,7 @@ + cat >>$CONFIG_STATUS <&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -16725,7 +16840,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:16728: error: unrecognized option: $1 ++ -*) { { echo "$as_me:16843: 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;} +@@ -16744,7 +16859,7 @@ + ## Running config.status. ## + ## ----------------------- ## + +-This file was extended by $as_me 2.52.20190828, executed with ++This file was extended by $as_me 2.52.20190901, executed with + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS +@@ -16796,7 +16911,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:16799: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:16914: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -16999,6 +17114,7 @@ + s,@ADA_OBJECTS@,$ADA_OBJECTS,;t t + s,@ADA_SHAREDLIB@,$ADA_SHAREDLIB,;t t + s,@MAKE_ADA_SHAREDLIB@,$MAKE_ADA_SHAREDLIB,;t t ++s,@ADA_LIBNAME@,$ADA_LIBNAME,;t t + s,@TINFO_LDFLAGS2@,$TINFO_LDFLAGS2,;t t + s,@TINFO_LIBS@,$TINFO_LIBS,;t t + s,@ACPPFLAGS@,$ACPPFLAGS,;t t +@@ -17148,7 +17264,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:17151: creating $ac_file" >&5 ++ { echo "$as_me:17267: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -17166,7 +17282,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:17169: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:17285: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -17179,7 +17295,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:17182: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:17298: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -17195,7 +17311,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' $ac_item` + if test -z "$ac_used"; then +- { echo "$as_me:17198: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:17314: 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;} +@@ -17204,7 +17320,7 @@ + fi + ac_seen=`grep '${datarootdir}' $ac_item` + if test -n "$ac_seen"; then +- { echo "$as_me:17207: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:17323: 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;} +@@ -17241,7 +17357,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:17244: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:17360: 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;} +@@ -17252,7 +17368,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:17255: WARNING: Some variables may not be substituted: ++ { echo "$as_me:17371: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -17301,7 +17417,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:17304: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:17420: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -17312,7 +17428,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:17315: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:17431: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -17325,7 +17441,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:17328: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:17444: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -17383,7 +17499,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:17386: $ac_file is unchanged" >&5 ++ { echo "$as_me:17502: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +Index: Ada95/configure.in +Prereq: 1.71 +--- ncurses-6.1-20190831+/Ada95/configure.in 2019-08-31 21:16:49.000000000 +0000 ++++ ncurses-6.1-20190907/Ada95/configure.in 2019-09-07 22:50:06.000000000 +0000 +@@ -28,14 +28,14 @@ + dnl + dnl Author: Thomas E. Dickey + dnl +-dnl $Id: configure.in,v 1.71 2019/08/31 21:16:49 tom Exp $ ++dnl $Id: configure.in,v 1.72 2019/09/07 22:50:06 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.20030208) +-AC_REVISION($Revision: 1.71 $) ++AC_REVISION($Revision: 1.72 $) + AC_INIT(gen/gen.c) + AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) + +@@ -497,6 +497,9 @@ + CF_WITH_ADA_INCLUDE + CF_WITH_ADA_OBJECTS + CF_WITH_ADA_SHAREDLIB ++ ++ # allow the Ada binding to be renamed ++ CF_WITH_ADA_LIBNAME(AdaCurses) + else + AC_MSG_ERROR(No usable Ada compiler found) + fi +Index: Ada95/doc/Makefile.in +Prereq: 1.5 +--- ncurses-6.1-20190831+/Ada95/doc/Makefile.in 2018-01-15 22:12:59.000000000 +0000 ++++ ncurses-6.1-20190907/Ada95/doc/Makefile.in 2019-09-07 20:21:52.000000000 +0000 +@@ -1,6 +1,6 @@ +-# $Id: Makefile.in,v 1.5 2018/01/15 22:12:59 tom Exp $ ++# $Id: Makefile.in,v 1.6 2019/09/07 20:21:52 tom Exp $ + ############################################################################## +-# Copyright (c) 2011-2015,2018 Free Software Foundation, Inc. # ++# Copyright (c) 2011-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"), # +@@ -47,7 +47,7 @@ + + DFT_ARG_SUFFIX = @DFT_ARG_SUFFIX@ + +-THIS = AdaCurses ++THIS = @ADA_LIBNAME@ + DOCDIR = $(DESTDIR)$(datadir)/doc/$(THIS) + MANDIR = $(DESTDIR)$(mandir)/man1 + +Index: Ada95/gen/adacurses-config.in +Prereq: 1.11 +--- ncurses-6.1-20190831+/Ada95/gen/adacurses-config.in 2016-11-05 20:48:35.000000000 +0000 ++++ ncurses-6.1-20190907/Ada95/gen/adacurses-config.in 2019-09-07 20:20:52.000000000 +0000 +@@ -1,5 +1,5 @@ + #! /bin/sh +-# $Id: adacurses-config.in,v 1.11 2016/11/05 20:48:35 tom Exp $ ++# $Id: adacurses-config.in,v 1.12 2019/09/07 20:20:52 tom Exp $ + ############################################################################## + # Copyright (c) 2007-2012,2016 Free Software Foundation, Inc. # + # # +@@ -41,14 +41,14 @@ + VERSION=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@ + + CFLAGS="-aI$ADA_INCLUDE -aO$ADA_OBJECTS" +-LIBS="-L$ADA_OBJECTS -lAdaCurses" ++LIBS="-L$ADA_OBJECTS -l@ADA_LIBNAME@" + +-THIS="adacurses" ++THIS="@ADA_LIBNAME@" + THIS_CFG="$THIS@DFT_ARG_SUFFIX@-config" + + case "x$1" in + x--version) +- echo AdaCurses $VERSION ++ echo @ADA_LIBNAME@ $VERSION + ;; + x--cflags) + echo $CFLAGS +Index: Ada95/package/AdaCurses-doc.spec +Prereq: 1.5 +--- ncurses-6.1-20190831+/Ada95/package/AdaCurses-doc.spec 2018-05-26 20:26:20.000000000 +0000 ++++ ncurses-6.1-20190907/Ada95/package/AdaCurses-doc.spec 2019-09-07 20:37:52.000000000 +0000 +@@ -3,7 +3,7 @@ + %define AppVersion MAJOR.MINOR + %define AppRelease YYYYMMDD + %define AppPackage %{AppProgram}-doc +-# $Id: AdaCurses-doc.spec,v 1.5 2018/05/26 20:26:20 tom Exp $ ++# $Id: AdaCurses-doc.spec,v 1.6 2019/09/07 20:37:52 tom Exp $ + Name: %{AppPackage} + Version: %{AppVersion} + Release: %{AppRelease} +@@ -41,10 +41,13 @@ + + %files + %defattr(-,root,root) +-%{_datadir}/doc/AdaCurses ++%{_datadir}/doc/%{AppProgram} + + %changelog + # each patch should add its ChangeLog entries here + ++* Sat Sep 07 2019 Thomas Dickey ++- use AppProgram to replace "AdaCurses" globally ++ + * Sat Mar 26 2011 Thomas Dickey + - initial version +Index: Ada95/package/AdaCurses.spec +Prereq: 1.16 +--- ncurses-6.1-20190831+/Ada95/package/AdaCurses.spec 2017-12-09 20:41:28.000000000 +0000 ++++ ncurses-6.1-20190907/Ada95/package/AdaCurses.spec 2019-09-08 01:00:18.000000000 +0000 +@@ -1,8 +1,8 @@ +-Summary: AdaCurses - Ada95 binding for ncurses ++Summary: Ada95 binding for ncurses + %define AppProgram AdaCurses + %define AppVersion MAJOR.MINOR + %define AppRelease YYYYMMDD +-# $Id: AdaCurses.spec,v 1.16 2017/12/09 20:41:28 tom Exp $ ++# $Id: AdaCurses.spec,v 1.19 2019/09/08 01:00:18 tom Exp $ + Name: %{AppProgram} + Version: %{AppVersion} + Release: %{AppRelease} +@@ -17,13 +17,13 @@ + patch-date YYYYMMDD. + + In addition to a library, this package installs sample programs in +-"bin/AdaCurses" to avoid conflict with other packages. ++"bin/%{AppProgram}" to avoid conflict with other packages. + %prep + + %define debug_package %{nil} + + # http://fedoraproject.org/wiki/EPEL:Packaging_Autoprovides_and_Requires_Filtering +-%filter_from_requires /libAdaCurses.so.1/d ++%filter_from_requires /lib%{AppProgram}.so.1/d + %filter_setup + + %setup -q -n %{AppProgram}-%{AppRelease} +@@ -31,6 +31,7 @@ + %build + + %define ada_libdir %{_prefix}/lib/ada/adalib ++%define ada_include %{_prefix}/share/ada/adainclude + + INSTALL_PROGRAM='${INSTALL}' \ + ./configure \ +@@ -38,6 +39,8 @@ + --prefix=%{_prefix} \ + --bindir=%{_bindir} \ + --libdir=%{_libdir} \ ++ --with-ada-include=%{ada_include} \ ++ --with-ada-objects=%{ada_libdir} \ + --mandir=%{_mandir} \ + --datadir=%{_datadir} \ + --disable-rpath-link \ +@@ -64,16 +67,18 @@ + %defattr(-,root,root) + %{_bindir}/adacurses*-config + %{_bindir}/%{AppProgram}/* +-%{_libdir}/libAdaCurses.* +-%{ada_libdir}/libAdaCurses.* +-%{ada_libdir}/terminal_interface* ++%{ada_libdir}/lib%{AppProgram}.* + %{_mandir}/man1/adacurses*-config.1* + %{_datadir}/%{AppProgram}/* +-%{_datadir}/ada/adainclude/terminal_interface* ++%{ada_include}/terminal_interface* + + %changelog + # each patch should add its ChangeLog entries here + ++* Sat Sep 07 2019 Thomas Dickey ++- use AppProgram to replace "AdaCurses" globally ++- amend install-paths to work with Fedora30 ++ + * Thu Mar 31 2011 Thomas Dickey + - use --with-shared option for consistency with --with-ada-sharelib + - ensure that MY_DATADIR is set when installing examples +Index: Ada95/samples/Makefile.in +Prereq: 1.53 +--- ncurses-6.1-20190831+/Ada95/samples/Makefile.in 2018-11-10 21:53:44.000000000 +0000 ++++ ncurses-6.1-20190907/Ada95/samples/Makefile.in 2019-09-08 00:01:38.000000000 +0000 +@@ -1,5 +1,5 @@ + ############################################################################## +-# 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 "Software"), # +@@ -28,7 +28,7 @@ + # + # Author: Juergen Pfeifer, 1996 + # +-# $Id: Makefile.in,v 1.53 2018/11/10 21:53:44 tom Exp $ ++# $Id: Makefile.in,v 1.56 2019/09/08 00:01:38 tom Exp $ + # + .SUFFIXES: + +@@ -81,29 +81,31 @@ + DATADIR = $(DESTDIR)$(datadir) + LIBDIR = $(DESTDIR)$(libdir) + +-MY_DATADIR = $(DATADIR)/AdaCurses ++MY_DATADIR = $(DATADIR)/@ADA_LIBNAME@ + + ################################################################################ +-ada_srcdir=../src ++ada_srcdir = ../src + +-LD_FLAGS = @LD_MODEL@ $(LOCAL_LIBS) @LDFLAGS@ @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) ++LD_FLAGS = @LD_MODEL@ $(LOCAL_LIBS) @LDFLAGS@ @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) + +-ADA = @cf_ada_compiler@ +-ADAFLAGS = @ADAFLAGS@ -I$(srcdir) ++ADA = @cf_ada_compiler@ ++ADAPREP = gnatprep ++ADAFLAGS = @ADAFLAGS@ -I$(srcdir) + +-ADAMAKE = @cf_ada_make@ +-ADAMAKEFLAGS = -a \ ++ADAMAKE = @cf_ada_make@ ++ADAMAKEFLAGS = -a \ + -A$(srcdir) \ + -A$(ada_srcdir) \ + -A$(srcdir)/$(ada_srcdir) + +-ALIB = @cf_ada_package@ +-ABASE = $(ALIB)-curses ++ALIB = @cf_ada_package@ ++ABASE = $(ALIB)-curses ++THISLIB = sample + +-CARGS =-cargs $(ADAFLAGS) +-LARGS =-largs -L../lib -lAdaCurses @TEST_ARG2@ $(LD_FLAGS) @TEST_LIBS2@ ++CARGS = -cargs $(ADAFLAGS) ++LARGS = -largs -L../lib -l@ADA_LIBNAME@ @TEST_ARG2@ $(LD_FLAGS) @TEST_LIBS2@ + +-PROGS = tour$x ncurses$x @USE_GNAT_SIGINT@ rain$x ++PROGS = tour$x ncurses$x @USE_GNAT_SIGINT@ rain$x + + all :: $(PROGS) + @echo made $@ +@@ -136,13 +138,15 @@ + $(MY_DATADIR) : + mkdir -p $@ + +-ncurses$x : ++AUTO_SRC = $(THISLIB)-explanation.adb ++ ++ncurses$x : $(AUTO_SRC) + $(ADAMAKE) $(ADAMAKEFLAGS) ncurses $(CARGS) $(LARGS) + +-tour$x : ++tour$x : $(AUTO_SRC) + $(ADAMAKE) $(ADAMAKEFLAGS) tour $(CARGS) $(LARGS) + +-rain$x : ++rain$x : $(AUTO_SRC) + $(ADAMAKE) $(ADAMAKEFLAGS) rain $(CARGS) $(LARGS) + + mostlyclean: +@@ -150,10 +154,15 @@ + + clean :: mostlyclean + rm -f *.o *.ali b_t*.* *.s $(PROGS) a.out core b_*_test.c *.xr[bs] \ +- trace screendump b~*.ad[bs] ++ rm -f $(AUTO_SRC) ++ rm -f trace screendump b~*.ad[bs] + + distclean :: clean + rm -f Makefile + + realclean :: distclean + @echo made $@ ++ ++$(THISLIB)-explanation.adb : $(srcdir)/$(THISLIB)-explanation.adb_p ++ rm -f $@ ++ $(ADAPREP) -DTHIS_DATADIR=\"$(DATADIR)\" @GNATPREP_OPTS@ $(srcdir)/$(THISLIB)-explanation.adb_p $@ +Index: Ada95/samples/sample-explanation.adb_p +--- /dev/null 2019-09-07 15:33:13.780000000 +0000 ++++ ncurses-6.1-20190907/Ada95/samples/sample-explanation.adb_p 2019-09-08 00:14:54.000000000 +0000 +@@ -0,0 +1,441 @@ ++------------------------------------------------------------------------------ ++-- -- ++-- GNAT ncurses Binding Samples -- ++-- -- ++-- Sample.Explanation -- ++-- -- ++-- B O D Y -- ++-- -- ++------------------------------------------------------------------------------ ++-- Copyright (c) 1998-2014,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. -- ++------------------------------------------------------------------------------ ++-- Author: Juergen Pfeifer, 1996 ++-- Version Control ++-- $Revision: 1.4 $ ++-- $Date: 2019/09/08 00:14:54 $ ++-- Binding Version 01.00 ++------------------------------------------------------------------------------ ++-- Poor mans help system. This scans a sequential file for key lines and ++-- then reads the lines up to the next key. Those lines are presented in ++-- a window as help or explanation. ++-- ++with Ada.Text_IO; use Ada.Text_IO; ++with Ada.Unchecked_Deallocation; ++with Terminal_Interface.Curses; use Terminal_Interface.Curses; ++with Terminal_Interface.Curses.Panels; use Terminal_Interface.Curses.Panels; ++ ++with Sample.Keyboard_Handler; use Sample.Keyboard_Handler; ++with Sample.Manifest; use Sample.Manifest; ++with Sample.Function_Key_Setting; use Sample.Function_Key_Setting; ++with Sample.Helpers; use Sample.Helpers; ++ ++package body Sample.Explanation is ++ ++ Help_Keys : constant String := "HELPKEYS"; ++ In_Help : constant String := "INHELP"; ++ ++ File_Name : constant String := "explain.txt"; ++ F : File_Type; ++ ++ type Help_Line; ++ type Help_Line_Access is access Help_Line; ++ pragma Controlled (Help_Line_Access); ++ type String_Access is access String; ++ pragma Controlled (String_Access); ++ ++ type Help_Line is ++ record ++ Prev, Next : Help_Line_Access; ++ Line : String_Access; ++ end record; ++ ++ procedure Explain (Key : String; ++ Win : Window); ++ ++ procedure Release_String is ++ new Ada.Unchecked_Deallocation (String, ++ String_Access); ++ procedure Release_Help_Line is ++ new Ada.Unchecked_Deallocation (Help_Line, ++ Help_Line_Access); ++ ++ function Search (Key : String) return Help_Line_Access; ++ procedure Release_Help (Root : in out Help_Line_Access); ++ ++ function Check_File (Name : String) return Boolean; ++ ++ procedure Explain (Key : String) ++ is ++ begin ++ Explain (Key, Null_Window); ++ end Explain; ++ ++ procedure Explain (Key : String; ++ Win : Window) ++ is ++ -- Retrieve the text associated with this key and display it in this ++ -- window. If no window argument is passed, the routine will create ++ -- a temporary window and use it. ++ ++ function Filter_Key return Real_Key_Code; ++ procedure Unknown_Key; ++ procedure Redo; ++ procedure To_Window (C : in out Help_Line_Access; ++ More : in out Boolean); ++ ++ Frame : Window := Null_Window; ++ ++ W : Window := Win; ++ K : Real_Key_Code; ++ P : Panel; ++ ++ Height : Line_Count; ++ Width : Column_Count; ++ Help : Help_Line_Access := Search (Key); ++ Current : Help_Line_Access; ++ Top_Line : Help_Line_Access; ++ ++ Has_More : Boolean := True; ++ ++ procedure Unknown_Key ++ is ++ begin ++ Add (W, "Help message with ID "); ++ Add (W, Key); ++ Add (W, " not found."); ++ Add (W, Character'Val (10)); ++ Add (W, "Press the Function key labeled 'Quit' key to continue."); ++ end Unknown_Key; ++ ++ procedure Redo ++ is ++ H : Help_Line_Access := Top_Line; ++ begin ++ if Top_Line /= null then ++ for L in 0 .. (Height - 1) loop ++ Add (W, L, 0, H.all.Line.all); ++ exit when H.all.Next = null; ++ H := H.all.Next; ++ end loop; ++ else ++ Unknown_Key; ++ end if; ++ end Redo; ++ ++ function Filter_Key return Real_Key_Code ++ is ++ K : Real_Key_Code; ++ begin ++ loop ++ K := Get_Key (W); ++ if K in Special_Key_Code'Range then ++ case K is ++ when HELP_CODE => ++ if not Find_Context (In_Help) then ++ Push_Environment (In_Help, False); ++ Explain (In_Help, W); ++ Pop_Environment; ++ Redo; ++ end if; ++ when EXPLAIN_CODE => ++ if not Find_Context (Help_Keys) then ++ Push_Environment (Help_Keys, False); ++ Explain (Help_Keys, W); ++ Pop_Environment; ++ Redo; ++ end if; ++ when others => exit; ++ end case; ++ else ++ exit; ++ end if; ++ end loop; ++ return K; ++ end Filter_Key; ++ ++ procedure To_Window (C : in out Help_Line_Access; ++ More : in out Boolean) ++ is ++ L : Line_Position := 0; ++ begin ++ loop ++ Add (W, L, 0, C.all.Line.all); ++ L := L + 1; ++ exit when C.all.Next = null or else L = Height; ++ C := C.all.Next; ++ end loop; ++ if C.all.Next /= null then ++ pragma Assert (L = Height); ++ More := True; ++ else ++ More := False; ++ end if; ++ end To_Window; ++ ++ begin ++ if W = Null_Window then ++ Push_Environment ("HELP"); ++ Default_Labels; ++ Frame := New_Window (Lines - 2, Columns, 0, 0); ++ if Has_Colors then ++ Set_Background (Win => Frame, ++ Ch => (Ch => ' ', ++ Color => Help_Color, ++ Attr => Normal_Video)); ++ Set_Character_Attributes (Win => Frame, ++ Attr => Normal_Video, ++ Color => Help_Color); ++ Erase (Frame); ++ end if; ++ Box (Frame); ++ Set_Character_Attributes (Frame, (Reverse_Video => True, ++ others => False)); ++ Add (Frame, Lines - 3, 2, "Cursor Up/Down scrolls"); ++ Set_Character_Attributes (Frame); -- Back to default. ++ Window_Title (Frame, "Explanation"); ++ W := Derived_Window (Frame, Lines - 4, Columns - 2, 1, 1); ++ Refresh_Without_Update (Frame); ++ Get_Size (W, Height, Width); ++ Set_Meta_Mode (W); ++ Set_KeyPad_Mode (W); ++ Allow_Scrolling (W, True); ++ Set_Echo_Mode (False); ++ P := Create (Frame); ++ Top (P); ++ Update_Panels; ++ else ++ Clear (W); ++ Refresh_Without_Update (W); ++ end if; ++ ++ Current := Help; Top_Line := Help; ++ ++ if null = Help then ++ Unknown_Key; ++ loop ++ K := Filter_Key; ++ exit when K = QUIT_CODE; ++ end loop; ++ else ++ To_Window (Current, Has_More); ++ if Has_More then ++ -- This means there are more lines available, so we have to go ++ -- into a scroll manager. ++ loop ++ K := Filter_Key; ++ if K in Special_Key_Code'Range then ++ case K is ++ when Key_Cursor_Down => ++ if Current.all.Next /= null then ++ Move_Cursor (W, Height - 1, 0); ++ Scroll (W, 1); ++ Current := Current.all.Next; ++ Top_Line := Top_Line.all.Next; ++ Add (W, Current.all.Line.all); ++ end if; ++ when Key_Cursor_Up => ++ if Top_Line.all.Prev /= null then ++ Move_Cursor (W, 0, 0); ++ Scroll (W, -1); ++ Top_Line := Top_Line.all.Prev; ++ Current := Current.all.Prev; ++ Add (W, Top_Line.all.Line.all); ++ end if; ++ when QUIT_CODE => exit; ++ when others => null; ++ end case; ++ end if; ++ end loop; ++ else ++ loop ++ K := Filter_Key; ++ exit when K = QUIT_CODE; ++ end loop; ++ end if; ++ end if; ++ ++ Clear (W); ++ ++ if Frame /= Null_Window then ++ Clear (Frame); ++ Delete (P); ++ Delete (W); ++ Delete (Frame); ++ Pop_Environment; ++ end if; ++ ++ Update_Panels; ++ Update_Screen; ++ ++ Release_Help (Help); ++ ++ end Explain; ++ ++ function Search (Key : String) return Help_Line_Access ++ is ++ Last : Natural; ++ Buffer : String (1 .. 256); ++ Root : Help_Line_Access := null; ++ Current : Help_Line_Access; ++ Tail : Help_Line_Access := null; ++ ++ function Next_Line return Boolean; ++ ++ function Next_Line return Boolean ++ is ++ H_End : constant String := "#END"; ++ begin ++ Get_Line (F, Buffer, Last); ++ if Last = H_End'Length and then H_End = Buffer (1 .. Last) then ++ return False; ++ else ++ return True; ++ end if; ++ end Next_Line; ++ begin ++ Reset (F); ++ Outer : ++ loop ++ exit Outer when not Next_Line; ++ if Last = (1 + Key'Length) ++ and then Key = Buffer (2 .. Last) ++ and then Buffer (1) = '#' ++ then ++ loop ++ exit when not Next_Line; ++ exit when Buffer (1) = '#'; ++ Current := new Help_Line'(null, null, ++ new String'(Buffer (1 .. Last))); ++ if Tail = null then ++ Release_Help (Root); ++ Root := Current; ++ else ++ Tail.all.Next := Current; ++ Current.all.Prev := Tail; ++ end if; ++ Tail := Current; ++ end loop; ++ exit Outer; ++ end if; ++ end loop Outer; ++ return Root; ++ end Search; ++ ++ procedure Release_Help (Root : in out Help_Line_Access) ++ is ++ Next : Help_Line_Access; ++ begin ++ loop ++ exit when Root = null; ++ Next := Root.all.Next; ++ Release_String (Root.all.Line); ++ Release_Help_Line (Root); ++ Root := Next; ++ end loop; ++ end Release_Help; ++ ++ procedure Explain_Context ++ is ++ begin ++ Explain (Context); ++ end Explain_Context; ++ ++ procedure Notepad (Key : String) ++ is ++ H : constant Help_Line_Access := Search (Key); ++ T : Help_Line_Access := H; ++ N : Line_Count := 1; ++ L : Line_Position := 0; ++ W : Window; ++ P : Panel; ++ begin ++ if H /= null then ++ loop ++ T := T.all.Next; ++ exit when T = null; ++ N := N + 1; ++ end loop; ++ W := New_Window (N + 2, Columns, Lines - N - 2, 0); ++ if Has_Colors then ++ Set_Background (Win => W, ++ Ch => (Ch => ' ', ++ Color => Notepad_Color, ++ Attr => Normal_Video)); ++ Set_Character_Attributes (Win => W, ++ Attr => Normal_Video, ++ Color => Notepad_Color); ++ Erase (W); ++ end if; ++ Box (W); ++ Window_Title (W, "Notepad"); ++ P := New_Panel (W); ++ T := H; ++ loop ++ Add (W, L + 1, 1, T.all.Line.all, Integer (Columns - 2)); ++ L := L + 1; ++ T := T.all.Next; ++ exit when T = null; ++ end loop; ++ T := H; ++ Release_Help (T); ++ Refresh_Without_Update (W); ++ Notepad_To_Context (P); ++ end if; ++ end Notepad; ++ ++ function Check_File (Name : String) return Boolean is ++ The_File : File_Type; ++ begin ++ Open (The_File, In_File, Name); ++ Close (The_File); ++ return True; ++ exception ++ when Name_Error => ++ return False; ++ end Check_File; ++ ++begin ++ if Check_File ++ ($THIS_DATADIR ++ & File_Name) ++ then ++ Open (F, In_File, ++ $THIS_DATADIR ++ & File_Name); ++ elsif Check_File (File_Name) then ++ Open (F, In_File, File_Name); ++ else ++ Put_Line (Standard_Error, ++ "The file " ++ & File_Name ++ & " was not found in " ++ & $THIS_DATADIR ++ ); ++ raise Name_Error; ++ end if; ++end Sample.Explanation; ++-- vile:adamode +Index: Ada95/src/Makefile.in +Prereq: 1.84 +--- ncurses-6.1-20190831+/Ada95/src/Makefile.in 2019-08-31 15:32:01.000000000 +0000 ++++ ncurses-6.1-20190907/Ada95/src/Makefile.in 2019-09-07 20:53:06.000000000 +0000 +@@ -28,7 +28,7 @@ + # + # Author: Juergen Pfeifer, 1996 + # +-# $Id: Makefile.in,v 1.84 2019/08/31 15:32:01 tom Exp $ ++# $Id: Makefile.in,v 1.87 2019/09/07 20:53:06 tom Exp $ + # + .SUFFIXES: + +@@ -56,7 +56,6 @@ + + INSTALL = @INSTALL@ @INSTALL_OPT_O@ + INSTALL_LIB = @INSTALL@ @INSTALL_LIB@ +-USE_LIB_SUFFIX = @USE_LIB_SUFFIX@ + + AR = @AR@ + ARFLAGS = @ARFLAGS@ +@@ -84,14 +83,14 @@ + RANLIB = @RANLIB@ + + ################################################################################ +-ADA = @cf_ada_compiler@ ++ADA = @cf_ada_compiler@ + ADAPREP = gnatprep +-ADAFLAGS = @ADAFLAGS@ -I. -I$(srcdir) ++ADAFLAGS = @ADAFLAGS@ -I. -I$(srcdir) + +-LIB_NAME = AdaCurses ++LIB_NAME = @ADA_LIBNAME@ + SONAME = @ADA_SHAREDLIB@ + +-GNAT_PROJECT = AdaCurses.gpr ++GNAT_PROJECT = @ADA_LIBNAME@.gpr + + # build/source are the Ada95 tree + BUILD_DIR = .. +@@ -100,8 +99,8 @@ + BUILD_DIR_LIB = $(BUILD_DIR)/lib + SOURCE_DIR_SRC = $(SOURCE_DIR)/src + +-ADAMAKE = @cf_ada_make@ +-ADAMAKEFLAGS = \ ++ADAMAKE = @cf_ada_make@ ++ADAMAKEFLAGS = \ + -P$(GNAT_PROJECT) \ + -XBUILD_DIR=`cd $(BUILD_DIR);pwd` \ + -XSOURCE_DIR=`cd $(SOURCE_DIR);pwd` \ +@@ -214,7 +213,7 @@ + rm -f $(ABASE)-trace.adb + + distclean :: clean +- rm -f Makefile ++ rm -f Makefile library.gpr + + realclean :: distclean + +@@ -273,7 +272,7 @@ + @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 "$(USE_LIB_SUFFIX)" $(srcdir)/library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT) ++@USE_GNAT_PROJECTS@ $(SHELL) $(srcdir)/library-cfg.sh static $(srcdir)/library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT) + @USE_GNAT_PROJECTS@ @echo "Using GNAT Project:" + @USE_GNAT_PROJECTS@ @-$(SHELL) -c "diff -u $(srcdir)/library.gpr $(GNAT_PROJECT); exit 0" + @USE_GNAT_PROJECTS@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static +@@ -311,7 +310,7 @@ + @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 "$(USE_LIB_SUFFIX)" $(srcdir)/library.gpr $(CFLAGS_SHARED) >$(GNAT_PROJECT) ++@MAKE_ADA_SHAREDLIB@ $(SHELL) $(srcdir)/library-cfg.sh dynamic $(srcdir)/library.gpr $(CFLAGS_SHARED) >$(GNAT_PROJECT) + @MAKE_ADA_SHAREDLIB@ @echo "Making Ada shared-lib:" + @MAKE_ADA_SHAREDLIB@ @-$(SHELL) -c "diff -u $(srcdir)/library.gpr $(GNAT_PROJECT); exit 0" + @MAKE_ADA_SHAREDLIB@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=dynamic +Index: Ada95/src/library-cfg.sh +Prereq: 1.5 +--- ncurses-6.1-20190831+/Ada95/src/library-cfg.sh 2019-08-31 15:32:51.000000000 +0000 ++++ ncurses-6.1-20190907/Ada95/src/library-cfg.sh 2019-09-07 20:27:26.000000000 +0000 +@@ -27,7 +27,7 @@ + # authorization. # + ############################################################################## + # +-# $Id: library-cfg.sh,v 1.5 2019/08/31 15:32:51 tom Exp $ ++# $Id: library-cfg.sh,v 1.6 2019/09/07 20:27:26 tom Exp $ + # + # Work around incompatible behavior introduced with gnat6, which causes + # gnatmake to attempt to compile all of the C objects which might be part of +@@ -35,8 +35,6 @@ + # by making a copy of the project file with that information filled in). + model=$1 + shift 1 +-suffix=$1 +-shift 1 + input=$1 + shift 1 + param= +@@ -61,10 +59,6 @@ + cat >$SCRIPT < conftest.$ac_ext <&5 ++ { echo "$as_me:1059: 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" +@@ -1066,7 +1067,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:1069: loading cache $cache_file" >&5 ++ { echo "$as_me:1070: loading cache $cache_file" >&5 + echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . $cache_file;; +@@ -1074,7 +1075,7 @@ + esac + fi + else +- { echo "$as_me:1077: creating cache $cache_file" >&5 ++ { echo "$as_me:1078: creating cache $cache_file" >&5 + echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi +@@ -1090,21 +1091,21 @@ + eval ac_new_val="\$ac_env_${ac_var}_value" + case $ac_old_set,$ac_new_set in + set,) +- { echo "$as_me:1093: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++ { echo "$as_me:1094: 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:1097: error: \`$ac_var' was not set in the previous run" >&5 ++ { echo "$as_me:1098: 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:1103: error: \`$ac_var' has changed since the previous run:" >&5 ++ { echo "$as_me:1104: 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:1105: former value: $ac_old_val" >&5 ++ { echo "$as_me:1106: former value: $ac_old_val" >&5 + echo "$as_me: former value: $ac_old_val" >&2;} +- { echo "$as_me:1107: current value: $ac_new_val" >&5 ++ { echo "$as_me:1108: current value: $ac_new_val" >&5 + echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: + fi;; +@@ -1123,9 +1124,9 @@ + fi + done + if $ac_cache_corrupted; then +- { echo "$as_me:1126: error: changes in the environment can compromise the build" >&5 ++ { echo "$as_me:1127: 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:1128: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 ++ { { echo "$as_me:1129: 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 +@@ -1146,10 +1147,10 @@ + echo "#! $SHELL" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh +-if { (echo "$as_me:1149: PATH=\".;.\"; conftest.sh") >&5 ++if { (echo "$as_me:1150: PATH=\".;.\"; conftest.sh") >&5 + (PATH=".;."; conftest.sh) 2>&5 + ac_status=$? +- echo "$as_me:1152: \$? = $ac_status" >&5 ++ echo "$as_me:1153: \$? = $ac_status" >&5 + (exit $ac_status); }; then + ac_path_separator=';' + else +@@ -1162,7 +1163,7 @@ + + top_builddir=`pwd` + +-echo "$as_me:1165: checking for egrep" >&5 ++echo "$as_me:1166: 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 +@@ -1172,11 +1173,11 @@ + else ac_cv_prog_egrep='egrep' + fi + fi +-echo "$as_me:1175: result: $ac_cv_prog_egrep" >&5 ++echo "$as_me:1176: 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:1179: error: No egrep program found" >&5 ++ test -z "$EGREP" && { { echo "$as_me:1180: error: No egrep program found" >&5 + echo "$as_me: error: No egrep program found" >&2;} + { (exit 1); exit 1; }; } + +@@ -1186,11 +1187,11 @@ + cf_cv_abi_version=${NCURSES_MAJOR} + cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} + cf_cv_timestamp=`date` +-echo "$as_me:1189: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 ++echo "$as_me:1190: 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:1193: checking for package version" >&5 ++ echo "$as_me:1194: 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... +@@ -1202,39 +1203,39 @@ + VERSION="$cf_field1" + + VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'` +- test -z "$VERSION_MAJOR" && { { echo "$as_me:1205: error: missing major-version" >&5 ++ test -z "$VERSION_MAJOR" && { { echo "$as_me:1206: 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:1210: error: missing minor-version" >&5 ++ test -z "$VERSION_MINOR" && { { echo "$as_me:1211: error: missing minor-version" >&5 + echo "$as_me: error: missing minor-version" >&2;} + { (exit 1); exit 1; }; } + +- echo "$as_me:1214: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5 ++ echo "$as_me:1215: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5 + echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6 + +- echo "$as_me:1217: checking for package patch date" >&5 ++ echo "$as_me:1218: 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:1222: error: missing patch-date $VERSION_PATCH" >&5 ++ { { echo "$as_me:1223: 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:1229: error: illegal patch-date $VERSION_PATCH" >&5 ++ { { echo "$as_me:1230: 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:1234: result: $VERSION_PATCH" >&5 ++ echo "$as_me:1235: result: $VERSION_PATCH" >&5 + echo "${ECHO_T}$VERSION_PATCH" >&6 + else +- { { echo "$as_me:1237: error: did not find $srcdir/VERSION" >&5 ++ { { echo "$as_me:1238: error: did not find $srcdir/VERSION" >&5 + echo "$as_me: error: did not find $srcdir/VERSION" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1242,19 +1243,19 @@ + # show the actual data that we have for versions: + test -n "$verbose" && echo " ABI VERSION $VERSION" 1>&6 + +-echo "${as_me:-configure}:1245: testing ABI VERSION $VERSION ..." 1>&5 ++echo "${as_me:-configure}:1246: testing ABI VERSION $VERSION ..." 1>&5 + + test -n "$verbose" && echo " VERSION_MAJOR $VERSION_MAJOR" 1>&6 + +-echo "${as_me:-configure}:1249: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5 ++echo "${as_me:-configure}:1250: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5 + + test -n "$verbose" && echo " VERSION_MINOR $VERSION_MINOR" 1>&6 + +-echo "${as_me:-configure}:1253: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5 ++echo "${as_me:-configure}:1254: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5 + + test -n "$verbose" && echo " VERSION_PATCH $VERSION_PATCH" 1>&6 + +-echo "${as_me:-configure}:1257: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5 ++echo "${as_me:-configure}:1258: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5 + + cf_PACKAGE=NCURSES + PACKAGE=ncurses +@@ -1278,7 +1279,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:1281: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 ++ { echo "$as_me:1282: 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; +@@ -1291,13 +1292,13 @@ + ([0-9]*) + ;; + (*) +- { { echo "$as_me:1294: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 ++ { { echo "$as_me:1295: 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:1300: error: Release major-version value is empty" >&5 ++ { { echo "$as_me:1301: error: Release major-version value is empty" >&5 + echo "$as_me: error: Release major-version value is empty" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1307,13 +1308,13 @@ + ([0-9]*) + ;; + (*) +- { { echo "$as_me:1310: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 ++ { { echo "$as_me:1311: 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:1316: error: Release minor-version value is empty" >&5 ++ { { echo "$as_me:1317: error: Release minor-version value is empty" >&5 + echo "$as_me: error: Release minor-version value is empty" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1326,7 +1327,7 @@ + + if test "x$cf_cv_abi_version" != "x$withval" + then +- { echo "$as_me:1329: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 ++ { echo "$as_me:1330: 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.*) +@@ -1345,13 +1346,13 @@ + ([0-9]*) + ;; + (*) +- { { echo "$as_me:1348: error: ABI version is not a number: $cf_cv_abi_version" >&5 ++ { { echo "$as_me:1349: 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:1354: error: ABI version value is empty" >&5 ++ { { echo "$as_me:1355: error: ABI version value is empty" >&5 + echo "$as_me: error: ABI version value is empty" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1382,7 +1383,7 @@ + fi + done + if test -z "$ac_aux_dir"; then +- { { echo "$as_me:1385: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 ++ { { echo "$as_me:1386: 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 +@@ -1392,11 +1393,11 @@ + + # Make sure we can run config.sub. + $ac_config_sub sun4 >/dev/null 2>&1 || +- { { echo "$as_me:1395: error: cannot run $ac_config_sub" >&5 ++ { { echo "$as_me:1396: error: cannot run $ac_config_sub" >&5 + echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:1399: checking build system type" >&5 ++echo "$as_me:1400: 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 +@@ -1405,23 +1406,23 @@ + test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` + test -z "$ac_cv_build_alias" && +- { { echo "$as_me:1408: error: cannot guess build type; you must specify one" >&5 ++ { { echo "$as_me:1409: 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:1412: error: $ac_config_sub $ac_cv_build_alias failed." >&5 ++ { { echo "$as_me:1413: 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:1417: result: $ac_cv_build" >&5 ++echo "$as_me:1418: 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:1424: checking host system type" >&5 ++echo "$as_me:1425: 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 +@@ -1430,12 +1431,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:1433: error: $ac_config_sub $ac_cv_host_alias failed" >&5 ++ { { echo "$as_me:1434: 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:1438: result: $ac_cv_host" >&5 ++echo "$as_me:1439: 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/'` +@@ -1443,7 +1444,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:1446: checking target system type" >&5 ++ echo "$as_me:1447: 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 +@@ -1452,12 +1453,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:1455: error: $ac_config_sub $ac_cv_target_alias failed" >&5 ++ { { echo "$as_me:1456: 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:1460: result: $ac_cv_target" >&5 ++echo "$as_me:1461: 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/'` +@@ -1489,13 +1490,13 @@ + fi + + test -z "$system_name" && system_name="$cf_cv_system_name" +-test -n "$cf_cv_system_name" && echo "$as_me:1492: result: Configuring for $cf_cv_system_name" >&5 ++test -n "$cf_cv_system_name" && echo "$as_me:1493: 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:1496: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 ++ echo "$as_me:1497: 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:1498: error: \"Please remove config.cache and try again.\"" >&5 ++ { { echo "$as_me:1499: 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 +@@ -1503,7 +1504,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:1506: WARNING: overriding system type to $withval" >&5 ++ { echo "$as_me:1507: 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 +@@ -1515,7 +1516,7 @@ + + ### Default install-location + +-echo "$as_me:1518: checking for prefix" >&5 ++echo "$as_me:1519: 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 +@@ -1527,11 +1528,11 @@ + ;; + esac + fi +-echo "$as_me:1530: result: $prefix" >&5 ++echo "$as_me:1531: result: $prefix" >&5 + echo "${ECHO_T}$prefix" >&6 + + if test "x$prefix" = "xNONE" ; then +-echo "$as_me:1534: checking for default include-directory" >&5 ++echo "$as_me:1535: 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 \ +@@ -1554,7 +1555,7 @@ + fi + test -n "$verbose" && echo " tested $cf_dir" 1>&6 + done +-echo "$as_me:1557: result: $includedir" >&5 ++echo "$as_me:1558: result: $includedir" >&5 + echo "${ECHO_T}$includedir" >&6 + fi + +@@ -1617,7 +1618,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:1620: checking for $ac_word" >&5 ++echo "$as_me:1621: 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 +@@ -1632,7 +1633,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:1635: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1636: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1640,10 +1641,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:1643: result: $CC" >&5 ++ echo "$as_me:1644: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else +- echo "$as_me:1646: result: no" >&5 ++ echo "$as_me:1647: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1656,7 +1657,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:1659: checking for $ac_word" >&5 ++echo "$as_me:1660: 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 +@@ -1671,7 +1672,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:1674: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1675: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1679,10 +1680,10 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:1682: result: $ac_ct_CC" >&5 ++ echo "$as_me:1683: result: $ac_ct_CC" >&5 + echo "${ECHO_T}$ac_ct_CC" >&6 + else +- echo "$as_me:1685: result: no" >&5 ++ echo "$as_me:1686: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1692,32 +1693,32 @@ + CC=$ac_ct_CC + fi + +-test -z "$CC" && { { echo "$as_me:1695: error: no acceptable cc found in \$PATH" >&5 ++test -z "$CC" && { { echo "$as_me:1696: 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:1700:" \ ++echo "$as_me:1701:" \ + "checking for C compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:1703: \"$ac_compiler --version &5\"") >&5 ++{ (eval echo "$as_me:1704: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? +- echo "$as_me:1706: \$? = $ac_status" >&5 ++ echo "$as_me:1707: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:1708: \"$ac_compiler -v &5\"") >&5 ++{ (eval echo "$as_me:1709: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? +- echo "$as_me:1711: \$? = $ac_status" >&5 ++ echo "$as_me:1712: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:1713: \"$ac_compiler -V &5\"") >&5 ++{ (eval echo "$as_me:1714: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? +- echo "$as_me:1716: \$? = $ac_status" >&5 ++ echo "$as_me:1717: \$? = $ac_status" >&5 + (exit $ac_status); } + + cat >conftest.$ac_ext <<_ACEOF +-#line 1720 "configure" ++#line 1721 "configure" + #include "confdefs.h" + + int +@@ -1733,13 +1734,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:1736: checking for C compiler default output" >&5 ++echo "$as_me:1737: 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:1739: \"$ac_link_default\"") >&5 ++if { (eval echo "$as_me:1740: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 + ac_status=$? +- echo "$as_me:1742: \$? = $ac_status" >&5 ++ echo "$as_me:1743: \$? = $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 +@@ -1762,34 +1763,34 @@ + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-{ { echo "$as_me:1765: error: C compiler cannot create executables" >&5 ++{ { echo "$as_me:1766: 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:1771: result: $ac_file" >&5 ++echo "$as_me:1772: 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:1776: checking whether the C compiler works" >&5 ++echo "$as_me:1777: 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:1782: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1783: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1785: \$? = $ac_status" >&5 ++ echo "$as_me:1786: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { echo "$as_me:1792: error: cannot run C compiled programs. ++ { { echo "$as_me:1793: 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;} +@@ -1797,24 +1798,24 @@ + fi + fi + fi +-echo "$as_me:1800: result: yes" >&5 ++echo "$as_me:1801: 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:1807: checking whether we are cross compiling" >&5 ++echo "$as_me:1808: checking whether we are cross compiling" >&5 + echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +-echo "$as_me:1809: result: $cross_compiling" >&5 ++echo "$as_me:1810: result: $cross_compiling" >&5 + echo "${ECHO_T}$cross_compiling" >&6 + +-echo "$as_me:1812: checking for executable suffix" >&5 ++echo "$as_me:1813: checking for executable suffix" >&5 + echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 +-if { (eval echo "$as_me:1814: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:1815: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:1817: \$? = $ac_status" >&5 ++ echo "$as_me:1818: \$? = $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 +@@ -1830,25 +1831,25 @@ + esac + done + else +- { { echo "$as_me:1833: error: cannot compute EXEEXT: cannot compile and link" >&5 ++ { { echo "$as_me:1834: 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:1839: result: $ac_cv_exeext" >&5 ++echo "$as_me:1840: 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:1845: checking for object suffix" >&5 ++echo "$as_me:1846: 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 1851 "configure" ++#line 1852 "configure" + #include "confdefs.h" + + int +@@ -1860,10 +1861,10 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (eval echo "$as_me:1863: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1864: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1866: \$? = $ac_status" >&5 ++ echo "$as_me:1867: \$? = $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 +@@ -1875,24 +1876,24 @@ + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-{ { echo "$as_me:1878: error: cannot compute OBJEXT: cannot compile" >&5 ++{ { echo "$as_me:1879: 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:1885: result: $ac_cv_objext" >&5 ++echo "$as_me:1886: result: $ac_cv_objext" >&5 + echo "${ECHO_T}$ac_cv_objext" >&6 + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-echo "$as_me:1889: checking whether we are using the GNU C compiler" >&5 ++echo "$as_me:1890: 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 1895 "configure" ++#line 1896 "configure" + #include "confdefs.h" + + int +@@ -1907,16 +1908,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1910: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1911: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1913: \$? = $ac_status" >&5 ++ echo "$as_me:1914: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1916: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1917: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1919: \$? = $ac_status" >&5 ++ echo "$as_me:1920: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes + else +@@ -1928,19 +1929,19 @@ + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:1931: result: $ac_cv_c_compiler_gnu" >&5 ++echo "$as_me:1932: 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:1937: checking whether $CC accepts -g" >&5 ++echo "$as_me:1938: 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 1943 "configure" ++#line 1944 "configure" + #include "confdefs.h" + + int +@@ -1952,16 +1953,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1955: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1956: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1958: \$? = $ac_status" >&5 ++ echo "$as_me:1959: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1961: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1962: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1964: \$? = $ac_status" >&5 ++ echo "$as_me:1965: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes + else +@@ -1971,7 +1972,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:1974: result: $ac_cv_prog_cc_g" >&5 ++echo "$as_me:1975: 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 +@@ -1998,16 +1999,16 @@ + #endif + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2001: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2002: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2004: \$? = $ac_status" >&5 ++ echo "$as_me:2005: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2007: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2008: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2010: \$? = $ac_status" >&5 ++ echo "$as_me:2011: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + ''\ +@@ -2019,7 +2020,7 @@ + 'void exit (int);' + do + cat >conftest.$ac_ext <<_ACEOF +-#line 2022 "configure" ++#line 2023 "configure" + #include "confdefs.h" + #include + $ac_declaration +@@ -2032,16 +2033,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2035: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2036: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2038: \$? = $ac_status" >&5 ++ echo "$as_me:2039: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2041: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2042: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2044: \$? = $ac_status" >&5 ++ echo "$as_me:2045: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -2051,7 +2052,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 2054 "configure" ++#line 2055 "configure" + #include "confdefs.h" + $ac_declaration + int +@@ -2063,16 +2064,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2066: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2067: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2069: \$? = $ac_status" >&5 ++ echo "$as_me:2070: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2072: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2073: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2075: \$? = $ac_status" >&5 ++ echo "$as_me:2076: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -2102,15 +2103,117 @@ + + GCC_VERSION=none + if test "$GCC" = yes ; then +- echo "$as_me:2105: checking version of $CC" >&5 ++ echo "$as_me:2106: 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:2109: result: $GCC_VERSION" >&5 ++ echo "$as_me:2110: result: $GCC_VERSION" >&5 + echo "${ECHO_T}$GCC_VERSION" >&6 + fi + +-echo "$as_me:2113: checking for $CC option to accept ANSI C" >&5 ++INTEL_COMPILER=no ++ ++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 $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" ++#include "confdefs.h" ++ ++int ++main (void) ++{ ++ ++#ifdef __INTEL_COMPILER ++#else ++make an error ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:2141: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:2144: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:2147: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:2150: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ INTEL_COMPILER=yes ++cf_save_CFLAGS="$cf_save_CFLAGS -we147" ++ ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$cf_save_CFLAGS" ++ echo "$as_me:2161: result: $INTEL_COMPILER" >&5 ++echo "${ECHO_T}$INTEL_COMPILER" >&6 ++ ;; ++ esac ++fi ++ ++CLANG_COMPILER=no ++ ++if test "$GCC" = yes ; then ++ echo "$as_me:2170: 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" ++#include "confdefs.h" ++ ++int ++main (void) ++{ ++ ++#ifdef __clang__ ++#else ++make an error ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:2192: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:2195: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:2198: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:2201: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ CLANG_COMPILER=yes ++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" ++ ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$cf_save_CFLAGS" ++ echo "$as_me:2212: 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 $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 +@@ -2118,7 +2221,7 @@ + ac_cv_prog_cc_stdc=no + ac_save_CC=$CC + cat >conftest.$ac_ext <<_ACEOF +-#line 2121 "configure" ++#line 2224 "configure" + #include "confdefs.h" + #include + #include +@@ -2167,16 +2270,16 @@ + do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2170: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2273: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2173: \$? = $ac_status" >&5 ++ echo "$as_me:2276: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2176: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2279: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2179: \$? = $ac_status" >&5 ++ echo "$as_me:2282: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg + break +@@ -2193,10 +2296,10 @@ + + case "x$ac_cv_prog_cc_stdc" in + x|xno) +- echo "$as_me:2196: result: none needed" >&5 ++ echo "$as_me:2299: result: none needed" >&5 + echo "${ECHO_T}none needed" >&6 ;; + *) +- echo "$as_me:2199: result: $ac_cv_prog_cc_stdc" >&5 ++ echo "$as_me:2302: result: $ac_cv_prog_cc_stdc" >&5 + echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; + esac +@@ -2204,13 +2307,13 @@ + # This should have been defined by AC_PROG_CC + : ${CC:=cc} + +-echo "$as_me:2207: checking \$CFLAGS variable" >&5 ++echo "$as_me:2310: checking \$CFLAGS variable" >&5 + echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 + case "x$CFLAGS" in + (*-[IUD]*) +- echo "$as_me:2211: result: broken" >&5 ++ echo "$as_me:2314: result: broken" >&5 + echo "${ECHO_T}broken" >&6 +- { echo "$as_me:2213: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 ++ { echo "$as_me:2316: 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= +@@ -2318,18 +2421,18 @@ + done + ;; + (*) +- echo "$as_me:2321: result: ok" >&5 ++ echo "$as_me:2424: result: ok" >&5 + echo "${ECHO_T}ok" >&6 + ;; + esac + +-echo "$as_me:2326: checking \$CC variable" >&5 ++echo "$as_me:2429: checking \$CC variable" >&5 + echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 + case "$CC" in + (*[\ \ ]-*) +- echo "$as_me:2330: result: broken" >&5 ++ echo "$as_me:2433: result: broken" >&5 + echo "${ECHO_T}broken" >&6 +- { echo "$as_me:2332: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 ++ { echo "$as_me:2435: 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/[ ]*[ ]-[^ ].*//'` +@@ -2446,19 +2549,19 @@ + done + test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 + +-echo "${as_me:-configure}:2449: testing resulting CC: '$CC' ..." 1>&5 ++echo "${as_me:-configure}:2552: testing resulting CC: '$CC' ..." 1>&5 + + test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 + +-echo "${as_me:-configure}:2453: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 ++echo "${as_me:-configure}:2556: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 + + test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 + +-echo "${as_me:-configure}:2457: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ++echo "${as_me:-configure}:2560: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 + + ;; + (*) +- echo "$as_me:2461: result: ok" >&5 ++ echo "$as_me:2564: result: ok" >&5 + echo "${ECHO_T}ok" >&6 + ;; + esac +@@ -2469,7 +2572,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:2472: checking how to run the C preprocessor" >&5 ++echo "$as_me:2575: 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 +@@ -2490,18 +2593,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 2493 "configure" ++#line 2596 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:2498: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:2601: \"$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:2504: \$? = $ac_status" >&5 ++ echo "$as_me:2607: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2524,17 +2627,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 2527 "configure" ++#line 2630 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:2531: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:2634: \"$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:2537: \$? = $ac_status" >&5 ++ echo "$as_me:2640: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2571,7 +2674,7 @@ + else + ac_cv_prog_CPP=$CPP + fi +-echo "$as_me:2574: result: $CPP" >&5 ++echo "$as_me:2677: result: $CPP" >&5 + echo "${ECHO_T}$CPP" >&6 + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes +@@ -2581,18 +2684,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 2584 "configure" ++#line 2687 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:2589: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:2692: \"$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:2595: \$? = $ac_status" >&5 ++ echo "$as_me:2698: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2615,17 +2718,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 2618 "configure" ++#line 2721 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:2622: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:2725: \"$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:2628: \$? = $ac_status" >&5 ++ echo "$as_me:2731: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2653,7 +2756,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:2656: error: C preprocessor \"$CPP\" fails sanity check" >&5 ++ { { echo "$as_me:2759: error: C preprocessor \"$CPP\" fails sanity check" >&5 + echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -2666,14 +2769,14 @@ + ac_main_return=return + + if test $ac_cv_c_compiler_gnu = yes; then +- echo "$as_me:2669: checking whether $CC needs -traditional" >&5 ++ echo "$as_me:2772: 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 2676 "configure" ++#line 2779 "configure" + #include "confdefs.h" + #include + int Autoconf = TIOCGETP; +@@ -2688,7 +2791,7 @@ + + if test $ac_cv_prog_gcc_traditional = no; then + cat >conftest.$ac_ext <<_ACEOF +-#line 2691 "configure" ++#line 2794 "configure" + #include "confdefs.h" + #include + int Autoconf = TCGETA; +@@ -2701,14 +2804,14 @@ + + fi + fi +-echo "$as_me:2704: result: $ac_cv_prog_gcc_traditional" >&5 ++echo "$as_me:2807: 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:2711: checking whether $CC understands -c and -o together" >&5 ++echo "$as_me:2814: 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 +@@ -2723,15 +2826,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:2726: \"$ac_try\"") >&5 ++if { (eval echo "$as_me:2829: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2729: \$? = $ac_status" >&5 ++ echo "$as_me:2832: \$? = $ac_status" >&5 + (exit $ac_status); } && +- test -f conftest2.$ac_objext && { (eval echo "$as_me:2731: \"$ac_try\"") >&5 ++ test -f conftest2.$ac_objext && { (eval echo "$as_me:2834: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2734: \$? = $ac_status" >&5 ++ echo "$as_me:2837: \$? = $ac_status" >&5 + (exit $ac_status); }; + then + eval cf_cv_prog_CC_c_o=yes +@@ -2742,10 +2845,10 @@ + + fi + if test $cf_cv_prog_CC_c_o = yes; then +- echo "$as_me:2745: result: yes" >&5 ++ echo "$as_me:2848: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:2748: result: no" >&5 ++ echo "$as_me:2851: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2759,7 +2862,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:2762: checking for $ac_word" >&5 ++echo "$as_me:2865: 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 +@@ -2776,7 +2879,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:2779: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:2882: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -2787,10 +2890,10 @@ + LDCONFIG=$ac_cv_path_LDCONFIG + + if test -n "$LDCONFIG"; then +- echo "$as_me:2790: result: $LDCONFIG" >&5 ++ echo "$as_me:2893: result: $LDCONFIG" >&5 + echo "${ECHO_T}$LDCONFIG" >&6 + else +- echo "$as_me:2793: result: no" >&5 ++ echo "$as_me:2896: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2798,7 +2901,7 @@ + esac + fi + +-echo "$as_me:2801: checking if you want to ensure bool is consistent with C++" >&5 ++echo "$as_me:2904: 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. +@@ -2808,7 +2911,7 @@ + else + cf_with_cxx=yes + fi; +-echo "$as_me:2811: result: $cf_with_cxx" >&5 ++echo "$as_me:2914: result: $cf_with_cxx" >&5 + echo "${ECHO_T}$cf_with_cxx" >&6 + if test "X$cf_with_cxx" = Xno ; then + CXX="" +@@ -2826,7 +2929,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:2829: checking for $ac_word" >&5 ++echo "$as_me:2932: 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 +@@ -2841,7 +2944,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:2844: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2947: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2849,10 +2952,10 @@ + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- echo "$as_me:2852: result: $CXX" >&5 ++ echo "$as_me:2955: result: $CXX" >&5 + echo "${ECHO_T}$CXX" >&6 + else +- echo "$as_me:2855: result: no" >&5 ++ echo "$as_me:2958: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2865,7 +2968,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:2868: checking for $ac_word" >&5 ++echo "$as_me:2971: 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 +@@ -2880,7 +2983,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:2883: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2986: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2888,10 +2991,10 @@ + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +- echo "$as_me:2891: result: $ac_ct_CXX" >&5 ++ echo "$as_me:2994: result: $ac_ct_CXX" >&5 + echo "${ECHO_T}$ac_ct_CXX" >&6 + else +- echo "$as_me:2894: result: no" >&5 ++ echo "$as_me:2997: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2903,32 +3006,32 @@ + fi + + # Provide some information about the compiler. +-echo "$as_me:2906:" \ ++echo "$as_me:3009:" \ + "checking for C++ compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:2909: \"$ac_compiler --version &5\"") >&5 ++{ (eval echo "$as_me:3012: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? +- echo "$as_me:2912: \$? = $ac_status" >&5 ++ echo "$as_me:3015: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:2914: \"$ac_compiler -v &5\"") >&5 ++{ (eval echo "$as_me:3017: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? +- echo "$as_me:2917: \$? = $ac_status" >&5 ++ echo "$as_me:3020: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:2919: \"$ac_compiler -V &5\"") >&5 ++{ (eval echo "$as_me:3022: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? +- echo "$as_me:2922: \$? = $ac_status" >&5 ++ echo "$as_me:3025: \$? = $ac_status" >&5 + (exit $ac_status); } + +-echo "$as_me:2925: checking whether we are using the GNU C++ compiler" >&5 ++echo "$as_me:3028: 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 2931 "configure" ++#line 3034 "configure" + #include "confdefs.h" + + int +@@ -2943,16 +3046,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2946: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3049: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2949: \$? = $ac_status" >&5 ++ echo "$as_me:3052: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2952: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3055: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2955: \$? = $ac_status" >&5 ++ echo "$as_me:3058: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes + else +@@ -2964,19 +3067,19 @@ + ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:2967: result: $ac_cv_cxx_compiler_gnu" >&5 ++echo "$as_me:3070: 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:2973: checking whether $CXX accepts -g" >&5 ++echo "$as_me:3076: 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 2979 "configure" ++#line 3082 "configure" + #include "confdefs.h" + + int +@@ -2988,16 +3091,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3094: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2994: \$? = $ac_status" >&5 ++ echo "$as_me:3097: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2997: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3100: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3000: \$? = $ac_status" >&5 ++ echo "$as_me:3103: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cxx_g=yes + else +@@ -3007,7 +3110,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:3010: result: $ac_cv_prog_cxx_g" >&5 ++echo "$as_me:3113: 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 +@@ -3034,7 +3137,7 @@ + 'void exit (int);' + do + cat >conftest.$ac_ext <<_ACEOF +-#line 3037 "configure" ++#line 3140 "configure" + #include "confdefs.h" + #include + $ac_declaration +@@ -3047,16 +3150,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3050: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3153: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3053: \$? = $ac_status" >&5 ++ echo "$as_me:3156: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3056: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3159: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3059: \$? = $ac_status" >&5 ++ echo "$as_me:3162: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -3066,7 +3169,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 3069 "configure" ++#line 3172 "configure" + #include "confdefs.h" + $ac_declaration + int +@@ -3078,16 +3181,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3081: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3184: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3084: \$? = $ac_status" >&5 ++ echo "$as_me:3187: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3087: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3190: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3090: \$? = $ac_status" >&5 ++ echo "$as_me:3193: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -3121,7 +3224,7 @@ + then + # Several of the C++ configurations do not work, particularly when + # cross-compiling (20140913 -TD) +- echo "$as_me:3124: checking if $CXX works" >&5 ++ echo "$as_me:3227: checking if $CXX works" >&5 + echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6 + + save_CPPFLAGS="$CPPFLAGS" +@@ -3129,7 +3232,7 @@ + CPPFLAGS="$CPPFLAGS -I${cf_includedir}" + + cat >conftest.$ac_ext <<_ACEOF +-#line 3132 "configure" ++#line 3235 "configure" + #include "confdefs.h" + + #include +@@ -3146,16 +3249,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3149: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3252: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3152: \$? = $ac_status" >&5 ++ echo "$as_me:3255: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3155: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3258: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3158: \$? = $ac_status" >&5 ++ echo "$as_me:3261: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cxx_works=yes + else +@@ -3166,11 +3269,11 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="$save_CPPFLAGS" + +- echo "$as_me:3169: result: $cf_cxx_works" >&5 ++ echo "$as_me:3272: result: $cf_cxx_works" >&5 + echo "${ECHO_T}$cf_cxx_works" >&6 + if test "x$cf_cxx_works" = xno + then +- { echo "$as_me:3173: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5 ++ { echo "$as_me:3276: 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 +@@ -3186,7 +3289,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:3189: checking for $ac_word" >&5 ++echo "$as_me:3292: 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 +@@ -3203,7 +3306,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:3206: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:3309: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -3214,17 +3317,17 @@ + CXX=$ac_cv_path_CXX + + if test -n "$CXX"; then +- echo "$as_me:3217: result: $CXX" >&5 ++ echo "$as_me:3320: result: $CXX" >&5 + echo "${ECHO_T}$CXX" >&6 + else +- echo "$as_me:3220: result: no" >&5 ++ echo "$as_me:3323: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi + case "x$CXX" in + (x|xg++) +- { echo "$as_me:3227: WARNING: You don't have any C++ compiler, too bad" >&5 ++ { echo "$as_me:3330: 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=""; + ;; +@@ -3233,7 +3336,7 @@ + + GXX_VERSION=none + if test "$GXX" = yes; then +- echo "$as_me:3236: checking version of ${CXX:-g++}" >&5 ++ echo "$as_me:3339: 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" +@@ -3241,7 +3344,7 @@ + GXX_VERSION=unknown + GXX=no + fi +- echo "$as_me:3244: result: $GXX_VERSION" >&5 ++ echo "$as_me:3347: result: $GXX_VERSION" >&5 + echo "${ECHO_T}$GXX_VERSION" >&6 + fi + +@@ -3249,12 +3352,12 @@ + (1*|2.[0-6]*) + # GXX=""; CXX=""; ac_cv_prog_gxx=no + # cf_cxx_library=no +- { echo "$as_me:3252: WARNING: templates do not work" >&5 ++ { echo "$as_me:3355: WARNING: templates do not work" >&5 + echo "$as_me: WARNING: templates do not work" >&2;} + ;; + esac + +-echo "$as_me:3257: checking if you want to build C++ binding and demo" >&5 ++echo "$as_me:3360: 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. +@@ -3264,15 +3367,15 @@ + else + cf_with_cxx_binding=$cf_with_cxx + fi; +-echo "$as_me:3267: result: $cf_with_cxx_binding" >&5 ++echo "$as_me:3370: result: $cf_with_cxx_binding" >&5 + echo "${ECHO_T}$cf_with_cxx_binding" >&6 + +-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:3272: result: $cf_with_ada" >&5 ++echo "$as_me:3373: 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 "${ECHO_T}$cf_with_ada" >&6 + +-echo "$as_me:3275: checking if you want to install terminal database" >&5 ++echo "$as_me:3378: 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. +@@ -3282,10 +3385,10 @@ + else + cf_with_db_install=yes + fi; +-echo "$as_me:3285: result: $cf_with_db_install" >&5 ++echo "$as_me:3388: result: $cf_with_db_install" >&5 + echo "${ECHO_T}$cf_with_db_install" >&6 + +-echo "$as_me:3288: checking if you want to install manpages" >&5 ++echo "$as_me:3391: 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. +@@ -3295,10 +3398,10 @@ + else + cf_with_manpages=yes + fi; +-echo "$as_me:3298: result: $cf_with_manpages" >&5 ++echo "$as_me:3401: result: $cf_with_manpages" >&5 + echo "${ECHO_T}$cf_with_manpages" >&6 + +-echo "$as_me:3301: checking if you want to build programs such as tic" >&5 ++echo "$as_me:3404: 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. +@@ -3308,18 +3411,18 @@ + else + cf_with_progs=yes + fi; +-echo "$as_me:3311: result: $cf_with_progs" >&5 ++echo "$as_me:3414: 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}:3318: testing ignoring tack because we are cross-compiling ..." 1>&5 ++echo "${as_me:-configure}:3421: testing ignoring tack because we are cross-compiling ..." 1>&5 + + cf_with_tack=no + else +- echo "$as_me:3322: checking if you want to build the tack program" >&5 ++ echo "$as_me:3425: 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. +@@ -3329,14 +3432,14 @@ + else + cf_with_tack=$cf_with_progs + fi; +- echo "$as_me:3332: result: $cf_with_tack" >&5 ++ echo "$as_me:3435: result: $cf_with_tack" >&5 + echo "${ECHO_T}$cf_with_tack" >&6 + fi + else + cf_with_tack=no + fi + +-echo "$as_me:3339: checking if you want to build test-programs" >&5 ++echo "$as_me:3442: 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. +@@ -3346,10 +3449,10 @@ + else + cf_with_tests=yes + fi; +-echo "$as_me:3349: result: $cf_with_tests" >&5 ++echo "$as_me:3452: result: $cf_with_tests" >&5 + echo "${ECHO_T}$cf_with_tests" >&6 + +-echo "$as_me:3352: checking if you wish to install curses.h" >&5 ++echo "$as_me:3455: 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. +@@ -3359,7 +3462,7 @@ + else + with_curses_h=yes + fi; +-echo "$as_me:3362: result: $with_curses_h" >&5 ++echo "$as_me:3465: result: $with_curses_h" >&5 + echo "${ECHO_T}$with_curses_h" >&6 + + modules_to_build="ncurses" +@@ -3384,7 +3487,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:3387: checking for $ac_word" >&5 ++echo "$as_me:3490: 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 +@@ -3399,7 +3502,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AWK="$ac_prog" +-echo "$as_me:3402: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3505: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3407,21 +3510,21 @@ + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- echo "$as_me:3410: result: $AWK" >&5 ++ echo "$as_me:3513: result: $AWK" >&5 + echo "${ECHO_T}$AWK" >&6 + else +- echo "$as_me:3413: result: no" >&5 ++ echo "$as_me:3516: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + test -n "$AWK" && break + done + +-test -z "$AWK" && { { echo "$as_me:3420: error: No awk program found" >&5 ++test -z "$AWK" && { { echo "$as_me:3523: error: No awk program found" >&5 + echo "$as_me: error: No awk program found" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:3424: checking for egrep" >&5 ++echo "$as_me:3527: 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 +@@ -3431,11 +3534,11 @@ + else ac_cv_prog_egrep='egrep' + fi + fi +-echo "$as_me:3434: result: $ac_cv_prog_egrep" >&5 ++echo "$as_me:3537: 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:3438: error: No egrep program found" >&5 ++ test -z "$EGREP" && { { echo "$as_me:3541: error: No egrep program found" >&5 + echo "$as_me: error: No egrep program found" >&2;} + { (exit 1); exit 1; }; } + +@@ -3451,7 +3554,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:3454: checking for a BSD compatible install" >&5 ++echo "$as_me:3557: 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 +@@ -3500,7 +3603,7 @@ + INSTALL=$ac_install_sh + fi + fi +-echo "$as_me:3503: result: $INSTALL" >&5 ++echo "$as_me:3606: result: $INSTALL" >&5 + echo "${ECHO_T}$INSTALL" >&6 + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -3525,7 +3628,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:3528: checking for $ac_word" >&5 ++echo "$as_me:3631: 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 +@@ -3540,7 +3643,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LINT="$ac_prog" +-echo "$as_me:3543: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3646: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3548,28 +3651,28 @@ + fi + LINT=$ac_cv_prog_LINT + if test -n "$LINT"; then +- echo "$as_me:3551: result: $LINT" >&5 ++ echo "$as_me:3654: result: $LINT" >&5 + echo "${ECHO_T}$LINT" >&6 + else +- echo "$as_me:3554: result: no" >&5 ++ echo "$as_me:3657: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + test -n "$LINT" && break + done + +-echo "$as_me:3561: checking whether ln -s works" >&5 ++echo "$as_me:3664: 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:3565: result: yes" >&5 ++ echo "$as_me:3668: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:3568: result: no, using $LN_S" >&5 ++ echo "$as_me:3671: result: no, using $LN_S" >&5 + echo "${ECHO_T}no, using $LN_S" >&6 + fi + +-echo "$as_me:3572: checking if $LN_S -f options work" >&5 ++echo "$as_me:3675: 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 +@@ -3581,12 +3684,12 @@ + cf_prog_ln_sf=no + fi + rm -f conf$$.dst conf$$src +-echo "$as_me:3584: result: $cf_prog_ln_sf" >&5 ++echo "$as_me:3687: 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:3589: checking for long file names" >&5 ++echo "$as_me:3692: 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 +@@ -3625,7 +3728,7 @@ + rm -rf $ac_xdir 2>/dev/null + done + fi +-echo "$as_me:3628: result: $ac_cv_sys_long_file_names" >&5 ++echo "$as_me:3731: 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 + +@@ -3644,7 +3747,7 @@ + withval="$with_config_suffix" + case "x$withval" in + (xyes|xno) +- { echo "$as_me:3647: WARNING: expected a value for config-suffix option" >&5 ++ { echo "$as_me:3750: 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" +@@ -3654,7 +3757,7 @@ + + # If we find pkg-config, check if we should install the ".pc" files. + +-echo "$as_me:3657: checking if you want to use pkg-config" >&5 ++echo "$as_me:3760: 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. +@@ -3664,7 +3767,7 @@ + else + cf_pkg_config=yes + fi; +-echo "$as_me:3667: result: $cf_pkg_config" >&5 ++echo "$as_me:3770: result: $cf_pkg_config" >&5 + echo "${ECHO_T}$cf_pkg_config" >&6 + + case $cf_pkg_config in +@@ -3676,7 +3779,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:3679: checking for $ac_word" >&5 ++echo "$as_me:3782: 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 +@@ -3693,7 +3796,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:3696: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:3799: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -3704,10 +3807,10 @@ + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + + if test -n "$PKG_CONFIG"; then +- echo "$as_me:3707: result: $PKG_CONFIG" >&5 ++ echo "$as_me:3810: result: $PKG_CONFIG" >&5 + echo "${ECHO_T}$PKG_CONFIG" >&6 + else +- echo "$as_me:3710: result: no" >&5 ++ echo "$as_me:3813: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3716,7 +3819,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:3719: checking for $ac_word" >&5 ++echo "$as_me:3822: 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 +@@ -3733,7 +3836,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:3736: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:3839: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -3745,10 +3848,10 @@ + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + + if test -n "$ac_pt_PKG_CONFIG"; then +- echo "$as_me:3748: result: $ac_pt_PKG_CONFIG" >&5 ++ echo "$as_me:3851: result: $ac_pt_PKG_CONFIG" >&5 + echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 + else +- echo "$as_me:3751: result: no" >&5 ++ echo "$as_me:3854: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3791,24 +3894,24 @@ + PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:3794: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 ++ { { echo "$as_me:3897: 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:3801: WARNING: pkg-config is not installed" >&5 ++ { echo "$as_me:3904: 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:3807: checking for pkg-config library directory" >&5 ++ echo "$as_me:3910: checking for pkg-config library directory" >&5 + echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6 + ;; + (*) +- echo "$as_me:3811: checking for $PKG_CONFIG library directory" >&5 ++ echo "$as_me:3914: checking for $PKG_CONFIG library directory" >&5 + echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 + ;; + esac +@@ -3863,18 +3966,18 @@ + + test -n "$verbose" && echo " list..." 1>&6 + +-echo "${as_me:-configure}:3866: testing list... ..." 1>&5 ++echo "${as_me:-configure}:3969: 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}:3872: testing checking $cf_config/pkgconfig ..." 1>&5 ++echo "${as_me:-configure}:3975: testing checking $cf_config/pkgconfig ..." 1>&5 + + if test -d $cf_config/pkgconfig + then + PKG_CONFIG_LIBDIR=$cf_config/pkgconfig +- echo "$as_me:3877: checking done" >&5 ++ echo "$as_me:3980: checking done" >&5 + echo $ECHO_N "checking done... $ECHO_C" >&6 + break + fi +@@ -3885,16 +3988,16 @@ + esac + + if test "x$PKG_CONFIG_LIBDIR" != xno ; then +- echo "$as_me:3888: result: $PKG_CONFIG_LIBDIR" >&5 ++ echo "$as_me:3991: result: $PKG_CONFIG_LIBDIR" >&5 + echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 + fi + + if test "x$PKG_CONFIG" != xnone + then +- echo "$as_me:3894: checking if we should install .pc files for $PKG_CONFIG" >&5 ++ echo "$as_me:3997: 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:3897: checking if we should install .pc files" >&5 ++ echo "$as_me:4000: checking if we should install .pc files" >&5 + echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6 + fi + +@@ -3905,7 +4008,7 @@ + else + enable_pc_files=no + fi; +-echo "$as_me:3908: result: $enable_pc_files" >&5 ++echo "$as_me:4011: result: $enable_pc_files" >&5 + echo "${ECHO_T}$enable_pc_files" >&6 + + if test "x$enable_pc_files" != xno +@@ -3913,7 +4016,7 @@ + MAKE_PC_FILES= + case "x$PKG_CONFIG_LIBDIR" in + (xno|xyes) +- { echo "$as_me:3916: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 ++ { echo "$as_me:4019: WARNING: no PKG_CONFIG_LIBDIR was found" >&5 + echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;} + ;; + (*) +@@ -3943,7 +4046,7 @@ + PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:3946: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5 ++ { { echo "$as_me:4049: 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; }; } + ;; +@@ -3957,7 +4060,7 @@ + + if test -z "$MAKE_PC_FILES" + then +- echo "$as_me:3960: checking for suffix to add to pc-files" >&5 ++ echo "$as_me:4063: 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. +@@ -3972,13 +4075,13 @@ + esac + fi; + test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none +- echo "$as_me:3975: result: $PC_MODULE_SUFFIX" >&5 ++ echo "$as_me:4078: result: $PC_MODULE_SUFFIX" >&5 + echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6 + test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX= + + fi + +-echo "$as_me:3981: checking if we should assume mixed-case filenames" >&5 ++echo "$as_me:4084: 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. +@@ -3988,11 +4091,11 @@ + else + enable_mixedcase=auto + fi; +-echo "$as_me:3991: result: $enable_mixedcase" >&5 ++echo "$as_me:4094: result: $enable_mixedcase" >&5 + echo "${ECHO_T}$enable_mixedcase" >&6 + if test "$enable_mixedcase" = "auto" ; then + +-echo "$as_me:3995: checking if filesystem supports mixed-case filenames" >&5 ++echo "$as_me:4098: 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 +@@ -4019,7 +4122,7 @@ + fi + + fi +-echo "$as_me:4022: result: $cf_cv_mixedcase" >&5 ++echo "$as_me:4125: result: $cf_cv_mixedcase" >&5 + echo "${ECHO_T}$cf_cv_mixedcase" >&6 + test "$cf_cv_mixedcase" = yes && + cat >>confdefs.h <<\EOF +@@ -4038,7 +4141,7 @@ + fi + + # do this after mixed-case option (tags/TAGS is not as important as tic). +-echo "$as_me:4041: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "$as_me:4144: 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 +@@ -4058,11 +4161,11 @@ + rm -f conftest.make + fi + if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:4061: result: yes" >&5 ++ echo "$as_me:4164: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + SET_MAKE= + else +- echo "$as_me:4065: result: no" >&5 ++ echo "$as_me:4168: result: no" >&5 + echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" + fi +@@ -4071,7 +4174,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:4074: checking for $ac_word" >&5 ++echo "$as_me:4177: 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 +@@ -4086,7 +4189,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CTAGS="$ac_prog" +-echo "$as_me:4089: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4192: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4094,10 +4197,10 @@ + fi + CTAGS=$ac_cv_prog_CTAGS + if test -n "$CTAGS"; then +- echo "$as_me:4097: result: $CTAGS" >&5 ++ echo "$as_me:4200: result: $CTAGS" >&5 + echo "${ECHO_T}$CTAGS" >&6 + else +- echo "$as_me:4100: result: no" >&5 ++ echo "$as_me:4203: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4108,7 +4211,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:4111: checking for $ac_word" >&5 ++echo "$as_me:4214: 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 +@@ -4123,7 +4226,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ETAGS="$ac_prog" +-echo "$as_me:4126: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4229: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4131,10 +4234,10 @@ + fi + ETAGS=$ac_cv_prog_ETAGS + if test -n "$ETAGS"; then +- echo "$as_me:4134: result: $ETAGS" >&5 ++ echo "$as_me:4237: result: $ETAGS" >&5 + echo "${ECHO_T}$ETAGS" >&6 + else +- echo "$as_me:4137: result: no" >&5 ++ echo "$as_me:4240: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4143,7 +4246,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:4146: checking for $ac_word" >&5 ++echo "$as_me:4249: 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 +@@ -4158,7 +4261,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:4161: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4264: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4167,17 +4270,17 @@ + fi + MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS + if test -n "$MAKE_LOWER_TAGS"; then +- echo "$as_me:4170: result: $MAKE_LOWER_TAGS" >&5 ++ echo "$as_me:4273: result: $MAKE_LOWER_TAGS" >&5 + echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 + else +- echo "$as_me:4173: result: no" >&5 ++ echo "$as_me:4276: 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:4180: checking for $ac_word" >&5 ++echo "$as_me:4283: 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 +@@ -4192,7 +4295,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:4195: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4298: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4201,10 +4304,10 @@ + fi + MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS + if test -n "$MAKE_UPPER_TAGS"; then +- echo "$as_me:4204: result: $MAKE_UPPER_TAGS" >&5 ++ echo "$as_me:4307: result: $MAKE_UPPER_TAGS" >&5 + echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 + else +- echo "$as_me:4207: result: no" >&5 ++ echo "$as_me:4310: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4224,7 +4327,7 @@ + MAKE_LOWER_TAGS="#" + fi + +-echo "$as_me:4227: checking for makeflags variable" >&5 ++echo "$as_me:4330: 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 +@@ -4254,7 +4357,7 @@ + ;; + (*) + +-echo "${as_me:-configure}:4257: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ++echo "${as_me:-configure}:4360: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 + + ;; + esac +@@ -4262,13 +4365,13 @@ + rm -f cf_makeflags.tmp + + fi +-echo "$as_me:4265: result: $cf_cv_makeflags" >&5 ++echo "$as_me:4368: 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:4271: checking for $ac_word" >&5 ++echo "$as_me:4374: 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 +@@ -4283,7 +4386,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:4286: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4389: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4291,10 +4394,10 @@ + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- echo "$as_me:4294: result: $RANLIB" >&5 ++ echo "$as_me:4397: result: $RANLIB" >&5 + echo "${ECHO_T}$RANLIB" >&6 + else +- echo "$as_me:4297: result: no" >&5 ++ echo "$as_me:4400: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4303,7 +4406,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:4306: checking for $ac_word" >&5 ++echo "$as_me:4409: 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 +@@ -4318,7 +4421,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:4321: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4424: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4327,10 +4430,10 @@ + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- echo "$as_me:4330: result: $ac_ct_RANLIB" >&5 ++ echo "$as_me:4433: result: $ac_ct_RANLIB" >&5 + echo "${ECHO_T}$ac_ct_RANLIB" >&6 + else +- echo "$as_me:4333: result: no" >&5 ++ echo "$as_me:4436: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4342,7 +4445,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:4345: checking for $ac_word" >&5 ++echo "$as_me:4448: 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 +@@ -4357,7 +4460,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:4360: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4463: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4365,10 +4468,10 @@ + fi + LD=$ac_cv_prog_LD + if test -n "$LD"; then +- echo "$as_me:4368: result: $LD" >&5 ++ echo "$as_me:4471: result: $LD" >&5 + echo "${ECHO_T}$LD" >&6 + else +- echo "$as_me:4371: result: no" >&5 ++ echo "$as_me:4474: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4377,7 +4480,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:4380: checking for $ac_word" >&5 ++echo "$as_me:4483: 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 +@@ -4392,7 +4495,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:4395: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4498: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4401,10 +4504,10 @@ + fi + ac_ct_LD=$ac_cv_prog_ac_ct_LD + if test -n "$ac_ct_LD"; then +- echo "$as_me:4404: result: $ac_ct_LD" >&5 ++ echo "$as_me:4507: result: $ac_ct_LD" >&5 + echo "${ECHO_T}$ac_ct_LD" >&6 + else +- echo "$as_me:4407: result: no" >&5 ++ echo "$as_me:4510: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4416,7 +4519,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:4419: checking for $ac_word" >&5 ++echo "$as_me:4522: 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 +@@ -4431,7 +4534,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:4434: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4537: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4439,10 +4542,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:4442: result: $AR" >&5 ++ echo "$as_me:4545: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:4445: result: no" >&5 ++ echo "$as_me:4548: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4451,7 +4554,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:4454: checking for $ac_word" >&5 ++echo "$as_me:4557: 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 +@@ -4466,7 +4569,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:4469: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4572: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4475,10 +4578,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:4478: result: $ac_ct_AR" >&5 ++ echo "$as_me:4581: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:4481: result: no" >&5 ++ echo "$as_me:4584: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4490,7 +4593,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:4493: checking for $ac_word" >&5 ++echo "$as_me:4596: 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 +@@ -4505,7 +4608,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:4508: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4611: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4513,10 +4616,10 @@ + fi + NM=$ac_cv_prog_NM + if test -n "$NM"; then +- echo "$as_me:4516: result: $NM" >&5 ++ echo "$as_me:4619: result: $NM" >&5 + echo "${ECHO_T}$NM" >&6 + else +- echo "$as_me:4519: result: no" >&5 ++ echo "$as_me:4622: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4525,7 +4628,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:4528: checking for $ac_word" >&5 ++echo "$as_me:4631: 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 +@@ -4540,7 +4643,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:4543: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4646: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4549,10 +4652,10 @@ + fi + ac_ct_NM=$ac_cv_prog_ac_ct_NM + if test -n "$ac_ct_NM"; then +- echo "$as_me:4552: result: $ac_ct_NM" >&5 ++ echo "$as_me:4655: result: $ac_ct_NM" >&5 + echo "${ECHO_T}$ac_ct_NM" >&6 + else +- echo "$as_me:4555: result: no" >&5 ++ echo "$as_me:4658: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4564,7 +4667,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:4567: checking for $ac_word" >&5 ++echo "$as_me:4670: 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 +@@ -4579,7 +4682,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:4582: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4685: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4587,10 +4690,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:4590: result: $AR" >&5 ++ echo "$as_me:4693: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:4593: result: no" >&5 ++ echo "$as_me:4696: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4599,7 +4702,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:4602: checking for $ac_word" >&5 ++echo "$as_me:4705: 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 +@@ -4614,7 +4717,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:4617: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4720: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4623,10 +4726,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:4626: result: $ac_ct_AR" >&5 ++ echo "$as_me:4729: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:4629: result: no" >&5 ++ echo "$as_me:4732: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4635,7 +4738,7 @@ + AR="$ac_cv_prog_AR" + fi + +-echo "$as_me:4638: checking for options to update archives" >&5 ++echo "$as_me:4741: 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 +@@ -4658,13 +4761,13 @@ + rm -f conftest.a + + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:4767: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4667: \$? = $ac_status" >&5 ++ echo "$as_me:4770: \$? = $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 +@@ -4675,7 +4778,7 @@ + else + test -n "$verbose" && echo " cannot compile test-program" 1>&6 + +-echo "${as_me:-configure}:4678: testing cannot compile test-program ..." 1>&5 ++echo "${as_me:-configure}:4781: testing cannot compile test-program ..." 1>&5 + + break + fi +@@ -4683,7 +4786,7 @@ + rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext + + fi +-echo "$as_me:4686: result: $cf_cv_ar_flags" >&5 ++echo "$as_me:4789: result: $cf_cv_ar_flags" >&5 + echo "${ECHO_T}$cf_cv_ar_flags" >&6 + + if test -n "$ARFLAGS" ; then +@@ -4694,7 +4797,7 @@ + ARFLAGS=$cf_cv_ar_flags + fi + +-echo "$as_me:4697: checking if you have specified an install-prefix" >&5 ++echo "$as_me:4800: 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. +@@ -4707,7 +4810,7 @@ + ;; + esac + fi; +-echo "$as_me:4710: result: $DESTDIR" >&5 ++echo "$as_me:4813: result: $DESTDIR" >&5 + echo "${ECHO_T}$DESTDIR" >&6 + + ############################################################################### +@@ -4735,7 +4838,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:4738: checking for $ac_word" >&5 ++echo "$as_me:4841: 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 +@@ -4750,7 +4853,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:4753: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4856: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4758,10 +4861,10 @@ + fi + BUILD_CC=$ac_cv_prog_BUILD_CC + if test -n "$BUILD_CC"; then +- echo "$as_me:4761: result: $BUILD_CC" >&5 ++ echo "$as_me:4864: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + else +- echo "$as_me:4764: result: no" >&5 ++ echo "$as_me:4867: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4770,12 +4873,12 @@ + test -n "$BUILD_CC" || BUILD_CC="none" + + fi; +- echo "$as_me:4773: checking for native build C compiler" >&5 ++ echo "$as_me:4876: checking for native build C compiler" >&5 + echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 +- echo "$as_me:4775: result: $BUILD_CC" >&5 ++ echo "$as_me:4878: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + +- echo "$as_me:4778: checking for native build C preprocessor" >&5 ++ echo "$as_me:4881: 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. +@@ -4785,10 +4888,10 @@ + else + BUILD_CPP='${BUILD_CC} -E' + fi; +- echo "$as_me:4788: result: $BUILD_CPP" >&5 ++ echo "$as_me:4891: result: $BUILD_CPP" >&5 + echo "${ECHO_T}$BUILD_CPP" >&6 + +- echo "$as_me:4791: checking for native build C flags" >&5 ++ echo "$as_me:4894: 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. +@@ -4796,10 +4899,10 @@ + withval="$with_build_cflags" + BUILD_CFLAGS="$withval" + fi; +- echo "$as_me:4799: result: $BUILD_CFLAGS" >&5 ++ echo "$as_me:4902: result: $BUILD_CFLAGS" >&5 + echo "${ECHO_T}$BUILD_CFLAGS" >&6 + +- echo "$as_me:4802: checking for native build C preprocessor-flags" >&5 ++ echo "$as_me:4905: 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. +@@ -4807,10 +4910,10 @@ + withval="$with_build_cppflags" + BUILD_CPPFLAGS="$withval" + fi; +- echo "$as_me:4810: result: $BUILD_CPPFLAGS" >&5 ++ echo "$as_me:4913: result: $BUILD_CPPFLAGS" >&5 + echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 + +- echo "$as_me:4813: checking for native build linker-flags" >&5 ++ echo "$as_me:4916: 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. +@@ -4818,10 +4921,10 @@ + withval="$with_build_ldflags" + BUILD_LDFLAGS="$withval" + fi; +- echo "$as_me:4821: result: $BUILD_LDFLAGS" >&5 ++ echo "$as_me:4924: result: $BUILD_LDFLAGS" >&5 + echo "${ECHO_T}$BUILD_LDFLAGS" >&6 + +- echo "$as_me:4824: checking for native build linker-libraries" >&5 ++ echo "$as_me:4927: 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. +@@ -4829,7 +4932,7 @@ + withval="$with_build_libs" + BUILD_LIBS="$withval" + fi; +- echo "$as_me:4832: result: $BUILD_LIBS" >&5 ++ echo "$as_me:4935: result: $BUILD_LIBS" >&5 + echo "${ECHO_T}$BUILD_LIBS" >&6 + + # this assumes we're on Unix. +@@ -4839,7 +4942,7 @@ + : ${BUILD_CC:='${CC}'} + + if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then +- { { echo "$as_me:4842: error: Cross-build requires two compilers. ++ { { echo "$as_me:4945: 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;} +@@ -4864,7 +4967,7 @@ + ### shared, for example. + cf_list_models="" + +-echo "$as_me:4867: checking if libtool -version-number should be used" >&5 ++echo "$as_me:4970: 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. +@@ -4881,7 +4984,7 @@ + cf_libtool_version=yes + + fi; +-echo "$as_me:4884: result: $cf_libtool_version" >&5 ++echo "$as_me:4987: result: $cf_libtool_version" >&5 + echo "${ECHO_T}$cf_libtool_version" >&6 + + if test "$cf_libtool_version" = yes ; then +@@ -4890,25 +4993,25 @@ + LIBTOOL_VERSION="-version-info" + case "x$VERSION" in + (x) +- { echo "$as_me:4893: WARNING: VERSION was not set" >&5 ++ { echo "$as_me:4996: 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}:4900: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ++echo "${as_me:-configure}:5003: 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}:4907: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ++echo "${as_me:-configure}:5010: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 + + ;; + (*) +- { echo "$as_me:4911: WARNING: unexpected VERSION value: $VERSION" >&5 ++ { echo "$as_me:5014: WARNING: unexpected VERSION value: $VERSION" >&5 + echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;} + ;; + esac +@@ -4930,7 +5033,7 @@ + LIB_INSTALL= + LIB_UNINSTALL= + +-echo "$as_me:4933: checking if you want to build libraries with libtool" >&5 ++echo "$as_me:5036: 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. +@@ -4940,7 +5043,7 @@ + else + with_libtool=no + fi; +-echo "$as_me:4943: result: $with_libtool" >&5 ++echo "$as_me:5046: result: $with_libtool" >&5 + echo "${ECHO_T}$with_libtool" >&6 + if test "$with_libtool" != "no"; then + +@@ -4971,7 +5074,7 @@ + with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:4974: error: expected a pathname, not \"$with_libtool\"" >&5 ++ { { echo "$as_me:5077: error: expected a pathname, not \"$with_libtool\"" >&5 + echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -4984,7 +5087,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:4987: checking for $ac_word" >&5 ++echo "$as_me:5090: 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 +@@ -4999,7 +5102,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:5002: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5105: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5007,10 +5110,10 @@ + fi + LIBTOOL=$ac_cv_prog_LIBTOOL + if test -n "$LIBTOOL"; then +- echo "$as_me:5010: result: $LIBTOOL" >&5 ++ echo "$as_me:5113: result: $LIBTOOL" >&5 + echo "${ECHO_T}$LIBTOOL" >&6 + else +- echo "$as_me:5013: result: no" >&5 ++ echo "$as_me:5116: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5023,7 +5126,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:5026: checking for $ac_word" >&5 ++echo "$as_me:5129: 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 +@@ -5038,7 +5141,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:5041: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5144: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5046,10 +5149,10 @@ + fi + ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL + if test -n "$ac_ct_LIBTOOL"; then +- echo "$as_me:5049: result: $ac_ct_LIBTOOL" >&5 ++ echo "$as_me:5152: result: $ac_ct_LIBTOOL" >&5 + echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 + else +- echo "$as_me:5052: result: no" >&5 ++ echo "$as_me:5155: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5080,7 +5183,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:5083: checking for $ac_word" >&5 ++echo "$as_me:5186: 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 +@@ -5095,7 +5198,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:5098: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5201: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5103,10 +5206,10 @@ + fi + LIBTOOL=$ac_cv_prog_LIBTOOL + if test -n "$LIBTOOL"; then +- echo "$as_me:5106: result: $LIBTOOL" >&5 ++ echo "$as_me:5209: result: $LIBTOOL" >&5 + echo "${ECHO_T}$LIBTOOL" >&6 + else +- echo "$as_me:5109: result: no" >&5 ++ echo "$as_me:5212: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5119,7 +5222,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:5122: checking for $ac_word" >&5 ++echo "$as_me:5225: 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 +@@ -5134,7 +5237,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:5137: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5240: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5142,10 +5245,10 @@ + fi + ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL + if test -n "$ac_ct_LIBTOOL"; then +- echo "$as_me:5145: result: $ac_ct_LIBTOOL" >&5 ++ echo "$as_me:5248: result: $ac_ct_LIBTOOL" >&5 + echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 + else +- echo "$as_me:5148: result: no" >&5 ++ echo "$as_me:5251: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5167,7 +5270,7 @@ + fi + fi + if test -z "$LIBTOOL" ; then +- { { echo "$as_me:5170: error: Cannot find libtool" >&5 ++ { { echo "$as_me:5273: error: Cannot find libtool" >&5 + echo "$as_me: error: Cannot find libtool" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5183,7 +5286,7 @@ + + if test -n "$LIBTOOL" && test "$LIBTOOL" != none + then +- echo "$as_me:5186: checking version of $LIBTOOL" >&5 ++ echo "$as_me:5289: checking version of $LIBTOOL" >&5 + echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6 + + if test -n "$LIBTOOL" && test "$LIBTOOL" != none +@@ -5194,15 +5297,15 @@ + fi + test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version + +- echo "$as_me:5197: result: $cf_cv_libtool_version" >&5 ++ echo "$as_me:5300: 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:5200: error: This is not GNU libtool" >&5 ++ { { echo "$as_me:5303: 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:5205: error: GNU libtool has not been found" >&5 ++ { { echo "$as_me:5308: error: GNU libtool has not been found" >&5 + echo "$as_me: error: GNU libtool has not been found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5238,7 +5341,7 @@ + + else + +-echo "$as_me:5241: checking if you want to build shared libraries" >&5 ++echo "$as_me:5344: 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. +@@ -5248,11 +5351,11 @@ + else + with_shared=no + fi; +-echo "$as_me:5251: result: $with_shared" >&5 ++echo "$as_me:5354: 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:5255: checking if you want to build static libraries" >&5 ++echo "$as_me:5358: 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. +@@ -5262,11 +5365,11 @@ + else + with_normal=yes + fi; +-echo "$as_me:5265: result: $with_normal" >&5 ++echo "$as_me:5368: 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:5269: checking if you want to build debug libraries" >&5 ++echo "$as_me:5372: 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. +@@ -5276,11 +5379,11 @@ + else + with_debug=yes + fi; +-echo "$as_me:5279: result: $with_debug" >&5 ++echo "$as_me:5382: 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:5283: checking if you want to build profiling libraries" >&5 ++echo "$as_me:5386: 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. +@@ -5290,7 +5393,7 @@ + else + with_profile=no + fi; +-echo "$as_me:5293: result: $with_profile" >&5 ++echo "$as_me:5396: result: $with_profile" >&5 + echo "${ECHO_T}$with_profile" >&6 + test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile" + +@@ -5298,7 +5401,7 @@ + + if test "X$cf_with_cxx_binding" != Xno; then + if test "x$with_shared" = "xyes"; then +-echo "$as_me:5301: checking if you want to build C++ shared libraries" >&5 ++echo "$as_me:5404: 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. +@@ -5308,26 +5411,26 @@ + else + with_shared_cxx=no + fi; +-echo "$as_me:5311: result: $with_shared_cxx" >&5 ++echo "$as_me:5414: result: $with_shared_cxx" >&5 + echo "${ECHO_T}$with_shared_cxx" >&6 + fi + fi + + ############################################################################### + +-echo "$as_me:5318: checking for specified models" >&5 ++echo "$as_me:5421: 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:5322: result: $cf_list_models" >&5 ++echo "$as_me:5425: 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:5327: checking for default model" >&5 ++echo "$as_me:5430: 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:5330: result: $DFT_LWR_MODEL" >&5 ++echo "$as_me:5433: result: $DFT_LWR_MODEL" >&5 + echo "${ECHO_T}$DFT_LWR_MODEL" >&6 + + DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +@@ -5341,7 +5444,7 @@ + LIB_DIR=../lib + LIB_2ND=../../lib + +-echo "$as_me:5344: checking if you want to have a library-prefix" >&5 ++echo "$as_me:5447: 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. +@@ -5351,7 +5454,7 @@ + else + with_lib_prefix=auto + fi; +-echo "$as_me:5354: result: $with_lib_prefix" >&5 ++echo "$as_me:5457: result: $with_lib_prefix" >&5 + echo "${ECHO_T}$with_lib_prefix" >&6 + + if test $with_lib_prefix = auto +@@ -5379,19 +5482,19 @@ + + LIB_SUFFIX= + +- echo "$as_me:5382: checking for PATH separator" >&5 ++ echo "$as_me:5485: 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:5389: result: $PATH_SEPARATOR" >&5 ++ echo "$as_me:5492: result: $PATH_SEPARATOR" >&5 + echo "${ECHO_T}$PATH_SEPARATOR" >&6 + + ############################################################################### + +-echo "$as_me:5394: checking if you want to build a separate terminfo library" >&5 ++echo "$as_me:5497: 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. +@@ -5401,10 +5504,10 @@ + else + with_termlib=no + fi; +-echo "$as_me:5404: result: $with_termlib" >&5 ++echo "$as_me:5507: result: $with_termlib" >&5 + echo "${ECHO_T}$with_termlib" >&6 + +-echo "$as_me:5407: checking if you want to build a separate tic library" >&5 ++echo "$as_me:5510: 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. +@@ -5414,7 +5517,7 @@ + else + with_ticlib=no + fi; +-echo "$as_me:5417: result: $with_ticlib" >&5 ++echo "$as_me:5520: result: $with_ticlib" >&5 + echo "${ECHO_T}$with_ticlib" >&6 + + if test X"$CC_G_OPT" = X"" ; then +@@ -5427,7 +5530,7 @@ + test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT='' + fi + +-echo "$as_me:5430: checking for default loader flags" >&5 ++echo "$as_me:5533: 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='' ;; +@@ -5436,13 +5539,13 @@ + (profile) LD_MODEL='-pg';; + (shared) LD_MODEL='' ;; + esac +-echo "$as_me:5439: result: $LD_MODEL" >&5 ++echo "$as_me:5542: result: $LD_MODEL" >&5 + echo "${ECHO_T}$LD_MODEL" >&6 + + case $DFT_LWR_MODEL in + (shared) + +-echo "$as_me:5445: checking if rpath option should be used" >&5 ++echo "$as_me:5548: 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. +@@ -5452,10 +5555,10 @@ + else + cf_cv_enable_rpath=no + fi; +-echo "$as_me:5455: result: $cf_cv_enable_rpath" >&5 ++echo "$as_me:5558: result: $cf_cv_enable_rpath" >&5 + echo "${ECHO_T}$cf_cv_enable_rpath" >&6 + +-echo "$as_me:5458: checking if shared libraries should be relinked during install" >&5 ++echo "$as_me:5561: 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. +@@ -5465,7 +5568,7 @@ + else + cf_cv_do_relink=yes + fi; +-echo "$as_me:5468: result: $cf_cv_do_relink" >&5 ++echo "$as_me:5571: result: $cf_cv_do_relink" >&5 + echo "${ECHO_T}$cf_cv_do_relink" >&6 + ;; + esac +@@ -5476,7 +5579,7 @@ + LD_RPATH_OPT= + if test "x$cf_cv_enable_rpath" != xno + then +- echo "$as_me:5479: checking for an rpath option" >&5 ++ echo "$as_me:5582: checking for an rpath option" >&5 + echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 + case $cf_cv_system_name in + (irix*) +@@ -5507,12 +5610,12 @@ + (*) + ;; + esac +- echo "$as_me:5510: result: $LD_RPATH_OPT" >&5 ++ echo "$as_me:5613: result: $LD_RPATH_OPT" >&5 + echo "${ECHO_T}$LD_RPATH_OPT" >&6 + + case "x$LD_RPATH_OPT" in + (x-R*) +- echo "$as_me:5515: checking if we need a space after rpath option" >&5 ++ echo "$as_me:5618: 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" + +@@ -5533,7 +5636,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 5536 "configure" ++#line 5639 "configure" + #include "confdefs.h" + + int +@@ -5545,16 +5648,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5548: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5651: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5551: \$? = $ac_status" >&5 ++ echo "$as_me:5654: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5554: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5657: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5557: \$? = $ac_status" >&5 ++ echo "$as_me:5660: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_rpath_space=no + else +@@ -5564,7 +5667,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$cf_save_LIBS" +- echo "$as_me:5567: result: $cf_rpath_space" >&5 ++ echo "$as_me:5670: result: $cf_rpath_space" >&5 + echo "${ECHO_T}$cf_rpath_space" >&6 + test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " + ;; +@@ -5586,7 +5689,7 @@ + cf_ld_rpath_opt= + test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" + +- echo "$as_me:5589: checking if release/abi version should be used for shared libs" >&5 ++ echo "$as_me:5692: 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. +@@ -5601,9 +5704,9 @@ + cf_cv_shlib_version=$withval + ;; + (*) +- echo "$as_me:5604: result: $withval" >&5 ++ echo "$as_me:5707: result: $withval" >&5 + echo "${ECHO_T}$withval" >&6 +- { { echo "$as_me:5606: error: option value must be one of: rel, abi, or auto" >&5 ++ { { echo "$as_me:5709: 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; }; } + ;; +@@ -5612,7 +5715,7 @@ + else + cf_cv_shlib_version=auto + fi; +- echo "$as_me:5615: result: $cf_cv_shlib_version" >&5 ++ echo "$as_me:5718: result: $cf_cv_shlib_version" >&5 + echo "${ECHO_T}$cf_cv_shlib_version" >&6 + + cf_cv_rm_so_locs=no +@@ -5635,14 +5738,14 @@ + + if test "$cf_try_fPIC" = yes + then +- echo "$as_me:5638: checking which $CC option to use" >&5 ++ echo "$as_me:5741: 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 5645 "configure" ++#line 5748 "configure" + #include "confdefs.h" + #include + int +@@ -5654,16 +5757,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5657: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5760: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5660: \$? = $ac_status" >&5 ++ echo "$as_me:5763: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5663: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5766: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5666: \$? = $ac_status" >&5 ++ echo "$as_me:5769: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -5672,7 +5775,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + done +- echo "$as_me:5675: result: $CC_SHARED_OPTS" >&5 ++ echo "$as_me:5778: result: $CC_SHARED_OPTS" >&5 + echo "${ECHO_T}$CC_SHARED_OPTS" >&6 + CFLAGS="$cf_save_CFLAGS" + fi +@@ -5743,7 +5846,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:5746: checking if ld -search_paths_first works" >&5 ++ echo "$as_me:5849: 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 +@@ -5752,7 +5855,7 @@ + cf_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" + cat >conftest.$ac_ext <<_ACEOF +-#line 5755 "configure" ++#line 5858 "configure" + #include "confdefs.h" + + int +@@ -5764,16 +5867,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5767: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5870: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5770: \$? = $ac_status" >&5 ++ echo "$as_me:5873: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5773: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5876: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5776: \$? = $ac_status" >&5 ++ echo "$as_me:5879: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ldflags_search_paths_first=yes + else +@@ -5784,7 +5887,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$cf_save_LDFLAGS + fi +-echo "$as_me:5787: result: $cf_cv_ldflags_search_paths_first" >&5 ++echo "$as_me:5890: 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" +@@ -6009,7 +6112,7 @@ + do + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6012 "configure" ++#line 6115 "configure" + #include "confdefs.h" + #include + int +@@ -6021,16 +6124,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6024: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6127: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6027: \$? = $ac_status" >&5 ++ echo "$as_me:6130: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6030: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6133: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6033: \$? = $ac_status" >&5 ++ echo "$as_me:6136: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -6067,7 +6170,7 @@ + test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes + ;; + (*) +- { echo "$as_me:6070: WARNING: ignored --with-shlib-version" >&5 ++ { echo "$as_me:6173: WARNING: ignored --with-shlib-version" >&5 + echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} + ;; + esac +@@ -6077,7 +6180,7 @@ + if test -n "$cf_try_cflags" + then + cat > conftest.$ac_ext < + int main(int argc, char *argv[]) + { +@@ -6089,18 +6192,18 @@ + for cf_opt in $cf_try_cflags + do + CFLAGS="$cf_save_CFLAGS -$cf_opt" +- echo "$as_me:6092: checking if CFLAGS option -$cf_opt works" >&5 ++ echo "$as_me:6195: 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:6094: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:6197: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6097: \$? = $ac_status" >&5 ++ echo "$as_me:6200: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- echo "$as_me:6099: result: yes" >&5 ++ echo "$as_me:6202: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + cf_save_CFLAGS="$CFLAGS" + else +- echo "$as_me:6103: result: no" >&5 ++ echo "$as_me:6206: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + done +@@ -6115,17 +6218,17 @@ + + test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 + +-echo "${as_me:-configure}:6118: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 ++echo "${as_me:-configure}:6221: 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}:6122: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:6225: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + for model in $cf_list_models; do + case $model in + (libtool) + +-echo "$as_me:6128: checking for additional libtool options" >&5 ++echo "$as_me:6231: 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. +@@ -6135,7 +6238,7 @@ + else + with_libtool_opts=no + fi; +-echo "$as_me:6138: result: $with_libtool_opts" >&5 ++echo "$as_me:6241: result: $with_libtool_opts" >&5 + echo "${ECHO_T}$with_libtool_opts" >&6 + + case .$with_libtool_opts in +@@ -6146,7 +6249,7 @@ + ;; + esac + +-echo "$as_me:6149: checking if exported-symbols file should be used" >&5 ++echo "$as_me:6252: 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. +@@ -6161,7 +6264,7 @@ + with_export_syms='${top_srcdir}/package/${PACKAGE}.sym' + + fi +-echo "$as_me:6164: result: $with_export_syms" >&5 ++echo "$as_me:6267: result: $with_export_syms" >&5 + echo "${ECHO_T}$with_export_syms" >&6 + if test "x$with_export_syms" != xno + then +@@ -6172,15 +6275,15 @@ + ;; + (shared) + if test "$CC_SHARED_OPTS" = "unknown"; then +- { { echo "$as_me:6175: error: Shared libraries are not supported in this version" >&5 ++ { { echo "$as_me:6278: 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:6180: checking if current CFLAGS link properly" >&5 ++ echo "$as_me:6283: 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 6183 "configure" ++#line 6286 "configure" + #include "confdefs.h" + #include + int +@@ -6192,16 +6295,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6195: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6298: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6198: \$? = $ac_status" >&5 ++ echo "$as_me:6301: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6201: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6304: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6204: \$? = $ac_status" >&5 ++ echo "$as_me:6307: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cflags_work=yes + else +@@ -6210,18 +6313,18 @@ + cf_cflags_work=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:6213: result: $cf_cflags_work" >&5 ++ echo "$as_me:6316: 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}:6219: testing try to work around by appending shared-options ..." 1>&5 ++echo "${as_me:-configure}:6322: testing try to work around by appending shared-options ..." 1>&5 + + CFLAGS="$CFLAGS $CC_SHARED_OPTS" + fi + +-echo "$as_me:6224: checking if versioned-symbols file should be used" >&5 ++echo "$as_me:6327: 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. +@@ -6239,18 +6342,18 @@ + (xno) + ;; + (x/*) +- test -f "$with_versioned_syms" || { { echo "$as_me:6242: error: expected a filename: $with_versioned_syms" >&5 ++ test -f "$with_versioned_syms" || { { echo "$as_me:6345: 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:6247: error: expected a filename: $with_versioned_syms" >&5 ++ test -f "$with_versioned_syms" || { { echo "$as_me:6350: 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:6253: result: $with_versioned_syms" >&5 ++echo "$as_me:6356: result: $with_versioned_syms" >&5 + echo "${ECHO_T}$with_versioned_syms" >&6 + + RESULTING_SYMS= +@@ -6266,7 +6369,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}:6269: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:6372: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + ;; + (*-dy\ *) +@@ -6274,11 +6377,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}:6277: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ++echo "${as_me:-configure}:6380: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + ;; + (*) +- { echo "$as_me:6281: WARNING: this system does not support versioned-symbols" >&5 ++ { echo "$as_me:6384: WARNING: this system does not support versioned-symbols" >&5 + echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;} + ;; + esac +@@ -6290,7 +6393,7 @@ + # symbols. + if test "x$VERSIONED_SYMS" != "x" + then +- echo "$as_me:6293: checking if wildcards can be used to selectively omit symbols" >&5 ++ echo "$as_me:6396: 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 + +@@ -6327,7 +6430,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:6361: result: $WILDCARD_SYMS" >&5 ++ echo "$as_me:6464: result: $WILDCARD_SYMS" >&5 + echo "${ECHO_T}$WILDCARD_SYMS" >&6 + rm -f conftest.* + fi +@@ -6371,7 +6474,7 @@ + ### Checks for special libraries, must be done up-front. + SHLIB_LIST="" + +-echo "$as_me:6374: checking if you want to link with the GPM mouse library" >&5 ++echo "$as_me:6477: 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. +@@ -6381,27 +6484,27 @@ + else + with_gpm=maybe + fi; +-echo "$as_me:6384: result: $with_gpm" >&5 ++echo "$as_me:6487: result: $with_gpm" >&5 + echo "${ECHO_T}$with_gpm" >&6 + + if test "$with_gpm" != no ; then +- echo "$as_me:6388: checking for gpm.h" >&5 ++ echo "$as_me:6491: 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 6394 "configure" ++#line 6497 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:6398: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:6501: \"$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:6404: \$? = $ac_status" >&5 ++ echo "$as_me:6507: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -6420,7 +6523,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:6423: result: $ac_cv_header_gpm_h" >&5 ++echo "$as_me:6526: 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 + +@@ -6431,7 +6534,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}:6434: testing assuming we really have GPM library ..." 1>&5 ++echo "${as_me:-configure}:6537: testing assuming we really have GPM library ..." 1>&5 + + cat >>confdefs.h <<\EOF + #define HAVE_LIBGPM 1 +@@ -6439,7 +6542,7 @@ + + with_gpm=yes + else +- echo "$as_me:6442: checking for Gpm_Open in -lgpm" >&5 ++ echo "$as_me:6545: 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 +@@ -6447,7 +6550,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6450 "configure" ++#line 6553 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6466,16 +6569,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6469: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6572: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6472: \$? = $ac_status" >&5 ++ echo "$as_me:6575: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6475: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6578: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6478: \$? = $ac_status" >&5 ++ echo "$as_me:6581: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -6486,18 +6589,18 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6489: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:6592: 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:6496: WARNING: Cannot link with GPM library" >&5 ++ { echo "$as_me:6599: WARNING: Cannot link with GPM library" >&5 + echo "$as_me: WARNING: Cannot link with GPM library" >&2;} + with_gpm=no + else +- { { echo "$as_me:6500: error: Cannot link with GPM library" >&5 ++ { { echo "$as_me:6603: error: Cannot link with GPM library" >&5 + echo "$as_me: error: Cannot link with GPM library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -6508,7 +6611,7 @@ + + else + +- test "$with_gpm" != maybe && { echo "$as_me:6511: WARNING: Cannot find GPM header" >&5 ++ test "$with_gpm" != maybe && { echo "$as_me:6614: WARNING: Cannot find GPM header" >&5 + echo "$as_me: WARNING: Cannot find GPM header" >&2;} + with_gpm=no + +@@ -6517,7 +6620,7 @@ + fi + + if test "$with_gpm" != no ; then +- echo "$as_me:6520: checking if you want to load GPM dynamically" >&5 ++ echo "$as_me:6623: 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. +@@ -6527,18 +6630,18 @@ + else + with_dlsym=yes + fi; +- echo "$as_me:6530: result: $with_dlsym" >&5 ++ echo "$as_me:6633: result: $with_dlsym" >&5 + echo "${ECHO_T}$with_dlsym" >&6 + if test "x$with_dlsym" = xyes ; then + + cf_have_dlsym=no +-echo "$as_me:6535: checking for dlsym" >&5 ++echo "$as_me:6638: 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 6541 "configure" ++#line 6644 "configure" + #include "confdefs.h" + #define dlsym autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -6569,16 +6672,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6572: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6675: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6575: \$? = $ac_status" >&5 ++ echo "$as_me:6678: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6578: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6681: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6581: \$? = $ac_status" >&5 ++ echo "$as_me:6684: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_dlsym=yes + else +@@ -6588,14 +6691,14 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:6591: result: $ac_cv_func_dlsym" >&5 ++echo "$as_me:6694: 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:6598: checking for dlsym in -ldl" >&5 ++echo "$as_me:6701: 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 +@@ -6603,7 +6706,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6606 "configure" ++#line 6709 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6622,16 +6725,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6625: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6728: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6628: \$? = $ac_status" >&5 ++ echo "$as_me:6731: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6631: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6734: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6634: \$? = $ac_status" >&5 ++ echo "$as_me:6737: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlsym=yes + else +@@ -6642,7 +6745,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6645: result: $ac_cv_lib_dl_dlsym" >&5 ++echo "$as_me:6748: 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 + +@@ -6671,10 +6774,10 @@ + LIBS="$cf_add_libs" + } + +- echo "$as_me:6674: checking whether able to link to dl*() functions" >&5 ++ echo "$as_me:6777: 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 6677 "configure" ++#line 6780 "configure" + #include "confdefs.h" + #include + int +@@ -6692,16 +6795,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6695: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6798: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6698: \$? = $ac_status" >&5 ++ echo "$as_me:6801: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6701: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6804: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6704: \$? = $ac_status" >&5 ++ echo "$as_me:6807: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cat >>confdefs.h <<\EOF +@@ -6712,15 +6815,15 @@ + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +- { { echo "$as_me:6715: error: Cannot link test program for libdl" >&5 ++ { { echo "$as_me:6818: 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:6720: result: ok" >&5 ++ echo "$as_me:6823: result: ok" >&5 + echo "${ECHO_T}ok" >&6 + else +- { { echo "$as_me:6723: error: Cannot find dlsym function" >&5 ++ { { echo "$as_me:6826: error: Cannot find dlsym function" >&5 + echo "$as_me: error: Cannot find dlsym function" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -6728,12 +6831,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}:6731: testing assuming soname for gpm is $with_gpm ..." 1>&5 ++echo "${as_me:-configure}:6834: testing assuming soname for gpm is $with_gpm ..." 1>&5 + + cf_cv_gpm_soname="$with_gpm" + else + +-echo "$as_me:6736: checking for soname of gpm library" >&5 ++echo "$as_me:6839: 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 +@@ -6767,15 +6870,15 @@ + done + LIBS="$cf_add_libs" + +- if { (eval echo "$as_me:6770: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:6873: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6773: \$? = $ac_status" >&5 ++ echo "$as_me:6876: \$? = $ac_status" >&5 + (exit $ac_status); } ; then +- if { (eval echo "$as_me:6775: \"$ac_link\"") >&5 ++ if { (eval echo "$as_me:6878: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6778: \$? = $ac_status" >&5 ++ echo "$as_me:6881: \$? = $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 +@@ -6786,7 +6889,7 @@ + fi + + fi +-echo "$as_me:6789: result: $cf_cv_gpm_soname" >&5 ++echo "$as_me:6892: result: $cf_cv_gpm_soname" >&5 + echo "${ECHO_T}$cf_cv_gpm_soname" >&6 + + fi +@@ -6854,7 +6957,7 @@ + #define HAVE_LIBGPM 1 + EOF + +-echo "$as_me:6857: checking for Gpm_Wgetch in -lgpm" >&5 ++echo "$as_me:6960: 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 +@@ -6862,7 +6965,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6865 "configure" ++#line 6968 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6881,16 +6984,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6884: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6987: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6887: \$? = $ac_status" >&5 ++ echo "$as_me:6990: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6890: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6993: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6893: \$? = $ac_status" >&5 ++ echo "$as_me:6996: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Wgetch=yes + else +@@ -6901,11 +7004,11 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6904: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 ++echo "$as_me:7007: 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:6908: checking if GPM is weakly bound to curses library" >&5 ++echo "$as_me:7011: 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 +@@ -6929,15 +7032,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:6932: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:7035: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6935: \$? = $ac_status" >&5 ++ echo "$as_me:7038: \$? = $ac_status" >&5 + (exit $ac_status); } ; then +- if { (eval echo "$as_me:6937: \"$ac_link\"") >&5 ++ if { (eval echo "$as_me:7040: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6940: \$? = $ac_status" >&5 ++ echo "$as_me:7043: \$? = $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 +@@ -6949,11 +7052,11 @@ + fi + + fi +-echo "$as_me:6952: result: $cf_cv_check_gpm_wgetch" >&5 ++echo "$as_me:7055: 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:6956: WARNING: GPM library is already linked with curses - read the FAQ" >&5 ++ { echo "$as_me:7059: 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 + +@@ -6961,7 +7064,7 @@ + + fi + +-echo "$as_me:6964: checking if you want to use PCRE2 for regular-expressions" >&5 ++echo "$as_me:7067: 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. +@@ -6970,7 +7073,7 @@ + + fi; + test -z "$with_pcre2" && with_pcre2=no +-echo "$as_me:6973: result: $with_pcre2" >&5 ++echo "$as_me:7076: result: $with_pcre2" >&5 + echo "${ECHO_T}$with_pcre2" >&6 + + if test "x$with_pcre2" != xno ; then +@@ -6978,17 +7081,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre2; then + test -n "$verbose" && echo " found package libpcre2" 1>&6 + +-echo "${as_me:-configure}:6981: testing found package libpcre2 ..." 1>&5 ++echo "${as_me:-configure}:7084: 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}:6987: testing package libpcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:7090: 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}:6991: testing package libpcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:7094: testing package libpcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -7112,17 +7215,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre; then + test -n "$verbose" && echo " found package libpcre" 1>&6 + +-echo "${as_me:-configure}:7115: testing found package libpcre ..." 1>&5 ++echo "${as_me:-configure}:7218: 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}:7121: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:7224: 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}:7125: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:7228: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -7243,7 +7346,7 @@ + cf_pkgconfig_incs= + cf_pkgconfig_libs= + +- { { echo "$as_me:7246: error: Cannot find PCRE2 library" >&5 ++ { { echo "$as_me:7349: error: Cannot find PCRE2 library" >&5 + echo "$as_me: error: Cannot find PCRE2 library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -7259,7 +7362,7 @@ + (*pcre2-posix*|*pcreposix*) + ;; + (*) +- echo "$as_me:7262: checking for regcomp in -lpcre2-posix" >&5 ++ echo "$as_me:7365: 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 +@@ -7267,7 +7370,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpcre2-posix $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7270 "configure" ++#line 7373 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7286,16 +7389,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7289: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7392: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7292: \$? = $ac_status" >&5 ++ echo "$as_me:7395: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7295: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7398: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7298: \$? = $ac_status" >&5 ++ echo "$as_me:7401: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pcre2_posix_regcomp=yes + else +@@ -7306,7 +7409,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7309: result: $ac_cv_lib_pcre2_posix_regcomp" >&5 ++echo "$as_me:7412: 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 + +@@ -7327,7 +7430,7 @@ + LIBS="$cf_add_libs" + + else +- echo "$as_me:7330: checking for regcomp in -lpcreposix" >&5 ++ echo "$as_me:7433: 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 +@@ -7335,7 +7438,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpcreposix $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7338 "configure" ++#line 7441 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -7354,16 +7457,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7357: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7460: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7360: \$? = $ac_status" >&5 ++ echo "$as_me:7463: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7363: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7466: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7366: \$? = $ac_status" >&5 ++ echo "$as_me:7469: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pcreposix_regcomp=yes + else +@@ -7374,7 +7477,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:7377: result: $ac_cv_lib_pcreposix_regcomp" >&5 ++echo "$as_me:7480: 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 + +@@ -7395,7 +7498,7 @@ + LIBS="$cf_add_libs" + + else +- { { echo "$as_me:7398: error: Cannot find PCRE2 POSIX library" >&5 ++ { { echo "$as_me:7501: error: Cannot find PCRE2 POSIX library" >&5 + echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -7410,23 +7513,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:7413: checking for $ac_header" >&5 ++echo "$as_me:7516: 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 7419 "configure" ++#line 7522 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:7423: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:7526: \"$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:7429: \$? = $ac_status" >&5 ++ echo "$as_me:7532: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -7445,7 +7548,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:7448: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:7551: 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:7462: checking if you want to use sysmouse" >&5 ++echo "$as_me:7565: 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. +@@ -7471,7 +7574,7 @@ + fi; + if test "$cf_with_sysmouse" != no ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 7474 "configure" ++#line 7577 "configure" + #include "confdefs.h" + + #include +@@ -7494,16 +7597,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7497: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7600: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7500: \$? = $ac_status" >&5 ++ echo "$as_me:7603: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7503: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7606: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7506: \$? = $ac_status" >&5 ++ echo "$as_me:7609: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_with_sysmouse=yes + else +@@ -7513,7 +7616,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:7516: result: $cf_with_sysmouse" >&5 ++echo "$as_me:7619: result: $cf_with_sysmouse" >&5 + echo "${ECHO_T}$cf_with_sysmouse" >&6 + test "$cf_with_sysmouse" = yes && + cat >>confdefs.h <<\EOF +@@ -7523,7 +7626,7 @@ + fi + + # pretend that ncurses==ncursesw==ncursest +-echo "$as_me:7526: checking if you want to disable library suffixes" >&5 ++echo "$as_me:7629: 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. +@@ -7540,13 +7643,13 @@ + disable_lib_suffixes=no + + fi; +-echo "$as_me:7543: result: $disable_lib_suffixes" >&5 ++echo "$as_me:7646: 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:7549: checking if rpath-hack should be disabled" >&5 ++echo "$as_me:7652: 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. +@@ -7563,21 +7666,21 @@ + cf_disable_rpath_hack=no + + fi; +-echo "$as_me:7566: result: $cf_disable_rpath_hack" >&5 ++echo "$as_me:7669: 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:7570: checking for updated LDFLAGS" >&5 ++echo "$as_me:7673: 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:7573: result: maybe" >&5 ++ echo "$as_me:7676: 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:7580: checking for $ac_word" >&5 ++echo "$as_me:7683: 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 +@@ -7592,7 +7695,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:7595: found $ac_dir/$ac_word" >&5 ++echo "$as_me:7698: found $ac_dir/$ac_word" >&5 + break + done + +@@ -7600,10 +7703,10 @@ + fi + cf_ldd_prog=$ac_cv_prog_cf_ldd_prog + if test -n "$cf_ldd_prog"; then +- echo "$as_me:7603: result: $cf_ldd_prog" >&5 ++ echo "$as_me:7706: result: $cf_ldd_prog" >&5 + echo "${ECHO_T}$cf_ldd_prog" >&6 + else +- echo "$as_me:7606: result: no" >&5 ++ echo "$as_me:7709: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -7617,7 +7720,7 @@ + cf_rpath_oops= + + cat >conftest.$ac_ext <<_ACEOF +-#line 7620 "configure" ++#line 7723 "configure" + #include "confdefs.h" + #include + int +@@ -7629,16 +7732,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7632: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7735: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7635: \$? = $ac_status" >&5 ++ echo "$as_me:7738: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7638: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7741: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7641: \$? = $ac_status" >&5 ++ echo "$as_me:7744: \$? = $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` +@@ -7666,7 +7769,7 @@ + then + test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 + +-echo "${as_me:-configure}:7669: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 ++echo "${as_me:-configure}:7772: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 + + LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" + break +@@ -7678,11 +7781,11 @@ + + test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:7681: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:7784: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:7685: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:7788: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LDFLAGS +@@ -7719,7 +7822,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:7722: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:7825: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -7732,11 +7835,11 @@ + + test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:7735: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:7838: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:7739: testing ...checking LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:7842: testing ...checking LIBS $LIBS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LIBS +@@ -7773,7 +7876,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:7776: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:7879: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -7786,14 +7889,14 @@ + + test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:7789: testing ...checked LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:7892: testing ...checked LIBS $LIBS ..." 1>&5 + + test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:7793: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:7896: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + else +- echo "$as_me:7796: result: no" >&5 ++ echo "$as_me:7899: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -7804,7 +7907,7 @@ + ############################################################################### + + ### use option --with-extra-suffix to append suffix to headers and libraries +-echo "$as_me:7807: checking if you wish to append extra suffix to header/library paths" >&5 ++echo "$as_me:7910: 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= + +@@ -7823,11 +7926,11 @@ + esac + + fi; +-echo "$as_me:7826: result: $EXTRA_SUFFIX" >&5 ++echo "$as_me:7929: result: $EXTRA_SUFFIX" >&5 + echo "${ECHO_T}$EXTRA_SUFFIX" >&6 + + ### use option --disable-overwrite to leave out the link to -lcurses +-echo "$as_me:7830: checking if you wish to install ncurses overwriting curses" >&5 ++echo "$as_me:7933: 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. +@@ -7837,10 +7940,10 @@ + else + if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi + fi; +-echo "$as_me:7840: result: $with_overwrite" >&5 ++echo "$as_me:7943: result: $with_overwrite" >&5 + echo "${ECHO_T}$with_overwrite" >&6 + +-echo "$as_me:7843: checking if external terminfo-database is used" >&5 ++echo "$as_me:7946: 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. +@@ -7850,7 +7953,7 @@ + else + use_database=yes + fi; +-echo "$as_me:7853: result: $use_database" >&5 ++echo "$as_me:7956: result: $use_database" >&5 + echo "${ECHO_T}$use_database" >&6 + + case $host_os in +@@ -7866,7 +7969,7 @@ + if test "$use_database" != no ; then + NCURSES_USE_DATABASE=1 + +- echo "$as_me:7869: checking which terminfo source-file will be installed" >&5 ++ echo "$as_me:7972: 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. +@@ -7874,10 +7977,10 @@ + withval="$with_database" + TERMINFO_SRC=$withval + fi; +- echo "$as_me:7877: result: $TERMINFO_SRC" >&5 ++ echo "$as_me:7980: result: $TERMINFO_SRC" >&5 + echo "${ECHO_T}$TERMINFO_SRC" >&6 + +- echo "$as_me:7880: checking whether to use hashed database instead of directory/tree" >&5 ++ echo "$as_me:7983: 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. +@@ -7887,13 +7990,13 @@ + else + with_hashed_db=no + fi; +- echo "$as_me:7890: result: $with_hashed_db" >&5 ++ echo "$as_me:7993: result: $with_hashed_db" >&5 + echo "${ECHO_T}$with_hashed_db" >&6 + else + with_hashed_db=no + fi + +-echo "$as_me:7896: checking for list of fallback descriptions" >&5 ++echo "$as_me:7999: 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. +@@ -7903,7 +8006,7 @@ + else + with_fallback= + fi; +-echo "$as_me:7906: result: $with_fallback" >&5 ++echo "$as_me:8009: result: $with_fallback" >&5 + echo "${ECHO_T}$with_fallback" >&6 + + case ".$with_fallback" in +@@ -7911,7 +8014,7 @@ + FALLBACK_LIST= + ;; + (.yes) +- { echo "$as_me:7914: WARNING: expected a list of terminal descriptions" >&5 ++ { echo "$as_me:8017: WARNING: expected a list of terminal descriptions" >&5 + echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;} + ;; + (*) +@@ -7933,10 +8036,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:7936: checking for tic program for fallbacks" >&5 ++ echo "$as_me:8039: 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 "$as_me:8042: result: $TIC" >&5 + echo "${ECHO_T}$TIC" >&6 + + if test "x$prefix" != xNONE; then +@@ -7964,7 +8067,7 @@ + TIC=`echo $TIC | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:7967: error: expected a pathname, not \"$TIC\"" >&5 ++ { { echo "$as_me:8070: error: expected a pathname, not \"$TIC\"" >&5 + echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -7977,7 +8080,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:7980: checking for $ac_word" >&5 ++echo "$as_me:8083: 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 +@@ -7994,7 +8097,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:7997: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:8100: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -8005,10 +8108,10 @@ + TIC=$ac_cv_path_TIC + + if test -n "$TIC"; then +- echo "$as_me:8008: result: $TIC" >&5 ++ echo "$as_me:8111: result: $TIC" >&5 + echo "${ECHO_T}$TIC" >&6 + else +- echo "$as_me:8011: result: no" >&5 ++ echo "$as_me:8114: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8067,7 +8170,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me:-configure}:8070: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me:-configure}:8173: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++ { echo "$as_me:8188: WARNING: no tic program found for fallbacks" >&5 + echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} + fi + +@@ -8091,10 +8194,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:8094: checking for infocmp program for fallbacks" >&5 ++ echo "$as_me:8197: 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 "$as_me:8200: result: $INFOCMP" >&5 + echo "${ECHO_T}$INFOCMP" >&6 + + if test "x$prefix" != xNONE; then +@@ -8122,7 +8225,7 @@ + INFOCMP=`echo $INFOCMP | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:8125: error: expected a pathname, not \"$INFOCMP\"" >&5 ++ { { echo "$as_me:8228: error: expected a pathname, not \"$INFOCMP\"" >&5 + echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -8135,7 +8238,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:8138: checking for $ac_word" >&5 ++echo "$as_me:8241: 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 +@@ -8152,7 +8255,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:8155: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:8258: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -8163,10 +8266,10 @@ + INFOCMP=$ac_cv_path_INFOCMP + + if test -n "$INFOCMP"; then +- echo "$as_me:8166: result: $INFOCMP" >&5 ++ echo "$as_me:8269: result: $INFOCMP" >&5 + echo "${ECHO_T}$INFOCMP" >&6 + else +- echo "$as_me:8169: result: no" >&5 ++ echo "$as_me:8272: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8225,7 +8328,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me:-configure}:8228: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me:-configure}:8331: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++ { echo "$as_me:8346: WARNING: no infocmp program found for fallbacks" >&5 + echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;} + fi + +@@ -8251,7 +8354,7 @@ + : ${INFOCMP:=infocmp} + fi + +-echo "$as_me:8254: checking if you want modern xterm or antique" >&5 ++echo "$as_me:8357: 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. +@@ -8265,11 +8368,11 @@ + (no) with_xterm_new=xterm-old;; + (*) with_xterm_new=xterm-new;; + esac +-echo "$as_me:8268: result: $with_xterm_new" >&5 ++echo "$as_me:8371: result: $with_xterm_new" >&5 + echo "${ECHO_T}$with_xterm_new" >&6 + WHICH_XTERM=$with_xterm_new + +-echo "$as_me:8272: checking if xterm backspace sends BS or DEL" >&5 ++echo "$as_me:8375: 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. +@@ -8290,7 +8393,7 @@ + with_xterm_kbs=$withval + ;; + esac +-echo "$as_me:8293: result: $with_xterm_kbs" >&5 ++echo "$as_me:8396: result: $with_xterm_kbs" >&5 + echo "${ECHO_T}$with_xterm_kbs" >&6 + XTERM_KBS=$with_xterm_kbs + +@@ -8300,7 +8403,7 @@ + MAKE_TERMINFO="#" + else + +-echo "$as_me:8303: checking for list of terminfo directories" >&5 ++echo "$as_me:8406: 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. +@@ -8340,7 +8443,7 @@ + cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:8343: error: expected a pathname, not \"$cf_src_path\"" >&5 ++ { { echo "$as_me:8446: 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; }; } + ;; +@@ -8363,7 +8466,7 @@ + ;; + esac + +-echo "$as_me:8366: result: $TERMINFO_DIRS" >&5 ++echo "$as_me:8469: result: $TERMINFO_DIRS" >&5 + echo "${ECHO_T}$TERMINFO_DIRS" >&6 + test -n "$TERMINFO_DIRS" && + cat >>confdefs.h <&5 ++ { echo "$as_me:8478: 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:8381: checking for default terminfo directory" >&5 ++echo "$as_me:8484: 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. +@@ -8414,7 +8517,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:8417: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:8520: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -8423,7 +8526,7 @@ + fi + eval TERMINFO="$withval" + +-echo "$as_me:8426: result: $TERMINFO" >&5 ++echo "$as_me:8529: result: $TERMINFO" >&5 + echo "${ECHO_T}$TERMINFO" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:8540: 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. +@@ -8446,7 +8549,7 @@ + with_big_core=no + else + cat >conftest.$ac_ext <<_ACEOF +-#line 8449 "configure" ++#line 8552 "configure" + #include "confdefs.h" + + #include +@@ -8460,15 +8563,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:8463: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8566: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8466: \$? = $ac_status" >&5 ++ echo "$as_me:8569: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:8468: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8571: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8471: \$? = $ac_status" >&5 ++ echo "$as_me:8574: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + with_big_core=yes + else +@@ -8480,7 +8583,7 @@ + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi; +-echo "$as_me:8483: result: $with_big_core" >&5 ++echo "$as_me:8586: result: $with_big_core" >&5 + echo "${ECHO_T}$with_big_core" >&6 + test "x$with_big_core" = "xyes" && + cat >>confdefs.h <<\EOF +@@ -8490,7 +8593,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:8493: checking if big-strings option selected" >&5 ++echo "$as_me:8596: 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. +@@ -8514,14 +8617,14 @@ + esac + + fi; +-echo "$as_me:8517: result: $with_big_strings" >&5 ++echo "$as_me:8620: 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:8524: checking if you want termcap-fallback support" >&5 ++echo "$as_me:8627: 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. +@@ -8531,14 +8634,14 @@ + else + with_termcap=no + fi; +-echo "$as_me:8534: result: $with_termcap" >&5 ++echo "$as_me:8637: 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:8541: error: You have disabled the database w/o specifying fallbacks" >&5 ++ { { echo "$as_me:8644: 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 +@@ -8551,13 +8654,13 @@ + else + + if test "$with_ticlib" != no ; then +- { { echo "$as_me:8554: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 ++ { { echo "$as_me:8657: 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:8560: checking for list of termcap files" >&5 ++ echo "$as_me:8663: 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. +@@ -8597,7 +8700,7 @@ + cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:8600: error: expected a pathname, not \"$cf_src_path\"" >&5 ++ { { echo "$as_me:8703: 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; }; } + ;; +@@ -8620,7 +8723,7 @@ + ;; + esac + +- echo "$as_me:8623: result: $TERMPATH" >&5 ++ echo "$as_me:8726: result: $TERMPATH" >&5 + echo "${ECHO_T}$TERMPATH" >&6 + test -n "$TERMPATH" && + cat >>confdefs.h <&5 ++ echo "$as_me:8734: 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. +@@ -8638,14 +8741,14 @@ + else + with_getcap=no + fi; +- echo "$as_me:8641: result: $with_getcap" >&5 ++ echo "$as_me:8744: 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:8648: checking if translated termcaps will be cached in ~/.terminfo" >&5 ++ echo "$as_me:8751: 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. +@@ -8655,7 +8758,7 @@ + else + with_getcap_cache=no + fi; +- echo "$as_me:8658: result: $with_getcap_cache" >&5 ++ echo "$as_me:8761: result: $with_getcap_cache" >&5 + echo "${ECHO_T}$with_getcap_cache" >&6 + test "x$with_getcap_cache" = "xyes" && + cat >>confdefs.h <<\EOF +@@ -8665,7 +8768,7 @@ + fi + + ### Use option --disable-home-terminfo to completely remove ~/.terminfo +-echo "$as_me:8668: checking if ~/.terminfo is wanted" >&5 ++echo "$as_me:8771: 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. +@@ -8675,14 +8778,14 @@ + else + with_home_terminfo=yes + fi; +-echo "$as_me:8678: result: $with_home_terminfo" >&5 ++echo "$as_me:8781: 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:8685: checking if you want to use restricted environment when running as root" >&5 ++echo "$as_me:8788: 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. +@@ -8692,7 +8795,7 @@ + else + with_root_environ=yes + fi; +-echo "$as_me:8695: result: $with_root_environ" >&5 ++echo "$as_me:8798: result: $with_root_environ" >&5 + echo "${ECHO_T}$with_root_environ" >&6 + test "x$with_root_environ" = xyes && + cat >>confdefs.h <<\EOF +@@ -8707,23 +8810,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:8710: checking for $ac_header" >&5 ++echo "$as_me:8813: 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 8716 "configure" ++#line 8819 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:8720: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:8823: \"$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:8726: \$? = $ac_status" >&5 ++ echo "$as_me:8829: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -8742,7 +8845,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:8745: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:8848: 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:8863: 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 8766 "configure" ++#line 8869 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -8794,16 +8897,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8797: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8900: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8800: \$? = $ac_status" >&5 ++ echo "$as_me:8903: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8803: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8906: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8806: \$? = $ac_status" >&5 ++ echo "$as_me:8909: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -8813,7 +8916,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:8816: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:8919: 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:8936: 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 8839 "configure" ++#line 8942 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -8867,16 +8970,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8870: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8973: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8873: \$? = $ac_status" >&5 ++ echo "$as_me:8976: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8876: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8979: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8879: \$? = $ac_status" >&5 ++ echo "$as_me:8982: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -8886,7 +8989,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:8889: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:8992: 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:9003: 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 +@@ -8910,7 +9013,7 @@ + eval 'ac_cv_func_'$cf_func'=error' + else + cat >conftest.$ac_ext <<_ACEOF +-#line 8913 "configure" ++#line 9016 "configure" + #include "confdefs.h" + + #include +@@ -8940,15 +9043,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:8943: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9046: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8946: \$? = $ac_status" >&5 ++ echo "$as_me:9049: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:8948: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9051: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8951: \$? = $ac_status" >&5 ++ echo "$as_me:9054: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" +@@ -8966,7 +9069,7 @@ + test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no + + fi +-echo "$as_me:8969: result: $cf_cv_link_funcs" >&5 ++echo "$as_me:9072: result: $cf_cv_link_funcs" >&5 + echo "${ECHO_T}$cf_cv_link_funcs" >&6 + test "$ac_cv_func_link" = yes && + cat >>confdefs.h <<\EOF +@@ -8986,7 +9089,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:8989: checking if tic should use symbolic links" >&5 ++ echo "$as_me:9092: 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. +@@ -8996,21 +9099,21 @@ + else + with_symlinks=no + fi; +- echo "$as_me:8999: result: $with_symlinks" >&5 ++ echo "$as_me:9102: 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:9006: checking if tic should use hard links" >&5 ++ echo "$as_me:9109: 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:9013: result: $with_links" >&5 ++ echo "$as_me:9116: result: $with_links" >&5 + echo "${ECHO_T}$with_links" >&6 + fi + +@@ -9025,7 +9128,7 @@ + EOF + + ### use option --enable-broken-linker to force on use of broken-linker support +-echo "$as_me:9028: checking if you want broken-linker support code" >&5 ++echo "$as_me:9131: 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. +@@ -9035,7 +9138,7 @@ + else + with_broken_linker=${BROKEN_LINKER:-no} + fi; +-echo "$as_me:9038: result: $with_broken_linker" >&5 ++echo "$as_me:9141: result: $with_broken_linker" >&5 + echo "${ECHO_T}$with_broken_linker" >&6 + + BROKEN_LINKER=0 +@@ -9057,14 +9160,14 @@ + BROKEN_LINKER=1 + test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 + +-echo "${as_me:-configure}:9060: testing cygwin linker is broken anyway ..." 1>&5 ++echo "${as_me:-configure}:9163: 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:9067: checking if tputs should process BSD-style prefix padding" >&5 ++echo "$as_me:9170: 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. +@@ -9074,7 +9177,7 @@ + else + with_bsdpad=no + fi; +-echo "$as_me:9077: result: $with_bsdpad" >&5 ++echo "$as_me:9180: result: $with_bsdpad" >&5 + echo "${ECHO_T}$with_bsdpad" >&6 + test "x$with_bsdpad" = xyes && + cat >>confdefs.h <<\EOF +@@ -9093,14 +9196,14 @@ + # Check to define _XOPEN_SOURCE "automatically" + CPPFLAGS_before_XOPEN="$CPPFLAGS" + +-echo "$as_me:9096: checking if the POSIX test-macros are already defined" >&5 ++echo "$as_me:9199: 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 9103 "configure" ++#line 9206 "configure" + #include "confdefs.h" + #include + int +@@ -9119,16 +9222,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9122: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9225: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9125: \$? = $ac_status" >&5 ++ echo "$as_me:9228: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9128: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9231: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9131: \$? = $ac_status" >&5 ++ echo "$as_me:9234: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_visible=no + else +@@ -9139,7 +9242,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:9142: result: $cf_cv_posix_visible" >&5 ++echo "$as_me:9245: result: $cf_cv_posix_visible" >&5 + echo "${ECHO_T}$cf_cv_posix_visible" >&6 + + if test "$cf_cv_posix_visible" = no; then +@@ -9184,14 +9287,14 @@ + + cf_gnu_xopen_source=$cf_XOPEN_SOURCE + +-echo "$as_me:9187: checking if this is the GNU C library" >&5 ++echo "$as_me:9290: 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 9194 "configure" ++#line 9297 "configure" + #include "confdefs.h" + #include + int +@@ -9210,16 +9313,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9213: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9316: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9216: \$? = $ac_status" >&5 ++ echo "$as_me:9319: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9219: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9322: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9222: \$? = $ac_status" >&5 ++ echo "$as_me:9325: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_library=yes + else +@@ -9230,7 +9333,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:9233: result: $cf_cv_gnu_library" >&5 ++echo "$as_me:9336: result: $cf_cv_gnu_library" >&5 + echo "${ECHO_T}$cf_cv_gnu_library" >&6 + + if test x$cf_cv_gnu_library = xyes; then +@@ -9238,7 +9341,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:9241: checking if _DEFAULT_SOURCE can be used as a basis" >&5 ++ echo "$as_me:9344: 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 +@@ -9250,7 +9353,7 @@ + CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + + cat >conftest.$ac_ext <<_ACEOF +-#line 9253 "configure" ++#line 9356 "configure" + #include "confdefs.h" + #include + int +@@ -9269,16 +9372,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9272: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9375: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9275: \$? = $ac_status" >&5 ++ echo "$as_me:9378: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9278: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9381: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9281: \$? = $ac_status" >&5 ++ echo "$as_me:9384: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_library_219=yes + else +@@ -9290,12 +9393,12 @@ + CPPFLAGS="$cf_save" + + fi +-echo "$as_me:9293: result: $cf_cv_gnu_library_219" >&5 ++echo "$as_me:9396: 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:9298: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 ++ echo "$as_me:9401: 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 +@@ -9400,7 +9503,7 @@ + fi + + cat >conftest.$ac_ext <<_ACEOF +-#line 9403 "configure" ++#line 9506 "configure" + #include "confdefs.h" + + #include +@@ -9420,16 +9523,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9423: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9526: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9426: \$? = $ac_status" >&5 ++ echo "$as_me:9529: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9429: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9532: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9432: \$? = $ac_status" >&5 ++ echo "$as_me:9535: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_dftsrc_219=yes + else +@@ -9440,7 +9543,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:9443: result: $cf_cv_gnu_dftsrc_219" >&5 ++echo "$as_me:9546: 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 +@@ -9449,14 +9552,14 @@ + + if test "x$cf_cv_gnu_dftsrc_219" != xyes; then + +- echo "$as_me:9452: checking if we must define _GNU_SOURCE" >&5 ++ echo "$as_me:9555: 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 9459 "configure" ++#line 9562 "configure" + #include "confdefs.h" + #include + int +@@ -9471,16 +9574,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9474: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9577: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9477: \$? = $ac_status" >&5 ++ echo "$as_me:9580: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9480: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9583: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9483: \$? = $ac_status" >&5 ++ echo "$as_me:9586: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no + else +@@ -9587,7 +9690,7 @@ + fi + + cat >conftest.$ac_ext <<_ACEOF +-#line 9590 "configure" ++#line 9693 "configure" + #include "confdefs.h" + #include + int +@@ -9602,16 +9705,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9605: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9708: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9608: \$? = $ac_status" >&5 ++ echo "$as_me:9711: \$? = $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:9714: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9614: \$? = $ac_status" >&5 ++ echo "$as_me:9717: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no + else +@@ -9626,12 +9729,12 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:9629: result: $cf_cv_gnu_source" >&5 ++echo "$as_me:9732: 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:9634: checking if we should also define _DEFAULT_SOURCE" >&5 ++ echo "$as_me:9737: 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 +@@ -9641,7 +9744,7 @@ + CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" + + cat >conftest.$ac_ext <<_ACEOF +-#line 9644 "configure" ++#line 9747 "configure" + #include "confdefs.h" + #include + int +@@ -9656,16 +9759,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9659: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9762: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9662: \$? = $ac_status" >&5 ++ echo "$as_me:9765: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9665: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9768: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9668: \$? = $ac_status" >&5 ++ echo "$as_me:9771: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_default_source=no + else +@@ -9676,7 +9779,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:9679: result: $cf_cv_default_source" >&5 ++echo "$as_me:9782: result: $cf_cv_default_source" >&5 + echo "${ECHO_T}$cf_cv_default_source" >&6 + if test "$cf_cv_default_source" = yes + then +@@ -9713,16 +9816,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:9716: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:9819: 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}:9722: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:9825: testing if the symbol is already defined go no further ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 9725 "configure" ++#line 9828 "configure" + #include "confdefs.h" + #include + int +@@ -9737,16 +9840,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9740: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9843: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9743: \$? = $ac_status" >&5 ++ echo "$as_me:9846: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9746: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9849: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9749: \$? = $ac_status" >&5 ++ echo "$as_me:9852: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_c_source=no + else +@@ -9767,7 +9870,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 9770 "configure" ++#line 9873 "configure" + #include "confdefs.h" + #include + int +@@ -9782,16 +9885,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9785: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9888: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9788: \$? = $ac_status" >&5 ++ echo "$as_me:9891: \$? = $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:9894: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9794: \$? = $ac_status" >&5 ++ echo "$as_me:9897: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -9802,7 +9905,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + +-echo "${as_me:-configure}:9805: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:9908: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -9810,10 +9913,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:9813: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:9916: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 9816 "configure" ++#line 9919 "configure" + #include "confdefs.h" + #include + int +@@ -9828,16 +9931,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9831: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9934: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9834: \$? = $ac_status" >&5 ++ echo "$as_me:9937: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9837: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9940: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9840: \$? = $ac_status" >&5 ++ echo "$as_me:9943: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -9853,7 +9956,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:9856: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:9959: 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 +@@ -9993,14 +10096,14 @@ + ;; + (*) + +-echo "$as_me:9996: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:10099: 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 10003 "configure" ++#line 10106 "configure" + #include "confdefs.h" + + #include +@@ -10019,16 +10122,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10022: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10125: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10025: \$? = $ac_status" >&5 ++ echo "$as_me:10128: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10028: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10131: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10031: \$? = $ac_status" >&5 ++ echo "$as_me:10134: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xopen_source=no + else +@@ -10040,7 +10143,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >conftest.$ac_ext <<_ACEOF +-#line 10043 "configure" ++#line 10146 "configure" + #include "confdefs.h" + + #include +@@ -10059,16 +10162,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10062: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10165: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10065: \$? = $ac_status" >&5 ++ echo "$as_me:10168: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10068: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10171: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10071: \$? = $ac_status" >&5 ++ echo "$as_me:10174: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xopen_source=no + else +@@ -10083,7 +10186,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:10086: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:10189: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -10213,16 +10316,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:10216: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:10319: 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}:10222: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:10325: testing if the symbol is already defined go no further ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 10225 "configure" ++#line 10328 "configure" + #include "confdefs.h" + #include + int +@@ -10237,16 +10340,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10240: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10343: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10243: \$? = $ac_status" >&5 ++ echo "$as_me:10346: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10246: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10349: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10249: \$? = $ac_status" >&5 ++ echo "$as_me:10352: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_c_source=no + else +@@ -10267,7 +10370,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 10270 "configure" ++#line 10373 "configure" + #include "confdefs.h" + #include + int +@@ -10282,16 +10385,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10285: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10388: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10288: \$? = $ac_status" >&5 ++ echo "$as_me:10391: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10291: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10394: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10294: \$? = $ac_status" >&5 ++ echo "$as_me:10397: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -10302,7 +10405,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + +-echo "${as_me:-configure}:10305: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:10408: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -10310,10 +10413,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:10313: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:10416: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 10316 "configure" ++#line 10419 "configure" + #include "confdefs.h" + #include + int +@@ -10328,16 +10431,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10331: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10434: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10334: \$? = $ac_status" >&5 ++ echo "$as_me:10437: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10337: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10440: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10340: \$? = $ac_status" >&5 ++ echo "$as_me:10443: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -10353,7 +10456,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:10356: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:10459: 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 +@@ -10547,7 +10650,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me:-configure}:10550: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me:-configure}:10653: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" +@@ -10557,7 +10660,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me:-configure}:10560: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me:-configure}:10663: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +@@ -10567,7 +10670,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}:10570: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me:-configure}:10673: 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" +@@ -10577,10 +10680,10 @@ + fi + + if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then +- echo "$as_me:10580: checking if _XOPEN_SOURCE really is set" >&5 ++ echo "$as_me:10683: 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 10583 "configure" ++#line 10686 "configure" + #include "confdefs.h" + #include + int +@@ -10595,16 +10698,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10598: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10701: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10601: \$? = $ac_status" >&5 ++ echo "$as_me:10704: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10604: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10707: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10607: \$? = $ac_status" >&5 ++ echo "$as_me:10710: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_XOPEN_SOURCE_set=yes + else +@@ -10613,12 +10716,12 @@ + cf_XOPEN_SOURCE_set=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:10616: result: $cf_XOPEN_SOURCE_set" >&5 ++ echo "$as_me:10719: 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 10621 "configure" ++#line 10724 "configure" + #include "confdefs.h" + #include + int +@@ -10633,16 +10736,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10636: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10739: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10639: \$? = $ac_status" >&5 ++ echo "$as_me:10742: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10642: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10745: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10645: \$? = $ac_status" >&5 ++ echo "$as_me:10748: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_XOPEN_SOURCE_set_ok=yes + else +@@ -10653,19 +10756,19 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + if test $cf_XOPEN_SOURCE_set_ok = no + then +- { echo "$as_me:10656: WARNING: _XOPEN_SOURCE is lower than requested" >&5 ++ { echo "$as_me:10759: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} + fi + else + +-echo "$as_me:10661: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:10764: 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 10668 "configure" ++#line 10771 "configure" + #include "confdefs.h" + + #include +@@ -10684,16 +10787,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10687: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10790: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10690: \$? = $ac_status" >&5 ++ echo "$as_me:10793: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10693: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10796: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10696: \$? = $ac_status" >&5 ++ echo "$as_me:10799: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xopen_source=no + else +@@ -10705,7 +10808,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >conftest.$ac_ext <<_ACEOF +-#line 10708 "configure" ++#line 10811 "configure" + #include "confdefs.h" + + #include +@@ -10724,16 +10827,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10727: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10830: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10730: \$? = $ac_status" >&5 ++ echo "$as_me:10833: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10733: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10836: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10736: \$? = $ac_status" >&5 ++ echo "$as_me:10839: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xopen_source=no + else +@@ -10748,7 +10851,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:10751: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:10854: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -10871,14 +10974,14 @@ + + # Work around breakage on OS X + +-echo "$as_me:10874: checking if SIGWINCH is defined" >&5 ++echo "$as_me:10977: 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 10881 "configure" ++#line 10984 "configure" + #include "confdefs.h" + + #include +@@ -10893,23 +10996,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10896: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10999: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10899: \$? = $ac_status" >&5 ++ echo "$as_me:11002: \$? = $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:11005: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10905: \$? = $ac_status" >&5 ++ echo "$as_me:11008: \$? = $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 10912 "configure" ++#line 11015 "configure" + #include "confdefs.h" + + #undef _XOPEN_SOURCE +@@ -10927,16 +11030,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10930: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11033: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10933: \$? = $ac_status" >&5 ++ echo "$as_me:11036: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10936: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11039: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10939: \$? = $ac_status" >&5 ++ echo "$as_me:11042: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_define_sigwinch=maybe + else +@@ -10950,11 +11053,11 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:10953: result: $cf_cv_define_sigwinch" >&5 ++echo "$as_me:11056: 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:10957: checking for actual SIGWINCH definition" >&5 ++echo "$as_me:11060: 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 +@@ -10965,7 +11068,7 @@ + while test $cf_sigwinch != 1 + do + cat >conftest.$ac_ext <<_ACEOF +-#line 10968 "configure" ++#line 11071 "configure" + #include "confdefs.h" + + #undef _XOPEN_SOURCE +@@ -10987,16 +11090,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10990: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11093: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10993: \$? = $ac_status" >&5 ++ echo "$as_me:11096: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10996: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11099: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10999: \$? = $ac_status" >&5 ++ echo "$as_me:11102: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_fixup_sigwinch=$cf_sigwinch + break +@@ -11010,7 +11113,7 @@ + done + + fi +-echo "$as_me:11013: result: $cf_cv_fixup_sigwinch" >&5 ++echo "$as_me:11116: result: $cf_cv_fixup_sigwinch" >&5 + echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 + + if test "$cf_cv_fixup_sigwinch" != unknown ; then +@@ -11020,13 +11123,13 @@ + + # Checks for CODESET support. + +-echo "$as_me:11023: checking for nl_langinfo and CODESET" >&5 ++echo "$as_me:11126: 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 11029 "configure" ++#line 11132 "configure" + #include "confdefs.h" + #include + int +@@ -11038,16 +11141,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11041: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11144: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11044: \$? = $ac_status" >&5 ++ echo "$as_me:11147: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11047: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11150: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11050: \$? = $ac_status" >&5 ++ echo "$as_me:11153: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + am_cv_langinfo_codeset=yes + else +@@ -11058,7 +11161,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:11061: result: $am_cv_langinfo_codeset" >&5 ++echo "$as_me:11164: result: $am_cv_langinfo_codeset" >&5 + echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 + if test $am_cv_langinfo_codeset = yes; then + +@@ -11072,7 +11175,7 @@ + NCURSES_OK_WCHAR_T= + NCURSES_OK_WINT_T= + +-echo "$as_me:11075: checking if you want wide-character code" >&5 ++echo "$as_me:11178: 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. +@@ -11082,7 +11185,7 @@ + else + with_widec=no + fi; +-echo "$as_me:11085: result: $with_widec" >&5 ++echo "$as_me:11188: result: $with_widec" >&5 + echo "${ECHO_T}$with_widec" >&6 + + NCURSES_WCWIDTH_GRAPHICS=1 +@@ -11106,23 +11209,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:11109: checking for $ac_header" >&5 ++echo "$as_me:11212: 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 11115 "configure" ++#line 11218 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:11119: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:11222: \"$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:11125: \$? = $ac_status" >&5 ++ echo "$as_me:11228: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -11141,7 +11244,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:11144: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:11247: 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:11257: 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 11161 "configure" ++#line 11264 "configure" + #include "confdefs.h" + + #include +@@ -11180,16 +11283,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11183: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11286: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11186: \$? = $ac_status" >&5 ++ echo "$as_me:11289: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11189: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11292: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11192: \$? = $ac_status" >&5 ++ echo "$as_me:11295: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wchar_h_okay=yes + else +@@ -11199,16 +11302,16 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:11202: result: $cf_cv_wchar_h_okay" >&5 ++echo "$as_me:11305: 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:11208: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 ++echo "$as_me:11311: 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 11211 "configure" ++#line 11314 "configure" + #include "confdefs.h" + #include + +@@ -11224,16 +11327,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11227: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11330: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11230: \$? = $ac_status" >&5 ++ echo "$as_me:11333: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11233: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11336: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11236: \$? = $ac_status" >&5 ++ echo "$as_me:11339: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=no + else +@@ -11242,16 +11345,16 @@ + cf_result=yes + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:11245: result: $cf_result" >&5 ++echo "$as_me:11348: 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:11251: checking checking for compatible value versus " >&5 ++ echo "$as_me:11354: 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 11254 "configure" ++#line 11357 "configure" + #include "confdefs.h" + #include + +@@ -11267,16 +11370,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11270: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11373: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11273: \$? = $ac_status" >&5 ++ echo "$as_me:11376: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11276: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11379: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11279: \$? = $ac_status" >&5 ++ echo "$as_me:11382: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -11285,7 +11388,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:11288: result: $cf_result" >&5 ++ echo "$as_me:11391: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = no ; then + # perhaps we can override it - try... +@@ -11295,7 +11398,7 @@ + + fi + +-echo "$as_me:11298: checking if wcwidth agrees graphics are single-width" >&5 ++echo "$as_me:11401: 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 +@@ -11366,7 +11469,7 @@ + cf_cv_wcwidth_graphics=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 11369 "configure" ++#line 11472 "configure" + #include "confdefs.h" + + #include +@@ -11410,15 +11513,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:11413: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11516: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11416: \$? = $ac_status" >&5 ++ echo "$as_me:11519: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:11418: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11521: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11421: \$? = $ac_status" >&5 ++ echo "$as_me:11524: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wcwidth_graphics=yes + else +@@ -11431,7 +11534,7 @@ + fi + + fi +-echo "$as_me:11434: result: $cf_cv_wcwidth_graphics" >&5 ++echo "$as_me:11537: result: $cf_cv_wcwidth_graphics" >&5 + echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6 + + test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0 +@@ -11442,13 +11545,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:11445: checking for $ac_func" >&5 ++echo "$as_me:11548: 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 11451 "configure" ++#line 11554 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -11479,16 +11582,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11482: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11585: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11485: \$? = $ac_status" >&5 ++ echo "$as_me:11588: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11488: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11591: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11491: \$? = $ac_status" >&5 ++ echo "$as_me:11594: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -11498,7 +11601,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11501: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:11604: 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:11616: 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 +@@ -11518,7 +11621,7 @@ + + cf_save_LIBS="$LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11521 "configure" ++#line 11624 "configure" + #include "confdefs.h" + + #include +@@ -11531,16 +11634,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11534: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11637: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11537: \$? = $ac_status" >&5 ++ echo "$as_me:11640: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11540: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11643: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11543: \$? = $ac_status" >&5 ++ echo "$as_me:11646: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_utf8_lib=yes + else +@@ -11552,12 +11655,12 @@ + cf_cv_header_path_utf8= + cf_cv_library_path_utf8= + +-echo "${as_me:-configure}:11555: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:11658: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 11560 "configure" ++#line 11663 "configure" + #include "confdefs.h" + + #include +@@ -11570,16 +11673,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11573: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11676: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11576: \$? = $ac_status" >&5 ++ echo "$as_me:11679: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11579: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11682: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11582: \$? = $ac_status" >&5 ++ echo "$as_me:11685: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -11593,7 +11696,7 @@ + LIBS="-lutf8 $cf_save_LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 11596 "configure" ++#line 11699 "configure" + #include "confdefs.h" + + #include +@@ -11606,16 +11709,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11609: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11712: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11612: \$? = $ac_status" >&5 ++ echo "$as_me:11715: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11615: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11718: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11618: \$? = $ac_status" >&5 ++ echo "$as_me:11721: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -11632,9 +11735,9 @@ + + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 + +-echo "${as_me:-configure}:11635: testing find linkage for utf8 library ..." 1>&5 ++echo "${as_me:-configure}:11738: testing find linkage for utf8 library ..." 1>&5 + +-echo "${as_me:-configure}:11637: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:11740: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -11725,7 +11828,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}:11728: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:11831: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS" + +@@ -11733,7 +11836,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" + + cat >conftest.$ac_ext <<_ACEOF +-#line 11736 "configure" ++#line 11839 "configure" + #include "confdefs.h" + + #include +@@ -11746,21 +11849,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11749: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11852: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11752: \$? = $ac_status" >&5 ++ echo "$as_me:11855: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11755: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11858: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11758: \$? = $ac_status" >&5 ++ echo "$as_me:11861: \$? = $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}:11763: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:11866: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -11778,7 +11881,7 @@ + + if test "$cf_cv_find_linkage_utf8" = maybe ; then + +-echo "${as_me:-configure}:11781: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:11884: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -11853,13 +11956,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}:11856: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:11959: 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 11862 "configure" ++#line 11965 "configure" + #include "confdefs.h" + + #include +@@ -11872,21 +11975,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11875: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11978: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11878: \$? = $ac_status" >&5 ++ echo "$as_me:11981: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11881: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11984: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11884: \$? = $ac_status" >&5 ++ echo "$as_me:11987: \$? = $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}:11889: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:11992: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=yes + cf_cv_library_file_utf8="-lutf8" +@@ -11928,7 +12031,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11931: result: $cf_cv_utf8_lib" >&5 ++echo "$as_me:12034: 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 +@@ -11966,7 +12069,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +-#line 11969 "configure" ++#line 12072 "configure" + #include "confdefs.h" + #include + int +@@ -11978,16 +12081,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11981: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12084: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11984: \$? = $ac_status" >&5 ++ echo "$as_me:12087: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11987: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12090: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11990: \$? = $ac_status" >&5 ++ echo "$as_me:12093: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -12004,7 +12107,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}:12007: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:12110: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -12040,7 +12143,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}:12043: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:12146: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -12072,14 +12175,14 @@ + fi + + # This is needed on Tru64 5.0 to declare mbstate_t +-echo "$as_me:12075: checking if we must include wchar.h to declare mbstate_t" >&5 ++echo "$as_me:12178: 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 12082 "configure" ++#line 12185 "configure" + #include "confdefs.h" + + #include +@@ -12097,23 +12200,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12100: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12203: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12103: \$? = $ac_status" >&5 ++ echo "$as_me:12206: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12106: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12209: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12109: \$? = $ac_status" >&5 ++ echo "$as_me:12212: \$? = $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 12116 "configure" ++#line 12219 "configure" + #include "confdefs.h" + + #include +@@ -12132,16 +12235,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12135: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12238: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12138: \$? = $ac_status" >&5 ++ echo "$as_me:12241: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12141: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12244: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12144: \$? = $ac_status" >&5 ++ echo "$as_me:12247: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_mbstate_t=yes + else +@@ -12153,7 +12256,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:12156: result: $cf_cv_mbstate_t" >&5 ++echo "$as_me:12259: result: $cf_cv_mbstate_t" >&5 + echo "${ECHO_T}$cf_cv_mbstate_t" >&6 + + if test "$cf_cv_mbstate_t" = yes ; then +@@ -12171,14 +12274,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wchar_t +-echo "$as_me:12174: checking if we must include wchar.h to declare wchar_t" >&5 ++echo "$as_me:12277: 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 12181 "configure" ++#line 12284 "configure" + #include "confdefs.h" + + #include +@@ -12196,23 +12299,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12199: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12302: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12202: \$? = $ac_status" >&5 ++ echo "$as_me:12305: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12205: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12308: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12208: \$? = $ac_status" >&5 ++ echo "$as_me:12311: \$? = $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 12215 "configure" ++#line 12318 "configure" + #include "confdefs.h" + + #include +@@ -12231,16 +12334,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12234: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12337: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12237: \$? = $ac_status" >&5 ++ echo "$as_me:12340: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12240: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12343: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12243: \$? = $ac_status" >&5 ++ echo "$as_me:12346: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wchar_t=yes + else +@@ -12252,7 +12355,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:12255: result: $cf_cv_wchar_t" >&5 ++echo "$as_me:12358: result: $cf_cv_wchar_t" >&5 + echo "${ECHO_T}$cf_cv_wchar_t" >&6 + + if test "$cf_cv_wchar_t" = yes ; then +@@ -12275,14 +12378,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wint_t +-echo "$as_me:12278: checking if we must include wchar.h to declare wint_t" >&5 ++echo "$as_me:12381: 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 12285 "configure" ++#line 12388 "configure" + #include "confdefs.h" + + #include +@@ -12300,23 +12403,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12303: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12406: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12306: \$? = $ac_status" >&5 ++ echo "$as_me:12409: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12309: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12412: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12312: \$? = $ac_status" >&5 ++ echo "$as_me:12415: \$? = $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 12319 "configure" ++#line 12422 "configure" + #include "confdefs.h" + + #include +@@ -12335,16 +12438,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12338: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12441: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12341: \$? = $ac_status" >&5 ++ echo "$as_me:12444: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12344: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12447: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12347: \$? = $ac_status" >&5 ++ echo "$as_me:12450: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wint_t=yes + else +@@ -12356,7 +12459,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:12359: result: $cf_cv_wint_t" >&5 ++echo "$as_me:12462: result: $cf_cv_wint_t" >&5 + echo "${ECHO_T}$cf_cv_wint_t" >&6 + + if test "$cf_cv_wint_t" = yes ; then +@@ -12388,7 +12491,7 @@ + fi + + ### use option --disable-lp64 to allow long chtype +-echo "$as_me:12391: checking whether to enable _LP64 definition in curses.h" >&5 ++echo "$as_me:12494: 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. +@@ -12398,7 +12501,7 @@ + else + with_lp64=$cf_dft_with_lp64 + fi; +-echo "$as_me:12401: result: $with_lp64" >&5 ++echo "$as_me:12504: result: $with_lp64" >&5 + echo "${ECHO_T}$with_lp64" >&6 + + if test "x$with_lp64" = xyes ; then +@@ -12414,7 +12517,7 @@ + fi; + if test "$enable_largefile" != no; then + +- echo "$as_me:12417: checking for special C compiler options needed for large files" >&5 ++ echo "$as_me:12520: 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 +@@ -12426,7 +12529,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 12429 "configure" ++#line 12532 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -12446,16 +12549,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12449: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12552: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12452: \$? = $ac_status" >&5 ++ echo "$as_me:12555: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12455: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12558: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12458: \$? = $ac_status" >&5 ++ echo "$as_me:12561: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -12465,16 +12568,16 @@ + rm -f conftest.$ac_objext + CC="$CC -n32" + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12468: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12571: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12471: \$? = $ac_status" >&5 ++ echo "$as_me:12574: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12474: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12577: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12477: \$? = $ac_status" >&5 ++ echo "$as_me:12580: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_largefile_CC=' -n32'; break + else +@@ -12488,13 +12591,13 @@ + rm -f conftest.$ac_ext + fi + fi +-echo "$as_me:12491: result: $ac_cv_sys_largefile_CC" >&5 ++echo "$as_me:12594: 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:12497: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++ echo "$as_me:12600: 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 +@@ -12502,7 +12605,7 @@ + while :; do + ac_cv_sys_file_offset_bits=no + cat >conftest.$ac_ext <<_ACEOF +-#line 12505 "configure" ++#line 12608 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -12522,16 +12625,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12525: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12628: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12528: \$? = $ac_status" >&5 ++ echo "$as_me:12631: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12531: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12634: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12534: \$? = $ac_status" >&5 ++ echo "$as_me:12637: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -12540,7 +12643,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 12543 "configure" ++#line 12646 "configure" + #include "confdefs.h" + #define _FILE_OFFSET_BITS 64 + #include +@@ -12561,16 +12664,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12564: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12667: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12567: \$? = $ac_status" >&5 ++ echo "$as_me:12670: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12570: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12673: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12573: \$? = $ac_status" >&5 ++ echo "$as_me:12676: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_file_offset_bits=64; break + else +@@ -12581,7 +12684,7 @@ + break + done + fi +-echo "$as_me:12584: result: $ac_cv_sys_file_offset_bits" >&5 ++echo "$as_me:12687: 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 + +@@ -12591,7 +12694,7 @@ + + fi + rm -rf conftest* +- echo "$as_me:12594: checking for _LARGE_FILES value needed for large files" >&5 ++ echo "$as_me:12697: 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 +@@ -12599,7 +12702,7 @@ + while :; do + ac_cv_sys_large_files=no + cat >conftest.$ac_ext <<_ACEOF +-#line 12602 "configure" ++#line 12705 "configure" + #include "confdefs.h" + #include + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -12619,16 +12722,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12622: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12725: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12625: \$? = $ac_status" >&5 ++ echo "$as_me:12728: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12628: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12731: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12631: \$? = $ac_status" >&5 ++ echo "$as_me:12734: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -12637,7 +12740,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 12640 "configure" ++#line 12743 "configure" + #include "confdefs.h" + #define _LARGE_FILES 1 + #include +@@ -12658,16 +12761,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12661: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12764: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12664: \$? = $ac_status" >&5 ++ echo "$as_me:12767: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12667: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12770: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12670: \$? = $ac_status" >&5 ++ echo "$as_me:12773: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_large_files=1; break + else +@@ -12678,7 +12781,7 @@ + break + done + fi +-echo "$as_me:12681: result: $ac_cv_sys_large_files" >&5 ++echo "$as_me:12784: 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 + +@@ -12691,7 +12794,7 @@ + fi + + if test "$enable_largefile" != no ; then +- echo "$as_me:12694: checking for _LARGEFILE_SOURCE value needed for large files" >&5 ++ echo "$as_me:12797: 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 +@@ -12699,7 +12802,7 @@ + while :; do + ac_cv_sys_largefile_source=no + cat >conftest.$ac_ext <<_ACEOF +-#line 12702 "configure" ++#line 12805 "configure" + #include "confdefs.h" + #include + int +@@ -12711,16 +12814,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12714: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12817: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12717: \$? = $ac_status" >&5 ++ echo "$as_me:12820: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12720: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12823: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12723: \$? = $ac_status" >&5 ++ echo "$as_me:12826: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -12729,7 +12832,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 12732 "configure" ++#line 12835 "configure" + #include "confdefs.h" + #define _LARGEFILE_SOURCE 1 + #include +@@ -12742,16 +12845,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12745: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12848: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12748: \$? = $ac_status" >&5 ++ echo "$as_me:12851: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12751: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12854: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12754: \$? = $ac_status" >&5 ++ echo "$as_me:12857: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_largefile_source=1; break + else +@@ -12762,7 +12865,7 @@ + break + done + fi +-echo "$as_me:12765: result: $ac_cv_sys_largefile_source" >&5 ++echo "$as_me:12868: 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 + +@@ -12776,13 +12879,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:12779: checking for fseeko" >&5 ++echo "$as_me:12882: 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 12785 "configure" ++#line 12888 "configure" + #include "confdefs.h" + #include + int +@@ -12794,16 +12897,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12797: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12900: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12800: \$? = $ac_status" >&5 ++ echo "$as_me:12903: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12803: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12906: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12806: \$? = $ac_status" >&5 ++ echo "$as_me:12909: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_fseeko=yes + else +@@ -12813,7 +12916,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:12816: result: $ac_cv_func_fseeko" >&5 ++echo "$as_me:12919: result: $ac_cv_func_fseeko" >&5 + echo "${ECHO_T}$ac_cv_func_fseeko" >&6 + if test $ac_cv_func_fseeko = yes; then + +@@ -12852,14 +12955,14 @@ + + fi + +- echo "$as_me:12855: checking whether to use struct dirent64" >&5 ++ echo "$as_me:12958: 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 12862 "configure" ++#line 12965 "configure" + #include "confdefs.h" + + #pragma GCC diagnostic error "-Wincompatible-pointer-types" +@@ -12881,16 +12984,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12884: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12987: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12887: \$? = $ac_status" >&5 ++ echo "$as_me:12990: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12890: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12993: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12893: \$? = $ac_status" >&5 ++ echo "$as_me:12996: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_struct_dirent64=yes + else +@@ -12901,7 +13004,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:12904: result: $cf_cv_struct_dirent64" >&5 ++echo "$as_me:13007: result: $cf_cv_struct_dirent64" >&5 + echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 + test "$cf_cv_struct_dirent64" = yes && + cat >>confdefs.h <<\EOF +@@ -12911,7 +13014,7 @@ + fi + + ### use option --disable-tparm-varargs to make tparm() conform to X/Open +-echo "$as_me:12914: checking if you want tparm not to use X/Open fixed-parameter list" >&5 ++echo "$as_me:13017: 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. +@@ -12921,14 +13024,14 @@ + else + with_tparm_varargs=yes + fi; +-echo "$as_me:12924: result: $with_tparm_varargs" >&5 ++echo "$as_me:13027: 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:12931: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 ++echo "$as_me:13034: 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. +@@ -12938,14 +13041,14 @@ + else + with_tic_depends=yes + fi; +-echo "$as_me:12941: result: $with_tic_depends" >&5 ++echo "$as_me:13044: 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:12948: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5 ++echo "$as_me:13051: 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. +@@ -12957,15 +13060,15 @@ + fi; + if [ "x$with_wattr_macros" != xyes ]; then + NCURSES_WATTR_MACROS=0 +- echo "$as_me:12960: result: yes" >&5 ++ echo "$as_me:13063: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + NCURSES_WATTR_MACROS=1 +- echo "$as_me:12964: result: no" >&5 ++ echo "$as_me:13067: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:12968: checking for X11 rgb file" >&5 ++echo "$as_me:13071: 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. +@@ -13029,7 +13132,7 @@ + cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:13032: error: expected a pathname, not \"$cf_path\"" >&5 ++ { { echo "$as_me:13135: error: expected a pathname, not \"$cf_path\"" >&5 + echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -13037,7 +13140,7 @@ + + fi + +-echo "$as_me:13040: result: $RGB_PATH" >&5 ++echo "$as_me:13143: result: $RGB_PATH" >&5 + echo "${ECHO_T}$RGB_PATH" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:13157: 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. +@@ -13061,10 +13164,10 @@ + else + NCURSES_BOOL=auto + fi; +-echo "$as_me:13064: result: $NCURSES_BOOL" >&5 ++echo "$as_me:13167: result: $NCURSES_BOOL" >&5 + echo "${ECHO_T}$NCURSES_BOOL" >&6 + +-echo "$as_me:13067: checking for alternate terminal capabilities file" >&5 ++echo "$as_me:13170: 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. +@@ -13075,11 +13178,11 @@ + TERMINFO_CAPS=Caps + fi; + test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps +-echo "$as_me:13078: result: $TERMINFO_CAPS" >&5 ++echo "$as_me:13181: result: $TERMINFO_CAPS" >&5 + echo "${ECHO_T}$TERMINFO_CAPS" >&6 + + ### use option --with-chtype to override chtype's type +-echo "$as_me:13082: checking for type of chtype" >&5 ++echo "$as_me:13185: 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. +@@ -13089,11 +13192,11 @@ + else + NCURSES_CHTYPE=$cf_dft_chtype + fi; +-echo "$as_me:13092: result: $NCURSES_CHTYPE" >&5 ++echo "$as_me:13195: result: $NCURSES_CHTYPE" >&5 + echo "${ECHO_T}$NCURSES_CHTYPE" >&6 + + ### use option --with-ospeed to override ospeed's type +-echo "$as_me:13096: checking for type of ospeed" >&5 ++echo "$as_me:13199: 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. +@@ -13103,11 +13206,11 @@ + else + NCURSES_OSPEED=short + fi; +-echo "$as_me:13106: result: $NCURSES_OSPEED" >&5 ++echo "$as_me:13209: result: $NCURSES_OSPEED" >&5 + echo "${ECHO_T}$NCURSES_OSPEED" >&6 + + ### use option --with-mmask-t to override mmask_t's type +-echo "$as_me:13110: checking for type of mmask_t" >&5 ++echo "$as_me:13213: 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. +@@ -13117,11 +13220,11 @@ + else + NCURSES_MMASK_T=$cf_dft_mmask_t + fi; +-echo "$as_me:13120: result: $NCURSES_MMASK_T" >&5 ++echo "$as_me:13223: 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:13124: checking for size CCHARW_MAX" >&5 ++echo "$as_me:13227: 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. +@@ -13131,16 +13234,16 @@ + else + NCURSES_CCHARW_MAX=5 + fi; +-echo "$as_me:13134: result: $NCURSES_CCHARW_MAX" >&5 ++echo "$as_me:13237: result: $NCURSES_CCHARW_MAX" >&5 + echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6 + +-echo "$as_me:13137: checking for ANSI C header files" >&5 ++echo "$as_me:13240: 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 13143 "configure" ++#line 13246 "configure" + #include "confdefs.h" + #include + #include +@@ -13148,13 +13251,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:13151: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:13254: \"$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:13157: \$? = $ac_status" >&5 ++ echo "$as_me:13260: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -13176,7 +13279,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 13179 "configure" ++#line 13282 "configure" + #include "confdefs.h" + #include + +@@ -13194,7 +13297,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 13197 "configure" ++#line 13300 "configure" + #include "confdefs.h" + #include + +@@ -13215,7 +13318,7 @@ + : + else + cat >conftest.$ac_ext <<_ACEOF +-#line 13218 "configure" ++#line 13321 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -13241,15 +13344,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:13244: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13347: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13247: \$? = $ac_status" >&5 ++ echo "$as_me:13350: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:13249: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13352: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13252: \$? = $ac_status" >&5 ++ echo "$as_me:13355: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -13262,7 +13365,7 @@ + fi + fi + fi +-echo "$as_me:13265: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:13368: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -13278,28 +13381,28 @@ + inttypes.h stdint.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:13281: checking for $ac_header" >&5 ++echo "$as_me:13384: 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 13287 "configure" ++#line 13390 "configure" + #include "confdefs.h" + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13293: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13396: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13296: \$? = $ac_status" >&5 ++ echo "$as_me:13399: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13299: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13402: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13302: \$? = $ac_status" >&5 ++ echo "$as_me:13405: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" + else +@@ -13309,7 +13412,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:13312: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:13415: 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:13425: 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 13328 "configure" ++#line 13431 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -13340,16 +13443,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13343: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13446: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13346: \$? = $ac_status" >&5 ++ echo "$as_me:13449: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13349: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13452: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13352: \$? = $ac_status" >&5 ++ echo "$as_me:13455: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_signed_char=yes + else +@@ -13359,10 +13462,10 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:13362: result: $ac_cv_type_signed_char" >&5 ++echo "$as_me:13465: result: $ac_cv_type_signed_char" >&5 + echo "${ECHO_T}$ac_cv_type_signed_char" >&6 + +-echo "$as_me:13365: checking size of signed char" >&5 ++echo "$as_me:13468: 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 +@@ -13371,7 +13474,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >conftest.$ac_ext <<_ACEOF +-#line 13374 "configure" ++#line 13477 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -13383,21 +13486,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13386: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13489: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13389: \$? = $ac_status" >&5 ++ echo "$as_me:13492: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13392: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13495: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13395: \$? = $ac_status" >&5 ++ echo "$as_me:13498: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 13400 "configure" ++#line 13503 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -13409,16 +13512,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13412: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13515: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13415: \$? = $ac_status" >&5 ++ echo "$as_me:13518: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13418: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13521: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13421: \$? = $ac_status" >&5 ++ echo "$as_me:13524: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break + else +@@ -13434,7 +13537,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 13437 "configure" ++#line 13540 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -13446,16 +13549,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13449: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13552: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13452: \$? = $ac_status" >&5 ++ echo "$as_me:13555: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13455: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13558: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13458: \$? = $ac_status" >&5 ++ echo "$as_me:13561: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break + else +@@ -13471,7 +13574,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 13474 "configure" ++#line 13577 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -13483,16 +13586,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13486: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13589: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13489: \$? = $ac_status" >&5 ++ echo "$as_me:13592: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13492: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13595: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13495: \$? = $ac_status" >&5 ++ echo "$as_me:13598: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid + else +@@ -13505,12 +13608,12 @@ + ac_cv_sizeof_signed_char=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:13508: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:13611: 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 13513 "configure" ++#line 13616 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -13526,15 +13629,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:13529: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13632: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13532: \$? = $ac_status" >&5 ++ echo "$as_me:13635: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:13534: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13637: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13537: \$? = $ac_status" >&5 ++ echo "$as_me:13640: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_signed_char=`cat conftest.val` + else +@@ -13550,7 +13653,7 @@ + ac_cv_sizeof_signed_char=0 + fi + fi +-echo "$as_me:13553: result: $ac_cv_sizeof_signed_char" >&5 ++echo "$as_me:13656: result: $ac_cv_sizeof_signed_char" >&5 + echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:13667: 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. +@@ -13571,12 +13674,12 @@ + else + with_signed_char=no + fi; +-echo "$as_me:13574: result: $with_signed_char" >&5 ++echo "$as_me:13677: 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:13579: checking for type of tparm args" >&5 ++echo "$as_me:13682: 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. +@@ -13586,11 +13689,11 @@ + else + NCURSES_TPARM_ARG=$cf_dft_tparm_arg + fi; +-echo "$as_me:13589: result: $NCURSES_TPARM_ARG" >&5 ++echo "$as_me:13692: result: $NCURSES_TPARM_ARG" >&5 + echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6 + + ### Enable compiling-in rcs id's +-echo "$as_me:13593: checking if RCS identifiers should be compiled-in" >&5 ++echo "$as_me:13696: 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. +@@ -13600,7 +13703,7 @@ + else + with_rcs_ids=no + fi; +-echo "$as_me:13603: result: $with_rcs_ids" >&5 ++echo "$as_me:13706: result: $with_rcs_ids" >&5 + echo "${ECHO_T}$with_rcs_ids" >&6 + test "x$with_rcs_ids" = xyes && + cat >>confdefs.h <<\EOF +@@ -13609,7 +13712,7 @@ + + ############################################################################### + +-echo "$as_me:13612: checking format of man-pages" >&5 ++echo "$as_me:13715: 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. +@@ -13698,14 +13801,14 @@ + ;; + esac + +-echo "$as_me:13701: result: $MANPAGE_FORMAT" >&5 ++echo "$as_me:13804: result: $MANPAGE_FORMAT" >&5 + echo "${ECHO_T}$MANPAGE_FORMAT" >&6 + if test -n "$cf_unknown" ; then +- { echo "$as_me:13704: WARNING: Unexpected manpage-format $cf_unknown" >&5 ++ { echo "$as_me:13807: WARNING: Unexpected manpage-format $cf_unknown" >&5 + echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} + fi + +-echo "$as_me:13708: checking for manpage renaming" >&5 ++echo "$as_me:13811: 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. +@@ -13733,7 +13836,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:13736: error: not a filename: $MANPAGE_RENAMES" >&5 ++ { { echo "$as_me:13839: error: not a filename: $MANPAGE_RENAMES" >&5 + echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -13747,10 +13850,10 @@ + fi + fi + +-echo "$as_me:13750: result: $MANPAGE_RENAMES" >&5 ++echo "$as_me:13853: result: $MANPAGE_RENAMES" >&5 + echo "${ECHO_T}$MANPAGE_RENAMES" >&6 + +-echo "$as_me:13753: checking if manpage aliases will be installed" >&5 ++echo "$as_me:13856: 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. +@@ -13761,7 +13864,7 @@ + MANPAGE_ALIASES=yes + fi; + +-echo "$as_me:13764: result: $MANPAGE_ALIASES" >&5 ++echo "$as_me:13867: result: $MANPAGE_ALIASES" >&5 + echo "${ECHO_T}$MANPAGE_ALIASES" >&6 + + case "x$LN_S" in +@@ -13775,7 +13878,7 @@ + + MANPAGE_SYMLINKS=no + if test "$MANPAGE_ALIASES" = yes ; then +-echo "$as_me:13778: checking if manpage symlinks should be used" >&5 ++echo "$as_me:13881: 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. +@@ -13788,17 +13891,17 @@ + + if test "$$cf_use_symlinks" = no; then + if test "$MANPAGE_SYMLINKS" = yes ; then +- { echo "$as_me:13791: WARNING: cannot make symlinks" >&5 ++ { echo "$as_me:13894: WARNING: cannot make symlinks" >&5 + echo "$as_me: WARNING: cannot make symlinks" >&2;} + MANPAGE_SYMLINKS=no + fi + fi + +-echo "$as_me:13797: result: $MANPAGE_SYMLINKS" >&5 ++echo "$as_me:13900: result: $MANPAGE_SYMLINKS" >&5 + echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 + fi + +-echo "$as_me:13801: checking for manpage tbl" >&5 ++echo "$as_me:13904: 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. +@@ -13809,7 +13912,7 @@ + MANPAGE_TBL=no + fi; + +-echo "$as_me:13812: result: $MANPAGE_TBL" >&5 ++echo "$as_me:13915: result: $MANPAGE_TBL" >&5 + echo "${ECHO_T}$MANPAGE_TBL" >&6 + + if test "$prefix" = "NONE" ; then +@@ -14142,7 +14245,7 @@ + ############################################################################### + + ### Note that some functions (such as const) are normally disabled anyway. +-echo "$as_me:14145: checking if you want to build with function extensions" >&5 ++echo "$as_me:14248: 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. +@@ -14152,7 +14255,7 @@ + else + with_ext_funcs=yes + fi; +-echo "$as_me:14155: result: $with_ext_funcs" >&5 ++echo "$as_me:14258: result: $with_ext_funcs" >&5 + echo "${ECHO_T}$with_ext_funcs" >&6 + if test "x$with_ext_funcs" = xyes ; then + NCURSES_EXT_FUNCS=1 +@@ -14212,7 +14315,7 @@ + GENERATED_EXT_FUNCS= + fi + +-echo "$as_me:14215: checking if you want to build with SCREEN extensions" >&5 ++echo "$as_me:14318: 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. +@@ -14222,7 +14325,7 @@ + else + with_sp_funcs=$cf_dft_ext_spfuncs + fi; +-echo "$as_me:14225: result: $with_sp_funcs" >&5 ++echo "$as_me:14328: result: $with_sp_funcs" >&5 + echo "${ECHO_T}$with_sp_funcs" >&6 + if test "x$with_sp_funcs" = xyes ; then + NCURSES_SP_FUNCS=1 +@@ -14241,7 +14344,7 @@ + GENERATED_SP_FUNCS= + fi + +-echo "$as_me:14244: checking if you want to build with terminal-driver" >&5 ++echo "$as_me:14347: 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. +@@ -14251,7 +14354,7 @@ + else + with_term_driver=no + fi; +-echo "$as_me:14254: result: $with_term_driver" >&5 ++echo "$as_me:14357: result: $with_term_driver" >&5 + echo "${ECHO_T}$with_term_driver" >&6 + if test "x$with_term_driver" = xyes ; then + +@@ -14260,19 +14363,19 @@ + EOF + + if test "x$with_termlib" != xno ; then +- { { echo "$as_me:14263: error: The term-driver option conflicts with the termlib option" >&5 ++ { { echo "$as_me:14366: 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:14268: error: The term-driver option relies upon sp-funcs" >&5 ++ { { echo "$as_me:14371: 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:14275: checking for extended use of const keyword" >&5 ++echo "$as_me:14378: 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. +@@ -14282,7 +14385,7 @@ + else + with_ext_const=$cf_dft_ext_const + fi; +-echo "$as_me:14285: result: $with_ext_const" >&5 ++echo "$as_me:14388: result: $with_ext_const" >&5 + echo "${ECHO_T}$with_ext_const" >&6 + NCURSES_CONST='/*nothing*/' + if test "x$with_ext_const" = xyes ; then +@@ -14290,7 +14393,7 @@ + fi + + ### use option --enable-ext-colors to turn on use of colors beyond 16. +-echo "$as_me:14293: checking if you want to use extended colors" >&5 ++echo "$as_me:14396: 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. +@@ -14300,12 +14403,12 @@ + else + with_ext_colors=$cf_dft_ext_colors + fi; +-echo "$as_me:14303: result: $with_ext_colors" >&5 ++echo "$as_me:14406: 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:14308: WARNING: This option applies only to wide-character library" >&5 ++ { echo "$as_me:14411: 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) +@@ -14315,7 +14418,7 @@ + (5.*) + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 +- { echo "$as_me:14318: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 ++ { echo "$as_me:14421: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} + ;; + esac +@@ -14343,7 +14446,7 @@ + fi + + ### use option --enable-ext-mouse to modify coding to support 5-button mice +-echo "$as_me:14346: checking if you want to use extended mouse encoding" >&5 ++echo "$as_me:14449: 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. +@@ -14353,7 +14456,7 @@ + else + with_ext_mouse=$cf_dft_ext_mouse + fi; +-echo "$as_me:14356: result: $with_ext_mouse" >&5 ++echo "$as_me:14459: result: $with_ext_mouse" >&5 + echo "${ECHO_T}$with_ext_mouse" >&6 + NCURSES_MOUSE_VERSION=1 + if test "x$with_ext_mouse" = xyes ; then +@@ -14364,7 +14467,7 @@ + (5.*) + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 +- { echo "$as_me:14367: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 ++ { echo "$as_me:14470: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} + ;; + esac +@@ -14373,7 +14476,7 @@ + fi + + ### use option --enable-ext-putwin to turn on extended screendumps +-echo "$as_me:14376: checking if you want to use extended putwin/screendump" >&5 ++echo "$as_me:14479: 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. +@@ -14383,7 +14486,7 @@ + else + with_ext_putwin=$cf_dft_ext_putwin + fi; +-echo "$as_me:14386: result: $with_ext_putwin" >&5 ++echo "$as_me:14489: result: $with_ext_putwin" >&5 + echo "${ECHO_T}$with_ext_putwin" >&6 + if test "x$with_ext_putwin" = xyes ; then + +@@ -14393,7 +14496,7 @@ + + fi + +-echo "$as_me:14396: checking if you want \$NCURSES_NO_PADDING code" >&5 ++echo "$as_me:14499: 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. +@@ -14403,7 +14506,7 @@ + else + with_no_padding=$with_ext_funcs + fi; +-echo "$as_me:14406: result: $with_no_padding" >&5 ++echo "$as_me:14509: result: $with_no_padding" >&5 + echo "${ECHO_T}$with_no_padding" >&6 + test "x$with_no_padding" = xyes && + cat >>confdefs.h <<\EOF +@@ -14411,7 +14514,7 @@ + EOF + + ### use option --enable-sigwinch to turn on use of SIGWINCH logic +-echo "$as_me:14414: checking if you want SIGWINCH handler" >&5 ++echo "$as_me:14517: 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. +@@ -14421,7 +14524,7 @@ + else + with_sigwinch=$with_ext_funcs + fi; +-echo "$as_me:14424: result: $with_sigwinch" >&5 ++echo "$as_me:14527: result: $with_sigwinch" >&5 + echo "${ECHO_T}$with_sigwinch" >&6 + test "x$with_sigwinch" = xyes && + cat >>confdefs.h <<\EOF +@@ -14429,7 +14532,7 @@ + EOF + + ### use option --enable-tcap-names to allow user to define new capabilities +-echo "$as_me:14432: checking if you want user-definable terminal capabilities like termcap" >&5 ++echo "$as_me:14535: 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. +@@ -14439,14 +14542,14 @@ + else + with_tcap_names=$with_ext_funcs + fi; +-echo "$as_me:14442: result: $with_tcap_names" >&5 ++echo "$as_me:14545: 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:14449: checking if you want to link with the pthread library" >&5 ++echo "$as_me:14552: 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. +@@ -14456,27 +14559,27 @@ + else + with_pthread=no + fi; +-echo "$as_me:14459: result: $with_pthread" >&5 ++echo "$as_me:14562: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + + if test "$with_pthread" != no ; then +- echo "$as_me:14463: checking for pthread.h" >&5 ++ echo "$as_me:14566: 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 14469 "configure" ++#line 14572 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:14473: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:14576: \"$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:14479: \$? = $ac_status" >&5 ++ echo "$as_me:14582: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -14495,7 +14598,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:14498: result: $ac_cv_header_pthread_h" >&5 ++echo "$as_me:14601: 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 + +@@ -14505,7 +14608,7 @@ + + for cf_lib_pthread in pthread c_r + do +- echo "$as_me:14508: checking if we can link with the $cf_lib_pthread library" >&5 ++ echo "$as_me:14611: 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" + +@@ -14526,7 +14629,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 14529 "configure" ++#line 14632 "configure" + #include "confdefs.h" + + #include +@@ -14543,16 +14646,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14546: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14649: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14549: \$? = $ac_status" >&5 ++ echo "$as_me:14652: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14552: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14655: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14555: \$? = $ac_status" >&5 ++ echo "$as_me:14658: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + with_pthread=yes + else +@@ -14562,7 +14665,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$cf_save_LIBS" +- echo "$as_me:14565: result: $with_pthread" >&5 ++ echo "$as_me:14668: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + test "$with_pthread" = yes && break + done +@@ -14590,7 +14693,7 @@ + EOF + + else +- { { echo "$as_me:14593: error: Cannot link with pthread library" >&5 ++ { { echo "$as_me:14696: error: Cannot link with pthread library" >&5 + echo "$as_me: error: Cannot link with pthread library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -14600,13 +14703,13 @@ + fi + + if test "x$with_pthread" != xno; then +- echo "$as_me:14603: checking for pthread_kill" >&5 ++ echo "$as_me:14706: 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 14609 "configure" ++#line 14712 "configure" + #include "confdefs.h" + #define pthread_kill autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -14637,16 +14740,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14640: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14743: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14643: \$? = $ac_status" >&5 ++ echo "$as_me:14746: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14646: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14749: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14649: \$? = $ac_status" >&5 ++ echo "$as_me:14752: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_pthread_kill=yes + else +@@ -14656,11 +14759,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:14659: result: $ac_cv_func_pthread_kill" >&5 ++echo "$as_me:14762: 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:14663: checking if you want to allow EINTR in wgetch with pthreads" >&5 ++ echo "$as_me:14766: 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. +@@ -14670,7 +14773,7 @@ + else + use_pthreads_eintr=no + fi; +- echo "$as_me:14673: result: $use_pthreads_eintr" >&5 ++ echo "$as_me:14776: result: $use_pthreads_eintr" >&5 + echo "${ECHO_T}$use_pthreads_eintr" >&6 + if test "x$use_pthreads_eintr" = xyes ; then + +@@ -14681,7 +14784,7 @@ + fi + fi + +- echo "$as_me:14684: checking if you want to use weak-symbols for pthreads" >&5 ++ echo "$as_me:14787: 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. +@@ -14691,18 +14794,18 @@ + else + use_weak_symbols=no + fi; +- echo "$as_me:14694: result: $use_weak_symbols" >&5 ++ echo "$as_me:14797: result: $use_weak_symbols" >&5 + echo "${ECHO_T}$use_weak_symbols" >&6 + if test "x$use_weak_symbols" = xyes ; then + +-echo "$as_me:14698: checking if $CC supports weak symbols" >&5 ++echo "$as_me:14801: 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 14705 "configure" ++#line 14808 "configure" + #include "confdefs.h" + + #include +@@ -14728,16 +14831,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14731: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14834: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14734: \$? = $ac_status" >&5 ++ echo "$as_me:14837: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14737: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14840: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14740: \$? = $ac_status" >&5 ++ echo "$as_me:14843: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_weak_symbols=yes + else +@@ -14748,7 +14851,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:14751: result: $cf_cv_weak_symbols" >&5 ++echo "$as_me:14854: result: $cf_cv_weak_symbols" >&5 + echo "${ECHO_T}$cf_cv_weak_symbols" >&6 + + else +@@ -14798,7 +14901,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:14801: checking if you want reentrant code" >&5 ++echo "$as_me:14904: 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. +@@ -14808,7 +14911,7 @@ + else + with_reentrant=no + fi; +-echo "$as_me:14811: result: $with_reentrant" >&5 ++echo "$as_me:14914: result: $with_reentrant" >&5 + echo "${ECHO_T}$with_reentrant" >&6 + if test "x$with_reentrant" = xyes ; then + cf_cv_enable_reentrant=1 +@@ -14896,7 +14999,7 @@ + (5.*) + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 +- { echo "$as_me:14899: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 ++ { echo "$as_me:15002: WARNING: overriding ABI version to $cf_cv_abi_version" >&5 + echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;} + ;; + esac +@@ -14908,7 +15011,7 @@ + NCURSES_SIZE_T=short + fi + +-echo "$as_me:14911: checking if you want opaque curses-library structures" >&5 ++echo "$as_me:15014: 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. +@@ -14930,16 +15033,16 @@ + test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no + + fi; +-echo "$as_me:14933: result: $enable_opaque_curses" >&5 ++echo "$as_me:15036: 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:14938: error: reentrant configuration requires opaque library" >&5 ++{ { echo "$as_me:15041: error: reentrant configuration requires opaque library" >&5 + echo "$as_me: error: reentrant configuration requires opaque library" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:14942: checking if you want opaque form-library structures" >&5 ++echo "$as_me:15045: 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. +@@ -14949,10 +15052,10 @@ + else + enable_opaque_form=no + fi; +-echo "$as_me:14952: result: $enable_opaque_form" >&5 ++echo "$as_me:15055: result: $enable_opaque_form" >&5 + echo "${ECHO_T}$enable_opaque_form" >&6 + +-echo "$as_me:14955: checking if you want opaque menu-library structures" >&5 ++echo "$as_me:15058: 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. +@@ -14962,10 +15065,10 @@ + else + enable_opaque_menu=no + fi; +-echo "$as_me:14965: result: $enable_opaque_menu" >&5 ++echo "$as_me:15068: result: $enable_opaque_menu" >&5 + echo "${ECHO_T}$enable_opaque_menu" >&6 + +-echo "$as_me:14968: checking if you want opaque panel-library structures" >&5 ++echo "$as_me:15071: 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. +@@ -14975,7 +15078,7 @@ + else + enable_opaque_panel=no + fi; +-echo "$as_me:14978: result: $enable_opaque_panel" >&5 ++echo "$as_me:15081: result: $enable_opaque_panel" >&5 + echo "${ECHO_T}$enable_opaque_panel" >&6 + + NCURSES_OPAQUE=0; test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1 +@@ -14985,7 +15088,7 @@ + + ### Allow using a different wrap-prefix + if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then +- echo "$as_me:14988: checking for prefix used to wrap public variables" >&5 ++ echo "$as_me:15091: 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. +@@ -14995,7 +15098,7 @@ + else + NCURSES_WRAP_PREFIX=_nc_ + fi; +- echo "$as_me:14998: result: $NCURSES_WRAP_PREFIX" >&5 ++ echo "$as_me:15101: result: $NCURSES_WRAP_PREFIX" >&5 + echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 + else + NCURSES_WRAP_PREFIX=_nc_ +@@ -15008,7 +15111,7 @@ + ############################################################################### + # These options are relatively safe to experiment with. + +-echo "$as_me:15011: checking if you want all development code" >&5 ++echo "$as_me:15114: 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. +@@ -15018,11 +15121,11 @@ + else + with_develop=no + fi; +-echo "$as_me:15021: result: $with_develop" >&5 ++echo "$as_me:15124: 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:15025: checking if you want hard-tabs code" >&5 ++echo "$as_me:15128: 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. +@@ -15032,7 +15135,7 @@ + else + enable_hard_tabs=$with_develop + fi; +-echo "$as_me:15035: result: $enable_hard_tabs" >&5 ++echo "$as_me:15138: result: $enable_hard_tabs" >&5 + echo "${ECHO_T}$enable_hard_tabs" >&6 + test "x$enable_hard_tabs" = xyes && + cat >>confdefs.h <<\EOF +@@ -15040,7 +15143,7 @@ + EOF + + ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize +-echo "$as_me:15043: checking if you want limited support for xmc" >&5 ++echo "$as_me:15146: 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. +@@ -15050,7 +15153,7 @@ + else + enable_xmc_glitch=$with_develop + fi; +-echo "$as_me:15053: result: $enable_xmc_glitch" >&5 ++echo "$as_me:15156: result: $enable_xmc_glitch" >&5 + echo "${ECHO_T}$enable_xmc_glitch" >&6 + test "x$enable_xmc_glitch" = xyes && + cat >>confdefs.h <<\EOF +@@ -15060,7 +15163,7 @@ + ############################################################################### + # These are just experimental, probably should not be in a package: + +-echo "$as_me:15063: checking if you do not want to assume colors are white-on-black" >&5 ++echo "$as_me:15166: 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. +@@ -15070,7 +15173,7 @@ + else + with_assumed_color=yes + fi; +-echo "$as_me:15073: result: $with_assumed_color" >&5 ++echo "$as_me:15176: result: $with_assumed_color" >&5 + echo "${ECHO_T}$with_assumed_color" >&6 + test "x$with_assumed_color" = xyes && + cat >>confdefs.h <<\EOF +@@ -15078,7 +15181,7 @@ + EOF + + ### use option --enable-hashmap to turn on use of hashmap scrolling logic +-echo "$as_me:15081: checking if you want hashmap scrolling-optimization code" >&5 ++echo "$as_me:15184: 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. +@@ -15088,7 +15191,7 @@ + else + with_hashmap=yes + fi; +-echo "$as_me:15091: result: $with_hashmap" >&5 ++echo "$as_me:15194: result: $with_hashmap" >&5 + echo "${ECHO_T}$with_hashmap" >&6 + test "x$with_hashmap" = xyes && + cat >>confdefs.h <<\EOF +@@ -15096,7 +15199,7 @@ + EOF + + ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment +-echo "$as_me:15099: checking if you want colorfgbg code" >&5 ++echo "$as_me:15202: 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. +@@ -15106,7 +15209,7 @@ + else + with_colorfgbg=no + fi; +-echo "$as_me:15109: result: $with_colorfgbg" >&5 ++echo "$as_me:15212: result: $with_colorfgbg" >&5 + echo "${ECHO_T}$with_colorfgbg" >&6 + test "x$with_colorfgbg" = xyes && + cat >>confdefs.h <<\EOF +@@ -15114,7 +15217,7 @@ + EOF + + ### use option --enable-interop to turn on use of bindings used for interop +-echo "$as_me:15117: checking if you want interop bindings" >&5 ++echo "$as_me:15220: 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. +@@ -15124,13 +15227,13 @@ + else + with_exp_interop=$cf_dft_interop + fi; +-echo "$as_me:15127: result: $with_exp_interop" >&5 ++echo "$as_me:15230: 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:15133: checking if you want experimental safe-sprintf code" >&5 ++echo "$as_me:15236: 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. +@@ -15140,13 +15243,13 @@ + else + with_safe_sprintf=no + fi; +-echo "$as_me:15143: result: $with_safe_sprintf" >&5 ++echo "$as_me:15246: 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:15149: checking if you want to experiment without scrolling-hints code" >&5 ++echo "$as_me:15252: 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. +@@ -15156,7 +15259,7 @@ + else + with_scroll_hints=yes + fi; +-echo "$as_me:15159: result: $with_scroll_hints" >&5 ++echo "$as_me:15262: result: $with_scroll_hints" >&5 + echo "${ECHO_T}$with_scroll_hints" >&6 + test "x$with_scroll_hints" = xyes && + cat >>confdefs.h <<\EOF +@@ -15165,7 +15268,7 @@ + + fi + +-echo "$as_me:15168: checking if you want wgetch-events code" >&5 ++echo "$as_me:15271: 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. +@@ -15175,7 +15278,7 @@ + else + with_wgetch_events=no + fi; +-echo "$as_me:15178: result: $with_wgetch_events" >&5 ++echo "$as_me:15281: result: $with_wgetch_events" >&5 + echo "${ECHO_T}$with_wgetch_events" >&6 + test "x$with_wgetch_events" = xyes && + cat >>confdefs.h <<\EOF +@@ -15186,7 +15289,7 @@ + + ### use option --disable-echo to suppress full display compiling commands + +-echo "$as_me:15189: checking if you want to see long compiling messages" >&5 ++echo "$as_me:15292: 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. +@@ -15220,7 +15323,7 @@ + ECHO_CC='' + + fi; +-echo "$as_me:15223: result: $enableval" >&5 ++echo "$as_me:15326: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + + if test "x$enable_echo" = xyes; then +@@ -15233,7 +15336,7 @@ + + # --disable-stripping is used for debugging + +-echo "$as_me:15236: checking if you want to install stripped executables" >&5 ++echo "$as_me:15339: 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. +@@ -15250,7 +15353,7 @@ + with_stripping=yes + + fi; +-echo "$as_me:15253: result: $with_stripping" >&5 ++echo "$as_me:15356: result: $with_stripping" >&5 + echo "${ECHO_T}$with_stripping" >&6 + + if test "$with_stripping" = yes +@@ -15261,7 +15364,7 @@ + fi + + : ${INSTALL:=install} +-echo "$as_me:15264: checking if install accepts -p option" >&5 ++echo "$as_me:15367: 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 +@@ -15292,10 +15395,10 @@ + rm -rf conftest* + + fi +-echo "$as_me:15295: result: $cf_cv_install_p" >&5 ++echo "$as_me:15398: result: $cf_cv_install_p" >&5 + echo "${ECHO_T}$cf_cv_install_p" >&6 + +-echo "$as_me:15298: checking if install needs to be told about ownership" >&5 ++echo "$as_me:15401: 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) +@@ -15306,7 +15409,7 @@ + ;; + esac + +-echo "$as_me:15309: result: $with_install_o" >&5 ++echo "$as_me:15412: result: $with_install_o" >&5 + echo "${ECHO_T}$with_install_o" >&6 + if test "x$with_install_o" = xyes + then +@@ -15330,7 +15433,7 @@ + fi + + ### use option --enable-warnings to turn on all gcc warnings +-echo "$as_me:15333: checking if you want to see compiler warnings" >&5 ++echo "$as_me:15436: 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. +@@ -15338,118 +15441,16 @@ + enableval="$enable_warnings" + with_warnings=$enableval + fi; +-echo "$as_me:15341: result: $with_warnings" >&5 ++echo "$as_me:15444: result: $with_warnings" >&5 + echo "${ECHO_T}$with_warnings" >&6 + + if test "x$with_warnings" = "xyes"; then + + ADAFLAGS="$ADAFLAGS -gnatg" + +-INTEL_COMPILER=no +- +-if test "$GCC" = yes ; then +- case $host_os in +- (linux*|gnu*) +- 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 15358 "configure" +-#include "confdefs.h" +- +-int +-main (void) +-{ +- +-#ifdef __INTEL_COMPILER +-#else +-make an error +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15375: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:15378: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15381: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:15384: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- INTEL_COMPILER=yes +-cf_save_CFLAGS="$cf_save_CFLAGS -we147" +- +-else +- echo "$as_me: failed program was:" >&5 +-cat conftest.$ac_ext >&5 +-fi +-rm -f conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$cf_save_CFLAGS" +- echo "$as_me:15395: result: $INTEL_COMPILER" >&5 +-echo "${ECHO_T}$INTEL_COMPILER" >&6 +- ;; +- esac +-fi +- +-CLANG_COMPILER=no +- +-if test "$GCC" = yes ; then +- 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 15409 "configure" +-#include "confdefs.h" +- +-int +-main (void) +-{ +- +-#ifdef __clang__ +-#else +-make an error +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15426: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:15429: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15432: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:15435: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- CLANG_COMPILER=yes +-cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" +- +-else +- echo "$as_me: failed program was:" >&5 +-cat conftest.$ac_ext >&5 +-fi +-rm -f conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$cf_save_CFLAGS" +- echo "$as_me: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 15452 "configure" ++#line 15453 "configure" + #include "confdefs.h" + + #include +@@ -15464,26 +15465,26 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15467: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15468: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15470: \$? = $ac_status" >&5 ++ echo "$as_me:15471: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15473: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15474: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15476: \$? = $ac_status" >&5 ++ echo "$as_me:15477: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +-echo "$as_me:15479: checking for X11/Xt const-feature" >&5 ++echo "$as_me:15480: 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 15486 "configure" ++#line 15487 "configure" + #include "confdefs.h" + + #define _CONST_X_STRING /* X11R7.8 (perhaps) */ +@@ -15500,16 +15501,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15503: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15504: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15506: \$? = $ac_status" >&5 ++ echo "$as_me:15507: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15509: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15510: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15512: \$? = $ac_status" >&5 ++ echo "$as_me:15513: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_const_x_string=no +@@ -15524,7 +15525,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:15527: result: $cf_cv_const_x_string" >&5 ++echo "$as_me:15528: result: $cf_cv_const_x_string" >&5 + echo "${ECHO_T}$cf_cv_const_x_string" >&6 + + case $cf_cv_const_x_string in +@@ -15549,7 +15550,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + cat > conftest.$ac_ext <&5 ++ { echo "$as_me:15569: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="-Wall" +@@ -15581,12 +15582,12 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:15584: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:15585: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15587: \$? = $ac_status" >&5 ++ echo "$as_me:15588: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:15589: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:15590: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -15594,7 +15595,7 @@ + CFLAGS="$cf_save_CFLAGS" + elif test "$GCC" = yes + then +- { echo "$as_me:15597: checking for $CC warning options..." >&5 ++ { echo "$as_me:15598: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS= +@@ -15618,12 +15619,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:15621: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:15622: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15624: \$? = $ac_status" >&5 ++ echo "$as_me:15625: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:15626: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:15627: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + case $cf_opt in + (Winline) +@@ -15631,7 +15632,7 @@ + ([34].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:15634: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:15635: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -15641,7 +15642,7 @@ + ([12].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:15644: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:15645: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -15661,12 +15662,12 @@ + if test "$GCC" = yes ; then + case $host_os in + (linux*|gnu*) +- echo "$as_me:15664: checking if this is really Intel C++ compiler" >&5 ++ echo "$as_me:15665: 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 15669 "configure" ++#line 15670 "configure" + #include "confdefs.h" + + int +@@ -15683,16 +15684,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15686: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15687: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15689: \$? = $ac_status" >&5 ++ echo "$as_me:15690: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15692: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15693: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15695: \$? = $ac_status" >&5 ++ echo "$as_me:15696: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + INTEL_CPLUSPLUS=yes + cf_save_CFLAGS="$cf_save_CFLAGS -we147" +@@ -15703,7 +15704,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + CXXFLAGS="$cf_save_CFLAGS" +- echo "$as_me:15706: result: $INTEL_CPLUSPLUS" >&5 ++ echo "$as_me:15707: result: $INTEL_CPLUSPLUS" >&5 + echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 + ;; + esac +@@ -15712,12 +15713,12 @@ + CLANG_CPLUSPLUS=no + + if test "$GCC" = yes ; then +- echo "$as_me:15715: checking if this is really Clang C++ compiler" >&5 ++ echo "$as_me:15716: 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 15720 "configure" ++#line 15721 "configure" + #include "confdefs.h" + + int +@@ -15734,16 +15735,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15737: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15738: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15740: \$? = $ac_status" >&5 ++ echo "$as_me:15741: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15743: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15744: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15746: \$? = $ac_status" >&5 ++ echo "$as_me:15747: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + CLANG_CPLUSPLUS=yes + cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" +@@ -15754,7 +15755,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + CXXFLAGS="$cf_save_CFLAGS" +- echo "$as_me:15757: result: $CLANG_CPLUSPLUS" >&5 ++ echo "$as_me:15758: result: $CLANG_CPLUSPLUS" >&5 + echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 + fi + +@@ -15766,7 +15767,7 @@ + ac_main_return=return + + cat > conftest.$ac_ext <&5 ++ { echo "$as_me:15788: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CXXFLAGS="$CXXFLAGS" + EXTRA_CXXFLAGS="-Wall" +@@ -15801,12 +15802,12 @@ + wd981 + do + CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" +- if { (eval echo "$as_me:15804: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:15805: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15807: \$? = $ac_status" >&5 ++ echo "$as_me:15808: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:15809: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:15810: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" + fi +@@ -15815,7 +15816,7 @@ + + elif test "$GXX" = yes + then +- { echo "$as_me:15818: checking for $CXX warning options..." >&5 ++ { echo "$as_me:15819: checking for $CXX warning options..." >&5 + echo "$as_me: checking for $CXX warning options..." >&6;} + cf_save_CXXFLAGS="$CXXFLAGS" + EXTRA_CXXFLAGS="-W -Wall" +@@ -15845,16 +15846,16 @@ + Wundef $cf_gxx_extra_warnings Wno-unused + do + CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" +- if { (eval echo "$as_me:15848: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:15849: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15851: \$? = $ac_status" >&5 ++ echo "$as_me:15852: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:15853: 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" + else +- test -n "$verbose" && echo "$as_me:15857: result: ... no -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:15858: result: ... no -$cf_opt" >&5 + echo "${ECHO_T}... no -$cf_opt" >&6 + fi + done +@@ -15890,10 +15891,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:15893: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:15894: 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:15946: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15948: \$? = $ac_status" >&5 ++ echo "$as_me:15949: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:15950: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:15951: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case $cf_attribute in +@@ -16006,7 +16007,7 @@ + rm -rf conftest* + fi + +-echo "$as_me:16009: checking if you want to work around bogus compiler/loader warnings" >&5 ++echo "$as_me:16010: 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. +@@ -16016,7 +16017,7 @@ + else + with_string_hacks=no + fi; +-echo "$as_me:16019: result: $with_string_hacks" >&5 ++echo "$as_me:16020: result: $with_string_hacks" >&5 + echo "${ECHO_T}$with_string_hacks" >&6 + + if test "x$with_string_hacks" = "xyes"; then +@@ -16025,15 +16026,15 @@ + #define USE_STRING_HACKS 1 + EOF + +- { echo "$as_me:16028: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 ++ { echo "$as_me:16029: 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:16030: checking for strlcat" >&5 ++ echo "$as_me:16031: 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 16036 "configure" ++#line 16037 "configure" + #include "confdefs.h" + #define strlcat autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -16064,16 +16065,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16067: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16068: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16070: \$? = $ac_status" >&5 ++ echo "$as_me:16071: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16073: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16074: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16076: \$? = $ac_status" >&5 ++ echo "$as_me:16077: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_strlcat=yes + else +@@ -16083,7 +16084,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:16086: result: $ac_cv_func_strlcat" >&5 ++echo "$as_me:16087: result: $ac_cv_func_strlcat" >&5 + echo "${ECHO_T}$ac_cv_func_strlcat" >&6 + if test $ac_cv_func_strlcat = yes; then + +@@ -16093,7 +16094,7 @@ + + else + +- echo "$as_me:16096: checking for strlcat in -lbsd" >&5 ++ echo "$as_me:16097: 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 +@@ -16101,7 +16102,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 16104 "configure" ++#line 16105 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16120,16 +16121,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16123: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16124: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16126: \$? = $ac_status" >&5 ++ echo "$as_me:16127: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16129: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16130: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16132: \$? = $ac_status" >&5 ++ echo "$as_me:16133: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_strlcat=yes + else +@@ -16140,7 +16141,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16143: result: $ac_cv_lib_bsd_strlcat" >&5 ++echo "$as_me:16144: 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 + +@@ -16163,23 +16164,23 @@ + for ac_header in bsd/string.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:16166: checking for $ac_header" >&5 ++echo "$as_me:16167: 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 16172 "configure" ++#line 16173 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:16176: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:16177: \"$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:16182: \$? = $ac_status" >&5 ++ echo "$as_me:16183: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16198,7 +16199,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:16201: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:16202: 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:16223: 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 16228 "configure" ++#line 16229 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -16256,16 +16257,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16259: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16260: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16262: \$? = $ac_status" >&5 ++ echo "$as_me:16263: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16265: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16266: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16268: \$? = $ac_status" >&5 ++ echo "$as_me:16269: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -16275,7 +16276,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:16278: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:16279: 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:16292: 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. +@@ -16298,7 +16299,7 @@ + else + with_assertions=no + fi; +-echo "$as_me:16301: result: $with_assertions" >&5 ++echo "$as_me:16302: result: $with_assertions" >&5 + echo "${ECHO_T}$with_assertions" >&6 + if test -n "$GCC" + then +@@ -16314,7 +16315,7 @@ + + ### use option --disable-leaks to suppress "permanent" leaks, for testing + +-echo "$as_me:16317: checking if you want to use dmalloc for testing" >&5 ++echo "$as_me:16318: 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. +@@ -16331,7 +16332,7 @@ + else + with_dmalloc= + fi; +-echo "$as_me:16334: result: ${with_dmalloc:-no}" >&5 ++echo "$as_me:16335: result: ${with_dmalloc:-no}" >&5 + echo "${ECHO_T}${with_dmalloc:-no}" >&6 + + case .$with_cflags in +@@ -16445,23 +16446,23 @@ + esac + + if test "$with_dmalloc" = yes ; then +- echo "$as_me:16448: checking for dmalloc.h" >&5 ++ echo "$as_me:16449: 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 16454 "configure" ++#line 16455 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:16458: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:16459: \"$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:16464: \$? = $ac_status" >&5 ++ echo "$as_me:16465: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16480,11 +16481,11 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:16483: result: $ac_cv_header_dmalloc_h" >&5 ++echo "$as_me:16484: 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:16487: checking for dmalloc_debug in -ldmalloc" >&5 ++echo "$as_me:16488: 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 +@@ -16492,7 +16493,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldmalloc $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 16495 "configure" ++#line 16496 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16511,16 +16512,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16514: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16515: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16517: \$? = $ac_status" >&5 ++ echo "$as_me:16518: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16520: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16521: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16523: \$? = $ac_status" >&5 ++ echo "$as_me:16524: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dmalloc_dmalloc_debug=yes + else +@@ -16531,7 +16532,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16534: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 ++echo "$as_me:16535: 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:16550: 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. +@@ -16563,7 +16564,7 @@ + else + with_dbmalloc= + fi; +-echo "$as_me:16566: result: ${with_dbmalloc:-no}" >&5 ++echo "$as_me:16567: result: ${with_dbmalloc:-no}" >&5 + echo "${ECHO_T}${with_dbmalloc:-no}" >&6 + + case .$with_cflags in +@@ -16677,23 +16678,23 @@ + esac + + if test "$with_dbmalloc" = yes ; then +- echo "$as_me:16680: checking for dbmalloc.h" >&5 ++ echo "$as_me:16681: 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 16686 "configure" ++#line 16687 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:16690: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:16691: \"$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:16696: \$? = $ac_status" >&5 ++ echo "$as_me:16697: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16712,11 +16713,11 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:16715: result: $ac_cv_header_dbmalloc_h" >&5 ++echo "$as_me:16716: 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:16719: checking for debug_malloc in -ldbmalloc" >&5 ++echo "$as_me:16720: 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 +@@ -16724,7 +16725,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldbmalloc $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 16727 "configure" ++#line 16728 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16743,16 +16744,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16746: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16747: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16749: \$? = $ac_status" >&5 ++ echo "$as_me:16750: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16752: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16753: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16755: \$? = $ac_status" >&5 ++ echo "$as_me:16756: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dbmalloc_debug_malloc=yes + else +@@ -16763,7 +16764,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16766: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 ++echo "$as_me:16767: 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:16782: 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. +@@ -16795,7 +16796,7 @@ + else + with_valgrind= + fi; +-echo "$as_me:16798: result: ${with_valgrind:-no}" >&5 ++echo "$as_me:16799: result: ${with_valgrind:-no}" >&5 + echo "${ECHO_T}${with_valgrind:-no}" >&6 + + case .$with_cflags in +@@ -16908,7 +16909,7 @@ + ;; + esac + +-echo "$as_me:16911: checking if you want to perform memory-leak testing" >&5 ++echo "$as_me:16912: 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. +@@ -16918,7 +16919,7 @@ + else + : ${with_no_leaks:=no} + fi; +-echo "$as_me:16921: result: $with_no_leaks" >&5 ++echo "$as_me:16922: result: $with_no_leaks" >&5 + echo "${ECHO_T}$with_no_leaks" >&6 + + if test "$with_no_leaks" = yes ; then +@@ -16970,7 +16971,7 @@ + ;; + esac + +-echo "$as_me:16973: checking whether to add trace feature to all models" >&5 ++echo "$as_me:16974: 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. +@@ -16980,7 +16981,7 @@ + else + cf_with_trace=$cf_all_traces + fi; +-echo "$as_me:16983: result: $cf_with_trace" >&5 ++echo "$as_me:16984: result: $cf_with_trace" >&5 + echo "${ECHO_T}$cf_with_trace" >&6 + + if test "x$cf_with_trace" = xyes ; then +@@ -17094,7 +17095,7 @@ + ADA_TRACE=FALSE + fi + +-echo "$as_me:17097: checking if we want to use GNAT projects" >&5 ++echo "$as_me:17098: 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. +@@ -17111,7 +17112,7 @@ + enable_gnat_projects=yes + + fi; +-echo "$as_me:17114: result: $enable_gnat_projects" >&5 ++echo "$as_me:17115: result: $enable_gnat_projects" >&5 + echo "${ECHO_T}$enable_gnat_projects" >&6 + + ### Checks for libraries. +@@ -17121,13 +17122,13 @@ + LIBS=" -lpsapi $LIBS" + ;; + (*) +-echo "$as_me:17124: checking for gettimeofday" >&5 ++echo "$as_me:17125: 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 17130 "configure" ++#line 17131 "configure" + #include "confdefs.h" + #define gettimeofday autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -17158,16 +17159,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17161: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17162: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17164: \$? = $ac_status" >&5 ++ echo "$as_me:17165: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17167: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17168: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17170: \$? = $ac_status" >&5 ++ echo "$as_me:17171: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gettimeofday=yes + else +@@ -17177,7 +17178,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:17180: result: $ac_cv_func_gettimeofday" >&5 ++echo "$as_me:17181: result: $ac_cv_func_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 + if test $ac_cv_func_gettimeofday = yes; then + +@@ -17187,7 +17188,7 @@ + + else + +-echo "$as_me:17190: checking for gettimeofday in -lbsd" >&5 ++echo "$as_me:17191: 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 +@@ -17195,7 +17196,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 17198 "configure" ++#line 17199 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -17214,16 +17215,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17217: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17218: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17220: \$? = $ac_status" >&5 ++ echo "$as_me:17221: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17223: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17224: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17226: \$? = $ac_status" >&5 ++ echo "$as_me:17227: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_gettimeofday=yes + else +@@ -17234,7 +17235,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:17237: result: $ac_cv_lib_bsd_gettimeofday" >&5 ++echo "$as_me:17238: 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 + +@@ -17264,14 +17265,14 @@ + ;; + esac + +-echo "$as_me:17267: checking if -lm needed for math functions" >&5 ++echo "$as_me:17268: 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 17274 "configure" ++#line 17275 "configure" + #include "confdefs.h" + + #include +@@ -17287,16 +17288,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17290: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17291: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17293: \$? = $ac_status" >&5 ++ echo "$as_me:17294: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17296: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17297: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17299: \$? = $ac_status" >&5 ++ echo "$as_me:17300: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_need_libm=no + else +@@ -17306,7 +17307,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:17309: result: $cf_cv_need_libm" >&5 ++echo "$as_me:17310: result: $cf_cv_need_libm" >&5 + echo "${ECHO_T}$cf_cv_need_libm" >&6 + if test "$cf_cv_need_libm" = yes + then +@@ -17314,13 +17315,13 @@ + fi + + ### Checks for header files. +-echo "$as_me:17317: checking for ANSI C header files" >&5 ++echo "$as_me:17318: 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 17323 "configure" ++#line 17324 "configure" + #include "confdefs.h" + #include + #include +@@ -17328,13 +17329,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:17331: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:17332: \"$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:17337: \$? = $ac_status" >&5 ++ echo "$as_me:17338: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -17356,7 +17357,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 17359 "configure" ++#line 17360 "configure" + #include "confdefs.h" + #include + +@@ -17374,7 +17375,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 17377 "configure" ++#line 17378 "configure" + #include "confdefs.h" + #include + +@@ -17395,7 +17396,7 @@ + : + else + cat >conftest.$ac_ext <<_ACEOF +-#line 17398 "configure" ++#line 17399 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -17421,15 +17422,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:17424: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17425: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17427: \$? = $ac_status" >&5 ++ echo "$as_me:17428: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:17429: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17430: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17432: \$? = $ac_status" >&5 ++ echo "$as_me:17433: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -17442,7 +17443,7 @@ + fi + fi + fi +-echo "$as_me:17445: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:17446: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -17455,13 +17456,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:17458: checking for $ac_hdr that defines DIR" >&5 ++echo "$as_me:17459: 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 17464 "configure" ++#line 17465 "configure" + #include "confdefs.h" + #include + #include <$ac_hdr> +@@ -17476,16 +17477,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17479: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17480: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17482: \$? = $ac_status" >&5 ++ echo "$as_me:17483: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17485: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17486: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17488: \$? = $ac_status" >&5 ++ echo "$as_me:17489: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" + else +@@ -17495,7 +17496,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:17498: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:17499: 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:17512: 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 +@@ -17516,7 +17517,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldir $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 17519 "configure" ++#line 17520 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -17535,16 +17536,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17538: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17539: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17541: \$? = $ac_status" >&5 ++ echo "$as_me:17542: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17544: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17545: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17547: \$? = $ac_status" >&5 ++ echo "$as_me:17548: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dir_opendir=yes + else +@@ -17555,14 +17556,14 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:17558: result: $ac_cv_lib_dir_opendir" >&5 ++echo "$as_me:17559: 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:17565: checking for opendir in -lx" >&5 ++ echo "$as_me:17566: 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 +@@ -17570,7 +17571,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lx $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 17573 "configure" ++#line 17574 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -17589,16 +17590,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17592: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17593: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17595: \$? = $ac_status" >&5 ++ echo "$as_me:17596: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17598: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17599: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17601: \$? = $ac_status" >&5 ++ echo "$as_me:17602: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_x_opendir=yes + else +@@ -17609,7 +17610,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:17612: result: $ac_cv_lib_x_opendir" >&5 ++echo "$as_me:17613: 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" +@@ -17617,13 +17618,13 @@ + + fi + +-echo "$as_me:17620: checking whether time.h and sys/time.h may both be included" >&5 ++echo "$as_me:17621: 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 17626 "configure" ++#line 17627 "configure" + #include "confdefs.h" + #include + #include +@@ -17639,16 +17640,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17642: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17643: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17645: \$? = $ac_status" >&5 ++ echo "$as_me:17646: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17648: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17649: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17651: \$? = $ac_status" >&5 ++ echo "$as_me:17652: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_time=yes + else +@@ -17658,7 +17659,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:17661: result: $ac_cv_header_time" >&5 ++echo "$as_me:17662: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -17677,13 +17678,13 @@ + ;; + esac + +-echo "$as_me:17680: checking for regcomp" >&5 ++echo "$as_me:17681: 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 17686 "configure" ++#line 17687 "configure" + #include "confdefs.h" + #define regcomp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -17714,16 +17715,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17717: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17718: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17720: \$? = $ac_status" >&5 ++ echo "$as_me:17721: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17723: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17724: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17726: \$? = $ac_status" >&5 ++ echo "$as_me:17727: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_regcomp=yes + else +@@ -17733,7 +17734,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:17736: result: $ac_cv_func_regcomp" >&5 ++echo "$as_me:17737: 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 +@@ -17742,7 +17743,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:17745: checking for regcomp in -l$cf_regex_lib" >&5 ++echo "$as_me:17746: 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 +@@ -17750,7 +17751,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$cf_regex_lib $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 17753 "configure" ++#line 17754 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -17769,16 +17770,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17772: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17773: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17775: \$? = $ac_status" >&5 ++ echo "$as_me:17776: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17778: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17779: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17781: \$? = $ac_status" >&5 ++ echo "$as_me:17782: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -17789,7 +17790,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:17792: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "$as_me:17793: 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 + +@@ -17818,13 +17819,13 @@ + fi + + if test "$cf_regex_func" = no ; then +- echo "$as_me:17821: checking for compile" >&5 ++ echo "$as_me:17822: 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 17827 "configure" ++#line 17828 "configure" + #include "confdefs.h" + #define compile autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -17855,16 +17856,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17858: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17859: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17861: \$? = $ac_status" >&5 ++ echo "$as_me:17862: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17864: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17865: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17867: \$? = $ac_status" >&5 ++ echo "$as_me:17868: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_compile=yes + else +@@ -17874,13 +17875,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:17877: result: $ac_cv_func_compile" >&5 ++echo "$as_me:17878: 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:17883: checking for compile in -lgen" >&5 ++ echo "$as_me:17884: 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 +@@ -17888,7 +17889,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgen $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 17891 "configure" ++#line 17892 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -17907,16 +17908,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17910: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17911: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17913: \$? = $ac_status" >&5 ++ echo "$as_me:17914: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17916: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17917: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17919: \$? = $ac_status" >&5 ++ echo "$as_me:17920: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gen_compile=yes + else +@@ -17927,7 +17928,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:17930: result: $ac_cv_lib_gen_compile" >&5 ++echo "$as_me:17931: 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 + +@@ -17955,11 +17956,11 @@ + fi + + if test "$cf_regex_func" = no ; then +- { echo "$as_me:17958: WARNING: cannot find regular expression library" >&5 ++ { echo "$as_me:17959: WARNING: cannot find regular expression library" >&5 + echo "$as_me: WARNING: cannot find regular expression library" >&2;} + fi + +-echo "$as_me:17962: checking for regular-expression headers" >&5 ++echo "$as_me:17963: 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 +@@ -17971,7 +17972,7 @@ + for cf_regex_hdr in regexp.h regexpr.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 17974 "configure" ++#line 17975 "configure" + #include "confdefs.h" + #include <$cf_regex_hdr> + int +@@ -17986,16 +17987,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17989: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17990: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17992: \$? = $ac_status" >&5 ++ echo "$as_me:17993: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17995: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17996: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17998: \$? = $ac_status" >&5 ++ echo "$as_me:17999: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_regex_hdrs=$cf_regex_hdr +@@ -18012,7 +18013,7 @@ + for cf_regex_hdr in regex.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 18015 "configure" ++#line 18016 "configure" + #include "confdefs.h" + #include + #include <$cf_regex_hdr> +@@ -18030,16 +18031,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18033: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18034: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18036: \$? = $ac_status" >&5 ++ echo "$as_me:18037: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18039: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18040: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18042: \$? = $ac_status" >&5 ++ echo "$as_me:18043: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_regex_hdrs=$cf_regex_hdr +@@ -18055,11 +18056,11 @@ + esac + + fi +-echo "$as_me:18058: result: $cf_cv_regex_hdrs" >&5 ++echo "$as_me:18059: result: $cf_cv_regex_hdrs" >&5 + echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 + + case $cf_cv_regex_hdrs in +- (no) { echo "$as_me:18062: WARNING: no regular expression header found" >&5 ++ (no) { echo "$as_me:18063: WARNING: no regular expression header found" >&5 + echo "$as_me: WARNING: no regular expression header found" >&2;} ;; + (regex.h) + cat >>confdefs.h <<\EOF +@@ -18098,23 +18099,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:18101: checking for $ac_header" >&5 ++echo "$as_me:18102: 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 18107 "configure" ++#line 18108 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:18111: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:18112: \"$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:18117: \$? = $ac_status" >&5 ++ echo "$as_me:18118: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -18133,7 +18134,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:18136: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:18137: 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: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 18155 "configure" ++#line 18156 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:18159: \"$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:18165: \$? = $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 +@@ -18181,7 +18182,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:18184: 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:18195: 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 +@@ -18201,7 +18202,7 @@ + for cf_header in stdio.h stdlib.h unistd.h getopt.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 18204 "configure" ++#line 18205 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -18214,16 +18215,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18217: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18218: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18220: \$? = $ac_status" >&5 ++ echo "$as_me:18221: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18223: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18224: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18226: \$? = $ac_status" >&5 ++ echo "$as_me:18227: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_getopt_header=$cf_header + break +@@ -18235,7 +18236,7 @@ + done + + fi +-echo "$as_me:18238: result: $cf_cv_getopt_header" >&5 ++echo "$as_me:18239: result: $cf_cv_getopt_header" >&5 + echo "${ECHO_T}$cf_cv_getopt_header" >&6 + if test $cf_cv_getopt_header != none ; then + +@@ -18252,14 +18253,14 @@ + + fi + +-echo "$as_me:18255: checking if external environ is declared" >&5 ++echo "$as_me:18256: 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 18262 "configure" ++#line 18263 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -18275,16 +18276,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18278: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18279: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18281: \$? = $ac_status" >&5 ++ echo "$as_me:18282: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18284: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18285: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18287: \$? = $ac_status" >&5 ++ echo "$as_me:18288: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_dcl_environ=yes + else +@@ -18295,7 +18296,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:18298: result: $cf_cv_dcl_environ" >&5 ++echo "$as_me:18299: result: $cf_cv_dcl_environ" >&5 + echo "${ECHO_T}$cf_cv_dcl_environ" >&6 + + if test "$cf_cv_dcl_environ" = no ; then +@@ -18310,14 +18311,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:18313: checking if external environ exists" >&5 ++echo "$as_me:18314: 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 18320 "configure" ++#line 18321 "configure" + #include "confdefs.h" + + #undef environ +@@ -18332,16 +18333,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18335: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18336: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18338: \$? = $ac_status" >&5 ++ echo "$as_me:18339: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18341: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18342: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18344: \$? = $ac_status" >&5 ++ echo "$as_me:18345: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_environ=yes + else +@@ -18352,7 +18353,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:18355: result: $cf_cv_have_environ" >&5 ++echo "$as_me:18356: result: $cf_cv_have_environ" >&5 + echo "${ECHO_T}$cf_cv_have_environ" >&6 + + if test "$cf_cv_have_environ" = yes ; then +@@ -18365,13 +18366,13 @@ + + fi + +-echo "$as_me:18368: checking for getenv" >&5 ++echo "$as_me:18369: 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 18374 "configure" ++#line 18375 "configure" + #include "confdefs.h" + #define getenv autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -18402,16 +18403,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18405: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18406: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18408: \$? = $ac_status" >&5 ++ echo "$as_me:18409: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18411: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18412: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18414: \$? = $ac_status" >&5 ++ echo "$as_me:18415: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_getenv=yes + else +@@ -18421,19 +18422,19 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:18424: result: $ac_cv_func_getenv" >&5 ++echo "$as_me:18425: 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:18430: checking for $ac_func" >&5 ++echo "$as_me:18431: 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 18436 "configure" ++#line 18437 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -18464,16 +18465,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18467: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18468: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18470: \$? = $ac_status" >&5 ++ echo "$as_me:18471: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18473: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18474: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18476: \$? = $ac_status" >&5 ++ echo "$as_me:18477: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -18483,7 +18484,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:18486: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:18487: 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:18497: 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 +@@ -18503,7 +18504,7 @@ + cf_cv_consistent_getenv=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 18506 "configure" ++#line 18507 "configure" + #include "confdefs.h" + + #include +@@ -18612,15 +18613,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:18615: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18616: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18618: \$? = $ac_status" >&5 ++ echo "$as_me:18619: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:18620: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18621: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18623: \$? = $ac_status" >&5 ++ echo "$as_me:18624: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_consistent_getenv=yes + else +@@ -18633,7 +18634,7 @@ + fi + + fi +-echo "$as_me:18636: result: $cf_cv_consistent_getenv" >&5 ++echo "$as_me:18637: result: $cf_cv_consistent_getenv" >&5 + echo "${ECHO_T}$cf_cv_consistent_getenv" >&6 + + if test "x$cf_cv_consistent_getenv" = xno +@@ -18648,7 +18649,7 @@ + if test "x$cf_cv_consistent_getenv" = xno && \ + test "x$cf_with_trace" = xyes + then +- { echo "$as_me:18651: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5 ++ { echo "$as_me:18652: 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 + +@@ -18656,7 +18657,7 @@ + # Note: even non-Posix ISC needs to declare fd_set + if test "x$ISC" = xyes ; then + +-echo "$as_me:18659: checking for main in -lcposix" >&5 ++echo "$as_me:18660: 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 +@@ -18664,7 +18665,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lcposix $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 18667 "configure" ++#line 18668 "configure" + #include "confdefs.h" + + int +@@ -18676,16 +18677,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18679: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18680: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18682: \$? = $ac_status" >&5 ++ echo "$as_me:18683: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18685: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18686: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18688: \$? = $ac_status" >&5 ++ echo "$as_me:18689: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_cposix_main=yes + else +@@ -18696,7 +18697,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:18699: result: $ac_cv_lib_cposix_main" >&5 ++echo "$as_me:18700: 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:18711: 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 +@@ -18715,7 +18716,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-linet $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 18718 "configure" ++#line 18719 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -18734,16 +18735,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18737: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18738: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18740: \$? = $ac_status" >&5 ++ echo "$as_me:18741: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18743: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18744: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18746: \$? = $ac_status" >&5 ++ echo "$as_me:18747: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_inet_bzero=yes + else +@@ -18754,7 +18755,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:18757: result: $ac_cv_lib_inet_bzero" >&5 ++echo "$as_me:18758: 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 + +@@ -18777,14 +18778,14 @@ + fi + fi + +-echo "$as_me:18780: checking if sys/time.h works with sys/select.h" >&5 ++echo "$as_me:18781: 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 18787 "configure" ++#line 18788 "configure" + #include "confdefs.h" + + #include +@@ -18804,16 +18805,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18807: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18808: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18810: \$? = $ac_status" >&5 ++ echo "$as_me:18811: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18813: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18814: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18816: \$? = $ac_status" >&5 ++ echo "$as_me:18817: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sys_time_select=yes + else +@@ -18825,7 +18826,7 @@ + + fi + +-echo "$as_me:18828: result: $cf_cv_sys_time_select" >&5 ++echo "$as_me:18829: 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 +@@ -18840,13 +18841,13 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return=return + +-echo "$as_me:18843: checking for an ANSI C-conforming const" >&5 ++echo "$as_me:18844: 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 18849 "configure" ++#line 18850 "configure" + #include "confdefs.h" + + int +@@ -18904,16 +18905,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18907: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18908: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18910: \$? = $ac_status" >&5 ++ echo "$as_me:18911: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18913: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18914: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18916: \$? = $ac_status" >&5 ++ echo "$as_me:18917: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_const=yes + else +@@ -18923,7 +18924,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:18926: result: $ac_cv_c_const" >&5 ++echo "$as_me:18927: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 + if test $ac_cv_c_const = no; then + +@@ -18933,7 +18934,7 @@ + + fi + +-echo "$as_me:18936: checking for inline" >&5 ++echo "$as_me:18937: 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 +@@ -18941,7 +18942,7 @@ + ac_cv_c_inline=no + for ac_kw in inline __inline__ __inline; do + cat >conftest.$ac_ext <<_ACEOF +-#line 18944 "configure" ++#line 18945 "configure" + #include "confdefs.h" + #ifndef __cplusplus + static $ac_kw int static_foo () {return 0; } +@@ -18950,16 +18951,16 @@ + + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18953: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18954: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18956: \$? = $ac_status" >&5 ++ echo "$as_me:18957: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18959: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18960: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18962: \$? = $ac_status" >&5 ++ echo "$as_me:18963: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_inline=$ac_kw; break + else +@@ -18970,7 +18971,7 @@ + done + + fi +-echo "$as_me:18973: result: $ac_cv_c_inline" >&5 ++echo "$as_me:18974: result: $ac_cv_c_inline" >&5 + echo "${ECHO_T}$ac_cv_c_inline" >&6 + case $ac_cv_c_inline in + inline | yes) ;; +@@ -18996,7 +18997,7 @@ + : + elif test "$GCC" = yes + then +- echo "$as_me:18999: checking if $CC supports options to tune inlining" >&5 ++ echo "$as_me:19000: 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 +@@ -19005,7 +19006,7 @@ + cf_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS --param max-inline-insns-single=1200" + cat >conftest.$ac_ext <<_ACEOF +-#line 19008 "configure" ++#line 19009 "configure" + #include "confdefs.h" + inline int foo(void) { return 1; } + int +@@ -19017,16 +19018,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19020: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19021: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19023: \$? = $ac_status" >&5 ++ echo "$as_me:19024: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19026: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19027: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19029: \$? = $ac_status" >&5 ++ echo "$as_me:19030: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gcc_inline=yes + else +@@ -19038,7 +19039,7 @@ + CFLAGS=$cf_save_CFLAGS + + fi +-echo "$as_me:19041: result: $cf_cv_gcc_inline" >&5 ++echo "$as_me:19042: result: $cf_cv_gcc_inline" >&5 + echo "${ECHO_T}$cf_cv_gcc_inline" >&6 + if test "$cf_cv_gcc_inline" = yes ; then + +@@ -19144,7 +19145,7 @@ + fi + fi + +-echo "$as_me:19147: checking for signal global datatype" >&5 ++echo "$as_me:19148: 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 +@@ -19156,7 +19157,7 @@ + "int" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 19159 "configure" ++#line 19160 "configure" + #include "confdefs.h" + + #include +@@ -19179,16 +19180,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19182: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19183: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19185: \$? = $ac_status" >&5 ++ echo "$as_me:19186: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19188: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19189: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19191: \$? = $ac_status" >&5 ++ echo "$as_me:19192: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sig_atomic_t=$cf_type + else +@@ -19202,7 +19203,7 @@ + + fi + +-echo "$as_me:19205: result: $cf_cv_sig_atomic_t" >&5 ++echo "$as_me:19206: 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:19215: 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 +@@ -19221,7 +19222,7 @@ + cf_cv_typeof_chtype=long + else + cat >conftest.$ac_ext <<_ACEOF +-#line 19224 "configure" ++#line 19225 "configure" + #include "confdefs.h" + + #define WANT_BITS 31 +@@ -19256,15 +19257,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:19259: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19260: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19262: \$? = $ac_status" >&5 ++ echo "$as_me:19263: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:19264: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19265: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19267: \$? = $ac_status" >&5 ++ echo "$as_me:19268: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_typeof_chtype=`cat cf_test.out` + else +@@ -19279,7 +19280,7 @@ + + fi + +-echo "$as_me:19282: result: $cf_cv_typeof_chtype" >&5 ++echo "$as_me:19283: result: $cf_cv_typeof_chtype" >&5 + echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:19295: 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 19301 "configure" ++#line 19302 "configure" + #include "confdefs.h" + + int +@@ -19310,16 +19311,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19313: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19314: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19316: \$? = $ac_status" >&5 ++ echo "$as_me:19317: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19319: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19320: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19322: \$? = $ac_status" >&5 ++ echo "$as_me:19323: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_unsigned_literals=yes + else +@@ -19331,7 +19332,7 @@ + + fi + +-echo "$as_me:19334: result: $cf_cv_unsigned_literals" >&5 ++echo "$as_me:19335: result: $cf_cv_unsigned_literals" >&5 + echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 + + cf_cv_1UL="1" +@@ -19347,14 +19348,14 @@ + + ### Checks for external-data + +-echo "$as_me:19350: checking if external errno is declared" >&5 ++echo "$as_me:19351: 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 19357 "configure" ++#line 19358 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -19372,16 +19373,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19375: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19376: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19378: \$? = $ac_status" >&5 ++ echo "$as_me:19379: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19381: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19382: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19384: \$? = $ac_status" >&5 ++ echo "$as_me:19385: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_dcl_errno=yes + else +@@ -19392,7 +19393,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:19395: result: $cf_cv_dcl_errno" >&5 ++echo "$as_me:19396: result: $cf_cv_dcl_errno" >&5 + echo "${ECHO_T}$cf_cv_dcl_errno" >&6 + + if test "$cf_cv_dcl_errno" = no ; then +@@ -19407,14 +19408,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:19410: checking if external errno exists" >&5 ++echo "$as_me:19411: 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 19417 "configure" ++#line 19418 "configure" + #include "confdefs.h" + + #undef errno +@@ -19429,16 +19430,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19432: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19433: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19435: \$? = $ac_status" >&5 ++ echo "$as_me:19436: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:19438: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19439: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19441: \$? = $ac_status" >&5 ++ echo "$as_me:19442: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_errno=yes + else +@@ -19449,7 +19450,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:19452: result: $cf_cv_have_errno" >&5 ++echo "$as_me:19453: result: $cf_cv_have_errno" >&5 + echo "${ECHO_T}$cf_cv_have_errno" >&6 + + if test "$cf_cv_have_errno" = yes ; then +@@ -19462,7 +19463,7 @@ + + fi + +-echo "$as_me:19465: checking if data-only library module links" >&5 ++echo "$as_me:19466: 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 +@@ -19470,20 +19471,20 @@ + + rm -f conftest.a + cat >conftest.$ac_ext <&5 ++ if { (eval echo "$as_me:19477: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19479: \$? = $ac_status" >&5 ++ echo "$as_me:19480: \$? = $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:19500: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19502: \$? = $ac_status" >&5 ++ echo "$as_me:19503: \$? = $ac_status" >&5 + (exit $ac_status); }; then + mv conftest.o func.o && \ + ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null +@@ -19512,7 +19513,7 @@ + cf_cv_link_dataonly=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 19515 "configure" ++#line 19516 "configure" + #include "confdefs.h" + + int main(void) +@@ -19523,15 +19524,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:19526: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19527: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19529: \$? = $ac_status" >&5 ++ echo "$as_me:19530: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:19531: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19532: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19534: \$? = $ac_status" >&5 ++ echo "$as_me:19535: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_link_dataonly=yes + else +@@ -19546,7 +19547,7 @@ + + fi + +-echo "$as_me:19549: result: $cf_cv_link_dataonly" >&5 ++echo "$as_me:19550: result: $cf_cv_link_dataonly" >&5 + echo "${ECHO_T}$cf_cv_link_dataonly" >&6 + + if test "$cf_cv_link_dataonly" = no ; then +@@ -19588,13 +19589,13 @@ + + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:19591: checking for $ac_func" >&5 ++echo "$as_me:19592: 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 19597 "configure" ++#line 19598 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -19625,16 +19626,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19628: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19629: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19631: \$? = $ac_status" >&5 ++ echo "$as_me:19632: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:19634: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19635: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19637: \$? = $ac_status" >&5 ++ echo "$as_me:19638: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -19644,7 +19645,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:19647: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:19648: 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:19660: error: getopt is required for building programs" >&5 + echo "$as_me: error: getopt is required for building programs" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -19665,7 +19666,7 @@ + then + if test "x$ac_cv_func_vsnprintf" = xyes + then +- { echo "$as_me:19668: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 ++ { echo "$as_me:19669: WARNING: will use vsnprintf instead of safe-sprintf option" >&5 + echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;} + else + +@@ -19678,14 +19679,14 @@ + + if test "x$with_getcap" = "xyes" ; then + +-echo "$as_me:19681: checking for terminal-capability database functions" >&5 ++echo "$as_me:19682: 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 19688 "configure" ++#line 19689 "configure" + #include "confdefs.h" + + #include +@@ -19705,16 +19706,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19708: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19709: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19711: \$? = $ac_status" >&5 ++ echo "$as_me:19712: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:19714: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19715: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19717: \$? = $ac_status" >&5 ++ echo "$as_me:19718: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_cgetent=yes + else +@@ -19725,7 +19726,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:19728: result: $cf_cv_cgetent" >&5 ++echo "$as_me:19729: result: $cf_cv_cgetent" >&5 + echo "${ECHO_T}$cf_cv_cgetent" >&6 + + if test "$cf_cv_cgetent" = yes +@@ -19735,14 +19736,14 @@ + #define HAVE_BSD_CGETENT 1 + EOF + +-echo "$as_me:19738: checking if cgetent uses const parameter" >&5 ++echo "$as_me:19739: 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 19745 "configure" ++#line 19746 "configure" + #include "confdefs.h" + + #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" +@@ -19765,16 +19766,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19768: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19769: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19771: \$? = $ac_status" >&5 ++ echo "$as_me:19772: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:19774: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19775: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19777: \$? = $ac_status" >&5 ++ echo "$as_me:19778: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_cgetent_const=yes + else +@@ -19785,7 +19786,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:19788: result: $cf_cv_cgetent_const" >&5 ++echo "$as_me:19789: result: $cf_cv_cgetent_const" >&5 + echo "${ECHO_T}$cf_cv_cgetent_const" >&6 + if test "$cf_cv_cgetent_const" = yes + then +@@ -19799,14 +19800,14 @@ + + fi + +-echo "$as_me:19802: checking for isascii" >&5 ++echo "$as_me:19803: 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 19809 "configure" ++#line 19810 "configure" + #include "confdefs.h" + #include + int +@@ -19818,16 +19819,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19821: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19822: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19824: \$? = $ac_status" >&5 ++ echo "$as_me:19825: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:19827: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19828: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19830: \$? = $ac_status" >&5 ++ echo "$as_me:19831: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_isascii=yes + else +@@ -19838,7 +19839,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:19841: result: $cf_cv_have_isascii" >&5 ++echo "$as_me:19842: result: $cf_cv_have_isascii" >&5 + echo "${ECHO_T}$cf_cv_have_isascii" >&6 + test "$cf_cv_have_isascii" = yes && + cat >>confdefs.h <<\EOF +@@ -19846,10 +19847,10 @@ + EOF + + if test "$ac_cv_func_sigaction" = yes; then +-echo "$as_me:19849: checking whether sigaction needs _POSIX_SOURCE" >&5 ++echo "$as_me:19850: 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 19852 "configure" ++#line 19853 "configure" + #include "confdefs.h" + + #include +@@ -19863,16 +19864,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19866: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19867: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19869: \$? = $ac_status" >&5 ++ echo "$as_me:19870: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19872: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19873: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19875: \$? = $ac_status" >&5 ++ echo "$as_me:19876: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + sigact_bad=no + else +@@ -19880,7 +19881,7 @@ + cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 19883 "configure" ++#line 19884 "configure" + #include "confdefs.h" + + #define _POSIX_SOURCE +@@ -19895,16 +19896,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19898: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19899: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19901: \$? = $ac_status" >&5 ++ echo "$as_me:19902: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19904: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19905: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19907: \$? = $ac_status" >&5 ++ echo "$as_me:19908: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + sigact_bad=yes + +@@ -19920,11 +19921,11 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:19923: result: $sigact_bad" >&5 ++echo "$as_me:19924: result: $sigact_bad" >&5 + echo "${ECHO_T}$sigact_bad" >&6 + fi + +-echo "$as_me:19927: checking if nanosleep really works" >&5 ++echo "$as_me:19928: 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 +@@ -19934,7 +19935,7 @@ + cf_cv_func_nanosleep=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 19937 "configure" ++#line 19938 "configure" + #include "confdefs.h" + + #include +@@ -19959,15 +19960,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:19962: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19963: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19965: \$? = $ac_status" >&5 ++ echo "$as_me:19966: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:19967: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19968: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19970: \$? = $ac_status" >&5 ++ echo "$as_me:19971: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_nanosleep=yes + else +@@ -19979,7 +19980,7 @@ + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi +-echo "$as_me:19982: result: $cf_cv_func_nanosleep" >&5 ++echo "$as_me:19983: result: $cf_cv_func_nanosleep" >&5 + echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 + + test "$cf_cv_func_nanosleep" = "yes" && +@@ -19996,23 +19997,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:19999: checking for $ac_header" >&5 ++echo "$as_me:20000: 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 20005 "configure" ++#line 20006 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:20009: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:20010: \"$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:20015: \$? = $ac_status" >&5 ++ echo "$as_me:20016: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -20031,7 +20032,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:20034: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:20035: 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:20052: 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 20054 "configure" ++#line 20055 "configure" + #include "confdefs.h" + #include + int +@@ -20063,16 +20064,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:20066: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20067: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20069: \$? = $ac_status" >&5 ++ echo "$as_me:20070: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:20072: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20073: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20075: \$? = $ac_status" >&5 ++ echo "$as_me:20076: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + termios_bad=no + else +@@ -20080,7 +20081,7 @@ + cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 20083 "configure" ++#line 20084 "configure" + #include "confdefs.h" + + #define _POSIX_SOURCE +@@ -20094,16 +20095,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:20097: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20098: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20100: \$? = $ac_status" >&5 ++ echo "$as_me:20101: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:20103: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20104: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20106: \$? = $ac_status" >&5 ++ echo "$as_me:20107: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + termios_bad=unknown + else +@@ -20119,19 +20120,19 @@ + + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:20122: result: $termios_bad" >&5 ++ echo "$as_me:20123: result: $termios_bad" >&5 + echo "${ECHO_T}$termios_bad" >&6 + fi + fi + +-echo "$as_me:20127: checking for tcgetattr" >&5 ++echo "$as_me:20128: 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 20134 "configure" ++#line 20135 "configure" + #include "confdefs.h" + + #include +@@ -20159,16 +20160,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20162: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20163: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20165: \$? = $ac_status" >&5 ++ echo "$as_me:20166: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20168: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20169: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20171: \$? = $ac_status" >&5 ++ echo "$as_me:20172: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_tcgetattr=yes + else +@@ -20178,21 +20179,21 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:20181: result: $cf_cv_have_tcgetattr" >&5 ++echo "$as_me:20182: 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:20188: checking for vsscanf function or workaround" >&5 ++echo "$as_me:20189: 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 20195 "configure" ++#line 20196 "configure" + #include "confdefs.h" + + #include +@@ -20208,16 +20209,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20211: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20212: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20214: \$? = $ac_status" >&5 ++ echo "$as_me:20215: \$? = $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:20218: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20220: \$? = $ac_status" >&5 ++ echo "$as_me:20221: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_vsscanf=vsscanf + else +@@ -20225,7 +20226,7 @@ + cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 20228 "configure" ++#line 20229 "configure" + #include "confdefs.h" + + #include +@@ -20247,16 +20248,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20250: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20251: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20253: \$? = $ac_status" >&5 ++ echo "$as_me:20254: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20256: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20257: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20259: \$? = $ac_status" >&5 ++ echo "$as_me:20260: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_vsscanf=vfscanf + else +@@ -20264,7 +20265,7 @@ + cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 20267 "configure" ++#line 20268 "configure" + #include "confdefs.h" + + #include +@@ -20286,16 +20287,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20289: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20290: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20292: \$? = $ac_status" >&5 ++ echo "$as_me:20293: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20295: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20296: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20298: \$? = $ac_status" >&5 ++ echo "$as_me:20299: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_vsscanf=_doscan + else +@@ -20310,7 +20311,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:20313: result: $cf_cv_func_vsscanf" >&5 ++echo "$as_me:20314: result: $cf_cv_func_vsscanf" >&5 + echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 + + case $cf_cv_func_vsscanf in +@@ -20336,23 +20337,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:20339: checking for $ac_header" >&5 ++echo "$as_me:20340: 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 20345 "configure" ++#line 20346 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:20349: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:20350: \"$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:20355: \$? = $ac_status" >&5 ++ echo "$as_me:20356: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -20371,7 +20372,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:20374: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:20375: 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:20385: 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 +@@ -20392,7 +20393,7 @@ + cf_cv_func_mkstemp=maybe + else + cat >conftest.$ac_ext <<_ACEOF +-#line 20395 "configure" ++#line 20396 "configure" + #include "confdefs.h" + + #include +@@ -20433,15 +20434,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:20436: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20437: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20439: \$? = $ac_status" >&5 ++ echo "$as_me:20440: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:20441: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20442: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20444: \$? = $ac_status" >&5 ++ echo "$as_me:20445: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_mkstemp=yes + +@@ -20456,16 +20457,16 @@ + fi + + fi +-echo "$as_me:20459: result: $cf_cv_func_mkstemp" >&5 ++echo "$as_me:20460: 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:20462: checking for mkstemp" >&5 ++ echo "$as_me:20463: 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 20468 "configure" ++#line 20469 "configure" + #include "confdefs.h" + #define mkstemp autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -20496,16 +20497,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20499: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20500: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20502: \$? = $ac_status" >&5 ++ echo "$as_me:20503: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20505: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20506: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20508: \$? = $ac_status" >&5 ++ echo "$as_me:20509: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_mkstemp=yes + else +@@ -20515,7 +20516,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:20518: result: $ac_cv_func_mkstemp" >&5 ++echo "$as_me:20519: result: $ac_cv_func_mkstemp" >&5 + echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 + + fi +@@ -20536,21 +20537,21 @@ + fi + + if test "x$cross_compiling" = xyes ; then +- { echo "$as_me:20539: WARNING: cross compiling: assume setvbuf params not reversed" >&5 ++ { echo "$as_me:20540: 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:20542: checking whether setvbuf arguments are reversed" >&5 ++ echo "$as_me:20543: 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:20548: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:20549: 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 20553 "configure" ++#line 20554 "configure" + #include "confdefs.h" + #include + /* If setvbuf has the reversed format, exit 0. */ +@@ -20567,15 +20568,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:20570: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20571: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20573: \$? = $ac_status" >&5 ++ echo "$as_me:20574: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:20575: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20576: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20578: \$? = $ac_status" >&5 ++ echo "$as_me:20579: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_setvbuf_reversed=yes + else +@@ -20588,7 +20589,7 @@ + fi + rm -f core core.* *.core + fi +-echo "$as_me:20591: result: $ac_cv_func_setvbuf_reversed" >&5 ++echo "$as_me:20592: 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 + +@@ -20599,13 +20600,13 @@ + fi + + fi +-echo "$as_me:20602: checking for intptr_t" >&5 ++echo "$as_me:20603: 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 20608 "configure" ++#line 20609 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -20620,16 +20621,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:20623: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20624: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20626: \$? = $ac_status" >&5 ++ echo "$as_me:20627: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:20629: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20630: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20632: \$? = $ac_status" >&5 ++ echo "$as_me:20633: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_intptr_t=yes + else +@@ -20639,7 +20640,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:20642: result: $ac_cv_type_intptr_t" >&5 ++echo "$as_me:20643: 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 + : +@@ -20651,13 +20652,13 @@ + + fi + +-echo "$as_me:20654: checking for ssize_t" >&5 ++echo "$as_me:20655: 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 20660 "configure" ++#line 20661 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -20672,16 +20673,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:20675: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20676: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20678: \$? = $ac_status" >&5 ++ echo "$as_me:20679: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:20681: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20682: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20684: \$? = $ac_status" >&5 ++ echo "$as_me:20685: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_ssize_t=yes + else +@@ -20691,7 +20692,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:20694: result: $ac_cv_type_ssize_t" >&5 ++echo "$as_me:20695: 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 + : +@@ -20703,14 +20704,14 @@ + + fi + +-echo "$as_me:20706: checking for type sigaction_t" >&5 ++echo "$as_me:20707: 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 20713 "configure" ++#line 20714 "configure" + #include "confdefs.h" + + #include +@@ -20723,16 +20724,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:20726: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20727: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20729: \$? = $ac_status" >&5 ++ echo "$as_me:20730: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:20732: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20733: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20735: \$? = $ac_status" >&5 ++ echo "$as_me:20736: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_type_sigaction=yes + else +@@ -20743,14 +20744,14 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + +-echo "$as_me:20746: result: $cf_cv_type_sigaction" >&5 ++echo "$as_me:20747: 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:20753: checking declaration of size-change" >&5 ++echo "$as_me:20754: 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 +@@ -20771,7 +20772,7 @@ + + fi + cat >conftest.$ac_ext <<_ACEOF +-#line 20774 "configure" ++#line 20775 "configure" + #include "confdefs.h" + #include + #ifdef HAVE_TERMIOS_H +@@ -20817,16 +20818,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:20820: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20821: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20823: \$? = $ac_status" >&5 ++ echo "$as_me:20824: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:20826: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20827: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20829: \$? = $ac_status" >&5 ++ echo "$as_me:20830: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sizechange=yes + else +@@ -20845,7 +20846,7 @@ + done + + fi +-echo "$as_me:20848: result: $cf_cv_sizechange" >&5 ++echo "$as_me:20849: result: $cf_cv_sizechange" >&5 + echo "${ECHO_T}$cf_cv_sizechange" >&6 + if test "$cf_cv_sizechange" != no ; then + +@@ -20863,13 +20864,13 @@ + esac + fi + +-echo "$as_me:20866: checking for memmove" >&5 ++echo "$as_me:20867: 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 20872 "configure" ++#line 20873 "configure" + #include "confdefs.h" + #define memmove autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -20900,16 +20901,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20903: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20904: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20906: \$? = $ac_status" >&5 ++ echo "$as_me:20907: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20909: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20910: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20912: \$? = $ac_status" >&5 ++ echo "$as_me:20913: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_memmove=yes + else +@@ -20919,19 +20920,19 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:20922: result: $ac_cv_func_memmove" >&5 ++echo "$as_me:20923: 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:20928: checking for bcopy" >&5 ++echo "$as_me:20929: 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 20934 "configure" ++#line 20935 "configure" + #include "confdefs.h" + #define bcopy autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -20962,16 +20963,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20965: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20966: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20968: \$? = $ac_status" >&5 ++ echo "$as_me:20969: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20971: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20972: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20974: \$? = $ac_status" >&5 ++ echo "$as_me:20975: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_bcopy=yes + else +@@ -20981,11 +20982,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:20984: result: $ac_cv_func_bcopy" >&5 ++echo "$as_me:20985: 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:20988: checking if bcopy does overlapping moves" >&5 ++ echo "$as_me:20989: 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 +@@ -20995,7 +20996,7 @@ + cf_cv_good_bcopy=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 20998 "configure" ++#line 20999 "configure" + #include "confdefs.h" + + int main(void) { +@@ -21009,15 +21010,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:21012: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21013: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21015: \$? = $ac_status" >&5 ++ echo "$as_me:21016: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:21017: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21018: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21020: \$? = $ac_status" >&5 ++ echo "$as_me:21021: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_good_bcopy=yes + else +@@ -21030,7 +21031,7 @@ + fi + + fi +-echo "$as_me:21033: result: $cf_cv_good_bcopy" >&5 ++echo "$as_me:21034: result: $cf_cv_good_bcopy" >&5 + echo "${ECHO_T}$cf_cv_good_bcopy" >&6 + + else +@@ -21057,13 +21058,13 @@ + for ac_func in posix_openpt + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:21060: checking for $ac_func" >&5 ++echo "$as_me:21061: 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 21066 "configure" ++#line 21067 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -21094,16 +21095,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21097: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21098: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21100: \$? = $ac_status" >&5 ++ echo "$as_me:21101: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21103: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21104: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21106: \$? = $ac_status" >&5 ++ echo "$as_me:21107: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -21113,7 +21114,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:21116: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:21117: 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:21127: 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 +@@ -21133,7 +21134,7 @@ + cf_cv_working_poll=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 21136 "configure" ++#line 21137 "configure" + #include "confdefs.h" + + #include +@@ -21185,15 +21186,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:21188: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21189: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21191: \$? = $ac_status" >&5 ++ echo "$as_me:21192: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:21193: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21194: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21196: \$? = $ac_status" >&5 ++ echo "$as_me:21197: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_working_poll=yes + else +@@ -21205,21 +21206,21 @@ + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi +-echo "$as_me:21208: result: $cf_cv_working_poll" >&5 ++echo "$as_me:21209: 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:21215: checking for va_copy" >&5 ++echo "$as_me:21216: 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 21222 "configure" ++#line 21223 "configure" + #include "confdefs.h" + + #include +@@ -21236,16 +21237,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21239: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21240: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21242: \$? = $ac_status" >&5 ++ echo "$as_me:21243: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21245: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21246: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21248: \$? = $ac_status" >&5 ++ echo "$as_me:21249: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_va_copy=yes + else +@@ -21255,7 +21256,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:21258: result: $cf_cv_have_va_copy" >&5 ++echo "$as_me:21259: result: $cf_cv_have_va_copy" >&5 + echo "${ECHO_T}$cf_cv_have_va_copy" >&6 + + if test "$cf_cv_have_va_copy" = yes; +@@ -21267,14 +21268,14 @@ + + else # !cf_cv_have_va_copy + +-echo "$as_me:21270: checking for __va_copy" >&5 ++echo "$as_me:21271: 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 21277 "configure" ++#line 21278 "configure" + #include "confdefs.h" + + #include +@@ -21291,16 +21292,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21294: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21295: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21297: \$? = $ac_status" >&5 ++ echo "$as_me:21298: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21300: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21301: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21303: \$? = $ac_status" >&5 ++ echo "$as_me:21304: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have___va_copy=yes + else +@@ -21310,7 +21311,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:21313: result: $cf_cv_have___va_copy" >&5 ++echo "$as_me:21314: result: $cf_cv_have___va_copy" >&5 + echo "${ECHO_T}$cf_cv_have___va_copy" >&6 + + if test "$cf_cv_have___va_copy" = yes +@@ -21322,14 +21323,14 @@ + + else # !cf_cv_have___va_copy + +-echo "$as_me:21325: checking for __builtin_va_copy" >&5 ++echo "$as_me:21326: 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 21332 "configure" ++#line 21333 "configure" + #include "confdefs.h" + + #include +@@ -21346,16 +21347,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21349: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21350: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21352: \$? = $ac_status" >&5 ++ echo "$as_me:21353: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21355: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21356: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21358: \$? = $ac_status" >&5 ++ echo "$as_me:21359: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have___builtin_va_copy=yes + else +@@ -21365,7 +21366,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:21368: result: $cf_cv_have___builtin_va_copy" >&5 ++echo "$as_me:21369: 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 && +@@ -21383,14 +21384,14 @@ + ;; + + (*) +- echo "$as_me:21386: checking if we can simply copy va_list" >&5 ++ echo "$as_me:21387: 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 21393 "configure" ++#line 21394 "configure" + #include "confdefs.h" + + #include +@@ -21407,16 +21408,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21410: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21411: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21413: \$? = $ac_status" >&5 ++ echo "$as_me:21414: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21416: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21417: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21419: \$? = $ac_status" >&5 ++ echo "$as_me:21420: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_pointer_va_list=yes + else +@@ -21426,19 +21427,19 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:21429: result: $cf_cv_pointer_va_list" >&5 ++echo "$as_me:21430: 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:21434: checking if we can copy va_list indirectly" >&5 ++ echo "$as_me:21435: 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 21441 "configure" ++#line 21442 "configure" + #include "confdefs.h" + + #include +@@ -21455,16 +21456,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21458: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21459: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21461: \$? = $ac_status" >&5 ++ echo "$as_me:21462: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21464: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21465: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21467: \$? = $ac_status" >&5 ++ echo "$as_me:21468: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_array_va_list=yes + else +@@ -21474,7 +21475,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:21477: result: $cf_cv_array_va_list" >&5 ++echo "$as_me:21478: 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 +@@ -21485,13 +21486,13 @@ + ;; + esac + +-echo "$as_me:21488: checking for pid_t" >&5 ++echo "$as_me:21489: 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 21494 "configure" ++#line 21495 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -21506,16 +21507,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:21509: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21510: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21512: \$? = $ac_status" >&5 ++ echo "$as_me:21513: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:21515: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21516: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21518: \$? = $ac_status" >&5 ++ echo "$as_me:21519: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_pid_t=yes + else +@@ -21525,7 +21526,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:21528: result: $ac_cv_type_pid_t" >&5 ++echo "$as_me:21529: 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 + : +@@ -21540,23 +21541,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:21543: checking for $ac_header" >&5 ++echo "$as_me:21544: 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 21549 "configure" ++#line 21550 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:21553: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:21554: \"$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:21559: \$? = $ac_status" >&5 ++ echo "$as_me:21560: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -21575,7 +21576,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:21578: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:21579: 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:21592: 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 21597 "configure" ++#line 21598 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -21625,16 +21626,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21628: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21629: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21631: \$? = $ac_status" >&5 ++ echo "$as_me:21632: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21634: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21635: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21637: \$? = $ac_status" >&5 ++ echo "$as_me:21638: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -21644,7 +21645,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:21647: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:21648: 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:21660: 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 +@@ -21679,15 +21680,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:21682: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21683: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21685: \$? = $ac_status" >&5 ++ echo "$as_me:21686: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:21687: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21688: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21690: \$? = $ac_status" >&5 ++ echo "$as_me:21691: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_fork_works=yes + else +@@ -21699,7 +21700,7 @@ + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi +-echo "$as_me:21702: result: $ac_cv_func_fork_works" >&5 ++echo "$as_me:21703: result: $ac_cv_func_fork_works" >&5 + echo "${ECHO_T}$ac_cv_func_fork_works" >&6 + + fi +@@ -21713,12 +21714,12 @@ + ac_cv_func_fork_works=yes + ;; + esac +- { echo "$as_me:21716: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:21717: 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:21721: checking for working vfork" >&5 ++ echo "$as_me:21722: 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 +@@ -21727,7 +21728,7 @@ + ac_cv_func_vfork_works=cross + else + cat >conftest.$ac_ext <<_ACEOF +-#line 21730 "configure" ++#line 21731 "configure" + #include "confdefs.h" + /* Thanks to Paul Eggert for this test. */ + #include +@@ -21824,15 +21825,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:21827: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21828: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21830: \$? = $ac_status" >&5 ++ echo "$as_me:21831: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:21832: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21833: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21835: \$? = $ac_status" >&5 ++ echo "$as_me:21836: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_vfork_works=yes + else +@@ -21844,13 +21845,13 @@ + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi +-echo "$as_me:21847: result: $ac_cv_func_vfork_works" >&5 ++echo "$as_me:21848: 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:21853: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:21854: 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 + +@@ -21875,7 +21876,7 @@ + + fi + +-echo "$as_me:21878: checking if fopen accepts explicit binary mode" >&5 ++echo "$as_me:21879: 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 +@@ -21885,7 +21886,7 @@ + cf_cv_fopen_bin_r=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 21888 "configure" ++#line 21889 "configure" + #include "confdefs.h" + + #include +@@ -21918,15 +21919,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:21921: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21922: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21924: \$? = $ac_status" >&5 ++ echo "$as_me:21925: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:21926: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21927: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21929: \$? = $ac_status" >&5 ++ echo "$as_me:21930: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_fopen_bin_r=yes + else +@@ -21939,7 +21940,7 @@ + fi + + fi +-echo "$as_me:21942: result: $cf_cv_fopen_bin_r" >&5 ++echo "$as_me:21943: 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 +@@ -21947,7 +21948,7 @@ + + # special check for test/ditto.c + +-echo "$as_me:21950: checking for openpty in -lutil" >&5 ++echo "$as_me:21951: 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 +@@ -21955,7 +21956,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lutil $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 21958 "configure" ++#line 21959 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -21974,16 +21975,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21977: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21978: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21980: \$? = $ac_status" >&5 ++ echo "$as_me:21981: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21983: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21984: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21986: \$? = $ac_status" >&5 ++ echo "$as_me:21987: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_util_openpty=yes + else +@@ -21994,7 +21995,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:21997: result: $ac_cv_lib_util_openpty" >&5 ++echo "$as_me:21998: 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 +@@ -22002,7 +22003,7 @@ + cf_cv_lib_util=no + fi + +-echo "$as_me:22005: checking for openpty header" >&5 ++echo "$as_me:22006: 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 +@@ -22029,7 +22030,7 @@ + for cf_header in pty.h libutil.h util.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 22032 "configure" ++#line 22033 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -22046,16 +22047,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:22049: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22050: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22052: \$? = $ac_status" >&5 ++ echo "$as_me:22053: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:22055: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22056: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22058: \$? = $ac_status" >&5 ++ echo "$as_me:22059: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_func_openpty=$cf_header +@@ -22073,7 +22074,7 @@ + LIBS="$cf_save_LIBS" + + fi +-echo "$as_me:22076: result: $cf_cv_func_openpty" >&5 ++echo "$as_me:22077: result: $cf_cv_func_openpty" >&5 + echo "${ECHO_T}$cf_cv_func_openpty" >&6 + + if test "$cf_cv_func_openpty" != no ; then +@@ -22146,7 +22147,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +-#line 22149 "configure" ++#line 22150 "configure" + #include "confdefs.h" + #include + int +@@ -22158,16 +22159,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:22161: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22162: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22164: \$? = $ac_status" >&5 ++ echo "$as_me:22165: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:22167: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22168: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22170: \$? = $ac_status" >&5 ++ echo "$as_me:22171: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -22184,7 +22185,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}:22187: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:22188: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -22220,7 +22221,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}:22223: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:22224: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -22231,7 +22232,7 @@ + else + case "$with_hashed_db" in + (./*|../*|/*) +- { echo "$as_me:22234: WARNING: no such directory $with_hashed_db" >&5 ++ { echo "$as_me:22235: WARNING: no such directory $with_hashed_db" >&5 + echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} + ;; + (*) +@@ -22303,7 +22304,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +-#line 22306 "configure" ++#line 22307 "configure" + #include "confdefs.h" + #include + int +@@ -22315,16 +22316,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:22318: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22319: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22321: \$? = $ac_status" >&5 ++ echo "$as_me:22322: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:22324: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22325: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22327: \$? = $ac_status" >&5 ++ echo "$as_me:22328: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -22341,7 +22342,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}:22344: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:22345: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -22421,7 +22422,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}:22424: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:22425: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -22438,23 +22439,23 @@ + fi + esac + +-echo "$as_me:22441: checking for db.h" >&5 ++echo "$as_me:22442: 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 22447 "configure" ++#line 22448 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:22451: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:22452: \"$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:22457: \$? = $ac_status" >&5 ++ echo "$as_me:22458: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -22473,11 +22474,11 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:22476: result: $ac_cv_header_db_h" >&5 ++echo "$as_me:22477: 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:22480: checking for version of db" >&5 ++echo "$as_me:22481: 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 +@@ -22488,10 +22489,10 @@ + for cf_db_version in 1 2 3 4 5 6 + do + +-echo "${as_me:-configure}:22491: testing checking for db version $cf_db_version ..." 1>&5 ++echo "${as_me:-configure}:22492: testing checking for db version $cf_db_version ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 22494 "configure" ++#line 22495 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -22521,16 +22522,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:22524: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22525: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22527: \$? = $ac_status" >&5 ++ echo "$as_me:22528: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:22530: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22531: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22533: \$? = $ac_status" >&5 ++ echo "$as_me:22534: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_hashed_db_version=$cf_db_version +@@ -22544,16 +22545,16 @@ + done + + fi +-echo "$as_me:22547: result: $cf_cv_hashed_db_version" >&5 ++echo "$as_me:22548: 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:22551: error: Cannot determine version of db" >&5 ++ { { echo "$as_me:22552: 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:22556: checking for db libraries" >&5 ++echo "$as_me:22557: 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 +@@ -22583,10 +22584,10 @@ + + fi + +-echo "${as_me:-configure}:22586: testing checking for library "$cf_db_libs" ..." 1>&5 ++echo "${as_me:-configure}:22587: testing checking for library "$cf_db_libs" ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 22589 "configure" ++#line 22590 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -22641,16 +22642,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:22644: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22645: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22647: \$? = $ac_status" >&5 ++ echo "$as_me:22648: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:22650: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22651: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22653: \$? = $ac_status" >&5 ++ echo "$as_me:22654: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + if test -n "$cf_db_libs" ; then +@@ -22670,11 +22671,11 @@ + done + + fi +-echo "$as_me:22673: result: $cf_cv_hashed_db_libs" >&5 ++echo "$as_me:22674: 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:22677: error: Cannot determine library for db" >&5 ++ { { echo "$as_me:22678: 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 +@@ -22700,7 +22701,7 @@ + + else + +- { { echo "$as_me:22703: error: Cannot find db.h" >&5 ++ { { echo "$as_me:22704: error: Cannot find db.h" >&5 + echo "$as_me: error: Cannot find db.h" >&2;} + { (exit 1); exit 1; }; } + +@@ -22715,7 +22716,7 @@ + + # Just in case, check if the C compiler has a bool type. + +-echo "$as_me:22718: checking if we should include stdbool.h" >&5 ++echo "$as_me:22719: 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 +@@ -22723,7 +22724,7 @@ + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 22726 "configure" ++#line 22727 "configure" + #include "confdefs.h" + + int +@@ -22735,23 +22736,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:22738: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22739: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22741: \$? = $ac_status" >&5 ++ echo "$as_me:22742: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:22744: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22745: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22747: \$? = $ac_status" >&5 ++ echo "$as_me:22748: \$? = $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 22754 "configure" ++#line 22755 "configure" + #include "confdefs.h" + + #ifndef __BEOS__ +@@ -22767,16 +22768,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:22770: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22771: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22773: \$? = $ac_status" >&5 ++ echo "$as_me:22774: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:22776: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22777: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22779: \$? = $ac_status" >&5 ++ echo "$as_me:22780: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_header_stdbool_h=1 + else +@@ -22790,13 +22791,13 @@ + fi + + if test "$cf_cv_header_stdbool_h" = 1 +-then echo "$as_me:22793: result: yes" >&5 ++then echo "$as_me:22794: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:22795: result: no" >&5 ++else echo "$as_me:22796: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:22799: checking for builtin bool type" >&5 ++echo "$as_me:22800: 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 +@@ -22804,7 +22805,7 @@ + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 22807 "configure" ++#line 22808 "configure" + #include "confdefs.h" + + #include +@@ -22819,16 +22820,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:22822: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22823: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22825: \$? = $ac_status" >&5 ++ echo "$as_me:22826: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:22828: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22829: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22831: \$? = $ac_status" >&5 ++ echo "$as_me:22832: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_cc_bool_type=1 + else +@@ -22841,9 +22842,9 @@ + fi + + if test "$cf_cv_cc_bool_type" = 1 +-then echo "$as_me:22844: result: yes" >&5 ++then echo "$as_me:22845: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:22846: result: no" >&5 ++else echo "$as_me:22847: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -22860,10 +22861,10 @@ + + cf_save="$LIBS" + LIBS="$LIBS $CXXLIBS" +- echo "$as_me:22863: checking if we already have C++ library" >&5 ++ echo "$as_me:22864: 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 22866 "configure" ++#line 22867 "configure" + #include "confdefs.h" + + #include +@@ -22877,16 +22878,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:22880: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22881: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22883: \$? = $ac_status" >&5 ++ echo "$as_me:22884: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:22886: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22887: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22889: \$? = $ac_status" >&5 ++ echo "$as_me:22890: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_libstdcpp=yes + else +@@ -22895,7 +22896,7 @@ + cf_have_libstdcpp=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:22898: result: $cf_have_libstdcpp" >&5 ++ echo "$as_me:22899: result: $cf_have_libstdcpp" >&5 + echo "${ECHO_T}$cf_have_libstdcpp" >&6 + LIBS="$cf_save" + +@@ -22914,7 +22915,7 @@ + ;; + esac + +- echo "$as_me:22917: checking for library $cf_stdcpp_libname" >&5 ++ echo "$as_me:22918: 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 +@@ -22940,7 +22941,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 22943 "configure" ++#line 22944 "configure" + #include "confdefs.h" + + #include +@@ -22954,16 +22955,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:22957: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22958: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22960: \$? = $ac_status" >&5 ++ echo "$as_me:22961: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:22963: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22964: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22966: \$? = $ac_status" >&5 ++ echo "$as_me:22967: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_libstdcpp=yes + else +@@ -22975,7 +22976,7 @@ + LIBS="$cf_save" + + fi +-echo "$as_me:22978: result: $cf_cv_libstdcpp" >&5 ++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" +@@ -22997,7 +22998,7 @@ + fi + fi + +- echo "$as_me:23000: checking whether $CXX understands -c and -o together" >&5 ++ echo "$as_me:23001: 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 +@@ -23012,15 +23013,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:23015: \"$ac_try\"") >&5 ++if { (eval echo "$as_me:23016: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23018: \$? = $ac_status" >&5 ++ echo "$as_me:23019: \$? = $ac_status" >&5 + (exit $ac_status); } && +- test -f conftest2.$ac_objext && { (eval echo "$as_me:23020: \"$ac_try\"") >&5 ++ test -f conftest2.$ac_objext && { (eval echo "$as_me:23021: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23023: \$? = $ac_status" >&5 ++ echo "$as_me:23024: \$? = $ac_status" >&5 + (exit $ac_status); }; + then + eval cf_cv_prog_CXX_c_o=yes +@@ -23031,10 +23032,10 @@ + + fi + if test $cf_cv_prog_CXX_c_o = yes; then +- echo "$as_me:23034: result: yes" >&5 ++ echo "$as_me:23035: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:23037: result: no" >&5 ++ echo "$as_me:23038: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -23054,7 +23055,7 @@ + ;; + esac + if test "$GXX" = yes; then +- echo "$as_me:23057: checking for lib$cf_gpp_libname" >&5 ++ echo "$as_me:23058: checking for lib$cf_gpp_libname" >&5 + echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 + cf_save="$LIBS" + +@@ -23075,7 +23076,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 23078 "configure" ++#line 23079 "configure" + #include "confdefs.h" + + #include <$cf_gpp_libname/builtin.h> +@@ -23089,16 +23090,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:23092: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23093: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23095: \$? = $ac_status" >&5 ++ echo "$as_me:23096: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:23098: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23099: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23101: \$? = $ac_status" >&5 ++ echo "$as_me:23102: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cxx_library=yes + +@@ -23135,7 +23136,7 @@ + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 23138 "configure" ++#line 23139 "configure" + #include "confdefs.h" + + #include +@@ -23149,16 +23150,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:23152: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23153: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23155: \$? = $ac_status" >&5 ++ echo "$as_me:23156: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:23158: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23159: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23161: \$? = $ac_status" >&5 ++ echo "$as_me:23162: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cxx_library=yes + +@@ -23191,7 +23192,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$cf_save" +- echo "$as_me:23194: result: $cf_cxx_library" >&5 ++ echo "$as_me:23195: result: $cf_cxx_library" >&5 + echo "${ECHO_T}$cf_cxx_library" >&6 + fi + +@@ -23207,7 +23208,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:23210: checking how to run the C++ preprocessor" >&5 ++echo "$as_me:23211: 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 +@@ -23224,18 +23225,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 23227 "configure" ++#line 23228 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:23232: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:23233: \"$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:23238: \$? = $ac_status" >&5 ++ echo "$as_me:23239: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -23258,17 +23259,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 23261 "configure" ++#line 23262 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:23265: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:23266: \"$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:23271: \$? = $ac_status" >&5 ++ echo "$as_me:23272: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -23305,7 +23306,7 @@ + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +-echo "$as_me:23308: result: $CXXCPP" >&5 ++echo "$as_me:23309: result: $CXXCPP" >&5 + echo "${ECHO_T}$CXXCPP" >&6 + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes +@@ -23315,18 +23316,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 23318 "configure" ++#line 23319 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:23323: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:23324: \"$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:23329: \$? = $ac_status" >&5 ++ echo "$as_me:23330: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -23349,17 +23350,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 23352 "configure" ++#line 23353 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:23356: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:23357: \"$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:23362: \$? = $ac_status" >&5 ++ echo "$as_me:23363: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -23387,7 +23388,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:23390: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 ++ { { echo "$as_me:23391: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -23402,23 +23403,23 @@ + for ac_header in typeinfo + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:23405: checking for $ac_header" >&5 ++echo "$as_me:23406: 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 23411 "configure" ++#line 23412 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:23415: \"$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:23421: \$? = $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 +23438,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:23440: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:23441: 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:23454: 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 23459 "configure" ++#line 23460 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:23463: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:23464: \"$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:23469: \$? = $ac_status" >&5 ++ echo "$as_me:23470: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -23485,7 +23486,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:23488: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:23489: 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:23500: 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 23502 "configure" ++#line 23503 "configure" + #include "confdefs.h" + + #include +@@ -23516,16 +23517,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:23519: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23520: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23522: \$? = $ac_status" >&5 ++ echo "$as_me:23523: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:23525: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23526: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23528: \$? = $ac_status" >&5 ++ echo "$as_me:23529: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_iostream_namespace=yes + else +@@ -23534,7 +23535,7 @@ + cf_iostream_namespace=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:23537: result: $cf_iostream_namespace" >&5 ++ echo "$as_me:23538: result: $cf_iostream_namespace" >&5 + echo "${ECHO_T}$cf_iostream_namespace" >&6 + if test "$cf_iostream_namespace" = yes ; then + +@@ -23545,7 +23546,7 @@ + fi + fi + +-echo "$as_me:23548: checking if we should include stdbool.h" >&5 ++echo "$as_me:23549: 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 +@@ -23553,7 +23554,7 @@ + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 23556 "configure" ++#line 23557 "configure" + #include "confdefs.h" + + int +@@ -23565,23 +23566,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:23568: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23569: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23571: \$? = $ac_status" >&5 ++ echo "$as_me:23572: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:23574: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23575: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23577: \$? = $ac_status" >&5 ++ echo "$as_me:23578: \$? = $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 23584 "configure" ++#line 23585 "configure" + #include "confdefs.h" + + #ifndef __BEOS__ +@@ -23597,16 +23598,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:23600: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23601: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23603: \$? = $ac_status" >&5 ++ echo "$as_me:23604: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:23606: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23607: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23609: \$? = $ac_status" >&5 ++ echo "$as_me:23610: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_header_stdbool_h=1 + else +@@ -23620,13 +23621,13 @@ + fi + + if test "$cf_cv_header_stdbool_h" = 1 +-then echo "$as_me:23623: result: yes" >&5 ++then echo "$as_me:23624: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:23625: result: no" >&5 ++else echo "$as_me:23626: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:23629: checking for builtin bool type" >&5 ++echo "$as_me:23630: 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 +@@ -23634,7 +23635,7 @@ + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 23637 "configure" ++#line 23638 "configure" + #include "confdefs.h" + + #include +@@ -23649,16 +23650,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:23652: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23653: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23655: \$? = $ac_status" >&5 ++ echo "$as_me:23656: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:23658: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23659: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23661: \$? = $ac_status" >&5 ++ echo "$as_me:23662: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_builtin_bool=1 + else +@@ -23671,13 +23672,13 @@ + fi + + if test "$cf_cv_builtin_bool" = 1 +-then echo "$as_me:23674: result: yes" >&5 ++then echo "$as_me:23675: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:23676: result: no" >&5 ++else echo "$as_me:23677: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:23680: checking for size of bool" >&5 ++echo "$as_me:23681: 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 +@@ -23688,7 +23689,7 @@ + cf_cv_type_of_bool=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 23691 "configure" ++#line 23692 "configure" + #include "confdefs.h" + + #include +@@ -23730,15 +23731,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:23733: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23734: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23736: \$? = $ac_status" >&5 ++ echo "$as_me:23737: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:23738: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23739: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23741: \$? = $ac_status" >&5 ++ echo "$as_me:23742: \$? = $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 +@@ -23756,18 +23757,18 @@ + fi + + rm -f cf_test.out +-echo "$as_me:23759: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:23760: 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:23765: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:23766: 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:23770: checking for special defines needed for etip.h" >&5 ++echo "$as_me:23771: 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" +@@ -23785,7 +23786,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 23788 "configure" ++#line 23789 "configure" + #include "confdefs.h" + + #include +@@ -23799,16 +23800,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:23802: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23803: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23805: \$? = $ac_status" >&5 ++ echo "$as_me:23806: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:23808: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23809: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23811: \$? = $ac_status" >&5 ++ echo "$as_me:23812: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + test -n "$cf_math" && cat >>confdefs.h <&5 ++echo "$as_me:23833: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + CXXFLAGS="$cf_save_CXXFLAGS" + + if test -n "$CXX"; then +-echo "$as_me:23837: checking if $CXX accepts parameter initialization" >&5 ++echo "$as_me:23838: 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 +@@ -23851,7 +23852,7 @@ + cf_cv_cpp_param_init=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 23854 "configure" ++#line 23855 "configure" + #include "confdefs.h" + + class TEST { +@@ -23870,15 +23871,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:23873: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23874: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23876: \$? = $ac_status" >&5 ++ echo "$as_me:23877: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:23878: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23879: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23881: \$? = $ac_status" >&5 ++ echo "$as_me:23882: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_cpp_param_init=yes + else +@@ -23897,7 +23898,7 @@ + ac_main_return=return + + fi +-echo "$as_me:23900: result: $cf_cv_cpp_param_init" >&5 ++echo "$as_me:23901: result: $cf_cv_cpp_param_init" >&5 + echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 + fi + test "$cf_cv_cpp_param_init" = yes && +@@ -23907,7 +23908,7 @@ + + if test -n "$CXX"; then + +-echo "$as_me:23910: checking if $CXX accepts static_cast" >&5 ++echo "$as_me:23911: 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 +@@ -23921,7 +23922,7 @@ + ac_main_return=return + + cat >conftest.$ac_ext <<_ACEOF +-#line 23924 "configure" ++#line 23925 "configure" + #include "confdefs.h" + + class NCursesPanel +@@ -23965,16 +23966,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:23968: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23969: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23971: \$? = $ac_status" >&5 ++ echo "$as_me:23972: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:23974: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23975: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23977: \$? = $ac_status" >&5 ++ echo "$as_me:23978: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_cpp_static_cast=yes + else +@@ -23992,7 +23993,7 @@ + ac_main_return=return + + fi +-echo "$as_me:23995: result: $cf_cv_cpp_static_cast" >&5 ++echo "$as_me:23996: result: $cf_cv_cpp_static_cast" >&5 + echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 + + fi +@@ -24041,7 +24042,7 @@ + else + if test "$cf_cv_header_stdbool_h" = 1 ; then + +-echo "$as_me:24044: checking for size of bool" >&5 ++echo "$as_me:24045: 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 +@@ -24052,7 +24053,7 @@ + cf_cv_type_of_bool=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 24055 "configure" ++#line 24056 "configure" + #include "confdefs.h" + + #include +@@ -24094,15 +24095,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:24097: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24098: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24100: \$? = $ac_status" >&5 ++ echo "$as_me:24101: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:24102: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24103: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24105: \$? = $ac_status" >&5 ++ echo "$as_me:24106: \$? = $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 +@@ -24120,25 +24121,25 @@ + fi + + rm -f cf_test.out +-echo "$as_me:24123: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:24124: 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:24129: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:24130: 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:24135: checking for fallback type of bool" >&5 ++ echo "$as_me:24136: 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:24141: result: $cf_cv_type_of_bool" >&5 ++ echo "$as_me:24142: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + fi + fi +@@ -24167,7 +24168,7 @@ + + if test "$cf_with_ada" != "no" ; then + if test "$with_libtool" != "no"; then +- { echo "$as_me:24170: WARNING: libtool does not support Ada - disabling feature" >&5 ++ { echo "$as_me:24171: 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 +@@ -24179,7 +24180,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:24182: checking for $ac_word" >&5 ++echo "$as_me:24183: 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 +@@ -24194,7 +24195,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_gnatmake_exists="yes" +-echo "$as_me:24197: found $ac_dir/$ac_word" >&5 ++echo "$as_me:24198: found $ac_dir/$ac_word" >&5 + break + done + +@@ -24203,10 +24204,10 @@ + fi + gnatmake_exists=$ac_cv_prog_gnatmake_exists + if test -n "$gnatmake_exists"; then +- echo "$as_me:24206: result: $gnatmake_exists" >&5 ++ echo "$as_me:24207: result: $gnatmake_exists" >&5 + echo "${ECHO_T}$gnatmake_exists" >&6 + else +- echo "$as_me:24209: result: no" >&5 ++ echo "$as_me:24210: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -24216,7 +24217,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:24219: checking for $ac_word" >&5 ++echo "$as_me:24220: 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 +@@ -24231,7 +24232,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_gprconfig_exists="yes" +-echo "$as_me:24234: found $ac_dir/$ac_word" >&5 ++echo "$as_me:24235: found $ac_dir/$ac_word" >&5 + break + done + +@@ -24240,10 +24241,10 @@ + fi + gprconfig_exists=$ac_cv_prog_gprconfig_exists + if test -n "$gprconfig_exists"; then +- echo "$as_me:24243: result: $gprconfig_exists" >&5 ++ echo "$as_me:24244: result: $gprconfig_exists" >&5 + echo "${ECHO_T}$gprconfig_exists" >&6 + else +- echo "$as_me:24246: result: no" >&5 ++ echo "$as_me:24247: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -24256,7 +24257,7 @@ + cd conftest.src + for cf_gprconfig in Ada C + do +- echo "$as_me:24259: checking for gprconfig name for $cf_gprconfig" >&5 ++ echo "$as_me:24260: 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 +@@ -24275,10 +24276,10 @@ + if test -n "$cf_gprconfig_value" + then + eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value +- echo "$as_me:24278: result: $cf_gprconfig_value" >&5 ++ echo "$as_me:24279: result: $cf_gprconfig_value" >&5 + echo "${ECHO_T}$cf_gprconfig_value" >&6 + else +- echo "$as_me:24281: result: missing" >&5 ++ echo "$as_me:24282: result: missing" >&5 + echo "${ECHO_T}missing" >&6 + cf_ada_config="#" + break +@@ -24294,12 +24295,12 @@ + if test "x$cf_ada_config" != "x#" + then + +-echo "$as_me:24297: checking for gnat version" >&5 ++echo "$as_me:24298: 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:24302: result: $cf_gnat_version" >&5 ++echo "$as_me:24303: result: $cf_gnat_version" >&5 + echo "${ECHO_T}$cf_gnat_version" >&6 + + case $cf_gnat_version in +@@ -24307,7 +24308,7 @@ + cf_cv_prog_gnat_correct=yes + ;; + (*) +- { echo "$as_me:24310: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 ++ { echo "$as_me:24311: 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 + ;; +@@ -24315,7 +24316,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:24318: checking for $ac_word" >&5 ++echo "$as_me:24319: 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 +@@ -24330,7 +24331,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_M4_exists="yes" +-echo "$as_me:24333: found $ac_dir/$ac_word" >&5 ++echo "$as_me:24334: found $ac_dir/$ac_word" >&5 + break + done + +@@ -24339,10 +24340,10 @@ + fi + M4_exists=$ac_cv_prog_M4_exists + if test -n "$M4_exists"; then +- echo "$as_me:24342: result: $M4_exists" >&5 ++ echo "$as_me:24343: result: $M4_exists" >&5 + echo "${ECHO_T}$M4_exists" >&6 + else +- echo "$as_me:24345: result: no" >&5 ++ echo "$as_me:24346: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -24351,7 +24352,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:24354: checking if GNAT works" >&5 ++ echo "$as_me:24355: checking if GNAT works" >&5 + echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + + rm -rf conftest* *~conftest* +@@ -24379,7 +24380,7 @@ + fi + rm -rf conftest* *~conftest* + +- echo "$as_me:24382: result: $cf_cv_prog_gnat_correct" >&5 ++ echo "$as_me:24383: result: $cf_cv_prog_gnat_correct" >&5 + echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + else +@@ -24391,7 +24392,7 @@ + + ADAFLAGS="$ADAFLAGS -gnatpn" + +- echo "$as_me:24394: checking optimization options for ADAFLAGS" >&5 ++ echo "$as_me:24395: checking optimization options for ADAFLAGS" >&5 + echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 + case "$CFLAGS" in + (*-g*) +@@ -24408,10 +24409,10 @@ + + ;; + esac +- echo "$as_me:24411: result: $ADAFLAGS" >&5 ++ echo "$as_me:24412: result: $ADAFLAGS" >&5 + echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:24414: checking if GNATPREP supports -T option" >&5 ++echo "$as_me:24415: 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 +@@ -24421,11 +24422,11 @@ + gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes + + fi +-echo "$as_me:24424: result: $cf_cv_gnatprep_opt_t" >&5 ++echo "$as_me:24425: 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:24428: checking if GNAT supports generics" >&5 ++echo "$as_me:24429: 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].*) +@@ -24435,7 +24436,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:24438: result: $cf_gnat_generics" >&5 ++echo "$as_me:24439: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -24447,7 +24448,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:24450: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:24451: 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 +@@ -24495,7 +24496,7 @@ + rm -rf conftest* *~conftest* + + fi +-echo "$as_me:24498: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:24499: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test $cf_cv_gnat_sigint = yes ; then +@@ -24508,7 +24509,7 @@ + cf_gnat_projects=no + + if test "$enable_gnat_projects" != no ; then +-echo "$as_me:24511: checking if GNAT supports project files" >&5 ++echo "$as_me:24512: 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]*) +@@ -24571,15 +24572,15 @@ + esac + ;; + esac +-echo "$as_me:24574: result: $cf_gnat_projects" >&5 ++echo "$as_me:24575: 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:24580: checking if GNAT supports libraries" >&5 ++ echo "$as_me:24581: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:24582: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:24583: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -24599,7 +24600,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:24602: checking for ada-compiler" >&5 ++echo "$as_me:24603: 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. +@@ -24610,12 +24611,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:24613: result: $cf_ada_compiler" >&5 ++echo "$as_me:24614: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:24618: checking for ada-include" >&5 ++echo "$as_me:24619: 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. +@@ -24651,7 +24652,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:24654: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:24655: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -24660,10 +24661,10 @@ + fi + eval ADA_INCLUDE="$withval" + +-echo "$as_me:24663: result: $ADA_INCLUDE" >&5 ++echo "$as_me:24664: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:24666: checking for ada-objects" >&5 ++echo "$as_me:24667: 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. +@@ -24699,7 +24700,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:24702: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:24703: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -24708,10 +24709,10 @@ + fi + eval ADA_OBJECTS="$withval" + +-echo "$as_me:24711: result: $ADA_OBJECTS" >&5 ++echo "$as_me:24712: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:24714: checking if an Ada95 shared-library should be built" >&5 ++echo "$as_me:24715: 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. +@@ -24721,14 +24722,14 @@ + else + with_ada_sharedlib=no + fi; +-echo "$as_me:24724: result: $with_ada_sharedlib" >&5 ++echo "$as_me:24725: 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:24731: WARNING: disabling shared-library since GNAT projects are not supported" >&5 ++ { echo "$as_me:24732: 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 +@@ -24746,6 +24747,27 @@ + fi + fi + ++ # allow the Ada binding to be renamed ++ ++echo "$as_me:24752: 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. ++if test "${with_ada_libname+set}" = set; then ++ withval="$with_ada_libname" ++ ADA_LIBNAME=$withval ++else ++ ADA_LIBNAME=AdaCurses ++fi; ++case "x$ADA_LIBNAME" in ++(x|xyes|xno) ++ ADA_LIBNAME=AdaCurses ++ ;; ++esac ++ ++echo "$as_me:24768: result: $ADA_LIBNAME" >&5 ++echo "${ECHO_T}$ADA_LIBNAME" >&6 ++ + fi + fi + else +@@ -24754,13 +24776,13 @@ + + # do this "late" to avoid conflict with header-checks + if test "x$with_widec" = xyes ; then +- echo "$as_me:24757: checking for wchar_t" >&5 ++ echo "$as_me:24779: 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 24763 "configure" ++#line 24785 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -24775,16 +24797,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:24778: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24800: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24781: \$? = $ac_status" >&5 ++ echo "$as_me:24803: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:24784: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24806: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24787: \$? = $ac_status" >&5 ++ echo "$as_me:24809: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_wchar_t=yes + else +@@ -24794,10 +24816,10 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:24797: result: $ac_cv_type_wchar_t" >&5 ++echo "$as_me:24819: result: $ac_cv_type_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 + +-echo "$as_me:24800: checking size of wchar_t" >&5 ++echo "$as_me:24822: 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 +@@ -24806,7 +24828,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >conftest.$ac_ext <<_ACEOF +-#line 24809 "configure" ++#line 24831 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -24818,21 +24840,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:24821: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24843: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24824: \$? = $ac_status" >&5 ++ echo "$as_me:24846: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:24827: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24849: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24830: \$? = $ac_status" >&5 ++ echo "$as_me:24852: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 24835 "configure" ++#line 24857 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -24844,16 +24866,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:24847: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24869: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24850: \$? = $ac_status" >&5 ++ echo "$as_me:24872: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:24853: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24875: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24856: \$? = $ac_status" >&5 ++ echo "$as_me:24878: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break + else +@@ -24869,7 +24891,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 24872 "configure" ++#line 24894 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -24881,16 +24903,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:24884: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24906: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24887: \$? = $ac_status" >&5 ++ echo "$as_me:24909: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:24890: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24912: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24893: \$? = $ac_status" >&5 ++ echo "$as_me:24915: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break + else +@@ -24906,7 +24928,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 24909 "configure" ++#line 24931 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -24918,16 +24940,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:24921: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24943: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24924: \$? = $ac_status" >&5 ++ echo "$as_me:24946: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:24927: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24949: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24930: \$? = $ac_status" >&5 ++ echo "$as_me:24952: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid + else +@@ -24940,12 +24962,12 @@ + ac_cv_sizeof_wchar_t=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:24943: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:24965: 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 24948 "configure" ++#line 24970 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -24961,15 +24983,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:24964: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24986: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24967: \$? = $ac_status" >&5 ++ echo "$as_me:24989: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:24969: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24991: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24972: \$? = $ac_status" >&5 ++ echo "$as_me:24994: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_wchar_t=`cat conftest.val` + else +@@ -24985,7 +25007,7 @@ + ac_cv_sizeof_wchar_t=0 + fi + fi +-echo "$as_me:24988: result: $ac_cv_sizeof_wchar_t" >&5 ++echo "$as_me:25010: result: $ac_cv_sizeof_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:25028: checking for library subsets" >&5 + echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 + LIB_SUBSETS= + +@@ -25045,7 +25067,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:25048: result: $LIB_SUBSETS" >&5 ++echo "$as_me:25070: result: $LIB_SUBSETS" >&5 + echo "${ECHO_T}$LIB_SUBSETS" >&6 + + ### Construct the list of include-directories to be generated +@@ -25076,7 +25098,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:25079: checking default library suffix" >&5 ++echo "$as_me:25101: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -25087,10 +25109,10 @@ + (shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:25090: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:25112: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:25093: checking default library-dependency suffix" >&5 ++echo "$as_me:25115: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case X$DFT_LWR_MODEL in +@@ -25148,10 +25170,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:25151: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:25173: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:25154: checking default object directory" >&5 ++echo "$as_me:25176: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -25167,11 +25189,11 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:25170: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:25192: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + if test "x$cf_with_cxx" = xyes ; then +-echo "$as_me:25174: checking c++ library-dependency suffix" >&5 ++echo "$as_me:25196: 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++) +@@ -25239,7 +25261,7 @@ + fi + + fi +-echo "$as_me:25242: result: $CXX_LIB_SUFFIX" >&5 ++echo "$as_me:25264: result: $CXX_LIB_SUFFIX" >&5 + echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 + + fi +@@ -25415,19 +25437,19 @@ + + if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" + then +- echo "$as_me:25418: checking if linker supports switching between static/dynamic" >&5 ++ echo "$as_me:25440: 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:25427: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:25449: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25430: \$? = $ac_status" >&5 ++ echo "$as_me:25452: \$? = $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 +@@ -25438,10 +25460,10 @@ + + LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 25441 "configure" ++#line 25463 "configure" + #include "confdefs.h" + +-#line 25444 "configure" ++#line 25466 "configure" + #include + int cf_ldflags_static(FILE *fp); + +@@ -25456,16 +25478,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:25459: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25481: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25462: \$? = $ac_status" >&5 ++ echo "$as_me:25484: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:25465: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25487: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25468: \$? = $ac_status" >&5 ++ echo "$as_me:25490: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + # some linkers simply ignore the -dynamic +@@ -25488,7 +25510,7 @@ + rm -f libconftest.* + LIBS="$cf_save_LIBS" + +- echo "$as_me:25491: result: $cf_ldflags_static" >&5 ++ echo "$as_me:25513: result: $cf_ldflags_static" >&5 + echo "${ECHO_T}$cf_ldflags_static" >&6 + + if test $cf_ldflags_static != yes +@@ -25504,7 +25526,7 @@ + ;; + esac + +-echo "$as_me:25507: checking where we will install curses.h" >&5 ++echo "$as_me:25529: checking where we will install curses.h" >&5 + echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 + + includesubdir= +@@ -25514,7 +25536,7 @@ + then + includesubdir="/ncurses${USE_LIB_SUFFIX}" + fi +-echo "$as_me:25517: result: ${includedir}${includesubdir}" >&5 ++echo "$as_me:25539: result: ${includedir}${includesubdir}" >&5 + echo "${ECHO_T}${includedir}${includesubdir}" >&6 + + ### Resolve a conflict between normal and wide-curses by forcing applications +@@ -25522,7 +25544,7 @@ + if test "$with_overwrite" != no ; then + if test "$NCURSES_LIBUTF8" = 1 ; then + NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' +- { echo "$as_me:25525: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 ++ { echo "$as_me:25547: 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 +@@ -25540,7 +25562,7 @@ + ### Construct the list of subdirectories for which we'll customize makefiles + ### with the appropriate compile-rules. + +-echo "$as_me:25543: checking for src modules" >&5 ++echo "$as_me:25565: checking for src modules" >&5 + echo $ECHO_N "checking for src modules... $ECHO_C" >&6 + + # dependencies and linker-arguments for test-programs +@@ -25605,7 +25627,7 @@ + fi + fi + done +-echo "$as_me:25608: result: $cf_cv_src_modules" >&5 ++echo "$as_me:25630: result: $cf_cv_src_modules" >&5 + echo "${ECHO_T}$cf_cv_src_modules" >&6 + + TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" +@@ -25657,6 +25679,7 @@ + fi + + if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then ++ SUB_MAKEFILES="$SUB_MAKEFILES Ada95/src/library.gpr:Ada95/src/library.gpr.in" + SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${USE_CFG_SUFFIX}-config:Ada95/gen/adacurses-config.in" + SUB_MAKEFILES="$SUB_MAKEFILES man/adacurses${USE_CFG_SUFFIX}-config.1:man/MKada_config.in" + fi +@@ -25871,7 +25894,7 @@ + (*-D_XOPEN_SOURCE_EXTENDED*) + test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 + +-echo "${as_me:-configure}:25874: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 ++echo "${as_me:-configure}:25897: 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//'` +@@ -25882,7 +25905,7 @@ + + # Help to automatically enable the extended curses features when using either + # the *-config or the ".pc" files by adding defines. +-echo "$as_me:25885: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 ++echo "$as_me:25908: 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 +@@ -25898,7 +25921,7 @@ + done + test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" + done +-echo "$as_me:25901: result: $PKG_CFLAGS" >&5 ++echo "$as_me:25924: result: $PKG_CFLAGS" >&5 + echo "${ECHO_T}$PKG_CFLAGS" >&6 + + # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. +@@ -25944,8 +25967,6 @@ + MAKE_DATABASE="$MAKE_TERMINFO" + fi + +-SUB_SCRIPTS= +- + if test -n "$PACKAGE" + then + PACKAGE="${PACKAGE}${DFT_ARG_SUFFIX}" +@@ -25961,7 +25982,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}:25964: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 ++echo "${as_me:-configure}:25985: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 + + fi + +@@ -25990,7 +26011,7 @@ + #define HAVE_CURSES_DATA_BOOLNAMES 1 + EOF + +-ac_config_files="$ac_config_files include/MKterm.h.awk include/curses.head:include/curses.h.in include/ncurses_dll.h include/termcap.h include/unctrl.h $SUB_SCRIPTS $SUB_MAKEFILES Makefile" ++ac_config_files="$ac_config_files include/MKterm.h.awk include/curses.head:include/curses.h.in include/ncurses_dll.h include/termcap.h include/unctrl.h $SUB_MAKEFILES Makefile" + ac_config_commands="$ac_config_commands default" + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -26071,7 +26092,7 @@ + : ${CONFIG_STATUS=./config.status} + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:26074: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:26095: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL +@@ -26203,7 +26224,7 @@ + cat >>$CONFIG_STATUS <&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -26266,7 +26287,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:26269: error: unrecognized option: $1 ++ -*) { { echo "$as_me:26290: 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;} +@@ -26285,7 +26306,7 @@ + ## Running config.status. ## + ## ----------------------- ## + +-This file was extended by $as_me 2.52.20190828, executed with ++This file was extended by $as_me 2.52.20190901, executed with + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS +@@ -26381,12 +26402,11 @@ + "include/ncurses_dll.h" ) CONFIG_FILES="$CONFIG_FILES include/ncurses_dll.h" ;; + "include/termcap.h" ) CONFIG_FILES="$CONFIG_FILES include/termcap.h" ;; + "include/unctrl.h" ) CONFIG_FILES="$CONFIG_FILES include/unctrl.h" ;; +- "$SUB_SCRIPTS" ) CONFIG_FILES="$CONFIG_FILES $SUB_SCRIPTS" ;; + "$SUB_MAKEFILES" ) CONFIG_FILES="$CONFIG_FILES $SUB_MAKEFILES" ;; + "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:26389: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:26409: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -26694,6 +26714,7 @@ + s,@ADA_OBJECTS@,$ADA_OBJECTS,;t t + s,@ADA_SHAREDLIB@,$ADA_SHAREDLIB,;t t + s,@MAKE_ADA_SHAREDLIB@,$MAKE_ADA_SHAREDLIB,;t t ++s,@ADA_LIBNAME@,$ADA_LIBNAME,;t t + s,@ACPPFLAGS@,$ACPPFLAGS,;t t + s,@DFT_ARG_SUFFIX@,$DFT_ARG_SUFFIX,;t t + s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t +@@ -26881,7 +26902,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:26884: creating $ac_file" >&5 ++ { echo "$as_me:26905: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -26899,7 +26920,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:26902: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:26923: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -26912,7 +26933,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:26915: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:26936: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -26928,7 +26949,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' $ac_item` + if test -z "$ac_used"; then +- { echo "$as_me:26931: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:26952: 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;} +@@ -26937,7 +26958,7 @@ + fi + ac_seen=`grep '${datarootdir}' $ac_item` + if test -n "$ac_seen"; then +- { echo "$as_me:26940: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:26961: 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;} +@@ -26974,7 +26995,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:26977: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:26998: 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;} +@@ -26985,7 +27006,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:26988: WARNING: Some variables may not be substituted: ++ { echo "$as_me:27009: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -27034,7 +27055,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:27037: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:27058: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -27045,7 +27066,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:27048: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:27069: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -27058,7 +27079,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:27061: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:27082: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -27116,7 +27137,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:27119: $ac_file is unchanged" >&5 ++ { echo "$as_me:27140: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +@@ -27461,7 +27482,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}:27464: testing overriding CXX_MODEL to SHARED ..." 1>&5 ++echo "${as_me:-configure}:27485: testing overriding CXX_MODEL to SHARED ..." 1>&5 + + with_shared_cxx=yes + ;; +Index: configure.in +Prereq: 1.688 +--- ncurses-6.1-20190831+/configure.in 2019-06-30 15:21:02.000000000 +0000 ++++ ncurses-6.1-20190907/configure.in 2019-09-07 20:06:52.000000000 +0000 +@@ -28,14 +28,14 @@ + dnl + dnl Author: Thomas E. Dickey 1995-on + dnl +-dnl $Id: configure.in,v 1.688 2019/06/30 15:21:02 tom Exp $ ++dnl $Id: configure.in,v 1.689 2019/09/07 20:06:52 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.688 $) ++AC_REVISION($Revision: 1.689 $) + AC_INIT(ncurses/base/lib_initscr.c) + AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) + +@@ -58,7 +58,7 @@ + + ### Checks for programs. + AC_ARG_WITH(ada, +- [ --without-ada suppress check for Ada95, don't build demo], ++ [ --without-ada suppress check for Ada compiler, don't build demo], + [cf_with_ada=$withval], + [cf_with_ada=yes]) + +@@ -154,7 +154,7 @@ + [cf_with_cxx_binding=$cf_with_cxx]) + AC_MSG_RESULT($cf_with_cxx_binding) + +-AC_MSG_CHECKING(if you want to build with Ada95) ++AC_MSG_CHECKING(if you want to build with Ada) + AC_MSG_RESULT($cf_with_ada) + + AC_MSG_CHECKING(if you want to install terminal database) +@@ -1884,7 +1884,7 @@ + fi + AC_SUBST(USE_CXX_BOOL) + +-CF_HELP_MESSAGE(Ada95 Binding Options:) ++CF_HELP_MESSAGE(Ada Binding Options:) + + dnl If the Ada95 source-tree is present, add that to the build unless it will + dnl not work, or was not requested. +@@ -1901,7 +1901,7 @@ + fi + + dnl Check for availability of GNU Ada Translator (GNAT). +-dnl At the moment we support no other Ada95 compiler. ++dnl At the moment we support no other Ada compiler. + if test "$cf_with_ada" != "no" ; then + CF_PROG_GNAT + if test "x$cf_cv_prog_gnat_correct" = xyes; then +@@ -1922,6 +1922,9 @@ + CF_WITH_ADA_INCLUDE + CF_WITH_ADA_OBJECTS + CF_WITH_ADA_SHAREDLIB ++ ++ # allow the Ada binding to be renamed ++ CF_WITH_ADA_LIBNAME(AdaCurses) + fi + fi + else +@@ -2201,6 +2204,7 @@ + CF_SRC_MODULES($modules_to_build) + + if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then ++ SUB_MAKEFILES="$SUB_MAKEFILES Ada95/src/library.gpr:Ada95/src/library.gpr.in" + SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${USE_CFG_SUFFIX}-config:Ada95/gen/adacurses-config.in" + SUB_MAKEFILES="$SUB_MAKEFILES man/adacurses${USE_CFG_SUFFIX}-config.1:man/MKada_config.in" + fi +@@ -2345,8 +2349,6 @@ + fi + AC_SUBST(MAKE_DATABASE) + +-SUB_SCRIPTS= +- + dnl Override the package used for exported symbols + if test -n "$PACKAGE" + then +@@ -2397,7 +2399,6 @@ + include/ncurses_dll.h \ + include/termcap.h \ + include/unctrl.h \ +- $SUB_SCRIPTS \ + $SUB_MAKEFILES \ + Makefile,[ + if test "x$cf_with_tests" != xno ; then +Index: dist.mk +Prereq: 1.1303 +--- ncurses-6.1-20190831+/dist.mk 2019-08-31 13:43:44.000000000 +0000 ++++ ncurses-6.1-20190907/dist.mk 2019-09-07 15:19:35.000000000 +0000 +@@ -25,7 +25,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1303 2019/08/31 13:43:44 tom Exp $ ++# $Id: dist.mk,v 1.1304 2019/09/07 15:19: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 = 20190831 ++NCURSES_PATCH = 20190907 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: man/MKada_config.in +Prereq: 1.10 +--- ncurses-6.1-20190831+/man/MKada_config.in 2016-11-05 21:08:21.000000000 +0000 ++++ ncurses-6.1-20190907/man/MKada_config.in 2019-09-07 20:22:51.000000000 +0000 +@@ -1,5 +1,5 @@ + .\"*************************************************************************** +-.\" Copyright (c) 2010-2014,2016 Free Software Foundation, Inc. * ++.\" Copyright (c) 2010-2016,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,28 +26,28 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: MKada_config.in,v 1.10 2016/11/05 21:08:21 tom Exp $ ++.\" $Id: MKada_config.in,v 1.11 2019/09/07 20:22:51 tom Exp $ + .ds C adacurses@USE_CFG_SUFFIX@\-config + .TH ADACURSES "1" "" "" "User Commands" + .SH NAME +-adacurses@USE_CFG_SUFFIX@\-config \- helper script for AdaCurses libraries ++adacurses@USE_CFG_SUFFIX@\-config \- helper script for @ADA_LIBNAME@ libraries + .SH SYNOPSIS + .B \*C + [\fIoptions\fR] + .SH DESCRIPTION + This is a shell script which simplifies configuring an application to use +-the AdaCurses library binding to ncurses. ++the @ADA_LIBNAME@ library binding to ncurses. + .SH OPTIONS + .TP + \fB\-\-cflags\fR +-echos the gnat (Ada compiler) flags needed to compile with AdaCurses. ++echos the gnat (Ada compiler) flags needed to compile with @ADA_LIBNAME@. + .TP + \fB\-\-libs\fR +-echos the gnat libraries needed to link with AdaCurses. ++echos the gnat libraries needed to link with @ADA_LIBNAME@. + .TP + \fB\-\-version\fR + echos the release+patchdate version of the ncurses libraries used +-to configure and build AdaCurses. ++to configure and build @ADA_LIBNAME@. + .TP + \fB\-\-help\fR + prints a list of the \fB\*C\fP script's options. +@@ -60,7 +60,7 @@ + .SH EXAMPLE + .PP + For example, supposing that you want to compile the "Hello World!" +-program for AdaCurses. ++program for @ADA_LIBNAME@. + Make a file named "hello.adb": + .RS + .nf +Index: package/debian-mingw/changelog +--- ncurses-6.1-20190831+/package/debian-mingw/changelog 2019-08-31 13:43:44.000000000 +0000 ++++ ncurses-6.1-20190907/package/debian-mingw/changelog 2019-09-07 15:19:35.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190831) unstable; urgency=low ++ncurses6 (6.1+20190907) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 31 Aug 2019 09:43:44 -0400 ++ -- Thomas E. Dickey Sat, 07 Sep 2019 11:19:35 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.1-20190831+/package/debian-mingw64/changelog 2019-08-31 13:43:44.000000000 +0000 ++++ ncurses-6.1-20190907/package/debian-mingw64/changelog 2019-09-07 15:19:35.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190831) unstable; urgency=low ++ncurses6 (6.1+20190907) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 31 Aug 2019 09:43:44 -0400 ++ -- Thomas E. Dickey Sat, 07 Sep 2019 11:19:35 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.1-20190831+/package/debian/changelog 2019-08-31 13:43:44.000000000 +0000 ++++ ncurses-6.1-20190907/package/debian/changelog 2019-09-07 15:19:35.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190831) unstable; urgency=low ++ncurses6 (6.1+20190907) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 31 Aug 2019 09:43:44 -0400 ++ -- Thomas E. Dickey Sat, 07 Sep 2019 11:19:35 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.349 +--- ncurses-6.1-20190831+/package/mingw-ncurses.nsi 2019-08-31 13:43:44.000000000 +0000 ++++ ncurses-6.1-20190907/package/mingw-ncurses.nsi 2019-09-07 15:19:35.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.349 2019/08/31 13:43:44 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.350 2019/09/07 15:19: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 "0831" ++!define VERSION_MMDD "0907" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.1-20190831+/package/mingw-ncurses.spec 2019-08-31 13:43:44.000000000 +0000 ++++ ncurses-6.1-20190907/package/mingw-ncurses.spec 2019-09-07 15:19:35.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.1 +-Release: 20190831 ++Release: 20190907 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.1-20190831+/package/ncurses.spec 2019-08-31 13:43:44.000000000 +0000 ++++ ncurses-6.1-20190907/package/ncurses.spec 2019-09-07 15:19:35.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.1 +-Release: 20190831 ++Release: 20190907 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.1-20190831+/package/ncursest.spec 2019-08-31 13:43:44.000000000 +0000 ++++ ncurses-6.1-20190907/package/ncursest.spec 2019-09-07 15:19:35.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.1 +-Release: 20190831 ++Release: 20190907 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: test/aclocal.m4 +Prereq: 1.163 +--- ncurses-6.1-20190831+/test/aclocal.m4 2019-01-01 01:46:17.000000000 +0000 ++++ ncurses-6.1-20190907/test/aclocal.m4 2019-09-07 23:58:37.000000000 +0000 +@@ -1,5 +1,5 @@ + dnl*************************************************************************** +-dnl Copyright (c) 2003-2017,2018 Free Software Foundation, Inc. * ++dnl Copyright (c) 2003-2018,2019 Free Software Foundation, Inc. * + dnl * + dnl Permission is hereby granted, free of charge, to any person obtaining a * + dnl copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + dnl authorization. * + dnl*************************************************************************** + dnl +-dnl $Id: aclocal.m4,v 1.163 2019/01/01 01:46:17 tom Exp $ ++dnl $Id: aclocal.m4,v 1.165 2019/09/07 23:58:37 tom Exp $ + dnl + dnl Author: Thomas E. Dickey + dnl +@@ -597,6 +597,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_CURSES_ACS_MAP version: 7 updated: 2012/10/06 16:39:58 + dnl ----------------- + dnl Check for likely values of acs_map[]: +@@ -1606,9 +1660,10 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GCC_VERSION version: 7 updated: 2012/10/18 06:46:33 ++dnl CF_GCC_VERSION version: 8 updated: 2019/09/07 13:38:36 + dnl -------------- +-dnl Find version of gcc ++dnl Find version of gcc, and (because icc/clang pretend to be gcc without being ++dnl compatible), attempt to determine if icc/clang is actually used. + AC_DEFUN([CF_GCC_VERSION],[ + AC_REQUIRE([AC_PROG_CC]) + GCC_VERSION=none +@@ -1618,9 +1673,11 @@ + test -z "$GCC_VERSION" && GCC_VERSION=unknown + AC_MSG_RESULT($GCC_VERSION) + fi ++CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) ++CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GCC_WARNINGS version: 33 updated: 2018/06/20 20:23:13 ++dnl CF_GCC_WARNINGS version: 36 updated: 2019/09/07 13:38:36 + 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: +@@ -1642,14 +1699,11 @@ + AC_DEFUN([CF_GCC_WARNINGS], + [ + 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 <&6 + fi + +-echo "$as_me:1859: checking for $CC option to accept ANSI C" >&5 ++INTEL_COMPILER=no ++ ++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 $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" ++#include "confdefs.h" ++ ++int ++main (void) ++{ ++ ++#ifdef __INTEL_COMPILER ++#else ++make an error ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:1886: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:1889: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:1892: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:1895: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ INTEL_COMPILER=yes ++cf_save_CFLAGS="$cf_save_CFLAGS -we147" ++ ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$cf_save_CFLAGS" ++ echo "$as_me:1906: result: $INTEL_COMPILER" >&5 ++echo "${ECHO_T}$INTEL_COMPILER" >&6 ++ ;; ++ esac ++fi ++ ++CLANG_COMPILER=no ++ ++if test "$GCC" = yes ; then ++ echo "$as_me:1915: checking if this is really Clang C compiler" >&5 ++echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 ++ cf_save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Qunused-arguments" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 1920 "configure" ++#include "confdefs.h" ++ ++int ++main (void) ++{ ++ ++#ifdef __clang__ ++#else ++make an error ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:1937: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:1940: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:1943: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:1946: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ CLANG_COMPILER=yes ++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" ++ ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$cf_save_CFLAGS" ++ echo "$as_me:1957: 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 $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 +@@ -1864,7 +1966,7 @@ + ac_cv_prog_cc_stdc=no + ac_save_CC=$CC + cat >conftest.$ac_ext <<_ACEOF +-#line 1867 "configure" ++#line 1969 "configure" + #include "confdefs.h" + #include + #include +@@ -1913,16 +2015,16 @@ + do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1916: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2018: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1919: \$? = $ac_status" >&5 ++ echo "$as_me:2021: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1922: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2024: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1925: \$? = $ac_status" >&5 ++ echo "$as_me:2027: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg + break +@@ -1939,10 +2041,10 @@ + + case "x$ac_cv_prog_cc_stdc" in + x|xno) +- echo "$as_me:1942: result: none needed" >&5 ++ echo "$as_me:2044: result: none needed" >&5 + echo "${ECHO_T}none needed" >&6 ;; + *) +- echo "$as_me:1945: result: $ac_cv_prog_cc_stdc" >&5 ++ echo "$as_me:2047: result: $ac_cv_prog_cc_stdc" >&5 + echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; + esac +@@ -1950,13 +2052,13 @@ + # This should have been defined by AC_PROG_CC + : ${CC:=cc} + +-echo "$as_me:1953: checking \$CFLAGS variable" >&5 ++echo "$as_me:2055: checking \$CFLAGS variable" >&5 + echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 + case "x$CFLAGS" in + (*-[IUD]*) +- echo "$as_me:1957: result: broken" >&5 ++ echo "$as_me:2059: result: broken" >&5 + echo "${ECHO_T}broken" >&6 +- { echo "$as_me:1959: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 ++ { echo "$as_me:2061: 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= +@@ -2064,18 +2166,18 @@ + done + ;; + (*) +- echo "$as_me:2067: result: ok" >&5 ++ echo "$as_me:2169: result: ok" >&5 + echo "${ECHO_T}ok" >&6 + ;; + esac + +-echo "$as_me:2072: checking \$CC variable" >&5 ++echo "$as_me:2174: checking \$CC variable" >&5 + echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 + case "$CC" in + (*[\ \ ]-*) +- echo "$as_me:2076: result: broken" >&5 ++ echo "$as_me:2178: result: broken" >&5 + echo "${ECHO_T}broken" >&6 +- { echo "$as_me:2078: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 ++ { echo "$as_me:2180: 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/[ ]*[ ]-[^ ].*//'` +@@ -2192,24 +2294,24 @@ + done + test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 + +-echo "${as_me:-configure}:2195: testing resulting CC: '$CC' ..." 1>&5 ++echo "${as_me:-configure}:2297: testing resulting CC: '$CC' ..." 1>&5 + + test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 + +-echo "${as_me:-configure}:2199: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 ++echo "${as_me:-configure}:2301: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 + + test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 + +-echo "${as_me:-configure}:2203: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ++echo "${as_me:-configure}:2305: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 + + ;; + (*) +- echo "$as_me:2207: result: ok" >&5 ++ echo "$as_me:2309: result: ok" >&5 + echo "${ECHO_T}ok" >&6 + ;; + esac + +-echo "$as_me:2212: checking for inline" >&5 ++echo "$as_me:2314: 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 +@@ -2217,7 +2319,7 @@ + ac_cv_c_inline=no + for ac_kw in inline __inline__ __inline; do + cat >conftest.$ac_ext <<_ACEOF +-#line 2220 "configure" ++#line 2322 "configure" + #include "confdefs.h" + #ifndef __cplusplus + static $ac_kw int static_foo () {return 0; } +@@ -2226,16 +2328,16 @@ + + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2229: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2331: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2232: \$? = $ac_status" >&5 ++ echo "$as_me:2334: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2235: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2337: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2238: \$? = $ac_status" >&5 ++ echo "$as_me:2340: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_inline=$ac_kw; break + else +@@ -2246,7 +2348,7 @@ + done + + fi +-echo "$as_me:2249: result: $ac_cv_c_inline" >&5 ++echo "$as_me:2351: result: $ac_cv_c_inline" >&5 + echo "${ECHO_T}$ac_cv_c_inline" >&6 + case $ac_cv_c_inline in + inline | yes) ;; +@@ -2267,7 +2369,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:2270: checking how to run the C preprocessor" >&5 ++echo "$as_me:2372: 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 +@@ -2288,18 +2390,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 2291 "configure" ++#line 2393 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:2296: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:2398: \"$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:2302: \$? = $ac_status" >&5 ++ echo "$as_me:2404: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2322,17 +2424,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 2325 "configure" ++#line 2427 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:2329: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:2431: \"$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:2335: \$? = $ac_status" >&5 ++ echo "$as_me:2437: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2369,7 +2471,7 @@ + else + ac_cv_prog_CPP=$CPP + fi +-echo "$as_me:2372: result: $CPP" >&5 ++echo "$as_me:2474: result: $CPP" >&5 + echo "${ECHO_T}$CPP" >&6 + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes +@@ -2379,18 +2481,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 2382 "configure" ++#line 2484 "configure" + #include "confdefs.h" + #include + Syntax error + _ACEOF +-if { (eval echo "$as_me:2387: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:2489: \"$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:2393: \$? = $ac_status" >&5 ++ echo "$as_me:2495: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2413,17 +2515,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 2416 "configure" ++#line 2518 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:2420: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:2522: \"$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:2426: \$? = $ac_status" >&5 ++ echo "$as_me:2528: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2451,7 +2553,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:2454: error: C preprocessor \"$CPP\" fails sanity check" >&5 ++ { { echo "$as_me:2556: error: C preprocessor \"$CPP\" fails sanity check" >&5 + echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -2467,7 +2569,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:2470: checking for $ac_word" >&5 ++echo "$as_me:2572: 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 +@@ -2482,7 +2584,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AWK="$ac_prog" +-echo "$as_me:2485: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2587: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2490,10 +2592,10 @@ + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- echo "$as_me:2493: result: $AWK" >&5 ++ echo "$as_me:2595: result: $AWK" >&5 + echo "${ECHO_T}$AWK" >&6 + else +- echo "$as_me:2496: result: no" >&5 ++ echo "$as_me:2598: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2512,7 +2614,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:2515: checking for a BSD compatible install" >&5 ++echo "$as_me:2617: 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 +@@ -2561,7 +2663,7 @@ + INSTALL=$ac_install_sh + fi + fi +-echo "$as_me:2564: result: $INSTALL" >&5 ++echo "$as_me:2666: result: $INSTALL" >&5 + echo "${ECHO_T}$INSTALL" >&6 + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -2582,7 +2684,7 @@ + ;; + esac + +-echo "$as_me:2585: checking if you want to install stripped executables" >&5 ++echo "$as_me:2687: 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. +@@ -2599,7 +2701,7 @@ + with_stripping=yes + + fi; +-echo "$as_me:2602: result: $with_stripping" >&5 ++echo "$as_me:2704: result: $with_stripping" >&5 + echo "${ECHO_T}$with_stripping" >&6 + + if test "$with_stripping" = yes +@@ -2610,7 +2712,7 @@ + fi + + : ${INSTALL:=install} +-echo "$as_me:2613: checking if install accepts -p option" >&5 ++echo "$as_me:2715: 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 +@@ -2641,10 +2743,10 @@ + rm -rf conftest* + + fi +-echo "$as_me:2644: result: $cf_cv_install_p" >&5 ++echo "$as_me:2746: result: $cf_cv_install_p" >&5 + echo "${ECHO_T}$cf_cv_install_p" >&6 + +-echo "$as_me:2647: checking if install needs to be told about ownership" >&5 ++echo "$as_me:2749: 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) +@@ -2655,7 +2757,7 @@ + ;; + esac + +-echo "$as_me:2658: result: $with_install_o" >&5 ++echo "$as_me:2760: result: $with_install_o" >&5 + echo "${ECHO_T}$with_install_o" >&6 + if test "x$with_install_o" = xyes + then +@@ -2668,7 +2770,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:2671: checking for $ac_word" >&5 ++echo "$as_me:2773: 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 +@@ -2683,7 +2785,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LINT="$ac_prog" +-echo "$as_me:2686: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2788: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2691,17 +2793,17 @@ + fi + LINT=$ac_cv_prog_LINT + if test -n "$LINT"; then +- echo "$as_me:2694: result: $LINT" >&5 ++ echo "$as_me:2796: result: $LINT" >&5 + echo "${ECHO_T}$LINT" >&6 + else +- echo "$as_me:2697: result: no" >&5 ++ echo "$as_me:2799: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + test -n "$LINT" && break + done + +-echo "$as_me:2704: checking if filesystem supports mixed-case filenames" >&5 ++echo "$as_me:2806: 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 +@@ -2728,7 +2830,7 @@ + fi + + fi +-echo "$as_me:2731: result: $cf_cv_mixedcase" >&5 ++echo "$as_me:2833: result: $cf_cv_mixedcase" >&5 + echo "${ECHO_T}$cf_cv_mixedcase" >&6 + test "$cf_cv_mixedcase" = yes && + cat >>confdefs.h <<\EOF +@@ -2739,7 +2841,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:2742: checking for $ac_word" >&5 ++echo "$as_me:2844: 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 +@@ -2754,7 +2856,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CTAGS="$ac_prog" +-echo "$as_me:2757: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2859: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2762,10 +2864,10 @@ + fi + CTAGS=$ac_cv_prog_CTAGS + if test -n "$CTAGS"; then +- echo "$as_me:2765: result: $CTAGS" >&5 ++ echo "$as_me:2867: result: $CTAGS" >&5 + echo "${ECHO_T}$CTAGS" >&6 + else +- echo "$as_me:2768: result: no" >&5 ++ echo "$as_me:2870: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2776,7 +2878,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:2779: checking for $ac_word" >&5 ++echo "$as_me:2881: 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 +@@ -2791,7 +2893,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ETAGS="$ac_prog" +-echo "$as_me:2794: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2896: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2799,10 +2901,10 @@ + fi + ETAGS=$ac_cv_prog_ETAGS + if test -n "$ETAGS"; then +- echo "$as_me:2802: result: $ETAGS" >&5 ++ echo "$as_me:2904: result: $ETAGS" >&5 + echo "${ECHO_T}$ETAGS" >&6 + else +- echo "$as_me:2805: result: no" >&5 ++ echo "$as_me:2907: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2811,7 +2913,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:2814: checking for $ac_word" >&5 ++echo "$as_me:2916: 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 +@@ -2826,7 +2928,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:2829: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2931: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2835,17 +2937,17 @@ + fi + MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS + if test -n "$MAKE_LOWER_TAGS"; then +- echo "$as_me:2838: result: $MAKE_LOWER_TAGS" >&5 ++ echo "$as_me:2940: result: $MAKE_LOWER_TAGS" >&5 + echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 + else +- echo "$as_me:2841: result: no" >&5 ++ echo "$as_me:2943: 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:2848: checking for $ac_word" >&5 ++echo "$as_me:2950: 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 +@@ -2860,7 +2962,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:2863: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2965: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2869,10 +2971,10 @@ + fi + MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS + if test -n "$MAKE_UPPER_TAGS"; then +- echo "$as_me:2872: result: $MAKE_UPPER_TAGS" >&5 ++ echo "$as_me:2974: result: $MAKE_UPPER_TAGS" >&5 + echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 + else +- echo "$as_me:2875: result: no" >&5 ++ echo "$as_me:2977: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2892,14 +2994,14 @@ + MAKE_LOWER_TAGS="#" + fi + +-echo "$as_me:2895: checking if -lm needed for math functions" >&5 ++echo "$as_me:2997: 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 2902 "configure" ++#line 3004 "configure" + #include "confdefs.h" + + #include +@@ -2915,16 +3017,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:2918: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:3020: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:2921: \$? = $ac_status" >&5 ++ echo "$as_me:3023: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:2924: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3026: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2927: \$? = $ac_status" >&5 ++ echo "$as_me:3029: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_need_libm=no + else +@@ -2934,7 +3036,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:2937: result: $cf_cv_need_libm" >&5 ++echo "$as_me:3039: result: $cf_cv_need_libm" >&5 + echo "${ECHO_T}$cf_cv_need_libm" >&6 + if test "$cf_cv_need_libm" = yes + then +@@ -2993,10 +3095,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:2996: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:3098: 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:3150: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3051: \$? = $ac_status" >&5 ++ echo "$as_me:3153: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:3053: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:3155: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case $cf_attribute in +@@ -3109,7 +3211,7 @@ + rm -rf conftest* + fi + +-echo "$as_me:3112: checking if you want to work around bogus compiler/loader warnings" >&5 ++echo "$as_me:3214: 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. +@@ -3119,7 +3221,7 @@ + else + with_string_hacks=no + fi; +-echo "$as_me:3122: result: $with_string_hacks" >&5 ++echo "$as_me:3224: result: $with_string_hacks" >&5 + echo "${ECHO_T}$with_string_hacks" >&6 + + if test "x$with_string_hacks" = "xyes"; then +@@ -3128,15 +3230,15 @@ + #define USE_STRING_HACKS 1 + EOF + +- { echo "$as_me:3131: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 ++ { echo "$as_me:3233: 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:3133: checking for strlcat" >&5 ++ echo "$as_me:3235: 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 3139 "configure" ++#line 3241 "configure" + #include "confdefs.h" + #define strlcat autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -3167,16 +3269,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:3170: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:3272: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:3173: \$? = $ac_status" >&5 ++ echo "$as_me:3275: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:3176: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3278: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3179: \$? = $ac_status" >&5 ++ echo "$as_me:3281: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_strlcat=yes + else +@@ -3186,7 +3288,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:3189: result: $ac_cv_func_strlcat" >&5 ++echo "$as_me:3291: result: $ac_cv_func_strlcat" >&5 + echo "${ECHO_T}$ac_cv_func_strlcat" >&6 + if test $ac_cv_func_strlcat = yes; then + +@@ -3196,7 +3298,7 @@ + + else + +- echo "$as_me:3199: checking for strlcat in -lbsd" >&5 ++ echo "$as_me:3301: 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 +@@ -3204,7 +3306,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 3207 "configure" ++#line 3309 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -3223,16 +3325,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:3226: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:3328: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:3229: \$? = $ac_status" >&5 ++ echo "$as_me:3331: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:3232: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3334: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3235: \$? = $ac_status" >&5 ++ echo "$as_me:3337: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_strlcat=yes + else +@@ -3243,7 +3345,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:3246: result: $ac_cv_lib_bsd_strlcat" >&5 ++echo "$as_me:3348: 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 + +@@ -3266,23 +3368,23 @@ + for ac_header in bsd/string.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:3269: checking for $ac_header" >&5 ++echo "$as_me:3371: 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 3275 "configure" ++#line 3377 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:3279: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:3381: \"$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:3285: \$? = $ac_status" >&5 ++ echo "$as_me:3387: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -3301,7 +3403,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:3304: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:3406: 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:3427: 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 3331 "configure" ++#line 3433 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -3359,16 +3461,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:3362: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:3464: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:3365: \$? = $ac_status" >&5 ++ echo "$as_me:3467: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:3368: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3470: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3371: \$? = $ac_status" >&5 ++ echo "$as_me:3473: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -3378,7 +3480,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:3381: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:3483: 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:3495: 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 3400 "configure" ++#line 3502 "configure" + #include "confdefs.h" + #include + int +@@ -3416,16 +3518,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3419: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3521: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3422: \$? = $ac_status" >&5 ++ echo "$as_me:3524: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3425: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3527: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3428: \$? = $ac_status" >&5 ++ echo "$as_me:3530: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_visible=no + else +@@ -3436,7 +3538,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:3439: result: $cf_cv_posix_visible" >&5 ++echo "$as_me:3541: result: $cf_cv_posix_visible" >&5 + echo "${ECHO_T}$cf_cv_posix_visible" >&6 + + if test "$cf_cv_posix_visible" = no; then +@@ -3481,14 +3583,14 @@ + + cf_gnu_xopen_source=$cf_XOPEN_SOURCE + +-echo "$as_me:3484: checking if this is the GNU C library" >&5 ++echo "$as_me:3586: 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 3491 "configure" ++#line 3593 "configure" + #include "confdefs.h" + #include + int +@@ -3507,16 +3609,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3510: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3612: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3513: \$? = $ac_status" >&5 ++ echo "$as_me:3615: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3516: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3618: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3519: \$? = $ac_status" >&5 ++ echo "$as_me:3621: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_library=yes + else +@@ -3527,7 +3629,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:3530: result: $cf_cv_gnu_library" >&5 ++echo "$as_me:3632: result: $cf_cv_gnu_library" >&5 + echo "${ECHO_T}$cf_cv_gnu_library" >&6 + + if test x$cf_cv_gnu_library = xyes; then +@@ -3535,7 +3637,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:3538: checking if _DEFAULT_SOURCE can be used as a basis" >&5 ++ echo "$as_me:3640: 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 +@@ -3547,7 +3649,7 @@ + CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + + cat >conftest.$ac_ext <<_ACEOF +-#line 3550 "configure" ++#line 3652 "configure" + #include "confdefs.h" + #include + int +@@ -3566,16 +3668,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3569: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3671: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3572: \$? = $ac_status" >&5 ++ echo "$as_me:3674: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3575: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3677: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3578: \$? = $ac_status" >&5 ++ echo "$as_me:3680: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_library_219=yes + else +@@ -3587,12 +3689,12 @@ + CPPFLAGS="$cf_save" + + fi +-echo "$as_me:3590: result: $cf_cv_gnu_library_219" >&5 ++echo "$as_me:3692: 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:3595: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 ++ echo "$as_me:3697: 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 +@@ -3697,7 +3799,7 @@ + fi + + cat >conftest.$ac_ext <<_ACEOF +-#line 3700 "configure" ++#line 3802 "configure" + #include "confdefs.h" + + #include +@@ -3717,16 +3819,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3720: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3822: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3723: \$? = $ac_status" >&5 ++ echo "$as_me:3825: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3726: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3828: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3729: \$? = $ac_status" >&5 ++ echo "$as_me:3831: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_dftsrc_219=yes + else +@@ -3737,7 +3839,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:3740: result: $cf_cv_gnu_dftsrc_219" >&5 ++echo "$as_me:3842: 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 +@@ -3746,14 +3848,14 @@ + + if test "x$cf_cv_gnu_dftsrc_219" != xyes; then + +- echo "$as_me:3749: checking if we must define _GNU_SOURCE" >&5 ++ echo "$as_me:3851: 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 3756 "configure" ++#line 3858 "configure" + #include "confdefs.h" + #include + int +@@ -3768,16 +3870,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3771: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3873: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3774: \$? = $ac_status" >&5 ++ echo "$as_me:3876: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3777: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3879: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3780: \$? = $ac_status" >&5 ++ echo "$as_me:3882: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no + else +@@ -3884,7 +3986,7 @@ + fi + + cat >conftest.$ac_ext <<_ACEOF +-#line 3887 "configure" ++#line 3989 "configure" + #include "confdefs.h" + #include + int +@@ -3899,16 +4001,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3902: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4004: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3905: \$? = $ac_status" >&5 ++ echo "$as_me:4007: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3908: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4010: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3911: \$? = $ac_status" >&5 ++ echo "$as_me:4013: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no + else +@@ -3923,12 +4025,12 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:3926: result: $cf_cv_gnu_source" >&5 ++echo "$as_me:4028: 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:3931: checking if we should also define _DEFAULT_SOURCE" >&5 ++ echo "$as_me:4033: 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 +@@ -3938,7 +4040,7 @@ + CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" + + cat >conftest.$ac_ext <<_ACEOF +-#line 3941 "configure" ++#line 4043 "configure" + #include "confdefs.h" + #include + int +@@ -3953,16 +4055,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3956: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4058: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3959: \$? = $ac_status" >&5 ++ echo "$as_me:4061: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3962: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4064: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3965: \$? = $ac_status" >&5 ++ echo "$as_me:4067: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_default_source=no + else +@@ -3973,7 +4075,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:3976: result: $cf_cv_default_source" >&5 ++echo "$as_me:4078: result: $cf_cv_default_source" >&5 + echo "${ECHO_T}$cf_cv_default_source" >&6 + if test "$cf_cv_default_source" = yes + then +@@ -4010,16 +4112,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:4013: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:4115: 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}:4019: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:4121: testing if the symbol is already defined go no further ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 4022 "configure" ++#line 4124 "configure" + #include "confdefs.h" + #include + int +@@ -4034,16 +4136,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4037: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4139: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4040: \$? = $ac_status" >&5 ++ echo "$as_me:4142: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4043: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4145: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4046: \$? = $ac_status" >&5 ++ echo "$as_me:4148: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_c_source=no + else +@@ -4064,7 +4166,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 4067 "configure" ++#line 4169 "configure" + #include "confdefs.h" + #include + int +@@ -4079,16 +4181,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4082: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4184: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4085: \$? = $ac_status" >&5 ++ echo "$as_me:4187: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4088: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4190: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4091: \$? = $ac_status" >&5 ++ echo "$as_me:4193: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -4099,7 +4201,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + +-echo "${as_me:-configure}:4102: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:4204: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -4107,10 +4209,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:4110: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:4212: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 4113 "configure" ++#line 4215 "configure" + #include "confdefs.h" + #include + int +@@ -4125,16 +4227,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4128: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4230: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4131: \$? = $ac_status" >&5 ++ echo "$as_me:4233: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4134: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4236: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4137: \$? = $ac_status" >&5 ++ echo "$as_me:4239: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -4150,7 +4252,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:4153: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:4255: 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 +@@ -4290,14 +4392,14 @@ + ;; + (*) + +-echo "$as_me:4293: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:4395: 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 4300 "configure" ++#line 4402 "configure" + #include "confdefs.h" + + #include +@@ -4316,16 +4418,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4319: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4421: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4322: \$? = $ac_status" >&5 ++ echo "$as_me:4424: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4325: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4427: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4328: \$? = $ac_status" >&5 ++ echo "$as_me:4430: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xopen_source=no + else +@@ -4337,7 +4439,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >conftest.$ac_ext <<_ACEOF +-#line 4340 "configure" ++#line 4442 "configure" + #include "confdefs.h" + + #include +@@ -4356,16 +4458,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4359: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4461: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4362: \$? = $ac_status" >&5 ++ echo "$as_me:4464: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4365: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4467: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4368: \$? = $ac_status" >&5 ++ echo "$as_me:4470: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xopen_source=no + else +@@ -4380,7 +4482,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:4383: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:4485: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -4510,16 +4612,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:4513: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:4615: 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}:4519: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:4621: testing if the symbol is already defined go no further ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 4522 "configure" ++#line 4624 "configure" + #include "confdefs.h" + #include + int +@@ -4534,16 +4636,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4537: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4639: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4540: \$? = $ac_status" >&5 ++ echo "$as_me:4642: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4543: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4645: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4546: \$? = $ac_status" >&5 ++ echo "$as_me:4648: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_c_source=no + else +@@ -4564,7 +4666,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 4567 "configure" ++#line 4669 "configure" + #include "confdefs.h" + #include + int +@@ -4579,16 +4681,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4582: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4684: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4585: \$? = $ac_status" >&5 ++ echo "$as_me:4687: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4588: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4690: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4591: \$? = $ac_status" >&5 ++ echo "$as_me:4693: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -4599,7 +4701,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + +-echo "${as_me:-configure}:4602: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:4704: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" +@@ -4607,10 +4709,10 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +-echo "${as_me:-configure}:4610: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:4712: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 4613 "configure" ++#line 4715 "configure" + #include "confdefs.h" + #include + int +@@ -4625,16 +4727,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4628: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4730: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4631: \$? = $ac_status" >&5 ++ echo "$as_me:4733: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4634: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4736: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4637: \$? = $ac_status" >&5 ++ echo "$as_me:4739: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -4650,7 +4752,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:4653: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:4755: 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 +@@ -4844,7 +4946,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me:-configure}:4847: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me:-configure}:4949: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" +@@ -4854,7 +4956,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me:-configure}:4857: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me:-configure}:4959: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +@@ -4864,7 +4966,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}:4867: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me:-configure}:4969: 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" +@@ -4874,10 +4976,10 @@ + fi + + if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then +- echo "$as_me:4877: checking if _XOPEN_SOURCE really is set" >&5 ++ echo "$as_me:4979: 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 4880 "configure" ++#line 4982 "configure" + #include "confdefs.h" + #include + int +@@ -4892,16 +4994,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4895: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4997: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4898: \$? = $ac_status" >&5 ++ echo "$as_me:5000: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4901: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5003: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4904: \$? = $ac_status" >&5 ++ echo "$as_me:5006: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_XOPEN_SOURCE_set=yes + else +@@ -4910,12 +5012,12 @@ + cf_XOPEN_SOURCE_set=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:4913: result: $cf_XOPEN_SOURCE_set" >&5 ++ echo "$as_me:5015: 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 4918 "configure" ++#line 5020 "configure" + #include "confdefs.h" + #include + int +@@ -4930,16 +5032,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4933: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5035: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4936: \$? = $ac_status" >&5 ++ echo "$as_me:5038: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4939: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5041: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4942: \$? = $ac_status" >&5 ++ echo "$as_me:5044: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_XOPEN_SOURCE_set_ok=yes + else +@@ -4950,19 +5052,19 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + if test $cf_XOPEN_SOURCE_set_ok = no + then +- { echo "$as_me:4953: WARNING: _XOPEN_SOURCE is lower than requested" >&5 ++ { echo "$as_me:5055: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} + fi + else + +-echo "$as_me:4958: checking if we should define _XOPEN_SOURCE" >&5 ++echo "$as_me:5060: 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 4965 "configure" ++#line 5067 "configure" + #include "confdefs.h" + + #include +@@ -4981,16 +5083,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4984: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5086: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4987: \$? = $ac_status" >&5 ++ echo "$as_me:5089: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4990: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5092: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4993: \$? = $ac_status" >&5 ++ echo "$as_me:5095: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xopen_source=no + else +@@ -5002,7 +5104,7 @@ + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >conftest.$ac_ext <<_ACEOF +-#line 5005 "configure" ++#line 5107 "configure" + #include "confdefs.h" + + #include +@@ -5021,16 +5123,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5024: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5126: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5027: \$? = $ac_status" >&5 ++ echo "$as_me:5129: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5030: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5132: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5033: \$? = $ac_status" >&5 ++ echo "$as_me:5135: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xopen_source=no + else +@@ -5045,7 +5147,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:5048: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:5150: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + + if test "$cf_cv_xopen_source" != no ; then +@@ -5164,7 +5266,7 @@ + fi + fi # cf_cv_posix_visible + +-echo "$as_me:5167: checking for signal global datatype" >&5 ++echo "$as_me:5269: 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 +@@ -5176,7 +5278,7 @@ + "int" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 5179 "configure" ++#line 5281 "configure" + #include "confdefs.h" + + #include +@@ -5199,16 +5301,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5202: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5304: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5205: \$? = $ac_status" >&5 ++ echo "$as_me:5307: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5208: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5310: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5211: \$? = $ac_status" >&5 ++ echo "$as_me:5313: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sig_atomic_t=$cf_type + else +@@ -5222,7 +5324,7 @@ + + fi + +-echo "$as_me:5225: result: $cf_cv_sig_atomic_t" >&5 ++echo "$as_me:5327: 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:5336: 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 5241 "configure" ++#line 5343 "configure" + #include "confdefs.h" + + #include +@@ -5253,23 +5355,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5256: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5358: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5259: \$? = $ac_status" >&5 ++ echo "$as_me:5361: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5262: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5364: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5265: \$? = $ac_status" >&5 ++ echo "$as_me:5367: \$? = $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 5272 "configure" ++#line 5374 "configure" + #include "confdefs.h" + + #undef _XOPEN_SOURCE +@@ -5287,16 +5389,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5290: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5392: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5293: \$? = $ac_status" >&5 ++ echo "$as_me:5395: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5296: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5398: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5299: \$? = $ac_status" >&5 ++ echo "$as_me:5401: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_define_sigwinch=maybe + else +@@ -5310,11 +5412,11 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:5313: result: $cf_cv_define_sigwinch" >&5 ++echo "$as_me:5415: 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:5317: checking for actual SIGWINCH definition" >&5 ++echo "$as_me:5419: 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 +@@ -5325,7 +5427,7 @@ + while test $cf_sigwinch != 1 + do + cat >conftest.$ac_ext <<_ACEOF +-#line 5328 "configure" ++#line 5430 "configure" + #include "confdefs.h" + + #undef _XOPEN_SOURCE +@@ -5347,16 +5449,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5350: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5452: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5353: \$? = $ac_status" >&5 ++ echo "$as_me:5455: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5356: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5458: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5359: \$? = $ac_status" >&5 ++ echo "$as_me:5461: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_fixup_sigwinch=$cf_sigwinch + break +@@ -5370,7 +5472,7 @@ + done + + fi +-echo "$as_me:5373: result: $cf_cv_fixup_sigwinch" >&5 ++echo "$as_me:5475: result: $cf_cv_fixup_sigwinch" >&5 + echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 + + if test "$cf_cv_fixup_sigwinch" != unknown ; then +@@ -5380,13 +5482,13 @@ + + # Checks for CODESET support. + +-echo "$as_me:5383: checking for nl_langinfo and CODESET" >&5 ++echo "$as_me:5485: 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 5389 "configure" ++#line 5491 "configure" + #include "confdefs.h" + #include + int +@@ -5398,16 +5500,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5401: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5503: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5404: \$? = $ac_status" >&5 ++ echo "$as_me:5506: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5407: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5509: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5410: \$? = $ac_status" >&5 ++ echo "$as_me:5512: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + am_cv_langinfo_codeset=yes + else +@@ -5418,7 +5520,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:5421: result: $am_cv_langinfo_codeset" >&5 ++echo "$as_me:5523: result: $am_cv_langinfo_codeset" >&5 + echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 + if test $am_cv_langinfo_codeset = yes; then + +@@ -5428,7 +5530,7 @@ + + fi + +-echo "$as_me:5431: checking if you want to use pkg-config" >&5 ++echo "$as_me:5533: 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. +@@ -5438,7 +5540,7 @@ + else + cf_pkg_config=yes + fi; +-echo "$as_me:5441: result: $cf_pkg_config" >&5 ++echo "$as_me:5543: result: $cf_pkg_config" >&5 + echo "${ECHO_T}$cf_pkg_config" >&6 + + case $cf_pkg_config in +@@ -5450,7 +5552,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:5453: checking for $ac_word" >&5 ++echo "$as_me:5555: 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 +@@ -5467,7 +5569,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:5470: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:5572: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -5478,10 +5580,10 @@ + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + + if test -n "$PKG_CONFIG"; then +- echo "$as_me:5481: result: $PKG_CONFIG" >&5 ++ echo "$as_me:5583: result: $PKG_CONFIG" >&5 + echo "${ECHO_T}$PKG_CONFIG" >&6 + else +- echo "$as_me:5484: result: no" >&5 ++ echo "$as_me:5586: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5490,7 +5592,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:5493: checking for $ac_word" >&5 ++echo "$as_me:5595: 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 +@@ -5507,7 +5609,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:5510: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:5612: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -5519,10 +5621,10 @@ + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + + if test -n "$ac_pt_PKG_CONFIG"; then +- echo "$as_me:5522: result: $ac_pt_PKG_CONFIG" >&5 ++ echo "$as_me:5624: result: $ac_pt_PKG_CONFIG" >&5 + echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 + else +- echo "$as_me:5525: result: no" >&5 ++ echo "$as_me:5627: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5565,18 +5667,18 @@ + PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:5568: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 ++ { { echo "$as_me:5670: 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:5575: WARNING: pkg-config is not installed" >&5 ++ { echo "$as_me:5677: WARNING: pkg-config is not installed" >&5 + echo "$as_me: WARNING: pkg-config is not installed" >&2;} + fi + +-echo "$as_me:5579: checking if you want to see long compiling messages" >&5 ++echo "$as_me:5681: 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. +@@ -5610,10 +5712,10 @@ + ECHO_CC='' + + fi; +-echo "$as_me:5613: result: $enableval" >&5 ++echo "$as_me:5715: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + +-echo "$as_me:5616: checking for ncurses wrap-prefix" >&5 ++echo "$as_me:5718: 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. +@@ -5623,10 +5725,10 @@ + else + NCURSES_WRAP_PREFIX=_nc_ + fi; +-echo "$as_me:5626: result: $NCURSES_WRAP_PREFIX" >&5 ++echo "$as_me:5728: result: $NCURSES_WRAP_PREFIX" >&5 + echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 + +-echo "$as_me:5629: checking if you want to check for wide-character functions" >&5 ++echo "$as_me:5731: 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. +@@ -5643,10 +5745,10 @@ + cf_enable_widec=yes + + fi; +-echo "$as_me:5646: result: $cf_enable_widec" >&5 ++echo "$as_me:5748: result: $cf_enable_widec" >&5 + echo "${ECHO_T}$cf_enable_widec" >&6 + +-echo "$as_me:5649: checking for specific curses-directory" >&5 ++echo "$as_me:5751: 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. +@@ -5656,7 +5758,7 @@ + else + cf_cv_curses_dir=no + fi; +-echo "$as_me:5659: result: $cf_cv_curses_dir" >&5 ++echo "$as_me:5761: 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" ) +@@ -5687,7 +5789,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:5690: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:5792: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -5723,7 +5825,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +-#line 5726 "configure" ++#line 5828 "configure" + #include "confdefs.h" + #include + int +@@ -5735,16 +5837,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5738: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5840: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5741: \$? = $ac_status" >&5 ++ echo "$as_me:5843: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5744: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5846: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5747: \$? = $ac_status" >&5 ++ echo "$as_me:5849: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -5761,7 +5863,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}:5764: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:5866: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -5797,7 +5899,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}:5800: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:5902: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -5810,7 +5912,7 @@ + + cf_cv_screen=curses + +-echo "$as_me:5813: checking for specified curses library type" >&5 ++echo "$as_me:5915: 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. +@@ -5854,13 +5956,13 @@ + fi; + fi; + +-echo "$as_me:5857: result: $cf_cv_screen" >&5 ++echo "$as_me:5959: result: $cf_cv_screen" >&5 + echo "${ECHO_T}$cf_cv_screen" >&6 + + case $cf_cv_screen in + (curses|curses_*) + +-echo "$as_me:5863: checking for extra include directories" >&5 ++echo "$as_me:5965: 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 +@@ -5886,7 +5988,7 @@ + esac + + fi +-echo "$as_me:5889: result: $cf_cv_curses_incdir" >&5 ++echo "$as_me:5991: result: $cf_cv_curses_incdir" >&5 + echo "${ECHO_T}$cf_cv_curses_incdir" >&6 + if test "$cf_cv_curses_incdir" != no + then +@@ -5896,7 +5998,7 @@ + + fi + +-echo "$as_me:5899: checking if we have identified curses headers" >&5 ++echo "$as_me:6001: 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 +@@ -5908,7 +6010,7 @@ + curses.h ncurses/ncurses.h ncurses/curses.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 5911 "configure" ++#line 6013 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -5920,16 +6022,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5923: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6025: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5926: \$? = $ac_status" >&5 ++ echo "$as_me:6028: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5929: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6031: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5932: \$? = $ac_status" >&5 ++ echo "$as_me:6034: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -5940,11 +6042,11 @@ + done + + fi +-echo "$as_me:5943: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:6045: 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:5947: error: No curses header-files found" >&5 ++ { { echo "$as_me:6049: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5954,23 +6056,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:5957: checking for $ac_header" >&5 ++echo "$as_me:6059: 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 5963 "configure" ++#line 6065 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:5967: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:6069: \"$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:5973: \$? = $ac_status" >&5 ++ echo "$as_me:6075: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -5989,7 +6091,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:5992: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:6094: 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:6104: 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 +@@ -6017,7 +6119,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 6020 "configure" ++#line 6122 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -6032,16 +6134,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6035: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6137: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6038: \$? = $ac_status" >&5 ++ echo "$as_me:6140: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6041: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6143: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6044: \$? = $ac_status" >&5 ++ echo "$as_me:6146: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -6057,7 +6159,7 @@ + done + + fi +-echo "$as_me:6060: result: $cf_cv_term_header" >&5 ++echo "$as_me:6162: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -6089,7 +6191,7 @@ + ;; + esac + +-echo "$as_me:6092: checking for ncurses version" >&5 ++echo "$as_me:6194: 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 +@@ -6115,10 +6217,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:6118: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:6220: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:6121: \$? = $ac_status" >&5 ++ echo "$as_me:6223: \$? = $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%".*%%'` +@@ -6128,7 +6230,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 6131 "configure" ++#line 6233 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -6153,15 +6255,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:6156: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6258: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6159: \$? = $ac_status" >&5 ++ echo "$as_me:6261: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:6161: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6263: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6164: \$? = $ac_status" >&5 ++ echo "$as_me:6266: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -6175,17 +6277,17 @@ + rm -f $cf_tempfile + + fi +-echo "$as_me:6178: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:6280: 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:6185: checking if we have identified curses libraries" >&5 ++echo "$as_me:6287: 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 6188 "configure" ++#line 6290 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6197,16 +6299,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6200: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6302: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6203: \$? = $ac_status" >&5 ++ echo "$as_me:6305: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6206: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6308: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6209: \$? = $ac_status" >&5 ++ echo "$as_me:6311: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -6215,13 +6317,13 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-echo "$as_me:6218: result: $cf_result" >&5 ++echo "$as_me:6320: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + + if test "$cf_result" = no ; then + case $host_os in + (freebsd*) +- echo "$as_me:6224: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:6326: 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 +@@ -6229,7 +6331,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6232 "configure" ++#line 6334 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6248,16 +6350,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6251: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6353: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6254: \$? = $ac_status" >&5 ++ echo "$as_me:6356: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6257: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6359: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6260: \$? = $ac_status" >&5 ++ echo "$as_me:6362: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -6268,7 +6370,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6271: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:6373: 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 + +@@ -6298,7 +6400,7 @@ + # term.h) for cur_colr + if test "x$cf_cv_screen" = "xcurses_colr" + then +- echo "$as_me:6301: checking for initscr in -lcur_colr" >&5 ++ echo "$as_me:6403: 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 +@@ -6306,7 +6408,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lcur_colr $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6309 "configure" ++#line 6411 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6325,16 +6427,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6328: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6430: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6331: \$? = $ac_status" >&5 ++ echo "$as_me:6433: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6334: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6436: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6337: \$? = $ac_status" >&5 ++ echo "$as_me:6439: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_cur_colr_initscr=yes + else +@@ -6345,7 +6447,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6348: result: $ac_cv_lib_cur_colr_initscr" >&5 ++echo "$as_me:6450: 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 + +@@ -6369,7 +6471,7 @@ + + else + +- echo "$as_me:6372: checking for initscr in -lHcurses" >&5 ++ echo "$as_me:6474: 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 +@@ -6377,7 +6479,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lHcurses $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6380 "configure" ++#line 6482 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6396,16 +6498,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6399: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6501: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6402: \$? = $ac_status" >&5 ++ echo "$as_me:6504: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6405: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6507: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6408: \$? = $ac_status" >&5 ++ echo "$as_me:6510: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Hcurses_initscr=yes + else +@@ -6416,7 +6518,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6419: result: $ac_cv_lib_Hcurses_initscr" >&5 ++echo "$as_me:6521: 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 + +@@ -6474,7 +6576,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}:6477: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:6579: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -6503,7 +6605,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}:6506: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:6608: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -6534,7 +6636,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}:6537: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:6639: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -6569,7 +6671,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}:6572: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:6674: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -6613,13 +6715,13 @@ + # because it may be needed to link the test-case for initscr. + if test "x$cf_term_lib" = x + then +- echo "$as_me:6616: checking for tgoto" >&5 ++ echo "$as_me:6718: 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 6622 "configure" ++#line 6724 "configure" + #include "confdefs.h" + #define tgoto autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -6650,16 +6752,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6653: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6755: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6656: \$? = $ac_status" >&5 ++ echo "$as_me:6758: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6659: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6761: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6662: \$? = $ac_status" >&5 ++ echo "$as_me:6764: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_tgoto=yes + else +@@ -6669,7 +6771,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:6672: result: $ac_cv_func_tgoto" >&5 ++echo "$as_me:6774: 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 +@@ -6678,7 +6780,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:6681: checking for tgoto in -l$cf_term_lib" >&5 ++echo "$as_me:6783: 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 +@@ -6686,7 +6788,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$cf_term_lib $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6689 "configure" ++#line 6791 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6705,16 +6807,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6708: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6810: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6711: \$? = $ac_status" >&5 ++ echo "$as_me:6813: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6714: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6816: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6717: \$? = $ac_status" >&5 ++ echo "$as_me:6819: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -6725,7 +6827,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6728: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "$as_me:6830: 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 + +@@ -6748,10 +6850,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:6751: checking if we can link with $cf_curs_lib library" >&5 ++ echo "$as_me:6853: 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 6754 "configure" ++#line 6856 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6763,16 +6865,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6766: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6868: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6769: \$? = $ac_status" >&5 ++ echo "$as_me:6871: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6772: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6874: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6775: \$? = $ac_status" >&5 ++ echo "$as_me:6877: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -6781,16 +6883,16 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:6784: result: $cf_result" >&5 ++ echo "$as_me:6886: 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:6790: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 ++ echo "$as_me:6892: 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 6793 "configure" ++#line 6895 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6802,16 +6904,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6805: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6907: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6808: \$? = $ac_status" >&5 ++ echo "$as_me:6910: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6811: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6913: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6814: \$? = $ac_status" >&5 ++ echo "$as_me:6916: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=no + else +@@ -6820,7 +6922,7 @@ + + LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6823 "configure" ++#line 6925 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6832,16 +6934,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6835: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6937: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6838: \$? = $ac_status" >&5 ++ echo "$as_me:6940: \$? = $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:6943: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6844: \$? = $ac_status" >&5 ++ echo "$as_me:6946: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -6853,13 +6955,13 @@ + + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:6856: result: $cf_result" >&5 ++ echo "$as_me:6958: 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:6862: error: no curses library found" >&5 ++ test $cf_curs_lib = unknown && { { echo "$as_me:6964: error: no curses library found" >&5 + echo "$as_me: error: no curses library found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -6868,7 +6970,7 @@ + ;; + (ncursesw*) + +-echo "$as_me:6871: checking for multibyte character support" >&5 ++echo "$as_me:6973: 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 +@@ -6876,7 +6978,7 @@ + + cf_save_LIBS="$LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6879 "configure" ++#line 6981 "configure" + #include "confdefs.h" + + #include +@@ -6889,16 +6991,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6892: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6994: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6895: \$? = $ac_status" >&5 ++ echo "$as_me:6997: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6898: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7000: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6901: \$? = $ac_status" >&5 ++ echo "$as_me:7003: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_utf8_lib=yes + else +@@ -6910,12 +7012,12 @@ + cf_cv_header_path_utf8= + cf_cv_library_path_utf8= + +-echo "${as_me:-configure}:6913: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:7015: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 6918 "configure" ++#line 7020 "configure" + #include "confdefs.h" + + #include +@@ -6928,16 +7030,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6931: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7033: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6934: \$? = $ac_status" >&5 ++ echo "$as_me:7036: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6937: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7039: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6940: \$? = $ac_status" >&5 ++ echo "$as_me:7042: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -6951,7 +7053,7 @@ + LIBS="-lutf8 $cf_save_LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 6954 "configure" ++#line 7056 "configure" + #include "confdefs.h" + + #include +@@ -6964,16 +7066,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6967: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7069: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6970: \$? = $ac_status" >&5 ++ echo "$as_me:7072: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6973: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7075: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6976: \$? = $ac_status" >&5 ++ echo "$as_me:7078: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -6990,9 +7092,9 @@ + + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 + +-echo "${as_me:-configure}:6993: testing find linkage for utf8 library ..." 1>&5 ++echo "${as_me:-configure}:7095: testing find linkage for utf8 library ..." 1>&5 + +-echo "${as_me:-configure}:6995: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:7097: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -7083,7 +7185,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}:7086: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:7188: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS" + +@@ -7091,7 +7193,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" + + cat >conftest.$ac_ext <<_ACEOF +-#line 7094 "configure" ++#line 7196 "configure" + #include "confdefs.h" + + #include +@@ -7104,21 +7206,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7107: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7209: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7110: \$? = $ac_status" >&5 ++ echo "$as_me:7212: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7113: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7215: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7116: \$? = $ac_status" >&5 ++ echo "$as_me:7218: \$? = $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}:7121: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:7223: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -7136,7 +7238,7 @@ + + if test "$cf_cv_find_linkage_utf8" = maybe ; then + +-echo "${as_me:-configure}:7139: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:7241: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -7211,13 +7313,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}:7214: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:7316: 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 7220 "configure" ++#line 7322 "configure" + #include "confdefs.h" + + #include +@@ -7230,21 +7332,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7233: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7335: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7236: \$? = $ac_status" >&5 ++ echo "$as_me:7338: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7239: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7341: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7242: \$? = $ac_status" >&5 ++ echo "$as_me:7344: \$? = $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}:7247: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:7349: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=yes + cf_cv_library_file_utf8="-lutf8" +@@ -7286,7 +7388,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:7289: result: $cf_cv_utf8_lib" >&5 ++echo "$as_me:7391: 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 +@@ -7324,7 +7426,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +-#line 7327 "configure" ++#line 7429 "configure" + #include "confdefs.h" + #include + int +@@ -7336,16 +7438,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7339: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7441: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7342: \$? = $ac_status" >&5 ++ echo "$as_me:7444: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7345: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7447: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7348: \$? = $ac_status" >&5 ++ echo "$as_me:7450: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -7362,7 +7464,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}:7365: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:7467: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -7398,7 +7500,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}:7401: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:7503: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -7428,13 +7530,13 @@ + cf_have_ncuconfig=no + + if test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:7431: checking pkg-config for $cf_ncuconfig_root" >&5 ++ echo "$as_me:7533: 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:7434: result: yes" >&5 ++ echo "$as_me:7536: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:7437: checking if the $cf_ncuconfig_root package files work" >&5 ++ echo "$as_me:7539: 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 + +@@ -7556,7 +7658,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 7559 "configure" ++#line 7661 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -7568,37 +7670,37 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7571: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7673: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7574: \$? = $ac_status" >&5 ++ echo "$as_me:7676: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7577: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7679: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7580: \$? = $ac_status" >&5 ++ echo "$as_me:7682: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe + else + cat >conftest.$ac_ext <<_ACEOF +-#line 7586 "configure" ++#line 7688 "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:7593: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7695: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7596: \$? = $ac_status" >&5 ++ echo "$as_me:7698: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:7598: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7700: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7601: \$? = $ac_status" >&5 ++ echo "$as_me:7703: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_ncuconfig=yes + else +@@ -7615,7 +7717,7 @@ + cf_have_ncuconfig=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:7618: result: $cf_have_ncuconfig" >&5 ++ echo "$as_me:7720: 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" +@@ -7631,7 +7733,7 @@ + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + +-echo "$as_me:7634: checking for terminfo header" >&5 ++echo "$as_me:7736: 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 +@@ -7649,7 +7751,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 7652 "configure" ++#line 7754 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -7664,16 +7766,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7667: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7769: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7670: \$? = $ac_status" >&5 ++ echo "$as_me:7772: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7673: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7775: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7676: \$? = $ac_status" >&5 ++ echo "$as_me:7778: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -7689,7 +7791,7 @@ + done + + fi +-echo "$as_me:7692: result: $cf_cv_term_header" >&5 ++echo "$as_me:7794: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -7724,7 +7826,7 @@ + fi + + else +- echo "$as_me:7727: result: no" >&5 ++ echo "$as_me:7829: result: no" >&5 + echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +@@ -7740,7 +7842,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:7743: checking for $ac_word" >&5 ++echo "$as_me:7845: 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 +@@ -7755,7 +7857,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:7758: found $ac_dir/$ac_word" >&5 ++echo "$as_me:7860: found $ac_dir/$ac_word" >&5 + break + done + +@@ -7763,10 +7865,10 @@ + fi + NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:7766: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:7868: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:7769: result: no" >&5 ++ echo "$as_me:7871: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -7779,7 +7881,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:7782: checking for $ac_word" >&5 ++echo "$as_me:7884: 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 +@@ -7794,7 +7896,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:7797: found $ac_dir/$ac_word" >&5 ++echo "$as_me:7899: found $ac_dir/$ac_word" >&5 + break + done + +@@ -7802,10 +7904,10 @@ + fi + ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG + if test -n "$ac_ct_NCURSES_CONFIG"; then +- echo "$as_me:7805: result: $ac_ct_NCURSES_CONFIG" >&5 ++ echo "$as_me:7907: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:7808: result: no" >&5 ++ echo "$as_me:7910: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -7934,7 +8036,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:7937: checking if we have identified curses headers" >&5 ++echo "$as_me:8039: 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 +@@ -7946,7 +8048,7 @@ + curses.h $cf_cv_screen/curses.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 7949 "configure" ++#line 8051 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -7958,16 +8060,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7961: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8063: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7964: \$? = $ac_status" >&5 ++ echo "$as_me:8066: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7967: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8069: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7970: \$? = $ac_status" >&5 ++ echo "$as_me:8072: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -7978,11 +8080,11 @@ + done + + fi +-echo "$as_me:7981: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:8083: 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:7985: error: No curses header-files found" >&5 ++ { { echo "$as_me:8087: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -7992,23 +8094,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:7995: checking for $ac_header" >&5 ++echo "$as_me:8097: 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 8001 "configure" ++#line 8103 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:8005: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:8107: \"$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:8011: \$? = $ac_status" >&5 ++ echo "$as_me:8113: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -8027,7 +8129,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:8030: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:8132: 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 8086 "configure" ++#line 8188 "configure" + #include "confdefs.h" + #include + int +@@ -8095,16 +8197,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8098: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8200: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8101: \$? = $ac_status" >&5 ++ echo "$as_me:8203: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8104: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8206: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8107: \$? = $ac_status" >&5 ++ echo "$as_me:8209: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -8121,7 +8223,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}:8124: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:8226: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8140,7 +8242,7 @@ + + } + +-echo "$as_me:8143: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:8245: 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 +@@ -8152,7 +8254,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 8155 "configure" ++#line 8257 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -8176,16 +8278,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8179: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8281: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8182: \$? = $ac_status" >&5 ++ echo "$as_me:8284: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8185: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8287: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8188: \$? = $ac_status" >&5 ++ echo "$as_me:8290: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -8200,14 +8302,14 @@ + done + + fi +-echo "$as_me:8203: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:8305: 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:8210: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:8312: 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 +@@ -8328,7 +8430,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +-#line 8331 "configure" ++#line 8433 "configure" + #include "confdefs.h" + #include + int +@@ -8340,16 +8442,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8343: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8445: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8346: \$? = $ac_status" >&5 ++ echo "$as_me:8448: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8349: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8451: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8352: \$? = $ac_status" >&5 ++ echo "$as_me:8454: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -8366,7 +8468,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}:8369: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:8471: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8389,7 +8491,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 8392 "configure" ++#line 8494 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -8413,16 +8515,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8416: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8518: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8419: \$? = $ac_status" >&5 ++ echo "$as_me:8521: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8422: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8524: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8425: \$? = $ac_status" >&5 ++ echo "$as_me:8527: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -8443,12 +8545,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8446: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8548: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:8451: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:8553: 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%/[^/]*$%%'` +@@ -8484,7 +8586,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +-#line 8487 "configure" ++#line 8589 "configure" + #include "confdefs.h" + #include + int +@@ -8496,16 +8598,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8499: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8601: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8502: \$? = $ac_status" >&5 ++ echo "$as_me:8604: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8505: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8607: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8508: \$? = $ac_status" >&5 ++ echo "$as_me:8610: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -8522,7 +8624,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}:8525: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:8627: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8570,7 +8672,7 @@ + ;; + esac + +-echo "$as_me:8573: checking for terminfo header" >&5 ++echo "$as_me:8675: 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 +@@ -8588,7 +8690,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 8591 "configure" ++#line 8693 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -8603,16 +8705,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8606: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8708: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8609: \$? = $ac_status" >&5 ++ echo "$as_me:8711: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8612: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8714: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8615: \$? = $ac_status" >&5 ++ echo "$as_me:8717: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -8628,7 +8730,7 @@ + done + + fi +-echo "$as_me:8631: result: $cf_cv_term_header" >&5 ++echo "$as_me:8733: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -8666,7 +8768,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:8669: checking for ncurses version" >&5 ++echo "$as_me:8771: 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 +@@ -8692,10 +8794,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:8695: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:8797: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:8698: \$? = $ac_status" >&5 ++ echo "$as_me:8800: \$? = $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%".*%%'` +@@ -8705,7 +8807,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 8708 "configure" ++#line 8810 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -8730,15 +8832,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:8733: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8835: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8736: \$? = $ac_status" >&5 ++ echo "$as_me:8838: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:8738: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8840: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8741: \$? = $ac_status" >&5 ++ echo "$as_me:8843: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -8752,7 +8854,7 @@ + rm -f $cf_tempfile + + fi +-echo "$as_me:8755: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:8857: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || + cat >>confdefs.h <<\EOF +@@ -8765,7 +8867,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:8768: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:8870: 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 +@@ -8773,7 +8875,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 8776 "configure" ++#line 8878 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8792,16 +8894,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8795: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8897: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8798: \$? = $ac_status" >&5 ++ echo "$as_me:8900: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8801: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8903: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8804: \$? = $ac_status" >&5 ++ echo "$as_me:8906: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -8812,10 +8914,10 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8815: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:8917: 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:8818: checking for initscr in -lgpm" >&5 ++ echo "$as_me:8920: 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 +@@ -8823,7 +8925,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 8826 "configure" ++#line 8928 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8842,16 +8944,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8845: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8947: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8848: \$? = $ac_status" >&5 ++ echo "$as_me:8950: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8851: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8953: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8854: \$? = $ac_status" >&5 ++ echo "$as_me:8956: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -8862,7 +8964,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8865: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:8967: 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" +@@ -8877,7 +8979,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:8880: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:8982: 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 +@@ -8885,7 +8987,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 8888 "configure" ++#line 8990 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8904,16 +9006,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8907: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9009: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8910: \$? = $ac_status" >&5 ++ echo "$as_me:9012: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8913: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9015: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8916: \$? = $ac_status" >&5 ++ echo "$as_me:9018: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -8924,7 +9026,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8927: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:9029: 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" +@@ -8973,13 +9075,13 @@ + + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + cf_libdir="" +- echo "$as_me:8976: checking for initscr" >&5 ++ echo "$as_me:9078: 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 8982 "configure" ++#line 9084 "configure" + #include "confdefs.h" + #define initscr autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -9010,16 +9112,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9013: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9115: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9016: \$? = $ac_status" >&5 ++ echo "$as_me:9118: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9019: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9121: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9022: \$? = $ac_status" >&5 ++ echo "$as_me:9124: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_initscr=yes + else +@@ -9029,18 +9131,18 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:9032: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:9134: 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:9039: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:9141: 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 9043 "configure" ++#line 9145 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9052,25 +9154,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9055: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9157: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9058: \$? = $ac_status" >&5 ++ echo "$as_me:9160: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9061: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9163: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9064: \$? = $ac_status" >&5 ++ echo "$as_me:9166: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:9066: result: yes" >&5 ++ echo "$as_me:9168: 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:9073: result: no" >&5 ++echo "$as_me:9175: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -9138,11 +9240,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:9141: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:9243: 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 9145 "configure" ++#line 9247 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9154,25 +9256,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9157: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9259: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9160: \$? = $ac_status" >&5 ++ echo "$as_me:9262: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9163: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9265: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9166: \$? = $ac_status" >&5 ++ echo "$as_me:9268: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:9168: result: yes" >&5 ++ echo "$as_me:9270: 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:9175: result: no" >&5 ++echo "$as_me:9277: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -9187,7 +9289,7 @@ + eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root + + if test $cf_found_library = no ; then +- { { echo "$as_me:9190: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:9292: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -9195,7 +9297,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:9198: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:9300: 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 +@@ -9205,7 +9307,7 @@ + fi + done + cat >conftest.$ac_ext <<_ACEOF +-#line 9208 "configure" ++#line 9310 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9217,23 +9319,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9220: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9322: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9223: \$? = $ac_status" >&5 ++ echo "$as_me:9325: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9226: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9328: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9229: \$? = $ac_status" >&5 ++ echo "$as_me:9331: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:9231: result: yes" >&5 ++ echo "$as_me:9333: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:9236: result: no" >&5 ++echo "$as_me:9338: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -9258,13 +9360,13 @@ + cf_have_ncuconfig=no + + if test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:9261: checking pkg-config for $cf_ncuconfig_root" >&5 ++ echo "$as_me:9363: 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:9264: result: yes" >&5 ++ echo "$as_me:9366: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:9267: checking if the $cf_ncuconfig_root package files work" >&5 ++ echo "$as_me:9369: 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 + +@@ -9386,7 +9488,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 9389 "configure" ++#line 9491 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9398,37 +9500,37 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9401: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9503: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9404: \$? = $ac_status" >&5 ++ echo "$as_me:9506: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9407: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9509: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9410: \$? = $ac_status" >&5 ++ echo "$as_me:9512: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe + else + cat >conftest.$ac_ext <<_ACEOF +-#line 9416 "configure" ++#line 9518 "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:9423: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9525: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9426: \$? = $ac_status" >&5 ++ echo "$as_me:9528: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:9428: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9530: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9431: \$? = $ac_status" >&5 ++ echo "$as_me:9533: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_ncuconfig=yes + else +@@ -9445,7 +9547,7 @@ + cf_have_ncuconfig=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:9448: result: $cf_have_ncuconfig" >&5 ++ echo "$as_me:9550: 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" +@@ -9461,7 +9563,7 @@ + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + +-echo "$as_me:9464: checking for terminfo header" >&5 ++echo "$as_me:9566: 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 +@@ -9479,7 +9581,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 9482 "configure" ++#line 9584 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -9494,16 +9596,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9497: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9599: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9500: \$? = $ac_status" >&5 ++ echo "$as_me:9602: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9503: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9605: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9506: \$? = $ac_status" >&5 ++ echo "$as_me:9608: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -9519,7 +9621,7 @@ + done + + fi +-echo "$as_me:9522: result: $cf_cv_term_header" >&5 ++echo "$as_me:9624: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -9554,7 +9656,7 @@ + fi + + else +- echo "$as_me:9557: result: no" >&5 ++ echo "$as_me:9659: result: no" >&5 + echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +@@ -9570,7 +9672,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:9573: checking for $ac_word" >&5 ++echo "$as_me:9675: 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 +@@ -9585,7 +9687,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:9588: found $ac_dir/$ac_word" >&5 ++echo "$as_me:9690: found $ac_dir/$ac_word" >&5 + break + done + +@@ -9593,10 +9695,10 @@ + fi + NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:9596: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:9698: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:9599: result: no" >&5 ++ echo "$as_me:9701: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -9609,7 +9711,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:9612: checking for $ac_word" >&5 ++echo "$as_me:9714: 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 +@@ -9624,7 +9726,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:9627: found $ac_dir/$ac_word" >&5 ++echo "$as_me:9729: found $ac_dir/$ac_word" >&5 + break + done + +@@ -9632,10 +9734,10 @@ + fi + ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG + if test -n "$ac_ct_NCURSES_CONFIG"; then +- echo "$as_me:9635: result: $ac_ct_NCURSES_CONFIG" >&5 ++ echo "$as_me:9737: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:9638: result: no" >&5 ++ echo "$as_me:9740: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -9764,7 +9866,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:9767: checking if we have identified curses headers" >&5 ++echo "$as_me:9869: 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 +@@ -9776,7 +9878,7 @@ + curses.h $cf_cv_screen/curses.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 9779 "configure" ++#line 9881 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -9788,16 +9890,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9791: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9893: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9794: \$? = $ac_status" >&5 ++ echo "$as_me:9896: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9797: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9899: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9800: \$? = $ac_status" >&5 ++ echo "$as_me:9902: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -9808,11 +9910,11 @@ + done + + fi +-echo "$as_me:9811: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:9913: 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:9815: error: No curses header-files found" >&5 ++ { { echo "$as_me:9917: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -9822,23 +9924,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:9825: checking for $ac_header" >&5 ++echo "$as_me:9927: 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 9831 "configure" ++#line 9933 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:9835: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:9937: \"$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:9841: \$? = $ac_status" >&5 ++ echo "$as_me:9943: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -9857,7 +9959,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:9860: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:9962: 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 9916 "configure" ++#line 10018 "configure" + #include "confdefs.h" + #include + int +@@ -9925,16 +10027,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9928: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10030: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9931: \$? = $ac_status" >&5 ++ echo "$as_me:10033: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9934: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10036: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9937: \$? = $ac_status" >&5 ++ echo "$as_me:10039: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -9951,7 +10053,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}:9954: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:10056: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -9970,7 +10072,7 @@ + + } + +-echo "$as_me:9973: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:10075: 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 +@@ -9982,7 +10084,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 9985 "configure" ++#line 10087 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -10006,16 +10108,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10009: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10111: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10012: \$? = $ac_status" >&5 ++ echo "$as_me:10114: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10015: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10117: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10018: \$? = $ac_status" >&5 ++ echo "$as_me:10120: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -10030,14 +10132,14 @@ + done + + fi +-echo "$as_me:10033: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:10135: 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:10040: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:10142: 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 +@@ -10158,7 +10260,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +-#line 10161 "configure" ++#line 10263 "configure" + #include "confdefs.h" + #include + int +@@ -10170,16 +10272,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10173: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10275: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10176: \$? = $ac_status" >&5 ++ echo "$as_me:10278: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10179: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10281: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10182: \$? = $ac_status" >&5 ++ echo "$as_me:10284: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -10196,7 +10298,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}:10199: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:10301: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -10219,7 +10321,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 10222 "configure" ++#line 10324 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -10243,16 +10345,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10246: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10348: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10249: \$? = $ac_status" >&5 ++ echo "$as_me:10351: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10252: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10354: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10255: \$? = $ac_status" >&5 ++ echo "$as_me:10357: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -10273,12 +10375,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10276: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10378: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:10281: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:10383: 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%/[^/]*$%%'` +@@ -10314,7 +10416,7 @@ + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +-#line 10317 "configure" ++#line 10419 "configure" + #include "confdefs.h" + #include + int +@@ -10326,16 +10428,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10329: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10431: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10332: \$? = $ac_status" >&5 ++ echo "$as_me:10434: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10335: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10437: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10338: \$? = $ac_status" >&5 ++ echo "$as_me:10440: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -10352,7 +10454,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}:10355: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:10457: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -10400,7 +10502,7 @@ + ;; + esac + +-echo "$as_me:10403: checking for terminfo header" >&5 ++echo "$as_me:10505: 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 +@@ -10418,7 +10520,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 10421 "configure" ++#line 10523 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -10433,16 +10535,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10436: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10538: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10439: \$? = $ac_status" >&5 ++ echo "$as_me:10541: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10442: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10544: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10445: \$? = $ac_status" >&5 ++ echo "$as_me:10547: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -10458,7 +10560,7 @@ + done + + fi +-echo "$as_me:10461: result: $cf_cv_term_header" >&5 ++echo "$as_me:10563: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -10496,7 +10598,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:10499: checking for ncurses version" >&5 ++echo "$as_me:10601: 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 +@@ -10522,10 +10624,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:10525: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:10627: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:10528: \$? = $ac_status" >&5 ++ echo "$as_me:10630: \$? = $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%".*%%'` +@@ -10535,7 +10637,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10538 "configure" ++#line 10640 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -10560,15 +10662,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:10563: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10665: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10566: \$? = $ac_status" >&5 ++ echo "$as_me:10668: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:10568: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10670: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10571: \$? = $ac_status" >&5 ++ echo "$as_me:10673: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -10582,7 +10684,7 @@ + rm -f $cf_tempfile + + fi +-echo "$as_me:10585: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:10687: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || + cat >>confdefs.h <<\EOF +@@ -10595,7 +10697,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:10598: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:10700: 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 +@@ -10603,7 +10705,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 10606 "configure" ++#line 10708 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10622,16 +10724,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10625: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10727: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10628: \$? = $ac_status" >&5 ++ echo "$as_me:10730: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10631: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10733: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10634: \$? = $ac_status" >&5 ++ echo "$as_me:10736: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -10642,10 +10744,10 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10645: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:10747: 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:10648: checking for initscr in -lgpm" >&5 ++ echo "$as_me:10750: 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 +@@ -10653,7 +10755,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 10656 "configure" ++#line 10758 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10672,16 +10774,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10675: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10777: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10678: \$? = $ac_status" >&5 ++ echo "$as_me:10780: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10681: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10783: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10684: \$? = $ac_status" >&5 ++ echo "$as_me:10786: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -10692,7 +10794,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10695: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:10797: 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" +@@ -10707,7 +10809,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:10710: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:10812: 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 +@@ -10715,7 +10817,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 10718 "configure" ++#line 10820 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10734,16 +10836,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10737: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10839: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10740: \$? = $ac_status" >&5 ++ echo "$as_me:10842: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10743: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10845: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10746: \$? = $ac_status" >&5 ++ echo "$as_me:10848: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -10754,7 +10856,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10757: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:10859: 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" +@@ -10803,13 +10905,13 @@ + + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + cf_libdir="" +- echo "$as_me:10806: checking for initscr" >&5 ++ echo "$as_me:10908: 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 10812 "configure" ++#line 10914 "configure" + #include "confdefs.h" + #define initscr autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -10840,16 +10942,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10843: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10945: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10846: \$? = $ac_status" >&5 ++ echo "$as_me:10948: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10849: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10951: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10852: \$? = $ac_status" >&5 ++ echo "$as_me:10954: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_initscr=yes + else +@@ -10859,18 +10961,18 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:10862: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:10964: 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:10869: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:10971: 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 10873 "configure" ++#line 10975 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -10882,25 +10984,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10885: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10987: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10888: \$? = $ac_status" >&5 ++ echo "$as_me:10990: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10891: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10993: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10894: \$? = $ac_status" >&5 ++ echo "$as_me:10996: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:10896: result: yes" >&5 ++ echo "$as_me:10998: 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:10903: result: no" >&5 ++echo "$as_me:11005: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -10968,11 +11070,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:10971: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:11073: 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 10975 "configure" ++#line 11077 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -10984,25 +11086,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10987: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11089: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10990: \$? = $ac_status" >&5 ++ echo "$as_me:11092: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10993: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11095: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10996: \$? = $ac_status" >&5 ++ echo "$as_me:11098: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:10998: result: yes" >&5 ++ echo "$as_me:11100: 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:11005: result: no" >&5 ++echo "$as_me:11107: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -11017,7 +11119,7 @@ + eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root + + if test $cf_found_library = no ; then +- { { echo "$as_me:11020: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:11122: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -11025,7 +11127,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:11028: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:11130: 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 +@@ -11035,7 +11137,7 @@ + fi + done + cat >conftest.$ac_ext <<_ACEOF +-#line 11038 "configure" ++#line 11140 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -11047,23 +11149,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11050: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11152: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11053: \$? = $ac_status" >&5 ++ echo "$as_me:11155: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11056: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11158: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11059: \$? = $ac_status" >&5 ++ echo "$as_me:11161: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:11061: result: yes" >&5 ++ echo "$as_me:11163: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:11066: result: no" >&5 ++echo "$as_me:11168: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -11083,7 +11185,7 @@ + + ;; + (pdcurses) +- echo "$as_me:11086: checking for X" >&5 ++ echo "$as_me:11188: checking for X" >&5 + echo $ECHO_N "checking for X... $ECHO_C" >&6 + + # Check whether --with-x or --without-x was given. +@@ -11184,17 +11286,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 11187 "configure" ++#line 11289 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:11191: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:11293: \"$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:11197: \$? = $ac_status" >&5 ++ echo "$as_me:11299: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -11227,7 +11329,7 @@ + ac_save_LIBS=$LIBS + LIBS="-lXt $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11230 "configure" ++#line 11332 "configure" + #include "confdefs.h" + #include + int +@@ -11239,16 +11341,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11242: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11344: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11245: \$? = $ac_status" >&5 ++ echo "$as_me:11347: \$? = $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:11350: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11251: \$? = $ac_status" >&5 ++ echo "$as_me:11353: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + LIBS=$ac_save_LIBS + # We can link X programs with no special library path. +@@ -11286,7 +11388,7 @@ + fi # $with_x != no + + if test "$have_x" != yes; then +- echo "$as_me:11289: result: $have_x" >&5 ++ echo "$as_me:11391: result: $have_x" >&5 + echo "${ECHO_T}$have_x" >&6 + no_x=yes + else +@@ -11296,7 +11398,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:11299: result: libraries $x_libraries, headers $x_includes" >&5 ++ echo "$as_me:11401: result: libraries $x_libraries, headers $x_includes" >&5 + echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + fi + +@@ -11320,11 +11422,11 @@ + # others require no space. Words are not sufficient . . . . + case `(uname -sr) 2>/dev/null` in + "SunOS 5"*) +- echo "$as_me:11323: checking whether -R must be followed by a space" >&5 ++ echo "$as_me:11425: 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 11327 "configure" ++#line 11429 "configure" + #include "confdefs.h" + + int +@@ -11336,16 +11438,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11339: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11441: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11342: \$? = $ac_status" >&5 ++ echo "$as_me:11444: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11345: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11447: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11348: \$? = $ac_status" >&5 ++ echo "$as_me:11450: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_R_nospace=yes + else +@@ -11355,13 +11457,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test $ac_R_nospace = yes; then +- echo "$as_me:11358: result: no" >&5 ++ echo "$as_me:11460: 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 11364 "configure" ++#line 11466 "configure" + #include "confdefs.h" + + int +@@ -11373,16 +11475,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11376: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11478: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11379: \$? = $ac_status" >&5 ++ echo "$as_me:11481: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11382: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11484: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11385: \$? = $ac_status" >&5 ++ echo "$as_me:11487: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_R_space=yes + else +@@ -11392,11 +11494,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test $ac_R_space = yes; then +- echo "$as_me:11395: result: yes" >&5 ++ echo "$as_me:11497: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + X_LIBS="$X_LIBS -R $x_libraries" + else +- echo "$as_me:11399: result: neither works" >&5 ++ echo "$as_me:11501: result: neither works" >&5 + echo "${ECHO_T}neither works" >&6 + fi + fi +@@ -11416,7 +11518,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 11419 "configure" ++#line 11521 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11435,22 +11537,22 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11438: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11540: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11441: \$? = $ac_status" >&5 ++ echo "$as_me:11543: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11444: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11546: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11447: \$? = $ac_status" >&5 ++ echo "$as_me:11549: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:11453: checking for dnet_ntoa in -ldnet" >&5 ++echo "$as_me:11555: 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 +@@ -11458,7 +11560,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11461 "configure" ++#line 11563 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11477,16 +11579,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11480: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11582: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11483: \$? = $ac_status" >&5 ++ echo "$as_me:11585: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11486: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11588: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11489: \$? = $ac_status" >&5 ++ echo "$as_me:11591: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dnet_dnet_ntoa=yes + else +@@ -11497,14 +11599,14 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11500: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 ++echo "$as_me:11602: 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:11507: checking for dnet_ntoa in -ldnet_stub" >&5 ++ echo "$as_me:11609: 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 +@@ -11512,7 +11614,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet_stub $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11515 "configure" ++#line 11617 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11531,16 +11633,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11534: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11636: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11537: \$? = $ac_status" >&5 ++ echo "$as_me:11639: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11540: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11642: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11543: \$? = $ac_status" >&5 ++ echo "$as_me:11645: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes + else +@@ -11551,7 +11653,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11554: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 ++echo "$as_me:11656: 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" +@@ -11570,13 +11672,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:11573: checking for gethostbyname" >&5 ++ echo "$as_me:11675: 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 11579 "configure" ++#line 11681 "configure" + #include "confdefs.h" + #define gethostbyname autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -11607,16 +11709,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11610: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11712: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11613: \$? = $ac_status" >&5 ++ echo "$as_me:11715: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11616: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11718: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11619: \$? = $ac_status" >&5 ++ echo "$as_me:11721: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gethostbyname=yes + else +@@ -11626,11 +11728,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11629: result: $ac_cv_func_gethostbyname" >&5 ++echo "$as_me:11731: 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:11633: checking for gethostbyname in -lnsl" >&5 ++ echo "$as_me:11735: 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 +@@ -11638,7 +11740,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnsl $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11641 "configure" ++#line 11743 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11657,16 +11759,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11660: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11762: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11663: \$? = $ac_status" >&5 ++ echo "$as_me:11765: \$? = $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:11768: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11669: \$? = $ac_status" >&5 ++ echo "$as_me:11771: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_gethostbyname=yes + else +@@ -11677,14 +11779,14 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11680: result: $ac_cv_lib_nsl_gethostbyname" >&5 ++echo "$as_me:11782: 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:11687: checking for gethostbyname in -lbsd" >&5 ++ echo "$as_me:11789: 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 +@@ -11692,7 +11794,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11695 "configure" ++#line 11797 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11711,16 +11813,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11714: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11816: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11717: \$? = $ac_status" >&5 ++ echo "$as_me:11819: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11720: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11822: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11723: \$? = $ac_status" >&5 ++ echo "$as_me:11825: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_gethostbyname=yes + else +@@ -11731,7 +11833,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11734: result: $ac_cv_lib_bsd_gethostbyname" >&5 ++echo "$as_me:11836: 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" +@@ -11747,13 +11849,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:11750: checking for connect" >&5 ++ echo "$as_me:11852: 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 11756 "configure" ++#line 11858 "configure" + #include "confdefs.h" + #define connect autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -11784,16 +11886,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11787: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11889: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11790: \$? = $ac_status" >&5 ++ echo "$as_me:11892: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11793: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11895: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11796: \$? = $ac_status" >&5 ++ echo "$as_me:11898: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_connect=yes + else +@@ -11803,11 +11905,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11806: result: $ac_cv_func_connect" >&5 ++echo "$as_me:11908: 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:11810: checking for connect in -lsocket" >&5 ++ echo "$as_me:11912: 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 +@@ -11815,7 +11917,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsocket $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11818 "configure" ++#line 11920 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11834,16 +11936,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11837: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11939: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11840: \$? = $ac_status" >&5 ++ echo "$as_me:11942: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11843: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11945: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11846: \$? = $ac_status" >&5 ++ echo "$as_me:11948: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_socket_connect=yes + else +@@ -11854,7 +11956,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11857: result: $ac_cv_lib_socket_connect" >&5 ++echo "$as_me:11959: 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" +@@ -11863,13 +11965,13 @@ + fi + + # Guillermo Gomez says -lposix is necessary on A/UX. +- echo "$as_me:11866: checking for remove" >&5 ++ echo "$as_me:11968: 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 11872 "configure" ++#line 11974 "configure" + #include "confdefs.h" + #define remove autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -11900,16 +12002,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11903: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12005: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11906: \$? = $ac_status" >&5 ++ echo "$as_me:12008: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11909: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12011: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11912: \$? = $ac_status" >&5 ++ echo "$as_me:12014: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_remove=yes + else +@@ -11919,11 +12021,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11922: result: $ac_cv_func_remove" >&5 ++echo "$as_me:12024: 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:11926: checking for remove in -lposix" >&5 ++ echo "$as_me:12028: 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 +@@ -11931,7 +12033,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lposix $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11934 "configure" ++#line 12036 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11950,16 +12052,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11953: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12055: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11956: \$? = $ac_status" >&5 ++ echo "$as_me:12058: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11959: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12061: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11962: \$? = $ac_status" >&5 ++ echo "$as_me:12064: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_posix_remove=yes + else +@@ -11970,7 +12072,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11973: result: $ac_cv_lib_posix_remove" >&5 ++echo "$as_me:12075: 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" +@@ -11979,13 +12081,13 @@ + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. +- echo "$as_me:11982: checking for shmat" >&5 ++ echo "$as_me:12084: 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 11988 "configure" ++#line 12090 "configure" + #include "confdefs.h" + #define shmat autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -12016,16 +12118,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12019: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12121: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12022: \$? = $ac_status" >&5 ++ echo "$as_me:12124: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12025: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12127: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12028: \$? = $ac_status" >&5 ++ echo "$as_me:12130: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_shmat=yes + else +@@ -12035,11 +12137,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:12038: result: $ac_cv_func_shmat" >&5 ++echo "$as_me:12140: 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:12042: checking for shmat in -lipc" >&5 ++ echo "$as_me:12144: 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 +@@ -12047,7 +12149,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lipc $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 12050 "configure" ++#line 12152 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -12066,16 +12168,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12069: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12171: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12072: \$? = $ac_status" >&5 ++ echo "$as_me:12174: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12075: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12177: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12078: \$? = $ac_status" >&5 ++ echo "$as_me:12180: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ipc_shmat=yes + else +@@ -12086,7 +12188,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:12089: result: $ac_cv_lib_ipc_shmat" >&5 ++echo "$as_me:12191: 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" +@@ -12104,7 +12206,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:12107: checking for IceConnectionNumber in -lICE" >&5 ++ echo "$as_me:12209: 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 +@@ -12112,7 +12214,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lICE $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 12115 "configure" ++#line 12217 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -12131,16 +12233,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12134: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12236: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12137: \$? = $ac_status" >&5 ++ echo "$as_me:12239: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12140: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12242: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12143: \$? = $ac_status" >&5 ++ echo "$as_me:12245: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ICE_IceConnectionNumber=yes + else +@@ -12151,7 +12253,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:12154: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 ++echo "$as_me:12256: 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" +@@ -12163,7 +12265,7 @@ + + cf_x_athena=${cf_x_athena:-Xaw} + +-echo "$as_me:12166: checking if you want to link with Xaw 3d library" >&5 ++echo "$as_me:12268: 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= + +@@ -12174,14 +12276,14 @@ + fi; + if test "$withval" = yes ; then + cf_x_athena=Xaw3d +- echo "$as_me:12177: result: yes" >&5 ++ echo "$as_me:12279: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:12180: result: no" >&5 ++ echo "$as_me:12282: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:12184: checking if you want to link with Xaw 3d xft library" >&5 ++echo "$as_me:12286: 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= + +@@ -12192,14 +12294,14 @@ + fi; + if test "$withval" = yes ; then + cf_x_athena=Xaw3dxft +- echo "$as_me:12195: result: yes" >&5 ++ echo "$as_me:12297: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:12198: result: no" >&5 ++ echo "$as_me:12300: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:12202: checking if you want to link with neXT Athena library" >&5 ++echo "$as_me:12304: 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= + +@@ -12210,14 +12312,14 @@ + fi; + if test "$withval" = yes ; then + cf_x_athena=neXtaw +- echo "$as_me:12213: result: yes" >&5 ++ echo "$as_me:12315: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:12216: result: no" >&5 ++ echo "$as_me:12318: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:12220: checking if you want to link with Athena-Plus library" >&5 ++echo "$as_me:12322: 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= + +@@ -12228,10 +12330,10 @@ + fi; + if test "$withval" = yes ; then + cf_x_athena=XawPlus +- echo "$as_me:12231: result: yes" >&5 ++ echo "$as_me:12333: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:12234: result: no" >&5 ++ echo "$as_me:12336: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -12251,17 +12353,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}:12254: testing found package $cf_athena_pkg ..." 1>&5 ++echo "${as_me:-configure}:12356: 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}:12260: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:12362: 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}:12264: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:12366: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -12392,20 +12494,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}:12395: testing ..trimmed $LIBS ..." 1>&5 ++echo "${as_me:-configure}:12497: testing ..trimmed $LIBS ..." 1>&5 + + ;; + esac + done + +-echo "$as_me:12401: checking for usable $cf_x_athena/Xmu package" >&5 ++echo "$as_me:12503: 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 12408 "configure" ++#line 12510 "configure" + #include "confdefs.h" + + #include +@@ -12421,16 +12523,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12424: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12526: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12427: \$? = $ac_status" >&5 ++ echo "$as_me:12529: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12430: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12532: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12433: \$? = $ac_status" >&5 ++ echo "$as_me:12535: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xaw_compat=yes + else +@@ -12440,7 +12542,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:12443: result: $cf_cv_xaw_compat" >&5 ++echo "$as_me:12545: result: $cf_cv_xaw_compat" >&5 + echo "${ECHO_T}$cf_cv_xaw_compat" >&6 + + if test "$cf_cv_xaw_compat" = no +@@ -12452,7 +12554,7 @@ + (*) + test -n "$verbose" && echo " work around broken package" 1>&6 + +-echo "${as_me:-configure}:12455: testing work around broken package ..." 1>&5 ++echo "${as_me:-configure}:12557: testing work around broken package ..." 1>&5 + + cf_save_xmu="$LIBS" + cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'` +@@ -12460,17 +12562,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then + test -n "$verbose" && echo " found package xmu" 1>&6 + +-echo "${as_me:-configure}:12463: testing found package xmu ..." 1>&5 ++echo "${as_me:-configure}:12565: 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}:12469: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:12571: 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}:12473: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:12575: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -12590,12 +12692,12 @@ + + test -n "$verbose" && echo " ...before $LIBS" 1>&6 + +-echo "${as_me:-configure}:12593: testing ...before $LIBS ..." 1>&5 ++echo "${as_me:-configure}:12695: 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}:12598: testing ...after $LIBS ..." 1>&5 ++echo "${as_me:-configure}:12700: testing ...after $LIBS ..." 1>&5 + + else + cf_pkgconfig_incs= +@@ -12603,12 +12705,12 @@ + + test -n "$verbose" && echo " ...before $LIBS" 1>&6 + +-echo "${as_me:-configure}:12606: testing ...before $LIBS ..." 1>&5 ++echo "${as_me:-configure}:12708: 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}:12611: testing ...after $LIBS ..." 1>&5 ++echo "${as_me:-configure}:12713: testing ...after $LIBS ..." 1>&5 + + fi + +@@ -12619,7 +12721,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}:12622: testing ..trimmed $LIBS ..." 1>&5 ++echo "${as_me:-configure}:12724: testing ..trimmed $LIBS ..." 1>&5 + + ;; + esac +@@ -12644,17 +12746,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then + test -n "$verbose" && echo " found package Xext" 1>&6 + +-echo "${as_me:-configure}:12647: testing found package Xext ..." 1>&5 ++echo "${as_me:-configure}:12749: 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}:12653: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:12755: 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}:12657: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:12759: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -12775,7 +12877,7 @@ + cf_pkgconfig_incs= + cf_pkgconfig_libs= + +- echo "$as_me:12778: checking for XextCreateExtension in -lXext" >&5 ++ echo "$as_me:12880: 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 +@@ -12783,7 +12885,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXext $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 12786 "configure" ++#line 12888 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -12802,16 +12904,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12805: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12907: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12808: \$? = $ac_status" >&5 ++ echo "$as_me:12910: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12811: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12913: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12814: \$? = $ac_status" >&5 ++ echo "$as_me:12916: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xext_XextCreateExtension=yes + else +@@ -12822,7 +12924,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:12825: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 ++echo "$as_me:12927: 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 + +@@ -12846,7 +12948,7 @@ + + fi + +-# OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new), and (and ++# OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new) (and + # in some cases has installed dummy files in the former, other cases replaced + # it with a link to the new location). This complicates the configure script. + # Check for that pitfall, and recover using pkg-config +@@ -12858,17 +12960,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then + test -n "$verbose" && echo " found package x11" 1>&6 + +-echo "${as_me:-configure}:12861: testing found package x11 ..." 1>&5 ++echo "${as_me:-configure}:12963: 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}:12867: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:12969: 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}:12871: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:12973: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -12988,24 +13090,24 @@ + else + cf_pkgconfig_incs= + cf_pkgconfig_libs= +- { echo "$as_me:12991: WARNING: unable to find X11 library" >&5 ++ { echo "$as_me:13093: 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}:12998: testing found package ice ..." 1>&5 ++echo "${as_me:-configure}:13100: 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}:13004: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:13106: 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}:13008: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:13110: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -13125,24 +13227,24 @@ + else + cf_pkgconfig_incs= + cf_pkgconfig_libs= +- { echo "$as_me:13128: WARNING: unable to find ICE library" >&5 ++ { echo "$as_me:13230: 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}:13135: testing found package sm ..." 1>&5 ++echo "${as_me:-configure}:13237: 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}:13141: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:13243: 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}:13145: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:13247: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -13262,24 +13364,24 @@ + else + cf_pkgconfig_incs= + cf_pkgconfig_libs= +- { echo "$as_me:13265: WARNING: unable to find SM library" >&5 ++ { echo "$as_me:13367: 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}:13272: testing found package xt ..." 1>&5 ++echo "${as_me:-configure}:13374: 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}:13278: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:13380: 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}:13282: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:13384: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -13399,7 +13501,7 @@ + else + cf_pkgconfig_incs= + cf_pkgconfig_libs= +- { echo "$as_me:13402: WARNING: unable to find Xt library" >&5 ++ { echo "$as_me:13504: WARNING: unable to find Xt library" >&5 + echo "$as_me: WARNING: unable to find Xt library" >&2;} + fi + +@@ -13410,17 +13512,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then + test -n "$verbose" && echo " found package xt" 1>&6 + +-echo "${as_me:-configure}:13413: testing found package xt ..." 1>&5 ++echo "${as_me:-configure}:13515: 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}:13419: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:13521: 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}:13423: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:13525: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -13541,14 +13643,14 @@ + ;; + (*) + # we have an "xt" package, but it may omit Xt's dependency on X11 +-echo "$as_me:13544: checking for usable X dependency" >&5 ++echo "$as_me:13646: 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 13551 "configure" ++#line 13653 "configure" + #include "confdefs.h" + + #include +@@ -13567,16 +13669,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13570: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13672: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13573: \$? = $ac_status" >&5 ++ echo "$as_me:13675: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13576: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13678: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13579: \$? = $ac_status" >&5 ++ echo "$as_me:13681: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xt_x11_compat=yes + else +@@ -13586,30 +13688,30 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:13589: result: $cf_cv_xt_x11_compat" >&5 ++echo "$as_me:13691: 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}:13595: testing work around broken X11 dependency ..." 1>&5 ++echo "${as_me:-configure}:13697: 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}:13602: testing found package x11 ..." 1>&5 ++echo "${as_me:-configure}:13704: 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}:13608: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:13710: 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}:13612: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:13714: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -13732,12 +13834,12 @@ + + test -n "$verbose" && echo " ...before $LIBS" 1>&6 + +-echo "${as_me:-configure}:13735: testing ...before $LIBS ..." 1>&5 ++echo "${as_me:-configure}:13837: 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}:13740: testing ...after $LIBS ..." 1>&5 ++echo "${as_me:-configure}:13842: testing ...after $LIBS ..." 1>&5 + + fi + +@@ -13745,14 +13847,14 @@ + ;; + esac + +-echo "$as_me:13748: checking for usable X Toolkit package" >&5 ++echo "$as_me:13850: 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 13755 "configure" ++#line 13857 "configure" + #include "confdefs.h" + + #include +@@ -13767,16 +13869,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13770: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13872: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13773: \$? = $ac_status" >&5 ++ echo "$as_me:13875: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13776: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13878: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13779: \$? = $ac_status" >&5 ++ echo "$as_me:13881: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xt_ice_compat=yes + else +@@ -13786,7 +13888,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:13789: result: $cf_cv_xt_ice_compat" >&5 ++echo "$as_me:13891: result: $cf_cv_xt_ice_compat" >&5 + echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 + + if test "$cf_cv_xt_ice_compat" = no +@@ -13800,22 +13902,22 @@ + (*) + test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 + +-echo "${as_me:-configure}:13803: testing work around broken ICE dependency ..." 1>&5 ++echo "${as_me:-configure}:13905: 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}:13808: testing found package ice ..." 1>&5 ++echo "${as_me:-configure}:13910: 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}:13814: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:13916: 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}:13818: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:13920: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -13934,17 +14036,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then + test -n "$verbose" && echo " found package sm" 1>&6 + +-echo "${as_me:-configure}:13937: testing found package sm ..." 1>&5 ++echo "${as_me:-configure}:14039: 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}:13943: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:14045: 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}:13947: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:14049: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -14073,12 +14175,12 @@ + + test -n "$verbose" && echo " ...before $LIBS" 1>&6 + +-echo "${as_me:-configure}:14076: testing ...before $LIBS ..." 1>&5 ++echo "${as_me:-configure}:14178: 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}:14081: testing ...after $LIBS ..." 1>&5 ++echo "${as_me:-configure}:14183: testing ...after $LIBS ..." 1>&5 + + fi + +@@ -14098,7 +14200,7 @@ + + test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 + +-echo "${as_me:-configure}:14101: testing checking additions to CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:14203: testing checking additions to CFLAGS ..." 1>&5 + + cf_check_cflags="$CFLAGS" + cf_check_cppflags="$CPPFLAGS" +@@ -14183,7 +14285,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me:-configure}:14186: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me:-configure}:14288: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" +@@ -14193,7 +14295,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me:-configure}:14196: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me:-configure}:14298: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +@@ -14203,7 +14305,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}:14206: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me:-configure}:14308: 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" +@@ -14212,7 +14314,7 @@ + + if test "x$cf_check_cflags" != "x$CFLAGS" ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 14215 "configure" ++#line 14317 "configure" + #include "confdefs.h" + #include + int +@@ -14224,16 +14326,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14227: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14329: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14230: \$? = $ac_status" >&5 ++ echo "$as_me:14332: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14233: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14335: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14236: \$? = $ac_status" >&5 ++ echo "$as_me:14338: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -14241,12 +14343,12 @@ + cat conftest.$ac_ext >&5 + test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 + +-echo "${as_me:-configure}:14244: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:14346: 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}:14249: testing but keeping change to \$CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:14351: testing but keeping change to \$CPPFLAGS ..." 1>&5 + + fi + CFLAGS="$cf_check_flags" +@@ -14254,13 +14356,13 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + +- echo "$as_me:14257: checking for XOpenDisplay" >&5 ++ echo "$as_me:14359: 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 14263 "configure" ++#line 14365 "configure" + #include "confdefs.h" + #define XOpenDisplay autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -14291,16 +14393,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14294: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14396: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14297: \$? = $ac_status" >&5 ++ echo "$as_me:14399: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14300: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14402: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14303: \$? = $ac_status" >&5 ++ echo "$as_me:14405: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_XOpenDisplay=yes + else +@@ -14310,13 +14412,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:14313: result: $ac_cv_func_XOpenDisplay" >&5 ++echo "$as_me:14415: 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:14319: checking for XOpenDisplay in -lX11" >&5 ++ echo "$as_me:14421: 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 +@@ -14324,7 +14426,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 14327 "configure" ++#line 14429 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -14343,16 +14445,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14346: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14448: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14349: \$? = $ac_status" >&5 ++ echo "$as_me:14451: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14352: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14454: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14355: \$? = $ac_status" >&5 ++ echo "$as_me:14457: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_X11_XOpenDisplay=yes + else +@@ -14363,7 +14465,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:14366: result: $ac_cv_lib_X11_XOpenDisplay" >&5 ++echo "$as_me:14468: 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 + +@@ -14387,13 +14489,13 @@ + + fi + +- echo "$as_me:14390: checking for XtAppInitialize" >&5 ++ echo "$as_me:14492: 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 14396 "configure" ++#line 14498 "configure" + #include "confdefs.h" + #define XtAppInitialize autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -14424,16 +14526,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14427: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14529: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14430: \$? = $ac_status" >&5 ++ echo "$as_me:14532: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14433: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14535: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14436: \$? = $ac_status" >&5 ++ echo "$as_me:14538: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_XtAppInitialize=yes + else +@@ -14443,13 +14545,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:14446: result: $ac_cv_func_XtAppInitialize" >&5 ++echo "$as_me:14548: 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:14452: checking for XtAppInitialize in -lXt" >&5 ++ echo "$as_me:14554: 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 +@@ -14457,7 +14559,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 14460 "configure" ++#line 14562 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -14476,16 +14578,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14479: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14581: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14482: \$? = $ac_status" >&5 ++ echo "$as_me:14584: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14485: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14587: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14488: \$? = $ac_status" >&5 ++ echo "$as_me:14590: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xt_XtAppInitialize=yes + else +@@ -14496,7 +14598,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:14499: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 ++echo "$as_me:14601: 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 + +@@ -14513,7 +14615,7 @@ + fi + + if test $cf_have_X_LIBS = no ; then +- { echo "$as_me:14516: WARNING: Unable to successfully link X Toolkit library (-lXt) with ++ { echo "$as_me:14618: 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 +@@ -14539,14 +14641,14 @@ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_path/include" + +- echo "$as_me:14542: checking for $cf_test in $cf_path" >&5 ++ echo "$as_me:14644: 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:14545: checking for $cf_test" >&5 ++ echo "$as_me:14647: checking for $cf_test" >&5 + echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 + fi + cat >conftest.$ac_ext <<_ACEOF +-#line 14549 "configure" ++#line 14651 "configure" + #include "confdefs.h" + + #include +@@ -14560,16 +14662,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14563: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14665: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14566: \$? = $ac_status" >&5 ++ echo "$as_me:14668: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14569: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14671: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14572: \$? = $ac_status" >&5 ++ echo "$as_me:14674: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -14578,7 +14680,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:14581: result: $cf_result" >&5 ++ echo "$as_me:14683: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = yes ; then + cf_x_athena_inc=$cf_path +@@ -14590,7 +14692,7 @@ + done + + if test -z "$cf_x_athena_inc" ; then +- { echo "$as_me:14593: WARNING: Unable to successfully find Athena header files with test program" >&5 ++ { echo "$as_me:14695: WARNING: Unable to successfully find Athena header files with test program" >&5 + echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;} + elif test "$cf_x_athena_inc" != default ; then + +@@ -14639,7 +14741,7 @@ + done + LIBS="$cf_add_libs" + +- echo "$as_me:14642: checking for $cf_libs in $cf_path" >&5 ++ echo "$as_me:14744: checking for $cf_libs in $cf_path" >&5 + echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6 + else + +@@ -14659,11 +14761,11 @@ + done + LIBS="$cf_add_libs" + +- echo "$as_me:14662: checking for $cf_test in $cf_libs" >&5 ++ echo "$as_me:14764: checking for $cf_test in $cf_libs" >&5 + echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6 + fi + cat >conftest.$ac_ext <<_ACEOF +-#line 14666 "configure" ++#line 14768 "configure" + #include "confdefs.h" + + #include +@@ -14679,16 +14781,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14682: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14784: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14685: \$? = $ac_status" >&5 ++ echo "$as_me:14787: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14688: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14790: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14691: \$? = $ac_status" >&5 ++ echo "$as_me:14793: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -14697,7 +14799,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:14700: result: $cf_result" >&5 ++ echo "$as_me:14802: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = yes ; then + cf_x_athena_lib="$cf_libs" +@@ -14711,7 +14813,7 @@ + done + + if test -z "$cf_x_athena_lib" ; then +- { { echo "$as_me:14714: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 ++ { { echo "$as_me:14816: 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 +@@ -14729,7 +14831,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:14732: checking for $ac_word" >&5 ++echo "$as_me:14834: 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 +@@ -14744,7 +14846,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:14747: found $ac_dir/$ac_word" >&5 ++echo "$as_me:14849: found $ac_dir/$ac_word" >&5 + break + done + +@@ -14752,10 +14854,10 @@ + fi + XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG + if test -n "$XCURSES_CONFIG"; then +- echo "$as_me:14755: result: $XCURSES_CONFIG" >&5 ++ echo "$as_me:14857: result: $XCURSES_CONFIG" >&5 + echo "${ECHO_T}$XCURSES_CONFIG" >&6 + else +- echo "$as_me:14758: result: no" >&5 ++ echo "$as_me:14860: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -14768,7 +14870,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:14771: checking for $ac_word" >&5 ++echo "$as_me:14873: 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 +@@ -14783,7 +14885,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:14786: found $ac_dir/$ac_word" >&5 ++echo "$as_me:14888: found $ac_dir/$ac_word" >&5 + break + done + +@@ -14791,10 +14893,10 @@ + fi + ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG + if test -n "$ac_ct_XCURSES_CONFIG"; then +- echo "$as_me:14794: result: $ac_ct_XCURSES_CONFIG" >&5 ++ echo "$as_me:14896: result: $ac_ct_XCURSES_CONFIG" >&5 + echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6 + else +- echo "$as_me:14797: result: no" >&5 ++ echo "$as_me:14899: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -14929,7 +15031,7 @@ + + test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 + +-echo "${as_me:-configure}:14932: testing checking additions to CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15034: testing checking additions to CFLAGS ..." 1>&5 + + cf_check_cflags="$CFLAGS" + cf_check_cppflags="$CPPFLAGS" +@@ -15014,7 +15116,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me:-configure}:15017: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me:-configure}:15119: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" +@@ -15024,7 +15126,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me:-configure}:15027: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me:-configure}:15129: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +@@ -15034,7 +15136,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}:15037: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me:-configure}:15139: 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" +@@ -15043,7 +15145,7 @@ + + if test "x$cf_check_cflags" != "x$CFLAGS" ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 15046 "configure" ++#line 15148 "configure" + #include "confdefs.h" + #include + int +@@ -15055,16 +15157,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15058: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15160: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15061: \$? = $ac_status" >&5 ++ echo "$as_me:15163: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15064: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15166: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15067: \$? = $ac_status" >&5 ++ echo "$as_me:15169: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -15072,12 +15174,12 @@ + cat conftest.$ac_ext >&5 + test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 + +-echo "${as_me:-configure}:15075: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15177: 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}:15080: testing but keeping change to \$CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:15182: testing but keeping change to \$CPPFLAGS ..." 1>&5 + + fi + CFLAGS="$cf_check_flags" +@@ -15085,7 +15187,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + +-echo "$as_me:15088: checking for XOpenDisplay in -lX11" >&5 ++echo "$as_me:15190: 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 +@@ -15093,7 +15195,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 15096 "configure" ++#line 15198 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -15112,16 +15214,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15115: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15217: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15118: \$? = $ac_status" >&5 ++ echo "$as_me:15220: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15121: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15223: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15124: \$? = $ac_status" >&5 ++ echo "$as_me:15226: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_X11_XOpenDisplay=yes + else +@@ -15132,7 +15234,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:15135: result: $ac_cv_lib_X11_XOpenDisplay" >&5 ++echo "$as_me:15237: 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 + +@@ -15154,7 +15256,7 @@ + + fi + +-echo "$as_me:15157: checking for XCurses library" >&5 ++echo "$as_me:15259: 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 +@@ -15177,7 +15279,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 15180 "configure" ++#line 15282 "configure" + #include "confdefs.h" + + #include +@@ -15192,16 +15294,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15195: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15297: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15198: \$? = $ac_status" >&5 ++ echo "$as_me:15300: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15201: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15303: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15204: \$? = $ac_status" >&5 ++ echo "$as_me:15306: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_lib_XCurses=yes + else +@@ -15212,7 +15314,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:15215: result: $cf_cv_lib_XCurses" >&5 ++echo "$as_me:15317: result: $cf_cv_lib_XCurses" >&5 + echo "${ECHO_T}$cf_cv_lib_XCurses" >&6 + + fi +@@ -15227,23 +15329,23 @@ + #define XCURSES 1 + EOF + +- echo "$as_me:15230: checking for xcurses.h" >&5 ++ echo "$as_me:15332: 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 15236 "configure" ++#line 15338 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:15240: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:15342: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:15246: \$? = $ac_status" >&5 ++ echo "$as_me:15348: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -15262,7 +15364,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:15265: result: $ac_cv_header_xcurses_h" >&5 ++echo "$as_me:15367: 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 + +@@ -15273,14 +15375,14 @@ + fi + + else +- { { echo "$as_me:15276: error: Cannot link with XCurses" >&5 ++ { { echo "$as_me:15378: error: Cannot link with XCurses" >&5 + echo "$as_me: error: Cannot link with XCurses" >&2;} + { (exit 1); exit 1; }; } + fi + + ;; + (*) +- { { echo "$as_me:15283: error: unexpected screen-value: $cf_cv_screen" >&5 ++ { { echo "$as_me:15385: error: unexpected screen-value: $cf_cv_screen" >&5 + echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -15288,7 +15390,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:15291: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5 ++echo "$as_me:15393: 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 +@@ -15296,7 +15398,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$cf_nculib_root $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 15299 "configure" ++#line 15401 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -15315,16 +15417,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15318: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15420: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15321: \$? = $ac_status" >&5 ++ echo "$as_me:15423: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15324: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15426: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15327: \$? = $ac_status" >&5 ++ echo "$as_me:15429: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -15335,7 +15437,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:15338: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "$as_me:15440: 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 +@@ -15370,7 +15472,7 @@ + ;; + esac + +-echo "$as_me:15373: checking for X11 rgb file" >&5 ++echo "$as_me:15475: 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. +@@ -15434,7 +15536,7 @@ + cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:15437: error: expected a pathname, not \"$cf_path\"" >&5 ++ { { echo "$as_me:15539: error: expected a pathname, not \"$cf_path\"" >&5 + echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -15442,7 +15544,7 @@ + + fi + +-echo "$as_me:15445: result: $RGB_PATH" >&5 ++echo "$as_me:15547: result: $RGB_PATH" >&5 + echo "${ECHO_T}$RGB_PATH" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:15588: 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. +@@ -15500,7 +15602,7 @@ + cf_enable_panel=$cf_default_panel + + fi; +-echo "$as_me:15503: result: $cf_enable_panel" >&5 ++echo "$as_me:15605: result: $cf_enable_panel" >&5 + echo "${ECHO_T}$cf_enable_panel" >&6 + if test $cf_enable_panel = yes + then +@@ -15511,13 +15613,13 @@ + if test "x${NCURSES_CONFIG_PKG}" = xnone; then + : + elif test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:15514: checking pkg-config for panel$cf_cv_libtype" >&5 ++ echo "$as_me:15616: 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:15517: result: yes" >&5 ++ echo "$as_me:15619: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:15520: checking if the panel$cf_cv_libtype package files work" >&5 ++ echo "$as_me:15622: 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" +@@ -15638,7 +15740,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 15641 "configure" ++#line 15743 "configure" + #include "confdefs.h" + #include + int +@@ -15650,37 +15752,37 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15653: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15755: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15656: \$? = $ac_status" >&5 ++ echo "$as_me:15758: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15659: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15761: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15662: \$? = $ac_status" >&5 ++ echo "$as_me:15764: \$? = $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 15668 "configure" ++#line 15770 "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:15675: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15777: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15678: \$? = $ac_status" >&5 ++ echo "$as_me:15780: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:15680: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15782: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15683: \$? = $ac_status" >&5 ++ echo "$as_me:15785: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_curses_lib=yes + else +@@ -15697,7 +15799,7 @@ + cf_have_curses_lib=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:15700: result: $cf_have_curses_lib" >&5 ++ echo "$as_me:15802: 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" +@@ -15717,7 +15819,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:15720: checking for new_panel in -lpanel$cf_cv_libtype" >&5 ++echo "$as_me:15822: 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 +@@ -15725,7 +15827,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpanel$cf_cv_libtype $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 15728 "configure" ++#line 15830 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -15744,16 +15846,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15747: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15849: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15750: \$? = $ac_status" >&5 ++ echo "$as_me:15852: \$? = $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:15855: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15756: \$? = $ac_status" >&5 ++ echo "$as_me:15858: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -15764,7 +15866,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:15767: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "$as_me:15869: 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 + +@@ -15797,7 +15899,7 @@ + cf_curses_headers="$cf_curses_headers panel.h" + fi + +-echo "$as_me:15800: checking if you want to check for menu functions" >&5 ++echo "$as_me:15902: 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. +@@ -15814,7 +15916,7 @@ + cf_enable_menu=$cf_default_menu + + fi; +-echo "$as_me:15817: result: $cf_enable_menu" >&5 ++echo "$as_me:15919: result: $cf_enable_menu" >&5 + echo "${ECHO_T}$cf_enable_menu" >&6 + if test $cf_enable_menu = yes + then +@@ -15823,14 +15925,14 @@ + ;; + (curses*) + +-echo "$as_me:15826: checking for NetBSD menu.h" >&5 ++echo "$as_me:15928: 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 15833 "configure" ++#line 15935 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -15848,16 +15950,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15851: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15953: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15854: \$? = $ac_status" >&5 ++ echo "$as_me:15956: \$? = $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:15959: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15860: \$? = $ac_status" >&5 ++ echo "$as_me:15962: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_netbsd_menu_h=yes + +@@ -15869,7 +15971,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:15872: result: $cf_cv_netbsd_menu_h" >&5 ++echo "$as_me:15974: result: $cf_cv_netbsd_menu_h" >&5 + echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6 + + test "$cf_cv_netbsd_menu_h" = yes && +@@ -15886,13 +15988,13 @@ + if test "x${NCURSES_CONFIG_PKG}" = xnone; then + : + elif test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:15889: checking pkg-config for menu$cf_cv_libtype" >&5 ++ echo "$as_me:15991: 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:15892: result: yes" >&5 ++ echo "$as_me:15994: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:15895: checking if the menu$cf_cv_libtype package files work" >&5 ++ echo "$as_me:15997: 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" +@@ -16013,7 +16115,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 16016 "configure" ++#line 16118 "configure" + #include "confdefs.h" + #include + int +@@ -16025,37 +16127,37 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16028: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16130: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16031: \$? = $ac_status" >&5 ++ echo "$as_me:16133: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16034: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16136: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16037: \$? = $ac_status" >&5 ++ echo "$as_me:16139: \$? = $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 16043 "configure" ++#line 16145 "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:16050: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16152: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16053: \$? = $ac_status" >&5 ++ echo "$as_me:16155: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:16055: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16157: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16058: \$? = $ac_status" >&5 ++ echo "$as_me:16160: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_curses_lib=yes + else +@@ -16072,7 +16174,7 @@ + cf_have_curses_lib=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:16075: result: $cf_have_curses_lib" >&5 ++ echo "$as_me:16177: 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" +@@ -16092,7 +16194,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:16095: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 ++echo "$as_me:16197: 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 +@@ -16100,7 +16202,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmenu$cf_cv_libtype $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 16103 "configure" ++#line 16205 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16119,16 +16221,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16122: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16224: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16125: \$? = $ac_status" >&5 ++ echo "$as_me:16227: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16128: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16230: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16131: \$? = $ac_status" >&5 ++ echo "$as_me:16233: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -16139,7 +16241,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16142: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "$as_me:16244: 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 + +@@ -16172,7 +16274,7 @@ + cf_curses_headers="$cf_curses_headers menu.h" + fi + +-echo "$as_me:16175: checking if you want to check for form functions" >&5 ++echo "$as_me:16277: 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. +@@ -16189,7 +16291,7 @@ + cf_enable_form=$cf_default_form + + fi; +-echo "$as_me:16192: result: $cf_enable_form" >&5 ++echo "$as_me:16294: result: $cf_enable_form" >&5 + echo "${ECHO_T}$cf_enable_form" >&6 + if test $cf_enable_form = yes + then +@@ -16198,14 +16300,14 @@ + ;; + (curses*) + +-echo "$as_me:16201: checking for NetBSD form.h" >&5 ++echo "$as_me:16303: 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 16208 "configure" ++#line 16310 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -16224,16 +16326,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:16227: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16329: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16230: \$? = $ac_status" >&5 ++ echo "$as_me:16332: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:16233: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16335: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16236: \$? = $ac_status" >&5 ++ echo "$as_me:16338: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_netbsd_form_h=yes + +@@ -16245,7 +16347,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:16248: result: $cf_cv_netbsd_form_h" >&5 ++echo "$as_me:16350: result: $cf_cv_netbsd_form_h" >&5 + echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6 + + test "$cf_cv_netbsd_form_h" = yes && +@@ -16262,13 +16364,13 @@ + if test "x${NCURSES_CONFIG_PKG}" = xnone; then + : + elif test "x${PKG_CONFIG:=none}" != xnone; then +- echo "$as_me:16265: checking pkg-config for form$cf_cv_libtype" >&5 ++ echo "$as_me:16367: 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:16268: result: yes" >&5 ++ echo "$as_me:16370: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:16271: checking if the form$cf_cv_libtype package files work" >&5 ++ echo "$as_me:16373: 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" +@@ -16389,7 +16491,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 16392 "configure" ++#line 16494 "configure" + #include "confdefs.h" + #include + int +@@ -16401,37 +16503,37 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16404: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16506: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16407: \$? = $ac_status" >&5 ++ echo "$as_me:16509: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16410: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16512: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16413: \$? = $ac_status" >&5 ++ echo "$as_me:16515: \$? = $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 16419 "configure" ++#line 16521 "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:16426: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16528: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16429: \$? = $ac_status" >&5 ++ echo "$as_me:16531: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:16431: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16533: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16434: \$? = $ac_status" >&5 ++ echo "$as_me:16536: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_curses_lib=yes + else +@@ -16448,7 +16550,7 @@ + cf_have_curses_lib=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:16451: result: $cf_have_curses_lib" >&5 ++ echo "$as_me:16553: 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" +@@ -16468,7 +16570,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:16471: checking for form_driver in -lform$cf_cv_libtype" >&5 ++echo "$as_me:16573: 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 +@@ -16476,7 +16578,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lform$cf_cv_libtype $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 16479 "configure" ++#line 16581 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16495,16 +16597,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16498: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16600: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16501: \$? = $ac_status" >&5 ++ echo "$as_me:16603: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16504: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16606: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16507: \$? = $ac_status" >&5 ++ echo "$as_me:16609: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -16515,7 +16617,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16518: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "$as_me:16620: 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 + +@@ -16553,23 +16655,23 @@ + for ac_header in $cf_curses_headers + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:16556: checking for $ac_header" >&5 ++echo "$as_me:16658: 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 16562 "configure" ++#line 16664 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:16566: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:16668: \"$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:16572: \$? = $ac_status" >&5 ++ echo "$as_me:16674: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16588,7 +16690,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:16591: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:16693: 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:16703: 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 16607 "configure" ++#line 16709 "configure" + #include "confdefs.h" + #include + #include +@@ -16612,13 +16714,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:16615: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:16717: \"$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:16621: \$? = $ac_status" >&5 ++ echo "$as_me:16723: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16640,7 +16742,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 16643 "configure" ++#line 16745 "configure" + #include "confdefs.h" + #include + +@@ -16658,7 +16760,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 16661 "configure" ++#line 16763 "configure" + #include "confdefs.h" + #include + +@@ -16679,7 +16781,7 @@ + : + else + cat >conftest.$ac_ext <<_ACEOF +-#line 16682 "configure" ++#line 16784 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -16705,15 +16807,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:16708: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16810: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16711: \$? = $ac_status" >&5 ++ echo "$as_me:16813: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:16713: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16815: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16716: \$? = $ac_status" >&5 ++ echo "$as_me:16818: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -16726,7 +16828,7 @@ + fi + fi + fi +-echo "$as_me:16729: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:16831: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -16736,13 +16838,13 @@ + + fi + +-echo "$as_me:16739: checking whether time.h and sys/time.h may both be included" >&5 ++echo "$as_me:16841: 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 16745 "configure" ++#line 16847 "configure" + #include "confdefs.h" + #include + #include +@@ -16758,16 +16860,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:16761: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16863: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16764: \$? = $ac_status" >&5 ++ echo "$as_me:16866: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:16767: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16869: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16770: \$? = $ac_status" >&5 ++ echo "$as_me:16872: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_time=yes + else +@@ -16777,7 +16879,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:16780: result: $ac_cv_header_time" >&5 ++echo "$as_me:16882: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -16801,23 +16903,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:16804: checking for $ac_header" >&5 ++echo "$as_me:16906: 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 16810 "configure" ++#line 16912 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:16814: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:16916: \"$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:16820: \$? = $ac_status" >&5 ++ echo "$as_me:16922: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16836,7 +16938,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:16839: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:16941: 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:16954: 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 16858 "configure" ++#line 16960 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:16862: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:16964: \"$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:16868: \$? = $ac_status" >&5 ++ echo "$as_me:16970: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16884,7 +16986,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:16887: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:16989: 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:16999: 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 +@@ -16904,7 +17006,7 @@ + for cf_header in stdio.h stdlib.h unistd.h getopt.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 16907 "configure" ++#line 17009 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -16917,16 +17019,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:16920: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17022: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16923: \$? = $ac_status" >&5 ++ echo "$as_me:17025: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:16926: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17028: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16929: \$? = $ac_status" >&5 ++ echo "$as_me:17031: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_getopt_header=$cf_header + break +@@ -16938,7 +17040,7 @@ + done + + fi +-echo "$as_me:16941: result: $cf_cv_getopt_header" >&5 ++echo "$as_me:17043: result: $cf_cv_getopt_header" >&5 + echo "${ECHO_T}$cf_cv_getopt_header" >&6 + if test $cf_cv_getopt_header != none ; then + +@@ -16963,13 +17065,13 @@ + + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:16966: checking for $ac_func" >&5 ++echo "$as_me:17068: 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 16972 "configure" ++#line 17074 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -17000,16 +17102,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17003: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17105: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17006: \$? = $ac_status" >&5 ++ echo "$as_me:17108: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17009: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17111: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17012: \$? = $ac_status" >&5 ++ echo "$as_me:17114: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -17019,7 +17121,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:17022: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:17124: 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:17135: 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 17040 "configure" ++#line 17142 "configure" + #include "confdefs.h" + + #include +@@ -17058,16 +17160,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17061: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17163: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17064: \$? = $ac_status" >&5 ++ echo "$as_me:17166: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17067: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17169: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17070: \$? = $ac_status" >&5 ++ echo "$as_me:17172: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_termcap_h=yes + else +@@ -17077,7 +17179,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:17080: result: $cf_cv_have_termcap_h" >&5 ++echo "$as_me:17182: 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 +@@ -17086,14 +17188,14 @@ + EOF + + else +-echo "$as_me:17089: checking if we can use ncurses/termcap.h" >&5 ++echo "$as_me:17191: 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 17096 "configure" ++#line 17198 "configure" + #include "confdefs.h" + + #include +@@ -17114,16 +17216,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17117: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17219: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17120: \$? = $ac_status" >&5 ++ echo "$as_me:17222: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17123: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17225: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17126: \$? = $ac_status" >&5 ++ echo "$as_me:17228: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_ncurses_termcap_h=yes + else +@@ -17133,7 +17235,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:17136: result: $cf_cv_have_ncurses_termcap_h" >&5 ++echo "$as_me:17238: 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 + #define HAVE_NCURSES_TERMCAP_H 1 +@@ -17142,7 +17244,7 @@ + fi + + if test "x$ac_cv_func_getopt" = xno; then +- { { echo "$as_me:17145: error: getopt is required for building programs" >&5 ++ { { echo "$as_me:17247: error: getopt is required for building programs" >&5 + echo "$as_me: error: getopt is required for building programs" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -17161,13 +17263,13 @@ + + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:17164: checking for $ac_func" >&5 ++echo "$as_me:17266: 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 17170 "configure" ++#line 17272 "configure" + #include "confdefs.h" + #define $ac_func autoconf_temporary + #include /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -17198,16 +17300,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17201: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17303: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17204: \$? = $ac_status" >&5 ++ echo "$as_me:17306: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17207: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17309: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17210: \$? = $ac_status" >&5 ++ echo "$as_me:17312: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -17217,7 +17319,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:17220: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:17322: 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:17334: 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 +@@ -17237,7 +17339,7 @@ + + cf_cv_need_xopen_extension=unknown + cat >conftest.$ac_ext <<_ACEOF +-#line 17240 "configure" ++#line 17342 "configure" + #include "confdefs.h" + + #include +@@ -17263,16 +17365,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17266: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17368: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17269: \$? = $ac_status" >&5 ++ echo "$as_me:17371: \$? = $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:17374: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17275: \$? = $ac_status" >&5 ++ echo "$as_me:17377: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_need_xopen_extension=none + else +@@ -17282,7 +17384,7 @@ + for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR + do + cat >conftest.$ac_ext <<_ACEOF +-#line 17285 "configure" ++#line 17387 "configure" + #include "confdefs.h" + + #define $cf_try_xopen_extension 1 +@@ -17304,16 +17406,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17307: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17409: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17310: \$? = $ac_status" >&5 ++ echo "$as_me:17412: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17313: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17415: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17316: \$? = $ac_status" >&5 ++ echo "$as_me:17418: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_need_xopen_extension=$cf_try_xopen_extension; break + else +@@ -17327,7 +17429,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:17330: result: $cf_cv_need_xopen_extension" >&5 ++echo "$as_me:17432: result: $cf_cv_need_xopen_extension" >&5 + echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 + + case $cf_cv_need_xopen_extension in +@@ -17339,7 +17441,7 @@ + ;; + esac + +-echo "$as_me:17342: checking for term.h" >&5 ++echo "$as_me:17444: 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 +@@ -17360,7 +17462,7 @@ + for cf_header in $cf_header_list + do + cat >conftest.$ac_ext <<_ACEOF +-#line 17363 "configure" ++#line 17465 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -17374,16 +17476,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17377: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17479: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17380: \$? = $ac_status" >&5 ++ echo "$as_me:17482: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17383: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17485: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17386: \$? = $ac_status" >&5 ++ echo "$as_me:17488: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_term_header=$cf_header + break +@@ -17402,7 +17504,7 @@ + for cf_header in ncurses/term.h ncursesw/term.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 17405 "configure" ++#line 17507 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -17420,16 +17522,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17423: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17525: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17426: \$? = $ac_status" >&5 ++ echo "$as_me:17528: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17429: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17531: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17432: \$? = $ac_status" >&5 ++ echo "$as_me:17534: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_term_header=$cf_header + break +@@ -17444,7 +17546,7 @@ + esac + + fi +-echo "$as_me:17447: result: $cf_cv_term_header" >&5 ++echo "$as_me:17549: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + case $cf_cv_term_header in +@@ -17471,7 +17573,7 @@ + ;; + esac + +-echo "$as_me:17474: checking for unctrl.h" >&5 ++echo "$as_me:17576: 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 +@@ -17492,7 +17594,7 @@ + for cf_header in $cf_header_list + do + cat >conftest.$ac_ext <<_ACEOF +-#line 17495 "configure" ++#line 17597 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -17506,16 +17608,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17509: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17611: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17512: \$? = $ac_status" >&5 ++ echo "$as_me:17614: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17515: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17617: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17518: \$? = $ac_status" >&5 ++ echo "$as_me:17620: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_unctrl_header=$cf_header + break +@@ -17528,12 +17630,12 @@ + done + + fi +-echo "$as_me:17531: result: $cf_cv_unctrl_header" >&5 ++echo "$as_me:17633: result: $cf_cv_unctrl_header" >&5 + echo "${ECHO_T}$cf_cv_unctrl_header" >&6 + + case $cf_cv_unctrl_header in + (no) +- { echo "$as_me:17536: WARNING: unctrl.h header not found" >&5 ++ { echo "$as_me:17638: WARNING: unctrl.h header not found" >&5 + echo "$as_me: WARNING: unctrl.h header not found" >&2;} + ;; + esac +@@ -17622,10 +17724,10 @@ + + cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +- echo "$as_me:17625: checking for ${cf_func}" >&5 ++ echo "$as_me:17727: checking for ${cf_func}" >&5 + echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 + +-echo "${as_me:-configure}:17628: testing ${cf_func} ..." 1>&5 ++echo "${as_me:-configure}:17730: testing ${cf_func} ..." 1>&5 + + if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17634,7 +17736,7 @@ + eval cf_result='$ac_cv_func_'$cf_func + if test ".$cf_result" != ".no"; then + cat >conftest.$ac_ext <<_ACEOF +-#line 17637 "configure" ++#line 17739 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -17667,16 +17769,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17670: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17772: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17673: \$? = $ac_status" >&5 ++ echo "$as_me:17775: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17676: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17778: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17679: \$? = $ac_status" >&5 ++ echo "$as_me:17781: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -17692,7 +17794,7 @@ + + # use the computed/retrieved cache-value: + eval 'cf_result=$cf_cv_func_'$cf_func +- echo "$as_me:17695: result: $cf_result" >&5 ++ echo "$as_me:17797: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result != no; then + cat >>confdefs.h <&5 ++ echo "$as_me:17812: checking for ${cf_func}" >&5 + echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 + +-echo "${as_me:-configure}:17713: testing ${cf_func} ..." 1>&5 ++echo "${as_me:-configure}:17815: testing ${cf_func} ..." 1>&5 + + if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17719,7 +17821,7 @@ + eval cf_result='$ac_cv_func_'$cf_func + if test ".$cf_result" != ".no"; then + cat >conftest.$ac_ext <<_ACEOF +-#line 17722 "configure" ++#line 17824 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -17752,16 +17854,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17755: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17857: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17758: \$? = $ac_status" >&5 ++ echo "$as_me:17860: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17761: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17863: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17764: \$? = $ac_status" >&5 ++ echo "$as_me:17866: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -17777,7 +17879,7 @@ + + # use the computed/retrieved cache-value: + eval 'cf_result=$cf_cv_func_'$cf_func +- echo "$as_me:17780: result: $cf_result" >&5 ++ echo "$as_me:17882: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result != no; then + cat >>confdefs.h <conftest.$ac_ext <<_ACEOF +-#line 17804 "configure" ++#line 17906 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -17821,21 +17923,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17824: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17926: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17827: \$? = $ac_status" >&5 ++ echo "$as_me:17929: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17830: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17932: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17833: \$? = $ac_status" >&5 ++ echo "$as_me:17935: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6 + +-echo "${as_me:-configure}:17838: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 ++echo "${as_me:-configure}:17940: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 + + cat >>confdefs.h <&5 ++echo "$as_me:17960: 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 17865 "configure" ++#line 17967 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -17877,16 +17979,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17880: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17982: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17883: \$? = $ac_status" >&5 ++ echo "$as_me:17985: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17886: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17988: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17889: \$? = $ac_status" >&5 ++ echo "$as_me:17991: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_ext_funcs=defined + else +@@ -17894,7 +17996,7 @@ + cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 17897 "configure" ++#line 17999 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -17919,16 +18021,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17922: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18024: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17925: \$? = $ac_status" >&5 ++ echo "$as_me:18027: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17928: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18030: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17931: \$? = $ac_status" >&5 ++ echo "$as_me:18033: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_ext_funcs=yes + else +@@ -17942,7 +18044,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:17945: result: $cf_cv_ncurses_ext_funcs" >&5 ++echo "$as_me:18047: 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 +@@ -17956,11 +18058,11 @@ + if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno + then + cf_define_xpg5=no +- echo "$as_me:17959: checking if _XPG5 should be defined to enable wide-characters" >&5 ++ echo "$as_me:18061: 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 17963 "configure" ++#line 18065 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -17973,16 +18075,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17976: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18078: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17979: \$? = $ac_status" >&5 ++ echo "$as_me:18081: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17982: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18084: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17985: \$? = $ac_status" >&5 ++ echo "$as_me:18087: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -17991,7 +18093,7 @@ + cf_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_XPG5" + cat >conftest.$ac_ext <<_ACEOF +-#line 17994 "configure" ++#line 18096 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -18004,16 +18106,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18007: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18109: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18010: \$? = $ac_status" >&5 ++ echo "$as_me:18112: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18013: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18115: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18016: \$? = $ac_status" >&5 ++ echo "$as_me:18118: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_define_xpg5=yes + else +@@ -18024,7 +18126,7 @@ + CPPFLAGS="$cf_save_cppflags" + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:18027: result: $cf_define_xpg5" >&5 ++ echo "$as_me:18129: result: $cf_define_xpg5" >&5 + echo "${ECHO_T}$cf_define_xpg5" >&6 + + if test "$cf_define_xpg5" = yes +@@ -18033,14 +18135,14 @@ + fi + fi + +- echo "$as_me:18036: checking for wide-character functions" >&5 ++ echo "$as_me:18138: 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 18043 "configure" ++#line 18145 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -18057,16 +18159,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18060: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18162: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18063: \$? = $ac_status" >&5 ++ echo "$as_me:18165: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18066: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18168: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18069: \$? = $ac_status" >&5 ++ echo "$as_me:18171: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_widechar_funcs=yes + else +@@ -18077,7 +18179,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:18080: result: $cf_cv_widechar_funcs" >&5 ++echo "$as_me:18182: result: $cf_cv_widechar_funcs" >&5 + echo "${ECHO_T}$cf_cv_widechar_funcs" >&6 + if test "$cf_cv_widechar_funcs" != no ; then + +@@ -18098,14 +18200,14 @@ + + fi + +-echo "$as_me:18101: checking if $cf_cv_screen library uses pthreads" >&5 ++echo "$as_me:18203: 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 18108 "configure" ++#line 18210 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -18123,16 +18225,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18126: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18228: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18129: \$? = $ac_status" >&5 ++ echo "$as_me:18231: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18132: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18234: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18135: \$? = $ac_status" >&5 ++ echo "$as_me:18237: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_use_pthreads=yes + else +@@ -18143,20 +18245,20 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:18146: result: $cf_cv_use_pthreads" >&5 ++echo "$as_me:18248: 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:18152: checking if sys/time.h works with sys/select.h" >&5 ++echo "$as_me:18254: 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 18159 "configure" ++#line 18261 "configure" + #include "confdefs.h" + + #include +@@ -18176,16 +18278,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18179: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18281: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18182: \$? = $ac_status" >&5 ++ echo "$as_me:18284: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18185: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18287: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18188: \$? = $ac_status" >&5 ++ echo "$as_me:18290: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sys_time_select=yes + else +@@ -18197,7 +18299,7 @@ + + fi + +-echo "$as_me:18200: result: $cf_cv_sys_time_select" >&5 ++echo "$as_me:18302: 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 +@@ -18206,7 +18308,7 @@ + + # special check for test/ditto.c + +-echo "$as_me:18209: checking for openpty in -lutil" >&5 ++echo "$as_me:18311: 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 +@@ -18214,7 +18316,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lutil $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 18217 "configure" ++#line 18319 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -18233,16 +18335,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18236: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18338: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18239: \$? = $ac_status" >&5 ++ echo "$as_me:18341: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18242: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18344: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18245: \$? = $ac_status" >&5 ++ echo "$as_me:18347: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_util_openpty=yes + else +@@ -18253,7 +18355,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:18256: result: $ac_cv_lib_util_openpty" >&5 ++echo "$as_me:18358: 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 +@@ -18261,7 +18363,7 @@ + cf_cv_lib_util=no + fi + +-echo "$as_me:18264: checking for openpty header" >&5 ++echo "$as_me:18366: 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 +@@ -18288,7 +18390,7 @@ + for cf_header in pty.h libutil.h util.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 18291 "configure" ++#line 18393 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -18305,16 +18407,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18308: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18410: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18311: \$? = $ac_status" >&5 ++ echo "$as_me:18413: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18314: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18416: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18317: \$? = $ac_status" >&5 ++ echo "$as_me:18419: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_func_openpty=$cf_header +@@ -18332,7 +18434,7 @@ + LIBS="$cf_save_LIBS" + + fi +-echo "$as_me:18335: result: $cf_cv_func_openpty" >&5 ++echo "$as_me:18437: result: $cf_cv_func_openpty" >&5 + echo "${ECHO_T}$cf_cv_func_openpty" >&6 + + if test "$cf_cv_func_openpty" != no ; then +@@ -18366,7 +18468,7 @@ + fi + fi + +-echo "$as_me:18369: checking for function curses_version" >&5 ++echo "$as_me:18471: 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 +@@ -18376,7 +18478,7 @@ + cf_cv_func_curses_version=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 18379 "configure" ++#line 18481 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -18389,15 +18491,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:18392: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18494: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18395: \$? = $ac_status" >&5 ++ echo "$as_me:18497: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:18397: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18499: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18400: \$? = $ac_status" >&5 ++ echo "$as_me:18502: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_curses_version=yes + +@@ -18412,14 +18514,14 @@ + fi + rm -f core + fi +-echo "$as_me:18415: result: $cf_cv_func_curses_version" >&5 ++echo "$as_me:18517: 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:18422: checking for alternate character set array" >&5 ++echo "$as_me:18524: 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 +@@ -18429,7 +18531,7 @@ + for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map + do + cat >conftest.$ac_ext <<_ACEOF +-#line 18432 "configure" ++#line 18534 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -18445,16 +18547,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18448: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18550: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18451: \$? = $ac_status" >&5 ++ echo "$as_me:18553: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18454: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18556: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18457: \$? = $ac_status" >&5 ++ echo "$as_me:18559: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_curses_acs_map=$name; break + else +@@ -18465,7 +18567,7 @@ + done + + fi +-echo "$as_me:18468: result: $cf_cv_curses_acs_map" >&5 ++echo "$as_me:18570: result: $cf_cv_curses_acs_map" >&5 + echo "${ECHO_T}$cf_cv_curses_acs_map" >&6 + + test "$cf_cv_curses_acs_map" != unknown && +@@ -18475,7 +18577,7 @@ + + if test "$cf_enable_widec" = yes; then + +-echo "$as_me:18478: checking for wide alternate character set array" >&5 ++echo "$as_me:18580: 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 +@@ -18485,7 +18587,7 @@ + for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char + do + cat >conftest.$ac_ext <<_ACEOF +-#line 18488 "configure" ++#line 18590 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -18501,16 +18603,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18504: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18606: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18507: \$? = $ac_status" >&5 ++ echo "$as_me:18609: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18510: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18612: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18513: \$? = $ac_status" >&5 ++ echo "$as_me:18615: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_curses_wacs_map=$name + break +@@ -18521,7 +18623,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done + fi +-echo "$as_me:18524: result: $cf_cv_curses_wacs_map" >&5 ++echo "$as_me:18626: result: $cf_cv_curses_wacs_map" >&5 + echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 + + test "$cf_cv_curses_wacs_map" != unknown && +@@ -18529,7 +18631,7 @@ + #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map + EOF + +-echo "$as_me:18532: checking for wide alternate character constants" >&5 ++echo "$as_me:18634: 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 +@@ -18539,7 +18641,7 @@ + if test "$cf_cv_curses_wacs_map" != unknown + then + cat >conftest.$ac_ext <<_ACEOF +-#line 18542 "configure" ++#line 18644 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -18556,16 +18658,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18559: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18661: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18562: \$? = $ac_status" >&5 ++ echo "$as_me:18664: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18565: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18667: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18568: \$? = $ac_status" >&5 ++ echo "$as_me:18670: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_curses_wacs_symbols=yes + else +@@ -18575,7 +18677,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + else + cat >conftest.$ac_ext <<_ACEOF +-#line 18578 "configure" ++#line 18680 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -18591,16 +18693,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18594: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18696: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18597: \$? = $ac_status" >&5 ++ echo "$as_me:18699: \$? = $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:18702: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18603: \$? = $ac_status" >&5 ++ echo "$as_me:18705: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_curses_wacs_symbols=yes + else +@@ -18611,7 +18713,7 @@ + fi + + fi +-echo "$as_me:18614: result: $cf_cv_curses_wacs_symbols" >&5 ++echo "$as_me:18716: result: $cf_cv_curses_wacs_symbols" >&5 + echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 + + test "$cf_cv_curses_wacs_symbols" != no && +@@ -18621,10 +18723,10 @@ + + fi + +-echo "$as_me:18624: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:18726: 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 18627 "configure" ++#line 18729 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -18642,16 +18744,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18645: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18747: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18648: \$? = $ac_status" >&5 ++ echo "$as_me:18750: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18651: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18753: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18654: \$? = $ac_status" >&5 ++ echo "$as_me:18756: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -18660,7 +18762,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:18663: result: $cf_result" >&5 ++echo "$as_me:18765: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -18681,14 +18783,14 @@ + if test "$cf_enable_widec" = yes; then + + # This is needed on Tru64 5.0 to declare mbstate_t +-echo "$as_me:18684: checking if we must include wchar.h to declare mbstate_t" >&5 ++echo "$as_me:18786: 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 18691 "configure" ++#line 18793 "configure" + #include "confdefs.h" + + #include +@@ -18706,23 +18808,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18709: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18811: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18712: \$? = $ac_status" >&5 ++ echo "$as_me:18814: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18715: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18817: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18718: \$? = $ac_status" >&5 ++ echo "$as_me:18820: \$? = $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 18725 "configure" ++#line 18827 "configure" + #include "confdefs.h" + + #include +@@ -18741,16 +18843,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18744: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18846: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18747: \$? = $ac_status" >&5 ++ echo "$as_me:18849: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18750: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18852: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18753: \$? = $ac_status" >&5 ++ echo "$as_me:18855: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_mbstate_t=yes + else +@@ -18762,7 +18864,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:18765: result: $cf_cv_mbstate_t" >&5 ++echo "$as_me:18867: result: $cf_cv_mbstate_t" >&5 + echo "${ECHO_T}$cf_cv_mbstate_t" >&6 + + if test "$cf_cv_mbstate_t" = yes ; then +@@ -18785,14 +18887,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wchar_t +-echo "$as_me:18788: checking if we must include wchar.h to declare wchar_t" >&5 ++echo "$as_me:18890: 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 18795 "configure" ++#line 18897 "configure" + #include "confdefs.h" + + #include +@@ -18810,23 +18912,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18813: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18915: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18816: \$? = $ac_status" >&5 ++ echo "$as_me:18918: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18819: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18921: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18822: \$? = $ac_status" >&5 ++ echo "$as_me:18924: \$? = $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 18829 "configure" ++#line 18931 "configure" + #include "confdefs.h" + + #include +@@ -18845,16 +18947,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18848: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18950: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18851: \$? = $ac_status" >&5 ++ echo "$as_me:18953: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18854: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18956: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18857: \$? = $ac_status" >&5 ++ echo "$as_me:18959: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wchar_t=yes + else +@@ -18866,7 +18968,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:18869: result: $cf_cv_wchar_t" >&5 ++echo "$as_me:18971: result: $cf_cv_wchar_t" >&5 + echo "${ECHO_T}$cf_cv_wchar_t" >&6 + + if test "$cf_cv_wchar_t" = yes ; then +@@ -18889,14 +18991,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wint_t +-echo "$as_me:18892: checking if we must include wchar.h to declare wint_t" >&5 ++echo "$as_me:18994: 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 18899 "configure" ++#line 19001 "configure" + #include "confdefs.h" + + #include +@@ -18914,23 +19016,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18917: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19019: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18920: \$? = $ac_status" >&5 ++ echo "$as_me:19022: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18923: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19025: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18926: \$? = $ac_status" >&5 ++ echo "$as_me:19028: \$? = $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 18933 "configure" ++#line 19035 "configure" + #include "confdefs.h" + + #include +@@ -18949,16 +19051,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18952: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19054: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18955: \$? = $ac_status" >&5 ++ echo "$as_me:19057: \$? = $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:19060: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18961: \$? = $ac_status" >&5 ++ echo "$as_me:19063: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wint_t=yes + else +@@ -18970,7 +19072,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:18973: result: $cf_cv_wint_t" >&5 ++echo "$as_me:19075: result: $cf_cv_wint_t" >&5 + echo "${ECHO_T}$cf_cv_wint_t" >&6 + + if test "$cf_cv_wint_t" = yes ; then +@@ -18994,10 +19096,10 @@ + + if test "$NCURSES_OK_MBSTATE_T" = 0 ; then + +-echo "$as_me:18997: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:19099: 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 19000 "configure" ++#line 19102 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -19015,16 +19117,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19018: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19120: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19021: \$? = $ac_status" >&5 ++ echo "$as_me:19123: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19024: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19126: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19027: \$? = $ac_status" >&5 ++ echo "$as_me:19129: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -19033,7 +19135,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:19036: result: $cf_result" >&5 ++echo "$as_me:19138: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -19055,10 +19157,10 @@ + + if test "$NCURSES_OK_WCHAR_T" = 0 ; then + +-echo "$as_me:19058: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:19160: 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 19061 "configure" ++#line 19163 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -19076,16 +19178,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19079: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19181: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19082: \$? = $ac_status" >&5 ++ echo "$as_me:19184: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19085: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19187: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19088: \$? = $ac_status" >&5 ++ echo "$as_me:19190: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -19094,7 +19196,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:19097: result: $cf_result" >&5 ++echo "$as_me:19199: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -19116,10 +19218,10 @@ + + if test "$NCURSES_OK_WINT_T" = 0 ; then + +-echo "$as_me:19119: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:19221: 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 19122 "configure" ++#line 19224 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -19137,16 +19239,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19140: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19242: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19143: \$? = $ac_status" >&5 ++ echo "$as_me:19245: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19146: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19248: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19149: \$? = $ac_status" >&5 ++ echo "$as_me:19251: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -19155,7 +19257,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:19158: result: $cf_result" >&5 ++echo "$as_me:19260: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -19184,11 +19286,11 @@ + boolfnames \ + ttytype + do +-echo "$as_me:19187: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:19289: 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 19191 "configure" ++#line 19293 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -19216,16 +19318,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19219: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19321: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19222: \$? = $ac_status" >&5 ++ echo "$as_me:19324: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19225: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19327: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19228: \$? = $ac_status" >&5 ++ echo "$as_me:19330: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + +@@ -19235,7 +19337,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:19238: result: $cf_result" >&5 ++echo "$as_me:19340: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + + if test $cf_result = yes ; then +@@ -19247,14 +19349,14 @@ + EOF + + else +- echo "$as_me:19250: checking for data $cf_data in library" >&5 ++ echo "$as_me:19352: 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 19257 "configure" ++#line 19359 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -19287,16 +19389,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19290: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19392: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19293: \$? = $ac_status" >&5 ++ echo "$as_me:19395: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:19296: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19398: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19299: \$? = $ac_status" >&5 ++ echo "$as_me:19401: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -19308,7 +19410,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 19311 "configure" ++#line 19413 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -19334,15 +19436,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:19337: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19439: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19340: \$? = $ac_status" >&5 ++ echo "$as_me:19442: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:19342: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19444: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19345: \$? = $ac_status" >&5 ++ echo "$as_me:19447: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + +@@ -19354,7 +19456,7 @@ + fi + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi +- echo "$as_me:19357: result: $cf_result" >&5 ++ echo "$as_me:19459: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -19371,7 +19473,7 @@ + + if ( test "$GCC" = yes || test "$GXX" = yes ) + then +-echo "$as_me:19374: checking if you want to turn on gcc warnings" >&5 ++echo "$as_me:19476: 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. +@@ -19388,7 +19490,7 @@ + with_warnings=no + + fi; +-echo "$as_me:19391: result: $with_warnings" >&5 ++echo "$as_me:19493: result: $with_warnings" >&5 + echo "${ECHO_T}$with_warnings" >&6 + if test "$with_warnings" = "yes" + then +@@ -19411,10 +19513,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:19414: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:19516: 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:19568: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19469: \$? = $ac_status" >&5 ++ echo "$as_me:19571: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:19471: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:19573: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case $cf_attribute in +@@ -19527,113 +19629,111 @@ + rm -rf conftest* + fi + +-INTEL_COMPILER=no +- +-if test "$GCC" = yes ; then +- case $host_os in +- (linux*|gnu*) +- echo "$as_me:19535: 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 19540 "configure" ++if test "x$have_x" = xyes; then ++cat >conftest.$ac_ext <<_ACEOF ++#line 19634 "configure" + #include "confdefs.h" + ++#include ++#include ++ + int + main (void) + { +- +-#ifdef __INTEL_COMPILER +-#else +-make an error +-#endif +- ++String foo = malloc(1) + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19557: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19649: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19560: \$? = $ac_status" >&5 ++ echo "$as_me:19652: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19563: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19655: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19566: \$? = $ac_status" >&5 ++ echo "$as_me:19658: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- INTEL_COMPILER=yes +-cf_save_CFLAGS="$cf_save_CFLAGS -we147" + ++echo "$as_me:19661: checking for X11/Xt const-feature" >&5 ++echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 ++if test "${cf_cv_const_x_string+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- echo "$as_me: failed program was:" >&5 +-cat conftest.$ac_ext >&5 +-fi +-rm -f conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$cf_save_CFLAGS" +- echo "$as_me:19577: result: $INTEL_COMPILER" >&5 +-echo "${ECHO_T}$INTEL_COMPILER" >&6 +- ;; +- esac +-fi + +-CLANG_COMPILER=no +- +-if test "$GCC" = yes ; then +- echo "$as_me:19586: 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 19591 "configure" ++#line 19668 "configure" + #include "confdefs.h" + ++#define _CONST_X_STRING /* X11R7.8 (perhaps) */ ++#undef XTSTRINGDEFINES /* X11R5 and later */ ++#include ++#include ++ + int + main (void) + { +- +-#ifdef __clang__ +-#else +-make an error +-#endif +- ++String foo = malloc(1); *foo = 0 + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19608: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19685: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19611: \$? = $ac_status" >&5 ++ echo "$as_me:19688: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19614: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19691: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19617: \$? = $ac_status" >&5 ++ echo "$as_me:19694: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- CLANG_COMPILER=yes +-cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" ++ ++ 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 +- CFLAGS="$cf_save_CFLAGS" +- echo "$as_me:19628: result: $CLANG_COMPILER" >&5 +-echo "${ECHO_T}$CLANG_COMPILER" >&6 ++ + fi ++echo "$as_me:19709: 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:19750: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="-Wall" +@@ -19663,21 +19763,20 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:19666: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:19766: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19669: \$? = $ac_status" >&5 ++ echo "$as_me:19769: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:19671: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:19771: 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:19680: checking for $CC warning options..." >&5 ++ { echo "$as_me:19779: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS= +@@ -19701,26 +19800,20 @@ + Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:19704: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:19803: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19707: \$? = $ac_status" >&5 ++ echo "$as_me:19806: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:19709: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:19808: 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}:19723: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:19816: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -19730,7 +19823,7 @@ + ([12].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:19733: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:19826: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -19746,7 +19839,7 @@ + fi + fi + +-echo "$as_me:19749: checking if you want to use dmalloc for testing" >&5 ++echo "$as_me:19842: 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. +@@ -19763,7 +19856,7 @@ + else + with_dmalloc= + fi; +-echo "$as_me:19766: result: ${with_dmalloc:-no}" >&5 ++echo "$as_me:19859: result: ${with_dmalloc:-no}" >&5 + echo "${ECHO_T}${with_dmalloc:-no}" >&6 + + case .$with_cflags in +@@ -19877,23 +19970,23 @@ + esac + + if test "$with_dmalloc" = yes ; then +- echo "$as_me:19880: checking for dmalloc.h" >&5 ++ echo "$as_me:19973: 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 19886 "configure" ++#line 19979 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:19890: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:19983: \"$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:19896: \$? = $ac_status" >&5 ++ echo "$as_me:19989: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -19912,11 +20005,11 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:19915: result: $ac_cv_header_dmalloc_h" >&5 ++echo "$as_me:20008: 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:19919: checking for dmalloc_debug in -ldmalloc" >&5 ++echo "$as_me:20012: 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 +@@ -19924,7 +20017,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldmalloc $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 19927 "configure" ++#line 20020 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19943,16 +20036,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19946: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20039: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19949: \$? = $ac_status" >&5 ++ echo "$as_me:20042: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:19952: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20045: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19955: \$? = $ac_status" >&5 ++ echo "$as_me:20048: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dmalloc_dmalloc_debug=yes + else +@@ -19963,7 +20056,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19966: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 ++echo "$as_me:20059: 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:20074: 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. +@@ -19995,7 +20088,7 @@ + else + with_dbmalloc= + fi; +-echo "$as_me:19998: result: ${with_dbmalloc:-no}" >&5 ++echo "$as_me:20091: result: ${with_dbmalloc:-no}" >&5 + echo "${ECHO_T}${with_dbmalloc:-no}" >&6 + + case .$with_cflags in +@@ -20109,23 +20202,23 @@ + esac + + if test "$with_dbmalloc" = yes ; then +- echo "$as_me:20112: checking for dbmalloc.h" >&5 ++ echo "$as_me:20205: 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 20118 "configure" ++#line 20211 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:20122: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:20215: \"$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:20128: \$? = $ac_status" >&5 ++ echo "$as_me:20221: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -20144,11 +20237,11 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:20147: result: $ac_cv_header_dbmalloc_h" >&5 ++echo "$as_me:20240: 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:20151: checking for debug_malloc in -ldbmalloc" >&5 ++echo "$as_me:20244: 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 +@@ -20156,7 +20249,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldbmalloc $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 20159 "configure" ++#line 20252 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -20175,16 +20268,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20178: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20271: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20181: \$? = $ac_status" >&5 ++ echo "$as_me:20274: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20184: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20277: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20187: \$? = $ac_status" >&5 ++ echo "$as_me:20280: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dbmalloc_debug_malloc=yes + else +@@ -20195,7 +20288,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:20198: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 ++echo "$as_me:20291: 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:20306: 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. +@@ -20227,7 +20320,7 @@ + else + with_valgrind= + fi; +-echo "$as_me:20230: result: ${with_valgrind:-no}" >&5 ++echo "$as_me:20323: result: ${with_valgrind:-no}" >&5 + echo "${ECHO_T}${with_valgrind:-no}" >&6 + + case .$with_cflags in +@@ -20340,7 +20433,7 @@ + ;; + esac + +-echo "$as_me:20343: checking if you want to perform memory-leak testing" >&5 ++echo "$as_me:20436: 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. +@@ -20350,7 +20443,7 @@ + else + : ${with_no_leaks:=no} + fi; +-echo "$as_me:20353: result: $with_no_leaks" >&5 ++echo "$as_me:20446: result: $with_no_leaks" >&5 + echo "${ECHO_T}$with_no_leaks" >&6 + + if test "$with_no_leaks" = yes ; then +@@ -20368,7 +20461,7 @@ + LD_RPATH_OPT= + if test "x$cf_cv_enable_rpath" != xno + then +- echo "$as_me:20371: checking for an rpath option" >&5 ++ echo "$as_me:20464: checking for an rpath option" >&5 + echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 + case $cf_cv_system_name in + (irix*) +@@ -20399,12 +20492,12 @@ + (*) + ;; + esac +- echo "$as_me:20402: result: $LD_RPATH_OPT" >&5 ++ echo "$as_me:20495: result: $LD_RPATH_OPT" >&5 + echo "${ECHO_T}$LD_RPATH_OPT" >&6 + + case "x$LD_RPATH_OPT" in + (x-R*) +- echo "$as_me:20407: checking if we need a space after rpath option" >&5 ++ echo "$as_me:20500: 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" + +@@ -20425,7 +20518,7 @@ + LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +-#line 20428 "configure" ++#line 20521 "configure" + #include "confdefs.h" + + int +@@ -20437,16 +20530,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20440: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20533: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20443: \$? = $ac_status" >&5 ++ echo "$as_me:20536: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20446: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20539: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20449: \$? = $ac_status" >&5 ++ echo "$as_me:20542: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_rpath_space=no + else +@@ -20456,14 +20549,14 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$cf_save_LIBS" +- echo "$as_me:20459: result: $cf_rpath_space" >&5 ++ echo "$as_me:20552: 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:20466: checking if rpath-hack should be disabled" >&5 ++echo "$as_me:20559: 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. +@@ -20480,21 +20573,21 @@ + cf_disable_rpath_hack=no + + fi; +-echo "$as_me:20483: result: $cf_disable_rpath_hack" >&5 ++echo "$as_me:20576: 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:20487: checking for updated LDFLAGS" >&5 ++echo "$as_me:20580: 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:20490: result: maybe" >&5 ++ echo "$as_me:20583: 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:20497: checking for $ac_word" >&5 ++echo "$as_me:20590: 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 +@@ -20509,7 +20602,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:20512: found $ac_dir/$ac_word" >&5 ++echo "$as_me:20605: found $ac_dir/$ac_word" >&5 + break + done + +@@ -20517,10 +20610,10 @@ + fi + cf_ldd_prog=$ac_cv_prog_cf_ldd_prog + if test -n "$cf_ldd_prog"; then +- echo "$as_me:20520: result: $cf_ldd_prog" >&5 ++ echo "$as_me:20613: result: $cf_ldd_prog" >&5 + echo "${ECHO_T}$cf_ldd_prog" >&6 + else +- echo "$as_me:20523: result: no" >&5 ++ echo "$as_me:20616: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -20534,7 +20627,7 @@ + cf_rpath_oops= + + cat >conftest.$ac_ext <<_ACEOF +-#line 20537 "configure" ++#line 20630 "configure" + #include "confdefs.h" + #include + int +@@ -20546,16 +20639,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20549: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20642: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20552: \$? = $ac_status" >&5 ++ echo "$as_me:20645: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20555: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20648: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20558: \$? = $ac_status" >&5 ++ echo "$as_me:20651: \$? = $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` +@@ -20583,7 +20676,7 @@ + then + test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 + +-echo "${as_me:-configure}:20586: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 ++echo "${as_me:-configure}:20679: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 + + LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" + break +@@ -20595,11 +20688,11 @@ + + test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:20598: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:20691: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:20602: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:20695: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LDFLAGS +@@ -20636,7 +20729,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:20639: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:20732: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -20649,11 +20742,11 @@ + + test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:20652: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:20745: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:20656: testing ...checking LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:20749: testing ...checking LIBS $LIBS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LIBS +@@ -20690,7 +20783,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:20693: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:20786: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -20703,14 +20796,14 @@ + + test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:20706: testing ...checked LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:20799: testing ...checked LIBS $LIBS ..." 1>&5 + + test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:20710: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:20803: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + else +- echo "$as_me:20713: result: no" >&5 ++ echo "$as_me:20806: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -20800,7 +20893,7 @@ + : ${CONFIG_STATUS=./config.status} + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:20803: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:20896: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL +@@ -20932,7 +21025,7 @@ + cat >>$CONFIG_STATUS <&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -20995,7 +21088,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:20998: error: unrecognized option: $1 ++ -*) { { echo "$as_me:21091: 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;} +@@ -21014,7 +21107,7 @@ + ## Running config.status. ## + ## ----------------------- ## + +-This file was extended by $as_me 2.52.20190828, executed with ++This file was extended by $as_me 2.52.20190901, executed with + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS +@@ -21045,7 +21138,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:21048: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:21141: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -21341,7 +21434,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:21344: creating $ac_file" >&5 ++ { echo "$as_me:21437: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -21359,7 +21452,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:21362: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:21455: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -21372,7 +21465,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:21375: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:21468: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -21388,7 +21481,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' $ac_item` + if test -z "$ac_used"; then +- { echo "$as_me:21391: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:21484: 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;} +@@ -21397,7 +21490,7 @@ + fi + ac_seen=`grep '${datarootdir}' $ac_item` + if test -n "$ac_seen"; then +- { echo "$as_me:21400: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:21493: 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;} +@@ -21434,7 +21527,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:21437: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:21530: 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;} +@@ -21445,7 +21538,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:21448: WARNING: Some variables may not be substituted: ++ { echo "$as_me:21541: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -21494,7 +21587,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:21497: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:21590: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -21505,7 +21598,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:21508: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:21601: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -21518,7 +21611,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:21521: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:21614: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -21576,7 +21669,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:21579: $ac_file is unchanged" >&5 ++ { echo "$as_me:21672: $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_panels.c +Prereq: 1.43 +--- ncurses-6.1-20190831+/test/demo_panels.c 2019-08-31 23:24:11.000000000 +0000 ++++ ncurses-6.1-20190907/test/demo_panels.c 2019-08-31 23:24:11.000000000 +0000 +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: demo_panels.c,v 1.43 2019/08/24 23:11:01 tom Exp $ ++ * $Id: demo_panels.c,v 1.44 2019/08/31 23:24:11 tom Exp $ + * + * Demonstrate a variety of functions from the panel library. + */ +Index: test/ncurses.c +Prereq: 1.517 +--- ncurses-6.1-20190831+/test/ncurses.c 2019-08-31 23:22:40.000000000 +0000 ++++ ncurses-6.1-20190907/test/ncurses.c 2019-08-31 23:22: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.517 2019/08/24 23:09:03 tom Exp $ ++$Id: ncurses.c,v 1.518 2019/08/31 23:22:40 tom Exp $ + + ***************************************************************************/ + diff --git a/ncurses-6.1-20190914.patch b/ncurses-6.1-20190914.patch new file mode 100644 index 0000000..7c6151b --- /dev/null +++ b/ncurses-6.1-20190914.patch @@ -0,0 +1,406 @@ +# ncurses 6.1 - patch 20190914 - 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-20190914.patch.gz +# patch by Thomas E. Dickey +# created Sun Sep 15 01:08:42 UTC 2019 +# ------------------------------------------------------------------------------ +# Ada95/configure | 29 +++++++++++++++-------------- +# Ada95/configure.in | 5 +++-- +# Ada95/package/AdaCurses.spec | 22 ++++++++++++++++------ +# NEWS | 5 ++++- +# 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 | 2 +- +# package/ncurses.spec | 2 +- +# package/ncursest.spec | 2 +- +# 13 files changed, 52 insertions(+), 37 deletions(-) +# ------------------------------------------------------------------------------ +Index: Ada95/configure +--- ncurses-6.1-20190907+/Ada95/configure 2019-09-07 23:37:18.000000000 +0000 ++++ ncurses-6.1-20190914/Ada95/configure 2019-09-14 19:53:04.000000000 +0000 +@@ -1,5 +1,5 @@ + #! /bin/sh +-# From configure.in Revision: 1.72 . ++# From configure.in Revision: 1.73 . + # Guess values for system-dependent variables and create Makefiles. + # Generated by Autoconf 2.52.20190901. + # +@@ -16564,7 +16564,7 @@ + ADAGEN_LDFLAGS='$(NATIVE_LDFLAGS)' + fi + +-ac_config_files="$ac_config_files $SUB_MAKEFILES doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in Makefile" ++ac_config_files="$ac_config_files $SUB_MAKEFILES src/library.gpr:src/library.gpr.in doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in Makefile" + ac_config_commands="$ac_config_commands default" + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -16907,11 +16907,12 @@ + case "$ac_config_target" in + # Handling of arguments. + "$SUB_MAKEFILES" ) CONFIG_FILES="$CONFIG_FILES $SUB_MAKEFILES" ;; ++ "src/library.gpr" ) CONFIG_FILES="$CONFIG_FILES src/library.gpr:src/library.gpr.in" ;; + "doc/adacurses${DFT_ARG_SUFFIX}-config.1" ) CONFIG_FILES="$CONFIG_FILES doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in" ;; + "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:16914: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:16915: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -17264,7 +17265,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:17267: creating $ac_file" >&5 ++ { echo "$as_me:17268: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -17282,7 +17283,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:17285: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:17286: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -17295,7 +17296,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:17298: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:17299: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -17311,7 +17312,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' $ac_item` + if test -z "$ac_used"; then +- { echo "$as_me:17314: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:17315: 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;} +@@ -17320,7 +17321,7 @@ + fi + ac_seen=`grep '${datarootdir}' $ac_item` + if test -n "$ac_seen"; then +- { echo "$as_me:17323: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:17324: 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;} +@@ -17357,7 +17358,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:17360: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:17361: 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;} +@@ -17368,7 +17369,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:17371: WARNING: Some variables may not be substituted: ++ { echo "$as_me:17372: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -17417,7 +17418,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:17420: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:17421: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -17428,7 +17429,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:17431: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:17432: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -17441,7 +17442,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:17444: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:17445: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -17499,7 +17500,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:17502: $ac_file is unchanged" >&5 ++ { echo "$as_me:17503: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +Index: Ada95/configure.in +Prereq: 1.72 +--- ncurses-6.1-20190907+/Ada95/configure.in 2019-09-07 22:50:06.000000000 +0000 ++++ ncurses-6.1-20190914/Ada95/configure.in 2019-09-14 19:33:07.000000000 +0000 +@@ -28,14 +28,14 @@ + dnl + dnl Author: Thomas E. Dickey + dnl +-dnl $Id: configure.in,v 1.72 2019/09/07 22:50:06 tom Exp $ ++dnl $Id: configure.in,v 1.73 2019/09/14 19:33:07 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.20030208) +-AC_REVISION($Revision: 1.72 $) ++AC_REVISION($Revision: 1.73 $) + AC_INIT(gen/gen.c) + AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) + +@@ -609,6 +609,7 @@ + + AC_OUTPUT( \ + $SUB_MAKEFILES \ ++ src/library.gpr:src/library.gpr.in \ + doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in \ + Makefile,[ + if test -z "$USE_OLD_MAKERULES" ; then +Index: Ada95/package/AdaCurses.spec +Prereq: 1.19 +--- ncurses-6.1-20190907+/Ada95/package/AdaCurses.spec 2019-09-08 01:00:18.000000000 +0000 ++++ ncurses-6.1-20190914/Ada95/package/AdaCurses.spec 2019-09-15 00:07:32.000000000 +0000 +@@ -2,7 +2,7 @@ + %define AppProgram AdaCurses + %define AppVersion MAJOR.MINOR + %define AppRelease YYYYMMDD +-# $Id: AdaCurses.spec,v 1.19 2019/09/08 01:00:18 tom Exp $ ++# $Id: AdaCurses.spec,v 1.24 2019/09/15 00:07:32 tom Exp $ + Name: %{AppProgram} + Version: %{AppVersion} + Release: %{AppRelease} +@@ -22,9 +22,13 @@ + + %define debug_package %{nil} + ++%define need_filter %(if grep -E -i '(mageia|red hat|fedora)' /etc/issue >/dev/null; then echo 1; elif test -f /etc/fedora-release; then echo 1; else echo 0; fi) ++ ++%if %{need_filter} == 1 + # http://fedoraproject.org/wiki/EPEL:Packaging_Autoprovides_and_Requires_Filtering + %filter_from_requires /lib%{AppProgram}.so.1/d + %filter_setup ++%endif + + %setup -q -n %{AppProgram}-%{AppRelease} + +@@ -52,12 +56,12 @@ + %install + [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT + +-make install DESTDIR=$RPM_BUILD_ROOT ++make install DESTDIR=$RPM_BUILD_ROOT + + ( cd samples && + make install.examples \ +- DESTDIR=$RPM_BUILD_ROOT \ +- BINDIR=$RPM_BUILD_ROOT%{_bindir}/%{AppProgram} ++ DESTDIR=$RPM_BUILD_ROOT \ ++ BINDIR=$RPM_BUILD_ROOT%{_bindir}/%{AppProgram} + ) + + %clean +@@ -67,14 +71,20 @@ + %defattr(-,root,root) + %{_bindir}/adacurses*-config + %{_bindir}/%{AppProgram}/* +-%{ada_libdir}/lib%{AppProgram}.* ++%{ada_libdir}/ ++%if %{need_filter} == 1 ++%{_libdir}/lib%{AppProgram}.* ++%endif + %{_mandir}/man1/adacurses*-config.1* + %{_datadir}/%{AppProgram}/* +-%{ada_include}/terminal_interface* ++%{ada_include}/ + + %changelog + # each patch should add its ChangeLog entries here + ++* Sat Sep 14 2019 Thomas Dickey ++- build-fixes for Fedora29, OpenSUSE ++ + * Sat Sep 07 2019 Thomas Dickey + - use AppProgram to replace "AdaCurses" globally + - amend install-paths to work with Fedora30 +Index: NEWS +Prereq: 1.3371 +--- ncurses-6.1-20190907+/NEWS 2019-09-07 22:41:16.000000000 +0000 ++++ ncurses-6.1-20190914/NEWS 2019-09-14 23:18:21.000000000 +0000 +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3371 2019/09/07 22:41:16 tom Exp $ ++-- $Id: NEWS,v 1.3373 2019/09/14 23:18:21 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -45,6 +45,9 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20190914 ++ + build-fixes for Ada95 configure-script and corresponding test package ++ + 20190907 + + add --with-ada-libname option and modify Ada95 configuration to + allow renaming the "AdaCurses" library (prompted by proposed changes +Index: VERSION +--- ncurses-6.1-20190907+/VERSION 2019-09-07 15:19:35.000000000 +0000 ++++ ncurses-6.1-20190914/VERSION 2019-09-14 13:43:52.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.1 20190907 ++5:0:10 6.1 20190914 +Index: dist.mk +Prereq: 1.1304 +--- ncurses-6.1-20190907+/dist.mk 2019-09-07 15:19:35.000000000 +0000 ++++ ncurses-6.1-20190914/dist.mk 2019-09-14 13:43:52.000000000 +0000 +@@ -25,7 +25,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1304 2019/09/07 15:19:35 tom Exp $ ++# $Id: dist.mk,v 1.1305 2019/09/14 13:43:52 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 = 20190907 ++NCURSES_PATCH = 20190914 + + # 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-20190907+/package/debian-mingw/changelog 2019-09-07 15:19:35.000000000 +0000 ++++ ncurses-6.1-20190914/package/debian-mingw/changelog 2019-09-14 13:43:52.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190907) unstable; urgency=low ++ncurses6 (6.1+20190914) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 07 Sep 2019 11:19:35 -0400 ++ -- Thomas E. Dickey Sat, 14 Sep 2019 09:43:52 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.1-20190907+/package/debian-mingw64/changelog 2019-09-07 15:19:35.000000000 +0000 ++++ ncurses-6.1-20190914/package/debian-mingw64/changelog 2019-09-14 13:43:52.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190907) unstable; urgency=low ++ncurses6 (6.1+20190914) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 07 Sep 2019 11:19:35 -0400 ++ -- Thomas E. Dickey Sat, 14 Sep 2019 09:43:52 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.1-20190907+/package/debian/changelog 2019-09-07 15:19:35.000000000 +0000 ++++ ncurses-6.1-20190914/package/debian/changelog 2019-09-14 13:43:52.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.1+20190907) unstable; urgency=low ++ncurses6 (6.1+20190914) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey Sat, 07 Sep 2019 11:19:35 -0400 ++ -- Thomas E. Dickey Sat, 14 Sep 2019 09:43:52 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.350 +--- ncurses-6.1-20190907+/package/mingw-ncurses.nsi 2019-09-07 15:19:35.000000000 +0000 ++++ ncurses-6.1-20190914/package/mingw-ncurses.nsi 2019-09-14 13:43:52.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.350 2019/09/07 15:19:35 tom Exp $ ++; $Id: mingw-ncurses.nsi,v 1.351 2019/09/14 13:43:52 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 "0907" ++!define VERSION_MMDD "0914" + !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} + + !define MY_ABI "5" +Index: package/mingw-ncurses.spec +--- ncurses-6.1-20190907+/package/mingw-ncurses.spec 2019-09-07 15:19:35.000000000 +0000 ++++ ncurses-6.1-20190914/package/mingw-ncurses.spec 2019-09-14 13:43:52.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.1 +-Release: 20190907 ++Release: 20190914 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.1-20190907+/package/ncurses.spec 2019-09-07 15:19:35.000000000 +0000 ++++ ncurses-6.1-20190914/package/ncurses.spec 2019-09-14 13:43:52.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.1 +-Release: 20190907 ++Release: 20190914 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.1-20190907+/package/ncursest.spec 2019-09-07 15:19:35.000000000 +0000 ++++ ncurses-6.1-20190914/package/ncursest.spec 2019-09-14 13:43:52.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.1 +-Release: 20190907 ++Release: 20190914 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz diff --git a/ncurses-6.1-20190921.patch b/ncurses-6.1-20190921.patch new file mode 100644 index 0000000..38512ef --- /dev/null +++ b/ncurses-6.1-20190921.patch @@ -0,0 +1,2677 @@ +# ncurses 6.1 - patch 20190921 - 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-20190921.patch.gz +# patch by Thomas E. Dickey +# created Sun Sep 22 01:25:51 UTC 2019 +# ------------------------------------------------------------------------------ +# Ada95/aclocal.m4 | 90 +++++-- +# Ada95/configure | 256 +++++++++++----------- +# Ada95/gen/adacurses-config.in | 4 +# NEWS | 8 +# VERSION | 2 +# aclocal.m4 | 145 +++++++----- +# configure | 372 ++++++++++++++++---------------- +# dist.mk | 4 +# doc/html/man/adacurses6-config.1.html | 6 +# 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/resizeterm.3x.html | 53 ++-- +# 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/resizeterm.3x | 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.spec | 2 +# package/ncursest.spec | 2 +# 33 files changed, 561 insertions(+), 447 deletions(-) +# ------------------------------------------------------------------------------ +Index: Ada95/aclocal.m4 +Prereq: 1.145 +--- ncurses-6.1-20190914+/Ada95/aclocal.m4 2019-09-07 23:37:09.000000000 +0000 ++++ ncurses-6.1-20190921/Ada95/aclocal.m4 2019-09-21 22:12:40.000000000 +0000 +@@ -28,7 +28,7 @@ + dnl + dnl Author: Thomas E. Dickey + dnl +-dnl $Id: aclocal.m4,v 1.145 2019/09/07 23:37:09 tom Exp $ ++dnl $Id: aclocal.m4,v 1.146 2019/09/21 22:12:40 tom Exp $ + dnl Macros used in NCURSES Ada95 auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -677,6 +677,22 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_CHECK_GNAT_VERSION version: 1 updated: 2019/09/21 18:08:42 ++dnl --------------------- ++AC_DEFUN([CF_CHECK_GNAT_VERSION], ++[ ++AC_REQUIRE([CF_GNAT_VERSION]) ++case $cf_gnat_version in ++(3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]]) ++ cf_cv_prog_gnat_correct=yes ++ ;; ++(*) ++ AC_MSG_WARN(Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding.) ++ cf_cv_prog_gnat_correct=no ++ ;; ++esac ++]) ++dnl --------------------------------------------------------------------------- + dnl CF_CLANG_COMPILER version: 2 updated: 2013/11/19 19:23:35 + dnl ----------------- + dnl Check if the given compiler is really clang. clang's C driver defines +@@ -1536,27 +1552,21 @@ + rm -rf conftest* *~conftest* + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GNAT_VERSION version: 20 updated: 2015/04/18 08:56:57 ++dnl CF_GNAT_VERSION version: 21 updated: 2019/09/21 18:08:42 + dnl --------------- +-dnl Verify version of GNAT. ++dnl $1 = cache variable to update ++dnl $2 = program name ++dnl Verify version of GNAT or related tool + AC_DEFUN([CF_GNAT_VERSION], + [ +-AC_MSG_CHECKING(for gnat version) +-cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ ++AC_CACHE_CHECK(for ifelse($2,,gnat,$2) version, cf_gnat_version,[ ++cf_gnat_version=`ifelse($2,,${cf_ada_make:-gnatmake},$2) --version 2>&1 | \ + grep '[[0-9]].[[0-9]][[0-9]]*' |\ + sed -e '2,$d' -e 's/[[^0-9 \.]]//g' -e 's/^[[ ]]*//' -e 's/ .*//'` +-AC_MSG_RESULT($cf_gnat_version) +- +-case $cf_gnat_version in +-(3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]]) +- cf_cv_prog_gnat_correct=yes +- ;; +-(*) +- AC_MSG_WARN(Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding.) +- cf_cv_prog_gnat_correct=no +- ;; +-esac + ]) ++test -z "$cf_gnat_version" && cf_gnat_version=no ++ifelse($1,,,[eval $1=$cf_gnat_version; unset cf_gnat_version]) ++])dnl + dnl --------------------------------------------------------------------------- + dnl CF_GNU_SOURCE version: 10 updated: 2018/12/10 20:09:41 + dnl ------------- +@@ -3138,20 +3148,40 @@ + test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT",[Define to the program extension (normally blank)]) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_PROG_GNAT version: 8 updated: 2018/11/10 19:47:04 ++dnl CF_PROG_GNAT version: 9 updated: 2019/09/21 18:08:42 + dnl ------------ +-dnl Check for gnatmake, ensure that it is complete. ++dnl Check for gnat/gnatmake/etc, ensure that the toolset is complete. + AC_DEFUN([CF_PROG_GNAT],[ +-cf_ada_make=gnatmake +-cf_ada_config="#" +-AC_CHECK_PROG(gnatmake_exists, $cf_ada_make, yes, no) +-if test "$ac_cv_prog_gnatmake_exists" = no; then ++for cf_prog_gnat in gnat gnatmake gprconfig gprbuild ++do ++ CF_UPPER(cf_upper_prog_gnat,${cf_prog_gnat}) ++ ++ unset ac_cv_path_cf_TEMP_gnat ++ unset cf_TEMP_gnat ++ AC_PATH_PROG(cf_TEMP_gnat,$cf_prog_gnat,no) ++ eval cf_cv_PATH_$cf_upper_prog_gnat=[$]ac_cv_path_cf_TEMP_gnat ++ ++ if test "x$cf_TEMP_gnat" != xno; then ++ unset cf_gnat_version ++ unset cf_TEMP_gnat ++ CF_GNAT_VERSION(cf_TEMP_gnat,$cf_prog_gnat) ++ fi ++ eval cf_cv_VERSION_$cf_upper_prog_gnat=[$]cf_TEMP_gnat ++ ++ unset cf_TEMP_gnat ++ unset cf_gnat_version ++ unset ac_cv_path_cf_TEMP_gnat ++done ++ ++if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then + cf_ada_make= + cf_cv_prog_gnat_correct=no + else +- AC_CHECK_PROG(gprconfig_exists, gprconfig, yes, no) +- if test "$ac_cv_prog_gprconfig_exists" = yes +- then ++ cf_ada_make=gnatmake ++ if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then ++ # gprconfig is newer than gnatmake; we can continue... ++ cf_ada_config="##" ++ else + rm -rf conftest* *~conftest* + if mkdir conftest.src + then +@@ -3187,17 +3217,15 @@ + cd .. + rm -rf conftest* *~conftest* + fi +- else +- # gprconfig is newer than gnatmake; we can continue... +- cf_ada_config="##" + fi + if test "x$cf_ada_config" != "x#" + then + CF_GNAT_VERSION ++ CF_CHECK_GNAT_VERSION + AC_CHECK_PROG(M4_exists, m4, yes, no) + if test "$ac_cv_prog_M4_exists" = no; then + cf_cv_prog_gnat_correct=no +- echo Ada95 binding required program m4 not found. Ada95 binding disabled. ++ AC_MSG_WARN(Ada95 binding required program m4 not found. Ada95 binding disabled) + fi + if test "$cf_cv_prog_gnat_correct" = yes; then + AC_MSG_CHECKING(if GNAT works) +@@ -3209,7 +3237,9 @@ + Text_IO.Put ("Hello World"); + Text_IO.New_Line; + GNAT.OS_Lib.OS_Exit (0); +-end conftest;],[cf_cv_prog_gnat_correct=yes],[cf_cv_prog_gnat_correct=no]) ++end conftest;], ++[cf_cv_prog_gnat_correct=yes], ++[cf_cv_prog_gnat_correct=no]) + AC_MSG_RESULT($cf_cv_prog_gnat_correct) + fi + else +Index: Ada95/configure +--- ncurses-6.1-20190914+/Ada95/configure 2019-09-14 19:53:04.000000000 +0000 ++++ ncurses-6.1-20190921/Ada95/configure 2019-09-21 22:12:48.000000000 +0000 +@@ -15676,80 +15676,90 @@ + cf_with_ada=yes + if test "$cf_with_ada" != "no" ; then + +-cf_ada_make=gnatmake +-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:15683: checking for $ac_word" >&5 ++for cf_prog_gnat in gnat gnatmake gprconfig gprbuild ++do ++ ++cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` ++ ++ unset ac_cv_path_cf_TEMP_gnat ++ 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:15688: 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 ++if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -n "$gnatmake_exists"; then +- ac_cv_prog_gnatmake_exists="$gnatmake_exists" # Let the user override the test. +-else ++ case $cf_TEMP_gnat in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path. ++ ;; ++ *) + ac_save_IFS=$IFS; IFS=$ac_path_separator + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-ac_cv_prog_gnatmake_exists="yes" +-echo "$as_me:15698: found $ac_dir/$ac_word" >&5 +-break ++ if $as_executable_p "$ac_dir/$ac_word"; then ++ ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" ++ echo "$as_me:15705: found $ac_dir/$ac_word" >&5 ++ break ++fi + done + +- test -z "$ac_cv_prog_gnatmake_exists" && ac_cv_prog_gnatmake_exists="no" +-fi ++ test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no" ++ ;; ++esac + fi +-gnatmake_exists=$ac_cv_prog_gnatmake_exists +-if test -n "$gnatmake_exists"; then +- echo "$as_me:15707: result: $gnatmake_exists" >&5 +-echo "${ECHO_T}$gnatmake_exists" >&6 ++cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat ++ ++if test -n "$cf_TEMP_gnat"; then ++ echo "$as_me:15717: result: $cf_TEMP_gnat" >&5 ++echo "${ECHO_T}$cf_TEMP_gnat" >&6 + else +- echo "$as_me:15710: result: no" >&5 ++ echo "$as_me:15720: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-if test "$ac_cv_prog_gnatmake_exists" = no; then +- cf_ada_make= +- cf_cv_prog_gnat_correct=no +-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:15720: 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 ++ eval cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat ++ ++ if test "x$cf_TEMP_gnat" != xno; then ++ unset cf_gnat_version ++ unset cf_TEMP_gnat ++ ++echo "$as_me:15730: checking for $cf_prog_gnat version" >&5 ++echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 ++if test "${cf_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -n "$gprconfig_exists"; then +- ac_cv_prog_gprconfig_exists="$gprconfig_exists" # Let the user override the test. +-else +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-ac_cv_prog_gprconfig_exists="yes" +-echo "$as_me:15735: found $ac_dir/$ac_word" >&5 +-break +-done + +- test -z "$ac_cv_prog_gprconfig_exists" && ac_cv_prog_gprconfig_exists="no" +-fi +-fi +-gprconfig_exists=$ac_cv_prog_gprconfig_exists +-if test -n "$gprconfig_exists"; then +- echo "$as_me:15744: result: $gprconfig_exists" >&5 +-echo "${ECHO_T}$gprconfig_exists" >&6 +-else +- echo "$as_me:15747: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++cf_gnat_version=`$cf_prog_gnat --version 2>&1 | \ ++ grep '[0-9].[0-9][0-9]*' |\ ++ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` ++ + fi ++echo "$as_me:15741: result: $cf_gnat_version" >&5 ++echo "${ECHO_T}$cf_gnat_version" >&6 ++test -z "$cf_gnat_version" && cf_gnat_version=no ++eval cf_TEMP_gnat=$cf_gnat_version; unset cf_gnat_version + +- if test "$ac_cv_prog_gprconfig_exists" = yes +- then ++ fi ++ eval cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat ++ ++ unset cf_TEMP_gnat ++ unset cf_gnat_version ++ unset ac_cv_path_cf_TEMP_gnat ++done ++ ++if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then ++ cf_ada_make= ++ cf_cv_prog_gnat_correct=no ++else ++ cf_ada_make=gnatmake ++ if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then ++ # gprconfig is newer than gnatmake; we can continue... ++ cf_ada_config="##" ++ else + rm -rf conftest* *~conftest* + if mkdir conftest.src + then +@@ -15757,7 +15767,7 @@ + cd conftest.src + for cf_gprconfig in Ada C + do +- echo "$as_me:15760: checking for gprconfig name for $cf_gprconfig" >&5 ++ echo "$as_me:15770: 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 +@@ -15776,10 +15786,10 @@ + if test -n "$cf_gprconfig_value" + then + eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value +- echo "$as_me:15779: result: $cf_gprconfig_value" >&5 ++ echo "$as_me:15789: result: $cf_gprconfig_value" >&5 + echo "${ECHO_T}$cf_gprconfig_value" >&6 + else +- echo "$as_me:15782: result: missing" >&5 ++ echo "$as_me:15792: result: missing" >&5 + echo "${ECHO_T}missing" >&6 + cf_ada_config="#" + break +@@ -15788,27 +15798,31 @@ + cd .. + rm -rf conftest* *~conftest* + fi +- else +- # gprconfig is newer than gnatmake; we can continue... +- cf_ada_config="##" + fi + if test "x$cf_ada_config" != "x#" + then + +-echo "$as_me:15798: checking for gnat version" >&5 ++echo "$as_me:15805: 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 | \ ++if test "${cf_gnat_version+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++cf_gnat_version=`${cf_ada_make:-gnatmake} --version 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:15803: result: $cf_gnat_version" >&5 ++ ++fi ++echo "$as_me:15816: result: $cf_gnat_version" >&5 + echo "${ECHO_T}$cf_gnat_version" >&6 ++test -z "$cf_gnat_version" && cf_gnat_version=no + + case $cf_gnat_version in + (3.1[1-9]*|3.[2-9]*|[4-9].*|20[0-9][0-9]) + cf_cv_prog_gnat_correct=yes + ;; + (*) +- { echo "$as_me:15811: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 ++ { echo "$as_me:15825: 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 + ;; +@@ -15816,7 +15830,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:15819: checking for $ac_word" >&5 ++echo "$as_me:15833: 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 +@@ -15831,7 +15845,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_M4_exists="yes" +-echo "$as_me:15834: found $ac_dir/$ac_word" >&5 ++echo "$as_me:15848: found $ac_dir/$ac_word" >&5 + break + done + +@@ -15840,19 +15854,20 @@ + fi + M4_exists=$ac_cv_prog_M4_exists + if test -n "$M4_exists"; then +- echo "$as_me:15843: result: $M4_exists" >&5 ++ echo "$as_me:15857: result: $M4_exists" >&5 + echo "${ECHO_T}$M4_exists" >&6 + else +- echo "$as_me:15846: result: no" >&5 ++ echo "$as_me:15860: 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 Ada95 binding required program m4 not found. Ada95 binding disabled. ++ { echo "$as_me:15866: 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:15855: checking if GNAT works" >&5 ++ echo "$as_me:15870: checking if GNAT works" >&5 + echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + + rm -rf conftest* *~conftest* +@@ -15880,7 +15895,7 @@ + fi + rm -rf conftest* *~conftest* + +- echo "$as_me:15883: result: $cf_cv_prog_gnat_correct" >&5 ++ echo "$as_me:15898: result: $cf_cv_prog_gnat_correct" >&5 + echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + else +@@ -15890,7 +15905,7 @@ + + if test "$cf_cv_prog_gnat_correct" = yes; then + +- echo "$as_me:15893: checking optimization options for ADAFLAGS" >&5 ++ echo "$as_me:15908: checking optimization options for ADAFLAGS" >&5 + echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 + case "$CFLAGS" in + (*-g*) +@@ -15907,10 +15922,10 @@ + + ;; + esac +- echo "$as_me:15910: result: $ADAFLAGS" >&5 ++ echo "$as_me:15925: result: $ADAFLAGS" >&5 + echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:15913: checking if GNATPREP supports -T option" >&5 ++echo "$as_me:15928: 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 +@@ -15920,11 +15935,11 @@ + gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes + + fi +-echo "$as_me:15923: result: $cf_cv_gnatprep_opt_t" >&5 ++echo "$as_me:15938: 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:15927: checking if GNAT supports generics" >&5 ++echo "$as_me:15942: 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].*) +@@ -15934,7 +15949,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:15937: result: $cf_gnat_generics" >&5 ++echo "$as_me:15952: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -15946,7 +15961,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:15949: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:15964: 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 +@@ -15994,7 +16009,7 @@ + rm -rf conftest* *~conftest* + + fi +-echo "$as_me:15997: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:16012: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test $cf_cv_gnat_sigint = yes ; then +@@ -16007,7 +16022,7 @@ + cf_gnat_projects=no + + if test "$enable_gnat_projects" != no ; then +-echo "$as_me:16010: checking if GNAT supports project files" >&5 ++echo "$as_me:16025: 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]*) +@@ -16070,15 +16085,15 @@ + esac + ;; + esac +-echo "$as_me:16073: result: $cf_gnat_projects" >&5 ++echo "$as_me:16088: 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:16079: checking if GNAT supports libraries" >&5 ++ echo "$as_me:16094: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:16081: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:16096: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -16098,7 +16113,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:16101: checking for ada-compiler" >&5 ++echo "$as_me:16116: 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. +@@ -16109,12 +16124,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:16112: result: $cf_ada_compiler" >&5 ++echo "$as_me:16127: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:16117: checking for ada-include" >&5 ++echo "$as_me:16132: 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. +@@ -16150,7 +16165,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:16153: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:16168: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -16159,10 +16174,10 @@ + fi + eval ADA_INCLUDE="$withval" + +-echo "$as_me:16162: result: $ADA_INCLUDE" >&5 ++echo "$as_me:16177: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:16165: checking for ada-objects" >&5 ++echo "$as_me:16180: 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. +@@ -16198,7 +16213,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:16201: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:16216: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -16207,10 +16222,10 @@ + fi + eval ADA_OBJECTS="$withval" + +-echo "$as_me:16210: result: $ADA_OBJECTS" >&5 ++echo "$as_me:16225: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:16213: checking if an Ada95 shared-library should be built" >&5 ++echo "$as_me:16228: 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. +@@ -16220,14 +16235,14 @@ + else + with_ada_sharedlib=no + fi; +-echo "$as_me:16223: result: $with_ada_sharedlib" >&5 ++echo "$as_me:16238: 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:16230: WARNING: disabling shared-library since GNAT projects are not supported" >&5 ++ { echo "$as_me:16245: 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 +@@ -16247,7 +16262,7 @@ + + # allow the Ada binding to be renamed + +-echo "$as_me:16250: checking for ada-libname" >&5 ++echo "$as_me:16265: 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. +@@ -16263,16 +16278,16 @@ + ;; + esac + +-echo "$as_me:16266: result: $ADA_LIBNAME" >&5 ++echo "$as_me:16281: result: $ADA_LIBNAME" >&5 + echo "${ECHO_T}$ADA_LIBNAME" >&6 + + else +- { { echo "$as_me:16270: error: No usable Ada compiler found" >&5 ++ { { echo "$as_me:16285: 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:16275: error: The Ada compiler is needed for this package" >&5 ++ { { echo "$as_me:16290: 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 +@@ -16312,7 +16327,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:16315: checking default library suffix" >&5 ++echo "$as_me:16330: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -16323,10 +16338,10 @@ + (shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:16326: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:16341: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:16329: checking default library-dependency suffix" >&5 ++echo "$as_me:16344: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case X$DFT_LWR_MODEL in +@@ -16384,10 +16399,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:16387: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:16402: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:16390: checking default object directory" >&5 ++echo "$as_me:16405: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -16403,7 +16418,7 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:16406: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:16421: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + ### Set up low-level terminfo dependencies for makefiles. +@@ -16645,7 +16660,7 @@ + : ${CONFIG_STATUS=./config.status} + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:16648: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:16663: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL +@@ -16821,7 +16836,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:16824: error: ambiguous option: $1 ++ { { echo "$as_me:16839: 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;} +@@ -16840,7 +16855,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:16843: error: unrecognized option: $1 ++ -*) { { echo "$as_me:16858: 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;} +@@ -16912,7 +16927,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:16915: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:16930: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -17095,8 +17110,7 @@ + s,@ADAFLAGS@,$ADAFLAGS,;t t + s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t + s,@ADA_TRACE@,$ADA_TRACE,;t t +-s,@gnatmake_exists@,$gnatmake_exists,;t t +-s,@gprconfig_exists@,$gprconfig_exists,;t t ++s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t + s,@M4_exists@,$M4_exists,;t t + s,@cf_ada_make@,$cf_ada_make,;t t + s,@cf_ada_config@,$cf_ada_config,;t t +@@ -17265,7 +17279,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:17268: creating $ac_file" >&5 ++ { echo "$as_me:17282: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -17283,7 +17297,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:17286: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:17300: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -17296,7 +17310,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:17299: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:17313: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -17312,7 +17326,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' $ac_item` + if test -z "$ac_used"; then +- { echo "$as_me:17315: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:17329: 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;} +@@ -17321,7 +17335,7 @@ + fi + ac_seen=`grep '${datarootdir}' $ac_item` + if test -n "$ac_seen"; then +- { echo "$as_me:17324: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:17338: 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;} +@@ -17358,7 +17372,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:17361: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:17375: 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;} +@@ -17369,7 +17383,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:17372: WARNING: Some variables may not be substituted: ++ { echo "$as_me:17386: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -17418,7 +17432,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:17421: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:17435: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -17429,7 +17443,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:17432: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:17446: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -17442,7 +17456,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:17445: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:17459: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -17500,7 +17514,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:17503: $ac_file is unchanged" >&5 ++ { echo "$as_me:17517: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +Index: Ada95/gen/adacurses-config.in +Prereq: 1.12 +--- ncurses-6.1-20190914+/Ada95/gen/adacurses-config.in 2019-09-07 20:20:52.000000000 +0000 ++++ ncurses-6.1-20190921/Ada95/gen/adacurses-config.in 2019-09-07 20:20:52.000000000 +0000 +@@ -1,7 +1,7 @@ + #! /bin/sh +-# $Id: adacurses-config.in,v 1.12 2019/09/07 20:20:52 tom Exp $ ++# $Id: adacurses-config.in,v 1.13 2019/09/07 20:20:52 tom Exp $ + ############################################################################## +-# Copyright (c) 2007-2012,2016 Free Software Foundation, Inc. # ++# Copyright (c) 2007-2016,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"), # +Index: NEWS +Prereq: 1.3373 +--- ncurses-6.1-20190914+/NEWS 2019-09-14 23:18:21.000000000 +0000 ++++ ncurses-6.1-20190921/NEWS 2019-09-21 23:47:04.000000000 +0000 +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3373 2019/09/14 23:18:21 tom Exp $ ++-- $Id: NEWS,v 1.3376 2019/09/21 23:47:04 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. + ++20190921 ++ + add a note in resizeterm manpage about top-level windows which touch ++ the screen's borders. ++ + modify configure-checks for gnat to identify each of the tools path ++ and version. ++ + 20190914 + + build-fixes for Ada95 configure-script and corresponding test package + +Index: VERSION +--- ncurses-6.1-20190914+/VERSION 2019-09-14 13:43:52.000000000 +0000 ++++ ncurses-6.1-20190921/VERSION 2019-09-21 14:56:20.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.1 20190914 ++5:0:10 6.1 20190921 +Index: aclocal.m4 +Prereq: 1.880 +--- ncurses-6.1-20190914+/aclocal.m4 2019-09-07 23:00:39.000000000 +0000 ++++ ncurses-6.1-20190921/aclocal.m4 2019-09-21 22:11:35.000000000 +0000 +@@ -28,7 +28,7 @@ + dnl + dnl Author: Thomas E. Dickey 1995-on + dnl +-dnl $Id: aclocal.m4,v 1.880 2019/09/07 23:00:39 tom Exp $ ++dnl $Id: aclocal.m4,v 1.883 2019/09/21 22:11:35 tom Exp $ + dnl Macros used in NCURSES auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -1137,6 +1137,22 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_CHECK_GNAT_VERSION version: 1 updated: 2019/09/21 18:08:42 ++dnl --------------------- ++AC_DEFUN([CF_CHECK_GNAT_VERSION], ++[ ++AC_REQUIRE([CF_GNAT_VERSION]) ++case $cf_gnat_version in ++(3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]]) ++ cf_cv_prog_gnat_correct=yes ++ ;; ++(*) ++ AC_MSG_WARN(Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding.) ++ cf_cv_prog_gnat_correct=no ++ ;; ++esac ++]) ++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 +@@ -2947,27 +2963,21 @@ + rm -rf conftest* *~conftest* + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GNAT_VERSION version: 20 updated: 2015/04/18 08:56:57 ++dnl CF_GNAT_VERSION version: 21 updated: 2019/09/21 18:08:42 + dnl --------------- +-dnl Verify version of GNAT. ++dnl $1 = cache variable to update ++dnl $2 = program name ++dnl Verify version of GNAT or related tool + AC_DEFUN([CF_GNAT_VERSION], + [ +-AC_MSG_CHECKING(for gnat version) +-cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ ++AC_CACHE_CHECK(for ifelse($2,,gnat,$2) version, cf_gnat_version,[ ++cf_gnat_version=`ifelse($2,,${cf_ada_make:-gnatmake},$2) --version 2>&1 | \ + grep '[[0-9]].[[0-9]][[0-9]]*' |\ + sed -e '2,$d' -e 's/[[^0-9 \.]]//g' -e 's/^[[ ]]*//' -e 's/ .*//'` +-AC_MSG_RESULT($cf_gnat_version) +- +-case $cf_gnat_version in +-(3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]]) +- cf_cv_prog_gnat_correct=yes +- ;; +-(*) +- AC_MSG_WARN(Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding.) +- cf_cv_prog_gnat_correct=no +- ;; +-esac + ]) ++test -z "$cf_gnat_version" && cf_gnat_version=no ++ifelse($1,,,[eval $1=$cf_gnat_version; unset cf_gnat_version]) ++])dnl + dnl --------------------------------------------------------------------------- + dnl CF_GNU_SOURCE version: 10 updated: 2018/12/10 20:09:41 + dnl ------------- +@@ -5974,20 +5984,40 @@ + test -z "$EGREP" && AC_MSG_ERROR(No egrep program found) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_PROG_GNAT version: 8 updated: 2018/11/10 19:47:04 ++dnl CF_PROG_GNAT version: 9 updated: 2019/09/21 18:08:42 + dnl ------------ +-dnl Check for gnatmake, ensure that it is complete. ++dnl Check for gnat/gnatmake/etc, ensure that the toolset is complete. + AC_DEFUN([CF_PROG_GNAT],[ +-cf_ada_make=gnatmake +-cf_ada_config="#" +-AC_CHECK_PROG(gnatmake_exists, $cf_ada_make, yes, no) +-if test "$ac_cv_prog_gnatmake_exists" = no; then ++for cf_prog_gnat in gnat gnatmake gprconfig gprbuild ++do ++ CF_UPPER(cf_upper_prog_gnat,${cf_prog_gnat}) ++ ++ unset ac_cv_path_cf_TEMP_gnat ++ unset cf_TEMP_gnat ++ AC_PATH_PROG(cf_TEMP_gnat,$cf_prog_gnat,no) ++ eval cf_cv_PATH_$cf_upper_prog_gnat=[$]ac_cv_path_cf_TEMP_gnat ++ ++ if test "x$cf_TEMP_gnat" != xno; then ++ unset cf_gnat_version ++ unset cf_TEMP_gnat ++ CF_GNAT_VERSION(cf_TEMP_gnat,$cf_prog_gnat) ++ fi ++ eval cf_cv_VERSION_$cf_upper_prog_gnat=[$]cf_TEMP_gnat ++ ++ unset cf_TEMP_gnat ++ unset cf_gnat_version ++ unset ac_cv_path_cf_TEMP_gnat ++done ++ ++if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then + cf_ada_make= + cf_cv_prog_gnat_correct=no + else +- AC_CHECK_PROG(gprconfig_exists, gprconfig, yes, no) +- if test "$ac_cv_prog_gprconfig_exists" = yes +- then ++ cf_ada_make=gnatmake ++ if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then ++ # gprconfig is newer than gnatmake; we can continue... ++ cf_ada_config="##" ++ else + rm -rf conftest* *~conftest* + if mkdir conftest.src + then +@@ -6023,17 +6053,15 @@ + cd .. + rm -rf conftest* *~conftest* + fi +- else +- # gprconfig is newer than gnatmake; we can continue... +- cf_ada_config="##" + fi + if test "x$cf_ada_config" != "x#" + then + CF_GNAT_VERSION ++ CF_CHECK_GNAT_VERSION + AC_CHECK_PROG(M4_exists, m4, yes, no) + if test "$ac_cv_prog_M4_exists" = no; then + cf_cv_prog_gnat_correct=no +- echo Ada95 binding required program m4 not found. Ada95 binding disabled. ++ AC_MSG_WARN(Ada95 binding required program m4 not found. Ada95 binding disabled) + fi + if test "$cf_cv_prog_gnat_correct" = yes; then + AC_MSG_CHECKING(if GNAT works) +@@ -6045,7 +6073,9 @@ + Text_IO.Put ("Hello World"); + Text_IO.New_Line; + GNAT.OS_Lib.OS_Exit (0); +-end conftest;],[cf_cv_prog_gnat_correct=yes],[cf_cv_prog_gnat_correct=no]) ++end conftest;], ++[cf_cv_prog_gnat_correct=yes], ++[cf_cv_prog_gnat_correct=no]) + AC_MSG_RESULT($cf_cv_prog_gnat_correct) + fi + else +@@ -6985,7 +7015,7 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_SRC_MODULES version: 30 updated: 2017/07/26 17:08:35 ++dnl CF_SRC_MODULES version: 31 updated: 2019/09/21 18:08:42 + 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 +@@ -6995,6 +7025,7 @@ + dnl SUB_MAKEFILES which are used in the makefile-generation scheme. + AC_DEFUN([CF_SRC_MODULES], + [ ++AC_REQUIRE([CF_CHECK_GNAT_VERSION]) + AC_MSG_CHECKING(for src modules) + + # dependencies and linker-arguments for test-programs +@@ -8262,6 +8293,32 @@ + + ])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_PCRE2 version: 2 updated: 2018/07/14 16:47:56 + dnl ------------- + dnl Add PCRE2 (Perl-compatible regular expressions v2) to the build if it is +@@ -8385,32 +8442,6 @@ + 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-20190914+/configure 2019-09-07 20:35:43.000000000 +0000 ++++ ncurses-6.1-20190921/configure 2019-09-21 19:49:24.000000000 +0000 +@@ -24176,80 +24176,90 @@ + + if test "$cf_with_ada" != "no" ; then + +-cf_ada_make=gnatmake +-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:24183: checking for $ac_word" >&5 ++for cf_prog_gnat in gnat gnatmake gprconfig gprbuild ++do ++ ++cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` ++ ++ unset ac_cv_path_cf_TEMP_gnat ++ 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:24188: 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 ++if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -n "$gnatmake_exists"; then +- ac_cv_prog_gnatmake_exists="$gnatmake_exists" # Let the user override the test. +-else ++ case $cf_TEMP_gnat in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path. ++ ;; ++ *) + ac_save_IFS=$IFS; IFS=$ac_path_separator + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-ac_cv_prog_gnatmake_exists="yes" +-echo "$as_me:24198: found $ac_dir/$ac_word" >&5 +-break ++ if $as_executable_p "$ac_dir/$ac_word"; then ++ ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" ++ echo "$as_me:24205: found $ac_dir/$ac_word" >&5 ++ break ++fi + done + +- test -z "$ac_cv_prog_gnatmake_exists" && ac_cv_prog_gnatmake_exists="no" +-fi ++ test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no" ++ ;; ++esac + fi +-gnatmake_exists=$ac_cv_prog_gnatmake_exists +-if test -n "$gnatmake_exists"; then +- echo "$as_me:24207: result: $gnatmake_exists" >&5 +-echo "${ECHO_T}$gnatmake_exists" >&6 ++cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat ++ ++if test -n "$cf_TEMP_gnat"; then ++ echo "$as_me:24217: result: $cf_TEMP_gnat" >&5 ++echo "${ECHO_T}$cf_TEMP_gnat" >&6 + else +- echo "$as_me:24210: result: no" >&5 ++ echo "$as_me:24220: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-if test "$ac_cv_prog_gnatmake_exists" = no; then +- cf_ada_make= +- cf_cv_prog_gnat_correct=no +-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:24220: 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 ++ eval cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat ++ ++ if test "x$cf_TEMP_gnat" != xno; then ++ unset cf_gnat_version ++ unset cf_TEMP_gnat ++ ++echo "$as_me:24230: checking for $cf_prog_gnat version" >&5 ++echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 ++if test "${cf_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -n "$gprconfig_exists"; then +- ac_cv_prog_gprconfig_exists="$gprconfig_exists" # Let the user override the test. +-else +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-ac_cv_prog_gprconfig_exists="yes" +-echo "$as_me:24235: found $ac_dir/$ac_word" >&5 +-break +-done + +- test -z "$ac_cv_prog_gprconfig_exists" && ac_cv_prog_gprconfig_exists="no" +-fi +-fi +-gprconfig_exists=$ac_cv_prog_gprconfig_exists +-if test -n "$gprconfig_exists"; then +- echo "$as_me:24244: result: $gprconfig_exists" >&5 +-echo "${ECHO_T}$gprconfig_exists" >&6 +-else +- echo "$as_me:24247: result: no" >&5 +-echo "${ECHO_T}no" >&6 ++cf_gnat_version=`$cf_prog_gnat --version 2>&1 | \ ++ grep '[0-9].[0-9][0-9]*' |\ ++ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` ++ + fi ++echo "$as_me:24241: result: $cf_gnat_version" >&5 ++echo "${ECHO_T}$cf_gnat_version" >&6 ++test -z "$cf_gnat_version" && cf_gnat_version=no ++eval cf_TEMP_gnat=$cf_gnat_version; unset cf_gnat_version + +- if test "$ac_cv_prog_gprconfig_exists" = yes +- then ++ fi ++ eval cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat ++ ++ unset cf_TEMP_gnat ++ unset cf_gnat_version ++ unset ac_cv_path_cf_TEMP_gnat ++done ++ ++if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then ++ cf_ada_make= ++ cf_cv_prog_gnat_correct=no ++else ++ cf_ada_make=gnatmake ++ if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then ++ # gprconfig is newer than gnatmake; we can continue... ++ cf_ada_config="##" ++ else + rm -rf conftest* *~conftest* + if mkdir conftest.src + then +@@ -24257,7 +24267,7 @@ + cd conftest.src + for cf_gprconfig in Ada C + do +- echo "$as_me:24260: checking for gprconfig name for $cf_gprconfig" >&5 ++ echo "$as_me:24270: 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 +@@ -24276,10 +24286,10 @@ + if test -n "$cf_gprconfig_value" + then + eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value +- echo "$as_me:24279: result: $cf_gprconfig_value" >&5 ++ echo "$as_me:24289: result: $cf_gprconfig_value" >&5 + echo "${ECHO_T}$cf_gprconfig_value" >&6 + else +- echo "$as_me:24282: result: missing" >&5 ++ echo "$as_me:24292: result: missing" >&5 + echo "${ECHO_T}missing" >&6 + cf_ada_config="#" + break +@@ -24288,27 +24298,31 @@ + cd .. + rm -rf conftest* *~conftest* + fi +- else +- # gprconfig is newer than gnatmake; we can continue... +- cf_ada_config="##" + fi + if test "x$cf_ada_config" != "x#" + then + +-echo "$as_me:24298: checking for gnat version" >&5 ++echo "$as_me:24305: 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 | \ ++if test "${cf_gnat_version+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++cf_gnat_version=`${cf_ada_make:-gnatmake} --version 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:24303: result: $cf_gnat_version" >&5 ++ ++fi ++echo "$as_me:24316: result: $cf_gnat_version" >&5 + echo "${ECHO_T}$cf_gnat_version" >&6 ++test -z "$cf_gnat_version" && cf_gnat_version=no + + case $cf_gnat_version in + (3.1[1-9]*|3.[2-9]*|[4-9].*|20[0-9][0-9]) + cf_cv_prog_gnat_correct=yes + ;; + (*) +- { echo "$as_me:24311: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 ++ { echo "$as_me:24325: 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 + ;; +@@ -24316,7 +24330,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:24319: checking for $ac_word" >&5 ++echo "$as_me:24333: 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 +@@ -24331,7 +24345,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_M4_exists="yes" +-echo "$as_me:24334: found $ac_dir/$ac_word" >&5 ++echo "$as_me:24348: found $ac_dir/$ac_word" >&5 + break + done + +@@ -24340,19 +24354,20 @@ + fi + M4_exists=$ac_cv_prog_M4_exists + if test -n "$M4_exists"; then +- echo "$as_me:24343: result: $M4_exists" >&5 ++ echo "$as_me:24357: result: $M4_exists" >&5 + echo "${ECHO_T}$M4_exists" >&6 + else +- echo "$as_me:24346: result: no" >&5 ++ echo "$as_me:24360: 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 Ada95 binding required program m4 not found. Ada95 binding disabled. ++ { echo "$as_me:24366: 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:24355: checking if GNAT works" >&5 ++ echo "$as_me:24370: checking if GNAT works" >&5 + echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + + rm -rf conftest* *~conftest* +@@ -24380,7 +24395,7 @@ + fi + rm -rf conftest* *~conftest* + +- echo "$as_me:24383: result: $cf_cv_prog_gnat_correct" >&5 ++ echo "$as_me:24398: result: $cf_cv_prog_gnat_correct" >&5 + echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + else +@@ -24392,7 +24407,7 @@ + + ADAFLAGS="$ADAFLAGS -gnatpn" + +- echo "$as_me:24395: checking optimization options for ADAFLAGS" >&5 ++ echo "$as_me:24410: checking optimization options for ADAFLAGS" >&5 + echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 + case "$CFLAGS" in + (*-g*) +@@ -24409,10 +24424,10 @@ + + ;; + esac +- echo "$as_me:24412: result: $ADAFLAGS" >&5 ++ echo "$as_me:24427: result: $ADAFLAGS" >&5 + echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:24415: checking if GNATPREP supports -T option" >&5 ++echo "$as_me:24430: 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 +@@ -24422,11 +24437,11 @@ + gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes + + fi +-echo "$as_me:24425: result: $cf_cv_gnatprep_opt_t" >&5 ++echo "$as_me:24440: 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:24429: checking if GNAT supports generics" >&5 ++echo "$as_me:24444: 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].*) +@@ -24436,7 +24451,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:24439: result: $cf_gnat_generics" >&5 ++echo "$as_me:24454: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -24448,7 +24463,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:24451: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:24466: 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 +@@ -24496,7 +24511,7 @@ + rm -rf conftest* *~conftest* + + fi +-echo "$as_me:24499: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:24514: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test $cf_cv_gnat_sigint = yes ; then +@@ -24509,7 +24524,7 @@ + cf_gnat_projects=no + + if test "$enable_gnat_projects" != no ; then +-echo "$as_me:24512: checking if GNAT supports project files" >&5 ++echo "$as_me:24527: 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]*) +@@ -24572,15 +24587,15 @@ + esac + ;; + esac +-echo "$as_me:24575: result: $cf_gnat_projects" >&5 ++echo "$as_me:24590: 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:24581: checking if GNAT supports libraries" >&5 ++ echo "$as_me:24596: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:24583: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:24598: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -24600,7 +24615,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:24603: checking for ada-compiler" >&5 ++echo "$as_me:24618: 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. +@@ -24611,12 +24626,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:24614: result: $cf_ada_compiler" >&5 ++echo "$as_me:24629: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:24619: checking for ada-include" >&5 ++echo "$as_me:24634: 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. +@@ -24652,7 +24667,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:24655: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:24670: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -24661,10 +24676,10 @@ + fi + eval ADA_INCLUDE="$withval" + +-echo "$as_me:24664: result: $ADA_INCLUDE" >&5 ++echo "$as_me:24679: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:24667: checking for ada-objects" >&5 ++echo "$as_me:24682: 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. +@@ -24700,7 +24715,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + (*) +- { { echo "$as_me:24703: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:24718: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -24709,10 +24724,10 @@ + fi + eval ADA_OBJECTS="$withval" + +-echo "$as_me:24712: result: $ADA_OBJECTS" >&5 ++echo "$as_me:24727: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:24715: checking if an Ada95 shared-library should be built" >&5 ++echo "$as_me:24730: 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. +@@ -24722,14 +24737,14 @@ + else + with_ada_sharedlib=no + fi; +-echo "$as_me:24725: result: $with_ada_sharedlib" >&5 ++echo "$as_me:24740: 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:24732: WARNING: disabling shared-library since GNAT projects are not supported" >&5 ++ { echo "$as_me:24747: 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 +@@ -24749,7 +24764,7 @@ + + # allow the Ada binding to be renamed + +-echo "$as_me:24752: checking for ada-libname" >&5 ++echo "$as_me:24767: 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. +@@ -24765,7 +24780,7 @@ + ;; + esac + +-echo "$as_me:24768: result: $ADA_LIBNAME" >&5 ++echo "$as_me:24783: result: $ADA_LIBNAME" >&5 + echo "${ECHO_T}$ADA_LIBNAME" >&6 + + fi +@@ -24776,13 +24791,13 @@ + + # do this "late" to avoid conflict with header-checks + if test "x$with_widec" = xyes ; then +- echo "$as_me:24779: checking for wchar_t" >&5 ++ echo "$as_me:24794: 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 24785 "configure" ++#line 24800 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -24797,16 +24812,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:24800: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24815: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24803: \$? = $ac_status" >&5 ++ echo "$as_me:24818: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:24806: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24821: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24809: \$? = $ac_status" >&5 ++ echo "$as_me:24824: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_wchar_t=yes + else +@@ -24816,10 +24831,10 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:24819: result: $ac_cv_type_wchar_t" >&5 ++echo "$as_me:24834: result: $ac_cv_type_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 + +-echo "$as_me:24822: checking size of wchar_t" >&5 ++echo "$as_me:24837: 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 +@@ -24828,7 +24843,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >conftest.$ac_ext <<_ACEOF +-#line 24831 "configure" ++#line 24846 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -24840,21 +24855,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:24843: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24858: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24846: \$? = $ac_status" >&5 ++ echo "$as_me:24861: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:24849: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24864: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24852: \$? = $ac_status" >&5 ++ echo "$as_me:24867: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 24857 "configure" ++#line 24872 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -24866,16 +24881,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:24869: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24884: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24872: \$? = $ac_status" >&5 ++ echo "$as_me:24887: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:24875: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24890: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24878: \$? = $ac_status" >&5 ++ echo "$as_me:24893: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break + else +@@ -24891,7 +24906,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 24894 "configure" ++#line 24909 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -24903,16 +24918,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:24906: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24921: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24909: \$? = $ac_status" >&5 ++ echo "$as_me:24924: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:24912: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24927: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24915: \$? = $ac_status" >&5 ++ echo "$as_me:24930: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break + else +@@ -24928,7 +24943,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 24931 "configure" ++#line 24946 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -24940,16 +24955,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:24943: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24958: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24946: \$? = $ac_status" >&5 ++ echo "$as_me:24961: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:24949: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24964: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24952: \$? = $ac_status" >&5 ++ echo "$as_me:24967: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid + else +@@ -24962,12 +24977,12 @@ + ac_cv_sizeof_wchar_t=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:24965: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:24980: 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 24970 "configure" ++#line 24985 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -24983,15 +24998,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:24986: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25001: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24989: \$? = $ac_status" >&5 ++ echo "$as_me:25004: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:24991: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25006: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24994: \$? = $ac_status" >&5 ++ echo "$as_me:25009: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_wchar_t=`cat conftest.val` + else +@@ -25007,7 +25022,7 @@ + ac_cv_sizeof_wchar_t=0 + fi + fi +-echo "$as_me:25010: result: $ac_cv_sizeof_wchar_t" >&5 ++echo "$as_me:25025: result: $ac_cv_sizeof_wchar_t" >&5 + echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:25043: checking for library subsets" >&5 + echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 + LIB_SUBSETS= + +@@ -25067,7 +25082,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:25070: result: $LIB_SUBSETS" >&5 ++echo "$as_me:25085: result: $LIB_SUBSETS" >&5 + echo "${ECHO_T}$LIB_SUBSETS" >&6 + + ### Construct the list of include-directories to be generated +@@ -25098,7 +25113,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:25101: checking default library suffix" >&5 ++echo "$as_me:25116: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -25109,10 +25124,10 @@ + (shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:25112: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:25127: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:25115: checking default library-dependency suffix" >&5 ++echo "$as_me:25130: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case X$DFT_LWR_MODEL in +@@ -25170,10 +25185,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:25173: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:25188: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:25176: checking default object directory" >&5 ++echo "$as_me:25191: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -25189,11 +25204,11 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:25192: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:25207: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + if test "x$cf_with_cxx" = xyes ; then +-echo "$as_me:25196: checking c++ library-dependency suffix" >&5 ++echo "$as_me:25211: 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++) +@@ -25261,7 +25276,7 @@ + fi + + fi +-echo "$as_me:25264: result: $CXX_LIB_SUFFIX" >&5 ++echo "$as_me:25279: result: $CXX_LIB_SUFFIX" >&5 + echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 + + fi +@@ -25437,19 +25452,19 @@ + + if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" + then +- echo "$as_me:25440: checking if linker supports switching between static/dynamic" >&5 ++ echo "$as_me:25455: 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:25449: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:25464: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25452: \$? = $ac_status" >&5 ++ echo "$as_me:25467: \$? = $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 +@@ -25460,10 +25475,10 @@ + + LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 25463 "configure" ++#line 25478 "configure" + #include "confdefs.h" + +-#line 25466 "configure" ++#line 25481 "configure" + #include + int cf_ldflags_static(FILE *fp); + +@@ -25478,16 +25493,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:25481: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25496: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25484: \$? = $ac_status" >&5 ++ echo "$as_me:25499: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:25487: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25502: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25490: \$? = $ac_status" >&5 ++ echo "$as_me:25505: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + # some linkers simply ignore the -dynamic +@@ -25510,7 +25525,7 @@ + rm -f libconftest.* + LIBS="$cf_save_LIBS" + +- echo "$as_me:25513: result: $cf_ldflags_static" >&5 ++ echo "$as_me:25528: result: $cf_ldflags_static" >&5 + echo "${ECHO_T}$cf_ldflags_static" >&6 + + if test $cf_ldflags_static != yes +@@ -25526,7 +25541,7 @@ + ;; + esac + +-echo "$as_me:25529: checking where we will install curses.h" >&5 ++echo "$as_me:25544: checking where we will install curses.h" >&5 + echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 + + includesubdir= +@@ -25536,7 +25551,7 @@ + then + includesubdir="/ncurses${USE_LIB_SUFFIX}" + fi +-echo "$as_me:25539: result: ${includedir}${includesubdir}" >&5 ++echo "$as_me:25554: result: ${includedir}${includesubdir}" >&5 + echo "${ECHO_T}${includedir}${includesubdir}" >&6 + + ### Resolve a conflict between normal and wide-curses by forcing applications +@@ -25544,7 +25559,7 @@ + if test "$with_overwrite" != no ; then + if test "$NCURSES_LIBUTF8" = 1 ; then + NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' +- { echo "$as_me:25547: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 ++ { echo "$as_me:25562: 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 +@@ -25562,7 +25577,7 @@ + ### Construct the list of subdirectories for which we'll customize makefiles + ### with the appropriate compile-rules. + +-echo "$as_me:25565: checking for src modules" >&5 ++echo "$as_me:25580: checking for src modules" >&5 + echo $ECHO_N "checking for src modules... $ECHO_C" >&6 + + # dependencies and linker-arguments for test-programs +@@ -25627,7 +25642,7 @@ + fi + fi + done +-echo "$as_me:25630: result: $cf_cv_src_modules" >&5 ++echo "$as_me:25645: result: $cf_cv_src_modules" >&5 + echo "${ECHO_T}$cf_cv_src_modules" >&6 + + TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" +@@ -25894,7 +25909,7 @@ + (*-D_XOPEN_SOURCE_EXTENDED*) + test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 + +-echo "${as_me:-configure}:25897: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 ++echo "${as_me:-configure}:25912: 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//'` +@@ -25905,7 +25920,7 @@ + + # Help to automatically enable the extended curses features when using either + # the *-config or the ".pc" files by adding defines. +-echo "$as_me:25908: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5 ++echo "$as_me:25923: 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 +@@ -25921,7 +25936,7 @@ + done + test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1" + done +-echo "$as_me:25924: result: $PKG_CFLAGS" >&5 ++echo "$as_me:25939: result: $PKG_CFLAGS" >&5 + echo "${ECHO_T}$PKG_CFLAGS" >&6 + + # AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. +@@ -25982,7 +25997,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}:25985: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 ++echo "${as_me:-configure}:26000: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 + + fi + +@@ -26092,7 +26107,7 @@ + : ${CONFIG_STATUS=./config.status} + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:26095: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:26110: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL +@@ -26268,7 +26283,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:26271: error: ambiguous option: $1 ++ { { echo "$as_me:26286: 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;} +@@ -26287,7 +26302,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:26290: error: unrecognized option: $1 ++ -*) { { echo "$as_me:26305: 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;} +@@ -26406,7 +26421,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:26409: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:26424: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -26694,8 +26709,7 @@ + s,@CXX_ARFLAGS@,$CXX_ARFLAGS,;t t + s,@CXXLIBS@,$CXXLIBS,;t t + s,@USE_CXX_BOOL@,$USE_CXX_BOOL,;t t +-s,@gnatmake_exists@,$gnatmake_exists,;t t +-s,@gprconfig_exists@,$gprconfig_exists,;t t ++s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t + s,@M4_exists@,$M4_exists,;t t + s,@cf_ada_make@,$cf_ada_make,;t t + s,@cf_ada_config@,$cf_ada_config,;t t +@@ -26902,7 +26916,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:26905: creating $ac_file" >&5 ++ { echo "$as_me:26919: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -26920,7 +26934,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:26923: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:26937: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -26933,7 +26947,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:26936: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:26950: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -26949,7 +26963,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' $ac_item` + if test -z "$ac_used"; then +- { echo "$as_me:26952: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:26966: 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;} +@@ -26958,7 +26972,7 @@ + fi + ac_seen=`grep '${datarootdir}' $ac_item` + if test -n "$ac_seen"; then +- { echo "$as_me:26961: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:26975: 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;} +@@ -26995,7 +27009,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:26998: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:27012: 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;} +@@ -27006,7 +27020,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:27009: WARNING: Some variables may not be substituted: ++ { echo "$as_me:27023: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -27055,7 +27069,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:27058: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:27072: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -27066,7 +27080,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:27069: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:27083: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -27079,7 +27093,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:27082: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:27096: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -27137,7 +27151,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:27140: $ac_file is unchanged" >&5 ++ { echo "$as_me:27154: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +@@ -27482,7 +27496,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}:27485: testing overriding CXX_MODEL to SHARED ..." 1>&5 ++echo "${as_me:-configure}:27499: testing overriding CXX_MODEL to SHARED ..." 1>&5 + + with_shared_cxx=yes + ;; +Index: dist.mk +Prereq: 1.1305 +--- ncurses-6.1-20190914+/dist.mk 2019-09-14 13:43:52.000000000 +0000 ++++ ncurses-6.1-20190921/dist.mk 2019-09-21 14:56:20.000000000 +0000 +@@ -25,7 +25,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1305 2019/09/14 13:43:52 tom Exp $ ++# $Id: dist.mk,v 1.1306 2019/09/21 14:56:20 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 = 20190914 ++NCURSES_PATCH = 20190921 + + # 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-20190914+/doc/html/man/adacurses6-config.1.html 2019-07-26 23:48:24.000000000 +0000 ++++ ncurses-6.1-20190921/doc/html/man/adacurses6-config.1.html 2019-09-21 23:49:50.000000000 +0000 +@@ -1,6 +1,6 @@ + + + +@@ -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
new file mode 100644
index 0000000..b7b6d2b
--- /dev/null
+++ b/ncurses-6.1-20190928.patch
@@ -0,0 +1,922 @@
+# 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
new file mode 100644
index 0000000..bd7c87d
--- /dev/null
+++ b/ncurses-6.1-20191005.patch
@@ -0,0 +1,231 @@
+# 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
new file mode 100644
index 0000000..bb8f057
--- /dev/null
+++ b/ncurses-6.1-20191012.patch
@@ -0,0 +1,1359 @@
+# 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
new file mode 100644
index 0000000..31f75ec
--- /dev/null
+++ b/ncurses-6.1-20191015.patch
@@ -0,0 +1,304 @@
+# 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
new file mode 100644
index 0000000..e958b36
--- /dev/null
+++ b/ncurses-6.1-20191019.patch
@@ -0,0 +1,256 @@
+# 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
new file mode 100644
index 0000000..d23c81c
--- /dev/null
+++ b/ncurses-6.1-20191026.patch
@@ -0,0 +1,740 @@
+# 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
new file mode 100644
index 0000000..2c94399
--- /dev/null
+++ b/ncurses-6.1-20191102.patch
@@ -0,0 +1,3052 @@
+# 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
new file mode 100644
index 0000000..0c39ad7
--- /dev/null
+++ b/ncurses-6.1-20191109.patch
@@ -0,0 +1,482 @@
+# 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
new file mode 100644
index 0000000..5e33db5
--- /dev/null
+++ b/ncurses-6.1-20191116.patch
@@ -0,0 +1,260 @@
+# 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
new file mode 100644
index 0000000..e74c8f3
--- /dev/null
+++ b/ncurses-6.1-20191123.patch
@@ -0,0 +1,387 @@
+# 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
new file mode 100644
index 0000000..046adf4
--- /dev/null
+++ b/ncurses-6.1-20191130.patch
@@ -0,0 +1,3764 @@
+# 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
new file mode 100644
index 0000000..bf2a6da
--- /dev/null
+++ b/ncurses-6.1-20191207.patch
@@ -0,0 +1,1686 @@
+# 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
new file mode 100644
index 0000000..c714434
--- /dev/null
+++ b/ncurses-6.1-20191214.patch
@@ -0,0 +1,1901 @@
+# 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.spec b/ncurses.spec
index 9a9164c..cfd07be 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -3,7 +3,7 @@
 %define        patchver %(echo %version | cut -d. -f 3)
 %define        tack_ver 1.07
 Name:          ncurses
-Version:       6.1.20190728
+Version:       6.1.20200118
 Release:       2mamba
 Summary:       A CRT screen handling and optimization package
 Group:         System/Libraries
@@ -21,7 +21,33 @@ Source5:       ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-20190706
 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
-Source20:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-%{patchver}.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
+Source99:      ftp://dickey.his.com/ncurses/%{majver}/ncurses-%{majver}-%{patchver}.patch.gz
 %endif
 License:       MIT
 ## AUTOBUILDREQ-BEGIN
@@ -52,6 +78,11 @@ Extra terminal information files.
 Summary:       The development files for applications which use ncurses
 Group:         System/Libraries
 Requires:      ncurses-terminfo
+%ifarch x86_64
+Provides:      libtinfo.so.6()(64bit)
+%else
+Provides:      libtinfo.so.6
+%endif
 
 %description -n libncurses
 The curses library routines are a terminal-independent method of updating character screens with reasonalble optimization. The ncurses (new curses) library is a freely distributable replacement for the discontinued 4.4BSD classic curses library.
@@ -64,8 +95,12 @@ Requires:      libncurses = %{version}-%{release}
 %description -n libncurses-devel
 The header files and libraries for developing applications that use the ncurses CRT screen handling and optimization package.
 
+%debug_package
+
 %prep
 %setup -q -n %{name}-%{majver}
+#-D -T
+#:<< _EOF
 
 %if "%{?patchver}" != ""
 gunzip -c %{SOURCE1} | bash
@@ -77,10 +112,37 @@ 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 %{SOURCE99} | patch -p1
 %endif
 
 %build
+#:<< _EOF
 mkdir narrowc widec
 cd narrowc
 ln -s ../configure .
@@ -94,7 +156,6 @@ ln -s ../configure .
    --without-debug \
    --without-profile \
    --without-ada \
-   --with-termlib \
    --enable-getcap \
    --enable-pc-files \
    --with-ticlib \
@@ -163,6 +224,9 @@ ln -sf ../l/linux %{buildroot}%{_datadir}/terminfo/c/console
 ln -sf libncurses.a %{buildroot}%{_libdir}/libcurses.a
 ln -sf libncursesw.a %{buildroot}%{_libdir}/libcursesw.a
 
+ln -sf libncurses.so.6 %{buildroot}%{_libdir}/libtinfo.so.6  
+ln -sf libncurses.so.6 %{buildroot}%{_libdir}/libtinfo.so
+
 # fix strange permissions
 chmod 755 %{buildroot}/%{_libdir}/*.so.*
 
@@ -189,6 +253,12 @@ chmod 755 %{buildroot}/%{_libdir}/*.so.*
 %post -n libncurses -p /sbin/ldconfig
 %postun -n libncurses -p /sbin/ldconfig
 
+%posttrans -n libncurses
+if [ $1 -ge 1 ]; then
+   [ -e %{_libdir}/libtinfo.so.6 ] || ln -sf libncurses.so.6 %{_libdir}/libtinfo.so.6
+fi
+:
+
 %files
 %defattr(-,root,root)
 %{_bindir}/captoinfo
@@ -218,7 +288,6 @@ chmod 755 %{buildroot}/%{_libdir}/*.so.*
 %{_libdir}/libtic.so.*
 %{_libdir}/libticw.so.*
 %{_libdir}/libtinfo.so.*
-%{_libdir}/pkgconfig/tinfo.pc
 #%{_datadir}/terminfo/*
 %if "%{_target_cpu}" != "x86_64"
 %{_libdir}/terminfo
@@ -244,6 +313,7 @@ chmod 755 %{buildroot}/%{_libdir}/*.so.*
 %{_libdir}/pkgconfig/panelw.pc
 %{_libdir}/pkgconfig/tic.pc
 %{_libdir}/pkgconfig/ticw.pc
+#%{_libdir}/pkgconfig/tinfo.pc
 %{_mandir}/man3/*
 %doc doc/html/hackguide.html
 %doc doc/html/ncurses-intro.html
@@ -256,6 +326,13 @@ chmod 755 %{buildroot}/%{_libdir}/*.so.*
 %{_datadir}/terminfo/*
 
 %changelog
+* Mon Feb 10 2020 Silvan Calarco  6.1.20200118-2mamba
+- postrans workaround to fix libtinfo.so.6 disappearing on upgrade
+
+* Sun Feb 09 2020 Silvan Calarco  6.1.20200118-1mamba
+- update to 6.1.20200118
+- remove --with-termlib, provide libterminfo.so* as a symlink to libncurses.so*
+
 * Mon Nov 25 2019 Silvan Calarco  6.1.20190728-2mamba
 - rebuilt with --with-termlib to generate libtinfo