diff options
Diffstat (limited to 'system/ncurses/ncurses-6.3-20220409.patch')
| -rw-r--r-- | system/ncurses/ncurses-6.3-20220409.patch | 3596 |
1 files changed, 3596 insertions, 0 deletions
diff --git a/system/ncurses/ncurses-6.3-20220409.patch b/system/ncurses/ncurses-6.3-20220409.patch new file mode 100644 index 000000000..e90a97870 --- /dev/null +++ b/system/ncurses/ncurses-6.3-20220409.patch @@ -0,0 +1,3596 @@ +# ncurses 6.3 - patch 20220409 - Thomas E. Dickey +# +# ------------------------------------------------------------------------------ +# +# Ncurses 6.3 is at +# ftp://ftp.invisible-island.net/ncurses/ +# https://invisible-mirror.net/archives/ncurses/ +# https://ftp.gnu.org/gnu/ncurses/ +# +# Patches for ncurses 6.3 can be found at +# ftp://ftp.invisible-island.net/ncurses/6.3 +# https://invisible-mirror.net/archives/ncurses/6.3 +# +# ------------------------------------------------------------------------------ +# ftp://ftp.invisible-island.net/ncurses/6.3/ncurses-6.3-20220409.patch.gz +# patch by Thomas E. Dickey <dickey@invisible-island.net> +# created Sun Apr 10 00:16:54 UTC 2022 +# ------------------------------------------------------------------------------ +# MANIFEST | 1 +# NEWS | 5 +# VERSION | 2 +# dist.mk | 4 +# include/ncurses_defs | 5 +# ncurses-6.3-20220409/test/test_unget_wch.c | 81 ++ +# package/debian-mingw/changelog | 4 +# package/debian-mingw64/changelog | 4 +# package/debian/changelog | 4 +# package/mingw-ncurses.nsi | 4 +# package/mingw-ncurses.spec | 2 +# package/ncurses.spec | 2 +# package/ncursest.spec | 2 +# progs/tic.c | 4 +# test/README | 68 +- +# test/configure | 859 +++++++++++++-------------- +# test/configure.in | 5 +# test/listused.sh | 6 +# test/modules | 5 +# test/programs | 5 +# test/sp_tinfo.c | 7 +# test/test.priv.h | 8 +# 22 files changed, 591 insertions(+), 496 deletions(-) +# ------------------------------------------------------------------------------ +Index: MANIFEST +--- ncurses-6.3-20220402+/MANIFEST 2021-12-11 21:06:27.000000000 +0000 ++++ ncurses-6.3-20220409/MANIFEST 2022-04-09 21:32:51.000000000 +0000 +@@ -1225,6 +1225,7 @@ + ./test/test_sgr.c + ./test/test_termattrs.c + ./test/test_tparm.c ++./test/test_unget_wch.c + ./test/test_vid_puts.c + ./test/test_vidputs.c + ./test/testaddch.c +Index: NEWS +Prereq: 1.3792 +--- ncurses-6.3-20220402+/NEWS 2022-04-02 22:16:49.000000000 +0000 ++++ ncurses-6.3-20220409/NEWS 2022-04-09 23:04:59.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.3792 2022/04/02 22:16:49 tom Exp $ ++-- $Id: NEWS,v 1.3794 2022/04/09 23:04:59 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -46,6 +46,9 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20220409 ++ + add test/test_unget_wch.c ++ + 20220402 + + amend extended_captype(), returning CANCEL if a string is explicitly + cancelled. +Index: VERSION +--- ncurses-6.3-20220402+/VERSION 2022-04-02 12:08:21.000000000 +0000 ++++ ncurses-6.3-20220409/VERSION 2022-04-09 12:59:03.000000000 +0000 +@@ -1 +1 @@ +-5:0:10 6.3 20220402 ++5:0:10 6.3 20220409 +Index: dist.mk +Prereq: 1.1473 +--- ncurses-6.3-20220402+/dist.mk 2022-04-02 12:08:21.000000000 +0000 ++++ ncurses-6.3-20220409/dist.mk 2022-04-09 12:59:03.000000000 +0000 +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.1473 2022/04/02 12:08:21 tom Exp $ ++# $Id: dist.mk,v 1.1474 2022/04/09 12:59:03 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -38,7 +38,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 6 + NCURSES_MINOR = 3 +-NCURSES_PATCH = 20220402 ++NCURSES_PATCH = 20220409 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +Index: include/ncurses_defs +Prereq: 1.98 +--- ncurses-6.3-20220402+/include/ncurses_defs 2021-12-04 23:01:31.000000000 +0000 ++++ ncurses-6.3-20220409/include/ncurses_defs 2022-04-09 21:34:05.000000000 +0000 +@@ -1,6 +1,6 @@ +-# $Id: ncurses_defs,v 1.98 2021/12/04 23:01:31 tom Exp $ ++# $Id: ncurses_defs,v 1.99 2022/04/09 21:34:05 tom Exp $ + ############################################################################## +-# Copyright 2018-2020,2021 Thomas E. Dickey # ++# Copyright 2018-2021,2022 Thomas E. Dickey # + # Copyright 2000-2016,2017 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # +@@ -192,6 +192,7 @@ + HAVE_TYPE_ATTR_T + HAVE_TYPE_SIGACTION + HAVE_UNCTRL_H 1 ++HAVE_UNGET_WCH 1 + HAVE_UNISTD_H + HAVE_UNLINK + HAVE_USE_DEFAULT_COLORS +Index: package/debian-mingw/changelog +--- ncurses-6.3-20220402+/package/debian-mingw/changelog 2022-04-02 12:08:21.000000000 +0000 ++++ ncurses-6.3-20220409/package/debian-mingw/changelog 2022-04-09 12:59:03.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20220402) unstable; urgency=low ++ncurses6 (6.3+20220409) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 02 Apr 2022 08:08:21 -0400 ++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 09 Apr 2022 08:59:03 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian-mingw64/changelog +--- ncurses-6.3-20220402+/package/debian-mingw64/changelog 2022-04-02 12:08:21.000000000 +0000 ++++ ncurses-6.3-20220409/package/debian-mingw64/changelog 2022-04-09 12:59:03.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20220402) unstable; urgency=low ++ncurses6 (6.3+20220409) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 02 Apr 2022 08:08:21 -0400 ++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 09 Apr 2022 08:59:03 -0400 + + ncurses6 (5.9-20131005) unstable; urgency=low + +Index: package/debian/changelog +--- ncurses-6.3-20220402+/package/debian/changelog 2022-04-02 12:08:21.000000000 +0000 ++++ ncurses-6.3-20220409/package/debian/changelog 2022-04-09 12:59:03.000000000 +0000 +@@ -1,8 +1,8 @@ +-ncurses6 (6.3+20220402) unstable; urgency=low ++ncurses6 (6.3+20220409) unstable; urgency=low + + * latest weekly patch + +- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 02 Apr 2022 08:08:21 -0400 ++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 09 Apr 2022 08:59:03 -0400 + + ncurses6 (5.9-20120608) unstable; urgency=low + +Index: package/mingw-ncurses.nsi +Prereq: 1.513 +--- ncurses-6.3-20220402+/package/mingw-ncurses.nsi 2022-04-02 12:08:21.000000000 +0000 ++++ ncurses-6.3-20220409/package/mingw-ncurses.nsi 2022-04-09 12:59:03.000000000 +0000 +@@ -1,4 +1,4 @@ +-; $Id: mingw-ncurses.nsi,v 1.513 2022/04/02 12:08:21 tom Exp $
++; $Id: mingw-ncurses.nsi,v 1.514 2022/04/09 12:59:03 tom Exp $
+
+ ; TODO add examples
+ ; TODO bump ABI to 6
+@@ -10,7 +10,7 @@ + !define VERSION_MAJOR "6"
+ !define VERSION_MINOR "3"
+ !define VERSION_YYYY "2022"
+-!define VERSION_MMDD "0402"
++!define VERSION_MMDD "0409"
+ !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
+
+ !define MY_ABI "5"
+Index: package/mingw-ncurses.spec +--- ncurses-6.3-20220402+/package/mingw-ncurses.spec 2022-04-02 12:08:21.000000000 +0000 ++++ ncurses-6.3-20220409/package/mingw-ncurses.spec 2022-04-09 12:59:03.000000000 +0000 +@@ -3,7 +3,7 @@ + Summary: shared libraries for terminal handling + Name: mingw32-ncurses6 + Version: 6.3 +-Release: 20220402 ++Release: 20220409 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncurses.spec +--- ncurses-6.3-20220402+/package/ncurses.spec 2022-04-02 12:08:21.000000000 +0000 ++++ ncurses-6.3-20220409/package/ncurses.spec 2022-04-09 12:59:03.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: shared libraries for terminal handling + Name: ncurses6 + Version: 6.3 +-Release: 20220402 ++Release: 20220409 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: package/ncursest.spec +--- ncurses-6.3-20220402+/package/ncursest.spec 2022-04-02 12:08:21.000000000 +0000 ++++ ncurses-6.3-20220409/package/ncursest.spec 2022-04-09 12:59:03.000000000 +0000 +@@ -1,7 +1,7 @@ + Summary: Curses library with POSIX thread support. + Name: ncursest6 + Version: 6.3 +-Release: 20220402 ++Release: 20220409 + License: X11 + Group: Development/Libraries + Source: ncurses-%{version}-%{release}.tgz +Index: progs/tic.c +Prereq: 1.309 +--- ncurses-6.3-20220402+/progs/tic.c 2022-03-19 20:38:50.000000000 +0000 ++++ ncurses-6.3-20220409/progs/tic.c 2022-04-09 22:17:45.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2018-2020,2021 Thomas E. Dickey * ++ * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 1998-2017,2018 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -49,7 +49,7 @@ + #include <parametrized.h> + #include <transform.h> + +-MODULE_ID("$Id: tic.c,v 1.309 2022/03/19 20:38:50 tom Exp $") ++MODULE_ID("$Id: tic.c,v 1.310 2022/04/09 22:17:45 tom Exp $") + + #define STDIN_NAME "<stdin>" + +Index: test/README +Prereq: 1.73 +--- ncurses-6.3-20220402+/test/README 2021-03-07 00:08:58.000000000 +0000 ++++ ncurses-6.3-20220409/test/README 2022-04-09 23:01:27.000000000 +0000 +@@ -26,7 +26,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: README,v 1.73 2021/03/07 00:08:58 tom Exp $ ++-- $Id: README,v 1.74 2022/04/09 23:01:27 tom Exp $ + ------------------------------------------------------------------------------- + + The programs in this directory are used to test and demonstrate ncurses. +@@ -234,16 +234,16 @@ + COLORS test: color_content demo_new_pair dots_curses dots_xcurses echochar ncurses pair_content picsmap savescreen xmas + COLOR_PAIR test: background blue bs cardfile clip_printw demo_forms demo_menus demo_panels dots_curses dup_field echochar filter firework gdc hanoi ins_wide insdelln inserts knight move_field ncurses newdemo padview picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas + COLOR_PAIRS test: demo_new_pair dots_curses dots_xcurses echochar ncurses newdemo pair_content +-COLS test: cardfile demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels demo_tabs ditto dots_curses dots_xcurses echochar filter firework foldkeys hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo padview picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm ++COLS test: cardfile combine demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels demo_tabs ditto dots_curses dots_xcurses echochar filter firework foldkeys hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo padview picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm + ESCDELAY test: test_opaque +-LINES test: cardfile demo_defkey demo_keyok demo_menus demo_panels demo_tabs ditto dots_curses dots_xcurses echochar firework hanoi hashtest inch_wide inchs ins_wide inserts lrtest move_field movewindow ncurses newdemo padview picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas ++LINES test: cardfile combine demo_defkey demo_keyok demo_menus demo_panels demo_tabs ditto dots_curses dots_xcurses echochar firework hanoi hashtest inch_wide inchs ins_wide inserts lrtest move_field movewindow ncurses newdemo padview picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas + PAIR_NUMBER test: dump_window ncurses + PC test: demo_termcap + SP lib: form + TABSIZE test: test_opaque + UP test: demo_termcap + acs_map test: back_ground background gdc ins_wide inserts knight movewindow ncurses newdemo savescreen test_add_wchstr test_addchstr test_addstr test_addwstr testcurs +-add_wch test: demo_new_pair demo_panels ncurses picsmap savescreen test_add_wchstr test_addwstr ++add_wch test: combine demo_new_pair demo_panels ncurses picsmap savescreen test_add_wchstr test_addwstr + add_wchnstr test: test_add_wchstr + add_wchstr test: test_add_wchstr view + addch test: back_ground background blue bs color_content demo_tabs dots_curses echochar hashtest ncurses padview pair_content picsmap savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_opaque testaddch view worm +@@ -252,14 +252,14 @@ + addnstr test: test_addstr + addnwstr test: dots_xcurses ncurses test_addwstr + addstr test: blue bs cardfile filter gdc hanoi lrtest ncurses test_addstr +-addwstr test: blue test_addwstr ++addwstr test: blue combine test_addwstr + alloc_pair test: demo_new_pair dots_xcurses + alloc_pair_sp - + assume_default_colors test: back_ground background ncurses + assume_default_colors_sp - + attr_get - +-attr_off test: dots_xcurses ncurses +-attr_on test: dots_xcurses ncurses ++attr_off test: combine dots_xcurses ncurses ++attr_on test: combine dots_xcurses ncurses + attr_set test: ncurses + attroff test: blue dots_curses echochar filter gdc ncurses tclock + attron test: blue bs dots_curses echochar filter gdc ncurses +@@ -274,14 +274,14 @@ + bkgrndset test: back_ground ncurses + boolcodes test: demo_termcap test_arrays progs: dump_entry + boolfnames test: demo_terminfo test_arrays progs: dump_entry +-boolnames test: demo_terminfo test_arrays progs: dump_entry infocmp ++boolnames test: demo_termcap demo_terminfo test_arrays progs: dump_entry infocmp + border - + border_set - + box test: cardfile chgat clip_printw demo_forms demo_menus demo_panels ditto inch_wide inchs ins_wide insdelln inserts lrtest ncurses newdemo popup_msg redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs + box_set test: ncurses + can_change_color test: color_content extended_color ncurses + can_change_color_sp test: extended_color +-cbreak test: back_ground background blue bs cardfile chgat clip_printw color_content color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs ditto dup_field extended_color filter firework foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas ++cbreak test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs ditto dup_field extended_color filter firework foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque test_unget_wch testcurs view worm xmas + cbreak_sp test: sp_tinfo + chgat test: chgat + clear test: blue bs filter gdc ncurses padview testcurs xmas +@@ -320,14 +320,15 @@ + echo_sp lib: ncurses + echo_wchar test: ncurses + echochar test: echochar ncurses +-endwin test: back_ground background blue bs cardfile chgat clip_printw color_content color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs ditto dots_curses dots_mvcur dots_xcurses dup_field echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas ++endwin test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs ditto dots_curses dots_mvcur dots_xcurses dup_field echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque test_unget_wch testaddch testcurs testscanw view worm xmas + endwin_sp lib: ncurses + erase test: cardfile demo_menus filter firework firstlast hanoi lrtest ncurses picsmap tclock test_opaque testcurs + erasechar test: ncurses + erasechar_sp test: sp_tinfo + erasewchar test: ncurses +-exit_curses test: back_ground background blue bs cardfile chgat clip_printw color_content color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs demo_termcap demo_terminfo ditto dots dots_curses dots_mvcur dots_termcap dots_xcurses dup_field echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight list_keys lrtest move_field movewindow ncurses newdemo padview pair_content picsmap railroad rain redraw savescreen sp_tinfo tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_arrays test_get_wstr test_getstr test_instr test_inwstr test_opaque test_setupterm test_sgr test_termattrs test_tparm test_vid_puts test_vidputs testaddch testcurs testscanw view worm xmas +-exit_terminfo lib: ncurses ++erasewchar_sp lib: ncurses ++exit_curses test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto dots_curses dots_xcurses dup_field echochar extended_color filter firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque test_setupterm test_unget_wch testaddch testcurs testscanw view worm xmas ++exit_terminfo test: demo_tabs demo_termcap demo_terminfo dots dots_mvcur dots_termcap list_keys railroad sp_tinfo test_arrays test_sgr test_termattrs test_tparm test_vid_puts test_vidputs + extended_color_content test: color_content extended_color + extended_color_content_sp test: extended_color + extended_pair_content test: extended_color pair_content +@@ -346,7 +347,7 @@ + free_pair_sp - + get_escdelay - + get_escdelay_sp - +-get_wch test: form_driver_w ++get_wch test: form_driver_w test_unget_wch + get_wstr test: test_get_wstr + getattrs - + getbegx test: chgat clip_printw demo_menus demo_panels dump_window insdelln move_field movewindow ncurses newdemo redraw testcurs +@@ -354,8 +355,8 @@ + getbkgd test: ncurses + getbkgrnd test: ncurses + getcchar test: demo_new_pair ncurses savescreen view +-getch test: back_ground background blue bs chgat color_content color_set demo_altkeys demo_new_pair demo_tabs extended_color filter firework firstlast foldkeys hanoi hashtest insdelln lrtest padview pair_content picsmap savescreen tclock test_opaque testaddch testcurs view xmas +-getcurx test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels dump_window extended_color filter firstlast foldkeys insdelln move_field movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs view ++getch test: back_ground background blue bs chgat color_content color_set combine demo_altkeys demo_new_pair demo_tabs extended_color filter firework firstlast foldkeys hanoi hashtest insdelln lrtest padview pair_content picsmap savescreen tclock test_opaque test_unget_wch testaddch testcurs view xmas ++getcurx test: bs chgat clip_printw combine demo_altkeys demo_defkey demo_panels dump_window extended_color filter firstlast foldkeys insdelln move_field movewindow ncurses redraw savescreen test_get_wstr test_getstr test_opaque testcurs view + getcury test: bs chgat clip_printw demo_altkeys demo_defkey demo_panels dump_window extended_color filter firstlast foldkeys insdelln move_field movewindow ncurses popup_msg redraw savescreen test_opaque testcurs view + getmaxx test: chgat clip_printw demo_panels dump_window firstlast inch_wide inchs insdelln movewindow ncurses newdemo popup_msg redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs + getmaxy test: chgat clip_printw demo_forms demo_panels dump_window firstlast inch_wide inchs insdelln movewindow ncurses newdemo popup_msg redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs +@@ -395,11 +396,11 @@ + init_color_sp - + init_extended_color test: color_content extended_color + init_extended_color_sp test: extended_color +-init_extended_pair test: extended_color ncurses pair_content picsmap ++init_extended_pair test: extended_color ncurses pair_content picsmap savescreen + init_extended_pair_sp test: extended_color + init_pair test: back_ground background blue bs cardfile chgat clip_printw color_set demo_forms demo_menus demo_new_pair demo_panels dots_curses dots_xcurses dup_field echochar filter firework gdc hanoi ins_wide insdelln inserts knight move_field ncurses newdemo padview pair_content picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas +-init_pair_sp - +-initscr test: back_ground background blue bs cardfile chgat clip_printw color_content color_set demo_defkey demo_forms demo_keyok demo_menus demo_panels demo_tabs dots_curses dots_xcurses dup_field echochar filter firework firstlast form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas ++init_pair_sp lib: ncurses ++initscr test: back_ground background blue bs cardfile chgat clip_printw color_content color_set combine demo_defkey demo_forms demo_keyok demo_menus demo_panels demo_tabs dots_curses dots_xcurses dup_field echochar filter firework firstlast form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest move_field movewindow ncurses newdemo padview pair_content picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque test_unget_wch testaddch testcurs testscanw view worm xmas + innstr test: test_instr + innwstr test: test_inwstr + ins_nwstr test: ins_wide +@@ -434,17 +435,18 @@ + isendwin_sp - + key_defined test: demo_defkey foldkeys + key_defined_sp test: sp_tinfo +-key_name test: key_names ncurses ++key_name test: key_names ncurses test_unget_wch + keybound test: demo_altkeys demo_defkey + keybound_sp test: sp_tinfo +-keyname test: demo_altkeys demo_defkey demo_keyok demo_menus dup_field edit_field foldkeys keynames move_field movewindow ncurses padview redraw test_getstr testcurs view progs: tic ++keyname test: combine demo_altkeys demo_defkey demo_keyok demo_menus dup_field edit_field foldkeys keynames move_field movewindow ncurses padview redraw test_getstr test_unget_wch testcurs view progs: tic + keyname_sp test: sp_tinfo + keyok test: demo_keyok foldkeys + keyok_sp test: sp_tinfo +-keypad test: bs cardfile chgat clip_printw demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto dup_field filter firework foldkeys form_driver_w hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest move_field movewindow ncurses padview popup_msg redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view ++keypad test: bs cardfile chgat clip_printw combine demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels ditto dup_field filter firework foldkeys form_driver_w hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest move_field movewindow ncurses padview popup_msg redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque test_unget_wch testcurs testscanw view + killchar test: ncurses + killchar_sp test: sp_tinfo + killwchar test: ncurses ++killwchar_sp lib: ncurses + leaveok test: hanoi test_opaque + longname test: ncurses testcurs progs: tput + longname_sp test: sp_tinfo +@@ -456,7 +458,7 @@ + mouseinterval_sp - + mousemask test: bs demo_forms demo_menus knight movewindow ncurses testcurs + mousemask_sp - +-move test: blue bs cardfile chgat demo_altkeys demo_menus demo_new_pair demo_tabs dots_curses dots_xcurses echochar filter foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest move_field movewindow ncurses picsmap savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testscanw view xmas ++move test: blue bs cardfile chgat combine demo_altkeys demo_menus demo_new_pair demo_tabs dots_curses dots_xcurses echochar filter foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest move_field movewindow ncurses picsmap savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testscanw view xmas + mvadd_wch test: ncurses test_add_wchstr test_addwstr + mvadd_wchnstr test: test_add_wchstr + mvadd_wchstr test: test_add_wchstr +@@ -556,7 +558,7 @@ + nocbreak test: testcurs + nocbreak_sp test: sp_tinfo + nodelay test: demo_new_pair ditto extended_color firework gdc lrtest ncurses newdemo padview rain tclock test_opaque view worm xmas +-noecho test: back_ground background bs cardfile chgat clip_printw color_content color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs ditto dup_field extended_color firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest move_field movewindow ncurses padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas ++noecho test: back_ground background bs cardfile chgat clip_printw color_content color_set combine demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_new_pair demo_panels demo_tabs ditto dup_field extended_color firework firstlast foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts knight lrtest move_field movewindow ncurses padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque test_unget_wch testcurs view worm xmas + noecho_sp lib: ncurses + nofilter - + nofilter_sp - +@@ -569,7 +571,7 @@ + notimeout test: ncurses test_opaque + numcodes test: demo_termcap test_arrays progs: dump_entry + numfnames test: demo_terminfo test_arrays progs: dump_entry +-numnames test: demo_terminfo test_arrays progs: dump_entry infocmp ++numnames test: demo_termcap demo_terminfo test_arrays progs: dump_entry infocmp + ospeed test: demo_termcap progs: tset + overlay test: ncurses testcurs xmas + overwrite test: ncurses savescreen +@@ -579,7 +581,7 @@ + pechochar - + pnoutrefresh test: ncurses padview popup_msg + prefresh test: testcurs +-printw test: back_ground background blue bs color_content color_set demo_altkeys demo_defkey demo_keyok demo_tabs extended_color filter foldkeys ncurses pair_content savescreen testcurs testscanw view ++printw test: back_ground background blue bs color_content color_set combine demo_altkeys demo_defkey demo_keyok demo_tabs extended_color filter foldkeys ncurses pair_content savescreen test_unget_wch testcurs testscanw view + putp test: filter test_sgr progs: tput + putp_sp test: sp_tinfo + putwin test: ncurses +@@ -587,7 +589,7 @@ + qiflush_sp test: sp_tinfo + raw test: demo_forms dup_field move_field ncurses redraw testcurs + raw_sp test: sp_tinfo +-redrawwin test: padview redraw view ++redrawwin test: combine padview redraw view + refresh test: blue bs color_content demo_defkey demo_forms demo_keyok demo_menus demo_panels demo_tabs dots_curses dots_mvcur dots_xcurses dup_field echochar filter firstlast form_driver_w gdc hanoi hashtest lrtest move_field movewindow ncurses pair_content picsmap savescreen tclock testcurs view xmas + reset_color_pairs test: picsmap + reset_color_pairs_sp - +@@ -608,7 +610,7 @@ + savetty - + savetty_sp test: sp_tinfo + scanw test: testcurs testscanw +-scr_dump test: savescreen ++scr_dump test: combine savescreen + scr_init test: savescreen + scr_init_sp - + scr_restore test: savescreen +@@ -617,7 +619,7 @@ + scr_set_sp - + scrl test: view + scroll test: testcurs +-scrollok test: clip_printw color_content demo_altkeys demo_defkey demo_keyok demo_new_pair demo_panels ditto foldkeys hashtest knight ncurses pair_content picsmap redraw test_opaque testcurs testscanw view ++scrollok test: clip_printw color_content demo_altkeys demo_defkey demo_keyok demo_new_pair demo_panels ditto foldkeys hashtest knight ncurses pair_content picsmap redraw test_opaque test_unget_wch testcurs testscanw view + set_curterm test: list_keys sp_tinfo + set_curterm_sp test: sp_tinfo + set_escdelay test: test_opaque +@@ -625,7 +627,7 @@ + set_tabsize test: demo_tabs test_opaque + set_tabsize_sp test: sp_tinfo + set_term lib: ncurses +-setcchar test: back_ground demo_new_pair demo_panels ins_wide ncurses picsmap savescreen test_add_wchstr test_addwstr ++setcchar test: back_ground combine demo_new_pair demo_panels ins_wide ncurses picsmap savescreen test_add_wchstr test_addwstr + setscrreg test: view + setupterm test: demo_terminfo dots list_keys sp_tinfo test_setupterm test_sgr test_termattrs test_tparm test_vid_puts test_vidputs progs: clear tabs tput tset + slk_attr - +@@ -663,10 +665,10 @@ + standout test: blue ncurses + start_color test: back_ground background blue bs cardfile chgat clip_printw color_content color_set demo_forms demo_menus demo_new_pair demo_panels dots_curses dots_xcurses dup_field echochar extended_color filter firework gdc hanoi ins_wide insdelln inserts knight move_field ncurses newdemo padview pair_content picsmap rain savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testaddch testcurs view worm xmas + start_color_sp - +-stdscr test: back_ground background bs chgat clip_printw color_content demo_altkeys demo_forms demo_menus demo_new_pair demo_panels ditto dup_field edit_field extended_color filter firework foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest move_field movewindow ncurses padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas ++stdscr test: back_ground background bs chgat clip_printw color_content combine demo_altkeys demo_forms demo_menus demo_new_pair demo_panels ditto dup_field edit_field extended_color filter firework foldkeys form_driver_w gdc hanoi hashtest inch_wide inchs ins_wide insdelln inserts key_names keynames knight lrtest move_field movewindow ncurses padview pair_content picsmap rain redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque test_unget_wch testcurs testscanw view worm xmas + strcodes test: demo_termcap test_arrays progs: dump_entry + strfnames test: demo_terminfo list_keys test_arrays progs: dump_entry +-strnames test: demo_terminfo foldkeys list_keys test_arrays test_tparm progs: dump_entry infocmp tic ++strnames test: demo_termcap demo_terminfo foldkeys list_keys test_arrays test_tparm progs: dump_entry infocmp tic + subpad test: testcurs + subwin test: movewindow ncurses newdemo testcurs + syncok test: test_opaque +@@ -704,9 +706,9 @@ + typeahead_sp test: sp_tinfo + unctrl test: ncurses redraw test_add_wchstr test_addchstr testcurs + unctrl_sp test: sp_tinfo +-unget_wch - ++unget_wch test: test_unget_wch + unget_wch_sp - +-ungetch test: bs knight ++ungetch test: bs knight test_unget_wch + ungetch_sp lib: ncurses + ungetmouse lib: menu + ungetmouse_sp - +Index: test/configure +--- ncurses-6.3-20220402+/test/configure 2022-01-23 00:22:56.000000000 +0000 ++++ ncurses-6.3-20220409/test/configure 2022-04-09 21:33:20.000000000 +0000 +@@ -18985,6 +18985,7 @@ + tigetstr \ + tputs_sp \ + typeahead \ ++unget_wch \ + use_default_colors \ + use_env \ + use_extended_names \ +@@ -19005,10 +19006,10 @@ + + cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +- echo "$as_me:19008: checking for ${cf_func}" >&5 ++ echo "$as_me:19009: checking for ${cf_func}" >&5 + echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 + +-echo "${as_me:-configure}:19011: testing ${cf_func} ..." 1>&5 ++echo "${as_me:-configure}:19012: testing ${cf_func} ..." 1>&5 + + if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19017,7 +19018,7 @@ + eval cf_result='$ac_cv_func_'$cf_func + if test ".$cf_result" != ".no"; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19020 "configure" ++#line 19021 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -19050,16 +19051,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19053: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19054: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19056: \$? = $ac_status" >&5 ++ echo "$as_me:19057: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19059: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19060: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19062: \$? = $ac_status" >&5 ++ echo "$as_me:19063: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes + else +@@ -19075,7 +19076,7 @@ + + # use the computed/retrieved cache-value: + eval 'cf_result=$cf_cv_func_'$cf_func +- echo "$as_me:19078: result: $cf_result" >&5 ++ echo "$as_me:19079: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" != no; then + cat >>confdefs.h <<EOF +@@ -19090,10 +19091,10 @@ + + cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +- echo "$as_me:19093: checking for ${cf_func}" >&5 ++ echo "$as_me:19094: checking for ${cf_func}" >&5 + echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 + +-echo "${as_me:-configure}:19096: testing ${cf_func} ..." 1>&5 ++echo "${as_me:-configure}:19097: testing ${cf_func} ..." 1>&5 + + if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19102,7 +19103,7 @@ + eval cf_result='$ac_cv_func_'$cf_func + if test ".$cf_result" != ".no"; then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19105 "configure" ++#line 19106 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -19135,16 +19136,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19138: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19139: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19141: \$? = $ac_status" >&5 ++ echo "$as_me:19142: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19144: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19145: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19147: \$? = $ac_status" >&5 ++ echo "$as_me:19148: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes + else +@@ -19160,7 +19161,7 @@ + + # use the computed/retrieved cache-value: + eval 'cf_result=$cf_cv_func_'$cf_func +- echo "$as_me:19163: result: $cf_result" >&5 ++ echo "$as_me:19164: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" != no; then + cat >>confdefs.h <<EOF +@@ -19184,7 +19185,7 @@ + cf_return="return value" + fi + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19187 "configure" ++#line 19188 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -19204,21 +19205,21 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:19207: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19208: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19210: \$? = $ac_status" >&5 ++ echo "$as_me:19211: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:19213: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19214: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19216: \$? = $ac_status" >&5 ++ echo "$as_me:19217: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6 + +-echo "${as_me:-configure}:19221: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 ++echo "${as_me:-configure}:19222: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 + + cat >>confdefs.h <<EOF + #define TPUTS_ARG $cf_arg +@@ -19238,14 +19239,14 @@ + done + fi + +-echo "$as_me:19241: checking for ncurses extended functions" >&5 ++echo "$as_me:19242: checking for ncurses extended functions" >&5 + echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6 + if test "${cf_cv_ncurses_ext_funcs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19248 "configure" ++#line 19249 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -19260,16 +19261,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:19263: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19264: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19266: \$? = $ac_status" >&5 ++ echo "$as_me:19267: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:19269: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19270: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19272: \$? = $ac_status" >&5 ++ echo "$as_me:19273: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_ext_funcs=defined + else +@@ -19277,7 +19278,7 @@ + cat "conftest.$ac_ext" >&5 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19280 "configure" ++#line 19281 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -19302,16 +19303,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19305: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19306: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19308: \$? = $ac_status" >&5 ++ echo "$as_me:19309: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19311: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19312: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19314: \$? = $ac_status" >&5 ++ echo "$as_me:19315: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_ext_funcs=yes + else +@@ -19325,7 +19326,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:19328: result: $cf_cv_ncurses_ext_funcs" >&5 ++echo "$as_me:19329: result: $cf_cv_ncurses_ext_funcs" >&5 + echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6 + test "$cf_cv_ncurses_ext_funcs" = yes && + cat >>confdefs.h <<\EOF +@@ -19339,11 +19340,11 @@ + if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno + then + cf_define_xpg5=no +- echo "$as_me:19342: checking if _XPG5 should be defined to enable wide-characters" >&5 ++ echo "$as_me:19343: checking if _XPG5 should be defined to enable wide-characters" >&5 + echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19346 "configure" ++#line 19347 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -19356,16 +19357,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:19359: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19360: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19362: \$? = $ac_status" >&5 ++ echo "$as_me:19363: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:19365: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19366: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19368: \$? = $ac_status" >&5 ++ echo "$as_me:19369: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else +@@ -19374,7 +19375,7 @@ + cf_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_XPG5" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19377 "configure" ++#line 19378 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -19387,16 +19388,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:19390: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19391: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19393: \$? = $ac_status" >&5 ++ echo "$as_me:19394: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:19396: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19397: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19399: \$? = $ac_status" >&5 ++ echo "$as_me:19400: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_define_xpg5=yes + else +@@ -19407,7 +19408,7 @@ + CPPFLAGS="$cf_save_cppflags" + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +- echo "$as_me:19410: result: $cf_define_xpg5" >&5 ++ echo "$as_me:19411: result: $cf_define_xpg5" >&5 + echo "${ECHO_T}$cf_define_xpg5" >&6 + + if test "$cf_define_xpg5" = yes +@@ -19416,14 +19417,14 @@ + fi + fi + +- echo "$as_me:19419: checking for wide-character functions" >&5 ++ echo "$as_me:19420: checking for wide-character functions" >&5 + echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6 + if test "${cf_cv_widechar_funcs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19426 "configure" ++#line 19427 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -19440,16 +19441,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19443: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19444: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19446: \$? = $ac_status" >&5 ++ echo "$as_me:19447: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19449: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19450: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19452: \$? = $ac_status" >&5 ++ echo "$as_me:19453: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_widechar_funcs=yes + else +@@ -19460,7 +19461,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:19463: result: $cf_cv_widechar_funcs" >&5 ++echo "$as_me:19464: result: $cf_cv_widechar_funcs" >&5 + echo "${ECHO_T}$cf_cv_widechar_funcs" >&6 + if test "$cf_cv_widechar_funcs" != no ; then + +@@ -19481,14 +19482,14 @@ + + fi + +-echo "$as_me:19484: checking if $cf_cv_screen library uses pthreads" >&5 ++echo "$as_me:19485: checking if $cf_cv_screen library uses pthreads" >&5 + echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6 + if test "${cf_cv_use_pthreads+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19491 "configure" ++#line 19492 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -19506,16 +19507,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19509: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19510: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19512: \$? = $ac_status" >&5 ++ echo "$as_me:19513: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19515: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19516: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19518: \$? = $ac_status" >&5 ++ echo "$as_me:19519: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_use_pthreads=yes + else +@@ -19526,21 +19527,21 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + fi +-echo "$as_me:19529: result: $cf_cv_use_pthreads" >&5 ++echo "$as_me:19530: result: $cf_cv_use_pthreads" >&5 + echo "${ECHO_T}$cf_cv_use_pthreads" >&6 + test $cf_cv_use_pthreads = yes && + cat >>confdefs.h <<\EOF + #define USE_PTHREADS 1 + EOF + +-echo "$as_me:19536: checking if sys/time.h works with sys/select.h" >&5 ++echo "$as_me:19537: checking if sys/time.h works with sys/select.h" >&5 + echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 + if test "${cf_cv_sys_time_select+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19543 "configure" ++#line 19544 "configure" + #include "confdefs.h" + + #include <sys/types.h> +@@ -19560,16 +19561,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:19563: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19564: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19566: \$? = $ac_status" >&5 ++ echo "$as_me:19567: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:19569: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19570: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19572: \$? = $ac_status" >&5 ++ echo "$as_me:19573: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_sys_time_select=yes + else +@@ -19581,7 +19582,7 @@ + + fi + +-echo "$as_me:19584: result: $cf_cv_sys_time_select" >&5 ++echo "$as_me:19585: result: $cf_cv_sys_time_select" >&5 + echo "${ECHO_T}$cf_cv_sys_time_select" >&6 + test "$cf_cv_sys_time_select" = yes && + cat >>confdefs.h <<\EOF +@@ -19590,7 +19591,7 @@ + + # special check for test/ditto.c + +-echo "$as_me:19593: checking for openpty in -lutil" >&5 ++echo "$as_me:19594: checking for openpty in -lutil" >&5 + echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 + if test "${ac_cv_lib_util_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19598,7 +19599,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lutil $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19601 "configure" ++#line 19602 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -19617,16 +19618,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19620: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19621: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19623: \$? = $ac_status" >&5 ++ echo "$as_me:19624: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19626: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19627: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19629: \$? = $ac_status" >&5 ++ echo "$as_me:19630: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_util_openpty=yes + else +@@ -19637,7 +19638,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:19640: result: $ac_cv_lib_util_openpty" >&5 ++echo "$as_me:19641: result: $ac_cv_lib_util_openpty" >&5 + echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 + if test "$ac_cv_lib_util_openpty" = yes; then + cf_cv_lib_util=yes +@@ -19645,7 +19646,7 @@ + cf_cv_lib_util=no + fi + +-echo "$as_me:19648: checking for openpty header" >&5 ++echo "$as_me:19649: checking for openpty header" >&5 + echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 + if test "${cf_cv_func_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19672,7 +19673,7 @@ + for cf_header in pty.h libutil.h util.h + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19675 "configure" ++#line 19676 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -19689,16 +19690,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19692: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19693: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19695: \$? = $ac_status" >&5 ++ echo "$as_me:19696: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19698: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19699: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19701: \$? = $ac_status" >&5 ++ echo "$as_me:19702: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_func_openpty=$cf_header +@@ -19716,7 +19717,7 @@ + LIBS="$cf_save_LIBS" + + fi +-echo "$as_me:19719: result: $cf_cv_func_openpty" >&5 ++echo "$as_me:19720: result: $cf_cv_func_openpty" >&5 + echo "${ECHO_T}$cf_cv_func_openpty" >&6 + + if test "$cf_cv_func_openpty" != no ; then +@@ -19750,7 +19751,7 @@ + fi + fi + +-echo "$as_me:19753: checking for function curses_version" >&5 ++echo "$as_me:19754: checking for function curses_version" >&5 + echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6 + if test "${cf_cv_func_curses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19760,7 +19761,7 @@ + cf_cv_func_curses_version=unknown + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19763 "configure" ++#line 19764 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -19773,15 +19774,15 @@ + + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:19776: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19777: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19779: \$? = $ac_status" >&5 ++ echo "$as_me:19780: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:19781: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19782: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19784: \$? = $ac_status" >&5 ++ echo "$as_me:19785: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_curses_version=yes + +@@ -19796,14 +19797,14 @@ + fi + rm -f core + fi +-echo "$as_me:19799: result: $cf_cv_func_curses_version" >&5 ++echo "$as_me:19800: result: $cf_cv_func_curses_version" >&5 + echo "${ECHO_T}$cf_cv_func_curses_version" >&6 + test "$cf_cv_func_curses_version" = yes && + cat >>confdefs.h <<\EOF + #define HAVE_CURSES_VERSION 1 + EOF + +-echo "$as_me:19806: checking for alternate character set array" >&5 ++echo "$as_me:19807: checking for alternate character set array" >&5 + echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6 + if test "${cf_cv_curses_acs_map+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19813,7 +19814,7 @@ + for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19816 "configure" ++#line 19817 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -19829,16 +19830,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19832: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19833: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19835: \$? = $ac_status" >&5 ++ echo "$as_me:19836: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19838: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19839: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19841: \$? = $ac_status" >&5 ++ echo "$as_me:19842: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_curses_acs_map=$name; break + else +@@ -19849,7 +19850,7 @@ + done + + fi +-echo "$as_me:19852: result: $cf_cv_curses_acs_map" >&5 ++echo "$as_me:19853: result: $cf_cv_curses_acs_map" >&5 + echo "${ECHO_T}$cf_cv_curses_acs_map" >&6 + + test "$cf_cv_curses_acs_map" != unknown && +@@ -19859,7 +19860,7 @@ + + if test "$cf_enable_widec" = yes; then + +-echo "$as_me:19862: checking for wide alternate character set array" >&5 ++echo "$as_me:19863: checking for wide alternate character set array" >&5 + echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6 + if test "${cf_cv_curses_wacs_map+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19869,7 +19870,7 @@ + for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char + do + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19872 "configure" ++#line 19873 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -19885,16 +19886,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19888: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19889: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19891: \$? = $ac_status" >&5 ++ echo "$as_me:19892: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19894: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19895: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19897: \$? = $ac_status" >&5 ++ echo "$as_me:19898: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_curses_wacs_map=$name + break +@@ -19905,7 +19906,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + done + fi +-echo "$as_me:19908: result: $cf_cv_curses_wacs_map" >&5 ++echo "$as_me:19909: result: $cf_cv_curses_wacs_map" >&5 + echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 + + test "$cf_cv_curses_wacs_map" != unknown && +@@ -19913,7 +19914,7 @@ + #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map + EOF + +-echo "$as_me:19916: checking for wide alternate character constants" >&5 ++echo "$as_me:19917: checking for wide alternate character constants" >&5 + echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6 + if test "${cf_cv_curses_wacs_symbols+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19923,7 +19924,7 @@ + if test "$cf_cv_curses_wacs_map" != unknown + then + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19926 "configure" ++#line 19927 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -19940,16 +19941,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19943: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19944: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19946: \$? = $ac_status" >&5 ++ echo "$as_me:19947: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19949: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19950: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19952: \$? = $ac_status" >&5 ++ echo "$as_me:19953: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_curses_wacs_symbols=yes + else +@@ -19959,7 +19960,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 19962 "configure" ++#line 19963 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -19975,16 +19976,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:19978: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19979: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19981: \$? = $ac_status" >&5 ++ echo "$as_me:19982: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:19984: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19985: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19987: \$? = $ac_status" >&5 ++ echo "$as_me:19988: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_curses_wacs_symbols=yes + else +@@ -19995,7 +19996,7 @@ + fi + + fi +-echo "$as_me:19998: result: $cf_cv_curses_wacs_symbols" >&5 ++echo "$as_me:19999: result: $cf_cv_curses_wacs_symbols" >&5 + echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 + + test "$cf_cv_curses_wacs_symbols" != no && +@@ -20005,10 +20006,10 @@ + + fi + +-echo "$as_me:20008: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:20009: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 + echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20011 "configure" ++#line 20012 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -20026,16 +20027,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20029: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20030: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20032: \$? = $ac_status" >&5 ++ echo "$as_me:20033: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20035: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20036: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20038: \$? = $ac_status" >&5 ++ echo "$as_me:20039: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes + else +@@ -20044,7 +20045,7 @@ + cf_result=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +-echo "$as_me:20047: result: $cf_result" >&5 ++echo "$as_me:20048: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = yes ; then + +@@ -20065,14 +20066,14 @@ + if test "$cf_enable_widec" = yes; then + + # This is needed on Tru64 5.0 to declare mbstate_t +-echo "$as_me:20068: checking if we must include wchar.h to declare mbstate_t" >&5 ++echo "$as_me:20069: checking if we must include wchar.h to declare mbstate_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 + if test "${cf_cv_mbstate_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20075 "configure" ++#line 20076 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -20090,23 +20091,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20093: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20094: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20096: \$? = $ac_status" >&5 ++ echo "$as_me:20097: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20099: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20100: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20102: \$? = $ac_status" >&5 ++ echo "$as_me:20103: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_mbstate_t=no + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20109 "configure" ++#line 20110 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -20125,16 +20126,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20128: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20129: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20131: \$? = $ac_status" >&5 ++ echo "$as_me:20132: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20134: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20135: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20137: \$? = $ac_status" >&5 ++ echo "$as_me:20138: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_mbstate_t=yes + else +@@ -20146,7 +20147,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:20149: result: $cf_cv_mbstate_t" >&5 ++echo "$as_me:20150: result: $cf_cv_mbstate_t" >&5 + echo "${ECHO_T}$cf_cv_mbstate_t" >&6 + + if test "$cf_cv_mbstate_t" = yes ; then +@@ -20169,14 +20170,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wchar_t +-echo "$as_me:20172: checking if we must include wchar.h to declare wchar_t" >&5 ++echo "$as_me:20173: checking if we must include wchar.h to declare wchar_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 + if test "${cf_cv_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20179 "configure" ++#line 20180 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -20194,23 +20195,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20197: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20198: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20200: \$? = $ac_status" >&5 ++ echo "$as_me:20201: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20203: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20204: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20206: \$? = $ac_status" >&5 ++ echo "$as_me:20207: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wchar_t=no + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20213 "configure" ++#line 20214 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -20229,16 +20230,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20232: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20233: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20235: \$? = $ac_status" >&5 ++ echo "$as_me:20236: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20238: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20239: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20241: \$? = $ac_status" >&5 ++ echo "$as_me:20242: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wchar_t=yes + else +@@ -20250,7 +20251,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:20253: result: $cf_cv_wchar_t" >&5 ++echo "$as_me:20254: result: $cf_cv_wchar_t" >&5 + echo "${ECHO_T}$cf_cv_wchar_t" >&6 + + if test "$cf_cv_wchar_t" = yes ; then +@@ -20273,14 +20274,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wint_t +-echo "$as_me:20276: checking if we must include wchar.h to declare wint_t" >&5 ++echo "$as_me:20277: checking if we must include wchar.h to declare wint_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 + if test "${cf_cv_wint_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20283 "configure" ++#line 20284 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -20298,23 +20299,23 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20301: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20302: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20304: \$? = $ac_status" >&5 ++ echo "$as_me:20305: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20307: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20308: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20310: \$? = $ac_status" >&5 ++ echo "$as_me:20311: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wint_t=no + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20317 "configure" ++#line 20318 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -20333,16 +20334,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20336: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20337: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20339: \$? = $ac_status" >&5 ++ echo "$as_me:20340: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20342: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20343: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20345: \$? = $ac_status" >&5 ++ echo "$as_me:20346: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_wint_t=yes + else +@@ -20354,7 +20355,7 @@ + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +-echo "$as_me:20357: result: $cf_cv_wint_t" >&5 ++echo "$as_me:20358: result: $cf_cv_wint_t" >&5 + echo "${ECHO_T}$cf_cv_wint_t" >&6 + + if test "$cf_cv_wint_t" = yes ; then +@@ -20378,10 +20379,10 @@ + + if test "$NCURSES_OK_MBSTATE_T" = 0 ; then + +-echo "$as_me:20381: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:20382: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 + echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20384 "configure" ++#line 20385 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -20399,16 +20400,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20402: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20403: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20405: \$? = $ac_status" >&5 ++ echo "$as_me:20406: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20408: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20409: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20411: \$? = $ac_status" >&5 ++ echo "$as_me:20412: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes + else +@@ -20417,7 +20418,7 @@ + cf_result=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +-echo "$as_me:20420: result: $cf_result" >&5 ++echo "$as_me:20421: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = yes ; then + +@@ -20439,10 +20440,10 @@ + + if test "$NCURSES_OK_WCHAR_T" = 0 ; then + +-echo "$as_me:20442: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:20443: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 + echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20445 "configure" ++#line 20446 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -20460,16 +20461,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20463: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20464: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20466: \$? = $ac_status" >&5 ++ echo "$as_me:20467: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20469: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20470: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20472: \$? = $ac_status" >&5 ++ echo "$as_me:20473: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes + else +@@ -20478,7 +20479,7 @@ + cf_result=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +-echo "$as_me:20481: result: $cf_result" >&5 ++echo "$as_me:20482: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = yes ; then + +@@ -20500,10 +20501,10 @@ + + if test "$NCURSES_OK_WINT_T" = 0 ; then + +-echo "$as_me:20503: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:20504: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 + echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20506 "configure" ++#line 20507 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -20521,16 +20522,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20524: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20525: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20527: \$? = $ac_status" >&5 ++ echo "$as_me:20528: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20530: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20531: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20533: \$? = $ac_status" >&5 ++ echo "$as_me:20534: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes + else +@@ -20539,7 +20540,7 @@ + cf_result=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +-echo "$as_me:20542: result: $cf_result" >&5 ++echo "$as_me:20543: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = yes ; then + +@@ -20568,11 +20569,11 @@ + boolfnames \ + ttytype + do +-echo "$as_me:20571: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:20572: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 + echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20575 "configure" ++#line 20576 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -20605,16 +20606,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:20608: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20609: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20611: \$? = $ac_status" >&5 ++ echo "$as_me:20612: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:20614: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20615: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20617: \$? = $ac_status" >&5 ++ echo "$as_me:20618: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes + +@@ -20624,7 +20625,7 @@ + cf_result=no + fi + rm -f "conftest.$ac_objext" "conftest.$ac_ext" +-echo "$as_me:20627: result: $cf_result" >&5 ++echo "$as_me:20628: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + + if test "$cf_result" = yes ; then +@@ -20636,14 +20637,14 @@ + EOF + + else +- echo "$as_me:20639: checking for data $cf_data in library" >&5 ++ echo "$as_me:20640: checking for data $cf_data in library" >&5 + echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6 + # BSD linkers insist on making weak linkage, but resolve at runtime. + if test "$cross_compiling" = yes; then + + # cross-compiling + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20646 "configure" ++#line 20647 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -20682,16 +20683,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20685: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20686: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20688: \$? = $ac_status" >&5 ++ echo "$as_me:20689: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20691: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20692: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20694: \$? = $ac_status" >&5 ++ echo "$as_me:20695: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes + else +@@ -20703,7 +20704,7 @@ + + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20706 "configure" ++#line 20707 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -20735,15 +20736,15 @@ + } + _ACEOF + rm -f "conftest$ac_exeext" +-if { (eval echo "$as_me:20738: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20739: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20741: \$? = $ac_status" >&5 ++ echo "$as_me:20742: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' +- { (eval echo "$as_me:20743: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20744: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20746: \$? = $ac_status" >&5 ++ echo "$as_me:20747: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes + +@@ -20755,7 +20756,7 @@ + fi + rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" + fi +- echo "$as_me:20758: result: $cf_result" >&5 ++ echo "$as_me:20759: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = yes ; then + +@@ -20772,7 +20773,7 @@ + + if test -n "$with_screen" && test "x$with_screen" = "xpdcurses" + then +- echo "$as_me:20775: checking for X" >&5 ++ echo "$as_me:20776: checking for X" >&5 + echo $ECHO_N "checking for X... $ECHO_C" >&6 + + # Check whether --with-x or --without-x was given. +@@ -20876,17 +20877,17 @@ + # Guess where to find include files, by looking for Intrinsic.h. + # First, try using that file with no special directory specified. + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20879 "configure" ++#line 20880 "configure" + #include "confdefs.h" + #include <X11/Intrinsic.h> + _ACEOF +-if { (eval echo "$as_me:20883: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:20884: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:20889: \$? = $ac_status" >&5 ++ echo "$as_me:20890: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -20919,7 +20920,7 @@ + ac_save_LIBS=$LIBS + LIBS="-lXt $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 20922 "configure" ++#line 20923 "configure" + #include "confdefs.h" + #include <X11/Intrinsic.h> + int +@@ -20931,16 +20932,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:20934: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20935: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20937: \$? = $ac_status" >&5 ++ echo "$as_me:20938: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:20940: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20941: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20943: \$? = $ac_status" >&5 ++ echo "$as_me:20944: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + LIBS=$ac_save_LIBS + # We can link X programs with no special library path. +@@ -20978,7 +20979,7 @@ + fi # $with_x != no + + if test "$have_x" != yes; then +- echo "$as_me:20981: result: $have_x" >&5 ++ echo "$as_me:20982: result: $have_x" >&5 + echo "${ECHO_T}$have_x" >&6 + no_x=yes + else +@@ -20988,7 +20989,7 @@ + # Update the cache value to reflect the command line values. + ac_cv_have_x="have_x=yes \ + ac_x_includes=$x_includes ac_x_libraries=$x_libraries" +- echo "$as_me:20991: result: libraries $x_libraries, headers $x_includes" >&5 ++ echo "$as_me:20992: result: libraries $x_libraries, headers $x_includes" >&5 + echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + fi + +@@ -21015,11 +21016,11 @@ + # others require no space. Words are not sufficient . . . . + case `(uname -sr) 2>/dev/null` in + "SunOS 5"*) +- echo "$as_me:21018: checking whether -R must be followed by a space" >&5 ++ echo "$as_me:21019: checking whether -R must be followed by a space" >&5 + echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21022 "configure" ++#line 21023 "configure" + #include "confdefs.h" + + int +@@ -21031,16 +21032,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21034: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21035: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21037: \$? = $ac_status" >&5 ++ echo "$as_me:21038: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21040: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21041: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21043: \$? = $ac_status" >&5 ++ echo "$as_me:21044: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_R_nospace=yes + else +@@ -21050,13 +21051,13 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + if test $ac_R_nospace = yes; then +- echo "$as_me:21053: result: no" >&5 ++ echo "$as_me:21054: result: no" >&5 + echo "${ECHO_T}no" >&6 + X_LIBS="$X_LIBS -R$x_libraries" + else + LIBS="$ac_xsave_LIBS -R $x_libraries" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21059 "configure" ++#line 21060 "configure" + #include "confdefs.h" + + int +@@ -21068,16 +21069,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21071: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21072: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21074: \$? = $ac_status" >&5 ++ echo "$as_me:21075: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21077: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21078: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21080: \$? = $ac_status" >&5 ++ echo "$as_me:21081: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_R_space=yes + else +@@ -21087,11 +21088,11 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + if test $ac_R_space = yes; then +- echo "$as_me:21090: result: yes" >&5 ++ echo "$as_me:21091: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + X_LIBS="$X_LIBS -R $x_libraries" + else +- echo "$as_me:21094: result: neither works" >&5 ++ echo "$as_me:21095: result: neither works" >&5 + echo "${ECHO_T}neither works" >&6 + fi + fi +@@ -21111,7 +21112,7 @@ + # the Alpha needs dnet_stub (dnet does not exist). + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21114 "configure" ++#line 21115 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -21130,22 +21131,22 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21133: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21134: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21136: \$? = $ac_status" >&5 ++ echo "$as_me:21137: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21139: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21140: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21142: \$? = $ac_status" >&5 ++ echo "$as_me:21143: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : + else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 +-echo "$as_me:21148: checking for dnet_ntoa in -ldnet" >&5 ++echo "$as_me:21149: checking for dnet_ntoa in -ldnet" >&5 + echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 + if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21153,7 +21154,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21156 "configure" ++#line 21157 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -21172,16 +21173,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21175: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21176: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21178: \$? = $ac_status" >&5 ++ echo "$as_me:21179: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21181: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21182: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21184: \$? = $ac_status" >&5 ++ echo "$as_me:21185: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dnet_dnet_ntoa=yes + else +@@ -21192,14 +21193,14 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:21195: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 ++echo "$as_me:21196: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 + echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 + if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" + fi + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then +- echo "$as_me:21202: checking for dnet_ntoa in -ldnet_stub" >&5 ++ echo "$as_me:21203: checking for dnet_ntoa in -ldnet_stub" >&5 + echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 + if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21207,7 +21208,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet_stub $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21210 "configure" ++#line 21211 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -21226,16 +21227,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21229: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21230: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21232: \$? = $ac_status" >&5 ++ echo "$as_me:21233: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21235: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21236: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21238: \$? = $ac_status" >&5 ++ echo "$as_me:21239: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes + else +@@ -21246,7 +21247,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:21249: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 ++echo "$as_me:21250: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 + echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 + if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" +@@ -21265,13 +21266,13 @@ + # on Irix 5.2, according to T.E. Dickey. + # The functions gethostbyname, getservbyname, and inet_addr are + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. +- echo "$as_me:21268: checking for gethostbyname" >&5 ++ echo "$as_me:21269: checking for gethostbyname" >&5 + echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 + if test "${ac_cv_func_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21274 "configure" ++#line 21275 "configure" + #include "confdefs.h" + #define gethostbyname autoconf_temporary + #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -21302,16 +21303,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21305: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21306: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21308: \$? = $ac_status" >&5 ++ echo "$as_me:21309: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21311: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21312: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21314: \$? = $ac_status" >&5 ++ echo "$as_me:21315: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_gethostbyname=yes + else +@@ -21321,11 +21322,11 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:21324: result: $ac_cv_func_gethostbyname" >&5 ++echo "$as_me:21325: result: $ac_cv_func_gethostbyname" >&5 + echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 + + if test $ac_cv_func_gethostbyname = no; then +- echo "$as_me:21328: checking for gethostbyname in -lnsl" >&5 ++ echo "$as_me:21329: checking for gethostbyname in -lnsl" >&5 + echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 + if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21333,7 +21334,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnsl $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21336 "configure" ++#line 21337 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -21352,16 +21353,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21355: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21356: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21358: \$? = $ac_status" >&5 ++ echo "$as_me:21359: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21361: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21362: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21364: \$? = $ac_status" >&5 ++ echo "$as_me:21365: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_nsl_gethostbyname=yes + else +@@ -21372,14 +21373,14 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:21375: result: $ac_cv_lib_nsl_gethostbyname" >&5 ++echo "$as_me:21376: result: $ac_cv_lib_nsl_gethostbyname" >&5 + echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 + if test "$ac_cv_lib_nsl_gethostbyname" = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" + fi + + if test $ac_cv_lib_nsl_gethostbyname = no; then +- echo "$as_me:21382: checking for gethostbyname in -lbsd" >&5 ++ echo "$as_me:21383: checking for gethostbyname in -lbsd" >&5 + echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 + if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21387,7 +21388,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21390 "configure" ++#line 21391 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -21406,16 +21407,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21409: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21410: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21412: \$? = $ac_status" >&5 ++ echo "$as_me:21413: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21415: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21416: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21418: \$? = $ac_status" >&5 ++ echo "$as_me:21419: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_bsd_gethostbyname=yes + else +@@ -21426,7 +21427,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:21429: result: $ac_cv_lib_bsd_gethostbyname" >&5 ++echo "$as_me:21430: result: $ac_cv_lib_bsd_gethostbyname" >&5 + echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 + if test "$ac_cv_lib_bsd_gethostbyname" = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" +@@ -21442,13 +21443,13 @@ + # variants that don't use the nameserver (or something). -lsocket + # must be given before -lnsl if both are needed. We assume that + # if connect needs -lnsl, so does gethostbyname. +- echo "$as_me:21445: checking for connect" >&5 ++ echo "$as_me:21446: checking for connect" >&5 + echo $ECHO_N "checking for connect... $ECHO_C" >&6 + if test "${ac_cv_func_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21451 "configure" ++#line 21452 "configure" + #include "confdefs.h" + #define connect autoconf_temporary + #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -21479,16 +21480,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21482: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21483: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21485: \$? = $ac_status" >&5 ++ echo "$as_me:21486: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21488: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21489: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21491: \$? = $ac_status" >&5 ++ echo "$as_me:21492: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_connect=yes + else +@@ -21498,11 +21499,11 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:21501: result: $ac_cv_func_connect" >&5 ++echo "$as_me:21502: result: $ac_cv_func_connect" >&5 + echo "${ECHO_T}$ac_cv_func_connect" >&6 + + if test $ac_cv_func_connect = no; then +- echo "$as_me:21505: checking for connect in -lsocket" >&5 ++ echo "$as_me:21506: checking for connect in -lsocket" >&5 + echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 + if test "${ac_cv_lib_socket_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21510,7 +21511,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsocket $X_EXTRA_LIBS $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21513 "configure" ++#line 21514 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -21529,16 +21530,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21532: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21533: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21535: \$? = $ac_status" >&5 ++ echo "$as_me:21536: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21538: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21539: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21541: \$? = $ac_status" >&5 ++ echo "$as_me:21542: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_socket_connect=yes + else +@@ -21549,7 +21550,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:21552: result: $ac_cv_lib_socket_connect" >&5 ++echo "$as_me:21553: result: $ac_cv_lib_socket_connect" >&5 + echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 + if test "$ac_cv_lib_socket_connect" = yes; then + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" +@@ -21558,13 +21559,13 @@ + fi + + # Guillermo Gomez says -lposix is necessary on A/UX. +- echo "$as_me:21561: checking for remove" >&5 ++ echo "$as_me:21562: checking for remove" >&5 + echo $ECHO_N "checking for remove... $ECHO_C" >&6 + if test "${ac_cv_func_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21567 "configure" ++#line 21568 "configure" + #include "confdefs.h" + #define remove autoconf_temporary + #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -21595,16 +21596,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21598: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21599: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21601: \$? = $ac_status" >&5 ++ echo "$as_me:21602: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21604: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21605: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21607: \$? = $ac_status" >&5 ++ echo "$as_me:21608: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_remove=yes + else +@@ -21614,11 +21615,11 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:21617: result: $ac_cv_func_remove" >&5 ++echo "$as_me:21618: result: $ac_cv_func_remove" >&5 + echo "${ECHO_T}$ac_cv_func_remove" >&6 + + if test $ac_cv_func_remove = no; then +- echo "$as_me:21621: checking for remove in -lposix" >&5 ++ echo "$as_me:21622: checking for remove in -lposix" >&5 + echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 + if test "${ac_cv_lib_posix_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21626,7 +21627,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lposix $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21629 "configure" ++#line 21630 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -21645,16 +21646,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21648: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21649: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21651: \$? = $ac_status" >&5 ++ echo "$as_me:21652: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21654: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21655: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21657: \$? = $ac_status" >&5 ++ echo "$as_me:21658: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_posix_remove=yes + else +@@ -21665,7 +21666,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:21668: result: $ac_cv_lib_posix_remove" >&5 ++echo "$as_me:21669: result: $ac_cv_lib_posix_remove" >&5 + echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 + if test "$ac_cv_lib_posix_remove" = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" +@@ -21674,13 +21675,13 @@ + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. +- echo "$as_me:21677: checking for shmat" >&5 ++ echo "$as_me:21678: checking for shmat" >&5 + echo $ECHO_N "checking for shmat... $ECHO_C" >&6 + if test "${ac_cv_func_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21683 "configure" ++#line 21684 "configure" + #include "confdefs.h" + #define shmat autoconf_temporary + #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +@@ -21711,16 +21712,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21714: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21715: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21717: \$? = $ac_status" >&5 ++ echo "$as_me:21718: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21720: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21721: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21723: \$? = $ac_status" >&5 ++ echo "$as_me:21724: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_shmat=yes + else +@@ -21730,11 +21731,11 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi +-echo "$as_me:21733: result: $ac_cv_func_shmat" >&5 ++echo "$as_me:21734: result: $ac_cv_func_shmat" >&5 + echo "${ECHO_T}$ac_cv_func_shmat" >&6 + + if test $ac_cv_func_shmat = no; then +- echo "$as_me:21737: checking for shmat in -lipc" >&5 ++ echo "$as_me:21738: checking for shmat in -lipc" >&5 + echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 + if test "${ac_cv_lib_ipc_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21742,7 +21743,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lipc $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21745 "configure" ++#line 21746 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -21761,16 +21762,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21764: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21765: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21767: \$? = $ac_status" >&5 ++ echo "$as_me:21768: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21770: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21771: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21773: \$? = $ac_status" >&5 ++ echo "$as_me:21774: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_ipc_shmat=yes + else +@@ -21781,7 +21782,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:21784: result: $ac_cv_lib_ipc_shmat" >&5 ++echo "$as_me:21785: result: $ac_cv_lib_ipc_shmat" >&5 + echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 + if test "$ac_cv_lib_ipc_shmat" = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" +@@ -21799,7 +21800,7 @@ + # These have to be linked with before -lX11, unlike the other + # libraries we check for below, so use a different variable. + # John Interrante, Karl Berry +- echo "$as_me:21802: checking for IceConnectionNumber in -lICE" >&5 ++ echo "$as_me:21803: checking for IceConnectionNumber in -lICE" >&5 + echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 + if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -21807,7 +21808,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lICE $X_EXTRA_LIBS $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 21810 "configure" ++#line 21811 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -21826,16 +21827,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:21829: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21830: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21832: \$? = $ac_status" >&5 ++ echo "$as_me:21833: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:21835: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21836: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21838: \$? = $ac_status" >&5 ++ echo "$as_me:21839: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_ICE_IceConnectionNumber=yes + else +@@ -21846,7 +21847,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:21849: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 ++echo "$as_me:21850: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 + echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 + if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" +@@ -21893,16 +21894,16 @@ + then + test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 + +-echo "${as_me:-configure}:21896: testing repairing CFLAGS: $CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:21897: testing repairing CFLAGS: $CFLAGS ..." 1>&5 + + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + +-echo "${as_me:-configure}:21901: testing ... fixed $CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:21902: testing ... fixed $CFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:21905: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:21906: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi + ;; +@@ -21941,16 +21942,16 @@ + then + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:21944: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:21945: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 + + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:21949: testing ... fixed $CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:21950: testing ... fixed $CPPFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:21953: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:21954: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi + ;; +@@ -21989,23 +21990,23 @@ + then + test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:21992: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:21993: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 + + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:21997: testing ... fixed $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:21998: testing ... fixed $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +-echo "${as_me:-configure}:22001: testing ... extra $EXTRA_CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:22002: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi + ;; + esac + fi + +-echo "$as_me:22008: checking if you want to turn on gcc warnings" >&5 ++echo "$as_me:22009: checking if you want to turn on gcc warnings" >&5 + echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 + + # Check whether --enable-warnings or --disable-warnings was given. +@@ -22022,7 +22023,7 @@ + enable_warnings=no + + fi; +-echo "$as_me:22025: result: $enable_warnings" >&5 ++echo "$as_me:22026: result: $enable_warnings" >&5 + echo "${ECHO_T}$enable_warnings" >&6 + if test "$enable_warnings" = "yes" + then +@@ -22045,10 +22046,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:22048: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:22049: checking for $CC __attribute__ directives..." >&5 + echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + cat > "conftest.$ac_ext" <<EOF +-#line 22051 "${as_me:-configure}" ++#line 22052 "${as_me:-configure}" + #include "confdefs.h" + #include "conftest.h" + #include "conftest.i" +@@ -22097,12 +22098,12 @@ + ;; + esac + +- if { (eval echo "$as_me:22100: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:22101: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22103: \$? = $ac_status" >&5 ++ echo "$as_me:22104: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:22105: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:22106: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case "$cf_attribute" in +@@ -22180,7 +22181,7 @@ + done + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22183 "configure" ++#line 22184 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -22195,26 +22196,26 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22198: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22199: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22201: \$? = $ac_status" >&5 ++ echo "$as_me:22202: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22204: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22205: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22207: \$? = $ac_status" >&5 ++ echo "$as_me:22208: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + +-echo "$as_me:22210: checking for X11/Xt const-feature" >&5 ++echo "$as_me:22211: checking for X11/Xt const-feature" >&5 + echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 + if test "${cf_cv_const_x_string+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22217 "configure" ++#line 22218 "configure" + #include "confdefs.h" + + #define _CONST_X_STRING /* X11R7.8 (perhaps) */ +@@ -22231,16 +22232,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" +-if { (eval echo "$as_me:22234: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22235: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22237: \$? = $ac_status" >&5 ++ echo "$as_me:22238: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' +- { (eval echo "$as_me:22240: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22241: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22243: \$? = $ac_status" >&5 ++ echo "$as_me:22244: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_const_x_string=no +@@ -22255,7 +22256,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + fi +-echo "$as_me:22258: result: $cf_cv_const_x_string" >&5 ++echo "$as_me:22259: result: $cf_cv_const_x_string" >&5 + echo "${ECHO_T}$cf_cv_const_x_string" >&6 + + LIBS="$cf_save_LIBS_CF_CONST_X_STRING" +@@ -22284,7 +22285,7 @@ + rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + cat > "conftest.$ac_ext" <<EOF +-#line 22287 "${as_me:-configure}" ++#line 22288 "${as_me:-configure}" + int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } + EOF + if test "$INTEL_COMPILER" = yes +@@ -22300,7 +22301,7 @@ + # remark #981: operands are evaluated in unspecified order + # warning #279: controlling expression is constant + +- { echo "$as_me:22303: checking for $CC warning options..." >&5 ++ { echo "$as_me:22304: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" +@@ -22316,12 +22317,12 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:22319: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:22320: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22322: \$? = $ac_status" >&5 ++ echo "$as_me:22323: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:22324: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:22325: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -22329,7 +22330,7 @@ + CFLAGS="$cf_save_CFLAGS" + elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" + then +- { echo "$as_me:22332: checking for $CC warning options..." >&5 ++ { echo "$as_me:22333: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + cf_warn_CONST="" +@@ -22352,12 +22353,12 @@ + Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:22355: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:22356: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22358: \$? = $ac_status" >&5 ++ echo "$as_me:22359: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then +- test -n "$verbose" && echo "$as_me:22360: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:22361: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + case "$cf_opt" in + (Winline) +@@ -22365,7 +22366,7 @@ + ([34].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:22368: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:22369: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -22375,7 +22376,7 @@ + ([12].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:22378: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:22379: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -22392,7 +22393,7 @@ + + fi + +-echo "$as_me:22395: checking if you want to use dmalloc for testing" >&5 ++echo "$as_me:22396: checking if you want to use dmalloc for testing" >&5 + echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 + + # Check whether --with-dmalloc or --without-dmalloc was given. +@@ -22414,7 +22415,7 @@ + else + with_dmalloc= + fi; +-echo "$as_me:22417: result: ${with_dmalloc:-no}" >&5 ++echo "$as_me:22418: result: ${with_dmalloc:-no}" >&5 + echo "${ECHO_T}${with_dmalloc:-no}" >&6 + + case ".$with_cflags" in +@@ -22528,23 +22529,23 @@ + esac + + if test "$with_dmalloc" = yes ; then +- echo "$as_me:22531: checking for dmalloc.h" >&5 ++ echo "$as_me:22532: checking for dmalloc.h" >&5 + echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 + if test "${ac_cv_header_dmalloc_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22537 "configure" ++#line 22538 "configure" + #include "confdefs.h" + #include <dmalloc.h> + _ACEOF +-if { (eval echo "$as_me:22541: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:22542: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:22547: \$? = $ac_status" >&5 ++ echo "$as_me:22548: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -22563,11 +22564,11 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:22566: result: $ac_cv_header_dmalloc_h" >&5 ++echo "$as_me:22567: result: $ac_cv_header_dmalloc_h" >&5 + echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 + if test "$ac_cv_header_dmalloc_h" = yes; then + +-echo "$as_me:22570: checking for dmalloc_debug in -ldmalloc" >&5 ++echo "$as_me:22571: checking for dmalloc_debug in -ldmalloc" >&5 + echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 + if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22575,7 +22576,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldmalloc $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22578 "configure" ++#line 22579 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -22594,16 +22595,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22597: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22598: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22600: \$? = $ac_status" >&5 ++ echo "$as_me:22601: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22603: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22604: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22606: \$? = $ac_status" >&5 ++ echo "$as_me:22607: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dmalloc_dmalloc_debug=yes + else +@@ -22614,7 +22615,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:22617: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 ++echo "$as_me:22618: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 + echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 + if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then + cat >>confdefs.h <<EOF +@@ -22629,7 +22630,7 @@ + + fi + +-echo "$as_me:22632: checking if you want to use dbmalloc for testing" >&5 ++echo "$as_me:22633: checking if you want to use dbmalloc for testing" >&5 + echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 + + # Check whether --with-dbmalloc or --without-dbmalloc was given. +@@ -22651,7 +22652,7 @@ + else + with_dbmalloc= + fi; +-echo "$as_me:22654: result: ${with_dbmalloc:-no}" >&5 ++echo "$as_me:22655: result: ${with_dbmalloc:-no}" >&5 + echo "${ECHO_T}${with_dbmalloc:-no}" >&6 + + case ".$with_cflags" in +@@ -22765,23 +22766,23 @@ + esac + + if test "$with_dbmalloc" = yes ; then +- echo "$as_me:22768: checking for dbmalloc.h" >&5 ++ echo "$as_me:22769: checking for dbmalloc.h" >&5 + echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 + if test "${ac_cv_header_dbmalloc_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22774 "configure" ++#line 22775 "configure" + #include "confdefs.h" + #include <dbmalloc.h> + _ACEOF +-if { (eval echo "$as_me:22778: \"$ac_cpp "conftest.$ac_ext"\"") >&5 ++if { (eval echo "$as_me:22779: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:22784: \$? = $ac_status" >&5 ++ echo "$as_me:22785: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -22800,11 +22801,11 @@ + fi + rm -f conftest.err "conftest.$ac_ext" + fi +-echo "$as_me:22803: result: $ac_cv_header_dbmalloc_h" >&5 ++echo "$as_me:22804: result: $ac_cv_header_dbmalloc_h" >&5 + echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 + if test "$ac_cv_header_dbmalloc_h" = yes; then + +-echo "$as_me:22807: checking for debug_malloc in -ldbmalloc" >&5 ++echo "$as_me:22808: checking for debug_malloc in -ldbmalloc" >&5 + echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 + if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -22812,7 +22813,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldbmalloc $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +-#line 22815 "configure" ++#line 22816 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -22831,16 +22832,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:22834: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22835: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22837: \$? = $ac_status" >&5 ++ echo "$as_me:22838: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:22840: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22841: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22843: \$? = $ac_status" >&5 ++ echo "$as_me:22844: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_dbmalloc_debug_malloc=yes + else +@@ -22851,7 +22852,7 @@ + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:22854: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 ++echo "$as_me:22855: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 + echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 + if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then + cat >>confdefs.h <<EOF +@@ -22866,7 +22867,7 @@ + + fi + +-echo "$as_me:22869: checking if you want to use valgrind for testing" >&5 ++echo "$as_me:22870: checking if you want to use valgrind for testing" >&5 + echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 + + # Check whether --with-valgrind or --without-valgrind was given. +@@ -22888,7 +22889,7 @@ + else + with_valgrind= + fi; +-echo "$as_me:22891: result: ${with_valgrind:-no}" >&5 ++echo "$as_me:22892: result: ${with_valgrind:-no}" >&5 + echo "${ECHO_T}${with_valgrind:-no}" >&6 + + case ".$with_cflags" in +@@ -23001,7 +23002,7 @@ + ;; + esac + +-echo "$as_me:23004: checking if you want to perform memory-leak testing" >&5 ++echo "$as_me:23005: checking if you want to perform memory-leak testing" >&5 + echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 + + # Check whether --enable-leaks or --disable-leaks was given. +@@ -23012,7 +23013,7 @@ + enable_leaks=yes + fi; + if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi +-echo "$as_me:23015: result: $with_no_leaks" >&5 ++echo "$as_me:23016: result: $with_no_leaks" >&5 + echo "${ECHO_T}$with_no_leaks" >&6 + + if test "$enable_leaks" = no ; then +@@ -23030,7 +23031,7 @@ + LD_RPATH_OPT= + if test "x$cf_cv_enable_rpath" != xno + then +- echo "$as_me:23033: checking for an rpath option" >&5 ++ echo "$as_me:23034: checking for an rpath option" >&5 + echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 + case "$cf_cv_system_name" in + (irix*) +@@ -23061,12 +23062,12 @@ + (*) + ;; + esac +- echo "$as_me:23064: result: $LD_RPATH_OPT" >&5 ++ echo "$as_me:23065: result: $LD_RPATH_OPT" >&5 + echo "${ECHO_T}$LD_RPATH_OPT" >&6 + + case "x$LD_RPATH_OPT" in + (x-R*) +- echo "$as_me:23069: checking if we need a space after rpath option" >&5 ++ echo "$as_me:23070: checking if we need a space after rpath option" >&5 + echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + +@@ -23087,7 +23088,7 @@ + LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23090 "configure" ++#line 23091 "configure" + #include "confdefs.h" + + int +@@ -23099,16 +23100,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23102: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23103: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23105: \$? = $ac_status" >&5 ++ echo "$as_me:23106: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23108: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23109: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23111: \$? = $ac_status" >&5 ++ echo "$as_me:23112: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_rpath_space=no + else +@@ -23118,14 +23119,14 @@ + fi + rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" +- echo "$as_me:23121: result: $cf_rpath_space" >&5 ++ echo "$as_me:23122: result: $cf_rpath_space" >&5 + echo "${ECHO_T}$cf_rpath_space" >&6 + test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " + ;; + esac + fi + +-echo "$as_me:23128: checking if rpath-hack should be disabled" >&5 ++echo "$as_me:23129: checking if rpath-hack should be disabled" >&5 + echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 + + # Check whether --enable-rpath-hack or --disable-rpath-hack was given. +@@ -23143,22 +23144,22 @@ + + fi; + if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi +-echo "$as_me:23146: result: $cf_disable_rpath_hack" >&5 ++echo "$as_me:23147: result: $cf_disable_rpath_hack" >&5 + echo "${ECHO_T}$cf_disable_rpath_hack" >&6 + + if test "$enable_rpath_hack" = yes ; then + +-echo "$as_me:23151: checking for updated LDFLAGS" >&5 ++echo "$as_me:23152: checking for updated LDFLAGS" >&5 + echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 + if test -n "$LD_RPATH_OPT" ; then +- echo "$as_me:23154: result: maybe" >&5 ++ echo "$as_me:23155: result: maybe" >&5 + echo "${ECHO_T}maybe" >&6 + + for ac_prog in ldd + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:23161: checking for $ac_word" >&5 ++echo "$as_me:23162: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23173,7 +23174,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_cf_ldd_prog="$ac_prog" +-echo "$as_me:23176: found $ac_dir/$ac_word" >&5 ++echo "$as_me:23177: found $ac_dir/$ac_word" >&5 + break + done + +@@ -23181,10 +23182,10 @@ + fi + cf_ldd_prog=$ac_cv_prog_cf_ldd_prog + if test -n "$cf_ldd_prog"; then +- echo "$as_me:23184: result: $cf_ldd_prog" >&5 ++ echo "$as_me:23185: result: $cf_ldd_prog" >&5 + echo "${ECHO_T}$cf_ldd_prog" >&6 + else +- echo "$as_me:23187: result: no" >&5 ++ echo "$as_me:23188: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -23198,7 +23199,7 @@ + cf_rpath_oops= + + cat >"conftest.$ac_ext" <<_ACEOF +-#line 23201 "configure" ++#line 23202 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -23210,16 +23211,16 @@ + } + _ACEOF + rm -f "conftest.$ac_objext" "conftest$ac_exeext" +-if { (eval echo "$as_me:23213: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23214: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23216: \$? = $ac_status" >&5 ++ echo "$as_me:23217: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' +- { (eval echo "$as_me:23219: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23220: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23222: \$? = $ac_status" >&5 ++ echo "$as_me:23223: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq` + cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` +@@ -23247,7 +23248,7 @@ + then + test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 + +-echo "${as_me:-configure}:23250: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 ++echo "${as_me:-configure}:23251: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 + + LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" + break +@@ -23259,11 +23260,11 @@ + + test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:23262: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:23263: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:23266: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:23267: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LDFLAGS +@@ -23300,7 +23301,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:23303: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:23304: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -23313,11 +23314,11 @@ + + test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:23316: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:23317: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:23320: testing ...checking LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:23321: testing ...checking LIBS $LIBS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LIBS +@@ -23354,7 +23355,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:23357: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:23358: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -23367,14 +23368,14 @@ + + test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:23370: testing ...checked LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:23371: testing ...checked LIBS $LIBS ..." 1>&5 + + test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:23374: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:23375: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + else +- echo "$as_me:23377: result: no" >&5 ++ echo "$as_me:23378: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -23464,7 +23465,7 @@ + : "${CONFIG_STATUS=./config.status}" + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:23467: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:23468: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >"$CONFIG_STATUS" <<_ACEOF + #! $SHELL +@@ -23643,7 +23644,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:23646: error: ambiguous option: $1 ++ { { echo "$as_me:23647: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -23662,7 +23663,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:23665: error: unrecognized option: $1 ++ -*) { { echo "$as_me:23666: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -23712,7 +23713,7 @@ + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;; +- *) { { echo "$as_me:23715: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:23716: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -24018,7 +24019,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:24021: creating $ac_file" >&5 ++ { echo "$as_me:24022: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -24036,7 +24037,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:24039: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:24040: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -24049,7 +24050,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:24052: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:24053: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -24065,7 +24066,7 @@ + if test -n "$ac_seen"; then + ac_used=`grep '@datarootdir@' "$ac_item"` + if test -z "$ac_used"; then +- { echo "$as_me:24068: WARNING: datarootdir was used implicitly but not set: ++ { echo "$as_me:24069: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used implicitly but not set: + $ac_seen" >&2;} +@@ -24074,7 +24075,7 @@ + fi + ac_seen=`grep '${datarootdir}' "$ac_item"` + if test -n "$ac_seen"; then +- { echo "$as_me:24077: WARNING: datarootdir was used explicitly but not set: ++ { echo "$as_me:24078: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&5 + echo "$as_me: WARNING: datarootdir was used explicitly but not set: + $ac_seen" >&2;} +@@ -24111,7 +24112,7 @@ + ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` + if test -z "$ac_init"; then + ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` +- { echo "$as_me:24114: WARNING: Variable $ac_name is used but was not set: ++ { echo "$as_me:24115: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&5 + echo "$as_me: WARNING: Variable $ac_name is used but was not set: + $ac_seen" >&2;} +@@ -24122,7 +24123,7 @@ + ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out + if test -s $tmp/out; then + ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` +- { echo "$as_me:24125: WARNING: Some variables may not be substituted: ++ { echo "$as_me:24126: WARNING: Some variables may not be substituted: + $ac_seen" >&5 + echo "$as_me: WARNING: Some variables may not be substituted: + $ac_seen" >&2;} +@@ -24171,7 +24172,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:24174: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:24175: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -24182,7 +24183,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:24185: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:24186: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -24195,7 +24196,7 @@ + echo "$srcdir/$f" + else + # /dev/null tree +- { { echo "$as_me:24198: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:24199: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -24253,7 +24254,7 @@ + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then +- { echo "$as_me:24256: $ac_file is unchanged" >&5 ++ { echo "$as_me:24257: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +Index: test/configure.in +Prereq: 1.163 +--- ncurses-6.3-20220402+/test/configure.in 2021-07-03 20:21:07.000000000 +0000 ++++ ncurses-6.3-20220409/test/configure.in 2022-04-09 21:31:37.000000000 +0000 +@@ -1,5 +1,5 @@ + dnl*************************************************************************** +-dnl Copyright 2018-2020,2021 Thomas E. Dickey * ++dnl Copyright 2018-2021,2022 Thomas E. Dickey * + dnl Copyright 1998-2017,2018 Free Software Foundation, Inc. * + dnl * + dnl Permission is hereby granted, free of charge, to any person obtaining a * +@@ -29,7 +29,7 @@ + dnl + dnl Author: Thomas E. Dickey 1996-on + dnl +-dnl $Id: configure.in,v 1.163 2021/07/03 20:21:07 tom Exp $ ++dnl $Id: configure.in,v 1.164 2022/04/09 21:31:37 tom Exp $ + dnl This is a simple configuration-script for the ncurses test programs that + dnl allows the test-directory to be separately configured against a reference + dnl system (i.e., sysvr4 curses) +@@ -359,6 +359,7 @@ + tigetstr \ + tputs_sp \ + typeahead \ ++unget_wch \ + use_default_colors \ + use_env \ + use_extended_names \ +Index: test/listused.sh +Prereq: 1.10 +--- ncurses-6.3-20220402+/test/listused.sh 2021-06-17 21:20:30.000000000 +0000 ++++ ncurses-6.3-20220409/test/listused.sh 2022-04-09 23:03:25.000000000 +0000 +@@ -1,6 +1,6 @@ + #!/bin/sh + ############################################################################## +-# Copyright 2020,2021 Thomas E. Dickey # ++# Copyright 2020-2021,2022 Thomas E. Dickey # + # Copyright 2003-2006,2010 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # +@@ -27,14 +27,16 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: listused.sh,v 1.10 2021/06/17 21:20:30 tom Exp $ ++# $Id: listused.sh,v 1.11 2022/04/09 23:03:25 tom Exp $ + # A very simple script to list all entrypoints that are used by either a test + # program, or within the libraries. This relies on the output format of 'nm', + # and assumes that the libraries are configured with TRACE defined, and using + # these options: + # --disable-macros ++# --enable-opaque-curses + # --enable-sp-funcs + # --enable-widec ++# --without-gpm + # Static libraries are used, to provide some filtering based on internal usage + # of the different symbols. + +Index: test/modules +Prereq: 1.75 +--- ncurses-6.3-20220402+/test/modules 2021-12-11 17:41:34.000000000 +0000 ++++ ncurses-6.3-20220409/test/modules 2022-04-09 21:27:31.000000000 +0000 +@@ -1,6 +1,6 @@ +-# $Id: modules,v 1.75 2021/12/11 17:41:34 tom Exp $ ++# $Id: modules,v 1.76 2022/04/09 21:27:31 tom Exp $ + ############################################################################## +-# Copyright 2018-2020,2021 Thomas E. Dickey # ++# Copyright 2018-2021,2022 Thomas E. Dickey # + # Copyright 1998-2016,2017 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # +@@ -110,6 +110,7 @@ + test_sgr progs $(srcdir) $(HEADER_DEPS) + test_termattrs progs $(srcdir) $(HEADER_DEPS) + test_tparm progs $(srcdir) $(HEADER_DEPS) ++test_unget_wch progs $(srcdir) $(HEADER_DEPS) + test_vid_puts progs $(srcdir) $(HEADER_DEPS) + test_vidputs progs $(srcdir) $(HEADER_DEPS) + testaddch progs $(srcdir) $(HEADER_DEPS) +Index: test/programs +Prereq: 1.51 +--- ncurses-6.3-20220402+/test/programs 2021-12-18 18:46:56.000000000 +0000 ++++ ncurses-6.3-20220409/test/programs 2022-04-09 21:27:24.000000000 +0000 +@@ -1,6 +1,6 @@ +-# $Id: programs,v 1.51 2021/12/18 18:46:56 tom Exp $ ++# $Id: programs,v 1.52 2022/04/09 21:27:24 tom Exp $ + ############################################################################## +-# Copyright 2018-2020,2021 Thomas E. Dickey # ++# Copyright 2018-2021,2022 Thomas E. Dickey # + # Copyright 2006-2016,2017 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # +@@ -105,6 +105,7 @@ + test_sgr $(LDFLAGS_TINFO) $(LOCAL_LIBS) test_sgr + test_termattrs $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_termattrs + test_tparm $(LDFLAGS_TINFO) $(LOCAL_LIBS) test_tparm ++test_unget_wch $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_unget_wch + test_vid_puts $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_vid_puts + test_vidputs $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_vidputs + testaddch $(LDFLAGS_CURSES) $(LOCAL_LIBS) testaddch +Index: test/sp_tinfo.c +Prereq: 1.23 +--- ncurses-6.3-20220402+/test/sp_tinfo.c 2020-02-02 23:34:34.000000000 +0000 ++++ ncurses-6.3-20220409/test/sp_tinfo.c 2022-04-09 22:56:28.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2019,2020 Thomas E. Dickey * ++ * Copyright 2019-2020,2022 Thomas E. Dickey * + * Copyright 2017 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -28,7 +28,7 @@ + ****************************************************************************/ + + /* +- * $Id: sp_tinfo.c,v 1.23 2020/02/02 23:34:34 tom Exp $ ++ * $Id: sp_tinfo.c,v 1.24 2022/04/09 22:56:28 tom Exp $ + * + * TOTO: add option for non-sp-funcs interface + */ +@@ -279,9 +279,6 @@ + { + set_curterm(data->term); + del_curterm(data->term); +-#if !NO_LEAKS +- free(data->sp); /* cannot use delscreen in tinfo */ +-#endif + free(data); + } + +Index: test/test.priv.h +Prereq: 1.198 +--- ncurses-6.3-20220402+/test/test.priv.h 2021-12-18 18:55:10.000000000 +0000 ++++ ncurses-6.3-20220409/test/test.priv.h 2022-04-09 21:32:05.000000000 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright 2018-2020,2021 Thomas E. Dickey * ++ * Copyright 2018-2021,2022 Thomas E. Dickey * + * Copyright 1998-2017,2018 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * +@@ -30,7 +30,7 @@ + /**************************************************************************** + * Author: Thomas E. Dickey 1996-on * + ****************************************************************************/ +-/* $Id: test.priv.h,v 1.198 2021/12/18 18:55:10 tom Exp $ */ ++/* $Id: test.priv.h,v 1.199 2022/04/09 21:32:05 tom Exp $ */ + + #ifndef __TEST_PRIV_H + #define __TEST_PRIV_H 1 +@@ -303,6 +303,10 @@ + #define HAVE_WINSSTR 0 + #endif + ++#ifndef HAVE_UNGET_WCH ++#define HAVE_UNGET_WCH 0 ++#endif ++ + #ifndef HAVE_USE_DEFAULT_COLORS + #define HAVE_USE_DEFAULT_COLORS 0 + #endif +Index: test/test_unget_wch.c +--- /dev/null 2022-04-09 19:19:40.156000000 +0000 ++++ ncurses-6.3-20220409/test/test_unget_wch.c 2022-04-09 23:47:04.000000000 +0000 +@@ -0,0 +1,81 @@ ++/**************************************************************************** ++ * Copyright 2022 Thomas E. Dickey * ++ * * ++ * Permission is hereby granted, free of charge, to any person obtaining a * ++ * copy of this software and associated documentation files (the * ++ * "Software"), to deal in the Software without restriction, including * ++ * without limitation the rights to use, copy, modify, merge, publish, * ++ * distribute, distribute with modifications, sublicense, and/or sell * ++ * copies of the Software, and to permit persons to whom the Software is * ++ * furnished to do so, subject to the following conditions: * ++ * * ++ * The above copyright notice and this permission notice shall be included * ++ * in all copies or substantial portions of the Software. * ++ * * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * ++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * ++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * ++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * ++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * ++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ++ * * ++ * Except as contained in this notice, the name(s) of the above copyright * ++ * holders shall not be used in advertising or otherwise to promote the * ++ * sale, use or other dealings in this Software without prior written * ++ * authorization. * ++ ****************************************************************************/ ++/* ++ * $Id: test_unget_wch.c,v 1.2 2022/04/09 23:47:04 tom Exp $ ++ * ++ * Demonstrate the unget_wch and unget functions. ++ */ ++ ++#include <test.priv.h> ++ ++#if USE_WIDEC_SUPPORT && HAVE_UNGET_WCH ++int ++main(void) ++{ ++ int step = 0; ++ ++ initscr(); ++ keypad(stdscr, TRUE); ++ cbreak(); ++ noecho(); ++ scrollok(stdscr, TRUE); ++ ++ for (;;) { ++ wint_t widechar; ++ int rc = get_wch(&widechar); ++ if (rc == KEY_CODE_YES) { ++ printw("KEY[%d] %s\n", ++step, keyname((int) widechar)); ++ ungetch((int) widechar); ++ printw("...[%d] %s\n", step, keyname(getch())); ++ } else if (widechar == QUIT || widechar == ESCAPE) { ++ break; ++ } else { ++ printw("CHR[%d] %s\n", ++step, key_name((wchar_t) widechar)); ++ unget_wch((wchar_t) widechar); ++ rc = get_wch(&widechar); ++ printw("%s[%d] %s\n", ++ ((rc == KEY_CODE_YES) ++ ? "???" ++ : "..."), ++ step, key_name((wchar_t) widechar)); ++ } ++ } ++ ++ endwin(); ++ ++ ExitProgram(EXIT_SUCCESS); ++} ++ ++#else ++int ++main(void) ++{ ++ printf("This program requires the wide-ncurses library\n"); ++ ExitProgram(EXIT_FAILURE); ++} ++#endif |