diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2024-06-20 08:11:38 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2024-06-20 08:11:38 +0000 |
| commit | 24fa7a5107c5b75d1c197accf0305be64bc72882 (patch) | |
| tree | 183f09c93417ac0e5f7f49760329a3d2cfaacda9 /test | |
| parent | bf0ab54638a5ef969749f6ceae30e864f9556ea8 (diff) | |
Diffstat (limited to 'test')
120 files changed, 8604 insertions, 4069 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index ebc6510ef9de..1d546285a98b 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.125 2020/07/18 18:47:54 tom Exp $ +# $Id: Makefile.in,v 1.130 2021/12/18 23:00:28 tom Exp $ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2021 Thomas E. Dickey # # Copyright 1998-2017,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -44,6 +44,8 @@ destdir = x = @EXEEXT@ o = .@OBJEXT@ +PACKAGE = @PACKAGE@ + MODEL = ../@DFT_OBJ_SUBDIR@ top_srcdir = @top_srcdir@ srcdir = @srcdir@ @@ -52,18 +54,19 @@ exec_prefix = @exec_prefix@ datarootdir = @datarootdir@ bindir = @bindir@ +libexecdir = @libexecdir@ libdir = @libdir@ -includedir = @includedir@ -includesubdir = @includesubdir@ datarootdir = @datarootdir@ datadir = @datadir@ +real_bindir = $(libexecdir)/$(PACKAGE) + BINDIR = $(DESTDIR)$(bindir) +LIBEXECDIR = $(DESTDIR)$(libexecdir) LIBDIR = $(DESTDIR)$(libdir) -INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir) DATADIR = $(DESTDIR)$(datadir) -PACKAGE = @PACKAGE@ +REAL_BINDIR = $(LIBEXECDIR)/$(PACKAGE) LIBTOOL = @LIBTOOL@ LIBTOOL_OPTS = @LIBTOOL_OPTS@ @@ -118,19 +121,22 @@ LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@ TEST_ARGS = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ # use these for linking with all of the libraries -LIBS_DEFAULT = $(TEST_ARGS) @LIBS@ $(TEST_LIBS) $(MATH_LIB) +LIBS_DEFAULT = $(TEST_ARGS) @LIBS@ $(TEST_LIBS) LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_DEFAULT) # use these for linking with the (n)curses library and possibly pthreads -LIBS_THREADS = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-l@FORM_NAME@.*-l@PANEL_NAME@[^ ]*//'` $(TEST_LIBS) $(MATH_LIB) @PTHREAD@ +LIBS_THREADS = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-l@FORM_NAME@.*-l@PANEL_NAME@[^ ]*//'` $(TEST_LIBS) @PTHREAD@ LDFLAGS_THREADS = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_THREADS) # use these for linking with the (n)curses library -LIBS_CURSES = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-l@FORM_NAME@.*-l@PANEL_NAME@[^ ]*//'` $(TEST_LIBS) $(MATH_LIB) +LIBS_CURSES = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-l@FORM_NAME@.*-l@PANEL_NAME@[^ ]*//'` $(TEST_LIBS) LDFLAGS_CURSES = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES) +# use these when we need the math library +LDFLAGS_CURSES_M= $(LDFLAGS_CURSES) $(MATH_LIB) + # use these for linking with the tinfo library if we have it, or curses library if not -LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) $(MATH_LIB) +LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) LDFLAGS_TINFO = @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO) LINT = @LINT@ @@ -150,4 +156,22 @@ HEADER_DEPS = \ $(incdir)/unctrl.h \ $(INCDIR)/nc_alloc.h +################################################################################ + +@MAKE_PHONY@.PHONY : all +@MAKE_PHONY@.PHONY : check + +all:: + +# Verify that each header-file can be compiled without including another. +check:: + @$(SHELL) -c "for header in *.h;\ + do \ + echo \"** testing \$${header}\" ; \ + echo \"#include <\$${header}>\" >headers.c; \ + echo \"int main(void) { return 0; }\" >>headers.c; \ + $(CC) -c $(CFLAGS) $(CPPFLAGS) headers.c; \ + done" + -@rm -f headers.* + # The rest is generated from the "programs" and "modules" files... diff --git a/test/README b/test/README index 5dc07c657bfd..885349dd08f2 100644 --- a/test/README +++ b/test/README @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2018-2020,2021 Thomas E. Dickey -- +-- Copyright 2018-2023,2024 Thomas E. Dickey -- -- Copyright 1998-2017,2018 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: README,v 1.72 2021/02/13 22:53:41 tom Exp $ +-- $Id: README,v 1.82 2024/04/27 18:35:01 tom Exp $ ------------------------------------------------------------------------------- The programs in this directory are used to test and demonstrate ncurses. @@ -86,12 +86,12 @@ TYPE_REGEXP test: demo_forms current_field test: demo_forms dup_field edit_field move_field ncurses data_ahead test: demo_forms data_behind test: demo_forms -dup_field - +dup_field test: dup_field dynamic_field_info test: demo_forms field_arg test: demo_forms field_back test: demo_forms edit_field field_buffer test: cardfile demo_forms ncurses -field_count test: demo_forms move_field +field_count test: demo_forms dup_field move_field field_fore test: demo_forms field_index test: demo_forms field_info test: edit_field ncurses @@ -107,7 +107,7 @@ field_type test: demo_forms field_userptr test: dup_field edit_field move_field ncurses form_driver test: cardfile demo_forms dup_field edit_field move_field ncurses form_driver_w test: form_driver_w -form_fields test: cardfile demo_forms move_field +form_fields test: cardfile demo_forms dup_field move_field form_init - form_opts - form_opts_off - @@ -147,7 +147,7 @@ set_field_type test: demo_forms dup_field move_field ncurses set_field_userptr test: edit_field ncurses set_fieldtype_arg - set_fieldtype_choice - -set_form_fields test: move_field +set_form_fields test: dup_field move_field set_form_init - set_form_opts - set_form_page - @@ -163,7 +163,7 @@ unpost_form test: cardfile demo_forms dup_field form_driver_w move_field ncurs libmenu: ------- current_item test: demo_menus ncurses -free_item test: ncurses +free_item test: demo_menus ncurses free_menu test: demo_menus ncurses item_count test: demo_menus item_description - @@ -234,16 +234,16 @@ BC test: demo_termcap COLORS test: color_content demo_new_pair dots_curses dots_xcurses echochar ncurses pair_content picsmap savescreen xmas COLOR_PAIR test: background blue bs cardfile clip_printw demo_forms demo_menus demo_panels dots_curses 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_delwin 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_delwin 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 @@ addchstr test: test_addchstr 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 @@ -277,17 +277,17 @@ boolfnames test: demo_terminfo test_arrays progs: dump_entry boolnames test: 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 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_delwin 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_delwin test_get_wstr test_getstr test_instr test_inwstr test_mouse 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 clearok test: bs knight clrtobot test: demo_menus move_field ncurses view -clrtoeol test: blue bs demo_altkeys filter foldkeys form_driver_w hanoi hashtest movewindow ncurses padview view +clrtoeol test: blue bs demo_altkeys filter foldkeys form_driver_w hanoi hashtest movewindow ncurses padview test_mouse view color_content test: color_content ncurses picsmap color_content_sp - color_set test: color_set dots_xcurses extended_color ncurses @@ -296,8 +296,8 @@ cur_term test: demo_termcap demo_terminfo dots dots_mvcur filter list_keys lrt curs_set test: demo_new_pair echochar firework gdc hanoi lrtest ncurses newdemo picsmap rain savescreen tclock testcurs worm xmas curs_set_sp test: sp_tinfo curscr test: demo_panels knight lrtest ncurses popup_msg savescreen tclock -curses_trace test: demo_menus hashtest lrtest ncurses padview redraw test_sgr test_termattrs test_vid_puts test_vidputs testcurs view worm -curses_version test: ncurses progs: clear infocmp tabs tic toe tput tset +curses_trace test: demo_menus hashtest lrtest ncurses padview redraw test_sgr test_termattrs test_vid_puts test_vidputs testcurs view worm progs: infocmp tic toe +curses_version 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 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_delwin test_endwin test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_setupterm test_sgr test_termattrs test_tparm test_unget_wch test_vid_puts test_vidputs testaddch testcurs testscanw view worm xmas progs: clear infocmp tabs tic toe tput tset def_prog_mode test: bs ncurses def_prog_mode_sp test: sp_tinfo def_shell_mode - @@ -310,9 +310,9 @@ delay_output test: newdemo delay_output_sp test: sp_tinfo delch - deleteln test: insdelln -delscreen test: ditto dots_mvcur -delwin test: cardfile chgat clip_printw demo_forms demo_panels dup_field inch_wide inchs ins_wide insdelln inserts move_field ncurses newdemo popup_msg redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view -derwin test: cardfile chgat clip_printw demo_forms demo_menus ditto inch_wide inchs ins_wide insdelln inserts movewindow ncurses test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque +delscreen test: ditto dots_mvcur test_delwin +delwin test: cardfile chgat clip_printw demo_forms demo_panels dup_field inch_wide inchs ins_wide insdelln inserts move_field ncurses newdemo padview popup_msg redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view +derwin test: cardfile chgat clip_printw demo_forms demo_menus ditto inch_wide inchs ins_wide insdelln inserts movewindow ncurses test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin test_get_wstr test_getstr test_instr test_inwstr test_opaque doupdate test: cardfile demo_menus demo_panels ditto ins_wide inserts knight movewindow ncurses padview popup_msg redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr doupdate_sp lib: ncurses dupwin test: popup_msg @@ -320,14 +320,15 @@ echo test: bs hanoi ncurses test_get_wstr test_getstr testcurs testscanw 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_delwin test_endwin test_get_wstr test_getstr test_instr test_inwstr test_mouse 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 - -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 +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 demo_tabs 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_delwin test_endwin test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_setupterm test_termattrs test_unget_wch testaddch testcurs testscanw view worm xmas +exit_terminfo test: demo_termcap demo_terminfo dots dots_mvcur dots_termcap list_keys railroad sp_tinfo test_arrays test_sgr 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 test: demo_new_pair 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,12 +355,12 @@ getbegy test: chgat clip_printw demo_menus demo_panels dump_window insdelln m 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 -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 +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_endwin test_mouse 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_mouse test_opaque testcurs view getmaxx test: chgat clip_printw demo_panels dump_window firstlast inch_wide inchs insdelln movewindow ncurses newdemo popup_msg redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs -getmaxy test: chgat clip_printw demo_forms demo_panels dump_window firstlast inch_wide inchs insdelln movewindow ncurses newdemo popup_msg redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs -getmouse test: bs demo_menus knight movewindow ncurses testcurs +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_mouse test_opaque testcurs +getmouse test: bs demo_menus knight movewindow ncurses test_mouse testcurs getmouse_sp - getn_wstr test: test_get_wstr getnstr test: filter ncurses test_getstr @@ -398,8 +399,8 @@ init_extended_color_sp test: extended_color init_extended_pair test: extended_color ncurses pair_content picsmap init_extended_pair_sp test: extended_color init_pair test: 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_endwin test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_unget_wch testaddch testcurs testscanw view worm xmas innstr test: test_instr innwstr test: test_inwstr ins_nwstr test: ins_wide @@ -414,18 +415,26 @@ instr test: test_instr intrflush test: demo_forms dup_field move_field movewindow intrflush_sp test: sp_tinfo inwstr test: test_inwstr +is_cbreak - +is_cbreak_sp - is_cleared test: test_opaque +is_echo - +is_echo_sp - is_idcok test: test_opaque is_idlok test: test_opaque is_immedok test: test_opaque is_keypad test: ncurses test_opaque is_leaveok test: test_opaque is_linetouched lib: form +is_nl - +is_nl_sp - is_nodelay test: test_opaque is_notimeout test: test_opaque -is_pad - +is_pad test: test_opaque +is_raw - +is_raw_sp - is_scrollok test: ncurses test_opaque -is_subwin - +is_subwin test: test_opaque is_syncok test: test_opaque is_term_resized - is_term_resized_sp - @@ -434,17 +443,18 @@ isendwin - 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_mouse 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 @@ -452,11 +462,11 @@ mcprint - mcprint_sp - meta test: key_names keynames ncurses mouse_trafo lib: form -mouseinterval - +mouseinterval test: test_mouse mouseinterval_sp - -mousemask test: bs demo_forms demo_menus knight movewindow ncurses testcurs +mousemask test: bs demo_forms demo_menus knight movewindow ncurses test_mouse 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 @@ -537,34 +547,34 @@ mvwinsnstr test: inserts mvwinsstr test: inserts testcurs mvwinstr test: test_instr mvwinwstr test: test_inwstr -mvwprintw test: demo_menus demo_panels inch_wide inchs ncurses test_instr test_inwstr testcurs +mvwprintw test: demo_menus demo_panels inch_wide inchs ncurses test_delwin test_instr test_inwstr testcurs mvwscanw test: testcurs mvwvline test: ins_wide inserts movewindow ncurses test_add_wchstr test_addchstr test_addstr test_addwstr mvwvline_set - -napms test: demo_panels ditto dots dots_curses dots_mvcur dots_xcurses echochar extended_color firework firstlast gdc hanoi lrtest ncurses padview picsmap railroad rain tclock test_opaque testcurs view worm xmas progs: tset +napms test: demo_panels ditto dots dots_curses dots_mvcur dots_termcap dots_xcurses echochar extended_color firework firstlast gdc hanoi lrtest ncurses padview picsmap railroad rain tclock test_opaque testcurs view worm xmas progs: tset napms_sp test: sp_tinfo new_prescr test: sp_tinfo newpad test: ncurses padview popup_msg testcurs newpad_sp lib: ncurses newscr lib: ncurses -newterm test: demo_altkeys demo_new_pair ditto dots_mvcur extended_color filter foldkeys gdc key_names keynames redraw test_setupterm test_termattrs +newterm test: demo_altkeys demo_new_pair ditto dots_mvcur extended_color filter foldkeys gdc key_names keynames redraw test_delwin test_endwin test_mouse test_setupterm test_termattrs newterm_sp - -newwin test: cardfile chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firstlast inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo popup_msg redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas +newwin test: cardfile chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firstlast inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo popup_msg redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas newwin_sp lib: ncurses nl test: demo_forms dup_field move_field ncurses rain testcurs nl_sp lib: ncurses nocbreak test: testcurs nocbreak_sp test: sp_tinfo nodelay test: demo_new_pair ditto extended_color firework gdc lrtest ncurses newdemo padview rain tclock test_opaque view worm xmas -noecho test: 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_delwin test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque test_unget_wch testcurs view worm xmas noecho_sp lib: ncurses nofilter - nofilter_sp - -nonl test: bs demo_forms dup_field hashtest move_field movewindow ncurses padview view worm xmas +nonl test: bs demo_forms dup_field hashtest move_field movewindow ncurses padview test_mouse view worm xmas nonl_sp lib: ncurses noqiflush - noqiflush_sp test: sp_tinfo -noraw test: demo_forms demo_menus dup_field move_field ncurses testcurs +noraw test: demo_forms demo_menus dup_field move_field ncurses test_mouse testcurs noraw_sp test: sp_tinfo notimeout test: ncurses test_opaque numcodes test: demo_termcap test_arrays progs: dump_entry @@ -579,16 +589,16 @@ pecho_wchar - 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 -putp test: filter test_sgr progs: tput +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_delwin test_unget_wch testcurs testscanw view +putp test: filter test_mouse test_sgr progs: tput putp_sp test: sp_tinfo putwin test: ncurses qiflush - qiflush_sp test: sp_tinfo -raw test: demo_forms dup_field move_field ncurses redraw testcurs +raw test: demo_forms dup_field move_field ncurses redraw test_mouse testcurs raw_sp test: sp_tinfo -redrawwin test: padview redraw view -refresh test: blue bs color_content demo_defkey demo_forms demo_keyok demo_menus demo_panels 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 +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 test_delwin test_endwin test_mouse testcurs view xmas reset_color_pairs test: picsmap reset_color_pairs_sp - reset_prog_mode test: filter ncurses @@ -608,7 +618,7 @@ ripoffline_sp - 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 +627,7 @@ scr_set test: savescreen 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_delwin 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 +635,7 @@ set_escdelay_sp lib: ncurses 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,7 +673,7 @@ standend test: blue gdc ncurses 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_delwin test_get_wstr test_getstr test_instr test_inwstr test_mouse 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 @@ -684,29 +694,31 @@ tgetnum test: demo_termcap dots_termcap railroad tgetnum_sp test: sp_tinfo tgetstr test: demo_termcap dots_termcap railroad tgetstr_sp test: sp_tinfo -tgoto test: dots_termcap railroad progs: tic +tgoto test: dots_termcap railroad test_mouse progs: tic tigetflag test: demo_terminfo savescreen progs: tic tput tigetflag_sp test: sp_tinfo tigetnum test: demo_tabs demo_terminfo dots dots_mvcur ncurses savescreen progs: tput tigetnum_sp test: sp_tinfo -tigetstr test: blue demo_defkey demo_new_pair demo_terminfo foldkeys list_keys savescreen test_sgr test_tparm testcurs progs: clear_cmd tic tput +tigetstr test: blue demo_defkey demo_new_pair demo_terminfo foldkeys list_keys savescreen test_mouse test_sgr test_tparm testcurs progs: clear_cmd tic tput tigetstr_sp test: sp_tinfo timeout test: filter rain savescreen -tiparm - +tiparm test: test_tparm +tiparm_s test: test_tparm +tiscan_s test: test_tparm touchline test: chgat clip_printw insdelln -touchwin test: chgat clip_printw demo_menus filter firstlast inch_wide inchs ins_wide insdelln inserts movewindow ncurses popup_msg redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas +touchwin test: chgat clip_printw demo_menus filter firstlast inch_wide inchs ins_wide insdelln inserts movewindow ncurses popup_msg redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas tparm test: dots dots_mvcur test_sgr test_tparm progs: tic tput -tputs test: dots dots_mvcur dots_termcap railroad test_vid_puts test_vidputs progs: clear_cmd reset_cmd tabs +tputs test: dots dots_mvcur dots_termcap railroad test_tparm test_vid_puts test_vidputs progs: clear_cmd reset_cmd tabs tputs_sp test: sp_tinfo trace - ttytype test: demo_terminfo test_sgr typeahead test: testcurs typeahead_sp test: sp_tinfo -unctrl test: ncurses redraw test_add_wchstr test_addchstr testcurs +unctrl test: ncurses redraw test_add_wchstr test_addchstr test_mouse 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 - @@ -732,7 +744,7 @@ vidputs test: test_vidputs vidputs_sp - vline test: gdc ncurses vline_set - -vw_printw test: clip_printw movewindow +vw_printw test: clip_printw movewindow test_mouse vw_scanw - vwprintw - vwscanw - @@ -750,8 +762,8 @@ wattr_get test: ncurses wattr_off lib: ncurses wattr_on lib: ncurses wattr_set test: ncurses -wattroff test: demo_forms ncurses testcurs xmas -wattron test: testcurs xmas +wattroff test: clip_printw demo_forms ncurses testcurs xmas +wattron test: clip_printw testcurs xmas wattrset test: clip_printw demo_forms insdelln ncurses newdemo padview test_get_wstr test_getstr testcurs xmas wbkgd test: cardfile demo_forms demo_menus ncurses newdemo padview testcurs wbkgdset test: demo_panels ins_wide inserts ncurses test_add_wchstr test_addchstr test_addstr test_addwstr @@ -761,7 +773,7 @@ wborder test: ncurses wborder_set test: ncurses wchgat test: chgat test_get_wstr test_getstr view wclear test: ncurses test_opaque testcurs -wclrtobot test: firstlast inch_wide inchs ncurses test_instr test_inwstr testcurs +wclrtobot test: firstlast inch_wide inchs ncurses test_delwin test_instr test_inwstr testcurs wclrtoeol test: chgat clip_printw demo_defkey demo_keyok demo_menus demo_panels firstlast inch_wide inchs ins_wide insdelln inserts knight ncurses test_add_wchstr test_addchstr test_addstr test_addwstr test_instr test_inwstr testcurs wcolor_set lib: ncurses wcursyncup lib: form @@ -774,8 +786,8 @@ werase test: cardfile demo_forms demo_menus demo_panels dup_field firstlast k wget_wch test: ins_wide ncurses test_add_wchstr test_addwstr wget_wstr test: test_get_wstr wgetbkgrnd lib: ncurses -wgetch test: cardfile chgat clip_printw demo_defkey demo_keyok demo_menus demo_panels ditto dump_window dup_field edit_field gdc insdelln inserts knight move_field movewindow ncurses newdemo popup_msg rain redraw test_addchstr test_addstr test_opaque testcurs worm -wgetdelay - +wgetch test: cardfile chgat clip_printw demo_defkey demo_keyok demo_menus demo_panels ditto dump_window dup_field edit_field gdc insdelln inserts knight move_field movewindow ncurses newdemo popup_msg rain redraw test_addchstr test_addstr test_delwin test_opaque testcurs worm +wgetdelay test: test_opaque wgetn_wstr test: ncurses test_get_wstr wgetnstr test: ncurses test_getstr wgetparent test: test_opaque @@ -802,15 +814,15 @@ winsstr test: inserts winstr test: test_instr winwstr test: test_inwstr wmouse_trafo test: ncurses -wmove test: chgat clip_printw demo_altkeys demo_defkey demo_keyok demo_menus demo_panels dump_window extended_color firstlast foldkeys inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo padview picsmap redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm +wmove test: chgat clip_printw demo_altkeys demo_defkey demo_keyok demo_menus demo_panels dump_window extended_color firstlast foldkeys inch_wide inchs ins_wide insdelln inserts knight movewindow ncurses newdemo padview picsmap redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque testcurs view worm wnoutrefresh test: demo_menus ditto inch_wide inchs ins_wide inserts knight movewindow ncurses padview popup_msg redraw test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque -wprintw test: chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels inch_wide inchs ins_wide insdelln inserts knight ncurses test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs +wprintw test: chgat clip_printw demo_defkey demo_forms demo_keyok demo_menus demo_panels inch_wide inchs ins_wide insdelln inserts knight ncurses test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_mouse test_opaque testcurs wredrawln test: redraw -wrefresh test: chgat clip_printw demo_forms demo_keyok demo_menus demo_panels dup_field firstlast ins_wide insdelln inserts knight lrtest move_field movewindow ncurses newdemo popup_msg redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr testcurs worm xmas +wrefresh test: chgat clip_printw demo_forms demo_keyok demo_menus demo_panels dup_field firstlast ins_wide insdelln inserts knight lrtest move_field movewindow ncurses newdemo popup_msg redraw savescreen tclock test_add_wchstr test_addchstr test_addstr test_addwstr test_delwin testcurs worm xmas wresize test: cardfile demo_menus ncurses wscanw test: testcurs wscrl test: ncurses testcurs -wsetscrreg test: ncurses testcurs +wsetscrreg test: ncurses test_delwin testcurs wstandend test: ncurses test_opaque xmas wstandout test: ncurses test_opaque xmas wsyncdown test: movewindow diff --git a/test/aclocal.m4 b/test/aclocal.m4 index 6c9727cd4983..fdab359ae5f1 100644 --- a/test/aclocal.m4 +++ b/test/aclocal.m4 @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2020,2021 Thomas E. Dickey * +dnl Copyright 2018-2023,2024 Thomas E. Dickey * dnl Copyright 2003-2017,2018 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written * dnl authorization. * dnl*************************************************************************** dnl -dnl $Id: aclocal.m4,v 1.190 2021/01/06 01:21:11 tom Exp $ +dnl $Id: aclocal.m4,v 1.221 2024/01/19 18:27:20 tom Exp $ dnl dnl Author: Thomas E. Dickey dnl @@ -43,7 +43,7 @@ dnl https://invisible-island.net/autoconf/my-autoconf.html dnl dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- -dnl AM_LANGINFO_CODESET version: 6 updated: 2021/01/01 16:53:59 +dnl AM_LANGINFO_CODESET version: 7 updated: 2023/01/11 04:05:23 dnl ------------------- dnl Inserted as requested by gettext 0.10.40 dnl File from /usr/share/aclocal @@ -55,7 +55,9 @@ dnl From Bruno Haible. AC_DEFUN([AM_LANGINFO_CODESET], [ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, - [AC_TRY_LINK([#include <langinfo.h>], + [AC_TRY_LINK([ +$ac_includes_default +#include <langinfo.h>], [char* cs = nl_langinfo(CODESET); (void)cs], am_cv_langinfo_codeset=yes, am_cv_langinfo_codeset=no) @@ -181,9 +183,9 @@ AC_SUBST(EXTRA_CPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_INCDIR version: 16 updated: 2020/12/31 20:19:42 +dnl CF_ADD_INCDIR version: 17 updated: 2021/09/04 06:35:04 dnl ------------- -dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it's +dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it is dnl redundant. We don't normally need to add -I/usr/local/include for gcc, dnl but old versions (and some misinstalled ones) need that. To make things dnl worse, gcc 3.x may give error messages if -I/usr/local/include is added to @@ -345,6 +347,25 @@ ifelse([$5],NONE,,[{ test -z "$5" || test "x$5" = xNONE || test "x$4" != "x$5"; } ])dnl dnl --------------------------------------------------------------------------- +dnl CF_APPEND_CFLAGS version: 3 updated: 2021/09/05 17:25:40 +dnl ---------------- +dnl Use CF_ADD_CFLAGS after first checking for potential redefinitions. +dnl $1 = flags to add +dnl $2 = if given makes this macro verbose. +define([CF_APPEND_CFLAGS], +[ +for cf_add_cflags in $1 +do + case "x$cf_add_cflags" in + (x-[[DU]]*) + CF_REMOVE_CFLAGS($cf_add_cflags,CFLAGS,[$2]) + CF_REMOVE_CFLAGS($cf_add_cflags,CPPFLAGS,[$2]) + ;; + esac + CF_ADD_CFLAGS([$cf_add_cflags],[$2]) +done +])dnl +dnl --------------------------------------------------------------------------- dnl CF_APPEND_TEXT version: 1 updated: 2017/02/25 18:58:55 dnl -------------- dnl use this macro for appending text without introducing an extra blank at @@ -390,7 +411,45 @@ ifelse([$3],,[ :]dnl ])dnl ])])dnl dnl --------------------------------------------------------------------------- -dnl CF_CC_ENV_FLAGS version: 10 updated: 2020/12/31 18:40:20 +dnl CF_C11_NORETURN version: 4 updated: 2023/02/18 17:41:25 +dnl --------------- +AC_DEFUN([CF_C11_NORETURN], +[ +AC_MSG_CHECKING(if you want to use C11 _Noreturn feature) +CF_ARG_ENABLE(stdnoreturn, + [ --enable-stdnoreturn enable C11 _Noreturn feature for diagnostics], + [enable_stdnoreturn=yes], + [enable_stdnoreturn=no]) +AC_MSG_RESULT($enable_stdnoreturn) + +if test $enable_stdnoreturn = yes; then +AC_CACHE_CHECK([for C11 _Noreturn feature], cf_cv_c11_noreturn, + [AC_TRY_COMPILE([ +$ac_includes_default +#include <stdnoreturn.h> +static _Noreturn void giveup(void) { exit(0); } + ], + [if (feof(stdin)) giveup()], + cf_cv_c11_noreturn=yes, + cf_cv_c11_noreturn=no) + ]) +else + cf_cv_c11_noreturn=no, +fi + +if test "$cf_cv_c11_noreturn" = yes; then + AC_DEFINE(HAVE_STDNORETURN_H, 1,[Define if <stdnoreturn.h> header is available and working]) + AC_DEFINE_UNQUOTED(STDC_NORETURN,_Noreturn,[Define if C11 _Noreturn keyword is supported]) + HAVE_STDNORETURN_H=1 +else + HAVE_STDNORETURN_H=0 +fi + +AC_SUBST(HAVE_STDNORETURN_H) +AC_SUBST(STDC_NORETURN) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_CC_ENV_FLAGS version: 11 updated: 2023/02/20 11:15:46 dnl --------------- dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content dnl into CC. This will not help with broken scripts that wrap the compiler @@ -431,7 +490,7 @@ case "$CC" in AC_MSG_WARN(your environment uses the CC variable to hold CFLAGS/CPPFLAGS options) # humor him... cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'` - cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", [substr]([$]0,1+length(prog))); }'` + cf_flags=`echo "$CC" | sed -e "s%^$cf_prog%%"` CC="$cf_prog" for cf_arg in $cf_flags do @@ -511,7 +570,7 @@ AC_TRY_LINK([#include <stdio.h>],[printf("Hello world");],, fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_CURSES_LIB version: 3 updated: 2021/01/04 19:45:09 +dnl CF_CHECK_CURSES_LIB version: 4 updated: 2021/09/05 17:25:40 dnl ------------------- dnl $1 = nominal library name, used also for header lookup dnl $2 = suffix to append to library name @@ -533,10 +592,11 @@ elif test "x${PKG_CONFIG:=none}" != xnone; then AC_MSG_CHECKING(if the $1$2 package files work) + cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" - CF_ADD_CFLAGS(`$PKG_CONFIG --cflags "$1$2"`) + CF_APPEND_CFLAGS(`$PKG_CONFIG --cflags "$1$2"`) CF_ADD_LIBS(`$PKG_CONFIG --libs "$1$2"`) AC_TRY_LINK([#include <$1.h>], @@ -550,13 +610,14 @@ elif test "x${PKG_CONFIG:=none}" != xnone; then [cf_have_curses_lib=no]) AC_MSG_RESULT($cf_have_curses_lib) test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes - if test "$cf_have_curses_lib" != "yes" + if test "$cf_have_curses_lib" = "yes" then - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - else CF_UPPER(cf_upper,have_lib$1) AC_DEFINE_UNQUOTED($cf_upper,1) + else + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" fi fi fi @@ -568,7 +629,7 @@ if test "$cf_have_curses_lib" = no; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CLANG_COMPILER version: 8 updated: 2021/01/01 13:31:04 +dnl CF_CLANG_COMPILER version: 9 updated: 2023/02/18 17:41:25 dnl ----------------- dnl Check if the given compiler is really clang. clang's C driver defines dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does @@ -590,7 +651,7 @@ if test "$ifelse([$1],,[$1],GCC)" = yes ; then AC_TRY_COMPILE([],[ #ifdef __clang__ #else -make an error +#error __clang__ is not defined #endif ],[ifelse([$2],,CLANG_COMPILER,[$2])=yes ],[]) @@ -636,7 +697,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_CONST_X_STRING version: 6 updated: 2021/01/01 13:31:04 +dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50 dnl ----------------- dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most dnl character-strings. @@ -666,11 +727,12 @@ AC_TRY_COMPILE( #include <stdlib.h> #include <X11/Intrinsic.h> ], -[String foo = malloc(1); (void)foo],[ +[String foo = malloc(1); free((void*)foo)],[ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[ AC_TRY_COMPILE( [ +#undef _CONST_X_STRING #define _CONST_X_STRING /* X11R7.8 (perhaps) */ #undef XTSTRINGDEFINES /* X11R5 and later */ #include <stdlib.h> @@ -879,7 +941,7 @@ if (foo + 1234L > 5678L) done ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_HEADER version: 5 updated: 2015/04/23 20:35:30 +dnl CF_CURSES_HEADER version: 6 updated: 2022/12/02 20:06:52 dnl ---------------- dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common dnl variations of ncurses' installs. @@ -893,7 +955,7 @@ for cf_header in \ curses.h ifelse($1,,,[$1/curses.h]) ifelse($1,,[ncurses/ncurses.h ncurses/curses.h]) do AC_TRY_COMPILE([#include <${cf_header}>], - [initscr(); tgoto("?", 0,0)], + [initscr(); endwin()], [cf_cv_ncurses_header=$cf_header; break],[]) done ]) @@ -906,7 +968,7 @@ fi AC_CHECK_HEADERS($cf_cv_ncurses_header) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_LIBS version: 44 updated: 2021/01/02 09:31:20 +dnl CF_CURSES_LIBS version: 45 updated: 2022/12/02 20:06:52 dnl -------------- dnl Look for the curses libraries. Older curses implementations may require dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. @@ -915,7 +977,7 @@ AC_DEFUN([CF_CURSES_LIBS],[ AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl AC_MSG_CHECKING(if we have identified curses libraries) AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr(); tgoto("?", 0,0)], + [initscr(); endwin()], cf_result=yes, cf_result=no) AC_MSG_RESULT($cf_result) @@ -1016,7 +1078,7 @@ if test ".$ac_cv_func_initscr" != .yes ; then elif test "$cf_term_lib" != predefined ; then AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries) AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr(); tgoto((char *)0, 0, 0);], + [initscr(); endwin();], [cf_result=no], [ LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" @@ -1036,7 +1098,7 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_TERM_H version: 15 updated: 2021/01/02 09:31:20 +dnl CF_CURSES_TERM_H version: 16 updated: 2024/01/07 06:34:16 dnl ---------------- dnl SVr4 curses should have term.h as well (where it puts the definitions of dnl the low-level interface). This may not be true in old/broken implementations, @@ -1082,7 +1144,7 @@ case "$cf_cv_term_header" in #ifdef NCURSES_VERSION #include <${cf_header}> #else -make an error +#error expected NCURSES_VERSION to be defined #endif], [WINDOW *x; (void)x], [cf_cv_term_header=$cf_header @@ -1223,9 +1285,9 @@ dnl ---------- dnl "dirname" is not portable, so we fake it with a shell script. AC_DEFUN([CF_DIRNAME],[$1=`echo "$2" | sed -e 's%/[[^/]]*$%%'`])dnl dnl --------------------------------------------------------------------------- -dnl CF_DISABLE_ECHO version: 13 updated: 2015/04/18 08:56:57 +dnl CF_DISABLE_ECHO version: 14 updated: 2021/09/04 06:35:04 dnl --------------- -dnl You can always use "make -n" to see the actual options, but it's hard to +dnl You can always use "make -n" to see the actual options, but it is hard to dnl pick out/analyze warning messages when the compile-line is long. dnl dnl Sets: @@ -1260,7 +1322,7 @@ AC_SUBST(SHOW_CC) AC_SUBST(ECHO_CC) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_DISABLE_LEAKS version: 8 updated: 2021/01/05 20:05:09 +dnl CF_DISABLE_LEAKS version: 9 updated: 2021/04/03 16:41:50 dnl ---------------- dnl Combine no-leak checks with the libraries or tools that are used for the dnl checks. @@ -1273,9 +1335,9 @@ AC_REQUIRE([CF_WITH_VALGRIND]) AC_MSG_CHECKING(if you want to perform memory-leak testing) AC_ARG_ENABLE(leaks, [ --disable-leaks test: free permanent memory, analyze leaks], - [enable_leaks=no], + [enable_leaks=$enableval], [enable_leaks=yes]) -dnl TODO - drop with_no_leaks +dnl with_no_leaks is more readable... if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi AC_MSG_RESULT($with_no_leaks) @@ -1558,7 +1620,7 @@ ifelse([$5],,AC_MSG_WARN(Cannot find $3 library),[$5]) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FIX_WARNINGS version: 3 updated: 2020/12/31 18:40:20 +dnl CF_FIX_WARNINGS version: 4 updated: 2021/12/16 18:22:31 dnl --------------- dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc. Any of gcc's dnl "-Werror" flags can interfere with configure-checks. Those go into @@ -1570,11 +1632,13 @@ if test "$GCC" = yes || test "$GXX" = yes then case [$]$1 in (*-Werror=*) - CF_VERBOSE(repairing $1: [$]$1) cf_temp_flags= for cf_temp_scan in [$]$1 do case "x$cf_temp_scan" in + (x-Werror=format*) + CF_APPEND_TEXT(cf_temp_flags,$cf_temp_scan) + ;; (x-Werror=*) CF_APPEND_TEXT(EXTRA_CFLAGS,$cf_temp_scan) ;; @@ -1583,16 +1647,20 @@ then ;; esac done - $1="$cf_temp_flags" - CF_VERBOSE(... fixed [$]$1) - CF_VERBOSE(... extra $EXTRA_CFLAGS) + if test "x[$]$1" != "x$cf_temp_flags" + then + CF_VERBOSE(repairing $1: [$]$1) + $1="$cf_temp_flags" + CF_VERBOSE(... fixed [$]$1) + CF_VERBOSE(... extra $EXTRA_CFLAGS) + fi ;; esac fi AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_CURSES_VERSION version: 8 updated: 2021/01/02 09:31:20 +dnl CF_FUNC_CURSES_VERSION version: 9 updated: 2023/01/05 18:06:10 dnl ---------------------- dnl Solaris has a data item 'curses_version', which confuses AC_CHECK_FUNCS. dnl It's a character string "SVR4", not documented. @@ -1600,11 +1668,14 @@ AC_DEFUN([CF_FUNC_CURSES_VERSION], [ AC_CACHE_CHECK(for function curses_version, cf_cv_func_curses_version,[ AC_TRY_RUN([ +$ac_includes_default + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) { char temp[1024]; - sprintf(temp, "%s\\n", curses_version()); + sprintf(temp, "%.999s\\n", curses_version()); ${cf_cv_main_return:-return}(0); }] ,[cf_cv_func_curses_version=yes] @@ -1614,7 +1685,34 @@ rm -f core]) test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 if we have curses_version function]) ]) dnl --------------------------------------------------------------------------- -dnl CF_FUNC_OPENPTY version: 6 updated: 2021/01/01 13:31:04 +dnl CF_FUNC_GETTIME version: 2 updated: 2023/02/25 08:45:56 +dnl --------------- +dnl Check for gettimeofday or clock_gettime. In 2023, the former is still more +dnl widely supported, but "deprecated" (2008), so we will use the latter if it +dnl is available, to reduce compiler warnings. +AC_DEFUN([CF_FUNC_GETTIME],[ +AC_CACHE_CHECK(for clock_gettime,cf_cv_func_clock_gettime,[ + AC_TRY_LINK([#include <time.h>], + [struct timespec ts; + int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts], + [cf_cv_func_clock_gettime=yes], + [cf_cv_func_clock_gettime=no]) +]) + +if test "$cf_cv_func_clock_gettime" = yes +then + AC_DEFINE(HAVE_CLOCK_GETTIME,1,[Define to 1 if we have clock_gettime function]) +else +AC_CHECK_FUNC(gettimeofday, + AC_DEFINE(HAVE_GETTIMEOFDAY,1,[Define to 1 if we have gettimeofday function]),[ + +AC_CHECK_LIB(bsd, gettimeofday, + AC_DEFINE(HAVE_GETTIMEOFDAY,1,[Define to 1 if we have gettimeofday function]) + CF_ADD_LIB(bsd))])dnl CLIX: bzero, select, gettimeofday +fi +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_FUNC_OPENPTY version: 7 updated: 2023/12/03 09:21:34 dnl --------------- dnl Check for openpty() function, along with <pty.h> header. It may need the dnl "util" library as well. @@ -1631,6 +1729,7 @@ AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[ ],[ int x = openpty((int *)0, (int *)0, (char *)0, (struct termios *)0, (struct winsize *)0); + (void)x; ],[ cf_cv_func_openpty=$cf_header break @@ -1642,13 +1741,14 @@ AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[ ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_ATTRIBUTES version: 23 updated: 2021/01/03 18:30:50 +dnl CF_GCC_ATTRIBUTES version: 24 updated: 2021/03/20 12:00:25 dnl ----------------- dnl Test for availability of useful gcc __attribute__ directives to quiet dnl compiler warnings. Though useful, not all are supported -- and contrary dnl to documentation, unrecognized directives cause older compilers to barf. AC_DEFUN([CF_GCC_ATTRIBUTES], [AC_REQUIRE([AC_PROG_FGREP])dnl +AC_REQUIRE([CF_C11_NORETURN])dnl if test "$GCC" = yes || test "$GXX" = yes then @@ -1671,6 +1771,7 @@ then AC_CHECKING([for $CC __attribute__ directives]) cat > "conftest.$ac_ext" <<EOF #line __oline__ "${as_me:-configure}" +#include <stdio.h> #include "confdefs.h" #include "conftest.h" #include "conftest.i" @@ -1685,8 +1786,8 @@ cat > "conftest.$ac_ext" <<EOF #define GCC_SCANFLIKE(fmt,var) /*nothing*/ #endif extern void wow(char *,...) GCC_SCANFLIKE(1,2); -extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN; -extern void foo(void) GCC_NORETURN; +extern GCC_NORETURN void oops(char *,...) GCC_PRINTFLIKE(1,2); +extern GCC_NORETURN void foo(void); int main(int argc GCC_UNUSED, char *argv[[]] GCC_UNUSED) { (void)argc; (void)argv; return 0; } EOF cf_printf_attribute=no @@ -1753,7 +1854,7 @@ rm -rf ./conftest* fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_VERSION version: 8 updated: 2019/09/07 13:38:36 +dnl CF_GCC_VERSION version: 9 updated: 2023/03/05 14:30:13 dnl -------------- dnl Find version of gcc, and (because icc/clang pretend to be gcc without being dnl compatible), attempt to determine if icc/clang is actually used. @@ -1762,7 +1863,7 @@ AC_REQUIRE([AC_PROG_CC]) GCC_VERSION=none if test "$GCC" = yes ; then AC_MSG_CHECKING(version of $CC) - GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[[^)]]*) //' -e 's/^.*(Debian[[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[[^(]]*([[^)]][[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown AC_MSG_RESULT($GCC_VERSION) fi @@ -1884,7 +1985,7 @@ rm -rf ./conftest* AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GETOPT_HEADER version: 7 updated: 2021/01/01 13:31:04 +dnl CF_GETOPT_HEADER version: 8 updated: 2021/06/19 19:16:16 dnl ---------------- dnl Check for getopt's variables which are commonly defined in stdlib.h, dnl unistd.h or (nonstandard) in getopt.h @@ -1897,7 +1998,7 @@ for cf_header in stdio.h stdlib.h unistd.h getopt.h do AC_TRY_COMPILE([ #include <$cf_header>], -[int x = optind; char *y = optarg], +[int x = optind; char *y = optarg; (void)x; (void)y], [cf_cv_getopt_header=$cf_header break]) done @@ -2083,7 +2184,7 @@ AC_DEFUN([CF_INHERIT_SCRIPT], test -f $1 || ( test -f ../$1 && cp ../$1 ./ ) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INSTALL_OPTS version: 2 updated: 2018/08/18 12:19:21 +dnl CF_INSTALL_OPTS version: 3 updated: 2023/06/03 15:17:30 dnl --------------- dnl prompt for/fill-in useful install-program options AC_DEFUN([CF_INSTALL_OPTS], @@ -2091,6 +2192,7 @@ AC_DEFUN([CF_INSTALL_OPTS], CF_INSTALL_OPT_S CF_INSTALL_OPT_P CF_INSTALL_OPT_O +CF_INSTALL_OPT_STRIP_PROG ])dnl dnl --------------------------------------------------------------------------- dnl CF_INSTALL_OPT_O version: 3 updated: 2020/12/31 20:19:42 @@ -2177,7 +2279,73 @@ fi AC_SUBST(INSTALL_OPT_S) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INTEL_COMPILER version: 8 updated: 2021/01/01 16:53:59 +dnl CF_INSTALL_OPT_STRIP_PROG version: 1 updated: 2023/06/03 15:17:30 +dnl ------------------------- +dnl Provide an option for overriding the strip program used in install "-s" +dnl +dnl coreutils install provides a --strip-program option +dnl FreeBSD uses STRIPBIN environment variable, while NetBSD and OpenBSD use +dnl STRIP environment variable. Other versions of install do not support this. +AC_DEFUN([CF_INSTALL_OPT_STRIP_PROG], +[ +AC_REQUIRE([CF_INSTALL_OPT_S]) +if test -n "$INSTALL_OPT_S" +then + AC_MSG_CHECKING(if you want to specify strip-program) + AC_ARG_WITH(strip-program, + [ --with-strip-program=XX specify program to use when stripping in install], + [with_strip_program=$withval], + [with_strip_program=no]) + AC_MSG_RESULT($with_strip_program) + if test "$with_strip_program" != no + then + AC_MSG_CHECKING(if strip-program is supported with this installer) + cf_install_program=`echo "$INSTALL" | sed -e 's%[[ ]]*[[ ]]-.%%'` + check_install_strip=no + if test -f "$cf_install_program" + then + check_install_version=`"$cf_install_program" --version 2>/dev/null | head -n 1 | grep coreutils` + if test -n "$check_install_version" + then + check_install_strip="option" + else + for check_strip_variable in STRIPBIN STRIP + do + if strings "$cf_install_program" | grep "^$check_strip_variable[$]" >/dev/null + then + check_install_strip="environ" + break + fi + done + fi + fi + AC_MSG_RESULT($check_install_strip) + case "$check_install_strip" in + (no) + AC_MSG_WARN($cf_install_program does not support strip program option) + with_strip_program=no + ;; + (environ) + cat >install.tmp <<-CF_EOF + #! $SHELL + STRIPBIN="$with_strip_program" \\ + STRIP="$with_strip_program" \\ + $INSTALL "[$]@" + CF_EOF + INSTALL="`pwd`/install.tmp" + chmod +x "$INSTALL" + CF_VERBOSE(created $INSTALL) + ;; + (option) + INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\"" + ;; + esac + fi +fi +AC_SUBST(INSTALL_OPT_S) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25 dnl ----------------- dnl Check if the given compiler is really the Intel compiler for Linux. It dnl tries to imitate gcc, but does not return an error when it finds a mismatch @@ -2203,7 +2371,7 @@ if test "$ifelse([$1],,[$1],GCC)" = yes ; then AC_TRY_COMPILE([],[ #ifdef __INTEL_COMPILER #else -make an error +#error __INTEL_COMPILER is not defined #endif ],[ifelse([$2],,INTEL_COMPILER,[$2])=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -2301,6 +2469,89 @@ CF_SUBDIR_PATH($1,$2,lib) $1="$cf_library_path_list [$]$1" ])dnl dnl --------------------------------------------------------------------------- +dnl CF_MAKE_PHONY version: 3 updated: 2021/01/08 16:08:21 +dnl ------------- +dnl Check if the make-program handles a ".PHONY" target, e.g,. a target which +dnl acts as a placeholder. +dnl +dnl The ".PHONY" feature was proposed in 2011 here +dnl https://www.austingroupbugs.net/view.php?id=523 +dnl and is scheduled for release in P1003.1 Issue 8 (late 2022). +dnl +dnl This is not supported by SVr4 make (or SunOS 4, 4.3SD, etc), but works with +dnl a few others (i.e., GNU make and the non-POSIX "BSD" make): +dnl +dnl + This is a GNU make feature (since April 1988, but in turn from binutils, +dnl date unspecified). +dnl +dnl + It was adopted in NetBSD make in June 1995. +dnl +dnl + The other BSD make programs are derived from the NetBSD make (and for +dnl that reason are not actually different "implementations"). +dnl +dnl + Some features of NetBSD make were actually adapted from pmake, which +dnl began as a modified GNU make starting in 1993. +dnl +dnl + Version 3.8 of the dmake program in January 1992 also implemented this +dnl GNU make extension, but is less well known than the BSD make. +AC_DEFUN([CF_MAKE_PHONY],[ +AC_CACHE_CHECK(for \".PHONY\" make-support, cf_cv_make_PHONY,[ + rm -rf conftest* + ( + mkdir conftest || exit 1 + cd conftest + cat >makefile <<'CF_EOF' +.PHONY: always +DATA=0 +always: always.out + @echo "** making [$]@ [$](DATA)" +once: once.out + @echo "** making [$]@ [$](DATA)" +always.out: + @echo "** making [$]@ [$](DATA)" + echo [$](DATA) > [$]@ +once.out: + @echo "** making [$]@ [$](DATA)" + echo [$](DATA) > [$]@ +CF_EOF + for cf_data in 1 2 3 + do + ${MAKE:-make} always DATA=$cf_data + ${MAKE:-make} once DATA=$cf_data + ${MAKE:-make} -t always once + if test -f always ; then + echo "no (case 1)" > ../conftest.tmp + elif test ! -f always.out ; then + echo "no (case 2)" > ../conftest.tmp + elif test ! -f once.out ; then + echo "no (case 3)" > ../conftest.tmp + elif ! cmp -s always.out once.out ; then + echo "no (case 4)" > ../conftest.tmp + diff always.out once.out + else + cf_check="`cat always.out`" + if test "x$cf_check" != "x$cf_data" ; then + echo "no (case 5)" > ../conftest.tmp + else + echo yes > ../conftest.tmp + rm -f ./*.out + continue + fi + fi + break + done + ) >&AC_FD_CC 2>&1 + cf_cv_make_PHONY="`cat conftest.tmp`" + rm -rf conftest* +]) +MAKE_NO_PHONY="#" +MAKE_PHONY="#" +test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY= +test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY= +AC_SUBST(MAKE_NO_PHONY) +AC_SUBST(MAKE_PHONY) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_MAKE_TAGS version: 6 updated: 2010/10/23 15:52:32 dnl ------------ dnl Generate tags/TAGS targets for makefiles. Do not generate TAGS if we have @@ -2338,7 +2589,7 @@ AC_SUBST(MAKE_UPPER_TAGS) AC_SUBST(MAKE_LOWER_TAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MATH_LIB version: 10 updated: 2020/12/31 18:40:20 +dnl CF_MATH_LIB version: 11 updated: 2022/07/27 19:01:48 dnl ----------- dnl Checks for libraries. At least one UNIX system, Apple Macintosh dnl Rhapsody 5.5, does not have -lm. We cannot use the simpler @@ -2348,18 +2599,42 @@ AC_DEFUN([CF_MATH_LIB], AC_CACHE_CHECK(if -lm needed for math functions, cf_cv_need_libm,[ AC_TRY_LINK([ - #include <stdio.h> - #include <stdlib.h> - #include <math.h> + #include <stdio.h> + #include <stdlib.h> + #include <math.h> ], [double x = rand(); printf("result = %g\\n", ]ifelse([$2],,sin(x),$2)[)], [cf_cv_need_libm=no], [cf_cv_need_libm=yes])]) + if test "$cf_cv_need_libm" = yes then -ifelse($1,,[ - CF_ADD_LIB(m) -],[$1=-lm]) + + cf_save_LIBS="$LIBS" + LIBS="$LIBS -lm" + AC_CACHE_CHECK(if -lm is available for math functions, + cf_cv_have_libm,[ + AC_TRY_LINK([ + #include <stdio.h> + #include <stdlib.h> + #include <math.h> + ], + [double x = rand(); printf("result = %g\\n", ]ifelse([$2],,sin(x),$2)[)], + [cf_cv_have_libm=yes], + [cf_cv_have_libm=no])]) + LIBS="$cf_save_LIBS" + + if test "$cf_cv_have_libm" = yes + then + ifelse($1,,[CF_ADD_LIB(m)],[$1=-lm]) + fi +else + cf_cv_have_libm=yes +fi + +if test "$cf_cv_have_libm" = yes +then + AC_DEFINE(HAVE_MATH_FUNCS,1,[Define to 1 if math functions are available]) fi ]) dnl --------------------------------------------------------------------------- @@ -2401,7 +2676,7 @@ AC_DEFUN([CF_MSG_LOG],[ echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CC_CHECK version: 5 updated: 2020/12/31 20:19:42 +dnl CF_NCURSES_CC_CHECK version: 6 updated: 2023/02/18 17:47:58 dnl ------------------- dnl Check if we can compile with ncurses' header file dnl $1 is the cache variable to set @@ -2418,7 +2693,7 @@ AC_DEFUN([CF_NCURSES_CC_CHECK],[ #ifdef NCURSES_VERSION ]ifelse($3,ncursesw,[ #ifndef WACS_BSSB - make an error + #error WACS_BSSB is not defined #endif ])[ printf("%s\\n", NCURSES_VERSION); @@ -2426,7 +2701,7 @@ printf("%s\\n", NCURSES_VERSION); #ifdef __NCURSES_H printf("old\\n"); #else - make an error + #error __NCURSES_H is not defined #endif #endif ] @@ -2434,7 +2709,7 @@ printf("old\\n"); ,[$1=no]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CONFIG version: 26 updated: 2021/01/03 08:05:37 +dnl CF_NCURSES_CONFIG version: 28 updated: 2021/08/28 15:20:37 dnl ----------------- dnl Tie together the configure-script macros for ncurses, preferring these in dnl order: @@ -2476,7 +2751,7 @@ if test "x${PKG_CONFIG:=none}" != xnone; then [initscr(); mousemask(0,0); tigetstr((char *)0);], [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}> int main(void) - { char *xx = curses_version(); return (xx == 0); }], + { const char *xx = curses_version(); return (xx == 0); }], [cf_test_ncuconfig=yes], [cf_test_ncuconfig=no], [cf_test_ncuconfig=maybe])], @@ -2495,14 +2770,14 @@ if test "x${PKG_CONFIG:=none}" != xnone; then ;; esac - CF_ADD_CFLAGS($cf_pkg_cflags) + CF_APPEND_CFLAGS($cf_pkg_cflags) CF_ADD_LIBS($cf_pkg_libs) AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], [initscr(); mousemask(0,0); tigetstr((char *)0);], [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}> int main(void) - { char *xx = curses_version(); return (xx == 0); }], + { const char *xx = curses_version(); return (xx == 0); }], [cf_have_ncuconfig=yes], [cf_have_ncuconfig=no], [cf_have_ncuconfig=maybe])], @@ -2537,7 +2812,7 @@ if test "x$cf_have_ncuconfig" = "xno"; then if test "$NCURSES_CONFIG" != none ; then - CF_ADD_CFLAGS(`$NCURSES_CONFIG --cflags`) + CF_APPEND_CFLAGS(`$NCURSES_CONFIG --cflags`) CF_ADD_LIBS(`$NCURSES_CONFIG --libs`) # even with config script, some packages use no-override for curses.h @@ -2716,7 +2991,7 @@ esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_LIBS version: 20 updated: 2021/01/03 08:05:37 +dnl CF_NCURSES_LIBS version: 21 updated: 2021/09/04 06:37:12 dnl --------------- dnl Look for the ncurses library. This is a little complicated on Linux, dnl because it may be linked with the gpm (general purpose mouse) library. @@ -2745,7 +3020,7 @@ AC_CHECK_LIB(gpm,Gpm_Open, case "$host_os" in (freebsd*) # This is only necessary if you are linking against an obsolete - # version of ncurses (but it should do no harm, since it's static). + # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then AC_CHECK_LIB(mytinfo,tgoto,[cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"]) fi @@ -2799,7 +3074,7 @@ then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_VERSION version: 16 updated: 2020/12/31 20:19:42 +dnl CF_NCURSES_VERSION version: 18 updated: 2024/01/07 06:34:16 dnl ------------------ dnl Check for the version of ncurses, to aid in reporting bugs, etc. dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS. We don't use @@ -2812,8 +3087,10 @@ AC_CACHE_CHECK(for ncurses version, cf_cv_ncurses_version,[ cf_tempfile=out$$ rm -f "$cf_tempfile" AC_TRY_RUN([ +$ac_includes_default + #include <${cf_cv_ncurses_header:-curses.h}> -#include <stdio.h> + int main(void) { FILE *fp = fopen("$cf_tempfile", "w"); @@ -2827,7 +3104,7 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); @@ -2916,19 +3193,29 @@ AC_TRY_COMPILE([ test "$cf_cv_netbsd_menu_h" = yes && AC_DEFINE(HAVE_NETBSD_MENU_H,1,[Define to 1 if we appear to be using NetBSD menu.h]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NO_LEAKS_OPTION version: 8 updated: 2021/01/05 20:05:09 +dnl CF_NO_LEAKS_OPTION version: 9 updated: 2021/06/13 19:45:41 dnl ------------------ dnl see CF_WITH_NO_LEAKS +dnl +dnl $1 = option/name +dnl $2 = help-text +dnl $3 = symbol to define if the option is set +dnl $4 = additional actions to take if the option is set AC_DEFUN([CF_NO_LEAKS_OPTION],[ AC_MSG_CHECKING(if you want to use $1 for testing) AC_ARG_WITH($1, [$2], - [AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[ + [case "x$withval" in + (x|xno) ;; + (*) + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" + with_$1=yes + AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[ $4 ]) - : "${with_cflags:=-g}" - : "${enable_leaks:=no}" - with_$1=yes], + ;; + esac], [with_$1=]) AC_MSG_RESULT(${with_$1:-no}) @@ -3027,14 +3314,16 @@ else fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PKG_CONFIG version: 11 updated: 2021/01/01 13:31:04 +dnl CF_PKG_CONFIG version: 13 updated: 2023/10/28 11:59:01 dnl ------------- dnl Check for the package-config program, unless disabled by command-line. +dnl +dnl Sets $PKG_CONFIG to the pathname of the pkg-config program. AC_DEFUN([CF_PKG_CONFIG], [ AC_MSG_CHECKING(if you want to use pkg-config) AC_ARG_WITH(pkg-config, - [ --with-pkg-config{=path} enable/disable use of pkg-config], + [[ --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD]], [cf_pkg_config=$withval], [cf_pkg_config=yes]) AC_MSG_RESULT($cf_pkg_config) @@ -3063,7 +3352,7 @@ fi AC_SUBST(PKG_CONFIG) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_POSIX_C_SOURCE version: 11 updated: 2018/12/31 20:46:17 +dnl CF_POSIX_C_SOURCE version: 12 updated: 2023/02/18 17:41:25 dnl ----------------- dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed. dnl @@ -3094,7 +3383,7 @@ AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_posix_c_source,[ CF_MSG_LOG(if the symbol is already defined go no further) AC_TRY_COMPILE([#include <sys/types.h>],[ #ifndef _POSIX_C_SOURCE -make an error +#error _POSIX_C_SOURCE is not defined #endif], [cf_cv_posix_c_source=no], [cf_want_posix_source=no @@ -3113,7 +3402,7 @@ make an error if test "$cf_want_posix_source" = yes ; then AC_TRY_COMPILE([#include <sys/types.h>],[ #ifdef _POSIX_SOURCE -make an error +#error _POSIX_SOURCE is defined #endif],[], cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE") fi @@ -3124,7 +3413,7 @@ make an error CF_MSG_LOG(if the second compile does not leave our definition intact error) AC_TRY_COMPILE([#include <sys/types.h>],[ #ifndef _POSIX_C_SOURCE -make an error +#error _POSIX_C_SOURCE is not defined #endif],, [cf_cv_posix_c_source=no]) CFLAGS="$cf_save_CFLAGS" @@ -3228,7 +3517,7 @@ case $INSTALL in esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_LINT version: 4 updated: 2019/11/20 18:55:37 +dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13 dnl ------------ AC_DEFUN([CF_PROG_LINT], [ @@ -3239,6 +3528,25 @@ case "x$LINT" in ;; esac AC_SUBST(LINT_OPTS) +AC_SUBST(LINT_LIBS) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_REMOVE_CFLAGS version: 3 updated: 2021/09/05 17:25:40 +dnl ---------------- +dnl Remove a given option from CFLAGS/CPPFLAGS +dnl $1 = option to remove +dnl $2 = variable to update +dnl $3 = nonempty to allow verbose message +define([CF_REMOVE_CFLAGS], +[ +cf_tmp_cflag=`echo "x$1" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x[$]$2" | sed -e 's/^.//' -e 's/[[ ]][[ ]]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[[^ ]][[^ ]]*\\)\?%%" -e 's/^[[ ]]*//' -e 's%[[ ]][[ ]]*-D% -D%g' -e 's%[[ ]][[ ]]*-I% -I%g'` + test "[$]$2" != "$cf_old_cflag" || break + ifelse([$3],,,[CF_VERBOSE(removing old option $1 from $2)]) + $2="$cf_old_cflag" +done ])dnl dnl --------------------------------------------------------------------------- dnl CF_REMOVE_DEFINE version: 3 updated: 2010/01/09 11:05:50 @@ -3412,7 +3720,7 @@ do done ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SIGWINCH version: 6 updated: 2021/01/01 13:31:04 +dnl CF_SIGWINCH version: 7 updated: 2023/02/18 17:41:25 dnl ----------- dnl Use this macro after CF_XOPEN_SOURCE, but do not require it (not all dnl programs need this test). @@ -3455,7 +3763,7 @@ do #include <sys/signal.h> ],[ #if SIGWINCH != $cf_sigwinch -make an error +#error SIGWINCH is not $cf_sigwinch #endif int x = SIGWINCH; (void)x], [cf_cv_fixup_sigwinch=$cf_sigwinch @@ -3697,34 +4005,20 @@ else fi ]) dnl --------------------------------------------------------------------------- -dnl CF_TRY_XOPEN_SOURCE version: 2 updated: 2018/06/20 20:23:13 +dnl CF_TRY_XOPEN_SOURCE version: 4 updated: 2022/09/10 15:16:16 dnl ------------------- dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we dnl can define it successfully. AC_DEFUN([CF_TRY_XOPEN_SOURCE],[ AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ - AC_TRY_COMPILE([ -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> -],[ -#ifndef _XOPEN_SOURCE -make an error -#endif], + AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY, [cf_cv_xopen_source=no], [cf_save="$CPPFLAGS" CF_APPEND_TEXT(CPPFLAGS,-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE) - AC_TRY_COMPILE([ -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> -],[ -#ifdef _XOPEN_SOURCE -make an error -#endif], - [cf_cv_xopen_source=no], - [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) - CPPFLAGS="$cf_save" + AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY, + [cf_cv_xopen_source=no], + [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) + CPPFLAGS="$cf_save" ]) ]) @@ -3732,7 +4026,7 @@ if test "$cf_cv_xopen_source" != no ; then CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" - CF_ADD_CFLAGS($cf_temp_xopen_source) + CF_APPEND_CFLAGS($cf_temp_xopen_source) fi ]) dnl --------------------------------------------------------------------------- @@ -3745,15 +4039,20 @@ AC_DEFUN([CF_UPPER], $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` ])dnl dnl --------------------------------------------------------------------------- -dnl CF_UTF8_LIB version: 8 updated: 2012/10/06 08:57:51 +dnl CF_UTF8_LIB version: 10 updated: 2023/01/11 04:05:23 dnl ----------- dnl Check for multibyte support, and if not found, utf8 compatibility library AC_DEFUN([CF_UTF8_LIB], [ +AC_HAVE_HEADERS(wchar.h) AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[ cf_save_LIBS="$LIBS" AC_TRY_LINK([ -#include <stdlib.h>],[putwc(0,0);], +$ac_includes_default +#ifdef HAVE_WCHAR_H +#include <wchar.h> +#endif +],[putwc(0,0);], [cf_cv_utf8_lib=yes], [CF_FIND_LINKAGE([ #include <libutf8.h>],[putwc(0,0);],utf8, @@ -3779,7 +4078,7 @@ AC_DEFUN([CF_VERBOSE], CF_MSG_LOG([$1]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WCHAR_TYPE version: 4 updated: 2012/10/06 16:39:58 +dnl CF_WCHAR_TYPE version: 5 updated: 2023/12/03 09:21:34 dnl ------------- dnl Check if type wide-character type $1 is declared, and if so, which header dnl file is needed. The second parameter is used to set a shell variable when @@ -3796,7 +4095,7 @@ AC_TRY_COMPILE([ #ifdef HAVE_LIBUTF8_H #include <libutf8.h> #endif], - [$1 state], + [$1 state; (void)state], [cf_cv_$1=no], [AC_TRY_COMPILE([ #include <stdlib.h> @@ -3806,7 +4105,7 @@ AC_TRY_COMPILE([ #ifdef HAVE_LIBUTF8_H #include <libutf8.h> #endif], - [$1 value], + [$1 value; (void) value], [cf_cv_$1=yes], [cf_cv_$1=unknown])])]) @@ -3883,7 +4182,7 @@ if test "$with_dmalloc" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_LIB_BASENAME version: 1 updated: 2020/03/07 20:05:14 +dnl CF_WITH_LIB_BASENAME version: 2 updated: 2023/11/22 20:48:30 dnl -------------------- dnl Allow for overriding the basename of a library, i.e., the part to which dnl prefixes/suffixes are attached. @@ -3895,7 +4194,7 @@ AC_DEFUN([CF_WITH_LIB_BASENAME], [ AC_MSG_CHECKING(for desired basename for $2 library) AC_ARG_WITH($2-libname, - [ --with-$2-libname=XXX override ifelse($3,,$2,$3) basename of library], + [[ --with-$2-libname[=XXX] override ifelse($3,,$2,$3) basename of library]], [with_lib_basename=$withval], [with_lib_basename=ifelse($3,,$2,$3)]) $1="$with_lib_basename" @@ -3912,7 +4211,7 @@ AC_MSG_RESULT([$]$1) AC_SUBST($1) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_NCURSES_ETC version: 5 updated: 2016/02/20 19:23:20 +dnl CF_WITH_NCURSES_ETC version: 6 updated: 2023/01/16 10:10:06 dnl ------------------- dnl Use this macro for programs which use any variant of "curses", e.g., dnl "ncurses", and "PDCurses". Programs that can use curses and some unrelated @@ -3972,6 +4271,7 @@ case $cf_cv_screen in esac CF_NCURSES_PTHREADS($cf_cv_screen) +AC_SUBST(cf_cv_screen) ])dnl dnl --------------------------------------------------------------------------- @@ -4000,7 +4300,7 @@ CF_NO_LEAKS_OPTION(valgrind, [USE_VALGRIND]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_X11_RGB version: 2 updated: 2019/12/31 08:53:54 +dnl CF_WITH_X11_RGB version: 3 updated: 2023/10/28 11:59:01 dnl --------------- dnl Handle configure option "--with-x11-rgb", setting these shell dnl variables: @@ -4040,7 +4340,7 @@ dnl /usr/X11/lib/X11/rgb.txt AC_DEFUN([CF_WITH_X11_RGB],[ AC_MSG_CHECKING(for X11 rgb file) AC_ARG_WITH(x11-rgb, - [ --with-x11-rgb=FILE file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt)], + [ --with-x11-rgb=FILE obtain X11 color definitions from FILE (default: EPREFIX/lib/X11/rgb.txt)], [RGB_PATH=$withval], [RGB_PATH=auto]) @@ -4086,7 +4386,7 @@ fi AC_SUBST(no_x11_rgb) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_CURSES version: 16 updated: 2021/01/02 09:31:20 +dnl CF_XOPEN_CURSES version: 20 updated: 2024/01/07 06:54:12 dnl --------------- dnl Test if we should define X/Open source for curses, needed on Digital Unix dnl 4.x, to see the extended functions, but breaks on IRIX 6.x. @@ -4099,22 +4399,22 @@ AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl AC_CACHE_CHECK(definition to turn on extended curses functions,cf_cv_need_xopen_extension,[ cf_cv_need_xopen_extension=unknown AC_TRY_LINK([ -#include <stdlib.h> +$ac_includes_default #include <${cf_cv_ncurses_header:-curses.h}>],[ #if defined(NCURSES_VERSION_PATCH) #if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403) - make an error + #error disallow ncurses versions between 2020/04/03 and 2010/05/01 #endif #endif -#ifdef NCURSES_VERSION +#ifdef NCURSES_WIDECHAR +#error prefer to fall-through on the second checks +#endif + static char dummy[10]; cchar_t check; int check2 = curs_set((int)sizeof(check)); -#endif - long x = winnstr(stdscr, "", 0); + long x = winnstr(stdscr, dummy, 5); int x1, y1; -#ifdef NCURSES_VERSION (void)check2; -#endif getbegyx(stdscr, y1, x1); (void)x; (void)y1; @@ -4126,18 +4426,15 @@ AC_TRY_LINK([ do AC_TRY_LINK([ #define $cf_try_xopen_extension 1 -#include <stdlib.h> +$ac_includes_default #include <${cf_cv_ncurses_header:-curses.h}>],[ -#ifdef NCURSES_VERSION + static char dummy[10]; cchar_t check; int check2 = curs_set((int)sizeof(check)); -#endif - long x = winnstr(stdscr, "", 0); + long x = winnstr(stdscr, dummy, 5); int x1, y1; getbegyx(stdscr, y1, x1); -#ifdef NCURSES_VERSION (void)check2; -#endif (void)x; (void)y1; (void)x1; @@ -4155,7 +4452,7 @@ esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 57 updated: 2021/01/01 16:53:59 +dnl CF_XOPEN_SOURCE version: 67 updated: 2023/09/06 18:55:27 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, dnl or adapt to the vendor's definitions to get equivalent functionality, @@ -4164,6 +4461,18 @@ dnl dnl Parameters: dnl $1 is the nominal value for _XOPEN_SOURCE dnl $2 is the nominal value for _POSIX_C_SOURCE +dnl +dnl The default case prefers _XOPEN_SOURCE over _POSIX_C_SOURCE if the +dnl implementation predefines it, because X/Open and most implementations agree +dnl that the latter is a legacy or "aligned" value. +dnl +dnl Because _XOPEN_SOURCE is preferred, if defining _POSIX_C_SOURCE turns +dnl that off, then refrain from setting _POSIX_C_SOURCE explicitly. +dnl +dnl References: +dnl https://pubs.opengroup.org/onlinepubs/007904975/functions/xsh_chap02_02.html +dnl https://docs.oracle.com/cd/E19253-01/816-5175/standards-5/index.html +dnl https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html AC_DEFUN([CF_XOPEN_SOURCE],[ AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([CF_POSIX_VISIBLE]) @@ -4178,9 +4487,6 @@ case "$host_os" in (aix[[4-7]]*) cf_xopen_source="-D_ALL_SOURCE" ;; -(msys) - cf_XOPEN_SOURCE=600 - ;; (darwin[[0-8]].*) cf_xopen_source="-D_APPLE_C_SOURCE" ;; @@ -4206,7 +4512,7 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) +(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) CF_GNU_SOURCE($cf_XOPEN_SOURCE) ;; (minix*) @@ -4220,7 +4526,15 @@ case "$host_os" in (netbsd*) cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ;; -(openbsd[[4-9]]*) +(openbsd[[6-9]]*) + # OpenBSD 6.x has broken locale support, both compile-time and runtime. + # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html + # Abusing the conformance level is a workaround. + AC_MSG_WARN(this system does not provide usable locale support) + cf_xopen_source="-D_BSD_SOURCE" + cf_XOPEN_SOURCE=700 + ;; +(openbsd[[4-5]]*) # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw cf_xopen_source="-D_BSD_SOURCE" cf_XOPEN_SOURCE=600 @@ -4247,12 +4561,20 @@ case "$host_os" in ;; (*) CF_TRY_XOPEN_SOURCE + cf_save_xopen_cppflags="$CPPFLAGS" CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) + # Some of these niche implementations use copy/paste, double-check... + if test "$cf_cv_xopen_source" = no ; then + CF_VERBOSE(checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE) + AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,,[ + AC_MSG_WARN(_POSIX_C_SOURCE definition is not usable) + CPPFLAGS="$cf_save_xopen_cppflags"]) + fi ;; esac if test -n "$cf_xopen_source" ; then - CF_ADD_CFLAGS($cf_xopen_source,true) + CF_APPEND_CFLAGS($cf_xopen_source,true) fi dnl In anything but the default case, we may have system-specific setting @@ -4262,7 +4584,7 @@ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then AC_MSG_CHECKING(if _XOPEN_SOURCE really is set) AC_TRY_COMPILE([#include <stdlib.h>],[ #ifndef _XOPEN_SOURCE -make an error +#error _XOPEN_SOURCE is not defined #endif], [cf_XOPEN_SOURCE_set=yes], [cf_XOPEN_SOURCE_set=no]) @@ -4271,7 +4593,7 @@ make an error then AC_TRY_COMPILE([#include <stdlib.h>],[ #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE -make an error +#error (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE #endif], [cf_XOPEN_SOURCE_set_ok=yes], [cf_XOPEN_SOURCE_set_ok=no]) @@ -4286,7 +4608,7 @@ fi fi # cf_cv_posix_visible ]) dnl --------------------------------------------------------------------------- -dnl CF_X_ATHENA version: 24 updated: 2020/03/10 18:53:47 +dnl CF_X_ATHENA version: 25 updated: 2023/01/11 04:05:23 dnl ----------- dnl Check for Xaw (Athena) libraries dnl @@ -4360,6 +4682,7 @@ if test "$PKG_CONFIG" != none ; then AC_CACHE_CHECK(for usable $cf_x_athena/Xmu package,cf_cv_xaw_compat,[ AC_TRY_LINK([ +$ac_includes_default #include <X11/Xmu/CharSet.h> ],[ int check = XmuCompareISOLatin1("big", "small"); @@ -4446,7 +4769,7 @@ elif test "$cf_x_athena_inc" != default ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_X_ATHENA_LIBS version: 13 updated: 2020/01/11 18:16:10 +dnl CF_X_ATHENA_LIBS version: 14 updated: 2023/01/11 04:05:23 dnl ---------------- dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw. @@ -4479,6 +4802,7 @@ do CF_ADD_LIBS($cf_libs) AC_MSG_CHECKING(for $cf_test in $cf_libs) AC_TRY_LINK([ +$ac_includes_default #include <X11/Intrinsic.h> #include <X11/$cf_x_athena_root/SimpleMenu.h> ],[ @@ -4515,7 +4839,7 @@ CF_TRY_PKG_CONFIG(Xext,,[ [CF_ADD_LIB(Xext)])]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_X_TOOLKIT version: 26 updated: 2021/01/02 09:31:20 +dnl CF_X_TOOLKIT version: 27 updated: 2023/01/11 04:05:23 dnl ------------ dnl Check for X Toolkit libraries AC_DEFUN([CF_X_TOOLKIT], @@ -4550,6 +4874,7 @@ CF_TRY_PKG_CONFIG(xt,[ # we have an "xt" package, but it may omit Xt's dependency on X11 AC_CACHE_CHECK(for usable X dependency,cf_cv_xt_x11_compat,[ AC_TRY_LINK([ +$ac_includes_default #include <X11/Xlib.h> ],[ int rc1 = XDrawLine((Display*) 0, (Drawable) 0, (GC) 0, 0, 0, 0, 0); @@ -4568,6 +4893,7 @@ AC_TRY_LINK([ AC_CACHE_CHECK(for usable X Toolkit package,cf_cv_xt_ice_compat,[ AC_TRY_LINK([ +$ac_includes_default #include <X11/Shell.h> ],[int num = IceConnectionNumber(0); (void) num ],[cf_cv_xt_ice_compat=yes],[cf_cv_xt_ice_compat=no])]) @@ -4653,3 +4979,21 @@ char * XCursesProgramName = "test"; #endif #endif ]) +dnl --------------------------------------------------------------------------- +dnl CF__XOPEN_SOURCE_BODY version: 2 updated: 2023/02/18 17:41:25 +dnl --------------------- +dnl body of test when test-compiling for _XOPEN_SOURCE check +define([CF__XOPEN_SOURCE_BODY], +[ +#ifndef _XOPEN_SOURCE +#error _XOPEN_SOURCE is not defined +#endif +]) +dnl --------------------------------------------------------------------------- +dnl CF__XOPEN_SOURCE_HEAD version: 2 updated: 2023/02/18 17:41:25 +dnl --------------------- +dnl headers to include when test-compiling for _XOPEN_SOURCE check +define([CF__XOPEN_SOURCE_HEAD], +[ +$ac_includes_default +]) diff --git a/test/back_ground.c b/test/back_ground.c index 100282464ac8..c53c2a36bf8c 100644 --- a/test/back_ground.c +++ b/test/back_ground.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2021 Thomas E. Dickey * + * Copyright 2021,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 * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: back_ground.c,v 1.5 2021/02/20 12:23:21 tom Exp $ + * $Id: back_ground.c,v 1.9 2022/12/10 22:28:50 tom Exp $ */ #include <test.priv.h> @@ -170,12 +170,13 @@ test_background(void) } static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: background [options]" ,"" + ,USAGE_COMMON ,"Options:" #if HAVE_ASSUME_DEFAULT_COLORS ," -a invoke assume_default_colors, repeat to use in init_pair" @@ -194,11 +195,14 @@ usage(void) for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { #if HAVE_ASSUME_DEFAULT_COLORS int a_option = 0; @@ -206,12 +210,12 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) #if HAVE_USE_DEFAULT_COLORS int d_option = 0; #endif - int n; + int ch; setlocale(LC_ALL, ""); - while ((n = getopt(argc, argv, "ab:df:l:wW:")) != -1) { - switch (n) { + while ((ch = getopt(argc, argv, OPTS_COMMON "ab:df:l:wW:")) != -1) { + switch (ch) { #if HAVE_ASSUME_DEFAULT_COLORS case 'a': ++a_option; @@ -230,7 +234,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) break; case 'l': if (!open_dump(optarg)) - usage(); + usage(FALSE); break; case 'w': wide_fill = L'\u2591'; @@ -238,8 +242,12 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) case 'W': wide_fill = decode_wchar(optarg); break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } #if HAVE_USE_DEFAULT_COLORS && HAVE_ASSUME_DEFAULT_COLORS diff --git a/test/background.c b/test/background.c index 649ffcedb446..5942debbb45b 100644 --- a/test/background.c +++ b/test/background.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2021,2022 Thomas E. Dickey * * Copyright 2003-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: background.c,v 1.20 2021/02/13 20:54:08 tom Exp $ + * $Id: background.c,v 1.24 2022/12/10 22:28:50 tom Exp $ */ #define NEED_COLOR_CODE 1 @@ -129,12 +129,13 @@ test_background(void) } static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: background [options]" ,"" + ,USAGE_COMMON ,"Options:" #if HAVE_ASSUME_DEFAULT_COLORS ," -a invoke assume_default_colors, repeat to use in init_pair" @@ -151,11 +152,14 @@ usage(void) for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { #if HAVE_ASSUME_DEFAULT_COLORS int a_option = 0; @@ -163,12 +167,12 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) #if HAVE_USE_DEFAULT_COLORS int d_option = 0; #endif - int n; + int ch; setlocale(LC_ALL, ""); - while ((n = getopt(argc, argv, "ab:df:l:")) != -1) { - switch (n) { + while ((ch = getopt(argc, argv, OPTS_COMMON "ab:df:l:")) != -1) { + switch (ch) { #if HAVE_ASSUME_DEFAULT_COLORS case 'a': ++a_option; @@ -187,10 +191,14 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) break; case 'l': if (!open_dump(optarg)) - usage(); + usage(FALSE); break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } #if HAVE_USE_DEFAULT_COLORS && HAVE_ASSUME_DEFAULT_COLORS diff --git a/test/blue.c b/test/blue.c index 922caab94396..90f240b62634 100644 --- a/test/blue.c +++ b/test/blue.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-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 * @@ -37,7 +37,7 @@ *****************************************************************************/ /* - * $Id: blue.c,v 1.53 2020/02/02 23:34:34 tom Exp $ + * $Id: blue.c,v 1.55 2022/12/10 23:31:31 tom Exp $ */ #include <test.priv.h> @@ -71,7 +71,7 @@ #define BLACK_ON_WHITE 2 #define BLUE_ON_WHITE 3 -static void die(int onsig) GCC_NORETURN; +static GCC_NORETURN void die(int onsig); static int deck_size = PACK_SIZE; /* initial deck */ static int deck[PACK_SIZE]; @@ -465,9 +465,44 @@ use_pc_display(void) #define use_pc_display() /* nothing */ #endif /* HAVE_LANGINFO_CODESET */ +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: blue [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int main(int argc, char *argv[]) { + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); + setlocale(LC_ALL, ""); use_pc_display(); diff --git a/test/bs.6 b/test/bs.6 index 364fc8fe336e..12295a319580 100644 --- a/test/bs.6 +++ b/test/bs.6 @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright 2020 Thomas E. Dickey * +.\" Copyright 2020,2021 Thomas E. Dickey * .\" Copyright 1998,2006 Free Software Foundation, Inc. * .\" * .\" Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,8 +27,8 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: bs.6,v 1.3 2020/02/02 23:34:34 tom Exp $ -.TH BATTLESHIPS 6 "Aug 23, 1989" +.\" $Id: bs.6,v 1.5 2021/06/17 21:20:30 tom Exp $ +.TH BATTLESHIPS 6 2021-06-17 ncurses-examples Games .SH NAME bs \- battleships game .SH SYNOPSIS @@ -45,7 +45,7 @@ may be used to ignore the current position and randomly place your currently selected ship. The `R' command will place all remaining ships randomly. The ^L command (form feed, ASCII 12) will force a screen redraw). .PP -The command-line arguments control game modes. +The command-line arguments control game modes. .nf -b selects a `blitz' variant diff --git a/test/bs.c b/test/bs.c index 0e4076f6110d..c7569cf207fd 100644 --- a/test/bs.c +++ b/test/bs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2022,2023 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -26,7 +26,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * ****************************************************************************/ -/* +/* * bs.c - original author: Bruce Holloway * salvo option by: Chuck A DeGaul * with improved user interface, autoconfiguration and code cleanup @@ -35,7 +35,7 @@ * v2.0 featuring strict ANSI/POSIX conformance, November 1993. * v2.1 with ncurses mouse support, September 1995 * - * $Id: bs.c,v 1.75 2020/02/02 23:34:34 tom Exp $ + * $Id: bs.c,v 1.79 2023/05/27 20:13:10 tom Exp $ */ #include <test.priv.h> @@ -181,7 +181,7 @@ static int salvo, blitz, closepack; #define PR (void)addstr -static void uninitgame(int sig) GCC_NORETURN; +static GCC_NORETURN void uninitgame(int sig); static void uninitgame(int sig GCC_UNUSED) @@ -898,8 +898,9 @@ sgetc(const char *s) ch = toupper(ch); if (is_QUIT(ch)) uninitgame(0); - for (s1 = s; *s1 && ch != *s1; ++s1) - continue; + for (s1 = s; *s1 && ch != *s1; ++s1) { + /* EMPTY */ ; + } if (*s1) { AddCh(ch); (void) refresh(); @@ -1162,55 +1163,6 @@ playagain(void) return (sgetc("YN") == 'Y'); } -static void -do_options(int c, char *op[]) -{ - if (c > 1) { - int i; - - for (i = 1; i < c; i++) { - switch (op[i][0]) { - default: - case '?': - (void) fprintf(stderr, "Usage: bs [-s | -b] [-c]\n"); - (void) fprintf(stderr, "\tWhere the options are:\n"); - (void) fprintf(stderr, "\t-s : play a salvo game\n"); - (void) fprintf(stderr, "\t-b : play a blitz game\n"); - (void) fprintf(stderr, "\t-c : ships may be adjacent\n"); - ExitProgram(EXIT_FAILURE); - break; - case '-': - switch (op[i][1]) { - case 'b': - blitz = 1; - if (salvo == 1) { - (void) fprintf(stderr, - "Bad Arg: -b and -s are mutually exclusive\n"); - ExitProgram(EXIT_FAILURE); - } - break; - case 's': - salvo = 1; - if (blitz == 1) { - (void) fprintf(stderr, - "Bad Arg: -s and -b are mutually exclusive\n"); - ExitProgram(EXIT_FAILURE); - } - break; - case 'c': - closepack = 1; - break; - default: - (void) fprintf(stderr, - "Bad arg: type \"%s ?\" for usage message\n", - op[0]); - ExitProgram(EXIT_FAILURE); - } - } - } - } -} - static int scount(int who) { @@ -1231,12 +1183,68 @@ scount(int who) return (shots); } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: bs [options]" + ,"" + ,USAGE_COMMON + ,"Options:" + ," -b play a blitz game" + ," -c ships may be adjacent" + ," -s play a salvo game" + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int main(int argc, char *argv[]) { - setlocale(LC_ALL, ""); + int ch; - do_options(argc, argv); + while ((ch = getopt(argc, argv, OPTS_COMMON "bcs")) != -1) { + switch (ch) { + case 'b': + blitz = 1; + if (salvo == 1) { + (void) fprintf(stderr, + "Bad Arg: -b and -s are mutually exclusive\n"); + ExitProgram(EXIT_FAILURE); + } + break; + case 's': + salvo = 1; + if (blitz == 1) { + (void) fprintf(stderr, + "Bad Arg: -s and -b are mutually exclusive\n"); + ExitProgram(EXIT_FAILURE); + } + break; + case 'c': + closepack = 1; + break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); + + setlocale(LC_ALL, ""); intro(); do { @@ -1263,8 +1271,9 @@ main(int argc, char *argv[]) } } } else - while ((turn ? cputurn() : plyturn()) && awinna() == -1) - continue; + while ((turn ? cputurn() : plyturn()) && awinna() == -1) { + /* EMPTY */ ; + } turn = OTHER; } } while diff --git a/test/cardfile.c b/test/cardfile.c index bf03755f658a..092483b02c00 100644 --- a/test/cardfile.c +++ b/test/cardfile.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2021,2022 Thomas E. Dickey * * Copyright 1999-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: cardfile.c,v 1.47 2020/02/02 23:34:34 tom Exp $ + * $Id: cardfile.c,v 1.51 2022/12/04 00:40:11 tom Exp $ * * File format: text beginning in column 1 is a title; other text is content. */ @@ -296,7 +296,7 @@ prev_card(CARD * now) static CARD * first_card(CARD * now) { - if (!isVisible(now)) + if (now != NULL && !isVisible(now)) now = next_card(now); return now; } @@ -550,37 +550,45 @@ cardfile(char *fname) } static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: cardfile [options] file" ,"" + ,USAGE_COMMON ,"Options:" ," -c use color if terminal supports it" }; size_t n; for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } /*******************************************************************************/ +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { - int n; + int ch; setlocale(LC_ALL, ""); - while ((n = getopt(argc, argv, "c")) != -1) { - switch (n) { + while ((ch = getopt(argc, argv, OPTS_COMMON "c")) != -1) { + switch (ch) { case 'c': try_color = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } @@ -600,6 +608,7 @@ main(int argc, char *argv[]) } if (optind + 1 == argc) { + int n; for (n = 1; n < argc; n++) read_data(argv[n]); if (count_cards() == 0) diff --git a/test/chgat.c b/test/chgat.c index a5bcbea27d61..2c2b539120c4 100644 --- a/test/chgat.c +++ b/test/chgat.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2020,2022 Thomas E. Dickey * * Copyright 2006-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: chgat.c,v 1.19 2020/02/02 23:34:34 tom Exp $ + * $Id: chgat.c,v 1.20 2022/12/10 23:31:31 tom Exp $ * * test-driver for chgat/wchgat/mvchgat/mvwchgat */ @@ -348,9 +348,44 @@ test_chgat(void) } while ((st.ch = getch()) != ERR); } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: chgat [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); + initscr(); cbreak(); noecho(); diff --git a/test/clip_printw.c b/test/clip_printw.c index a4242e8467e3..c34a1e09ff34 100644 --- a/test/clip_printw.c +++ b/test/clip_printw.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2022,2023 Thomas E. Dickey * * Copyright 2008-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,9 +27,9 @@ * authorization. * ****************************************************************************/ /* - * $Id: clip_printw.c,v 1.19 2020/05/10 00:40:23 tom Exp $ + * $Id: clip_printw.c,v 1.23 2023/09/30 19:57:44 tom Exp $ * - * demonstrate how to use printw without wrapping. + * demonstrate how to use printw with/without wrapping. */ #include <test.priv.h> @@ -40,9 +40,15 @@ #define SHOW(n) ((n) == ERR ? "ERR" : "OK") #define COLOR_DEFAULT (-1) +#define X_BASE 0 +#define Y_BASE 1 +#define MARGIN 1 +#define Y_TOP (Y_BASE + MARGIN) + typedef struct { unsigned c; unsigned v; + bool single; int status; int pair; attr_t attr; @@ -57,21 +63,29 @@ typedef struct { } STATUS; static int -clip_wprintw(WINDOW *win, NCURSES_CONST char *fmt, ...) +clip_wprintw(WINDOW *win, bool single, NCURSES_CONST char *fmt, ...) { int y0, x0, y1, x1, width; WINDOW *sub; va_list ap; int rc; - /* - * Allocate a single-line derived window extending from the current - * cursor position to the end of the current line in the given window. - * Disable scrolling in the derived window. - */ getyx(win, y0, x0); width = getmaxx(win) - x0; - sub = derwin(win, 1, width, y0, x0); + if (single) { + /* + * Allocate a single-line derived window extending from the current + * cursor position to the end of the current line in the given window. + * Disable scrolling in the derived window. + */ + sub = derwin(win, 1, width, y0, x0); + } else { + /* + * Allow printw to wrap through the entire window. + */ + sub = derwin(win, getmaxy(win), getmaxx(win), 0, 0); + wmove(sub, y0, x0); + } scrollok(sub, FALSE); /* @@ -84,7 +98,11 @@ clip_wprintw(WINDOW *win, NCURSES_CONST char *fmt, ...) getyx(sub, y1, x1); delwin(sub); - wmove(win, y1 + y0, x1 + x0); + if (single) { + wmove(win, y1 + y0, x1 + x0); + } else { + wmove(win, y1, x1); + } return rc; } @@ -156,11 +174,12 @@ video_params(unsigned state, attr_t *attr) static void fill_window(WINDOW *win) { + int y_top = (win == stdscr) ? Y_BASE : MARGIN; int y, x; int y0 = -1, x0 = -1; getyx(win, y, x); - wmove(win, 0, 0); + wmove(win, y_top, 0); while (waddstr(win, "0123456789 abcdefghijklmnopqrstuvwxyz ") != ERR) { int y1, x1; getyx(win, y1, x1); @@ -178,25 +197,34 @@ show_status(WINDOW *win, STATUS * sp) int y, x; getyx(win, y, x); + wattron(win, A_REVERSE); wmove(win, 0, 0); - wprintw(win, "Count %d", sp->count); + wprintw(win, "Clip %s", sp->single ? "line" : "window"); + wprintw(win, " Count %d", sp->count); if (sp->v_msg != 0) wprintw(win, " Video %s", sp->v_msg); if (sp->c_msg != 0) wprintw(win, " Color %s", sp->c_msg); wprintw(win, " (%d)", sp->status); wclrtoeol(win); + wattroff(win, A_REVERSE); wmove(win, y, x); } static void do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *)) { - WINDOW *win1 = newwin(sp->y_max - 2, sp->x_max - 2, - sp->y_beg + 1, sp->x_beg + 1); + WINDOW *win1 = newwin(sp->y_max - (2 * MARGIN), + sp->x_max - (2 * MARGIN), + sp->y_beg + MARGIN, + sp->x_beg + MARGIN); if (win1 != 0 && sp->y_max > 4 && sp->x_max > 4) { - WINDOW *win2 = derwin(win1, sp->y_max - 4, sp->x_max - 4, 1, 1); + WINDOW *win2 = derwin(win1, + sp->y_max - (2 * MARGIN) - 2, + sp->x_max - (2 * MARGIN) - 2, + (win == stdscr) ? Y_BASE : Y_BASE, + MARGIN); if (win2 != 0) { box(win1, 0, 0); @@ -216,10 +244,14 @@ do_subwindow(WINDOW *win, STATUS * sp, void func(WINDOW *)) } } +/* + * The status line is within the same window as the test-data. + */ static void init_status(WINDOW *win, STATUS * sp) { memset(sp, 0, sizeof(*sp)); + sp->single = TRUE; sp->c = 99; sp->v = 99; sp->ch = ' '; @@ -229,6 +261,8 @@ init_status(WINDOW *win, STATUS * sp) getbegyx(win, sp->y_beg, sp->x_beg); getmaxyx(win, sp->y_max, sp->x_max); + + wmove(win, sp->y_val = Y_BASE, sp->x_val = 0); } static void @@ -242,7 +276,10 @@ show_help(WINDOW *win) ,"" ,"Other commands:" ,"space toggles through the set of video attributes and colors." + ,"q exit subwindow, quit if last window." + ,"s toggles single-line updates versus entire windows." ,"t touches (forces repaint) of the current line." + ,"w create subwindow." ,". calls vw_printw at the current position with the given count." ,"= resets count to zero." ,"? shows this help-window" @@ -255,6 +292,8 @@ show_help(WINDOW *win) static void update_status(WINDOW *win, STATUS * sp) { + int margin = 0; + switch (sp->ch) { case ' ': /* next test-iteration */ if (has_colors()) { @@ -272,24 +311,40 @@ update_status(WINDOW *win, STATUS * sp) sp->count = 0; show_status(win, sp); break; + case KEY_HOME: + case '^': + wmove(win, sp->y_val, sp->x_val = margin); + break; + case KEY_END: + case '$': + wmove(win, sp->y_val, sp->x_val = (sp->x_max - margin - 1)); + break; + case KEY_PPAGE: + case CTRL('B'): + wmove(win, sp->y_val = Y_BASE, sp->x_val); + break; + case KEY_NPAGE: + case CTRL('F'): + wmove(win, sp->y_val = (sp->y_max - margin - 1), sp->x_val); + break; case KEY_LEFT: case 'h': - if (sp->x_val > 0) + if (sp->x_val > margin) wmove(win, sp->y_val, --(sp->x_val)); break; case KEY_DOWN: case 'j': - if (sp->y_val < sp->y_max) + if (sp->y_val < (sp->y_max - margin)) wmove(win, ++(sp->y_val), sp->x_val); break; case KEY_UP: case 'k': - if (sp->y_val > 0) + if (sp->y_val > Y_BASE) wmove(win, --(sp->y_val), sp->x_val); break; case KEY_RIGHT: case 'l': - if (sp->x_val < sp->x_max) + if (sp->x_val < (sp->x_max - margin)) wmove(win, sp->y_val, ++(sp->x_val)); break; case 't': @@ -299,6 +354,10 @@ update_status(WINDOW *win, STATUS * sp) sp->count = 0; show_status(win, sp); break; + case 's': + sp->single = !sp->single; + show_status(win, sp); + break; case HELP_KEY_1: show_help(win); break; @@ -342,7 +401,7 @@ test_clipping(WINDOW *win) buffer[j] = (char) ('A' + (j % 26)); } buffer[need - 1] = '\0'; - st.status = clip_wprintw(win, fmt, '[', buffer, ']'); + st.status = clip_wprintw(win, st.single, fmt, '[', buffer, ']'); free(buffer); } break; @@ -358,9 +417,45 @@ test_clipping(WINDOW *win) } while ((st.ch = wgetch(win)) != ERR); } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: clip_printw [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); + + setlocale(LC_ALL, ""); initscr(); cbreak(); noecho(); diff --git a/test/color_content.c b/test/color_content.c index 0f619f661e63..d08dffb09fb5 100644 --- a/test/color_content.c +++ b/test/color_content.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2022,2023 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: color_content.c,v 1.12 2020/02/02 23:34:34 tom Exp $ + * $Id: color_content.c,v 1.19 2023/02/25 16:48:02 tom Exp $ */ #define NEED_TIME_H @@ -58,10 +58,8 @@ static int x_opt; static MYCOLOR *expected; -#if HAVE_GETTIMEOFDAY -static struct timeval initial_time; -static struct timeval finish_time; -#endif +static TimeType initial_time; +static TimeType finish_time; static void failed(const char *msg) @@ -118,6 +116,7 @@ random_color(void) static void setup_test(void) { + setlocale(LC_ALL, ""); initscr(); cbreak(); noecho(); @@ -174,9 +173,7 @@ setup_test(void) } else { failed("This demo requires a color terminal"); } -#if HAVE_GETTIMEOFDAY - gettimeofday(&initial_time, 0); -#endif + GetClockTime(&initial_time); } static void @@ -212,23 +209,14 @@ finish_test(void) endwin(); } -#if HAVE_GETTIMEOFDAY -static double -seconds(struct timeval *mark) -{ - double result = (double) mark->tv_sec; - result += ((double) mark->tv_usec / 1e6); - return result; -} -#endif - static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: color_content [options]" ,"" + ,USAGE_COMMON ,"Options:" ," -f COLOR first color value to test (default: 0)" ," -i interactive, showing test-progress" @@ -244,26 +232,29 @@ usage(void) size_t n; for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { - int i; + int ch; - while ((i = getopt(argc, argv, "f:il:npr:sx")) != -1) { - switch (i) { + while ((ch = getopt(argc, argv, OPTS_COMMON "f:il:npr:sx")) != -1) { + switch (ch) { case 'f': if ((f_opt = atoi(optarg)) <= 0) - usage(); + usage(FALSE); break; case 'i': i_opt = 1; break; case 'l': if ((l_opt = atoi(optarg)) <= 0) - usage(); + usage(FALSE); break; case 'n': n_opt = 1; @@ -273,7 +264,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) break; case 'r': if ((r_opt = atoi(optarg)) <= 0) - usage(); + usage(FALSE); break; case 's': s_opt = 1; @@ -283,17 +274,22 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) x_opt = 1; break; #endif + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); if (r_opt <= 0) r_opt = 1; setup_test(); if (p_opt) { + int i; endwin(); for (i = 0; i < COLORS; ++i) { my_color_t r, g, b; @@ -318,14 +314,11 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) addch('\n'); } printw("DONE: "); -#if HAVE_GETTIMEOFDAY - gettimeofday(&finish_time, 0); - printw("%.03f seconds", - seconds(&finish_time) - - seconds(&initial_time)); -#endif + GetClockTime(&finish_time); + printw("%.03f seconds", ElapsedSeconds(&finish_time, &initial_time)); finish_test(); } + free(expected); ExitProgram(EXIT_SUCCESS); } diff --git a/test/color_name.h b/test/color_name.h index d27804e87266..867396ca5f70 100644 --- a/test/color_name.h +++ b/test/color_name.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2020,2021 Thomas E. Dickey * * Copyright 2011-2012,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: color_name.h,v 1.8 2020/06/20 18:58:20 tom Exp $ + * $Id: color_name.h,v 1.9 2021/04/24 23:25:29 tom Exp $ */ #ifndef __COLORNAME_H @@ -37,7 +37,7 @@ #include <test.priv.h> #endif -static NCURSES_CONST char *the_color_names[] = +static NCURSES_CONST char *const the_color_names[] = { "black", "red", diff --git a/test/color_set.c b/test/color_set.c index 016b993313f3..5510a0fdba44 100644 --- a/test/color_set.c +++ b/test/color_set.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2020,2020,2022 Thomas E. Dickey * * Copyright 2003-2012,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: color_set.c,v 1.10 2020/02/02 23:34:34 tom Exp $ + * $Id: color_set.c,v 1.12 2022/12/10 23:36:59 tom Exp $ */ #include <test.priv.h> @@ -36,11 +36,46 @@ #define SHOW(n) ((n) == ERR ? "ERR" : "OK") +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: color_set [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { NCURSES_COLOR_T f, b; + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); + setlocale(LC_ALL, ""); initscr(); cbreak(); noecho(); diff --git a/test/combine.c b/test/combine.c new file mode 100644 index 000000000000..eca72b80711f --- /dev/null +++ b/test/combine.c @@ -0,0 +1,313 @@ +/**************************************************************************** + * Copyright 2021,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: combine.c,v 1.23 2022/12/10 22:28:50 tom Exp $ + */ + +#include <test.priv.h> + +#if USE_WIDEC_SUPPORT + +#include <wctype.h> +#include <dump_window.h> +#include <popup_msg.h> + +static int c_opt; +static int r_opt; + +static int +next_char(int value) +{ + do { + ++value; + } while (!iswprint((wint_t) value)); + return value; +} + +static int +prev_char(int value) +{ + do { + --value; + } while (!iswprint((wint_t) value)); + return value; +} + +static void +do_row(int row, int base_ch, int over_ch) +{ + int col = 0; + bool done = FALSE; + bool reverse = (r_opt && !(row % 2)); + + move(row, col); + printw("[U+%04X]", over_ch); + do { + if (c_opt) { + wchar_t source[2]; + cchar_t target; + attr_t attr = reverse ? A_REVERSE : A_NORMAL; + + source[1] = 0; + + source[0] = (wchar_t) base_ch; + setcchar(&target, source, attr, 0, NULL); + add_wch(&target); + + source[0] = (wchar_t) over_ch; + setcchar(&target, source, attr, 0, NULL); + add_wch(&target); + } else { + wchar_t data[3]; + + data[0] = (wchar_t) base_ch; + data[1] = (wchar_t) over_ch; + data[2] = 0; + if (reverse) + attr_on(A_REVERSE, NULL); + addwstr(data); + if (reverse) + attr_off(A_REVERSE, NULL); + } + col = getcurx(stdscr); + base_ch = next_char(base_ch); + done = (col + 1 >= COLS); + } while (!done); +} + +#define LAST_OVER 0x6f + +static int +next_over(int value) +{ + if (++value > LAST_OVER) + value = 0; + return value; +} + +static int +prev_over(int value) +{ + if (--value < 0) + value = LAST_OVER; + return value; +} + +static void +do_all(int left_at, int over_it) +{ + int row; + + for (row = 0; row < LINES; ++row) { + do_row(row, left_at, 0x300 + over_it); + over_it = next_over(over_it); + } +} + +static void +show_help(WINDOW *current) +{ + /* *INDENT-OFF* */ + static struct { + int key; + CONST_FMT char * msg; + } help[] = { + { HELP_KEY_1, "Show this screen" }, + { CTRL('L'), "Repaint screen" }, + { '$', "Scroll to end of combining-character range" }, + { '+', "Scroll to next combining-character in range" }, + { KEY_DOWN, "(same as \"+\")" }, + { '-', "Scroll to previous combining-character in range" }, + { KEY_UP, "(same as \"-\")" }, + { '0', "Scroll to beginning of combining-character range" }, + { 'c', "Toggle command-line option \"-c\"" }, + { 'd', "Dump screen using scr_dump unless \"-l\" option used" }, + { 'h', "Scroll test-data left one column" }, + { 'j', "Scroll test-data down one row" }, + { 'k', "Scroll test-data up one row" }, + { 'l', "Scroll test-data right one column" }, + { 'q', "Quit" }, + { ESCAPE, "(same as \"q\")" }, + { QUIT, "(same as \"q\")" }, + { 'r', "Toggle command-line option \"-r\"" }, + }; + /* *INDENT-ON* */ + + char **msgs = typeCalloc(char *, SIZEOF(help) + 3); + size_t s; + int d = 0; + + msgs[d++] = strdup("Test diacritic combining-characters range " + "U+0300..U+036F"); + msgs[d++] = strdup(""); + for (s = 0; s < SIZEOF(help); ++s) { + char *name = strdup(keyname(help[s].key)); + size_t need = (11 + strlen(name) + strlen(help[s].msg)); + msgs[d] = typeMalloc(char, need); + _nc_SPRINTF(msgs[d], _nc_SLIMIT(need) "%-10s%s", name, help[s].msg); + free(name); + ++d; + } + popup_msg2(current, msgs); + for (s = 0; msgs[s] != 0; ++s) { + free(msgs[s]); + } + free(msgs); +} + +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: combine [options]" + ,"" + ,USAGE_COMMON + ,"Demonstrate combining-characters." + ,"" + ,"Options:" + ," -c use cchar_t data rather than wchar_t string" + ," -l FILE log window-dumps to this file" + ," -r draw even-numbered rows in reverse-video" + }; + unsigned n; + for (n = 0; n < SIZEOF(msg); ++n) { + fprintf(stderr, "%s\n", msg[n]); + } + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + +int +main(int argc, char *argv[]) +{ + int ch; + int left_at = ' '; + int over_it = 0; + bool done = FALSE; + bool log_option = FALSE; + const char *dump_log = "combine.log"; + + while ((ch = getopt(argc, argv, OPTS_COMMON "cl:r")) != -1) { + switch (ch) { + case 'c': + c_opt = TRUE; + break; + case 'l': + log_option = TRUE; + if (!open_dump(optarg)) + usage(FALSE); + break; + case 'r': + r_opt = TRUE; + break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + + setlocale(LC_ALL, ""); + initscr(); + cbreak(); + noecho(); + keypad(stdscr, TRUE); + + do { + do_all(left_at, over_it); + switch (getch()) { + case HELP_KEY_1: + show_help(stdscr); + break; + case 'q': + case QUIT: + case ESCAPE: + done = TRUE; + break; + case CTRL('L'): + redrawwin(stdscr); + break; + case 'd': + if (log_option) + dump_window(stdscr); +#if HAVE_SCR_DUMP + else + scr_dump(dump_log); +#endif + break; + case 'h': + if (left_at > ' ') + left_at = prev_char(left_at); + break; + case 'l': + left_at = next_char(left_at); + break; + case 'c': + c_opt = !c_opt; + break; + case 'r': + r_opt = !r_opt; + break; + case KEY_HOME: + case '0': + over_it = 0; + break; + case KEY_END: + case '$': + over_it = LAST_OVER; + break; + case KEY_UP: + case 'k': + case '-': + over_it = prev_over(over_it); + break; + case KEY_DOWN: + case 'j': + case '+': + over_it = next_over(over_it); + break; + } + } while (!done); + + endwin(); + + ExitProgram(EXIT_SUCCESS); +} +#else +int +main(void) +{ + printf("This program requires wide-curses functions\n"); + ExitProgram(EXIT_FAILURE); +} +#endif diff --git a/test/configure b/test/configure index 3c4ece5afe1c..4f155cd78d0e 100755 --- a/test/configure +++ b/test/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20210105. +# Generated by Autoconf 2.52.20231210. # -# Copyright 2003-2020,2021 Thomas E. Dickey +# Copyright 2003-2022,2023 Thomas E. Dickey # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -33,9 +33,9 @@ fi as_me=`echo "$0" |sed 's,.*[\\/],,'` if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr + as_expr="expr" else - as_expr=false + as_expr="false" fi rm -f conf$$ conf$$.exe conf$$.file @@ -50,7 +50,7 @@ if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' fi elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + as_ln_s='ln' else as_ln_s='cp -p' fi @@ -107,6 +107,42 @@ SHELL=${CONFIG_SHELL-/bin/sh} : "${ac_max_here_lines=38}" ac_unique_file="ncurses.c" +# Factoring default headers for most tests. +ac_includes_default="\ +#include <stdio.h> +#if HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif +#if HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif +#if STDC_HEADERS +# include <stdlib.h> +# include <stddef.h> +#else +# if HAVE_STDLIB_H +# include <stdlib.h> +# endif +#endif +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H +# include <memory.h> +# endif +# include <string.h> +#endif +#if HAVE_STRINGS_H +# include <strings.h> +#endif +#if HAVE_INTTYPES_H +# include <inttypes.h> +#else +# if HAVE_STDINT_H +# include <stdint.h> +# endif +#endif +#if HAVE_UNISTD_H +# include <unistd.h> +#endif" # Initialize some variables set by options. ac_init_help= @@ -669,8 +705,10 @@ Optional Packages: General Options: --disable-stripping do not strip (debug info) installed executables + --with-strip-program=XX specify program to use when stripping in install + --enable-stdnoreturn enable C11 _Noreturn feature for diagnostics --enable-string-hacks work around bogus compiler/loader warnings - --with-pkg-config{=path} enable/disable use of pkg-config + --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD --disable-echo do not display "compiling" commands Curses Version-dependent Options: --with-ncurses-wrap-prefix naming-prefix for ncurses wrapped-variables @@ -687,10 +725,10 @@ Curses Version-dependent Options: --with-neXtaw link with neXT Athena library --with-XawPlus link with Athena-Plus library --with-x use the X Window System - --with-x11-rgb=FILE file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt) - --with-form-libname=XXX override form basename of library - --with-menu-libname=XXX override menu basename of library - --with-panel-libname=XXX override panel basename of library + --with-x11-rgb=FILE obtain X11 color definitions from FILE (default: EPREFIX/lib/X11/rgb.txt) + --with-form-libname[=XXX] override ifelse(,,form,) basename of library + --with-menu-libname[=XXX] override ifelse(,,menu,) basename of library + --with-panel-libname[=XXX] override ifelse(,,panel,) basename of library --disable-panel disable checks for panel functions --disable-menu disable checks for menu functions --disable-form disable checks for form functions @@ -757,7 +795,7 @@ test -n "$ac_init_help" && exit 0 if "$ac_init_version"; then cat <<\EOF -Copyright 2003-2020,2021 Thomas E. Dickey +Copyright 2003-2022,2023 Thomas E. Dickey Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -771,7 +809,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52.20210105. Invocation command line was +generated by GNU Autoconf 2.52.20231210. Invocation command line was $ $0 $@ @@ -895,7 +933,7 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:898: loading site script $ac_site_file" >&5 + { echo "$as_me:936: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -906,7 +944,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:909: loading cache $cache_file" >&5 + { echo "$as_me:947: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -914,7 +952,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:917: creating cache $cache_file" >&5 + { echo "$as_me:955: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -930,21 +968,21 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case "$ac_old_set,$ac_new_set" in set,) - { echo "$as_me:933: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:971: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:937: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:975: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:943: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:981: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:945: former value: $ac_old_val" >&5 + { echo "$as_me:983: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:947: current value: $ac_new_val" >&5 + { echo "$as_me:985: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -963,9 +1001,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if "$ac_cache_corrupted"; then - { echo "$as_me:966: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:1004: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:968: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1006: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -994,10 +1032,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:997: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1035: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1000: \$? = $ac_status" >&5 + echo "$as_me:1038: \$? = $ac_status" >&5 (exit "$ac_status"); }; then ac_path_separator=';' else @@ -1029,7 +1067,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1032: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1070: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1039,11 +1077,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1042: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1080: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1046: checking build system type" >&5 +echo "$as_me:1084: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1052,16 +1090,16 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1055: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1093: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` || - { { echo "$as_me:1059: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1097: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1064: result: $ac_cv_build" >&5 +echo "$as_me:1102: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1069,7 +1107,7 @@ build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then - echo "$as_me:1072: checking host system type" >&5 + echo "$as_me:1110: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1078,12 +1116,12 @@ else test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` || - { { echo "$as_me:1081: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1119: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1086: result: $ac_cv_host" >&5 +echo "$as_me:1124: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1109,13 +1147,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1112: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1150: result: Configuring for $cf_cv_system_name" >&5 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$as_me:1116: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1154: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 - { { echo "$as_me:1118: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1156: error: \"Please remove config.cache and try again.\"" >&5 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} { (exit 1); exit 1; }; } fi @@ -1133,7 +1171,7 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed -echo "$as_me:1136: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:1174: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -1153,11 +1191,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1156: result: yes" >&5 + echo "$as_me:1194: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1160: result: no" >&5 + echo "$as_me:1198: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -1171,7 +1209,7 @@ ac_main_return="return" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1174: checking for $ac_word" >&5 +echo "$as_me:1212: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1186,7 +1224,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1189: found $ac_dir/$ac_word" >&5 +echo "$as_me:1227: found $ac_dir/$ac_word" >&5 break done @@ -1194,10 +1232,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1197: result: $CC" >&5 + echo "$as_me:1235: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1200: result: no" >&5 + echo "$as_me:1238: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1206,7 +1244,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1209: checking for $ac_word" >&5 +echo "$as_me:1247: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1221,7 +1259,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1224: found $ac_dir/$ac_word" >&5 +echo "$as_me:1262: found $ac_dir/$ac_word" >&5 break done @@ -1229,10 +1267,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1232: result: $ac_ct_CC" >&5 + echo "$as_me:1270: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1235: result: no" >&5 + echo "$as_me:1273: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1245,7 +1283,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1248: checking for $ac_word" >&5 +echo "$as_me:1286: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1260,7 +1298,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1263: found $ac_dir/$ac_word" >&5 +echo "$as_me:1301: found $ac_dir/$ac_word" >&5 break done @@ -1268,10 +1306,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1271: result: $CC" >&5 + echo "$as_me:1309: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1274: result: no" >&5 + echo "$as_me:1312: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1280,7 +1318,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1283: checking for $ac_word" >&5 +echo "$as_me:1321: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1295,7 +1333,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1298: found $ac_dir/$ac_word" >&5 +echo "$as_me:1336: found $ac_dir/$ac_word" >&5 break done @@ -1303,10 +1341,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1306: result: $ac_ct_CC" >&5 + echo "$as_me:1344: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1309: result: no" >&5 + echo "$as_me:1347: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1319,7 +1357,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1322: checking for $ac_word" >&5 +echo "$as_me:1360: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1339,7 +1377,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then continue fi ac_cv_prog_CC="cc" -echo "$as_me:1342: found $ac_dir/$ac_word" >&5 +echo "$as_me:1380: found $ac_dir/$ac_word" >&5 break done @@ -1361,10 +1399,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1364: result: $CC" >&5 + echo "$as_me:1402: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1367: result: no" >&5 + echo "$as_me:1405: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1375,7 +1413,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1378: checking for $ac_word" >&5 +echo "$as_me:1416: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1390,7 +1428,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1393: found $ac_dir/$ac_word" >&5 +echo "$as_me:1431: found $ac_dir/$ac_word" >&5 break done @@ -1398,10 +1436,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1401: result: $CC" >&5 + echo "$as_me:1439: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1404: result: no" >&5 + echo "$as_me:1442: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1414,7 +1452,7 @@ if test -z "$CC"; then 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:1417: checking for $ac_word" >&5 +echo "$as_me:1455: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1429,7 +1467,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1432: found $ac_dir/$ac_word" >&5 +echo "$as_me:1470: found $ac_dir/$ac_word" >&5 break done @@ -1437,10 +1475,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1440: result: $ac_ct_CC" >&5 + echo "$as_me:1478: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1443: result: no" >&5 + echo "$as_me:1481: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1452,32 +1490,32 @@ fi fi -test -z "$CC" && { { echo "$as_me:1455: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1493: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1460:" \ +echo "$as_me:1498:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo "$2"` -{ (eval echo "$as_me:1463: \"$ac_compiler --version </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1501: \"$ac_compiler --version </dev/null >&5\"") >&5 (eval $ac_compiler --version </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1466: \$? = $ac_status" >&5 + echo "$as_me:1504: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:1468: \"$ac_compiler -v </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1506: \"$ac_compiler -v </dev/null >&5\"") >&5 (eval $ac_compiler -v </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1471: \$? = $ac_status" >&5 + echo "$as_me:1509: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:1473: \"$ac_compiler -V </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1511: \"$ac_compiler -V </dev/null >&5\"") >&5 (eval $ac_compiler -V </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1476: \$? = $ac_status" >&5 + echo "$as_me:1514: \$? = $ac_status" >&5 (exit "$ac_status"); } cat >"conftest.$ac_ext" <<_ACEOF -#line 1480 "configure" +#line 1518 "configure" #include "confdefs.h" int @@ -1493,13 +1531,13 @@ ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1496: checking for C compiler default output" >&5 +echo "$as_me:1534: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'` -if { (eval echo "$as_me:1499: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1537: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1502: \$? = $ac_status" >&5 + echo "$as_me:1540: \$? = $ac_status" >&5 (exit "$ac_status"); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last @@ -1522,34 +1560,34 @@ done else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -{ { echo "$as_me:1525: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1563: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1531: result: $ac_file" >&5 +echo "$as_me:1569: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1536: checking whether the C compiler works" >&5 +echo "$as_me:1574: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1542: \"$ac_try\"") >&5 + { (eval echo "$as_me:1580: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1545: \$? = $ac_status" >&5 + echo "$as_me:1583: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1552: error: cannot run C compiled programs. + { { echo "$as_me:1590: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1557,24 +1595,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1560: result: yes" >&5 +echo "$as_me:1598: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe "conftest$ac_cv_exeext" ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1567: checking whether we are cross compiling" >&5 +echo "$as_me:1605: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1569: result: $cross_compiling" >&5 +echo "$as_me:1607: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1572: checking for executable suffix" >&5 +echo "$as_me:1610: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1574: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1612: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1577: \$? = $ac_status" >&5 + echo "$as_me:1615: \$? = $ac_status" >&5 (exit "$ac_status"); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1590,25 +1628,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1593: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1631: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f "conftest$ac_cv_exeext" -echo "$as_me:1599: result: $ac_cv_exeext" >&5 +echo "$as_me:1637: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f "conftest.$ac_ext" EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1605: checking for object suffix" >&5 +echo "$as_me:1643: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 1611 "configure" +#line 1649 "configure" #include "confdefs.h" int @@ -1620,10 +1658,10 @@ main (void) } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1623: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1661: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1626: \$? = $ac_status" >&5 + echo "$as_me:1664: \$? = $ac_status" >&5 (exit "$ac_status"); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1635,24 +1673,24 @@ done else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -{ { echo "$as_me:1638: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1676: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f "conftest.$ac_cv_objext" "conftest.$ac_ext" fi -echo "$as_me:1645: result: $ac_cv_objext" >&5 +echo "$as_me:1683: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1649: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1687: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 1655 "configure" +#line 1693 "configure" #include "confdefs.h" int @@ -1667,16 +1705,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1670: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1708: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1673: \$? = $ac_status" >&5 + echo "$as_me:1711: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1676: \"$ac_try\"") >&5 + { (eval echo "$as_me:1714: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1679: \$? = $ac_status" >&5 + echo "$as_me:1717: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_compiler_gnu=yes else @@ -1688,19 +1726,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1691: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1729: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1697: checking whether $CC accepts -g" >&5 +echo "$as_me:1735: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 1703 "configure" +#line 1741 "configure" #include "confdefs.h" int @@ -1712,16 +1750,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1715: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1753: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1718: \$? = $ac_status" >&5 + echo "$as_me:1756: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1721: \"$ac_try\"") >&5 + { (eval echo "$as_me:1759: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1724: \$? = $ac_status" >&5 + echo "$as_me:1762: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cc_g=yes else @@ -1731,7 +1769,7 @@ ac_cv_prog_cc_g=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:1734: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1772: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1758,16 +1796,16 @@ cat >"conftest.$ac_ext" <<_ACEOF #endif _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1761: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1799: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1764: \$? = $ac_status" >&5 + echo "$as_me:1802: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1767: \"$ac_try\"") >&5 + { (eval echo "$as_me:1805: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1770: \$? = $ac_status" >&5 + echo "$as_me:1808: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then for ac_declaration in \ ''\ @@ -1779,7 +1817,7 @@ if { (eval echo "$as_me:1761: \"$ac_compile\"") >&5 'void exit (int);' do cat >"conftest.$ac_ext" <<_ACEOF -#line 1782 "configure" +#line 1820 "configure" #include "confdefs.h" #include <stdlib.h> $ac_declaration @@ -1792,16 +1830,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1795: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1833: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1798: \$? = $ac_status" >&5 + echo "$as_me:1836: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1801: \"$ac_try\"") >&5 + { (eval echo "$as_me:1839: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1804: \$? = $ac_status" >&5 + echo "$as_me:1842: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -1811,7 +1849,7 @@ continue fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 1814 "configure" +#line 1852 "configure" #include "confdefs.h" $ac_declaration int @@ -1823,16 +1861,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1826: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1864: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1829: \$? = $ac_status" >&5 + echo "$as_me:1867: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1832: \"$ac_try\"") >&5 + { (eval echo "$as_me:1870: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1835: \$? = $ac_status" >&5 + echo "$as_me:1873: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -1862,11 +1900,11 @@ ac_main_return="return" GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:1865: checking version of $CC" >&5 + echo "$as_me:1903: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 - GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:1869: result: $GCC_VERSION" >&5 + echo "$as_me:1907: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi @@ -1875,12 +1913,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case "$host_os" in (linux*|gnu*) - echo "$as_me:1878: checking if this is really Intel C compiler" >&5 + echo "$as_me:1916: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat >"conftest.$ac_ext" <<_ACEOF -#line 1883 "configure" +#line 1921 "configure" #include "confdefs.h" int @@ -1889,7 +1927,7 @@ main (void) #ifdef __INTEL_COMPILER #else -make an error +#error __INTEL_COMPILER is not defined #endif ; @@ -1897,16 +1935,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1900: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1938: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1903: \$? = $ac_status" >&5 + echo "$as_me:1941: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1906: \"$ac_try\"") >&5 + { (eval echo "$as_me:1944: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1909: \$? = $ac_status" >&5 + echo "$as_me:1947: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -1917,7 +1955,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:1920: result: $INTEL_COMPILER" >&5 + echo "$as_me:1958: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -1926,11 +1964,11 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:1929: checking if this is really Clang C compiler" >&5 + echo "$as_me:1967: checking if this is really Clang C compiler" >&5 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" cat >"conftest.$ac_ext" <<_ACEOF -#line 1933 "configure" +#line 1971 "configure" #include "confdefs.h" int @@ -1939,7 +1977,7 @@ main (void) #ifdef __clang__ #else -make an error +#error __clang__ is not defined #endif ; @@ -1947,16 +1985,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1950: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1988: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1953: \$? = $ac_status" >&5 + echo "$as_me:1991: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1956: \"$ac_try\"") >&5 + { (eval echo "$as_me:1994: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1959: \$? = $ac_status" >&5 + echo "$as_me:1997: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then CLANG_COMPILER=yes @@ -1966,7 +2004,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:1969: result: $CLANG_COMPILER" >&5 + echo "$as_me:2007: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi @@ -1975,30 +2013,30 @@ CLANG_VERSION=none if test "x$CLANG_COMPILER" = "xyes" ; then case "$CC" in (c[1-9][0-9]|*/c[1-9][0-9]) - { echo "$as_me:1978: WARNING: replacing broken compiler alias $CC" >&5 + { echo "$as_me:2016: WARNING: replacing broken compiler alias $CC" >&5 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;} CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`" CC=clang ;; esac - echo "$as_me:1985: checking version of $CC" >&5 + echo "$as_me:2023: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$CLANG_VERSION" && CLANG_VERSION=unknown - echo "$as_me:1989: result: $CLANG_VERSION" >&5 + echo "$as_me:2027: result: $CLANG_VERSION" >&5 echo "${ECHO_T}$CLANG_VERSION" >&6 for cf_clang_opt in \ -Qunused-arguments \ -Wno-error=implicit-function-declaration do - echo "$as_me:1996: checking if option $cf_clang_opt works" >&5 + echo "$as_me:2034: checking if option $cf_clang_opt works" >&5 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $cf_clang_opt" cat >"conftest.$ac_ext" <<_ACEOF -#line 2001 "configure" +#line 2039 "configure" #include "confdefs.h" #include <stdio.h> @@ -2012,16 +2050,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:2015: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2053: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2018: \$? = $ac_status" >&5 + echo "$as_me:2056: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:2021: \"$ac_try\"") >&5 + { (eval echo "$as_me:2059: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2024: \$? = $ac_status" >&5 + echo "$as_me:2062: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_clang_optok=yes @@ -2032,13 +2070,13 @@ cat "conftest.$ac_ext" >&5 cf_clang_optok=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:2035: result: $cf_clang_optok" >&5 + echo "$as_me:2073: result: $cf_clang_optok" >&5 echo "${ECHO_T}$cf_clang_optok" >&6 CFLAGS="$cf_save_CFLAGS" if test "$cf_clang_optok" = yes; then test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 -echo "${as_me:-configure}:2041: testing adding option $cf_clang_opt ..." 1>&5 +echo "${as_me:-configure}:2079: testing adding option $cf_clang_opt ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_clang_opt" @@ -2047,7 +2085,7 @@ echo "${as_me:-configure}:2041: testing adding option $cf_clang_opt ..." 1>&5 done fi -echo "$as_me:2050: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:2088: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2055,7 +2093,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >"conftest.$ac_ext" <<_ACEOF -#line 2058 "configure" +#line 2096 "configure" #include "confdefs.h" #include <stdarg.h> #include <stdio.h> @@ -2064,9 +2102,7 @@ cat >"conftest.$ac_ext" <<_ACEOF /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; +static char *e (char **p, int i) { return p[i]; } @@ -2104,16 +2140,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2107: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2143: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2110: \$? = $ac_status" >&5 + echo "$as_me:2146: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2113: \"$ac_try\"") >&5 + { (eval echo "$as_me:2149: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2116: \$? = $ac_status" >&5 + echo "$as_me:2152: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2130,10 +2166,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2133: result: none needed" >&5 + echo "$as_me:2169: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2136: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2172: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -2141,13 +2177,13 @@ esac # This should have been defined by AC_PROG_CC : "${CC:=cc}" -echo "$as_me:2144: checking \$CFLAGS variable" >&5 +echo "$as_me:2180: checking \$CFLAGS variable" >&5 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 case "x$CFLAGS" in (*-[IUD]*) - echo "$as_me:2148: result: broken" >&5 + echo "$as_me:2184: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2150: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 + { echo "$as_me:2186: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} cf_flags="$CFLAGS" CFLAGS= @@ -2255,22 +2291,22 @@ fi done ;; (*) - echo "$as_me:2258: result: ok" >&5 + echo "$as_me:2294: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2263: checking \$CC variable" >&5 +echo "$as_me:2299: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in (*[\ \ ]-*) - echo "$as_me:2267: result: broken" >&5 + echo "$as_me:2303: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2269: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:2305: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` - cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'` + cf_flags=`echo "$CC" | sed -e "s%^$cf_prog%%"` CC="$cf_prog" for cf_arg in $cf_flags do @@ -2383,24 +2419,24 @@ fi done test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 -echo "${as_me:-configure}:2386: testing resulting CC: '$CC' ..." 1>&5 +echo "${as_me:-configure}:2422: testing resulting CC: '$CC' ..." 1>&5 test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 -echo "${as_me:-configure}:2390: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2426: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 -echo "${as_me:-configure}:2394: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2430: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ;; (*) - echo "$as_me:2398: result: ok" >&5 + echo "$as_me:2434: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2403: checking for inline" >&5 +echo "$as_me:2439: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2408,25 +2444,25 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >"conftest.$ac_ext" <<_ACEOF -#line 2411 "configure" +#line 2447 "configure" #include "confdefs.h" #ifndef __cplusplus -static $ac_kw int static_foo () {return 0; } -$ac_kw int foo () {return 0; } +static $ac_kw int static_foo (void) {return 0; } +$ac_kw int foo (void) {return 0; } #endif _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2420: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2456: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2423: \$? = $ac_status" >&5 + echo "$as_me:2459: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2426: \"$ac_try\"") >&5 + { (eval echo "$as_me:2462: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2429: \$? = $ac_status" >&5 + echo "$as_me:2465: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -2437,7 +2473,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:2440: result: $ac_cv_c_inline" >&5 +echo "$as_me:2476: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -2456,7 +2492,7 @@ for ac_prog in ggrep grep 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:2459: checking for $ac_word" >&5 +echo "$as_me:2495: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_GREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2471,7 +2507,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_GREP="$ac_prog" -echo "$as_me:2474: found $ac_dir/$ac_word" >&5 +echo "$as_me:2510: found $ac_dir/$ac_word" >&5 break done @@ -2479,10 +2515,10 @@ fi fi GREP=$ac_cv_prog_GREP if test -n "$GREP"; then - echo "$as_me:2482: result: $GREP" >&5 + echo "$as_me:2518: result: $GREP" >&5 echo "${ECHO_T}$GREP" >&6 else - echo "$as_me:2485: result: no" >&5 + echo "$as_me:2521: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2490,7 +2526,7 @@ fi done test -n "$GREP" || GREP=": " -echo "$as_me:2493: checking for egrep" >&5 +echo "$as_me:2529: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2502,7 +2538,7 @@ else 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:2505: checking for $ac_word" >&5 +echo "$as_me:2541: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2519,7 +2555,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_EGREP="$ac_dir/$ac_word" - echo "$as_me:2522: found $ac_dir/$ac_word" >&5 + echo "$as_me:2558: found $ac_dir/$ac_word" >&5 break fi done @@ -2530,10 +2566,10 @@ fi EGREP=$ac_cv_path_EGREP if test -n "$EGREP"; then - echo "$as_me:2533: result: $EGREP" >&5 + echo "$as_me:2569: result: $EGREP" >&5 echo "${ECHO_T}$EGREP" >&6 else - echo "$as_me:2536: result: no" >&5 + echo "$as_me:2572: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2541,12 +2577,12 @@ fi done test -n "$EGREP" || EGREP=": " - test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2544: error: cannot find workable egrep" >&5 + test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2580: error: cannot find workable egrep" >&5 echo "$as_me: error: cannot find workable egrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:2549: result: $ac_cv_path_EGREP" >&5 +echo "$as_me:2585: result: $ac_cv_path_EGREP" >&5 echo "${ECHO_T}$ac_cv_path_EGREP" >&6 EGREP="$ac_cv_path_EGREP" @@ -2556,7 +2592,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" -echo "$as_me:2559: checking how to run the C preprocessor" >&5 +echo "$as_me:2595: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2577,18 +2613,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >"conftest.$ac_ext" <<_ACEOF -#line 2580 "configure" +#line 2616 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:2585: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2621: \"$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:2591: \$? = $ac_status" >&5 + echo "$as_me:2627: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2611,17 +2647,17 @@ rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >"conftest.$ac_ext" <<_ACEOF -#line 2614 "configure" +#line 2650 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:2618: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2654: \"$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:2624: \$? = $ac_status" >&5 + echo "$as_me:2660: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2658,7 +2694,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2661: result: $CPP" >&5 +echo "$as_me:2697: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2668,18 +2704,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >"conftest.$ac_ext" <<_ACEOF -#line 2671 "configure" +#line 2707 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:2676: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2712: \"$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:2682: \$? = $ac_status" >&5 + echo "$as_me:2718: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2702,17 +2738,17 @@ rm -f conftest.err "conftest.$ac_ext" # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >"conftest.$ac_ext" <<_ACEOF -#line 2705 "configure" +#line 2741 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:2709: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2745: \"$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:2715: \$? = $ac_status" >&5 + echo "$as_me:2751: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2740,7 +2776,7 @@ rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then : else - { { echo "$as_me:2743: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2779: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2756,7 +2792,7 @@ for ac_prog in mawk gawk nawk awk 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:2759: checking for $ac_word" >&5 +echo "$as_me:2795: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2771,7 +2807,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AWK="$ac_prog" -echo "$as_me:2774: found $ac_dir/$ac_word" >&5 +echo "$as_me:2810: found $ac_dir/$ac_word" >&5 break done @@ -2779,10 +2815,10 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:2782: result: $AWK" >&5 + echo "$as_me:2818: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:2785: result: no" >&5 + echo "$as_me:2821: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2801,7 +2837,7 @@ done # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2804: checking for a BSD compatible install" >&5 +echo "$as_me:2840: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -2850,7 +2886,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2853: result: $INSTALL" >&5 +echo "$as_me:2889: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2871,7 +2907,7 @@ case $INSTALL in ;; esac -echo "$as_me:2874: checking if you want to install stripped executables" >&5 +echo "$as_me:2910: checking if you want to install stripped executables" >&5 echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6 # Check whether --enable-stripping or --disable-stripping was given. @@ -2888,7 +2924,7 @@ else enable_stripping=yes fi; -echo "$as_me:2891: result: $enable_stripping" >&5 +echo "$as_me:2927: result: $enable_stripping" >&5 echo "${ECHO_T}$enable_stripping" >&6 if test "$enable_stripping" = yes @@ -2899,7 +2935,7 @@ else fi : "${INSTALL:=install}" -echo "$as_me:2902: checking if install accepts -p option" >&5 +echo "$as_me:2938: checking if install accepts -p option" >&5 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6 if test "${cf_cv_install_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2930,10 +2966,10 @@ else rm -rf ./conftest* fi -echo "$as_me:2933: result: $cf_cv_install_p" >&5 +echo "$as_me:2969: result: $cf_cv_install_p" >&5 echo "${ECHO_T}$cf_cv_install_p" >&6 -echo "$as_me:2936: checking if install needs to be told about ownership" >&5 +echo "$as_me:2972: checking if install needs to be told about ownership" >&5 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6 case `$ac_config_guess` in (*minix) @@ -2944,7 +2980,7 @@ case `$ac_config_guess` in ;; esac -echo "$as_me:2947: result: $with_install_o" >&5 +echo "$as_me:2983: result: $with_install_o" >&5 echo "${ECHO_T}$with_install_o" >&6 if test "x$with_install_o" = xyes then @@ -2953,11 +2989,77 @@ else INSTALL_OPT_O= fi +if test -n "$INSTALL_OPT_S" +then + echo "$as_me:2994: checking if you want to specify strip-program" >&5 +echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6 + +# Check whether --with-strip-program or --without-strip-program was given. +if test "${with_strip_program+set}" = set; then + withval="$with_strip_program" + with_strip_program=$withval +else + with_strip_program=no +fi; + echo "$as_me:3004: result: $with_strip_program" >&5 +echo "${ECHO_T}$with_strip_program" >&6 + if test "$with_strip_program" != no + then + echo "$as_me:3008: checking if strip-program is supported with this installer" >&5 +echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6 + cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'` + check_install_strip=no + if test -f "$cf_install_program" + then + check_install_version=`"$cf_install_program" --version 2>/dev/null | head -n 1 | grep coreutils` + if test -n "$check_install_version" + then + check_install_strip="option" + else + for check_strip_variable in STRIPBIN STRIP + do + if strings "$cf_install_program" | grep "^$check_strip_variable$" >/dev/null + then + check_install_strip="environ" + break + fi + done + fi + fi + echo "$as_me:3029: result: $check_install_strip" >&5 +echo "${ECHO_T}$check_install_strip" >&6 + case "$check_install_strip" in + (no) + { echo "$as_me:3033: WARNING: $cf_install_program does not support strip program option" >&5 +echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;} + with_strip_program=no + ;; + (environ) + cat >install.tmp <<-CF_EOF + #! $SHELL + STRIPBIN="$with_strip_program" \\ + STRIP="$with_strip_program" \\ + $INSTALL "$@" + CF_EOF + INSTALL="`pwd`/install.tmp" + chmod +x "$INSTALL" + test -n "$verbose" && echo " created $INSTALL" 1>&6 + +echo "${as_me:-configure}:3048: testing created $INSTALL ..." 1>&5 + + ;; + (option) + INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\"" + ;; + esac + fi +fi + for ac_prog in lint cppcheck splint 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:2960: checking for $ac_word" >&5 +echo "$as_me:3062: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2972,7 +3074,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LINT="$ac_prog" -echo "$as_me:2975: found $ac_dir/$ac_word" >&5 +echo "$as_me:3077: found $ac_dir/$ac_word" >&5 break done @@ -2980,10 +3082,10 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:2983: result: $LINT" >&5 + echo "$as_me:3085: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:2986: result: no" >&5 + echo "$as_me:3088: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2996,7 +3098,69 @@ case "x$LINT" in ;; esac -echo "$as_me:2999: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:3101: checking for \".PHONY\" make-support" >&5 +echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6 +if test "${cf_cv_make_PHONY+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + rm -rf conftest* + ( + mkdir conftest || exit 1 + cd conftest + cat >makefile <<'CF_EOF' +.PHONY: always +DATA=0 +always: always.out + @echo "** making $@ $(DATA)" +once: once.out + @echo "** making $@ $(DATA)" +always.out: + @echo "** making $@ $(DATA)" + echo $(DATA) > $@ +once.out: + @echo "** making $@ $(DATA)" + echo $(DATA) > $@ +CF_EOF + for cf_data in 1 2 3 + do + ${MAKE:-make} always DATA=$cf_data + ${MAKE:-make} once DATA=$cf_data + ${MAKE:-make} -t always once + if test -f always ; then + echo "no (case 1)" > ../conftest.tmp + elif test ! -f always.out ; then + echo "no (case 2)" > ../conftest.tmp + elif test ! -f once.out ; then + echo "no (case 3)" > ../conftest.tmp + elif ! cmp -s always.out once.out ; then + echo "no (case 4)" > ../conftest.tmp + diff always.out once.out + else + cf_check="`cat always.out`" + if test "x$cf_check" != "x$cf_data" ; then + echo "no (case 5)" > ../conftest.tmp + else + echo yes > ../conftest.tmp + rm -f ./*.out + continue + fi + fi + break + done + ) >&5 2>&1 + cf_cv_make_PHONY="`cat conftest.tmp`" + rm -rf conftest* + +fi +echo "$as_me:3156: result: $cf_cv_make_PHONY" >&5 +echo "${ECHO_T}$cf_cv_make_PHONY" >&6 +MAKE_NO_PHONY="#" +MAKE_PHONY="#" +test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY= +test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY= + +echo "$as_me:3163: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3023,7 +3187,7 @@ else fi fi -echo "$as_me:3026: result: $cf_cv_mixedcase" >&5 +echo "$as_me:3190: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -3034,7 +3198,7 @@ for ac_prog in exctags ctags 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:3037: checking for $ac_word" >&5 +echo "$as_me:3201: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CTAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3049,7 +3213,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CTAGS="$ac_prog" -echo "$as_me:3052: found $ac_dir/$ac_word" >&5 +echo "$as_me:3216: found $ac_dir/$ac_word" >&5 break done @@ -3057,10 +3221,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:3060: result: $CTAGS" >&5 + echo "$as_me:3224: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:3063: result: no" >&5 + echo "$as_me:3227: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3071,7 +3235,7 @@ for ac_prog in exetags etags 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:3074: checking for $ac_word" >&5 +echo "$as_me:3238: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ETAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3086,7 +3250,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ETAGS="$ac_prog" -echo "$as_me:3089: found $ac_dir/$ac_word" >&5 +echo "$as_me:3253: found $ac_dir/$ac_word" >&5 break done @@ -3094,10 +3258,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:3097: result: $ETAGS" >&5 + echo "$as_me:3261: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:3100: result: no" >&5 + echo "$as_me:3264: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3106,7 +3270,7 @@ done # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. set dummy ${CTAGS:-ctags}; ac_word=$2 -echo "$as_me:3109: checking for $ac_word" >&5 +echo "$as_me:3273: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3121,7 +3285,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_LOWER_TAGS="yes" -echo "$as_me:3124: found $ac_dir/$ac_word" >&5 +echo "$as_me:3288: found $ac_dir/$ac_word" >&5 break done @@ -3130,17 +3294,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:3133: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:3297: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:3136: result: no" >&5 + echo "$as_me:3300: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$cf_cv_mixedcase" = yes ; then # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. set dummy ${ETAGS:-etags}; ac_word=$2 -echo "$as_me:3143: checking for $ac_word" >&5 +echo "$as_me:3307: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3155,7 +3319,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_UPPER_TAGS="yes" -echo "$as_me:3158: found $ac_dir/$ac_word" >&5 +echo "$as_me:3322: found $ac_dir/$ac_word" >&5 break done @@ -3164,10 +3328,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:3167: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:3331: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:3170: result: no" >&5 + echo "$as_me:3334: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3187,19 +3351,19 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:3190: checking if -lm needed for math functions" >&5 +echo "$as_me:3354: checking if -lm needed for math functions" >&5 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 if test "${cf_cv_need_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3197 "configure" +#line 3361 "configure" #include "confdefs.h" - #include <stdio.h> - #include <stdlib.h> - #include <math.h> + #include <stdio.h> + #include <stdlib.h> + #include <math.h> int main (void) @@ -3210,16 +3374,16 @@ double x = rand(); printf("result = %g\\n", pow(sin(x),x)) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:3213: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3377: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3216: \$? = $ac_status" >&5 + echo "$as_me:3380: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:3219: \"$ac_try\"") >&5 + { (eval echo "$as_me:3383: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3222: \$? = $ac_status" >&5 + echo "$as_me:3386: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_libm=no else @@ -3229,11 +3393,75 @@ cf_cv_need_libm=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:3232: result: $cf_cv_need_libm" >&5 +echo "$as_me:3396: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 + if test "$cf_cv_need_libm" = yes then -MATH_LIB=-lm + + cf_save_LIBS="$LIBS" + LIBS="$LIBS -lm" + echo "$as_me:3404: checking if -lm is available for math functions" >&5 +echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6 +if test "${cf_cv_have_libm+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >"conftest.$ac_ext" <<_ACEOF +#line 3411 "configure" +#include "confdefs.h" + + #include <stdio.h> + #include <stdlib.h> + #include <math.h> + +int +main (void) +{ +double x = rand(); printf("result = %g\\n", pow(sin(x),x)) + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:3427: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3430: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:3433: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3436: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_libm=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_have_libm=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +fi +echo "$as_me:3446: result: $cf_cv_have_libm" >&5 +echo "${ECHO_T}$cf_cv_have_libm" >&6 + LIBS="$cf_save_LIBS" + + if test "$cf_cv_have_libm" = yes + then + MATH_LIB=-lm + fi +else + cf_cv_have_libm=yes +fi + +if test "$cf_cv_have_libm" = yes +then + +cat >>confdefs.h <<\EOF +#define HAVE_MATH_FUNCS 1 +EOF + fi top_builddir=`pwd` @@ -3270,7 +3498,7 @@ includesubdir="" cf_cv_screen=curses cf_cv_libtype= -echo "$as_me:3273: checking for fgrep" >&5 +echo "$as_me:3501: checking for fgrep" >&5 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3282,7 +3510,7 @@ else 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:3285: checking for $ac_word" >&5 +echo "$as_me:3513: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3299,7 +3527,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_FGREP="$ac_dir/$ac_word" - echo "$as_me:3302: found $ac_dir/$ac_word" >&5 + echo "$as_me:3530: found $ac_dir/$ac_word" >&5 break fi done @@ -3310,10 +3538,10 @@ fi FGREP=$ac_cv_path_FGREP if test -n "$FGREP"; then - echo "$as_me:3313: result: $FGREP" >&5 + echo "$as_me:3541: result: $FGREP" >&5 echo "${ECHO_T}$FGREP" >&6 else - echo "$as_me:3316: result: no" >&5 + echo "$as_me:3544: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3321,15 +3549,99 @@ fi done test -n "$FGREP" || FGREP=": " - test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3324: error: cannot find workable fgrep" >&5 + test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3552: error: cannot find workable fgrep" >&5 echo "$as_me: error: cannot find workable fgrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:3329: result: $ac_cv_path_FGREP" >&5 +echo "$as_me:3557: result: $ac_cv_path_FGREP" >&5 echo "${ECHO_T}$ac_cv_path_FGREP" >&6 FGREP="$ac_cv_path_FGREP" +echo "$as_me:3561: checking if you want to use C11 _Noreturn feature" >&5 +echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 + +# Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. +if test "${enable_stdnoreturn+set}" = set; then + enableval="$enable_stdnoreturn" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + enable_stdnoreturn=yes + else + enable_stdnoreturn=no + fi +else + enableval=no + enable_stdnoreturn=no + +fi; +echo "$as_me:3578: result: $enable_stdnoreturn" >&5 +echo "${ECHO_T}$enable_stdnoreturn" >&6 + +if test $enable_stdnoreturn = yes; then +echo "$as_me:3582: checking for C11 _Noreturn feature" >&5 +echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 +if test "${cf_cv_c11_noreturn+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 3588 "configure" +#include "confdefs.h" + +$ac_includes_default +#include <stdnoreturn.h> +static _Noreturn void giveup(void) { exit(0); } + +int +main (void) +{ +if (feof(stdin)) giveup() + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:3604: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3607: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:3610: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3613: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_c11_noreturn=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_c11_noreturn=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + +fi +echo "$as_me:3624: result: $cf_cv_c11_noreturn" >&5 +echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 +else + cf_cv_c11_noreturn=no, +fi + +if test "$cf_cv_c11_noreturn" = yes; then + +cat >>confdefs.h <<\EOF +#define HAVE_STDNORETURN_H 1 +EOF + +cat >>confdefs.h <<EOF +#define STDC_NORETURN _Noreturn +EOF + + HAVE_STDNORETURN_H=1 +else + HAVE_STDNORETURN_H=0 +fi + if test "$GCC" = yes || test "$GXX" = yes then cat > conftest.i <<EOF @@ -3348,10 +3660,11 @@ cat > conftest.i <<EOF EOF if test "$GCC" = yes then - { echo "$as_me:3351: checking for $CC __attribute__ directives..." >&5 + { echo "$as_me:3663: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > "conftest.$ac_ext" <<EOF -#line 3354 "${as_me:-configure}" +#line 3666 "${as_me:-configure}" +#include <stdio.h> #include "confdefs.h" #include "conftest.h" #include "conftest.i" @@ -3366,8 +3679,8 @@ cat > "conftest.$ac_ext" <<EOF #define GCC_SCANFLIKE(fmt,var) /*nothing*/ #endif extern void wow(char *,...) GCC_SCANFLIKE(1,2); -extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN; -extern void foo(void) GCC_NORETURN; +extern GCC_NORETURN void oops(char *,...) GCC_PRINTFLIKE(1,2); +extern GCC_NORETURN void foo(void); int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) { (void)argc; (void)argv; return 0; } EOF cf_printf_attribute=no @@ -3400,12 +3713,12 @@ EOF ;; esac - if { (eval echo "$as_me:3403: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:3716: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3406: \$? = $ac_status" >&5 + echo "$as_me:3719: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:3408: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:3721: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -3464,7 +3777,7 @@ fi rm -rf ./conftest* fi -echo "$as_me:3467: checking if you want to work around bogus compiler/loader warnings" >&5 +echo "$as_me:3780: checking if you want to work around bogus compiler/loader warnings" >&5 echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 # Check whether --enable-string-hacks or --disable-string-hacks was given. @@ -3474,7 +3787,7 @@ if test "${enable_string_hacks+set}" = set; then else enable_string_hacks=no fi; -echo "$as_me:3477: result: $enable_string_hacks" >&5 +echo "$as_me:3790: result: $enable_string_hacks" >&5 echo "${ECHO_T}$enable_string_hacks" >&6 if test "x$enable_string_hacks" = "xyes"; then @@ -3483,15 +3796,15 @@ cat >>confdefs.h <<\EOF #define USE_STRING_HACKS 1 EOF - { echo "$as_me:3486: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 + { echo "$as_me:3799: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;} - echo "$as_me:3488: checking for strlcat" >&5 + echo "$as_me:3801: checking for strlcat" >&5 echo $ECHO_N "checking for strlcat... $ECHO_C" >&6 if test "${ac_cv_func_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3494 "configure" +#line 3807 "configure" #include "confdefs.h" #define strlcat autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -3522,16 +3835,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:3525: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3838: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3528: \$? = $ac_status" >&5 + echo "$as_me:3841: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:3531: \"$ac_try\"") >&5 + { (eval echo "$as_me:3844: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3534: \$? = $ac_status" >&5 + echo "$as_me:3847: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_strlcat=yes else @@ -3541,7 +3854,7 @@ ac_cv_func_strlcat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:3544: result: $ac_cv_func_strlcat" >&5 +echo "$as_me:3857: result: $ac_cv_func_strlcat" >&5 echo "${ECHO_T}$ac_cv_func_strlcat" >&6 if test "$ac_cv_func_strlcat" = yes; then @@ -3551,7 +3864,7 @@ EOF else - echo "$as_me:3554: checking for strlcat in -lbsd" >&5 + echo "$as_me:3867: checking for strlcat in -lbsd" >&5 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3559,7 +3872,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 3562 "configure" +#line 3875 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3568,7 +3881,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char strlcat (); +char strlcat (void); int main (void) { @@ -3578,16 +3891,16 @@ strlcat (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:3581: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3894: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3584: \$? = $ac_status" >&5 + echo "$as_me:3897: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:3587: \"$ac_try\"") >&5 + { (eval echo "$as_me:3900: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3590: \$? = $ac_status" >&5 + echo "$as_me:3903: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_strlcat=yes else @@ -3598,7 +3911,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3601: result: $ac_cv_lib_bsd_strlcat" >&5 +echo "$as_me:3914: result: $ac_cv_lib_bsd_strlcat" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6 if test "$ac_cv_lib_bsd_strlcat" = yes; then @@ -3621,23 +3934,23 @@ LIBS="$cf_add_libs" for ac_header in bsd/string.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3624: checking for $ac_header" >&5 +echo "$as_me:3937: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3630 "configure" +#line 3943 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3634: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:3947: \"$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:3640: \$? = $ac_status" >&5 + echo "$as_me:3953: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3656,7 +3969,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:3659: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:3972: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -3677,13 +3990,13 @@ fi for ac_func in strlcpy snprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:3680: checking for $ac_func" >&5 +echo "$as_me:3993: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3686 "configure" +#line 3999 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -3714,16 +4027,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:3717: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4030: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3720: \$? = $ac_status" >&5 + echo "$as_me:4033: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:3723: \"$ac_try\"") >&5 + { (eval echo "$as_me:4036: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3726: \$? = $ac_status" >&5 + echo "$as_me:4039: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -3733,7 +4046,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:3736: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:4049: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -3745,14 +4058,14 @@ done fi -echo "$as_me:3748: checking if the POSIX test-macros are already defined" >&5 +echo "$as_me:4061: checking if the POSIX test-macros are already defined" >&5 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 if test "${cf_cv_posix_visible+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3755 "configure" +#line 4068 "configure" #include "confdefs.h" #include <stdio.h> int @@ -3771,16 +4084,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3774: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4087: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3777: \$? = $ac_status" >&5 + echo "$as_me:4090: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3780: \"$ac_try\"") >&5 + { (eval echo "$as_me:4093: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3783: \$? = $ac_status" >&5 + echo "$as_me:4096: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_visible=no else @@ -3791,7 +4104,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:3794: result: $cf_cv_posix_visible" >&5 +echo "$as_me:4107: result: $cf_cv_posix_visible" >&5 echo "${ECHO_T}$cf_cv_posix_visible" >&6 if test "$cf_cv_posix_visible" = no; then @@ -3804,9 +4117,6 @@ case "$host_os" in (aix[4-7]*) cf_xopen_source="-D_ALL_SOURCE" ;; -(msys) - cf_XOPEN_SOURCE=600 - ;; (darwin[0-8].*) cf_xopen_source="-D_APPLE_C_SOURCE" ;; @@ -3832,18 +4142,18 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) +(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) cf_gnu_xopen_source=$cf_XOPEN_SOURCE -echo "$as_me:3839: checking if this is the GNU C library" >&5 +echo "$as_me:4149: checking if this is the GNU C library" >&5 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 if test "${cf_cv_gnu_library+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 3846 "configure" +#line 4156 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3862,16 +4172,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3865: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4175: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3868: \$? = $ac_status" >&5 + echo "$as_me:4178: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3871: \"$ac_try\"") >&5 + { (eval echo "$as_me:4181: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3874: \$? = $ac_status" >&5 + echo "$as_me:4184: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library=yes else @@ -3882,7 +4192,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:3885: result: $cf_cv_gnu_library" >&5 +echo "$as_me:4195: result: $cf_cv_gnu_library" >&5 echo "${ECHO_T}$cf_cv_gnu_library" >&6 if test x$cf_cv_gnu_library = xyes; then @@ -3890,7 +4200,7 @@ if test x$cf_cv_gnu_library = xyes; then # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE # was changed to help a little. newlib incorporated the change about 4 # years later. - echo "$as_me:3893: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo "$as_me:4203: checking if _DEFAULT_SOURCE can be used as a basis" >&5 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 if test "${cf_cv_gnu_library_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3902,7 +4212,7 @@ else CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 3905 "configure" +#line 4215 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3921,16 +4231,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:3924: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4234: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3927: \$? = $ac_status" >&5 + echo "$as_me:4237: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:3930: \"$ac_try\"") >&5 + { (eval echo "$as_me:4240: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3933: \$? = $ac_status" >&5 + echo "$as_me:4243: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library_219=yes else @@ -3942,12 +4252,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save" fi -echo "$as_me:3945: result: $cf_cv_gnu_library_219" >&5 +echo "$as_me:4255: result: $cf_cv_gnu_library_219" >&5 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 if test "x$cf_cv_gnu_library_219" = xyes; then cf_save="$CPPFLAGS" - echo "$as_me:3950: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo "$as_me:4260: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4052,7 +4362,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 4055 "configure" +#line 4365 "configure" #include "confdefs.h" #include <limits.h> @@ -4072,16 +4382,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4075: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4385: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4078: \$? = $ac_status" >&5 + echo "$as_me:4388: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4081: \"$ac_try\"") >&5 + { (eval echo "$as_me:4391: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4084: \$? = $ac_status" >&5 + echo "$as_me:4394: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_dftsrc_219=yes else @@ -4092,7 +4402,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4095: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "$as_me:4405: result: $cf_cv_gnu_dftsrc_219" >&5 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" else @@ -4101,14 +4411,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 if test "x$cf_cv_gnu_dftsrc_219" != xyes; then - echo "$as_me:4104: checking if we must define _GNU_SOURCE" >&5 + echo "$as_me:4414: checking if we must define _GNU_SOURCE" >&5 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 4111 "configure" +#line 4421 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4123,16 +4433,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4126: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4436: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4129: \$? = $ac_status" >&5 + echo "$as_me:4439: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4132: \"$ac_try\"") >&5 + { (eval echo "$as_me:4442: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4135: \$? = $ac_status" >&5 + echo "$as_me:4445: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -4239,7 +4549,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 4242 "configure" +#line 4552 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4254,16 +4564,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4257: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4567: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4260: \$? = $ac_status" >&5 + echo "$as_me:4570: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4263: \"$ac_try\"") >&5 + { (eval echo "$as_me:4573: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4266: \$? = $ac_status" >&5 + echo "$as_me:4576: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -4278,12 +4588,12 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4281: result: $cf_cv_gnu_source" >&5 +echo "$as_me:4591: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 if test "$cf_cv_gnu_source" = yes then - echo "$as_me:4286: checking if we should also define _DEFAULT_SOURCE" >&5 + echo "$as_me:4596: checking if we should also define _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_default_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4293,7 +4603,7 @@ else CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 4296 "configure" +#line 4606 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4308,16 +4618,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4311: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4621: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4314: \$? = $ac_status" >&5 + echo "$as_me:4624: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4317: \"$ac_try\"") >&5 + { (eval echo "$as_me:4627: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4320: \$? = $ac_status" >&5 + echo "$as_me:4630: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_default_source=no else @@ -4328,7 +4638,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4331: result: $cf_cv_default_source" >&5 +echo "$as_me:4641: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 if test "$cf_cv_default_source" = yes then @@ -4365,16 +4675,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:4368: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:4678: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:4374: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:4684: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 4377 "configure" +#line 4687 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4382,23 +4692,23 @@ main (void) { #ifndef _POSIX_C_SOURCE -make an error +#error _POSIX_C_SOURCE is not defined #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4392: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4702: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4395: \$? = $ac_status" >&5 + echo "$as_me:4705: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4398: \"$ac_try\"") >&5 + { (eval echo "$as_me:4708: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4401: \$? = $ac_status" >&5 + echo "$as_me:4711: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -4419,7 +4729,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 4422 "configure" +#line 4732 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4427,23 +4737,23 @@ main (void) { #ifdef _POSIX_SOURCE -make an error +#error _POSIX_SOURCE is defined #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4437: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4747: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4440: \$? = $ac_status" >&5 + echo "$as_me:4750: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4443: \"$ac_try\"") >&5 + { (eval echo "$as_me:4753: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4446: \$? = $ac_status" >&5 + echo "$as_me:4756: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4454,7 +4764,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:4457: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:4767: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -4462,10 +4772,10 @@ echo "${as_me:-configure}:4457: testing ifdef from value $cf_POSIX_C_SOURCE ..." test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:4465: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:4775: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 4468 "configure" +#line 4778 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4473,23 +4783,23 @@ main (void) { #ifndef _POSIX_C_SOURCE -make an error +#error _POSIX_C_SOURCE is not defined #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4483: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4793: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4486: \$? = $ac_status" >&5 + echo "$as_me:4796: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4489: \"$ac_try\"") >&5 + { (eval echo "$as_me:4799: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4492: \$? = $ac_status" >&5 + echo "$as_me:4802: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4505,7 +4815,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4508: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:4818: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -4618,7 +4928,16 @@ fi # cf_cv_posix_visible (netbsd*) cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ;; -(openbsd[4-9]*) +(openbsd[6-9]*) + # OpenBSD 6.x has broken locale support, both compile-time and runtime. + # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html + # Abusing the conformance level is a workaround. + { echo "$as_me:4935: WARNING: this system does not provide usable locale support" >&5 +echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} + cf_xopen_source="-D_BSD_SOURCE" + cf_XOPEN_SOURCE=700 + ;; +(openbsd[4-5]*) # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw cf_xopen_source="-D_BSD_SOURCE" cf_XOPEN_SOURCE=600 @@ -4645,42 +4964,41 @@ fi # cf_cv_posix_visible ;; (*) -echo "$as_me:4648: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:4967: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 4655 "configure" +#line 4974 "configure" #include "confdefs.h" -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> +$ac_includes_default int main (void) { #ifndef _XOPEN_SOURCE -make an error +#error _XOPEN_SOURCE is not defined #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4674: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4992: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4677: \$? = $ac_status" >&5 + echo "$as_me:4995: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4680: \"$ac_try\"") >&5 + { (eval echo "$as_me:4998: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4683: \$? = $ac_status" >&5 + echo "$as_me:5001: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -4692,35 +5010,34 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 4695 "configure" +#line 5013 "configure" #include "confdefs.h" -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> +$ac_includes_default int main (void) { -#ifdef _XOPEN_SOURCE -make an error +#ifndef _XOPEN_SOURCE +#error _XOPEN_SOURCE is not defined #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4714: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5031: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4717: \$? = $ac_status" >&5 + echo "$as_me:5034: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4720: \"$ac_try\"") >&5 + { (eval echo "$as_me:5037: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4723: \$? = $ac_status" >&5 + echo "$as_me:5040: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -4729,13 +5046,13 @@ cat "conftest.$ac_ext" >&5 cf_cv_xopen_source=$cf_XOPEN_SOURCE fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS="$cf_save" + CPPFLAGS="$cf_save" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:4738: result: $cf_cv_xopen_source" >&5 +echo "$as_me:5055: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -4750,12 +5067,38 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" +for cf_add_cflags in $cf_temp_xopen_source +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_temp_xopen_source +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -4848,8 +5191,12 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + fi + cf_save_xopen_cppflags="$CPPFLAGS" + if test "$cf_cv_posix_visible" = no; then cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE @@ -4865,16 +5212,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:4868: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:5215: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:4874: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:5221: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 4877 "configure" +#line 5224 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4882,23 +5229,23 @@ main (void) { #ifndef _POSIX_C_SOURCE -make an error +#error _POSIX_C_SOURCE is not defined #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4892: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5239: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4895: \$? = $ac_status" >&5 + echo "$as_me:5242: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4898: \"$ac_try\"") >&5 + { (eval echo "$as_me:5245: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4901: \$? = $ac_status" >&5 + echo "$as_me:5248: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -4919,7 +5266,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 4922 "configure" +#line 5269 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4927,23 +5274,23 @@ main (void) { #ifdef _POSIX_SOURCE -make an error +#error _POSIX_SOURCE is defined #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4937: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5284: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4940: \$? = $ac_status" >&5 + echo "$as_me:5287: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4943: \"$ac_try\"") >&5 + { (eval echo "$as_me:5290: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4946: \$? = $ac_status" >&5 + echo "$as_me:5293: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4954,7 +5301,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:4957: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:5304: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -4962,10 +5309,10 @@ echo "${as_me:-configure}:4957: testing ifdef from value $cf_POSIX_C_SOURCE ..." test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:4965: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:5312: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 4968 "configure" +#line 5315 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4973,23 +5320,23 @@ main (void) { #ifndef _POSIX_C_SOURCE -make an error +#error _POSIX_C_SOURCE is not defined #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4983: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5330: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4986: \$? = $ac_status" >&5 + echo "$as_me:5333: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4989: \"$ac_try\"") >&5 + { (eval echo "$as_me:5336: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4992: \$? = $ac_status" >&5 + echo "$as_me:5339: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5005,7 +5352,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5008: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:5355: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -5114,17 +5461,96 @@ fi fi # cf_cv_posix_visible + # Some of these niche implementations use copy/paste, double-check... + if test "$cf_cv_xopen_source" = no ; then + test -n "$verbose" && echo " checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6 + +echo "${as_me:-configure}:5468: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +#line 5471 "configure" +#include "confdefs.h" + +$ac_includes_default + +int +main (void) +{ + +#ifndef _XOPEN_SOURCE +#error _XOPEN_SOURCE is not defined +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5489: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5492: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5495: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5498: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + { echo "$as_me:5505: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 +echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;} + CPPFLAGS="$cf_save_xopen_cppflags" +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi ;; esac if test -n "$cf_xopen_source" ; then +for cf_add_cflags in $cf_xopen_source +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6 + +echo "${as_me:-configure}:5528: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6 + +echo "${as_me:-configure}:5540: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_xopen_source +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -5199,7 +5625,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:5202: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:5628: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -5209,7 +5635,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:5212: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:5638: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -5219,20 +5645,22 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:5222: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:5648: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi +done + fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:5232: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:5660: checking if _XOPEN_SOURCE really is set" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 5235 "configure" +#line 5663 "configure" #include "confdefs.h" #include <stdlib.h> int @@ -5240,23 +5668,23 @@ main (void) { #ifndef _XOPEN_SOURCE -make an error +#error _XOPEN_SOURCE is not defined #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5250: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5678: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5253: \$? = $ac_status" >&5 + echo "$as_me:5681: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5256: \"$ac_try\"") >&5 + { (eval echo "$as_me:5684: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5259: \$? = $ac_status" >&5 + echo "$as_me:5687: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -5265,12 +5693,12 @@ cat "conftest.$ac_ext" >&5 cf_XOPEN_SOURCE_set=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:5268: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:5696: result: $cf_XOPEN_SOURCE_set" >&5 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 if test "$cf_XOPEN_SOURCE_set" = yes then cat >"conftest.$ac_ext" <<_ACEOF -#line 5273 "configure" +#line 5701 "configure" #include "confdefs.h" #include <stdlib.h> int @@ -5278,23 +5706,23 @@ main (void) { #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE -make an error +#error (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5288: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5716: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5291: \$? = $ac_status" >&5 + echo "$as_me:5719: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5294: \"$ac_try\"") >&5 + { (eval echo "$as_me:5722: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5297: \$? = $ac_status" >&5 + echo "$as_me:5725: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -5305,47 +5733,46 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_XOPEN_SOURCE_set_ok" = no then - { echo "$as_me:5308: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:5736: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:5313: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:5741: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5320 "configure" +#line 5748 "configure" #include "confdefs.h" -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> +$ac_includes_default int main (void) { #ifndef _XOPEN_SOURCE -make an error +#error _XOPEN_SOURCE is not defined #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5339: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5766: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5342: \$? = $ac_status" >&5 + echo "$as_me:5769: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5345: \"$ac_try\"") >&5 + { (eval echo "$as_me:5772: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5348: \$? = $ac_status" >&5 + echo "$as_me:5775: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -5357,35 +5784,34 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 5360 "configure" +#line 5787 "configure" #include "confdefs.h" -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> +$ac_includes_default int main (void) { -#ifdef _XOPEN_SOURCE -make an error +#ifndef _XOPEN_SOURCE +#error _XOPEN_SOURCE is not defined #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5379: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5805: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5382: \$? = $ac_status" >&5 + echo "$as_me:5808: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5385: \"$ac_try\"") >&5 + { (eval echo "$as_me:5811: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5388: \$? = $ac_status" >&5 + echo "$as_me:5814: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -5394,13 +5820,13 @@ cat "conftest.$ac_ext" >&5 cf_cv_xopen_source=$cf_XOPEN_SOURCE fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS="$cf_save" + CPPFLAGS="$cf_save" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5403: result: $cf_cv_xopen_source" >&5 +echo "$as_me:5829: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -5415,12 +5841,38 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" +for cf_add_cflags in $cf_temp_xopen_source +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_temp_xopen_source +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -5513,13 +5965,243 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + fi fi fi fi # cf_cv_posix_visible -echo "$as_me:5522: checking for signal global datatype" >&5 +echo "$as_me:5976: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 5982 "configure" +#include "confdefs.h" +#include <stdlib.h> +#include <stdarg.h> +#include <string.h> +#include <float.h> + +_ACEOF +if { (eval echo "$as_me:5990: \"$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:5996: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_stdc=yes +else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + ac_cv_header_stdc=no +fi +rm -f conftest.err "conftest.$ac_ext" + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +#line 6018 "configure" +#include "confdefs.h" +#include <string.h> + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -rf conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +#line 6036 "configure" +#include "confdefs.h" +#include <stdlib.h> + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -rf conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 6057 "configure" +#include "confdefs.h" +#include <ctype.h> +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main (void) +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + $ac_main_return(2); + $ac_main_return (0); +} +_ACEOF +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:6083: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6086: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:6088: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6091: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_header_stdc=no +fi +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" +fi +fi +fi +echo "$as_me:6104: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\EOF +#define STDC_HEADERS 1 +EOF + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:6120: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 6126 "configure" +#include "confdefs.h" +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:6132: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6135: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:6138: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6141: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +eval "$as_ac_Header=no" +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +fi +echo "$as_me:6151: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <<EOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +EOF + +fi +done + +echo "$as_me:6161: checking whether exit is declared" >&5 +echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6 +if test "${ac_cv_have_decl_exit+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 6167 "configure" +#include "confdefs.h" +$ac_includes_default +int +main (void) +{ +#ifndef exit + (void) exit; +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:6182: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6185: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:6188: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6191: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_have_decl_exit=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_have_decl_exit=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +fi +echo "$as_me:6201: result: $ac_cv_have_decl_exit" >&5 +echo "${ECHO_T}$ac_cv_have_decl_exit" >&6 + +echo "$as_me:6204: checking for signal global datatype" >&5 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 if test "${cf_cv_sig_atomic_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5531,7 +6213,7 @@ else "int" do cat >"conftest.$ac_ext" <<_ACEOF -#line 5534 "configure" +#line 6216 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5555,16 +6237,16 @@ signal(SIGINT, handler); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5558: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6240: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5561: \$? = $ac_status" >&5 + echo "$as_me:6243: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5564: \"$ac_try\"") >&5 + { (eval echo "$as_me:6246: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5567: \$? = $ac_status" >&5 + echo "$as_me:6249: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -5578,7 +6260,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5581: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:6263: result: $cf_cv_sig_atomic_t" >&5 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF @@ -5587,14 +6269,14 @@ EOF # Work around breakage on OS X -echo "$as_me:5590: checking if SIGWINCH is defined" >&5 +echo "$as_me:6272: checking if SIGWINCH is defined" >&5 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 if test "${cf_cv_define_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5597 "configure" +#line 6279 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5609,23 +6291,23 @@ int x = SIGWINCH; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5612: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6294: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5615: \$? = $ac_status" >&5 + echo "$as_me:6297: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5618: \"$ac_try\"") >&5 + { (eval echo "$as_me:6300: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5621: \$? = $ac_status" >&5 + echo "$as_me:6303: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_define_sigwinch=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 5628 "configure" +#line 6310 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -5643,16 +6325,16 @@ int x = SIGWINCH; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5646: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6328: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5649: \$? = $ac_status" >&5 + echo "$as_me:6331: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5652: \"$ac_try\"") >&5 + { (eval echo "$as_me:6334: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5655: \$? = $ac_status" >&5 + echo "$as_me:6337: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_define_sigwinch=maybe else @@ -5666,11 +6348,11 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5669: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:6351: result: $cf_cv_define_sigwinch" >&5 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 if test "$cf_cv_define_sigwinch" = maybe ; then -echo "$as_me:5673: checking for actual SIGWINCH definition" >&5 +echo "$as_me:6355: checking for actual SIGWINCH definition" >&5 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 if test "${cf_cv_fixup_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5681,7 +6363,7 @@ cf_sigwinch=32 while test "$cf_sigwinch" != 1 do cat >"conftest.$ac_ext" <<_ACEOF -#line 5684 "configure" +#line 6366 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -5695,7 +6377,7 @@ main (void) { #if SIGWINCH != $cf_sigwinch -make an error +#error SIGWINCH is not $cf_sigwinch #endif int x = SIGWINCH; (void)x ; @@ -5703,16 +6385,16 @@ int x = SIGWINCH; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5706: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6388: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5709: \$? = $ac_status" >&5 + echo "$as_me:6391: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5712: \"$ac_try\"") >&5 + { (eval echo "$as_me:6394: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5715: \$? = $ac_status" >&5 + echo "$as_me:6397: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -5726,7 +6408,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`" done fi -echo "$as_me:5729: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:6411: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -5736,14 +6418,16 @@ fi # Checks for CODESET support. -echo "$as_me:5739: checking for nl_langinfo and CODESET" >&5 +echo "$as_me:6421: checking for nl_langinfo and CODESET" >&5 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 if test "${am_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5745 "configure" +#line 6427 "configure" #include "confdefs.h" + +$ac_includes_default #include <langinfo.h> int main (void) @@ -5754,16 +6438,16 @@ char* cs = nl_langinfo(CODESET); (void)cs } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:5757: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6441: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5760: \$? = $ac_status" >&5 + echo "$as_me:6444: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:5763: \"$ac_try\"") >&5 + { (eval echo "$as_me:6447: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5766: \$? = $ac_status" >&5 + echo "$as_me:6450: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then am_cv_langinfo_codeset=yes else @@ -5774,7 +6458,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:5777: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:6461: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test "$am_cv_langinfo_codeset" = yes; then @@ -5784,7 +6468,7 @@ EOF fi -echo "$as_me:5787: checking if you want to use pkg-config" >&5 +echo "$as_me:6471: checking if you want to use pkg-config" >&5 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 # Check whether --with-pkg-config or --without-pkg-config was given. @@ -5794,7 +6478,7 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:5797: result: $cf_pkg_config" >&5 +echo "$as_me:6481: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 case "$cf_pkg_config" in @@ -5806,7 +6490,7 @@ case "$cf_pkg_config" in if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -echo "$as_me:5809: checking for $ac_word" >&5 +echo "$as_me:6493: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5823,7 +6507,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:5826: found $ac_dir/$ac_word" >&5 + echo "$as_me:6510: found $ac_dir/$ac_word" >&5 break fi done @@ -5834,10 +6518,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:5837: result: $PKG_CONFIG" >&5 + echo "$as_me:6521: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:5840: result: no" >&5 + echo "$as_me:6524: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5846,7 +6530,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:5849: checking for $ac_word" >&5 +echo "$as_me:6533: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5863,7 +6547,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:5866: found $ac_dir/$ac_word" >&5 + echo "$as_me:6550: found $ac_dir/$ac_word" >&5 break fi done @@ -5875,10 +6559,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:5878: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:6562: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:5881: result: no" >&5 + echo "$as_me:6565: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5921,18 +6605,18 @@ case ".$PKG_CONFIG" in PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:5924: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:6608: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} { (exit 1); exit 1; }; } ;; esac elif test "x$cf_pkg_config" != xno ; then - { echo "$as_me:5931: WARNING: pkg-config is not installed" >&5 + { echo "$as_me:6615: WARNING: pkg-config is not installed" >&5 echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi -echo "$as_me:5935: checking if you want to see long compiling messages" >&5 +echo "$as_me:6619: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -5966,10 +6650,10 @@ else ECHO_CC='' fi; -echo "$as_me:5969: result: $enableval" >&5 +echo "$as_me:6653: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:5972: checking for ncurses wrap-prefix" >&5 +echo "$as_me:6656: checking for ncurses wrap-prefix" >&5 echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6 # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given. @@ -5979,10 +6663,10 @@ if test "${with_ncurses_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; -echo "$as_me:5982: result: $NCURSES_WRAP_PREFIX" >&5 +echo "$as_me:6666: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 -echo "$as_me:5985: checking if you want to check for wide-character functions" >&5 +echo "$as_me:6669: checking if you want to check for wide-character functions" >&5 echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6 # Check whether --enable-widec or --disable-widec was given. @@ -5999,10 +6683,10 @@ else cf_enable_widec=yes fi; -echo "$as_me:6002: result: $cf_enable_widec" >&5 +echo "$as_me:6686: result: $cf_enable_widec" >&5 echo "${ECHO_T}$cf_enable_widec" >&6 -echo "$as_me:6005: checking for specific curses-directory" >&5 +echo "$as_me:6689: checking for specific curses-directory" >&5 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 # Check whether --with-curses-dir or --without-curses-dir was given. @@ -6012,7 +6696,7 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:6015: result: $cf_cv_curses_dir" >&5 +echo "$as_me:6699: result: $cf_cv_curses_dir" >&5 echo "${ECHO_T}$cf_cv_curses_dir" >&6 if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" @@ -6043,7 +6727,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:6046: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:6730: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -6079,7 +6763,7 @@ if test -n "$cf_cv_curses_dir/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 6082 "configure" +#line 6766 "configure" #include "confdefs.h" #include <stdio.h> int @@ -6091,16 +6775,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6094: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6778: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6097: \$? = $ac_status" >&5 + echo "$as_me:6781: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6100: \"$ac_try\"") >&5 + { (eval echo "$as_me:6784: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6103: \$? = $ac_status" >&5 + echo "$as_me:6787: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -6117,7 +6801,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:6120: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6804: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6153,7 +6837,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6156: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6840: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6166,7 +6850,7 @@ fi cf_cv_screen=curses -echo "$as_me:6169: checking for specified curses library type" >&5 +echo "$as_me:6853: checking for specified curses library type" >&5 echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6 # Check whether --with-screen or --without-screen was given. @@ -6210,13 +6894,13 @@ fi; fi; fi; -echo "$as_me:6213: result: $cf_cv_screen" >&5 +echo "$as_me:6897: result: $cf_cv_screen" >&5 echo "${ECHO_T}$cf_cv_screen" >&6 case $cf_cv_screen in (curses|curses_*) -echo "$as_me:6219: checking for extra include directories" >&5 +echo "$as_me:6903: checking for extra include directories" >&5 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6 if test "${cf_cv_curses_incdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6242,7 +6926,7 @@ case "$host_os" in esac fi -echo "$as_me:6245: result: $cf_cv_curses_incdir" >&5 +echo "$as_me:6929: result: $cf_cv_curses_incdir" >&5 echo "${ECHO_T}$cf_cv_curses_incdir" >&6 if test "$cf_cv_curses_incdir" != no then @@ -6252,7 +6936,7 @@ then fi -echo "$as_me:6255: checking if we have identified curses headers" >&5 +echo "$as_me:6939: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6264,28 +6948,28 @@ for cf_header in \ curses.h ncurses/ncurses.h ncurses/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 6267 "configure" +#line 6951 "configure" #include "confdefs.h" #include <${cf_header}> int main (void) { -initscr(); tgoto("?", 0,0) +initscr(); endwin() ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6279: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6963: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6282: \$? = $ac_status" >&5 + echo "$as_me:6966: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6285: \"$ac_try\"") >&5 + { (eval echo "$as_me:6969: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6288: \$? = $ac_status" >&5 + echo "$as_me:6972: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -6296,11 +6980,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:6299: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:6983: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:6303: error: No curses header-files found" >&5 + { { echo "$as_me:6987: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -6310,23 +6994,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:6313: checking for $ac_header" >&5 +echo "$as_me:6997: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6319 "configure" +#line 7003 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:6323: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:7007: \"$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:6329: \$? = $ac_status" >&5 + echo "$as_me:7013: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6345,7 +7029,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6348: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:7032: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -6355,7 +7039,7 @@ EOF fi done -echo "$as_me:6358: checking for terminfo header" >&5 +echo "$as_me:7042: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6373,7 +7057,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 6376 "configure" +#line 7060 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -6388,16 +7072,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6391: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7075: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6394: \$? = $ac_status" >&5 + echo "$as_me:7078: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6397: \"$ac_try\"") >&5 + { (eval echo "$as_me:7081: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6400: \$? = $ac_status" >&5 + echo "$as_me:7084: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -6413,7 +7097,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:6416: result: $cf_cv_term_header" >&5 +echo "$as_me:7100: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -6445,7 +7129,7 @@ EOF ;; esac -echo "$as_me:6448: checking for ncurses version" >&5 +echo "$as_me:7132: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6471,10 +7155,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:6474: \"$cf_try\"") >&5 + { (eval echo "$as_me:7158: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:6477: \$? = $ac_status" >&5 + echo "$as_me:7161: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -6484,11 +7168,13 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 6487 "configure" +#line 7171 "configure" #include "confdefs.h" +$ac_includes_default + #include <${cf_cv_ncurses_header:-curses.h}> -#include <stdio.h> + int main(void) { FILE *fp = fopen("$cf_tempfile", "w"); @@ -6502,22 +7188,22 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:6512: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7198: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6515: \$? = $ac_status" >&5 + echo "$as_me:7201: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:6517: \"$ac_try\"") >&5 + { (eval echo "$as_me:7203: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6520: \$? = $ac_status" >&5 + echo "$as_me:7206: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -6531,38 +7217,38 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:6534: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:7220: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:6541: checking if we have identified curses libraries" >&5 +echo "$as_me:7227: checking if we have identified curses libraries" >&5 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 6544 "configure" +#line 7230 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -initscr(); tgoto("?", 0,0) +initscr(); endwin() ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6556: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7242: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6559: \$? = $ac_status" >&5 + echo "$as_me:7245: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6562: \"$ac_try\"") >&5 + { (eval echo "$as_me:7248: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6565: \$? = $ac_status" >&5 + echo "$as_me:7251: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -6571,13 +7257,13 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -echo "$as_me:6574: result: $cf_result" >&5 +echo "$as_me:7260: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then case "$host_os" in (freebsd*) - echo "$as_me:6580: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:7266: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6585,7 +7271,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6588 "configure" +#line 7274 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6594,7 +7280,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (); +char tgoto (void); int main (void) { @@ -6604,16 +7290,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6607: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7293: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6610: \$? = $ac_status" >&5 + echo "$as_me:7296: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6613: \"$ac_try\"") >&5 + { (eval echo "$as_me:7299: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6616: \$? = $ac_status" >&5 + echo "$as_me:7302: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -6624,7 +7310,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6627: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:7313: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test "$ac_cv_lib_mytinfo_tgoto" = yes; then @@ -6654,7 +7340,7 @@ fi # term.h) for cur_colr if test "x$cf_cv_screen" = "xcurses_colr" then - echo "$as_me:6657: checking for initscr in -lcur_colr" >&5 + echo "$as_me:7343: checking for initscr in -lcur_colr" >&5 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6662,7 +7348,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcur_colr $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6665 "configure" +#line 7351 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6671,7 +7357,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); +char initscr (void); int main (void) { @@ -6681,16 +7367,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6684: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7370: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6687: \$? = $ac_status" >&5 + echo "$as_me:7373: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6690: \"$ac_try\"") >&5 + { (eval echo "$as_me:7376: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6693: \$? = $ac_status" >&5 + echo "$as_me:7379: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_cur_colr_initscr=yes else @@ -6701,7 +7387,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6704: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "$as_me:7390: result: $ac_cv_lib_cur_colr_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6 if test "$ac_cv_lib_cur_colr_initscr" = yes; then @@ -6725,7 +7411,7 @@ LIBS="$cf_add_libs" else - echo "$as_me:6728: checking for initscr in -lHcurses" >&5 + echo "$as_me:7414: checking for initscr in -lHcurses" >&5 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6733,7 +7419,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lHcurses $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6736 "configure" +#line 7422 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6742,7 +7428,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); +char initscr (void); int main (void) { @@ -6752,16 +7438,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6755: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7441: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6758: \$? = $ac_status" >&5 + echo "$as_me:7444: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6761: \"$ac_try\"") >&5 + { (eval echo "$as_me:7447: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6764: \$? = $ac_status" >&5 + echo "$as_me:7450: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Hcurses_initscr=yes else @@ -6772,7 +7458,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6775: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "$as_me:7461: result: $ac_cv_lib_Hcurses_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6 if test "$ac_cv_lib_Hcurses_initscr" = yes; then @@ -6830,7 +7516,7 @@ if test -n "/lib64" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6833: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7519: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6859,7 +7545,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6862: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7548: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6890,7 +7576,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6893: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7579: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6925,7 +7611,7 @@ if test -n "/usr/5lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6928: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7614: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6969,13 +7655,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then # because it may be needed to link the test-case for initscr. if test "x$cf_term_lib" = x then - echo "$as_me:6972: checking for tgoto" >&5 + echo "$as_me:7658: checking for tgoto" >&5 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6 if test "${ac_cv_func_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6978 "configure" +#line 7664 "configure" #include "confdefs.h" #define tgoto autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -7006,16 +7692,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7009: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7695: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7012: \$? = $ac_status" >&5 + echo "$as_me:7698: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7015: \"$ac_try\"") >&5 + { (eval echo "$as_me:7701: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7018: \$? = $ac_status" >&5 + echo "$as_me:7704: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_tgoto=yes else @@ -7025,7 +7711,7 @@ ac_cv_func_tgoto=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:7028: result: $ac_cv_func_tgoto" >&5 +echo "$as_me:7714: result: $ac_cv_func_tgoto" >&5 echo "${ECHO_T}$ac_cv_func_tgoto" >&6 if test "$ac_cv_func_tgoto" = yes; then cf_term_lib=predefined @@ -7034,7 +7720,7 @@ else for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` -echo "$as_me:7037: checking for tgoto in -l$cf_term_lib" >&5 +echo "$as_me:7723: checking for tgoto in -l$cf_term_lib" >&5 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7042,7 +7728,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_term_lib $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7045 "configure" +#line 7731 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7051,7 +7737,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (); +char tgoto (void); int main (void) { @@ -7061,16 +7747,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7064: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7750: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7067: \$? = $ac_status" >&5 + echo "$as_me:7753: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7070: \"$ac_try\"") >&5 + { (eval echo "$as_me:7756: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7073: \$? = $ac_status" >&5 + echo "$as_me:7759: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -7081,7 +7767,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7084: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:7770: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then @@ -7104,10 +7790,10 @@ fi do LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then - echo "$as_me:7107: checking if we can link with $cf_curs_lib library" >&5 + echo "$as_me:7793: checking if we can link with $cf_curs_lib library" >&5 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 7110 "configure" +#line 7796 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7119,16 +7805,16 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7122: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7808: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7125: \$? = $ac_status" >&5 + echo "$as_me:7811: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7128: \"$ac_try\"") >&5 + { (eval echo "$as_me:7814: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7131: \$? = $ac_status" >&5 + echo "$as_me:7817: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -7137,37 +7823,37 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:7140: result: $cf_result" >&5 + echo "$as_me:7826: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test "$cf_result" = yes && break elif test "$cf_curs_lib" = "$cf_term_lib" ; then cf_result=no elif test "$cf_term_lib" != predefined ; then - echo "$as_me:7146: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + echo "$as_me:7832: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 7149 "configure" +#line 7835 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -initscr(); tgoto((char *)0, 0, 0); +initscr(); endwin(); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7161: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7847: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7164: \$? = $ac_status" >&5 + echo "$as_me:7850: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7167: \"$ac_try\"") >&5 + { (eval echo "$as_me:7853: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7170: \$? = $ac_status" >&5 + echo "$as_me:7856: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=no else @@ -7176,7 +7862,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7179 "configure" +#line 7865 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7188,16 +7874,16 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7191: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7877: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7194: \$? = $ac_status" >&5 + echo "$as_me:7880: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7197: \"$ac_try\"") >&5 + { (eval echo "$as_me:7883: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7200: \$? = $ac_status" >&5 + echo "$as_me:7886: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -7209,13 +7895,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:7212: result: $cf_result" >&5 + echo "$as_me:7898: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test "$cf_result" != error && break fi done fi - test "$cf_curs_lib" = unknown && { { echo "$as_me:7218: error: no curses library found" >&5 + test "$cf_curs_lib" = unknown && { { echo "$as_me:7904: error: no curses library found" >&5 echo "$as_me: error: no curses library found" >&2;} { (exit 1); exit 1; }; } fi @@ -7224,7 +7910,55 @@ fi ;; (ncursesw*) -echo "$as_me:7227: checking for multibyte character support" >&5 +for ac_header in wchar.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:7916: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 7922 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:7926: \"$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:7932: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err "conftest.$ac_ext" +fi +echo "$as_me:7951: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <<EOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +EOF + +fi +done + +echo "$as_me:7961: checking for multibyte character support" >&5 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 if test "${cf_cv_utf8_lib+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7232,10 +7966,14 @@ else cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7235 "configure" +#line 7969 "configure" #include "confdefs.h" -#include <stdlib.h> +$ac_includes_default +#ifdef HAVE_WCHAR_H +#include <wchar.h> +#endif + int main (void) { @@ -7245,16 +7983,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7248: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7986: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7251: \$? = $ac_status" >&5 + echo "$as_me:7989: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7254: \"$ac_try\"") >&5 + { (eval echo "$as_me:7992: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7257: \$? = $ac_status" >&5 + echo "$as_me:7995: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_utf8_lib=yes else @@ -7266,12 +8004,12 @@ cat "conftest.$ac_ext" >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:7269: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:8007: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7274 "configure" +#line 8012 "configure" #include "confdefs.h" #include <libutf8.h> @@ -7284,16 +8022,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7287: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8025: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7290: \$? = $ac_status" >&5 + echo "$as_me:8028: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7293: \"$ac_try\"") >&5 + { (eval echo "$as_me:8031: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7296: \$? = $ac_status" >&5 + echo "$as_me:8034: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -7307,7 +8045,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lutf8 $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 7310 "configure" +#line 8048 "configure" #include "confdefs.h" #include <libutf8.h> @@ -7320,16 +8058,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7323: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8061: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7326: \$? = $ac_status" >&5 + echo "$as_me:8064: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7329: \"$ac_try\"") >&5 + { (eval echo "$as_me:8067: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7332: \$? = $ac_status" >&5 + echo "$as_me:8070: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -7346,9 +8084,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:7349: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:8087: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:7351: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:8089: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -7439,7 +8177,7 @@ cf_search="$cf_search $cf_header_path_list" if test -d "$cf_cv_header_path_utf8" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:7442: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8180: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -7447,7 +8185,7 @@ echo "${as_me:-configure}:7442: testing ... testing $cf_cv_header_path_utf8 ..." CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" cat >"conftest.$ac_ext" <<_ACEOF -#line 7450 "configure" +#line 8188 "configure" #include "confdefs.h" #include <libutf8.h> @@ -7460,21 +8198,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7463: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8201: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7466: \$? = $ac_status" >&5 + echo "$as_me:8204: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7469: \"$ac_try\"") >&5 + { (eval echo "$as_me:8207: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7472: \$? = $ac_status" >&5 + echo "$as_me:8210: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:7477: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8215: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -7492,7 +8230,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:7495: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:8233: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -7567,13 +8305,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d "$cf_cv_library_path_utf8" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:7570: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8308: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lutf8 $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" cat >"conftest.$ac_ext" <<_ACEOF -#line 7576 "configure" +#line 8314 "configure" #include "confdefs.h" #include <libutf8.h> @@ -7586,21 +8324,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7589: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8327: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7592: \$? = $ac_status" >&5 + echo "$as_me:8330: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7595: \"$ac_try\"") >&5 + { (eval echo "$as_me:8333: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7598: \$? = $ac_status" >&5 + echo "$as_me:8336: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:7603: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8341: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -7642,7 +8380,7 @@ fi fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:7645: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:8383: result: $cf_cv_utf8_lib" >&5 echo "${ECHO_T}$cf_cv_utf8_lib" >&6 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between @@ -7680,7 +8418,7 @@ if test -n "$cf_cv_header_path_utf8" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 7683 "configure" +#line 8421 "configure" #include "confdefs.h" #include <stdio.h> int @@ -7692,16 +8430,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7695: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8433: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7698: \$? = $ac_status" >&5 + echo "$as_me:8436: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7701: \"$ac_try\"") >&5 + { (eval echo "$as_me:8439: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7704: \$? = $ac_status" >&5 + echo "$as_me:8442: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -7718,7 +8456,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:7721: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8459: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7754,7 +8492,7 @@ if test -n "$cf_cv_library_path_utf8" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7757: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:8495: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7784,13 +8522,13 @@ cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:7787: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:8525: checking pkg-config for $cf_ncuconfig_root" >&5 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:7790: result: yes" >&5 + echo "$as_me:8528: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:7793: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:8531: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown @@ -7923,7 +8661,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 7926 "configure" +#line 8664 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7935,37 +8673,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7938: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8676: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7941: \$? = $ac_status" >&5 + echo "$as_me:8679: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7944: \"$ac_try\"") >&5 + { (eval echo "$as_me:8682: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7947: \$? = $ac_status" >&5 + echo "$as_me:8685: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 7953 "configure" +#line 8691 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) - { char *xx = curses_version(); return (xx == 0); } + { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:7960: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8698: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7963: \$? = $ac_status" >&5 + echo "$as_me:8701: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:7965: \"$ac_try\"") >&5 + { (eval echo "$as_me:8703: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7968: \$? = $ac_status" >&5 + echo "$as_me:8706: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -7996,12 +8734,38 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ;; esac +for cf_add_cflags in $cf_pkg_cflags +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_pkg_cflags +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -8094,6 +8858,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -8111,7 +8877,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 8114 "configure" +#line 8880 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8123,37 +8889,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8126: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8892: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8129: \$? = $ac_status" >&5 + echo "$as_me:8895: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8132: \"$ac_try\"") >&5 + { (eval echo "$as_me:8898: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8135: \$? = $ac_status" >&5 + echo "$as_me:8901: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 8141 "configure" +#line 8907 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) - { char *xx = curses_version(); return (xx == 0); } + { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:8148: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8914: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8151: \$? = $ac_status" >&5 + echo "$as_me:8917: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:8153: \"$ac_try\"") >&5 + { (eval echo "$as_me:8919: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8156: \$? = $ac_status" >&5 + echo "$as_me:8922: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -8170,7 +8936,7 @@ cat "conftest.$ac_ext" >&5 cf_have_ncuconfig=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:8173: result: $cf_have_ncuconfig" >&5 + echo "$as_me:8939: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -8186,7 +8952,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:8189: checking for terminfo header" >&5 +echo "$as_me:8955: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8204,7 +8970,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 8207 "configure" +#line 8973 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -8219,16 +8985,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8222: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8988: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8225: \$? = $ac_status" >&5 + echo "$as_me:8991: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8228: \"$ac_try\"") >&5 + { (eval echo "$as_me:8994: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8231: \$? = $ac_status" >&5 + echo "$as_me:8997: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -8244,7 +9010,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8247: result: $cf_cv_term_header" >&5 +echo "$as_me:9013: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -8279,7 +9045,7 @@ esac fi else - echo "$as_me:8282: result: no" >&5 + echo "$as_me:9048: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -8295,7 +9061,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:8298: checking for $ac_word" >&5 +echo "$as_me:9064: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8310,7 +9076,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:8313: found $ac_dir/$ac_word" >&5 +echo "$as_me:9079: found $ac_dir/$ac_word" >&5 break done @@ -8318,10 +9084,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:8321: result: $NCURSES_CONFIG" >&5 + echo "$as_me:9087: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:8324: result: no" >&5 + echo "$as_me:9090: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8334,7 +9100,7 @@ if test -z "$NCURSES_CONFIG"; then 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:8337: checking for $ac_word" >&5 +echo "$as_me:9103: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8349,7 +9115,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:8352: found $ac_dir/$ac_word" >&5 +echo "$as_me:9118: found $ac_dir/$ac_word" >&5 break done @@ -8357,10 +9123,10 @@ fi fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:8360: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:9126: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:8363: result: no" >&5 + echo "$as_me:9129: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8373,12 +9139,38 @@ fi if test "$NCURSES_CONFIG" != none ; then +for cf_add_cflags in `$NCURSES_CONFIG --cflags` +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$NCURSES_CONFIG --cflags` +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -8471,6 +9263,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -8489,7 +9283,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:8492: checking if we have identified curses headers" >&5 +echo "$as_me:9286: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8501,28 +9295,28 @@ for cf_header in \ curses.h $cf_cv_screen/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 8504 "configure" +#line 9298 "configure" #include "confdefs.h" #include <${cf_header}> int main (void) { -initscr(); tgoto("?", 0,0) +initscr(); endwin() ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8516: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9310: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8519: \$? = $ac_status" >&5 + echo "$as_me:9313: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8522: \"$ac_try\"") >&5 + { (eval echo "$as_me:9316: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8525: \$? = $ac_status" >&5 + echo "$as_me:9319: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -8533,11 +9327,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8536: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:9330: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:8540: error: No curses header-files found" >&5 + { { echo "$as_me:9334: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -8547,23 +9341,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:8550: checking for $ac_header" >&5 +echo "$as_me:9344: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 8556 "configure" +#line 9350 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:8560: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:9354: \"$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:8566: \$? = $ac_status" >&5 + echo "$as_me:9360: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -8582,7 +9376,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:8585: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:9379: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -8638,7 +9432,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 8641 "configure" +#line 9435 "configure" #include "confdefs.h" #include <stdio.h> int @@ -8650,16 +9444,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8653: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9447: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8656: \$? = $ac_status" >&5 + echo "$as_me:9450: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8659: \"$ac_try\"") >&5 + { (eval echo "$as_me:9453: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8662: \$? = $ac_status" >&5 + echo "$as_me:9456: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8676,7 +9470,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:8679: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9473: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8695,7 +9489,7 @@ fi } -echo "$as_me:8698: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:9492: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8707,7 +9501,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 8710 "configure" +#line 9504 "configure" #include "confdefs.h" #include <$cf_header> @@ -8722,7 +9516,7 @@ printf("%s\\n", NCURSES_VERSION); #ifdef __NCURSES_H printf("old\\n"); #else - make an error + #error __NCURSES_H is not defined #endif #endif @@ -8731,16 +9525,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8734: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9528: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8737: \$? = $ac_status" >&5 + echo "$as_me:9531: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8740: \"$ac_try\"") >&5 + { (eval echo "$as_me:9534: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8743: \$? = $ac_status" >&5 + echo "$as_me:9537: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -8755,14 +9549,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8758: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:9552: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:8765: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:9559: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8883,7 +9677,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 8886 "configure" +#line 9680 "configure" #include "confdefs.h" #include <stdio.h> int @@ -8895,16 +9689,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8898: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9692: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8901: \$? = $ac_status" >&5 + echo "$as_me:9695: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8904: \"$ac_try\"") >&5 + { (eval echo "$as_me:9698: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8907: \$? = $ac_status" >&5 + echo "$as_me:9701: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8921,7 +9715,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:8924: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9718: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8944,7 +9738,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 8947 "configure" +#line 9741 "configure" #include "confdefs.h" #include <$cf_header> @@ -8959,7 +9753,7 @@ printf("%s\\n", NCURSES_VERSION); #ifdef __NCURSES_H printf("old\\n"); #else - make an error + #error __NCURSES_H is not defined #endif #endif @@ -8968,16 +9762,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8971: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9765: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8974: \$? = $ac_status" >&5 + echo "$as_me:9768: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8977: \"$ac_try\"") >&5 + { (eval echo "$as_me:9771: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8980: \$? = $ac_status" >&5 + echo "$as_me:9774: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -8998,12 +9792,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9001: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9795: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:9006: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:9800: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` @@ -9039,7 +9833,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 9042 "configure" +#line 9836 "configure" #include "confdefs.h" #include <stdio.h> int @@ -9051,16 +9845,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9054: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9848: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9057: \$? = $ac_status" >&5 + echo "$as_me:9851: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9060: \"$ac_try\"") >&5 + { (eval echo "$as_me:9854: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9063: \$? = $ac_status" >&5 + echo "$as_me:9857: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -9077,7 +9871,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:9080: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9874: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9125,7 +9919,7 @@ EOF ;; esac -echo "$as_me:9128: checking for terminfo header" >&5 +echo "$as_me:9922: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9143,7 +9937,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 9146 "configure" +#line 9940 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -9158,16 +9952,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9161: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9955: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9164: \$? = $ac_status" >&5 + echo "$as_me:9958: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9167: \"$ac_try\"") >&5 + { (eval echo "$as_me:9961: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9170: \$? = $ac_status" >&5 + echo "$as_me:9964: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -9183,7 +9977,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:9186: result: $cf_cv_term_header" >&5 +echo "$as_me:9980: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -9221,7 +10015,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:9224: checking for ncurses version" >&5 +echo "$as_me:10018: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9247,10 +10041,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:9250: \"$cf_try\"") >&5 + { (eval echo "$as_me:10044: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:9253: \$? = $ac_status" >&5 + echo "$as_me:10047: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -9260,11 +10054,13 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 9263 "configure" +#line 10057 "configure" #include "confdefs.h" +$ac_includes_default + #include <${cf_cv_ncurses_header:-curses.h}> -#include <stdio.h> + int main(void) { FILE *fp = fopen("$cf_tempfile", "w"); @@ -9278,22 +10074,22 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:9288: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10084: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9291: \$? = $ac_status" >&5 + echo "$as_me:10087: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:9293: \"$ac_try\"") >&5 + { (eval echo "$as_me:10089: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9296: \$? = $ac_status" >&5 + echo "$as_me:10092: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -9307,7 +10103,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:9310: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:10106: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -9320,7 +10116,7 @@ cf_nculib_root=$cf_cv_screen # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:9323: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:10119: checking for Gpm_Open in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9328,7 +10124,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 9331 "configure" +#line 10127 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9337,7 +10133,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char Gpm_Open (); +char Gpm_Open (void); int main (void) { @@ -9347,16 +10143,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9350: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10146: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9353: \$? = $ac_status" >&5 + echo "$as_me:10149: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9356: \"$ac_try\"") >&5 + { (eval echo "$as_me:10152: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9359: \$? = $ac_status" >&5 + echo "$as_me:10155: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -9367,10 +10163,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9370: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:10166: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then - echo "$as_me:9373: checking for initscr in -lgpm" >&5 + echo "$as_me:10169: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9378,7 +10174,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 9381 "configure" +#line 10177 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9387,7 +10183,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); +char initscr (void); int main (void) { @@ -9397,16 +10193,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9400: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10196: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9403: \$? = $ac_status" >&5 + echo "$as_me:10199: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9406: \"$ac_try\"") >&5 + { (eval echo "$as_me:10202: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9409: \$? = $ac_status" >&5 + echo "$as_me:10205: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -9417,7 +10213,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9420: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:10216: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test "$ac_cv_lib_gpm_initscr" = yes; then LIBS="$cf_ncurses_SAVE" @@ -9430,9 +10226,9 @@ fi case "$host_os" in (freebsd*) # This is only necessary if you are linking against an obsolete - # version of ncurses (but it should do no harm, since it's static). + # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:9435: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:10231: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9440,7 +10236,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 9443 "configure" +#line 10239 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9449,7 +10245,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (); +char tgoto (void); int main (void) { @@ -9459,16 +10255,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9462: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10258: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9465: \$? = $ac_status" >&5 + echo "$as_me:10261: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9468: \"$ac_try\"") >&5 + { (eval echo "$as_me:10264: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9471: \$? = $ac_status" >&5 + echo "$as_me:10267: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -9479,7 +10275,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9482: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:10278: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test "$ac_cv_lib_mytinfo_tgoto" = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -9528,13 +10324,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:9531: checking for initscr" >&5 + echo "$as_me:10327: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 9537 "configure" +#line 10333 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -9565,16 +10361,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9568: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10364: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9571: \$? = $ac_status" >&5 + echo "$as_me:10367: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9574: \"$ac_try\"") >&5 + { (eval echo "$as_me:10370: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9577: \$? = $ac_status" >&5 + echo "$as_me:10373: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -9584,18 +10380,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:9587: result: $ac_cv_func_initscr" >&5 +echo "$as_me:10383: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test "$ac_cv_func_initscr" = yes; then eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:9594: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:10390: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 9598 "configure" +#line 10394 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9607,25 +10403,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9610: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10406: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9613: \$? = $ac_status" >&5 + echo "$as_me:10409: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9616: \"$ac_try\"") >&5 + { (eval echo "$as_me:10412: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9619: \$? = $ac_status" >&5 + echo "$as_me:10415: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:9621: result: yes" >&5 + echo "$as_me:10417: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:9628: result: no" >&5 +echo "$as_me:10424: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -9693,11 +10489,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:9696: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:10492: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 9700 "configure" +#line 10496 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9709,25 +10505,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9712: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10508: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9715: \$? = $ac_status" >&5 + echo "$as_me:10511: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9718: \"$ac_try\"") >&5 + { (eval echo "$as_me:10514: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9721: \$? = $ac_status" >&5 + echo "$as_me:10517: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:9723: result: yes" >&5 + echo "$as_me:10519: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' break else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:9730: result: no" >&5 +echo "$as_me:10526: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -9742,7 +10538,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:9745: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:10541: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -9750,7 +10546,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:9753: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:10549: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -9760,7 +10556,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 9763 "configure" +#line 10559 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9772,23 +10568,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9775: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10571: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9778: \$? = $ac_status" >&5 + echo "$as_me:10574: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9781: \"$ac_try\"") >&5 + { (eval echo "$as_me:10577: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9784: \$? = $ac_status" >&5 + echo "$as_me:10580: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:9786: result: yes" >&5 + echo "$as_me:10582: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:9791: result: no" >&5 +echo "$as_me:10587: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -9813,13 +10609,13 @@ cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:9816: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:10612: checking pkg-config for $cf_ncuconfig_root" >&5 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:9819: result: yes" >&5 + echo "$as_me:10615: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:9822: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:10618: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown @@ -9952,7 +10748,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 9955 "configure" +#line 10751 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9964,37 +10760,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9967: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10763: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9970: \$? = $ac_status" >&5 + echo "$as_me:10766: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9973: \"$ac_try\"") >&5 + { (eval echo "$as_me:10769: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9976: \$? = $ac_status" >&5 + echo "$as_me:10772: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 9982 "configure" +#line 10778 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) - { char *xx = curses_version(); return (xx == 0); } + { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:9989: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10785: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9992: \$? = $ac_status" >&5 + echo "$as_me:10788: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:9994: \"$ac_try\"") >&5 + { (eval echo "$as_me:10790: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9997: \$? = $ac_status" >&5 + echo "$as_me:10793: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -10025,12 +10821,38 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ;; esac +for cf_add_cflags in $cf_pkg_cflags +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_pkg_cflags +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -10123,6 +10945,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -10140,7 +10964,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 10143 "configure" +#line 10967 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10152,37 +10976,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10155: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10979: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10158: \$? = $ac_status" >&5 + echo "$as_me:10982: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10161: \"$ac_try\"") >&5 + { (eval echo "$as_me:10985: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10164: \$? = $ac_status" >&5 + echo "$as_me:10988: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 10170 "configure" +#line 10994 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) - { char *xx = curses_version(); return (xx == 0); } + { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:10177: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11001: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10180: \$? = $ac_status" >&5 + echo "$as_me:11004: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:10182: \"$ac_try\"") >&5 + { (eval echo "$as_me:11006: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10185: \$? = $ac_status" >&5 + echo "$as_me:11009: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -10199,7 +11023,7 @@ cat "conftest.$ac_ext" >&5 cf_have_ncuconfig=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:10202: result: $cf_have_ncuconfig" >&5 + echo "$as_me:11026: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -10215,7 +11039,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:10218: checking for terminfo header" >&5 +echo "$as_me:11042: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10233,7 +11057,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 10236 "configure" +#line 11060 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -10248,16 +11072,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10251: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11075: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10254: \$? = $ac_status" >&5 + echo "$as_me:11078: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10257: \"$ac_try\"") >&5 + { (eval echo "$as_me:11081: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10260: \$? = $ac_status" >&5 + echo "$as_me:11084: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -10273,7 +11097,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:10276: result: $cf_cv_term_header" >&5 +echo "$as_me:11100: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -10308,7 +11132,7 @@ esac fi else - echo "$as_me:10311: result: no" >&5 + echo "$as_me:11135: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -10324,7 +11148,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:10327: checking for $ac_word" >&5 +echo "$as_me:11151: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10339,7 +11163,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:10342: found $ac_dir/$ac_word" >&5 +echo "$as_me:11166: found $ac_dir/$ac_word" >&5 break done @@ -10347,10 +11171,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:10350: result: $NCURSES_CONFIG" >&5 + echo "$as_me:11174: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:10353: result: no" >&5 + echo "$as_me:11177: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10363,7 +11187,7 @@ if test -z "$NCURSES_CONFIG"; then 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:10366: checking for $ac_word" >&5 +echo "$as_me:11190: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10378,7 +11202,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:10381: found $ac_dir/$ac_word" >&5 +echo "$as_me:11205: found $ac_dir/$ac_word" >&5 break done @@ -10386,10 +11210,10 @@ fi fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:10389: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:11213: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:10392: result: no" >&5 + echo "$as_me:11216: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10402,12 +11226,38 @@ fi if test "$NCURSES_CONFIG" != none ; then +for cf_add_cflags in `$NCURSES_CONFIG --cflags` +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$NCURSES_CONFIG --cflags` +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -10500,6 +11350,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -10518,7 +11370,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:10521: checking if we have identified curses headers" >&5 +echo "$as_me:11373: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10530,28 +11382,28 @@ for cf_header in \ curses.h $cf_cv_screen/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 10533 "configure" +#line 11385 "configure" #include "confdefs.h" #include <${cf_header}> int main (void) { -initscr(); tgoto("?", 0,0) +initscr(); endwin() ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10545: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11397: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10548: \$? = $ac_status" >&5 + echo "$as_me:11400: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10551: \"$ac_try\"") >&5 + { (eval echo "$as_me:11403: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10554: \$? = $ac_status" >&5 + echo "$as_me:11406: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -10562,11 +11414,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:10565: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:11417: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:10569: error: No curses header-files found" >&5 + { { echo "$as_me:11421: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -10576,23 +11428,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:10579: checking for $ac_header" >&5 +echo "$as_me:11431: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 10585 "configure" +#line 11437 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:10589: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:11441: \"$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:10595: \$? = $ac_status" >&5 + echo "$as_me:11447: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -10611,7 +11463,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:10614: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:11466: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -10667,7 +11519,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 10670 "configure" +#line 11522 "configure" #include "confdefs.h" #include <stdio.h> int @@ -10679,16 +11531,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10682: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11534: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10685: \$? = $ac_status" >&5 + echo "$as_me:11537: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10688: \"$ac_try\"") >&5 + { (eval echo "$as_me:11540: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10691: \$? = $ac_status" >&5 + echo "$as_me:11543: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -10705,7 +11557,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:10708: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11560: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10724,7 +11576,7 @@ fi } -echo "$as_me:10727: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:11579: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10736,7 +11588,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 10739 "configure" +#line 11591 "configure" #include "confdefs.h" #include <$cf_header> @@ -10751,7 +11603,7 @@ printf("%s\\n", NCURSES_VERSION); #ifdef __NCURSES_H printf("old\\n"); #else - make an error + #error __NCURSES_H is not defined #endif #endif @@ -10760,16 +11612,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10763: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11615: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10766: \$? = $ac_status" >&5 + echo "$as_me:11618: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10769: \"$ac_try\"") >&5 + { (eval echo "$as_me:11621: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10772: \$? = $ac_status" >&5 + echo "$as_me:11624: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -10784,14 +11636,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:10787: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:11639: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:10794: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:11646: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10912,7 +11764,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 10915 "configure" +#line 11767 "configure" #include "confdefs.h" #include <stdio.h> int @@ -10924,16 +11776,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10927: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11779: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10930: \$? = $ac_status" >&5 + echo "$as_me:11782: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10933: \"$ac_try\"") >&5 + { (eval echo "$as_me:11785: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10936: \$? = $ac_status" >&5 + echo "$as_me:11788: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -10950,7 +11802,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:10953: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11805: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10973,7 +11825,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 10976 "configure" +#line 11828 "configure" #include "confdefs.h" #include <$cf_header> @@ -10988,7 +11840,7 @@ printf("%s\\n", NCURSES_VERSION); #ifdef __NCURSES_H printf("old\\n"); #else - make an error + #error __NCURSES_H is not defined #endif #endif @@ -10997,16 +11849,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11000: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11852: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11003: \$? = $ac_status" >&5 + echo "$as_me:11855: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11006: \"$ac_try\"") >&5 + { (eval echo "$as_me:11858: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11009: \$? = $ac_status" >&5 + echo "$as_me:11861: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -11027,12 +11879,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11030: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11882: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:11035: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:11887: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` @@ -11068,7 +11920,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 11071 "configure" +#line 11923 "configure" #include "confdefs.h" #include <stdio.h> int @@ -11080,16 +11932,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11083: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11935: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11086: \$? = $ac_status" >&5 + echo "$as_me:11938: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11089: \"$ac_try\"") >&5 + { (eval echo "$as_me:11941: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11092: \$? = $ac_status" >&5 + echo "$as_me:11944: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -11106,7 +11958,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:11109: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11961: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -11154,7 +12006,7 @@ EOF ;; esac -echo "$as_me:11157: checking for terminfo header" >&5 +echo "$as_me:12009: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11172,7 +12024,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 11175 "configure" +#line 12027 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -11187,16 +12039,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11190: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12042: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11193: \$? = $ac_status" >&5 + echo "$as_me:12045: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11196: \"$ac_try\"") >&5 + { (eval echo "$as_me:12048: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11199: \$? = $ac_status" >&5 + echo "$as_me:12051: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -11212,7 +12064,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:11215: result: $cf_cv_term_header" >&5 +echo "$as_me:12067: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -11250,7 +12102,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:11253: checking for ncurses version" >&5 +echo "$as_me:12105: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11276,10 +12128,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:11279: \"$cf_try\"") >&5 + { (eval echo "$as_me:12131: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:11282: \$? = $ac_status" >&5 + echo "$as_me:12134: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -11289,11 +12141,13 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 11292 "configure" +#line 12144 "configure" #include "confdefs.h" +$ac_includes_default + #include <${cf_cv_ncurses_header:-curses.h}> -#include <stdio.h> + int main(void) { FILE *fp = fopen("$cf_tempfile", "w"); @@ -11307,22 +12161,22 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:11317: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12171: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11320: \$? = $ac_status" >&5 + echo "$as_me:12174: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:11322: \"$ac_try\"") >&5 + { (eval echo "$as_me:12176: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11325: \$? = $ac_status" >&5 + echo "$as_me:12179: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -11336,7 +12190,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:11339: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:12193: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -11349,7 +12203,7 @@ cf_nculib_root=$cf_cv_screen # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:11352: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:12206: checking for Gpm_Open in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11357,7 +12211,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11360 "configure" +#line 12214 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11366,7 +12220,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char Gpm_Open (); +char Gpm_Open (void); int main (void) { @@ -11376,16 +12230,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11379: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12233: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11382: \$? = $ac_status" >&5 + echo "$as_me:12236: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11385: \"$ac_try\"") >&5 + { (eval echo "$as_me:12239: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11388: \$? = $ac_status" >&5 + echo "$as_me:12242: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -11396,10 +12250,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11399: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:12253: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then - echo "$as_me:11402: checking for initscr in -lgpm" >&5 + echo "$as_me:12256: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11407,7 +12261,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11410 "configure" +#line 12264 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11416,7 +12270,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); +char initscr (void); int main (void) { @@ -11426,16 +12280,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11429: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12283: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11432: \$? = $ac_status" >&5 + echo "$as_me:12286: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11435: \"$ac_try\"") >&5 + { (eval echo "$as_me:12289: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11438: \$? = $ac_status" >&5 + echo "$as_me:12292: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -11446,7 +12300,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11449: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:12303: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test "$ac_cv_lib_gpm_initscr" = yes; then LIBS="$cf_ncurses_SAVE" @@ -11459,9 +12313,9 @@ fi case "$host_os" in (freebsd*) # This is only necessary if you are linking against an obsolete - # version of ncurses (but it should do no harm, since it's static). + # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:11464: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:12318: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11469,7 +12323,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11472 "configure" +#line 12326 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11478,7 +12332,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (); +char tgoto (void); int main (void) { @@ -11488,16 +12342,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11491: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12345: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11494: \$? = $ac_status" >&5 + echo "$as_me:12348: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11497: \"$ac_try\"") >&5 + { (eval echo "$as_me:12351: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11500: \$? = $ac_status" >&5 + echo "$as_me:12354: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -11508,7 +12362,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11511: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:12365: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test "$ac_cv_lib_mytinfo_tgoto" = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -11557,13 +12411,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:11560: checking for initscr" >&5 + echo "$as_me:12414: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 11566 "configure" +#line 12420 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -11594,16 +12448,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11597: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12451: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11600: \$? = $ac_status" >&5 + echo "$as_me:12454: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11603: \"$ac_try\"") >&5 + { (eval echo "$as_me:12457: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11606: \$? = $ac_status" >&5 + echo "$as_me:12460: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -11613,18 +12467,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:11616: result: $ac_cv_func_initscr" >&5 +echo "$as_me:12470: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test "$ac_cv_func_initscr" = yes; then eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:11623: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:12477: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11627 "configure" +#line 12481 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11636,25 +12490,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11639: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12493: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11642: \$? = $ac_status" >&5 + echo "$as_me:12496: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11645: \"$ac_try\"") >&5 + { (eval echo "$as_me:12499: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11648: \$? = $ac_status" >&5 + echo "$as_me:12502: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:11650: result: yes" >&5 + echo "$as_me:12504: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:11657: result: no" >&5 +echo "$as_me:12511: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -11722,11 +12576,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:11725: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:12579: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11729 "configure" +#line 12583 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11738,25 +12592,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11741: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12595: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11744: \$? = $ac_status" >&5 + echo "$as_me:12598: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11747: \"$ac_try\"") >&5 + { (eval echo "$as_me:12601: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11750: \$? = $ac_status" >&5 + echo "$as_me:12604: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:11752: result: yes" >&5 + echo "$as_me:12606: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'"$cf_nculib_root"'=yes' break else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:11759: result: no" >&5 +echo "$as_me:12613: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -11771,7 +12625,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:11774: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:12628: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -11779,7 +12633,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:11782: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:12636: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -11789,7 +12643,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 11792 "configure" +#line 12646 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11801,23 +12655,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11804: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12658: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11807: \$? = $ac_status" >&5 + echo "$as_me:12661: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11810: \"$ac_try\"") >&5 + { (eval echo "$as_me:12664: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11813: \$? = $ac_status" >&5 + echo "$as_me:12667: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:11815: result: yes" >&5 + echo "$as_me:12669: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:11820: result: no" >&5 +echo "$as_me:12674: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -11837,7 +12691,7 @@ fi ;; (pdcurses) - echo "$as_me:11840: checking for X" >&5 + echo "$as_me:12694: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -11941,17 +12795,17 @@ if test "$ac_x_includes" = no; then # 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 11944 "configure" +#line 12798 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> _ACEOF -if { (eval echo "$as_me:11948: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:12802: \"$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:11954: \$? = $ac_status" >&5 + echo "$as_me:12808: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11984,7 +12838,7 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11987 "configure" +#line 12841 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> int @@ -11996,16 +12850,16 @@ XtMalloc (0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11999: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12853: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12002: \$? = $ac_status" >&5 + echo "$as_me:12856: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12005: \"$ac_try\"") >&5 + { (eval echo "$as_me:12859: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12008: \$? = $ac_status" >&5 + echo "$as_me:12862: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -12043,7 +12897,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:12046: result: $have_x" >&5 + echo "$as_me:12900: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -12053,7 +12907,7 @@ else # 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:12056: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:12910: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -12080,11 +12934,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:12083: checking whether -R must be followed by a space" >&5 + echo "$as_me:12937: 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 12087 "configure" +#line 12941 "configure" #include "confdefs.h" int @@ -12096,16 +12950,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12099: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12953: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12102: \$? = $ac_status" >&5 + echo "$as_me:12956: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12105: \"$ac_try\"") >&5 + { (eval echo "$as_me:12959: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12108: \$? = $ac_status" >&5 + echo "$as_me:12962: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_nospace=yes else @@ -12115,13 +12969,13 @@ ac_R_nospace=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_nospace = yes; then - echo "$as_me:12118: result: no" >&5 + echo "$as_me:12972: 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 12124 "configure" +#line 12978 "configure" #include "confdefs.h" int @@ -12133,16 +12987,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12136: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12990: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12139: \$? = $ac_status" >&5 + echo "$as_me:12993: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12142: \"$ac_try\"") >&5 + { (eval echo "$as_me:12996: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12145: \$? = $ac_status" >&5 + echo "$as_me:12999: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_space=yes else @@ -12152,11 +13006,11 @@ ac_R_space=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_space = yes; then - echo "$as_me:12155: result: yes" >&5 + echo "$as_me:13009: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:12159: result: neither works" >&5 + echo "$as_me:13013: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -12176,7 +13030,7 @@ echo "${ECHO_T}neither works" >&6 # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >"conftest.$ac_ext" <<_ACEOF -#line 12179 "configure" +#line 13033 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12185,7 +13039,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); +char XOpenDisplay (void); int main (void) { @@ -12195,22 +13049,22 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12198: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13052: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12201: \$? = $ac_status" >&5 + echo "$as_me:13055: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12204: \"$ac_try\"") >&5 + { (eval echo "$as_me:13058: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12207: \$? = $ac_status" >&5 + echo "$as_me:13061: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:12213: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:13067: 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 @@ -12218,7 +13072,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12221 "configure" +#line 13075 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12227,7 +13081,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); +char dnet_ntoa (void); int main (void) { @@ -12237,16 +13091,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12240: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13094: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12243: \$? = $ac_status" >&5 + echo "$as_me:13097: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12246: \"$ac_try\"") >&5 + { (eval echo "$as_me:13100: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12249: \$? = $ac_status" >&5 + echo "$as_me:13103: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -12257,14 +13111,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12260: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:13114: 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:12267: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:13121: 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 @@ -12272,7 +13126,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12275 "configure" +#line 13129 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12281,7 +13135,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); +char dnet_ntoa (void); int main (void) { @@ -12291,16 +13145,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12294: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13148: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12297: \$? = $ac_status" >&5 + echo "$as_me:13151: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12300: \"$ac_try\"") >&5 + { (eval echo "$as_me:13154: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12303: \$? = $ac_status" >&5 + echo "$as_me:13157: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -12311,7 +13165,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12314: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:13168: 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" @@ -12330,13 +13184,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" # 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:12333: checking for gethostbyname" >&5 + echo "$as_me:13187: 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 12339 "configure" +#line 13193 "configure" #include "confdefs.h" #define gethostbyname autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -12367,16 +13221,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12370: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13224: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12373: \$? = $ac_status" >&5 + echo "$as_me:13227: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12376: \"$ac_try\"") >&5 + { (eval echo "$as_me:13230: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12379: \$? = $ac_status" >&5 + echo "$as_me:13233: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gethostbyname=yes else @@ -12386,11 +13240,11 @@ ac_cv_func_gethostbyname=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:12389: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:13243: 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:12393: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:13247: 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 @@ -12398,7 +13252,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12401 "configure" +#line 13255 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12407,7 +13261,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gethostbyname (); +char gethostbyname (void); int main (void) { @@ -12417,16 +13271,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12420: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13274: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12423: \$? = $ac_status" >&5 + echo "$as_me:13277: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12426: \"$ac_try\"") >&5 + { (eval echo "$as_me:13280: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12429: \$? = $ac_status" >&5 + echo "$as_me:13283: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -12437,14 +13291,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12440: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:13294: 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:12447: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:13301: 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 @@ -12452,7 +13306,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12455 "configure" +#line 13309 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12461,7 +13315,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gethostbyname (); +char gethostbyname (void); int main (void) { @@ -12471,16 +13325,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12474: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13328: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12477: \$? = $ac_status" >&5 + echo "$as_me:13331: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12480: \"$ac_try\"") >&5 + { (eval echo "$as_me:13334: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12483: \$? = $ac_status" >&5 + echo "$as_me:13337: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -12491,7 +13345,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12494: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:13348: 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" @@ -12507,13 +13361,13 @@ fi # 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:12510: checking for connect" >&5 + echo "$as_me:13364: 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 12516 "configure" +#line 13370 "configure" #include "confdefs.h" #define connect autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -12544,16 +13398,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12547: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13401: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12550: \$? = $ac_status" >&5 + echo "$as_me:13404: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12553: \"$ac_try\"") >&5 + { (eval echo "$as_me:13407: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12556: \$? = $ac_status" >&5 + echo "$as_me:13410: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_connect=yes else @@ -12563,11 +13417,11 @@ ac_cv_func_connect=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:12566: result: $ac_cv_func_connect" >&5 +echo "$as_me:13420: 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:12570: checking for connect in -lsocket" >&5 + echo "$as_me:13424: 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 @@ -12575,7 +13429,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12578 "configure" +#line 13432 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12584,7 +13438,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char connect (); +char connect (void); int main (void) { @@ -12594,16 +13448,16 @@ connect (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12597: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13451: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12600: \$? = $ac_status" >&5 + echo "$as_me:13454: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12603: \"$ac_try\"") >&5 + { (eval echo "$as_me:13457: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12606: \$? = $ac_status" >&5 + echo "$as_me:13460: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_socket_connect=yes else @@ -12614,7 +13468,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12617: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:13471: 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" @@ -12623,13 +13477,13 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:12626: checking for remove" >&5 + echo "$as_me:13480: 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 12632 "configure" +#line 13486 "configure" #include "confdefs.h" #define remove autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -12660,16 +13514,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12663: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13517: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12666: \$? = $ac_status" >&5 + echo "$as_me:13520: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12669: \"$ac_try\"") >&5 + { (eval echo "$as_me:13523: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12672: \$? = $ac_status" >&5 + echo "$as_me:13526: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_remove=yes else @@ -12679,11 +13533,11 @@ ac_cv_func_remove=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:12682: result: $ac_cv_func_remove" >&5 +echo "$as_me:13536: 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:12686: checking for remove in -lposix" >&5 + echo "$as_me:13540: 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 @@ -12691,7 +13545,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12694 "configure" +#line 13548 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12700,7 +13554,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char remove (); +char remove (void); int main (void) { @@ -12710,16 +13564,16 @@ remove (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12713: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13567: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12716: \$? = $ac_status" >&5 + echo "$as_me:13570: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12719: \"$ac_try\"") >&5 + { (eval echo "$as_me:13573: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12722: \$? = $ac_status" >&5 + echo "$as_me:13576: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_posix_remove=yes else @@ -12730,7 +13584,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12733: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:13587: 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" @@ -12739,13 +13593,13 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:12742: checking for shmat" >&5 + echo "$as_me:13596: 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 12748 "configure" +#line 13602 "configure" #include "confdefs.h" #define shmat autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -12776,16 +13630,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12779: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13633: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12782: \$? = $ac_status" >&5 + echo "$as_me:13636: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12785: \"$ac_try\"") >&5 + { (eval echo "$as_me:13639: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12788: \$? = $ac_status" >&5 + echo "$as_me:13642: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_shmat=yes else @@ -12795,11 +13649,11 @@ ac_cv_func_shmat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:12798: result: $ac_cv_func_shmat" >&5 +echo "$as_me:13652: 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:12802: checking for shmat in -lipc" >&5 + echo "$as_me:13656: 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 @@ -12807,7 +13661,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12810 "configure" +#line 13664 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12816,7 +13670,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char shmat (); +char shmat (void); int main (void) { @@ -12826,16 +13680,16 @@ shmat (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12829: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13683: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12832: \$? = $ac_status" >&5 + echo "$as_me:13686: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12835: \"$ac_try\"") >&5 + { (eval echo "$as_me:13689: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12838: \$? = $ac_status" >&5 + echo "$as_me:13692: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -12846,7 +13700,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12849: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:13703: 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" @@ -12864,7 +13718,7 @@ fi # 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:12867: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:13721: 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 @@ -12872,7 +13726,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12875 "configure" +#line 13729 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12881,7 +13735,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char IceConnectionNumber (); +char IceConnectionNumber (void); int main (void) { @@ -12891,16 +13745,16 @@ IceConnectionNumber (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:12894: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13748: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12897: \$? = $ac_status" >&5 + echo "$as_me:13751: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:12900: \"$ac_try\"") >&5 + { (eval echo "$as_me:13754: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12903: \$? = $ac_status" >&5 + echo "$as_me:13757: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -12911,7 +13765,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12914: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:13768: 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" @@ -12923,7 +13777,7 @@ fi cf_x_athena=${cf_x_athena:-Xaw} -echo "$as_me:12926: checking if you want to link with Xaw 3d library" >&5 +echo "$as_me:13780: checking if you want to link with Xaw 3d library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6 withval= @@ -12934,14 +13788,14 @@ if test "${with_Xaw3d+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3d - echo "$as_me:12937: result: yes" >&5 + echo "$as_me:13791: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:12940: result: no" >&5 + echo "$as_me:13794: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:12944: checking if you want to link with Xaw 3d xft library" >&5 +echo "$as_me:13798: checking if you want to link with Xaw 3d xft library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6 withval= @@ -12952,14 +13806,14 @@ if test "${with_Xaw3dxft+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3dxft - echo "$as_me:12955: result: yes" >&5 + echo "$as_me:13809: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:12958: result: no" >&5 + echo "$as_me:13812: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:12962: checking if you want to link with neXT Athena library" >&5 +echo "$as_me:13816: checking if you want to link with neXT Athena library" >&5 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6 withval= @@ -12970,14 +13824,14 @@ if test "${with_neXtaw+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=neXtaw - echo "$as_me:12973: result: yes" >&5 + echo "$as_me:13827: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:12976: result: no" >&5 + echo "$as_me:13830: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:12980: checking if you want to link with Athena-Plus library" >&5 +echo "$as_me:13834: checking if you want to link with Athena-Plus library" >&5 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6 withval= @@ -12988,10 +13842,10 @@ if test "${with_XawPlus+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=XawPlus - echo "$as_me:12991: result: yes" >&5 + echo "$as_me:13845: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:12994: result: no" >&5 + echo "$as_me:13848: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -13011,17 +13865,17 @@ if test "$PKG_CONFIG" != none ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then test -n "$verbose" && echo " found package $cf_athena_pkg" 1>&6 -echo "${as_me:-configure}:13014: testing found package $cf_athena_pkg ..." 1>&5 +echo "${as_me:-configure}:13868: testing found package $cf_athena_pkg ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_athena_pkg" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "$cf_athena_pkg" 2>/dev/null`" test -n "$verbose" && echo " package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:13020: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:13874: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:13024: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:13878: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -13152,22 +14006,23 @@ EOF LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 -echo "${as_me:-configure}:13155: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:14009: testing ..trimmed $LIBS ..." 1>&5 ;; esac done -echo "$as_me:13161: checking for usable $cf_x_athena/Xmu package" >&5 +echo "$as_me:14015: checking for usable $cf_x_athena/Xmu package" >&5 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6 if test "${cf_cv_xaw_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 13168 "configure" +#line 14022 "configure" #include "confdefs.h" +$ac_includes_default #include <X11/Xmu/CharSet.h> int @@ -13182,16 +14037,16 @@ int check = XmuCompareISOLatin1("big", "small"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13185: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14040: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13188: \$? = $ac_status" >&5 + echo "$as_me:14043: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13191: \"$ac_try\"") >&5 + { (eval echo "$as_me:14046: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13194: \$? = $ac_status" >&5 + echo "$as_me:14049: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xaw_compat=yes else @@ -13201,7 +14056,7 @@ cf_cv_xaw_compat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:13204: result: $cf_cv_xaw_compat" >&5 +echo "$as_me:14059: result: $cf_cv_xaw_compat" >&5 echo "${ECHO_T}$cf_cv_xaw_compat" >&6 if test "$cf_cv_xaw_compat" = no @@ -13213,7 +14068,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6 (*) test -n "$verbose" && echo " work around broken package" 1>&6 -echo "${as_me:-configure}:13216: testing work around broken package ..." 1>&5 +echo "${as_me:-configure}:14071: testing work around broken package ..." 1>&5 cf_save_xmu="$LIBS" cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'` @@ -13221,17 +14076,17 @@ echo "${as_me:-configure}:13216: testing work around broken package ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then test -n "$verbose" && echo " found package xmu" 1>&6 -echo "${as_me:-configure}:13224: testing found package xmu ..." 1>&5 +echo "${as_me:-configure}:14079: testing found package xmu ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xmu" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "xmu" 2>/dev/null`" test -n "$verbose" && echo " package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:13230: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14085: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xmu LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:13234: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14089: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -13351,12 +14206,12 @@ LIBS="$cf_add_libs" test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:13354: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:14209: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:13359: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:14214: testing ...after $LIBS ..." 1>&5 else cf_pkgconfig_incs= @@ -13364,12 +14219,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:13367: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:14222: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:13372: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:14227: testing ...after $LIBS ..." 1>&5 fi @@ -13380,7 +14235,7 @@ fi LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 -echo "${as_me:-configure}:13383: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:14238: testing ..trimmed $LIBS ..." 1>&5 ;; esac @@ -13405,17 +14260,17 @@ if test -z "$cf_x_athena_lib" ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then test -n "$verbose" && echo " found package Xext" 1>&6 -echo "${as_me:-configure}:13408: testing found package Xext ..." 1>&5 +echo "${as_me:-configure}:14263: testing found package Xext ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "Xext" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "Xext" 2>/dev/null`" test -n "$verbose" && echo " package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:13414: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14269: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package Xext LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:13418: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14273: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -13536,7 +14391,7 @@ else cf_pkgconfig_incs= cf_pkgconfig_libs= - echo "$as_me:13539: checking for XextCreateExtension in -lXext" >&5 + echo "$as_me:14394: checking for XextCreateExtension in -lXext" >&5 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13544,7 +14399,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 13547 "configure" +#line 14402 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13553,7 +14408,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XextCreateExtension (); +char XextCreateExtension (void); int main (void) { @@ -13563,16 +14418,16 @@ XextCreateExtension (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13566: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14421: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13569: \$? = $ac_status" >&5 + echo "$as_me:14424: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13572: \"$ac_try\"") >&5 + { (eval echo "$as_me:14427: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13575: \$? = $ac_status" >&5 + echo "$as_me:14430: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -13583,7 +14438,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13586: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:14441: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6 if test "$ac_cv_lib_Xext_XextCreateExtension" = yes; then @@ -13619,17 +14474,17 @@ then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:13622: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:14477: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "x11" 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:13628: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14483: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:13632: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14487: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -13749,24 +14604,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:13752: WARNING: unable to find X11 library" >&5 + { echo "$as_me:14607: WARNING: unable to find X11 library" >&5 echo "$as_me: WARNING: unable to find X11 library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:13759: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:14614: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "ice" 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:13765: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14620: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:13769: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14624: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -13886,24 +14741,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:13889: WARNING: unable to find ICE library" >&5 + { echo "$as_me:14744: WARNING: unable to find ICE library" >&5 echo "$as_me: WARNING: unable to find ICE library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:13896: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:14751: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "sm" 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:13902: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14757: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:13906: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14761: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -14023,24 +14878,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:14026: WARNING: unable to find SM library" >&5 + { echo "$as_me:14881: WARNING: unable to find SM library" >&5 echo "$as_me: WARNING: unable to find SM library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:14033: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:14888: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "xt" 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14039: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14894: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14043: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14898: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -14160,7 +15015,7 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:14163: WARNING: unable to find Xt library" >&5 + { echo "$as_me:15018: WARNING: unable to find Xt library" >&5 echo "$as_me: WARNING: unable to find Xt library" >&2;} fi @@ -14173,17 +15028,17 @@ cf_have_X_LIBS=no if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:14176: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:15031: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "xt" 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14182: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15037: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14186: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15041: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -14304,16 +15159,17 @@ LIBS="$cf_add_libs" ;; (*) # we have an "xt" package, but it may omit Xt's dependency on X11 -echo "$as_me:14307: checking for usable X dependency" >&5 +echo "$as_me:15162: checking for usable X dependency" >&5 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6 if test "${cf_cv_xt_x11_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14314 "configure" +#line 15169 "configure" #include "confdefs.h" +$ac_includes_default #include <X11/Xlib.h> int @@ -14330,16 +15186,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14333: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15189: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14336: \$? = $ac_status" >&5 + echo "$as_me:15192: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14339: \"$ac_try\"") >&5 + { (eval echo "$as_me:15195: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14342: \$? = $ac_status" >&5 + echo "$as_me:15198: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xt_x11_compat=yes else @@ -14349,30 +15205,30 @@ cf_cv_xt_x11_compat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:14352: result: $cf_cv_xt_x11_compat" >&5 +echo "$as_me:15208: result: $cf_cv_xt_x11_compat" >&5 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6 if test "$cf_cv_xt_x11_compat" = no then test -n "$verbose" && echo " work around broken X11 dependency" 1>&6 -echo "${as_me:-configure}:14358: testing work around broken X11 dependency ..." 1>&5 +echo "${as_me:-configure}:15214: testing work around broken X11 dependency ..." 1>&5 # 2010/11/19 - good enough until a working Xt on Xcb is delivered. if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:14365: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:15221: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "x11" 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14371: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15227: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14375: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15231: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -14495,12 +15351,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:14498: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:15354: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:14503: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:15359: testing ...after $LIBS ..." 1>&5 fi @@ -14508,16 +15364,17 @@ fi ;; esac -echo "$as_me:14511: checking for usable X Toolkit package" >&5 +echo "$as_me:15367: checking for usable X Toolkit package" >&5 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6 if test "${cf_cv_xt_ice_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14518 "configure" +#line 15374 "configure" #include "confdefs.h" +$ac_includes_default #include <X11/Shell.h> int @@ -14530,16 +15387,16 @@ int num = IceConnectionNumber(0); (void) num } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14533: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15390: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14536: \$? = $ac_status" >&5 + echo "$as_me:15393: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14539: \"$ac_try\"") >&5 + { (eval echo "$as_me:15396: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14542: \$? = $ac_status" >&5 + echo "$as_me:15399: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xt_ice_compat=yes else @@ -14549,7 +15406,7 @@ cf_cv_xt_ice_compat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:14552: result: $cf_cv_xt_ice_compat" >&5 +echo "$as_me:15409: result: $cf_cv_xt_ice_compat" >&5 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 if test "$cf_cv_xt_ice_compat" = no @@ -14563,22 +15420,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 (*) test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 -echo "${as_me:-configure}:14566: testing work around broken ICE dependency ..." 1>&5 +echo "${as_me:-configure}:15423: testing work around broken ICE dependency ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:14571: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:15428: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "ice" 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14577: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15434: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14581: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15438: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -14697,17 +15554,17 @@ LIBS="$cf_add_libs" if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:14700: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:15557: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "sm" 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14706: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15563: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14710: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15567: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -14836,12 +15693,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:14839: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:15696: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:14844: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:15701: testing ...after $LIBS ..." 1>&5 fi @@ -14861,7 +15718,7 @@ else test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:14864: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15721: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -14946,7 +15803,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:14949: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:15806: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -14956,7 +15813,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:14959: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:15816: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -14966,7 +15823,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:14969: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:15826: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -14975,7 +15832,7 @@ fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 14978 "configure" +#line 15835 "configure" #include "confdefs.h" #include <stdio.h> int @@ -14987,16 +15844,16 @@ printf("Hello world"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14990: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15847: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14993: \$? = $ac_status" >&5 + echo "$as_me:15850: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14996: \"$ac_try\"") >&5 + { (eval echo "$as_me:15853: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14999: \$? = $ac_status" >&5 + echo "$as_me:15856: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -15004,12 +15861,12 @@ else cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:15007: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15864: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:15012: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:15869: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_cflags" @@ -15017,13 +15874,13 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi - echo "$as_me:15020: checking for XOpenDisplay" >&5 + echo "$as_me:15877: checking for XOpenDisplay" >&5 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6 if test "${ac_cv_func_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15026 "configure" +#line 15883 "configure" #include "confdefs.h" #define XOpenDisplay autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15054,16 +15911,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15057: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15914: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15060: \$? = $ac_status" >&5 + echo "$as_me:15917: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15063: \"$ac_try\"") >&5 + { (eval echo "$as_me:15920: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15066: \$? = $ac_status" >&5 + echo "$as_me:15923: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_XOpenDisplay=yes else @@ -15073,13 +15930,13 @@ ac_cv_func_XOpenDisplay=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15076: result: $ac_cv_func_XOpenDisplay" >&5 +echo "$as_me:15933: result: $ac_cv_func_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6 if test "$ac_cv_func_XOpenDisplay" = yes; then : else - echo "$as_me:15082: checking for XOpenDisplay in -lX11" >&5 + echo "$as_me:15939: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15087,7 +15944,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15090 "configure" +#line 15947 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15096,7 +15953,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); +char XOpenDisplay (void); int main (void) { @@ -15106,16 +15963,16 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15109: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15966: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15112: \$? = $ac_status" >&5 + echo "$as_me:15969: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15115: \"$ac_try\"") >&5 + { (eval echo "$as_me:15972: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15118: \$? = $ac_status" >&5 + echo "$as_me:15975: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -15126,7 +15983,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15129: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:15986: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then @@ -15150,13 +16007,13 @@ fi fi - echo "$as_me:15153: checking for XtAppInitialize" >&5 + echo "$as_me:16010: checking for XtAppInitialize" >&5 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6 if test "${ac_cv_func_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15159 "configure" +#line 16016 "configure" #include "confdefs.h" #define XtAppInitialize autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15187,16 +16044,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15190: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16047: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15193: \$? = $ac_status" >&5 + echo "$as_me:16050: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15196: \"$ac_try\"") >&5 + { (eval echo "$as_me:16053: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15199: \$? = $ac_status" >&5 + echo "$as_me:16056: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_XtAppInitialize=yes else @@ -15206,13 +16063,13 @@ ac_cv_func_XtAppInitialize=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15209: result: $ac_cv_func_XtAppInitialize" >&5 +echo "$as_me:16066: result: $ac_cv_func_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6 if test "$ac_cv_func_XtAppInitialize" = yes; then : else - echo "$as_me:15215: checking for XtAppInitialize in -lXt" >&5 + echo "$as_me:16072: checking for XtAppInitialize in -lXt" >&5 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15220,7 +16077,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15223 "configure" +#line 16080 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15229,7 +16086,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XtAppInitialize (); +char XtAppInitialize (void); int main (void) { @@ -15239,16 +16096,16 @@ XtAppInitialize (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15242: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16099: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15245: \$? = $ac_status" >&5 + echo "$as_me:16102: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15248: \"$ac_try\"") >&5 + { (eval echo "$as_me:16105: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15251: \$? = $ac_status" >&5 + echo "$as_me:16108: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Xt_XtAppInitialize=yes else @@ -15259,7 +16116,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15262: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "$as_me:16119: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6 if test "$ac_cv_lib_Xt_XtAppInitialize" = yes; then @@ -15276,7 +16133,7 @@ fi fi if test "$cf_have_X_LIBS" = no ; then - { echo "$as_me:15279: WARNING: Unable to successfully link X Toolkit library (-lXt) with + { echo "$as_me:16136: WARNING: Unable to successfully link X Toolkit library (-lXt) with test program. You will have to check and add the proper libraries by hand to makefile." >&5 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with @@ -15317,14 +16174,14 @@ done test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_path/include" - echo "$as_me:15320: checking for $cf_test in $cf_path" >&5 + echo "$as_me:16177: checking for $cf_test in $cf_path" >&5 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6 else - echo "$as_me:15323: checking for $cf_test" >&5 + echo "$as_me:16180: checking for $cf_test" >&5 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi cat >"conftest.$ac_ext" <<_ACEOF -#line 15327 "configure" +#line 16184 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> @@ -15338,16 +16195,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15341: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16198: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15344: \$? = $ac_status" >&5 + echo "$as_me:16201: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15347: \"$ac_try\"") >&5 + { (eval echo "$as_me:16204: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15350: \$? = $ac_status" >&5 + echo "$as_me:16207: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -15356,7 +16213,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:15359: result: $cf_result" >&5 + echo "$as_me:16216: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS" @@ -15372,7 +16229,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS" done if test -z "$cf_x_athena_inc" ; then - { echo "$as_me:15375: WARNING: Unable to find Athena header files" >&5 + { echo "$as_me:16232: WARNING: Unable to find Athena header files" >&5 echo "$as_me: WARNING: Unable to find Athena header files" >&2;} elif test "$cf_x_athena_inc" != default ; then @@ -15437,12 +16294,13 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - echo "$as_me:15440: checking for $cf_test in $cf_libs" >&5 + echo "$as_me:16297: checking for $cf_test in $cf_libs" >&5 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 15443 "configure" +#line 16300 "configure" #include "confdefs.h" +$ac_includes_default #include <X11/Intrinsic.h> #include <X11/$cf_x_athena_root/SimpleMenu.h> @@ -15456,16 +16314,16 @@ $cf_test((XtAppContext) 0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15459: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16317: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15462: \$? = $ac_status" >&5 + echo "$as_me:16320: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15465: \"$ac_try\"") >&5 + { (eval echo "$as_me:16323: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15468: \$? = $ac_status" >&5 + echo "$as_me:16326: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -15474,7 +16332,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:15477: result: $cf_result" >&5 + echo "$as_me:16335: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS" @@ -15491,7 +16349,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS" done if test -z "$cf_x_athena_lib" ; then - { { echo "$as_me:15494: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + { { echo "$as_me:16352: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;} { (exit 1); exit 1; }; } fi @@ -15525,7 +16383,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:15528: checking for $ac_word" >&5 +echo "$as_me:16386: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15540,7 +16398,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:15543: found $ac_dir/$ac_word" >&5 +echo "$as_me:16401: found $ac_dir/$ac_word" >&5 break done @@ -15548,10 +16406,10 @@ fi fi XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG if test -n "$XCURSES_CONFIG"; then - echo "$as_me:15551: result: $XCURSES_CONFIG" >&5 + echo "$as_me:16409: result: $XCURSES_CONFIG" >&5 echo "${ECHO_T}$XCURSES_CONFIG" >&6 else - echo "$as_me:15554: result: no" >&5 + echo "$as_me:16412: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -15564,7 +16422,7 @@ if test -z "$XCURSES_CONFIG"; then 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:15567: checking for $ac_word" >&5 +echo "$as_me:16425: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15579,7 +16437,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog" -echo "$as_me:15582: found $ac_dir/$ac_word" >&5 +echo "$as_me:16440: found $ac_dir/$ac_word" >&5 break done @@ -15587,10 +16445,10 @@ fi fi ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG if test -n "$ac_ct_XCURSES_CONFIG"; then - echo "$as_me:15590: result: $ac_ct_XCURSES_CONFIG" >&5 + echo "$as_me:16448: result: $ac_ct_XCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6 else - echo "$as_me:15593: result: no" >&5 + echo "$as_me:16451: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -15725,7 +16583,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:15728: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:16586: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -15810,7 +16668,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:15813: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:16671: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -15820,7 +16678,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:15823: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:16681: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -15830,7 +16688,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:15833: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:16691: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -15839,7 +16697,7 @@ fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 15842 "configure" +#line 16700 "configure" #include "confdefs.h" #include <stdio.h> int @@ -15851,16 +16709,16 @@ printf("Hello world"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15854: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16712: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15857: \$? = $ac_status" >&5 + echo "$as_me:16715: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15860: \"$ac_try\"") >&5 + { (eval echo "$as_me:16718: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15863: \$? = $ac_status" >&5 + echo "$as_me:16721: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -15868,12 +16726,12 @@ else cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:15871: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:16729: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:15876: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:16734: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_cflags" @@ -15881,7 +16739,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15884: checking for XOpenDisplay in -lX11" >&5 +echo "$as_me:16742: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15889,7 +16747,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15892 "configure" +#line 16750 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15898,7 +16756,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); +char XOpenDisplay (void); int main (void) { @@ -15908,16 +16766,16 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15911: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16769: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15914: \$? = $ac_status" >&5 + echo "$as_me:16772: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15917: \"$ac_try\"") >&5 + { (eval echo "$as_me:16775: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15920: \$? = $ac_status" >&5 + echo "$as_me:16778: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -15928,7 +16786,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15931: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:16789: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then @@ -15950,7 +16808,7 @@ LIBS="$cf_add_libs" fi -echo "$as_me:15953: checking for XCurses library" >&5 +echo "$as_me:16811: checking for XCurses library" >&5 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6 if test "${cf_cv_lib_XCurses+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15973,7 +16831,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 15976 "configure" +#line 16834 "configure" #include "confdefs.h" #include <xcurses.h> @@ -15988,16 +16846,16 @@ XCursesExit(); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15991: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16849: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15994: \$? = $ac_status" >&5 + echo "$as_me:16852: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15997: \"$ac_try\"") >&5 + { (eval echo "$as_me:16855: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16000: \$? = $ac_status" >&5 + echo "$as_me:16858: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_lib_XCurses=yes else @@ -16008,7 +16866,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16011: result: $cf_cv_lib_XCurses" >&5 +echo "$as_me:16869: result: $cf_cv_lib_XCurses" >&5 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6 fi @@ -16023,23 +16881,23 @@ cat >>confdefs.h <<\EOF #define XCURSES 1 EOF - echo "$as_me:16026: checking for xcurses.h" >&5 + echo "$as_me:16884: checking for xcurses.h" >&5 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6 if test "${ac_cv_header_xcurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16032 "configure" +#line 16890 "configure" #include "confdefs.h" #include <xcurses.h> _ACEOF -if { (eval echo "$as_me:16036: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:16894: \"$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:16042: \$? = $ac_status" >&5 + echo "$as_me:16900: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16058,7 +16916,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:16061: result: $ac_cv_header_xcurses_h" >&5 +echo "$as_me:16919: result: $ac_cv_header_xcurses_h" >&5 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6 if test "$ac_cv_header_xcurses_h" = yes; then @@ -16069,14 +16927,14 @@ EOF fi else - { { echo "$as_me:16072: error: Cannot link with XCurses" >&5 + { { echo "$as_me:16930: error: Cannot link with XCurses" >&5 echo "$as_me: error: Cannot link with XCurses" >&2;} { (exit 1); exit 1; }; } fi ;; (*) - { { echo "$as_me:16079: error: unexpected screen-value: $cf_cv_screen" >&5 + { { echo "$as_me:16937: error: unexpected screen-value: $cf_cv_screen" >&5 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;} { (exit 1); exit 1; }; } ;; @@ -16084,7 +16942,7 @@ esac : ${cf_nculib_root:=$cf_cv_screen} as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh` -echo "$as_me:16087: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5 +echo "$as_me:16945: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16092,7 +16950,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_nculib_root $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16095 "configure" +#line 16953 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16101,7 +16959,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char _nc_init_pthreads (); +char _nc_init_pthreads (void); int main (void) { @@ -16111,16 +16969,16 @@ _nc_init_pthreads (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16114: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16972: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16117: \$? = $ac_status" >&5 + echo "$as_me:16975: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16120: \"$ac_try\"") >&5 + { (eval echo "$as_me:16978: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16123: \$? = $ac_status" >&5 + echo "$as_me:16981: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -16131,7 +16989,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16134: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:16992: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then cf_cv_ncurses_pthreads=yes @@ -16166,7 +17024,7 @@ case $cf_cv_screen in ;; esac -echo "$as_me:16169: checking for X11 rgb file" >&5 +echo "$as_me:17027: checking for X11 rgb file" >&5 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6 # Check whether --with-x11-rgb or --without-x11-rgb was given. @@ -16230,7 +17088,7 @@ case ".$cf_path" in cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:16233: error: expected a pathname, not \"$cf_path\"" >&5 + { { echo "$as_me:17091: error: expected a pathname, not \"$cf_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -16238,7 +17096,7 @@ esac fi -echo "$as_me:16241: result: $RGB_PATH" >&5 +echo "$as_me:17099: result: $RGB_PATH" >&5 echo "${ECHO_T}$RGB_PATH" >&6 cat >>confdefs.h <<EOF @@ -16279,7 +17137,7 @@ case $cf_cv_screen in ;; esac -echo "$as_me:16282: checking for desired basename for form library" >&5 +echo "$as_me:17140: checking for desired basename for form library" >&5 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6 # Check whether --with-form-libname or --without-form-libname was given. @@ -16299,10 +17157,10 @@ case "x$FORM_NAME" in ;; esac -echo "$as_me:16302: result: $FORM_NAME" >&5 +echo "$as_me:17160: result: $FORM_NAME" >&5 echo "${ECHO_T}$FORM_NAME" >&6 -echo "$as_me:16305: checking for desired basename for menu library" >&5 +echo "$as_me:17163: checking for desired basename for menu library" >&5 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6 # Check whether --with-menu-libname or --without-menu-libname was given. @@ -16322,10 +17180,10 @@ case "x$MENU_NAME" in ;; esac -echo "$as_me:16325: result: $MENU_NAME" >&5 +echo "$as_me:17183: result: $MENU_NAME" >&5 echo "${ECHO_T}$MENU_NAME" >&6 -echo "$as_me:16328: checking for desired basename for panel library" >&5 +echo "$as_me:17186: checking for desired basename for panel library" >&5 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6 # Check whether --with-panel-libname or --without-panel-libname was given. @@ -16345,10 +17203,10 @@ case "x$PANEL_NAME" in ;; esac -echo "$as_me:16348: result: $PANEL_NAME" >&5 +echo "$as_me:17206: result: $PANEL_NAME" >&5 echo "${ECHO_T}$PANEL_NAME" >&6 -echo "$as_me:16351: checking if you want to check for panel functions" >&5 +echo "$as_me:17209: checking if you want to check for panel functions" >&5 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6 # Check whether --enable-panel or --disable-panel was given. @@ -16365,7 +17223,7 @@ else cf_enable_panel=$cf_default_panel fi; -echo "$as_me:16368: result: $cf_enable_panel" >&5 +echo "$as_me:17226: result: $cf_enable_panel" >&5 echo "${ECHO_T}$cf_enable_panel" >&6 if test $cf_enable_panel = yes then @@ -16376,24 +17234,51 @@ cf_have_curses_lib=no if test "x${NCURSES_CONFIG_PKG}" = xnone; then : elif test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:16379: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5 + echo "$as_me:17237: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6 if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then - echo "$as_me:16382: result: yes" >&5 + echo "$as_me:17240: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:16385: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5 + echo "$as_me:17243: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5 echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" +for cf_add_cflags in `$PKG_CONFIG --cflags "$PANEL_NAME$cf_cv_libtype"` +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$PKG_CONFIG --cflags "$PANEL_NAME$cf_cv_libtype"` +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -16486,6 +17371,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -16503,7 +17390,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 16506 "configure" +#line 17393 "configure" #include "confdefs.h" #include <$PANEL_NAME.h> int @@ -16515,37 +17402,37 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16518: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17405: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16521: \$? = $ac_status" >&5 + echo "$as_me:17408: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16524: \"$ac_try\"") >&5 + { (eval echo "$as_me:17411: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16527: \$? = $ac_status" >&5 + echo "$as_me:17414: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_curses_lib=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 16533 "configure" +#line 17420 "configure" #include "confdefs.h" #include <$PANEL_NAME.h> int main(void) { (void) new_panel ( 0 ); return 0; } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:16540: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17427: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16543: \$? = $ac_status" >&5 + echo "$as_me:17430: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:16545: \"$ac_try\"") >&5 + { (eval echo "$as_me:17432: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16548: \$? = $ac_status" >&5 + echo "$as_me:17435: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_curses_lib=yes else @@ -16562,14 +17449,11 @@ cat "conftest.$ac_ext" >&5 cf_have_curses_lib=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:16565: result: $cf_have_curses_lib" >&5 + echo "$as_me:17452: result: $cf_have_curses_lib" >&5 echo "${ECHO_T}$cf_have_curses_lib" >&6 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes - if test "$cf_have_curses_lib" != "yes" + if test "$cf_have_curses_lib" = "yes" then - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - else cf_upper=`echo "have_lib$PANEL_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -16577,12 +17461,16 @@ cf_upper=`echo "have_lib$PANEL_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDE #define $cf_upper 1 EOF + else + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" fi fi fi if test "$cf_have_curses_lib" = no; then as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh` -echo "$as_me:16585: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5 +echo "$as_me:17473: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16590,7 +17478,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$PANEL_NAME$cf_cv_libtype $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16593 "configure" +#line 17481 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16599,7 +17487,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char new_panel (); +char new_panel (void); int main (void) { @@ -16609,16 +17497,16 @@ new_panel (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16612: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17500: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16615: \$? = $ac_status" >&5 + echo "$as_me:17503: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16618: \"$ac_try\"") >&5 + { (eval echo "$as_me:17506: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16621: \$? = $ac_status" >&5 + echo "$as_me:17509: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -16629,7 +17517,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16632: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:17520: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then @@ -16662,7 +17550,7 @@ fi cf_curses_headers="$cf_curses_headers panel.h" fi -echo "$as_me:16665: checking if you want to check for menu functions" >&5 +echo "$as_me:17553: checking if you want to check for menu functions" >&5 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6 # Check whether --enable-menu or --disable-menu was given. @@ -16679,7 +17567,7 @@ else cf_enable_menu=$cf_default_menu fi; -echo "$as_me:16682: result: $cf_enable_menu" >&5 +echo "$as_me:17570: result: $cf_enable_menu" >&5 echo "${ECHO_T}$cf_enable_menu" >&6 if test $cf_enable_menu = yes then @@ -16688,14 +17576,14 @@ then ;; (curses*) -echo "$as_me:16691: checking for NetBSD menu.h" >&5 +echo "$as_me:17579: checking for NetBSD menu.h" >&5 echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6 if test "${cf_cv_netbsd_menu_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16698 "configure" +#line 17586 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16713,16 +17601,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16716: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17604: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16719: \$? = $ac_status" >&5 + echo "$as_me:17607: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16722: \"$ac_try\"") >&5 + { (eval echo "$as_me:17610: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16725: \$? = $ac_status" >&5 + echo "$as_me:17613: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_netbsd_menu_h=yes @@ -16734,7 +17622,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16737: result: $cf_cv_netbsd_menu_h" >&5 +echo "$as_me:17625: result: $cf_cv_netbsd_menu_h" >&5 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6 test "$cf_cv_netbsd_menu_h" = yes && @@ -16751,24 +17639,51 @@ cf_have_curses_lib=no if test "x${NCURSES_CONFIG_PKG}" = xnone; then : elif test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:16754: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5 + echo "$as_me:17642: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6 if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then - echo "$as_me:16757: result: yes" >&5 + echo "$as_me:17645: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:16760: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5 + echo "$as_me:17648: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5 echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" +for cf_add_cflags in `$PKG_CONFIG --cflags "$MENU_NAME$cf_cv_libtype"` +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$PKG_CONFIG --cflags "$MENU_NAME$cf_cv_libtype"` +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -16861,6 +17776,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -16878,7 +17795,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 16881 "configure" +#line 17798 "configure" #include "confdefs.h" #include <$MENU_NAME.h> int @@ -16890,37 +17807,37 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16893: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17810: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16896: \$? = $ac_status" >&5 + echo "$as_me:17813: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16899: \"$ac_try\"") >&5 + { (eval echo "$as_me:17816: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16902: \$? = $ac_status" >&5 + echo "$as_me:17819: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_curses_lib=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 16908 "configure" +#line 17825 "configure" #include "confdefs.h" #include <$MENU_NAME.h> int main(void) { (void) menu_driver ( 0,0 ); return 0; } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:16915: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17832: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16918: \$? = $ac_status" >&5 + echo "$as_me:17835: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:16920: \"$ac_try\"") >&5 + { (eval echo "$as_me:17837: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16923: \$? = $ac_status" >&5 + echo "$as_me:17840: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_curses_lib=yes else @@ -16937,14 +17854,11 @@ cat "conftest.$ac_ext" >&5 cf_have_curses_lib=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:16940: result: $cf_have_curses_lib" >&5 + echo "$as_me:17857: result: $cf_have_curses_lib" >&5 echo "${ECHO_T}$cf_have_curses_lib" >&6 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes - if test "$cf_have_curses_lib" != "yes" + if test "$cf_have_curses_lib" = "yes" then - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - else cf_upper=`echo "have_lib$MENU_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -16952,12 +17866,16 @@ cf_upper=`echo "have_lib$MENU_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEF #define $cf_upper 1 EOF + else + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" fi fi fi if test "$cf_have_curses_lib" = no; then as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh` -echo "$as_me:16960: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5 +echo "$as_me:17878: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16965,7 +17883,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$MENU_NAME$cf_cv_libtype $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16968 "configure" +#line 17886 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16974,7 +17892,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char menu_driver (); +char menu_driver (void); int main (void) { @@ -16984,16 +17902,16 @@ menu_driver (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16987: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17905: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16990: \$? = $ac_status" >&5 + echo "$as_me:17908: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16993: \"$ac_try\"") >&5 + { (eval echo "$as_me:17911: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16996: \$? = $ac_status" >&5 + echo "$as_me:17914: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -17004,7 +17922,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17007: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:17925: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then @@ -17037,7 +17955,7 @@ fi cf_curses_headers="$cf_curses_headers menu.h" fi -echo "$as_me:17040: checking if you want to check for form functions" >&5 +echo "$as_me:17958: checking if you want to check for form functions" >&5 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6 # Check whether --enable-form or --disable-form was given. @@ -17054,7 +17972,7 @@ else cf_enable_form=$cf_default_form fi; -echo "$as_me:17057: result: $cf_enable_form" >&5 +echo "$as_me:17975: result: $cf_enable_form" >&5 echo "${ECHO_T}$cf_enable_form" >&6 if test $cf_enable_form = yes then @@ -17063,14 +17981,14 @@ then ;; (curses*) -echo "$as_me:17066: checking for NetBSD form.h" >&5 +echo "$as_me:17984: checking for NetBSD form.h" >&5 echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6 if test "${cf_cv_netbsd_form_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17073 "configure" +#line 17991 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -17089,16 +18007,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17092: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18010: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17095: \$? = $ac_status" >&5 + echo "$as_me:18013: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17098: \"$ac_try\"") >&5 + { (eval echo "$as_me:18016: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17101: \$? = $ac_status" >&5 + echo "$as_me:18019: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_netbsd_form_h=yes @@ -17110,7 +18028,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17113: result: $cf_cv_netbsd_form_h" >&5 +echo "$as_me:18031: result: $cf_cv_netbsd_form_h" >&5 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6 test "$cf_cv_netbsd_form_h" = yes && @@ -17127,24 +18045,51 @@ cf_have_curses_lib=no if test "x${NCURSES_CONFIG_PKG}" = xnone; then : elif test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:17130: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5 + echo "$as_me:18048: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6 if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then - echo "$as_me:17133: result: yes" >&5 + echo "$as_me:18051: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:17136: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5 + echo "$as_me:18054: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5 echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" +for cf_add_cflags in `$PKG_CONFIG --cflags "$FORM_NAME$cf_cv_libtype"` +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$PKG_CONFIG --cflags "$FORM_NAME$cf_cv_libtype"` +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -17237,6 +18182,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -17254,7 +18201,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 17257 "configure" +#line 18204 "configure" #include "confdefs.h" #include <$FORM_NAME.h> int @@ -17266,37 +18213,37 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17269: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18216: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17272: \$? = $ac_status" >&5 + echo "$as_me:18219: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17275: \"$ac_try\"") >&5 + { (eval echo "$as_me:18222: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17278: \$? = $ac_status" >&5 + echo "$as_me:18225: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_curses_lib=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 17284 "configure" +#line 18231 "configure" #include "confdefs.h" #include <$FORM_NAME.h> int main(void) { (void) form_driver ( 0,0 ); return 0; } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:17291: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18238: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17294: \$? = $ac_status" >&5 + echo "$as_me:18241: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:17296: \"$ac_try\"") >&5 + { (eval echo "$as_me:18243: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17299: \$? = $ac_status" >&5 + echo "$as_me:18246: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_curses_lib=yes else @@ -17313,14 +18260,11 @@ cat "conftest.$ac_ext" >&5 cf_have_curses_lib=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:17316: result: $cf_have_curses_lib" >&5 + echo "$as_me:18263: result: $cf_have_curses_lib" >&5 echo "${ECHO_T}$cf_have_curses_lib" >&6 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes - if test "$cf_have_curses_lib" != "yes" + if test "$cf_have_curses_lib" = "yes" then - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - else cf_upper=`echo "have_lib$FORM_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -17328,12 +18272,16 @@ cf_upper=`echo "have_lib$FORM_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEF #define $cf_upper 1 EOF + else + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" fi fi fi if test "$cf_have_curses_lib" = no; then as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh` -echo "$as_me:17336: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5 +echo "$as_me:18284: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17341,7 +18289,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$FORM_NAME$cf_cv_libtype $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17344 "configure" +#line 18292 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17350,7 +18298,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char form_driver (); +char form_driver (void); int main (void) { @@ -17360,16 +18308,16 @@ form_driver (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17363: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18311: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17366: \$? = $ac_status" >&5 + echo "$as_me:18314: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17369: \"$ac_try\"") >&5 + { (eval echo "$as_me:18317: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17372: \$? = $ac_status" >&5 + echo "$as_me:18320: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -17380,7 +18328,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17383: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:18331: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then @@ -17418,23 +18366,23 @@ fi for ac_header in $cf_curses_headers do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:17421: checking for $ac_header" >&5 +echo "$as_me:18369: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17427 "configure" +#line 18375 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17431: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18379: \"$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:17437: \$? = $ac_status" >&5 + echo "$as_me:18385: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17453,7 +18401,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:17456: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18404: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -17463,151 +18411,13 @@ EOF fi done -echo "$as_me:17466: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >"conftest.$ac_ext" <<_ACEOF -#line 17472 "configure" -#include "confdefs.h" -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <float.h> - -_ACEOF -if { (eval echo "$as_me:17480: \"$ac_cpp "conftest.$ac_ext"\"") >&5 - (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - $EGREP -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:17486: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 - cat "conftest.$ac_ext" >&5 - ac_cv_header_stdc=no -fi -rm -f conftest.err "conftest.$ac_ext" - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >"conftest.$ac_ext" <<_ACEOF -#line 17508 "configure" -#include "confdefs.h" -#include <string.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -rf conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >"conftest.$ac_ext" <<_ACEOF -#line 17526 "configure" -#include "confdefs.h" -#include <stdlib.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -rf conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >"conftest.$ac_ext" <<_ACEOF -#line 17547 "configure" -#include "confdefs.h" -#include <ctype.h> -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main (void) -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - $ac_main_return(2); - $ac_main_return (0); -} -_ACEOF -rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:17573: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:17576: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:17578: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17581: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -ac_cv_header_stdc=no -fi -rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" -fi -fi -fi -echo "$as_me:17594: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\EOF -#define STDC_HEADERS 1 -EOF - -fi - -echo "$as_me:17604: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:18414: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17610 "configure" +#line 18420 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -17623,16 +18433,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17626: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18436: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17629: \$? = $ac_status" >&5 + echo "$as_me:18439: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17632: \"$ac_try\"") >&5 + { (eval echo "$as_me:18442: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17635: \$? = $ac_status" >&5 + echo "$as_me:18445: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_header_time=yes else @@ -17642,7 +18452,7 @@ ac_cv_header_time=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17645: result: $ac_cv_header_time" >&5 +echo "$as_me:18455: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -17657,7 +18467,6 @@ getopt.h \ locale.h \ math.h \ stdarg.h \ -stdint.h \ sys/ioctl.h \ sys/select.h \ sys/time.h \ @@ -17666,23 +18475,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:17669: checking for $ac_header" >&5 +echo "$as_me:18478: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17675 "configure" +#line 18484 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17679: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18488: \"$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:17685: \$? = $ac_status" >&5 + echo "$as_me:18494: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17701,7 +18510,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:17704: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18513: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -17714,23 +18523,23 @@ done for ac_header in unistd.h getopt.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:17717: checking for $ac_header" >&5 +echo "$as_me:18526: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17723 "configure" +#line 18532 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17727: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18536: \"$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:17733: \$? = $ac_status" >&5 + echo "$as_me:18542: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17749,7 +18558,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:17752: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18561: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -17759,7 +18568,7 @@ EOF fi done -echo "$as_me:17762: checking for header declaring getopt variables" >&5 +echo "$as_me:18571: checking for header declaring getopt variables" >&5 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 if test "${cf_cv_getopt_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17769,29 +18578,29 @@ cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 17772 "configure" +#line 18581 "configure" #include "confdefs.h" #include <$cf_header> int main (void) { -int x = optind; char *y = optarg +int x = optind; char *y = optarg; (void)x; (void)y ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17785: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18594: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17788: \$? = $ac_status" >&5 + echo "$as_me:18597: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17791: \"$ac_try\"") >&5 + { (eval echo "$as_me:18600: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17794: \$? = $ac_status" >&5 + echo "$as_me:18603: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_getopt_header=$cf_header break @@ -17803,7 +18612,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:17806: result: $cf_cv_getopt_header" >&5 +echo "$as_me:18615: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test "$cf_cv_getopt_header" != none ; then @@ -17820,9 +18629,201 @@ EOF fi +echo "$as_me:18632: checking for clock_gettime" >&5 +echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6 +if test "${cf_cv_func_clock_gettime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >"conftest.$ac_ext" <<_ACEOF +#line 18639 "configure" +#include "confdefs.h" +#include <time.h> +int +main (void) +{ +struct timespec ts; + int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18652: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:18655: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18658: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18661: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_clock_gettime=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_func_clock_gettime=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + +fi +echo "$as_me:18672: result: $cf_cv_func_clock_gettime" >&5 +echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6 + +if test "$cf_cv_func_clock_gettime" = yes +then + +cat >>confdefs.h <<\EOF +#define HAVE_CLOCK_GETTIME 1 +EOF + +else +echo "$as_me:18683: checking for gettimeofday" >&5 +echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 +if test "${ac_cv_func_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 18689 "configure" +#include "confdefs.h" +#define gettimeofday autoconf_temporary +#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef gettimeofday + +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gettimeofday (void); + +int +main (void) +{ + +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_gettimeofday) || defined (__stub___gettimeofday) +#error found stub for gettimeofday +#endif + + return gettimeofday (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18720: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:18723: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18726: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18729: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_gettimeofday=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_func_gettimeofday=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +fi +echo "$as_me:18739: result: $ac_cv_func_gettimeofday" >&5 +echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 +if test "$ac_cv_func_gettimeofday" = yes; then + +cat >>confdefs.h <<\EOF +#define HAVE_GETTIMEOFDAY 1 +EOF + +else + +echo "$as_me:18749: checking for gettimeofday in -lbsd" >&5 +echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 +if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsd $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 18757 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gettimeofday (void); +int +main (void) +{ +gettimeofday (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18776: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:18779: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18782: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18785: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_bsd_gettimeofday=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_lib_bsd_gettimeofday=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:18796: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 +if test "$ac_cv_lib_bsd_gettimeofday" = yes; then + +cat >>confdefs.h <<\EOF +#define HAVE_GETTIMEOFDAY 1 +EOF + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lbsd; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + +fi + +fi +fi + for ac_func in \ getopt \ -gettimeofday \ snprintf \ strdup \ strstr \ @@ -17830,13 +18831,13 @@ tsearch \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:17833: checking for $ac_func" >&5 +echo "$as_me:18834: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17839 "configure" +#line 18840 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -17867,16 +18868,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17870: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18871: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17873: \$? = $ac_status" >&5 + echo "$as_me:18874: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17876: \"$ac_try\"") >&5 + { (eval echo "$as_me:18877: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17879: \$? = $ac_status" >&5 + echo "$as_me:18880: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -17886,7 +18887,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:17889: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:18890: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -17897,14 +18898,14 @@ fi done # use a compile-check to work with ncurses*-config and subdirectory includes -echo "$as_me:17900: checking if we can use termcap.h" >&5 +echo "$as_me:18901: checking if we can use termcap.h" >&5 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6 if test "${cf_cv_have_termcap_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17907 "configure" +#line 18908 "configure" #include "confdefs.h" #include <curses.h> @@ -17925,16 +18926,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17928: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18929: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17931: \$? = $ac_status" >&5 + echo "$as_me:18932: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17934: \"$ac_try\"") >&5 + { (eval echo "$as_me:18935: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17937: \$? = $ac_status" >&5 + echo "$as_me:18938: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_termcap_h=yes else @@ -17944,7 +18945,7 @@ cf_cv_have_termcap_h=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17947: result: $cf_cv_have_termcap_h" >&5 +echo "$as_me:18948: result: $cf_cv_have_termcap_h" >&5 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6 if test "x$cf_cv_have_termcap_h" = xyes then @@ -17954,14 +18955,14 @@ cat >>confdefs.h <<\EOF EOF else -echo "$as_me:17957: checking if we can use ncurses/termcap.h" >&5 +echo "$as_me:18958: checking if we can use ncurses/termcap.h" >&5 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17964 "configure" +#line 18965 "configure" #include "confdefs.h" #include <ncurses/curses.h> @@ -17982,16 +18983,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17985: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18986: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17988: \$? = $ac_status" >&5 + echo "$as_me:18989: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17991: \"$ac_try\"") >&5 + { (eval echo "$as_me:18992: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17994: \$? = $ac_status" >&5 + echo "$as_me:18995: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_ncurses_termcap_h=yes else @@ -18001,7 +19002,7 @@ cf_cv_have_ncurses_termcap_h=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:18004: result: $cf_cv_have_ncurses_termcap_h" >&5 +echo "$as_me:19005: result: $cf_cv_have_ncurses_termcap_h" >&5 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6 test "x$cf_cv_have_ncurses_termcap_h" = xyes && cat >>confdefs.h <<\EOF @@ -18011,7 +19012,7 @@ EOF fi if test "x$ac_cv_func_getopt" = xno; then - { { echo "$as_me:18014: error: getopt is required for building programs" >&5 + { { echo "$as_me:19015: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi @@ -18030,13 +19031,13 @@ wcstombs \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:18033: checking for $ac_func" >&5 +echo "$as_me:19034: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18039 "configure" +#line 19040 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18067,16 +19068,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18070: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19071: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18073: \$? = $ac_status" >&5 + echo "$as_me:19074: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18076: \"$ac_try\"") >&5 + { (eval echo "$as_me:19077: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18079: \$? = $ac_status" >&5 + echo "$as_me:19080: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -18086,7 +19087,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18089: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:19090: result: `eval echo '${'"$as_ac_var"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <<EOF @@ -18098,7 +19099,7 @@ done fi -echo "$as_me:18101: checking definition to turn on extended curses functions" >&5 +echo "$as_me:19102: checking definition to turn on extended curses functions" >&5 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6 if test "${cf_cv_need_xopen_extension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18106,10 +19107,10 @@ else cf_cv_need_xopen_extension=unknown cat >"conftest.$ac_ext" <<_ACEOF -#line 18109 "configure" +#line 19110 "configure" #include "confdefs.h" -#include <stdlib.h> +$ac_includes_default #include <${cf_cv_ncurses_header:-curses.h}> int main (void) @@ -18117,18 +19118,18 @@ main (void) #if defined(NCURSES_VERSION_PATCH) #if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403) - make an error + #error disallow ncurses versions between 2020/04/03 and 2010/05/01 #endif #endif -#ifdef NCURSES_VERSION +#ifdef NCURSES_WIDECHAR +#error prefer to fall-through on the second checks +#endif + static char dummy[10]; cchar_t check; int check2 = curs_set((int)sizeof(check)); -#endif - long x = winnstr(stdscr, "", 0); + long x = winnstr(stdscr, dummy, 5); int x1, y1; -#ifdef NCURSES_VERSION (void)check2; -#endif getbegyx(stdscr, y1, x1); (void)x; (void)y1; @@ -18139,16 +19140,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18142: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19143: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18145: \$? = $ac_status" >&5 + echo "$as_me:19146: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18148: \"$ac_try\"") >&5 + { (eval echo "$as_me:19149: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18151: \$? = $ac_status" >&5 + echo "$as_me:19152: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_xopen_extension=none else @@ -18158,26 +19159,23 @@ cat "conftest.$ac_ext" >&5 for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR do cat >"conftest.$ac_ext" <<_ACEOF -#line 18161 "configure" +#line 19162 "configure" #include "confdefs.h" #define $cf_try_xopen_extension 1 -#include <stdlib.h> +$ac_includes_default #include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -#ifdef NCURSES_VERSION + static char dummy[10]; cchar_t check; int check2 = curs_set((int)sizeof(check)); -#endif - long x = winnstr(stdscr, "", 0); + long x = winnstr(stdscr, dummy, 5); int x1, y1; getbegyx(stdscr, y1, x1); -#ifdef NCURSES_VERSION (void)check2; -#endif (void)x; (void)y1; (void)x1; @@ -18187,16 +19185,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18190: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19188: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18193: \$? = $ac_status" >&5 + echo "$as_me:19191: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18196: \"$ac_try\"") >&5 + { (eval echo "$as_me:19194: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18199: \$? = $ac_status" >&5 + echo "$as_me:19197: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_xopen_extension=$cf_try_xopen_extension; break else @@ -18210,7 +19208,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18213: result: $cf_cv_need_xopen_extension" >&5 +echo "$as_me:19211: result: $cf_cv_need_xopen_extension" >&5 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 case "$cf_cv_need_xopen_extension" in @@ -18222,7 +19220,7 @@ case "$cf_cv_need_xopen_extension" in ;; esac -echo "$as_me:18225: checking for term.h" >&5 +echo "$as_me:19223: checking for term.h" >&5 echo $ECHO_N "checking for term.h... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18243,7 +19241,7 @@ esac for cf_header in $cf_header_list do cat >"conftest.$ac_ext" <<_ACEOF -#line 18246 "configure" +#line 19244 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18257,16 +19255,16 @@ WINDOW *x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18260: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19258: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18263: \$? = $ac_status" >&5 + echo "$as_me:19261: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18266: \"$ac_try\"") >&5 + { (eval echo "$as_me:19264: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18269: \$? = $ac_status" >&5 + echo "$as_me:19267: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header=$cf_header break @@ -18285,14 +19283,14 @@ case "$cf_cv_term_header" in for cf_header in ncurses/term.h ncursesw/term.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 18288 "configure" +#line 19286 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> #ifdef NCURSES_VERSION #include <${cf_header}> #else -make an error +#error expected NCURSES_VERSION to be defined #endif int main (void) @@ -18303,16 +19301,16 @@ WINDOW *x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18306: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19304: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18309: \$? = $ac_status" >&5 + echo "$as_me:19307: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18312: \"$ac_try\"") >&5 + { (eval echo "$as_me:19310: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18315: \$? = $ac_status" >&5 + echo "$as_me:19313: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header=$cf_header break @@ -18327,7 +19325,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" esac fi -echo "$as_me:18330: result: $cf_cv_term_header" >&5 +echo "$as_me:19328: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 case "$cf_cv_term_header" in @@ -18354,7 +19352,7 @@ EOF ;; esac -echo "$as_me:18357: checking for unctrl.h" >&5 +echo "$as_me:19355: checking for unctrl.h" >&5 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6 if test "${cf_cv_unctrl_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18375,7 +19373,7 @@ esac for cf_header in $cf_header_list do cat >"conftest.$ac_ext" <<_ACEOF -#line 18378 "configure" +#line 19376 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18389,16 +19387,16 @@ WINDOW *x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18392: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19390: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18395: \$? = $ac_status" >&5 + echo "$as_me:19393: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18398: \"$ac_try\"") >&5 + { (eval echo "$as_me:19396: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18401: \$? = $ac_status" >&5 + echo "$as_me:19399: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_unctrl_header=$cf_header break @@ -18411,12 +19409,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:18414: result: $cf_cv_unctrl_header" >&5 +echo "$as_me:19412: result: $cf_cv_unctrl_header" >&5 echo "${ECHO_T}$cf_cv_unctrl_header" >&6 case "$cf_cv_unctrl_header" in (no) - { echo "$as_me:18419: WARNING: unctrl.h header not found" >&5 + { echo "$as_me:19417: WARNING: unctrl.h header not found" >&5 echo "$as_me: WARNING: unctrl.h header not found" >&2;} ;; esac @@ -18446,12 +19444,15 @@ EOF esac for cf_func in \ +_nc_tparm_analyze \ +_tracef \ alloc_pair \ assume_default_colors \ chgat \ color_content \ color_set \ copywin \ +curses_trace \ delscreen \ dupwin \ exit_curses \ @@ -18486,8 +19487,12 @@ termname \ tgetent \ tigetnum \ tigetstr \ +tiparm \ +tiparm_s \ +tiscan_s \ tputs_sp \ typeahead \ +unget_wch \ use_default_colors \ use_env \ use_extended_names \ @@ -18502,16 +19507,15 @@ winsdelln \ winsstr \ wresize \ wsyncdown \ -_tracef \ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:18511: checking for ${cf_func}" >&5 + echo "$as_me:19515: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:18514: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:19518: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18520,7 +19524,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >"conftest.$ac_ext" <<_ACEOF -#line 18523 "configure" +#line 19527 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -18553,16 +19557,16 @@ if (foo + 1234L > 5678L) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18556: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19560: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18559: \$? = $ac_status" >&5 + echo "$as_me:19563: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18562: \"$ac_try\"") >&5 + { (eval echo "$as_me:19566: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18565: \$? = $ac_status" >&5 + echo "$as_me:19569: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -18578,7 +19582,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:18581: result: $cf_result" >&5 + echo "$as_me:19585: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" != no; then cat >>confdefs.h <<EOF @@ -18593,10 +19597,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:18596: checking for ${cf_func}" >&5 + echo "$as_me:19600: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:18599: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:19603: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18605,7 +19609,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >"conftest.$ac_ext" <<_ACEOF -#line 18608 "configure" +#line 19612 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -18638,16 +19642,16 @@ if (foo + 1234L > 5678L) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18641: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19645: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18644: \$? = $ac_status" >&5 + echo "$as_me:19648: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18647: \"$ac_try\"") >&5 + { (eval echo "$as_me:19651: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18650: \$? = $ac_status" >&5 + echo "$as_me:19654: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -18663,7 +19667,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:18666: result: $cf_result" >&5 + echo "$as_me:19670: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" != no; then cat >>confdefs.h <<EOF @@ -18687,7 +19691,7 @@ then cf_return="return value" fi cat >"conftest.$ac_ext" <<_ACEOF -#line 18690 "configure" +#line 19694 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18707,21 +19711,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18710: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19714: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18713: \$? = $ac_status" >&5 + echo "$as_me:19717: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18716: \"$ac_try\"") >&5 + { (eval echo "$as_me:19720: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18719: \$? = $ac_status" >&5 + echo "$as_me:19723: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6 -echo "${as_me:-configure}:18724: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 +echo "${as_me:-configure}:19728: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 cat >>confdefs.h <<EOF #define TPUTS_ARG $cf_arg @@ -18741,14 +19745,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:18744: checking for ncurses extended functions" >&5 +echo "$as_me:19748: 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 18751 "configure" +#line 19755 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18763,16 +19767,16 @@ int x = NCURSES_EXT_FUNCS } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18766: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19770: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18769: \$? = $ac_status" >&5 + echo "$as_me:19773: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18772: \"$ac_try\"") >&5 + { (eval echo "$as_me:19776: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18775: \$? = $ac_status" >&5 + echo "$as_me:19779: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_ext_funcs=defined else @@ -18780,7 +19784,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 18783 "configure" +#line 19787 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18805,16 +19809,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18808: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19812: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18811: \$? = $ac_status" >&5 + echo "$as_me:19815: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18814: \"$ac_try\"") >&5 + { (eval echo "$as_me:19818: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18817: \$? = $ac_status" >&5 + echo "$as_me:19821: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_ext_funcs=yes else @@ -18828,7 +19832,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:18831: result: $cf_cv_ncurses_ext_funcs" >&5 +echo "$as_me:19835: 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 @@ -18842,11 +19846,11 @@ then if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno then cf_define_xpg5=no - echo "$as_me:18845: checking if _XPG5 should be defined to enable wide-characters" >&5 + echo "$as_me:19849: 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 18849 "configure" +#line 19853 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18859,16 +19863,16 @@ int x = _XPG5 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18862: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19866: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18865: \$? = $ac_status" >&5 + echo "$as_me:19869: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18868: \"$ac_try\"") >&5 + { (eval echo "$as_me:19872: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18871: \$? = $ac_status" >&5 + echo "$as_me:19875: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -18877,7 +19881,7 @@ cat "conftest.$ac_ext" >&5 cf_save_cppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XPG5" cat >"conftest.$ac_ext" <<_ACEOF -#line 18880 "configure" +#line 19884 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18890,16 +19894,16 @@ int x = _XPG5 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18893: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19897: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18896: \$? = $ac_status" >&5 + echo "$as_me:19900: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18899: \"$ac_try\"") >&5 + { (eval echo "$as_me:19903: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18902: \$? = $ac_status" >&5 + echo "$as_me:19906: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_define_xpg5=yes else @@ -18910,7 +19914,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save_cppflags" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:18913: result: $cf_define_xpg5" >&5 + echo "$as_me:19917: result: $cf_define_xpg5" >&5 echo "${ECHO_T}$cf_define_xpg5" >&6 if test "$cf_define_xpg5" = yes @@ -18919,14 +19923,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6 fi fi - echo "$as_me:18922: checking for wide-character functions" >&5 + echo "$as_me:19926: 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 18929 "configure" +#line 19933 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18943,16 +19947,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18946: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19950: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18949: \$? = $ac_status" >&5 + echo "$as_me:19953: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18952: \"$ac_try\"") >&5 + { (eval echo "$as_me:19956: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18955: \$? = $ac_status" >&5 + echo "$as_me:19959: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_widechar_funcs=yes else @@ -18963,7 +19967,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18966: result: $cf_cv_widechar_funcs" >&5 +echo "$as_me:19970: result: $cf_cv_widechar_funcs" >&5 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6 if test "$cf_cv_widechar_funcs" != no ; then @@ -18984,14 +19988,14 @@ EOF fi -echo "$as_me:18987: checking if $cf_cv_screen library uses pthreads" >&5 +echo "$as_me:19991: 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 18994 "configure" +#line 19998 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19009,16 +20013,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19012: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20016: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19015: \$? = $ac_status" >&5 + echo "$as_me:20019: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19018: \"$ac_try\"") >&5 + { (eval echo "$as_me:20022: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19021: \$? = $ac_status" >&5 + echo "$as_me:20025: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_use_pthreads=yes else @@ -19029,21 +20033,21 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19032: result: $cf_cv_use_pthreads" >&5 +echo "$as_me:20036: 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:19039: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:20043: 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 19046 "configure" +#line 20050 "configure" #include "confdefs.h" #include <sys/types.h> @@ -19063,16 +20067,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19066: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20070: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19069: \$? = $ac_status" >&5 + echo "$as_me:20073: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19072: \"$ac_try\"") >&5 + { (eval echo "$as_me:20076: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19075: \$? = $ac_status" >&5 + echo "$as_me:20079: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_sys_time_select=yes else @@ -19084,7 +20088,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19087: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:20091: 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 @@ -19093,7 +20097,7 @@ EOF # special check for test/ditto.c -echo "$as_me:19096: checking for openpty in -lutil" >&5 +echo "$as_me:20100: 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 @@ -19101,7 +20105,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19104 "configure" +#line 20108 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19110,7 +20114,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char openpty (); +char openpty (void); int main (void) { @@ -19120,16 +20124,16 @@ openpty (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19123: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20127: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19126: \$? = $ac_status" >&5 + echo "$as_me:20130: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19129: \"$ac_try\"") >&5 + { (eval echo "$as_me:20133: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19132: \$? = $ac_status" >&5 + echo "$as_me:20136: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_util_openpty=yes else @@ -19140,7 +20144,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:19143: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:20147: 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 @@ -19148,7 +20152,7 @@ else cf_cv_lib_util=no fi -echo "$as_me:19151: checking for openpty header" >&5 +echo "$as_me:20155: 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 @@ -19175,7 +20179,7 @@ LIBS="$cf_add_libs" for cf_header in pty.h libutil.h util.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 19178 "configure" +#line 20182 "configure" #include "confdefs.h" #include <$cf_header> @@ -19186,22 +20190,23 @@ main (void) int x = openpty((int *)0, (int *)0, (char *)0, (struct termios *)0, (struct winsize *)0); + (void)x; ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19195: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20200: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19198: \$? = $ac_status" >&5 + echo "$as_me:20203: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19201: \"$ac_try\"") >&5 + { (eval echo "$as_me:20206: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19204: \$? = $ac_status" >&5 + echo "$as_me:20209: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_openpty=$cf_header @@ -19219,7 +20224,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" fi -echo "$as_me:19222: result: $cf_cv_func_openpty" >&5 +echo "$as_me:20227: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -19253,7 +20258,7 @@ TEST_LIBS="$cf_add_libs" fi fi -echo "$as_me:19256: checking for function curses_version" >&5 +echo "$as_me:20261: 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 @@ -19263,28 +20268,31 @@ if test "$cross_compiling" = yes; then cf_cv_func_curses_version=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 19266 "configure" +#line 20271 "configure" #include "confdefs.h" +$ac_includes_default + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) { char temp[1024]; - sprintf(temp, "%s\\n", curses_version()); + sprintf(temp, "%.999s\\n", curses_version()); ${cf_cv_main_return:-return}(0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:19279: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20287: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19282: \$? = $ac_status" >&5 + echo "$as_me:20290: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:19284: \"$ac_try\"") >&5 + { (eval echo "$as_me:20292: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19287: \$? = $ac_status" >&5 + echo "$as_me:20295: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_curses_version=yes @@ -19299,14 +20307,14 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi rm -f core fi -echo "$as_me:19302: result: $cf_cv_func_curses_version" >&5 +echo "$as_me:20310: 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:19309: checking for alternate character set array" >&5 +echo "$as_me:20317: 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 @@ -19316,7 +20324,7 @@ cf_cv_curses_acs_map=unknown for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map do cat >"conftest.$ac_ext" <<_ACEOF -#line 19319 "configure" +#line 20327 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19332,16 +20340,16 @@ ${name}['k'] = ACS_PLUS } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19335: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20343: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19338: \$? = $ac_status" >&5 + echo "$as_me:20346: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19341: \"$ac_try\"") >&5 + { (eval echo "$as_me:20349: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19344: \$? = $ac_status" >&5 + echo "$as_me:20352: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_acs_map=$name; break else @@ -19352,7 +20360,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -echo "$as_me:19355: result: $cf_cv_curses_acs_map" >&5 +echo "$as_me:20363: result: $cf_cv_curses_acs_map" >&5 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6 test "$cf_cv_curses_acs_map" != unknown && @@ -19362,7 +20370,7 @@ EOF if test "$cf_enable_widec" = yes; then -echo "$as_me:19365: checking for wide alternate character set array" >&5 +echo "$as_me:20373: 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 @@ -19372,7 +20380,7 @@ else for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char do cat >"conftest.$ac_ext" <<_ACEOF -#line 19375 "configure" +#line 20383 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19388,16 +20396,16 @@ void *foo = &(${name}['k']); (void)foo } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19391: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20399: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19394: \$? = $ac_status" >&5 + echo "$as_me:20402: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19397: \"$ac_try\"") >&5 + { (eval echo "$as_me:20405: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19400: \$? = $ac_status" >&5 + echo "$as_me:20408: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_wacs_map=$name break @@ -19408,7 +20416,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -echo "$as_me:19411: result: $cf_cv_curses_wacs_map" >&5 +echo "$as_me:20419: result: $cf_cv_curses_wacs_map" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 test "$cf_cv_curses_wacs_map" != unknown && @@ -19416,7 +20424,7 @@ cat >>confdefs.h <<EOF #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map EOF -echo "$as_me:19419: checking for wide alternate character constants" >&5 +echo "$as_me:20427: 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 @@ -19426,7 +20434,7 @@ cf_cv_curses_wacs_symbols=no if test "$cf_cv_curses_wacs_map" != unknown then cat >"conftest.$ac_ext" <<_ACEOF -#line 19429 "configure" +#line 20437 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19443,16 +20451,16 @@ cchar_t *foo = WACS_PLUS; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19446: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20454: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19449: \$? = $ac_status" >&5 + echo "$as_me:20457: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19452: \"$ac_try\"") >&5 + { (eval echo "$as_me:20460: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19455: \$? = $ac_status" >&5 + echo "$as_me:20463: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -19462,7 +20470,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" else cat >"conftest.$ac_ext" <<_ACEOF -#line 19465 "configure" +#line 20473 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19478,16 +20486,16 @@ cchar_t *foo = WACS_PLUS; (void)foo } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19481: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20489: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19484: \$? = $ac_status" >&5 + echo "$as_me:20492: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19487: \"$ac_try\"") >&5 + { (eval echo "$as_me:20495: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19490: \$? = $ac_status" >&5 + echo "$as_me:20498: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -19498,7 +20506,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi fi -echo "$as_me:19501: result: $cf_cv_curses_wacs_symbols" >&5 +echo "$as_me:20509: result: $cf_cv_curses_wacs_symbols" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 test "$cf_cv_curses_wacs_symbols" != no && @@ -19508,10 +20516,10 @@ EOF fi -echo "$as_me:19511: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20519: 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 19514 "configure" +#line 20522 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19529,16 +20537,16 @@ attr_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19532: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20540: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19535: \$? = $ac_status" >&5 + echo "$as_me:20543: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19538: \"$ac_try\"") >&5 + { (eval echo "$as_me:20546: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19541: \$? = $ac_status" >&5 + echo "$as_me:20549: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -19547,7 +20555,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:19550: result: $cf_result" >&5 +echo "$as_me:20558: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -19568,14 +20576,14 @@ fi if test "$cf_enable_widec" = yes; then # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:19571: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:20579: 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 19578 "configure" +#line 20586 "configure" #include "confdefs.h" #include <stdlib.h> @@ -19587,29 +20595,29 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -mbstate_t state +mbstate_t state; (void)state ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19596: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20604: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19599: \$? = $ac_status" >&5 + echo "$as_me:20607: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19602: \"$ac_try\"") >&5 + { (eval echo "$as_me:20610: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19605: \$? = $ac_status" >&5 + echo "$as_me:20613: \$? = $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 19612 "configure" +#line 20620 "configure" #include "confdefs.h" #include <stdlib.h> @@ -19622,22 +20630,22 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -mbstate_t value +mbstate_t value; (void) value ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19631: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20639: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19634: \$? = $ac_status" >&5 + echo "$as_me:20642: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19637: \"$ac_try\"") >&5 + { (eval echo "$as_me:20645: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19640: \$? = $ac_status" >&5 + echo "$as_me:20648: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_mbstate_t=yes else @@ -19649,7 +20657,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19652: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:20660: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -19672,14 +20680,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:19675: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:20683: 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 19682 "configure" +#line 20690 "configure" #include "confdefs.h" #include <stdlib.h> @@ -19691,29 +20699,29 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -wchar_t state +wchar_t state; (void)state ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19700: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20708: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19703: \$? = $ac_status" >&5 + echo "$as_me:20711: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19706: \"$ac_try\"") >&5 + { (eval echo "$as_me:20714: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19709: \$? = $ac_status" >&5 + echo "$as_me:20717: \$? = $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 19716 "configure" +#line 20724 "configure" #include "confdefs.h" #include <stdlib.h> @@ -19726,22 +20734,22 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -wchar_t value +wchar_t value; (void) value ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19735: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20743: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19738: \$? = $ac_status" >&5 + echo "$as_me:20746: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19741: \"$ac_try\"") >&5 + { (eval echo "$as_me:20749: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19744: \$? = $ac_status" >&5 + echo "$as_me:20752: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wchar_t=yes else @@ -19753,7 +20761,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19756: result: $cf_cv_wchar_t" >&5 +echo "$as_me:20764: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -19776,14 +20784,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:19779: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:20787: 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 19786 "configure" +#line 20794 "configure" #include "confdefs.h" #include <stdlib.h> @@ -19795,29 +20803,29 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -wint_t state +wint_t state; (void)state ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19804: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20812: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19807: \$? = $ac_status" >&5 + echo "$as_me:20815: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19810: \"$ac_try\"") >&5 + { (eval echo "$as_me:20818: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19813: \$? = $ac_status" >&5 + echo "$as_me:20821: \$? = $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 19820 "configure" +#line 20828 "configure" #include "confdefs.h" #include <stdlib.h> @@ -19830,22 +20838,22 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -wint_t value +wint_t value; (void) value ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19839: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20847: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19842: \$? = $ac_status" >&5 + echo "$as_me:20850: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19845: \"$ac_try\"") >&5 + { (eval echo "$as_me:20853: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19848: \$? = $ac_status" >&5 + echo "$as_me:20856: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_wint_t=yes else @@ -19857,7 +20865,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19860: result: $cf_cv_wint_t" >&5 +echo "$as_me:20868: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -19881,10 +20889,10 @@ fi if test "$NCURSES_OK_MBSTATE_T" = 0 ; then -echo "$as_me:19884: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20892: 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 19887 "configure" +#line 20895 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19902,16 +20910,16 @@ mbstate_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19905: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20913: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19908: \$? = $ac_status" >&5 + echo "$as_me:20916: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19911: \"$ac_try\"") >&5 + { (eval echo "$as_me:20919: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19914: \$? = $ac_status" >&5 + echo "$as_me:20922: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -19920,7 +20928,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:19923: result: $cf_result" >&5 +echo "$as_me:20931: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -19942,10 +20950,10 @@ fi if test "$NCURSES_OK_WCHAR_T" = 0 ; then -echo "$as_me:19945: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20953: 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 19948 "configure" +#line 20956 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19963,16 +20971,16 @@ wchar_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19966: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20974: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19969: \$? = $ac_status" >&5 + echo "$as_me:20977: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19972: \"$ac_try\"") >&5 + { (eval echo "$as_me:20980: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19975: \$? = $ac_status" >&5 + echo "$as_me:20983: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -19981,7 +20989,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:19984: result: $cf_result" >&5 +echo "$as_me:20992: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20003,10 +21011,10 @@ fi if test "$NCURSES_OK_WINT_T" = 0 ; then -echo "$as_me:20006: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:21014: 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 20009 "configure" +#line 21017 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -20024,16 +21032,16 @@ wint_t foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20027: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21035: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20030: \$? = $ac_status" >&5 + echo "$as_me:21038: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20033: \"$ac_try\"") >&5 + { (eval echo "$as_me:21041: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20036: \$? = $ac_status" >&5 + echo "$as_me:21044: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20042,7 +21050,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20045: result: $cf_result" >&5 +echo "$as_me:21053: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20071,11 +21079,11 @@ boolnames \ boolfnames \ ttytype do -echo "$as_me:20074: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:21082: 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 20078 "configure" +#line 21086 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -20108,16 +21116,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20111: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21119: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20114: \$? = $ac_status" >&5 + echo "$as_me:21122: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20117: \"$ac_try\"") >&5 + { (eval echo "$as_me:21125: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20120: \$? = $ac_status" >&5 + echo "$as_me:21128: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes @@ -20127,7 +21135,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20130: result: $cf_result" >&5 +echo "$as_me:21138: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20139,14 +21147,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./ EOF else - echo "$as_me:20142: checking for data $cf_data in library" >&5 + echo "$as_me:21150: 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 20149 "configure" +#line 21157 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -20185,16 +21193,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20188: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21196: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20191: \$? = $ac_status" >&5 + echo "$as_me:21199: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20194: \"$ac_try\"") >&5 + { (eval echo "$as_me:21202: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20197: \$? = $ac_status" >&5 + echo "$as_me:21205: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -20206,7 +21214,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" else cat >"conftest.$ac_ext" <<_ACEOF -#line 20209 "configure" +#line 21217 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -20238,15 +21246,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:20241: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21249: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20244: \$? = $ac_status" >&5 + echo "$as_me:21252: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:20246: \"$ac_try\"") >&5 + { (eval echo "$as_me:21254: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20249: \$? = $ac_status" >&5 + echo "$as_me:21257: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes @@ -20258,7 +21266,7 @@ cf_result=no fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi - echo "$as_me:20261: result: $cf_result" >&5 + echo "$as_me:21269: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then @@ -20275,7 +21283,7 @@ done if test -n "$with_screen" && test "x$with_screen" = "xpdcurses" then - echo "$as_me:20278: checking for X" >&5 + echo "$as_me:21286: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -20379,17 +21387,17 @@ if test "$ac_x_includes" = no; then # 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 20382 "configure" +#line 21390 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> _ACEOF -if { (eval echo "$as_me:20386: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:21394: \"$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:20392: \$? = $ac_status" >&5 + echo "$as_me:21400: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -20422,7 +21430,7 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 20425 "configure" +#line 21433 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> int @@ -20434,16 +21442,16 @@ XtMalloc (0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20437: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21445: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20440: \$? = $ac_status" >&5 + echo "$as_me:21448: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20443: \"$ac_try\"") >&5 + { (eval echo "$as_me:21451: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20446: \$? = $ac_status" >&5 + echo "$as_me:21454: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -20481,7 +21489,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:20484: result: $have_x" >&5 + echo "$as_me:21492: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -20491,7 +21499,7 @@ else # 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:20494: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:21502: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -20518,11 +21526,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:20521: checking whether -R must be followed by a space" >&5 + echo "$as_me:21529: 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 20525 "configure" +#line 21533 "configure" #include "confdefs.h" int @@ -20534,16 +21542,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20537: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21545: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20540: \$? = $ac_status" >&5 + echo "$as_me:21548: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20543: \"$ac_try\"") >&5 + { (eval echo "$as_me:21551: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20546: \$? = $ac_status" >&5 + echo "$as_me:21554: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_nospace=yes else @@ -20553,13 +21561,13 @@ ac_R_nospace=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_nospace = yes; then - echo "$as_me:20556: result: no" >&5 + echo "$as_me:21564: 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 20562 "configure" +#line 21570 "configure" #include "confdefs.h" int @@ -20571,16 +21579,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20574: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21582: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20577: \$? = $ac_status" >&5 + echo "$as_me:21585: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20580: \"$ac_try\"") >&5 + { (eval echo "$as_me:21588: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20583: \$? = $ac_status" >&5 + echo "$as_me:21591: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_space=yes else @@ -20590,11 +21598,11 @@ ac_R_space=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_space = yes; then - echo "$as_me:20593: result: yes" >&5 + echo "$as_me:21601: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:20597: result: neither works" >&5 + echo "$as_me:21605: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -20614,7 +21622,7 @@ echo "${ECHO_T}neither works" >&6 # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >"conftest.$ac_ext" <<_ACEOF -#line 20617 "configure" +#line 21625 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20623,7 +21631,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); +char XOpenDisplay (void); int main (void) { @@ -20633,22 +21641,22 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20636: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21644: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20639: \$? = $ac_status" >&5 + echo "$as_me:21647: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20642: \"$ac_try\"") >&5 + { (eval echo "$as_me:21650: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20645: \$? = $ac_status" >&5 + echo "$as_me:21653: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:20651: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:21659: 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 @@ -20656,7 +21664,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 20659 "configure" +#line 21667 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20665,7 +21673,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); +char dnet_ntoa (void); int main (void) { @@ -20675,16 +21683,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20678: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21686: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20681: \$? = $ac_status" >&5 + echo "$as_me:21689: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20684: \"$ac_try\"") >&5 + { (eval echo "$as_me:21692: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20687: \$? = $ac_status" >&5 + echo "$as_me:21695: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -20695,14 +21703,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:20698: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:21706: 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:20705: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:21713: 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 @@ -20710,7 +21718,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 20713 "configure" +#line 21721 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20719,7 +21727,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); +char dnet_ntoa (void); int main (void) { @@ -20729,16 +21737,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20732: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21740: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20735: \$? = $ac_status" >&5 + echo "$as_me:21743: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20738: \"$ac_try\"") >&5 + { (eval echo "$as_me:21746: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20741: \$? = $ac_status" >&5 + echo "$as_me:21749: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -20749,7 +21757,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:20752: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:21760: 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" @@ -20768,13 +21776,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" # 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:20771: checking for gethostbyname" >&5 + echo "$as_me:21779: 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 20777 "configure" +#line 21785 "configure" #include "confdefs.h" #define gethostbyname autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -20805,16 +21813,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20808: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21816: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20811: \$? = $ac_status" >&5 + echo "$as_me:21819: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20814: \"$ac_try\"") >&5 + { (eval echo "$as_me:21822: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20817: \$? = $ac_status" >&5 + echo "$as_me:21825: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gethostbyname=yes else @@ -20824,11 +21832,11 @@ ac_cv_func_gethostbyname=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:20827: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:21835: 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:20831: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:21839: 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 @@ -20836,7 +21844,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 20839 "configure" +#line 21847 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20845,7 +21853,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gethostbyname (); +char gethostbyname (void); int main (void) { @@ -20855,16 +21863,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20858: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21866: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20861: \$? = $ac_status" >&5 + echo "$as_me:21869: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20864: \"$ac_try\"") >&5 + { (eval echo "$as_me:21872: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20867: \$? = $ac_status" >&5 + echo "$as_me:21875: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -20875,14 +21883,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:20878: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:21886: 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:20885: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:21893: 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 @@ -20890,7 +21898,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 20893 "configure" +#line 21901 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20899,7 +21907,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gethostbyname (); +char gethostbyname (void); int main (void) { @@ -20909,16 +21917,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20912: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21920: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20915: \$? = $ac_status" >&5 + echo "$as_me:21923: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20918: \"$ac_try\"") >&5 + { (eval echo "$as_me:21926: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20921: \$? = $ac_status" >&5 + echo "$as_me:21929: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -20929,7 +21937,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:20932: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:21940: 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" @@ -20945,13 +21953,13 @@ fi # 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:20948: checking for connect" >&5 + echo "$as_me:21956: 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 20954 "configure" +#line 21962 "configure" #include "confdefs.h" #define connect autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -20982,16 +21990,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20985: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21993: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20988: \$? = $ac_status" >&5 + echo "$as_me:21996: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20991: \"$ac_try\"") >&5 + { (eval echo "$as_me:21999: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20994: \$? = $ac_status" >&5 + echo "$as_me:22002: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_connect=yes else @@ -21001,11 +22009,11 @@ ac_cv_func_connect=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21004: result: $ac_cv_func_connect" >&5 +echo "$as_me:22012: 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:21008: checking for connect in -lsocket" >&5 + echo "$as_me:22016: 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 @@ -21013,7 +22021,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21016 "configure" +#line 22024 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21022,7 +22030,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char connect (); +char connect (void); int main (void) { @@ -21032,16 +22040,16 @@ connect (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21035: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22043: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21038: \$? = $ac_status" >&5 + echo "$as_me:22046: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21041: \"$ac_try\"") >&5 + { (eval echo "$as_me:22049: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21044: \$? = $ac_status" >&5 + echo "$as_me:22052: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_socket_connect=yes else @@ -21052,7 +22060,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21055: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:22063: 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" @@ -21061,13 +22069,13 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:21064: checking for remove" >&5 + echo "$as_me:22072: 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 21070 "configure" +#line 22078 "configure" #include "confdefs.h" #define remove autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21098,16 +22106,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21101: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22109: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21104: \$? = $ac_status" >&5 + echo "$as_me:22112: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21107: \"$ac_try\"") >&5 + { (eval echo "$as_me:22115: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21110: \$? = $ac_status" >&5 + echo "$as_me:22118: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_remove=yes else @@ -21117,11 +22125,11 @@ ac_cv_func_remove=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21120: result: $ac_cv_func_remove" >&5 +echo "$as_me:22128: 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:21124: checking for remove in -lposix" >&5 + echo "$as_me:22132: 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 @@ -21129,7 +22137,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21132 "configure" +#line 22140 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21138,7 +22146,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char remove (); +char remove (void); int main (void) { @@ -21148,16 +22156,16 @@ remove (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21151: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22159: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21154: \$? = $ac_status" >&5 + echo "$as_me:22162: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21157: \"$ac_try\"") >&5 + { (eval echo "$as_me:22165: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21160: \$? = $ac_status" >&5 + echo "$as_me:22168: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_posix_remove=yes else @@ -21168,7 +22176,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21171: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:22179: 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" @@ -21177,13 +22185,13 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:21180: checking for shmat" >&5 + echo "$as_me:22188: 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 21186 "configure" +#line 22194 "configure" #include "confdefs.h" #define shmat autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21214,16 +22222,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21217: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22225: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21220: \$? = $ac_status" >&5 + echo "$as_me:22228: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21223: \"$ac_try\"") >&5 + { (eval echo "$as_me:22231: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21226: \$? = $ac_status" >&5 + echo "$as_me:22234: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_shmat=yes else @@ -21233,11 +22241,11 @@ ac_cv_func_shmat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21236: result: $ac_cv_func_shmat" >&5 +echo "$as_me:22244: 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:21240: checking for shmat in -lipc" >&5 + echo "$as_me:22248: 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 @@ -21245,7 +22253,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21248 "configure" +#line 22256 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21254,7 +22262,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char shmat (); +char shmat (void); int main (void) { @@ -21264,16 +22272,16 @@ shmat (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21267: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22275: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21270: \$? = $ac_status" >&5 + echo "$as_me:22278: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21273: \"$ac_try\"") >&5 + { (eval echo "$as_me:22281: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21276: \$? = $ac_status" >&5 + echo "$as_me:22284: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -21284,7 +22292,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21287: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:22295: 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" @@ -21302,7 +22310,7 @@ fi # 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:21305: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:22313: 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 @@ -21310,7 +22318,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21313 "configure" +#line 22321 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21319,7 +22327,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char IceConnectionNumber (); +char IceConnectionNumber (void); int main (void) { @@ -21329,16 +22337,16 @@ IceConnectionNumber (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21332: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22340: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21335: \$? = $ac_status" >&5 + echo "$as_me:22343: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21338: \"$ac_try\"") >&5 + { (eval echo "$as_me:22346: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21341: \$? = $ac_status" >&5 + echo "$as_me:22349: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -21349,7 +22357,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21352: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:22360: 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" @@ -21368,14 +22376,16 @@ if test "$GCC" = yes || test "$GXX" = yes then case $CFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 - -echo "${as_me:-configure}:21373: testing repairing CFLAGS: $CFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $CFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " @@ -21390,15 +22400,22 @@ echo "${as_me:-configure}:21373: testing repairing CFLAGS: $CFLAGS ..." 1>&5 ;; esac done - CFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + if test "x$CFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 + +echo "${as_me:-configure}:22407: testing repairing CFLAGS: $CFLAGS ..." 1>&5 + + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:21396: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22412: testing ... fixed $CFLAGS ..." 1>&5 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:21400: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22416: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + fi ;; esac fi @@ -21407,14 +22424,16 @@ if test "$GCC" = yes || test "$GXX" = yes then case $CPPFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 - -echo "${as_me:-configure}:21412: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $CPPFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " @@ -21429,15 +22448,22 @@ echo "${as_me:-configure}:21412: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 ;; esac done - CPPFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + if test "x$CPPFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +echo "${as_me:-configure}:22455: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 -echo "${as_me:-configure}:21435: testing ... fixed $CPPFLAGS ..." 1>&5 + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:22460: testing ... fixed $CPPFLAGS ..." 1>&5 -echo "${as_me:-configure}:21439: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:22464: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi ;; esac fi @@ -21446,14 +22472,16 @@ if test "$GCC" = yes || test "$GXX" = yes then case $LDFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 - -echo "${as_me:-configure}:21451: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $LDFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " @@ -21468,20 +22496,27 @@ echo "${as_me:-configure}:21451: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 ;; esac done - LDFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + if test "x$LDFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 -echo "${as_me:-configure}:21474: testing ... fixed $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:22503: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 -echo "${as_me:-configure}:21478: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22508: testing ... fixed $LDFLAGS ..." 1>&5 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +echo "${as_me:-configure}:22512: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi ;; esac fi -echo "$as_me:21484: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:22519: 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. @@ -21498,7 +22533,7 @@ else enable_warnings=no fi; -echo "$as_me:21501: result: $enable_warnings" >&5 +echo "$as_me:22536: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then @@ -21521,10 +22556,11 @@ cat > conftest.i <<EOF EOF if test "$GCC" = yes then - { echo "$as_me:21524: checking for $CC __attribute__ directives..." >&5 + { echo "$as_me:22559: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > "conftest.$ac_ext" <<EOF -#line 21527 "${as_me:-configure}" +#line 22562 "${as_me:-configure}" +#include <stdio.h> #include "confdefs.h" #include "conftest.h" #include "conftest.i" @@ -21539,8 +22575,8 @@ cat > "conftest.$ac_ext" <<EOF #define GCC_SCANFLIKE(fmt,var) /*nothing*/ #endif extern void wow(char *,...) GCC_SCANFLIKE(1,2); -extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN; -extern void foo(void) GCC_NORETURN; +extern GCC_NORETURN void oops(char *,...) GCC_PRINTFLIKE(1,2); +extern GCC_NORETURN void foo(void); int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) { (void)argc; (void)argv; return 0; } EOF cf_printf_attribute=no @@ -21573,12 +22609,12 @@ EOF ;; esac - if { (eval echo "$as_me:21576: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:22612: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21579: \$? = $ac_status" >&5 + echo "$as_me:22615: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:21581: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:22617: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -21656,7 +22692,7 @@ do done cat >"conftest.$ac_ext" <<_ACEOF -#line 21659 "configure" +#line 22695 "configure" #include "confdefs.h" #include <stdlib.h> @@ -21665,34 +22701,35 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -String foo = malloc(1); (void)foo +String foo = malloc(1); free((void*)foo) ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21674: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22710: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21677: \$? = $ac_status" >&5 + echo "$as_me:22713: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21680: \"$ac_try\"") >&5 + { (eval echo "$as_me:22716: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21683: \$? = $ac_status" >&5 + echo "$as_me:22719: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then -echo "$as_me:21686: checking for X11/Xt const-feature" >&5 +echo "$as_me:22722: 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 21693 "configure" +#line 22729 "configure" #include "confdefs.h" +#undef _CONST_X_STRING #define _CONST_X_STRING /* X11R7.8 (perhaps) */ #undef XTSTRINGDEFINES /* X11R5 and later */ #include <stdlib.h> @@ -21707,16 +22744,16 @@ String foo = malloc(1); *foo = 0 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21710: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22747: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21713: \$? = $ac_status" >&5 + echo "$as_me:22750: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21716: \"$ac_try\"") >&5 + { (eval echo "$as_me:22753: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21719: \$? = $ac_status" >&5 + echo "$as_me:22756: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_const_x_string=no @@ -21731,7 +22768,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:21734: result: $cf_cv_const_x_string" >&5 +echo "$as_me:22771: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" @@ -21760,7 +22797,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi cat > "conftest.$ac_ext" <<EOF -#line 21763 "${as_me:-configure}" +#line 22800 "${as_me:-configure}" int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } EOF if test "$INTEL_COMPILER" = yes @@ -21776,7 +22813,7 @@ then # remark #981: operands are evaluated in unspecified order # warning #279: controlling expression is constant - { echo "$as_me:21779: checking for $CC warning options..." >&5 + { echo "$as_me:22816: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -21792,12 +22829,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:21795: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:22832: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21798: \$? = $ac_status" >&5 + echo "$as_me:22835: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:21800: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:22837: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -21805,7 +22842,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:21808: checking for $CC warning options..." >&5 + { echo "$as_me:22845: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -21828,12 +22865,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} 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:21831: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:22868: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21834: \$? = $ac_status" >&5 + echo "$as_me:22871: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:21836: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:22873: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -21841,7 +22878,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 ([34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:21844: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:22881: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -21851,7 +22888,7 @@ echo "${as_me:-configure}:21844: testing feature is broken in gcc $GCC_VERSION . ([12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:21854: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:22891: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -21868,24 +22905,29 @@ fi fi -echo "$as_me:21871: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:22908: 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. if test "${with_dmalloc+set}" = set; then withval="$with_dmalloc" + case "x$withval" in + (x|xno) ;; + (*) + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" + with_dmalloc=yes cat >>confdefs.h <<EOF #define USE_DMALLOC 1 EOF - : "${with_cflags:=-g}" - : "${enable_leaks:=no}" - with_dmalloc=yes + ;; + esac else with_dmalloc= fi; -echo "$as_me:21888: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:22930: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case ".$with_cflags" in @@ -21999,23 +23041,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:22002: checking for dmalloc.h" >&5 + echo "$as_me:23044: 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 22008 "configure" +#line 23050 "configure" #include "confdefs.h" #include <dmalloc.h> _ACEOF -if { (eval echo "$as_me:22012: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:23054: \"$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:22018: \$? = $ac_status" >&5 + echo "$as_me:23060: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -22034,11 +23076,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:22037: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:23079: 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:22041: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:23083: 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 @@ -22046,7 +23088,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22049 "configure" +#line 23091 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22055,7 +23097,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dmalloc_debug (); +char dmalloc_debug (void); int main (void) { @@ -22065,16 +23107,16 @@ dmalloc_debug (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22068: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23110: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22071: \$? = $ac_status" >&5 + echo "$as_me:23113: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22074: \"$ac_try\"") >&5 + { (eval echo "$as_me:23116: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22077: \$? = $ac_status" >&5 + echo "$as_me:23119: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -22085,7 +23127,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22088: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:23130: 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 @@ -22100,24 +23142,29 @@ fi fi -echo "$as_me:22103: checking if you want to use dbmalloc for testing" >&5 +echo "$as_me:23145: 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. if test "${with_dbmalloc+set}" = set; then withval="$with_dbmalloc" + case "x$withval" in + (x|xno) ;; + (*) + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" + with_dbmalloc=yes cat >>confdefs.h <<EOF #define USE_DBMALLOC 1 EOF - : "${with_cflags:=-g}" - : "${enable_leaks:=no}" - with_dbmalloc=yes + ;; + esac else with_dbmalloc= fi; -echo "$as_me:22120: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:23167: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case ".$with_cflags" in @@ -22231,23 +23278,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:22234: checking for dbmalloc.h" >&5 + echo "$as_me:23281: 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 22240 "configure" +#line 23287 "configure" #include "confdefs.h" #include <dbmalloc.h> _ACEOF -if { (eval echo "$as_me:22244: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:23291: \"$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:22250: \$? = $ac_status" >&5 + echo "$as_me:23297: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -22266,11 +23313,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:22269: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:23316: 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:22273: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:23320: 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 @@ -22278,7 +23325,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22281 "configure" +#line 23328 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22287,7 +23334,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char debug_malloc (); +char debug_malloc (void); int main (void) { @@ -22297,16 +23344,16 @@ debug_malloc (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22300: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23347: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22303: \$? = $ac_status" >&5 + echo "$as_me:23350: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22306: \"$ac_try\"") >&5 + { (eval echo "$as_me:23353: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22309: \$? = $ac_status" >&5 + echo "$as_me:23356: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -22317,7 +23364,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22320: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:23367: 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 @@ -22332,24 +23379,29 @@ fi fi -echo "$as_me:22335: checking if you want to use valgrind for testing" >&5 +echo "$as_me:23382: 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. if test "${with_valgrind+set}" = set; then withval="$with_valgrind" + case "x$withval" in + (x|xno) ;; + (*) + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" + with_valgrind=yes cat >>confdefs.h <<EOF #define USE_VALGRIND 1 EOF - : "${with_cflags:=-g}" - : "${enable_leaks:=no}" - with_valgrind=yes + ;; + esac else with_valgrind= fi; -echo "$as_me:22352: result: ${with_valgrind:-no}" >&5 +echo "$as_me:23404: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case ".$with_cflags" in @@ -22462,18 +23514,18 @@ fi ;; esac -echo "$as_me:22465: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:23517: 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. if test "${enable_leaks+set}" = set; then enableval="$enable_leaks" - enable_leaks=no + enable_leaks=$enableval else enable_leaks=yes fi; if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi -echo "$as_me:22476: result: $with_no_leaks" >&5 +echo "$as_me:23528: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$enable_leaks" = no ; then @@ -22491,7 +23543,7 @@ fi LD_RPATH_OPT= if test "x$cf_cv_enable_rpath" != xno then - echo "$as_me:22494: checking for an rpath option" >&5 + echo "$as_me:23546: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case "$cf_cv_system_name" in (irix*) @@ -22522,12 +23574,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 (*) ;; esac - echo "$as_me:22525: result: $LD_RPATH_OPT" >&5 + echo "$as_me:23577: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:22530: checking if we need a space after rpath option" >&5 + echo "$as_me:23582: 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" @@ -22548,7 +23600,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 22551 "configure" +#line 23603 "configure" #include "confdefs.h" int @@ -22560,16 +23612,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22563: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23615: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22566: \$? = $ac_status" >&5 + echo "$as_me:23618: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22569: \"$ac_try\"") >&5 + { (eval echo "$as_me:23621: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22572: \$? = $ac_status" >&5 + echo "$as_me:23624: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_space=no else @@ -22579,14 +23631,14 @@ cf_rpath_space=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:22582: result: $cf_rpath_space" >&5 + echo "$as_me:23634: 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:22589: checking if rpath-hack should be disabled" >&5 +echo "$as_me:23641: 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. @@ -22604,22 +23656,22 @@ else fi; if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi -echo "$as_me:22607: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:23659: result: $cf_disable_rpath_hack" >&5 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 if test "$enable_rpath_hack" = yes ; then -echo "$as_me:22612: checking for updated LDFLAGS" >&5 +echo "$as_me:23664: 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:22615: result: maybe" >&5 + echo "$as_me:23667: 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:22622: checking for $ac_word" >&5 +echo "$as_me:23674: 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 @@ -22634,7 +23686,7 @@ for ac_dir in $ac_dummy; do 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:22637: found $ac_dir/$ac_word" >&5 +echo "$as_me:23689: found $ac_dir/$ac_word" >&5 break done @@ -22642,10 +23694,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:22645: result: $cf_ldd_prog" >&5 + echo "$as_me:23697: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:22648: result: no" >&5 + echo "$as_me:23700: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -22659,7 +23711,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >"conftest.$ac_ext" <<_ACEOF -#line 22662 "configure" +#line 23714 "configure" #include "confdefs.h" #include <stdio.h> int @@ -22671,16 +23723,16 @@ printf("Hello"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22674: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23726: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22677: \$? = $ac_status" >&5 + echo "$as_me:23729: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22680: \"$ac_try\"") >&5 + { (eval echo "$as_me:23732: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22683: \$? = $ac_status" >&5 + echo "$as_me:23735: \$? = $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` @@ -22708,7 +23760,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" then test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 -echo "${as_me:-configure}:22711: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:23763: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -22720,11 +23772,11 @@ echo "${as_me:-configure}:22711: testing ...adding -L$cf_rpath_dir/lib to LDFLAG test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:22723: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23775: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:22727: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23779: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -22761,7 +23813,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:22764: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:23816: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -22774,11 +23826,11 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:22777: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23829: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:22781: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:23833: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -22815,7 +23867,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:22818: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:23870: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -22828,14 +23880,14 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:22831: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:23883: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:22835: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23887: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:22838: result: no" >&5 + echo "$as_me:23890: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -22856,7 +23908,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -22925,7 +23977,7 @@ DEFS=-DHAVE_CONFIG_H : "${CONFIG_STATUS=./config.status}" ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:22928: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:23980: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -22934,6 +23986,8 @@ cat >"$CONFIG_STATUS" <<_ACEOF # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. +me=\`echo "\$0" | sed -e 's,.*\\/,,'\` + debug=false SHELL=\${CONFIG_SHELL-$SHELL} ac_cs_invocation="\$0 \$@" @@ -22955,9 +24009,9 @@ fi as_me=`echo "$0" |sed 's,.*[\\/],,'` if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr + as_expr="expr" else - as_expr=false + as_expr="false" fi rm -f conf$$ conf$$.exe conf$$.file @@ -22972,7 +24026,7 @@ if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' fi elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + as_ln_s='ln' else as_ln_s='cp -p' fi @@ -23059,10 +24113,10 @@ EOF cat >>"$CONFIG_STATUS" <<EOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52.20210105, +configured by $0, generated by GNU Autoconf 2.52.20231210, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright 2003-2020,2021 Thomas E. Dickey +Copyright 2003-2022,2023 Thomas E. Dickey Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation @@ -23104,7 +24158,7 @@ cat >>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:23107: error: ambiguous option: $1 + { { echo "$as_me:24161: 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;} @@ -23123,7 +24177,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:23126: error: unrecognized option: $1 + -*) { { echo "$as_me:24180: 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;} @@ -23142,7 +24196,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20210105, executed with +This file was extended by $as_me 2.52.20231210, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -23173,7 +24227,7 @@ do "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:23176: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:24230: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -23197,14 +24251,14 @@ $debug || } # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} +: "${TMPDIR=/tmp}" { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { tmp=$TMPDIR/cs$$-$RANDOM - (umask 077 && mkdir $tmp) + (umask 077 && mkdir "$tmp") } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 @@ -23224,7 +24278,7 @@ cat >>"$CONFIG_STATUS" <<EOF if test -n "\$CONFIG_FILES"; then # Protect against being on the right side of a sed subst in config.status. sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF + s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >"\$tmp"/subs.sed <<\\CEOF s,@SHELL@,$SHELL,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t @@ -23285,6 +24339,9 @@ s,@INSTALL_OPT_S@,$INSTALL_OPT_S,;t t s,@INSTALL_OPT_O@,$INSTALL_OPT_O,;t t s,@LINT@,$LINT,;t t s,@LINT_OPTS@,$LINT_OPTS,;t t +s,@LINT_LIBS@,$LINT_LIBS,;t t +s,@MAKE_NO_PHONY@,$MAKE_NO_PHONY,;t t +s,@MAKE_PHONY@,$MAKE_PHONY,;t t s,@CTAGS@,$CTAGS,;t t s,@ETAGS@,$ETAGS,;t t s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t @@ -23319,6 +24376,8 @@ s,@cf_cv_abi_version@,$cf_cv_abi_version,;t t s,@cf_cv_rel_version@,$cf_cv_rel_version,;t t s,@includesubdir@,$includesubdir,;t t s,@FGREP@,$FGREP,;t t +s,@HAVE_STDNORETURN_H@,$HAVE_STDNORETURN_H,;t t +s,@STDC_NORETURN@,$STDC_NORETURN,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t s,@ECHO_LT@,$ECHO_LT,;t t @@ -23335,6 +24394,7 @@ s,@X_LIBS@,$X_LIBS,;t t s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t s,@XCURSES_CONFIG@,$XCURSES_CONFIG,;t t s,@ac_ct_XCURSES_CONFIG@,$ac_ct_XCURSES_CONFIG,;t t +s,@cf_cv_screen@,$cf_cv_screen,;t t s,@RGB_PATH@,$RGB_PATH,;t t s,@no_x11_rgb@,$no_x11_rgb,;t t s,@FORM_NAME@,$FORM_NAME,;t t @@ -23358,11 +24418,11 @@ EOF ac_sed_cmds= while "$ac_more_lines"; do if test "$ac_beg" -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + sed "1,${ac_beg}d; ${ac_end}q" "$tmp"/subs.sed >"$tmp"/subs.frag else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + sed "${ac_end}q" "$tmp"/subs.sed >"$tmp"/subs.frag fi - if test ! -s $tmp/subs.frag; then + if test ! -s "$tmp"/subs.frag; then ac_more_lines=false else # The purpose of the label and of the branching condition is to @@ -23370,17 +24430,17 @@ EOF # is no need to browse any of the substitutions). # These are the two extra sed commands mentioned above. (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed # It is possible to make a multiline substitution using escaped newlines. # Ensure that we do not split the substitution between script fragments. ac_BEG=$ac_end ac_END=`expr "$ac_end" + "$ac_max_sed_lines"` - sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next - if test -s $tmp/subs.next; then - grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit - if test ! -s $tmp/subs.edit; then - grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit - if test ! -s $tmp/subs.edit; then + sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next + if test -s "$tmp"/subs.next; then + grep '^s,@[^@,][^@,]*@,.*\\$' "$tmp"/subs.next >"$tmp"/subs.edit + if test ! -s "$tmp"/subs.edit; then + grep "^s,@[^@,][^@,]*@,.*,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit + if test ! -s "$tmp"/subs.edit; then if test "$ac_beg" -gt 1; then ac_end=`expr "$ac_end" - 1` continue @@ -23390,9 +24450,9 @@ EOF fi if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="sed -f \"$tmp\"/subs-$ac_sed_frag.sed" else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="$ac_sed_cmds | sed -f \"$tmp\"/subs-$ac_sed_frag.sed" fi ac_sed_frag=`expr "$ac_sed_frag" + 1` ac_beg=$ac_end @@ -23400,7 +24460,7 @@ EOF fi done if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat + ac_sed_cmds="cat" fi fi # test -n "$CONFIG_FILES" @@ -23410,7 +24470,7 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin + cat >"$tmp"/stdin ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` @@ -23447,7 +24507,7 @@ for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do esac done; } - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" + ac_dir_suffix="/`echo "$ac_dir"|sed 's,^\./,,'`" # A "../" for each directory in $ac_dir_suffix. ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` else @@ -23475,7 +24535,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:23478: creating $ac_file" >&5 + { echo "$as_me:24538: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -23490,23 +24550,23 @@ echo "$as_me: creating $ac_file" >&6;} ac_file_inputs=`IFS=: for f in $ac_file_in; do case $f in - -) echo $tmp/stdin ;; + -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:23496: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24556: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo $f;; + echo "$f";; *) # Relative if test -f "$f"; then # Build tree - echo $f + echo "$f" elif test -f "$srcdir/$f"; then # Source tree echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:23509: error: cannot find input file: $f" >&5 + { { echo "$as_me:24569: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -23522,7 +24582,7 @@ cat >>"$CONFIG_STATUS" <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' "$ac_item"` if test -z "$ac_used"; then - { echo "$as_me:23525: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:24585: 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;} @@ -23531,7 +24591,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:23534: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:24594: 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;} @@ -23556,38 +24616,46 @@ s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t s,@top_srcdir@,$ac_top_srcdir,;t t s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin +" $ac_file_inputs | (eval "$ac_sed_cmds") >"$tmp"/out + rm -f "$tmp"/stdin +EOF +test -n "${FGREP}" || FGREP="grep -F" +test -n "${EGREP}" || EGREP="grep -E" +cat >>"$CONFIG_STATUS" <<EOF + test -n "\${FGREP}" || FGREP="$FGREP" + test -n "\${EGREP}" || EGREP="$EGREP" +EOF +cat >>"$CONFIG_STATUS" <<\EOF if test x"$ac_file" != x-; then cp "$tmp/out" "$ac_file" for ac_name in prefix exec_prefix datarootdir do - ac_seen=`${FGREP-fgrep} -n '${'$ac_name'[:=].*}' "$ac_file"` + ac_seen=`$FGREP -n '${'$ac_name'[:=].*}' "$ac_file"` if test -n "$ac_seen"; then - ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` + ac_init=`$EGREP '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then - ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:23571: WARNING: Variable $ac_name is used but was not set: + ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'` + { echo "$as_me:24639: 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;} fi fi done - ${EGREP-egrep} -n '@[a-z_][a-z_0-9]+@' "$ac_file" >$tmp/out - ${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:23582: WARNING: Some variables may not be substituted: + $EGREP -n '@[a-z_][a-z_0-9]+@' "$ac_file" >"$tmp"/out + $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:24650: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} fi else - cat $tmp/out + cat "$tmp"/out fi - rm -f $tmp/out + rm -f "$tmp"/out done EOF @@ -23620,7 +24688,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin + cat >"$tmp"/stdin ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` @@ -23628,7 +24696,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:23631: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:24699: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -23636,10 +24704,10 @@ echo "$as_me: creating $ac_file" >&6;} ac_file_inputs=`IFS=: for f in $ac_file_in; do case $f in - -) echo $tmp/stdin ;; + -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:23642: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24710: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -23652,14 +24720,14 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:23655: error: cannot find input file: $f" >&5 + { { echo "$as_me:24723: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + sed 's/[ ]*$//' $ac_file_inputs >"$tmp"/in EOF @@ -23691,9 +24759,9 @@ echo ' cat >> conftest.edit <<CEOF /@DEFS@/r conftest.frag /@DEFS@/d CEOF -sed -f conftest.edit $tmp/in > $tmp/out -rm -f $tmp/in -mv $tmp/out $tmp/in +sed -f conftest.edit "$tmp"/in > "$tmp"/out +rm -f "$tmp"/in +mv "$tmp"/out "$tmp"/in rm -f conftest.edit conftest.frag ' >> "$CONFIG_STATUS" @@ -23702,15 +24770,15 @@ cat >>"$CONFIG_STATUS" <<\EOF # use $as_me), people would be surprised to read: # /* config.h. Generated automatically by config.status. */ if test x"$ac_file" = x-; then - echo "/* Generated automatically by configure. */" >$tmp/config.h + echo "/* Generated automatically by configure. */" >"$tmp"/config.h else - echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h + echo "/* $ac_file. Generated automatically by configure. */" >"$tmp"/config.h fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in + cat "$tmp"/in >>"$tmp"/config.h + 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:23713: $ac_file is unchanged" >&5 + { echo "$as_me:24781: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -23746,8 +24814,8 @@ done; } mv "$tmp/config.h" "$ac_file" fi else - cat $tmp/config.h - rm -f $tmp/config.h + cat "$tmp"/config.h + rm -f "$tmp"/config.h fi done EOF diff --git a/test/configure.in b/test/configure.in index 2a0b77903df6..4df1c11f933b 100644 --- a/test/configure.in +++ b/test/configure.in @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2019,2020 Thomas E. Dickey * +dnl Copyright 2018-2023,2024 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 dnl Author: Thomas E. Dickey 1996-on dnl -dnl $Id: configure.in,v 1.162 2020/08/29 13:23:50 tom Exp $ +dnl $Id: configure.in,v 1.174 2024/03/30 14:31:11 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) @@ -42,7 +42,7 @@ dnl https://invisible-island.net/autoconf/ dnl https://invisible-island.net/autoconf/my-autoconf.html dnl https://invisible-island.net/ncurses/ncurses-examples.html dnl --------------------------------------------------------------------------- -AC_PREREQ(2.52.20200111) +AC_PREREQ(2.52.20210509) AC_INIT(ncurses.c) AC_CONFIG_HEADER(ncurses_cfg.h:ncurses_tst.hin) @@ -62,6 +62,7 @@ AC_PROG_AWK CF_PROG_INSTALL CF_INSTALL_OPTS CF_PROG_LINT +CF_MAKE_PHONY CF_MAKE_TAGS CF_MATH_LIB(MATH_LIB,pow(sin(x),x)) @@ -107,6 +108,7 @@ AC_OBJEXT CF_GCC_ATTRIBUTES CF_ENABLE_STRING_HACKS CF_XOPEN_SOURCE(600) +AC_CHECK_DECL(exit) CF_SIG_ATOMIC_T # Work around breakage on OS X @@ -236,14 +238,12 @@ fi # look for curses-related headers AC_CHECK_HEADERS( $cf_curses_headers ) -AC_STDC_HEADERS AC_HEADER_TIME AC_CHECK_HEADERS( \ getopt.h \ locale.h \ math.h \ stdarg.h \ -stdint.h \ sys/ioctl.h \ sys/select.h \ sys/time.h \ @@ -252,10 +252,10 @@ unistd.h \ ) CF_GETOPT_HEADER +CF_FUNC_GETTIME AC_CHECK_FUNCS( \ getopt \ -gettimeofday \ snprintf \ strdup \ strstr \ @@ -316,12 +316,15 @@ wcstombs \ fi CF_CURSES_FUNCS( \ +_nc_tparm_analyze \ +_tracef \ alloc_pair \ assume_default_colors \ chgat \ color_content \ color_set \ copywin \ +curses_trace \ delscreen \ dupwin \ exit_curses \ @@ -356,8 +359,12 @@ termname \ tgetent \ tigetnum \ tigetstr \ +tiparm \ +tiparm_s \ +tiscan_s \ tputs_sp \ typeahead \ +unget_wch \ use_default_colors \ use_env \ use_extended_names \ @@ -372,7 +379,6 @@ winsdelln \ winsstr \ wresize \ wsyncdown \ -_tracef \ ) CF_TPUTS_PROTO diff --git a/test/demo_altkeys.c b/test/demo_altkeys.c index fb3cd65c6f04..ea6a7e64bcae 100644 --- a/test/demo_altkeys.c +++ b/test/demo_altkeys.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2022,2023 Thomas E. Dickey * * Copyright 2005-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_altkeys.c,v 1.14 2020/02/02 23:34:34 tom Exp $ + * $Id: demo_altkeys.c,v 1.17 2023/02/25 18:08:02 tom Exp $ * * Demonstrate the define_key() function. * Thomas Dickey - 2005/10/22 @@ -71,17 +71,49 @@ log_last_line(WINDOW *win) } } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: demo_altkeys [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int n; int ch; -#if HAVE_GETTIMEOFDAY - struct timeval previous; -#endif + TimeType previous; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); unlink(MY_LOGFILE); + setlocale(LC_ALL, ""); if (newterm(0, stdout, stdin) == 0) { fprintf(stderr, "Cannot initialize terminal\n"); ExitProgram(EXIT_FAILURE); @@ -113,31 +145,16 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) } } -#if HAVE_GETTIMEOFDAY - gettimeofday(&previous, 0); -#endif + GetClockTime(&previous); while ((ch = getch()) != ERR) { bool escaped = (ch >= MY_KEYS); const char *name = keyname(escaped ? (ch - MY_KEYS) : ch); -#if HAVE_GETTIMEOFDAY - int secs, msecs; - struct timeval current; - - gettimeofday(¤t, 0); - secs = (int) (current.tv_sec - previous.tv_sec); - msecs = (int) ((current.tv_usec - previous.tv_usec) / 1000); - if (msecs < 0) { - msecs += 1000; - --secs; - } - if (msecs >= 1000) { - secs += msecs / 1000; - msecs %= 1000; - } - printw("%6d.%03d ", secs, msecs); + TimeType current; + + GetClockTime(¤t); + printw("%6.03f ", ElapsedSeconds(&previous, ¤t)); previous = current; -#endif printw("Keycode %d, name %s%s\n", ch, escaped ? "ESC-" : "", diff --git a/test/demo_defkey.c b/test/demo_defkey.c index afe102931a68..441667263f69 100644 --- a/test/demo_defkey.c +++ b/test/demo_defkey.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 2002-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_defkey.c,v 1.31 2020/12/26 17:55:13 tom Exp $ + * $Id: demo_defkey.c,v 1.35 2024/01/20 20:46:12 tom Exp $ * * Demonstrate the define_key() function. * Thomas Dickey - 2002/11/23 @@ -100,7 +100,7 @@ visible(const char *string) { char *result = 0; - if (string != 0 && *string != '\0') { + if (VALID_STRING(string) && *string != '\0') { int pass; int n; size_t need = 1; @@ -148,11 +148,7 @@ really_define_key(WINDOW *win, const char *new_string, int code) } log_last_line(win); - if (vis_string != 0) { - free(vis_string); - vis_string = 0; - } - + free(vis_string); vis_string = visible(new_string); if ((rc = key_defined(new_string)) > 0) { wprintw(win, "%s was bound to %s\n", vis_string, keyname(rc)); @@ -185,7 +181,7 @@ duplicate(WINDOW *win, NCURSES_CONST char *name, int code) { char *value = tigetstr(name); - if (value != 0) { + if (VALID_STRING(value)) { const char *prefix = 0; if (!(strncmp) (value, "\033[", (size_t) 2)) { @@ -214,16 +210,50 @@ remove_definition(WINDOW *win, int code) really_define_key(win, 0, code); } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: demo_defkey [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { char *fkeys[12]; int n; int ch; WINDOW *win; + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); + unlink(MY_LOGFILE); + setlocale(LC_ALL, ""); initscr(); (void) cbreak(); /* take input chars one at a time, no wait for \n */ (void) noecho(); /* don't echo input */ diff --git a/test/demo_forms.c b/test/demo_forms.c index ea0426d0fa00..62e8c644e23b 100644 --- a/test/demo_forms.c +++ b/test/demo_forms.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2022,2023 Thomas E. Dickey * * Copyright 2003-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_forms.c,v 1.58 2020/03/21 15:57:59 tom Exp $ + * $Id: demo_forms.c,v 1.63 2023/11/11 00:29:53 tom Exp $ * * Demonstrate a variety of functions from the form library. * Thomas Dickey - 2003/4/26 @@ -154,7 +154,7 @@ make_label(const char *label, int frow, int fcol) if (f) { set_field_buffer(f, 0, label); - set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE)); + set_field_opts(f, (int) ((unsigned) field_opts(f) & (unsigned) ~O_ACTIVE)); } return (f); } @@ -242,7 +242,7 @@ show_insert_mode(bool insert_mode) #define O_SELECTABLE (O_ACTIVE | O_VISIBLE) static FIELD * -another_field(FORM *form, FIELD *field) +another_field(FORM *form, const FIELD *const field) { FIELD **f = form_fields(form); FIELD *result = 0; @@ -556,23 +556,28 @@ demo_forms(void) } static void -usage(void) +usage(int ok) { static const char *tbl[] = { "Usage: demo_forms [options] [data file]" ,"" - ," -d make fields dynamic" - ," -j value justify (1=left, 2=center, 3=right)" - ," -m value set maximum size of dynamic fields" - ," -o value specify number of offscreen rows in new_field()" - ," -t value specify text to fill fields initially" + ,USAGE_COMMON + ,"Options:" + ," -d make fields dynamic" + ," -j NUM justify (1=left, 2=center, 3=right)" + ," -m NUM set maximum size of dynamic fields" + ," -o NUM specify number of offscreen rows in new_field()" + ," -t NUM specify text to fill fields initially" }; unsigned int j; for (j = 0; j < SIZEOF(tbl); ++j) fprintf(stderr, "%s\n", tbl[j]); - exit(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) @@ -581,7 +586,7 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "dj:m:o:t:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "dj:m:o:t:")) != -1) { switch (ch) { case 'd': d_option = TRUE; @@ -590,7 +595,7 @@ main(int argc, char *argv[]) j_value = atoi(optarg); if (j_value < NO_JUSTIFICATION || j_value > JUSTIFY_RIGHT) - usage(); + usage(FALSE); break; case 'm': m_value = atoi(optarg); @@ -601,9 +606,12 @@ main(int argc, char *argv[]) case 't': t_value = optarg; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } while (optind < argc) { diff --git a/test/demo_keyok.c b/test/demo_keyok.c index 28d90aa18cc2..8f4ae906bd06 100644 --- a/test/demo_keyok.c +++ b/test/demo_keyok.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 2002-2006,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_keyok.c,v 1.7 2020/02/02 23:34:34 tom Exp $ + * $Id: demo_keyok.c,v 1.9 2022/12/10 23:31:31 tom Exp $ * * Demonstrate the keyok() function. * Thomas Dickey - 2002/11/23 @@ -36,14 +36,48 @@ #include <test.priv.h> #if defined(NCURSES_VERSION) && NCURSES_EXT_FUNCS +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: demo_keyok [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int lastch = ERR; int prior = ERR; int ch; WINDOW *win; + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); + + setlocale(LC_ALL, ""); initscr(); (void) cbreak(); /* take input chars one at a time, no wait for \n */ (void) noecho(); /* don't echo input */ diff --git a/test/demo_menus.c b/test/demo_menus.c index 02f7ca3312ff..7b0bf30316e5 100644 --- a/test/demo_menus.c +++ b/test/demo_menus.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2022,2023 Thomas E. Dickey * * Copyright 2003-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_menus.c,v 1.71 2020/02/02 23:34:34 tom Exp $ + * $Id: demo_menus.c,v 1.80 2023/05/27 20:13:10 tom Exp $ * * Demonstrate a variety of functions from the menu library. * Thomas Dickey - 2005/4/9 @@ -113,7 +113,7 @@ static bool loaded_file = FALSE; static char empty[1]; #ifdef TRACE -static void failed(const char *s) GCC_NORETURN; +static GCC_NORETURN void failed(const char *s); static void failed(const char *s) @@ -308,7 +308,7 @@ menu_create(ITEM ** items, int count, int ncols, MenuNo number) } static void -menu_destroy(MENU * m) +menu_destroy(MENU * m, int itemsToo) { Trace(("menu_destroy %p", (void *) m)); if (m != 0) { @@ -331,18 +331,18 @@ menu_destroy(MENU * m) Trace(("freeing blob %p", blob)); free((void *) blob); } - free(items); - items = 0; } -#ifdef TRACE - if ((count > 0) && (m == mpTrace)) { - ITEM **ip = items; - if (ip != 0) { - while (*ip) - free(*ip++); + if (count > 0 && itemsToo) { + if (itemsToo & 1) { + ITEM **ip = items; + if (ip != 0) { + while (*ip) + free_item(*ip++); + } } + if (itemsToo & 2) + free(items); } -#endif } } @@ -565,7 +565,7 @@ tracetrace(unsigned tlevel) } _nc_SPRINTF(buf, _nc_SLIMIT(need) "0x%02x = {", tlevel); if (tlevel == 0) { - _nc_STRCAT(buf, t_tbl[0].name, need); + _nc_STRCAT(buf, t_tbl[0].name ? t_tbl[0].name : "", need); _nc_STRCAT(buf, ", ", need); } else { for (n = 1; t_tbl[n].name != 0; n++) @@ -925,19 +925,18 @@ perform_menus(void) } if (code == E_REQUEST_DENIED) beep(); - continue; } } static void destroy_menus(void) { - menu_destroy(mpFile); - menu_destroy(mpSelect); + menu_destroy(mpFile, 1); + menu_destroy(mpSelect, 3); #ifdef TRACE - menu_destroy(mpTrace); + menu_destroy(mpTrace, 1); #endif - menu_destroy(mpBanner); + menu_destroy(mpBanner, 1); } #if HAVE_RIPOFFLINE @@ -977,41 +976,46 @@ call_files(int code) } static void -usage(void) +usage(int ok) { static const char *const tbl[] = { "Usage: demo_menus [options] [menu-file]" ,"" + ,USAGE_COMMON ,"Options:" #if HAVE_RIPOFFLINE - ," -f rip-off footer line (can repeat)" - ," -h rip-off header line (can repeat)" + ," -F rip-off footer line (can repeat)" + ," -H rip-off header line (can repeat)" #endif #ifdef TRACE - ," -t mask specify default trace-level (may toggle with ^T)" + ," -t mask specify default trace-level (may toggle with ^T)" #endif }; size_t n; for (n = 0; n < SIZEOF(tbl); n++) fprintf(stderr, "%s\n", tbl[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { - int c; + int ch; setlocale(LC_ALL, ""); + START_TRACE(); - while ((c = getopt(argc, argv, "fht:")) != -1) { - switch (c) { + while ((ch = getopt(argc, argv, OPTS_COMMON "FHt:")) != -1) { + switch (ch) { #if HAVE_RIPOFFLINE - case 'f': + case 'F': ripoffline(-1, rip_footer); break; - case 'h': + case 'H': ripoffline(1, rip_header); break; #endif /* HAVE_RIPOFFLINE */ @@ -1020,8 +1024,12 @@ main(int argc, char *argv[]) curses_trace((unsigned) strtoul(optarg, 0, 0)); break; #endif + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } diff --git a/test/demo_new_pair.c b/test/demo_new_pair.c index ac0d9bf3362d..bc41d44de930 100644 --- a/test/demo_new_pair.c +++ b/test/demo_new_pair.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2021,2022 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_new_pair.c,v 1.24 2021/02/21 01:24:06 tom Exp $ + * $Id: demo_new_pair.c,v 1.27 2022/12/04 00:40:11 tom Exp $ * * Demonstrate the alloc_pair() function. */ @@ -127,26 +127,27 @@ now(void) } static void -usage(void) +usage(int ok) { static const char *msg[] = { - "Usage: demo_new_pair [options]", - "", - "Repeatedly print using all possible color combinations.", - "", - "Options:", - " -g use getcchar to check setcchar", - " -i use init_pair rather than alloc_pair", - " -p start in paged-mode", - " -s start in single-step mode", - " -w print a wide-character cell", + "Usage: demo_new_pair [options]" + ,"" + ,"Repeatedly print using all possible color combinations." + ,"" + ,USAGE_COMMON + ,"Options:" + ," -g use getcchar to check setcchar" + ," -i use init_pair rather than alloc_pair" + ," -p start in paged-mode" + ," -s start in single-step mode" + ," -w print a wide-character cell" }; unsigned n; for (n = 0; n < SIZEOF(msg); ++n) { fprintf(stderr, "%s\n", msg[n]); } - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } #define use_pages() \ @@ -158,6 +159,9 @@ usage(void) #define update_modes() \ scrollok(stdscr, !paged_mode); \ nodelay(stdscr, !single_mode || paged_mode) +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) @@ -204,7 +208,7 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "gipsw")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "gipsw")) != -1) { switch (ch) { case 'g': check_set = TRUE; @@ -221,9 +225,12 @@ main(int argc, char *argv[]) case 'w': use_wide = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } diff --git a/test/demo_panels.c b/test/demo_panels.c index 005483e94f62..6c8258915713 100644 --- a/test/demo_panels.c +++ b/test/demo_panels.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2020,2022 Thomas E. Dickey * * Copyright 2003-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_panels.c,v 1.45 2020/02/02 23:34:34 tom Exp $ + * $Id: demo_panels.c,v 1.48 2022/12/04 00:40:11 tom Exp $ * * Demonstrate a variety of functions from the panel library. */ @@ -741,39 +741,43 @@ demo_panels(InitPanel myInit, FillPanel myFill) } static void -usage(void) +usage(int ok) { static const char *const tbl[] = { "Usage: demo_panels [options]" ,"" + ,USAGE_COMMON ,"Options:" - ," -i file read commands from file" - ," -o file record commands in file" - ," -m do not use colors" + ," -i file read commands from file" + ," -o file record commands in file" + ," -m do not use colors" #if USE_WIDEC_SUPPORT - ," -w use wide-characters in panels and background" + ," -w use wide-characters in panels and background" #endif - ," -x do not enclose panels in boxes" + ," -x do not enclose panels in boxes" }; size_t n; for (n = 0; n < SIZEOF(tbl); n++) fprintf(stderr, "%s\n", tbl[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { - int c; + int ch; bool monochrome = FALSE; InitPanel myInit = init_panel; FillPanel myFill = fill_panel; setlocale(LC_ALL, ""); - while ((c = getopt(argc, argv, "i:o:mwx")) != -1) { - switch (c) { + while ((ch = getopt(argc, argv, OPTS_COMMON "i:o:mwx")) != -1) { + switch (ch) { case 'i': log_in = fopen(optarg, "r"); break; @@ -792,8 +796,12 @@ main(int argc, char *argv[]) case 'x': unboxed = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (unboxed) diff --git a/test/demo_tabs.c b/test/demo_tabs.c index f63850dfd6dc..16c1ad57cfd8 100644 --- a/test/demo_tabs.c +++ b/test/demo_tabs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2020,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 * @@ -29,52 +29,60 @@ /* * Author: Thomas E. Dickey * - * $Id: demo_tabs.c,v 1.5 2020/02/02 23:34:34 tom Exp $ + * $Id: demo_tabs.c,v 1.10 2022/12/04 00:40:11 tom Exp $ * * A simple demo of tabs in curses. */ +#define USE_CURSES #define USE_TINFO -#include "test.priv.h" +#include <test.priv.h> static void -usage(void) +usage(int ok) { static const char *msg[] = { - "Usage: demo_tabs [options]", - "", - "Print a grid to test tab-stops with the curses interface", - "", - "Options:", - " -l COUNT total number of lines to show", - " -t NUM set TABSIZE variable to the given value", + "Usage: demo_tabs [options]" + ,"" + ,"Print a grid to test tab-stops with the curses interface" + ,"" + ,USAGE_COMMON + ,"Options:" + ," -l COUNT total number of lines to show" + ," -t NUM set TABSIZE variable to the given value" }; unsigned n; for (n = 0; n < SIZEOF(msg); ++n) { fprintf(stderr, "%s\n", msg[n]); } - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { int tabstop; - int n, col, row, step; + int ch, col, row, step; int line_limit = -1; int curses_stops = -1; - while ((n = getopt(argc, argv, "l:t:")) != -1) { - switch (n) { + while ((ch = getopt(argc, argv, OPTS_COMMON "l:t:")) != -1) { + switch (ch) { case 'l': line_limit = atoi(optarg); break; case 't': curses_stops = atoi(optarg); break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } @@ -92,10 +100,10 @@ main(int argc, char *argv[]) move(row, 0); for (col = step = 0; col < COLS - 1; ++col) { if (row == 0) { - chtype ch = '-'; + chtype ct = '-'; if ((col % tabstop) == 0) - ch = '+'; - addch(ch); + ct = '+'; + addch(ct); } else if (col + 1 < row) { addch('*'); } else { diff --git a/test/demo_termcap.c b/test/demo_termcap.c index adc9eeea6935..6e2aba700679 100644 --- a/test/demo_termcap.c +++ b/test/demo_termcap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2022,2023 Thomas E. Dickey * * Copyright 2005-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: demo_termcap.c,v 1.59 2020/02/02 23:34:34 tom Exp $ + * $Id: demo_termcap.c,v 1.65 2023/05/27 20:13:10 tom Exp $ * * A simple demo of the termcap interface. */ @@ -55,7 +55,7 @@ #endif #endif -static void failed(const char *) GCC_NORETURN; +static GCC_NORETURN void failed(const char *); static void failed(const char *msg) @@ -105,7 +105,7 @@ static long total_s_values; #define EachCapName(n) n = 33; n < 127; ++n static char * -make_dbitem(char *p, char *q) +make_dbitem(const char *const p, const char *const q) { size_t need = strlen(e_opt) + 2 + (size_t) (p - q); char *result = malloc(need); @@ -404,7 +404,8 @@ typedef enum { static void parse_description(const char *input_name) { - static char empty[1]; + static char empty[1] = + {0}; FILE *fp; struct stat sb; @@ -437,11 +438,13 @@ parse_description(const char *input_name) failed("cannot allocate memory for input-file"); } - if ((fp = fopen(input_name, "r")) == 0) + if ((fp = fopen(input_name, "r")) == 0) { failed("cannot open input-file"); - len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp); - my_blob[sb.st_size] = '\0'; - fclose(fp); + } else { + len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp); + my_blob[sb.st_size] = '\0'; + fclose(fp); + } /* * First, get rid of comments and escaped newlines, as well as repeated @@ -738,40 +741,45 @@ free_code_list(char **list) #endif /* USE_CODE_LISTS */ static void -usage(void) +usage(int ok) { static const char *msg[] = { - "Usage: demo_termcap [options] [terminal]", - "", - "If no options are given, print all (boolean, numeric, string)", - "capabilities for the given terminal, using short names.", - "", - "Options:", - " -a try all names, print capabilities found", - " -b print boolean-capabilities", - " -d LIST colon-separated list of databases to use", - " -e NAME environment variable to set with -d option", - " -i NAME terminal description to use as names for \"-a\" option, etc.", - " -n print numeric-capabilities", - " -q quiet (prints only counts)", - " -r COUNT repeat for given count", - " -s print string-capabilities", - " -v print termcap-variables", + "Usage: demo_termcap [options] [terminal]" + ,"" + ,"If no options are given, print all (boolean, numeric, string)" + ,"capabilities for the given terminal, using short names." + ,"" + ,USAGE_COMMON + ,"Options:" + ," -a try all names, print capabilities found" + ," -b print boolean-capabilities" + ," -d LIST colon-separated list of databases to use" + ," -e NAME environment variable to set with -d option" + ," -i NAME terminal description to use as names for \"-a\" option, etc." + ," -n print numeric-capabilities" + ," -q quiet (prints only counts)" + ," -r COUNT repeat for given count" + ," -s print string-capabilities" + ," -v print termcap-variables" #ifdef NCURSES_VERSION - " -x print extended capabilities", + ," -x print extended capabilities" #endif }; unsigned n; for (n = 0; n < SIZEOF(msg); ++n) { fprintf(stderr, "%s\n", msg[n]); } - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { + int ch; int n; char *name; bool a_opt = FALSE; @@ -783,8 +791,8 @@ main(int argc, char *argv[]) int repeat; int r_opt = 1; - while ((n = getopt(argc, argv, "abd:e:i:nqr:svxy")) != -1) { - switch (n) { + while ((ch = getopt(argc, argv, OPTS_COMMON "abd:e:i:nqr:svxy")) != -1) { + switch (ch) { case 'a': a_opt = TRUE; break; @@ -808,7 +816,7 @@ main(int argc, char *argv[]) break; case 'r': if ((r_opt = atoi(optarg)) <= 0) - usage(); + usage(FALSE); break; case 's': s_opt = TRUE; @@ -829,9 +837,12 @@ main(int argc, char *argv[]) break; #endif #endif + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } @@ -915,8 +926,7 @@ main(int argc, char *argv[]) #else int -main(int argc GCC_UNUSED, - char *argv[]GCC_UNUSED) +main(void) { failed("This program requires termcap"); } diff --git a/test/demo_terminfo.c b/test/demo_terminfo.c index 61c4076b6254..5e78015c36e0 100644 --- a/test/demo_terminfo.c +++ b/test/demo_terminfo.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2022,2023 Thomas E. Dickey * * Copyright 2009-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: demo_terminfo.c,v 1.51 2020/05/09 13:56:40 tom Exp $ + * $Id: demo_terminfo.c,v 1.57 2023/05/27 20:13:10 tom Exp $ * * A simple demo of the terminfo interface. */ @@ -47,7 +47,7 @@ #endif #endif -static void failed(const char *) GCC_NORETURN; +static GCC_NORETURN void failed(const char *); static void failed(const char *msg) @@ -96,7 +96,7 @@ static long total_s_values; #define FNAME(type) "%s %-*s = ", #type, f_opt ? 24 : FCOLS static char * -make_dbitem(char *p, char *q) +make_dbitem(const char *const p, const char *const q) { size_t need = strlen(e_opt) + 2 + (size_t) (p - q); char *result = malloc(need); @@ -430,7 +430,8 @@ typedef enum { static void parse_description(const char *input_name) { - static char empty[1]; + static char empty[1] = + {0}; FILE *fp; struct stat sb; @@ -463,11 +464,13 @@ parse_description(const char *input_name) failed("cannot allocate memory for input-file"); } - if ((fp = fopen(input_name, "r")) == 0) + if ((fp = fopen(input_name, "r")) == 0) { failed("cannot open input-file"); - len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp); - my_blob[sb.st_size] = '\0'; - fclose(fp); + } else { + len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp); + my_blob[sb.st_size] = '\0'; + fclose(fp); + } /* * First, get rid of comments and escaped newlines, as well as repeated @@ -768,49 +771,54 @@ free_code_list(char **list) #endif /* USE_CODE_LISTS */ static void -usage(void) +usage(int ok) { static const char *msg[] = { - "Usage: demo_terminfo [options] [terminal]", - "", - "If no options are given, print all (boolean, numeric, string)", - "capabilities for the given terminal, using short names.", - "", - "Options:", - " -a try all names, print capabilities found", - " -b print boolean-capabilities", - " -d LIST colon-separated list of databases to use", - " -e NAME environment variable to set with -d option", - " -f print full names", - " -i NAME terminal description to use as names for \"-a\" option", - " -n print numeric-capabilities", - " -q quiet (prints only counts)", - " -r COUNT repeat for given count", - " -s print string-capabilities", + "Usage: demo_terminfo [options] [terminal]" + ,"" + ,"If no options are given, print all (boolean, numeric, string)" + ,"capabilities for the given terminal, using short names." + ,"" + ,USAGE_COMMON + ,"Options:" + ," -a try all names, print capabilities found" + ," -b print boolean-capabilities" + ," -d LIST colon-separated list of databases to use" + ," -e NAME environment variable to set with -d option" + ," -f print full names" + ," -i NAME terminal description to use as names for \"-a\" option" + ," -n print numeric-capabilities" + ," -q quiet (prints only counts)" + ," -r COUNT repeat for given count" + ," -s print string-capabilities" #ifdef NCURSES_VERSION - " -x print extended capabilities", - " -y direct-lookup names of extended capabilities", + ," -x print extended capabilities" + ," -y direct-lookup names of extended capabilities" #endif }; unsigned n; for (n = 0; n < SIZEOF(msg); ++n) { fprintf(stderr, "%s\n", msg[n]); } - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { + int ch; int n; int repeat; char *name; int r_opt = 1; char *input_name = 0; - while ((n = getopt(argc, argv, "abd:e:fi:nqr:sxy")) != -1) { - switch (n) { + while ((ch = getopt(argc, argv, OPTS_COMMON "abd:e:fi:nqr:sxy")) != -1) { + switch (ch) { case 'a': a_opt = TRUE; break; @@ -837,7 +845,7 @@ main(int argc, char *argv[]) break; case 'r': if ((r_opt = atoi(optarg)) <= 0) - usage(); + usage(FALSE); break; case 's': s_opt = TRUE; @@ -853,9 +861,12 @@ main(int argc, char *argv[]) x_opt = TRUE; break; #endif + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } @@ -946,7 +957,7 @@ main(int argc, char *argv[]) #else /* !HAVE_TIGETSTR */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(void) { failed("This program requires the terminfo functions such as tigetstr"); ExitProgram(EXIT_FAILURE); diff --git a/test/ditto.c b/test/ditto.c index a5cec3305646..acac8377aad7 100644 --- a/test/ditto.c +++ b/test/ditto.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2022,2023 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey (1998-on) * - * $Id: ditto.c,v 1.49 2020/02/02 23:34:34 tom Exp $ + * $Id: ditto.c,v 1.59 2023/09/23 17:08:43 tom Exp $ * * The program illustrates how to set up multiple screens from a single * program. @@ -92,6 +92,15 @@ typedef struct { #endif } DITTO; +#ifdef USE_PTHREADS +#define LockIt() pthread_mutex_lock(&pending_mutex) +#define UnlockIt() pthread_mutex_unlock(&pending_mutex) +pthread_mutex_t pending_mutex; +#else +#define LockIt() /* nothing */ +#define UnlockIt() /* nothing */ +#endif + /* * Structure used to pass multiple parameters via the use_screen() * single-parameter interface. @@ -102,9 +111,6 @@ typedef struct { DITTO *ditto; /* data for all screens */ } DDATA; -static void failed(const char *) GCC_NORETURN; -static void usage(void) GCC_NORETURN; - static void failed(const char *s) { @@ -112,13 +118,6 @@ failed(const char *s) ExitProgram(EXIT_FAILURE); } -static void -usage(void) -{ - fprintf(stderr, "Usage: ditto [terminal1 ...]\n"); - ExitProgram(EXIT_FAILURE); -} - /* Add to the head of the fifo, checking for overflow. */ static void put_fifo(FIFO * fifo, int value) @@ -182,7 +181,7 @@ open_tty(char *path) #else struct stat sb; - if (stat(path, &sb) < 0) + if (stat(path, &sb) == -1) failed(path); if ((sb.st_mode & S_IFMT) != S_IFCHR) { errno = ENOTTY; @@ -241,6 +240,14 @@ init_screen( } static void +free_screen(DITTO * target) +{ + free(target->parents); + free(target->windows); + free(target->peeks); +} + +static void open_screen(DITTO * target, char **source, int length, int which1) { if (which1 != 0) { @@ -353,7 +360,6 @@ static void * handle_screen(void *arg) { DDATA ddata; - int ch; memset(&ddata, 0, sizeof(ddata)); ddata.ditto = (DITTO *) arg; @@ -361,7 +367,7 @@ handle_screen(void *arg) ddata.ditto -= ddata.source; /* -> base of array */ for (;;) { - ch = read_screen(ddata.ditto->screen, &ddata); + int ch = read_screen(ddata.ditto->screen, &ddata); if (ch == CTRL('D')) { int later = (ddata.source ? ddata.source : -1); int j; @@ -382,17 +388,46 @@ handle_screen(void *arg) } #endif +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: ditto [terminal [terminal2 ...]]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int main(int argc, char *argv[]) { int j; + int ch; DITTO *data; #ifndef USE_PTHREADS int count; #endif - if (argc <= 1) - usage(); + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } if ((data = typeCalloc(DITTO, (size_t) argc)) == 0) failed("calloc data"); @@ -404,13 +439,15 @@ main(int argc, char *argv[]) } #ifdef USE_PTHREADS + pthread_mutex_init(&pending_mutex, NULL); /* * For multi-threaded operation, set up a reader for each of the screens. * That uses blocking I/O rather than polling for input, so no calls to * napms() are needed. */ for (j = 0; j < argc; j++) { - (void) pthread_create(&(data[j].thread), NULL, handle_screen, &data[j]); + (void) pthread_create(&(data[j].thread), NULL, handle_screen, + &data[j]); } pthread_join(data[1].thread, NULL); #else @@ -420,7 +457,6 @@ main(int argc, char *argv[]) */ for (count = 0;; ++count) { DDATA ddata; - int ch; int which = (count % argc); napms(20); @@ -441,6 +477,7 @@ main(int argc, char *argv[]) * Cleanup and exit */ for (j = argc - 1; j >= 0; j--) { + LockIt(); USING_SCREEN(data[j].screen, close_screen, 0); fprintf(data[j].output, "**Closed\r\n"); @@ -451,7 +488,10 @@ main(int argc, char *argv[]) fflush(data[j].output); fclose(data[j].output); delscreen(data[j].screen); + free_screen(&data[j]); + UnlockIt(); } + free(data); ExitProgram(EXIT_SUCCESS); } #else diff --git a/test/dots.c b/test/dots.c index 94d90a13ff90..05aa8545100c 100644 --- a/test/dots.c +++ b/test/dots.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2022,2023 Thomas E. Dickey * * Copyright 1999-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey <dickey@clark.net> 1999 * - * $Id: dots.c,v 1.40 2020/05/29 23:04:02 tom Exp $ + * $Id: dots.c,v 1.45 2023/01/07 17:21:48 tom Exp $ * * A simple demo of the terminfo interface. */ @@ -111,12 +111,13 @@ get_number(NCURSES_CONST char *cap, int map) } static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: dots [options]" ,"" + ,USAGE_COMMON ,"Options:" ," -T TERM override $TERM" #if HAVE_USE_ENV @@ -132,12 +133,14 @@ usage(void) for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc, - char *argv[]) +main(int argc, char *argv[]) { int ch; double r; @@ -150,13 +153,14 @@ main(int argc, size_t need; char *my_env; - while ((ch = getopt(argc, argv, "T:efm:r:s:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "T:efm:r:s:")) != -1) { switch (ch) { case 'T': need = 6 + strlen(optarg); - my_env = malloc(need); - _nc_SPRINTF(my_env, _nc_SLIMIT(need) "TERM=%s", optarg); - putenv(my_env); + if ((my_env = malloc(need)) != NULL) { + _nc_SPRINTF(my_env, _nc_SLIMIT(need) "TERM=%s", optarg); + putenv(my_env); + } break; #if HAVE_USE_ENV case 'e': @@ -175,9 +179,12 @@ main(int argc, case 's': s_option = atoi(optarg); break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } @@ -236,8 +243,7 @@ main(int argc, } #else int -main(int argc GCC_UNUSED, - char *argv[]GCC_UNUSED) +main(void) { fprintf(stderr, "This program requires terminfo\n"); exit(EXIT_FAILURE); diff --git a/test/dots_curses.c b/test/dots_curses.c index 95ddb93155c9..1a553213c48a 100644 --- a/test/dots_curses.c +++ b/test/dots_curses.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2022,2023 Thomas E. Dickey * * Copyright 2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: dots_curses.c,v 1.21 2020/08/29 16:22:03 juergen Exp $ + * $Id: dots_curses.c,v 1.25 2023/01/07 17:21:48 tom Exp $ * * A simple demo of the curses interface used for comparison with termcap. */ @@ -87,12 +87,13 @@ set_colors(int fg, int bg) } static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: dots_curses [options]" ,"" + ,USAGE_COMMON ,"Options:" ," -T TERM override $TERM" #if HAVE_USE_DEFAULT_COLORS @@ -110,8 +111,11 @@ usage(void) for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) @@ -129,13 +133,14 @@ main(int argc, char *argv[]) size_t need; char *my_env; - while ((ch = getopt(argc, argv, "T:dem:r:s:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "T:dem:r:s:")) != -1) { switch (ch) { case 'T': need = 6 + strlen(optarg); - my_env = malloc(need); - _nc_SPRINTF(my_env, _nc_SLIMIT(need) "TERM=%s", optarg); - putenv(my_env); + if ((my_env = malloc(need)) != NULL) { + _nc_SPRINTF(my_env, _nc_SLIMIT(need) "TERM=%s", optarg); + putenv(my_env); + } break; #if HAVE_USE_DEFAULT_COLORS case 'd': @@ -156,9 +161,12 @@ main(int argc, char *argv[]) case 's': s_option = atoi(optarg); break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } diff --git a/test/dots_mvcur.c b/test/dots_mvcur.c index a032124c1359..a6119237bda7 100644 --- a/test/dots_mvcur.c +++ b/test/dots_mvcur.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2022,2023 Thomas E. Dickey * * Copyright 2007-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey - 2007 * - * $Id: dots_mvcur.c,v 1.26 2020/05/29 23:04:02 tom Exp $ + * $Id: dots_mvcur.c,v 1.31 2023/01/07 17:21:48 tom Exp $ * * A simple demo of the terminfo interface, and mvcur. */ @@ -112,12 +112,13 @@ get_number(NCURSES_CONST char *cap, int map) } static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: dots_termcap [options]" ,"" + ,USAGE_COMMON ,"Options:" ," -T TERM override $TERM" #if HAVE_USE_ENV @@ -133,12 +134,14 @@ usage(void) for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc GCC_UNUSED, - char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int x0 = 1, y0 = 1; int ch; @@ -153,13 +156,14 @@ main(int argc GCC_UNUSED, size_t need; char *my_env; - while ((ch = getopt(argc, argv, "T:efm:r:s:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "T:efm:r:s:")) != -1) { switch (ch) { case 'T': need = 6 + strlen(optarg); - my_env = malloc(need); - _nc_SPRINTF(my_env, _nc_SLIMIT(need) "TERM=%s", optarg); - putenv(my_env); + if ((my_env = malloc(need)) != NULL) { + _nc_SPRINTF(my_env, _nc_SLIMIT(need) "TERM=%s", optarg); + putenv(my_env); + } break; #if HAVE_USE_ENV case 'e': @@ -178,9 +182,12 @@ main(int argc GCC_UNUSED, case 's': s_option = atoi(optarg); break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } @@ -253,8 +260,7 @@ main(int argc GCC_UNUSED, } #else int -main(int argc GCC_UNUSED, - char *argv[]GCC_UNUSED) +main(void) { fprintf(stderr, "This program requires terminfo\n"); exit(EXIT_FAILURE); diff --git a/test/dots_termcap.c b/test/dots_termcap.c index 5e4c17d1adaf..65786c411a4a 100644 --- a/test/dots_termcap.c +++ b/test/dots_termcap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2022,2023 Thomas E. Dickey * * Copyright 2013-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: dots_termcap.c,v 1.26 2020/09/05 17:58:47 juergen Exp $ + * $Id: dots_termcap.c,v 1.32 2023/02/25 18:11:21 tom Exp $ * * A simple demo of the termcap interface. */ @@ -150,11 +150,19 @@ ranf(void) return ((double) r / 32768.); } +/* + * napms is a curses function which happens to be usable without initializing + * the screen, but if this program happened to be build with a "real" termcap + * library, there is nothing like napms. + */ +#if HAVE_NAPMS +#define my_napms(ms) napms(ms) +#else static void my_napms(int ms) { if (ms > 0) { -#if defined(_NC_WINDOWS) || !HAVE_GETTIMEOFDAY +#if defined(_NC_WINDOWS) Sleep((unsigned int) ms); #else struct timeval data; @@ -164,6 +172,7 @@ my_napms(int ms) #endif } } +#endif static int get_number(NCURSES_CONST char *cap, const char *env) @@ -180,12 +189,13 @@ get_number(NCURSES_CONST char *cap, const char *env) } static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: dots_termcap [options]" ,"" + ,USAGE_COMMON ,"Options:" ," -T TERM override $TERM" ," -e allow environment $LINES / $COLUMNS" @@ -198,8 +208,11 @@ usage(void) for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) @@ -220,13 +233,14 @@ main(int argc, char *argv[]) size_t need; char *my_env; - while ((ch = getopt(argc, argv, "T:em:r:s:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "T:em:r:s:")) != -1) { switch (ch) { case 'T': need = 6 + strlen(optarg); - my_env = malloc(need); - _nc_SPRINTF(my_env, _nc_SLIMIT(need) "TERM=%s", optarg); - putenv(my_env); + if ((my_env = malloc(need)) != NULL) { + _nc_SPRINTF(my_env, _nc_SLIMIT(need) "TERM=%s", optarg); + putenv(my_env); + } break; case 'e': e_option = 1; @@ -240,9 +254,12 @@ main(int argc, char *argv[]) case 's': s_option = atoi(optarg); break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } @@ -319,8 +336,7 @@ main(int argc, char *argv[]) } #else int -main(int argc GCC_UNUSED, - char *argv[]GCC_UNUSED) +main(void) { fprintf(stderr, "This program requires termcap\n"); exit(EXIT_FAILURE); diff --git a/test/dots_xcurses.c b/test/dots_xcurses.c index b640c2b61267..b4b52193d262 100644 --- a/test/dots_xcurses.c +++ b/test/dots_xcurses.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2022,2023 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: dots_xcurses.c,v 1.24 2020/08/29 16:22:03 juergen Exp $ + * $Id: dots_xcurses.c,v 1.29 2023/01/07 17:21:48 tom Exp $ * * A simple demo of the wide-curses interface used for comparison with termcap. */ @@ -110,12 +110,13 @@ set_colors(int fg, int bg) } static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: dots_xcurses [options]" ,"" + ,USAGE_COMMON ,"Options:" ," -T TERM override $TERM" #if HAVE_USE_DEFAULT_COLORS @@ -136,8 +137,11 @@ usage(void) for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) @@ -155,13 +159,14 @@ main(int argc, char *argv[]) size_t need; char *my_env; - while ((ch = getopt(argc, argv, "T:dem:r:s:x")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "T:dem:r:s:x")) != -1) { switch (ch) { case 'T': need = 6 + strlen(optarg); - my_env = malloc(need); - _nc_SPRINTF(my_env, _nc_SLIMIT(need) "TERM=%s", optarg); - putenv(my_env); + if ((my_env = malloc(need)) != NULL) { + _nc_SPRINTF(my_env, _nc_SLIMIT(need) "TERM=%s", optarg); + putenv(my_env); + } break; #if HAVE_USE_DEFAULT_COLORS case 'd': @@ -187,12 +192,16 @@ main(int argc, char *argv[]) x_option = TRUE; break; #endif + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } + setlocale(LC_ALL, ""); srand((unsigned) time(0)); SetupAlarm(r_option); diff --git a/test/dump_window.c b/test/dump_window.c index 14a8c9fa267d..eed4dbcbdf83 100644 --- a/test/dump_window.c +++ b/test/dump_window.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2020,2023 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: dump_window.c,v 1.4 2020/02/02 23:34:34 tom Exp $ + * $Id: dump_window.c,v 1.5 2023/11/11 00:30:50 tom Exp $ */ #include <dump_window.h> @@ -97,7 +97,7 @@ dump_window(WINDOW *w) char aa; char pp; - temp = ((data & A_ATTRIBUTES) & (~A_COLOR)); + temp = ((data & A_ATTRIBUTES) & (chtype) (~A_COLOR)); if (temp) { if (temp & A_ALTCHARSET) { aa = (temp & A_BOLD) ? 'A' : 'a'; diff --git a/test/dup_field.c b/test/dup_field.c index 5ca67f0b0f5a..68198ed755b3 100644 --- a/test/dup_field.c +++ b/test/dup_field.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2022,2023 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,9 +26,9 @@ * authorization. * ****************************************************************************/ /* - * $Id: dup_field.c,v 1.1 2020/03/21 19:28:36 tom Exp $ + * $Id: dup_field.c,v 1.8 2023/11/11 00:29:10 tom Exp $ * - * Demonstrate move_field(). + * Demonstrate dup_field(). */ #include <test.priv.h> @@ -38,11 +38,11 @@ #include <edit_field.h> #include <popup_msg.h> -#define MY_DEMO EDIT_FIELD('f') +#define DO_DEMO CTRL('F') /* actual key for toggling demo-mode */ +#define MY_DEMO EDIT_FIELD('f') /* internal request-code */ static char empty[] = ""; static FIELD *all_fields[100]; - /* *INDENT-OFF* */ static struct { int code; @@ -52,7 +52,6 @@ static struct { { CTRL('A'), REQ_BEG_FIELD, "go to beginning of field" }, { CTRL('D'), REQ_DOWN_FIELD, "move downward to field" }, { CTRL('E'), REQ_END_FIELD, "go to end of field" }, - { CTRL('G'), MY_DEMO, "move current field with cursor keys" }, { CTRL('H'), REQ_DEL_PREV, "delete previous character" }, { CTRL('I'), REQ_NEXT_FIELD, "go to next field" }, { CTRL('K'), REQ_CLR_EOF, "clear to end of field" }, @@ -73,7 +72,8 @@ static struct { { KEY_NEXT, REQ_NEXT_FIELD, "go to next field" }, { KEY_PREVIOUS, REQ_PREV_FIELD, "go to previous field" }, { KEY_RIGHT, REQ_RIGHT_CHAR, "move right 1 character" }, - { KEY_UP, REQ_UP_CHAR, "move up 1 character" } + { KEY_UP, REQ_UP_CHAR, "move up 1 character" }, + { DO_DEMO, MY_DEMO, "duplicate current field" } }; /* *INDENT-ON* */ @@ -109,11 +109,6 @@ my_help_edit_field(void) free(msgs); } -static void -do_demo(FORM *form) -{ -} - static FIELD * make_label(const char *label, int frow, int fcol) { @@ -121,7 +116,7 @@ make_label(const char *label, int frow, int fcol) if (f) { set_field_buffer(f, 0, label); - set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE)); + set_field_opts(f, (int) ((unsigned) field_opts(f) & (unsigned) ~O_ACTIVE)); } return (f); } @@ -148,28 +143,6 @@ erase_form(FORM *f) werase(w); wrefresh(w); delwin(s); - delwin(w); -} - -static int -my_form_driver(FORM *form, int c) -{ - switch (c) { - case MY_QUIT: - if (form_driver(form, REQ_VALIDATION) == E_OK) - return (TRUE); - break; - case MY_HELP: - my_help_edit_field(); - break; - case MY_DEMO: - do_demo(form); - break; - default: - beep(); - break; - } - return (FALSE); } static FieldAttrs * @@ -213,7 +186,6 @@ my_edit_field(FORM *form, int *result) int status; FIELD *before; unsigned n; - int length; int before_row; int before_col; int before_off = offset_in_field(form); @@ -239,8 +211,8 @@ my_edit_field(FORM *form, int *result) if (status == E_OK) { bool modified = TRUE; + int length = buffer_length(before); - length = buffer_length(before); if (length < before_off) length = before_off; switch (*result) { @@ -293,6 +265,55 @@ my_edit_field(FORM *form, int *result) return status; } +static FIELD ** +copy_fields(FIELD **source, FIELD *extra, size_t length) +{ + FIELD **target = typeCalloc(FIELD *, length + 1); + memcpy(target, source, length * sizeof(FIELD *)); + target[length] = extra; + return target; +} + +static void +do_demo(FORM *form) +{ + int count = field_count(form); + FIELD *my_field = current_field(form); + FIELD **old_fields = form_fields(form); + + if (count > 0 && old_fields != NULL && my_field != NULL) { + FIELD **new_fields = copy_fields(old_fields, + dup_field(my_field, + form_field_row(my_field) + + 1, + form_field_col(my_field)), + (size_t) count); + if (new_fields != NULL) + set_form_fields(form, new_fields); + } +} + +static int +my_form_driver(FORM *form, int c) +{ + switch (c) { + case MY_QUIT: + if (form_driver(form, REQ_VALIDATION) == E_OK) + return (TRUE); + break; + case MY_HELP: + my_help_edit_field(); + break; + case MY_DEMO: + do_demo(form); + break; + default: + beep(); + break; + } + return (FALSE); +} + static void demo_forms(void) { @@ -356,9 +377,44 @@ demo_forms(void) nl(); } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: dup_field [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int -main(void) +main(int argc, char *argv[]) { + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); + setlocale(LC_ALL, ""); initscr(); diff --git a/test/echochar.c b/test/echochar.c index ce7f03d385fe..08497069419a 100644 --- a/test/echochar.c +++ b/test/echochar.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2022,2023 Thomas E. Dickey * * Copyright 2006-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: echochar.c,v 1.21 2020/02/02 23:34:34 tom Exp $ + * $Id: echochar.c,v 1.26 2023/05/27 20:13:10 tom Exp $ * * Demonstrate the echochar function (compare to dots.c). * Thomas Dickey - 2006/11/4 @@ -65,7 +65,7 @@ ranf(void) } static void -set_color(char *my_pairs, int fg, int bg) +set_color(const char *const my_pairs, int fg, int bg) { int pair = (fg * COLORS) + bg; if (pair < COLOR_PAIRS) { @@ -78,9 +78,30 @@ set_color(char *my_pairs, int fg, int bg) } } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: echochar" + ,"" + ,USAGE_COMMON + ,"Options:" + ," -r use addch/refresh rather than echochar()" + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int -main(int argc GCC_UNUSED, - char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int ch; double r; @@ -91,14 +112,17 @@ main(int argc GCC_UNUSED, int last_fg = 0; int last_bg = 0; - while ((ch = getopt(argc, argv, "r")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "r")) != -1) { switch (ch) { case 'r': opt_r = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - fprintf(stderr, "Usage: echochar [-r]\n"); - ExitProgram(EXIT_FAILURE); + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } diff --git a/test/extended_color.c b/test/extended_color.c index bc52cc4889c8..746c035927b1 100644 --- a/test/extended_color.c +++ b/test/extended_color.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2020,2022 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: extended_color.c,v 1.15 2020/02/02 23:34:34 tom Exp $ + * $Id: extended_color.c,v 1.20 2022/12/10 22:28:50 tom Exp $ */ #include <test.priv.h> @@ -139,42 +139,50 @@ show_rgb(SCREEN *sp) } static void -usage(void) +usage(int ok) { static const char *tbl[] = { - "Usage: extended_color", - "", - "Options:", - " -s use sp-funcs", - NULL + "Usage: extended_color" + ,"" + ,USAGE_COMMON + ,"Options:" + ," -s use sp-funcs" }; size_t n; for (n = 0; n < SIZEOF(tbl); ++n) { fprintf(stderr, "%s\n", tbl[n]); } - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { + int ch; int i; SCREEN *sp; - while ((i = getopt(argc, argv, "s")) != -1) { - switch (i) { + while ((ch = getopt(argc, argv, OPTS_COMMON "s")) != -1) { + switch (ch) { #if USE_SP_FUNCS case 's': opt_s = TRUE; break; #endif + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); /* NOTREACHED */ } } + setlocale(LC_ALL, ""); slk_init(1); sp = newterm(NULL, stdout, stdin); cbreak(); diff --git a/test/filter.c b/test/filter.c index 6cd9206b274d..b7444569b789 100644 --- a/test/filter.c +++ b/test/filter.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2020,2022 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey 1998 * - * $Id: filter.c,v 1.35 2020/07/25 22:40:57 tom Exp $ + * $Id: filter.c,v 1.38 2022/12/04 00:40:11 tom Exp $ * * An example of the 'filter()' function in ncurses, this program prompts * for commands and executes them (like a command shell). It illustrates @@ -299,28 +299,32 @@ cancel_altscreen(void) #endif static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: filter [options]" ,"" + ,USAGE_COMMON ,"Options:" #ifdef NCURSES_VERSION - ," -a suppress xterm alternate-screen by amending smcup/rmcup" + ," -a suppress xterm alternate-screen by amending smcup/rmcup" #endif - ," -c show current time on prompt line with \"Command\"" + ," -c show current time on prompt line with \"Command\"" #if HAVE_USE_DEFAULT_COLORS - ," -d invoke use_default_colors" + ," -d invoke use_default_colors" #endif - ," -i use initscr() rather than newterm()" - ," -p poll for individual characters rather than using getnstr" + ," -i use initscr() rather than newterm()" + ," -p poll for individual characters rather than using getnstr" }; unsigned n; for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) @@ -340,7 +344,7 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "adcip")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "adcip")) != -1) { switch (ch) { #ifdef NCURSES_VERSION case 'a': @@ -361,8 +365,12 @@ main(int argc, char *argv[]) case 'p': p_option = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } diff --git a/test/firework.c b/test/firework.c index bfeadd7c0dfe..54e4036cf6a2 100644 --- a/test/firework.c +++ b/test/firework.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2020,2022 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: firework.c,v 1.37 2020/02/02 23:34:34 tom Exp $ + * $Id: firework.c,v 1.40 2022/12/04 00:40:11 tom Exp $ */ #include <test.priv.h> @@ -138,12 +138,13 @@ explode(int row, int col) } static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: firework [options]" ,"" + ,USAGE_COMMON ,"Options:" #if HAVE_USE_DEFAULT_COLORS ," -d invoke use_default_colors, repeat to use in init_pair" @@ -154,8 +155,11 @@ usage(void) for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) @@ -170,19 +174,23 @@ main(int argc, char *argv[]) bool d_option = FALSE; #endif - while ((ch = getopt(argc, argv, "d")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "d")) != -1) { switch (ch) { #if HAVE_USE_DEFAULT_COLORS case 'd': d_option = TRUE; break; #endif + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); InitAndCatch(initscr(), onsig); noecho(); diff --git a/test/firstlast.c b/test/firstlast.c index 0a8e5ee0a694..c66c2b8511c3 100644 --- a/test/firstlast.c +++ b/test/firstlast.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 1998-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ * This test was written by Alexander V. Lukyanov to demonstrate difference * between ncurses 4.1 and SVR4 curses * - * $Id: firstlast.c,v 1.9 2020/02/02 23:34:34 tom Exp $ + * $Id: firstlast.c,v 1.10 2022/12/10 23:31:31 tom Exp $ */ #include <test.priv.h> @@ -71,11 +71,45 @@ fill(WINDOW *w, const char *str) } } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: firstlast [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int -main(int argc GCC_UNUSED, - char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { WINDOW *large, *small; + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); + initscr(); noecho(); diff --git a/test/foldkeys.c b/test/foldkeys.c index 1a5aac0d97fc..bb3801e282fe 100644 --- a/test/foldkeys.c +++ b/test/foldkeys.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2022,2023 Thomas E. Dickey * * Copyright 2006-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey, 2006 * - * $Id: foldkeys.c,v 1.9 2020/02/02 23:34:34 tom Exp $ + * $Id: foldkeys.c,v 1.12 2023/02/25 16:51:01 tom Exp $ * * Demonstrate a method for altering key definitions at runtime. * @@ -146,7 +146,8 @@ demo_foldkeys(void) int first, second; char final[2]; char *value; - size_t need = 0; + size_t need; + if (info[j].state == 0 && sscanf(info[j].value, "\033[%d;%d%c", @@ -156,6 +157,7 @@ demo_foldkeys(void) && *final != ';' && (need = strlen(info[j].value)) != 0 && (value = strdup(info[j].value)) != 0) { + (void) need; /* _nc_SLIMIT is normally nothing */ _nc_SPRINTF(value, _nc_SLIMIT(need) "\033[%d%c", first, *final); for (k = 0; k < info_len; ++k) { if (info[k].state == 0 @@ -191,13 +193,44 @@ demo_foldkeys(void) printw("Merged to %d key definitions\n", info_len - merged); } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: foldkeys [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int ch; -#if HAVE_GETTIMEOFDAY - struct timeval previous; -#endif + TimeType previous; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); if (newterm(0, stdout, stdin) == 0) { fprintf(stderr, "Cannot initialize terminal\n"); @@ -215,32 +248,17 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) demo_foldkeys(); -#if HAVE_GETTIMEOFDAY - gettimeofday(&previous, 0); -#endif + GetClockTime(&previous); while ((ch = getch()) != ERR) { bool escaped = (ch >= MY_KEYS); const char *name = keyname(escaped ? (ch - MY_KEYS) : ch); + TimeType current; -#if HAVE_GETTIMEOFDAY - int secs, msecs; - struct timeval current; - - gettimeofday(¤t, 0); - secs = (int) (current.tv_sec - previous.tv_sec); - msecs = (int) ((current.tv_usec - previous.tv_usec) / 1000); - if (msecs < 0) { - msecs += 1000; - --secs; - } - if (msecs >= 1000) { - secs += msecs / 1000; - msecs %= 1000; - } - printw("%6d.%03d ", secs, msecs); + GetClockTime(¤t); + printw("%6.03f ", ElapsedSeconds(&previous, ¤t)); previous = current; -#endif + printw("Keycode %d, name %s%s\n", ch, escaped ? "ESC-" : "", diff --git a/test/form_driver_w.c b/test/form_driver_w.c index dd7ea68cfb4f..544060dcc101 100644 --- a/test/form_driver_w.c +++ b/test/form_driver_w.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 2013-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -32,7 +32,7 @@ ****************************************************************************/ /* - * $Id: form_driver_w.c,v 1.16 2020/02/02 23:34:34 tom Exp $ + * $Id: form_driver_w.c,v 1.17 2022/12/10 23:31:31 tom Exp $ * * Test form_driver_w (int, int, wchar_t), a wide char aware * replacement of form_driver. @@ -45,8 +45,28 @@ #include <form.h> +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: form_driver_w [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int -main(void) +main(int argc, char *argv[]) { static const char *help[] = { @@ -64,6 +84,20 @@ main(void) FORM *my_form; bool done = FALSE; int n; + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); setlocale(LC_ALL, ""); @@ -94,14 +128,14 @@ main(void) /* Loop through to get user requests */ while (!done) { - wint_t ch; - int ret = get_wch(&ch); + wint_t c2; + int ret = get_wch(&c2); mvprintw(MyRow(NUM_FIELDS), MyCol(NUM_FIELDS), "Got %d (%#x), type: %s", - (int) ch, - (int) ch, + (int) c2, + (int) c2, (ret == KEY_CODE_YES) ? "KEY_CODE_YES" : ((ret == OK) @@ -113,7 +147,7 @@ main(void) switch (ret) { case KEY_CODE_YES: - switch (ch) { + switch (c2) { case KEY_DOWN: /* Go to next field */ form_driver_w(my_form, KEY_CODE_YES, REQ_NEXT_FIELD); @@ -132,7 +166,7 @@ main(void) } break; case OK: - switch (ch) { + switch (c2) { case CTRL('D'): case QUIT: case ESCAPE: @@ -146,7 +180,7 @@ main(void) popup_msg(form_win(my_form), help); break; default: - form_driver_w(my_form, OK, (wchar_t) ch); + form_driver_w(my_form, OK, (wchar_t) c2); break; } break; diff --git a/test/gdc.6 b/test/gdc.6 index 383aae57e336..bf90b26f8b25 100644 --- a/test/gdc.6 +++ b/test/gdc.6 @@ -27,8 +27,8 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: gdc.6,v 1.5 2020/02/02 23:34:34 tom Exp $ -.TH GDC 6 +.\" $Id: gdc.6,v 1.6 2020/02/02 23:34:34 tom Exp $ +.TH GDC 6 2020-02-02 ncurses-examples Games .SH NAME gdc \- grand digital clock (curses) .SH SYNOPSIS diff --git a/test/gdc.c b/test/gdc.c index 59c95e17f2d6..7243c104b173 100644 --- a/test/gdc.c +++ b/test/gdc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2020,2022 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,7 +34,7 @@ * modified 10-18-89 for curses (jrl) * 10-18-89 added signal handling * - * $Id: gdc.c,v 1.54 2020/02/02 23:34:34 tom Exp $ + * $Id: gdc.c,v 1.57 2022/12/04 00:40:11 tom Exp $ */ #include <test.priv.h> @@ -150,26 +150,27 @@ set(int t, int n) } static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: gdc [options] [count]" ,"" + ,USAGE_COMMON ,"Options:" #if HAVE_USE_DEFAULT_COLORS - ," -d invoke use_default_colors" + ," -d invoke use_default_colors" #endif - ," -n redirect input to /dev/null" - ," -s scroll each number into place, rather than flipping" - ," -t hh:mm:ss specify starting time (default is ``now'')" + ," -n redirect input to /dev/null" + ," -s scroll each number into place, rather than flipping" + ," -t TIME specify starting time as hh:mm:ss (default is ``now'')" ,"" ,"If you specify a count, gdc runs for that number of seconds" }; unsigned j; for (j = 0; j < SIZEOF(msg); j++) fprintf(stderr, "%s\n", msg[j]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } static time_t @@ -183,14 +184,14 @@ parse_time(const char *value) if (sscanf(value, "%d:%d:%d%c", &hh, &mm, &ss, &c) != 3) { if (sscanf(value, "%02d%02d%02d%c", &hh, &mm, &ss, &c) != 3) { - usage(); + usage(FALSE); } } if ((hh < 0) || (hh >= 24) || (mm < 0) || (mm >= 60) || (ss < 0) || (ss >= 60)) { - usage(); + usage(FALSE); } /* adjust so that the localtime in the main loop will give usable time */ @@ -204,10 +205,13 @@ parse_time(const char *value) if (tm->tm_hour != hh) { fprintf(stderr, "Cannot find local time for %s!\n", value); - usage(); + usage(FALSE); } return result; } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) @@ -215,7 +219,7 @@ main(int argc, char *argv[]) time_t now; struct tm *tm; long t, a; - int i, j, s, k; + int i, j, s, k, ch; int count = 0; FILE *ofp = stdout; FILE *ifp = stdin; @@ -228,8 +232,8 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((k = getopt(argc, argv, "dnst:")) != -1) { - switch (k) { + while ((ch = getopt(argc, argv, OPTS_COMMON "dnst:")) != -1) { + switch (ch) { #if HAVE_USE_DEFAULT_COLORS case 'd': d_option = TRUE; @@ -245,15 +249,19 @@ main(int argc, char *argv[]) case 't': starts = parse_time(optarg); break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind < argc) { count = atoi(argv[optind++]); assert(count >= 0); if (optind < argc) - usage(); + usage(FALSE); } InitAndCatch({ diff --git a/test/hanoi.c b/test/hanoi.c index 8f1792d9d88b..6d92332fa095 100644 --- a/test/hanoi.c +++ b/test/hanoi.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2021,2022 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -42,7 +42,7 @@ * * Date: 05.Nov.90 * - * $Id: hanoi.c,v 1.41 2020/02/02 23:34:34 tom Exp $ + * $Id: hanoi.c,v 1.47 2022/12/04 00:40:11 tom Exp $ */ #include <test.priv.h> @@ -125,6 +125,15 @@ InitTiles(void) Pegs[2].Count = 0; } +static int +two2n(int n) +{ + int result = 1; + while (n-- > 0) + result *= 2; + return result; +} + static void DisplayTiles(void) { @@ -134,7 +143,7 @@ DisplayTiles(void) erase(); MvAddStr(1, 24, "T O W E R S O F H A N O I"); MvAddStr(3, 34, "SJR 1990"); - MvPrintw(19, 5, "Moves : %d of %.0f", NMoves, pow(2.0, (float) NTiles) - 1); + MvPrintw(19, 5, "Moves : %d of %d", NMoves, two2n(NTiles) - 1); (void) attrset(A_REVERSE); MvAddStr(BASELINE, 8, " "); @@ -232,12 +241,13 @@ Solved(int NumTiles) } static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: hanoi [options] [[<No Of Tiles>] [a]]" ,"" + ,USAGE_COMMON ,"Options:" #if HAVE_USE_DEFAULT_COLORS ," -d invoke use_default_colors" @@ -250,8 +260,11 @@ usage(void) for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char **argv) @@ -263,7 +276,7 @@ main(int argc, char **argv) #endif NTiles = DEFAULTTILES; - while ((ch = getopt(argc, argv, "dn:X")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "dn:X")) != -1) { switch (ch) { #if HAVE_USE_DEFAULT_COLORS case 'd': @@ -276,17 +289,20 @@ main(int argc, char **argv) case 'X': AutoFlag = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); /* NOTREACHED */ } } setlocale(LC_ALL, ""); - switch (ch = (argc - optind)) { + switch (argc - optind) { case 2: if (strcmp(argv[optind + 1], "a")) { - usage(); + usage(FALSE); } AutoFlag = TRUE; /* FALLTHRU */ @@ -296,12 +312,12 @@ main(int argc, char **argv) case 0: break; default: - usage(); + usage(FALSE); } if (NTiles > MAXTILES || NTiles < MINTILES) { fprintf(stderr, "Range %d to %d\n", MINTILES, MAXTILES); - usage(); + usage(FALSE); } initscr(); diff --git a/test/hashtest.c b/test/hashtest.c index 70d622874da9..be79c0e10372 100644 --- a/test/hashtest.c +++ b/test/hashtest.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2020,2022 Thomas E. Dickey * * Copyright 1998-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -31,7 +31,7 @@ * * Generate timing statistics for vertical-motion optimization. * - * $Id: hashtest.c,v 1.36 2020/02/02 23:34:34 tom Exp $ + * $Id: hashtest.c,v 1.39 2022/12/04 00:40:11 tom Exp $ */ #include <test.priv.h> @@ -150,49 +150,53 @@ run_test(bool optimized GCC_UNUSED) } static void -usage(void) +usage(int ok) { static const char *const tbl[] = { "Usage: hashtest [options]" ,"" + ,USAGE_COMMON ,"Options:" - ," -c continuous (don't reset between refresh's)" - ," -f num leave 'num' lines constant for footer" - ," -h num leave 'num' lines constant for header" - ," -l num repeat test 'num' times" - ," -n test the normal optimizer" - ," -o test the hashed optimizer" - ," -r reverse the loops" - ," -s single-step" - ," -x assume lower-right corner extension" + ," -c continuous (don't reset between refresh's)" + ," -F num leave 'num' lines constant for footer" + ," -H num leave 'num' lines constant for header" + ," -l num repeat test 'num' times" + ," -n test the normal optimizer" + ," -o test the hashed optimizer" + ," -r reverse the loops" + ," -s single-step" + ," -x assume lower-right corner extension" }; size_t n; for (n = 0; n < SIZEOF(tbl); n++) fprintf(stderr, "%s\n", tbl[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { - int c; + int ch; int test_loops = 1; int test_normal = FALSE; int test_optimize = FALSE; setlocale(LC_ALL, ""); - while ((c = getopt(argc, argv, "cf:h:l:norsx")) != -1) { - switch (c) { + while ((ch = getopt(argc, argv, OPTS_COMMON "cF:H:l:norsx")) != -1) { + switch (ch) { case 'c': continuous = TRUE; break; - case 'f': + case 'F': foot_lines = atoi(optarg); break; - case 'h': + case 'H': head_lines = atoi(optarg); break; case 'l': @@ -214,8 +218,12 @@ main(int argc, char *argv[]) case 'x': extend_corner = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (!test_normal && !test_optimize) { diff --git a/test/inch_wide.c b/test/inch_wide.c index e44a5f512860..7b838d1dff28 100644 --- a/test/inch_wide.c +++ b/test/inch_wide.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2020,2022 Thomas E. Dickey * * Copyright 2007-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: inch_wide.c,v 1.11 2020/02/02 23:34:34 tom Exp $ + * $Id: inch_wide.c,v 1.13 2022/12/10 23:55:34 tom Exp $ */ /* int in_wch(cchar_t *wcval); @@ -259,19 +259,49 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) return TRUE; } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: inch_wide [options] [file1 [...]]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int main(int argc, char *argv[]) { WINDOW *chrbox; WINDOW *chrwin; WINDOW *strwin; + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } setlocale(LC_ALL, ""); - if (argc < 2) { - fprintf(stderr, "usage: %s file1 [file2 [...]]\n", argv[0]); - return EXIT_FAILURE; - } + if (optind + 1 > argc) + usage(FALSE); initscr(); @@ -282,7 +312,7 @@ main(int argc, char *argv[]) chrwin = derwin(chrbox, 1, COLS - 2, 1, 1); strwin = derwin(chrbox, 4, COLS - 2, 2, 1); - test_inchs(1, argv, chrwin, strwin); + test_inchs(optind, argv, chrwin, strwin); endwin(); ExitProgram(EXIT_SUCCESS); diff --git a/test/inchs.c b/test/inchs.c index 1d1691a61bdd..b5922dd65a80 100644 --- a/test/inchs.c +++ b/test/inchs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2020,2022 Thomas E. Dickey * * Copyright 2007-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: inchs.c,v 1.18 2020/02/02 23:34:34 tom Exp $ + * $Id: inchs.c,v 1.19 2022/12/11 00:01:39 tom Exp $ * * Author: Thomas E Dickey */ @@ -271,19 +271,49 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) return TRUE; } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: inchs [options] file1 [file2 [...]]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int main(int argc, char *argv[]) { WINDOW *chrbox; WINDOW *chrwin; WINDOW *strwin; + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } setlocale(LC_ALL, ""); - if (argc < 2) { - fprintf(stderr, "usage: %s file1 [file2 [...]]\n", argv[0]); - return EXIT_FAILURE; - } + if (optind + 1 > argc) + usage(FALSE); initscr(); @@ -294,7 +324,7 @@ main(int argc, char *argv[]) chrwin = derwin(chrbox, 1, COLS - 2, 1, 1); strwin = derwin(chrbox, 4, COLS - 2, 2, 1); - test_inchs(1, argv, chrwin, strwin); + test_inchs(optind, argv, chrwin, strwin); endwin(); ExitProgram(EXIT_SUCCESS); diff --git a/test/ins_wide.c b/test/ins_wide.c index 9f733924a44a..a732449331e9 100644 --- a/test/ins_wide.c +++ b/test/ins_wide.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 2002-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: ins_wide.c,v 1.25 2020/02/02 23:34:34 tom Exp $ + * $Id: ins_wide.c,v 1.30 2022/12/10 22:28:50 tom Exp $ * * Demonstrate the wins_wstr() and wins_wch functions. * Thomas Dickey - 2002/11/23 @@ -106,7 +106,7 @@ legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length) } static int -ColOf(wchar_t *buffer, int length, int margin) +ColOf(const wchar_t *buffer, int length, int margin) { int n; int result; @@ -455,32 +455,36 @@ test_inserts(int level) } static void -usage(void) +usage(int ok) { static const char *tbl[] = { "Usage: ins_wide [options]" ,"" + ,USAGE_COMMON ,"Options:" - ," -f FILE read data from given file" - ," -n NUM limit string-inserts to NUM bytes on ^N replay" - ," -m perform wmove/move separately from insert-functions" - ," -w use window-parameter even when stdscr would be implied" + ," -f FILE read data from given file" + ," -n NUM limit string-inserts to NUM bytes on ^N replay" + ," -m perform wmove/move separately from insert-functions" + ," -w use window-parameter even when stdscr would be implied" }; unsigned n; for (n = 0; n < SIZEOF(tbl); ++n) fprintf(stderr, "%s\n", tbl[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int ch; setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "f:mn:w")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "f:mn:w")) != -1) { switch (ch) { case 'f': init_linedata(optarg); @@ -496,13 +500,16 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) case 'w': w_opt = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); test_inserts(0); endwin(); diff --git a/test/insdelln.c b/test/insdelln.c index 55e606aebe13..52ccfb620f9b 100644 --- a/test/insdelln.c +++ b/test/insdelln.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2020,2022 Thomas E. Dickey * * Copyright 2008-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: insdelln.c,v 1.14 2020/02/02 23:34:34 tom Exp $ + * $Id: insdelln.c,v 1.15 2022/12/10 23:31:31 tom Exp $ * * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln */ @@ -371,9 +371,44 @@ test_insdelln(void) } while ((st.ch = getch()) != ERR); } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: insdelln [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); + initscr(); cbreak(); noecho(); diff --git a/test/inserts.c b/test/inserts.c index 6d108cc31cb7..b106ffc7d462 100644 --- a/test/inserts.c +++ b/test/inserts.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 2002-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: inserts.c,v 1.30 2020/02/02 23:34:34 tom Exp $ + * $Id: inserts.c,v 1.34 2022/12/10 22:28:50 tom Exp $ * * Demonstrate the winsstr() and winsch functions. * Thomas Dickey - 2002/10/19 @@ -384,32 +384,36 @@ test_inserts(int level) } static void -usage(void) +usage(int ok) { static const char *tbl[] = { "Usage: inserts [options]" ,"" + ,USAGE_COMMON ,"Options:" - ," -f FILE read data from given file" - ," -n NUM limit string-inserts to NUM bytes on ^N replay" - ," -m perform wmove/move separately from insert-functions" - ," -w use window-parameter even when stdscr would be implied" + ," -f FILE read data from given file" + ," -n NUM limit string-inserts to NUM bytes on ^N replay" + ," -m perform wmove/move separately from insert-functions" + ," -w use window-parameter even when stdscr would be implied" }; unsigned n; for (n = 0; n < SIZEOF(tbl); ++n) fprintf(stderr, "%s\n", tbl[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int ch; setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "f:mn:w")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "f:mn:w")) != -1) { switch (ch) { case 'f': init_linedata(optarg); @@ -425,13 +429,16 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) case 'w': w_opt = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); test_inserts(0); endwin(); diff --git a/test/key_names.c b/test/key_names.c index 69c95d638db0..fa7fdba631a4 100644 --- a/test/key_names.c +++ b/test/key_names.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 2007-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: key_names.c,v 1.8 2020/02/02 23:34:34 tom Exp $ + * $Id: key_names.c,v 1.11 2022/12/04 00:40:11 tom Exp $ */ #include <test.priv.h> @@ -35,15 +35,32 @@ #if USE_WIDEC_SUPPORT static void -usage(void) +usage(int ok) { - fprintf(stderr, "Usage: key_names [-m] [-s]\n"); - ExitProgram(EXIT_FAILURE); + static const char *msg[] = + { + "Usage: key_names" + ,"" + ,USAGE_COMMON + ,"Options:" + ," -m call meta(TRUE) in initialization" + ," -s call newterm, etc., to complete initialization" + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { + int ch; int n; bool do_setup = FALSE; @@ -51,16 +68,19 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((n = getopt(argc, argv, "ms")) != -1) { - switch (n) { + while ((ch = getopt(argc, argv, OPTS_COMMON "ms")) != -1) { + switch (ch) { case 'm': do_meta = TRUE; break; case 's': do_setup = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); /* NOTREACHED */ } } diff --git a/test/keynames.c b/test/keynames.c index 5a3d12a69063..cae260f63fe5 100644 --- a/test/keynames.c +++ b/test/keynames.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 1998-2006,2008 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,37 +27,57 @@ * authorization. * ****************************************************************************/ /* - * $Id: keynames.c,v 1.10 2020/02/02 23:34:34 tom Exp $ + * $Id: keynames.c,v 1.13 2022/12/04 00:40:11 tom Exp $ */ #include <test.priv.h> static void -usage(void) +usage(int ok) { - fprintf(stderr, "Usage: keynames [-m] [-s]\n"); - ExitProgram(EXIT_FAILURE); + static const char *msg[] = + { + "Usage: keynames" + ,"" + ,USAGE_COMMON + ,"Options:" + ," -m call meta(TRUE) in initialization" + ," -s call newterm, etc., to complete initialization" + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { + int ch; int n; bool do_setup = FALSE; bool do_meta = FALSE; setlocale(LC_ALL, ""); - while ((n = getopt(argc, argv, "ms")) != -1) { - switch (n) { + while ((ch = getopt(argc, argv, OPTS_COMMON "ms")) != -1) { + switch (ch) { case 'm': do_meta = TRUE; break; case 's': do_setup = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); /* NOTREACHED */ } } diff --git a/test/knight.c b/test/knight.c index bda7da38fc43..b15c4d23763e 100644 --- a/test/knight.c +++ b/test/knight.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2021,2022 Thomas E. Dickey * * Copyright 1998-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,7 +34,7 @@ * Eric S. Raymond <esr@snark.thyrsus.com> July 22 1995. Mouse support * added September 20th 1995. * - * $Id: knight.c,v 1.47 2020/02/02 23:34:34 tom Exp $ + * $Id: knight.c,v 1.52 2022/12/04 00:40:11 tom Exp $ */ #include <test.priv.h> @@ -595,8 +595,8 @@ play(void) { bool keyhelp; /* TRUE if keystroke help is up */ int i, j, count; - int lastcol = 0; /* last location visited */ - int lastrow = 0; + int lastcol; /* last location visited */ + int lastrow; int ny = 0, nx = 0; int review = 0; /* review history */ int test_size; @@ -621,10 +621,10 @@ play(void) for (i = 0; i < ylimit; i++) { for (j = 0; j < xlimit; j++) { - squares[i][j] = FALSE; unmarkcell(i, j); } } + memset(squares, 0, sizeof(squares)); memset(history, 0, sizeof(history)); history[0].y = history[0].x = -1; history[1].y = history[1].x = -1; @@ -899,12 +899,13 @@ play(void) } static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: knight [options]" ,"" + ,USAGE_COMMON ,"Options:" #if HAVE_USE_DEFAULT_COLORS ," -d invoke use_default_colors" @@ -916,15 +917,18 @@ usage(void) for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { int ch; - while ((ch = getopt(argc, argv, "dn:")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "dn:")) != -1) { switch (ch) { #if HAVE_USE_DEFAULT_COLORS case 'd': @@ -935,17 +939,20 @@ main(int argc, char *argv[]) ch = atoi(optarg); if (ch < 3 || ch > 8) { fprintf(stderr, "board size %d is outside [3..8]\n", ch); - usage(); + usage(FALSE); } xlimit = ylimit = ch; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); init_program(); diff --git a/test/list_keys.c b/test/list_keys.c index cdad60e928b6..b616919f4653 100644 --- a/test/list_keys.c +++ b/test/list_keys.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2022,2023 Thomas E. Dickey * * Copyright 2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: list_keys.c,v 1.26 2020/02/02 23:34:34 tom Exp $ + * $Id: list_keys.c,v 1.33 2023/11/11 00:35:05 tom Exp $ * * Author: Thomas E Dickey * @@ -52,7 +52,10 @@ static bool f_opt = FALSE; static bool m_opt = FALSE; static bool t_opt = FALSE; + +#if NCURSES_XNAMES || HAVE_USE_EXTENDED_NAMES static bool x_opt = FALSE; +#endif typedef enum { ktCursor @@ -71,6 +74,13 @@ typedef struct { #define Type(n) list[n].type #define Name(n) list[n].name +static void +failed(const char *msg) +{ + perror(msg); + ExitProgram(EXIT_FAILURE); +} + static const char * full_name(const char *name) { @@ -240,7 +250,7 @@ modified_key(const char *name) map |= (bit1 << 1) | (bit2 >> 1); _nc_SPRINTF(result, _nc_SLIMIT(sizeof(result)) "%sF%d", modifiers[map][(unsigned) f_opt], 1 + key); - } else if (sscanf(name, "k%[A-Z]%d%c", buffer, &value, &chr) == 2 && + } else if (sscanf(name, "k%80[A-Z]%d%c", buffer, &value, &chr) == 2 && (value > 1 && value <= 8) && (!strcmp(buffer, "UP") || @@ -255,7 +265,7 @@ modified_key(const char *name) !strcmp(buffer, "PRV"))) { _nc_SPRINTF(result, _nc_SLIMIT(sizeof(result)) "%sk%s", modifiers[value - 1][(unsigned) f_opt], buffer); - } else if (sscanf(name, "k%[A-Z]%c", buffer, &chr) == 1 && + } else if (sscanf(name, "k%80[A-Z]%c", buffer, &chr) == 1 && (!strcmp(buffer, "UP") || !strcmp(buffer, "DN"))) { _nc_SPRINTF(result, _nc_SLIMIT(sizeof(result)) @@ -338,8 +348,11 @@ list_keys(TERMINAL **terms, int count) widths1 = (int) strlen(modifier); for (k = 0; k < count; ++k) { + char *value; set_curterm(terms[k]); - check = (int) strlen(termname()); + if ((value = termname()) == NULL) + failed("termname"); + check = (int) strlen(value); if (widths2 < check) widths2 = check; } @@ -417,37 +430,41 @@ list_keys(TERMINAL **terms, int count) } static void -usage(void) +usage(int ok) { static const char *msg[] = { - "Usage: list_keys [options] [terminal [terminal2 [...]]]", - "", - "Print capabilities for terminal special keys.", - "", - "Options:", - " -f print full names", - " -m print modifier-column for shift/control keys", - " -t print result as CSV table", + "Usage: list_keys [options] [terminal [terminal2 [...]]]" + ,"" + ,"Print capabilities for terminal special keys." + ,"" + ,USAGE_COMMON + ,"Options:" + ," -f print full names" + ," -m print modifier-column for shift/control keys" + ," -t print result as CSV table" #ifdef NCURSES_VERSION - " -x print extended capabilities", + ," -x print extended capabilities" #endif }; unsigned n; for (n = 0; n < SIZEOF(msg); ++n) { fprintf(stderr, "%s\n", msg[n]); } - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { - int n; + int ch; TERMINAL **terms = typeCalloc(TERMINAL *, argc + 1); - while ((n = getopt(argc, argv, "fmtx")) != -1) { - switch (n) { + while ((ch = getopt(argc, argv, OPTS_COMMON "fmtx")) != -1) { + switch (ch) { case 'f': f_opt = TRUE; break; @@ -457,14 +474,17 @@ main(int argc, char *argv[]) case 't': t_opt = TRUE; break; -#ifdef NCURSES_VERSION +#if NCURSES_XNAMES || HAVE_USE_EXTENDED_NAMES case 'x': x_opt = TRUE; break; #endif + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } @@ -475,6 +495,7 @@ main(int argc, char *argv[]) if (optind < argc) { int found = 0; int status; + int n; for (n = optind; n < argc; ++n) { setupterm((NCURSES_CONST char *) argv[n], 1, &status); if (status > 0 && cur_term != 0) { @@ -496,7 +517,7 @@ main(int argc, char *argv[]) #else int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(void) { printf("This program requires the terminfo arrays\n"); ExitProgram(EXIT_FAILURE); @@ -504,7 +525,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) #endif #else /* !HAVE_TIGETSTR */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(void) { printf("This program requires the terminfo functions such as tigetstr\n"); ExitProgram(EXIT_FAILURE); diff --git a/test/listused.sh b/test/listused.sh index d3e2629495a9..45653ebd68b2 100755 --- a/test/listused.sh +++ b/test/listused.sh @@ -1,6 +1,6 @@ #!/bin/sh ############################################################################## -# Copyright 2020 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.9 2020/02/02 23:34:34 tom Exp $ +# $Id: listused.sh,v 1.12 2022/07/16 16:33:38 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. @@ -65,7 +67,7 @@ do ;; *) NAME=../objects/${name}.o - if test -f $NAME + if test -f "$NAME" then PROGS="$PROGS $NAME" fi @@ -76,19 +78,19 @@ done # For each library - for lib in ../lib/*.a do - LIB=`basename $lib .a` + LIB=`basename "$lib" .a` case $LIB in *_*|*+*) continue ;; esac - tmp=`echo $LIB|sed -e 's/w$//'` + tmp=`echo "$LIB"|sed -e 's/w$//'` echo echo "${tmp}:" - echo $tmp |sed -e 's/./-/g' + echo "$tmp" |sed -e 's/./-/g' # Construct a list of public externals provided by the library. - WANT=`nm $NM_OPTS $lib |\ + WANT=`nm $NM_OPTS "$lib" |\ sed -e 's/^[^ ]*//' \ -e 's/^ *//' \ -e '/^[ a-z] /d' \ @@ -111,7 +113,7 @@ do tags=$prog ;; *) - TEST=`nm $NM_OPTS $prog |\ + TEST=`nm $NM_OPTS "$prog" |\ sed -e 's/^[^ ]*//' \ -e 's/^ *//' \ -e '/^[ a-z] /d' \ @@ -123,7 +125,7 @@ do -e '/^[^_]/d'` if test -n "$TEST" then - have=`basename $prog .o` + have=`basename "$prog" .o` if test -n "$HAVE" then if test "$last" = "$tags" @@ -145,13 +147,13 @@ do if test -z "$HAVE" then for tmp in ../lib/*.a - do + do case $tmp in *_*|*+*) continue ;; esac - TEST=`nm $NM_OPTS $tmp |\ + TEST=`nm $NM_OPTS "$tmp" |\ sed -e 's/^[^ ]*//' \ -e 's/^ *//' \ -e '/^[ a-z] /d' \ @@ -164,20 +166,20 @@ do -e '/^[^_]/d'` if test -n "$TEST" then - tmp=`basename $tmp .a |sed -e 's/w$//'` - HAVE=`echo $tmp | sed -e 's/lib/lib: /'` + tmp=`basename "$tmp" .a |sed -e 's/w$//'` + HAVE=`echo "$tmp" | sed -e 's/lib/lib: /'` break fi done fi test -z "$HAVE" && HAVE="-" - lenn=`expr 39 - length $name` - lenn=`expr $lenn / 8` + lenn=`expr 39 - length "$name"` + lenn=`expr "$lenn" / 8` tabs= - while test $lenn != 0 + while test "$lenn" != 0 do tabs="${tabs} " - lenn=`expr $lenn - 1` + lenn=`expr "$lenn" - 1` done echo "${name}${tabs}${HAVE}" done diff --git a/test/lrtest.c b/test/lrtest.c index 9c77577e65e9..0e609d012c96 100644 --- a/test/lrtest.c +++ b/test/lrtest.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2020,2022 Thomas E. Dickey * * Copyright 1998-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -35,7 +35,7 @@ * This can't be part of the ncurses test-program, because ncurses rips off the * bottom line to do labels. * - * $Id: lrtest.c,v 1.27 2020/02/02 23:34:34 tom Exp $ + * $Id: lrtest.c,v 1.29 2022/12/10 23:44:18 tom Exp $ */ #include <test.priv.h> @@ -82,10 +82,28 @@ show(MARK *m) } } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: lrtest [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int -main( - int argc GCC_UNUSED, - char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { static MARK marks[] = { @@ -97,6 +115,20 @@ main( {1, 0, 1, 1, 1, '*' | A_REVERSE}, {2, 0, 1, 1, 1, '*' | A_REVERSE} }; + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); setlocale(LC_ALL, ""); @@ -132,7 +164,7 @@ main( } for (;;) { - int ch; + int c2; unsigned n; box(stdscr, 0, 0); @@ -140,21 +172,21 @@ main( show(&marks[n]); } - if ((ch = getch()) > 0) { - if (ch == 'q') + if ((c2 = getch()) > 0) { + if (c2 == 'q') break; - else if (ch == 's') + else if (c2 == 's') nodelay(stdscr, FALSE); - else if (ch == ' ') + else if (c2 == ' ') nodelay(stdscr, TRUE); #ifdef TRACE - else if (ch == 'T') + else if (c2 == 'T') curses_trace(0); - else if (ch == 't') + else if (c2 == 't') curses_trace(TRACE_CALLS | TRACE_ICALLS | TRACE_UPDATE); #endif #ifdef KEY_RESIZE - else if (ch == KEY_RESIZE) { + else if (c2 == KEY_RESIZE) { for (n = 0; n < SIZEOF(marks); n++) { if (marks[n].mode == 0) { /* moving along x-direction */ if (marks[n].y) diff --git a/test/make-tar.sh b/test/make-tar.sh index c088d07ea1bf..df4b66aadab6 100755 --- a/test/make-tar.sh +++ b/test/make-tar.sh @@ -1,7 +1,7 @@ #!/bin/sh -# $Id: make-tar.sh,v 1.16 2020/02/02 23:34:34 tom Exp $ +# $Id: make-tar.sh,v 1.21 2022/11/05 19:41:33 tom Exp $ ############################################################################## -# Copyright 2019,2020 Thomas E. Dickey # +# Copyright 2019-2021,2022 Thomas E. Dickey # # Copyright 2010-2015,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -37,14 +37,20 @@ export CDPATH TARGET=`pwd` -: ${PKG_NAME:=ncurses-examples} -: ${ROOTNAME:=ncurses-test} -: ${DESTDIR:=$TARGET} -: ${TMPDIR:=/tmp} +: "${PKG_NAME:=ncurses-examples}" +: "${ROOTNAME:=ncurses-test}" +: "${DESTDIR:=$TARGET}" +: "${TMPDIR:=/tmp}" + +# make timestamps of generated files predictable +same_timestamp() { + [ -f ../NEWS ] || echo "OOPS $1" + touch -r ../NEWS "$1" +} grep_assign() { - grep_assign=`egrep "^$2\>" "$1" | sed -e "s/^$2[ ]*=[ ]*//" -e 's/"//g'` - eval $2=\"$grep_assign\" + grep_assign=`grep -E "^$2\>" "$1" | sed -e "s/^$2[ ]*=[ ]*//" -e 's/"//g'` + eval "$2"=\""$grep_assign"\" } grep_patchdate() { @@ -59,29 +65,35 @@ edit_specfile() { sed \ -e "s/\\<MAJOR\\>/$NCURSES_MAJOR/g" \ -e "s/\\<MINOR\\>/$NCURSES_MINOR/g" \ - -e "s/\\<YYYYMMDD\\>/$NCURSES_PATCH/g" $1 >$1.new - chmod u+w $1 - mv $1.new $1 + -e "s/\\<YYYYMMDD\\>/$NCURSES_PATCH/g" "$1" >"$1.new" + chmod u+w "$1" + mv "$1.new" "$1" + same_timestamp "$1" } make_changelog() { - test -f $1 && chmod u+w $1 - cat >$1 <<EOF -`echo $PKG_NAME|tr '[A-Z]' '[a-z]'` ($NCURSES_MAJOR.$NCURSES_MINOR+$NCURSES_PATCH) unstable; urgency=low + [ -f "$1" ] && chmod u+w "$1" + cat >"$1" <<EOF +`echo $PKG_NAME|tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ($NCURSES_MAJOR.$NCURSES_MINOR+$NCURSES_PATCH) unstable; urgency=low * snapshot of ncurses subpackage for $PKG_NAME. - -- `head -n 1 $HOME/.signature` `date -R` + -- `head -n 1 "$HOME"/.signature` `date -R` EOF + same_timestamp "$1" } # This can be run from either the subdirectory, or from the top-level # source directory. We will put the tar file in the original directory. -test -d ./test && cd ./test +if [ -d ./test ] +then + cd ./test || exit +fi SOURCE=`cd ..;pwd` BUILD=$TMPDIR/make-tar$$ -trap "cd /; rm -rf $BUILD; exit 0" EXIT INT QUIT TERM HUP +trap "cd /; rm -rf $BUILD; exit 1" 1 2 3 15 +trap "cd /; rm -rf $BUILD; exit 0" 0 umask 077 if ! ( mkdir $BUILD ) @@ -92,36 +104,37 @@ fi umask 022 mkdir $BUILD/$ROOTNAME -cp -p -r * $BUILD/$ROOTNAME/ || exit +cp -p -r ./* $BUILD/$ROOTNAME/ || exit # Add the config.* utility scripts from the top-level directory. for i in . .. do - for j in config.guess config.sub install-sh tar-copy.sh + for j in COPYING config.guess config.sub install-sh tar-copy.sh do - test -f $i/$j && cp -p $i/$j $BUILD/$ROOTNAME/ + [ -f $i/$j ] && cp -p $i/$j $BUILD/$ROOTNAME/ done done # Make rpm and dpkg scripts for test-builds grep_patchdate -for spec in $BUILD/$ROOTNAME/package/*.spec +for spec in "$BUILD/$ROOTNAME"/package/*.spec do - edit_specfile $spec + edit_specfile "$spec" done -for spec in $BUILD/$ROOTNAME/package/debian* +for spec in "$BUILD/$ROOTNAME"/package/debian* do - make_changelog $spec/changelog + make_changelog "$spec"/changelog done -cp -p $SOURCE/NEWS $BUILD/$ROOTNAME +cp -p "$SOURCE/NEWS" "$BUILD/$ROOTNAME" # cleanup empty directories (an artifact of ncurses source archives) -touch $BUILD/$ROOTNAME/MANIFEST -( cd $BUILD/$ROOTNAME && find . -type f -print |$SOURCE/misc/csort >MANIFEST ) +touch $BUILD/$ROOTNAME/MANIFEST +( cd $BUILD/$ROOTNAME && find . -type f -print | "$SOURCE/misc/csort" >MANIFEST ) +same_timestamp $BUILD/$ROOTNAME/MANIFEST -cd $BUILD || exit +cd $BUILD || exit # Remove build-artifacts. find . -name RCS -exec rm -rf {} \; @@ -138,8 +151,11 @@ find . -name "*.gz" -exec rm -rf {} \; # Make the files writable... chmod -R u+w . -tar cf - $ROOTNAME | gzip >$DESTDIR/$ROOTNAME.tar.gz -cd $DESTDIR +# Cleanup timestamps +[ -n "$TOUCH_DIRS" ] && "$TOUCH_DIRS" "$ROOTNAME" + +tar cf - $TAR_OPTIONS $ROOTNAME | gzip >"$DESTDIR/$ROOTNAME.tar.gz" +cd "$DESTDIR" || exit pwd ls -l $ROOTNAME.tar.gz diff --git a/test/mk-test.awk b/test/mk-test.awk index ac4203aaac56..a194a5d4ee7f 100644 --- a/test/mk-test.awk +++ b/test/mk-test.awk @@ -1,6 +1,6 @@ -# $Id: mk-test.awk,v 1.23 2020/02/02 23:34:34 tom Exp $ +# $Id: mk-test.awk,v 1.30 2021/12/19 16:54:36 tom Exp $ ############################################################################## -# Copyright 2019,2020 Thomas E. Dickey # +# Copyright 2019-2020,2021 Thomas E. Dickey # # Copyright 2006-2017,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -77,11 +77,11 @@ END { print " $(srcdir)/*.x* \\" print " $(srcdir)/*.dat" print "" - print "all: $(TESTS)" + print "all:: $(TESTS)" print "" print "sources:" print "" - print "check:" + print "check::" print " @ echo The test-programs are interactive" print "tags:" print " $(CTAGS) *.[ch]" @@ -93,19 +93,38 @@ END { print "" if (INSTALL == "yes") { print "# we might install the test-programs" + print "$(PACKAGE) :" + print " @echo \"creating $(PACKAGE) script\"" + print " @$(SHELL) -c '\\" + print " L=$(real_bindir); \\" + print " rm -f $@; \\" + print " echo \"#!$(SHELL)\" > $@;\\" + print " echo \"PATH=\\\"$$L\\\":\\$$PATH\" >>$@;\\" + print " echo \"export PATH\" >>$@;\\" + print " echo \"if test \\$$# != 0; then\" >>$@;\\" + print " echo \" exec \\\"\\$$@\\\"\" >>$@;\\" + print " echo \"elif test -t 1; then\" >>$@;\\" + print " echo \" cd \\\"$$L\\\" || exit\" >>$@;\\" + print " echo \" ls -l | \\$${PAGER:-less}\" >>$@;\\" + print " echo \"fi\" >>$@;\\" + print " echo \"echo \\\"usage: $@ [program]\\\"\" >>$@'" + print "" print "install \\" - print "install.test: $(BINDIR) $(DATADIR) $(TESTS)" + print "install.test: $(PACKAGE) $(BINDIR) $(REAL_BINDIR) $(DATADIR) $(TESTS)" + + print " @echo \"installing $(PACKAGE) -> $(BINDIR)/\"" + print " @$(INSTALL_SCRIPT) $(PACKAGE) $(BINDIR)" print " @$(SHELL) -c 'for src in $(TESTS); do \\" print " dst=`echo $$src | $(TRANSFORM)`; \\" - print " echo \"installing $$src -> $(BINDIR)/$$dst\"; \\" - print " $(INSTALL_PROG) $$src $(BINDIR)/$$dst; \\" + print " echo \"installing $$src -> $(REAL_BINDIR)/$$dst\"; \\" + print " $(INSTALL_PROG) $$src $(REAL_BINDIR)/$$dst; \\" print " done'" print " @$(SHELL) -c 'for src in $(SCRIPTS); do \\" print " dst=`echo $$src | sed -e 's,^.*/,,' | $(TRANSFORM)`; \\" - print " echo \"installing $$src -> $(BINDIR)/$$dst\"; \\" - print " $(INSTALL_SCRIPT) $$src $(BINDIR)/$$dst; \\" + print " echo \"installing $$src -> $(REAL_BINDIR)/$$dst\"; \\" + print " $(INSTALL_SCRIPT) $$src $(REAL_BINDIR)/$$dst; \\" print " done'" print " @$(SHELL) -c 'for src in $(DATAFILES); do \\" @@ -117,14 +136,16 @@ END { print "uninstall \\" print "uninstall.test:" + print " -rm -f $(BINDIR)/$(PACKAGE)" + print " @$(SHELL) -c 'for src in $(TESTS); do \\" print " dst=`echo $$src | $(TRANSFORM)`; \\" - print " rm -f $(BINDIR)/$$dst; \\" + print " rm -f $(REAL_BINDIR)/$$dst; \\" print " done'" print " @$(SHELL) -c 'for src in $(SCRIPTS); do \\" print " dst=`echo $$src | sed -e 's,^.*/,,' | $(TRANSFORM)`; \\" - print " rm -f $(BINDIR)/$$dst; \\" + print " rm -f $(REAL_BINDIR)/$$dst; \\" print " done'" print " @$(SHELL) -c 'for src in $(DATAFILES); do \\" @@ -144,6 +165,7 @@ END { print "clean :: mostlyclean" print " -$(SHELL) -c \"if test -n '$x' ; then $(MAKE) clean x=''; fi\"" print " -rm -rf *$o screendump *.lis $(TESTS) .libs *.dSYM" + print " -rm -f $(PACKAGE)" print "" print "distclean :: clean" print " -rm -f Makefile ncurses_cfg.h config.status config.log" @@ -152,7 +174,7 @@ END { print "" print "lint:" print " $(SHELL) -c 'for N in $(TESTS); do echo LINT:$$N; $(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/$$N.c $(LINT_LIBS); done'" - print "$(BINDIR) $(DATADIR) :" + print "$(BINDIR) $(REAL_BINDIR) $(DATADIR) :" print " mkdir -p $@" diff --git a/test/modules b/test/modules index de3d140abc6e..fb97d027e3d8 100644 --- a/test/modules +++ b/test/modules @@ -1,6 +1,6 @@ -# $Id: modules,v 1.74 2021/02/13 16:33:43 tom Exp $ +# $Id: modules,v 1.79 2023/11/10 11:48:20 tom Exp $ ############################################################################## -# Copyright 2018-2020,2021 Thomas E. Dickey # +# Copyright 2018-2022,2023 Thomas E. Dickey # # Copyright 1998-2016,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -42,6 +42,7 @@ chgat progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h clip_printw progs $(srcdir) $(HEADER_DEPS) $(srcdir)/popup_msg.h color_content progs $(srcdir) $(HEADER_DEPS) color_set progs $(srcdir) $(HEADER_DEPS) +combine progs $(srcdir) $(HEADER_DEPS) demo_altkeys progs $(srcdir) $(HEADER_DEPS) demo_defkey progs $(srcdir) $(HEADER_DEPS) demo_forms progs $(srcdir) $(HEADER_DEPS) $(srcdir)/edit_field.h @@ -100,15 +101,19 @@ test_addchstr progs $(srcdir) $(HEADER_DEPS) $(srcdir)/linedata.h test_addstr progs $(srcdir) $(HEADER_DEPS) $(srcdir)/linedata.h test_addwstr progs $(srcdir) $(HEADER_DEPS) $(srcdir)/linedata.h test_arrays progs $(srcdir) $(HEADER_DEPS) +test_delwin progs $(srcdir) $(HEADER_DEPS) +test_endwin progs $(srcdir) $(HEADER_DEPS) test_get_wstr progs $(srcdir) $(HEADER_DEPS) test_getstr progs $(srcdir) $(HEADER_DEPS) test_instr progs $(srcdir) $(HEADER_DEPS) test_inwstr progs $(srcdir) $(HEADER_DEPS) +test_mouse progs $(srcdir) $(HEADER_DEPS) test_opaque progs $(srcdir) $(HEADER_DEPS) test_setupterm progs $(srcdir) $(HEADER_DEPS) 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) diff --git a/test/move_field.c b/test/move_field.c index 8344c56f8c14..84bac3f4b565 100644 --- a/test/move_field.c +++ b/test/move_field.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2022,2023 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: move_field.c,v 1.7 2020/05/09 12:52:00 tom Exp $ + * $Id: move_field.c,v 1.15 2023/11/11 00:28:19 tom Exp $ * * Demonstrate move_field(). */ @@ -38,20 +38,11 @@ #include <edit_field.h> #include <popup_msg.h> -#ifdef HAVE_NETBSD_FORM_H -#define form_field_row(field) (field)->form_row -#define form_field_col(field) (field)->form_col -#else /* e.g., SVr4, ncurses */ -#define form_field_row(field) (field)->frow -#define form_field_col(field) (field)->fcol -#endif - #define DO_DEMO CTRL('F') /* actual key for toggling demo-mode */ #define MY_DEMO EDIT_FIELD('f') /* internal request-code */ static char empty[] = ""; static FIELD *all_fields[100]; - /* *INDENT-OFF* */ static struct { int code; @@ -125,7 +116,7 @@ make_label(const char *label, int frow, int fcol) if (f) { set_field_buffer(f, 0, label); - set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE)); + set_field_opts(f, (int) ((unsigned) field_opts(f) & (unsigned) ~O_ACTIVE)); } return (f); } @@ -152,7 +143,6 @@ erase_form(FORM *f) werase(w); wrefresh(w); delwin(s); - delwin(w); } static FieldAttrs * @@ -196,7 +186,6 @@ my_edit_field(FORM *form, int *result) int status; FIELD *before; unsigned n; - int length; int before_row; int before_col; int before_off = offset_in_field(form); @@ -222,8 +211,8 @@ my_edit_field(FORM *form, int *result) if (status == E_OK) { bool modified = TRUE; + int length = buffer_length(before); - length = buffer_length(before); if (length < before_off) length = before_off; switch (*result) { @@ -279,7 +268,7 @@ my_edit_field(FORM *form, int *result) static FIELD ** copy_fields(FIELD **source, size_t length) { - FIELD **target = calloc(length + 1, sizeof(FIELD *)); + FIELD **target = typeCalloc(FIELD *, length + 1); memcpy(target, source, length * sizeof(FIELD *)); return target; } @@ -311,15 +300,15 @@ do_demo(FORM *form) { int count = field_count(form); FIELD *my_field = current_field(form); + FIELD **old_fields = form_fields(form); - if (count > 0 && my_field != NULL) { + if (count > 0 && old_fields != NULL && my_field != NULL) { size_t needed = (size_t) count; - FIELD **old_fields = copy_fields(form_fields(form), needed); - FIELD **new_fields = copy_fields(form_fields(form), needed); - int ch; + FIELD **new_fields = copy_fields(old_fields, needed); - if (old_fields != NULL && new_fields != NULL) { + if (new_fields != NULL) { bool found = FALSE; + int ch; /* TODO: move the label too, in parallel with the editing field */ @@ -338,7 +327,6 @@ do_demo(FORM *form) getyx(stdscr, currow, curcol); show_status(form, my_field); - ch = '?'; while ((ch = wgetch(form_win(form))) != DO_DEMO) { int field_y = form_field_row(my_field); int field_x = form_field_col(my_field); @@ -486,9 +474,44 @@ demo_forms(void) nl(); } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: move_field [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int -main(void) +main(int argc, char *argv[]) { + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); + setlocale(LC_ALL, ""); initscr(); diff --git a/test/movewindow.c b/test/movewindow.c index 0c94572d2c63..07797ca67b9e 100644 --- a/test/movewindow.c +++ b/test/movewindow.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2022,2023 Thomas E. Dickey * * Copyright 2006-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: movewindow.c,v 1.51 2020/02/02 23:34:34 tom Exp $ + * $Id: movewindow.c,v 1.54 2023/05/27 20:13:10 tom Exp $ * * Demonstrate move functions for windows and derived windows from the curses * library. @@ -55,14 +55,6 @@ TODO: #undef derwin #endif -#if defined(NCURSES_CONST) -#define CONST_FMT NCURSES_CONST -#elif defined(PDCURSES) -#define CONST_FMT const -#else -#define CONST_FMT /* nothing */ -#endif - #undef LINE_MAX #define LINE_MIN 2 @@ -332,6 +324,7 @@ add_window(WINDOW *parent, WINDOW *child) all_windows = typeRealloc(FRAME, need, all_windows); if (!all_windows) failed("add_window"); + have = need; } all_windows[num_windows].parent = parent; all_windows[num_windows].child = child; @@ -339,7 +332,7 @@ add_window(WINDOW *parent, WINDOW *child) } static int -window2num(WINDOW *win) +window2num(const WINDOW *const win) { int n; int result = -1; @@ -415,7 +408,7 @@ prev_window(WINDOW *win) } static void -recur_move_window(WINDOW *parent, int dy, int dx) +recur_move_window(const WINDOW *const parent, int dy, int dx) { unsigned n; @@ -679,13 +672,46 @@ show_help(WINDOW *current) free(msgs); } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: movewindow [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { WINDOW *current_win; int ch; bool done = FALSE; + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); + initscr(); cbreak(); noecho(); diff --git a/test/ncurses.c b/test/ncurses.c index f50530ab6372..a272d1423eee 100644 --- a/test/ncurses.c +++ b/test/ncurses.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2022,2023 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -41,24 +41,24 @@ AUTHOR Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993 Thomas E. Dickey (beginning revision 1.27 in 1996). -$Id: ncurses.c,v 1.523 2020/08/29 16:22:03 juergen Exp $ +$Id: ncurses.c,v 1.538 2023/11/11 01:23:59 tom Exp $ ***************************************************************************/ +#define NEED_TIME_H 1 #include <test.priv.h> #ifdef __hpux #undef mvwdelch /* HPUX 11.23 macro will not compile */ #endif -#if HAVE_GETTIMEOFDAY #if HAVE_SYS_TIME_H && HAVE_SYS_TIME_SELECT #include <sys/time.h> #endif + #if HAVE_SYS_SELECT_H #include <sys/select.h> #endif -#endif #if USE_LIBPANEL #include <panel.h> @@ -166,7 +166,7 @@ static RGB_DATA *all_colors; #endif static void main_menu(bool); -static void failed(const char *s) GCC_NORETURN; +static GCC_NORETURN void failed(const char *s); static void failed(const char *s) @@ -770,7 +770,7 @@ slk_repaint(void) * Resize both and paint the box in the parent. */ static void -resize_boxes(unsigned level, WINDOW *win) +resize_boxes(unsigned level, const WINDOW *const win) { unsigned n; int base = 5; @@ -855,7 +855,7 @@ wgetch_test(unsigned level, WINDOW *win, int delay) setup_getch(win, flags); wgetch_help(win, flags); } else if (c == 'g') { - waddstr(win, "getstr test: "); + waddstr(win, "wgetnstr test: "); echo(); c = wgetnstr(win, buf, sizeof(buf) - 1); noecho(); @@ -1012,7 +1012,7 @@ getch_test(bool recur GCC_UNUSED) */ #if defined(KEY_RESIZE) && HAVE_WRESIZE static void -resize_wide_boxes(unsigned level, WINDOW *win) +resize_wide_boxes(unsigned level, const WINDOW *const win) { unsigned n; int base = 5; @@ -1113,7 +1113,7 @@ wget_wch_test(unsigned level, WINDOW *win, int delay) setup_getch(win, flags); wgetch_help(win, flags); } else if (c == 'g') { - waddstr(win, "getstr test: "); + waddstr(win, "wgetn_str test: "); echo(); code = wgetn_wstr(win, wint_buf, BUFSIZ - 1); noecho(); @@ -2885,6 +2885,10 @@ init_all_colors(bool xterm_colors, char *palette_file) while (fgets(buffer, sizeof(buffer), fp) != 0) { if (sscanf(buffer, "scale:%d", &c) == 1) { scale = c; + if (scale < 100) + scale = 100; + if (scale > 1000) + scale = 1000; } else if (sscanf(buffer, "%d:%d %d %d", &c, &red, @@ -3153,7 +3157,7 @@ color_edit(bool recur GCC_UNUSED) * ****************************************************************************/ static bool -cycle_attr(int ch, unsigned *at_code, chtype *attr, ATTR_TBL * list, unsigned limit) +cycle_attr(int ch, unsigned *at_code, attr_t *attr, ATTR_TBL * list, unsigned limit) { bool result = TRUE; @@ -3314,7 +3318,7 @@ slk_test(bool recur GCC_UNUSED) int c, fmt = 1; char buf[9]; char *s; - chtype attr = A_NORMAL; + attr_t attr = A_NORMAL; unsigned at_code = 0; #if HAVE_SLK_COLOR int fg = COLOR_BLACK; @@ -3404,7 +3408,7 @@ slk_test(bool recur GCC_UNUSED) default: if (cycle_attr(c, &at_code, &attr, my_list, my_size)) { - slk_attrset(attr); + slk_attrset((chtype) attr); slk_touch(); slk_noutrefresh(); break; @@ -3820,7 +3824,7 @@ acs_test(bool recur GCC_UNUSED) const char *pch_kludge = ((term != 0 && strstr(term, "linux")) ? "p=PC, " : ""); - chtype attr = A_NORMAL; + attr_t attr = A_NORMAL; int digit = 0; int repeat = 1; int fg = COLOR_BLACK; @@ -4413,7 +4417,7 @@ x_acs_test(bool recur GCC_UNUSED) if (pending_code) { _nc_SPRINTF(at_page, _nc_SLIMIT(sizeof(at_page)) "%02x", digit); } else if (at_page[0] != '\0') { - _nc_SPRINTF(at_page, _nc_SLIMIT(sizeof(at_page)) "%x", digit); + sscanf(at_page, "%x", &digit); } break; default: @@ -5531,7 +5535,7 @@ panner_legend(int line) "Number repeats. Toggle legend:? filler:a timer:t scrollmark:s." }; int n = ((int) SIZEOF(legend) - (LINES - line)); - if (n >= 0) { + if (n >= 0 && n < (int) SIZEOF(legend)) { if (move(line, 0) != ERR) { if (show_panner_legend) printw("%s", legend[n]); @@ -5596,10 +5600,8 @@ panner(WINDOW *pad, int (*pgetc) (WINDOW *), bool colored) { -#if HAVE_GETTIMEOFDAY - struct timeval before, after; + TimeType before, after; bool timing = TRUE; -#endif bool pan_lines = FALSE; bool scrollers = TRUE; int basex = 0; @@ -5645,13 +5647,11 @@ panner(WINDOW *pad, pending_pan = FALSE; break; -#if HAVE_GETTIMEOFDAY case 't': timing = !timing; if (!timing) panner_legend(LINES - 1); break; -#endif case 's': scrollers = !scrollers; break; @@ -5824,9 +5824,7 @@ panner(WINDOW *pad, MvAddCh(porty - 1, portx - 1, ACS_LRCORNER); if (!pending_pan) { -#if HAVE_GETTIMEOFDAY - gettimeofday(&before, 0); -#endif + GetClockTime(&before); wnoutrefresh(stdscr); pnoutrefresh(pad, @@ -5836,17 +5834,12 @@ panner(WINDOW *pad, portx - (pymax > porty) - 1); doupdate(); -#if HAVE_GETTIMEOFDAY -#define TIMEVAL2S(data) ((double) data.tv_sec + ((double) data.tv_usec / 1.0e6)) if (timing) { - double elapsed; - gettimeofday(&after, 0); - elapsed = (TIMEVAL2S(after) - TIMEVAL2S(before)); + GetClockTime(&after); move(LINES - 1, COLS - 12); - printw("Secs: %2.03f", elapsed); + printw("Secs: %6.03f", ElapsedSeconds(&before, &after)); refresh(); } -#endif } } while @@ -6168,7 +6161,6 @@ menu_test(bool recur GCC_UNUSED) break; if (c == E_REQUEST_DENIED) beep(); - continue; } MvPrintw(LINES - 2, 0, @@ -6232,7 +6224,7 @@ tracetrace(unsigned tlevel) } _nc_SPRINTF(buf, _nc_SLIMIT(need) "0x%02x = {", tlevel); if (tlevel == 0) { - _nc_STRCAT(buf, t_tbl[0].name, need); + _nc_STRCAT(buf, t_tbl[0].name ? t_tbl[0].name : "", need); _nc_STRCAT(buf, ", ", need); } else { for (n = 1; t_tbl[n].name != 0; n++) @@ -6336,8 +6328,9 @@ trace_set(bool recur GCC_UNUSED) set_item_value(*ip, TRUE); } - while (run_trace_menu(m)) - continue; + while (run_trace_menu(m)) { + /* EMPTY */ ; + } newtrace = 0; for (ip = menu_items(m); *ip; ip++) @@ -6376,7 +6369,7 @@ make_label(int frow, int fcol, NCURSES_CONST char *label) if (f) { set_field_buffer(f, 0, label); - set_field_opts(f, (int) ((unsigned) field_opts(f) & ~O_ACTIVE)); + set_field_opts(f, (int) ((unsigned) field_opts(f) & (unsigned) ~O_ACTIVE)); } return (f); } @@ -7236,11 +7229,11 @@ overlap_test(bool recur GCC_UNUSED) overlap_test_0(win2, win1); break; - case 'c': /* fill window A so it's visible */ + case 'c': /* fill window A so it is visible */ overlap_test_1(flavor[otBASE_fill], 0, win1, 'A'); break; - case 'd': /* fill window B so it's visible */ + case 'd': /* fill window B so it is visible */ overlap_test_1(flavor[otBASE_fill], 1, win2, 'B'); break; @@ -7436,11 +7429,11 @@ x_overlap_test(bool recur GCC_UNUSED) overlap_test_0(win2, win1); break; - case 'c': /* fill window A so it's visible */ + case 'c': /* fill window A so it is visible */ x_overlap_test_1(flavor[otBASE_fill], 0, win1, WIDE_A); break; - case 'd': /* fill window B so it's visible */ + case 'd': /* fill window B so it is visible */ x_overlap_test_1(flavor[otBASE_fill], 1, win2, WIDE_B); break; @@ -7618,8 +7611,10 @@ settings_test(bool recur GCC_UNUSED) #if HAVE_COLOR_CONTENT show_boolean_setting("can_change_color", can_change_color()); #endif - show_setting_name("LINES"); printw("%d\n", LINES); - show_setting_name("COLS"); printw("%d\n", COLS); + show_setting_name("LINES"); + printw("%d\n", LINES); + show_setting_name("COLS"); + printw("%d\n", COLS); Pause(); erase(); stop_curses(); @@ -7633,48 +7628,49 @@ settings_test(bool recur GCC_UNUSED) ****************************************************************************/ static void -usage(void) +usage(int ok) { static const char *const tbl[] = { "Usage: ncurses [options]" ,"" + ,USAGE_COMMON ,"Options:" #ifdef NCURSES_VERSION - ," -a f,b set default-colors (assumed white-on-black)" - ," -d use default-colors if terminal supports them" + ," -a f,b set default-colors (assumed white-on-black)" + ," -d use default-colors if terminal supports them" #endif #if HAVE_USE_ENV - ," -E call use_env(FALSE) to ignore $LINES and $COLUMNS" + ," -E call use_env(FALSE) to ignore $LINES and $COLUMNS" #endif #if USE_SOFTKEYS - ," -e fmt specify format for soft-keys test (e)" + ," -e fmt specify format for soft-keys test (e)" #endif #if HAVE_RIPOFFLINE - ," -f rip-off footer line (can repeat)" - ," -h rip-off header line (can repeat)" + ," -F rip-off footer line (can repeat)" + ," -H rip-off header line (can repeat)" #endif - ," -m do not use colors" + ," -m do not use colors" #if HAVE_COLOR_CONTENT - ," -p file rgb values to use in 'd' rather than ncurses's builtin" + ," -p file rgb values to use in 'd' rather than ncurses's builtin" #endif #if USE_LIBPANEL - ," -s msec specify nominal time for panel-demo (default: 1, to hold)" + ," -s msec specify nominal time for panel-demo (default: 1, to hold)" #endif #if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20120714) && !defined(_NC_WINDOWS) - ," -T call use_tioctl(TRUE) to allow SIGWINCH to override environment" + ," -T call use_tioctl(TRUE) to allow SIGWINCH to override environment" #endif #ifdef TRACE - ," -t mask specify default trace-level (may toggle with ^T)" + ," -t mask specify default trace-level (may toggle with ^T)" #endif #if HAVE_COLOR_CONTENT - ," -x use xterm-compatible control for reading color palette" + ," -x use xterm-compatible control for reading color palette" #endif }; size_t n; for (n = 0; n < SIZEOF(tbl); n++) fprintf(stderr, "%s\n", tbl[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } static void @@ -7787,7 +7783,7 @@ main_menu(bool top) int (*doit) (bool); char command; - unsigned n; + unsigned n; do { printf("This is the ncurses main menu (uppercase for wide-characters)\n"); for (n = 0; n < SIZEOF(cmds); ++n) { @@ -7853,7 +7849,7 @@ main_menu(bool top) if (doit != NULL && doit(FALSE) == OK) { /* - * This may be overkill; it's intended to reset everything back + * This may be overkill; it is intended to reset everything back * to the initial terminal modes so that tests don't get in * each other's way. */ @@ -7881,11 +7877,14 @@ main_menu(bool top) /*+------------------------------------------------------------------------- main(argc,argv) --------------------------------------------------------------------------*/ +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { - int c; + int ch; int my_e_param = 1; #ifdef NCURSES_VERSION_PATCH #if HAVE_USE_DEFAULT_COLORS @@ -7905,8 +7904,8 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((c = getopt(argc, argv, "a:dEe:fhmp:s:Tt:x")) != -1) { - switch (c) { + while ((ch = getopt(argc, argv, OPTS_COMMON "a:dEe:FHmp:s:Tt:x")) != -1) { + switch (ch) { #ifdef NCURSES_VERSION_PATCH #if HAVE_USE_DEFAULT_COLORS #if HAVE_ASSUME_DEFAULT_COLORS @@ -7936,17 +7935,17 @@ main(int argc, char *argv[]) my_e_param = atoi(optarg); #ifdef NCURSES_VERSION if (my_e_param > 3) /* allow extended layouts */ - usage(); + usage(FALSE); #else if (my_e_param > 1) - usage(); + usage(FALSE); #endif break; #if HAVE_RIPOFFLINE - case 'f': + case 'F': ripoffline(-1, rip_footer); break; - case 'h': + case 'H': ripoffline(1, rip_header); break; #endif /* HAVE_RIPOFFLINE */ @@ -7978,8 +7977,12 @@ main(int argc, char *argv[]) xterm_colors = TRUE; break; #endif + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } diff --git a/test/newdemo.c b/test/newdemo.c index d76523ab6ffd..78761534d7c5 100644 --- a/test/newdemo.c +++ b/test/newdemo.c @@ -2,7 +2,7 @@ * newdemo.c - A demo program using PDCurses. The program illustrate * the use of colours for text output. * - * $Id: newdemo.c,v 1.47 2019/12/14 23:25:29 tom Exp $ + * $Id: newdemo.c,v 1.48 2022/12/10 23:36:05 tom Exp $ */ #include <test.priv.h> @@ -215,17 +215,51 @@ BouncingBalls(WINDOW *win) return 0; } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: newdemo [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + /* * Main driver */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { WINDOW *win; int x, y, i, k; char buffer[SIZEOF(messages) * 80]; int width, height; chtype save[80]; + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); setlocale(LC_ALL, ""); diff --git a/test/package/debian-mingw/compat b/test/package/debian-mingw/compat index f599e28b8ab0..48082f72f087 100644 --- a/test/package/debian-mingw/compat +++ b/test/package/debian-mingw/compat @@ -1 +1 @@ -10 +12 diff --git a/test/package/debian-mingw/control b/test/package/debian-mingw/control index 64bd01b1832d..116103d2018f 100644 --- a/test/package/debian-mingw/control +++ b/test/package/debian-mingw/control @@ -2,7 +2,7 @@ Source: ncurses-examples Maintainer: Thomas E. Dickey <dickey@invisible-island.net> Section: misc Priority: optional -Standards-Version: 3.8.4 +Standards-Version: 4.6.1.0 Build-Depends: debhelper (>= 5) Homepage: https://invisible-island.net/ncurses/ncurses-examples.html diff --git a/test/package/debian-mingw/copyright b/test/package/debian-mingw/copyright index a805a1f67dd2..7546e1cc1f71 100644 --- a/test/package/debian-mingw/copyright +++ b/test/package/debian-mingw/copyright @@ -4,13 +4,13 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net> ------------------------------------------------------------------------------- Files: * -Copyright: 2017-2020,2021 Thomas E. Dickey +Copyright: 2017-2023,2024 Thomas E. Dickey Copyright: 1998-2016,2017 Free Software Foundation, Inc. -Licence: X11 +License: X11 Files: aclocal.m4 package -Copyright: 2003-2020,2021 by Thomas E. Dickey -Licence: X11 +Copyright: 2003-2023,2024 by Thomas E. Dickey +License: X11 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -39,7 +39,7 @@ Licence: X11 ------------------------------------------------------------------------------- Files: install-sh Copyright: 1994 X Consortium -Licence: X11 +License: X11 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to diff --git a/test/package/debian-mingw/rules b/test/package/debian-mingw/rules index e61cf71a3fa3..152cd3c77f95 100755 --- a/test/package/debian-mingw/rules +++ b/test/package/debian-mingw/rules @@ -70,7 +70,7 @@ install: install-stamp install-stamp: build-stamp dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs $(MAKE) install DESTDIR=$(MINGW_TMP) diff --git a/test/package/debian-mingw64/compat b/test/package/debian-mingw64/compat index f599e28b8ab0..48082f72f087 100644 --- a/test/package/debian-mingw64/compat +++ b/test/package/debian-mingw64/compat @@ -1 +1 @@ -10 +12 diff --git a/test/package/debian-mingw64/control b/test/package/debian-mingw64/control index c22f262a8bf9..df942b7553e4 100644 --- a/test/package/debian-mingw64/control +++ b/test/package/debian-mingw64/control @@ -2,7 +2,7 @@ Source: ncurses-examples Maintainer: Thomas E. Dickey <dickey@invisible-island.net> Section: misc Priority: optional -Standards-Version: 3.8.4 +Standards-Version: 4.6.1.0 Build-Depends: debhelper (>= 5) Homepage: https://invisible-island.net/ncurses/ncurses-examples.html diff --git a/test/package/debian-mingw64/copyright b/test/package/debian-mingw64/copyright index a805a1f67dd2..7546e1cc1f71 100644 --- a/test/package/debian-mingw64/copyright +++ b/test/package/debian-mingw64/copyright @@ -4,13 +4,13 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net> ------------------------------------------------------------------------------- Files: * -Copyright: 2017-2020,2021 Thomas E. Dickey +Copyright: 2017-2023,2024 Thomas E. Dickey Copyright: 1998-2016,2017 Free Software Foundation, Inc. -Licence: X11 +License: X11 Files: aclocal.m4 package -Copyright: 2003-2020,2021 by Thomas E. Dickey -Licence: X11 +Copyright: 2003-2023,2024 by Thomas E. Dickey +License: X11 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -39,7 +39,7 @@ Licence: X11 ------------------------------------------------------------------------------- Files: install-sh Copyright: 1994 X Consortium -Licence: X11 +License: X11 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to diff --git a/test/package/debian-mingw64/rules b/test/package/debian-mingw64/rules index 7db9c5acef1a..02175a66ee5b 100755 --- a/test/package/debian-mingw64/rules +++ b/test/package/debian-mingw64/rules @@ -70,7 +70,7 @@ install: install-stamp install-stamp: build-stamp dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs $(MAKE) install DESTDIR=$(MINGW_TMP) diff --git a/test/package/debian/compat b/test/package/debian/compat index f599e28b8ab0..48082f72f087 100644 --- a/test/package/debian/compat +++ b/test/package/debian/compat @@ -1 +1 @@ -10 +12 diff --git a/test/package/debian/control b/test/package/debian/control index d7647b3fdb8b..89de1b8c5cab 100644 --- a/test/package/debian/control +++ b/test/package/debian/control @@ -2,7 +2,7 @@ Source: ncurses-examples Maintainer: Thomas E. Dickey <dickey@invisible-island.net> Section: misc Priority: optional -Standards-Version: 3.8.4 +Standards-Version: 4.6.1.0 Build-Depends: debhelper (>= 5) Homepage: https://invisible-island.net/ncurses/ncurses-examples.html diff --git a/test/package/debian/copyright b/test/package/debian/copyright index c6873e2c5833..7546e1cc1f71 100644 --- a/test/package/debian/copyright +++ b/test/package/debian/copyright @@ -4,13 +4,13 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net> ------------------------------------------------------------------------------- Files: * -Copyright: 2017-2020,2021 Thomas E. Dickey +Copyright: 2017-2023,2024 Thomas E. Dickey Copyright: 1998-2016,2017 Free Software Foundation, Inc. -Licence: X11 +License: X11 Files: aclocal.m4 package -Copyright: 2003-2019,2020 by Thomas E. Dickey -Licence: X11 +Copyright: 2003-2023,2024 by Thomas E. Dickey +License: X11 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -39,7 +39,7 @@ Licence: X11 ------------------------------------------------------------------------------- Files: install-sh Copyright: 1994 X Consortium -Licence: X11 +License: X11 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to diff --git a/test/package/debian/rules b/test/package/debian/rules index 4e6d570ecc88..2cc34f7305ef 100755 --- a/test/package/debian/rules +++ b/test/package/debian/rules @@ -74,8 +74,7 @@ config-$(NCURSES_PKG)-stamp: mkdir -p t/ncurses6 cd t/ncurses6; $(configure) \ - --bindir=\$${prefix}/bin/$(NCURSES_PKG) \ - --datadir=\$${prefix}/share/$(NCURSES_PKG) \ + --datadir=\$${datarootdir}/$(NCURSES_PKG) \ --with-screen=ncursesw6 touch $@ @@ -87,8 +86,7 @@ config-$(NCURSEST_PKG)-stamp: mkdir -p t/ncursest6 cd t/ncursest6; $(configure) \ - --bindir=\$${prefix}/bin/$(NCURSEST_PKG) \ - --datadir=\$${prefix}/share/$(NCURSEST_PKG) \ + --datadir=\$${datarootdir}/$(NCURSEST_PKG) \ --with-screen=ncursestw6 touch $@ @@ -113,7 +111,9 @@ install-$(NCURSES_PKG)-stamp: build-$(NCURSES_PKG)-stamp dh_installdirs $(verbose) dh_prep $(verbose) -p$(NCURSES_PKG) - $(MAKE) -C t/ncurses6 install DESTDIR=$(CURDIR)/debian/$(NCURSES_PKG) + $(MAKE) -C t/ncurses6 install \ + PACKAGE=$(NCURSES_PKG) \ + DESTDIR=$(CURDIR)/debian/$(NCURSES_PKG) touch $@ @@ -123,7 +123,9 @@ install-$(NCURSEST_PKG)-stamp: build-$(NCURSEST_PKG)-stamp dh_installdirs $(verbose) dh_prep $(verbose) -p$(NCURSEST_PKG) - $(MAKE) -C t/ncursest6 install DESTDIR=$(CURDIR)/debian/$(NCURSEST_PKG) + $(MAKE) -C t/ncursest6 install \ + PACKAGE=$(NCURSEST_PKG) \ + DESTDIR=$(CURDIR)/debian/$(NCURSEST_PKG) touch $@ @@ -151,6 +153,7 @@ ifneq ($(PACKAGES.arch),) rm -f $(PACKAGES.arch:%=install-%-stamp) dh_testdir dh_testroot + dh_installdocs $(verbose) $(PACKAGES.arch:%=-p%) dh_installchangelogs $(verbose) $(PACKAGES.arch:%=-p%) NEWS dh_strip $(verbose) $(PACKAGES.arch:%=-p%) dh_compress $(verbose) $(PACKAGES.arch:%=-p%) diff --git a/test/package/mingw-ncurses-examples.spec b/test/package/mingw-ncurses-examples.spec index 5758c29097a5..bfadd10e850b 100644 --- a/test/package/mingw-ncurses-examples.spec +++ b/test/package/mingw-ncurses-examples.spec @@ -4,14 +4,14 @@ Summary: ncurses-examples - example/test programs from ncurses %global AppProgram ncurses-examples %global AppVersion MAJOR.MINOR %global AppRelease YYYYMMDD -# $Id: mingw-ncurses-examples.spec,v 1.9 2019/11/23 21:13:52 tom Exp $ +# $Id: mingw-ncurses-examples.spec,v 1.11 2023/02/25 23:10:34 tom Exp $ Name: mingw32-ncurses6-examples Version: %{AppVersion} Release: %{AppRelease} License: X11 Group: Development/Libraries -Source: ncurses-examples-%{release}.tgz -# URL: https://invisible-island.net/ncurses/ +URL: https://invisible-island.net/ncurses/%{AppProgram}.html +Source: https://invisible-island.net/archives/%{AppProgram}/%{AppProgram}-%{release}.tgz BuildRequires: mingw32-ncurses6 @@ -50,11 +50,14 @@ This package is used for testing ABI 6 with cross-compiles to MinGW. %prep # override location of bindir, e.g., to avoid conflict with pdcurses -%global mingw32_bindir %{mingw32_exec_prefix}/bin/%{AppProgram} -%global mingw64_bindir %{mingw64_exec_prefix}/bin/%{AppProgram} +%global mingw32_bindir %{mingw32_exec_prefix}/bin/%{AppProgram} +%global mingw64_bindir %{mingw64_exec_prefix}/bin/%{AppProgram} -%global mingw32_datadir %{mingw32_datadir}/%{AppProgram} -%global mingw64_datadir %{mingw64_datadir}/%{AppProgram} +%global mingw32_datadir %{mingw32_datadir}/%{AppProgram} +%global mingw64_datadir %{mingw64_datadir}/%{AppProgram} + +%global mingw32_libexec %{mingw32_libexecdir}/%{AppProgram} +%global mingw64_libexec %{mingw64_libexecdir}/%{AppProgram} %define CFG_OPTS \\\ --enable-echo \\\ @@ -96,26 +99,24 @@ pushd BUILD-W64 %{mingw64_make} install DESTDIR=$RPM_BUILD_ROOT popd -%clean -if rm -rf $RPM_BUILD_ROOT; then - echo OK -else - find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1 -fi -exit 0 - -%defattr(-,root,root,-) - %files -n mingw32-ncurses6-examples +%defattr(-,root,root,-) %{mingw32_bindir}/* %{mingw32_datadir}/* +%{mingw32_libexec}/* %files -n mingw64-ncurses6-examples +%defattr(-,root,root,-) %{mingw64_bindir}/* %{mingw64_datadir}/* +%{mingw64_libexec}/* %changelog +* Sat Feb 25 2023 Thomas Dickey +- use libexecdir for programs rather than subdir of bindir +- amend URLs per rpmlint + * Sat Nov 16 2019 Thomas Dickey - modify clean-rule to work around Fedora NFS bugs. diff --git a/test/package/ncurses-examples.spec b/test/package/ncurses-examples.spec index d2b5a84e7e8b..8f1a3cbe52d1 100644 --- a/test/package/ncurses-examples.spec +++ b/test/package/ncurses-examples.spec @@ -3,15 +3,14 @@ Summary: example/test programs from ncurses %global AltProgram ncursest-examples %global AppVersion MAJOR.MINOR %global AppRelease YYYYMMDD -# $Id: ncurses-examples.spec,v 1.16 2019/11/23 21:11:34 tom Exp $ +# $Id: ncurses-examples.spec,v 1.22 2023/02/25 23:10:49 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppRelease} License: MIT Group: Applications/Development -URL: ftp://ftp.invisible-island.net/%{AppProgram} -Source0: %{AppProgram}-%{AppRelease}.tgz -Packager: Thomas Dickey <dickey@invisible-island.net> +URL: https://invisible-island.net/ncurses/%{AppProgram}.html +Source: https://invisible-island.net/archives/%{AppProgram}/%{AppProgram}-%{release}.tgz %description These are the example/test programs from the ncurses MAJOR.MINOR distribution, @@ -50,8 +49,7 @@ CONFIGURE_TOP=%{my_srcdir} \ %configure \ --target %{_target_platform} \ --prefix=%{_prefix} \ - --bindir=%{_bindir}/%{AppProgram} \ - --datadir=%{_datadir}/%{AppProgram} \ + --datadir=%{_datarootdir}/%{AppProgram} \ --with-screen=ncursesw6dev \ --disable-rpath-hack @@ -66,8 +64,7 @@ CONFIGURE_TOP=%{my_srcdir} \ %configure \ --target %{_target_platform} \ --prefix=%{_prefix} \ - --bindir=%{_bindir}/%{AltProgram} \ - --datadir=%{_datadir}/%{AltProgram} \ + --datadir=%{_datarootdir}/%{AltProgram} \ --with-screen=ncursestw6dev \ --disable-rpath-hack @@ -78,34 +75,34 @@ popd [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT pushd BUILD-%{AppProgram} -make install DESTDIR=$RPM_BUILD_ROOT +make install PACKAGE=%{AppProgram} DESTDIR=$RPM_BUILD_ROOT popd pushd BUILD-%{AltProgram} -make install DESTDIR=$RPM_BUILD_ROOT +make install PACKAGE=%{AltProgram} DESTDIR=$RPM_BUILD_ROOT popd -%clean -if rm -rf $RPM_BUILD_ROOT; then - echo OK -else - find $RPM_BUILD_ROOT -type f | grep -F -v /.nfs && exit 1 -fi -exit 0 - %files -n %{AppProgram} %defattr(-,root,root) -%{_bindir}/%{AppProgram}/* -%{_datadir}/%{AppProgram}/* +%{_bindir}/%{AppProgram} +%{_libexecdir}/%{AppProgram}/* +%{_datarootdir}/%{AppProgram}/* %files -n %{AltProgram} %defattr(-,root,root) -%{_bindir}/%{AltProgram}/* -%{_datadir}/%{AltProgram}/* +%{_bindir}/%{AltProgram} +%{_libexecdir}/%{AltProgram}/* +%{_datarootdir}/%{AltProgram}/* %changelog # each patch should add its ChangeLog entries here +* Sat Feb 25 2023 Thomas Dickey +- amend URLs per rpmlint + +* Sat Dec 18 2021 Thomas Dickey +- use libexecdir for programs rather than subdir of bindir + * Sat Nov 16 2019 Thomas Dickey - modify clean-rule to work around Fedora NFS bugs. diff --git a/test/padview.c b/test/padview.c index 6917e0ed6eb6..0defee3430e0 100644 --- a/test/padview.c +++ b/test/padview.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2021,2022 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -29,7 +29,7 @@ /* * clone of view.c, using pads * - * $Id: padview.c,v 1.16 2020/02/02 23:34:34 tom Exp $ + * $Id: padview.c,v 1.22 2022/12/04 00:40:11 tom Exp $ */ #include <test.priv.h> @@ -41,10 +41,11 @@ #if HAVE_NEWPAD -static void finish(int sig) GCC_NORETURN; +static GCC_NORETURN void finish(int sig); #define my_pair 1 +static WINDOW *global_pad; static int shift = 0; static bool try_color = FALSE; @@ -55,8 +56,6 @@ static int num_lines; static bool n_option = FALSE; #endif -static void usage(void) GCC_NORETURN; - static void failed(const char *msg) { @@ -69,6 +68,8 @@ static void finish(int sig) { endwin(); + if (global_pad != NULL) + delwin(global_pad); ExitProgram(sig != 0 ? EXIT_FAILURE : EXIT_SUCCESS); } @@ -144,9 +145,12 @@ read_file(const char *filename) } len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp); - my_blob[sb.st_size] = '\0'; fclose(fp); + if (len > (size_t) sb.st_size) + len = (size_t) sb.st_size; + my_blob[len] = '\0'; + for (pass = 0; pass < 2; ++pass) { char *base = my_blob; k = 0; @@ -160,12 +164,19 @@ read_file(const char *filename) ++k; } } + if (base != (my_blob + j)) { + if (pass) + my_vec[k] = base; + ++k; + } num_lines = k; - if (base != (my_blob + j)) - ++num_lines; - if (!pass && - ((my_vec = typeCalloc(char *, (size_t) k + 2)) == 0)) { - failed("cannot allocate line-vector #1"); + if (pass == 0) { + if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == 0)) { + failed("cannot allocate line-vector #1"); + } + } else { + if (my_vec[0] == NULL) + my_vec[0] = my_blob; } } @@ -237,12 +248,13 @@ read_file(const char *filename) } static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: view [options] file" ,"" + ,USAGE_COMMON ,"Options:" ," -c use color if terminal supports it" ," -i ignore INT, QUIT, TERM signals" @@ -258,8 +270,11 @@ usage(void) size_t n; for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) @@ -289,6 +304,7 @@ main(int argc, char *argv[]) 0 }; + int ch; int i; int my_delay = 0; WINDOW *my_pad; @@ -302,8 +318,8 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((i = getopt(argc, argv, "cinstT:")) != -1) { - switch (i) { + while ((ch = getopt(argc, argv, OPTS_COMMON "cinstT:")) != -1) { + switch (ch) { case 'c': try_color = TRUE; break; @@ -324,7 +340,7 @@ main(int argc, char *argv[]) char *next = 0; int tvalue = (int) strtol(optarg, &next, 0); if (tvalue < 0 || (next != 0 && *next != 0)) - usage(); + usage(FALSE); curses_trace((unsigned) tvalue); } break; @@ -332,12 +348,16 @@ main(int argc, char *argv[]) curses_trace(TRACE_CALLS); break; #endif + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind + 1 != argc) - usage(); + usage(FALSE); InitAndCatch(initscr(), ignore_sigs ? SIG_IGN : finish); keypad(stdscr, TRUE); /* enable keyboard mapping */ @@ -362,7 +382,8 @@ main(int argc, char *argv[]) * Do this after starting color, otherwise the pad's background will be * uncolored after the ncurses 6.1.20181208 fixes. */ - my_pad = read_file(fname = argv[optind]); + global_pad = + my_pad = read_file(fname = argv[optind]); my_row = 0; while (!done) { diff --git a/test/pair_content.c b/test/pair_content.c index fc5926b50386..2b759a82466d 100644 --- a/test/pair_content.c +++ b/test/pair_content.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2022,2023 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: pair_content.c,v 1.14 2020/02/02 23:34:34 tom Exp $ + * $Id: pair_content.c,v 1.22 2023/02/25 16:43:56 tom Exp $ */ #define NEED_TIME_H @@ -57,10 +57,15 @@ static int x_opt; static MYPAIR *expected; -#if HAVE_GETTIMEOFDAY -static struct timeval initial_time; -static struct timeval finish_time; -#endif +static TimeType initial_time; +static TimeType finish_time; + +static GCC_NORETURN void +finish(int code) +{ + free(expected); + ExitProgram(code); +} static void failed(const char *msg) @@ -68,7 +73,7 @@ failed(const char *msg) printw("%s", msg); getch(); endwin(); - ExitProgram(EXIT_FAILURE); + finish(EXIT_FAILURE); } #if USE_EXTENDED_COLOR @@ -115,6 +120,7 @@ random_color(void) static void setup_test(void) { + setlocale(LC_ALL, ""); initscr(); cbreak(); noecho(); @@ -163,9 +169,7 @@ setup_test(void) } else { failed("This demo requires a color terminal"); } -#if HAVE_GETTIMEOFDAY - gettimeofday(&initial_time, 0); -#endif + GetClockTime(&initial_time); } static void @@ -198,23 +202,14 @@ finish_test(void) endwin(); } -#if HAVE_GETTIMEOFDAY -static double -seconds(struct timeval *mark) -{ - double result = (double) mark->tv_sec; - result += ((double) mark->tv_usec / 1e6); - return result; -} -#endif - static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: pair_content [options]" ,"" + ,USAGE_COMMON ,"Options:" ," -f PAIR first color pair to test (default: 1)" ," -i interactive, showing test-progress" @@ -230,26 +225,29 @@ usage(void) size_t n; for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { - int i; + int ch; - while ((i = getopt(argc, argv, "f:il:npr:sx")) != -1) { - switch (i) { + while ((ch = getopt(argc, argv, OPTS_COMMON "f:il:npr:sx")) != -1) { + switch (ch) { case 'f': if ((f_opt = atoi(optarg)) <= 0) - usage(); + usage(FALSE); break; case 'i': i_opt = 1; break; case 'l': if ((l_opt = atoi(optarg)) <= 0) - usage(); + usage(FALSE); break; case 'n': n_opt = 1; @@ -259,7 +257,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) break; case 'r': if ((r_opt = atoi(optarg)) <= 0) - usage(); + usage(FALSE); break; case 's': s_opt = 1; @@ -269,17 +267,22 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) x_opt = 1; break; #endif + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); if (r_opt <= 0) r_opt = 1; setup_test(); if (p_opt) { + int i; endwin(); for (i = f_opt; i < l_opt; ++i) { my_color_t fg, bg; @@ -304,14 +307,10 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) addch('\n'); } printw("DONE: "); -#if HAVE_GETTIMEOFDAY - gettimeofday(&finish_time, 0); - printw("%.03f seconds", - seconds(&finish_time) - - seconds(&initial_time)); -#endif + GetClockTime(&finish_time); + printw("%.03f seconds", ElapsedSeconds(&initial_time, &finish_time)); finish_test(); } - ExitProgram(EXIT_SUCCESS); + finish(EXIT_SUCCESS); } diff --git a/test/picsmap.c b/test/picsmap.c index a2e4c430e03c..b582f3aada5d 100644 --- a/test/picsmap.c +++ b/test/picsmap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2022,2023 Thomas E. Dickey * * Copyright 2017,2018 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: picsmap.c,v 1.135 2020/12/26 18:04:03 tom Exp $ + * $Id: picsmap.c,v 1.149 2023/04/23 23:20:37 tom Exp $ * * Author: Thomas E. Dickey * @@ -53,13 +53,6 @@ #include <sys/types.h> #include <sys/stat.h> -#if HAVE_STDINT_H -#include <stdint.h> -#define my_intptr_t intptr_t -#else -#define my_intptr_t long -#endif - #if HAVE_TSEARCH #include <search.h> #endif @@ -109,7 +102,7 @@ typedef struct { #define debugmsg if (debugging) logmsg #define debugmsg2 if (debugging) logmsg2 -static void cleanup(int) GCC_NORETURN; +static GCC_NORETURN void cleanup(int); static void giveup(const char *fmt, ...) GCC_PRINTFLIKE(1, 2); static void logmsg(const char *fmt, ...) GCC_PRINTFLIKE(1, 2); static void logmsg2(const char *fmt, ...) GCC_PRINTFLIKE(1, 2); @@ -487,27 +480,28 @@ read_file(const char *filename) } static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: picsmap [options] [imagefile [...]]" ,"Read/display one or more xbm/xpm files (possibly use \"convert\")" ,"" + ,USAGE_COMMON ,"Options:" - ," -a ratio aspect-ratio correction for ImageMagick" + ," -a ratio aspect-ratio correction for ImageMagick" #if HAVE_USE_DEFAULT_COLORS - ," -d invoke use_default_colors" + ," -d invoke use_default_colors" #endif - ," -L add debugging information to logfile" - ," -l logfile write informational messages to logfile" - ," -p palette color-palette file (default \"$TERM.dat\")" - ," -q less verbose" - ," -r rgb-path xpm uses X rgb color-names (default \"" RGB_PATH "\")" - ," -s SECS pause for SECS seconds after display vs getch" + ," -L add debugging information to logfile" + ," -l FILE write informational messages to FILE" + ," -p FILE color-palette file (default \"$TERM.dat\")" + ," -q less verbose" + ," -r FILE xpm uses X rgb color-names in FILE (default \"" RGB_PATH "\")" + ," -s SECS pause for SECS seconds after display vs getch" #if USE_EXTENDED_COLORS - ," -x [pc] use extension (p=extended-pairs, c=extended-colors)" - ," Either/both extension may be given" + ," -x [pc] use extension (p=extended-pairs, c=extended-colors)" + ," Either/both extension may be given" #endif }; size_t n; @@ -517,7 +511,7 @@ usage(void) fflush(stdout); for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - cleanup(EXIT_FAILURE); + cleanup(ok ? EXIT_SUCCESS : EXIT_FAILURE); } static void @@ -541,7 +535,7 @@ giveup(const char *fmt, ...) fflush(logfp); } - usage(); + usage(FALSE); } /* @@ -604,7 +598,6 @@ read_palette(const char *filename) continue; } } - s += strlen(s); if (tries & 2) { int len = (int) strlen(filename); @@ -798,6 +791,7 @@ match_c(const char *source, const char *pattern, ...) int ch; int *ip; char *cp; + float *fp; long lv; va_start(ap, pattern); @@ -811,10 +805,13 @@ match_c(const char *source, const char *pattern, ...) continue; } /* %c, %d, %s are like sscanf except for special treatment of blanks */ - if (ch == '%' && *pattern != '\0' && strchr("cdnsx", *pattern)) { + if (ch == '%' && *pattern != '\0' && strchr("%cdnfsx", *pattern)) { bool found = FALSE; ch = *pattern++; switch (ch) { + case '%': + source++; + break; case 'c': cp = va_arg(ap, char *); do { @@ -833,6 +830,29 @@ match_c(const char *source, const char *pattern, ...) goto finish; } break; + case 'f': + /* floating point for pixels... */ + fp = va_arg(ap, float *); + lv = strtol(source, &cp, 10); + if (cp == 0 || cp == source) + goto finish; + *fp = (float) lv; + source = cp; + if (*source == '.') { + lv = strtol(++source, &cp, 10); + if (cp == 0 || cp == source) + goto finish; + { + float scale = 1.0f; + int digits = (int) (cp - source); + while (digits-- > 0) { + scale *= 10.0f; + } + *fp += (float) lv / scale; + } + source = cp; + } + break; case 'n': /* not really sscanf... */ limit = *va_arg(ap, int *); @@ -990,7 +1010,7 @@ parse_xbm(char **data) { int n; int state = 0; - char buf[BUFSIZ]; + char buf[2048]; int num; char ch; char *s; @@ -1015,7 +1035,7 @@ parse_xbm(char **data) case 0: case 1: case 2: - if (sscanf(s, "#define %s %d%c", buf, &num, &ch) >= 2) { + if (sscanf(s, "#define %1024s %d%c", buf, &num, &ch) >= 2) { if ((t = strstr(buf, "_width")) != 0) { state |= 1; result->wide = (short) bytes_of(num); @@ -1036,7 +1056,7 @@ parse_xbm(char **data) } break; case 3: - if (sscanf(s, "static char %[^_ ]_bits[]%c", buf, &ch) >= 1) { + if (sscanf(s, "static char %1024[^_ ]_bits[]%c", buf, &ch) >= 1) { if (strcmp(result->name, buf)) { goto finish; } @@ -1347,11 +1367,16 @@ parse_img(const char *filename) break; } } else { - /* subsequent lines begin "col,row: (r,g,b,a) #RGB" */ + /* + * subsequent lines begin "col,row: (r,g,b,a) #RGB". + * Those r/g/b could be integers (0..255) or float-percentages. + */ int r, g, b, nocolor; + float rf, gf, bf; unsigned check; char *t; char *s = t = strchr(buffer, '#'); + bool matched = FALSE; if (s != 0) { /* after the "#RGB", there are differences - just ignore */ @@ -1359,19 +1384,44 @@ parse_img(const char *filename) ++s; *++s = '\0'; } + if (match_c(buffer, "%d,%d: (%d,%d,%d,%d) #%x ", &col, &row, &r, &g, &b, &nocolor, &check)) { + matched = TRUE; + } else if (match_c(buffer, + "%d,%d: (%f%%,%f%%,%f%%,%d) #%x ", + &col, &row, + &rf, &gf, &bf, &nocolor, + &check) || + match_c(buffer, + "%d,%d: (%f%%,%f%%,%f%%) #%x ", + &col, &row, + &rf, &gf, &bf, + &check)) { + matched = TRUE; + +#define fp_fix(n) (int) (MaxRGB * (((n) > 100.0 ? 100.0 : (n)) / 100.0)) + + r = fp_fix(rf); + g = fp_fix(gf); + b = fp_fix(bf); + } + if ((s - t) > 8) /* 6 hex digits vs 8 */ + check /= 256; + if (matched) { int which, c; + int want_r = (check >> 16) & 0xff; + int want_g = (check >> 8) & 0xff; + int want_b = (check >> 0) & 0xff; - if ((s - t) > 8) /* 6 hex digits vs 8 */ - check /= 256; - if (r > MaxRGB || - g > MaxRGB || - b > MaxRGB || - check != (unsigned) ((r << 16) | (g << 8) | b)) { +#define fp_err(tst,ref) ((tst > MaxRGB) || ((tst - ref)*(tst - ref)) > 4) + + if (fp_err(r, want_r) || + fp_err(g, want_g) || + fp_err(b, want_b)) { okay = FALSE; break; } @@ -1471,6 +1521,7 @@ init_display(const char *palette_path, int opt_d) (void) opt_d; if (isatty(fileno(stdout))) { in_curses = TRUE; + setlocale(LC_ALL, ""); initscr(); cbreak(); noecho(); @@ -1666,24 +1717,27 @@ report_colors(PICS_HEAD * pics) } } } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { - int n; + int ch; int opt_d = FALSE; char ignore_ch; const char *palette_path = 0; const char *rgb_path = RGB_PATH; - while ((n = getopt(argc, argv, "a:dLl:p:qr:s:x:")) != -1) { - switch (n) { + while ((ch = getopt(argc, argv, OPTS_COMMON "a:dLl:p:qr:s:x:")) != -1) { + switch (ch) { case 'a': if (sscanf(optarg, "%lf%c", &aspect_ratio, &ignore_ch) != 1 || aspect_ratio < 0.1 || aspect_ratio > 10.) { fprintf(stderr, "Expected a number in [0.1 to 10.]: %s\n", optarg); - usage(); + usage(FALSE); } break; #if HAVE_USE_DEFAULT_COLORS @@ -1723,21 +1777,25 @@ main(int argc, char *argv[]) use_extended_colors = TRUE; break; default: - usage(); + usage(FALSE); break; } } } break; #endif + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind < argc) { char **rgb_data = read_file(rgb_path); + int n; if (rgb_data) rgb_table = parse_rgb(rgb_data); @@ -1770,7 +1828,7 @@ main(int argc, char *argv[]) free(rgb_table); free(all_colors); } else { - usage(); + usage(FALSE); } cleanup(EXIT_SUCCESS); diff --git a/test/picsmap.h b/test/picsmap.h index bdeb3c31471f..fc790a941c0a 100644 --- a/test/picsmap.h +++ b/test/picsmap.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2021 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /**************************************************************************** * Author: Thomas E. Dickey * ****************************************************************************/ -/* $Id: picsmap.h,v 1.4 2020/02/02 23:34:34 tom Exp $ */ +/* $Id: picsmap.h,v 1.5 2021/04/24 23:25:17 tom Exp $ */ #ifndef PICSMAP_H_INCL #define PICSMAP_H_INCL 1 @@ -68,8 +68,4 @@ typedef struct { short blue; } RGB_DATA; -static void init_display(const char *, int); - -static void show_picture(PICS_HEAD * pics); - #endif /* PICSMAP_H_INCL */ diff --git a/test/popup_msg.c b/test/popup_msg.c index 5c0e5bad0989..09eff5e39430 100644 --- a/test/popup_msg.c +++ b/test/popup_msg.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2020,2021 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: popup_msg.c,v 1.10 2020/02/02 23:34:34 tom Exp $ + * $Id: popup_msg.c,v 1.11 2021/12/18 21:19:19 tom Exp $ * * Show a multi-line message in a window which may extend beyond the screen. * @@ -87,7 +87,7 @@ popup_msg(WINDOW *parent, const char *const *msg) if ((help = newwin(high, wide, y0, x0)) == 0) return; - if ((data = newpad(length + 1, width)) == 0) { + if ((data = newpad(length + 1, width + 1)) == 0) { delwin(help); return; } diff --git a/test/programs b/test/programs index 8b0908332701..16ecf810391e 100644 --- a/test/programs +++ b/test/programs @@ -1,6 +1,6 @@ -# $Id: programs,v 1.48 2021/02/13 16:33:51 tom Exp $ +# $Id: programs,v 1.57 2023/11/10 11:48:38 tom Exp $ ############################################################################## -# Copyright 2018-2020,2021 Thomas E. Dickey # +# Copyright 2018-2022,2023 Thomas E. Dickey # # Copyright 2006-2016,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -40,6 +40,7 @@ chgat $(LDFLAGS_CURSES) $(LOCAL_LIBS) chgat popup_msg clip_printw $(LDFLAGS_CURSES) $(LOCAL_LIBS) clip_printw popup_msg color_content $(LDFLAGS_CURSES) $(LOCAL_LIBS) color_content color_set $(LDFLAGS_CURSES) $(LOCAL_LIBS) color_set +combine $(LDFLAGS_CURSES) $(LOCAL_LIBS) combine dump_window popup_msg demo_altkeys $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_altkeys demo_defkey $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_defkey demo_forms $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) demo_forms edit_field popup_msg @@ -65,7 +66,7 @@ firstlast $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) firstlast foldkeys $(LDFLAGS_CURSES) $(LOCAL_LIBS) foldkeys form_driver_w $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) form_driver_w popup_msg gdc $(LDFLAGS_CURSES) $(LOCAL_LIBS) gdc -hanoi $(LDFLAGS_CURSES) $(LOCAL_LIBS) hanoi +hanoi $(LDFLAGS_CURSES_M) $(LOCAL_LIBS) hanoi hashtest $(LDFLAGS_CURSES) $(LOCAL_LIBS) hashtest inch_wide $(LDFLAGS_CURSES) $(LOCAL_LIBS) inch_wide popup_msg inchs $(LDFLAGS_CURSES) $(LOCAL_LIBS) inchs popup_msg @@ -89,21 +90,25 @@ rain $(LDFLAGS_THREADS) $(LOCAL_LIBS) rain popup_msg redraw $(LDFLAGS_CURSES) $(LOCAL_LIBS) redraw popup_msg savescreen $(LDFLAGS_CURSES) $(LOCAL_LIBS) savescreen popup_msg sp_tinfo $(LDFLAGS_TINFO) $(LOCAL_LIBS) sp_tinfo -tclock $(LDFLAGS_CURSES) $(LOCAL_LIBS) tclock +tclock $(LDFLAGS_CURSES_M) $(LOCAL_LIBS) tclock test_add_wchstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_add_wchstr test_addchstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_addchstr test_addstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_addstr test_addwstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_addwstr test_arrays $(LDFLAGS_TINFO) $(LOCAL_LIBS) test_arrays +test_delwin $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_delwin +test_endwin $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_endwin test_get_wstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_get_wstr popup_msg test_getstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_getstr popup_msg test_instr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_instr test_inwstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_inwstr +test_mouse $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_mouse test_opaque $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_opaque test_setupterm $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_setupterm 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 diff --git a/test/railroad.c b/test/railroad.c index 3336f5659539..4d7c0700de5f 100644 --- a/test/railroad.c +++ b/test/railroad.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2020,2022 Thomas E. Dickey * * Copyright 2000-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey - 2000 * - * $Id: railroad.c,v 1.25 2020/09/05 21:43:37 tom Exp $ + * $Id: railroad.c,v 1.26 2022/12/11 00:12:13 tom Exp $ * * A simple demo of the termcap interface. */ @@ -235,11 +235,44 @@ railroad(char **args) } } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: railroad [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int main(int argc, char *argv[]) { - if (argc > 1) { - railroad(argv + 1); + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + + if (optind < argc) { + railroad(argv + optind); } else { static char world[] = "Hello World"; static char *hello[] = @@ -251,8 +284,7 @@ main(int argc, char *argv[]) #else int -main(int argc GCC_UNUSED, - char *argv[]GCC_UNUSED) +main(void) { printf("This program requires termcap\n"); exit(EXIT_FAILURE); diff --git a/test/rain.c b/test/rain.c index 4c3568cffcda..1b1d81a05bcb 100644 --- a/test/rain.c +++ b/test/rain.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2020,2022 Thomas E. Dickey * * Copyright 1998-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: rain.c,v 1.52 2020/08/29 16:22:03 juergen Exp $ + * $Id: rain.c,v 1.57 2022/12/04 00:40:11 tom Exp $ */ #include <test.priv.h> #include <popup_msg.h> @@ -57,6 +57,7 @@ typedef struct DATA { #ifdef USE_PTHREADS pthread_cond_t cond_next_drop; +pthread_mutex_t mutex_drop_data; pthread_mutex_t mutex_next_drop; static int used_threads; @@ -200,7 +201,7 @@ draw_part(void (*func) (DATA *), int state, DATA * data) static int put_next_drop(void) { - pthread_cond_signal(&cond_next_drop); + pthread_cond_broadcast(&cond_next_drop); pthread_mutex_unlock(&mutex_next_drop); return 0; @@ -246,7 +247,9 @@ draw_drop(void *arg) * to the data which it uses for setting up this thread (but it has * been modified to use different coordinates). */ + pthread_mutex_lock(&mutex_drop_data); mydata = *(DATA *) arg; + pthread_mutex_unlock(&mutex_drop_data); draw_part(part1, 0, &mydata); draw_part(part2, 1, &mydata); @@ -254,6 +257,7 @@ draw_drop(void *arg) draw_part(part4, 3, &mydata); draw_part(part5, 4, &mydata); draw_part(part6, 0, &mydata); + } while (get_next_drop()); return NULL; @@ -298,12 +302,13 @@ get_input(void) } static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: rain [options]" ,"" + ,USAGE_COMMON ,"Options:" #if HAVE_USE_DEFAULT_COLORS ," -d invoke use_default_colors" @@ -314,8 +319,11 @@ usage(void) for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) @@ -341,20 +349,23 @@ main(int argc, char *argv[]) bool d_option = FALSE; #endif - while ((ch = getopt(argc, argv, "d")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "d")) != -1) { switch (ch) { #if HAVE_USE_DEFAULT_COLORS case 'd': d_option = TRUE; break; #endif + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); setlocale(LC_ALL, ""); @@ -374,7 +385,9 @@ main(int argc, char *argv[]) curs_set(0); timeout(0); -#ifndef USE_PTHREADS +#ifdef USE_PTHREADS + pthread_mutex_init(&mutex_drop_data, NULL); +#else /* !USE_PTHREADS */ for (j = MAX_DROP; --j >= 0;) { last[j].x = random_x(); last[j].y = random_y(); @@ -383,14 +396,21 @@ main(int argc, char *argv[]) #endif while (!done) { +#ifdef USE_PTHREADS + pthread_mutex_lock(&mutex_drop_data); + drop.x = random_x(); drop.y = random_y(); -#ifdef USE_PTHREADS if (start_drop(&drop) != 0) { beep(); } + + pthread_mutex_unlock(&mutex_drop_data); #else + drop.x = random_x(); + drop.y = random_y(); + /* * The non-threaded code draws parts of each drop on each loop. */ diff --git a/test/redraw.c b/test/redraw.c index 569c2769a98d..749f790b3fd3 100644 --- a/test/redraw.c +++ b/test/redraw.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2021,2022 Thomas E. Dickey * * Copyright 2006-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: redraw.c,v 1.11 2020/02/02 23:34:34 tom Exp $ + * $Id: redraw.c,v 1.17 2022/12/10 22:28:50 tom Exp $ * * Demonstrate the redrawwin() and wredrawln() functions. * Thomas Dickey - 2006/11/4 @@ -82,7 +82,6 @@ test_redraw(WINDOW *win) WINDOW *win1; WINDOW *win2; bool done = FALSE; - int ch, y, x; int max_y, max_x; int beg_y, beg_x; @@ -92,8 +91,11 @@ test_redraw(WINDOW *win) keypad(win, TRUE); getmaxyx(win, max_y, max_x); getbegyx(win, beg_y, beg_x); + while (!done) { - ch = wgetch(win); + int ch = wgetch(win); + int y, x; + getyx(win, y, x); switch (ch) { case 'q': @@ -133,7 +135,7 @@ test_redraw(WINDOW *win) /* * For a shell command, we can work around the problem noted above * using mvcur(). It is ifdef'd for NCURSES, since X/Open does - * not define the case where the old location is unknown. + * not define the case where the old location is unknown. */ IGNORE_RC(system("date")); mvcur(-1, -1, y, x); @@ -187,30 +189,34 @@ test_redraw(WINDOW *win) } static void -usage(void) +usage(int ok) { static const char *tbl[] = { "Usage: redraw [options]" ,"" + ,USAGE_COMMON ,"Options:" - ," -e use stderr (default stdout)" - ," -n do not initialize terminal" + ," -e use stderr (default stdout)" + ," -n do not initialize terminal" }; unsigned n; for (n = 0; n < SIZEOF(tbl); ++n) fprintf(stderr, "%s\n", tbl[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int ch; bool no_init = FALSE; FILE *my_fp = stdout; - while ((ch = getopt(argc, argv, "en")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "en")) != -1) { switch (ch) { case 'e': my_fp = stderr; @@ -218,13 +224,16 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) case 'n': no_init = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); if (no_init) { START_TRACE(); diff --git a/test/savescreen.c b/test/savescreen.c index da00d7534dc4..3ea619306a84 100644 --- a/test/savescreen.c +++ b/test/savescreen.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2021,2022 Thomas E. Dickey * * Copyright 2006-2017,2018 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: savescreen.c,v 1.57 2020/02/02 23:34:34 tom Exp $ + * $Id: savescreen.c,v 1.62 2022/12/10 23:23:27 tom Exp $ * * Demonstrate save/restore functions from the curses library. * Thomas Dickey - 2007/7/14 @@ -86,9 +86,9 @@ setup_next(void) static void cleanup(char *files[]) { - int n; - if (!keep_dumps) { + int n; + for (n = 0; files[n] != 0; ++n) { unlink(files[n]); } @@ -169,7 +169,6 @@ dump_screen(char **files, int color, int which, int last, bool use_colors) { #if USE_WIDEC_SUPPORT cchar_t mycc; - int myxx; #endif char *filename = files[which]; bool dumped = FALSE; @@ -198,7 +197,7 @@ dump_screen(char **files, int color, int which, int last, bool use_colors) wmove(stdscr, cy, cx); #if USE_WIDEC_SUPPORT if (win_wch(curscr, &mycc) != ERR) { - myxx = wcwidth(BaseChar(mycc)); + int myxx = wcwidth(BaseChar(mycc)); if (myxx > 0) { wadd_wchnstr(stdscr, &mycc, 1); cx += (myxx - 1); @@ -254,24 +253,28 @@ replay_help(void) } static void -usage(void) +usage(int ok) { static const char *msg[] = { - "Usage: savescreen [-r] files", - "", - "Options:", - " -f file fill/initialize screen using text from this file", - " -i use scr_init/scr_restore rather than scr_set", - " -k keep the restored dump-files rather than removing them", - " -r replay the screen-dump files" + "Usage: savescreen [-r] files" + ,"" + ,USAGE_COMMON + ,"Options:" + ," -f file fill/initialize screen using text from this file" + ," -i use scr_init/scr_restore rather than scr_set" + ," -k keep the restored dump-files rather than removing them" + ," -r replay the screen-dump files" }; unsigned n; for (n = 0; n < SIZEOF(msg); ++n) { fprintf(stderr, "%s\n", msg[n]); } - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) @@ -285,19 +288,14 @@ main(int argc, char *argv[]) char **files; char *fill_by = 0; #if USE_WIDEC_SUPPORT - int r, g, b; - int cube = 0; - int cube0 = 16; - int cube1; cchar_t mycc; static const wchar_t mywc[2] = {L'#', 0}; - bool using_rgb = FALSE; #endif setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "f:ikr")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "f:ikr")) != -1) { switch (ch) { case 'f': fill_by = optarg; @@ -311,9 +309,12 @@ main(int argc, char *argv[]) case 'r': replaying = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } @@ -332,6 +333,9 @@ main(int argc, char *argv[]) curs_set(0); if (has_colors() && (start_color() == OK) && COLORS >= MAX_ANSI) { +#if USE_WIDEC_SUPPORT + bool using_rgb = FALSE; +#endif static const struct { int fg, bg; } table[MAX_ANSI] = { @@ -378,13 +382,13 @@ main(int argc, char *argv[]) int r_delta = (r_max / cols); int g_delta = (g_max / cols); int row = 0; + int b = 0; - b = 0; using_rgb = TRUE; while (row++ < rows) { int col = 0; - r = 0; - g = g_max; + int r = 0; + int g = g_max; while (col++ < cols) { int color = (((r * (g_max + 1)) + g) * (b_max + 1) + b + MAX_ANSI); @@ -404,6 +408,9 @@ main(int argc, char *argv[]) #endif } if ((fill_by == 0) && !replaying) { +#if USE_WIDEC_SUPPORT + int cube = 0; +#endif /* * Originally (before wide-characters) ncurses supported 16 colors. */ @@ -428,8 +435,9 @@ main(int argc, char *argv[]) cube = 6; } if (cube != 0) { - cube0 = 16; - cube1 = cube0 + (cube * cube * cube); + int r, g, b; + int cube0 = 16; + int cube1 = cube0 + (cube * cube * cube); addch('\n'); printw("Color cube, %dx%dx%d:\n", cube, cube, cube); @@ -460,7 +468,6 @@ main(int argc, char *argv[]) int cols = COLS - 1; int row = 0; - b = 0; pair = MAX_ANSI; while (row++ < rows) { int col = 0; @@ -648,7 +655,7 @@ main(int argc, char *argv[]) #else int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(void) { printf("This program requires the screen-dump functions\n"); ExitProgram(EXIT_FAILURE); diff --git a/test/savescreen.sh b/test/savescreen.sh index 4a15ce427c76..1ffab2fcc170 100755 --- a/test/savescreen.sh +++ b/test/savescreen.sh @@ -1,6 +1,6 @@ #!/bin/sh ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2022 Thomas E. Dickey # # Copyright 2007-2009,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -27,17 +27,18 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: savescreen.sh,v 1.6 2020/02/02 23:34:34 tom Exp $ +# $Id: savescreen.sh,v 1.8 2022/07/16 16:34:34 tom Exp $ # # Use this script to exercise "savescreen". # It starts by generating a series of temporary-filenames, which are passed # to the test-program. Loop as long as the first file named exists. -: ${TMPDIR:=/tmp} +: "${TMPDIR:=/tmp}" # "mktemp -d" would be preferable, but is not standard. MY_DIR=$TMPDIR/savescreen$$ -trap "rm -rf $MY_DIR" EXIT INT QUIT HUP +trap "rm -rf $MY_DIR; exit 1" 1 2 3 +trap "rm -rf $MY_DIR" 0 umask 077 mkdir $MY_DIR || exit 1 @@ -58,7 +59,7 @@ if test -f $BEGINS then while test -f $BEGINS do - ${0%.sh} -r $PARAMS + "${0%.sh}" -r $PARAMS test $? != 0 && break done else diff --git a/test/sp_tinfo.c b/test/sp_tinfo.c index 419b000a700a..72b20cfb0c1d 100644 --- a/test/sp_tinfo.c +++ b/test/sp_tinfo.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2022,2023 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.29 2023/06/24 14:14:56 tom Exp $ * * TOTO: add option for non-sp-funcs interface */ @@ -279,48 +279,51 @@ cleanup(MYDATA * data) { set_curterm(data->term); del_curterm(data->term); -#if !NO_LEAKS - free(data->sp); /* cannot use delscreen in tinfo */ -#endif free(data); } static void -usage(void) +usage(int ok) { static const char *tbl[] = { - "Usage: sp_tinfo [output] [error]", - "", - "Options:", - " -n suppress call to new_prescr()", - " -t use termcap functions rather than terminfo", - NULL + "Usage: sp_tinfo [output] [error]" + ,"" + ,USAGE_COMMON + ,"Options:" + ," -n suppress call to new_prescr()" + ," -t use termcap functions rather than terminfo" }; size_t n; for (n = 0; n < SIZEOF(tbl); ++n) { fprintf(stderr, "%s\n", tbl[n]); } - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { MYDATA *my_out; MYDATA *my_err; - int n; + int ch; - while ((n = getopt(argc, argv, "nt")) != -1) { - switch (n) { + while ((ch = getopt(argc, argv, OPTS_COMMON "nt")) != -1) { + switch (ch) { case 'n': opt_n = TRUE; break; case 't': opt_t = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); /* NOTREACHED */ } } @@ -328,7 +331,7 @@ main(int argc, char *argv[]) argc -= (optind - 1); if (argc > 3) - usage(); + usage(FALSE); my_out = initialize((argc > 1) ? argv[1] : "vt100", stdout); my_err = initialize((argc > 2) ? argv[2] : "ansi", stderr); @@ -336,14 +339,18 @@ main(int argc, char *argv[]) do_stuff(my_out); do_stuff(my_err); - cleanup(my_out); - cleanup(my_err); + if (my_out != my_err) { + cleanup(my_out); + cleanup(my_err); + } else { + cleanup(my_out); + } ExitProgram(EXIT_SUCCESS); } #else int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(void) { fprintf(stderr, "This program requires the low-level ncurses sp-funcs tputs_sp\n"); diff --git a/test/tclock.c b/test/tclock.c index 71da53af3539..1a749628914d 100644 --- a/test/tclock.c +++ b/test/tclock.c @@ -1,9 +1,9 @@ -/* $Id: tclock.c,v 1.42 2020/12/26 17:56:36 tom Exp $ */ +/* $Id: tclock.c,v 1.48 2023/02/25 16:42:22 tom Exp $ */ #define NEED_TIME_H #include <test.priv.h> -#if HAVE_MATH_H +#if HAVE_MATH_H && HAVE_MATH_FUNCS #include <math.h> @@ -107,12 +107,13 @@ dline(int pair, int from_x, int from_y, int x2, int y2, int ch) } static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: tclock [options]" ,"" + ,USAGE_COMMON ,"Options:" #if HAVE_USE_DEFAULT_COLORS ," -d invoke use_default_colors" @@ -123,12 +124,17 @@ usage(void) for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { + static TimeType initial; + int i, cx, cy; double cr, mradius, hradius, mangle, hangle; double sangle, sradius, hours; @@ -143,28 +149,28 @@ main(int argc, char *argv[]) char szChar[20]; char *text; short my_bg = COLOR_BLACK; -#if HAVE_GETTIMEOFDAY - struct timeval current; -#endif - double fraction = 0.0; + TimeType current; #if HAVE_USE_DEFAULT_COLORS bool d_option = FALSE; #endif - while ((ch = getopt(argc, argv, "d")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "d")) != -1) { switch (ch) { #if HAVE_USE_DEFAULT_COLORS case 'd': d_option = TRUE; break; #endif + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); setlocale(LC_ALL, ""); @@ -229,11 +235,9 @@ main(int argc, char *argv[]) hdx = A2X(hangle, hradius); hdy = A2Y(hangle, hradius); -#if HAVE_GETTIMEOFDAY - gettimeofday(¤t, 0); - fraction = ((double) current.tv_usec / 1.0e6); -#endif - sangle = ((t->tm_sec + fraction) * (2.0 * PI) / 60.0); + GetClockTime(¤t); + + sangle = (ElapsedSeconds(&initial, ¤t) * (2.0 * PI) / 60.0); sdx = A2X(sangle, sradius); sdy = A2Y(sangle, sradius); @@ -287,9 +291,9 @@ main(int argc, char *argv[]) } #else int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(void) { - printf("This program requires the development header math.h\n"); + printf("This program requires the header math.h and trignometric functions\n"); ExitProgram(EXIT_FAILURE); } #endif diff --git a/test/test.priv.h b/test/test.priv.h index 6913b25d14ca..a901185b8df0 100644 --- a/test/test.priv.h +++ b/test/test.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2023,2024 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.191 2020/09/12 23:54:42 tom Exp $ */ +/* $Id: test.priv.h,v 1.218 2024/02/10 14:40:03 tom Exp $ */ #ifndef __TEST_PRIV_H #define __TEST_PRIV_H 1 @@ -67,22 +67,18 @@ #define HAVE_ASSUME_DEFAULT_COLORS 0 #endif -#ifndef HAVE_BSD_STRING_H -#define HAVE_BSD_STRING_H 0 -#endif - -#ifndef HAVE_CURSES_VERSION -#define HAVE_CURSES_VERSION 0 -#endif - -#ifndef HAVE_CURSCR -#define HAVE_CURSCR 0 +#ifndef HAVE_CFMAKERAW +#define HAVE_CFMAKERAW 0 #endif #ifndef HAVE_CHGAT #define HAVE_CHGAT 0 #endif +#ifndef HAVE_CLOCK_GETTIME +#define HAVE_CLOCK_GETTIME 0 +#endif + #ifndef HAVE_COLOR_CONTENT #define HAVE_COLOR_CONTENT 0 #endif @@ -95,6 +91,18 @@ #define HAVE_COLOR_SET 0 #endif +#ifndef HAVE_BSD_STRING_H +#define HAVE_BSD_STRING_H 0 +#endif + +#ifndef HAVE_CURSES_VERSION +#define HAVE_CURSES_VERSION 0 +#endif + +#ifndef HAVE_CURSCR +#define HAVE_CURSCR 0 +#endif + #ifndef HAVE_DELSCREEN #define HAVE_DELSCREEN 0 #endif @@ -123,6 +131,10 @@ #define HAVE_GETMAXX 0 #endif +#ifndef HAVE_GETTIMEOFDAY +#define HAVE_GETTIMEOFDAY 0 +#endif + #ifndef HAVE_GETOPT_H #define HAVE_GETOPT_H 0 #endif @@ -163,6 +175,10 @@ #define HAVE_LOCALE_H 0 #endif +#ifndef HAVE_MATH_FUNCS +#define HAVE_MATH_FUNCS 0 +#endif + #ifndef HAVE_MATH_H #define HAVE_MATH_H 0 #endif @@ -243,6 +259,10 @@ #define HAVE_STDINT_H 0 #endif +#ifndef HAVE_STDNORETURN_H +#define HAVE_STDNORETURN_H 0 +#endif + #ifndef HAVE_STRSTR #define HAVE_STRSTR 0 #endif @@ -283,6 +303,18 @@ #define HAVE_TIGETSTR 0 #endif +#ifndef HAVE_TIPARM +#define HAVE_TIPARM 0 +#endif + +#ifndef HAVE_TIPARM_S +#define HAVE_TIPARM_S 0 +#endif + +#ifndef HAVE_TISCAN_S +#define HAVE_TISCAN_S 0 +#endif + #ifndef HAVE_TPUTS_SP #define HAVE_TPUTS_SP 0 #endif @@ -299,6 +331,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 @@ -355,6 +391,10 @@ #define NO_LEAKS 0 #endif +#ifndef HAVE__NC_TPARM_ANALYZE +#define HAVE__NC_TPARM_ANALYZE 0 +#endif + /* * Workaround for HPUX */ @@ -391,6 +431,12 @@ #include <curses.h> #endif +#if HAVE_STDNORETURN_H && !defined(NCURSES_VERSION) +#include <stdnoreturn.h> +#undef GCC_NORETURN +#define GCC_NORETURN _Noreturn +#endif + #if !(defined(NCURSES_WGETCH_EVENTS) && defined(NEED_KEY_EVENT)) #undef KEY_EVENT /* reduce compiler-warnings with Visual C++ */ #endif @@ -441,6 +487,13 @@ extern int optind; #include <assert.h> #include <ctype.h> +#if HAVE_STDINT_H +#include <stdint.h> +#define my_intptr_t intptr_t +#else +#define my_intptr_t long +#endif + #if defined(_MSC_VER) #undef popen #define popen(s,n) _popen(s,n) @@ -539,8 +592,12 @@ extern int optind; /* workaround, to build against NetBSD's variant of the form library */ #ifdef HAVE_NETBSD_FORM_H #define form_getyx(form, y, x) y = (int)current_field(form)->cursor_ypos, x = (int)current_field(form)->cursor_xpos -#else +#define form_field_row(field) (field)->form_row +#define form_field_col(field) (field)->form_col +#else /* e.g., SVr4, ncurses */ #define form_getyx(form, y, x) y = (int)(form)->currow, x = (int)(form)->curcol +#define form_field_row(field) (field)->frow +#define form_field_col(field) (field)->fcol #endif /* workaround, to build against NetBSD's variant of the form library */ @@ -685,6 +742,48 @@ extern int optind; #define HELP_KEY_1 '?' #define HELP_KEY_2 KEY_F(1) +/* our "standard" options for getopt, needed for help2man */ +#define OPTS_USAGE 'h' +#define OPTS_VERSION 'V' +#define OPTS_COMMON "hV" +#define USAGE_COMMON \ + "Common options:"\ +," -h show this message"\ +," -V show version of curses" + +#if HAVE_CURSES_VERSION +#define format_version(buffer, size) strcpy(buffer, curses_version()) +#elif defined(NCURSES_VERSION_MAJOR) && defined(NCURSES_VERSION_MINOR) && defined(NCURSES_VERSION_PATCH) +#define format_version(buffer, size) \ + _nc_SPRINTF(buffer, _nc_SLIMIT(size) "ncurses %d.%d.%d", \ + NCURSES_VERSION_MAJOR, \ + NCURSES_VERSION_MINOR, \ + NCURSES_VERSION_PATCH) +#else +#define format_version(buffer, size) strcpy(buffer, "ncurses-examples") +#endif + +#define VERSION_COMMON() \ +static char *version_common(char **argv) { \ + char *base = argv[0]; \ + char *part = strrchr(base, '/'); \ + size_t need = strlen(base) + 80; \ + char *result = malloc(need); \ + if (result != NULL) { \ + if (part++ == NULL) part = base; \ + _nc_SPRINTF(result, _nc_SLIMIT(need) "%.20s: ", part); \ + format_version(result + strlen(result), need - strlen(result)); \ + } \ + return result; \ +} \ +static void show_version(char **argv) { \ + char *value = version_common(argv); \ + if (value != NULL) { \ + puts(value); \ + free(value); \ + } \ +} + /* from nc_string.h, to make this stand alone */ #if HAVE_BSD_STRING_H #include <bsd/string.h> @@ -708,10 +807,18 @@ extern int optind; #define HAVE_SNPRINTF 0 #endif +#ifndef HAVE_STRDUP +#define HAVE_STRDUP 0 +#endif + #ifndef USE_STRING_HACKS #define USE_STRING_HACKS 0 #endif +#ifndef HAVE_STRSTR +#define HAVE_STRSTR 0 +#endif + #ifndef NCURSES_CAST #ifdef __cplusplus extern "C" { @@ -738,10 +845,10 @@ extern "C" { #endif #if USE_STRING_HACKS && HAVE_SNPRINTF -#define _nc_SPRINTF NCURSES_VOID snprintf +#define _nc_SPRINTF NCURSES_VOID (snprintf) #define _nc_SLIMIT(n) NCURSES_CAST(size_t,n), #else -#define _nc_SPRINTF NCURSES_VOID sprintf +#define _nc_SPRINTF NCURSES_VOID (sprintf) #define _nc_SLIMIT(n) /* nothing */ #endif @@ -910,15 +1017,20 @@ extern int TABSIZE; #define UChar(c) ((unsigned char)(c)) +#ifndef SIZEOF #define SIZEOF(table) (sizeof(table)/sizeof(table[0])) +#endif #if defined(NCURSES_VERSION) && HAVE_NC_ALLOC_H #include <nc_alloc.h> -#if HAVE_EXIT_TERMINFO && defined(USE_TINFO) +#if HAVE_EXIT_TERMINFO && !defined(USE_CURSES) && (defined(USE_TERMINFO) || defined(USE_TINFO)) #undef ExitProgram #define ExitProgram(code) exit_terminfo(code) +#elif HAVE_EXIT_CURSES +#undef ExitProgram +#define ExitProgram(code) exit_curses(code) #endif -#else +#else /* not ncurses-tree */ #define typeMalloc(type,n) (type *) malloc((size_t)(n) * sizeof(type)) #define typeCalloc(type,elts) (type *) calloc((size_t)(elts), sizeof(type)) #define typeRealloc(type,n,p) (type *) realloc(p, (size_t)(n) * sizeof(type)) @@ -999,6 +1111,26 @@ extern int TABSIZE; #endif #endif +#if HAVE_CLOCK_GETTIME +# define GetClockTime(t) clock_gettime(CLOCK_REALTIME, t) +# define TimeType struct timespec +# define TimeScale 1000000000L /* 1e9 */ +# define ElapsedSeconds(b,e) \ + (double) (((e)->tv_sec - (b)->tv_sec) \ + + ((e)->tv_nsec - (b)->tv_nsec) / TimeScale) +#elif HAVE_GETTIMEOFDAY +# define GetClockTime(t) gettimeofday(t, 0) +# define TimeType struct timeval +# define TimeScale 1000000L /* 1e6 */ +# define ElapsedSeconds(b,e) \ + (double) (((e)->tv_sec - (b)->tv_sec) \ + + ((e)->tv_usec - (b)->tv_usec) / TimeScale) +#else +# define TimeType time_t +# define GetClockTime(t) time((time_t*)0) +# define ElapsedSeconds(b,e) (double)((e) - (b)) +#endif + /* * Ultrix 3.1 */ @@ -1135,6 +1267,14 @@ extern char *tgoto(char *, int, int); /* available, but not prototyped */ #define CONST_MENUS /* nothing */ #endif +#if defined(NCURSES_CONST) +#define CONST_FMT NCURSES_CONST +#elif defined(PDCURSES) +#define CONST_FMT const +#else +#define CONST_FMT /* nothing */ +#endif + /* * Simplify setting up demo of threading with these macros. */ @@ -1159,7 +1299,7 @@ extern char *tgoto(char *, int, int); /* available, but not prototyped */ #define WANT_USE_SCREEN() extern void _nc_want_use_screen(void) #endif -#if defined(TRACE) && HAVE__TRACEF +#if defined(TRACE) && HAVE__TRACEF && HAVE_CURSES_TRACE #define Trace(p) _tracef p #define USE_TRACE 1 #define START_TRACE() \ diff --git a/test/test_add_wchstr.c b/test/test_add_wchstr.c index e2c8b6677faa..f69e1ddc271a 100644 --- a/test/test_add_wchstr.c +++ b/test/test_add_wchstr.c @@ -1,6 +1,6 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * - * Copyright 2009-2016,2017 Free Software Foundation, Inc. * + * Copyright 2020-2021,2022 Thomas E. Dickey * + * Copyright 2009-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_add_wchstr.c,v 1.27 2020/02/02 23:34:34 tom Exp $ + * $Id: test_add_wchstr.c,v 1.34 2022/12/10 22:28:50 tom Exp $ * * Demonstrate the waddwchstr() and wadd_wch functions. * Thomas Dickey - 2009/9/12 @@ -132,10 +132,11 @@ ChWLen(const wchar_t *source) if (!pass_ctls) { size_t adjust = 0; size_t n; - const char *s; - for (n = 0; n < result; ++n) { - if (source[n] < 256 && (s = unctrl((chtype) source[n])) != 0) { + for (n = 0; source[n] != 0; ++n) { + const char *s; + + if ((source[n] < 256) && (s = unctrl((chtype) source[n])) != 0) { adjust += (strlen(s) - 1); } } @@ -190,7 +191,7 @@ legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length) } static int -ColOf(wchar_t *buffer, int length, int margin) +ColOf(const wchar_t *buffer, int length, int margin) { int n; int result; @@ -541,33 +542,37 @@ recursive_test(int level) } static void -usage(void) +usage(int ok) { static const char *tbl[] = { "Usage: test_add_wchstr [options]" ,"" + ,USAGE_COMMON ,"Options:" - ," -f FILE read data from given file" - ," -n NUM limit string-adds to NUM bytes on ^N replay" - ," -m perform wmove/move separately from add-functions" - ," -p pass-thru control characters without using unctrl()" - ," -w use window-parameter even when stdscr would be implied" + ," -f FILE read data from given file" + ," -n NUM limit string-adds to NUM bytes on ^N replay" + ," -m perform wmove/move separately from add-functions" + ," -p pass-thru control characters without using unctrl()" + ," -w use window-parameter even when stdscr would be implied" }; unsigned n; for (n = 0; n < SIZEOF(tbl); ++n) fprintf(stderr, "%s\n", tbl[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int ch; setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "f:mn:pw")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "f:mn:pw")) != -1) { switch (ch) { case 'f': init_linedata(optarg); @@ -586,13 +591,16 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) case 'w': w_opt = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); recursive_test(0); endwin(); diff --git a/test/test_addchstr.c b/test/test_addchstr.c index 5b2df8ad38aa..cddc31528fc4 100644 --- a/test/test_addchstr.c +++ b/test/test_addchstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 2009-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_addchstr.c,v 1.25 2020/02/02 23:34:34 tom Exp $ + * $Id: test_addchstr.c,v 1.29 2022/12/10 22:28:50 tom Exp $ * * Demonstrate the waddchstr() and waddch functions. * Thomas Dickey - 2009/9/12 @@ -460,33 +460,37 @@ recursive_test(int level) } static void -usage(void) +usage(int ok) { static const char *tbl[] = { "Usage: test_addchstr [options]" ,"" + ,USAGE_COMMON ,"Options:" - ," -f FILE read data from given file" - ," -n NUM limit string-adds to NUM bytes on ^N replay" - ," -m perform wmove/move separately from add-functions" - ," -p pass-thru control characters without using unctrl()" - ," -w use window-parameter even when stdscr would be implied" + ," -f FILE read data from given file" + ," -n NUM limit string-adds to NUM bytes on ^N replay" + ," -m perform wmove/move separately from add-functions" + ," -p pass-thru control characters without using unctrl()" + ," -w use window-parameter even when stdscr would be implied" }; unsigned n; for (n = 0; n < SIZEOF(tbl); ++n) fprintf(stderr, "%s\n", tbl[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int ch; setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "f:mn:pw")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "f:mn:pw")) != -1) { switch (ch) { case 'f': init_linedata(optarg); @@ -505,13 +509,16 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) case 'w': w_opt = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); recursive_test(0); endwin(); diff --git a/test/test_addstr.c b/test/test_addstr.c index 67e540a5e151..ba8a90e5cd82 100644 --- a/test/test_addstr.c +++ b/test/test_addstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 2009-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_addstr.c,v 1.16 2020/02/02 23:34:34 tom Exp $ + * $Id: test_addstr.c,v 1.20 2022/12/10 22:28:50 tom Exp $ * * Demonstrate the waddstr() and waddch functions. * Thomas Dickey - 2009/9/12 @@ -375,32 +375,36 @@ recursive_test(int level) } static void -usage(void) +usage(int ok) { static const char *tbl[] = { "Usage: test_addstr [options]" ,"" + ,USAGE_COMMON ,"Options:" - ," -f FILE read data from given file" - ," -n NUM limit string-adds to NUM bytes on ^N replay" - ," -m perform wmove/move separately from add-functions" - ," -w use window-parameter even when stdscr would be implied" + ," -f FILE read data from given file" + ," -n NUM limit string-adds to NUM bytes on ^N replay" + ," -m perform wmove/move separately from add-functions" + ," -w use window-parameter even when stdscr would be implied" }; unsigned n; for (n = 0; n < SIZEOF(tbl); ++n) fprintf(stderr, "%s\n", tbl[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int ch; setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "f:mn:w")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "f:mn:w")) != -1) { switch (ch) { case 'f': init_linedata(optarg); @@ -416,13 +420,16 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) case 'w': w_opt = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); recursive_test(0); endwin(); diff --git a/test/test_addwstr.c b/test/test_addwstr.c index 22cacb91b094..9e51f49df149 100644 --- a/test/test_addwstr.c +++ b/test/test_addwstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2022,2023 Thomas E. Dickey * * Copyright 2009-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_addwstr.c,v 1.17 2020/02/02 23:34:34 tom Exp $ + * $Id: test_addwstr.c,v 1.22 2023/05/27 20:13:10 tom Exp $ * * Demonstrate the waddwstr() and wadd_wch functions. * Thomas Dickey - 2009/9/12 @@ -114,7 +114,7 @@ legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length) } static int -ColOf(wchar_t *buffer, int length, int margin) +ColOf(const wchar_t *const buffer, int length, int margin) { int n; int result; @@ -467,32 +467,36 @@ recursive_test(int level) } static void -usage(void) +usage(int ok) { static const char *tbl[] = { "Usage: test_addwstr [options]" ,"" + ,USAGE_COMMON ,"Options:" - ," -f FILE read data from given file" - ," -n NUM limit string-adds to NUM bytes on ^N replay" - ," -m perform wmove/move separately from add-functions" - ," -w use window-parameter even when stdscr would be implied" + ," -f FILE read data from given file" + ," -n NUM limit string-adds to NUM bytes on ^N replay" + ," -m perform wmove/move separately from add-functions" + ," -w use window-parameter even when stdscr would be implied" }; unsigned n; for (n = 0; n < SIZEOF(tbl); ++n) fprintf(stderr, "%s\n", tbl[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int ch; setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "f:mn:w")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "f:mn:w")) != -1) { switch (ch) { case 'f': init_linedata(optarg); @@ -508,13 +512,16 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) case 'w': w_opt = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); recursive_test(0); endwin(); diff --git a/test/test_arrays.c b/test/test_arrays.c index 7ee25eab59bb..f89cb280f05f 100644 --- a/test/test_arrays.c +++ b/test/test_arrays.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 2007-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_arrays.c,v 1.9 2020/02/02 23:34:34 tom Exp $ + * $Id: test_arrays.c,v 1.13 2022/12/10 23:23:27 tom Exp $ * * Author: Thomas E Dickey * @@ -135,37 +135,41 @@ dump_table(void) } static void -usage(void) +usage(int ok) { static const char *msg[] = { - "Usage: test_arrays [options]", - "", - "If no options are given, print all (boolean, numeric, string)", - "capability names showing their index within the tables.", - "", - "Options:", - " -C print termcap names", - " -T print terminfo names", - " -c print termcap names", - " -f print full terminfo names", - " -n print short terminfo names", - " -t print the result as CSV table", + "Usage: test_arrays [options]" + ,"" + ,"If no options are given, print all (boolean, numeric, string)" + ,"capability names showing their index within the tables." + ,"" + ,USAGE_COMMON + ,"Options:" + ," -C print termcap names" + ," -T print terminfo names" + ," -c print termcap names" + ," -f print full terminfo names" + ," -n print short terminfo names" + ," -t print the result as CSV table" }; unsigned n; for (n = 0; n < SIZEOF(msg); ++n) { fprintf(stderr, "%s\n", msg[n]); } - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { - int n; + int ch; - while ((n = getopt(argc, argv, "CTcfnt")) != -1) { - switch (n) { + while ((ch = getopt(argc, argv, OPTS_COMMON "CTcfnt")) != -1) { + switch (ch) { case 'C': opt_C = TRUE; break; @@ -184,13 +188,16 @@ main(int argc, char *argv[]) case 't': opt_t = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); if (!(opt_T || opt_C)) { opt_T = opt_C = TRUE; @@ -210,7 +217,7 @@ main(int argc, char *argv[]) #else int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(void) { printf("This program requires the terminfo arrays\n"); ExitProgram(EXIT_FAILURE); @@ -218,7 +225,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) #endif #else /* !HAVE_TIGETSTR */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(void) { printf("This program requires the terminfo functions such as tigetstr\n"); ExitProgram(EXIT_FAILURE); diff --git a/test/test_delwin.c b/test/test_delwin.c new file mode 100644 index 000000000000..09ef5c538e4e --- /dev/null +++ b/test/test_delwin.c @@ -0,0 +1,151 @@ +/**************************************************************************** + * Copyright 2022,2023 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_delwin.c,v 1.5 2023/05/27 20:34:51 tom Exp $ + */ +#include <test.priv.h> + +#define STATUS 10 + +static SCREEN *my_screen; + +static void +show_rc(const char *what, const char *explain, int rc) +{ + printw("%s : %d (%s)\n", what, rc, explain); +} + +static void +next_step(WINDOW *win) +{ + int ch = wgetch(win); + if (ch == QUIT || ch == ESCAPE) { + endwin(); + /* use this to verify if delscreen frees all memory */ + delscreen(my_screen); + exit(EXIT_FAILURE); + } +} + +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: test_delwin [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + +int +main(int argc, char **argv) +{ + WINDOW *parent, *child1; + int rc; + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); + + if ((my_screen = newterm(NULL, stdout, stdin)) == NULL) + ExitProgram(EXIT_FAILURE); + + noecho(); + cbreak(); + + refresh(); + wsetscrreg(stdscr, 0, STATUS - 1); + scrollok(stdscr, TRUE); + + parent = newwin(0, 0, STATUS, 0); + box(parent, 0, 0); + wrefresh(parent); + next_step(parent); + + printw("New window %p %s\n", (void *) parent, "Top window"); + mvwprintw(parent, 1, 1, "Top window"); + wrefresh(parent); + next_step(stdscr); + + child1 = derwin(parent, LINES - STATUS - 4, COLS - 4, 2, 2); + box(child1, 0, 0); + mvwprintw(child1, 1, 1, "Sub window"); + wrefresh(child1); + + printw("Sub window %p %s\n", (void *) child1, "Hello world!"); + next_step(stdscr); + + show_rc("Deleted parent", + "should fail, it still has a subwindow", + delwin(parent)); + next_step(stdscr); + show_rc("Deleted child1", + "should succeed", + rc = delwin(child1)); + next_step(stdscr); + if (rc == OK) { + wclrtobot(parent); + box(parent, 0, 0); + next_step(parent); + } + show_rc("Deleted parent", + "should succeed, it has no subwindow now", + rc = delwin(parent)); + next_step(stdscr); + if (rc == OK) { + touchwin(stdscr); + next_step(stdscr); + } + show_rc("Deleted parent", + "should fail, may dump core", + delwin(parent)); + next_step(stdscr); + endwin(); + ExitProgram(EXIT_SUCCESS); +} diff --git a/test/test_endwin.c b/test/test_endwin.c new file mode 100644 index 000000000000..8e0d283cd2cc --- /dev/null +++ b/test/test_endwin.c @@ -0,0 +1,132 @@ +/**************************************************************************** + * Copyright 2023 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_endwin.c,v 1.2 2023/11/10 15:17:19 tom Exp $ + */ +#include <test.priv.h> + +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: test_endwin [options]" + ,"" + ,"Options:" + ," -e call endwin() an extra time" + ," -i call initscr() before endwin()" + ," -n call newterm() before endwin()" + ," -r call refresh() before endwin()" + ," -s call getch() after endwin(), to refresh screen" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + +#define status(opt,name,rc) if (opt) printf(" %s: %s", name, (rc) == OK ? "OK" : "ERR") + +int +main(int argc, char *argv[]) +{ + int ch; + int rc_r = OK; + int rc_e1 = OK; + int rc_e2 = OK; + int rc_e3 = OK; + SCREEN *sp = NULL; + bool opt_e = FALSE; + bool opt_i = FALSE; + bool opt_n = FALSE; + bool opt_r = FALSE; + bool opt_s = FALSE; + + while ((ch = getopt(argc, argv, "einrs" OPTS_COMMON)) != -1) { + switch (ch) { + case 'e': + opt_e = TRUE; + break; + case 'i': + opt_i = TRUE; + break; + case 'n': + opt_n = TRUE; + break; + case 'r': + opt_r = TRUE; + break; + case 's': + opt_s = TRUE; + break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); + if (opt_i && opt_n) + usage(TRUE); + + if (opt_i) { + initscr(); + } else if (opt_n) { + sp = newterm(NULL, stdout, stdin); + } + if (opt_r) { + rc_r = refresh(); + } + rc_e1 = endwin(); + if (opt_e) { + rc_e2 = endwin(); + } + if (opt_s) { + getch(); + rc_e3 = endwin(); + } + printf("status:"); + status(opt_i, "initscr(-i)", OK); + status(opt_n, "newterm(-n)", (sp != NULL) ? OK : ERR); + status(opt_r, "refresh(-r)", rc_r); + status(TRUE, "endwin", rc_e1); + status(opt_e, "endwin(-e)", rc_e2); + status(opt_s, "endwin(-s)", rc_e3); + printf("\n"); + ExitProgram(EXIT_SUCCESS); +} diff --git a/test/test_get_wstr.c b/test/test_get_wstr.c index bc86030c12c4..2a788fce8dfa 100644 --- a/test/test_get_wstr.c +++ b/test/test_get_wstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 2007-2011,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_get_wstr.c,v 1.12 2020/02/02 23:34:34 tom Exp $ + * $Id: test_get_wstr.c,v 1.14 2022/12/10 23:59:13 tom Exp $ * * Author: Thomas E Dickey * @@ -355,18 +355,48 @@ recursive_test(int level, char **argv, WINDOW *strwin) return TRUE; } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: test_get_wstr [options] [file1 [...]]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int main(int argc, char *argv[]) { WINDOW *chrbox; WINDOW *strwin; + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } setlocale(LC_ALL, ""); - if (argc < 2) { - fprintf(stderr, "usage: %s file\n", argv[0]); - return EXIT_FAILURE; - } + if (optind + 1 > argc) + usage(FALSE); initscr(); @@ -376,7 +406,7 @@ main(int argc, char *argv[]) strwin = derwin(chrbox, 4, COLS - 2, 1, 1); - recursive_test(1, argv, strwin); + recursive_test(optind, argv, strwin); endwin(); ExitProgram(EXIT_SUCCESS); diff --git a/test/test_getstr.c b/test/test_getstr.c index 0910a041e42b..dbc0a0a271ed 100644 --- a/test/test_getstr.c +++ b/test/test_getstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 2007-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_getstr.c,v 1.14 2020/02/02 23:34:34 tom Exp $ + * $Id: test_getstr.c,v 1.16 2022/12/10 23:58:37 tom Exp $ * * Author: Thomas E Dickey * @@ -362,18 +362,48 @@ recursive_test(int level, char **argv, WINDOW *strwin) return TRUE; } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: test_getstr [options] [file1 [...]]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int main(int argc, char *argv[]) { WINDOW *chrbox; WINDOW *strwin; + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } setlocale(LC_ALL, ""); - if (argc < 2) { - fprintf(stderr, "usage: %s file\n", argv[0]); - return EXIT_FAILURE; - } + if (optind + 1 > argc) + usage(FALSE); initscr(); @@ -383,7 +413,7 @@ main(int argc, char *argv[]) strwin = derwin(chrbox, 4, COLS - 2, 1, 1); - recursive_test(1, argv, strwin); + recursive_test(optind, argv, strwin); endwin(); ExitProgram(EXIT_SUCCESS); diff --git a/test/test_instr.c b/test/test_instr.c index f04d8a3dadef..c87bdd707212 100644 --- a/test/test_instr.c +++ b/test/test_instr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 2007-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_instr.c,v 1.10 2020/02/02 23:34:34 tom Exp $ + * $Id: test_instr.c,v 1.12 2022/12/10 23:58:01 tom Exp $ * * Author: Thomas E Dickey * @@ -232,19 +232,49 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) return TRUE; } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: test_instr [options] [file1 [...]]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int main(int argc, char *argv[]) { WINDOW *chrbox; WINDOW *chrwin; WINDOW *strwin; + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } setlocale(LC_ALL, ""); - if (argc < 2) { - fprintf(stderr, "usage: %s file\n", argv[0]); - return EXIT_FAILURE; - } + if (optind + 1 > argc) + usage(FALSE); initscr(); @@ -255,7 +285,7 @@ main(int argc, char *argv[]) chrwin = derwin(chrbox, 2, COLS - 2, 1, 1); strwin = derwin(chrbox, 2, COLS - 2, 3, 1); - recursive_test(1, argv, chrwin, strwin); + recursive_test(optind, argv, chrwin, strwin); endwin(); ExitProgram(EXIT_SUCCESS); diff --git a/test/test_inwstr.c b/test/test_inwstr.c index 81ebda776a38..c22add7b8fa9 100644 --- a/test/test_inwstr.c +++ b/test/test_inwstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 2007-2010,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_inwstr.c,v 1.6 2020/02/02 23:34:34 tom Exp $ + * $Id: test_inwstr.c,v 1.8 2022/12/10 23:56:39 tom Exp $ * * Author: Thomas E Dickey * @@ -232,19 +232,49 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin) return TRUE; } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: test_inwstr [options] [file1 [...]]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int main(int argc, char *argv[]) { WINDOW *chrbox; WINDOW *chrwin; WINDOW *strwin; + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } setlocale(LC_ALL, ""); - if (argc < 2) { - fprintf(stderr, "usage: %s file\n", argv[0]); - return EXIT_FAILURE; - } + if (optind + 1 > argc) + usage(FALSE); initscr(); @@ -255,7 +285,7 @@ main(int argc, char *argv[]) chrwin = derwin(chrbox, 2, COLS - 2, 1, 1); strwin = derwin(chrbox, 2, COLS - 2, 3, 1); - recursive_test(1, argv, chrwin, strwin); + recursive_test(optind, argv, chrwin, strwin); endwin(); ExitProgram(EXIT_SUCCESS); diff --git a/test/test_mouse.c b/test/test_mouse.c new file mode 100644 index 000000000000..5508ea42f503 --- /dev/null +++ b/test/test_mouse.c @@ -0,0 +1,284 @@ +/**************************************************************************** + * Copyright 2022-2023,2024 Thomas E. Dickey * + * Copyright 2022 Leonid S. Usov <leonid.s.usov at gmail.com> * + * * + * 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. * + ****************************************************************************/ +/* + * $Id: test_mouse.c,v 1.31 2024/03/30 20:45:31 tom Exp $ + * + * Author: Leonid S Usov + * + * Observe mouse events in the raw terminal or parsed ncurses modes + */ + +#include <test.priv.h> + +#if defined(NCURSES_MOUSE_VERSION) && !defined(_NC_WINDOWS) + +static int logoffset = 0; + +static void +raw_loop(void) +{ + char *xtermcap; + + printf("Entering raw mode. Ctrl-c to quit.\n"); + + newterm(NULL, stdout, stdin); + raw(); + xtermcap = tigetstr("XM"); + if (!VALID_STRING(xtermcap)) { + fprintf(stderr, "couldn't get XM terminfo"); + return; + } + + putp(tgoto(xtermcap, 1, 1)); + fflush(stdout); + + while (1) { + int c = getc(stdin); + const char *pretty; + + if (c == -1 || c == '\003') { + break; + } else if (c == '\033') { + printf("\r\n\\E"); + } else if ((pretty = unctrl((chtype) c)) != NULL) { + printf("%s", pretty); + } else if (isprint(c)) { + printf("%c", c); + } else { + printf("{%x}", UChar(c)); + } + } + + putp(tgoto(xtermcap, 0, 0)); + fflush(stdout); + noraw(); +} + +static void logw(const char *fmt, ...) GCC_PRINTFLIKE(1, 2); + +static void +logw(const char *fmt, ...) +{ + int row = getcury(stdscr); + va_list args; + + va_start(args, fmt); + wmove(stdscr, row++, 0); + vw_printw(stdscr, fmt, args); + va_end(args); + + clrtoeol(); + + row %= (getmaxy(stdscr) - logoffset); + if (row < logoffset) { + row = logoffset; + } + + wmove(stdscr, row, 0); + wprintw(stdscr, ">"); + clrtoeol(); +} + +static void +cooked_loop(char *my_environ, int interval) +{ + MEVENT event; + + initscr(); + noecho(); + cbreak(); /* Line buffering disabled; pass everything */ + nonl(); + keypad(stdscr, TRUE); + + /* Get all the mouse events */ + mousemask(ALL_MOUSE_EVENTS | REPORT_MOUSE_POSITION, NULL); + mouseinterval(interval); + + logw("Ctrl-c to quit"); + logw("--------------"); + if (my_environ) + logw("%s", my_environ); + logoffset = getcury(stdscr); + + while (1) { + int c = getch(); + + switch (c) { + case KEY_MOUSE: + if (getmouse(&event) == OK) { + unsigned btn; + mmask_t events; +#if NCURSES_MOUSE_VERSION > 1 + const unsigned max_btn = 5; +#else + const unsigned max_btn = 4; +#endif + const mmask_t btn_mask = (NCURSES_BUTTON_RELEASED | + NCURSES_BUTTON_PRESSED | + NCURSES_BUTTON_CLICKED | + NCURSES_DOUBLE_CLICKED | + NCURSES_TRIPLE_CLICKED); + bool found = FALSE; + for (btn = 1; btn <= max_btn; btn++) { + events = (mmask_t) (event.bstate + & NCURSES_MOUSE_MASK(btn, btn_mask)); + if (events == 0) + continue; +#define ShowQ(btn,name) \ + (((event.bstate & NCURSES_MOUSE_MASK(btn, NCURSES_ ## name)) != 0) \ + ? (" " #name) \ + : "") +#define ShowM(name) \ + (((event.bstate & NCURSES_MOUSE_MASK(btn, BUTTON_ ## name)) != 0) \ + ? (" " #name) \ + : "") +#define ShowP() \ + ((event.bstate & REPORT_MOUSE_POSITION) != 0 \ + ? " position" \ + : "") + logw("[%08lX] button %d%s%s%s%s%s%s%s%s%s @ %d, %d", + (unsigned long) events, + btn, + ShowQ(btn, BUTTON_RELEASED), + ShowQ(btn, BUTTON_PRESSED), + ShowQ(btn, BUTTON_CLICKED), + ShowQ(btn, DOUBLE_CLICKED), + ShowQ(btn, TRIPLE_CLICKED), + ShowM(SHIFT), + ShowM(CTRL), + ShowM(ALT), + ShowP(), + event.y, event.x); + found = TRUE; + } + /* + * A position report need not have a button associated with it. + * The modifiers probably are unused. + */ + if (!found && (event.bstate & REPORT_MOUSE_POSITION)) { + logw("[%08lX]%s%s%s%s @ %d, %d", + (unsigned long) events, + ShowM(SHIFT), + ShowM(CTRL), + ShowM(ALT), + ShowP(), + event.y, event.x); + } + } + break; + case '\003': + goto end; + default: + logw("got another char: 0x%x", UChar(c)); + } + refresh(); + } + end: + endwin(); +} + +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: test_mouse [options]" + ,"" + ,"Test mouse events. These examples for $TERM demonstrate xterm" + ,"features:" + ," xterm" + ," xterm-1002" + ," xterm-1003" + ,"" + ,USAGE_COMMON + ,"Options:" + ," -r show raw input stream, injecting a new line before every ESC" + ," -i n set mouse interval to n; default is 0 (no double-clicks)" + ," -T term use terminal description other than $TERM" + }; + unsigned n; + for (n = 0; n < sizeof(msg) / sizeof(char *); ++n) { + fprintf(stderr, "%s\n", msg[n]); + } + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + +int +main(int argc, char *argv[]) +{ + bool rawmode = FALSE; + int interval = 0; + int ch; + size_t my_len; + char *my_environ = NULL; + const char *term_format = "TERM=%s"; + + while ((ch = getopt(argc, argv, OPTS_COMMON "i:rT:")) != -1) { + switch (ch) { + case 'i': + interval = atoi(optarg); + break; + case 'r': + rawmode = TRUE; + break; + case 'T': + my_len = strlen(term_format) + strlen(optarg) + 1; + my_environ = malloc(my_len); + if (my_environ != NULL) { + _nc_SPRINTF(my_environ, _nc_SLIMIT(my_len) term_format, optarg); + putenv(my_environ); + } + break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) { + usage(FALSE); + ExitProgram(EXIT_FAILURE); + } + + if (rawmode) { + raw_loop(); + } else { + cooked_loop(my_environ, interval); + } + + ExitProgram(EXIT_SUCCESS); +} +#else +int +main(void) +{ + printf("This program requires the ncurses library\n"); + ExitProgram(EXIT_FAILURE); +} +#endif diff --git a/test/test_opaque.c b/test/test_opaque.c index 8e19a8c29cc4..09b98c009019 100644 --- a/test/test_opaque.c +++ b/test/test_opaque.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2021,2022 Thomas E. Dickey * * Copyright 2007-2008,2009 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_opaque.c,v 1.10 2020/02/02 23:34:34 tom Exp $ + * $Id: test_opaque.c,v 1.15 2022/12/11 00:03:10 tom Exp $ * * Author: Thomas E Dickey * @@ -45,6 +45,9 @@ bool is_scrollok(const WINDOW *win); bool is_syncok(const WINDOW *win); int wgetscrreg (const WINDOW *, int *, int *); + bool is_pad(const WINDOW *win); + bool is_subwin(const WINDOW *win); + int wgetdelay(const WINDOW *win); */ #include <test.priv.h> @@ -52,7 +55,7 @@ #define BASE_Y 6 #define MAX_COLS 1024 -#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20080119) && NCURSES_EXT_FUNCS +#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20090906) && NCURSES_EXT_FUNCS && NCURSES_OPAQUE static bool Quit(int ch) @@ -209,6 +212,8 @@ static struct { }; /* *INDENT-ON* */ +#define bool2c(c) ((c) ? 'T' : 'F') + /* * Display and/or allow update for the properties accessed in the opaque * window. Some may change state after refreshing the window, so we @@ -227,18 +232,35 @@ show_opaque(WINDOW *stswin, WINDOW *txtwin, bool before, int active) show_keyword(stswin, n, active, bool_funcs[n].name); to_result(stswin, n, before); - wprintw(stswin, "%c", bool_funcs[n].func(txtwin, -1) ? 'T' : 'F'); + wprintw(stswin, "%c", bool2c(bool_funcs[n].func(txtwin, -1))); } + show_keyword(stswin, n, active, "is_pad"); + to_result(stswin, n, TRUE); + wprintw(stswin, "%c", bool2c(is_pad(txtwin))); + + ++n; + show_keyword(stswin, n, active, "is_subwin"); + to_result(stswin, n, TRUE); + wprintw(stswin, "%c", bool2c(is_subwin(txtwin))); + + ++n; show_keyword(stswin, n, active, "wgetparent"); to_result(stswin, n, TRUE); wprintw(stswin, "%p", (void *) wgetparent(txtwin)); ++n; + show_keyword(stswin, n, active, "wgetdelay"); + to_result(stswin, n, TRUE); + wprintw(stswin, "%d", wgetdelay(txtwin)); + + ++n; show_keyword(stswin, n, active, "wgetscrreg"); to_result(stswin, n, TRUE); if (wgetscrreg(txtwin, &top, &bottom) == OK) wprintw(stswin, "%d,%d", top, bottom); + else + wprintw(stswin, "none"); wnoutrefresh(stswin); return active; @@ -432,18 +454,48 @@ test_set_tabsize(void) set_tabsize(save_tabsize); } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: test_opaque [options] file1 [file2 [...]]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int main(int argc, char *argv[]) { WINDOW *stsbox; WINDOW *stswin; + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } setlocale(LC_ALL, ""); - if (argc < 2) { - fprintf(stderr, "usage: %s file\n", argv[0]); - return EXIT_FAILURE; - } + if (optind + 1 > argc) + usage(FALSE); initscr(); @@ -457,7 +509,7 @@ main(int argc, char *argv[]) stswin = derwin(stsbox, BASE_Y - 2, COLS - 2, 1, 1); keypad(stswin, TRUE); - test_opaque(1, argv, stswin); + test_opaque(optind, argv, stswin); endwin(); ExitProgram(EXIT_SUCCESS); diff --git a/test/test_setupterm.c b/test/test_setupterm.c index 9d582aa0ad55..24d7c46c7773 100644 --- a/test/test_setupterm.c +++ b/test/test_setupterm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2022,2023 Thomas E. Dickey * * Copyright 2015,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: test_setupterm.c,v 1.10 2020/02/02 23:34:34 tom Exp $ + * $Id: test_setupterm.c,v 1.17 2023/06/24 14:19:52 tom Exp $ * * A simple demo of setupterm/restartterm. */ @@ -43,6 +43,55 @@ static bool f_opt = FALSE; static bool n_opt = FALSE; static bool r_opt = FALSE; +#if NO_LEAKS +static TERMINAL **saved_terminals; +static size_t num_saved; +static size_t max_saved; + +static void +failed(const char *msg) +{ + perror(msg); + ExitProgram(EXIT_FAILURE); +} + +static void +finish(int code) +{ + size_t n; + for (n = 0; n < num_saved; ++n) + del_curterm(saved_terminals[n]); + free(saved_terminals); + ExitProgram(code); +} + +static void +save_curterm(void) +{ + size_t n; + bool found = FALSE; + for (n = 0; n < num_saved; ++n) { + if (saved_terminals[n] == cur_term) { + found = TRUE; + break; + } + } + if (!found) { + if (num_saved + 1 >= max_saved) { + max_saved += 100; + saved_terminals = typeRealloc(TERMINAL *, max_saved, saved_terminals); + if (saved_terminals == NULL) + failed("realloc"); + } + saved_terminals[num_saved++] = cur_term; + } +} + +#else +#define finish(code) ExitProgram(code) +#define save_curterm() /* nothing */ +#endif + static void test_rc(NCURSES_CONST char *name, int actual_rc, int actual_err) { @@ -104,40 +153,46 @@ test_setupterm(NCURSES_CONST char *name) #endif rc = setupterm(name, 0, f_opt ? NULL : &err); test_rc(name, rc, err); + save_curterm(); } static void -usage(void) +usage(int ok) { static const char *msg[] = { - "Usage: test_setupterm [options] [terminal]", - "", - "Demonstrate error-checking for setupterm and restartterm.", - "", - "Options:", - " -a automatic test for each success/error code", - " -f treat errors as fatal", - " -n set environment to disable terminfo database, assuming", - " the compiled-in paths for database also fail", + "Usage: test_setupterm [options] [terminal]" + ,"" + ,USAGE_COMMON + ,"Demonstrate error-checking for setupterm and restartterm." + ,"" + ,"Options:" + ," -a automatic test for each success/error code" + ," -f treat errors as fatal" + ," -n set environment to disable terminfo database, assuming" + ," the compiled-in paths for database also fail" #if HAVE_RESTARTTERM - " -r test restartterm rather than setupterm", + ," -r test restartterm rather than setupterm" #endif }; unsigned n; for (n = 0; n < SIZEOF(msg); ++n) { fprintf(stderr, "%s\n", msg[n]); } - ExitProgram(EXIT_FAILURE); + finish(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { + int ch; int n; - while ((n = getopt(argc, argv, "afnr")) != -1) { - switch (n) { + while ((ch = getopt(argc, argv, OPTS_COMMON "afnr")) != -1) { + switch (ch) { case 'a': a_opt = TRUE; break; @@ -152,9 +207,12 @@ main(int argc, char *argv[]) r_opt = TRUE; break; #endif + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } @@ -182,13 +240,14 @@ main(int argc, char *argv[]) if (r_opt) { newterm("ansi", stdout, stdin); reset_shell_mode(); + save_curterm(); } if (a_opt) { static char predef[][9] = {"vt100", "dumb", "lpr", "unknown", "none-such"}; if (optind < argc) { - usage(); + usage(FALSE); } for (n = 0; n < 4; ++n) { test_setupterm(predef[n]); @@ -203,12 +262,12 @@ main(int argc, char *argv[]) } } - ExitProgram(EXIT_SUCCESS); + finish(EXIT_SUCCESS); } #else /* !HAVE_TIGETSTR */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(void) { printf("This program requires the terminfo functions such as tigetstr\n"); ExitProgram(EXIT_FAILURE); diff --git a/test/test_sgr.c b/test/test_sgr.c index aeb833cf9e10..8763dca3cd34 100644 --- a/test/test_sgr.c +++ b/test/test_sgr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2022,2023 Thomas E. Dickey * * Copyright 2015-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ /* * Author: Thomas E. Dickey * - * $Id: test_sgr.c,v 1.15 2020/02/02 23:34:34 tom Exp $ + * $Id: test_sgr.c,v 1.22 2023/05/27 20:13:10 tom Exp $ * * A simple demo of the sgr/sgr0 terminal capabilities. */ @@ -38,7 +38,7 @@ #include <test.priv.h> #if !HAVE_TIGETSTR -static void failed(const char *) GCC_NORETURN; +static GCC_NORETURN void failed(const char *); static void failed(const char *msg) @@ -61,7 +61,7 @@ static int db_item; static long total_values; static char * -make_dbitem(char *p, char *q) +make_dbitem(const char *const p, const char *const q) { size_t need = strlen(e_opt) + 2 + (size_t) (p - q); char *result = malloc(need); @@ -116,7 +116,7 @@ next_dbitem(void) db_item++; } } - printf("** %s\n", result); + printf("** %s\n", result ? result : "<null>"); return result; } @@ -305,35 +305,39 @@ brute_force(const char *name) } static void -usage(void) +usage(int ok) { static const char *msg[] = { - "Usage: test_sgr [options] [terminal]", - "", - "Print all distinct combinations of sgr capability.", - "", - "Options:", - " -d LIST colon-separated list of databases to use", - " -e NAME environment variable to set with -d option", - " -n do not initialize terminal, to test error-checking", - " -q quiet (prints only counts)", + "Usage: test_sgr [options] [terminal]" + ,"" + ,"Print all distinct combinations of sgr capability." + ,"" + ,USAGE_COMMON + ,"Options:" + ," -d LIST colon-separated list of databases to use" + ," -e NAME environment variable to set with -d option" + ," -n do not initialize terminal, to test error-checking" + ," -q quiet (prints only counts)" }; unsigned n; for (n = 0; n < SIZEOF(msg); ++n) { fprintf(stderr, "%s\n", msg[n]); } - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) { - int n; + int ch; char *name; - while ((n = getopt(argc, argv, "d:e:nq")) != -1) { - switch (n) { + while ((ch = getopt(argc, argv, OPTS_COMMON "d:e:nq")) != -1) { + switch (ch) { case 'd': d_opt = optarg; break; @@ -346,15 +350,19 @@ main(int argc, char *argv[]) case 'q': q_opt = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } make_dblist(); if (optind < argc) { + int n; for (n = optind; n < argc; ++n) { brute_force(argv[n]); } @@ -376,7 +384,7 @@ main(int argc, char *argv[]) #else /* !HAVE_TIGETSTR */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(void) { failed("This program requires the terminfo functions such as tigetstr"); ExitProgram(EXIT_FAILURE); diff --git a/test/test_termattrs.c b/test/test_termattrs.c index fc22216a675a..ec44cc227544 100644 --- a/test/test_termattrs.c +++ b/test/test_termattrs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,11 +27,12 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_termattrs.c,v 1.3 2020/02/02 23:34:34 tom Exp $ + * $Id: test_termattrs.c,v 1.8 2022/12/10 23:23:27 tom Exp $ * * Demonstrate the termattrs and term_attrs functions. */ +#define USE_CURSES #define USE_TINFO #include <test.priv.h> @@ -117,28 +118,32 @@ test_termattrs(unsigned long value) } static void -usage(void) +usage(int ok) { static const char *tbl[] = { "Usage: test_termattrs [options]" ,"" + ,USAGE_COMMON ,"Options:" - ," -e use stderr (default stdout)" - ," -n do not initialize terminal" - ," -s use setupterm rather than newterm" + ," -e use stderr (default stdout)" + ," -n do not initialize terminal" + ," -s use setupterm rather than newterm" #if USE_WIDEC_SUPPORT - ," -w use term_attrs rather than termattrs" + ," -w use term_attrs rather than termattrs" #endif }; unsigned n; for (n = 0; n < SIZEOF(tbl); ++n) fprintf(stderr, "%s\n", tbl[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int ch; bool no_init = FALSE; @@ -149,7 +154,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) my_fp = stdout; - while ((ch = getopt(argc, argv, "ensw")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "ensw")) != -1) { switch (ch) { case 'e': my_fp = stderr; @@ -165,13 +170,16 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) w_opt = TRUE; break; #endif + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); if (no_init) { START_TRACE(); @@ -191,8 +199,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) #else int -main(int argc GCC_UNUSED, - char *argv[]GCC_UNUSED) +main(void) { fprintf(stderr, "This program requires terminfo\n"); exit(EXIT_FAILURE); diff --git a/test/test_tparm.c b/test/test_tparm.c index 40ffc4fb1d07..50289defdf60 100644 --- a/test/test_tparm.c +++ b/test/test_tparm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2022,2023 Thomas E. Dickey * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -29,19 +29,35 @@ /* * Author: Thomas E. Dickey * - * $Id: test_tparm.c,v 1.4 2020/05/31 00:51:32 tom Exp $ + * $Id: test_tparm.c,v 1.39 2023/11/11 01:00:03 tom Exp $ * - * Exercise tparm, either for all possible capabilities with fixed parameters, - * or one capability with all possible parameters. - * - * TODO: incorporate tic.h and _nc_tparm_analyze - * TODO: optionally test tiparm - * TODO: add checks/logic to handle "%s" in tparm + * Exercise tparm/tiparm, either for all possible capabilities with fixed + * parameters, or one capability with specific combinations of parameters. */ #define USE_TINFO #include <test.priv.h> -static void failed(const char *) GCC_NORETURN; +#if NCURSES_XNAMES +#if HAVE_TERM_ENTRY_H +#include <term_entry.h> +#else +#undef NCURSES_XNAMES +#define NCURSES_XNAMES 0 +#endif +#endif + +#define MAX_PARM 9 + +#define GrowArray(array,limit,length) \ + if (length + 2 >= limit) { \ + limit *= 2; \ + array = typeRealloc(char *, limit, array); \ + if (array == 0) { \ + failed("no memory: " #array); \ + } \ + } + +static GCC_NORETURN void failed(const char *); static void failed(const char *msg) @@ -53,8 +69,43 @@ failed(const char *msg) #if HAVE_TIGETSTR static int a_opt; +static int p_opt; static int v_opt; +#if HAVE_TIPARM +static int i_opt; +#endif + +#if HAVE_TIPARM_S +static int s_opt; +#endif + +/* + * Total tests (and failures): + */ +static long total_tests; +static long total_fails; + +/* + * Total characters formatted for tputs: + */ +static long total_nulls; +static long total_ctrls; +static long total_print; + +static int +output_func(int ch) +{ + if (ch == 0) { + total_nulls++; + } else if (ch < 32 || (ch >= 127 && ch < 160)) { + total_ctrls++; + } else { + total_print++; + } + return ch; +} + static int isNumeric(char *source) { @@ -65,31 +116,40 @@ isNumeric(char *source) return result; } -static char * -validate(const char *name) +static int +relevant(const char *name, const char *value) { - char *value = tigetstr(name); - if (!VALID_STRING(value)) { - if (v_opt > 1) { + int code = 1; + if (VALID_STRING(value)) { + if (strstr(value, "%p") == 0 + && strstr(value, "%d") == 0 + && strstr(value, "%s") == 0 + && (!p_opt || strstr(value, "$<") == 0)) { + if (v_opt > 2) + printf("? %s noparams\n", name); + code = 0; + } + } else { + if (v_opt > 2) { printf("? %s %s\n", (value == ABSENT_STRING) ? "absent" : "cancel", name); } - value = 0; + code = 0; } - return value; + return code; } static int -increment(int *all_parms, int *num_parms, int len_parms, int end_parms) +increment(long *all_parms, int *num_parms, int len_parms, int end_parms) { int rc = 0; int n; - if (len_parms > 9) - len_parms = 9; + if (len_parms > MAX_PARM) + len_parms = MAX_PARM; if (end_parms < len_parms) { if (all_parms[end_parms]++ >= num_parms[end_parms]) { @@ -107,103 +167,298 @@ increment(int *all_parms, int *num_parms, int len_parms, int end_parms) return rc; } +/* parse the format string to determine which positional parameters + * are assumed to be strings. + */ +#if HAVE_TISCAN_S +static int +analyze_format(const char *format, int *mask, char **p_is_s) +{ + int arg_count; + int arg_mask; + int n; + if (tiscan_s(&arg_count, &arg_mask, format) == OK) { + *mask = arg_mask; + for (n = 0; n < MAX_PARM; ++n) { + static char dummy[1]; + p_is_s[n] = (arg_mask & 1) ? dummy : NULL; + arg_mask >>= 1; + } + } else { + *mask = 0; + arg_count = 0; + for (n = 0; n < MAX_PARM; ++n) { + p_is_s[n] = NULL; + } + } + return arg_count; +} +#elif HAVE__NC_TPARM_ANALYZE +extern int _nc_tparm_analyze(TERMINAL *, const char *, char **, int *); + +static int +analyze_format(const char *format, int *mask, char **p_is_s) +{ + int popcount = 0; + int analyzed = _nc_tparm_analyze(cur_term, format, p_is_s, &popcount); + int n; + if (analyzed < popcount) { + analyzed = popcount; + } + *mask = 0; + for (n = 0; n < MAX_PARM; ++n) { + if (p_is_s[n]) + *mask |= (1 << n); + } + return analyzed; +} +#else +/* TODO: make this work without direct use of ncurses internals. */ +static int +analyze_format(const char *format, int *mask, char **p_is_s) +{ + int n; + char *filler = strstr(format, "%s"); + *mask = 0; + for (n = 0; n < MAX_PARM; ++n) { + p_is_s[n] = filler; + } + return n; +} +#endif + +#define NumStr(n) use_strings[n] \ + ? (long) (my_intptr_t) (number[n] \ + ? string[n] \ + : NULL) \ + : number[n] + +#define NS_0(fmt) fmt +#define NS_1(fmt) NS_0(fmt), NumStr(0) +#define NS_2(fmt) NS_1(fmt), NumStr(1) +#define NS_3(fmt) NS_2(fmt), NumStr(2) +#define NS_4(fmt) NS_3(fmt), NumStr(3) +#define NS_5(fmt) NS_4(fmt), NumStr(4) +#define NS_6(fmt) NS_5(fmt), NumStr(5) +#define NS_7(fmt) NS_6(fmt), NumStr(6) +#define NS_8(fmt) NS_7(fmt), NumStr(7) +#define NS_9(fmt) NS_8(fmt), NumStr(8) + static void -test_tparm(const char *name, int *number) +test_tparm(const char *name, const char *format, long *number, char **string) { - char *format = tigetstr(name); - if ((format = validate(name)) != 0) { - char *result = tparm(format, - number[0], - number[1], - number[2], - number[3], - number[4], - number[5], - number[6], - number[7], - number[8]); - if (v_opt > 1) - printf(".. %2d = %2d %2d %2d %2d %2d %2d %2d %2d %2d %s\n", - result != 0 ? (int) strlen(result) : -1, - number[0], - number[1], - number[2], - number[3], - number[4], - number[5], - number[6], - number[7], - number[8], - name); + char *use_strings[MAX_PARM]; + char *result = NULL; + int nparam; + int mask; + + nparam = analyze_format(format, &mask, use_strings); +#if HAVE_TIPARM_S + if (s_opt) { + switch (nparam) { + case 0: + result = tiparm_s(0, mask, NS_0(format)); + break; + case 1: + result = tiparm_s(1, mask, NS_1(format)); + break; + case 2: + result = tiparm_s(2, mask, NS_2(format)); + break; + case 3: + result = tiparm_s(3, mask, NS_3(format)); + break; + case 4: + result = tiparm_s(4, mask, NS_4(format)); + break; + case 5: + result = tiparm_s(5, mask, NS_5(format)); + break; + case 6: + result = tiparm_s(6, mask, NS_6(format)); + break; + case 7: + result = tiparm_s(7, mask, NS_7(format)); + break; + case 8: + result = tiparm_s(8, mask, NS_8(format)); + break; + case 9: + result = tiparm_s(9, mask, NS_9(format)); + break; + } + } else +#endif +#if HAVE_TIPARM + if (i_opt) { + switch (nparam) { + case 0: + result = tiparm(NS_0(format)); + break; + case 1: + result = tiparm(NS_1(format)); + break; + case 2: + result = tiparm(NS_2(format)); + break; + case 3: + result = tiparm(NS_3(format)); + break; + case 4: + result = tiparm(NS_4(format)); + break; + case 5: + result = tiparm(NS_5(format)); + break; + case 6: + result = tiparm(NS_6(format)); + break; + case 7: + result = tiparm(NS_7(format)); + break; + case 8: + result = tiparm(NS_8(format)); + break; + case 9: + result = tiparm(NS_9(format)); + break; + } + } else +#endif + result = tparm(NS_9(format)); + total_tests++; + if (result != NULL) { + tputs(result, 1, output_func); + } else { + total_fails++; + } + if (v_opt > 1) { + int n; + printf(".. %3d =", result != 0 ? (int) strlen(result) : -1); + for (n = 0; n < nparam; ++n) { + if (use_strings[n]) { + if (number[n]) { + printf(" \"%s\"", string[n]); + } else { + printf(" ?"); + } + } else { + printf(" %2ld", number[n]); + } + } + printf(" %s\n", name); } } static void -usage(void) +usage(int ok) { static const char *msg[] = { - "Usage: test_tparm [options] [capability] [value1 [value2 [...]]]", - "", - "Print all distinct combinations of given capability.", - "", - "Options:", - " -T TERM override $TERM; this may be a comma-separated list or \"-\"", - " to read a list from standard-input", - " -a if capability is given, test all combinations of values", - " -r NUM repeat tests NUM times", - " -v show values and results", + "Usage: test_tparm [options] [capability] [value1 [value2 [...]]]" + ,"" + ,"Use tparm/tputs for all distinct combinations of given capability." + ,"" + ,USAGE_COMMON + ,"Options:" + ," -T TERM override $TERM; this may be a comma-separated list or \"-\"" + ," to read a list from standard-input" + ," -a test all combinations of parameters" + ," [value1...] forms a vector of maximum parameter-values." +#if HAVE_TIPARM + ," -i test tiparm rather than tparm" +#endif + ," -p test capabilities with no parameters but having padding" + ," -r NUM repeat tests NUM times" +#if HAVE_TIPARM_S + ," -s test tiparm_s rather than tparm" +#endif + ," -v show values and results" }; unsigned n; for (n = 0; n < SIZEOF(msg); ++n) { fprintf(stderr, "%s\n", msg[n]); } - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } #define PLURAL(n) n, (n != 1) ? "s" : "" #define COLONS(n) (n >= 1) ? ":" : "" +#define NUMFORM "%10ld" +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int main(int argc, char *argv[]) { + int ch; int n; int r_run, t_run, n_run; char *old_term = getenv("TERM"); int r_opt = 1; char *t_opt = 0; - int len_names = 0; /* cur # of items in all_names[] */ - int use_names = 10; /* max # of items in all_names[] */ - char **all_names = typeCalloc(char *, use_names); - int all_parms[10]; /* workspace for "-a" option */ + + int std_caps = 0; /* predefine items in all_caps[] */ + int len_caps = 0; /* cur # of items in all_caps[] */ + int max_caps = 10; /* max # of items in all_caps[] */ + char **all_caps = typeCalloc(char *, max_caps); + + long all_parms[10]; /* workspace for "-a" option */ + int len_terms = 0; /* cur # of items in all_terms[] */ - int use_terms = 10; /* max # of items in all_terms[] */ - char **all_terms = typeCalloc(char *, use_terms); + int max_terms = 10; /* max # of items in all_terms[] */ + char **all_terms = typeCalloc(char *, max_terms); + + int use_caps; + int max_name = 10; /* max # of items in cap_name[] */ + int max_data = 10; /* max # of items in cap_data[] */ + char **cap_name; + char **cap_data; + int len_parms = 0; /* cur # of items in num_parms[], str_parms[] */ - int use_parms = argc + 10; /* max # of items in num_parms[], str_parms[] */ - int *num_parms = typeCalloc(int, use_parms); - char **str_parms = typeCalloc(char *, use_parms); + int max_parms = argc + 10; /* max # of items in num_parms[], str_parms[] */ + int *num_parms = typeCalloc(int, max_parms); + char **str_parms = typeCalloc(char *, max_parms); + long use_parms = 1; - if (all_names == 0 || all_terms == 0 || num_parms == 0 || str_parms == 0) + if (all_caps == 0 || all_terms == 0 || num_parms == 0 || str_parms == 0) failed("no memory"); - while ((n = getopt(argc, argv, "T:ar:v")) != -1) { - switch (n) { + while ((ch = getopt(argc, argv, OPTS_COMMON "T:aipr:sv")) != -1) { + switch (ch) { case 'T': t_opt = optarg; break; case 'a': ++a_opt; break; +#if HAVE_TIPARM + case 'i': + ++i_opt; + break; +#endif + case 'p': + ++p_opt; + break; case 'r': r_opt = atoi(optarg); break; +#if HAVE_TIPARM_S + case 's': + ++s_opt; + break; +#endif case 'v': ++v_opt; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } @@ -213,14 +468,14 @@ main(int argc, char *argv[]) */ if (optind < argc) { if (!isNumeric(argv[optind])) { - all_names[len_names++] = strdup(argv[optind++]); + all_caps[len_caps++] = strdup(argv[optind++]); } } /* * Any remaining arguments must be possible parameter values. If numeric, - * and "-a" is not set, use those as the maximum values within which the - * test parameters should vary. + * and "-a" is not set, use those as the actual values for which the + * capabilities are tested. */ while (optind < argc) { if (isNumeric(argv[optind])) { @@ -232,14 +487,16 @@ main(int argc, char *argv[]) ++optind; ++len_parms; } - for (n = len_parms; n < use_parms; ++n) { + for (n = len_parms; n < max_parms; ++n) { static char dummy[1]; str_parms[n] = dummy; } if (v_opt) { printf("%d parameter%s%s\n", PLURAL(len_parms), COLONS(len_parms)); - for (n = 0; n < len_parms; ++n) { - printf(" %d: %d (%s)\n", n + 1, num_parms[n], str_parms[n]); + if (v_opt > 3) { + for (n = 0; n < len_parms; ++n) { + printf(" %d: %d (%s)\n", n + 1, num_parms[n], str_parms[n]); + } } } @@ -260,9 +517,9 @@ main(int argc, char *argv[]) while (t != s && isspace(UChar(t[-1]))) *--t = '\0'; s = strdup(s); - if (len_terms + 2 >= use_terms) { - use_terms *= 2; - all_terms = typeRealloc(char *, use_terms, all_terms); + if (len_terms + 2 >= max_terms) { + max_terms *= 2; + all_terms = typeRealloc(char *, max_terms, all_terms); if (all_terms == 0) failed("no memory: all_terms"); } @@ -273,9 +530,9 @@ main(int argc, char *argv[]) char *t; while ((t = strtok(s, ",")) != 0) { s = 0; - if (len_terms + 2 >= use_terms) { - use_terms *= 2; - all_terms = typeRealloc(char *, use_terms, all_terms); + if (len_terms + 2 >= max_terms) { + max_terms *= 2; + all_terms = typeRealloc(char *, max_terms, all_terms); if (all_terms == 0) failed("no memory: all_terms"); } @@ -288,8 +545,10 @@ main(int argc, char *argv[]) all_terms[len_terms] = 0; if (v_opt) { printf("%d term%s:\n", PLURAL(len_terms)); - for (n = 0; n < len_terms; ++n) { - printf(" %d: %s\n", n + 1, all_terms[n]); + if (v_opt > 3) { + for (n = 0; n < len_terms; ++n) { + printf(" %d: %s\n", n + 1, all_terms[n]); + } } } @@ -300,34 +559,40 @@ main(int argc, char *argv[]) * TODO: To address the "other" systems which do not follow SVr4, * just use the output from infocmp on $TERM. */ - if (len_names == 0) { + if (len_caps == 0) { #if defined(HAVE_CURSES_DATA_BOOLNAMES) || defined(DECL_CURSES_DATA_BOOLNAMES) for (n = 0; strnames[n] != 0; ++n) { - if (len_names + 2 >= use_names) { - use_names *= 2; - all_names = typeRealloc(char *, use_names, all_names); - if (all_names == 0) { - failed("no memory: all_names"); - } - } - all_names[len_names++] = strdup(strnames[n]); + GrowArray(all_caps, max_caps, len_caps); + all_caps[len_caps++] = strdup(strnames[n]); } #else - all_names[len_names++] = strdup("cup"); - all_names[len_names++] = strdup("sgr"); + all_caps[len_caps++] = strdup("cup"); + all_caps[len_caps++] = strdup("sgr"); #endif } - all_names[len_names] = 0; + std_caps = len_caps; + all_caps[len_caps] = 0; if (v_opt) { - printf("%d name%s%s\n", PLURAL(len_names), COLONS(len_names)); - for (n = 0; n < len_names; ++n) { - printf(" %d: %s\n", n + 1, all_names[n]); + printf("%d name%s%s\n", PLURAL(len_caps), COLONS(len_caps)); + if (v_opt > 3) { + for (n = 0; n < len_caps; ++n) { + printf(" %d: %s\n", n + 1, all_caps[n]); + } } } + cap_name = typeMalloc(char *, (max_name = 1 + len_caps)); + cap_data = typeMalloc(char *, (max_data = 1 + len_caps)); + if (r_opt <= 0) r_opt = 1; + if (a_opt) { + for (n = 0; n < max_parms; ++n) + if (num_parms[n]) + use_parms *= (num_parms[n] + 1); + } + for (r_run = 0; r_run < r_opt; ++r_run) { for (t_run = 0; t_run < len_terms; ++t_run) { int errs; @@ -335,26 +600,70 @@ main(int argc, char *argv[]) if (setupterm(all_terms[t_run], fileno(stdout), &errs) != OK) { printf("** skipping %s (errs:%d)\n", all_terms[t_run], errs); } +#if NCURSES_XNAMES + len_caps = std_caps; + if (cur_term) { + TERMTYPE *term = (TERMTYPE *) cur_term; + for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) { + GrowArray(all_caps, max_caps, len_caps); + GrowArray(cap_name, max_name, len_caps); + GrowArray(cap_data, max_data, len_caps); + all_caps[len_caps++] = strdup(ExtStrname(term, (int) n, strnames)); + } + } +#else + (void) std_caps; +#endif - if (v_opt) - printf("** testing %s\n", all_terms[t_run]); - if (len_names == 1) { - if (a_opt) { - /* for each combination of values */ - memset(all_parms, 0, sizeof(all_parms)); - do { - test_tparm(all_names[0], all_parms); + /* + * Most of the capabilities have no parameters, e.g., they are + * function-keys or simple operations such as clear-display. + * Ignore those, since they do not really exercise tparm. + */ + use_caps = 0; + for (n = 0; n < len_caps; ++n) { + char *value = tigetstr(all_caps[n]); + if (relevant(all_caps[n], value)) { + cap_name[use_caps] = all_caps[n]; + cap_data[use_caps] = value; + use_caps++; + } + } + + if (v_opt) { + printf("[%d:%d] %d paramerized cap%s * %ld test-case%s \"%s\"\n", + r_run + 1, r_opt, + PLURAL(use_caps), + PLURAL(use_parms), + all_terms[t_run]); + } + + memset(all_parms, 0, sizeof(all_parms)); + if (a_opt) { + /* for each combination of values */ + do { + for (n_run = 0; n_run < use_caps; ++n_run) { + test_tparm(cap_name[n_run], + cap_data[n_run], + all_parms, + str_parms); } - while (increment(all_parms, num_parms, len_parms, 0)); - } else { - /* for the given values */ - test_tparm(all_names[0], num_parms); } + while (increment(all_parms, num_parms, len_parms, 0)); } else { - for (n_run = 0; n_run < len_names; ++n_run) { - test_tparm(all_names[n_run], num_parms); + /* for the given values */ + for (n_run = 0; n_run < use_caps; ++n_run) { + test_tparm(cap_name[n_run], + cap_data[n_run], + all_parms, + str_parms); } } +#if NCURSES_XNAMES + for (n = std_caps; n < len_caps; ++n) { + free(all_caps[n]); + } +#endif if (cur_term != 0) { del_curterm(cur_term); } else { @@ -362,11 +671,21 @@ main(int argc, char *argv[]) } } } + + printf("Tests:\n"); + printf(NUMFORM " total\n", total_tests); + if (total_fails) + printf(NUMFORM " failed\n", total_fails); + printf("Characters:\n"); + printf(NUMFORM " nulls\n", total_nulls); + printf(NUMFORM " controls\n", total_ctrls); + printf(NUMFORM " printable\n", total_print); + printf(NUMFORM " total\n", total_nulls + total_ctrls + total_print); #if NO_LEAKS - for (n = 0; n < len_names; ++n) { - free(all_names[n]); + for (n = 0; n < std_caps; ++n) { + free(all_caps[n]); } - free(all_names); + free(all_caps); free(old_term); for (n = 0; n < len_terms; ++n) { free(all_terms[n]); @@ -374,6 +693,8 @@ main(int argc, char *argv[]) free(all_terms); free(num_parms); free(str_parms); + free(cap_name); + free(cap_data); #endif ExitProgram(EXIT_SUCCESS); @@ -381,7 +702,7 @@ main(int argc, char *argv[]) #else /* !HAVE_TIGETSTR */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(void) { failed("This program requires the terminfo functions such as tigetstr"); } diff --git a/test/test_unget_wch.c b/test/test_unget_wch.c new file mode 100644 index 000000000000..58085304c90c --- /dev/null +++ b/test/test_unget_wch.c @@ -0,0 +1,116 @@ +/**************************************************************************** + * 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.4 2022/12/10 23:31:31 tom Exp $ + * + * Demonstrate the unget_wch and unget functions. + */ + +#include <test.priv.h> + +#if USE_WIDEC_SUPPORT && HAVE_UNGET_WCH +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: test_unget_wch [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + +int +main(int argc, char *argv[]) +{ + int step = 0; + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); + + setlocale(LC_ALL, ""); + 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 diff --git a/test/test_vid_puts.c b/test/test_vid_puts.c index 85a7f4ed7696..0d7d7abbe9f0 100644 --- a/test/test_vid_puts.c +++ b/test/test_vid_puts.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2021,2022 Thomas E. Dickey * * Copyright 2013-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_vid_puts.c,v 1.11 2020/02/02 23:34:34 tom Exp $ + * $Id: test_vid_puts.c,v 1.17 2022/12/10 22:28:50 tom Exp $ * * Demonstrate the vid_puts and vid_attr functions. * Thomas Dickey - 2013/01/12 @@ -44,7 +44,7 @@ static bool p_opt = FALSE; static TPUTS_PROTO(outc, c) { - int rc = c; + int rc; rc = putc(c, my_fp); TPUTS_RETURN(rc); @@ -94,32 +94,36 @@ test_vid_puts(void) } static void -usage(void) +usage(int ok) { static const char *tbl[] = { "Usage: test_vid_puts [options]" ,"" + ,USAGE_COMMON ,"Options:" - ," -e use stderr (default stdout)" - ," -n do not initialize terminal" - ," -p use vid_puts (default vid_attr)" + ," -e use stderr (default stdout)" + ," -n do not initialize terminal" + ," -p use vid_puts (default vid_attr)" }; unsigned n; for (n = 0; n < SIZEOF(tbl); ++n) fprintf(stderr, "%s\n", tbl[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int ch; bool no_init = FALSE; my_fp = stdout; - while ((ch = getopt(argc, argv, "enp")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "enp")) != -1) { switch (ch) { case 'e': my_fp = stderr; @@ -130,14 +134,18 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) case 'p': p_opt = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); + setlocale(LC_ALL, ""); if (no_init) { START_TRACE(); } else { diff --git a/test/test_vidputs.c b/test/test_vidputs.c index 355f100989bd..31dc9da4da0f 100644 --- a/test/test_vidputs.c +++ b/test/test_vidputs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2021,2022 Thomas E. Dickey * * Copyright 2013-2014,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_vidputs.c,v 1.10 2020/02/02 23:34:34 tom Exp $ + * $Id: test_vidputs.c,v 1.15 2022/12/10 23:23:27 tom Exp $ * * Demonstrate the vidputs and vidattr functions. * Thomas Dickey - 2013/01/12 @@ -44,7 +44,7 @@ static bool p_opt = FALSE; static TPUTS_PROTO(outc, c) { - int rc = c; + int rc; rc = putc(c, my_fp); TPUTS_RETURN(rc); @@ -94,32 +94,36 @@ test_vidputs(void) } static void -usage(void) +usage(int ok) { static const char *tbl[] = { "Usage: test_vidputs [options]" ,"" + ,USAGE_COMMON ,"Options:" - ," -e use stderr (default stdout)" - ," -n do not initialize terminal" - ," -p use vidputs (default vidattr)" + ," -e use stderr (default stdout)" + ," -n do not initialize terminal" + ," -p use vidputs (default vidattr)" }; unsigned n; for (n = 0; n < SIZEOF(tbl); ++n) fprintf(stderr, "%s\n", tbl[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { int ch; bool no_init = FALSE; my_fp = stdout; - while ((ch = getopt(argc, argv, "enp")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "enp")) != -1) { switch (ch) { case 'e': my_fp = stderr; @@ -130,13 +134,16 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) case 'p': p_opt = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); - break; + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); if (no_init) { START_TRACE(); @@ -150,8 +157,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) #else int -main(int argc GCC_UNUSED, - char *argv[]GCC_UNUSED) +main(void) { fprintf(stderr, "This program requires terminfo\n"); exit(EXIT_FAILURE); diff --git a/test/testaddch.c b/test/testaddch.c index 875c8be7129c..e393c3cc5190 100644 --- a/test/testaddch.c +++ b/test/testaddch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 1998-2013,2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,7 +30,7 @@ * This is an example written by Alexander V. Lukyanov <lav@yars.free.net>, * to demonstrate an inconsistency between ncurses and SVr4 curses. * - * $Id: testaddch.c,v 1.13 2020/02/02 23:34:34 tom Exp $ + * $Id: testaddch.c,v 1.15 2022/12/10 23:44:18 tom Exp $ */ #include <test.priv.h> @@ -41,13 +41,45 @@ attr_addstr(const char *s, chtype a) addch(((unsigned char) (*s++)) | a); } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: testaddch [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int -main( - int argc GCC_UNUSED, - char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { unsigned i; chtype back, set, attr; + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); setlocale(LC_ALL, ""); diff --git a/test/testcurs.c b/test/testcurs.c index f9762b0b328a..750e5a450b1d 100644 --- a/test/testcurs.c +++ b/test/testcurs.c @@ -6,7 +6,7 @@ * wrs(5/28/93) -- modified to be consistent (perform identically) with either * PDCurses or under Unix System V, R4 * - * $Id: testcurs.c,v 1.55 2019/12/14 23:25:29 tom Exp $ + * $Id: testcurs.c,v 1.58 2023/05/28 14:23:34 tom Exp $ */ #include <test.priv.h> @@ -160,7 +160,7 @@ inputTest(WINDOW *win) { int answered; int repeat; - int w, h, bx, by, sw, sh, i, c, num; + int w, h, bx, by, sw, sh, i, num; char buffer[80]; WINDOW *subWin; wclear(win); @@ -238,6 +238,8 @@ inputTest(WINDOW *win) #endif for (;;) { + int c; + wmove(win, 3, 5); c = wgetch(win); wclrtobot(win); @@ -250,11 +252,11 @@ inputTest(WINDOW *win) #ifdef KEY_MOUSE if (c == KEY_MOUSE) { #if defined(NCURSES_MOUSE_VERSION) -#define ButtonChanged(n) ((event.bstate) & NCURSES_MOUSE_MASK(1, 037)) -#define ButtonPressed(n) ((event.bstate) & NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_PRESSED)) -#define ButtonDouble(n) ((event.bstate) & NCURSES_MOUSE_MASK(1, NCURSES_DOUBLE_CLICKED)) -#define ButtonTriple(n) ((event.bstate) & NCURSES_MOUSE_MASK(1, NCURSES_TRIPLE_CLICKED)) -#define ButtonRelease(n) ((event.bstate) & NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_RELEASED)) +#define ButtonChanged(n) ((event.bstate) & NCURSES_MOUSE_MASK(n, (NCURSES_BUTTON_RELEASED|NCURSES_BUTTON_PRESSED|NCURSES_BUTTON_CLICKED|NCURSES_DOUBLE_CLICKED|NCURSES_TRIPLE_CLICKED|NCURSES_RESERVED_EVENT))) +#define ButtonPressed(n) ((event.bstate) & NCURSES_MOUSE_MASK(n, NCURSES_BUTTON_PRESSED)) +#define ButtonDouble(n) ((event.bstate) & NCURSES_MOUSE_MASK(n, NCURSES_DOUBLE_CLICKED)) +#define ButtonTriple(n) ((event.bstate) & NCURSES_MOUSE_MASK(n, NCURSES_TRIPLE_CLICKED)) +#define ButtonRelease(n) ((event.bstate) & NCURSES_MOUSE_MASK(n, NCURSES_BUTTON_RELEASED)) MEVENT event; int button = 0; @@ -355,7 +357,6 @@ inputTest(WINDOW *win) static void outputTest(WINDOW *win) { - WINDOW *win1; char Buffer[80]; chtype ch; int by, bx; @@ -395,7 +396,7 @@ outputTest(WINDOW *win) MvWAddStr(win, 6, 1, "display of at least 24 LINES by 75 COLUMNS"); Continue(win); } else { - win1 = newwin(10, 50, 14, 25); + WINDOW *win1 = newwin(10, 50, 14, 25); if (win1 == NULL) { endwin(); return; @@ -589,9 +590,11 @@ resizeTest(WINDOW *dummy GCC_UNUSED) static void padTest(WINDOW *dummy GCC_UNUSED) { - WINDOW *pad, *spad; + WINDOW *pad; if ((pad = newpad(50, 100)) != 0) { + WINDOW *spad; + wattron(pad, A_REVERSE); MvWAddStr(pad, 5, 2, "This is a new pad"); (void) wattrset(pad, A_NORMAL); @@ -673,17 +676,48 @@ display_menu(int old_option, int new_option) refresh(); } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: testcurs [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int -main( - int argc GCC_UNUSED, - char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { WINDOW *win; - int key; int old_option = (-1); int new_option = 0; bool quit = FALSE; int n; + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); setlocale(LC_ALL, ""); @@ -695,7 +729,10 @@ main( erase(); display_menu(old_option, new_option); + for (;;) { + int key; + #ifdef A_COLOR if (has_colors()) { init_pair(1, COLOR_WHITE, COLOR_BLUE); diff --git a/test/testscanw.c b/test/testscanw.c index 251c464d763c..415250c6edb3 100644 --- a/test/testscanw.c +++ b/test/testscanw.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-2020,2022 Thomas E. Dickey * * Copyright 1998-2002,2006 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -30,15 +30,49 @@ * Date: 1997/03/17 * From: bayern@morpheus.cis.yale.edu * - * $Id: testscanw.c,v 1.13 2020/02/02 23:34:34 tom Exp $ + * $Id: testscanw.c,v 1.15 2022/12/11 00:10:29 tom Exp $ */ #include <test.priv.h> +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: testscanw [options] tokens" + ,"" + ,"Tokens are integers (starting line-number) or k+, k- to turn keypad on/off." + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int main(int argc, char *argv[]) { long badanswer = 1; long *response = &badanswer; + int ch; + + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } setlocale(LC_ALL, ""); @@ -50,12 +84,14 @@ main(int argc, char *argv[]) #if 0 curses_trace(TRACE_UPDATE | TRACE_CALLS); #endif - while (argc > 1) { - if (isdigit(UChar(*argv[1]))) - move(atoi(argv[1]), 0); - else if (!strcmp(argv[1], "-k")) + while (optind < argc) { + char *token = argv[optind++]; + if (isdigit(UChar(*token))) + move(atoi(token), 0); + else if (!strcmp(token, "k+")) keypad(stdscr, TRUE); - argc--, argv++; + else if (!strcmp(token, "k-")) + keypad(stdscr, FALSE); } while (badanswer) { diff --git a/test/tracemunch b/test/tracemunch index cde06e576a02..b2d3b03b216c 100755 --- a/test/tracemunch +++ b/test/tracemunch @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: tracemunch,v 1.40 2021/02/13 19:29:12 tom Exp $ +# $Id: tracemunch,v 1.41 2021/09/04 10:31:03 tom Exp $ ############################################################################## # Copyright 2018-2020,2021 Thomas E. Dickey # # Copyright 1998-2005,2017 Free Software Foundation, Inc. # @@ -744,7 +744,7 @@ sub muncher($) { $_ =~ s/^[^:]*://; } - # Transform window pointer addresses so it's easier to compare logs + # Transform window pointer addresses to make it easier to compare logs $awaiting = "curscr" if ( $_ =~ /creating curscr/ ); $awaiting = "newscr" if ( $_ =~ /creating newscr/ ); $awaiting = "stdscr" if ( $_ =~ /creating stdscr/ ); diff --git a/test/view.c b/test/view.c index e4d746f4d6c5..72e0cfbb6b97 100644 --- a/test/view.c +++ b/test/view.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 2019-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 * @@ -52,7 +52,7 @@ * scroll operation worked, and the refresh() code only had to do a * partial repaint. * - * $Id: view.c,v 1.138 2020/02/02 23:34:34 tom Exp $ + * $Id: view.c,v 1.145 2022/12/04 00:40:11 tom Exp $ */ #include <test.priv.h> @@ -62,7 +62,7 @@ #include <sys/stat.h> #include <time.h> -static void finish(int sig) GCC_NORETURN; +static GCC_NORETURN void finish(int sig); #define my_pair 1 @@ -78,9 +78,7 @@ static int num_lines; static bool n_option = FALSE; #endif -static void usage(void) GCC_NORETURN; - -static void +static GCC_NORETURN void failed(const char *msg) { endwin(); @@ -92,12 +90,10 @@ static int ch_len(NCURSES_CH_T *src) { int result = 0; -#if USE_WIDEC_SUPPORT - int count; -#endif #if USE_WIDEC_SUPPORT for (;;) { + int count; TEST_CCHAR(src, count, { int len = wcwidth(test_wch[0]); result += (len > 0) ? len : 1; @@ -136,7 +132,6 @@ show_all(const char *tag) int i; int digits; char temp[BUFSIZ]; - NCURSES_CH_T *s; time_t this_time; for (digits = 1, i = num_lines; i > 0; i /= 10) { @@ -161,8 +156,10 @@ show_all(const char *tag) scrollok(stdscr, FALSE); /* prevent screen from moving */ for (i = 1; i < LINES; i++) { + NCURSES_CH_T *s; int len; int actual = (int) (lptr + i - vec_lines); + if (actual > num_lines) { if (i < LINES - 1) { int y, x; @@ -189,8 +186,11 @@ show_all(const char *tag) */ { int j; - int width = 1, count; + int width = 1; + for (j = actual = 0; j < shift; ++j) { + int count; + TEST_CCHAR(s + j, count, { width = wcwidth(test_wch[0]); } @@ -257,9 +257,12 @@ read_file(const char *filename) } len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp); - my_blob[sb.st_size] = '\0'; fclose(fp); + if (len > (size_t) sb.st_size) + len = (size_t) sb.st_size; + my_blob[len] = '\0'; + for (pass = 0; pass < 2; ++pass) { char *base = my_blob; k = 0; @@ -273,12 +276,19 @@ read_file(const char *filename) ++k; } } + if (base != (my_blob + j)) { + if (pass) + my_vec[k] = base; + ++k; + } num_lines = k; - if (base != (my_blob + j)) - ++num_lines; - if (!pass && - ((my_vec = typeCalloc(char *, (size_t) k + 2)) == 0)) { - failed("cannot allocate line-vector #1"); + if (pass == 0) { + if (((my_vec = typeCalloc(char *, (size_t) k + 2)) == 0)) { + failed("cannot allocate line-vector #1"); + } + } else { + if (my_vec[0] == NULL) + my_vec[0] = my_blob; } } @@ -366,13 +376,14 @@ read_file(const char *filename) free(my_blob); } -static void -usage(void) +static GCC_NORETURN void +usage(int ok) { static const char *msg[] = { "Usage: view [options] file" ,"" + ,USAGE_COMMON ,"Options:" ," -c use color if terminal supports it" ," -i ignore INT, QUIT, TERM signals" @@ -388,8 +399,11 @@ usage(void) size_t n; for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) @@ -419,6 +433,7 @@ main(int argc, char *argv[]) 0 }; + int ch; int i; int my_delay = 0; NCURSES_CH_T **olptr; @@ -431,8 +446,8 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((i = getopt(argc, argv, "cinstT:")) != -1) { - switch (i) { + while ((ch = getopt(argc, argv, OPTS_COMMON "cinstT:")) != -1) { + switch (ch) { case 'c': try_color = TRUE; break; @@ -453,7 +468,7 @@ main(int argc, char *argv[]) char *next = 0; int tvalue = (int) strtol(optarg, &next, 0); if (tvalue < 0 || (next != 0 && *next != 0)) - usage(); + usage(FALSE); curses_trace((unsigned) tvalue); } break; @@ -461,12 +476,16 @@ main(int argc, char *argv[]) curses_trace(TRACE_CALLS); break; #endif + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); + /* NOTREACHED */ } } if (optind + 1 != argc) - usage(); + usage(FALSE); InitAndCatch(initscr(), ignore_sigs ? SIG_IGN : finish); keypad(stdscr, TRUE); /* enable keyboard mapping */ diff --git a/test/worm.c b/test/worm.c index 6304e4b06a88..7c4842e4004f 100644 --- a/test/worm.c +++ b/test/worm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2020,2022 Thomas E. Dickey * * Copyright 1998-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -53,7 +53,7 @@ traces will be dumped. The program stops and waits for one character of input at the beginning and end of the interval. - $Id: worm.c,v 1.82 2020/02/02 23:34:34 tom Exp $ + $Id: worm.c,v 1.89 2022/12/24 20:46:49 tom Exp $ */ #include <test.priv.h> @@ -107,6 +107,18 @@ static int length = 16, number = 3; static chtype trail = ' '; static unsigned pending; + +#ifdef USE_PTHREADS +#define Locked(statement) { \ + pthread_mutex_lock(&pending_mutex); \ + statement; \ + pthread_mutex_unlock(&pending_mutex); \ + } +pthread_mutex_t pending_mutex; +#else +#define Locked(statement) statement +#endif + #ifdef TRACE static int generation, trace_start, trace_end; #endif /* TRACE */ @@ -248,13 +260,18 @@ draw_worm(WINDOW *win, void *data) WORM *w = (WORM *) data; const struct options *op; unsigned mask = (unsigned) (~(1 << (w - worm))); - chtype attrs = w->attrs | ((mask & pending) ? A_REVERSE : 0); + chtype attrs; int x; int y; int h; bool done = FALSE; + bool is_pending; + + Locked(is_pending = ((mask & pending) != 0)); + + attrs = w->attrs | (is_pending ? A_REVERSE : 0); if ((x = w->xpos[h = w->head]) < 0) { wmove(win, y = w->ypos[h] = last_y, x = w->xpos[h] = 0); @@ -336,9 +353,12 @@ draw_worm(WINDOW *win, void *data) static bool quit_worm(int bitnum) { - pending = (pending | (unsigned) (1 << bitnum)); + Locked(pending = (pending | (unsigned) (1 << bitnum))); + napms(10); /* let the other thread(s) have a chance */ - pending = (pending & (unsigned) ~(1 << bitnum)); + + Locked(pending = (pending & (unsigned) ~(1 << bitnum))); + return quitting; } @@ -348,13 +368,13 @@ start_worm(void *arg) unsigned long compare = 0; Trace(("start_worm")); while (!quit_worm((int) (((struct worm *) arg) - worm))) { - while (compare < sequence) { + for (;;) { + bool done = FALSE; + Locked(done = (compare >= sequence)); + if (done) + break; ++compare; -#if HAVE_USE_WINDOW - use_window(stdscr, draw_worm, arg); -#else - draw_worm(stdscr, arg); -#endif + USING_WINDOW2(stdscr, draw_worm, arg); } } Trace(("...start_worm (done)")); @@ -379,13 +399,7 @@ draw_all_worms(void) } #else for (n = 0, w = &worm[0]; n < number; n++, w++) { - if ( -#if HAVE_USE_WINDOW - USING_WINDOW2(stdscr, draw_worm, w) -#else - draw_worm(stdscr, w) -#endif - ) + if (USING_WINDOW2(stdscr, draw_worm, w)) done = TRUE; } #endif @@ -437,12 +451,13 @@ update_refs(WINDOW *win, void *data) #endif static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: worm [options]" ,"" + ,USAGE_COMMON ,"Options:" #if HAVE_USE_DEFAULT_COLORS ," -d invoke use_default_colors" @@ -461,8 +476,11 @@ usage(void) for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) @@ -479,7 +497,7 @@ main(int argc, char *argv[]) setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "dfl:n:tT:N")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "dfl:n:tT:N")) != -1) { switch (ch) { #if HAVE_USE_DEFAULT_COLORS case 'd': @@ -492,13 +510,13 @@ main(int argc, char *argv[]) case 'l': if ((length = atoi(optarg)) < 2 || length > MAX_LENGTH) { fprintf(stderr, "%s: Invalid length\n", *argv); - usage(); + usage(FALSE); } break; case 'n': if ((number = atoi(optarg)) < 1 || number > MAX_WORMS) { fprintf(stderr, "%s: Invalid number of worms\n", *argv); - usage(); + usage(FALSE); } break; case 't': @@ -507,19 +525,22 @@ main(int argc, char *argv[]) #ifdef TRACE case 'T': if (sscanf(optarg, "%d,%d", &trace_start, &trace_end) != 2) - usage(); + usage(FALSE); break; case 'N': _nc_optimize_enable ^= OPTIMIZE_ALL; /* declared by ncurses */ break; #endif /* TRACE */ + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); /* NOTREACHED */ } } if (optind < argc) - usage(); + usage(FALSE); signal(SIGINT, onsig); initscr(); @@ -603,8 +624,12 @@ main(int argc, char *argv[]) USING_WINDOW1(stdscr, wrefresh, safe_wrefresh); nodelay(stdscr, TRUE); +#ifdef USE_PTHREADS + pthread_mutex_init(&pending_mutex, NULL); +#endif + while (!done) { - ++sequence; + Locked(++sequence); if ((ch = get_input()) > 0) { #ifdef TRACE if (trace_start || trace_end) { @@ -649,6 +674,15 @@ main(int argc, char *argv[]) Trace(("Cleanup")); cleanup(); +#ifdef USE_PTHREADS + /* + * Do this just in case one of the threads did not really exit. + */ + Trace(("join all threads")); + for (n = 0; n < number; n++) { + pthread_join(worm[n].thread, NULL); + } +#endif #if NO_LEAKS for (y = 0; y < max_refs; y++) { free(refs[y]); @@ -659,14 +693,5 @@ main(int argc, char *argv[]) free(w->ypos); } #endif -#ifdef USE_PTHREADS - /* - * Do this just in case one of the threads did not really exit. - */ - Trace(("join all threads")); - for (n = 0; n < number; n++) { - pthread_join(worm[n].thread, NULL); - } -#endif ExitProgram(EXIT_SUCCESS); } diff --git a/test/xmas.c b/test/xmas.c index 78b187c20a3e..9ba3a26c02e0 100644 --- a/test/xmas.c +++ b/test/xmas.c @@ -92,7 +92,7 @@ /******************************************************************************/ /* - * $Id: xmas.c,v 1.34 2019/12/14 23:25:29 tom Exp $ + * $Id: xmas.c,v 1.39 2022/12/04 00:40:11 tom Exp $ */ #include <test.priv.h> @@ -133,7 +133,7 @@ static WINDOW *w_holiday; static WINDOW *w_del_msg; static bool *my_pairs; -static void done(int sig) GCC_NORETURN; +static GCC_NORETURN void done(int sig); static void set_color(WINDOW *win, chtype color) @@ -500,9 +500,6 @@ reindeer(void) y_pos = 0; for (x_pos = 70; x_pos > 62; x_pos--) { - if (x_pos < 62) { - y_pos = 1; - } for (looper = 0; looper < 4; looper++) { MvWAddCh(dotdeer0, y_pos, x_pos, (chtype) '.'); wrefresh(dotdeer0); @@ -649,12 +646,13 @@ done(int sig GCC_UNUSED) } static void -usage(void) +usage(int ok) { static const char *msg[] = { "Usage: xmas [options]" ,"" + ,USAGE_COMMON ,"Options:" #if HAVE_USE_DEFAULT_COLORS ," -d invoke use_default_colors" @@ -666,8 +664,11 @@ usage(void) for (n = 0; n < SIZEOF(msg); n++) fprintf(stderr, "%s\n", msg[n]); - ExitProgram(EXIT_FAILURE); + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); } +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ int main(int argc, char *argv[]) @@ -679,7 +680,7 @@ main(int argc, char *argv[]) #endif bool opt_q = FALSE; - while ((ch = getopt(argc, argv, "dq")) != -1) { + while ((ch = getopt(argc, argv, OPTS_COMMON "dq")) != -1) { switch (ch) { #if HAVE_USE_DEFAULT_COLORS case 'd': @@ -689,8 +690,11 @@ main(int argc, char *argv[]) case 'q': opt_q = TRUE; break; + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); default: - usage(); + usage(ch == OPTS_USAGE); /* NOTREACHED */ } } diff --git a/test/xterm-16color.dat b/test/xterm-16color.dat index 35aa099ede56..075c44b804f1 100644 --- a/test/xterm-16color.dat +++ b/test/xterm-16color.dat @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2021 Thomas E. Dickey # # Copyright 2004-2006,2016 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -26,8 +26,8 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: xterm-16color.dat,v 1.4 2020/02/08 21:38:22 tom Exp $ -# This illustrates the predefined colors for XFree86 xterm's "xterm-16color". +# $Id: xterm-16color.dat,v 1.5 2021/06/17 21:20:30 tom Exp $ +# This illustrates the predefined colors for XFree86 xterm's "xterm-16color". # If you set $TERM to "xterm-88color" (and have xterm compiled to support the # 88-color or 256-color feature), you can use the ncurses 'd' screen to # manipulate the colors shown in the screen. The 'd' screen is limited to |