1# ncurses 6.1 - patch 20200118 - Thomas E. Dickey 2# 3# ------------------------------------------------------------------------------ 4# 5# Ncurses 6.1 is at 6# ftp.gnu.org:/pub/gnu 7# 8# Patches for ncurses 6.1 can be found at 9# ftp://ftp.invisible-island.net/ncurses/6.1 10# http://invisible-mirror.net/archives/ncurses/6.1 11# 12# ------------------------------------------------------------------------------ 13# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20200118.patch.gz 14# patch by Thomas E. Dickey <dickey@invisible-island.net> 15# created Sun Jan 19 02:49:58 UTC 2020 16# ------------------------------------------------------------------------------ 17# Ada95/samples/ncurses2-demo_pad.adb | 10 18# Ada95/samples/ncurses2-m.adb | 8 19# Ada95/src/terminal_interface-curses-forms-field_types-enumeration.ads | 6 20# INSTALL | 8 21# NEWS | 45 22# VERSION | 2 23# aclocal.m4 | 6 24# c++/cursesf.h | 6 25# c++/cursesm.h | 6 26# c++/cursesw.h | 6 27# dist.mk | 4 28# doc/html/ada/funcs/T.htm | 2 29# doc/html/ada/terminal_interface-curses-forms-field_types-enumeration__ads.htm | 6 30# doc/html/man/adacurses6-config.1.html | 2 31# doc/html/man/captoinfo.1m.html | 2 32# doc/html/man/clear.1.html | 2 33# doc/html/man/curs_memleaks.3x.html | 2 34# doc/html/man/curs_slk.3x.html | 30 35# doc/html/man/curs_terminfo.3x.html | 150 + 36# doc/html/man/form.3x.html | 2 37# doc/html/man/infocmp.1m.html | 2 38# doc/html/man/infotocap.1m.html | 2 39# doc/html/man/menu.3x.html | 2 40# doc/html/man/ncurses.3x.html | 2 41# doc/html/man/ncurses6-config.1.html | 2 42# doc/html/man/panel.3x.html | 2 43# doc/html/man/tabs.1.html | 2 44# doc/html/man/terminfo.5.html | 2 45# doc/html/man/tic.1m.html | 2 46# doc/html/man/toe.1m.html | 2 47# doc/html/man/tput.1.html | 2 48# doc/html/man/tset.1.html | 2 49# doc/html/man/user_caps.5.html | 70 50# form/frm_post.c | 14 51# form/fty_generic.c | 30 52# man/curs_slk.3x | 27 53# man/curs_terminfo.3x | 102 54# man/user_caps.5 | 82 55# menu/m_driver.c | 6 56# menu/m_global.c | 52 57# menu/m_item_use.c | 16 58# menu/m_userptr.c | 16 59# misc/emx.src | 8 60# misc/terminfo.src | 51 61# ncurses/README.IZ | 6 62# ncurses/build.priv.h | 27 63# ncurses/tinfo/make_hash.c | 6 64# ncurses/tinfo/obsolete.c | 6 65# ncurses/win32con/win_driver.c | 8 66# package/debian-mingw/changelog | 4 67# package/debian-mingw64/changelog | 4 68# package/debian/changelog | 4 69# package/mingw-ncurses.nsi | 4 70# package/mingw-ncurses.spec | 2 71# package/ncurses.spec | 2 72# package/ncursest.spec | 2 73# progs/capconvert | 8 74# test/aclocal.m4 | 14 75# test/configure | 1105 +++++----- 76# test/tclock.c | 4 77# 60 files changed, 1201 insertions(+), 808 deletions(-) 78# ------------------------------------------------------------------------------ 79Index: Ada95/samples/ncurses2-demo_pad.adb 80--- ncurses-6.1-20200111+/Ada95/samples/ncurses2-demo_pad.adb 2014-09-13 19:10:18.000000000 +0000 81+++ ncurses-6.1-20200118/Ada95/samples/ncurses2-demo_pad.adb 2020-01-18 17:02:13.000000000 +0000 82@@ -7,7 +7,7 @@ 83 -- B O D Y -- 84 -- -- 85 ------------------------------------------------------------------------------ 86--- Copyright (c) 2000-2011,2014 Free Software Foundation, Inc. -- 87+-- Copyright (c) 2000-2014,2020 Free Software Foundation, Inc. -- 88 -- -- 89 -- Permission is hereby granted, free of charge, to any person obtaining a -- 90 -- copy of this software and associated documentation files (the -- 91@@ -35,8 +35,8 @@ 92 ------------------------------------------------------------------------------ 93 -- Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000 94 -- Version Control 95--- $Revision: 1.9 $ 96--- $Date: 2014/09/13 19:10:18 $ 97+-- $Revision: 1.10 $ 98+-- $Date: 2020/01/18 17:02:13 $ 99 -- Binding Version 01.00 100 ------------------------------------------------------------------------------ 101 with ncurses2.util; use ncurses2.util; 102@@ -488,7 +488,7 @@ 103 -- more writing off the screen. 104 -- Interestingly, the exception is not handled if 105 -- we put a block around this. 106- -- delcare --begin 107+ -- declare --begin 108 if top_y /= 0 and top_x /= 0 then 109 Add (Line => top_y - 1, Column => top_x - 1, 110 Ch => ACS_Map (ACS_Upper_Left_Corner)); 111@@ -579,7 +579,7 @@ 112 113 declare 114 -- the C version allows the panel to have a zero height 115- -- wich raise the exception 116+ -- which raise the exception 117 begin 118 Refresh_Without_Update 119 ( 120Index: Ada95/samples/ncurses2-m.adb 121--- ncurses-6.1-20200111+/Ada95/samples/ncurses2-m.adb 2018-07-07 23:33:16.000000000 +0000 122+++ ncurses-6.1-20200118/Ada95/samples/ncurses2-m.adb 2020-01-18 17:02:13.000000000 +0000 123@@ -7,7 +7,7 @@ 124 -- B O D Y -- 125 -- -- 126 ------------------------------------------------------------------------------ 127--- Copyright (c) 2000-2008,2018 Free Software Foundation, Inc. -- 128+-- Copyright (c) 2000-2018,2020 Free Software Foundation, Inc. -- 129 -- -- 130 -- Permission is hereby granted, free of charge, to any person obtaining a -- 131 -- copy of this software and associated documentation files (the -- 132@@ -35,8 +35,8 @@ 133 ------------------------------------------------------------------------------ 134 -- Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000 135 -- Version Control 136--- $Revision: 1.9 $ 137--- $Date: 2018/07/07 23:33:16 $ 138+-- $Revision: 1.10 $ 139+-- $Date: 2020/01/18 17:02:13 $ 140 -- Binding Version 01.00 141 ------------------------------------------------------------------------------ 142 -- TODO use Default_Character where appropriate 143@@ -186,7 +186,7 @@ 144 Erase (Win); 145 Move_Cursor (Win, 0, 0); 146 Add (Win, "header:" & Columns'Img & " columns"); 147- -- 'Img is a GNAT extention 148+ -- 'Img is a GNAT extension 149 Refresh_Without_Update (Win); 150 return 0; -- Curses_OK; 151 end rip_header; 152Index: Ada95/src/terminal_interface-curses-forms-field_types-enumeration.ads 153--- ncurses-6.1-20200111+/Ada95/src/terminal_interface-curses-forms-field_types-enumeration.ads 2018-07-07 23:34:20.000000000 +0000 154+++ ncurses-6.1-20200118/Ada95/src/terminal_interface-curses-forms-field_types-enumeration.ads 2020-01-18 17:02:13.000000000 +0000 155@@ -7,7 +7,7 @@ 156 -- S P E C -- 157 -- -- 158 ------------------------------------------------------------------------------ 159--- Copyright (c) 1998-2009,2018 Free Software Foundation, Inc. -- 160+-- Copyright (c) 1998-2018,2020 Free Software Foundation, Inc. -- 161 -- -- 162 -- Permission is hereby granted, free of charge, to any person obtaining a -- 163 -- copy of this software and associated documentation files (the -- 164@@ -35,7 +35,7 @@ 165 ------------------------------------------------------------------------------ 166 -- Author: Juergen Pfeifer, 1996 167 -- Version Control: 168--- $Revision: 1.13 $ 169+-- $Revision: 1.14 $ 170 -- Binding Version 01.00 171 ------------------------------------------------------------------------------ 172 with Interfaces.C.Strings; 173@@ -78,7 +78,7 @@ 174 -- But we may want to release the field to release the memory allocated 175 -- by it internally. After that the Enumeration field is no longer usable. 176 177- -- The next type defintions are all ncurses extensions. They are typically 178+ -- The next type definitions are all ncurses extensions. They are typically 179 -- not available in other curses implementations. 180 181 procedure Set_Field_Type (Fld : Field; 182Index: INSTALL 183Prereq: 1.214 184--- ncurses-6.1-20200111+/INSTALL 2019-09-07 22:44:40.000000000 +0000 185+++ ncurses-6.1-20200118/INSTALL 2020-01-18 17:02:13.000000000 +0000 186@@ -1,5 +1,5 @@ 187 ------------------------------------------------------------------------------- 188--- Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. -- 189+-- Copyright (c) 1998-2019,2020 Free Software Foundation, Inc. -- 190 -- -- 191 -- Permission is hereby granted, free of charge, to any person obtaining a -- 192 -- copy of this software and associated documentation files (the -- 193@@ -25,7 +25,7 @@ 194 -- sale, use or other dealings in this Software without prior written -- 195 -- authorization. -- 196 ------------------------------------------------------------------------------- 197--- $Id: INSTALL,v 1.214 2019/09/07 22:44:40 tom Exp $ 198+-- $Id: INSTALL,v 1.215 2020/01/18 17:02:13 tom Exp $ 199 --------------------------------------------------------------------- 200 How to install Ncurses/Terminfo on your system 201 --------------------------------------------------------------------- 202@@ -492,7 +492,7 @@ 203 204 --disable-wattr-macros 205 The 6.0 ABI adds support for extended colors and for extended mouse. 206- The former is a noticeable problem when developers inadvertantly 207+ The former is a noticeable problem when developers inadvertently 208 compile using the ncurses6 header files and link with an ncurses5 209 library, because the wattr* macros use a new field in the WINDOW 210 structure. These macros are used in several applications. 211@@ -2158,7 +2158,7 @@ 212 >fallback.c 213 214 The overhead for an empty fallback list is one trivial stub function. 215- Any non-empty fallback list is const-ed and therefore lives in sharable 216+ Any non-empty fallback list is const'd and therefore lives in shareable 217 text space. You can look at the comment trailing each initializer in 218 the generated ncurses/fallback.c file to see the core cost of the 219 fallbacks. A good rule of thumb for modern vt100-like entries is that 220Index: NEWS 221Prereq: 1.3428 222--- ncurses-6.1-20200111+/NEWS 2020-01-12 00:20:47.000000000 +0000 223+++ ncurses-6.1-20200118/NEWS 2020-01-19 02:02:44.000000000 +0000 224@@ -25,7 +25,7 @@ 225 -- sale, use or other dealings in this Software without prior written -- 226 -- authorization. -- 227 ------------------------------------------------------------------------------- 228--- $Id: NEWS,v 1.3428 2020/01/12 00:20:47 tom Exp $ 229+-- $Id: NEWS,v 1.3431 2020/01/19 02:02:44 tom Exp $ 230 ------------------------------------------------------------------------------- 231 232 This is a log of changes that ncurses has gone through since Zeyd started 233@@ -45,6 +45,15 @@ 234 Changes through 1.9.9e did not credit all contributions; 235 it is not possible to add this information. 236 237+20200118 238+ + expanded description of XM in user_caps.5 239+ + improve xm example for xterm+x11mouse, xterm+sm+1006 -TD 240+ + add history section to curs_slk.3x and curs_terminfo.3x manpages. 241+ + update alacritty entries for 0.4.0 (prompted by patch by 242+ Christian Durr) -TD 243+ + correct spelling errors found with codespell. 244+ + fix for test/configure, from xterm #352. 245+ 246 20200111 247 + improve configure macros which check for the X11/Intrinsic.h header, 248 to accommodate recent MacOS changes. 249@@ -1080,7 +1089,7 @@ 250 + modify several test-programs which call use_default_colors() to 251 consistently do this only if "-d" option is given. 252 + additional changes to test with non-standard variants of curses: 253- + modify a loop limit in firework.c to work around absense of limit 254+ + modify a loop limit in firework.c to work around absence of limit 255 checks in some libraries. 256 + fill the last row of a window with "?" in firstlast if waddch does 257 not return ERR on the lower-right corner. 258@@ -3191,7 +3200,7 @@ 259 + updated termcap manpage to document legacy termcap behavior for 260 matching capability names. 261 + modify name-comparison for tgetstr, etc., to accommodate legacy 262- applications as well as to improve compatbility with BSD 4.2 263+ applications as well as to improve compatibility with BSD 4.2 264 termcap implementations (Debian #698299) (cf: 980725). 265 266 20130112 267@@ -3709,7 +3718,7 @@ 268 + modify stat() calls to ignore the st_size member 269 + drop mk-dlls.sh script. 270 + change recommended regular expression library. 271- + modify rain.c to allow for threaded configuraton. 272+ + modify rain.c to allow for threaded configuration. 273 + modify tset.c to allow for case when size-change logic is not used. 274 275 20111231 276@@ -4329,7 +4338,7 @@ 277 when weak-symbols are used, allowing the pthread configuration to 278 more closely match the non-thread naming (report by Werner Fink). 279 + modify configure check for tic program, used for fallbacks, to a 280- warning if not found. This makes it simpler to use additonal 281+ warning if not found. This makes it simpler to use additional 282 scripts to bootstrap the fallbacks code using tic from the build 283 tree (report by Werner Fink). 284 + fix several places in configure script using ${variable-value} form. 285@@ -10061,7 +10070,7 @@ 286 current directory (reported by Mike Castle <dalgoda@ix.netcom.com>). 287 + modify terminfo/termcap translation to suppress acsc before trying 288 sgr if the entry would be too large (patch by Todd C Miller). 289- + document a special case of incompatiblity between ncurses 4.2 and 290+ + document a special case of incompatibility between ncurses 4.2 and 291 5.0, add a section for this in INSTALL. 292 + add TRACE_DATABASE flag for trace(). 293 294@@ -10635,7 +10644,7 @@ 295 + resolve ambiguity of kend/kll/kslt and khome/kfnd/kich1 strings in 296 xterm and ncsa terminfo entries by removing the unneeded ones. Note 297 that some entries will return kend & khome versus kslt and kfnd, for 298- PC-style keyboards versus strict vt220 compatiblity - TD 299+ PC-style keyboards versus strict vt220 compatibility - TD 300 + add function keybound(), which returns the definition associated with 301 a given keycode. 302 + modify define_key() to undefine the given string when no keycode is 303@@ -10722,7 +10731,7 @@ 304 + add configure --with-shlib-version option to allow installing shared 305 libraries named according to release or ABI versions. This 306 parameterizes some existing logic in the configure script, and is 307- intended for compatiblity upgrades on Digital Unix, which used 308+ intended for compatibility upgrades on Digital Unix, which used 309 versioned libraries in ncurses 4.2, but no longer does (cf: 980425). 310 + resync configure script against autoconf 2.13 + patches 311 + minor improvements for teraterm terminfo entry based on the program's 312@@ -11203,7 +11212,7 @@ 313 980523 314 + correct maxx/maxy expression for num_columns/num_lines in derwin 315 (patch by Alexander V Lukyanov). 316- + add /usr/share/lib/terminfo and /usr/lib/terminfo as compatibilty 317+ + add /usr/share/lib/terminfo and /usr/lib/terminfo as compatibility 318 fallbacks to _nc_read_entry(), along with --with-terminfo-dirs 319 configure option (suggested by Mike Hopkirk). 320 + modify config.guess to recognize Unixware 2.1 and 7 (patch by Mike 321@@ -11289,7 +11298,7 @@ 322 + remove spurious trailing blanks in glibc addon-scripts (patch by 323 H.J.Lu). 324 + insert a few braces at locations where gcc-2.8.x asks to use them to 325- avoid ambigous else's, use -fpic rather than -fPIC for Linux (patch 326+ avoid ambiguous else's, use -fpic rather than -fPIC for Linux (patch 327 by Juergen Pfeifer). 328 329 980404 330@@ -11739,7 +11748,7 @@ 331 > patch by Juergen Pfeifer: 332 + factor lib_menu and lib_form into smaller modules 333 + clean up the interface between panel and SCREEN 334- + minor changes to the Ada95 mouse support implemenation 335+ + minor changes to the Ada95 mouse support implementation 336 + minor bugfix in C++ binding to ripoff windows 337 + fix a few Ada95 html documentation pages 338 339@@ -11950,7 +11959,7 @@ 340 + Enhance form/frm_driver.c: Allow growth of dynamic fields also on 341 navigation requests. 342 + Fixed a bug in form/fty_enum.c: wrong position of postincrement in 343- case-insensitiva comparision routine. 344+ case-insensitiva comparison routine. 345 + Enhanced form/lib_adabind.c with function _nc_get_field() to get a 346 forms field by index. 347 + Enhanced menu/m_adabind.c with function _nc_get_item() to get a menus 348@@ -12061,7 +12070,7 @@ 349 4. correctly handle input errors (i.e., EINTR) without loss of raw 350 keys 351 5. recognize ESC KEY_LEFT and similar 352- 6. correctly handle the case of receiption of KEY_MOUSE from gpm 353+ 6. correctly handle the case of reception of KEY_MOUSE from gpm 354 + correct off-by-one indexing error in _nc_mouse_parse(), that caused 355 single mouse events (press/release) to be ignored in favor of 356 composed events (click). Improves on a fix from integrating gpm 357@@ -12302,7 +12311,7 @@ 358 than total lines (patch by Alexander V. Lukyanov). 359 + correct loop limits for table-lookup of enumerated value in form 360 (patch by Juergen Pfeifer). 361- + improve threshhold computation for determining when to call ClrToEOL 362+ + improve threshold computation for determining when to call ClrToEOL 363 (patch by Alexander V. Lukyanov). 364 365 970531 366@@ -13537,7 +13546,7 @@ 367 * tset(1) added 368 * mouse support for xterm. 369 * most data tables are now const and accordingly live in shareable text space. 370-* Obey the XPG4/SVr4 practice that echo() is initally off. 371+* Obey the XPG4/SVr4 practice that echo() is initially off. 372 * tic is much better at translating XENIX and AIX termcap entries now. 373 * tic can interpret ko capabilities now. 374 * integrated Juergen Pfeifer's forms library. 375@@ -13553,7 +13562,7 @@ 376 * Fixed a ^Z-handling bug that was tanking lynx(1). 377 * HJ Lu's patches for ELF shared libraries under Linux 378 * terminfo.src 9.8.2 379-* tweaks for compiling in seperate directories. 380+* tweaks for compiling in separate directories. 381 * Thomas Dickey's patches to support NeXT's brain-dead linker 382 * Eric Raymond's patches to fix problems with long termcap entries. 383 * more support for shared libraries under SunOS and IRIX. 384@@ -13634,7 +13643,7 @@ 385 * tic can understand termcap now, especially if it is called captoinfo. 386 * The Linux Standard Console terminfo entry is called linux insead of console. 387 It also uses the kernel's new method of changing charsets. 388-* initscr() will EXIT upon error (as the docs say) This wil mostly happen if 389+* initscr() will EXIT upon error (as the docs say) This will mostly happen if 390 you try to run on an undefined terminal. 391 * I can get things running on AIX but tic can't compile terminfo. I have to 392 compile entries on another machine. Volunteers to hunt this bug are welcome. 393@@ -13873,7 +13882,7 @@ 394 * cleaned up vidputs() 395 * general cleanup of the code 396 * more attention to portability to other systems 397-* added terminfos for hp70092 (wont work until changes to lib_update.c are 398+* added terminfos for hp70092 (won't work until changes to lib_update.c are 399 made) and 386BSD pcvt drivers. 400 401 Thanks to Hellmuth Michaelis for his help. 402Index: VERSION 403--- ncurses-6.1-20200111+/VERSION 2020-01-11 10:59:50.000000000 +0000 404+++ ncurses-6.1-20200118/VERSION 2020-01-18 10:27:03.000000000 +0000 405@@ -1 +1 @@ 406-5:0:10 6.1 20200111 407+5:0:10 6.1 20200118 408Index: aclocal.m4 409Prereq: 1.892 410--- ncurses-6.1-20200111+/aclocal.m4 2020-01-12 00:10:43.000000000 +0000 411+++ ncurses-6.1-20200118/aclocal.m4 2020-01-18 17:30:44.000000000 +0000 412@@ -28,7 +28,7 @@ 413 dnl 414 dnl Author: Thomas E. Dickey 1995-on 415 dnl 416-dnl $Id: aclocal.m4,v 1.892 2020/01/12 00:10:43 tom Exp $ 417+dnl $Id: aclocal.m4,v 1.893 2020/01/18 17:30:44 tom Exp $ 418 dnl Macros used in NCURSES auto-configuration script. 419 dnl 420 dnl These macros are maintained separately from NCURSES. The copyright on 421@@ -7029,9 +7029,9 @@ 422 fi 423 ])dnl 424 dnl --------------------------------------------------------------------------- 425-dnl CF_SIG_ATOMIC_T version: 3 updated: 2012/10/04 20:12:20 426+dnl CF_SIG_ATOMIC_T version: 4 updated: 2020/01/18 12:30:44 427 dnl --------------- 428-dnl signal handler, but there are some gcc depedencies in that recommendation. 429+dnl signal handler, but there are some gcc dependencies in that recommendation. 430 dnl Try anyway. 431 AC_DEFUN([CF_SIG_ATOMIC_T], 432 [ 433Index: c++/cursesf.h 434Prereq: 1.33 435--- ncurses-6.1-20200111+/c++/cursesf.h 2019-07-28 19:55:27.000000000 +0000 436+++ ncurses-6.1-20200118/c++/cursesf.h 2020-01-18 17:02:13.000000000 +0000 437@@ -1,6 +1,6 @@ 438 // * This makes emacs happy -*-Mode: C++;-*- 439 /**************************************************************************** 440- * Copyright (c) 1998-2014,2019 Free Software Foundation, Inc. * 441+ * Copyright (c) 1998-2019,2020 Free Software Foundation, Inc. * 442 * * 443 * Permission is hereby granted, free of charge, to any person obtaining a * 444 * copy of this software and associated documentation files (the * 445@@ -31,7 +31,7 @@ 446 * Author: Juergen Pfeifer, 1997 * 447 ****************************************************************************/ 448 449-// $Id: cursesf.h,v 1.33 2019/07/28 19:55:27 tom Exp $ 450+// $Id: cursesf.h,v 1.34 2020/01/18 17:02:13 tom Exp $ 451 452 #ifndef NCURSES_CURSESF_H_incl 453 #define NCURSES_CURSESF_H_incl 1 454@@ -47,7 +47,7 @@ 455 } 456 // 457 // ------------------------------------------------------------------------- 458-// The abstract base class for buitin and user defined Fieldtypes. 459+// The abstract base class for builtin and user defined Fieldtypes. 460 // ------------------------------------------------------------------------- 461 // 462 class NCURSES_IMPEXP NCursesFormField; // forward declaration 463Index: c++/cursesm.h 464Prereq: 1.31 465--- ncurses-6.1-20200111+/c++/cursesm.h 2019-07-28 19:55:27.000000000 +0000 466+++ ncurses-6.1-20200118/c++/cursesm.h 2020-01-18 17:02:13.000000000 +0000 467@@ -1,6 +1,6 @@ 468 // * This makes emacs happy -*-Mode: C++;-*- 469 /**************************************************************************** 470- * Copyright (c) 1998-2014,2019 Free Software Foundation, Inc. * 471+ * Copyright (c) 1998-2019,2020 Free Software Foundation, Inc. * 472 * * 473 * Permission is hereby granted, free of charge, to any person obtaining a * 474 * copy of this software and associated documentation files (the * 475@@ -31,7 +31,7 @@ 476 * Author: Juergen Pfeifer, 1997 * 477 ****************************************************************************/ 478 479-// $Id: cursesm.h,v 1.31 2019/07/28 19:55:27 tom Exp $ 480+// $Id: cursesm.h,v 1.32 2020/01/18 17:02:13 tom Exp $ 481 482 #ifndef NCURSES_CURSESM_H_incl 483 #define NCURSES_CURSESM_H_incl 1 484@@ -358,7 +358,7 @@ 485 flag ? OnError (::post_menu(menu)) : OnError (::unpost_menu (menu)); 486 } 487 488- // Get the numer of rows and columns for this menu 489+ // Get the number of rows and columns for this menu 490 inline void scale (int& mrows, int& mcols) const { 491 OnError (::scale_menu (menu, &mrows, &mcols)); 492 } 493Index: c++/cursesw.h 494Prereq: 1.54 495--- ncurses-6.1-20200111+/c++/cursesw.h 2019-07-28 19:55:27.000000000 +0000 496+++ ncurses-6.1-20200118/c++/cursesw.h 2020-01-18 17:02:13.000000000 +0000 497@@ -1,7 +1,7 @@ 498 // * This makes emacs happy -*-Mode: C++;-*- 499 // vile:cppmode 500 /**************************************************************************** 501- * Copyright (c) 1998-2017,2019 Free Software Foundation, Inc. * 502+ * Copyright (c) 1998-2019,2020 Free Software Foundation, Inc. * 503 * * 504 * Permission is hereby granted, free of charge, to any person obtaining a * 505 * copy of this software and associated documentation files (the * 506@@ -31,7 +31,7 @@ 507 #ifndef NCURSES_CURSESW_H_incl 508 #define NCURSES_CURSESW_H_incl 1 509 510-// $Id: cursesw.h,v 1.54 2019/07/28 19:55:27 tom Exp $ 511+// $Id: cursesw.h,v 1.55 2020/01/18 17:02:13 tom Exp $ 512 513 extern "C" { 514 # include <curses.h> 515@@ -1255,7 +1255,7 @@ 516 // Return TRUE if window is marked as changed, FALSE otherwise 517 518 int leaveok(bool bf) { return ::leaveok(w, bf); } 519- // If bf is TRUE, curses will leave the cursor after an update whereever 520+ // If bf is TRUE, curses will leave the cursor after an update wherever 521 // it is after the update. 522 523 int redrawln(int from, int n) { return ::wredrawln(w, from, n); } 524Index: dist.mk 525Prereq: 1.1324 526--- ncurses-6.1-20200111+/dist.mk 2020-01-11 10:59:50.000000000 +0000 527+++ ncurses-6.1-20200118/dist.mk 2020-01-18 10:27:03.000000000 +0000 528@@ -25,7 +25,7 @@ 529 # use or other dealings in this Software without prior written # 530 # authorization. # 531 ############################################################################## 532-# $Id: dist.mk,v 1.1324 2020/01/11 10:59:50 tom Exp $ 533+# $Id: dist.mk,v 1.1325 2020/01/18 10:27:03 tom Exp $ 534 # Makefile for creating ncurses distributions. 535 # 536 # This only needs to be used directly as a makefile by developers, but 537@@ -37,7 +37,7 @@ 538 # These define the major/minor/patch versions of ncurses. 539 NCURSES_MAJOR = 6 540 NCURSES_MINOR = 1 541-NCURSES_PATCH = 20200111 542+NCURSES_PATCH = 20200118 543 544 # We don't append the patch to the version, since this only applies to releases 545 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) 546Index: doc/html/ada/funcs/T.htm 547--- ncurses-6.1-20200111+/doc/html/ada/funcs/T.htm 2019-12-15 00:54:38.000000000 +0000 548+++ ncurses-6.1-20200118/doc/html/ada/funcs/T.htm 2020-01-19 02:05:15.000000000 +0000 549@@ -20,8 +20,8 @@ 550 <LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_89_16" TARGET="main">tgetnum</A> 551 <LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_108_16" TARGET="main">tgetstr - terminal_interface-curses-termcap.adb:108</A> 552 <LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_129_16" TARGET="main">tgetstr - terminal_interface-curses-termcap.adb:129</A> 553-<LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_151_16" TARGET="main">tgoto</A> 554 <LI><A HREF="../terminal_interface-curses-termcap__ads.htm#ref_53_13" TARGET="main">TGoto</A> 555+<LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_151_16" TARGET="main">tgoto</A> 556 <LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_69_16" TARGET="main">tigetflag</A> 557 <LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_87_16" TARGET="main">tigetstr - terminal_interface-curses-terminfo.adb:87</A> 558 <LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_108_16" TARGET="main">tigetstr - terminal_interface-curses-terminfo.adb:108</A> 559Index: doc/html/ada/terminal_interface-curses-forms-field_types-enumeration__ads.htm 560--- ncurses-6.1-20200111+/doc/html/ada/terminal_interface-curses-forms-field_types-enumeration__ads.htm 2019-03-16 19:34:48.000000000 +0000 561+++ ncurses-6.1-20200118/doc/html/ada/terminal_interface-curses-forms-field_types-enumeration__ads.htm 2020-01-19 02:05:15.000000000 +0000 562@@ -24,7 +24,7 @@ 563 <span class="comment"><EM>-- S P E C --</EM></span> 564 <span class="comment"><EM>-- --</EM></span> 565 <span class="comment"><EM>------------------------------------------------------------------------------</EM></span> 566-<span class="comment"><EM>-- Copyright (c) 1998-2009,2018 Free Software Foundation, Inc. --</EM></span> 567+<span class="comment"><EM>-- Copyright (c) 1998-2018,2020 Free Software Foundation, Inc. --</EM></span> 568 <span class="comment"><EM>-- --</EM></span> 569 <span class="comment"><EM>-- Permission is hereby granted, free of charge, to any person obtaining a --</EM></span> 570 <span class="comment"><EM>-- copy of this software and associated documentation files (the --</EM></span> 571@@ -52,7 +52,7 @@ 572 <span class="comment"><EM>------------------------------------------------------------------------------</EM></span> 573 <span class="comment"><EM>-- Author: Juergen Pfeifer, 1996</EM></span> 574 <span class="comment"><EM>-- Version Control:</EM></span> 575-<span class="comment"><EM>-- @Revision: 1.13 @</EM></span> 576+<span class="comment"><EM>-- @Revision: 1.14 @</EM></span> 577 <span class="comment"><EM>-- Binding Version 01.00</EM></span> 578 <span class="comment"><EM>------------------------------------------------------------------------------</EM></span> 579 <b>with</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.Strings; 580@@ -95,7 +95,7 @@ 581 <span class="comment"><EM>-- But we may want to release the field to release the memory allocated</EM></span> 582 <span class="comment"><EM>-- by it internally. After that the Enumeration field is no longer usable.</EM></span> 583 584- <span class="comment"><EM>-- The next type defintions are all ncurses extensions. They are typically</EM></span> 585+ <span class="comment"><EM>-- The next type definitions are all ncurses extensions. They are typically</EM></span> 586 <span class="comment"><EM>-- not available in other curses implementations.</EM></span> 587 588 <b>procedure</b> <span class="symbol"><A NAME="ref_84_14" HREF="terminal_interface-curses-forms-field_types-enumeration__adb.htm#ref_91_14">Set_Field_Type</A></span> (<span class="symbol"><A NAME="ref_84_30" HREF="terminal_interface-curses-forms-field_types-enumeration__adb.htm#ref_91_30">Fld</A></span> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_51_9">Field</A>; 589Index: doc/html/man/adacurses6-config.1.html 590--- ncurses-6.1-20200111+/doc/html/man/adacurses6-config.1.html 2019-12-15 00:54:32.000000000 +0000 591+++ ncurses-6.1-20200118/doc/html/man/adacurses6-config.1.html 2020-01-19 02:05:08.000000000 +0000 592@@ -125,7 +125,7 @@ 593 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 594 <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> 595 596- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191214). 597+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20200118). 598 599 600 601Index: doc/html/man/captoinfo.1m.html 602--- ncurses-6.1-20200111+/doc/html/man/captoinfo.1m.html 2019-12-15 00:54:32.000000000 +0000 603+++ ncurses-6.1-20200118/doc/html/man/captoinfo.1m.html 2020-01-19 02:05:08.000000000 +0000 604@@ -198,7 +198,7 @@ 605 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 606 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> 607 608- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191214). 609+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20200118). 610 611 612 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> 613Index: doc/html/man/clear.1.html 614--- ncurses-6.1-20200111+/doc/html/man/clear.1.html 2019-12-15 00:54:32.000000000 +0000 615+++ ncurses-6.1-20200118/doc/html/man/clear.1.html 2020-01-19 02:05:08.000000000 +0000 616@@ -148,7 +148,7 @@ 617 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 618 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> 619 620- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191214). 621+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20200118). 622 623 624 625Index: doc/html/man/curs_memleaks.3x.html 626--- ncurses-6.1-20200111+/doc/html/man/curs_memleaks.3x.html 2019-12-15 00:54:33.000000000 +0000 627+++ ncurses-6.1-20200118/doc/html/man/curs_memleaks.3x.html 2020-01-19 02:05:09.000000000 +0000 628@@ -26,7 +26,7 @@ 629 * sale, use or other dealings in this Software without prior written * 630 * authorization. * 631 **************************************************************************** 632- * @Id: curs_memleaks.3x,v 1.6 2017/08/22 08:35:37 Sven.Joachim Exp @ 633+ * @Id: curs_memleaks.3x,v 1.7 2019/12/14 23:21:32 tom Exp @ 634 --> 635 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> 636 <HTML> 637Index: doc/html/man/curs_slk.3x.html 638--- ncurses-6.1-20200111+/doc/html/man/curs_slk.3x.html 2019-03-16 19:34:44.000000000 +0000 639+++ ncurses-6.1-20200118/doc/html/man/curs_slk.3x.html 2020-01-19 02:05:10.000000000 +0000 640@@ -1,6 +1,6 @@ 641 <!-- 642 **************************************************************************** 643- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * 644+ * Copyright (c) 1998-2018,2020 Free Software Foundation, Inc. * 645 * * 646 * Permission is hereby granted, free of charge, to any person obtaining a * 647 * copy of this software and associated documentation files (the * 648@@ -26,7 +26,7 @@ 649 * sale, use or other dealings in this Software without prior written * 650 * authorization. * 651 **************************************************************************** 652- * @Id: curs_slk.3x,v 1.34 2018/07/28 22:20:54 tom Exp @ 653+ * @Id: curs_slk.3x,v 1.35 2020/01/18 22:49:38 tom Exp @ 654 --> 655 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> 656 <HTML> 657@@ -203,6 +203,31 @@ 658 or if memory for the labels cannot be allocated. 659 660 661+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE> 662+ SVr3 introduced these functions: 663+ slk_clear 664+ slk_init 665+ slk_label 666+ slk_noutrefresh 667+ slk_refresh 668+ slk_restore 669+ slk_set 670+ slk_touch 671+ 672+ SVr4 added these functions: 673+ slk_attroff 674+ slk_attron 675+ slk_attrset 676+ slk_start 677+ 678+ X/Open Curses added these: 679+ slk_attr_off 680+ slk_attr_on 681+ slk_attr_set 682+ slk_color 683+ slk_wset 684+ 685+ 686 </PRE><H2><a name="h2-EXTENSIONS">EXTENSIONS</a></H2><PRE> 687 X/Open Curses documents the <EM>opts</EM> argument as reserved for future use, 688 saying that it must be null. This implementation uses that parameter 689@@ -270,6 +295,7 @@ 690 </ul> 691 </li> 692 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li> 693+<li><a href="#h2-HISTORY">HISTORY</a></li> 694 <li><a href="#h2-EXTENSIONS">EXTENSIONS</a></li> 695 <li><a href="#h2-NOTES">NOTES</a></li> 696 <li><a href="#h2-PORTABILITY">PORTABILITY</a></li> 697Index: doc/html/man/curs_terminfo.3x.html 698--- ncurses-6.1-20200111+/doc/html/man/curs_terminfo.3x.html 2019-03-16 19:34:44.000000000 +0000 699+++ ncurses-6.1-20200118/doc/html/man/curs_terminfo.3x.html 2020-01-19 02:05:10.000000000 +0000 700@@ -1,6 +1,6 @@ 701 <!-- 702 **************************************************************************** 703- * Copyright (c) 1999-2017,2018 Free Software Foundation, Inc. * 704+ * Copyright (c) 1999-2018,2020 Free Software Foundation, Inc. * 705 * * 706 * Permission is hereby granted, free of charge, to any person obtaining a * 707 * copy of this software and associated documentation files (the * 708@@ -26,7 +26,7 @@ 709 * sale, use or other dealings in this Software without prior written * 710 * authorization. * 711 **************************************************************************** 712- * @Id: curs_terminfo.3x,v 1.60 2018/07/28 22:08:59 tom Exp @ 713+ * @Id: curs_terminfo.3x,v 1.63 2020/01/18 23:55:46 tom Exp @ 714 * *************************************************************************** 715 * *************************************************************************** 716 * *************************************************************************** 717@@ -364,20 +364,97 @@ 718 value of the output function <EM>putc</EM>. 719 720 721+</PRE><H2><a name="h2-HISTORY">HISTORY</a></H2><PRE> 722+ SVr2 introduced the terminfo feature. Its programming manual mentioned 723+ these low-level functions: 724+ 725+ <STRONG>Function</STRONG> <STRONG>Description</STRONG> 726+ ------------------------------------------------------------ 727+ fixterm restore tty to "in curses" state 728+ gettmode establish current tty modes 729+ mvcur low level cursor motion 730+ putp utility function that uses <STRONG>tputs</STRONG> to send char- 731+ acters via <STRONG>putchar</STRONG>. 732+ resetterm set tty modes to "out of curses" state 733+ resetty reset tty flags to stored value 734+ saveterm save current modes as "in curses" state 735+ savetty store current tty flags 736+ setterm establish terminal with given type 737+ setupterm establish terminal with given type 738+ tparm instantiate a string expression with parameters 739+ tputs apply padding information to a string 740+ vidattr like <STRONG>vidputs</STRONG>, but outputs through <STRONG>putchar</STRONG> 741+ vidputs output a string to put terminal in a specified 742+ video attribute mode 743+ 744+ The programming manual also mentioned functions provided for termcap 745+ compatibility (commenting that they "may go away at a later date"): 746+ 747+ <STRONG>Function</STRONG> <STRONG>Description</STRONG> 748+ ------------------------------------------------ 749+ tgetent look up termcap entry for given <EM>name</EM> 750+ tgetflag get boolean entry for given <EM>id</EM> 751+ tgetnum get numeric entry for given <EM>id</EM> 752+ tgetstr get string entry for given <EM>id</EM> 753+ tgoto apply parameters to given capability 754+ tputs apply padding to capability, calling 755+ a function to put characters 756+ 757+ Early terminfo programs obtained capability values from the <STRONG>TERMINAL</STRONG> 758+ structure initialized by <STRONG>setupterm</STRONG>. 759+ 760+ SVr3 extended terminfo by adding functions to retrieve capability val- 761+ ues (like the termcap interface), and reusing tgoto and tputs: 762+ 763+ <STRONG>Function</STRONG> <STRONG>Description</STRONG> 764+ ------------------------------------------- 765+ tigetflag get boolean entry for given <EM>id</EM> 766+ tigetnum get numeric entry for given <EM>id</EM> 767+ tigetstr get string entry for given <EM>id</EM> 768+ 769+ SVr3 also replaced several of the SVr2 terminfo functions which had no 770+ counterpart in the termcap interface, documenting them as obsolete: 771+ 772+ <STRONG>Function</STRONG> <STRONG>Replaced</STRONG> <STRONG>by</STRONG> 773+ ----------------------------- 774+ crmode cbreak 775+ fixterm reset_prog_mode 776+ gettmode N/A 777+ nocrmode nocbreak 778+ resetterm reset_shell_mode 779+ saveterm def_prog_mode 780+ setterm setupterm 781+ 782+ SVr3 kept the <STRONG>mvcur</STRONG>, <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG> functions, along with <STRONG>putp</STRONG>, 783+ <STRONG>tparm</STRONG> and <STRONG>tputs</STRONG>. The latter were needed to support padding, and han- 784+ dling functions such as <STRONG>vidattr</STRONG> (which used more than the two parame- 785+ ters supported by <STRONG>tgoto</STRONG>). 786+ 787+ SVr3 introduced the functions for switching between terminal descrip- 788+ tions, e.g., <STRONG>set_curterm</STRONG>. The various global variables such as <STRONG>bool-</STRONG> 789+ <STRONG>names</STRONG> were mentioned in the programming manual at this point. 790+ 791+ SVr4 added the <STRONG>vid_attr</STRONG> and <STRONG>vid_puts</STRONG> functions. 792+ 793+ There are other low-level functions declared in the curses header files 794+ on Unix systems, but none were documented. The functions marked "obso- 795+ lete" remained in use by the Unix <STRONG>vi</STRONG> editor. 796+ 797+ 798 </PRE><H2><a name="h2-PORTABILITY">PORTABILITY</a></H2><PRE> 799 800 </PRE><H3><a name="h3-Legacy-functions">Legacy functions</a></H3><PRE> 801 X/Open notes that <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG> may be macros. 802 803- The function <STRONG>setterm</STRONG> is not described by X/Open and must be considered 804+ The function <STRONG>setterm</STRONG> is not described by X/Open and must be considered 805 non-portable. All other functions are as described by X/Open. 806 807 808 </PRE><H3><a name="h3-Legacy-data">Legacy data</a></H3><PRE> 809- <STRONG>setupterm</STRONG> copies the terminal name to the array <STRONG>ttytype</STRONG>. This is not 810+ <STRONG>setupterm</STRONG> copies the terminal name to the array <STRONG>ttytype</STRONG>. This is not 811 part of X/Open Curses, but is assumed by some applications. 812 813- Other implementions may not declare the capability name arrays. Some 814+ Other implementions may not declare the capability name arrays. Some 815 provide them without declaring them. X/Open does not specify them. 816 817 Extended terminal capability names, e.g., as defined by <STRONG>tic</STRONG> <STRONG>-x</STRONG>, are not 818@@ -385,14 +462,14 @@ 819 820 821 </PRE><H3><a name="h3-Output-buffering">Output buffering</a></H3><PRE> 822- Older versions of <STRONG>ncurses</STRONG> assumed that the file descriptor passed to 823+ Older versions of <STRONG>ncurses</STRONG> assumed that the file descriptor passed to 824 <STRONG>setupterm</STRONG> from <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG> uses buffered I/O, and would write to 825- the corresponding stream. In addition to the limitation that the ter- 826- minal was left in block-buffered mode on exit (like System V curses), 827- it was problematic because <STRONG>ncurses</STRONG> did not allow a reliable way to 828+ the corresponding stream. In addition to the limitation that the ter- 829+ minal was left in block-buffered mode on exit (like System V curses), 830+ it was problematic because <STRONG>ncurses</STRONG> did not allow a reliable way to 831 cleanup on receiving SIGTSTP. 832 833- The current version (ncurses6) uses output buffers managed directly by 834+ The current version (ncurses6) uses output buffers managed directly by 835 <STRONG>ncurses</STRONG>. Some of the low-level functions described in this manual page 836 write to the standard output. They are not signal-safe. The high-lev- 837 el functions in <STRONG>ncurses</STRONG> use alternate versions of these functions using 838@@ -401,69 +478,69 @@ 839 840 </PRE><H3><a name="h3-Function-prototypes">Function prototypes</a></H3><PRE> 841 The X/Open Curses prototypes are based on the SVr4 curses header decla- 842- rations, which were defined at the same time the C language was first 843+ rations, which were defined at the same time the C language was first 844 standardized in the late 1980s. 845 846- <STRONG>o</STRONG> X/Open Curses uses <STRONG>const</STRONG> less effectively than a later design 847- might, in some cases applying it needlessly to values are already 848- constant, and in most cases overlooking parameters which normally 849- would use <STRONG>const</STRONG>. Using constant parameters for functions which do 850+ <STRONG>o</STRONG> X/Open Curses uses <STRONG>const</STRONG> less effectively than a later design 851+ might, in some cases applying it needlessly to values are already 852+ constant, and in most cases overlooking parameters which normally 853+ would use <STRONG>const</STRONG>. Using constant parameters for functions which do 854 not use <STRONG>const</STRONG> may prevent the program from compiling. On the other 855 hand, <EM>writable</EM> <EM>strings</EM> are an obsolescent feature. 856 857- As an extension, this implementation can be configured to change 858- the function prototypes to use the <STRONG>const</STRONG> keyword. The ncurses ABI 859+ As an extension, this implementation can be configured to change 860+ the function prototypes to use the <STRONG>const</STRONG> keyword. The ncurses ABI 861 6 enables this feature by default. 862 863- <STRONG>o</STRONG> X/Open Curses prototypes <STRONG>tparm</STRONG> with a fixed number of parameters, 864+ <STRONG>o</STRONG> X/Open Curses prototypes <STRONG>tparm</STRONG> with a fixed number of parameters, 865 rather than a variable argument list. 866 867- This implementation uses a variable argument list, but can be con- 868- figured to use the fixed-parameter list. Portable applications 869- should provide 9 parameters after the format; zeroes are fine for 870+ This implementation uses a variable argument list, but can be con- 871+ figured to use the fixed-parameter list. Portable applications 872+ should provide 9 parameters after the format; zeroes are fine for 873 this purpose. 874 875- In response to review comments by Thomas E. Dickey, X/Open Curses 876+ In response to review comments by Thomas E. Dickey, X/Open Curses 877 Issue 7 proposed the <STRONG>tiparm</STRONG> function in mid-2009. 878 879 880 </PRE><H3><a name="h3-Special-TERM-treatment">Special TERM treatment</a></H3><PRE> 881 If configured to use the terminal-driver, e.g., for the MinGW port, 882 883- <STRONG>o</STRONG> <STRONG>setupterm</STRONG> interprets a missing/empty TERM variable as the special 884+ <STRONG>o</STRONG> <STRONG>setupterm</STRONG> interprets a missing/empty TERM variable as the special 885 value "unknown". 886 887- <STRONG>o</STRONG> <STRONG>setupterm</STRONG> allows explicit use of the the windows console driver by 888- checking if $TERM is set to "#win32con" or an abbreviation of that 889+ <STRONG>o</STRONG> <STRONG>setupterm</STRONG> allows explicit use of the the windows console driver by 890+ checking if $TERM is set to "#win32con" or an abbreviation of that 891 string. 892 893 894 </PRE><H3><a name="h3-Other-portability-issues">Other portability issues</a></H3><PRE> 895- In System V Release 4, <STRONG>set_curterm</STRONG> has an <STRONG>int</STRONG> return type and returns 896+ In System V Release 4, <STRONG>set_curterm</STRONG> has an <STRONG>int</STRONG> return type and returns 897 <STRONG>OK</STRONG> or <STRONG>ERR</STRONG>. We have chosen to implement the X/Open Curses semantics. 898 899- In System V Release 4, the third argument of <STRONG>tputs</STRONG> has the type <STRONG>int</STRONG> 900+ In System V Release 4, the third argument of <STRONG>tputs</STRONG> has the type <STRONG>int</STRONG> 901 <STRONG>(*putc)(char)</STRONG>. 902 903- At least one implementation of X/Open Curses (Solaris) returns a value 904- other than <STRONG>OK</STRONG>/<STRONG>ERR</STRONG> from <STRONG>tputs</STRONG>. That returns the length of the string, 905+ At least one implementation of X/Open Curses (Solaris) returns a value 906+ other than <STRONG>OK</STRONG>/<STRONG>ERR</STRONG> from <STRONG>tputs</STRONG>. That returns the length of the string, 907 and does no error-checking. 908 909- X/Open notes that after calling <STRONG>mvcur</STRONG>, the curses state may not match 910+ X/Open notes that after calling <STRONG>mvcur</STRONG>, the curses state may not match 911 the actual terminal state, and that an application should touch and re- 912 fresh the window before resuming normal curses calls. Both <STRONG>ncurses</STRONG> and 913- System V Release 4 curses implement <STRONG>mvcur</STRONG> using the SCREEN data allo- 914- cated in either <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>. So though it is documented as a 915- terminfo function, <STRONG>mvcur</STRONG> is really a curses function which is not well 916+ System V Release 4 curses implement <STRONG>mvcur</STRONG> using the SCREEN data allo- 917+ cated in either <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>. So though it is documented as a 918+ terminfo function, <STRONG>mvcur</STRONG> is really a curses function which is not well 919 specified. 920 921- X/Open states that the old location must be given for <STRONG>mvcur</STRONG>. This im- 922- plementation allows the caller to use -1's for the old ordinates. In 923+ X/Open states that the old location must be given for <STRONG>mvcur</STRONG>. This im- 924+ plementation allows the caller to use -1's for the old ordinates. In 925 that case, the old location is unknown. 926 927 928 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 929- <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>, <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, 930+ <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>, <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>, 931 <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG>putc(3)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> 932 933 934@@ -485,6 +562,7 @@ 935 </ul> 936 </li> 937 <li><a href="#h2-RETURN-VALUE">RETURN VALUE</a></li> 938+<li><a href="#h2-HISTORY">HISTORY</a></li> 939 <li><a href="#h2-PORTABILITY">PORTABILITY</a> 940 <ul> 941 <li><a href="#h3-Legacy-functions">Legacy functions</a></li> 942Index: doc/html/man/form.3x.html 943--- ncurses-6.1-20200111+/doc/html/man/form.3x.html 2019-12-15 00:54:34.000000000 +0000 944+++ ncurses-6.1-20200118/doc/html/man/form.3x.html 2020-01-19 02:05:11.000000000 +0000 945@@ -246,7 +246,7 @@ 946 <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "form_" for detailed 947 descriptions of the entry points. 948 949- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191214). 950+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20200118). 951 952 953 954Index: doc/html/man/infocmp.1m.html 955--- ncurses-6.1-20200111+/doc/html/man/infocmp.1m.html 2019-12-15 00:54:35.000000000 +0000 956+++ ncurses-6.1-20200118/doc/html/man/infocmp.1m.html 2020-01-19 02:05:12.000000000 +0000 957@@ -512,7 +512,7 @@ 958 959 https://invisible-island.net/ncurses/tctest.html 960 961- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191214). 962+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20200118). 963 964 965 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> 966Index: doc/html/man/infotocap.1m.html 967--- ncurses-6.1-20200111+/doc/html/man/infotocap.1m.html 2019-12-15 00:54:35.000000000 +0000 968+++ ncurses-6.1-20200118/doc/html/man/infotocap.1m.html 2020-01-19 02:05:12.000000000 +0000 969@@ -90,7 +90,7 @@ 970 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 971 <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> 972 973- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191214). 974+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20200118). 975 976 977 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> 978Index: doc/html/man/menu.3x.html 979--- ncurses-6.1-20200111+/doc/html/man/menu.3x.html 2019-12-15 00:54:35.000000000 +0000 980+++ ncurses-6.1-20200118/doc/html/man/menu.3x.html 2020-01-19 02:05:12.000000000 +0000 981@@ -221,7 +221,7 @@ 982 <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "menu_" for detailed 983 descriptions of the entry points. 984 985- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191214). 986+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20200118). 987 988 989 990Index: doc/html/man/ncurses.3x.html 991--- ncurses-6.1-20200111+/doc/html/man/ncurses.3x.html 2019-12-15 00:54:36.000000000 +0000 992+++ ncurses-6.1-20200118/doc/html/man/ncurses.3x.html 2020-01-19 02:05:13.000000000 +0000 993@@ -59,7 +59,7 @@ 994 method of updating character screens with reasonable optimization. 995 This implementation is "new curses" (ncurses) and is the approved 996 replacement for 4.4BSD classic curses, which has been discontinued. 997- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191214). 998+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20200118). 999 1000 The <STRONG>ncurses</STRONG> library emulates the curses library of System V Release 4 1001 UNIX, and XPG4 (X/Open Portability Guide) curses (also known as XSI 1002Index: doc/html/man/ncurses6-config.1.html 1003--- ncurses-6.1-20200111+/doc/html/man/ncurses6-config.1.html 2019-12-15 00:54:36.000000000 +0000 1004+++ ncurses-6.1-20200118/doc/html/man/ncurses6-config.1.html 2020-01-19 02:05:13.000000000 +0000 1005@@ -112,7 +112,7 @@ 1006 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 1007 <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> 1008 1009- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191214). 1010+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20200118). 1011 1012 1013 1014Index: doc/html/man/panel.3x.html 1015--- ncurses-6.1-20200111+/doc/html/man/panel.3x.html 2019-12-15 00:54:36.000000000 +0000 1016+++ ncurses-6.1-20200118/doc/html/man/panel.3x.html 2020-01-19 02:05:13.000000000 +0000 1017@@ -204,7 +204,7 @@ 1018 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 1019 <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, 1020 1021- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191214). 1022+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20200118). 1023 1024 1025 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> 1026Index: doc/html/man/tabs.1.html 1027--- ncurses-6.1-20200111+/doc/html/man/tabs.1.html 2019-12-15 00:54:36.000000000 +0000 1028+++ ncurses-6.1-20200118/doc/html/man/tabs.1.html 2020-01-19 02:05:13.000000000 +0000 1029@@ -205,7 +205,7 @@ 1030 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 1031 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. 1032 1033- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191214). 1034+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20200118). 1035 1036 1037 1038Index: doc/html/man/terminfo.5.html 1039--- ncurses-6.1-20200111+/doc/html/man/terminfo.5.html 2019-12-15 00:54:36.000000000 +0000 1040+++ ncurses-6.1-20200118/doc/html/man/terminfo.5.html 2020-01-19 02:05:13.000000000 +0000 1041@@ -103,7 +103,7 @@ 1042 have, by specifying how to perform screen operations, and by specifying 1043 padding requirements and initialization sequences. 1044 1045- This manual describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191214). 1046+ This manual describes <STRONG>ncurses</STRONG> version 6.1 (patch 20200118). 1047 1048 1049 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE> 1050Index: doc/html/man/tic.1m.html 1051--- ncurses-6.1-20200111+/doc/html/man/tic.1m.html 2019-12-15 00:54:37.000000000 +0000 1052+++ ncurses-6.1-20200118/doc/html/man/tic.1m.html 2020-01-19 02:05:13.000000000 +0000 1053@@ -460,7 +460,7 @@ 1054 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, 1055 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>. <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>. 1056 1057- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191214). 1058+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20200118). 1059 1060 1061 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> 1062Index: doc/html/man/toe.1m.html 1063--- ncurses-6.1-20200111+/doc/html/man/toe.1m.html 2019-12-15 00:54:37.000000000 +0000 1064+++ ncurses-6.1-20200118/doc/html/man/toe.1m.html 2020-01-19 02:05:13.000000000 +0000 1065@@ -170,7 +170,7 @@ 1066 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG>ter-</STRONG> 1067 <STRONG><A HREF="terminfo.5.html">minfo(5)</A></STRONG>. 1068 1069- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191214). 1070+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20200118). 1071 1072 1073 1074Index: doc/html/man/tput.1.html 1075--- ncurses-6.1-20200111+/doc/html/man/tput.1.html 2019-12-15 00:54:37.000000000 +0000 1076+++ ncurses-6.1-20200118/doc/html/man/tput.1.html 2020-01-19 02:05:13.000000000 +0000 1077@@ -522,7 +522,7 @@ 1078 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 1079 <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>. 1080 1081- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191214). 1082+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20200118). 1083 1084 1085 1086Index: doc/html/man/tset.1.html 1087--- ncurses-6.1-20200111+/doc/html/man/tset.1.html 2019-12-15 00:54:37.000000000 +0000 1088+++ ncurses-6.1-20200118/doc/html/man/tset.1.html 2020-01-19 02:05:13.000000000 +0000 1089@@ -389,7 +389,7 @@ 1090 <STRONG>csh(1)</STRONG>, <STRONG>sh(1)</STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG>tty(4)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, 1091 <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG> 1092 1093- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20191214). 1094+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20200118). 1095 1096 1097 1098Index: doc/html/man/user_caps.5.html 1099--- ncurses-6.1-20200111+/doc/html/man/user_caps.5.html 2019-06-15 23:31:12.000000000 +0000 1100+++ ncurses-6.1-20200118/doc/html/man/user_caps.5.html 2020-01-19 02:05:13.000000000 +0000 1101@@ -1,6 +1,6 @@ 1102 <!-- 1103 **************************************************************************** 1104- * Copyright (c) 2017-2018,2019 Free Software Foundation, Inc. * 1105+ * Copyright (c) 2017-2019,2020 Free Software Foundation, Inc. * 1106 * * 1107 * Permission is hereby granted, free of charge, to any person obtaining a * 1108 * copy of this software and associated documentation files (the * 1109@@ -26,7 +26,7 @@ 1110 * sale, use or other dealings in this Software without prior written * 1111 * authorization. * 1112 **************************************************************************** 1113- * @Id: user_caps.5,v 1.10 2019/05/18 22:48:40 tom Exp @ 1114+ * @Id: user_caps.5,v 1.11 2020/01/19 02:01:39 tom Exp @ 1115 --> 1116 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> 1117 <HTML> 1118@@ -237,6 +237,72 @@ 1119 XM <EM>string</EM>, override ncurses's built-in string which enables/disables 1120 <STRONG>xterm</STRONG> mouse mode. 1121 1122+ ncurses sends a character sequence to the terminal to initialize 1123+ mouse mode, and when the user clicks the mouse buttons or (in 1124+ certain modes) moves the mouse, handles the characters sent back 1125+ by the terminal to tell it what was done with the mouse. 1126+ 1127+ The mouse protocol is enabled when the <EM>mask</EM> passed in the <STRONG>mouse-</STRONG> 1128+ <STRONG>mask</STRONG> function is nonzero. By default, ncurses handles the 1129+ responses for the X11 xterm mouse protocol. It also knows about 1130+ the <EM>SGR</EM> <EM>1006</EM> xterm mouse protocol, but must to be told to look 1131+ for this specifically. It will not be able to guess which mode 1132+ is used, because the responses are enough alike that only confu- 1133+ sion would result. 1134+ 1135+ The <STRONG>XM</STRONG> capability has a single parameter. If nonzero, the mouse 1136+ protocol should be enabled. If zero, the mouse protocol should 1137+ be disabled. ncurses inspects this capability if it is present, 1138+ to see whether the 1006 protocol is used. If so, it expects the 1139+ responses to use the <EM>SGR</EM> <EM>1006</EM> xterm mouse protocol. 1140+ 1141+ The xterm mouse protocol is used by other terminal emulators. 1142+ The terminal database uses building-blocks for the various xterm 1143+ mouse protocols which can be used in customized terminal descrip- 1144+ tions. 1145+ 1146+ The terminal database building blocks for this mouse feature also 1147+ have an experimental capability <EM>xm</EM>. The "xm" capability 1148+ describes the mouse response. Currently there is no interpreter 1149+ which would use this information to make the mouse support com- 1150+ pletely data-driven. 1151+ 1152+ <EM>xm</EM> shows the format of the mouse responses. In this experimental 1153+ capability, the parameters are 1154+ 1155+ <EM>p1</EM> y-ordinate 1156+ 1157+ <EM>p2</EM> x-ordinate 1158+ 1159+ <EM>p3</EM> button 1160+ 1161+ <EM>p4</EM> state, e.g., pressed or released 1162+ 1163+ <EM>p5</EM> y-ordinate starting region 1164+ 1165+ <EM>p6</EM> x-ordinate starting region 1166+ 1167+ <EM>p7</EM> y-ordinate ending region 1168+ 1169+ <EM>p8</EM> x-ordinate ending region 1170+ 1171+ Here are examples from the terminal database for the most com- 1172+ monly used xterm mouse protocols: 1173+ 1174+ xterm+x11mouse|X11 xterm mouse protocol, 1175+ kmous=\E[M, XM=\E[?1000%?%p1%{1}%=%th%el%;, 1176+ xm=\E[M 1177+ %?%p4%t%p3%e%{3}%;%' '%+%c 1178+ %p2%'!'%+%c 1179+ %p1%'!'%+%c, 1180+ 1181+ xterm+sm+1006|xterm SGR-mouse, 1182+ kmous=\E[<, XM=\E[?1006;1000%?%p1%{1}%=%th%el%;, 1183+ xm=\E[<%i%p3%d; 1184+ %p1%d; 1185+ %p2%d; 1186+ %?%p4%tM%em%;, 1187+ 1188 1189 </PRE><H3><a name="h3-Extended-key-definitions">Extended key-definitions</a></H3><PRE> 1190 Several terminals provide the ability to send distinct strings for com- 1191Index: form/frm_post.c 1192Prereq: 1.11 1193--- ncurses-6.1-20200111+/form/frm_post.c 2012-06-10 00:27:49.000000000 +0000 1194+++ ncurses-6.1-20200118/form/frm_post.c 2020-01-18 17:05:03.000000000 +0000 1195@@ -1,5 +1,5 @@ 1196 /**************************************************************************** 1197- * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * 1198+ * Copyright (c) 1998-2012,2020 Free Software Foundation, Inc. * 1199 * * 1200 * Permission is hereby granted, free of charge, to any person obtaining a * 1201 * copy of this software and associated documentation files (the * 1202@@ -32,12 +32,12 @@ 1203 1204 #include "form.priv.h" 1205 1206-MODULE_ID("$Id: frm_post.c,v 1.11 2012/06/10 00:27:49 tom Exp $") 1207+MODULE_ID("$Id: frm_post.c,v 1.12 2020/01/18 17:05:03 tom Exp $") 1208 1209 /*--------------------------------------------------------------------------- 1210-| Facility : libnform 1211+| Facility : libnform 1212 | Function : int post_form(FORM * form) 1213-| 1214+| 1215 | Description : Writes the form into its associated subwindow. 1216 | 1217 | Return Values : E_OK - success 1218@@ -69,7 +69,7 @@ 1219 if ((form->cols > getmaxx(formwin)) || (form->rows > getmaxy(formwin))) 1220 RETURN(E_NO_ROOM); 1221 1222- /* reset form->curpage to an invald value. This forces Set_Form_Page 1223+ /* reset form->curpage to an invalid value. This forces Set_Form_Page 1224 to do the page initialization which is required by post_form. 1225 */ 1226 page = form->curpage; 1227@@ -87,9 +87,9 @@ 1228 } 1229 1230 /*--------------------------------------------------------------------------- 1231-| Facility : libnform 1232+| Facility : libnform 1233 | Function : int unpost_form(FORM * form) 1234-| 1235+| 1236 | Description : Erase form from its associated subwindow. 1237 | 1238 | Return Values : E_OK - success 1239Index: form/fty_generic.c 1240Prereq: 1.8 1241--- ncurses-6.1-20200111+/form/fty_generic.c 2018-12-16 00:14:02.000000000 +0000 1242+++ ncurses-6.1-20200118/form/fty_generic.c 2020-01-18 17:08:04.000000000 +0000 1243@@ -1,5 +1,5 @@ 1244 /**************************************************************************** 1245- * Copyright (c) 2008-2016,2018 Free Software Foundation, Inc. * 1246+ * Copyright (c) 2008-2018,2020 Free Software Foundation, Inc. * 1247 * * 1248 * Permission is hereby granted, free of charge, to any person obtaining a * 1249 * copy of this software and associated documentation files (the * 1250@@ -34,7 +34,7 @@ 1251 1252 #include "form.priv.h" 1253 1254-MODULE_ID("$Id: fty_generic.c,v 1.8 2018/12/16 00:14:02 tom Exp $") 1255+MODULE_ID("$Id: fty_generic.c,v 1.9 2020/01/18 17:08:04 tom Exp $") 1256 1257 /* 1258 * This is not a full implementation of a field type, but adds some 1259@@ -55,15 +55,15 @@ 1260 * fieldtype they register with the forms library using this call. 1261 * 1262 * For that purpose we have extended the fieldtype struc by a new element 1263- * that gets the arguments from a single struct passed by the caller. 1264- * 1265+ * that gets the arguments from a single struct passed by the caller. 1266+ * 1267 */ 1268 #if NCURSES_INTEROP_FUNCS 1269 1270 /*--------------------------------------------------------------------------- 1271-| Facility : libnform 1272+| Facility : libnform 1273 | Function : static void *Generic_This_Type( void * arg ) 1274-| 1275+| 1276 | Description : We interpret the passed arg just as a handle the 1277 | calling language uses to keep track of its allocated 1278 | argument structures. We can simply copy it back. 1279@@ -89,7 +89,7 @@ 1280 | write a field_check and a char_check function and give 1281 | them as input to this call. A callback to allow the 1282 | release of the allocated memory must also be provided. 1283-| For generic field types, we provide some more 1284+| For generic field types, we provide some more 1285 | information about the field as parameters. 1286 | 1287 | If an error occurs, errno is set to 1288@@ -145,16 +145,16 @@ 1289 } 1290 1291 /*--------------------------------------------------------------------------- 1292-| Facility : libnform 1293+| Facility : libnform 1294 | Function : static TypeArgument *GenericArgument( 1295 | const FIELDTYPE* typ, 1296 | int (*argiterator)(void**), 1297 | int* err) 1298-| 1299+| 1300 | Description : The iterator callback must browse through all fieldtype 1301 | parameters that have an argument associated with the 1302 | type. The iterator returns 1 if the operation to get 1303-| the next element was successfull, 0 otherwise. If the 1304+| the next element was successful, 0 otherwise. If the 1305 | iterator could move to the next argument, it fills 1306 | the void* pointer representing the argument into the 1307 | location provided as argument to the iterator. 1308@@ -206,14 +206,14 @@ 1309 } 1310 1311 /*--------------------------------------------------------------------------- 1312-| Facility : libnform 1313+| Facility : libnform 1314 | Function : int _nc_set_generic_fieldtype( 1315 | FIELD* field, 1316 | FIELDTYPE* ftyp, 1317 | int (*argiterator)(void**)) 1318-| 1319+| 1320 | Description : Assign the fieldtype to the field and use the iterator 1321-| mechanism to get the arguments when a check is 1322+| mechanism to get the arguments when a check is 1323 | performed. 1324 | 1325 | Return Values : E_OK if all went well 1326@@ -264,11 +264,11 @@ 1327 } 1328 1329 /*--------------------------------------------------------------------------- 1330-| Facility : libnform 1331+| Facility : libnform 1332 | Function : WINDOW* _nc_form_cursor( 1333 | FORM* form, 1334 | int *pRow, int *pCol) 1335-| 1336+| 1337 | Description : Get the current position of the form cursor position 1338 | We also return the field window 1339 | 1340Index: man/curs_slk.3x 1341Prereq: 1.34 1342--- ncurses-6.1-20200111+/man/curs_slk.3x 2018-07-28 22:20:54.000000000 +0000 1343+++ ncurses-6.1-20200118/man/curs_slk.3x 2020-01-18 22:49:38.000000000 +0000 1344@@ -1,5 +1,5 @@ 1345 .\"*************************************************************************** 1346-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * 1347+.\" Copyright (c) 1998-2018,2020 Free Software Foundation, Inc. * 1348 .\" * 1349 .\" Permission is hereby granted, free of charge, to any person obtaining a * 1350 .\" copy of this software and associated documentation files (the * 1351@@ -26,7 +26,7 @@ 1352 .\" authorization. * 1353 .\"*************************************************************************** 1354 .\" 1355-.\" $Id: curs_slk.3x,v 1.34 2018/07/28 22:20:54 tom Exp $ 1356+.\" $Id: curs_slk.3x,v 1.35 2020/01/18 22:49:38 tom Exp $ 1357 .TH curs_slk 3X "" 1358 .de bP 1359 .ie n .IP \(bu 4 1360@@ -242,6 +242,29 @@ 1361 if the format parameter is outside the range 0..2, or if 1362 memory for the labels cannot be allocated. 1363 .RE 1364+.SH HISTORY 1365+SVr3 introduced these functions: 1366+ slk_clear 1367+ slk_init 1368+ slk_label 1369+ slk_noutrefresh 1370+ slk_refresh 1371+ slk_restore 1372+ slk_set 1373+ slk_touch 1374+.PP 1375+SVr4 added these functions: 1376+ slk_attroff 1377+ slk_attron 1378+ slk_attrset 1379+ slk_start 1380+.PP 1381+X/Open Curses added these: 1382+ slk_attr_off 1383+ slk_attr_on 1384+ slk_attr_set 1385+ slk_color 1386+ slk_wset 1387 .SH EXTENSIONS 1388 .PP 1389 X/Open Curses documents the \fIopts\fP argument as reserved for future use, 1390Index: man/curs_terminfo.3x 1391Prereq: 1.60 1392--- ncurses-6.1-20200111+/man/curs_terminfo.3x 2018-07-28 22:08:59.000000000 +0000 1393+++ ncurses-6.1-20200118/man/curs_terminfo.3x 2020-01-18 23:55:46.000000000 +0000 1394@@ -1,5 +1,5 @@ 1395 .\"*************************************************************************** 1396-.\" Copyright (c) 1999-2017,2018 Free Software Foundation, Inc. * 1397+.\" Copyright (c) 1999-2018,2020 Free Software Foundation, Inc. * 1398 .\" * 1399 .\" Permission is hereby granted, free of charge, to any person obtaining a * 1400 .\" copy of this software and associated documentation files (the * 1401@@ -26,7 +26,7 @@ 1402 .\" authorization. * 1403 .\"*************************************************************************** 1404 .\" 1405-.\" $Id: curs_terminfo.3x,v 1.60 2018/07/28 22:08:59 tom Exp $ 1406+.\" $Id: curs_terminfo.3x,v 1.63 2020/01/18 23:55:46 tom Exp $ 1407 .TH curs_terminfo 3X "" 1408 .ie \n(.g .ds `` \(lq 1409 .el .ds `` `` 1410@@ -432,6 +432,104 @@ 1411 X/Open states that \fBtputs\fP ignores the return value 1412 of the output function \fIputc\fP. 1413 .RE 1414+.SH HISTORY 1415+.PP 1416+SVr2 introduced the terminfo feature. 1417+Its programming manual mentioned these low-level functions: 1418+.TS 1419+l l 1420+_ _ 1421+l l. 1422+\fBFunction\fR \fBDescription\fR 1423+fixterm restore tty to \*(``in curses\*('' state 1424+gettmode establish current tty modes 1425+mvcur low level cursor motion 1426+putp T{ 1427+utility function that uses \fBtputs\fP to send characters via \fBputchar\fP. 1428+T} 1429+resetterm set tty modes to \*(``out of curses\*('' state 1430+resetty reset tty flags to stored value 1431+saveterm save current modes as \*(``in curses\*('' state 1432+savetty store current tty flags 1433+setterm establish terminal with given type 1434+setupterm establish terminal with given type 1435+tparm instantiate a string expression with parameters 1436+tputs apply padding information to a string 1437+vidattr like \fBvidputs\fP, but outputs through \fBputchar\fP 1438+vidputs T{ 1439+output a string to put terminal in a specified video attribute mode 1440+T} 1441+.TE 1442+.PP 1443+The programming manual also mentioned 1444+functions provided for termcap compatibility 1445+(commenting that they \*(``may go away at a later date\*(''): 1446+.TS 1447+l l 1448+_ _ 1449+l l. 1450+\fBFunction\fR \fBDescription\fR 1451+tgetent look up termcap entry for given \fIname\fP 1452+tgetflag get boolean entry for given \fIid\fP 1453+tgetnum get numeric entry for given \fIid\fP 1454+tgetstr get string entry for given \fIid\fP 1455+tgoto apply parameters to given capability 1456+tputs T{ 1457+apply padding to capability, calling a function to put characters 1458+T} 1459+.TE 1460+.PP 1461+Early terminfo programs obtained capability values from the 1462+\fBTERMINAL\fP structure initialized by \fBsetupterm\fR. 1463+.PP 1464+SVr3 extended terminfo by adding functions to retrieve capability values 1465+(like the termcap interface), 1466+and reusing tgoto and tputs: 1467+.TS 1468+l l 1469+_ _ 1470+l l. 1471+\fBFunction\fR \fBDescription\fR 1472+tigetflag get boolean entry for given \fIid\fP 1473+tigetnum get numeric entry for given \fIid\fP 1474+tigetstr get string entry for given \fIid\fP 1475+.TE 1476+.PP 1477+SVr3 also replaced several of the SVr2 terminfo functions 1478+which had no counterpart in the termcap interface, 1479+documenting them as obsolete: 1480+.TS 1481+l l 1482+_ _ 1483+l l. 1484+\fBFunction\fR \fBReplaced by\fP 1485+crmode cbreak 1486+fixterm reset_prog_mode 1487+gettmode N/A 1488+nocrmode nocbreak 1489+resetterm reset_shell_mode 1490+saveterm def_prog_mode 1491+setterm setupterm 1492+.TE 1493+.PP 1494+SVr3 kept the \fBmvcur\fP, \fBvidattr\fP and \fBvidputs\fP functions, 1495+along with \fBputp\fP, \fBtparm\fP and \fBtputs\fP. 1496+The latter were needed to support padding, 1497+and handling functions such as \fBvidattr\fP 1498+(which used more than the two parameters supported by \fBtgoto\fP). 1499+.PP 1500+SVr3 introduced the functions for switching between terminal 1501+descriptions, e.g., \fBset_curterm\fP. 1502+The various global variables such as \fBboolnames\fP were mentioned 1503+in the programming manual at this point. 1504+.PP 1505+SVr4 added the \fBvid_attr\fP and \fBvid_puts\fP functions. 1506+.PP 1507+There are other low-level functions declared in the curses header files 1508+on Unix systems, 1509+but none were documented. 1510+The functions marked \*(``obsolete\*('' remained in use 1511+by the Unix \fBvi\fP editor. 1512 .SH PORTABILITY 1513 .SS Legacy functions 1514 .PP 1515Index: man/user_caps.5 1516Prereq: 1.10 1517--- ncurses-6.1-20200111+/man/user_caps.5 2019-05-18 22:48:40.000000000 +0000 1518+++ ncurses-6.1-20200118/man/user_caps.5 2020-01-19 02:01:39.000000000 +0000 1519@@ -1,5 +1,5 @@ 1520 .\"*************************************************************************** 1521-.\" Copyright (c) 2017-2018,2019 Free Software Foundation, Inc. * 1522+.\" Copyright (c) 2017-2019,2020 Free Software Foundation, Inc. * 1523 .\" * 1524 .\" Permission is hereby granted, free of charge, to any person obtaining a * 1525 .\" copy of this software and associated documentation files (the * 1526@@ -26,7 +26,7 @@ 1527 .\" authorization. * 1528 .\"*************************************************************************** 1529 .\" 1530-.\" $Id: user_caps.5,v 1.10 2019/05/18 22:48:40 tom Exp $ 1531+.\" $Id: user_caps.5,v 1.11 2020/01/19 02:01:39 tom Exp $ 1532 .TH user_caps 5 1533 .ie \n(.g .ds `` \(lq 1534 .el .ds `` `` 1535@@ -258,6 +258,84 @@ 1536 \fIstring\fP, 1537 override ncurses's built-in string which 1538 enables/disables \fBxterm\fP mouse mode. 1539+.IP 1540+ncurses sends a character sequence to the terminal to initialize mouse mode, 1541+and when the user clicks the mouse buttons or (in certain modes) moves the 1542+mouse, handles the characters sent back by the terminal to tell it what 1543+was done with the mouse. 1544+.IP 1545+The mouse protocol is enabled when 1546+the \fImask\fP passed in the \fBmousemask\fP function is nonzero. 1547+By default, ncurses handles the responses for the X11 xterm mouse protocol. 1548+It also knows about the \fISGR 1006\fP xterm mouse protocol, 1549+but must to be told to look for this specifically. 1550+It will not be able to guess which mode is used, 1551+because the responses are enough alike that only confusion would result. 1552+.IP 1553+The \fBXM\fP capability has a single parameter. 1554+If nonzero, the mouse protocol should be enabled. 1555+If zero, the mouse protocol should be disabled. 1556+ncurses inspects this capability if it is present, 1557+to see whether the 1006 protocol is used. 1558+If so, it expects the responses to use the \fISGR 1006\fP xterm mouse protocol. 1559+.IP 1560+The xterm mouse protocol is used by other terminal emulators. 1561+The terminal database uses building-blocks for the various xterm mouse 1562+protocols which can be used in customized terminal descriptions. 1563+.IP 1564+The terminal database building blocks for this mouse 1565+feature also have an experimental capability \fIxm\fP. 1566+The \*(``xm\*('' capability describes the mouse response. 1567+Currently there is no interpreter which would use this 1568+information to make the mouse support completely data-driven. 1569+.IP 1570+\fIxm\fP shows the format of the mouse responses. 1571+In this experimental capability, the parameters are 1572+.RS 5 1573+.TP 5 1574+.I p1 1575+y-ordinate 1576+.TP 5 1577+.I p2 1578+x-ordinate 1579+.TP 5 1580+.I p3 1581+button 1582+.TP 5 1583+.I p4 1584+state, e.g., pressed or released 1585+.TP 5 1586+.I p5 1587+y-ordinate starting region 1588+.TP 5 1589+.I p6 1590+x-ordinate starting region 1591+.TP 5 1592+.I p7 1593+y-ordinate ending region 1594+.TP 5 1595+.I p8 1596+x-ordinate ending region 1597+.RE 1598+.IP 1599+Here are examples from the terminal database for the most commonly used 1600+xterm mouse protocols: 1601+.IP 1602+.nf 1603+ xterm+x11mouse|X11 xterm mouse protocol, 1604+ kmous=\\E[M, XM=\\E[?1000%?%p1%{1}%=%th%el%;, 1605+ xm=\\E[M 1606+ %?%p4%t%p3%e%{3}%;%'\ '%+%c 1607+ %p2%'!'%+%c 1608+ %p1%'!'%+%c, 1609+ 1610+ xterm+sm+1006|xterm SGR-mouse, 1611+ kmous=\\E[<, XM=\\E[?1006;1000%?%p1%{1}%=%th%el%;, 1612+ xm=\\E[<%i%p3%d; 1613+ %p1%d; 1614+ %p2%d; 1615+ %?%p4%tM%em%;, 1616+.fi 1617 . 1618 .SS Extended key-definitions 1619 .PP 1620Index: menu/m_driver.c 1621Prereq: 1.32 1622--- ncurses-6.1-20200111+/menu/m_driver.c 2016-03-26 21:51:52.000000000 +0000 1623+++ ncurses-6.1-20200118/menu/m_driver.c 2020-01-18 17:02:13.000000000 +0000 1624@@ -1,5 +1,5 @@ 1625 /**************************************************************************** 1626- * Copyright (c) 1998-2012,2016 Free Software Foundation, Inc. * 1627+ * Copyright (c) 1998-2016,2020 Free Software Foundation, Inc. * 1628 * * 1629 * Permission is hereby granted, free of charge, to any person obtaining a * 1630 * copy of this software and associated documentation files (the * 1631@@ -37,7 +37,7 @@ 1632 1633 #include "menu.priv.h" 1634 1635-MODULE_ID("$Id: m_driver.c,v 1.32 2016/03/26 21:51:52 tom Exp $") 1636+MODULE_ID("$Id: m_driver.c,v 1.33 2020/01/18 17:02:13 tom Exp $") 1637 1638 /* Macros */ 1639 1640@@ -138,7 +138,7 @@ 1641 /* we artificially position one item back, because in the do...while 1642 loop we start with the next item. This means, that with a new 1643 pattern search we always start the scan with the actual item. If 1644- we do a NEXT_PATTERN oder PREV_PATTERN search, we start with the 1645+ we do a NEXT_PATTERN or PREV_PATTERN search, we start with the 1646 one after or before the actual item. */ 1647 if (--idx < 0) 1648 idx = menu->nitems - 1; 1649Index: menu/m_global.c 1650Prereq: 1.28 1651--- ncurses-6.1-20200111+/menu/m_global.c 2014-03-15 20:37:22.000000000 +0000 1652+++ ncurses-6.1-20200118/menu/m_global.c 2020-01-18 17:05:17.000000000 +0000 1653@@ -1,5 +1,5 @@ 1654 /**************************************************************************** 1655- * Copyright (c) 1998-2012,2014 Free Software Foundation, Inc. * 1656+ * Copyright (c) 1998-2014,2020 Free Software Foundation, Inc. * 1657 * * 1658 * Permission is hereby granted, free of charge, to any person obtaining a * 1659 * copy of this software and associated documentation files (the * 1660@@ -37,7 +37,7 @@ 1661 1662 #include "menu.priv.h" 1663 1664-MODULE_ID("$Id: m_global.c,v 1.28 2014/03/15 20:37:22 tom Exp $") 1665+MODULE_ID("$Id: m_global.c,v 1.29 2020/01/18 17:05:17 tom Exp $") 1666 1667 static char mark[] = "-"; 1668 /* *INDENT-OFF* */ 1669@@ -53,7 +53,7 @@ 1670 0, /* length of widest description */ 1671 1, /* length of mark */ 1672 1, /* length of one item */ 1673- 1, /* Spacing for descriptor */ 1674+ 1, /* Spacing for descriptor */ 1675 1, /* Spacing for columns */ 1676 1, /* Spacing for rows */ 1677 (char *)0, /* buffer used to store match chars */ 1678@@ -68,7 +68,7 @@ 1679 0, /* Top row of menu */ 1680 (chtype)A_REVERSE, /* Attribute for selection */ 1681 (chtype)A_NORMAL, /* Attribute for nonselection */ 1682- (chtype)A_UNDERLINE, /* Attribute for inactive */ 1683+ (chtype)A_UNDERLINE, /* Attribute for inactive */ 1684 ' ', /* Pad character */ 1685 (Menu_Hook)0, /* Menu init */ 1686 (Menu_Hook)0, /* Menu term */ 1687@@ -77,7 +77,7 @@ 1688 (void *)0, /* userptr */ 1689 mark, /* mark */ 1690 ALL_MENU_OPTS, /* options */ 1691- 0 /* status */ 1692+ 0 /* status */ 1693 }; 1694 1695 NCURSES_EXPORT_VAR(ITEM) _nc_Default_Item = { 1696@@ -98,9 +98,9 @@ 1697 /* *INDENT-ON* */ 1698 1699 /*--------------------------------------------------------------------------- 1700-| Facility : libnmenu 1701+| Facility : libnmenu 1702 | Function : static void ComputeMaximum_NameDesc_Lenths(MENU *menu) 1703-| 1704+| 1705 | Description : Calculates the maximum name and description lengths 1706 | of the items connected to the menu 1707 | 1708@@ -132,10 +132,10 @@ 1709 } 1710 1711 /*--------------------------------------------------------------------------- 1712-| Facility : libnmenu 1713+| Facility : libnmenu 1714 | Function : static void ResetConnectionInfo(MENU *, ITEM **) 1715-| 1716-| Description : Reset all informations in the menu and the items in 1717+| 1718+| Description : Reset all information in the menu and the items in 1719 | the item array that indicates a connection 1720 | 1721 | Return Values : - 1722@@ -160,7 +160,7 @@ 1723 } 1724 1725 /*--------------------------------------------------------------------------- 1726-| Facility : libnmenu 1727+| Facility : libnmenu 1728 | Function : bool _nc_Connect_Items(MENU *menu, ITEM **items) 1729 | 1730 | Description : Connect the items in the item array to the menu. 1731@@ -218,16 +218,16 @@ 1732 } 1733 } 1734 1735- /* If we fall through to this point, we have to reset all items connection 1736+ /* If we fall through to this point, we have to reset all items connection 1737 and inform about a reject connection */ 1738 ResetConnectionInfo(menu, items); 1739 return (FALSE); 1740 } 1741 1742 /*--------------------------------------------------------------------------- 1743-| Facility : libnmenu 1744+| Facility : libnmenu 1745 | Function : void _nc_Disconnect_Items(MENU *menu) 1746-| 1747+| 1748 | Description : Disconnect the menus item array from the menu 1749 | 1750 | Return Values : - 1751@@ -240,9 +240,9 @@ 1752 } 1753 1754 /*--------------------------------------------------------------------------- 1755-| Facility : libnmenu 1756+| Facility : libnmenu 1757 | Function : int _nc_Calculate_Text_Width(const TEXT * item) 1758-| 1759+| 1760 | Description : Calculate the number of columns for a TEXT. 1761 | 1762 | Return Values : the width 1763@@ -328,9 +328,9 @@ 1764 #endif 1765 1766 /*--------------------------------------------------------------------------- 1767-| Facility : libnmenu 1768+| Facility : libnmenu 1769 | Function : void _nc_Calculate_Item_Length_and_Width(MENU *menu) 1770-| 1771+| 1772 | Description : Calculate the length of an item and the width of the 1773 | whole menu. 1774 | 1775@@ -366,9 +366,9 @@ 1776 } 1777 1778 /*--------------------------------------------------------------------------- 1779-| Facility : libnmenu 1780+| Facility : libnmenu 1781 | Function : void _nc_Link_Item(MENU *menu) 1782-| 1783+| 1784 | Description : Statically calculate for every item its four neighbors. 1785 | This depends on the orientation of the menu. This 1786 | static approach simplifies navigation in the menu a lot. 1787@@ -495,9 +495,9 @@ 1788 } 1789 1790 /*--------------------------------------------------------------------------- 1791-| Facility : libnmenu 1792+| Facility : libnmenu 1793 | Function : void _nc_Show_Menu(const MENU* menu) 1794-| 1795+| 1796 | Description : Update the window that is associated with the menu 1797 | 1798 | Return Values : - 1799@@ -530,12 +530,12 @@ 1800 } 1801 1802 /*--------------------------------------------------------------------------- 1803-| Facility : libnmenu 1804+| Facility : libnmenu 1805 | Function : void _nc_New_TopRow_and_CurrentItem( 1806-| MENU *menu, 1807-| int new_toprow, 1808+| MENU *menu, 1809+| int new_toprow, 1810 | ITEM *new_current_item) 1811-| 1812+| 1813 | Description : Redisplay the menu so that the given row becomes the 1814 | top row and the given item becomes the new current 1815 | item. 1816Index: menu/m_item_use.c 1817Prereq: 1.17 1818--- ncurses-6.1-20200111+/menu/m_item_use.c 2010-01-23 21:20:10.000000000 +0000 1819+++ ncurses-6.1-20200118/menu/m_item_use.c 2020-01-18 17:02:13.000000000 +0000 1820@@ -1,5 +1,5 @@ 1821 /**************************************************************************** 1822- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. * 1823+ * Copyright (c) 1998-2010,2020 Free Software Foundation, Inc. * 1824 * * 1825 * Permission is hereby granted, free of charge, to any person obtaining a * 1826 * copy of this software and associated documentation files (the * 1827@@ -37,14 +37,14 @@ 1828 1829 #include "menu.priv.h" 1830 1831-MODULE_ID("$Id: m_item_use.c,v 1.17 2010/01/23 21:20:10 tom Exp $") 1832+MODULE_ID("$Id: m_item_use.c,v 1.18 2020/01/18 17:02:13 tom Exp $") 1833 1834 /*--------------------------------------------------------------------------- 1835-| Facility : libnmenu 1836+| Facility : libnmenu 1837 | Function : int set_item_userptr(ITEM *item, void *userptr) 1838-| 1839+| 1840 | Description : Set the pointer that is reserved in any item to store 1841-| application relevant informations. 1842+| application relevant information. 1843 | 1844 | Return Values : E_OK - success 1845 +--------------------------------------------------------------------------*/ 1846@@ -57,11 +57,11 @@ 1847 } 1848 1849 /*--------------------------------------------------------------------------- 1850-| Facility : libnmenu 1851+| Facility : libnmenu 1852 | Function : void *item_userptr(const ITEM *item) 1853-| 1854+| 1855 | Description : Return the pointer that is reserved in any item to store 1856-| application relevant informations. 1857+| application relevant information. 1858 | 1859 | Return Values : Value of the pointer. If no such pointer has been set, 1860 | NULL is returned. 1861Index: menu/m_userptr.c 1862Prereq: 1.17 1863--- ncurses-6.1-20200111+/menu/m_userptr.c 2010-01-23 21:20:10.000000000 +0000 1864+++ ncurses-6.1-20200118/menu/m_userptr.c 2020-01-18 17:04:37.000000000 +0000 1865@@ -1,5 +1,5 @@ 1866 /**************************************************************************** 1867- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. * 1868+ * Copyright (c) 1998-2010,2020 Free Software Foundation, Inc. * 1869 * * 1870 * Permission is hereby granted, free of charge, to any person obtaining a * 1871 * copy of this software and associated documentation files (the * 1872@@ -37,14 +37,14 @@ 1873 1874 #include "menu.priv.h" 1875 1876-MODULE_ID("$Id: m_userptr.c,v 1.17 2010/01/23 21:20:10 tom Exp $") 1877+MODULE_ID("$Id: m_userptr.c,v 1.18 2020/01/18 17:04:37 tom Exp $") 1878 1879 /*--------------------------------------------------------------------------- 1880-| Facility : libnmenu 1881+| Facility : libnmenu 1882 | Function : int set_menu_userptr(MENU *menu, void *userptr) 1883-| 1884+| 1885 | Description : Set the pointer that is reserved in any menu to store 1886-| application relevant informations. 1887+| application relevant information. 1888 | 1889 | Return Values : E_OK - success 1890 +--------------------------------------------------------------------------*/ 1891@@ -57,11 +57,11 @@ 1892 } 1893 1894 /*--------------------------------------------------------------------------- 1895-| Facility : libnmenu 1896+| Facility : libnmenu 1897 | Function : void *menu_userptr(const MENU *menu) 1898-| 1899+| 1900 | Description : Return the pointer that is reserved in any menu to 1901-| store application relevant informations. 1902+| store application relevant information. 1903 | 1904 | Return Values : Value of the pointer. If no such pointer has been set, 1905 | NULL is returned 1906Index: misc/emx.src 1907Prereq: 1.9 1908--- ncurses-6.1-20200111+/misc/emx.src 2006-04-22 21:46:17.000000000 +0000 1909+++ ncurses-6.1-20200118/misc/emx.src 2020-01-18 19:04:22.000000000 +0000 1910@@ -1,5 +1,5 @@ 1911 ############################################################################## 1912-# Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. # 1913+# Copyright (c) 1998-2006,2020 Free Software Foundation, Inc. # 1914 # # 1915 # Permission is hereby granted, free of charge, to any person obtaining a # 1916 # copy of this software and associated documentation files (the "Software"), # 1917@@ -25,7 +25,7 @@ 1918 # use or other dealings in this Software without prior written # 1919 # authorization. # 1920 ############################################################################## 1921-# $Id: emx.src,v 1.9 2006/04/22 21:46:17 tom Exp $ 1922+# $Id: emx.src,v 1.11 2020/01/18 19:04:22 tom Exp $ 1923 # This is a reformatted copy of the terminfo source for OS/2 EMX from 1924 # Juan Jose Garcia Ripoll <worm@arrakis.es>. 1925 # http://www.arrakis.es/~worm/ 1926@@ -183,7 +183,7 @@ 1927 # 1928 # This completely describes the sequences specified in the DOS 2.1 ANSI.SYS 1929 # documentation (except for the keyboard key reassignment feature, which 1930-# doen't fit the <pfkey> model well). The klone+acs sequences were valid 1931+# doesn't fit the <pfkey> model well). The klone+acs sequences were valid 1932 # though undocumented. The <pfkey> capability is untested but should work for 1933 # keys F1-F10 (%p1 values outside this range will yield unpredictable results). 1934 # From: Eric S. Raymond <esr@snark.thyrsus.com> Nov 7 1995 1935@@ -330,7 +330,7 @@ 1936 # mb <-> blink turn on blinking 1937 # md <-> bold turn on extra bright (bold) mode 1938 # mr <-> rev turn on reverse video mode 1939-# me <-> sgr0 turn off all atributes 1940+# me <-> sgr0 turn off all attributes 1941 # 1942 # On my terminal, \E[4m looks dim. 1943 ansi-emx|ANSI.SYS color, 1944Index: misc/terminfo.src 1945--- ncurses-6.1-20200111+/misc/terminfo.src 2019-11-09 23:52:28.000000000 +0000 1946+++ ncurses-6.1-20200118/misc/terminfo.src 2020-01-19 01:09:38.000000000 +0000 1947@@ -6,8 +6,8 @@ 1948 # Report bugs and new terminal descriptions to 1949 # bug-ncurses@gnu.org 1950 # 1951-# $Revision: 1.773 $ 1952-# $Date: 2019/11/09 23:52:28 $ 1953+# $Revision: 1.779 $ 1954+# $Date: 2020/01/19 01:09:38 $ 1955 # 1956 # The original header is preserved below for reference. It is noted that there 1957 # is a "newer" version which differs in some cosmetic details (but actually 1958@@ -3453,7 +3453,7 @@ 1959 # 1960 # According to its documentation, iTerm uses terminfo to obtain function key 1961 # definitions. For example, if it is started with TERM=xterm, it uses key 1962-# definitons from that terminal description from the local OSX machine. Those 1963+# definitions from that terminal description from the local OSX machine. Those 1964 # $TERM settings may be augmented using the bookmark and profile dialogs. 1965 # However, the behavior seen with tack does not agree with either the terminfo 1966 # description or the function keys in its "xterm" profile. 1967@@ -5192,7 +5192,7 @@ 1968 # no new information. 1969 xterm+x11mouse|X11 xterm mouse protocol, 1970 kmous=\E[M, XM=\E[?1000%?%p1%{1}%=%th%el%;, 1971- xm=\E[M%?%p4%t3%e%p3%'\s'%+%c%;%p2%'!'%+%c%p1%'!'%+%c, 1972+ xm=\E[M%?%p4%t%p3%e%{3}%;%'\s'%+%c%p2%'!'%+%c%p1%'!'%+%c, 1973 xterm-x11mouse|X11 mouse, 1974 use=xterm+x11mouse, use=xterm, 1975 1976@@ -5255,10 +5255,11 @@ 1977 # from the non-1005 responses. 1978 # 1979 # As an alternative (and fixing the longstanding limitation of X11 mouse 1980-# protocol regarding button-releases), I provided this: 1981+# protocol regarding button-releases), I provided the 1006 mode, referring 1982+# to it as "SGR 1006" since the replies resemble the SGR control string: 1983 xterm+sm+1006|xterm SGR-mouse, 1984 kmous=\E[<, XM=\E[?1006;1000%?%p1%{1}%=%th%el%;, 1985- xm=\E[<%p1%d;%p2%d;%p3%d;%?%p4%tM%em%;, 1986+ xm=\E[<%i%p3%d;%p1%d;%p2%d;%?%p4%tM%em%;, 1987 xterm-1006|xterm SGR-mouse, 1988 use=xterm+sm+1006, use=xterm, 1989 1990@@ -5287,7 +5288,7 @@ 1991 # These (xtermc and xtermm) are distributed with Solaris. They refer to a 1992 # variant of xterm which is apparently no longer supported, but are interesting 1993 # because they illustrate SVr4 curses mouse controls - T.Dickey 1994-xtermm|xterm terminal emulator (monocrome), 1995+xtermm|xterm terminal emulator (monochrome), 1996 OTbs, am, km, mir, msgr, xenl, 1997 btns#3, cols#80, it#8, lines#24, 1998 acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, 1999@@ -6890,6 +6891,7 @@ 2000 2001 #### Alacritty 2002 # https://github.com/jwilm/alacritty 2003+# Version 0.4.0 (2019/11/25) 2004 # Version 0.3.3 (2019/08/03) 2005 # Version 0.2.1 (2018/10/03) 2006 # Project started in 2016/02, uses Rust and OpenGL, and in contrast to (most X 2007@@ -6902,9 +6904,10 @@ 2008 # otherwise, passes wrapping test 2009 # no DECSCNM 2010 # identifies as a vt102 2011+# numeric keypad does not send expected codes (seen in 0.4.0) 2012 # passes bce test 2013 # vt220: 2014-# ECH works (0.2.1 left text on right margin) 2015+# ECH works in 0.3.3 (0.2.1 left text on right margin) 2016 # no SRM, DECSCA 2017 # vt320: 2018 # fails DECXCPR 2019@@ -6920,12 +6923,16 @@ 2020 # no X10 mouse 2021 # has normal and highlight mouse 2022 # has any-event and button-event mouse 2023-# cursor-position wrong after alternate-screen 2024+# + does support SGR-mouse 2025+# + does not correctly support focus in/out events (seen in 0.4.0) 2026+# cursor-position wrong after alternate-screen (fixed in 0.4.0) 2027 # none of the dtterm controls work 2028 # tack: 2029 # bell and flash do not work 2030+# blink does not work 2031 # italics and crossed-out work (latter did not work in 0.2.1) 2032-# function-keys work up to kf36; those using two modifiers do not work 2033+# function-keys work up (tested combinations which window manager allows) 2034+# treats meta as escape-prefix 2035 # 2036 # The program sources include "alacritty" and "alacritty-direct", which are 2037 # copied from "xterm-256color" and "xterm-direct" (but using semicolon for 2038@@ -6937,14 +6944,14 @@ 2039 alacritty-direct|alacritty with direct color indexing, 2040 use=xterm+indirect, use=alacritty+common, 2041 2042-# removed ech, since it fails vttest -TD 2043+# cancel km, since it is not actually meta mode -TD 2044 # added ecma+strikeout in 0.3.3 -TD 2045 # added xterm+sl-twm in 0.3.3 -TD 2046 alacritty+common|base fragment for alacritty, 2047- npc, 2048- ech@, kb2=\EOE, kbs=^?, kcbt=\E[Z, kent=\EOM, Se=\E[0 q, 2049- use=ecma+index, use=xterm-basic, use=xterm+app, 2050- use=ansi+rep, use=xterm+sm+1006, use=xterm+tmux, 2051+ km@, npc, 2052+ kb2=\EOE, kbs=^?, kcbt=\E[Z, kent=\EOM, Se=\E[0 q, 2053+ use=ecma+index, use=xterm+sm+1006, use=xterm-basic, 2054+ use=xterm+app, use=ansi+rep, use=xterm+tmux, 2055 use=ecma+strikeout, use=xterm+sl-twm, use=ecma+italics, 2056 use=xterm+pce2, use=xterm+pcc2, use=xterm+pcf2, 2057 2058@@ -23140,8 +23147,8 @@ 2059 2060 #### Masscomp consoles 2061 # 2062-# Masscomp has gone out of business. Their product line was purchased by 2063-# comany in Georgia (US) called "XS International", parts and service may 2064+# Masscomp has gone out of business. Their product line was purchased by a 2065+# company in Georgia (US) called "XS International", parts and service may 2066 # still be available through them. 2067 # 2068 2069@@ -24477,7 +24484,7 @@ 2070 # goes to the first column of the "status line". 2071 # XM is a string capability which overrides ncurses's built-in string which 2072 # enables/disables xterm mouse mode. 2073-# xm shows the format of the mouse responses. Parameters are (from zero): 2074+# xm shows the format of the mouse responses. Parameters: 2075 # p1 = y-ordinate 2076 # p2 = x-ordinate 2077 # p3 = button 2078@@ -26420,4 +26427,12 @@ 2079 # + reviewed st 0.8.2, updated some details -TD 2080 # + use ansi+rep several places -TD 2081 # 2082+# 2020-01-12 2083+# + update alacritty entries for 0.4.0 (prompted by patch by 2084+# Christian Durr) -TD 2085+# 2086+# 2020-01-18 2087+# + spelling fixes per codespell -TD 2088+# + improve xm example for xterm+x11mouse, xterm+sm+1006 -TD 2089+# 2090 ######## SHANTIH! SHANTIH! SHANTIH! 2091Index: ncurses/README.IZ 2092Prereq: 1.2 2093--- ncurses-6.1-20200111+/ncurses/README.IZ 2006-04-22 23:13:05.000000000 +0000 2094+++ ncurses-6.1-20200118/ncurses/README.IZ 2020-01-18 17:02:13.000000000 +0000 2095@@ -1,5 +1,5 @@ 2096 ------------------------------------------------------------------------------- 2097--- Copyright (c) 2002,2006 Free Software Foundation, Inc. -- 2098+-- Copyright (c) 2002-2006,2020 Free Software Foundation, Inc. -- 2099 -- -- 2100 -- Permission is hereby granted, free of charge, to any person obtaining a -- 2101 -- copy of this software and associated documentation files (the -- 2102@@ -25,11 +25,11 @@ 2103 -- sale, use or other dealings in this Software without prior written -- 2104 -- authorization. -- 2105 ------------------------------------------------------------------------------- 2106--- $Id: README.IZ,v 1.2 2006/04/22 23:13:05 tom Exp $ 2107+-- $Id: README.IZ,v 1.3 2020/01/18 17:02:13 tom Exp $ 2108 --------------------------------------------------------------------- 2109 2110 Here is the patch. I did no testing whatsoever with event watching 2111-requests present (I need some applications which exersize this before 2112+requests present (I need some applications which exercise this before 2113 this, probably lynx ;-), but the code looks working "the normal way". 2114 2115 I had no way to test that the poll() branch compiles/works... 2116Index: ncurses/build.priv.h 2117Prereq: 1.10 2118--- ncurses-6.1-20200111+/ncurses/build.priv.h 2019-05-11 14:14:00.000000000 +0000 2119+++ ncurses-6.1-20200118/ncurses/build.priv.h 2020-01-18 17:03:32.000000000 +0000 2120@@ -1,5 +1,5 @@ 2121 /**************************************************************************** 2122- * Copyright (c) 2010-2012,2019 Free Software Foundation, Inc. * 2123+ * Copyright (c) 2010-2019,2020 Free Software Foundation, Inc. * 2124 * * 2125 * Permission is hereby granted, free of charge, to any person obtaining a * 2126 * copy of this software and associated documentation files (the * 2127@@ -31,11 +31,11 @@ 2128 ****************************************************************************/ 2129 2130 /* 2131- * $Id: build.priv.h,v 1.10 2019/05/11 14:14:00 tom Exp $ 2132+ * $Id: build.priv.h,v 1.11 2020/01/18 17:03:32 tom Exp $ 2133 * 2134 * build.priv.h 2135 * 2136- * This is a reduced version of curses.priv.h, for build-time utilties. 2137+ * This is a reduced version of curses.priv.h, for build-time utilities. 2138 * Because it has fewer dependencies, this simplifies cross-compiling. 2139 * 2140 */ 2141@@ -54,7 +54,7 @@ 2142 #if USE_RCS_IDS 2143 #define MODULE_ID(id) static const char Ident[] = id; 2144 #else 2145-#define MODULE_ID(id) /*nothing*/ 2146+#define MODULE_ID(id) /*nothing */ 2147 #endif 2148 2149 #include <stdlib.h> 2150@@ -66,7 +66,7 @@ 2151 2152 #include <errno.h> 2153 2154-#include <curses.h> /* we'll use -Ipath directive to get the right one! */ 2155+#include <curses.h> /* we'll use -Ipath directive to get the right one! */ 2156 2157 /* usually in <unistd.h> */ 2158 #ifndef EXIT_SUCCESS 2159@@ -89,20 +89,19 @@ 2160 #define NCURSES_ARRAY(name) \ 2161 NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, name) 2162 2163-NCURSES_ARRAY(boolnames); 2164-NCURSES_ARRAY(boolfnames); 2165-NCURSES_ARRAY(numnames); 2166-NCURSES_ARRAY(numfnames); 2167-NCURSES_ARRAY(strnames); 2168-NCURSES_ARRAY(strfnames); 2169+ NCURSES_ARRAY(boolnames); 2170+ NCURSES_ARRAY(boolfnames); 2171+ NCURSES_ARRAY(numnames); 2172+ NCURSES_ARRAY(numfnames); 2173+ NCURSES_ARRAY(strnames); 2174+ NCURSES_ARRAY(strfnames); 2175 #endif 2176 2177 #if NO_LEAKS 2178-NCURSES_EXPORT(void) _nc_names_leaks(void); 2179+ NCURSES_EXPORT(void) _nc_names_leaks(void); 2180 #endif 2181 2182 #ifdef __cplusplus 2183 } 2184 #endif 2185- 2186-#endif /* CURSES_PRIV_H */ 2187+#endif /* CURSES_PRIV_H */ 2188Index: ncurses/tinfo/make_hash.c 2189Prereq: 1.29 2190--- ncurses-6.1-20200111+/ncurses/tinfo/make_hash.c 2019-10-19 21:02:19.000000000 +0000 2191+++ ncurses-6.1-20200118/ncurses/tinfo/make_hash.c 2020-01-18 17:02:38.000000000 +0000 2192@@ -1,5 +1,5 @@ 2193 /**************************************************************************** 2194- * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. * 2195+ * Copyright (c) 1998-2019,2020 Free Software Foundation, Inc. * 2196 * * 2197 * Permission is hereby granted, free of charge, to any person obtaining a * 2198 * copy of this software and associated documentation files (the * 2199@@ -43,7 +43,7 @@ 2200 2201 #include <ctype.h> 2202 2203-MODULE_ID("$Id: make_hash.c,v 1.29 2019/10/19 21:02:19 tom Exp $") 2204+MODULE_ID("$Id: make_hash.c,v 1.30 2020/01/18 17:02:38 tom Exp $") 2205 2206 /* 2207 * _nc_make_hash_table() 2208@@ -89,7 +89,7 @@ 2209 * 2210 * Computes the hashing function on the given string. 2211 * 2212- * The current hash function is the sum of each consectutive pair 2213+ * The current hash function is the sum of each consecutive pair 2214 * of characters, taken as two-byte integers, mod HASHTABSIZE. 2215 * 2216 */ 2217Index: ncurses/tinfo/obsolete.c 2218Prereq: 1.4 2219--- ncurses-6.1-20200111+/ncurses/tinfo/obsolete.c 2016-09-10 18:39:51.000000000 +0000 2220+++ ncurses-6.1-20200118/ncurses/tinfo/obsolete.c 2020-01-18 17:02:38.000000000 +0000 2221@@ -1,5 +1,5 @@ 2222 /**************************************************************************** 2223- * Copyright (c) 2013-2014,2016 Free Software Foundation, Inc. * 2224+ * Copyright (c) 2013-2016,2020 Free Software Foundation, Inc. * 2225 * * 2226 * Permission is hereby granted, free of charge, to any person obtaining a * 2227 * copy of this software and associated documentation files (the * 2228@@ -36,10 +36,10 @@ 2229 2230 #include <curses.priv.h> 2231 2232-MODULE_ID("$Id: obsolete.c,v 1.4 2016/09/10 18:39:51 tom Exp $") 2233+MODULE_ID("$Id: obsolete.c,v 1.5 2020/01/18 17:02:38 tom Exp $") 2234 2235 /* 2236- * Obsolete entrypoint retained for binary compatbility. 2237+ * Obsolete entrypoint retained for binary compatibility. 2238 */ 2239 NCURSES_EXPORT(void) 2240 NCURSES_SP_NAME(_nc_set_buffer) (NCURSES_SP_DCLx FILE *ofp, int buffered) 2241Index: ncurses/win32con/win_driver.c 2242Prereq: 1.61 2243--- ncurses-6.1-20200111+/ncurses/win32con/win_driver.c 2018-06-23 21:35:06.000000000 +0000 2244+++ ncurses-6.1-20200118/ncurses/win32con/win_driver.c 2020-01-18 17:02:38.000000000 +0000 2245@@ -1,5 +1,5 @@ 2246 /**************************************************************************** 2247- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * 2248+ * Copyright (c) 1998-2018,2020 Free Software Foundation, Inc. * 2249 * * 2250 * Permission is hereby granted, free of charge, to any person obtaining a * 2251 * copy of this software and associated documentation files (the * 2252@@ -54,7 +54,7 @@ 2253 2254 #define CUR TerminalType(my_term). 2255 2256-MODULE_ID("$Id: win_driver.c,v 1.61 2018/06/23 21:35:06 tom Exp $") 2257+MODULE_ID("$Id: win_driver.c,v 1.62 2020/01/18 17:02:38 tom Exp $") 2258 2259 #ifndef __GNUC__ 2260 # error We need GCC to compile for MinGW 2261@@ -1973,7 +1973,7 @@ 2262 2263 /* This is used when running in terminfo mode to discover, 2264 whether or not the "terminal" is actually a Windows 2265- Console. It's the responsibilty of the console to deal 2266+ Console. It's the responsibility of the console to deal 2267 with the terminal escape sequences that are sent by 2268 terminfo. 2269 */ 2270@@ -2162,7 +2162,7 @@ 2271 static bool 2272 InitConsole(void) 2273 { 2274- /* initalize once, or not at all */ 2275+ /* initialize once, or not at all */ 2276 if (!console_initialized) { 2277 int i; 2278 DWORD num_buttons; 2279Index: package/debian-mingw/changelog 2280--- ncurses-6.1-20200111+/package/debian-mingw/changelog 2020-01-11 10:59:50.000000000 +0000 2281+++ ncurses-6.1-20200118/package/debian-mingw/changelog 2020-01-18 10:27:03.000000000 +0000 2282@@ -1,8 +1,8 @@ 2283-ncurses6 (6.1+20200111) unstable; urgency=low 2284+ncurses6 (6.1+20200118) unstable; urgency=low 2285 2286 * latest weekly patch 2287 2288- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 11 Jan 2020 05:59:50 -0500 2289+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 18 Jan 2020 05:27:03 -0500 2290 2291 ncurses6 (5.9-20131005) unstable; urgency=low 2292 2293Index: package/debian-mingw64/changelog 2294--- ncurses-6.1-20200111+/package/debian-mingw64/changelog 2020-01-11 10:59:50.000000000 +0000 2295+++ ncurses-6.1-20200118/package/debian-mingw64/changelog 2020-01-18 10:27:03.000000000 +0000 2296@@ -1,8 +1,8 @@ 2297-ncurses6 (6.1+20200111) unstable; urgency=low 2298+ncurses6 (6.1+20200118) unstable; urgency=low 2299 2300 * latest weekly patch 2301 2302- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 11 Jan 2020 05:59:50 -0500 2303+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 18 Jan 2020 05:27:03 -0500 2304 2305 ncurses6 (5.9-20131005) unstable; urgency=low 2306 2307Index: package/debian/changelog 2308--- ncurses-6.1-20200111+/package/debian/changelog 2020-01-11 10:59:50.000000000 +0000 2309+++ ncurses-6.1-20200118/package/debian/changelog 2020-01-18 10:27:03.000000000 +0000 2310@@ -1,8 +1,8 @@ 2311-ncurses6 (6.1+20200111) unstable; urgency=low 2312+ncurses6 (6.1+20200118) unstable; urgency=low 2313 2314 * latest weekly patch 2315 2316- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 11 Jan 2020 05:59:50 -0500 2317+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 18 Jan 2020 05:27:03 -0500 2318 2319 ncurses6 (5.9-20120608) unstable; urgency=low 2320 2321Index: package/mingw-ncurses.nsi 2322Prereq: 1.369 2323--- ncurses-6.1-20200111+/package/mingw-ncurses.nsi 2020-01-11 10:59:50.000000000 +0000 2324+++ ncurses-6.1-20200118/package/mingw-ncurses.nsi 2020-01-18 10:27:03.000000000 +0000 2325@@ -1,4 +1,4 @@ 2326-; $Id: mingw-ncurses.nsi,v 1.369 2020/01/11 10:59:50 tom Exp $ 2327+; $Id: mingw-ncurses.nsi,v 1.370 2020/01/18 10:27:03 tom Exp $ 2328 2329 ; TODO add examples 2330 ; TODO bump ABI to 6 2331@@ -10,7 +10,7 @@ 2332 !define VERSION_MAJOR "6" 2333 !define VERSION_MINOR "1" 2334 !define VERSION_YYYY "2020" 2335-!define VERSION_MMDD "0111" 2336+!define VERSION_MMDD "0118" 2337 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} 2338 2339 !define MY_ABI "5" 2340Index: package/mingw-ncurses.spec 2341--- ncurses-6.1-20200111+/package/mingw-ncurses.spec 2020-01-11 10:59:50.000000000 +0000 2342+++ ncurses-6.1-20200118/package/mingw-ncurses.spec 2020-01-18 10:27:03.000000000 +0000 2343@@ -3,7 +3,7 @@ 2344 Summary: shared libraries for terminal handling 2345 Name: mingw32-ncurses6 2346 Version: 6.1 2347-Release: 20200111 2348+Release: 20200118 2349 License: X11 2350 Group: Development/Libraries 2351 Source: ncurses-%{version}-%{release}.tgz 2352Index: package/ncurses.spec 2353--- ncurses-6.1-20200111+/package/ncurses.spec 2020-01-11 10:59:50.000000000 +0000 2354+++ ncurses-6.1-20200118/package/ncurses.spec 2020-01-18 10:27:03.000000000 +0000 2355@@ -1,7 +1,7 @@ 2356 Summary: shared libraries for terminal handling 2357 Name: ncurses6 2358 Version: 6.1 2359-Release: 20200111 2360+Release: 20200118 2361 License: X11 2362 Group: Development/Libraries 2363 Source: ncurses-%{version}-%{release}.tgz 2364Index: package/ncursest.spec 2365--- ncurses-6.1-20200111+/package/ncursest.spec 2020-01-11 10:59:50.000000000 +0000 2366+++ ncurses-6.1-20200118/package/ncursest.spec 2020-01-18 10:27:03.000000000 +0000 2367@@ -1,7 +1,7 @@ 2368 Summary: Curses library with POSIX thread support. 2369 Name: ncursest6 2370 Version: 6.1 2371-Release: 20200111 2372+Release: 20200118 2373 License: X11 2374 Group: Development/Libraries 2375 Source: ncurses-%{version}-%{release}.tgz 2376Index: progs/capconvert 2377Prereq: 1.7 2378--- ncurses-6.1-20200111+/progs/capconvert 2019-03-02 22:51:42.000000000 +0000 2379+++ ncurses-6.1-20200118/progs/capconvert 2020-01-18 17:02:38.000000000 +0000 2380@@ -1,6 +1,6 @@ 2381 #!/bin/sh 2382 ############################################################################## 2383-# Copyright (c) 1998-2017,2019 Free Software Foundation, Inc. # 2384+# Copyright (c) 1998-2019,2020 Free Software Foundation, Inc. # 2385 # # 2386 # Permission is hereby granted, free of charge, to any person obtaining a # 2387 # copy of this software and associated documentation files (the "Software"), # 2388@@ -26,7 +26,7 @@ 2389 # use or other dealings in this Software without prior written # 2390 # authorization. # 2391 ############################################################################## 2392-# $Id: capconvert,v 1.7 2019/03/02 22:51:42 tom Exp $ 2393+# $Id: capconvert,v 1.8 2020/01/18 17:02:38 tom Exp $ 2394 # 2395 # capconvert -- automated conversion from termcap to terminfo 2396 # 2397@@ -179,7 +179,7 @@ 2398 echo "I am going to assume this is the terminfo source included with" 2399 echo "the ncurses distribution. If this assumption is wrong, please" 2400 echo "interrupt me now! OK to continue?" 2401- read ans; 2402+ read answer; 2403 ;; 2404 2) 2405 echo "I see more than one possible terminfo source. Here they are:" 2406@@ -251,7 +251,7 @@ 2407 echo "Done." 2408 echo "Note that editing TERMCAP will no longer change the data curses sees." 2409 fi 2410-echo "To do that, decompile the terminal decription you want with infocmp(1)," 2411+echo "To do that, decompile the terminal description you want with infocmp(1)," 2412 echo "edit to taste, and recompile using tic(1)." 2413 2414 # capconvert ends here 2415Index: test/aclocal.m4 2416Prereq: 1.169 2417--- ncurses-6.1-20200111+/test/aclocal.m4 2020-01-12 00:01:40.000000000 +0000 2418+++ ncurses-6.1-20200118/test/aclocal.m4 2020-01-18 17:30:44.000000000 +0000 2419@@ -26,7 +26,7 @@ 2420 dnl authorization. * 2421 dnl*************************************************************************** 2422 dnl 2423-dnl $Id: aclocal.m4,v 1.169 2020/01/12 00:01:40 tom Exp $ 2424+dnl $Id: aclocal.m4,v 1.172 2020/01/18 17:30:44 tom Exp $ 2425 dnl 2426 dnl Author: Thomas E. Dickey 2427 dnl 2428@@ -3350,9 +3350,9 @@ 2429 fi 2430 ])dnl 2431 dnl --------------------------------------------------------------------------- 2432-dnl CF_SIG_ATOMIC_T version: 3 updated: 2012/10/04 20:12:20 2433+dnl CF_SIG_ATOMIC_T version: 4 updated: 2020/01/18 12:30:44 2434 dnl --------------- 2435-dnl signal handler, but there are some gcc depedencies in that recommendation. 2436+dnl signal handler, but there are some gcc dependencies in that recommendation. 2437 dnl Try anyway. 2438 AC_DEFUN([CF_SIG_ATOMIC_T], 2439 [ 2440@@ -4216,7 +4216,7 @@ 2441 fi 2442 ])dnl 2443 dnl --------------------------------------------------------------------------- 2444-dnl CF_X_ATHENA_CPPFLAGS version: 7 updated: 2020/01/11 17:15:41 2445+dnl CF_X_ATHENA_CPPFLAGS version: 8 updated: 2020/01/16 05:21:56 2446 dnl -------------------- 2447 dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of 2448 dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw. 2449@@ -4249,15 +4249,15 @@ 2450 AC_MSG_RESULT($cf_result) 2451 CF_RESTORE_XTRA_FLAGS([CF_X_ATHENA_CPPFLAGS]) 2452 if test "$cf_result" = yes ; then 2453- cf_x_athena_inc=$cf_path 2454+ test "$cf_path" = default && cf_x_athena_inc=default 2455+ test "$cf_path" != default && cf_x_athena_inc=$cf_path/include 2456 break 2457 fi 2458 fi 2459 done 2460 2461 if test -z "$cf_x_athena_inc" ; then 2462- AC_MSG_WARN( 2463-[Unable to successfully find Athena header files with test program]) 2464+ AC_MSG_WARN([Unable to find Athena header files]) 2465 elif test "$cf_x_athena_inc" != default ; then 2466 CF_APPEND_TEXT(CPPFLAGS,-I$cf_x_athena_inc) 2467 fi 2468Index: test/configure 2469--- ncurses-6.1-20200111+/test/configure 2020-01-12 00:02:42.000000000 +0000 2470+++ ncurses-6.1-20200118/test/configure 2020-01-18 16:40:29.000000000 +0000 2471@@ -14712,15 +14712,16 @@ 2472 CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS" 2473 2474 if test "$cf_result" = yes ; then 2475- cf_x_athena_inc=$cf_path 2476+ test "$cf_path" = default && cf_x_athena_inc=default 2477+ test "$cf_path" != default && cf_x_athena_inc=$cf_path/include 2478 break 2479 fi 2480 fi 2481 done 2482 2483 if test -z "$cf_x_athena_inc" ; then 2484- { echo "$as_me:14722: WARNING: Unable to successfully find Athena header files with test program" >&5 2485-echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;} 2486+ { echo "$as_me:14723: WARNING: Unable to find Athena header files" >&5 2487+echo "$as_me: WARNING: Unable to find Athena header files" >&2;} 2488 elif test "$cf_x_athena_inc" != default ; then 2489 2490 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " 2491@@ -14784,10 +14785,10 @@ 2492 done 2493 LIBS="$cf_add_libs" 2494 2495- echo "$as_me:14787: checking for $cf_test in $cf_libs" >&5 2496+ echo "$as_me:14788: checking for $cf_test in $cf_libs" >&5 2497 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6 2498 cat >conftest.$ac_ext <<_ACEOF 2499-#line 14790 "configure" 2500+#line 14791 "configure" 2501 #include "confdefs.h" 2502 2503 #include <X11/Intrinsic.h> 2504@@ -14803,16 +14804,16 @@ 2505 } 2506 _ACEOF 2507 rm -f conftest.$ac_objext conftest$ac_exeext 2508-if { (eval echo "$as_me:14806: \"$ac_link\"") >&5 2509+if { (eval echo "$as_me:14807: \"$ac_link\"") >&5 2510 (eval $ac_link) 2>&5 2511 ac_status=$? 2512- echo "$as_me:14809: \$? = $ac_status" >&5 2513+ echo "$as_me:14810: \$? = $ac_status" >&5 2514 (exit $ac_status); } && 2515 { ac_try='test -s conftest$ac_exeext' 2516- { (eval echo "$as_me:14812: \"$ac_try\"") >&5 2517+ { (eval echo "$as_me:14813: \"$ac_try\"") >&5 2518 (eval $ac_try) 2>&5 2519 ac_status=$? 2520- echo "$as_me:14815: \$? = $ac_status" >&5 2521+ echo "$as_me:14816: \$? = $ac_status" >&5 2522 (exit $ac_status); }; }; then 2523 cf_result=yes 2524 else 2525@@ -14821,7 +14822,7 @@ 2526 cf_result=no 2527 fi 2528 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 2529- echo "$as_me:14824: result: $cf_result" >&5 2530+ echo "$as_me:14825: result: $cf_result" >&5 2531 echo "${ECHO_T}$cf_result" >&6 2532 2533 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS" 2534@@ -14838,7 +14839,7 @@ 2535 done 2536 2537 if test -z "$cf_x_athena_lib" ; then 2538- { { echo "$as_me:14841: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 2539+ { { echo "$as_me:14842: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 2540 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;} 2541 { (exit 1); exit 1; }; } 2542 fi 2543@@ -14872,7 +14873,7 @@ 2544 do 2545 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 2546 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 2547-echo "$as_me:14875: checking for $ac_word" >&5 2548+echo "$as_me:14876: checking for $ac_word" >&5 2549 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2550 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then 2551 echo $ECHO_N "(cached) $ECHO_C" >&6 2552@@ -14887,7 +14888,7 @@ 2553 test -z "$ac_dir" && ac_dir=. 2554 $as_executable_p "$ac_dir/$ac_word" || continue 2555 ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog" 2556-echo "$as_me:14890: found $ac_dir/$ac_word" >&5 2557+echo "$as_me:14891: found $ac_dir/$ac_word" >&5 2558 break 2559 done 2560 2561@@ -14895,10 +14896,10 @@ 2562 fi 2563 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG 2564 if test -n "$XCURSES_CONFIG"; then 2565- echo "$as_me:14898: result: $XCURSES_CONFIG" >&5 2566+ echo "$as_me:14899: result: $XCURSES_CONFIG" >&5 2567 echo "${ECHO_T}$XCURSES_CONFIG" >&6 2568 else 2569- echo "$as_me:14901: result: no" >&5 2570+ echo "$as_me:14902: result: no" >&5 2571 echo "${ECHO_T}no" >&6 2572 fi 2573 2574@@ -14911,7 +14912,7 @@ 2575 do 2576 # Extract the first word of "$ac_prog", so it can be a program name with args. 2577 set dummy $ac_prog; ac_word=$2 2578-echo "$as_me:14914: checking for $ac_word" >&5 2579+echo "$as_me:14915: checking for $ac_word" >&5 2580 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 2581 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then 2582 echo $ECHO_N "(cached) $ECHO_C" >&6 2583@@ -14926,7 +14927,7 @@ 2584 test -z "$ac_dir" && ac_dir=. 2585 $as_executable_p "$ac_dir/$ac_word" || continue 2586 ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog" 2587-echo "$as_me:14929: found $ac_dir/$ac_word" >&5 2588+echo "$as_me:14930: found $ac_dir/$ac_word" >&5 2589 break 2590 done 2591 2592@@ -14934,10 +14935,10 @@ 2593 fi 2594 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG 2595 if test -n "$ac_ct_XCURSES_CONFIG"; then 2596- echo "$as_me:14937: result: $ac_ct_XCURSES_CONFIG" >&5 2597+ echo "$as_me:14938: result: $ac_ct_XCURSES_CONFIG" >&5 2598 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6 2599 else 2600- echo "$as_me:14940: result: no" >&5 2601+ echo "$as_me:14941: result: no" >&5 2602 echo "${ECHO_T}no" >&6 2603 fi 2604 2605@@ -15072,7 +15073,7 @@ 2606 2607 test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 2608 2609-echo "${as_me:-configure}:15075: testing checking additions to CFLAGS ..." 1>&5 2610+echo "${as_me:-configure}:15076: testing checking additions to CFLAGS ..." 1>&5 2611 2612 cf_check_cflags="$CFLAGS" 2613 cf_check_cppflags="$CPPFLAGS" 2614@@ -15157,7 +15158,7 @@ 2615 if test -n "$cf_new_cflags" ; then 2616 test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 2617 2618-echo "${as_me:-configure}:15160: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 2619+echo "${as_me:-configure}:15161: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 2620 2621 test -n "$CFLAGS" && CFLAGS="$CFLAGS " 2622 CFLAGS="${CFLAGS}$cf_new_cflags" 2623@@ -15167,7 +15168,7 @@ 2624 if test -n "$cf_new_cppflags" ; then 2625 test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 2626 2627-echo "${as_me:-configure}:15170: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 2628+echo "${as_me:-configure}:15171: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 2629 2630 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " 2631 CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" 2632@@ -15177,7 +15178,7 @@ 2633 if test -n "$cf_new_extra_cppflags" ; then 2634 test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 2635 2636-echo "${as_me:-configure}:15180: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 2637+echo "${as_me:-configure}:15181: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 2638 2639 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " 2640 EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" 2641@@ -15186,7 +15187,7 @@ 2642 2643 if test "x$cf_check_cflags" != "x$CFLAGS" ; then 2644 cat >conftest.$ac_ext <<_ACEOF 2645-#line 15189 "configure" 2646+#line 15190 "configure" 2647 #include "confdefs.h" 2648 #include <stdio.h> 2649 int 2650@@ -15198,16 +15199,16 @@ 2651 } 2652 _ACEOF 2653 rm -f conftest.$ac_objext conftest$ac_exeext 2654-if { (eval echo "$as_me:15201: \"$ac_link\"") >&5 2655+if { (eval echo "$as_me:15202: \"$ac_link\"") >&5 2656 (eval $ac_link) 2>&5 2657 ac_status=$? 2658- echo "$as_me:15204: \$? = $ac_status" >&5 2659+ echo "$as_me:15205: \$? = $ac_status" >&5 2660 (exit $ac_status); } && 2661 { ac_try='test -s conftest$ac_exeext' 2662- { (eval echo "$as_me:15207: \"$ac_try\"") >&5 2663+ { (eval echo "$as_me:15208: \"$ac_try\"") >&5 2664 (eval $ac_try) 2>&5 2665 ac_status=$? 2666- echo "$as_me:15210: \$? = $ac_status" >&5 2667+ echo "$as_me:15211: \$? = $ac_status" >&5 2668 (exit $ac_status); }; }; then 2669 : 2670 else 2671@@ -15215,12 +15216,12 @@ 2672 cat conftest.$ac_ext >&5 2673 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 2674 2675-echo "${as_me:-configure}:15218: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 2676+echo "${as_me:-configure}:15219: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 2677 2678 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then 2679 test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 2680 2681-echo "${as_me:-configure}:15223: testing but keeping change to \$CPPFLAGS ..." 1>&5 2682+echo "${as_me:-configure}:15224: testing but keeping change to \$CPPFLAGS ..." 1>&5 2683 2684 fi 2685 CFLAGS="$cf_check_flags" 2686@@ -15228,7 +15229,7 @@ 2687 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 2688 fi 2689 2690-echo "$as_me:15231: checking for XOpenDisplay in -lX11" >&5 2691+echo "$as_me:15232: checking for XOpenDisplay in -lX11" >&5 2692 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 2693 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then 2694 echo $ECHO_N "(cached) $ECHO_C" >&6 2695@@ -15236,7 +15237,7 @@ 2696 ac_check_lib_save_LIBS=$LIBS 2697 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" 2698 cat >conftest.$ac_ext <<_ACEOF 2699-#line 15239 "configure" 2700+#line 15240 "configure" 2701 #include "confdefs.h" 2702 2703 /* Override any gcc2 internal prototype to avoid an error. */ 2704@@ -15255,16 +15256,16 @@ 2705 } 2706 _ACEOF 2707 rm -f conftest.$ac_objext conftest$ac_exeext 2708-if { (eval echo "$as_me:15258: \"$ac_link\"") >&5 2709+if { (eval echo "$as_me:15259: \"$ac_link\"") >&5 2710 (eval $ac_link) 2>&5 2711 ac_status=$? 2712- echo "$as_me:15261: \$? = $ac_status" >&5 2713+ echo "$as_me:15262: \$? = $ac_status" >&5 2714 (exit $ac_status); } && 2715 { ac_try='test -s conftest$ac_exeext' 2716- { (eval echo "$as_me:15264: \"$ac_try\"") >&5 2717+ { (eval echo "$as_me:15265: \"$ac_try\"") >&5 2718 (eval $ac_try) 2>&5 2719 ac_status=$? 2720- echo "$as_me:15267: \$? = $ac_status" >&5 2721+ echo "$as_me:15268: \$? = $ac_status" >&5 2722 (exit $ac_status); }; }; then 2723 ac_cv_lib_X11_XOpenDisplay=yes 2724 else 2725@@ -15275,7 +15276,7 @@ 2726 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 2727 LIBS=$ac_check_lib_save_LIBS 2728 fi 2729-echo "$as_me:15278: result: $ac_cv_lib_X11_XOpenDisplay" >&5 2730+echo "$as_me:15279: result: $ac_cv_lib_X11_XOpenDisplay" >&5 2731 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 2732 if test $ac_cv_lib_X11_XOpenDisplay = yes; then 2733 2734@@ -15297,7 +15298,7 @@ 2735 2736 fi 2737 2738-echo "$as_me:15300: checking for XCurses library" >&5 2739+echo "$as_me:15301: checking for XCurses library" >&5 2740 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6 2741 if test "${cf_cv_lib_XCurses+set}" = set; then 2742 echo $ECHO_N "(cached) $ECHO_C" >&6 2743@@ -15320,7 +15321,7 @@ 2744 LIBS="$cf_add_libs" 2745 2746 cat >conftest.$ac_ext <<_ACEOF 2747-#line 15323 "configure" 2748+#line 15324 "configure" 2749 #include "confdefs.h" 2750 2751 #include <xcurses.h> 2752@@ -15335,16 +15336,16 @@ 2753 } 2754 _ACEOF 2755 rm -f conftest.$ac_objext conftest$ac_exeext 2756-if { (eval echo "$as_me:15338: \"$ac_link\"") >&5 2757+if { (eval echo "$as_me:15339: \"$ac_link\"") >&5 2758 (eval $ac_link) 2>&5 2759 ac_status=$? 2760- echo "$as_me:15341: \$? = $ac_status" >&5 2761+ echo "$as_me:15342: \$? = $ac_status" >&5 2762 (exit $ac_status); } && 2763 { ac_try='test -s conftest$ac_exeext' 2764- { (eval echo "$as_me:15344: \"$ac_try\"") >&5 2765+ { (eval echo "$as_me:15345: \"$ac_try\"") >&5 2766 (eval $ac_try) 2>&5 2767 ac_status=$? 2768- echo "$as_me:15347: \$? = $ac_status" >&5 2769+ echo "$as_me:15348: \$? = $ac_status" >&5 2770 (exit $ac_status); }; }; then 2771 cf_cv_lib_XCurses=yes 2772 else 2773@@ -15355,7 +15356,7 @@ 2774 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 2775 2776 fi 2777-echo "$as_me:15358: result: $cf_cv_lib_XCurses" >&5 2778+echo "$as_me:15359: result: $cf_cv_lib_XCurses" >&5 2779 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6 2780 2781 fi 2782@@ -15370,23 +15371,23 @@ 2783 #define XCURSES 1 2784 EOF 2785 2786- echo "$as_me:15373: checking for xcurses.h" >&5 2787+ echo "$as_me:15374: checking for xcurses.h" >&5 2788 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6 2789 if test "${ac_cv_header_xcurses_h+set}" = set; then 2790 echo $ECHO_N "(cached) $ECHO_C" >&6 2791 else 2792 cat >conftest.$ac_ext <<_ACEOF 2793-#line 15379 "configure" 2794+#line 15380 "configure" 2795 #include "confdefs.h" 2796 #include <xcurses.h> 2797 _ACEOF 2798-if { (eval echo "$as_me:15383: \"$ac_cpp conftest.$ac_ext\"") >&5 2799+if { (eval echo "$as_me:15384: \"$ac_cpp conftest.$ac_ext\"") >&5 2800 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 2801 ac_status=$? 2802 egrep -v '^ *\+' conftest.er1 >conftest.err 2803 rm -f conftest.er1 2804 cat conftest.err >&5 2805- echo "$as_me:15389: \$? = $ac_status" >&5 2806+ echo "$as_me:15390: \$? = $ac_status" >&5 2807 (exit $ac_status); } >/dev/null; then 2808 if test -s conftest.err; then 2809 ac_cpp_err=$ac_c_preproc_warn_flag 2810@@ -15405,7 +15406,7 @@ 2811 fi 2812 rm -f conftest.err conftest.$ac_ext 2813 fi 2814-echo "$as_me:15408: result: $ac_cv_header_xcurses_h" >&5 2815+echo "$as_me:15409: result: $ac_cv_header_xcurses_h" >&5 2816 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6 2817 if test $ac_cv_header_xcurses_h = yes; then 2818 2819@@ -15416,14 +15417,14 @@ 2820 fi 2821 2822 else 2823- { { echo "$as_me:15419: error: Cannot link with XCurses" >&5 2824+ { { echo "$as_me:15420: error: Cannot link with XCurses" >&5 2825 echo "$as_me: error: Cannot link with XCurses" >&2;} 2826 { (exit 1); exit 1; }; } 2827 fi 2828 2829 ;; 2830 (*) 2831- { { echo "$as_me:15426: error: unexpected screen-value: $cf_cv_screen" >&5 2832+ { { echo "$as_me:15427: error: unexpected screen-value: $cf_cv_screen" >&5 2833 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;} 2834 { (exit 1); exit 1; }; } 2835 ;; 2836@@ -15431,7 +15432,7 @@ 2837 2838 : ${cf_nculib_root:=$cf_cv_screen} 2839 as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh` 2840-echo "$as_me:15434: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5 2841+echo "$as_me:15435: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5 2842 echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6 2843 if eval "test \"\${$as_ac_Lib+set}\" = set"; then 2844 echo $ECHO_N "(cached) $ECHO_C" >&6 2845@@ -15439,7 +15440,7 @@ 2846 ac_check_lib_save_LIBS=$LIBS 2847 LIBS="-l$cf_nculib_root $LIBS" 2848 cat >conftest.$ac_ext <<_ACEOF 2849-#line 15442 "configure" 2850+#line 15443 "configure" 2851 #include "confdefs.h" 2852 2853 /* Override any gcc2 internal prototype to avoid an error. */ 2854@@ -15458,16 +15459,16 @@ 2855 } 2856 _ACEOF 2857 rm -f conftest.$ac_objext conftest$ac_exeext 2858-if { (eval echo "$as_me:15461: \"$ac_link\"") >&5 2859+if { (eval echo "$as_me:15462: \"$ac_link\"") >&5 2860 (eval $ac_link) 2>&5 2861 ac_status=$? 2862- echo "$as_me:15464: \$? = $ac_status" >&5 2863+ echo "$as_me:15465: \$? = $ac_status" >&5 2864 (exit $ac_status); } && 2865 { ac_try='test -s conftest$ac_exeext' 2866- { (eval echo "$as_me:15467: \"$ac_try\"") >&5 2867+ { (eval echo "$as_me:15468: \"$ac_try\"") >&5 2868 (eval $ac_try) 2>&5 2869 ac_status=$? 2870- echo "$as_me:15470: \$? = $ac_status" >&5 2871+ echo "$as_me:15471: \$? = $ac_status" >&5 2872 (exit $ac_status); }; }; then 2873 eval "$as_ac_Lib=yes" 2874 else 2875@@ -15478,7 +15479,7 @@ 2876 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 2877 LIBS=$ac_check_lib_save_LIBS 2878 fi 2879-echo "$as_me:15481: result: `eval echo '${'$as_ac_Lib'}'`" >&5 2880+echo "$as_me:15482: result: `eval echo '${'$as_ac_Lib'}'`" >&5 2881 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 2882 if test `eval echo '${'$as_ac_Lib'}'` = yes; then 2883 cf_cv_ncurses_pthreads=yes 2884@@ -15513,7 +15514,7 @@ 2885 ;; 2886 esac 2887 2888-echo "$as_me:15516: checking for X11 rgb file" >&5 2889+echo "$as_me:15517: checking for X11 rgb file" >&5 2890 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6 2891 2892 # Check whether --with-x11-rgb or --without-x11-rgb was given. 2893@@ -15577,7 +15578,7 @@ 2894 cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%` 2895 ;; 2896 (*) 2897- { { echo "$as_me:15580: error: expected a pathname, not \"$cf_path\"" >&5 2898+ { { echo "$as_me:15581: error: expected a pathname, not \"$cf_path\"" >&5 2899 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} 2900 { (exit 1); exit 1; }; } 2901 ;; 2902@@ -15585,7 +15586,7 @@ 2903 2904 fi 2905 2906-echo "$as_me:15588: result: $RGB_PATH" >&5 2907+echo "$as_me:15589: result: $RGB_PATH" >&5 2908 echo "${ECHO_T}$RGB_PATH" >&6 2909 2910 cat >>confdefs.h <<EOF 2911@@ -15626,7 +15627,7 @@ 2912 ;; 2913 esac 2914 2915-echo "$as_me:15629: checking if you want to check for panel functions" >&5 2916+echo "$as_me:15630: checking if you want to check for panel functions" >&5 2917 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6 2918 2919 # Check whether --enable-panel or --disable-panel was given. 2920@@ -15643,7 +15644,7 @@ 2921 cf_enable_panel=$cf_default_panel 2922 2923 fi; 2924-echo "$as_me:15646: result: $cf_enable_panel" >&5 2925+echo "$as_me:15647: result: $cf_enable_panel" >&5 2926 echo "${ECHO_T}$cf_enable_panel" >&6 2927 if test $cf_enable_panel = yes 2928 then 2929@@ -15654,13 +15655,13 @@ 2930 if test "x${NCURSES_CONFIG_PKG}" = xnone; then 2931 : 2932 elif test "x${PKG_CONFIG:=none}" != xnone; then 2933- echo "$as_me:15657: checking pkg-config for panel$cf_cv_libtype" >&5 2934+ echo "$as_me:15658: checking pkg-config for panel$cf_cv_libtype" >&5 2935 echo $ECHO_N "checking pkg-config for panel$cf_cv_libtype... $ECHO_C" >&6 2936 if "$PKG_CONFIG" --exists panel$cf_cv_libtype ; then 2937- echo "$as_me:15660: result: yes" >&5 2938+ echo "$as_me:15661: result: yes" >&5 2939 echo "${ECHO_T}yes" >&6 2940 2941- echo "$as_me:15663: checking if the panel$cf_cv_libtype package files work" >&5 2942+ echo "$as_me:15664: checking if the panel$cf_cv_libtype package files work" >&5 2943 echo $ECHO_N "checking if the panel$cf_cv_libtype package files work... $ECHO_C" >&6 2944 2945 cf_save_CPPFLAGS="$CPPFLAGS" 2946@@ -15781,7 +15782,7 @@ 2947 LIBS="$cf_add_libs" 2948 2949 cat >conftest.$ac_ext <<_ACEOF 2950-#line 15784 "configure" 2951+#line 15785 "configure" 2952 #include "confdefs.h" 2953 #include <panel.h> 2954 int 2955@@ -15793,37 +15794,37 @@ 2956 } 2957 _ACEOF 2958 rm -f conftest.$ac_objext conftest$ac_exeext 2959-if { (eval echo "$as_me:15796: \"$ac_link\"") >&5 2960+if { (eval echo "$as_me:15797: \"$ac_link\"") >&5 2961 (eval $ac_link) 2>&5 2962 ac_status=$? 2963- echo "$as_me:15799: \$? = $ac_status" >&5 2964+ echo "$as_me:15800: \$? = $ac_status" >&5 2965 (exit $ac_status); } && 2966 { ac_try='test -s conftest$ac_exeext' 2967- { (eval echo "$as_me:15802: \"$ac_try\"") >&5 2968+ { (eval echo "$as_me:15803: \"$ac_try\"") >&5 2969 (eval $ac_try) 2>&5 2970 ac_status=$? 2971- echo "$as_me:15805: \$? = $ac_status" >&5 2972+ echo "$as_me:15806: \$? = $ac_status" >&5 2973 (exit $ac_status); }; }; then 2974 if test "$cross_compiling" = yes; then 2975 cf_have_curses_lib=maybe 2976 else 2977 cat >conftest.$ac_ext <<_ACEOF 2978-#line 15811 "configure" 2979+#line 15812 "configure" 2980 #include "confdefs.h" 2981 #include <panel.h> 2982 int main(void) 2983 { (void) new_panel ( 0 ); return 0; } 2984 _ACEOF 2985 rm -f conftest$ac_exeext 2986-if { (eval echo "$as_me:15818: \"$ac_link\"") >&5 2987+if { (eval echo "$as_me:15819: \"$ac_link\"") >&5 2988 (eval $ac_link) 2>&5 2989 ac_status=$? 2990- echo "$as_me:15821: \$? = $ac_status" >&5 2991+ echo "$as_me:15822: \$? = $ac_status" >&5 2992 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 2993- { (eval echo "$as_me:15823: \"$ac_try\"") >&5 2994+ { (eval echo "$as_me:15824: \"$ac_try\"") >&5 2995 (eval $ac_try) 2>&5 2996 ac_status=$? 2997- echo "$as_me:15826: \$? = $ac_status" >&5 2998+ echo "$as_me:15827: \$? = $ac_status" >&5 2999 (exit $ac_status); }; }; then 3000 cf_have_curses_lib=yes 3001 else 3002@@ -15840,7 +15841,7 @@ 3003 cf_have_curses_lib=no 3004 fi 3005 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 3006- echo "$as_me:15843: result: $cf_have_curses_lib" >&5 3007+ echo "$as_me:15844: result: $cf_have_curses_lib" >&5 3008 echo "${ECHO_T}$cf_have_curses_lib" >&6 3009 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes 3010 if test "$cf_have_curses_lib" != "yes" 3011@@ -15860,7 +15861,7 @@ 3012 fi 3013 if test "$cf_have_curses_lib" = no; then 3014 as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh` 3015-echo "$as_me:15863: checking for new_panel in -lpanel$cf_cv_libtype" >&5 3016+echo "$as_me:15864: checking for new_panel in -lpanel$cf_cv_libtype" >&5 3017 echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6 3018 if eval "test \"\${$as_ac_Lib+set}\" = set"; then 3019 echo $ECHO_N "(cached) $ECHO_C" >&6 3020@@ -15868,7 +15869,7 @@ 3021 ac_check_lib_save_LIBS=$LIBS 3022 LIBS="-lpanel$cf_cv_libtype $LIBS" 3023 cat >conftest.$ac_ext <<_ACEOF 3024-#line 15871 "configure" 3025+#line 15872 "configure" 3026 #include "confdefs.h" 3027 3028 /* Override any gcc2 internal prototype to avoid an error. */ 3029@@ -15887,16 +15888,16 @@ 3030 } 3031 _ACEOF 3032 rm -f conftest.$ac_objext conftest$ac_exeext 3033-if { (eval echo "$as_me:15890: \"$ac_link\"") >&5 3034+if { (eval echo "$as_me:15891: \"$ac_link\"") >&5 3035 (eval $ac_link) 2>&5 3036 ac_status=$? 3037- echo "$as_me:15893: \$? = $ac_status" >&5 3038+ echo "$as_me:15894: \$? = $ac_status" >&5 3039 (exit $ac_status); } && 3040 { ac_try='test -s conftest$ac_exeext' 3041- { (eval echo "$as_me:15896: \"$ac_try\"") >&5 3042+ { (eval echo "$as_me:15897: \"$ac_try\"") >&5 3043 (eval $ac_try) 2>&5 3044 ac_status=$? 3045- echo "$as_me:15899: \$? = $ac_status" >&5 3046+ echo "$as_me:15900: \$? = $ac_status" >&5 3047 (exit $ac_status); }; }; then 3048 eval "$as_ac_Lib=yes" 3049 else 3050@@ -15907,7 +15908,7 @@ 3051 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 3052 LIBS=$ac_check_lib_save_LIBS 3053 fi 3054-echo "$as_me:15910: result: `eval echo '${'$as_ac_Lib'}'`" >&5 3055+echo "$as_me:15911: result: `eval echo '${'$as_ac_Lib'}'`" >&5 3056 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 3057 if test `eval echo '${'$as_ac_Lib'}'` = yes; then 3058 3059@@ -15940,7 +15941,7 @@ 3060 cf_curses_headers="$cf_curses_headers panel.h" 3061 fi 3062 3063-echo "$as_me:15943: checking if you want to check for menu functions" >&5 3064+echo "$as_me:15944: checking if you want to check for menu functions" >&5 3065 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6 3066 3067 # Check whether --enable-menu or --disable-menu was given. 3068@@ -15957,7 +15958,7 @@ 3069 cf_enable_menu=$cf_default_menu 3070 3071 fi; 3072-echo "$as_me:15960: result: $cf_enable_menu" >&5 3073+echo "$as_me:15961: result: $cf_enable_menu" >&5 3074 echo "${ECHO_T}$cf_enable_menu" >&6 3075 if test $cf_enable_menu = yes 3076 then 3077@@ -15966,14 +15967,14 @@ 3078 ;; 3079 (curses*) 3080 3081-echo "$as_me:15969: checking for NetBSD menu.h" >&5 3082+echo "$as_me:15970: checking for NetBSD menu.h" >&5 3083 echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6 3084 if test "${cf_cv_netbsd_menu_h+set}" = set; then 3085 echo $ECHO_N "(cached) $ECHO_C" >&6 3086 else 3087 3088 cat >conftest.$ac_ext <<_ACEOF 3089-#line 15976 "configure" 3090+#line 15977 "configure" 3091 #include "confdefs.h" 3092 3093 #include <${cf_cv_ncurses_header:-curses.h}> 3094@@ -15991,16 +15992,16 @@ 3095 } 3096 _ACEOF 3097 rm -f conftest.$ac_objext 3098-if { (eval echo "$as_me:15994: \"$ac_compile\"") >&5 3099+if { (eval echo "$as_me:15995: \"$ac_compile\"") >&5 3100 (eval $ac_compile) 2>&5 3101 ac_status=$? 3102- echo "$as_me:15997: \$? = $ac_status" >&5 3103+ echo "$as_me:15998: \$? = $ac_status" >&5 3104 (exit $ac_status); } && 3105 { ac_try='test -s conftest.$ac_objext' 3106- { (eval echo "$as_me:16000: \"$ac_try\"") >&5 3107+ { (eval echo "$as_me:16001: \"$ac_try\"") >&5 3108 (eval $ac_try) 2>&5 3109 ac_status=$? 3110- echo "$as_me:16003: \$? = $ac_status" >&5 3111+ echo "$as_me:16004: \$? = $ac_status" >&5 3112 (exit $ac_status); }; }; then 3113 cf_cv_netbsd_menu_h=yes 3114 3115@@ -16012,7 +16013,7 @@ 3116 rm -f conftest.$ac_objext conftest.$ac_ext 3117 3118 fi 3119-echo "$as_me:16015: result: $cf_cv_netbsd_menu_h" >&5 3120+echo "$as_me:16016: result: $cf_cv_netbsd_menu_h" >&5 3121 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6 3122 3123 test "$cf_cv_netbsd_menu_h" = yes && 3124@@ -16029,13 +16030,13 @@ 3125 if test "x${NCURSES_CONFIG_PKG}" = xnone; then 3126 : 3127 elif test "x${PKG_CONFIG:=none}" != xnone; then 3128- echo "$as_me:16032: checking pkg-config for menu$cf_cv_libtype" >&5 3129+ echo "$as_me:16033: checking pkg-config for menu$cf_cv_libtype" >&5 3130 echo $ECHO_N "checking pkg-config for menu$cf_cv_libtype... $ECHO_C" >&6 3131 if "$PKG_CONFIG" --exists menu$cf_cv_libtype ; then 3132- echo "$as_me:16035: result: yes" >&5 3133+ echo "$as_me:16036: result: yes" >&5 3134 echo "${ECHO_T}yes" >&6 3135 3136- echo "$as_me:16038: checking if the menu$cf_cv_libtype package files work" >&5 3137+ echo "$as_me:16039: checking if the menu$cf_cv_libtype package files work" >&5 3138 echo $ECHO_N "checking if the menu$cf_cv_libtype package files work... $ECHO_C" >&6 3139 3140 cf_save_CPPFLAGS="$CPPFLAGS" 3141@@ -16156,7 +16157,7 @@ 3142 LIBS="$cf_add_libs" 3143 3144 cat >conftest.$ac_ext <<_ACEOF 3145-#line 16159 "configure" 3146+#line 16160 "configure" 3147 #include "confdefs.h" 3148 #include <menu.h> 3149 int 3150@@ -16168,37 +16169,37 @@ 3151 } 3152 _ACEOF 3153 rm -f conftest.$ac_objext conftest$ac_exeext 3154-if { (eval echo "$as_me:16171: \"$ac_link\"") >&5 3155+if { (eval echo "$as_me:16172: \"$ac_link\"") >&5 3156 (eval $ac_link) 2>&5 3157 ac_status=$? 3158- echo "$as_me:16174: \$? = $ac_status" >&5 3159+ echo "$as_me:16175: \$? = $ac_status" >&5 3160 (exit $ac_status); } && 3161 { ac_try='test -s conftest$ac_exeext' 3162- { (eval echo "$as_me:16177: \"$ac_try\"") >&5 3163+ { (eval echo "$as_me:16178: \"$ac_try\"") >&5 3164 (eval $ac_try) 2>&5 3165 ac_status=$? 3166- echo "$as_me:16180: \$? = $ac_status" >&5 3167+ echo "$as_me:16181: \$? = $ac_status" >&5 3168 (exit $ac_status); }; }; then 3169 if test "$cross_compiling" = yes; then 3170 cf_have_curses_lib=maybe 3171 else 3172 cat >conftest.$ac_ext <<_ACEOF 3173-#line 16186 "configure" 3174+#line 16187 "configure" 3175 #include "confdefs.h" 3176 #include <menu.h> 3177 int main(void) 3178 { (void) menu_driver ( 0,0 ); return 0; } 3179 _ACEOF 3180 rm -f conftest$ac_exeext 3181-if { (eval echo "$as_me:16193: \"$ac_link\"") >&5 3182+if { (eval echo "$as_me:16194: \"$ac_link\"") >&5 3183 (eval $ac_link) 2>&5 3184 ac_status=$? 3185- echo "$as_me:16196: \$? = $ac_status" >&5 3186+ echo "$as_me:16197: \$? = $ac_status" >&5 3187 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 3188- { (eval echo "$as_me:16198: \"$ac_try\"") >&5 3189+ { (eval echo "$as_me:16199: \"$ac_try\"") >&5 3190 (eval $ac_try) 2>&5 3191 ac_status=$? 3192- echo "$as_me:16201: \$? = $ac_status" >&5 3193+ echo "$as_me:16202: \$? = $ac_status" >&5 3194 (exit $ac_status); }; }; then 3195 cf_have_curses_lib=yes 3196 else 3197@@ -16215,7 +16216,7 @@ 3198 cf_have_curses_lib=no 3199 fi 3200 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 3201- echo "$as_me:16218: result: $cf_have_curses_lib" >&5 3202+ echo "$as_me:16219: result: $cf_have_curses_lib" >&5 3203 echo "${ECHO_T}$cf_have_curses_lib" >&6 3204 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes 3205 if test "$cf_have_curses_lib" != "yes" 3206@@ -16235,7 +16236,7 @@ 3207 fi 3208 if test "$cf_have_curses_lib" = no; then 3209 as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh` 3210-echo "$as_me:16238: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 3211+echo "$as_me:16239: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 3212 echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6 3213 if eval "test \"\${$as_ac_Lib+set}\" = set"; then 3214 echo $ECHO_N "(cached) $ECHO_C" >&6 3215@@ -16243,7 +16244,7 @@ 3216 ac_check_lib_save_LIBS=$LIBS 3217 LIBS="-lmenu$cf_cv_libtype $LIBS" 3218 cat >conftest.$ac_ext <<_ACEOF 3219-#line 16246 "configure" 3220+#line 16247 "configure" 3221 #include "confdefs.h" 3222 3223 /* Override any gcc2 internal prototype to avoid an error. */ 3224@@ -16262,16 +16263,16 @@ 3225 } 3226 _ACEOF 3227 rm -f conftest.$ac_objext conftest$ac_exeext 3228-if { (eval echo "$as_me:16265: \"$ac_link\"") >&5 3229+if { (eval echo "$as_me:16266: \"$ac_link\"") >&5 3230 (eval $ac_link) 2>&5 3231 ac_status=$? 3232- echo "$as_me:16268: \$? = $ac_status" >&5 3233+ echo "$as_me:16269: \$? = $ac_status" >&5 3234 (exit $ac_status); } && 3235 { ac_try='test -s conftest$ac_exeext' 3236- { (eval echo "$as_me:16271: \"$ac_try\"") >&5 3237+ { (eval echo "$as_me:16272: \"$ac_try\"") >&5 3238 (eval $ac_try) 2>&5 3239 ac_status=$? 3240- echo "$as_me:16274: \$? = $ac_status" >&5 3241+ echo "$as_me:16275: \$? = $ac_status" >&5 3242 (exit $ac_status); }; }; then 3243 eval "$as_ac_Lib=yes" 3244 else 3245@@ -16282,7 +16283,7 @@ 3246 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 3247 LIBS=$ac_check_lib_save_LIBS 3248 fi 3249-echo "$as_me:16285: result: `eval echo '${'$as_ac_Lib'}'`" >&5 3250+echo "$as_me:16286: result: `eval echo '${'$as_ac_Lib'}'`" >&5 3251 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 3252 if test `eval echo '${'$as_ac_Lib'}'` = yes; then 3253 3254@@ -16315,7 +16316,7 @@ 3255 cf_curses_headers="$cf_curses_headers menu.h" 3256 fi 3257 3258-echo "$as_me:16318: checking if you want to check for form functions" >&5 3259+echo "$as_me:16319: checking if you want to check for form functions" >&5 3260 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6 3261 3262 # Check whether --enable-form or --disable-form was given. 3263@@ -16332,7 +16333,7 @@ 3264 cf_enable_form=$cf_default_form 3265 3266 fi; 3267-echo "$as_me:16335: result: $cf_enable_form" >&5 3268+echo "$as_me:16336: result: $cf_enable_form" >&5 3269 echo "${ECHO_T}$cf_enable_form" >&6 3270 if test $cf_enable_form = yes 3271 then 3272@@ -16341,14 +16342,14 @@ 3273 ;; 3274 (curses*) 3275 3276-echo "$as_me:16344: checking for NetBSD form.h" >&5 3277+echo "$as_me:16345: checking for NetBSD form.h" >&5 3278 echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6 3279 if test "${cf_cv_netbsd_form_h+set}" = set; then 3280 echo $ECHO_N "(cached) $ECHO_C" >&6 3281 else 3282 3283 cat >conftest.$ac_ext <<_ACEOF 3284-#line 16351 "configure" 3285+#line 16352 "configure" 3286 #include "confdefs.h" 3287 3288 #include <${cf_cv_ncurses_header:-curses.h}> 3289@@ -16367,16 +16368,16 @@ 3290 } 3291 _ACEOF 3292 rm -f conftest.$ac_objext 3293-if { (eval echo "$as_me:16370: \"$ac_compile\"") >&5 3294+if { (eval echo "$as_me:16371: \"$ac_compile\"") >&5 3295 (eval $ac_compile) 2>&5 3296 ac_status=$? 3297- echo "$as_me:16373: \$? = $ac_status" >&5 3298+ echo "$as_me:16374: \$? = $ac_status" >&5 3299 (exit $ac_status); } && 3300 { ac_try='test -s conftest.$ac_objext' 3301- { (eval echo "$as_me:16376: \"$ac_try\"") >&5 3302+ { (eval echo "$as_me:16377: \"$ac_try\"") >&5 3303 (eval $ac_try) 2>&5 3304 ac_status=$? 3305- echo "$as_me:16379: \$? = $ac_status" >&5 3306+ echo "$as_me:16380: \$? = $ac_status" >&5 3307 (exit $ac_status); }; }; then 3308 cf_cv_netbsd_form_h=yes 3309 3310@@ -16388,7 +16389,7 @@ 3311 rm -f conftest.$ac_objext conftest.$ac_ext 3312 3313 fi 3314-echo "$as_me:16391: result: $cf_cv_netbsd_form_h" >&5 3315+echo "$as_me:16392: result: $cf_cv_netbsd_form_h" >&5 3316 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6 3317 3318 test "$cf_cv_netbsd_form_h" = yes && 3319@@ -16405,13 +16406,13 @@ 3320 if test "x${NCURSES_CONFIG_PKG}" = xnone; then 3321 : 3322 elif test "x${PKG_CONFIG:=none}" != xnone; then 3323- echo "$as_me:16408: checking pkg-config for form$cf_cv_libtype" >&5 3324+ echo "$as_me:16409: checking pkg-config for form$cf_cv_libtype" >&5 3325 echo $ECHO_N "checking pkg-config for form$cf_cv_libtype... $ECHO_C" >&6 3326 if "$PKG_CONFIG" --exists form$cf_cv_libtype ; then 3327- echo "$as_me:16411: result: yes" >&5 3328+ echo "$as_me:16412: result: yes" >&5 3329 echo "${ECHO_T}yes" >&6 3330 3331- echo "$as_me:16414: checking if the form$cf_cv_libtype package files work" >&5 3332+ echo "$as_me:16415: checking if the form$cf_cv_libtype package files work" >&5 3333 echo $ECHO_N "checking if the form$cf_cv_libtype package files work... $ECHO_C" >&6 3334 3335 cf_save_CPPFLAGS="$CPPFLAGS" 3336@@ -16532,7 +16533,7 @@ 3337 LIBS="$cf_add_libs" 3338 3339 cat >conftest.$ac_ext <<_ACEOF 3340-#line 16535 "configure" 3341+#line 16536 "configure" 3342 #include "confdefs.h" 3343 #include <form.h> 3344 int 3345@@ -16544,37 +16545,37 @@ 3346 } 3347 _ACEOF 3348 rm -f conftest.$ac_objext conftest$ac_exeext 3349-if { (eval echo "$as_me:16547: \"$ac_link\"") >&5 3350+if { (eval echo "$as_me:16548: \"$ac_link\"") >&5 3351 (eval $ac_link) 2>&5 3352 ac_status=$? 3353- echo "$as_me:16550: \$? = $ac_status" >&5 3354+ echo "$as_me:16551: \$? = $ac_status" >&5 3355 (exit $ac_status); } && 3356 { ac_try='test -s conftest$ac_exeext' 3357- { (eval echo "$as_me:16553: \"$ac_try\"") >&5 3358+ { (eval echo "$as_me:16554: \"$ac_try\"") >&5 3359 (eval $ac_try) 2>&5 3360 ac_status=$? 3361- echo "$as_me:16556: \$? = $ac_status" >&5 3362+ echo "$as_me:16557: \$? = $ac_status" >&5 3363 (exit $ac_status); }; }; then 3364 if test "$cross_compiling" = yes; then 3365 cf_have_curses_lib=maybe 3366 else 3367 cat >conftest.$ac_ext <<_ACEOF 3368-#line 16562 "configure" 3369+#line 16563 "configure" 3370 #include "confdefs.h" 3371 #include <form.h> 3372 int main(void) 3373 { (void) form_driver ( 0,0 ); return 0; } 3374 _ACEOF 3375 rm -f conftest$ac_exeext 3376-if { (eval echo "$as_me:16569: \"$ac_link\"") >&5 3377+if { (eval echo "$as_me:16570: \"$ac_link\"") >&5 3378 (eval $ac_link) 2>&5 3379 ac_status=$? 3380- echo "$as_me:16572: \$? = $ac_status" >&5 3381+ echo "$as_me:16573: \$? = $ac_status" >&5 3382 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 3383- { (eval echo "$as_me:16574: \"$ac_try\"") >&5 3384+ { (eval echo "$as_me:16575: \"$ac_try\"") >&5 3385 (eval $ac_try) 2>&5 3386 ac_status=$? 3387- echo "$as_me:16577: \$? = $ac_status" >&5 3388+ echo "$as_me:16578: \$? = $ac_status" >&5 3389 (exit $ac_status); }; }; then 3390 cf_have_curses_lib=yes 3391 else 3392@@ -16591,7 +16592,7 @@ 3393 cf_have_curses_lib=no 3394 fi 3395 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 3396- echo "$as_me:16594: result: $cf_have_curses_lib" >&5 3397+ echo "$as_me:16595: result: $cf_have_curses_lib" >&5 3398 echo "${ECHO_T}$cf_have_curses_lib" >&6 3399 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes 3400 if test "$cf_have_curses_lib" != "yes" 3401@@ -16611,7 +16612,7 @@ 3402 fi 3403 if test "$cf_have_curses_lib" = no; then 3404 as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh` 3405-echo "$as_me:16614: checking for form_driver in -lform$cf_cv_libtype" >&5 3406+echo "$as_me:16615: checking for form_driver in -lform$cf_cv_libtype" >&5 3407 echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6 3408 if eval "test \"\${$as_ac_Lib+set}\" = set"; then 3409 echo $ECHO_N "(cached) $ECHO_C" >&6 3410@@ -16619,7 +16620,7 @@ 3411 ac_check_lib_save_LIBS=$LIBS 3412 LIBS="-lform$cf_cv_libtype $LIBS" 3413 cat >conftest.$ac_ext <<_ACEOF 3414-#line 16622 "configure" 3415+#line 16623 "configure" 3416 #include "confdefs.h" 3417 3418 /* Override any gcc2 internal prototype to avoid an error. */ 3419@@ -16638,16 +16639,16 @@ 3420 } 3421 _ACEOF 3422 rm -f conftest.$ac_objext conftest$ac_exeext 3423-if { (eval echo "$as_me:16641: \"$ac_link\"") >&5 3424+if { (eval echo "$as_me:16642: \"$ac_link\"") >&5 3425 (eval $ac_link) 2>&5 3426 ac_status=$? 3427- echo "$as_me:16644: \$? = $ac_status" >&5 3428+ echo "$as_me:16645: \$? = $ac_status" >&5 3429 (exit $ac_status); } && 3430 { ac_try='test -s conftest$ac_exeext' 3431- { (eval echo "$as_me:16647: \"$ac_try\"") >&5 3432+ { (eval echo "$as_me:16648: \"$ac_try\"") >&5 3433 (eval $ac_try) 2>&5 3434 ac_status=$? 3435- echo "$as_me:16650: \$? = $ac_status" >&5 3436+ echo "$as_me:16651: \$? = $ac_status" >&5 3437 (exit $ac_status); }; }; then 3438 eval "$as_ac_Lib=yes" 3439 else 3440@@ -16658,7 +16659,7 @@ 3441 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 3442 LIBS=$ac_check_lib_save_LIBS 3443 fi 3444-echo "$as_me:16661: result: `eval echo '${'$as_ac_Lib'}'`" >&5 3445+echo "$as_me:16662: result: `eval echo '${'$as_ac_Lib'}'`" >&5 3446 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 3447 if test `eval echo '${'$as_ac_Lib'}'` = yes; then 3448 3449@@ -16696,23 +16697,23 @@ 3450 for ac_header in $cf_curses_headers 3451 do 3452 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 3453-echo "$as_me:16699: checking for $ac_header" >&5 3454+echo "$as_me:16700: checking for $ac_header" >&5 3455 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 3456 if eval "test \"\${$as_ac_Header+set}\" = set"; then 3457 echo $ECHO_N "(cached) $ECHO_C" >&6 3458 else 3459 cat >conftest.$ac_ext <<_ACEOF 3460-#line 16705 "configure" 3461+#line 16706 "configure" 3462 #include "confdefs.h" 3463 #include <$ac_header> 3464 _ACEOF 3465-if { (eval echo "$as_me:16709: \"$ac_cpp conftest.$ac_ext\"") >&5 3466+if { (eval echo "$as_me:16710: \"$ac_cpp conftest.$ac_ext\"") >&5 3467 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 3468 ac_status=$? 3469 egrep -v '^ *\+' conftest.er1 >conftest.err 3470 rm -f conftest.er1 3471 cat conftest.err >&5 3472- echo "$as_me:16715: \$? = $ac_status" >&5 3473+ echo "$as_me:16716: \$? = $ac_status" >&5 3474 (exit $ac_status); } >/dev/null; then 3475 if test -s conftest.err; then 3476 ac_cpp_err=$ac_c_preproc_warn_flag 3477@@ -16731,7 +16732,7 @@ 3478 fi 3479 rm -f conftest.err conftest.$ac_ext 3480 fi 3481-echo "$as_me:16734: result: `eval echo '${'$as_ac_Header'}'`" >&5 3482+echo "$as_me:16735: result: `eval echo '${'$as_ac_Header'}'`" >&5 3483 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 3484 if test `eval echo '${'$as_ac_Header'}'` = yes; then 3485 cat >>confdefs.h <<EOF 3486@@ -16741,13 +16742,13 @@ 3487 fi 3488 done 3489 3490-echo "$as_me:16744: checking for ANSI C header files" >&5 3491+echo "$as_me:16745: checking for ANSI C header files" >&5 3492 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 3493 if test "${ac_cv_header_stdc+set}" = set; then 3494 echo $ECHO_N "(cached) $ECHO_C" >&6 3495 else 3496 cat >conftest.$ac_ext <<_ACEOF 3497-#line 16750 "configure" 3498+#line 16751 "configure" 3499 #include "confdefs.h" 3500 #include <stdlib.h> 3501 #include <stdarg.h> 3502@@ -16755,13 +16756,13 @@ 3503 #include <float.h> 3504 3505 _ACEOF 3506-if { (eval echo "$as_me:16758: \"$ac_cpp conftest.$ac_ext\"") >&5 3507+if { (eval echo "$as_me:16759: \"$ac_cpp conftest.$ac_ext\"") >&5 3508 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 3509 ac_status=$? 3510 egrep -v '^ *\+' conftest.er1 >conftest.err 3511 rm -f conftest.er1 3512 cat conftest.err >&5 3513- echo "$as_me:16764: \$? = $ac_status" >&5 3514+ echo "$as_me:16765: \$? = $ac_status" >&5 3515 (exit $ac_status); } >/dev/null; then 3516 if test -s conftest.err; then 3517 ac_cpp_err=$ac_c_preproc_warn_flag 3518@@ -16783,7 +16784,7 @@ 3519 if test $ac_cv_header_stdc = yes; then 3520 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 3521 cat >conftest.$ac_ext <<_ACEOF 3522-#line 16786 "configure" 3523+#line 16787 "configure" 3524 #include "confdefs.h" 3525 #include <string.h> 3526 3527@@ -16801,7 +16802,7 @@ 3528 if test $ac_cv_header_stdc = yes; then 3529 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 3530 cat >conftest.$ac_ext <<_ACEOF 3531-#line 16804 "configure" 3532+#line 16805 "configure" 3533 #include "confdefs.h" 3534 #include <stdlib.h> 3535 3536@@ -16822,7 +16823,7 @@ 3537 : 3538 else 3539 cat >conftest.$ac_ext <<_ACEOF 3540-#line 16825 "configure" 3541+#line 16826 "configure" 3542 #include "confdefs.h" 3543 #include <ctype.h> 3544 #if ((' ' & 0x0FF) == 0x020) 3545@@ -16848,15 +16849,15 @@ 3546 } 3547 _ACEOF 3548 rm -f conftest$ac_exeext 3549-if { (eval echo "$as_me:16851: \"$ac_link\"") >&5 3550+if { (eval echo "$as_me:16852: \"$ac_link\"") >&5 3551 (eval $ac_link) 2>&5 3552 ac_status=$? 3553- echo "$as_me:16854: \$? = $ac_status" >&5 3554+ echo "$as_me:16855: \$? = $ac_status" >&5 3555 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 3556- { (eval echo "$as_me:16856: \"$ac_try\"") >&5 3557+ { (eval echo "$as_me:16857: \"$ac_try\"") >&5 3558 (eval $ac_try) 2>&5 3559 ac_status=$? 3560- echo "$as_me:16859: \$? = $ac_status" >&5 3561+ echo "$as_me:16860: \$? = $ac_status" >&5 3562 (exit $ac_status); }; }; then 3563 : 3564 else 3565@@ -16869,7 +16870,7 @@ 3566 fi 3567 fi 3568 fi 3569-echo "$as_me:16872: result: $ac_cv_header_stdc" >&5 3570+echo "$as_me:16873: result: $ac_cv_header_stdc" >&5 3571 echo "${ECHO_T}$ac_cv_header_stdc" >&6 3572 if test $ac_cv_header_stdc = yes; then 3573 3574@@ -16879,13 +16880,13 @@ 3575 3576 fi 3577 3578-echo "$as_me:16882: checking whether time.h and sys/time.h may both be included" >&5 3579+echo "$as_me:16883: checking whether time.h and sys/time.h may both be included" >&5 3580 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 3581 if test "${ac_cv_header_time+set}" = set; then 3582 echo $ECHO_N "(cached) $ECHO_C" >&6 3583 else 3584 cat >conftest.$ac_ext <<_ACEOF 3585-#line 16888 "configure" 3586+#line 16889 "configure" 3587 #include "confdefs.h" 3588 #include <sys/types.h> 3589 #include <sys/time.h> 3590@@ -16901,16 +16902,16 @@ 3591 } 3592 _ACEOF 3593 rm -f conftest.$ac_objext 3594-if { (eval echo "$as_me:16904: \"$ac_compile\"") >&5 3595+if { (eval echo "$as_me:16905: \"$ac_compile\"") >&5 3596 (eval $ac_compile) 2>&5 3597 ac_status=$? 3598- echo "$as_me:16907: \$? = $ac_status" >&5 3599+ echo "$as_me:16908: \$? = $ac_status" >&5 3600 (exit $ac_status); } && 3601 { ac_try='test -s conftest.$ac_objext' 3602- { (eval echo "$as_me:16910: \"$ac_try\"") >&5 3603+ { (eval echo "$as_me:16911: \"$ac_try\"") >&5 3604 (eval $ac_try) 2>&5 3605 ac_status=$? 3606- echo "$as_me:16913: \$? = $ac_status" >&5 3607+ echo "$as_me:16914: \$? = $ac_status" >&5 3608 (exit $ac_status); }; }; then 3609 ac_cv_header_time=yes 3610 else 3611@@ -16920,7 +16921,7 @@ 3612 fi 3613 rm -f conftest.$ac_objext conftest.$ac_ext 3614 fi 3615-echo "$as_me:16923: result: $ac_cv_header_time" >&5 3616+echo "$as_me:16924: result: $ac_cv_header_time" >&5 3617 echo "${ECHO_T}$ac_cv_header_time" >&6 3618 if test $ac_cv_header_time = yes; then 3619 3620@@ -16944,23 +16945,23 @@ 3621 3622 do 3623 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 3624-echo "$as_me:16947: checking for $ac_header" >&5 3625+echo "$as_me:16948: checking for $ac_header" >&5 3626 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 3627 if eval "test \"\${$as_ac_Header+set}\" = set"; then 3628 echo $ECHO_N "(cached) $ECHO_C" >&6 3629 else 3630 cat >conftest.$ac_ext <<_ACEOF 3631-#line 16953 "configure" 3632+#line 16954 "configure" 3633 #include "confdefs.h" 3634 #include <$ac_header> 3635 _ACEOF 3636-if { (eval echo "$as_me:16957: \"$ac_cpp conftest.$ac_ext\"") >&5 3637+if { (eval echo "$as_me:16958: \"$ac_cpp conftest.$ac_ext\"") >&5 3638 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 3639 ac_status=$? 3640 egrep -v '^ *\+' conftest.er1 >conftest.err 3641 rm -f conftest.er1 3642 cat conftest.err >&5 3643- echo "$as_me:16963: \$? = $ac_status" >&5 3644+ echo "$as_me:16964: \$? = $ac_status" >&5 3645 (exit $ac_status); } >/dev/null; then 3646 if test -s conftest.err; then 3647 ac_cpp_err=$ac_c_preproc_warn_flag 3648@@ -16979,7 +16980,7 @@ 3649 fi 3650 rm -f conftest.err conftest.$ac_ext 3651 fi 3652-echo "$as_me:16982: result: `eval echo '${'$as_ac_Header'}'`" >&5 3653+echo "$as_me:16983: result: `eval echo '${'$as_ac_Header'}'`" >&5 3654 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 3655 if test `eval echo '${'$as_ac_Header'}'` = yes; then 3656 cat >>confdefs.h <<EOF 3657@@ -16992,23 +16993,23 @@ 3658 for ac_header in unistd.h getopt.h 3659 do 3660 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 3661-echo "$as_me:16995: checking for $ac_header" >&5 3662+echo "$as_me:16996: checking for $ac_header" >&5 3663 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 3664 if eval "test \"\${$as_ac_Header+set}\" = set"; then 3665 echo $ECHO_N "(cached) $ECHO_C" >&6 3666 else 3667 cat >conftest.$ac_ext <<_ACEOF 3668-#line 17001 "configure" 3669+#line 17002 "configure" 3670 #include "confdefs.h" 3671 #include <$ac_header> 3672 _ACEOF 3673-if { (eval echo "$as_me:17005: \"$ac_cpp conftest.$ac_ext\"") >&5 3674+if { (eval echo "$as_me:17006: \"$ac_cpp conftest.$ac_ext\"") >&5 3675 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 3676 ac_status=$? 3677 egrep -v '^ *\+' conftest.er1 >conftest.err 3678 rm -f conftest.er1 3679 cat conftest.err >&5 3680- echo "$as_me:17011: \$? = $ac_status" >&5 3681+ echo "$as_me:17012: \$? = $ac_status" >&5 3682 (exit $ac_status); } >/dev/null; then 3683 if test -s conftest.err; then 3684 ac_cpp_err=$ac_c_preproc_warn_flag 3685@@ -17027,7 +17028,7 @@ 3686 fi 3687 rm -f conftest.err conftest.$ac_ext 3688 fi 3689-echo "$as_me:17030: result: `eval echo '${'$as_ac_Header'}'`" >&5 3690+echo "$as_me:17031: result: `eval echo '${'$as_ac_Header'}'`" >&5 3691 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 3692 if test `eval echo '${'$as_ac_Header'}'` = yes; then 3693 cat >>confdefs.h <<EOF 3694@@ -17037,7 +17038,7 @@ 3695 fi 3696 done 3697 3698-echo "$as_me:17040: checking for header declaring getopt variables" >&5 3699+echo "$as_me:17041: checking for header declaring getopt variables" >&5 3700 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 3701 if test "${cf_cv_getopt_header+set}" = set; then 3702 echo $ECHO_N "(cached) $ECHO_C" >&6 3703@@ -17047,7 +17048,7 @@ 3704 for cf_header in stdio.h stdlib.h unistd.h getopt.h 3705 do 3706 cat >conftest.$ac_ext <<_ACEOF 3707-#line 17050 "configure" 3708+#line 17051 "configure" 3709 #include "confdefs.h" 3710 3711 #include <$cf_header> 3712@@ -17060,16 +17061,16 @@ 3713 } 3714 _ACEOF 3715 rm -f conftest.$ac_objext 3716-if { (eval echo "$as_me:17063: \"$ac_compile\"") >&5 3717+if { (eval echo "$as_me:17064: \"$ac_compile\"") >&5 3718 (eval $ac_compile) 2>&5 3719 ac_status=$? 3720- echo "$as_me:17066: \$? = $ac_status" >&5 3721+ echo "$as_me:17067: \$? = $ac_status" >&5 3722 (exit $ac_status); } && 3723 { ac_try='test -s conftest.$ac_objext' 3724- { (eval echo "$as_me:17069: \"$ac_try\"") >&5 3725+ { (eval echo "$as_me:17070: \"$ac_try\"") >&5 3726 (eval $ac_try) 2>&5 3727 ac_status=$? 3728- echo "$as_me:17072: \$? = $ac_status" >&5 3729+ echo "$as_me:17073: \$? = $ac_status" >&5 3730 (exit $ac_status); }; }; then 3731 cf_cv_getopt_header=$cf_header 3732 break 3733@@ -17081,7 +17082,7 @@ 3734 done 3735 3736 fi 3737-echo "$as_me:17084: result: $cf_cv_getopt_header" >&5 3738+echo "$as_me:17085: result: $cf_cv_getopt_header" >&5 3739 echo "${ECHO_T}$cf_cv_getopt_header" >&6 3740 if test $cf_cv_getopt_header != none ; then 3741 3742@@ -17106,13 +17107,13 @@ 3743 3744 do 3745 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 3746-echo "$as_me:17109: checking for $ac_func" >&5 3747+echo "$as_me:17110: checking for $ac_func" >&5 3748 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 3749 if eval "test \"\${$as_ac_var+set}\" = set"; then 3750 echo $ECHO_N "(cached) $ECHO_C" >&6 3751 else 3752 cat >conftest.$ac_ext <<_ACEOF 3753-#line 17115 "configure" 3754+#line 17116 "configure" 3755 #include "confdefs.h" 3756 #define $ac_func autoconf_temporary 3757 #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ 3758@@ -17143,16 +17144,16 @@ 3759 } 3760 _ACEOF 3761 rm -f conftest.$ac_objext conftest$ac_exeext 3762-if { (eval echo "$as_me:17146: \"$ac_link\"") >&5 3763+if { (eval echo "$as_me:17147: \"$ac_link\"") >&5 3764 (eval $ac_link) 2>&5 3765 ac_status=$? 3766- echo "$as_me:17149: \$? = $ac_status" >&5 3767+ echo "$as_me:17150: \$? = $ac_status" >&5 3768 (exit $ac_status); } && 3769 { ac_try='test -s conftest$ac_exeext' 3770- { (eval echo "$as_me:17152: \"$ac_try\"") >&5 3771+ { (eval echo "$as_me:17153: \"$ac_try\"") >&5 3772 (eval $ac_try) 2>&5 3773 ac_status=$? 3774- echo "$as_me:17155: \$? = $ac_status" >&5 3775+ echo "$as_me:17156: \$? = $ac_status" >&5 3776 (exit $ac_status); }; }; then 3777 eval "$as_ac_var=yes" 3778 else 3779@@ -17162,7 +17163,7 @@ 3780 fi 3781 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 3782 fi 3783-echo "$as_me:17165: result: `eval echo '${'$as_ac_var'}'`" >&5 3784+echo "$as_me:17166: result: `eval echo '${'$as_ac_var'}'`" >&5 3785 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 3786 if test `eval echo '${'$as_ac_var'}'` = yes; then 3787 cat >>confdefs.h <<EOF 3788@@ -17173,14 +17174,14 @@ 3789 done 3790 3791 # use a compile-check to work with ncurses*-config and subdirectory includes 3792-echo "$as_me:17176: checking if we can use termcap.h" >&5 3793+echo "$as_me:17177: checking if we can use termcap.h" >&5 3794 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6 3795 if test "${cf_cv_have_termcap_h+set}" = set; then 3796 echo $ECHO_N "(cached) $ECHO_C" >&6 3797 else 3798 3799 cat >conftest.$ac_ext <<_ACEOF 3800-#line 17183 "configure" 3801+#line 17184 "configure" 3802 #include "confdefs.h" 3803 3804 #include <curses.h> 3805@@ -17201,16 +17202,16 @@ 3806 } 3807 _ACEOF 3808 rm -f conftest.$ac_objext 3809-if { (eval echo "$as_me:17204: \"$ac_compile\"") >&5 3810+if { (eval echo "$as_me:17205: \"$ac_compile\"") >&5 3811 (eval $ac_compile) 2>&5 3812 ac_status=$? 3813- echo "$as_me:17207: \$? = $ac_status" >&5 3814+ echo "$as_me:17208: \$? = $ac_status" >&5 3815 (exit $ac_status); } && 3816 { ac_try='test -s conftest.$ac_objext' 3817- { (eval echo "$as_me:17210: \"$ac_try\"") >&5 3818+ { (eval echo "$as_me:17211: \"$ac_try\"") >&5 3819 (eval $ac_try) 2>&5 3820 ac_status=$? 3821- echo "$as_me:17213: \$? = $ac_status" >&5 3822+ echo "$as_me:17214: \$? = $ac_status" >&5 3823 (exit $ac_status); }; }; then 3824 cf_cv_have_termcap_h=yes 3825 else 3826@@ -17220,7 +17221,7 @@ 3827 fi 3828 rm -f conftest.$ac_objext conftest.$ac_ext 3829 fi 3830-echo "$as_me:17223: result: $cf_cv_have_termcap_h" >&5 3831+echo "$as_me:17224: result: $cf_cv_have_termcap_h" >&5 3832 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6 3833 if test "x$cf_cv_have_termcap_h" = xyes 3834 then 3835@@ -17230,14 +17231,14 @@ 3836 EOF 3837 3838 else 3839-echo "$as_me:17233: checking if we can use ncurses/termcap.h" >&5 3840+echo "$as_me:17234: checking if we can use ncurses/termcap.h" >&5 3841 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6 3842 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then 3843 echo $ECHO_N "(cached) $ECHO_C" >&6 3844 else 3845 3846 cat >conftest.$ac_ext <<_ACEOF 3847-#line 17240 "configure" 3848+#line 17241 "configure" 3849 #include "confdefs.h" 3850 3851 #include <ncurses/curses.h> 3852@@ -17258,16 +17259,16 @@ 3853 } 3854 _ACEOF 3855 rm -f conftest.$ac_objext 3856-if { (eval echo "$as_me:17261: \"$ac_compile\"") >&5 3857+if { (eval echo "$as_me:17262: \"$ac_compile\"") >&5 3858 (eval $ac_compile) 2>&5 3859 ac_status=$? 3860- echo "$as_me:17264: \$? = $ac_status" >&5 3861+ echo "$as_me:17265: \$? = $ac_status" >&5 3862 (exit $ac_status); } && 3863 { ac_try='test -s conftest.$ac_objext' 3864- { (eval echo "$as_me:17267: \"$ac_try\"") >&5 3865+ { (eval echo "$as_me:17268: \"$ac_try\"") >&5 3866 (eval $ac_try) 2>&5 3867 ac_status=$? 3868- echo "$as_me:17270: \$? = $ac_status" >&5 3869+ echo "$as_me:17271: \$? = $ac_status" >&5 3870 (exit $ac_status); }; }; then 3871 cf_cv_have_ncurses_termcap_h=yes 3872 else 3873@@ -17277,7 +17278,7 @@ 3874 fi 3875 rm -f conftest.$ac_objext conftest.$ac_ext 3876 fi 3877-echo "$as_me:17280: result: $cf_cv_have_ncurses_termcap_h" >&5 3878+echo "$as_me:17281: result: $cf_cv_have_ncurses_termcap_h" >&5 3879 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6 3880 test "x$cf_cv_have_ncurses_termcap_h" = xyes && 3881 cat >>confdefs.h <<\EOF 3882@@ -17287,7 +17288,7 @@ 3883 fi 3884 3885 if test "x$ac_cv_func_getopt" = xno; then 3886- { { echo "$as_me:17290: error: getopt is required for building programs" >&5 3887+ { { echo "$as_me:17291: error: getopt is required for building programs" >&5 3888 echo "$as_me: error: getopt is required for building programs" >&2;} 3889 { (exit 1); exit 1; }; } 3890 fi 3891@@ -17306,13 +17307,13 @@ 3892 3893 do 3894 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 3895-echo "$as_me:17309: checking for $ac_func" >&5 3896+echo "$as_me:17310: checking for $ac_func" >&5 3897 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 3898 if eval "test \"\${$as_ac_var+set}\" = set"; then 3899 echo $ECHO_N "(cached) $ECHO_C" >&6 3900 else 3901 cat >conftest.$ac_ext <<_ACEOF 3902-#line 17315 "configure" 3903+#line 17316 "configure" 3904 #include "confdefs.h" 3905 #define $ac_func autoconf_temporary 3906 #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ 3907@@ -17343,16 +17344,16 @@ 3908 } 3909 _ACEOF 3910 rm -f conftest.$ac_objext conftest$ac_exeext 3911-if { (eval echo "$as_me:17346: \"$ac_link\"") >&5 3912+if { (eval echo "$as_me:17347: \"$ac_link\"") >&5 3913 (eval $ac_link) 2>&5 3914 ac_status=$? 3915- echo "$as_me:17349: \$? = $ac_status" >&5 3916+ echo "$as_me:17350: \$? = $ac_status" >&5 3917 (exit $ac_status); } && 3918 { ac_try='test -s conftest$ac_exeext' 3919- { (eval echo "$as_me:17352: \"$ac_try\"") >&5 3920+ { (eval echo "$as_me:17353: \"$ac_try\"") >&5 3921 (eval $ac_try) 2>&5 3922 ac_status=$? 3923- echo "$as_me:17355: \$? = $ac_status" >&5 3924+ echo "$as_me:17356: \$? = $ac_status" >&5 3925 (exit $ac_status); }; }; then 3926 eval "$as_ac_var=yes" 3927 else 3928@@ -17362,7 +17363,7 @@ 3929 fi 3930 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 3931 fi 3932-echo "$as_me:17365: result: `eval echo '${'$as_ac_var'}'`" >&5 3933+echo "$as_me:17366: result: `eval echo '${'$as_ac_var'}'`" >&5 3934 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 3935 if test `eval echo '${'$as_ac_var'}'` = yes; then 3936 cat >>confdefs.h <<EOF 3937@@ -17374,7 +17375,7 @@ 3938 3939 fi 3940 3941-echo "$as_me:17377: checking definition to turn on extended curses functions" >&5 3942+echo "$as_me:17378: checking definition to turn on extended curses functions" >&5 3943 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6 3944 if test "${cf_cv_need_xopen_extension+set}" = set; then 3945 echo $ECHO_N "(cached) $ECHO_C" >&6 3946@@ -17382,7 +17383,7 @@ 3947 3948 cf_cv_need_xopen_extension=unknown 3949 cat >conftest.$ac_ext <<_ACEOF 3950-#line 17385 "configure" 3951+#line 17386 "configure" 3952 #include "confdefs.h" 3953 3954 #include <stdlib.h> 3955@@ -17408,16 +17409,16 @@ 3956 } 3957 _ACEOF 3958 rm -f conftest.$ac_objext conftest$ac_exeext 3959-if { (eval echo "$as_me:17411: \"$ac_link\"") >&5 3960+if { (eval echo "$as_me:17412: \"$ac_link\"") >&5 3961 (eval $ac_link) 2>&5 3962 ac_status=$? 3963- echo "$as_me:17414: \$? = $ac_status" >&5 3964+ echo "$as_me:17415: \$? = $ac_status" >&5 3965 (exit $ac_status); } && 3966 { ac_try='test -s conftest$ac_exeext' 3967- { (eval echo "$as_me:17417: \"$ac_try\"") >&5 3968+ { (eval echo "$as_me:17418: \"$ac_try\"") >&5 3969 (eval $ac_try) 2>&5 3970 ac_status=$? 3971- echo "$as_me:17420: \$? = $ac_status" >&5 3972+ echo "$as_me:17421: \$? = $ac_status" >&5 3973 (exit $ac_status); }; }; then 3974 cf_cv_need_xopen_extension=none 3975 else 3976@@ -17427,7 +17428,7 @@ 3977 for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR 3978 do 3979 cat >conftest.$ac_ext <<_ACEOF 3980-#line 17430 "configure" 3981+#line 17431 "configure" 3982 #include "confdefs.h" 3983 3984 #define $cf_try_xopen_extension 1 3985@@ -17449,16 +17450,16 @@ 3986 } 3987 _ACEOF 3988 rm -f conftest.$ac_objext conftest$ac_exeext 3989-if { (eval echo "$as_me:17452: \"$ac_link\"") >&5 3990+if { (eval echo "$as_me:17453: \"$ac_link\"") >&5 3991 (eval $ac_link) 2>&5 3992 ac_status=$? 3993- echo "$as_me:17455: \$? = $ac_status" >&5 3994+ echo "$as_me:17456: \$? = $ac_status" >&5 3995 (exit $ac_status); } && 3996 { ac_try='test -s conftest$ac_exeext' 3997- { (eval echo "$as_me:17458: \"$ac_try\"") >&5 3998+ { (eval echo "$as_me:17459: \"$ac_try\"") >&5 3999 (eval $ac_try) 2>&5 4000 ac_status=$? 4001- echo "$as_me:17461: \$? = $ac_status" >&5 4002+ echo "$as_me:17462: \$? = $ac_status" >&5 4003 (exit $ac_status); }; }; then 4004 cf_cv_need_xopen_extension=$cf_try_xopen_extension; break 4005 else 4006@@ -17472,7 +17473,7 @@ 4007 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4008 4009 fi 4010-echo "$as_me:17475: result: $cf_cv_need_xopen_extension" >&5 4011+echo "$as_me:17476: result: $cf_cv_need_xopen_extension" >&5 4012 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 4013 4014 case $cf_cv_need_xopen_extension in 4015@@ -17484,7 +17485,7 @@ 4016 ;; 4017 esac 4018 4019-echo "$as_me:17487: checking for term.h" >&5 4020+echo "$as_me:17488: checking for term.h" >&5 4021 echo $ECHO_N "checking for term.h... $ECHO_C" >&6 4022 if test "${cf_cv_term_header+set}" = set; then 4023 echo $ECHO_N "(cached) $ECHO_C" >&6 4024@@ -17505,7 +17506,7 @@ 4025 for cf_header in $cf_header_list 4026 do 4027 cat >conftest.$ac_ext <<_ACEOF 4028-#line 17508 "configure" 4029+#line 17509 "configure" 4030 #include "confdefs.h" 4031 4032 #include <${cf_cv_ncurses_header:-curses.h}> 4033@@ -17519,16 +17520,16 @@ 4034 } 4035 _ACEOF 4036 rm -f conftest.$ac_objext 4037-if { (eval echo "$as_me:17522: \"$ac_compile\"") >&5 4038+if { (eval echo "$as_me:17523: \"$ac_compile\"") >&5 4039 (eval $ac_compile) 2>&5 4040 ac_status=$? 4041- echo "$as_me:17525: \$? = $ac_status" >&5 4042+ echo "$as_me:17526: \$? = $ac_status" >&5 4043 (exit $ac_status); } && 4044 { ac_try='test -s conftest.$ac_objext' 4045- { (eval echo "$as_me:17528: \"$ac_try\"") >&5 4046+ { (eval echo "$as_me:17529: \"$ac_try\"") >&5 4047 (eval $ac_try) 2>&5 4048 ac_status=$? 4049- echo "$as_me:17531: \$? = $ac_status" >&5 4050+ echo "$as_me:17532: \$? = $ac_status" >&5 4051 (exit $ac_status); }; }; then 4052 cf_cv_term_header=$cf_header 4053 break 4054@@ -17547,7 +17548,7 @@ 4055 for cf_header in ncurses/term.h ncursesw/term.h 4056 do 4057 cat >conftest.$ac_ext <<_ACEOF 4058-#line 17550 "configure" 4059+#line 17551 "configure" 4060 #include "confdefs.h" 4061 4062 #include <${cf_cv_ncurses_header:-curses.h}> 4063@@ -17565,16 +17566,16 @@ 4064 } 4065 _ACEOF 4066 rm -f conftest.$ac_objext 4067-if { (eval echo "$as_me:17568: \"$ac_compile\"") >&5 4068+if { (eval echo "$as_me:17569: \"$ac_compile\"") >&5 4069 (eval $ac_compile) 2>&5 4070 ac_status=$? 4071- echo "$as_me:17571: \$? = $ac_status" >&5 4072+ echo "$as_me:17572: \$? = $ac_status" >&5 4073 (exit $ac_status); } && 4074 { ac_try='test -s conftest.$ac_objext' 4075- { (eval echo "$as_me:17574: \"$ac_try\"") >&5 4076+ { (eval echo "$as_me:17575: \"$ac_try\"") >&5 4077 (eval $ac_try) 2>&5 4078 ac_status=$? 4079- echo "$as_me:17577: \$? = $ac_status" >&5 4080+ echo "$as_me:17578: \$? = $ac_status" >&5 4081 (exit $ac_status); }; }; then 4082 cf_cv_term_header=$cf_header 4083 break 4084@@ -17589,7 +17590,7 @@ 4085 esac 4086 4087 fi 4088-echo "$as_me:17592: result: $cf_cv_term_header" >&5 4089+echo "$as_me:17593: result: $cf_cv_term_header" >&5 4090 echo "${ECHO_T}$cf_cv_term_header" >&6 4091 4092 case $cf_cv_term_header in 4093@@ -17616,7 +17617,7 @@ 4094 ;; 4095 esac 4096 4097-echo "$as_me:17619: checking for unctrl.h" >&5 4098+echo "$as_me:17620: checking for unctrl.h" >&5 4099 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6 4100 if test "${cf_cv_unctrl_header+set}" = set; then 4101 echo $ECHO_N "(cached) $ECHO_C" >&6 4102@@ -17637,7 +17638,7 @@ 4103 for cf_header in $cf_header_list 4104 do 4105 cat >conftest.$ac_ext <<_ACEOF 4106-#line 17640 "configure" 4107+#line 17641 "configure" 4108 #include "confdefs.h" 4109 4110 #include <${cf_cv_ncurses_header:-curses.h}> 4111@@ -17651,16 +17652,16 @@ 4112 } 4113 _ACEOF 4114 rm -f conftest.$ac_objext 4115-if { (eval echo "$as_me:17654: \"$ac_compile\"") >&5 4116+if { (eval echo "$as_me:17655: \"$ac_compile\"") >&5 4117 (eval $ac_compile) 2>&5 4118 ac_status=$? 4119- echo "$as_me:17657: \$? = $ac_status" >&5 4120+ echo "$as_me:17658: \$? = $ac_status" >&5 4121 (exit $ac_status); } && 4122 { ac_try='test -s conftest.$ac_objext' 4123- { (eval echo "$as_me:17660: \"$ac_try\"") >&5 4124+ { (eval echo "$as_me:17661: \"$ac_try\"") >&5 4125 (eval $ac_try) 2>&5 4126 ac_status=$? 4127- echo "$as_me:17663: \$? = $ac_status" >&5 4128+ echo "$as_me:17664: \$? = $ac_status" >&5 4129 (exit $ac_status); }; }; then 4130 cf_cv_unctrl_header=$cf_header 4131 break 4132@@ -17673,12 +17674,12 @@ 4133 done 4134 4135 fi 4136-echo "$as_me:17676: result: $cf_cv_unctrl_header" >&5 4137+echo "$as_me:17677: result: $cf_cv_unctrl_header" >&5 4138 echo "${ECHO_T}$cf_cv_unctrl_header" >&6 4139 4140 case $cf_cv_unctrl_header in 4141 (no) 4142- { echo "$as_me:17681: WARNING: unctrl.h header not found" >&5 4143+ { echo "$as_me:17682: WARNING: unctrl.h header not found" >&5 4144 echo "$as_me: WARNING: unctrl.h header not found" >&2;} 4145 ;; 4146 esac 4147@@ -17767,10 +17768,10 @@ 4148 4149 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 4150 4151- echo "$as_me:17770: checking for ${cf_func}" >&5 4152+ echo "$as_me:17771: checking for ${cf_func}" >&5 4153 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 4154 4155-echo "${as_me:-configure}:17773: testing ${cf_func} ..." 1>&5 4156+echo "${as_me:-configure}:17774: testing ${cf_func} ..." 1>&5 4157 4158 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then 4159 echo $ECHO_N "(cached) $ECHO_C" >&6 4160@@ -17779,7 +17780,7 @@ 4161 eval cf_result='$ac_cv_func_'$cf_func 4162 if test ".$cf_result" != ".no"; then 4163 cat >conftest.$ac_ext <<_ACEOF 4164-#line 17782 "configure" 4165+#line 17783 "configure" 4166 #include "confdefs.h" 4167 4168 #ifdef HAVE_XCURSES 4169@@ -17812,16 +17813,16 @@ 4170 } 4171 _ACEOF 4172 rm -f conftest.$ac_objext conftest$ac_exeext 4173-if { (eval echo "$as_me:17815: \"$ac_link\"") >&5 4174+if { (eval echo "$as_me:17816: \"$ac_link\"") >&5 4175 (eval $ac_link) 2>&5 4176 ac_status=$? 4177- echo "$as_me:17818: \$? = $ac_status" >&5 4178+ echo "$as_me:17819: \$? = $ac_status" >&5 4179 (exit $ac_status); } && 4180 { ac_try='test -s conftest$ac_exeext' 4181- { (eval echo "$as_me:17821: \"$ac_try\"") >&5 4182+ { (eval echo "$as_me:17822: \"$ac_try\"") >&5 4183 (eval $ac_try) 2>&5 4184 ac_status=$? 4185- echo "$as_me:17824: \$? = $ac_status" >&5 4186+ echo "$as_me:17825: \$? = $ac_status" >&5 4187 (exit $ac_status); }; }; then 4188 cf_result=yes 4189 else 4190@@ -17837,7 +17838,7 @@ 4191 4192 # use the computed/retrieved cache-value: 4193 eval 'cf_result=$cf_cv_func_'$cf_func 4194- echo "$as_me:17840: result: $cf_result" >&5 4195+ echo "$as_me:17841: result: $cf_result" >&5 4196 echo "${ECHO_T}$cf_result" >&6 4197 if test $cf_result != no; then 4198 cat >>confdefs.h <<EOF 4199@@ -17852,10 +17853,10 @@ 4200 4201 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 4202 4203- echo "$as_me:17855: checking for ${cf_func}" >&5 4204+ echo "$as_me:17856: checking for ${cf_func}" >&5 4205 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 4206 4207-echo "${as_me:-configure}:17858: testing ${cf_func} ..." 1>&5 4208+echo "${as_me:-configure}:17859: testing ${cf_func} ..." 1>&5 4209 4210 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then 4211 echo $ECHO_N "(cached) $ECHO_C" >&6 4212@@ -17864,7 +17865,7 @@ 4213 eval cf_result='$ac_cv_func_'$cf_func 4214 if test ".$cf_result" != ".no"; then 4215 cat >conftest.$ac_ext <<_ACEOF 4216-#line 17867 "configure" 4217+#line 17868 "configure" 4218 #include "confdefs.h" 4219 4220 #ifdef HAVE_XCURSES 4221@@ -17897,16 +17898,16 @@ 4222 } 4223 _ACEOF 4224 rm -f conftest.$ac_objext conftest$ac_exeext 4225-if { (eval echo "$as_me:17900: \"$ac_link\"") >&5 4226+if { (eval echo "$as_me:17901: \"$ac_link\"") >&5 4227 (eval $ac_link) 2>&5 4228 ac_status=$? 4229- echo "$as_me:17903: \$? = $ac_status" >&5 4230+ echo "$as_me:17904: \$? = $ac_status" >&5 4231 (exit $ac_status); } && 4232 { ac_try='test -s conftest$ac_exeext' 4233- { (eval echo "$as_me:17906: \"$ac_try\"") >&5 4234+ { (eval echo "$as_me:17907: \"$ac_try\"") >&5 4235 (eval $ac_try) 2>&5 4236 ac_status=$? 4237- echo "$as_me:17909: \$? = $ac_status" >&5 4238+ echo "$as_me:17910: \$? = $ac_status" >&5 4239 (exit $ac_status); }; }; then 4240 cf_result=yes 4241 else 4242@@ -17922,7 +17923,7 @@ 4243 4244 # use the computed/retrieved cache-value: 4245 eval 'cf_result=$cf_cv_func_'$cf_func 4246- echo "$as_me:17925: result: $cf_result" >&5 4247+ echo "$as_me:17926: result: $cf_result" >&5 4248 echo "${ECHO_T}$cf_result" >&6 4249 if test $cf_result != no; then 4250 cat >>confdefs.h <<EOF 4251@@ -17946,7 +17947,7 @@ 4252 cf_return="return value" 4253 fi 4254 cat >conftest.$ac_ext <<_ACEOF 4255-#line 17949 "configure" 4256+#line 17950 "configure" 4257 #include "confdefs.h" 4258 4259 #include <${cf_cv_ncurses_header:-curses.h}> 4260@@ -17966,21 +17967,21 @@ 4261 } 4262 _ACEOF 4263 rm -f conftest.$ac_objext 4264-if { (eval echo "$as_me:17969: \"$ac_compile\"") >&5 4265+if { (eval echo "$as_me:17970: \"$ac_compile\"") >&5 4266 (eval $ac_compile) 2>&5 4267 ac_status=$? 4268- echo "$as_me:17972: \$? = $ac_status" >&5 4269+ echo "$as_me:17973: \$? = $ac_status" >&5 4270 (exit $ac_status); } && 4271 { ac_try='test -s conftest.$ac_objext' 4272- { (eval echo "$as_me:17975: \"$ac_try\"") >&5 4273+ { (eval echo "$as_me:17976: \"$ac_try\"") >&5 4274 (eval $ac_try) 2>&5 4275 ac_status=$? 4276- echo "$as_me:17978: \$? = $ac_status" >&5 4277+ echo "$as_me:17979: \$? = $ac_status" >&5 4278 (exit $ac_status); }; }; then 4279 4280 test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6 4281 4282-echo "${as_me:-configure}:17983: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 4283+echo "${as_me:-configure}:17984: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 4284 4285 cat >>confdefs.h <<EOF 4286 #define TPUTS_ARG $cf_arg 4287@@ -18000,14 +18001,14 @@ 4288 done 4289 fi 4290 4291-echo "$as_me:18003: checking for ncurses extended functions" >&5 4292+echo "$as_me:18004: checking for ncurses extended functions" >&5 4293 echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6 4294 if test "${cf_cv_ncurses_ext_funcs+set}" = set; then 4295 echo $ECHO_N "(cached) $ECHO_C" >&6 4296 else 4297 4298 cat >conftest.$ac_ext <<_ACEOF 4299-#line 18010 "configure" 4300+#line 18011 "configure" 4301 #include "confdefs.h" 4302 4303 #include <${cf_cv_ncurses_header:-curses.h}> 4304@@ -18022,16 +18023,16 @@ 4305 } 4306 _ACEOF 4307 rm -f conftest.$ac_objext 4308-if { (eval echo "$as_me:18025: \"$ac_compile\"") >&5 4309+if { (eval echo "$as_me:18026: \"$ac_compile\"") >&5 4310 (eval $ac_compile) 2>&5 4311 ac_status=$? 4312- echo "$as_me:18028: \$? = $ac_status" >&5 4313+ echo "$as_me:18029: \$? = $ac_status" >&5 4314 (exit $ac_status); } && 4315 { ac_try='test -s conftest.$ac_objext' 4316- { (eval echo "$as_me:18031: \"$ac_try\"") >&5 4317+ { (eval echo "$as_me:18032: \"$ac_try\"") >&5 4318 (eval $ac_try) 2>&5 4319 ac_status=$? 4320- echo "$as_me:18034: \$? = $ac_status" >&5 4321+ echo "$as_me:18035: \$? = $ac_status" >&5 4322 (exit $ac_status); }; }; then 4323 cf_cv_ncurses_ext_funcs=defined 4324 else 4325@@ -18039,7 +18040,7 @@ 4326 cat conftest.$ac_ext >&5 4327 4328 cat >conftest.$ac_ext <<_ACEOF 4329-#line 18042 "configure" 4330+#line 18043 "configure" 4331 #include "confdefs.h" 4332 4333 #include <${cf_cv_ncurses_header:-curses.h}> 4334@@ -18064,16 +18065,16 @@ 4335 } 4336 _ACEOF 4337 rm -f conftest.$ac_objext conftest$ac_exeext 4338-if { (eval echo "$as_me:18067: \"$ac_link\"") >&5 4339+if { (eval echo "$as_me:18068: \"$ac_link\"") >&5 4340 (eval $ac_link) 2>&5 4341 ac_status=$? 4342- echo "$as_me:18070: \$? = $ac_status" >&5 4343+ echo "$as_me:18071: \$? = $ac_status" >&5 4344 (exit $ac_status); } && 4345 { ac_try='test -s conftest$ac_exeext' 4346- { (eval echo "$as_me:18073: \"$ac_try\"") >&5 4347+ { (eval echo "$as_me:18074: \"$ac_try\"") >&5 4348 (eval $ac_try) 2>&5 4349 ac_status=$? 4350- echo "$as_me:18076: \$? = $ac_status" >&5 4351+ echo "$as_me:18077: \$? = $ac_status" >&5 4352 (exit $ac_status); }; }; then 4353 cf_cv_ncurses_ext_funcs=yes 4354 else 4355@@ -18087,7 +18088,7 @@ 4356 rm -f conftest.$ac_objext conftest.$ac_ext 4357 4358 fi 4359-echo "$as_me:18090: result: $cf_cv_ncurses_ext_funcs" >&5 4360+echo "$as_me:18091: result: $cf_cv_ncurses_ext_funcs" >&5 4361 echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6 4362 test "$cf_cv_ncurses_ext_funcs" = yes && 4363 cat >>confdefs.h <<\EOF 4364@@ -18101,11 +18102,11 @@ 4365 if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno 4366 then 4367 cf_define_xpg5=no 4368- echo "$as_me:18104: checking if _XPG5 should be defined to enable wide-characters" >&5 4369+ echo "$as_me:18105: checking if _XPG5 should be defined to enable wide-characters" >&5 4370 echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6 4371 4372 cat >conftest.$ac_ext <<_ACEOF 4373-#line 18108 "configure" 4374+#line 18109 "configure" 4375 #include "confdefs.h" 4376 4377 #include <${cf_cv_ncurses_header:-curses.h}> 4378@@ -18118,16 +18119,16 @@ 4379 } 4380 _ACEOF 4381 rm -f conftest.$ac_objext 4382-if { (eval echo "$as_me:18121: \"$ac_compile\"") >&5 4383+if { (eval echo "$as_me:18122: \"$ac_compile\"") >&5 4384 (eval $ac_compile) 2>&5 4385 ac_status=$? 4386- echo "$as_me:18124: \$? = $ac_status" >&5 4387+ echo "$as_me:18125: \$? = $ac_status" >&5 4388 (exit $ac_status); } && 4389 { ac_try='test -s conftest.$ac_objext' 4390- { (eval echo "$as_me:18127: \"$ac_try\"") >&5 4391+ { (eval echo "$as_me:18128: \"$ac_try\"") >&5 4392 (eval $ac_try) 2>&5 4393 ac_status=$? 4394- echo "$as_me:18130: \$? = $ac_status" >&5 4395+ echo "$as_me:18131: \$? = $ac_status" >&5 4396 (exit $ac_status); }; }; then 4397 : 4398 else 4399@@ -18136,7 +18137,7 @@ 4400 cf_save_cppflags="$CPPFLAGS" 4401 CPPFLAGS="$CPPFLAGS -D_XPG5" 4402 cat >conftest.$ac_ext <<_ACEOF 4403-#line 18139 "configure" 4404+#line 18140 "configure" 4405 #include "confdefs.h" 4406 4407 #include <${cf_cv_ncurses_header:-curses.h}> 4408@@ -18149,16 +18150,16 @@ 4409 } 4410 _ACEOF 4411 rm -f conftest.$ac_objext 4412-if { (eval echo "$as_me:18152: \"$ac_compile\"") >&5 4413+if { (eval echo "$as_me:18153: \"$ac_compile\"") >&5 4414 (eval $ac_compile) 2>&5 4415 ac_status=$? 4416- echo "$as_me:18155: \$? = $ac_status" >&5 4417+ echo "$as_me:18156: \$? = $ac_status" >&5 4418 (exit $ac_status); } && 4419 { ac_try='test -s conftest.$ac_objext' 4420- { (eval echo "$as_me:18158: \"$ac_try\"") >&5 4421+ { (eval echo "$as_me:18159: \"$ac_try\"") >&5 4422 (eval $ac_try) 2>&5 4423 ac_status=$? 4424- echo "$as_me:18161: \$? = $ac_status" >&5 4425+ echo "$as_me:18162: \$? = $ac_status" >&5 4426 (exit $ac_status); }; }; then 4427 cf_define_xpg5=yes 4428 else 4429@@ -18169,7 +18170,7 @@ 4430 CPPFLAGS="$cf_save_cppflags" 4431 fi 4432 rm -f conftest.$ac_objext conftest.$ac_ext 4433- echo "$as_me:18172: result: $cf_define_xpg5" >&5 4434+ echo "$as_me:18173: result: $cf_define_xpg5" >&5 4435 echo "${ECHO_T}$cf_define_xpg5" >&6 4436 4437 if test "$cf_define_xpg5" = yes 4438@@ -18178,14 +18179,14 @@ 4439 fi 4440 fi 4441 4442- echo "$as_me:18181: checking for wide-character functions" >&5 4443+ echo "$as_me:18182: checking for wide-character functions" >&5 4444 echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6 4445 if test "${cf_cv_widechar_funcs+set}" = set; then 4446 echo $ECHO_N "(cached) $ECHO_C" >&6 4447 else 4448 4449 cat >conftest.$ac_ext <<_ACEOF 4450-#line 18188 "configure" 4451+#line 18189 "configure" 4452 #include "confdefs.h" 4453 4454 #include <${cf_cv_ncurses_header:-curses.h}> 4455@@ -18202,16 +18203,16 @@ 4456 } 4457 _ACEOF 4458 rm -f conftest.$ac_objext conftest$ac_exeext 4459-if { (eval echo "$as_me:18205: \"$ac_link\"") >&5 4460+if { (eval echo "$as_me:18206: \"$ac_link\"") >&5 4461 (eval $ac_link) 2>&5 4462 ac_status=$? 4463- echo "$as_me:18208: \$? = $ac_status" >&5 4464+ echo "$as_me:18209: \$? = $ac_status" >&5 4465 (exit $ac_status); } && 4466 { ac_try='test -s conftest$ac_exeext' 4467- { (eval echo "$as_me:18211: \"$ac_try\"") >&5 4468+ { (eval echo "$as_me:18212: \"$ac_try\"") >&5 4469 (eval $ac_try) 2>&5 4470 ac_status=$? 4471- echo "$as_me:18214: \$? = $ac_status" >&5 4472+ echo "$as_me:18215: \$? = $ac_status" >&5 4473 (exit $ac_status); }; }; then 4474 cf_cv_widechar_funcs=yes 4475 else 4476@@ -18222,7 +18223,7 @@ 4477 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4478 4479 fi 4480-echo "$as_me:18225: result: $cf_cv_widechar_funcs" >&5 4481+echo "$as_me:18226: result: $cf_cv_widechar_funcs" >&5 4482 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6 4483 if test "$cf_cv_widechar_funcs" != no ; then 4484 4485@@ -18243,14 +18244,14 @@ 4486 4487 fi 4488 4489-echo "$as_me:18246: checking if $cf_cv_screen library uses pthreads" >&5 4490+echo "$as_me:18247: checking if $cf_cv_screen library uses pthreads" >&5 4491 echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6 4492 if test "${cf_cv_use_pthreads+set}" = set; then 4493 echo $ECHO_N "(cached) $ECHO_C" >&6 4494 else 4495 4496 cat >conftest.$ac_ext <<_ACEOF 4497-#line 18253 "configure" 4498+#line 18254 "configure" 4499 #include "confdefs.h" 4500 4501 #include <${cf_cv_ncurses_header:-curses.h}> 4502@@ -18268,16 +18269,16 @@ 4503 } 4504 _ACEOF 4505 rm -f conftest.$ac_objext conftest$ac_exeext 4506-if { (eval echo "$as_me:18271: \"$ac_link\"") >&5 4507+if { (eval echo "$as_me:18272: \"$ac_link\"") >&5 4508 (eval $ac_link) 2>&5 4509 ac_status=$? 4510- echo "$as_me:18274: \$? = $ac_status" >&5 4511+ echo "$as_me:18275: \$? = $ac_status" >&5 4512 (exit $ac_status); } && 4513 { ac_try='test -s conftest$ac_exeext' 4514- { (eval echo "$as_me:18277: \"$ac_try\"") >&5 4515+ { (eval echo "$as_me:18278: \"$ac_try\"") >&5 4516 (eval $ac_try) 2>&5 4517 ac_status=$? 4518- echo "$as_me:18280: \$? = $ac_status" >&5 4519+ echo "$as_me:18281: \$? = $ac_status" >&5 4520 (exit $ac_status); }; }; then 4521 cf_cv_use_pthreads=yes 4522 else 4523@@ -18288,21 +18289,21 @@ 4524 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4525 4526 fi 4527-echo "$as_me:18291: result: $cf_cv_use_pthreads" >&5 4528+echo "$as_me:18292: result: $cf_cv_use_pthreads" >&5 4529 echo "${ECHO_T}$cf_cv_use_pthreads" >&6 4530 test $cf_cv_use_pthreads = yes && 4531 cat >>confdefs.h <<\EOF 4532 #define USE_PTHREADS 1 4533 EOF 4534 4535-echo "$as_me:18298: checking if sys/time.h works with sys/select.h" >&5 4536+echo "$as_me:18299: checking if sys/time.h works with sys/select.h" >&5 4537 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 4538 if test "${cf_cv_sys_time_select+set}" = set; then 4539 echo $ECHO_N "(cached) $ECHO_C" >&6 4540 else 4541 4542 cat >conftest.$ac_ext <<_ACEOF 4543-#line 18305 "configure" 4544+#line 18306 "configure" 4545 #include "confdefs.h" 4546 4547 #include <sys/types.h> 4548@@ -18322,16 +18323,16 @@ 4549 } 4550 _ACEOF 4551 rm -f conftest.$ac_objext 4552-if { (eval echo "$as_me:18325: \"$ac_compile\"") >&5 4553+if { (eval echo "$as_me:18326: \"$ac_compile\"") >&5 4554 (eval $ac_compile) 2>&5 4555 ac_status=$? 4556- echo "$as_me:18328: \$? = $ac_status" >&5 4557+ echo "$as_me:18329: \$? = $ac_status" >&5 4558 (exit $ac_status); } && 4559 { ac_try='test -s conftest.$ac_objext' 4560- { (eval echo "$as_me:18331: \"$ac_try\"") >&5 4561+ { (eval echo "$as_me:18332: \"$ac_try\"") >&5 4562 (eval $ac_try) 2>&5 4563 ac_status=$? 4564- echo "$as_me:18334: \$? = $ac_status" >&5 4565+ echo "$as_me:18335: \$? = $ac_status" >&5 4566 (exit $ac_status); }; }; then 4567 cf_cv_sys_time_select=yes 4568 else 4569@@ -18343,7 +18344,7 @@ 4570 4571 fi 4572 4573-echo "$as_me:18346: result: $cf_cv_sys_time_select" >&5 4574+echo "$as_me:18347: result: $cf_cv_sys_time_select" >&5 4575 echo "${ECHO_T}$cf_cv_sys_time_select" >&6 4576 test "$cf_cv_sys_time_select" = yes && 4577 cat >>confdefs.h <<\EOF 4578@@ -18352,7 +18353,7 @@ 4579 4580 # special check for test/ditto.c 4581 4582-echo "$as_me:18355: checking for openpty in -lutil" >&5 4583+echo "$as_me:18356: checking for openpty in -lutil" >&5 4584 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 4585 if test "${ac_cv_lib_util_openpty+set}" = set; then 4586 echo $ECHO_N "(cached) $ECHO_C" >&6 4587@@ -18360,7 +18361,7 @@ 4588 ac_check_lib_save_LIBS=$LIBS 4589 LIBS="-lutil $LIBS" 4590 cat >conftest.$ac_ext <<_ACEOF 4591-#line 18363 "configure" 4592+#line 18364 "configure" 4593 #include "confdefs.h" 4594 4595 /* Override any gcc2 internal prototype to avoid an error. */ 4596@@ -18379,16 +18380,16 @@ 4597 } 4598 _ACEOF 4599 rm -f conftest.$ac_objext conftest$ac_exeext 4600-if { (eval echo "$as_me:18382: \"$ac_link\"") >&5 4601+if { (eval echo "$as_me:18383: \"$ac_link\"") >&5 4602 (eval $ac_link) 2>&5 4603 ac_status=$? 4604- echo "$as_me:18385: \$? = $ac_status" >&5 4605+ echo "$as_me:18386: \$? = $ac_status" >&5 4606 (exit $ac_status); } && 4607 { ac_try='test -s conftest$ac_exeext' 4608- { (eval echo "$as_me:18388: \"$ac_try\"") >&5 4609+ { (eval echo "$as_me:18389: \"$ac_try\"") >&5 4610 (eval $ac_try) 2>&5 4611 ac_status=$? 4612- echo "$as_me:18391: \$? = $ac_status" >&5 4613+ echo "$as_me:18392: \$? = $ac_status" >&5 4614 (exit $ac_status); }; }; then 4615 ac_cv_lib_util_openpty=yes 4616 else 4617@@ -18399,7 +18400,7 @@ 4618 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4619 LIBS=$ac_check_lib_save_LIBS 4620 fi 4621-echo "$as_me:18402: result: $ac_cv_lib_util_openpty" >&5 4622+echo "$as_me:18403: result: $ac_cv_lib_util_openpty" >&5 4623 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 4624 if test $ac_cv_lib_util_openpty = yes; then 4625 cf_cv_lib_util=yes 4626@@ -18407,7 +18408,7 @@ 4627 cf_cv_lib_util=no 4628 fi 4629 4630-echo "$as_me:18410: checking for openpty header" >&5 4631+echo "$as_me:18411: checking for openpty header" >&5 4632 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 4633 if test "${cf_cv_func_openpty+set}" = set; then 4634 echo $ECHO_N "(cached) $ECHO_C" >&6 4635@@ -18434,7 +18435,7 @@ 4636 for cf_header in pty.h libutil.h util.h 4637 do 4638 cat >conftest.$ac_ext <<_ACEOF 4639-#line 18437 "configure" 4640+#line 18438 "configure" 4641 #include "confdefs.h" 4642 4643 #include <$cf_header> 4644@@ -18451,16 +18452,16 @@ 4645 } 4646 _ACEOF 4647 rm -f conftest.$ac_objext conftest$ac_exeext 4648-if { (eval echo "$as_me:18454: \"$ac_link\"") >&5 4649+if { (eval echo "$as_me:18455: \"$ac_link\"") >&5 4650 (eval $ac_link) 2>&5 4651 ac_status=$? 4652- echo "$as_me:18457: \$? = $ac_status" >&5 4653+ echo "$as_me:18458: \$? = $ac_status" >&5 4654 (exit $ac_status); } && 4655 { ac_try='test -s conftest$ac_exeext' 4656- { (eval echo "$as_me:18460: \"$ac_try\"") >&5 4657+ { (eval echo "$as_me:18461: \"$ac_try\"") >&5 4658 (eval $ac_try) 2>&5 4659 ac_status=$? 4660- echo "$as_me:18463: \$? = $ac_status" >&5 4661+ echo "$as_me:18464: \$? = $ac_status" >&5 4662 (exit $ac_status); }; }; then 4663 4664 cf_cv_func_openpty=$cf_header 4665@@ -18478,7 +18479,7 @@ 4666 LIBS="$cf_save_LIBS" 4667 4668 fi 4669-echo "$as_me:18481: result: $cf_cv_func_openpty" >&5 4670+echo "$as_me:18482: result: $cf_cv_func_openpty" >&5 4671 echo "${ECHO_T}$cf_cv_func_openpty" >&6 4672 4673 if test "$cf_cv_func_openpty" != no ; then 4674@@ -18512,7 +18513,7 @@ 4675 fi 4676 fi 4677 4678-echo "$as_me:18515: checking for function curses_version" >&5 4679+echo "$as_me:18516: checking for function curses_version" >&5 4680 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6 4681 if test "${cf_cv_func_curses_version+set}" = set; then 4682 echo $ECHO_N "(cached) $ECHO_C" >&6 4683@@ -18522,7 +18523,7 @@ 4684 cf_cv_func_curses_version=unknown 4685 else 4686 cat >conftest.$ac_ext <<_ACEOF 4687-#line 18525 "configure" 4688+#line 18526 "configure" 4689 #include "confdefs.h" 4690 4691 #include <${cf_cv_ncurses_header:-curses.h}> 4692@@ -18535,15 +18536,15 @@ 4693 4694 _ACEOF 4695 rm -f conftest$ac_exeext 4696-if { (eval echo "$as_me:18538: \"$ac_link\"") >&5 4697+if { (eval echo "$as_me:18539: \"$ac_link\"") >&5 4698 (eval $ac_link) 2>&5 4699 ac_status=$? 4700- echo "$as_me:18541: \$? = $ac_status" >&5 4701+ echo "$as_me:18542: \$? = $ac_status" >&5 4702 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 4703- { (eval echo "$as_me:18543: \"$ac_try\"") >&5 4704+ { (eval echo "$as_me:18544: \"$ac_try\"") >&5 4705 (eval $ac_try) 2>&5 4706 ac_status=$? 4707- echo "$as_me:18546: \$? = $ac_status" >&5 4708+ echo "$as_me:18547: \$? = $ac_status" >&5 4709 (exit $ac_status); }; }; then 4710 cf_cv_func_curses_version=yes 4711 4712@@ -18558,14 +18559,14 @@ 4713 fi 4714 rm -f core 4715 fi 4716-echo "$as_me:18561: result: $cf_cv_func_curses_version" >&5 4717+echo "$as_me:18562: result: $cf_cv_func_curses_version" >&5 4718 echo "${ECHO_T}$cf_cv_func_curses_version" >&6 4719 test "$cf_cv_func_curses_version" = yes && 4720 cat >>confdefs.h <<\EOF 4721 #define HAVE_CURSES_VERSION 1 4722 EOF 4723 4724-echo "$as_me:18568: checking for alternate character set array" >&5 4725+echo "$as_me:18569: checking for alternate character set array" >&5 4726 echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6 4727 if test "${cf_cv_curses_acs_map+set}" = set; then 4728 echo $ECHO_N "(cached) $ECHO_C" >&6 4729@@ -18575,7 +18576,7 @@ 4730 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map 4731 do 4732 cat >conftest.$ac_ext <<_ACEOF 4733-#line 18578 "configure" 4734+#line 18579 "configure" 4735 #include "confdefs.h" 4736 4737 #include <${cf_cv_ncurses_header:-curses.h}> 4738@@ -18591,16 +18592,16 @@ 4739 } 4740 _ACEOF 4741 rm -f conftest.$ac_objext conftest$ac_exeext 4742-if { (eval echo "$as_me:18594: \"$ac_link\"") >&5 4743+if { (eval echo "$as_me:18595: \"$ac_link\"") >&5 4744 (eval $ac_link) 2>&5 4745 ac_status=$? 4746- echo "$as_me:18597: \$? = $ac_status" >&5 4747+ echo "$as_me:18598: \$? = $ac_status" >&5 4748 (exit $ac_status); } && 4749 { ac_try='test -s conftest$ac_exeext' 4750- { (eval echo "$as_me:18600: \"$ac_try\"") >&5 4751+ { (eval echo "$as_me:18601: \"$ac_try\"") >&5 4752 (eval $ac_try) 2>&5 4753 ac_status=$? 4754- echo "$as_me:18603: \$? = $ac_status" >&5 4755+ echo "$as_me:18604: \$? = $ac_status" >&5 4756 (exit $ac_status); }; }; then 4757 cf_cv_curses_acs_map=$name; break 4758 else 4759@@ -18611,7 +18612,7 @@ 4760 done 4761 4762 fi 4763-echo "$as_me:18614: result: $cf_cv_curses_acs_map" >&5 4764+echo "$as_me:18615: result: $cf_cv_curses_acs_map" >&5 4765 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6 4766 4767 test "$cf_cv_curses_acs_map" != unknown && 4768@@ -18621,7 +18622,7 @@ 4769 4770 if test "$cf_enable_widec" = yes; then 4771 4772-echo "$as_me:18624: checking for wide alternate character set array" >&5 4773+echo "$as_me:18625: checking for wide alternate character set array" >&5 4774 echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6 4775 if test "${cf_cv_curses_wacs_map+set}" = set; then 4776 echo $ECHO_N "(cached) $ECHO_C" >&6 4777@@ -18631,7 +18632,7 @@ 4778 for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char 4779 do 4780 cat >conftest.$ac_ext <<_ACEOF 4781-#line 18634 "configure" 4782+#line 18635 "configure" 4783 #include "confdefs.h" 4784 4785 #ifndef _XOPEN_SOURCE_EXTENDED 4786@@ -18647,16 +18648,16 @@ 4787 } 4788 _ACEOF 4789 rm -f conftest.$ac_objext conftest$ac_exeext 4790-if { (eval echo "$as_me:18650: \"$ac_link\"") >&5 4791+if { (eval echo "$as_me:18651: \"$ac_link\"") >&5 4792 (eval $ac_link) 2>&5 4793 ac_status=$? 4794- echo "$as_me:18653: \$? = $ac_status" >&5 4795+ echo "$as_me:18654: \$? = $ac_status" >&5 4796 (exit $ac_status); } && 4797 { ac_try='test -s conftest$ac_exeext' 4798- { (eval echo "$as_me:18656: \"$ac_try\"") >&5 4799+ { (eval echo "$as_me:18657: \"$ac_try\"") >&5 4800 (eval $ac_try) 2>&5 4801 ac_status=$? 4802- echo "$as_me:18659: \$? = $ac_status" >&5 4803+ echo "$as_me:18660: \$? = $ac_status" >&5 4804 (exit $ac_status); }; }; then 4805 cf_cv_curses_wacs_map=$name 4806 break 4807@@ -18667,7 +18668,7 @@ 4808 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4809 done 4810 fi 4811-echo "$as_me:18670: result: $cf_cv_curses_wacs_map" >&5 4812+echo "$as_me:18671: result: $cf_cv_curses_wacs_map" >&5 4813 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 4814 4815 test "$cf_cv_curses_wacs_map" != unknown && 4816@@ -18675,7 +18676,7 @@ 4817 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map 4818 EOF 4819 4820-echo "$as_me:18678: checking for wide alternate character constants" >&5 4821+echo "$as_me:18679: checking for wide alternate character constants" >&5 4822 echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6 4823 if test "${cf_cv_curses_wacs_symbols+set}" = set; then 4824 echo $ECHO_N "(cached) $ECHO_C" >&6 4825@@ -18685,7 +18686,7 @@ 4826 if test "$cf_cv_curses_wacs_map" != unknown 4827 then 4828 cat >conftest.$ac_ext <<_ACEOF 4829-#line 18688 "configure" 4830+#line 18689 "configure" 4831 #include "confdefs.h" 4832 4833 #ifndef _XOPEN_SOURCE_EXTENDED 4834@@ -18702,16 +18703,16 @@ 4835 } 4836 _ACEOF 4837 rm -f conftest.$ac_objext conftest$ac_exeext 4838-if { (eval echo "$as_me:18705: \"$ac_link\"") >&5 4839+if { (eval echo "$as_me:18706: \"$ac_link\"") >&5 4840 (eval $ac_link) 2>&5 4841 ac_status=$? 4842- echo "$as_me:18708: \$? = $ac_status" >&5 4843+ echo "$as_me:18709: \$? = $ac_status" >&5 4844 (exit $ac_status); } && 4845 { ac_try='test -s conftest$ac_exeext' 4846- { (eval echo "$as_me:18711: \"$ac_try\"") >&5 4847+ { (eval echo "$as_me:18712: \"$ac_try\"") >&5 4848 (eval $ac_try) 2>&5 4849 ac_status=$? 4850- echo "$as_me:18714: \$? = $ac_status" >&5 4851+ echo "$as_me:18715: \$? = $ac_status" >&5 4852 (exit $ac_status); }; }; then 4853 cf_cv_curses_wacs_symbols=yes 4854 else 4855@@ -18721,7 +18722,7 @@ 4856 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 4857 else 4858 cat >conftest.$ac_ext <<_ACEOF 4859-#line 18724 "configure" 4860+#line 18725 "configure" 4861 #include "confdefs.h" 4862 4863 #ifndef _XOPEN_SOURCE_EXTENDED 4864@@ -18737,16 +18738,16 @@ 4865 } 4866 _ACEOF 4867 rm -f conftest.$ac_objext conftest$ac_exeext 4868-if { (eval echo "$as_me:18740: \"$ac_link\"") >&5 4869+if { (eval echo "$as_me:18741: \"$ac_link\"") >&5 4870 (eval $ac_link) 2>&5 4871 ac_status=$? 4872- echo "$as_me:18743: \$? = $ac_status" >&5 4873+ echo "$as_me:18744: \$? = $ac_status" >&5 4874 (exit $ac_status); } && 4875 { ac_try='test -s conftest$ac_exeext' 4876- { (eval echo "$as_me:18746: \"$ac_try\"") >&5 4877+ { (eval echo "$as_me:18747: \"$ac_try\"") >&5 4878 (eval $ac_try) 2>&5 4879 ac_status=$? 4880- echo "$as_me:18749: \$? = $ac_status" >&5 4881+ echo "$as_me:18750: \$? = $ac_status" >&5 4882 (exit $ac_status); }; }; then 4883 cf_cv_curses_wacs_symbols=yes 4884 else 4885@@ -18757,7 +18758,7 @@ 4886 fi 4887 4888 fi 4889-echo "$as_me:18760: result: $cf_cv_curses_wacs_symbols" >&5 4890+echo "$as_me:18761: result: $cf_cv_curses_wacs_symbols" >&5 4891 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 4892 4893 test "$cf_cv_curses_wacs_symbols" != no && 4894@@ -18767,10 +18768,10 @@ 4895 4896 fi 4897 4898-echo "$as_me:18770: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 4899+echo "$as_me:18771: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 4900 echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 4901 cat >conftest.$ac_ext <<_ACEOF 4902-#line 18773 "configure" 4903+#line 18774 "configure" 4904 #include "confdefs.h" 4905 4906 #ifndef _XOPEN_SOURCE_EXTENDED 4907@@ -18788,16 +18789,16 @@ 4908 } 4909 _ACEOF 4910 rm -f conftest.$ac_objext 4911-if { (eval echo "$as_me:18791: \"$ac_compile\"") >&5 4912+if { (eval echo "$as_me:18792: \"$ac_compile\"") >&5 4913 (eval $ac_compile) 2>&5 4914 ac_status=$? 4915- echo "$as_me:18794: \$? = $ac_status" >&5 4916+ echo "$as_me:18795: \$? = $ac_status" >&5 4917 (exit $ac_status); } && 4918 { ac_try='test -s conftest.$ac_objext' 4919- { (eval echo "$as_me:18797: \"$ac_try\"") >&5 4920+ { (eval echo "$as_me:18798: \"$ac_try\"") >&5 4921 (eval $ac_try) 2>&5 4922 ac_status=$? 4923- echo "$as_me:18800: \$? = $ac_status" >&5 4924+ echo "$as_me:18801: \$? = $ac_status" >&5 4925 (exit $ac_status); }; }; then 4926 cf_result=yes 4927 else 4928@@ -18806,7 +18807,7 @@ 4929 cf_result=no 4930 fi 4931 rm -f conftest.$ac_objext conftest.$ac_ext 4932-echo "$as_me:18809: result: $cf_result" >&5 4933+echo "$as_me:18810: result: $cf_result" >&5 4934 echo "${ECHO_T}$cf_result" >&6 4935 if test $cf_result = yes ; then 4936 4937@@ -18827,14 +18828,14 @@ 4938 if test "$cf_enable_widec" = yes; then 4939 4940 # This is needed on Tru64 5.0 to declare mbstate_t 4941-echo "$as_me:18830: checking if we must include wchar.h to declare mbstate_t" >&5 4942+echo "$as_me:18831: checking if we must include wchar.h to declare mbstate_t" >&5 4943 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 4944 if test "${cf_cv_mbstate_t+set}" = set; then 4945 echo $ECHO_N "(cached) $ECHO_C" >&6 4946 else 4947 4948 cat >conftest.$ac_ext <<_ACEOF 4949-#line 18837 "configure" 4950+#line 18838 "configure" 4951 #include "confdefs.h" 4952 4953 #include <stdlib.h> 4954@@ -18852,23 +18853,23 @@ 4955 } 4956 _ACEOF 4957 rm -f conftest.$ac_objext 4958-if { (eval echo "$as_me:18855: \"$ac_compile\"") >&5 4959+if { (eval echo "$as_me:18856: \"$ac_compile\"") >&5 4960 (eval $ac_compile) 2>&5 4961 ac_status=$? 4962- echo "$as_me:18858: \$? = $ac_status" >&5 4963+ echo "$as_me:18859: \$? = $ac_status" >&5 4964 (exit $ac_status); } && 4965 { ac_try='test -s conftest.$ac_objext' 4966- { (eval echo "$as_me:18861: \"$ac_try\"") >&5 4967+ { (eval echo "$as_me:18862: \"$ac_try\"") >&5 4968 (eval $ac_try) 2>&5 4969 ac_status=$? 4970- echo "$as_me:18864: \$? = $ac_status" >&5 4971+ echo "$as_me:18865: \$? = $ac_status" >&5 4972 (exit $ac_status); }; }; then 4973 cf_cv_mbstate_t=no 4974 else 4975 echo "$as_me: failed program was:" >&5 4976 cat conftest.$ac_ext >&5 4977 cat >conftest.$ac_ext <<_ACEOF 4978-#line 18871 "configure" 4979+#line 18872 "configure" 4980 #include "confdefs.h" 4981 4982 #include <stdlib.h> 4983@@ -18887,16 +18888,16 @@ 4984 } 4985 _ACEOF 4986 rm -f conftest.$ac_objext 4987-if { (eval echo "$as_me:18890: \"$ac_compile\"") >&5 4988+if { (eval echo "$as_me:18891: \"$ac_compile\"") >&5 4989 (eval $ac_compile) 2>&5 4990 ac_status=$? 4991- echo "$as_me:18893: \$? = $ac_status" >&5 4992+ echo "$as_me:18894: \$? = $ac_status" >&5 4993 (exit $ac_status); } && 4994 { ac_try='test -s conftest.$ac_objext' 4995- { (eval echo "$as_me:18896: \"$ac_try\"") >&5 4996+ { (eval echo "$as_me:18897: \"$ac_try\"") >&5 4997 (eval $ac_try) 2>&5 4998 ac_status=$? 4999- echo "$as_me:18899: \$? = $ac_status" >&5 5000+ echo "$as_me:18900: \$? = $ac_status" >&5 5001 (exit $ac_status); }; }; then 5002 cf_cv_mbstate_t=yes 5003 else 5004@@ -18908,7 +18909,7 @@ 5005 fi 5006 rm -f conftest.$ac_objext conftest.$ac_ext 5007 fi 5008-echo "$as_me:18911: result: $cf_cv_mbstate_t" >&5 5009+echo "$as_me:18912: result: $cf_cv_mbstate_t" >&5 5010 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 5011 5012 if test "$cf_cv_mbstate_t" = yes ; then 5013@@ -18931,14 +18932,14 @@ 5014 fi 5015 5016 # This is needed on Tru64 5.0 to declare wchar_t 5017-echo "$as_me:18934: checking if we must include wchar.h to declare wchar_t" >&5 5018+echo "$as_me:18935: checking if we must include wchar.h to declare wchar_t" >&5 5019 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 5020 if test "${cf_cv_wchar_t+set}" = set; then 5021 echo $ECHO_N "(cached) $ECHO_C" >&6 5022 else 5023 5024 cat >conftest.$ac_ext <<_ACEOF 5025-#line 18941 "configure" 5026+#line 18942 "configure" 5027 #include "confdefs.h" 5028 5029 #include <stdlib.h> 5030@@ -18956,23 +18957,23 @@ 5031 } 5032 _ACEOF 5033 rm -f conftest.$ac_objext 5034-if { (eval echo "$as_me:18959: \"$ac_compile\"") >&5 5035+if { (eval echo "$as_me:18960: \"$ac_compile\"") >&5 5036 (eval $ac_compile) 2>&5 5037 ac_status=$? 5038- echo "$as_me:18962: \$? = $ac_status" >&5 5039+ echo "$as_me:18963: \$? = $ac_status" >&5 5040 (exit $ac_status); } && 5041 { ac_try='test -s conftest.$ac_objext' 5042- { (eval echo "$as_me:18965: \"$ac_try\"") >&5 5043+ { (eval echo "$as_me:18966: \"$ac_try\"") >&5 5044 (eval $ac_try) 2>&5 5045 ac_status=$? 5046- echo "$as_me:18968: \$? = $ac_status" >&5 5047+ echo "$as_me:18969: \$? = $ac_status" >&5 5048 (exit $ac_status); }; }; then 5049 cf_cv_wchar_t=no 5050 else 5051 echo "$as_me: failed program was:" >&5 5052 cat conftest.$ac_ext >&5 5053 cat >conftest.$ac_ext <<_ACEOF 5054-#line 18975 "configure" 5055+#line 18976 "configure" 5056 #include "confdefs.h" 5057 5058 #include <stdlib.h> 5059@@ -18991,16 +18992,16 @@ 5060 } 5061 _ACEOF 5062 rm -f conftest.$ac_objext 5063-if { (eval echo "$as_me:18994: \"$ac_compile\"") >&5 5064+if { (eval echo "$as_me:18995: \"$ac_compile\"") >&5 5065 (eval $ac_compile) 2>&5 5066 ac_status=$? 5067- echo "$as_me:18997: \$? = $ac_status" >&5 5068+ echo "$as_me:18998: \$? = $ac_status" >&5 5069 (exit $ac_status); } && 5070 { ac_try='test -s conftest.$ac_objext' 5071- { (eval echo "$as_me:19000: \"$ac_try\"") >&5 5072+ { (eval echo "$as_me:19001: \"$ac_try\"") >&5 5073 (eval $ac_try) 2>&5 5074 ac_status=$? 5075- echo "$as_me:19003: \$? = $ac_status" >&5 5076+ echo "$as_me:19004: \$? = $ac_status" >&5 5077 (exit $ac_status); }; }; then 5078 cf_cv_wchar_t=yes 5079 else 5080@@ -19012,7 +19013,7 @@ 5081 fi 5082 rm -f conftest.$ac_objext conftest.$ac_ext 5083 fi 5084-echo "$as_me:19015: result: $cf_cv_wchar_t" >&5 5085+echo "$as_me:19016: result: $cf_cv_wchar_t" >&5 5086 echo "${ECHO_T}$cf_cv_wchar_t" >&6 5087 5088 if test "$cf_cv_wchar_t" = yes ; then 5089@@ -19035,14 +19036,14 @@ 5090 fi 5091 5092 # This is needed on Tru64 5.0 to declare wint_t 5093-echo "$as_me:19038: checking if we must include wchar.h to declare wint_t" >&5 5094+echo "$as_me:19039: checking if we must include wchar.h to declare wint_t" >&5 5095 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 5096 if test "${cf_cv_wint_t+set}" = set; then 5097 echo $ECHO_N "(cached) $ECHO_C" >&6 5098 else 5099 5100 cat >conftest.$ac_ext <<_ACEOF 5101-#line 19045 "configure" 5102+#line 19046 "configure" 5103 #include "confdefs.h" 5104 5105 #include <stdlib.h> 5106@@ -19060,23 +19061,23 @@ 5107 } 5108 _ACEOF 5109 rm -f conftest.$ac_objext 5110-if { (eval echo "$as_me:19063: \"$ac_compile\"") >&5 5111+if { (eval echo "$as_me:19064: \"$ac_compile\"") >&5 5112 (eval $ac_compile) 2>&5 5113 ac_status=$? 5114- echo "$as_me:19066: \$? = $ac_status" >&5 5115+ echo "$as_me:19067: \$? = $ac_status" >&5 5116 (exit $ac_status); } && 5117 { ac_try='test -s conftest.$ac_objext' 5118- { (eval echo "$as_me:19069: \"$ac_try\"") >&5 5119+ { (eval echo "$as_me:19070: \"$ac_try\"") >&5 5120 (eval $ac_try) 2>&5 5121 ac_status=$? 5122- echo "$as_me:19072: \$? = $ac_status" >&5 5123+ echo "$as_me:19073: \$? = $ac_status" >&5 5124 (exit $ac_status); }; }; then 5125 cf_cv_wint_t=no 5126 else 5127 echo "$as_me: failed program was:" >&5 5128 cat conftest.$ac_ext >&5 5129 cat >conftest.$ac_ext <<_ACEOF 5130-#line 19079 "configure" 5131+#line 19080 "configure" 5132 #include "confdefs.h" 5133 5134 #include <stdlib.h> 5135@@ -19095,16 +19096,16 @@ 5136 } 5137 _ACEOF 5138 rm -f conftest.$ac_objext 5139-if { (eval echo "$as_me:19098: \"$ac_compile\"") >&5 5140+if { (eval echo "$as_me:19099: \"$ac_compile\"") >&5 5141 (eval $ac_compile) 2>&5 5142 ac_status=$? 5143- echo "$as_me:19101: \$? = $ac_status" >&5 5144+ echo "$as_me:19102: \$? = $ac_status" >&5 5145 (exit $ac_status); } && 5146 { ac_try='test -s conftest.$ac_objext' 5147- { (eval echo "$as_me:19104: \"$ac_try\"") >&5 5148+ { (eval echo "$as_me:19105: \"$ac_try\"") >&5 5149 (eval $ac_try) 2>&5 5150 ac_status=$? 5151- echo "$as_me:19107: \$? = $ac_status" >&5 5152+ echo "$as_me:19108: \$? = $ac_status" >&5 5153 (exit $ac_status); }; }; then 5154 cf_cv_wint_t=yes 5155 else 5156@@ -19116,7 +19117,7 @@ 5157 fi 5158 rm -f conftest.$ac_objext conftest.$ac_ext 5159 fi 5160-echo "$as_me:19119: result: $cf_cv_wint_t" >&5 5161+echo "$as_me:19120: result: $cf_cv_wint_t" >&5 5162 echo "${ECHO_T}$cf_cv_wint_t" >&6 5163 5164 if test "$cf_cv_wint_t" = yes ; then 5165@@ -19140,10 +19141,10 @@ 5166 5167 if test "$NCURSES_OK_MBSTATE_T" = 0 ; then 5168 5169-echo "$as_me:19143: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 5170+echo "$as_me:19144: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 5171 echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 5172 cat >conftest.$ac_ext <<_ACEOF 5173-#line 19146 "configure" 5174+#line 19147 "configure" 5175 #include "confdefs.h" 5176 5177 #ifndef _XOPEN_SOURCE_EXTENDED 5178@@ -19161,16 +19162,16 @@ 5179 } 5180 _ACEOF 5181 rm -f conftest.$ac_objext 5182-if { (eval echo "$as_me:19164: \"$ac_compile\"") >&5 5183+if { (eval echo "$as_me:19165: \"$ac_compile\"") >&5 5184 (eval $ac_compile) 2>&5 5185 ac_status=$? 5186- echo "$as_me:19167: \$? = $ac_status" >&5 5187+ echo "$as_me:19168: \$? = $ac_status" >&5 5188 (exit $ac_status); } && 5189 { ac_try='test -s conftest.$ac_objext' 5190- { (eval echo "$as_me:19170: \"$ac_try\"") >&5 5191+ { (eval echo "$as_me:19171: \"$ac_try\"") >&5 5192 (eval $ac_try) 2>&5 5193 ac_status=$? 5194- echo "$as_me:19173: \$? = $ac_status" >&5 5195+ echo "$as_me:19174: \$? = $ac_status" >&5 5196 (exit $ac_status); }; }; then 5197 cf_result=yes 5198 else 5199@@ -19179,7 +19180,7 @@ 5200 cf_result=no 5201 fi 5202 rm -f conftest.$ac_objext conftest.$ac_ext 5203-echo "$as_me:19182: result: $cf_result" >&5 5204+echo "$as_me:19183: result: $cf_result" >&5 5205 echo "${ECHO_T}$cf_result" >&6 5206 if test $cf_result = yes ; then 5207 5208@@ -19201,10 +19202,10 @@ 5209 5210 if test "$NCURSES_OK_WCHAR_T" = 0 ; then 5211 5212-echo "$as_me:19204: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 5213+echo "$as_me:19205: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 5214 echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 5215 cat >conftest.$ac_ext <<_ACEOF 5216-#line 19207 "configure" 5217+#line 19208 "configure" 5218 #include "confdefs.h" 5219 5220 #ifndef _XOPEN_SOURCE_EXTENDED 5221@@ -19222,16 +19223,16 @@ 5222 } 5223 _ACEOF 5224 rm -f conftest.$ac_objext 5225-if { (eval echo "$as_me:19225: \"$ac_compile\"") >&5 5226+if { (eval echo "$as_me:19226: \"$ac_compile\"") >&5 5227 (eval $ac_compile) 2>&5 5228 ac_status=$? 5229- echo "$as_me:19228: \$? = $ac_status" >&5 5230+ echo "$as_me:19229: \$? = $ac_status" >&5 5231 (exit $ac_status); } && 5232 { ac_try='test -s conftest.$ac_objext' 5233- { (eval echo "$as_me:19231: \"$ac_try\"") >&5 5234+ { (eval echo "$as_me:19232: \"$ac_try\"") >&5 5235 (eval $ac_try) 2>&5 5236 ac_status=$? 5237- echo "$as_me:19234: \$? = $ac_status" >&5 5238+ echo "$as_me:19235: \$? = $ac_status" >&5 5239 (exit $ac_status); }; }; then 5240 cf_result=yes 5241 else 5242@@ -19240,7 +19241,7 @@ 5243 cf_result=no 5244 fi 5245 rm -f conftest.$ac_objext conftest.$ac_ext 5246-echo "$as_me:19243: result: $cf_result" >&5 5247+echo "$as_me:19244: result: $cf_result" >&5 5248 echo "${ECHO_T}$cf_result" >&6 5249 if test $cf_result = yes ; then 5250 5251@@ -19262,10 +19263,10 @@ 5252 5253 if test "$NCURSES_OK_WINT_T" = 0 ; then 5254 5255-echo "$as_me:19265: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 5256+echo "$as_me:19266: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 5257 echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 5258 cat >conftest.$ac_ext <<_ACEOF 5259-#line 19268 "configure" 5260+#line 19269 "configure" 5261 #include "confdefs.h" 5262 5263 #ifndef _XOPEN_SOURCE_EXTENDED 5264@@ -19283,16 +19284,16 @@ 5265 } 5266 _ACEOF 5267 rm -f conftest.$ac_objext 5268-if { (eval echo "$as_me:19286: \"$ac_compile\"") >&5 5269+if { (eval echo "$as_me:19287: \"$ac_compile\"") >&5 5270 (eval $ac_compile) 2>&5 5271 ac_status=$? 5272- echo "$as_me:19289: \$? = $ac_status" >&5 5273+ echo "$as_me:19290: \$? = $ac_status" >&5 5274 (exit $ac_status); } && 5275 { ac_try='test -s conftest.$ac_objext' 5276- { (eval echo "$as_me:19292: \"$ac_try\"") >&5 5277+ { (eval echo "$as_me:19293: \"$ac_try\"") >&5 5278 (eval $ac_try) 2>&5 5279 ac_status=$? 5280- echo "$as_me:19295: \$? = $ac_status" >&5 5281+ echo "$as_me:19296: \$? = $ac_status" >&5 5282 (exit $ac_status); }; }; then 5283 cf_result=yes 5284 else 5285@@ -19301,7 +19302,7 @@ 5286 cf_result=no 5287 fi 5288 rm -f conftest.$ac_objext conftest.$ac_ext 5289-echo "$as_me:19304: result: $cf_result" >&5 5290+echo "$as_me:19305: result: $cf_result" >&5 5291 echo "${ECHO_T}$cf_result" >&6 5292 if test $cf_result = yes ; then 5293 5294@@ -19330,11 +19331,11 @@ 5295 boolfnames \ 5296 ttytype 5297 do 5298-echo "$as_me:19333: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 5299+echo "$as_me:19334: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 5300 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 5301 5302 cat >conftest.$ac_ext <<_ACEOF 5303-#line 19337 "configure" 5304+#line 19338 "configure" 5305 #include "confdefs.h" 5306 5307 #ifdef HAVE_XCURSES 5308@@ -19362,16 +19363,16 @@ 5309 } 5310 _ACEOF 5311 rm -f conftest.$ac_objext 5312-if { (eval echo "$as_me:19365: \"$ac_compile\"") >&5 5313+if { (eval echo "$as_me:19366: \"$ac_compile\"") >&5 5314 (eval $ac_compile) 2>&5 5315 ac_status=$? 5316- echo "$as_me:19368: \$? = $ac_status" >&5 5317+ echo "$as_me:19369: \$? = $ac_status" >&5 5318 (exit $ac_status); } && 5319 { ac_try='test -s conftest.$ac_objext' 5320- { (eval echo "$as_me:19371: \"$ac_try\"") >&5 5321+ { (eval echo "$as_me:19372: \"$ac_try\"") >&5 5322 (eval $ac_try) 2>&5 5323 ac_status=$? 5324- echo "$as_me:19374: \$? = $ac_status" >&5 5325+ echo "$as_me:19375: \$? = $ac_status" >&5 5326 (exit $ac_status); }; }; then 5327 cf_result=yes 5328 5329@@ -19381,7 +19382,7 @@ 5330 cf_result=no 5331 fi 5332 rm -f conftest.$ac_objext conftest.$ac_ext 5333-echo "$as_me:19384: result: $cf_result" >&5 5334+echo "$as_me:19385: result: $cf_result" >&5 5335 echo "${ECHO_T}$cf_result" >&6 5336 5337 if test $cf_result = yes ; then 5338@@ -19393,14 +19394,14 @@ 5339 EOF 5340 5341 else 5342- echo "$as_me:19396: checking for data $cf_data in library" >&5 5343+ echo "$as_me:19397: checking for data $cf_data in library" >&5 5344 echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6 5345 # BSD linkers insist on making weak linkage, but resolve at runtime. 5346 if test "$cross_compiling" = yes; then 5347 5348 # cross-compiling 5349 cat >conftest.$ac_ext <<_ACEOF 5350-#line 19403 "configure" 5351+#line 19404 "configure" 5352 #include "confdefs.h" 5353 5354 #ifdef HAVE_XCURSES 5355@@ -19433,16 +19434,16 @@ 5356 } 5357 _ACEOF 5358 rm -f conftest.$ac_objext conftest$ac_exeext 5359-if { (eval echo "$as_me:19436: \"$ac_link\"") >&5 5360+if { (eval echo "$as_me:19437: \"$ac_link\"") >&5 5361 (eval $ac_link) 2>&5 5362 ac_status=$? 5363- echo "$as_me:19439: \$? = $ac_status" >&5 5364+ echo "$as_me:19440: \$? = $ac_status" >&5 5365 (exit $ac_status); } && 5366 { ac_try='test -s conftest$ac_exeext' 5367- { (eval echo "$as_me:19442: \"$ac_try\"") >&5 5368+ { (eval echo "$as_me:19443: \"$ac_try\"") >&5 5369 (eval $ac_try) 2>&5 5370 ac_status=$? 5371- echo "$as_me:19445: \$? = $ac_status" >&5 5372+ echo "$as_me:19446: \$? = $ac_status" >&5 5373 (exit $ac_status); }; }; then 5374 cf_result=yes 5375 else 5376@@ -19454,7 +19455,7 @@ 5377 5378 else 5379 cat >conftest.$ac_ext <<_ACEOF 5380-#line 19457 "configure" 5381+#line 19458 "configure" 5382 #include "confdefs.h" 5383 5384 #ifdef HAVE_XCURSES 5385@@ -19480,15 +19481,15 @@ 5386 } 5387 _ACEOF 5388 rm -f conftest$ac_exeext 5389-if { (eval echo "$as_me:19483: \"$ac_link\"") >&5 5390+if { (eval echo "$as_me:19484: \"$ac_link\"") >&5 5391 (eval $ac_link) 2>&5 5392 ac_status=$? 5393- echo "$as_me:19486: \$? = $ac_status" >&5 5394+ echo "$as_me:19487: \$? = $ac_status" >&5 5395 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 5396- { (eval echo "$as_me:19488: \"$ac_try\"") >&5 5397+ { (eval echo "$as_me:19489: \"$ac_try\"") >&5 5398 (eval $ac_try) 2>&5 5399 ac_status=$? 5400- echo "$as_me:19491: \$? = $ac_status" >&5 5401+ echo "$as_me:19492: \$? = $ac_status" >&5 5402 (exit $ac_status); }; }; then 5403 cf_result=yes 5404 5405@@ -19500,7 +19501,7 @@ 5406 fi 5407 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 5408 fi 5409- echo "$as_me:19503: result: $cf_result" >&5 5410+ echo "$as_me:19504: result: $cf_result" >&5 5411 echo "${ECHO_T}$cf_result" >&6 5412 if test $cf_result = yes ; then 5413 5414@@ -19517,7 +19518,7 @@ 5415 5416 if ( test "$GCC" = yes || test "$GXX" = yes ) 5417 then 5418-echo "$as_me:19520: checking if you want to turn on gcc warnings" >&5 5419+echo "$as_me:19521: checking if you want to turn on gcc warnings" >&5 5420 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 5421 5422 # Check whether --enable-warnings or --disable-warnings was given. 5423@@ -19534,7 +19535,7 @@ 5424 with_warnings=no 5425 5426 fi; 5427-echo "$as_me:19537: result: $with_warnings" >&5 5428+echo "$as_me:19538: result: $with_warnings" >&5 5429 echo "${ECHO_T}$with_warnings" >&6 5430 if test "$with_warnings" = "yes" 5431 then 5432@@ -19557,10 +19558,10 @@ 5433 EOF 5434 if test "$GCC" = yes 5435 then 5436- { echo "$as_me:19560: checking for $CC __attribute__ directives..." >&5 5437+ { echo "$as_me:19561: checking for $CC __attribute__ directives..." >&5 5438 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} 5439 cat > conftest.$ac_ext <<EOF 5440-#line 19563 "${as_me:-configure}" 5441+#line 19564 "${as_me:-configure}" 5442 #include "confdefs.h" 5443 #include "conftest.h" 5444 #include "conftest.i" 5445@@ -19609,12 +19610,12 @@ 5446 ;; 5447 esac 5448 5449- if { (eval echo "$as_me:19612: \"$ac_compile\"") >&5 5450+ if { (eval echo "$as_me:19613: \"$ac_compile\"") >&5 5451 (eval $ac_compile) 2>&5 5452 ac_status=$? 5453- echo "$as_me:19615: \$? = $ac_status" >&5 5454+ echo "$as_me:19616: \$? = $ac_status" >&5 5455 (exit $ac_status); }; then 5456- test -n "$verbose" && echo "$as_me:19617: result: ... $cf_attribute" >&5 5457+ test -n "$verbose" && echo "$as_me:19618: result: ... $cf_attribute" >&5 5458 echo "${ECHO_T}... $cf_attribute" >&6 5459 cat conftest.h >>confdefs.h 5460 case $cf_attribute in 5461@@ -19692,7 +19693,7 @@ 5462 done 5463 5464 cat >conftest.$ac_ext <<_ACEOF 5465-#line 19695 "configure" 5466+#line 19696 "configure" 5467 #include "confdefs.h" 5468 5469 #include <stdlib.h> 5470@@ -19707,26 +19708,26 @@ 5471 } 5472 _ACEOF 5473 rm -f conftest.$ac_objext 5474-if { (eval echo "$as_me:19710: \"$ac_compile\"") >&5 5475+if { (eval echo "$as_me:19711: \"$ac_compile\"") >&5 5476 (eval $ac_compile) 2>&5 5477 ac_status=$? 5478- echo "$as_me:19713: \$? = $ac_status" >&5 5479+ echo "$as_me:19714: \$? = $ac_status" >&5 5480 (exit $ac_status); } && 5481 { ac_try='test -s conftest.$ac_objext' 5482- { (eval echo "$as_me:19716: \"$ac_try\"") >&5 5483+ { (eval echo "$as_me:19717: \"$ac_try\"") >&5 5484 (eval $ac_try) 2>&5 5485 ac_status=$? 5486- echo "$as_me:19719: \$? = $ac_status" >&5 5487+ echo "$as_me:19720: \$? = $ac_status" >&5 5488 (exit $ac_status); }; }; then 5489 5490-echo "$as_me:19722: checking for X11/Xt const-feature" >&5 5491+echo "$as_me:19723: checking for X11/Xt const-feature" >&5 5492 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 5493 if test "${cf_cv_const_x_string+set}" = set; then 5494 echo $ECHO_N "(cached) $ECHO_C" >&6 5495 else 5496 5497 cat >conftest.$ac_ext <<_ACEOF 5498-#line 19729 "configure" 5499+#line 19730 "configure" 5500 #include "confdefs.h" 5501 5502 #define _CONST_X_STRING /* X11R7.8 (perhaps) */ 5503@@ -19743,16 +19744,16 @@ 5504 } 5505 _ACEOF 5506 rm -f conftest.$ac_objext 5507-if { (eval echo "$as_me:19746: \"$ac_compile\"") >&5 5508+if { (eval echo "$as_me:19747: \"$ac_compile\"") >&5 5509 (eval $ac_compile) 2>&5 5510 ac_status=$? 5511- echo "$as_me:19749: \$? = $ac_status" >&5 5512+ echo "$as_me:19750: \$? = $ac_status" >&5 5513 (exit $ac_status); } && 5514 { ac_try='test -s conftest.$ac_objext' 5515- { (eval echo "$as_me:19752: \"$ac_try\"") >&5 5516+ { (eval echo "$as_me:19753: \"$ac_try\"") >&5 5517 (eval $ac_try) 2>&5 5518 ac_status=$? 5519- echo "$as_me:19755: \$? = $ac_status" >&5 5520+ echo "$as_me:19756: \$? = $ac_status" >&5 5521 (exit $ac_status); }; }; then 5522 5523 cf_cv_const_x_string=no 5524@@ -19767,7 +19768,7 @@ 5525 rm -f conftest.$ac_objext conftest.$ac_ext 5526 5527 fi 5528-echo "$as_me:19770: result: $cf_cv_const_x_string" >&5 5529+echo "$as_me:19771: result: $cf_cv_const_x_string" >&5 5530 echo "${ECHO_T}$cf_cv_const_x_string" >&6 5531 5532 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" 5533@@ -19796,7 +19797,7 @@ 5534 rm -f conftest.$ac_objext conftest.$ac_ext 5535 fi 5536 cat > conftest.$ac_ext <<EOF 5537-#line 19799 "${as_me:-configure}" 5538+#line 19800 "${as_me:-configure}" 5539 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } 5540 EOF 5541 if test "$INTEL_COMPILER" = yes 5542@@ -19812,7 +19813,7 @@ 5543 # remark #981: operands are evaluated in unspecified order 5544 # warning #279: controlling expression is constant 5545 5546- { echo "$as_me:19815: checking for $CC warning options..." >&5 5547+ { echo "$as_me:19816: checking for $CC warning options..." >&5 5548 echo "$as_me: checking for $CC warning options..." >&6;} 5549 cf_save_CFLAGS="$CFLAGS" 5550 EXTRA_CFLAGS="-Wall" 5551@@ -19828,12 +19829,12 @@ 5552 wd981 5553 do 5554 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" 5555- if { (eval echo "$as_me:19831: \"$ac_compile\"") >&5 5556+ if { (eval echo "$as_me:19832: \"$ac_compile\"") >&5 5557 (eval $ac_compile) 2>&5 5558 ac_status=$? 5559- echo "$as_me:19834: \$? = $ac_status" >&5 5560+ echo "$as_me:19835: \$? = $ac_status" >&5 5561 (exit $ac_status); }; then 5562- test -n "$verbose" && echo "$as_me:19836: result: ... -$cf_opt" >&5 5563+ test -n "$verbose" && echo "$as_me:19837: result: ... -$cf_opt" >&5 5564 echo "${ECHO_T}... -$cf_opt" >&6 5565 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" 5566 fi 5567@@ -19841,7 +19842,7 @@ 5568 CFLAGS="$cf_save_CFLAGS" 5569 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" 5570 then 5571- { echo "$as_me:19844: checking for $CC warning options..." >&5 5572+ { echo "$as_me:19845: checking for $CC warning options..." >&5 5573 echo "$as_me: checking for $CC warning options..." >&6;} 5574 cf_save_CFLAGS="$CFLAGS" 5575 EXTRA_CFLAGS= 5576@@ -19865,12 +19866,12 @@ 5577 Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas 5578 do 5579 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" 5580- if { (eval echo "$as_me:19868: \"$ac_compile\"") >&5 5581+ if { (eval echo "$as_me:19869: \"$ac_compile\"") >&5 5582 (eval $ac_compile) 2>&5 5583 ac_status=$? 5584- echo "$as_me:19871: \$? = $ac_status" >&5 5585+ echo "$as_me:19872: \$? = $ac_status" >&5 5586 (exit $ac_status); }; then 5587- test -n "$verbose" && echo "$as_me:19873: result: ... -$cf_opt" >&5 5588+ test -n "$verbose" && echo "$as_me:19874: result: ... -$cf_opt" >&5 5589 echo "${ECHO_T}... -$cf_opt" >&6 5590 case $cf_opt in 5591 (Winline) 5592@@ -19878,7 +19879,7 @@ 5593 ([34].*) 5594 test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 5595 5596-echo "${as_me:-configure}:19881: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 5597+echo "${as_me:-configure}:19882: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 5598 5599 continue;; 5600 esac 5601@@ -19888,7 +19889,7 @@ 5602 ([12].*) 5603 test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 5604 5605-echo "${as_me:-configure}:19891: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 5606+echo "${as_me:-configure}:19892: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 5607 5608 continue;; 5609 esac 5610@@ -19904,7 +19905,7 @@ 5611 fi 5612 fi 5613 5614-echo "$as_me:19907: checking if you want to use dmalloc for testing" >&5 5615+echo "$as_me:19908: checking if you want to use dmalloc for testing" >&5 5616 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 5617 5618 # Check whether --with-dmalloc or --without-dmalloc was given. 5619@@ -19921,7 +19922,7 @@ 5620 else 5621 with_dmalloc= 5622 fi; 5623-echo "$as_me:19924: result: ${with_dmalloc:-no}" >&5 5624+echo "$as_me:19925: result: ${with_dmalloc:-no}" >&5 5625 echo "${ECHO_T}${with_dmalloc:-no}" >&6 5626 5627 case .$with_cflags in 5628@@ -20035,23 +20036,23 @@ 5629 esac 5630 5631 if test "$with_dmalloc" = yes ; then 5632- echo "$as_me:20038: checking for dmalloc.h" >&5 5633+ echo "$as_me:20039: checking for dmalloc.h" >&5 5634 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 5635 if test "${ac_cv_header_dmalloc_h+set}" = set; then 5636 echo $ECHO_N "(cached) $ECHO_C" >&6 5637 else 5638 cat >conftest.$ac_ext <<_ACEOF 5639-#line 20044 "configure" 5640+#line 20045 "configure" 5641 #include "confdefs.h" 5642 #include <dmalloc.h> 5643 _ACEOF 5644-if { (eval echo "$as_me:20048: \"$ac_cpp conftest.$ac_ext\"") >&5 5645+if { (eval echo "$as_me:20049: \"$ac_cpp conftest.$ac_ext\"") >&5 5646 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 5647 ac_status=$? 5648 egrep -v '^ *\+' conftest.er1 >conftest.err 5649 rm -f conftest.er1 5650 cat conftest.err >&5 5651- echo "$as_me:20054: \$? = $ac_status" >&5 5652+ echo "$as_me:20055: \$? = $ac_status" >&5 5653 (exit $ac_status); } >/dev/null; then 5654 if test -s conftest.err; then 5655 ac_cpp_err=$ac_c_preproc_warn_flag 5656@@ -20070,11 +20071,11 @@ 5657 fi 5658 rm -f conftest.err conftest.$ac_ext 5659 fi 5660-echo "$as_me:20073: result: $ac_cv_header_dmalloc_h" >&5 5661+echo "$as_me:20074: result: $ac_cv_header_dmalloc_h" >&5 5662 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 5663 if test $ac_cv_header_dmalloc_h = yes; then 5664 5665-echo "$as_me:20077: checking for dmalloc_debug in -ldmalloc" >&5 5666+echo "$as_me:20078: checking for dmalloc_debug in -ldmalloc" >&5 5667 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 5668 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then 5669 echo $ECHO_N "(cached) $ECHO_C" >&6 5670@@ -20082,7 +20083,7 @@ 5671 ac_check_lib_save_LIBS=$LIBS 5672 LIBS="-ldmalloc $LIBS" 5673 cat >conftest.$ac_ext <<_ACEOF 5674-#line 20085 "configure" 5675+#line 20086 "configure" 5676 #include "confdefs.h" 5677 5678 /* Override any gcc2 internal prototype to avoid an error. */ 5679@@ -20101,16 +20102,16 @@ 5680 } 5681 _ACEOF 5682 rm -f conftest.$ac_objext conftest$ac_exeext 5683-if { (eval echo "$as_me:20104: \"$ac_link\"") >&5 5684+if { (eval echo "$as_me:20105: \"$ac_link\"") >&5 5685 (eval $ac_link) 2>&5 5686 ac_status=$? 5687- echo "$as_me:20107: \$? = $ac_status" >&5 5688+ echo "$as_me:20108: \$? = $ac_status" >&5 5689 (exit $ac_status); } && 5690 { ac_try='test -s conftest$ac_exeext' 5691- { (eval echo "$as_me:20110: \"$ac_try\"") >&5 5692+ { (eval echo "$as_me:20111: \"$ac_try\"") >&5 5693 (eval $ac_try) 2>&5 5694 ac_status=$? 5695- echo "$as_me:20113: \$? = $ac_status" >&5 5696+ echo "$as_me:20114: \$? = $ac_status" >&5 5697 (exit $ac_status); }; }; then 5698 ac_cv_lib_dmalloc_dmalloc_debug=yes 5699 else 5700@@ -20121,7 +20122,7 @@ 5701 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 5702 LIBS=$ac_check_lib_save_LIBS 5703 fi 5704-echo "$as_me:20124: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 5705+echo "$as_me:20125: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 5706 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 5707 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then 5708 cat >>confdefs.h <<EOF 5709@@ -20136,7 +20137,7 @@ 5710 5711 fi 5712 5713-echo "$as_me:20139: checking if you want to use dbmalloc for testing" >&5 5714+echo "$as_me:20140: checking if you want to use dbmalloc for testing" >&5 5715 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 5716 5717 # Check whether --with-dbmalloc or --without-dbmalloc was given. 5718@@ -20153,7 +20154,7 @@ 5719 else 5720 with_dbmalloc= 5721 fi; 5722-echo "$as_me:20156: result: ${with_dbmalloc:-no}" >&5 5723+echo "$as_me:20157: result: ${with_dbmalloc:-no}" >&5 5724 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 5725 5726 case .$with_cflags in 5727@@ -20267,23 +20268,23 @@ 5728 esac 5729 5730 if test "$with_dbmalloc" = yes ; then 5731- echo "$as_me:20270: checking for dbmalloc.h" >&5 5732+ echo "$as_me:20271: checking for dbmalloc.h" >&5 5733 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 5734 if test "${ac_cv_header_dbmalloc_h+set}" = set; then 5735 echo $ECHO_N "(cached) $ECHO_C" >&6 5736 else 5737 cat >conftest.$ac_ext <<_ACEOF 5738-#line 20276 "configure" 5739+#line 20277 "configure" 5740 #include "confdefs.h" 5741 #include <dbmalloc.h> 5742 _ACEOF 5743-if { (eval echo "$as_me:20280: \"$ac_cpp conftest.$ac_ext\"") >&5 5744+if { (eval echo "$as_me:20281: \"$ac_cpp conftest.$ac_ext\"") >&5 5745 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 5746 ac_status=$? 5747 egrep -v '^ *\+' conftest.er1 >conftest.err 5748 rm -f conftest.er1 5749 cat conftest.err >&5 5750- echo "$as_me:20286: \$? = $ac_status" >&5 5751+ echo "$as_me:20287: \$? = $ac_status" >&5 5752 (exit $ac_status); } >/dev/null; then 5753 if test -s conftest.err; then 5754 ac_cpp_err=$ac_c_preproc_warn_flag 5755@@ -20302,11 +20303,11 @@ 5756 fi 5757 rm -f conftest.err conftest.$ac_ext 5758 fi 5759-echo "$as_me:20305: result: $ac_cv_header_dbmalloc_h" >&5 5760+echo "$as_me:20306: result: $ac_cv_header_dbmalloc_h" >&5 5761 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 5762 if test $ac_cv_header_dbmalloc_h = yes; then 5763 5764-echo "$as_me:20309: checking for debug_malloc in -ldbmalloc" >&5 5765+echo "$as_me:20310: checking for debug_malloc in -ldbmalloc" >&5 5766 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 5767 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then 5768 echo $ECHO_N "(cached) $ECHO_C" >&6 5769@@ -20314,7 +20315,7 @@ 5770 ac_check_lib_save_LIBS=$LIBS 5771 LIBS="-ldbmalloc $LIBS" 5772 cat >conftest.$ac_ext <<_ACEOF 5773-#line 20317 "configure" 5774+#line 20318 "configure" 5775 #include "confdefs.h" 5776 5777 /* Override any gcc2 internal prototype to avoid an error. */ 5778@@ -20333,16 +20334,16 @@ 5779 } 5780 _ACEOF 5781 rm -f conftest.$ac_objext conftest$ac_exeext 5782-if { (eval echo "$as_me:20336: \"$ac_link\"") >&5 5783+if { (eval echo "$as_me:20337: \"$ac_link\"") >&5 5784 (eval $ac_link) 2>&5 5785 ac_status=$? 5786- echo "$as_me:20339: \$? = $ac_status" >&5 5787+ echo "$as_me:20340: \$? = $ac_status" >&5 5788 (exit $ac_status); } && 5789 { ac_try='test -s conftest$ac_exeext' 5790- { (eval echo "$as_me:20342: \"$ac_try\"") >&5 5791+ { (eval echo "$as_me:20343: \"$ac_try\"") >&5 5792 (eval $ac_try) 2>&5 5793 ac_status=$? 5794- echo "$as_me:20345: \$? = $ac_status" >&5 5795+ echo "$as_me:20346: \$? = $ac_status" >&5 5796 (exit $ac_status); }; }; then 5797 ac_cv_lib_dbmalloc_debug_malloc=yes 5798 else 5799@@ -20353,7 +20354,7 @@ 5800 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 5801 LIBS=$ac_check_lib_save_LIBS 5802 fi 5803-echo "$as_me:20356: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 5804+echo "$as_me:20357: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 5805 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 5806 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then 5807 cat >>confdefs.h <<EOF 5808@@ -20368,7 +20369,7 @@ 5809 5810 fi 5811 5812-echo "$as_me:20371: checking if you want to use valgrind for testing" >&5 5813+echo "$as_me:20372: checking if you want to use valgrind for testing" >&5 5814 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 5815 5816 # Check whether --with-valgrind or --without-valgrind was given. 5817@@ -20385,7 +20386,7 @@ 5818 else 5819 with_valgrind= 5820 fi; 5821-echo "$as_me:20388: result: ${with_valgrind:-no}" >&5 5822+echo "$as_me:20389: result: ${with_valgrind:-no}" >&5 5823 echo "${ECHO_T}${with_valgrind:-no}" >&6 5824 5825 case .$with_cflags in 5826@@ -20498,7 +20499,7 @@ 5827 ;; 5828 esac 5829 5830-echo "$as_me:20501: checking if you want to perform memory-leak testing" >&5 5831+echo "$as_me:20502: checking if you want to perform memory-leak testing" >&5 5832 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 5833 5834 # Check whether --enable-leaks or --disable-leaks was given. 5835@@ -20508,7 +20509,7 @@ 5836 else 5837 : ${with_no_leaks:=no} 5838 fi; 5839-echo "$as_me:20511: result: $with_no_leaks" >&5 5840+echo "$as_me:20512: result: $with_no_leaks" >&5 5841 echo "${ECHO_T}$with_no_leaks" >&6 5842 5843 if test "$with_no_leaks" = yes ; then 5844@@ -20526,7 +20527,7 @@ 5845 LD_RPATH_OPT= 5846 if test "x$cf_cv_enable_rpath" != xno 5847 then 5848- echo "$as_me:20529: checking for an rpath option" >&5 5849+ echo "$as_me:20530: checking for an rpath option" >&5 5850 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 5851 case $cf_cv_system_name in 5852 (irix*) 5853@@ -20557,12 +20558,12 @@ 5854 (*) 5855 ;; 5856 esac 5857- echo "$as_me:20560: result: $LD_RPATH_OPT" >&5 5858+ echo "$as_me:20561: result: $LD_RPATH_OPT" >&5 5859 echo "${ECHO_T}$LD_RPATH_OPT" >&6 5860 5861 case "x$LD_RPATH_OPT" in 5862 (x-R*) 5863- echo "$as_me:20565: checking if we need a space after rpath option" >&5 5864+ echo "$as_me:20566: checking if we need a space after rpath option" >&5 5865 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 5866 cf_save_LIBS="$LIBS" 5867 5868@@ -20583,7 +20584,7 @@ 5869 LIBS="$cf_add_libs" 5870 5871 cat >conftest.$ac_ext <<_ACEOF 5872-#line 20586 "configure" 5873+#line 20587 "configure" 5874 #include "confdefs.h" 5875 5876 int 5877@@ -20595,16 +20596,16 @@ 5878 } 5879 _ACEOF 5880 rm -f conftest.$ac_objext conftest$ac_exeext 5881-if { (eval echo "$as_me:20598: \"$ac_link\"") >&5 5882+if { (eval echo "$as_me:20599: \"$ac_link\"") >&5 5883 (eval $ac_link) 2>&5 5884 ac_status=$? 5885- echo "$as_me:20601: \$? = $ac_status" >&5 5886+ echo "$as_me:20602: \$? = $ac_status" >&5 5887 (exit $ac_status); } && 5888 { ac_try='test -s conftest$ac_exeext' 5889- { (eval echo "$as_me:20604: \"$ac_try\"") >&5 5890+ { (eval echo "$as_me:20605: \"$ac_try\"") >&5 5891 (eval $ac_try) 2>&5 5892 ac_status=$? 5893- echo "$as_me:20607: \$? = $ac_status" >&5 5894+ echo "$as_me:20608: \$? = $ac_status" >&5 5895 (exit $ac_status); }; }; then 5896 cf_rpath_space=no 5897 else 5898@@ -20614,14 +20615,14 @@ 5899 fi 5900 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 5901 LIBS="$cf_save_LIBS" 5902- echo "$as_me:20617: result: $cf_rpath_space" >&5 5903+ echo "$as_me:20618: result: $cf_rpath_space" >&5 5904 echo "${ECHO_T}$cf_rpath_space" >&6 5905 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " 5906 ;; 5907 esac 5908 fi 5909 5910-echo "$as_me:20624: checking if rpath-hack should be disabled" >&5 5911+echo "$as_me:20625: checking if rpath-hack should be disabled" >&5 5912 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 5913 5914 # Check whether --enable-rpath-hack or --disable-rpath-hack was given. 5915@@ -20638,21 +20639,21 @@ 5916 cf_disable_rpath_hack=no 5917 5918 fi; 5919-echo "$as_me:20641: result: $cf_disable_rpath_hack" >&5 5920+echo "$as_me:20642: result: $cf_disable_rpath_hack" >&5 5921 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 5922 if test "$cf_disable_rpath_hack" = no ; then 5923 5924-echo "$as_me:20645: checking for updated LDFLAGS" >&5 5925+echo "$as_me:20646: checking for updated LDFLAGS" >&5 5926 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 5927 if test -n "$LD_RPATH_OPT" ; then 5928- echo "$as_me:20648: result: maybe" >&5 5929+ echo "$as_me:20649: result: maybe" >&5 5930 echo "${ECHO_T}maybe" >&6 5931 5932 for ac_prog in ldd 5933 do 5934 # Extract the first word of "$ac_prog", so it can be a program name with args. 5935 set dummy $ac_prog; ac_word=$2 5936-echo "$as_me:20655: checking for $ac_word" >&5 5937+echo "$as_me:20656: checking for $ac_word" >&5 5938 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 5939 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then 5940 echo $ECHO_N "(cached) $ECHO_C" >&6 5941@@ -20667,7 +20668,7 @@ 5942 test -z "$ac_dir" && ac_dir=. 5943 $as_executable_p "$ac_dir/$ac_word" || continue 5944 ac_cv_prog_cf_ldd_prog="$ac_prog" 5945-echo "$as_me:20670: found $ac_dir/$ac_word" >&5 5946+echo "$as_me:20671: found $ac_dir/$ac_word" >&5 5947 break 5948 done 5949 5950@@ -20675,10 +20676,10 @@ 5951 fi 5952 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog 5953 if test -n "$cf_ldd_prog"; then 5954- echo "$as_me:20678: result: $cf_ldd_prog" >&5 5955+ echo "$as_me:20679: result: $cf_ldd_prog" >&5 5956 echo "${ECHO_T}$cf_ldd_prog" >&6 5957 else 5958- echo "$as_me:20681: result: no" >&5 5959+ echo "$as_me:20682: result: no" >&5 5960 echo "${ECHO_T}no" >&6 5961 fi 5962 5963@@ -20692,7 +20693,7 @@ 5964 cf_rpath_oops= 5965 5966 cat >conftest.$ac_ext <<_ACEOF 5967-#line 20695 "configure" 5968+#line 20696 "configure" 5969 #include "confdefs.h" 5970 #include <stdio.h> 5971 int 5972@@ -20704,16 +20705,16 @@ 5973 } 5974 _ACEOF 5975 rm -f conftest.$ac_objext conftest$ac_exeext 5976-if { (eval echo "$as_me:20707: \"$ac_link\"") >&5 5977+if { (eval echo "$as_me:20708: \"$ac_link\"") >&5 5978 (eval $ac_link) 2>&5 5979 ac_status=$? 5980- echo "$as_me:20710: \$? = $ac_status" >&5 5981+ echo "$as_me:20711: \$? = $ac_status" >&5 5982 (exit $ac_status); } && 5983 { ac_try='test -s conftest$ac_exeext' 5984- { (eval echo "$as_me:20713: \"$ac_try\"") >&5 5985+ { (eval echo "$as_me:20714: \"$ac_try\"") >&5 5986 (eval $ac_try) 2>&5 5987 ac_status=$? 5988- echo "$as_me:20716: \$? = $ac_status" >&5 5989+ echo "$as_me:20717: \$? = $ac_status" >&5 5990 (exit $ac_status); }; }; then 5991 cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq` 5992 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` 5993@@ -20741,7 +20742,7 @@ 5994 then 5995 test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 5996 5997-echo "${as_me:-configure}:20744: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 5998+echo "${as_me:-configure}:20745: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 5999 6000 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" 6001 break 6002@@ -20753,11 +20754,11 @@ 6003 6004 test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 6005 6006-echo "${as_me:-configure}:20756: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 6007+echo "${as_me:-configure}:20757: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 6008 6009 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 6010 6011-echo "${as_me:-configure}:20760: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 6012+echo "${as_me:-configure}:20761: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 6013 6014 cf_rpath_dst= 6015 for cf_rpath_src in $LDFLAGS 6016@@ -20794,7 +20795,7 @@ 6017 then 6018 test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 6019 6020-echo "${as_me:-configure}:20797: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 6021+echo "${as_me:-configure}:20798: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 6022 6023 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" 6024 fi 6025@@ -20807,11 +20808,11 @@ 6026 6027 test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 6028 6029-echo "${as_me:-configure}:20810: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 6030+echo "${as_me:-configure}:20811: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 6031 6032 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 6033 6034-echo "${as_me:-configure}:20814: testing ...checking LIBS $LIBS ..." 1>&5 6035+echo "${as_me:-configure}:20815: testing ...checking LIBS $LIBS ..." 1>&5 6036 6037 cf_rpath_dst= 6038 for cf_rpath_src in $LIBS 6039@@ -20848,7 +20849,7 @@ 6040 then 6041 test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 6042 6043-echo "${as_me:-configure}:20851: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 6044+echo "${as_me:-configure}:20852: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 6045 6046 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" 6047 fi 6048@@ -20861,14 +20862,14 @@ 6049 6050 test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 6051 6052-echo "${as_me:-configure}:20864: testing ...checked LIBS $LIBS ..." 1>&5 6053+echo "${as_me:-configure}:20865: testing ...checked LIBS $LIBS ..." 1>&5 6054 6055 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 6056 6057-echo "${as_me:-configure}:20868: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 6058+echo "${as_me:-configure}:20869: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 6059 6060 else 6061- echo "$as_me:20871: result: no" >&5 6062+ echo "$as_me:20872: result: no" >&5 6063 echo "${ECHO_T}no" >&6 6064 fi 6065 6066@@ -20958,7 +20959,7 @@ 6067 : ${CONFIG_STATUS=./config.status} 6068 ac_clean_files_save=$ac_clean_files 6069 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 6070-{ echo "$as_me:20961: creating $CONFIG_STATUS" >&5 6071+{ echo "$as_me:20962: creating $CONFIG_STATUS" >&5 6072 echo "$as_me: creating $CONFIG_STATUS" >&6;} 6073 cat >$CONFIG_STATUS <<_ACEOF 6074 #! $SHELL 6075@@ -21134,7 +21135,7 @@ 6076 echo "$ac_cs_version"; exit 0 ;; 6077 --he | --h) 6078 # Conflict between --help and --header 6079- { { echo "$as_me:21137: error: ambiguous option: $1 6080+ { { echo "$as_me:21138: error: ambiguous option: $1 6081 Try \`$0 --help' for more information." >&5 6082 echo "$as_me: error: ambiguous option: $1 6083 Try \`$0 --help' for more information." >&2;} 6084@@ -21153,7 +21154,7 @@ 6085 ac_need_defaults=false;; 6086 6087 # This is an error. 6088- -*) { { echo "$as_me:21156: error: unrecognized option: $1 6089+ -*) { { echo "$as_me:21157: error: unrecognized option: $1 6090 Try \`$0 --help' for more information." >&5 6091 echo "$as_me: error: unrecognized option: $1 6092 Try \`$0 --help' for more information." >&2;} 6093@@ -21203,7 +21204,7 @@ 6094 "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; 6095 "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; 6096 "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;; 6097- *) { { echo "$as_me:21206: error: invalid argument: $ac_config_target" >&5 6098+ *) { { echo "$as_me:21207: error: invalid argument: $ac_config_target" >&5 6099 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} 6100 { (exit 1); exit 1; }; };; 6101 esac 6102@@ -21499,7 +21500,7 @@ 6103 esac 6104 6105 if test x"$ac_file" != x-; then 6106- { echo "$as_me:21502: creating $ac_file" >&5 6107+ { echo "$as_me:21503: creating $ac_file" >&5 6108 echo "$as_me: creating $ac_file" >&6;} 6109 rm -f "$ac_file" 6110 fi 6111@@ -21517,7 +21518,7 @@ 6112 -) echo $tmp/stdin ;; 6113 [\\/$]*) 6114 # Absolute (can't be DOS-style, as IFS=:) 6115- test -f "$f" || { { echo "$as_me:21520: error: cannot find input file: $f" >&5 6116+ test -f "$f" || { { echo "$as_me:21521: error: cannot find input file: $f" >&5 6117 echo "$as_me: error: cannot find input file: $f" >&2;} 6118 { (exit 1); exit 1; }; } 6119 echo $f;; 6120@@ -21530,7 +21531,7 @@ 6121 echo $srcdir/$f 6122 else 6123 # /dev/null tree 6124- { { echo "$as_me:21533: error: cannot find input file: $f" >&5 6125+ { { echo "$as_me:21534: error: cannot find input file: $f" >&5 6126 echo "$as_me: error: cannot find input file: $f" >&2;} 6127 { (exit 1); exit 1; }; } 6128 fi;; 6129@@ -21546,7 +21547,7 @@ 6130 if test -n "$ac_seen"; then 6131 ac_used=`grep '@datarootdir@' $ac_item` 6132 if test -z "$ac_used"; then 6133- { echo "$as_me:21549: WARNING: datarootdir was used implicitly but not set: 6134+ { echo "$as_me:21550: WARNING: datarootdir was used implicitly but not set: 6135 $ac_seen" >&5 6136 echo "$as_me: WARNING: datarootdir was used implicitly but not set: 6137 $ac_seen" >&2;} 6138@@ -21555,7 +21556,7 @@ 6139 fi 6140 ac_seen=`grep '${datarootdir}' $ac_item` 6141 if test -n "$ac_seen"; then 6142- { echo "$as_me:21558: WARNING: datarootdir was used explicitly but not set: 6143+ { echo "$as_me:21559: WARNING: datarootdir was used explicitly but not set: 6144 $ac_seen" >&5 6145 echo "$as_me: WARNING: datarootdir was used explicitly but not set: 6146 $ac_seen" >&2;} 6147@@ -21592,7 +21593,7 @@ 6148 ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` 6149 if test -z "$ac_init"; then 6150 ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` 6151- { echo "$as_me:21595: WARNING: Variable $ac_name is used but was not set: 6152+ { echo "$as_me:21596: WARNING: Variable $ac_name is used but was not set: 6153 $ac_seen" >&5 6154 echo "$as_me: WARNING: Variable $ac_name is used but was not set: 6155 $ac_seen" >&2;} 6156@@ -21603,7 +21604,7 @@ 6157 egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out 6158 if test -s $tmp/out; then 6159 ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` 6160- { echo "$as_me:21606: WARNING: Some variables may not be substituted: 6161+ { echo "$as_me:21607: WARNING: Some variables may not be substituted: 6162 $ac_seen" >&5 6163 echo "$as_me: WARNING: Some variables may not be substituted: 6164 $ac_seen" >&2;} 6165@@ -21652,7 +21653,7 @@ 6166 * ) ac_file_in=$ac_file.in ;; 6167 esac 6168 6169- test x"$ac_file" != x- && { echo "$as_me:21655: creating $ac_file" >&5 6170+ test x"$ac_file" != x- && { echo "$as_me:21656: creating $ac_file" >&5 6171 echo "$as_me: creating $ac_file" >&6;} 6172 6173 # First look for the input files in the build tree, otherwise in the 6174@@ -21663,7 +21664,7 @@ 6175 -) echo $tmp/stdin ;; 6176 [\\/$]*) 6177 # Absolute (can't be DOS-style, as IFS=:) 6178- test -f "$f" || { { echo "$as_me:21666: error: cannot find input file: $f" >&5 6179+ test -f "$f" || { { echo "$as_me:21667: error: cannot find input file: $f" >&5 6180 echo "$as_me: error: cannot find input file: $f" >&2;} 6181 { (exit 1); exit 1; }; } 6182 echo $f;; 6183@@ -21676,7 +21677,7 @@ 6184 echo $srcdir/$f 6185 else 6186 # /dev/null tree 6187- { { echo "$as_me:21679: error: cannot find input file: $f" >&5 6188+ { { echo "$as_me:21680: error: cannot find input file: $f" >&5 6189 echo "$as_me: error: cannot find input file: $f" >&2;} 6190 { (exit 1); exit 1; }; } 6191 fi;; 6192@@ -21734,7 +21735,7 @@ 6193 rm -f $tmp/in 6194 if test x"$ac_file" != x-; then 6195 if cmp -s $ac_file $tmp/config.h 2>/dev/null; then 6196- { echo "$as_me:21737: $ac_file is unchanged" >&5 6197+ { echo "$as_me:21738: $ac_file is unchanged" >&5 6198 echo "$as_me: $ac_file is unchanged" >&6;} 6199 else 6200 ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 6201Index: test/tclock.c 6202Prereq: 1.40 6203--- ncurses-6.1-20200111+/test/tclock.c 2019-12-14 23:25:29.000000000 +0000 6204+++ ncurses-6.1-20200118/test/tclock.c 2020-01-18 16:46:35.000000000 +0000 6205@@ -1,4 +1,4 @@ 6206-/* $Id: tclock.c,v 1.40 2019/12/14 23:25:29 tom Exp $ */ 6207+/* $Id: tclock.c,v 1.41 2020/01/18 16:46:35 tom Exp $ */ 6208 6209 #define NEED_TIME_H 6210 #include <test.priv.h> 6211@@ -48,7 +48,7 @@ 6212 MvAddCh(y, x, (chtype) col); 6213 } 6214 6215-/* Draw a diagonal(arbitrary) line using Bresenham's alogrithm. */ 6216+/* Draw a diagonal(arbitrary) line using Bresenham's algorithm. */ 6217 static void 6218 dline(int pair, int from_x, int from_y, int x2, int y2, int ch) 6219 { 6220