From a5c6f9c718cc505a4b7e6e30bff23d4ac1adc9f9 Mon Sep 17 00:00:00 2001 From: manjiamu Date: Thu, 23 Apr 2026 14:36:22 +0800 Subject: [PATCH] [Update] upgrade ncurses to 6.6 - replace upstream ncurses sources with version 6.6 - update VERSION file to 6.6 - update ncurses.spec to reference ncurses-6.6.tar.gz - update README.OpenSource with new version and URL - keep original patches for adaptation Signed-off-by: manjiamu --- Ada95/Makefile.in | 23 +- Ada95/aclocal.m4 | 873 +- Ada95/configure | 7618 ++-- Ada95/configure.in | 47 +- Ada95/doc/Makefile.in | 10 +- Ada95/gen/Makefile.in | 77 +- Ada95/gen/adacurses-config.in | 14 +- Ada95/gen/gen.c | 12 +- Ada95/include/Makefile.in | 7 +- Ada95/include/ncurses_cfg.hin | 6 +- Ada95/make-tar.sh | 49 +- Ada95/package/AdaCurses-doc.spec | 9 +- Ada95/package/AdaCurses.spec | 10 +- .../debian/adacurses.lintian-overrides | 4 + .../package/debian/adacurses.triggers | 0 Ada95/package/debian/control | 3 +- Ada95/package/debian/copyright | 131 +- Ada95/package/debian/rules | 54 +- Ada95/package/debian/watch | 2 +- Ada95/samples/Makefile.in | 14 +- Ada95/samples/sample-explanation.adb_p | 8 +- Ada95/samples/sample-menu_demo-handler.adb | 4 +- Ada95/src/Makefile.in | 23 +- Ada95/src/library.gpr.in | 6 +- Ada95/src/modules | 6 +- Ada95/src/terminal_interface-curses-forms.adb | 8 +- Ada95/src/terminal_interface-curses-menus.adb | 8 +- ...inal_interface-curses-panels-user_data.adb | 4 +- MANIFEST | 23 +- Makefile.in | 17 +- Makefile.os2 | 6 +- NEWS | 615 +- README.OpenSource | 4 +- VERSION | 2 +- aclocal.m4 | 1380 +- announce.html.in | 1157 +- c++/Makefile.in | 28 +- c++/cursesapp.cc | 22 +- c++/cursesf.cc | 133 +- c++/cursesf.h | 44 +- c++/cursesm.cc | 116 +- c++/cursesm.h | 44 +- c++/cursesp.cc | 10 +- c++/cursesp.h | 16 +- c++/cursespad.cc | 24 +- c++/cursesw.cc | 42 +- c++/cursesw.h | 10 +- c++/cursslk.cc | 15 +- c++/cursslk.h | 6 +- c++/demo.cc | 20 +- c++/edit_cfg.sh | 6 +- c++/etip.h.in | 41 +- c++/internal.h | 8 +- c++/modules | 20 +- config.guess | 26 +- config.sub | 749 +- configure | 31238 ++++++++-------- configure.in | 318 +- cross_compile_support_ohos.patch | 37 - dist.mk | 12 +- doc/html/Ada95.html | 6 +- doc/html/NCURSES-Programming-HOWTO.html | 4026 +- doc/html/ada/funcs/T.htm | 2 +- .../terminal_interface-curses-forms__adb.htm | 8 +- .../terminal_interface-curses-menus__adb.htm | 8 +- ...interface-curses-panels-user_data__adb.htm | 4 +- ...rminal_interface-curses_constants__ads.htm | 6 +- doc/html/announce.html | 1156 +- doc/html/man/adacursesw6-config.1.html | 19 +- doc/html/man/captoinfo.1m.html | 83 +- doc/html/man/clear.1.html | 24 +- doc/html/man/curs_add_wch.3x.html | 503 +- doc/html/man/curs_add_wchstr.3x.html | 99 +- doc/html/man/curs_addch.3x.html | 374 +- doc/html/man/curs_addchstr.3x.html | 90 +- doc/html/man/curs_addstr.3x.html | 73 +- doc/html/man/curs_addwstr.3x.html | 81 +- doc/html/man/curs_attr.3x.html | 316 +- doc/html/man/curs_beep.3x.html | 53 +- doc/html/man/curs_bkgd.3x.html | 142 +- doc/html/man/curs_bkgrnd.3x.html | 115 +- doc/html/man/curs_border.3x.html | 100 +- doc/html/man/curs_border_set.3x.html | 103 +- doc/html/man/curs_clear.3x.html | 46 +- doc/html/man/curs_color.3x.html | 394 +- doc/html/man/curs_delch.3x.html | 56 +- doc/html/man/curs_deleteln.3x.html | 79 +- doc/html/man/curs_extend.3x.html | 73 +- doc/html/man/curs_get_wch.3x.html | 143 +- doc/html/man/curs_get_wstr.3x.html | 219 +- doc/html/man/curs_getcchar.3x.html | 205 +- doc/html/man/curs_getch.3x.html | 308 +- doc/html/man/curs_getstr.3x.html | 290 +- doc/html/man/curs_getyx.3x.html | 78 +- doc/html/man/curs_in_wch.3x.html | 60 +- doc/html/man/curs_in_wchstr.3x.html | 90 +- doc/html/man/curs_inch.3x.html | 102 +- doc/html/man/curs_inchstr.3x.html | 106 +- doc/html/man/curs_initscr.3x.html | 354 +- doc/html/man/curs_inopts.3x.html | 437 +- doc/html/man/curs_ins_wch.3x.html | 64 +- doc/html/man/curs_ins_wstr.3x.html | 113 +- doc/html/man/curs_insch.3x.html | 50 +- doc/html/man/curs_insstr.3x.html | 113 +- doc/html/man/curs_instr.3x.html | 112 +- doc/html/man/curs_inwstr.3x.html | 124 +- doc/html/man/curs_kernel.3x.html | 247 +- doc/html/man/curs_legacy.3x.html | 34 +- doc/html/man/curs_memleaks.3x.html | 20 +- doc/html/man/curs_mouse.3x.html | 316 +- doc/html/man/curs_move.3x.html | 40 +- doc/html/man/curs_opaque.3x.html | 34 +- doc/html/man/curs_outopts.3x.html | 210 +- doc/html/man/curs_overlay.3x.html | 51 +- doc/html/man/curs_pad.3x.html | 165 +- doc/html/man/curs_print.3x.html | 67 +- doc/html/man/curs_printw.3x.html | 75 +- doc/html/man/curs_refresh.3x.html | 60 +- doc/html/man/curs_scanw.3x.html | 75 +- doc/html/man/curs_scr_dump.3x.html | 105 +- doc/html/man/curs_scroll.3x.html | 81 +- doc/html/man/curs_slk.3x.html | 111 +- doc/html/man/curs_sp_funcs.3x.html | 288 +- doc/html/man/curs_termattrs.3x.html | 122 +- doc/html/man/curs_termcap.3x.html | 284 +- doc/html/man/curs_terminfo.3x.html | 604 +- doc/html/man/curs_threads.3x.html | 55 +- doc/html/man/curs_touch.3x.html | 59 +- doc/html/man/curs_trace.3x.html | 68 +- doc/html/man/curs_util.3x.html | 312 +- doc/html/man/curs_variables.3x.html | 165 +- doc/html/man/curs_window.3x.html | 191 +- doc/html/man/default_colors.3x.html | 26 +- doc/html/man/define_key.3x.html | 57 +- doc/html/man/form.3x.html | 23 +- doc/html/man/form_cursor.3x.html | 14 +- doc/html/man/form_data.3x.html | 14 +- doc/html/man/form_driver.3x.html | 43 +- doc/html/man/form_field.3x.html | 18 +- doc/html/man/form_field_attributes.3x.html | 14 +- doc/html/man/form_field_buffer.3x.html | 28 +- doc/html/man/form_field_info.3x.html | 16 +- doc/html/man/form_field_just.3x.html | 12 +- doc/html/man/form_field_new.3x.html | 22 +- doc/html/man/form_field_opts.3x.html | 32 +- doc/html/man/form_field_userptr.3x.html | 14 +- doc/html/man/form_field_validation.3x.html | 56 +- doc/html/man/form_fieldtype.3x.html | 32 +- doc/html/man/form_hook.3x.html | 22 +- doc/html/man/form_new.3x.html | 20 +- doc/html/man/form_new_page.3x.html | 12 +- doc/html/man/form_opts.3x.html | 16 +- doc/html/man/form_page.3x.html | 14 +- doc/html/man/form_post.3x.html | 12 +- doc/html/man/form_requestname.3x.html | 24 +- doc/html/man/form_userptr.3x.html | 20 +- doc/html/man/form_variables.3x.html | 10 +- doc/html/man/form_win.3x.html | 18 +- doc/html/man/index.html | 69 +- doc/html/man/infocmp.1m.html | 303 +- doc/html/man/infotocap.1m.html | 25 +- doc/html/man/key_defined.3x.html | 41 +- doc/html/man/keybound.3x.html | 49 +- doc/html/man/keyok.3x.html | 53 +- doc/html/man/legacy_coding.3x.html | 45 +- doc/html/man/menu.3x.html | 27 +- doc/html/man/menu_attributes.3x.html | 14 +- doc/html/man/menu_cursor.3x.html | 10 +- doc/html/man/menu_driver.3x.html | 38 +- doc/html/man/menu_format.3x.html | 26 +- doc/html/man/menu_hook.3x.html | 26 +- doc/html/man/menu_items.3x.html | 18 +- doc/html/man/menu_mark.3x.html | 26 +- doc/html/man/menu_new.3x.html | 16 +- doc/html/man/menu_opts.3x.html | 16 +- doc/html/man/menu_pattern.3x.html | 16 +- doc/html/man/menu_post.3x.html | 12 +- doc/html/man/menu_requestname.3x.html | 24 +- doc/html/man/menu_spacing.3x.html | 26 +- doc/html/man/menu_userptr.3x.html | 20 +- doc/html/man/menu_win.3x.html | 18 +- doc/html/man/mitem_current.3x.html | 30 +- doc/html/man/mitem_name.3x.html | 16 +- doc/html/man/mitem_new.3x.html | 14 +- doc/html/man/mitem_opts.3x.html | 16 +- doc/html/man/mitem_userptr.3x.html | 20 +- doc/html/man/mitem_value.3x.html | 12 +- doc/html/man/mitem_visible.3x.html | 10 +- doc/html/man/ncurses.3x.html | 761 +- doc/html/man/ncursesw6-config.1.html | 14 +- doc/html/man/new_pair.3x.html | 48 +- doc/html/man/panel.3x.html | 50 +- doc/html/man/resizeterm.3x.html | 81 +- doc/html/man/scr_dump.5.html | 68 +- doc/html/man/tabs.1.html | 79 +- doc/html/man/term.5.html | 259 +- doc/html/man/term.7.html | 90 +- doc/html/man/term_variables.3x.html | 121 +- doc/html/man/terminfo.5.html | 872 +- doc/html/man/tic.1m.html | 338 +- doc/html/man/toe.1m.html | 49 +- doc/html/man/tput.1.html | 299 +- doc/html/man/tset.1.html | 126 +- doc/html/man/user_caps.5.html | 369 +- doc/html/man/wresize.3x.html | 63 +- doc/html/ncurses-intro.html | 10 +- doc/ncurses-intro.doc | 5 +- form/Makefile.in | 28 +- form/fld_arg.c | 6 +- form/fld_attr.c | 6 +- form/fld_current.c | 12 +- form/fld_def.c | 30 +- form/fld_dup.c | 6 +- form/form.priv.h | 15 +- form/frm_data.c | 8 +- form/frm_driver.c | 91 +- form/frm_post.c | 6 +- form/frm_req_name.c | 6 +- form/frm_sub.c | 15 +- form/frm_win.c | 16 +- form/fty_enum.c | 57 +- form/fty_generic.c | 17 +- form/fty_int.c | 14 +- form/fty_num.c | 16 +- form/fty_regex.c | 8 +- include/Caps | 44 +- include/Caps.aix4 | 26 +- include/Caps.hpux11 | 26 +- include/Caps.keys | 26 +- include/Caps.osf1r5 | 20 +- include/Caps.uwin | 20 +- include/MKkey_defs.sh | 8 +- include/MKterm.h.awk.in | 57 +- include/Makefile.in | 9 +- include/capdefaults.c | 6 +- include/curses.h.in | 104 +- include/curses.tail | 54 +- include/curses.wide | 7 +- include/headers | 9 +- include/nc_alloc.h | 25 +- include/nc_termios.h | 91 +- include/nc_tparm.h | 5 +- include/{nc_win32.h => nc_win32.h.in} | 131 +- include/ncurses_cfg.hin | 6 +- include/ncurses_defs | 23 +- include/ncurses_mingw.h | 82 - include/term_entry.h | 9 +- include/tic.h | 10 +- include/unctrl.h.in | 10 +- include/win32_curses.h | 75 - install-sh | 27 +- man/MKada_config.in | 8 +- man/MKncu_config.in | 4 +- man/MKterminfo.sh | 66 +- man/Makefile.in | 24 +- man/captoinfo.1m | 159 +- man/clear.1 | 12 +- man/curs_add_wch.3x | 743 +- man/curs_add_wchstr.3x | 139 +- man/curs_addch.3x | 529 +- man/curs_addchstr.3x | 122 +- man/curs_addstr.3x | 101 +- man/curs_addwstr.3x | 107 +- man/curs_attr.3x | 494 +- man/curs_beep.3x | 85 +- man/curs_bkgd.3x | 243 +- man/curs_bkgrnd.3x | 198 +- man/curs_border.3x | 239 +- man/curs_border_set.3x | 96 +- man/curs_clear.3x | 46 +- man/curs_color.3x | 510 +- man/curs_delch.3x | 56 +- man/curs_deleteln.3x | 126 +- man/curs_extend.3x | 93 +- man/curs_get_wch.3x | 175 +- man/curs_get_wstr.3x | 425 +- man/curs_getcchar.3x | 394 +- man/curs_getch.3x | 441 +- man/curs_getstr.3x | 620 +- man/curs_getyx.3x | 150 +- man/curs_in_wch.3x | 85 +- man/curs_in_wchstr.3x | 139 +- man/curs_inch.3x | 148 +- man/curs_inchstr.3x | 179 +- man/curs_initscr.3x | 675 +- man/curs_inopts.3x | 977 +- man/curs_ins_wch.3x | 110 +- man/curs_ins_wstr.3x | 181 +- man/curs_insch.3x | 71 +- man/curs_insstr.3x | 175 +- man/curs_instr.3x | 188 +- man/curs_inwstr.3x | 239 +- man/curs_kernel.3x | 461 +- man/curs_legacy.3x | 35 +- man/curs_mouse.3x | 542 +- man/curs_move.3x | 64 +- man/curs_opaque.3x | 33 +- man/curs_outopts.3x | 414 +- man/curs_overlay.3x | 53 +- man/curs_pad.3x | 250 +- man/curs_print.3x | 105 +- man/curs_printw.3x | 139 +- man/curs_refresh.3x | 33 +- man/curs_scanw.3x | 129 +- man/curs_scr_dump.3x | 200 +- man/curs_scroll.3x | 143 +- man/curs_slk.3x | 77 +- man/curs_sp_funcs.3x | 272 +- man/curs_termattrs.3x | 199 +- man/curs_termcap.3x | 446 +- man/curs_terminfo.3x | 834 +- man/curs_threads.3x | 8 +- man/curs_touch.3x | 70 +- man/curs_trace.3x | 14 +- man/curs_util.3x | 436 +- man/curs_variables.3x | 298 +- man/curs_window.3x | 318 +- man/define_key.3x | 108 +- man/form.3x | 21 +- man/form_driver.3x | 9 +- man/form_field.3x | 15 +- man/form_field_buffer.3x | 8 +- man/form_field_new.3x | 7 +- man/form_field_opts.3x | 20 +- man/form_field_userptr.3x | 7 +- man/form_field_validation.3x | 30 +- man/form_fieldtype.3x | 23 +- man/form_hook.3x | 27 +- man/form_new.3x | 11 +- man/form_opts.3x | 20 +- man/form_page.3x | 8 +- man/form_requestname.3x | 8 +- man/form_userptr.3x | 7 +- man/form_win.3x | 16 +- man/infocmp.1m | 301 +- man/infotocap.1m | 62 +- man/key_defined.3x | 60 +- man/keybound.3x | 79 +- man/keyok.3x | 88 +- man/legacy_coding.3x | 42 +- man/make_sed.sh | 10 +- man/man_db.renames.in | 28 +- man/manhtml.aliases | 29 +- man/manhtml.externs | 15 +- man/manlinks.sed | 13 +- man/menu.3x | 60 +- man/menu_driver.3x | 11 +- man/menu_hook.3x | 28 +- man/menu_items.3x | 13 +- man/menu_mark.3x | 17 +- man/menu_new.3x | 11 +- man/menu_opts.3x | 20 +- man/menu_pattern.3x | 9 +- man/menu_requestname.3x | 8 +- man/menu_spacing.3x | 8 +- man/menu_userptr.3x | 7 +- man/menu_win.3x | 16 +- man/mitem_current.3x | 10 +- man/mitem_name.3x | 7 +- man/mitem_new.3x | 8 +- man/mitem_opts.3x | 20 +- man/mitem_userptr.3x | 7 +- man/ncurses.3x | 944 +- man/new_pair.3x | 14 +- man/panel.3x | 27 +- man/resizeterm.3x | 59 +- man/scr_dump.5 | 22 +- man/tabs.1 | 73 +- man/term.5 | 431 +- man/term.7 | 16 +- man/term_variables.3x | 222 +- man/terminfo.head | 11 +- man/terminfo.tail | 387 +- man/tic.1m | 612 +- man/toe.1m | 23 +- man/tput.1 | 410 +- man/tset.1 | 22 +- man/user_caps.5 | 584 +- man/wresize.3x | 105 +- menu/Makefile.in | 28 +- menu/m_driver.c | 14 +- menu/m_global.c | 14 +- menu/m_item_new.c | 14 +- menu/m_item_vis.c | 6 +- menu/m_pattern.c | 6 +- menu/m_post.c | 42 +- menu/m_req_name.c | 6 +- menu/menu.priv.h | 7 +- menu/mf_common.h | 8 +- misc/Makefile.in | 79 +- misc/gen-pkgconfig.in | 14 +- misc/gen_edit.sh | 16 +- misc/magic | 9 +- misc/makellib | 28 +- misc/ncurses-config.in | 134 +- misc/run_tic.in | 147 +- misc/terminfo.src | 4424 ++- mk-1st.awk | 105 +- ncurses.spec | 8 +- ncurses/Makefile.in | 36 +- ncurses/base/MKkeyname.awk | 30 +- ncurses/base/MKlib_gen.sh | 77 +- ncurses/base/MKunctrl.awk | 10 +- ncurses/base/define_key.c | 12 +- ncurses/base/key_defined.c | 10 +- ncurses/base/keybound.c | 8 +- ncurses/base/keyok.c | 10 +- ncurses/base/legacy_coding.c | 6 +- ncurses/base/lib_addch.c | 12 +- ncurses/base/lib_addstr.c | 14 +- ncurses/base/lib_beep.c | 10 +- ncurses/base/lib_bkgd.c | 6 +- ncurses/base/lib_chgat.c | 7 +- ncurses/base/lib_color.c | 84 +- ncurses/base/lib_colorset.c | 6 +- ncurses/base/lib_delch.c | 8 +- ncurses/base/lib_delwin.c | 29 +- ncurses/base/lib_dft_fgbg.c | 12 +- ncurses/base/lib_driver.c | 50 +- ncurses/base/lib_echo.c | 8 +- ncurses/base/lib_endwin.c | 6 +- ncurses/base/lib_erase.c | 6 +- ncurses/base/lib_flash.c | 8 +- ncurses/base/lib_freeall.c | 18 +- ncurses/base/lib_getch.c | 51 +- ncurses/base/lib_getstr.c | 12 +- ncurses/base/lib_initscr.c | 12 +- ncurses/base/lib_insch.c | 10 +- ncurses/base/lib_insnstr.c | 8 +- ncurses/base/lib_instr.c | 16 +- ncurses/base/lib_mouse.c | 170 +- ncurses/base/lib_mvwin.c | 6 +- ncurses/base/lib_newterm.c | 47 +- ncurses/base/lib_newwin.c | 80 +- ncurses/base/lib_nl.c | 12 +- ncurses/base/lib_overlay.c | 10 +- ncurses/base/lib_pad.c | 22 +- ncurses/base/lib_printw.c | 12 +- ncurses/base/lib_redrawln.c | 6 +- ncurses/base/lib_refresh.c | 8 +- ncurses/base/lib_restart.c | 12 +- ncurses/base/lib_screen.c | 108 +- ncurses/base/lib_set_term.c | 128 +- ncurses/base/lib_slk.c | 22 +- ncurses/base/lib_slkatr_set.c | 8 +- ncurses/base/lib_slkatrof.c | 6 +- ncurses/base/lib_slkatron.c | 6 +- ncurses/base/lib_slkatrset.c | 6 +- ncurses/base/lib_slkattr.c | 6 +- ncurses/base/lib_slkclear.c | 6 +- ncurses/base/lib_slkcolor.c | 8 +- ncurses/base/lib_slklab.c | 8 +- ncurses/base/lib_slkrefr.c | 18 +- ncurses/base/lib_slkset.c | 16 +- ncurses/base/lib_slktouch.c | 6 +- ncurses/base/lib_touch.c | 12 +- ncurses/base/lib_ungetch.c | 6 +- ncurses/base/lib_wattron.c | 6 +- ncurses/base/lib_winch.c | 6 +- ncurses/base/lib_window.c | 14 +- ncurses/base/nc_panel.c | 6 +- ncurses/base/new_pair.c | 22 +- ncurses/base/resizeterm.c | 47 +- ncurses/base/safe_sprintf.c | 19 +- ncurses/base/tries.c | 20 +- ncurses/base/vsscanf.c | 8 +- ncurses/base/wresize.c | 22 +- ncurses/build.priv.h | 6 +- ncurses/curses.priv.h | 331 +- ncurses/llib-lncurses | 26 +- ncurses/llib-lncursest | 26 +- ncurses/llib-lncursestw | 40 +- ncurses/llib-lncursesw | 40 +- ncurses/llib-ltinfo | 20 +- ncurses/llib-ltinfot | 20 +- ncurses/llib-ltinfotw | 20 +- ncurses/llib-ltinfow | 20 +- ncurses/modules | 20 +- ncurses/new_pair.h | 10 +- include/nc_mingw.h => ncurses/report_ctype.c | 116 +- ncurses/report_hashing.c | 6 +- ncurses/report_offsets.c | 19 +- ncurses/term.priv.h | 8 +- ncurses/tinfo/MKcaptab.awk | 6 +- ncurses/tinfo/MKcaptab.sh | 22 +- ncurses/tinfo/MKcodes.awk | 12 +- ncurses/tinfo/MKfallback.sh | 35 +- ncurses/tinfo/MKkeys_list.sh | 26 +- ncurses/tinfo/MKnames.awk | 12 +- ncurses/tinfo/MKuserdefs.sh | 10 +- ncurses/tinfo/access.c | 188 +- ncurses/tinfo/add_tries.c | 18 +- ncurses/tinfo/alloc_entry.c | 27 +- ncurses/tinfo/alloc_ttype.c | 43 +- ncurses/tinfo/captoinfo.c | 87 +- ncurses/tinfo/comp_error.c | 16 +- ncurses/tinfo/comp_expand.c | 22 +- ncurses/tinfo/comp_hash.c | 14 +- ncurses/tinfo/comp_parse.c | 59 +- ncurses/tinfo/comp_scan.c | 68 +- ncurses/tinfo/db_iterator.c | 66 +- ncurses/tinfo/doalloc.c | 6 +- ncurses/tinfo/entries.c | 30 +- ncurses/tinfo/getenv_num.c | 14 +- ncurses/tinfo/hashed_db.c | 49 +- ncurses/tinfo/home_terminfo.c | 12 +- ncurses/tinfo/init_keytry.c | 10 +- ncurses/tinfo/lib_acs.c | 24 +- ncurses/tinfo/lib_baudrate.c | 21 +- ncurses/tinfo/lib_cur_term.c | 22 +- ncurses/tinfo/lib_data.c | 44 +- ncurses/tinfo/lib_has_cap.c | 8 +- ncurses/tinfo/lib_kernel.c | 18 +- ncurses/tinfo/lib_napms.c | 10 +- ncurses/tinfo/lib_options.c | 30 +- ncurses/tinfo/lib_print.c | 15 +- ncurses/tinfo/lib_raw.c | 39 +- ncurses/tinfo/lib_setup.c | 148 +- ncurses/tinfo/lib_termcap.c | 60 +- ncurses/tinfo/lib_termname.c | 10 +- ncurses/tinfo/lib_tgoto.c | 18 +- ncurses/tinfo/lib_ti.c | 12 +- ncurses/tinfo/lib_tparm.c | 52 +- ncurses/tinfo/lib_tputs.c | 32 +- ncurses/tinfo/lib_ttyflags.c | 46 +- ncurses/tinfo/lib_win32con.c | 414 +- ncurses/tinfo/lib_win32util.c | 11 +- ncurses/tinfo/make_hash.c | 51 +- ncurses/tinfo/make_keys.c | 25 +- ncurses/tinfo/name_match.c | 16 +- ncurses/tinfo/obsolete.c | 14 +- ncurses/tinfo/parse_entry.c | 58 +- ncurses/tinfo/read_entry.c | 42 +- ncurses/tinfo/read_termcap.c | 78 +- ncurses/tinfo/strings.c | 14 +- ncurses/tinfo/tinfo_driver.c | 125 +- ncurses/tinfo/trim_sgr0.c | 98 +- ncurses/tinfo/write_entry.c | 76 +- ncurses/trace/lib_trace.c | 22 +- ncurses/trace/lib_traceatr.c | 35 +- ncurses/trace/lib_tracebits.c | 22 +- ncurses/trace/lib_tracechr.c | 10 +- ncurses/trace/lib_tracedmp.c | 8 +- ncurses/trace/lib_tracemse.c | 10 +- ncurses/trace/trace_buf.c | 26 +- ncurses/trace/trace_tries.c | 10 +- ncurses/trace/varargs.c | 38 +- ncurses/trace/visbuf.c | 24 +- ncurses/tty/MKexpanded.sh | 11 +- ncurses/tty/hardscroll.c | 16 +- ncurses/tty/hashmap.c | 26 +- ncurses/tty/lib_mvcur.c | 84 +- ncurses/tty/lib_tstp.c | 16 +- ncurses/tty/lib_twait.c | 12 +- ncurses/tty/lib_vidattr.c | 12 +- ncurses/tty/tty_update.c | 48 +- ncurses/wcwidth.h | 966 +- ncurses/widechar/charable.c | 9 +- ncurses/widechar/lib_add_wch.c | 12 +- ncurses/widechar/lib_box_set.c | 6 +- ncurses/widechar/lib_cchar.c | 8 +- ncurses/widechar/lib_get_wch.c | 10 +- ncurses/widechar/lib_get_wstr.c | 8 +- ncurses/widechar/lib_hline_set.c | 6 +- ncurses/widechar/lib_in_wch.c | 8 +- ncurses/widechar/lib_in_wchnstr.c | 10 +- ncurses/widechar/lib_ins_wch.c | 53 +- ncurses/widechar/lib_inwstr.c | 33 +- ncurses/widechar/lib_key_name.c | 6 +- ncurses/widechar/lib_pecho_wchar.c | 6 +- ncurses/widechar/lib_slk_wset.c | 8 +- ncurses/widechar/lib_unget_wch.c | 10 +- ncurses/widechar/lib_vid_attr.c | 26 +- ncurses/widechar/lib_vline_set.c | 6 +- ncurses/widechar/lib_wacs.c | 8 +- ncurses/widechar/lib_wunctrl.c | 13 +- ncurses/widechar/widechars.c | 12 +- ncurses/win32con/gettimeofday.c | 9 +- ncurses/win32con/wcwidth.c | 13 +- ncurses/win32con/win32_driver.c | 103 +- ncurses/win32con/win_driver.c | 2282 -- package/debian-mingw/changelog | 4 +- package/debian-mingw/control | 7 +- package/debian-mingw/copyright | 185 +- .../mingw32-ncurses6.lintian-overrides | 7 - .../mingw32-ncurses6td.lintian-overrides | 7 + package/debian-mingw/rules | 6 +- package/debian-mingw/watch | 2 +- package/debian-mingw64/changelog | 4 +- package/debian-mingw64/control | 7 +- package/debian-mingw64/copyright | 185 +- .../mingw64-ncurses6.lintian-overrides | 7 - .../mingw64-ncurses6td.lintian-overrides | 7 + package/debian-mingw64/rules | 6 +- package/debian-mingw64/watch | 2 +- package/debian/changelog | 4 +- package/debian/control | 22 +- package/debian/copyright | 185 +- package/debian/ncurses6.lintian-overrides | 9 - package/debian/ncurses6td.lintian-overrides | 11 + ...ncursest6.triggers => ncurses6td.triggers} | 0 package/debian/ncursest6.lintian-overrides | 9 - package/debian/ncursest6td.lintian-overrides | 11 + package/debian/ncursest6td.triggers | 1 + package/debian/rules | 84 +- package/debian/watch | 2 +- package/mingw-ncurses.nsi | 8 +- package/mingw-ncurses.spec | 9 +- package/ncurses.map | 9 +- package/ncurses.spec | 9 +- package/ncurses.sym | 3 +- package/ncursest.map | 9 +- package/ncursest.spec | 9 +- package/ncursest.sym | 3 +- package/ncursestw.map | 9 +- package/ncursestw.sym | 3 +- package/ncursesw.map | 9 +- package/ncursesw.sym | 3 +- panel/Makefile.in | 28 +- panel/p_above.c | 16 +- panel/p_below.c | 18 +- panel/p_new.c | 6 +- panel/panel.c | 18 +- panel/panel.priv.h | 6 +- progs/Makefile.in | 65 +- progs/capconvert | 44 +- progs/clear.c | 6 +- progs/clear_cmd.c | 69 +- progs/dump_entry.c | 66 +- progs/infocmp.c | 308 +- progs/modules | 28 +- progs/progs.priv.h | 4 +- progs/reset_cmd.c | 90 +- progs/tabs.c | 51 +- progs/tic.c | 178 +- progs/toe.c | 82 +- progs/tput.c | 154 +- progs/tset.c | 70 +- test/Makefile.in | 20 +- test/aclocal.m4 | 722 +- test/back_ground.c | 35 +- test/background.c | 47 +- test/blue.c | 17 +- test/bs.6 | 75 +- test/bs.c | 29 +- test/cardfile.c | 73 +- test/chgat.c | 38 +- test/clip_printw.c | 35 +- test/color_content.c | 19 +- test/color_name.h | 12 +- test/color_set.c | 9 +- test/combine.c | 29 +- test/configure | 4721 +-- test/configure.in | 50 +- test/demo_altkeys.c | 25 +- test/demo_defkey.c | 39 +- test/demo_forms.c | 61 +- test/demo_keyok.c | 13 +- test/demo_menus.c | 101 +- test/demo_new_pair.c | 39 +- test/demo_panels.c | 72 +- test/demo_tabs.c | 15 +- test/demo_termcap.c | 94 +- test/demo_terminfo.c | 96 +- test/ditto.c | 29 +- test/dots.c | 17 +- test/dots_curses.c | 13 +- test/dots_mvcur.c | 19 +- test/dots_termcap.c | 31 +- test/dots_xcurses.c | 23 +- test/dump_window.c | 18 +- test/dup_field.c | 39 +- test/echochar.c | 15 +- test/edit_field.c | 24 +- test/extended_color.c | 9 +- test/filter.c | 35 +- test/firework.c | 9 +- test/firstlast.c | 9 +- test/foldkeys.c | 23 +- test/form_driver_w.c | 13 +- test/gdc.6 | 96 +- test/gdc.c | 86 +- test/hanoi.c | 9 +- test/hashtest.c | 27 +- test/inch_wide.c | 23 +- test/inchs.c | 25 +- test/ins_wide.c | 19 +- test/insdelln.c | 33 +- test/inserts.c | 17 +- test/key_names.c | 11 +- test/keynames.c | 11 +- test/knight.c | 12 +- test/linedata.h | 10 +- test/list_keys.c | 27 +- test/lrtest.c | 9 +- test/make-tar.sh | 38 +- test/modules | 30 +- test/move_field.c | 43 +- test/movewindow.c | 73 +- test/ncurses.c | 331 +- test/newdemo.c | 9 +- test/package/debian-mingw/copyright | 137 +- test/package/debian-mingw/rules | 2 +- test/package/debian-mingw/watch | 2 +- test/package/debian-mingw64/copyright | 137 +- test/package/debian-mingw64/rules | 2 +- test/package/debian-mingw64/watch | 2 +- test/package/debian/copyright | 137 +- .../debian/ncurses-examples.lintian-overrides | 7 + .../ncursest-examples.lintian-overrides | 7 + test/package/debian/rules | 23 +- test/package/debian/watch | 2 +- test/package/mingw-ncurses-examples.spec | 7 +- test/package/ncurses-examples.spec | 7 +- test/padview.c | 48 +- test/pair_content.c | 19 +- test/parse_rgb.h | 12 +- test/picsmap.c | 159 +- test/popup_msg.c | 17 +- test/popup_msg.h | 6 +- test/programs | 8 +- test/railroad.c | 43 +- test/rain.c | 31 +- test/redraw.c | 15 +- test/savescreen.c | 39 +- test/savescreen.sh | 17 +- test/sp_tinfo.c | 15 +- test/tclock.c | 13 +- test/test.priv.h | 105 +- test/test_add_wchstr.c | 29 +- test/test_addchstr.c | 27 +- test/test_addstr.c | 17 +- test/test_addwstr.c | 19 +- test/test_arrays.c | 39 +- test/test_delwin.c | 9 +- test/test_endwin.c | 21 +- test/test_get_wstr.c | 25 +- test/test_getstr.c | 25 +- test/test_instr.c | 57 +- test/test_inwstr.c | 58 +- test/test_mouse.c | 24 +- test/test_opaque.c | 71 +- test/test_setupterm.c | 15 +- test/test_sgr.c | 60 +- test/test_termattrs.c | 9 +- test/test_tparm.c | 66 +- test/test_unget_wch.c | 9 +- test/test_vid_puts.c | 11 +- test/test_vidputs.c | 13 +- test/testaddch.c | 9 +- test/testcurs.c | 23 +- test/testscanw.c | 11 +- test/tput-colorcube | 58 +- test/tput-initc | 21 +- test/view.c | 62 +- test/widechars.h | 4 +- test/worm.c | 73 +- test/xmas.c | 71 +- 758 files changed, 62516 insertions(+), 50350 deletions(-) create mode 100644 Ada95/package/debian/adacurses.lintian-overrides rename package/debian/ncurses6.triggers => Ada95/package/debian/adacurses.triggers (100%) delete mode 100644 cross_compile_support_ohos.patch rename include/{nc_win32.h => nc_win32.h.in} (70%) delete mode 100644 include/ncurses_mingw.h delete mode 100644 include/win32_curses.h rename include/nc_mingw.h => ncurses/report_ctype.c (59%) delete mode 100644 ncurses/win32con/win_driver.c delete mode 100644 package/debian-mingw/mingw32-ncurses6.lintian-overrides create mode 100644 package/debian-mingw/mingw32-ncurses6td.lintian-overrides delete mode 100644 package/debian-mingw64/mingw64-ncurses6.lintian-overrides create mode 100644 package/debian-mingw64/mingw64-ncurses6td.lintian-overrides delete mode 100644 package/debian/ncurses6.lintian-overrides create mode 100644 package/debian/ncurses6td.lintian-overrides rename package/debian/{ncursest6.triggers => ncurses6td.triggers} (100%) delete mode 100644 package/debian/ncursest6.lintian-overrides create mode 100644 package/debian/ncursest6td.lintian-overrides create mode 100644 package/debian/ncursest6td.triggers create mode 100644 test/package/debian/ncurses-examples.lintian-overrides create mode 100644 test/package/debian/ncursest-examples.lintian-overrides diff --git a/Ada95/Makefile.in b/Ada95/Makefile.in index 22b922e..23e59ed 100644 --- a/Ada95/Makefile.in +++ b/Ada95/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.30 2022/12/17 23:33:33 tom Exp $ +# $Id: Makefile.in,v 1.34 2025/10/18 15:20:43 tom Exp $ ############################################################################## -# Copyright 2020-2021,2022 Thomas E. Dickey # +# Copyright 2020-2024,2025 Thomas E. Dickey # # Copyright 1998-2010,2015 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -31,7 +31,7 @@ # Author: Juergen Pfeifer, 1996 # # Version Control -# $Revision: 1.30 $ +# $Revision: 1.34 $ # SHELL = @SHELL@ VPATH = @srcdir@ @@ -47,19 +47,20 @@ libdir = @libdir@ libexecdir = @libexecdir@ includedir = @includedir@ -BINDIR = $(DESTDIR)$(bindir) -DATADIR = $(DESTDIR)$(datadir) -LIBDIR = $(DESTDIR)$(libdir) -LIBEXECDIR = $(DESTDIR)$(libexecdir) +@SET_MAKE@ +@SET_DESTDIR@ +TOP_MFLAGS = DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)" -SUBDIRS = @ADA_SUBDIRS@ +BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@) +DATADIR = $(DESTDIR)$(datadir@MERGE_PREFIX@) +LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@) +LIBEXECDIR = $(DESTDIR)$(libexecdir@MERGE_PREFIX@) + +SUBDIRS = @ADA_SUBDIRS@ INSTALL = @INSTALL@ @INSTALL_OPT_O@ INSTALL_SCRIPT = @INSTALL@ -TOP_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)" -@SET_MAKE@ - ################################################################################ @MAKE_PHONY@.PHONY : all diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 index 6fe1f94..d063565 100644 --- a/Ada95/aclocal.m4 +++ b/Ada95/aclocal.m4 @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2023,2024 Thomas E. Dickey * +dnl Copyright 2018-2024,2025 Thomas E. Dickey * dnl Copyright 2010-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 dnl -dnl $Id: aclocal.m4,v 1.210 2024/03/30 22:17:13 tom Exp $ +dnl $Id: aclocal.m4,v 1.241 2025/12/25 23:45:32 tom Exp $ dnl Macros used in NCURSES Ada95 auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -189,7 +189,7 @@ AC_SUBST(EXTRA_CPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_INCDIR version: 17 updated: 2021/09/04 06:35:04 +dnl CF_ADD_INCDIR version: 18 updated: 2025/12/22 04:16:14 dnl ------------- 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, @@ -221,8 +221,8 @@ if test -n "$1" ; then then cf_save_CPPFLAGS=$CPPFLAGS CF_APPEND_TEXT(CPPFLAGS,-I$cf_add_incdir) - AC_TRY_COMPILE([#include ], - [printf("Hello")], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], + [printf("Hello")])], [], [cf_have_incdir=yes]) CPPFLAGS=$cf_save_CPPFLAGS @@ -381,7 +381,7 @@ dnl Allow user to enable a normally-off option. AC_DEFUN([CF_ARG_ENABLE], [CF_ARG_OPTION($1,[$2],[$3],[$4],no)])dnl dnl --------------------------------------------------------------------------- -dnl CF_ARG_OPTION version: 5 updated: 2015/05/10 19:52:14 +dnl CF_ARG_OPTION version: 6 updated: 2025/08/05 04:09:09 dnl ------------- dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus dnl values. @@ -390,7 +390,7 @@ dnl Parameters: dnl $1 = option name dnl $2 = help-string dnl $3 = action to perform if option is not default -dnl $4 = action if perform if option is default +dnl $4 = action to perform if option is default dnl $5 = default option value (either 'yes' or 'no') AC_DEFUN([CF_ARG_OPTION], [AC_ARG_ENABLE([$1],[$2],[test "$enableval" != ifelse([$5],no,yes,no) && enableval=ifelse([$5],no,no,yes) @@ -404,7 +404,7 @@ ifelse([$3],,[ :]dnl ])dnl ])])dnl dnl --------------------------------------------------------------------------- -dnl CF_AR_FLAGS version: 9 updated: 2021/01/01 13:31:04 +dnl CF_AR_FLAGS version: 10 updated: 2025/12/14 20:07:31 dnl ----------- dnl Check for suitable "ar" (archiver) options for updating an archive. dnl @@ -450,8 +450,8 @@ AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[ int testdata[[3]] = { 123, 456, 789 }; EOF if AC_TRY_EVAL(ac_compile) ; then - echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&AC_FD_CC - $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&AC_FD_CC 1>/dev/null + echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&AS_MESSAGE_LOG_FD + $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&AS_MESSAGE_LOG_FD 1>/dev/null if test -f conftest.a ; then cf_cv_ar_flags="$cf_ar_flags" break @@ -477,7 +477,7 @@ fi AC_SUBST(ARFLAGS) ]) dnl --------------------------------------------------------------------------- -dnl CF_BUILD_CC version: 11 updated: 2022/12/04 15:40:08 +dnl CF_BUILD_CC version: 14 updated: 2024/12/14 11:58:01 dnl ----------- dnl If we're cross-compiling, allow the user to override the tools and their dnl options. The configure script is oriented toward identifying the host @@ -555,7 +555,7 @@ if test "$cross_compiling" = yes ; then AC_TRY_RUN([#include int main(int argc, char *argv[]) { - ${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0); + ${cf_cv_main_return:-return}(argc < 0 || argv == (void*)0 || argv[0] == (void*)0); } ], cf_ok_build_cc=yes, @@ -594,7 +594,7 @@ AC_SUBST(BUILD_EXEEXT) AC_SUBST(BUILD_OBJEXT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_C11_NORETURN version: 4 updated: 2023/02/18 17:41:25 +dnl CF_C11_NORETURN version: 5 updated: 2025/12/14 17:40:20 dnl --------------- AC_DEFUN([CF_C11_NORETURN], [ @@ -607,12 +607,12 @@ 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_COMPILE_IFELSE([AC_LANG_PROGRAM([ $ac_includes_default #include static _Noreturn void giveup(void) { exit(0); } ], - [if (feof(stdin)) giveup()], + [if (feof(stdin)) giveup()])], cf_cv_c11_noreturn=yes, cf_cv_c11_noreturn=no) ]) @@ -696,7 +696,7 @@ case "$CC" in esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CFG_DEFAULTS version: 16 updated: 2021/01/04 19:33:05 +dnl CF_CFG_DEFAULTS version: 17 updated: 2025/12/24 12:27:29 dnl --------------- dnl Determine the default configuration into which we'll install ncurses. This dnl can be overridden by the user's command-line options. There's two items to @@ -726,7 +726,7 @@ AC_MSG_RESULT($prefix) if test "x$prefix" = "xNONE" ; then AC_MSG_CHECKING(for default include-directory) -test -n "$verbose" && echo 1>&AC_FD_MSG +test -n "$verbose" && echo 1>&AS_MESSAGE_FD for cf_symbol in \ "$includedir" \ "$includedir/ncurses" \ @@ -741,11 +741,11 @@ do if test -f "$cf_dir/curses.h" ; then if ( ${FGREP-fgrep} NCURSES_VERSION "$cf_dir/curses.h" >/dev/null 2>&1 ) ; then includedir="$cf_symbol" - test -n "$verbose" && echo $ECHO_N " found " 1>&AC_FD_MSG + test -n "$verbose" && echo $ECHO_N " found " 1>&AS_MESSAGE_FD break fi fi - test -n "$verbose" && echo " tested $cf_dir" 1>&AC_FD_MSG + test -n "$verbose" && echo " tested $cf_dir" 1>&AS_MESSAGE_FD done AC_MSG_RESULT($includedir) fi @@ -802,26 +802,26 @@ case "$cf_cv_gnat_version" in esac ]) dnl --------------------------------------------------------------------------- -dnl CF_CHECK_LIBSSP version: 1 updated: 2021/10/30 10:40:19 +dnl CF_CHECK_LIBSSP version: 2 updated: 2025/12/24 12:27:29 dnl --------------- dnl Check if libssp is needed, e.g., to work around misconfigured libraries dnl used in cross-compiling to MinGW. AC_DEFUN([CF_CHECK_LIBSSP],[ AC_CACHE_CHECK(if ssp library is needed,cf_cv_need_libssp,[ -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include #include ],[ DIR *dp = opendir("."); -],cf_cv_need_libssp=no,[ +])],cf_cv_need_libssp=no,[ cf_save_LIBS="$LIBS" LIBS="$LIBS -lssp" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include #include ],[ DIR *dp = opendir("."); - ],cf_cv_need_libssp=yes, + ])],cf_cv_need_libssp=yes, cf_cv_need_libssp=maybe) LIBS="$cf_save_LIBS" ])dnl @@ -833,7 +833,7 @@ then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CLANG_COMPILER version: 9 updated: 2023/02/18 17:41:25 +dnl CF_CLANG_COMPILER version: 11 updated: 2025/12/14 17:46:02 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 @@ -852,12 +852,12 @@ ifelse([$2],,CLANG_COMPILER,[$2])=no if test "$ifelse([$1],,[$1],GCC)" = yes ; then AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler) cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])" - AC_TRY_COMPILE([],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[ #ifdef __clang__ #else #error __clang__ is not defined #endif -],[ifelse([$2],,CLANG_COMPILER,[$2])=yes +])],[ifelse([$2],,CLANG_COMPILER,[$2])=yes ],[]) ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2])) @@ -886,9 +886,9 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then AC_MSG_CHECKING(if option $cf_clang_opt works) cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $cf_clang_opt" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include ],[ - printf("hello!\\n");],[ + printf("hello!\\n");])],[ cf_clang_optok=yes],[ cf_clang_optok=no]) AC_MSG_RESULT($cf_clang_optok) @@ -901,7 +901,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50 +dnl CF_CONST_X_STRING version: 10 updated: 2025/12/14 17:40:20 dnl ----------------- dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most dnl character-strings. @@ -926,22 +926,22 @@ AC_REQUIRE([AC_PATH_XTRA]) CF_SAVE_XTRA_FLAGS([CF_CONST_X_STRING]) -AC_TRY_COMPILE( +AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [ -#include +$ac_includes_default #include ], -[String foo = malloc(1); free((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( + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [ #undef _CONST_X_STRING #define _CONST_X_STRING /* X11R7.8 (perhaps) */ #undef XTSTRINGDEFINES /* X11R5 and later */ -#include +$ac_includes_default #include - ],[String foo = malloc(1); *foo = 0],[ + ],[String foo = malloc(1); *foo = 0])],[ cf_cv_const_x_string=no ],[ cf_cv_const_x_string=yes @@ -962,68 +962,53 @@ esac ]) ])dnl dnl --------------------------------------------------------------------------- -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. -dnl -dnl It is ambiguous because the specification accommodated the pre-ANSI -dnl compilers bundled by more than one vendor in lieu of providing a standard C -dnl compiler other than by costly add-ons. Because of this, the specification -dnl did not take into account the use of const for telling the compiler that -dnl string literals would be in readonly memory. -dnl -dnl As a workaround, one could (starting with X11R5) define XTSTRINGDEFINES, to -dnl let the compiler decide how to represent Xt's strings which were #define'd. -dnl That does not solve the problem of using the block of Xt's strings which -dnl are compiled into the library (and is less efficient than one might want). -dnl -dnl Xt specification 7 introduces the _CONST_X_STRING symbol which is used both -dnl when compiling the library and compiling using the library, to tell the -dnl compiler that String is const. -AC_DEFUN([CF_CONST_X_STRING], +dnl CF_CURSES_CONFIG version: 2 updated: 2006/10/29 11:06:27 +dnl ---------------- +dnl Tie together the configure-script macros for curses. It may be ncurses, +dnl but unless asked, we do not make a special search for ncurses. However, +dnl still check for the ncurses version number, for use in other macros. +AC_DEFUN([CF_CURSES_CONFIG], [ -AC_REQUIRE([AC_PATH_XTRA]) - -CF_SAVE_XTRA_FLAGS([CF_CONST_X_STRING]) - -AC_TRY_COMPILE( -[ -#include -#include -], -[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 -#include - ],[String foo = malloc(1); *foo = 0],[ - cf_cv_const_x_string=no - ],[ - cf_cv_const_x_string=yes - ]) -]) - -CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING]) - -case "$cf_cv_const_x_string" in -(no) - CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES) - ;; -(*) - CF_APPEND_TEXT(CPPFLAGS,-D_CONST_X_STRING) - ;; -esac - -]) +CF_CURSES_CPPFLAGS +CF_NCURSES_VERSION +CF_CURSES_LIBS ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_HEADER version: 6 updated: 2022/12/02 20:06:52 +dnl CF_CURSES_CPPFLAGS version: 14 updated: 2021/01/02 09:31:20 +dnl ------------------ +dnl Look for the curses headers. +AC_DEFUN([CF_CURSES_CPPFLAGS],[ + +AC_CACHE_CHECK(for extra include directories,cf_cv_curses_incdir,[ +cf_cv_curses_incdir=no +case "$host_os" in +(hpux10.*) + if test "x$cf_cv_screen" = "xcurses_colr" + then + test -d /usr/include/curses_colr && \ + cf_cv_curses_incdir="-I/usr/include/curses_colr" + fi + ;; +(sunos3*|sunos4*) + if test "x$cf_cv_screen" = "xcurses_5lib" + then + test -d /usr/5lib && \ + test -d /usr/5include && \ + cf_cv_curses_incdir="-I/usr/5include" + fi + ;; +esac +]) +if test "$cf_cv_curses_incdir" != no +then + CF_APPEND_TEXT(CPPFLAGS,$cf_cv_curses_incdir) +fi + +CF_CURSES_HEADER +CF_TERM_HEADER +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_CURSES_HEADER version: 7 updated: 2025/12/22 04:16:14 dnl ---------------- dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common dnl variations of ncurses' installs. @@ -1036,8 +1021,8 @@ for cf_header in \ ncurses.h ifelse($1,,,[$1/ncurses.h]) \ curses.h ifelse($1,,,[$1/curses.h]) ifelse($1,,[ncurses/ncurses.h ncurses/curses.h]) do -AC_TRY_COMPILE([#include <${cf_header}>], - [initscr(); endwin()], +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <${cf_header}>], + [initscr(); endwin()])], [cf_cv_ncurses_header=$cf_header; break],[]) done ]) @@ -1048,6 +1033,136 @@ fi # cheat, to get the right #define's for HAVE_NCURSES_H, etc. AC_CHECK_HEADERS($cf_cv_ncurses_header) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_CURSES_LIBS version: 46 updated: 2025/12/22 04:16:14 +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. +AC_DEFUN([CF_CURSES_LIBS],[ + +AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl +AC_MSG_CHECKING(if we have identified curses libraries) +AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr(); endwin()])], + cf_result=yes, + cf_result=no) +AC_MSG_RESULT($cf_result) + +if test "$cf_result" = no ; then +case "$host_os" in +(freebsd*) + AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)]) + ;; +(hpux10.*) + # Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr + # next (1998), and xcurses "newer" (2000). There is no header file for + # Hcurses; the subdirectory curses_colr has the headers (curses.h and + # term.h) for cur_colr + if test "x$cf_cv_screen" = "xcurses_colr" + then + AC_CHECK_LIB(cur_colr,initscr,[ + CF_ADD_LIBS(-lcur_colr) + ac_cv_func_initscr=yes + ],[ + AC_CHECK_LIB(Hcurses,initscr,[ + # HP's header uses __HP_CURSES, but user claims _HP_CURSES. + CF_ADD_LIBS(-lHcurses) + CF_APPEND_TEXT(CPPFLAGS,-D__HP_CURSES -D_HP_CURSES) + ac_cv_func_initscr=yes + ])]) + fi + ;; +(linux*) + case `arch 2>/dev/null` in + (x86_64) + if test -d /lib64 + then + CF_ADD_LIBDIR(/lib64) + else + CF_ADD_LIBDIR(/lib) + fi + ;; + (*) + CF_ADD_LIBDIR(/lib) + ;; + esac + ;; +(sunos3*|sunos4*) + if test "x$cf_cv_screen" = "xcurses_5lib" + then + if test -d /usr/5lib ; then + CF_ADD_LIBDIR(/usr/5lib) + CF_ADD_LIBS(-lcurses -ltermcap) + fi + fi + ac_cv_func_initscr=yes + ;; +esac + +if test ".$ac_cv_func_initscr" != .yes ; then + cf_save_LIBS="$LIBS" + + if test ".${cf_cv_ncurses_version:-no}" != .no + then + cf_check_list="ncurses curses cursesX" + else + cf_check_list="cursesX curses ncurses" + fi + + # Check for library containing tgoto. Do this before curses library + # because it may be needed to link the test-case for initscr. + if test "x$cf_term_lib" = x + then + AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[ + for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown + do + AC_CHECK_LIB($cf_term_lib,tgoto,[ + : "${cf_nculib_root:=$cf_term_lib}" + break + ]) + done + ]) + fi + + # Check for library containing initscr + test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" + if test "x$cf_curs_lib" = x + then + for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown + do + LIBS="-l$cf_curs_lib $cf_save_LIBS" + if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then + AC_MSG_CHECKING(if we can link with $cf_curs_lib library) + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr()])], + [cf_result=yes], + [cf_result=no]) + AC_MSG_RESULT($cf_result) + test "$cf_result" = yes && break + elif test "$cf_curs_lib" = "$cf_term_lib" ; then + cf_result=no + elif test "$cf_term_lib" != predefined ; then + AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries) + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr(); endwin();])], + [cf_result=no], + [ + LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr()])], + [cf_result=yes], + [cf_result=error]) + ]) + AC_MSG_RESULT($cf_result) + test "$cf_result" != error && break + fi + done + fi + test "$cf_curs_lib" = unknown && AC_MSG_ERROR(no curses library found) +fi +fi + ])dnl dnl --------------------------------------------------------------------------- dnl CF_DIRNAME version: 5 updated: 2020/12/31 20:19:42 @@ -1155,9 +1270,9 @@ ifelse($2,yes,[CF_GCC_ATTRIBUTES]) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FIND_LIBRARY version: 11 updated: 2021/01/02 09:31:20 +dnl CF_FIND_LIBRARY version: 13 updated: 2025/12/22 04:16:14 dnl --------------- -dnl Look for a non-standard library, given parameters for AC_TRY_LINK. We +dnl Look for a non-standard library, given parameters for AC_LINK_IFELSE. We dnl prefer a standard location, and use -L options only if we do not find the dnl library in the standard library location(s). dnl $1 = library name @@ -1167,7 +1282,7 @@ dnl $4 = code fragment to compile/link dnl $5 = corresponding function-name dnl $6 = flag, nonnull if failure should not cause an error-exit dnl -dnl Sets the variable "$cf_libdir" as a side-effect, so we can see if we had +dnl Sets the variable "$cf_libdir" as a side effect, so we can see if we had dnl to use a -L option. AC_DEFUN([CF_FIND_LIBRARY], [ @@ -1178,7 +1293,7 @@ AC_DEFUN([CF_FIND_LIBRARY], cf_save_LIBS="$LIBS" AC_MSG_CHECKING(for $5 in -l$1) LIBS="-l$1 $LIBS" - AC_TRY_LINK([$3],[$4], + AC_LINK_IFELSE([AC_LANG_PROGRAM([$3],[$4])], [AC_MSG_RESULT(yes) eval 'cf_cv_have_lib_'"$1"'=yes' ], @@ -1188,7 +1303,7 @@ AC_DEFUN([CF_FIND_LIBRARY], do AC_MSG_CHECKING(for -l$1 in $cf_libdir) LIBS="-L$cf_libdir -l$1 $cf_save_LIBS" - AC_TRY_LINK([$3],[$4], + AC_LINK_IFELSE([AC_LANG_PROGRAM([$3],[$4])], [AC_MSG_RESULT(yes) eval 'cf_cv_have_lib_'"$1"'=yes' break], @@ -1205,7 +1320,7 @@ fi ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FIND_LINKAGE version: 22 updated: 2020/12/31 20:19:42 +dnl CF_FIND_LINKAGE version: 23 updated: 2025/12/22 04:16:14 dnl --------------- dnl Find a library (specifically the linkage used in the code fragment), dnl searching for it if it is not already in the library path. @@ -1228,7 +1343,7 @@ dnl $cf_cv_library_file_$3 - library-file if needed, e.g., -l$3 AC_DEFUN([CF_FIND_LINKAGE],[ # If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these -# will be set on completion of the AC_TRY_LINK below. +# will be set on completion of the AC_LINK_IFELSE below. cf_cv_header_path_$3= cf_cv_library_path_$3= @@ -1236,7 +1351,7 @@ CF_MSG_LOG([Starting [FIND_LINKAGE]($3,$6)]) cf_save_LIBS="$LIBS" -AC_TRY_LINK([$1],[$2],[ +AC_LINK_IFELSE([AC_LANG_PROGRAM([$1],[$2])],[ cf_cv_find_linkage_$3=yes cf_cv_header_path_$3=/usr/include cf_cv_library_path_$3=/usr/lib @@ -1244,7 +1359,7 @@ AC_TRY_LINK([$1],[$2],[ LIBS="-l$3 $7 $cf_save_LIBS" -AC_TRY_LINK([$1],[$2],[ +AC_LINK_IFELSE([AC_LANG_PROGRAM([$1],[$2])],[ cf_cv_find_linkage_$3=yes cf_cv_header_path_$3=/usr/include cf_cv_library_path_$3=/usr/lib @@ -1266,7 +1381,7 @@ AC_TRY_LINK([$1],[$2],[ CF_VERBOSE(... testing $cf_cv_header_path_$3) CPPFLAGS="$cf_save_CPPFLAGS" CF_APPEND_TEXT(CPPFLAGS,-I$cf_cv_header_path_$3) - AC_TRY_COMPILE([$1],[$2],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$1],[$2])],[ CF_VERBOSE(... found $3 headers in $cf_cv_header_path_$3) cf_cv_find_linkage_$3=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -1286,7 +1401,7 @@ AC_TRY_LINK([$1],[$2],[ ifelse([$6],,,[ CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-l$3 $7 $cf_save_LIBS" - AC_TRY_LINK([$1],[$2],[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([$1],[$2])],[ CF_VERBOSE(... found $3 library in system) cf_cv_find_linkage_$3=yes]) CPPFLAGS="$cf_save_CPPFLAGS" @@ -1302,7 +1417,7 @@ AC_TRY_LINK([$1],[$2],[ CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-l$3 $7 $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_$3" - AC_TRY_LINK([$1],[$2],[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([$1],[$2])],[ CF_VERBOSE(... found $3 library in $cf_cv_library_path_$3) cf_cv_find_linkage_$3=yes cf_cv_library_file_$3="-l$3" @@ -1395,19 +1510,36 @@ fi AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_GETTIME version: 2 updated: 2023/02/25 08:45:56 +dnl CF_FUNC_GETTIME version: 4 updated: 2025/12/23 18:53:34 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 ], +cf_save_libs="$LIBS" +AC_CHECK_FUNC(clock_gettime, + cf_cv_test_clock_gettime=yes, + AC_CHECK_LIB(rt, clock_gettime, + [LIBS="-lrt $LIBS" + cf_cv_test_clock_gettime=yes], + cf_cv_test_clock_gettime=no)) + +if test "$cf_cv_test_clock_gettime" = yes ; then +AC_CACHE_CHECK(if clock_gettime links,cf_cv_func_clock_gettime,[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ +$ac_includes_default +#include + ], [struct timespec ts; - int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts], + int rc = clock_gettime(CLOCK_REALTIME, &ts) + + clock_gettime(CLOCK_MONOTONIC, &ts); + (void) rc; (void)ts])], [cf_cv_func_clock_gettime=yes], [cf_cv_func_clock_gettime=no]) ]) +else + cf_cv_func_clock_gettime=no +fi if test "$cf_cv_func_clock_gettime" = yes then @@ -1422,7 +1554,7 @@ AC_CHECK_LIB(bsd, gettimeofday, fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_ATTRIBUTES version: 24 updated: 2021/03/20 12:00:25 +dnl CF_GCC_ATTRIBUTES version: 28 updated: 2025/12/25 18:43:31 dnl ----------------- dnl Test for availability of useful gcc __attribute__ directives to quiet dnl compiler warnings. Though useful, not all are supported -- and contrary @@ -1449,7 +1581,8 @@ cat > conftest.i < "conftest.$ac_ext" < @@ -1477,7 +1610,7 @@ EOF do CF_UPPER(cf_ATTRIBUTE,$cf_attribute) cf_directive="__attribute__(($cf_attribute))" - echo "checking for $CC $cf_directive" 1>&AC_FD_CC + echo "checking for $CC $cf_directive" 1>&AS_MESSAGE_LOG_FD case "$cf_attribute" in (printf) @@ -1552,7 +1685,7 @@ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_WARNINGS version: 41 updated: 2021/01/01 16:53:59 +dnl CF_GCC_WARNINGS version: 45 updated: 2025/12/24 09:07:25 dnl --------------- dnl Check if the compiler supports useful warning options. There's a few that dnl we don't use, simply because they're too noisy: @@ -1593,7 +1726,8 @@ then # remark #981: operands are evaluated in unspecified order # warning #279: controlling expression is constant - AC_CHECKING([for $CC warning options]) + AC_MSG_CHECKING([for $CC warning options]) + test -n "$verbose" && AC_MSG_RESULT() cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" for cf_opt in \ @@ -1616,7 +1750,8 @@ then CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - AC_CHECKING([for $CC warning options]) + AC_MSG_CHECKING([for $CC warning options]) + test -n "$verbose" && AC_MSG_RESULT() cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" @@ -1666,6 +1801,26 @@ rm -rf ./conftest* AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_GLOB_FULLPATH version: 2 updated: 2024/08/03 12:34:02 +dnl ---------------- +dnl Use this in case-statements to check for pathname syntax, i.e., absolute +dnl pathnames. The "x" is assumed since we provide an alternate form for DOS. +AC_DEFUN([CF_GLOB_FULLPATH],[ +AC_REQUIRE([CF_WITH_SYSTYPE])dnl +case "$cf_cv_system_name" in +(cygwin*|msys*|mingw32*|mingw64|os2*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER='[[a-zA-Z]]:[[\\/]]*' + ;; +(*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX + ;; +esac +AC_SUBST(GLOB_FULLPATH_POSIX) +AC_SUBST(GLOB_FULLPATH_OTHER) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_GNATPREP_OPT_T version: 1 updated: 2014/08/02 18:37:25 dnl ----------------- AC_DEFUN([CF_GNATPREP_OPT_T],[ @@ -1707,7 +1862,7 @@ AC_SUBST(cf_compile_generics) AC_SUBST(cf_generic_objects) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNAT_PROJECTS version: 13 updated: 2021/01/02 17:09:14 +dnl CF_GNAT_PROJECTS version: 14 updated: 2025/12/24 12:27:29 dnl ---------------- dnl GNAT projects are configured with ".gpr" project files. dnl GNAT libraries are a further development, using the project feature. @@ -1768,7 +1923,7 @@ CF_EOF -XLIBRARY_DIR="`cd ../conftest.lib;pwd`" \ -XSOURCE_DIR="`pwd`" \ -XSONAME=libConfTest.so.1 \ - -XLIB_KIND=static 1>&AC_FD_CC 2>&1 ) ; then + -XLIB_KIND=static 1>&AS_MESSAGE_LOG_FD 2>&1 ) ; then cf_gnat_projects=yes fi cd .. @@ -1872,7 +2027,7 @@ fi AC_SUBST(USE_GNAT_SIGINT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNAT_TRY_LINK version: 4 updated: 2021/01/01 13:31:04 +dnl CF_GNAT_TRY_LINK version: 5 updated: 2025/12/24 12:27:29 dnl ---------------- dnl Verify that a test program compiles/links with GNAT. dnl $cf_ada_make is set to the program that compiles/links @@ -1891,7 +2046,7 @@ CF_EOF cat >>conftest.adb <&AC_FD_CC 2>&1 ) ; then +if ( "$cf_ada_make" $ADAFLAGS conftest 1>&AS_MESSAGE_LOG_FD 2>&1 ) ; then ifelse($3,, :,[ $3]) ifelse($4,,,[else $4]) @@ -1899,7 +2054,7 @@ fi rm -rf ./conftest* ./*~conftest* ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNAT_TRY_RUN version: 6 updated: 2021/01/01 13:31:04 +dnl CF_GNAT_TRY_RUN version: 7 updated: 2025/12/24 12:27:29 dnl --------------- dnl Verify that a test program compiles and runs with GNAT dnl $cf_ada_make is set to the program that compiles/links @@ -1918,8 +2073,8 @@ CF_EOF cat >>conftest.adb <&AC_FD_CC 2>&1 ) ; then - if ( ./conftest 1>&AC_FD_CC 2>&1 ) ; then +if ( "$cf_ada_make" $ADAFLAGS conftest 1>&AS_MESSAGE_LOG_FD 2>&1 ) ; then + if ( ./conftest 1>&AS_MESSAGE_LOG_FD 2>&1 ) ; then ifelse($3,, :,[ $3]) ifelse($4,,,[ else $4]) @@ -1946,7 +2101,7 @@ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no ifelse($1,,,[eval $1=$cf_cv_gnat_version; unset cf_cv_gnat_version]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNU_SOURCE version: 10 updated: 2018/12/10 20:09:41 +dnl CF_GNU_SOURCE version: 11 updated: 2025/12/14 17:40:20 dnl ------------- dnl Check if we must define _GNU_SOURCE to get a reasonable value for dnl _XOPEN_SOURCE, upon which many POSIX definitions depend. This is a defect @@ -1962,14 +2117,14 @@ AC_DEFUN([CF_GNU_SOURCE], cf_gnu_xopen_source=ifelse($1,,500,$1) AC_CACHE_CHECK(if this is the GNU C library,cf_cv_gnu_library,[ -AC_TRY_COMPILE([#include ],[ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #if __GLIBC__ > 0 && __GLIBC_MINOR__ >= 0 return 0; #elif __NEWLIB__ > 0 && __NEWLIB_MINOR__ >= 0 return 0; #else # error not GNU C library - #endif], + #endif])], [cf_cv_gnu_library=yes], [cf_cv_gnu_library=no]) ]) @@ -1982,14 +2137,14 @@ if test x$cf_cv_gnu_library = xyes; then AC_CACHE_CHECK(if _DEFAULT_SOURCE can be used as a basis,cf_cv_gnu_library_219,[ cf_save="$CPPFLAGS" CF_APPEND_TEXT(CPPFLAGS,-D_DEFAULT_SOURCE) - AC_TRY_COMPILE([#include ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19) || (__GLIBC__ > 2) return 0; #elif (__NEWLIB__ == 2 && __NEWLIB_MINOR__ >= 4) || (__GLIBC__ > 3) return 0; #else # error GNU C library __GLIBC__.__GLIBC_MINOR__ is too old - #endif], + #endif])], [cf_cv_gnu_library_219=yes], [cf_cv_gnu_library_219=no]) CPPFLAGS="$cf_save" @@ -1999,7 +2154,7 @@ if test x$cf_cv_gnu_library = xyes; then cf_save="$CPPFLAGS" AC_CACHE_CHECK(if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE,cf_cv_gnu_dftsrc_219,[ CF_ADD_CFLAGS(-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include #include ],[ @@ -2007,7 +2162,7 @@ if test x$cf_cv_gnu_library = xyes; then return 0; #else # error GNU C library is too old - #endif], + #endif])], [cf_cv_gnu_dftsrc_219=yes], [cf_cv_gnu_dftsrc_219=no]) ]) @@ -2019,17 +2174,17 @@ if test x$cf_cv_gnu_library = xyes; then if test "x$cf_cv_gnu_dftsrc_219" != xyes; then AC_CACHE_CHECK(if we must define _GNU_SOURCE,cf_cv_gnu_source,[ - AC_TRY_COMPILE([#include ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #ifndef _XOPEN_SOURCE #error expected _XOPEN_SOURCE to be defined - #endif], + #endif])], [cf_cv_gnu_source=no], [cf_save="$CPPFLAGS" CF_ADD_CFLAGS(-D_GNU_SOURCE) - AC_TRY_COMPILE([#include ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #ifdef _XOPEN_SOURCE #error expected _XOPEN_SOURCE to be undefined - #endif], + #endif])], [cf_cv_gnu_source=no], [cf_cv_gnu_source=yes]) CPPFLAGS="$cf_save" @@ -2040,10 +2195,10 @@ if test x$cf_cv_gnu_library = xyes; then then AC_CACHE_CHECK(if we should also define _DEFAULT_SOURCE,cf_cv_default_source,[ CF_APPEND_TEXT(CPPFLAGS,-D_GNU_SOURCE) - AC_TRY_COMPILE([#include ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #ifdef _DEFAULT_SOURCE #error expected _DEFAULT_SOURCE to be undefined - #endif], + #endif])], [cf_cv_default_source=no], [cf_cv_default_source=yes]) ]) @@ -2289,7 +2444,45 @@ fi AC_SUBST(INSTALL_OPT_S) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25 +dnl CF_INSTALL_PREFIX version: 2 updated: 2025/10/18 11:14:21 +dnl ----------------- +dnl Special option for use by system-builders: the install-prefix is used to +dnl adjust the location into which the actual install is done, so that an +dnl archive can be built without modifying the host system's configuration. +AC_DEFUN([CF_INSTALL_PREFIX],[ +AC_MSG_CHECKING(for an installation directory prefix) +AC_ARG_WITH(install-prefix, + [ --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix], + [case "x$withval" in + (xyes|xno) + ;; + (*) DESTDIR="$withval" + ;; + esac]) +AC_MSG_RESULT([${DESTDIR:-(none)}]) +AC_SUBST(DESTDIR) + +SET_DESTDIR= +test -n "$DESTDIR" && SET_DESTDIR="DESTDIR=$DESTDIR" +AC_SUBST(SET_DESTDIR) + +AC_MSG_CHECKING(if installation directory prefix should be merged) +CF_ARG_ENABLE(install-prefix, + [ --enable-install-prefix merge DESTDIR with installation prefix], + cf_install_prefix=yes, + cf_install_prefix=no) +AC_MSG_RESULT($cf_install_prefix) + +if test "$cf_install_prefix" = yes ; then + MERGE_PREFIX=':$(prefix)%=%' +else + MERGE_PREFIX='' +fi + +AC_SUBST(MERGE_PREFIX) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_INTEL_COMPILER version: 10 updated: 2025/12/14 17:40:20 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 @@ -2312,12 +2505,12 @@ if test "$ifelse([$1],,[$1],GCC)" = yes ; then AC_MSG_CHECKING(if this is really Intel ifelse([$1],GXX,C++,C) compiler) cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])" ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -no-gcc" - AC_TRY_COMPILE([],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[ #ifdef __INTEL_COMPILER #else #error __INTEL_COMPILER is not defined #endif -],[ifelse([$2],,INTEL_COMPILER,[$2])=yes +])],[ifelse([$2],,INTEL_COMPILER,[$2])=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" ],[]) ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" @@ -2327,7 +2520,7 @@ cf_save_CFLAGS="$cf_save_CFLAGS -we147" fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LARGEFILE version: 13 updated: 2023/12/03 19:09:59 +dnl CF_LARGEFILE version: 14 updated: 2025/12/22 04:16:14 dnl ------------ dnl Add checks for large file support. AC_DEFUN([CF_LARGEFILE],[ @@ -2357,7 +2550,7 @@ ifdef([AC_FUNC_FSEEKO],[ fi AC_CACHE_CHECK(whether to use struct dirent64, cf_cv_struct_dirent64,[ - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #pragma GCC diagnostic error "-Wincompatible-pointer-types" #include #include @@ -2372,7 +2565,7 @@ extern struct dirent64 * readdir(DIR *); struct dirent *y = readdir(dp); int z = x - y; (void)z; - ], + ])], [cf_cv_struct_dirent64=yes], [cf_cv_struct_dirent64=no]) ]) @@ -2381,7 +2574,7 @@ extern struct dirent64 * readdir(DIR *); ]) ]) dnl --------------------------------------------------------------------------- -dnl CF_LD_RPATH_OPT version: 9 updated: 2021/01/01 13:31:04 +dnl CF_LD_RPATH_OPT version: 10 updated: 2025/12/15 04:04:20 dnl --------------- dnl For the given system and compiler, find the compiler flags to pass to the dnl loader to use the "rpath" feature. @@ -2429,7 +2622,7 @@ then AC_MSG_CHECKING(if we need a space after rpath option) cf_save_LIBS="$LIBS" CF_ADD_LIBS(${LD_RPATH_OPT}$libdir) - AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes) + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], cf_rpath_space=no, cf_rpath_space=yes) LIBS="$cf_save_LIBS" AC_MSG_RESULT($cf_rpath_space) test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " @@ -2600,7 +2793,7 @@ AC_DEFUN([CF_LIB_TYPE], test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LINK_DATAONLY version: 15 updated: 2023/12/03 10:03:10 +dnl CF_LINK_DATAONLY version: 17 updated: 2025/12/24 12:27:29 dnl ---------------- dnl Some systems have a non-ANSI linker that doesn't pull in modules that have dnl only data (i.e., no functions), for example NeXT. On those systems we'll @@ -2616,10 +2809,10 @@ AC_CACHE_VAL(cf_cv_link_dataonly,[ int testdata[[3]] = { 123, 456, 789 }; EOF if AC_TRY_EVAL(ac_compile) ; then - mv conftest.o data.o && \ - ( $AR $ARFLAGS conftest.a data.o ) 2>&AC_FD_CC 1>/dev/null + mv conftest.$OBJEXT data.$OBJEXT && \ + ( $AR $ARFLAGS conftest.a data.$OBJEXT ) 2>&AS_MESSAGE_LOG_FD 1>/dev/null fi - rm -f conftest.$ac_ext data.o + rm -f conftest.$ac_ext data.$OBJEXT cat >conftest.$ac_ext <&AC_FD_CC 1>/dev/null + mv conftest.$OBJEXT func.$OBJEXT && \ + ( $AR $ARFLAGS conftest.a func.$OBJEXT ) 2>&AS_MESSAGE_LOG_FD 1>/dev/null fi - rm -f conftest.$ac_ext func.o - ( eval $RANLIB conftest.a ) 2>&AC_FD_CC >/dev/null + rm -f conftest.$ac_ext func.$OBJEXT + ( eval $RANLIB conftest.a ) 2>&AS_MESSAGE_LOG_FD >/dev/null cf_saveLIBS="$LIBS" LIBS="conftest.a $LIBS" AC_TRY_RUN([ @@ -2668,50 +2861,7 @@ AC_SUBST(BROKEN_LINKER) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MAKEFLAGS version: 21 updated: 2021/09/04 06:47:34 -dnl ------------ -dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make' -dnl options to lower-levels. It is very useful for "make -n" -- if we have it. -dnl (GNU 'make' does both, something POSIX 'make', which happens to make the -dnl ${MAKEFLAGS} variable incompatible because it adds the assignments :-) -AC_DEFUN([CF_MAKEFLAGS], -[AC_REQUIRE([AC_PROG_FGREP])dnl - -AC_CACHE_CHECK(for makeflags variable, cf_cv_makeflags,[ - cf_cv_makeflags='' - for cf_option in '-${MAKEFLAGS}' '${MFLAGS}' - do - cat >cf_makeflags.tmp </dev/null | ${FGREP-fgrep} -v "ing directory" | sed -e 's,[[ ]]*$,,'` - case "$cf_result" in - (.*k|.*kw) - cf_result="`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`" - case "$cf_result" in - (.*CC=*) cf_cv_makeflags= - ;; - (*) cf_cv_makeflags=$cf_option - ;; - esac - break - ;; - (.-) - ;; - (*) - CF_MSG_LOG(given option \"$cf_option\", no match \"$cf_result\") - ;; - esac - done - rm -f cf_makeflags.tmp -]) - -AC_SUBST(cf_cv_makeflags) -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_MAKE_PHONY version: 3 updated: 2021/01/08 16:08:21 +dnl CF_MAKE_PHONY version: 4 updated: 2025/12/24 12:27:29 dnl ------------- dnl Check if the make-program handles a ".PHONY" target, e.g,. a target which dnl acts as a placeholder. @@ -2782,7 +2932,7 @@ CF_EOF fi break done - ) >&AC_FD_CC 2>&1 + ) >&AS_MESSAGE_LOG_FD 2>&1 cf_cv_make_PHONY="`cat conftest.tmp`" rm -rf conftest* ]) @@ -2861,7 +3011,7 @@ fi test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MKSTEMP version: 13 updated: 2023/12/01 17:22:50 +dnl CF_MKSTEMP version: 14 updated: 2025/12/14 18:08:20 dnl ---------- dnl Check for a working mkstemp. This creates two files, checks that they are dnl successfully created and distinct (AmigaOS apparently fails on the last). @@ -2871,7 +3021,7 @@ unistd.h \ ) AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[ rm -rf ./conftest* -AC_TRY_RUN([ +AC_RUN_IFELSE([AC_LANG_SOURCE([[ $ac_includes_default int main(void) @@ -2901,7 +3051,7 @@ int main(void) result = 1; ${cf_cv_main_return:-return}(result); } -],[cf_cv_func_mkstemp=yes +]])],[cf_cv_func_mkstemp=yes ],[cf_cv_func_mkstemp=no ],[cf_cv_func_mkstemp=maybe]) ]) @@ -2913,15 +3063,15 @@ if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; th fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MSG_LOG version: 5 updated: 2010/10/23 15:52:32 +dnl CF_MSG_LOG version: 6 updated: 2025/12/14 17:51:46 dnl ---------- dnl Write a debug message to config.log, along with the line number in the dnl configure script. AC_DEFUN([CF_MSG_LOG],[ -echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC +echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AS_MESSAGE_LOG_FD ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_ADDON version: 6 updated: 2021/01/04 19:33:05 +dnl CF_NCURSES_ADDON version: 9 updated: 2025/12/24 13:30:00 dnl ---------------- dnl Configure an ncurses add-on, built outside the ncurses tree. AC_DEFUN([CF_NCURSES_ADDON],[ @@ -2929,18 +3079,29 @@ AC_REQUIRE([CF_NCURSES_CONFIG]) AC_PROVIDE([CF_SUBST_NCURSES_VERSION]) -AC_MSG_CHECKING(if you want wide-character code) -AC_ARG_ENABLE(widec, - [ --enable-widec compile with wide-char/UTF-8 code], - [with_widec=$enableval], - [with_widec=no]) -AC_MSG_RESULT($with_widec) -if test "$with_widec" = yes ; then +AC_MSG_CHECKING(for specified curses library type) +AC_ARG_WITH(screen, + [ --with-screen=XXX use specified curses-libraries], + [cf_cv_screen=$withval], + [cf_cv_screen=ncurses]) + +case $cf_cv_screen in +(curses|curses_*) + CF_CURSES_CONFIG + ;; +(ncursesw*) CF_UTF8_LIB - CF_NCURSES_CONFIG(ncursesw) -else - CF_NCURSES_CONFIG(ncurses) -fi + CF_NCURSES_CONFIG($cf_cv_screen) + ;; +(ncurses*) + CF_NCURSES_CONFIG($cf_cv_screen) + ;; +(*) + AC_MSG_ERROR(unexpected screen-value: $cf_cv_screen) + ;; +esac + +AC_SUBST(cf_cv_screen) if test "$NCURSES_CONFIG_PKG" != none ; then cf_version=`$PKG_CONFIG --modversion $NCURSES_CONFIG_PKG 2>/dev/null` @@ -3004,29 +3165,32 @@ dnl We need these values in the generated makefiles AC_SUBST(cf_cv_rel_version) AC_SUBST(cf_cv_abi_version) -dnl FIXME - not needed for Ada95 -AC_SUBST(cf_cv_builtin_bool) -AC_SUBST(cf_cv_header_stdbool_h) -AC_SUBST(cf_cv_type_of_bool)dnl - +AC_CACHE_CHECK(if KEY_RESIZE is supported,cf_cv_curses_resizes,[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <${cf_cv_ncurses_header:-curses.h}>], + [int key = KEY_RESIZE; (void)key])], + cf_cv_curses_resizes=yes, + cf_cv_curses_resizes=no)]) +cf_cv_enable_sigwinch=0 +test "$cf_cv_curses_resizes" = yes && cf_cv_enable_sigwinch=1 +AC_SUBST(cf_cv_enable_sigwinch) ]) dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CC_CHECK version: 6 updated: 2023/02/18 17:47:58 +dnl CF_NCURSES_CC_CHECK version: 7 updated: 2025/12/22 04:16:14 dnl ------------------- dnl Check if we can compile with ncurses' header file dnl $1 is the cache variable to set dnl $2 is the header-file to include dnl $3 is the root name (ncurses or ncursesw) AC_DEFUN([CF_NCURSES_CC_CHECK],[ - AC_TRY_COMPILE([ -]ifelse($3,ncursesw,[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +]ifelse([$3],ncursesw,[ #define _XOPEN_SOURCE_EXTENDED #undef HAVE_LIBUTF8_H /* in case we used CF_UTF8_LIB */ #define HAVE_LIBUTF8_H /* to force ncurses' header file to use cchar_t */ ])[ #include <$2>],[ #ifdef NCURSES_VERSION -]ifelse($3,ncursesw,[ +]ifelse([$3],ncursesw,[ #ifndef WACS_BSSB #error WACS_BSSB is not defined #endif @@ -3039,12 +3203,12 @@ printf("old\\n"); #error __NCURSES_H is not defined #endif #endif - ] + ])]dnl ,[$1=$2] ,[$1=no]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CONFIG version: 28 updated: 2021/08/28 15:20:37 +dnl CF_NCURSES_CONFIG version: 30 updated: 2025/12/22 04:16:14 dnl ----------------- dnl Tie together the configure-script macros for ncurses, preferring these in dnl order: @@ -3082,8 +3246,8 @@ if test "x${PKG_CONFIG:=none}" != xnone; then CF_ADD_CFLAGS($cf_pkg_cflags) CF_ADD_LIBS($cf_pkg_libs) - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr(); mousemask(0,0); tigetstr((char *)0);], + AC_LINK_IFELSE([AC_LANG_PROGRAM([#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) { const char *xx = curses_version(); return (xx == 0); }], @@ -3105,11 +3269,12 @@ if test "x${PKG_CONFIG:=none}" != xnone; then ;; esac + CF_REQUIRE_PKG($cf_ncuconfig_root) 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_LINK_IFELSE([AC_LANG_PROGRAM([#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) { const char *xx = curses_version(); return (xx == 0); }], @@ -3225,7 +3390,7 @@ AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries]) CF_NCURSES_VERSION ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_HEADER version: 7 updated: 2021/01/04 19:33:05 +dnl CF_NCURSES_HEADER version: 8 updated: 2025/12/22 04:16:14 dnl ----------------- dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common dnl variations of ncurses' installs. @@ -3252,10 +3417,10 @@ AC_CACHE_CHECK(for $cf_ncuhdr_root include-path, cf_cv_ncurses_h2,[ CF_NCURSES_CC_CHECK(cf_cv_ncurses_h2,$cf_header,$1) if test "$cf_cv_ncurses_h2" != no ; then cf_cv_ncurses_h2=$cf_incdir/$cf_header - test -n "$verbose" && echo $ECHO_N " ... found $ECHO_C" 1>&AC_FD_MSG + test -n "$verbose" && echo $ECHO_N " ... found $ECHO_C" 1>&AS_MESSAGE_FD break fi - test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&AC_FD_MSG + test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&AS_MESSAGE_FD done CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break @@ -3291,7 +3456,7 @@ esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_LIBS version: 21 updated: 2021/09/04 06:37:12 +dnl CF_NCURSES_LIBS version: 22 updated: 2025/12/22 04:16:14 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. @@ -3348,8 +3513,8 @@ if test -n "$cf_ncurses_LIBS" ; then LIBS="$q" fi done - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr(); mousemask(0,0); tigetstr((char *)0);], + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr(); mousemask(0,0); tigetstr((char *)0);])], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) LIBS="$cf_ncurses_SAVE"]) @@ -3359,7 +3524,7 @@ CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_nculib_root) AC_DEFINE_UNQUOTED($cf_nculib_ROOT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_VERSION version: 18 updated: 2024/01/07 06:34:16 +dnl CF_NCURSES_VERSION version: 19 updated: 2025/12/22 04:16:14 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 @@ -3410,7 +3575,7 @@ Autoconf "old" ; #endif EOF - cf_try="$ac_cpp conftest.$ac_ext 2>&AC_FD_CC | grep '^Autoconf ' >conftest.out" + cf_try="$ac_cpp conftest.$ac_ext 2>&AS_MESSAGE_LOG_FD | grep '^Autoconf ' >conftest.out" AC_TRY_EVAL(cf_try) if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[[^"]]*"%%' -e 's%".*%%' conftest.out` @@ -3459,39 +3624,39 @@ ifelse([$1],,,[$1=$PATH_SEPARATOR]) AC_MSG_RESULT($PATH_SEPARATOR) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20 +dnl CF_PATH_SYNTAX version: 20 updated: 2025/12/16 04:09:03 dnl -------------- dnl Check the argument to see that it looks like a pathname. Rewrite it if it dnl begins with one of the prefix/exec_prefix variables, and then again if the dnl result begins with 'NONE'. This is necessary to work around autoconf's dnl delayed evaluation of those symbols. AC_DEFUN([CF_PATH_SYNTAX],[ +AC_REQUIRE([CF_GLOB_FULLPATH])dnl + if test "x$prefix" != xNONE; then cf_path_syntax="$prefix" else cf_path_syntax="$ac_default_prefix" fi -case ".[$]$1" in -(.\[$]\(*\)*|.\'*\'*) +case "x[$]$1" in +(x\[$]\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX - ;; -(.\[$]\{*prefix\}*|.\[$]\{*dir\}*) +(x\[$]\{*prefix\}*|x\[$]\{*dir\}*) eval $1="[$]$1" - case ".[$]$1" in - (.NONE/*) + case "x[$]$1" in + (xNONE/*) $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2) + ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not "[$]$1"])],$2) ;; esac ])dnl @@ -3534,7 +3699,7 @@ fi AC_SUBST(PKG_CONFIG) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_POSIX_C_SOURCE version: 12 updated: 2023/02/18 17:41:25 +dnl CF_POSIX_C_SOURCE version: 13 updated: 2025/12/14 17:40:20 dnl ----------------- dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed. dnl @@ -3563,10 +3728,10 @@ CF_REMOVE_DEFINE(cf_trim_CPPFLAGS,$cf_save_CPPFLAGS,_POSIX_C_SOURCE) 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 ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #ifndef _POSIX_C_SOURCE #error _POSIX_C_SOURCE is not defined -#endif], +#endif])], [cf_cv_posix_c_source=no], [cf_want_posix_source=no case .$cf_POSIX_C_SOURCE in @@ -3582,10 +3747,10 @@ AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_posix_c_source,[ ;; esac if test "$cf_want_posix_source" = yes ; then - AC_TRY_COMPILE([#include ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #ifdef _POSIX_SOURCE #error _POSIX_SOURCE is defined -#endif],[], +#endif])],[], cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE") fi CF_MSG_LOG(ifdef from value $cf_POSIX_C_SOURCE) @@ -3593,10 +3758,10 @@ AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_posix_c_source,[ CPPFLAGS="$cf_trim_CPPFLAGS" CF_APPEND_TEXT(CPPFLAGS,$cf_cv_posix_c_source) CF_MSG_LOG(if the second compile does not leave our definition intact error) - AC_TRY_COMPILE([#include ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #ifndef _POSIX_C_SOURCE #error _POSIX_C_SOURCE is not defined -#endif],, +#endif])],, [cf_cv_posix_c_source=no]) CFLAGS="$cf_save_CFLAGS" CPPFLAGS="$cf_save_CPPFLAGS" @@ -3613,7 +3778,7 @@ fi # cf_cv_posix_visible ])dnl dnl --------------------------------------------------------------------------- -dnl CF_POSIX_VISIBLE version: 1 updated: 2018/12/31 20:46:17 +dnl CF_POSIX_VISIBLE version: 2 updated: 2025/12/14 17:40:20 dnl ---------------- dnl POSIX documents test-macros which an application may set before any system dnl headers are included to make features available. @@ -3629,14 +3794,14 @@ dnl conflicting definition. AC_DEFUN([CF_POSIX_VISIBLE], [ AC_CACHE_CHECK(if the POSIX test-macros are already defined,cf_cv_posix_visible,[ -AC_TRY_COMPILE([#include ],[ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #if defined(__POSIX_VISIBLE) && ((__POSIX_VISIBLE - 0L) > 0) \ && defined(__XSI_VISIBLE) && ((__XSI_VISIBLE - 0L) > 0) \ && defined(__BSD_VISIBLE) && ((__BSD_VISIBLE - 0L) > 0) \ && defined(__ISO_C_VISIBLE) && ((__ISO_C_VISIBLE - 0L) > 0) #error conflicting symbols found #endif -],[cf_cv_posix_visible=no],[cf_cv_posix_visible=yes]) +])],[cf_cv_posix_visible=no],[cf_cv_posix_visible=yes]) ]) ])dnl dnl --------------------------------------------------------------------------- @@ -3673,7 +3838,7 @@ CF_ACVERSION_CHECK(2.52, CF_CC_ENV_FLAGS ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_CC_C_O version: 6 updated: 2021/01/01 13:31:04 +dnl CF_PROG_CC_C_O version: 7 updated: 2025/12/24 12:27:29 dnl -------------- dnl Analogous to AC_PROG_CC_C_O, but more useful: tests only $CC, ensures that dnl the output file can be renamed, and allows for a shell variable that can @@ -3697,7 +3862,7 @@ int main(void) CF_EOF # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. -ac_try='[$]$1 $2 -c conftest.$ac_ext -o conftest2.$ac_objext >&AC_FD_CC' +ac_try='[$]$1 $2 -c conftest.$ac_ext -o conftest2.$ac_objext >&AS_MESSAGE_LOG_FD' if AC_TRY_EVAL(ac_try) && test -f conftest2.$ac_objext && AC_TRY_EVAL(ac_try); then @@ -3754,7 +3919,7 @@ AC_SUBST(PROG_EXT) test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT",[Define to the program extension (normally blank)]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_GNAT version: 12 updated: 2021/01/02 17:09:14 +dnl CF_PROG_GNAT version: 13 updated: 2025/12/24 12:27:29 dnl ------------ dnl Check for gnat/gnatmake/etc, ensure that the toolset is complete. AC_DEFUN([CF_PROG_GNAT],[ @@ -3803,12 +3968,12 @@ else "$cf_gprconfig,,,,GCC" \ "$cf_gprconfig" do - cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&AC_FD_CC | ${AWK:-awk} '/^\*/{print [$]3;}' | head -n 1` + cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&AS_MESSAGE_LOG_FD | ${AWK:-awk} '/^\*/{print [$]3;}' | head -n 1` test -n "$cf_gprconfig_value" && break done else cf_gprconfig_param=$cf_gprconfig - cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&AC_FD_CC | ${AWK:-awk} '/^\*/{print [$]3;}' | head -n 1` + cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&AS_MESSAGE_LOG_FD | ${AWK:-awk} '/^\*/{print [$]3;}' | head -n 1` fi if test -n "$cf_gprconfig_value" then @@ -3859,15 +4024,25 @@ AC_SUBST(cf_ada_config_Ada) AC_SUBST(cf_ada_config_C) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_INSTALL version: 10 updated: 2021/01/04 19:33:05 +dnl CF_PROG_INSTALL version: 13 updated: 2025/10/21 16:28:49 dnl --------------- dnl Force $INSTALL to be an absolute-path. Otherwise, edit_man.sh and the dnl misc/tabset install won't work properly. Usually this happens only when dnl using the fallback mkinstalldirs script AC_DEFUN([CF_PROG_INSTALL], [AC_PROG_INSTALL -case $INSTALL in -(/*) +AC_REQUIRE([CF_GLOB_FULLPATH])dnl +if test "x$INSTALL" = "x./install-sh -c"; then + if test -f /usr/sbin/install ; then + case "$host_os" in + (linux*gnu*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) + INSTALL=/usr/sbin/install + ;; + esac + fi +fi +case x$INSTALL in +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; (*) CF_DIRNAME(cf_dir,$INSTALL) @@ -3947,6 +4122,30 @@ define([CF_REMOVE_LIB], $1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'` ])dnl dnl --------------------------------------------------------------------------- +dnl CF_REQUIRE_PKG version: 1 updated: 2025/01/10 19:55:54 +dnl -------------- +dnl Update $REQUIRE_PKG, which lists the known required packages for this +dnl program. +dnl +dnl $1 = package(s) to require, e.g., in the generated ".pc" file +define([CF_REQUIRE_PKG], +[ +for cf_required in $1 +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done +AC_SUBST(REQUIRE_PKG) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_RESTORE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:47:45 dnl --------------------- dnl Restore flags saved in CF_SAVE_XTRA_FLAGS @@ -3983,7 +4182,7 @@ do done ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SHARED_OPTS version: 111 updated: 2024/03/29 20:08:49 +dnl CF_SHARED_OPTS version: 114 updated: 2025/12/15 04:04:20 dnl -------------- dnl -------------- dnl Attempt to determine the appropriate CC/LD options for creating a shared @@ -4073,7 +4272,7 @@ AC_DEFUN([CF_SHARED_OPTS], for CC_SHARED_OPTS in -fPIC -fpic '' do CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" - AC_TRY_COMPILE([#include ],[int x = 1; (void)x],[break],[]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[int x = 1; (void)x])],[break],[]) done AC_MSG_RESULT($CC_SHARED_OPTS) CFLAGS="$cf_save_CFLAGS" @@ -4148,7 +4347,7 @@ CF_EOF AC_CACHE_CHECK([if ld -search_paths_first works], cf_cv_ldflags_search_paths_first, [ cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" - AC_TRY_LINK(, [int i;], cf_cv_ldflags_search_paths_first=yes, cf_cv_ldflags_search_paths_first=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [int i;])], cf_cv_ldflags_search_paths_first=yes, cf_cv_ldflags_search_paths_first=no) LDFLAGS=$cf_save_LDFLAGS]) if test "$cf_cv_ldflags_search_paths_first" = yes; then LDFLAGS="$LDFLAGS -Wl,-search_paths_first" @@ -4278,7 +4477,7 @@ CF_EOF -L*) ldopts+=("\`echo \"\[$]1\" | sed \"s/^-L/-LIBPATH:/\"\`") ;; - *.obj | *.o) + *.obj | *.$OBJEXT) ldopts+=("\[$]1") ;; -Wl,*) @@ -4455,7 +4654,7 @@ CF_EOF for cf_shared_opts in -xcode=pic32 -xcode=pic13 -KPIC -Kpic -O do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" - AC_TRY_COMPILE([#include ],[printf("Hello\\n");],[break]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[printf("Hello\\n");])],[break]) done CFLAGS="$cf_save_CFLAGS" CC_SHARED_OPTS=$cf_shared_opts @@ -4499,7 +4698,7 @@ cat > conftest.$ac_ext < +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include #include <${cf_cv_ncurses_header:-curses.h}> #include <$cf_test> -],[int x = auto_left_margin; (void)x],[ +],[int x = auto_left_margin; (void)x])],[ cf_cv_term_header="$cf_test"],[ cf_cv_term_header=unknown ]) @@ -4648,17 +4847,17 @@ top_builddir=ifelse($1,,`pwd`,$1) AC_SUBST(top_builddir) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TRY_XOPEN_SOURCE version: 4 updated: 2022/09/10 15:16:16 +dnl CF_TRY_XOPEN_SOURCE version: 5 updated: 2025/12/14 17:40:20 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(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(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(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY)], [cf_cv_xopen_source=no], [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) CPPFLAGS="$cf_save" @@ -4682,20 +4881,20 @@ AC_DEFUN([CF_UPPER], $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` ])dnl dnl --------------------------------------------------------------------------- -dnl CF_UTF8_LIB version: 10 updated: 2023/01/11 04:05:23 +dnl CF_UTF8_LIB version: 12 updated: 2025/12/22 04:16:14 dnl ----------- dnl Check for multibyte support, and if not found, utf8 compatibility library AC_DEFUN([CF_UTF8_LIB], [ -AC_HAVE_HEADERS(wchar.h) +AC_CHECK_HEADERS(wchar.h) AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[ cf_save_LIBS="$LIBS" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ $ac_includes_default #ifdef HAVE_WCHAR_H #include #endif -],[putwc(0,0);], +],[putwc(0,0);])], [cf_cv_utf8_lib=yes], [CF_FIND_LINKAGE([ #include ],[putwc(0,0);],utf8, @@ -4713,22 +4912,22 @@ if test "$cf_cv_utf8_lib" = "add-on" ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_VERBOSE version: 3 updated: 2007/07/29 09:55:12 +dnl CF_VERBOSE version: 4 updated: 2025/12/14 17:51:46 dnl ---------- dnl Use AC_VERBOSE w/o the warnings AC_DEFUN([CF_VERBOSE], -[test -n "$verbose" && echo " $1" 1>&AC_FD_MSG +[test -n "$verbose" && echo " $1" 1>&AS_MESSAGE_FD CF_MSG_LOG([$1]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WEAK_SYMBOLS version: 1 updated: 2008/08/16 19:18:06 +dnl CF_WEAK_SYMBOLS version: 2 updated: 2025/12/24 12:27:29 dnl --------------- dnl Check for compiler-support for weak symbols. dnl This works with "recent" gcc. AC_DEFUN([CF_WEAK_SYMBOLS],[ AC_CACHE_CHECK(if $CC supports weak symbols,cf_cv_weak_symbols,[ -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include ], [ #if defined(__GNUC__) @@ -4743,10 +4942,60 @@ AC_TRY_COMPILE([ #endif weak_symbol(fopen); -],[cf_cv_weak_symbols=yes],[cf_cv_weak_symbols=no]) +])],[cf_cv_weak_symbols=yes],[cf_cv_weak_symbols=no]) ]) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_WITH_ADA version: 2 updated: 2024/11/09 18:07:29 +dnl ----------- +dnl Check for the Ada compiler (unless requested to not do this), which causes +dnl a further check for a C compiler which can work with the Ada compiler. +AC_DEFUN([CF_WITH_ADA],[ +AC_ARG_WITH(ada, + [ --without-ada suppress check for Ada compiler], + [cf_with_ada=$withval], + [cf_with_ada=yes]) + +cf_prog_cc="gcc cc" +if test "x$cf_with_ada" = xyes +then + CF_PROG_GNAT + if test "x$cf_cv_prog_gnat_correct" = xyes; then + # gcc's developers chose to deprecate gnatgcc before making gprconfig + # work. They replaced gnatgcc in gcc 13 with a script which spits out + # a warning offering advice which could never work. + # + # Here is a workaround. + AC_PATH_PROG(cf_cv_path_gnatgcc,gnatgcc,no) + if test "$cf_cv_path_gnatgcc" != no + then + AC_MSG_CHECKING(for improvement) + cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null` + case "x$cf_file_gnatgcc" in + (*script*) + cf_cv_path_gnatgcc=`sh -x "$cf_cv_path_gnatgcc" --version 2>&1 | grep -w exec | sed -e 's/^[[ ]]*+[[ ]]*//' -e 's/exec[[ ]]//' -e 's/ .*//'` + ;; + (*) + cf_cv_path_gnatgcc=no + ;; + esac + AC_MSG_RESULT($cf_cv_path_gnatgcc) + test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc + cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc" + fi + fi +fi +case "$cf_prog_cc" in +(*/*) + CC="$cf_prog_cc" + AC_SUBST(CC) + ;; +(*) + CF_PROG_CC($cf_prog_cc) + ;; +esac +])dnl +dnl --------------------------------------------------------------------------- dnl CF_WITH_ADA_COMPILER version: 3 updated: 2023/10/28 11:59:01 dnl -------------------- dnl Command-line option to specify the Ada95 compiler. @@ -4924,7 +5173,7 @@ eval $3="$withval" AC_SUBST($3)dnl ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_PKG_CONFIG_LIBDIR version: 23 updated: 2023/11/22 20:48:30 +dnl CF_WITH_PKG_CONFIG_LIBDIR version: 25 updated: 2024/08/03 13:34:29 dnl ------------------------- dnl Allow the choice of the pkg-config library directory to be overridden. dnl @@ -4938,6 +5187,7 @@ dnl pkgconf (used with some systems such as FreeBSD in place of pkg-config) dnl optionally ignores $PKG_CONFIG_LIBDIR. Very old versions of pkg-config, dnl e.g., Solaris 10 also do not recognize $PKG_CONFIG_LIBDIR. AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[ +AC_REQUIRE([CF_GLOB_FULLPATH])dnl case "$PKG_CONFIG" in (no|none|yes) @@ -4971,10 +5221,10 @@ case "x$cf_search_path" in ;; (x) ;; -(x/*\ *) +(x$GLOB_FULLPATH_POSIX\ *|x$GLOB_FULLPATH_OTHER\ *) PKG_CONFIG_LIBDIR= ;; -(x/*) +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) PKG_CONFIG_LIBDIR="$cf_search_path" AC_MSG_RESULT($PKG_CONFIG_LIBDIR) cf_search_path= @@ -4993,7 +5243,15 @@ case "x$cf_search_path" in pkg-config \ pkgconf do - cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` + cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null` + case "$cf_raw_search_path" in + (*\\*) + cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'` + ;; + (*/*) + cf_search_path=`echo "$cf_raw_search_path" | tr : ' '` + ;; + esac test -n "$cf_search_path" && break done @@ -5066,7 +5324,7 @@ fi AC_SUBST(PKG_CONFIG_LIBDIR) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_PTHREAD version: 7 updated: 2015/04/18 08:56:57 +dnl CF_WITH_PTHREAD version: 8 updated: 2025/12/24 12:27:29 dnl --------------- dnl Check for POSIX thread library. AC_DEFUN([CF_WITH_PTHREAD], @@ -5087,12 +5345,12 @@ if test "$with_pthread" != no ; then AC_MSG_CHECKING(if we can link with the $cf_lib_pthread library) cf_save_LIBS="$LIBS" CF_ADD_LIB($cf_lib_pthread) - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include ],[ int rc = pthread_create(0,0,0,0); int r2 = pthread_mutexattr_settype(0, 0); -],[with_pthread=yes],[with_pthread=no]) +])],[with_pthread=yes],[with_pthread=no]) LIBS="$cf_save_LIBS" AC_MSG_RESULT($with_pthread) test "$with_pthread" = yes && break @@ -5108,7 +5366,7 @@ if test "$with_pthread" != no ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_WITH_SYSTYPE version: 1 updated: 2013/01/26 16:26:12 +dnl CF_WITH_SYSTYPE version: 2 updated: 2025/12/14 18:08:20 dnl --------------- dnl For testing, override the derived host system-type which is used to decide dnl things such as the linker commands used to build shared libraries. This is @@ -5119,7 +5377,7 @@ dnl This is different from the --host option: it is used only for testing parts dnl of the configure script which would not be reachable with --host since that dnl relies on the build environment being real, rather than mocked up. AC_DEFUN([CF_WITH_SYSTYPE],[ -CF_CHECK_CACHE([AC_CANONICAL_SYSTEM]) +CF_CHECK_CACHE([AC_CANONICAL_TARGET]) AC_ARG_WITH(system-type, [ --with-system-type=XXX test: override derived host system-type], [AC_MSG_WARN(overriding system type to $withval) @@ -5128,7 +5386,7 @@ AC_ARG_WITH(system-type, ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 67 updated: 2023/09/06 18:55:27 +dnl CF_XOPEN_SOURCE version: 71 updated: 2025/12/14 17:40:20 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, @@ -5188,9 +5446,12 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) +(linux*gnu*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) CF_GNU_SOURCE($cf_XOPEN_SOURCE) ;; +linux*musl) + cf_xopen_source="-D_BSD_SOURCE" + ;; (minix*) cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this... ;; @@ -5242,7 +5503,7 @@ case "$host_os" in # 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_COMPILE_IFELSE([AC_LANG_PROGRAM(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY)],,[ AC_MSG_WARN(_POSIX_C_SOURCE definition is not usable) CPPFLAGS="$cf_save_xopen_cppflags"]) fi @@ -5258,19 +5519,19 @@ dnl which is still not guaranteed to provide all of the entrypoints that dnl _XOPEN_SOURCE would yield. 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 ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #ifndef _XOPEN_SOURCE #error _XOPEN_SOURCE is not defined -#endif], +#endif])], [cf_XOPEN_SOURCE_set=yes], [cf_XOPEN_SOURCE_set=no]) AC_MSG_RESULT($cf_XOPEN_SOURCE_set) if test "$cf_XOPEN_SOURCE_set" = yes then - AC_TRY_COMPILE([#include ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE #error (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE -#endif], +#endif])], [cf_XOPEN_SOURCE_set_ok=yes], [cf_XOPEN_SOURCE_set_ok=no]) if test "$cf_XOPEN_SOURCE_set_ok" = no diff --git a/Ada95/configure b/Ada95/configure index 8c01a29..0b12053 100755 --- a/Ada95/configure +++ b/Ada95/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Revision: 1.91 . +# From configure.in Revision: 1.97 . # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20231210. +# Generated by Autoconf 2.52.20250126. # # Copyright 2003-2022,2023 Thomas E. Dickey # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -481,6 +481,10 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; + -*dir | -dvi* | -doc* | -html* | -local* | -pdf* | -ps* ) + echo "$as_me: WARNING: unsupported option: $ac_option" >&2 + ;; + -*) { echo "$as_me: error: unrecognized option: $ac_option Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } @@ -703,13 +707,15 @@ Optional Features: General Options: --with-system-type=XXX test: override derived host system-type + --without-ada suppress check for Ada compiler --disable-stripping do not strip (debug info) installed executables --with-strip-program=XX specify program to use when stripping in install --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD --with-pkg-config-libdir[=XXX] use given directory for installing pc-files --without-tests suppress build with test-programs --enable-mixed-case tic should assume mixed-case filenames - --with-install-prefix prefixes actual install-location ($DESTDIR) + --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix + --enable-install-prefix merge DESTDIR with installation prefix Build-Tools Needed to Compile Temporary Applications for Cross-compiling: --with-build-cc=XXX the build C compiler ($BUILD_CC) --with-build-cpp=XXX the build C preprocessor ($BUILD_CPP) @@ -720,7 +726,7 @@ Build-Tools Needed to Compile Temporary Applications for Cross-compiling: Options to Specify the Libraries Built/Used: --with-shared generate shared C-objects (needed for --with-ada-sharedlib) --with-curses-dir=DIR directory in which (n)curses is installed - --enable-widec compile with wide-char/UTF-8 code + --with-screen=XXX use specified curses-libraries --with-lib-prefix override library-prefix --with-shlib-version[={rel|abi}] use release or ABI version in shared library file names --enable-rpath-link link sample programs with rpath option @@ -823,7 +829,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.20231210. Invocation command line was +generated by GNU Autoconf 2.52.20250126. Invocation command line was $ $0 $@ @@ -947,7 +953,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:950: loading site script $ac_site_file" >&5 + { echo "$as_me:956: 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" @@ -958,7 +964,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:961: loading cache $cache_file" >&5 + { echo "$as_me:967: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -966,7 +972,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:969: creating cache $cache_file" >&5 + { echo "$as_me:975: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -982,21 +988,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:985: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:991: 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:989: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:995: 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:995: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:1001: 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:997: former value: $ac_old_val" >&5 + { echo "$as_me:1003: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:999: current value: $ac_new_val" >&5 + { echo "$as_me:1005: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -1015,9 +1021,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if "$ac_cache_corrupted"; then - { echo "$as_me:1018: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:1024: 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:1020: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1026: 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 @@ -1046,10 +1052,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1049: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1055: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1052: \$? = $ac_status" >&5 + echo "$as_me:1058: \$? = $ac_status" >&5 (exit "$ac_status"); }; then ac_path_separator=';' else @@ -1081,7 +1087,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1084: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1090: 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 @@ -1091,11 +1097,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:1094: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1100: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1098: checking build system type" >&5 +echo "$as_me:1104: 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 @@ -1104,23 +1110,23 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1107: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1113: 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:1111: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1117: 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:1116: result: $ac_cv_build" >&5 +echo "$as_me:1122: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$as_me:1123: checking host system type" >&5 +echo "$as_me:1129: 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 @@ -1129,12 +1135,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:1132: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1138: 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:1137: result: $ac_cv_host" >&5 +echo "$as_me:1143: 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/'` @@ -1142,7 +1148,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then - echo "$as_me:1145: checking target system type" >&5 + echo "$as_me:1151: checking target system type" >&5 echo $ECHO_N "checking target system type... $ECHO_C" >&6 if test "${ac_cv_target+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1151,12 +1157,12 @@ else test "x$ac_cv_target_alias" = "x" && ac_cv_target_alias=$ac_cv_host_alias ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` || - { { echo "$as_me:1154: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + { { echo "$as_me:1160: error: $ac_config_sub $ac_cv_target_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1159: result: $ac_cv_target" >&5 +echo "$as_me:1165: result: $ac_cv_target" >&5 echo "${ECHO_T}$ac_cv_target" >&6 target=$ac_cv_target target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1188,13 +1194,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1191: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1197: 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:1195: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1201: 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:1197: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1203: 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 @@ -1202,7 +1208,7 @@ fi # Check whether --with-system-type or --without-system-type was given. if test "${with_system_type+set}" = set; then withval="$with_system_type" - { echo "$as_me:1205: WARNING: overriding system type to $withval" >&5 + { echo "$as_me:1211: WARNING: overriding system type to $withval" >&5 echo "$as_me: WARNING: overriding system type to $withval" >&2;} cf_cv_system_name=$withval host_os=$withval @@ -1217,7 +1223,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:1220: checking for $ac_word" >&5 +echo "$as_me:1226: 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 @@ -1232,7 +1238,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:1235: found $ac_dir/$ac_word" >&5 +echo "$as_me:1241: found $ac_dir/$ac_word" >&5 break done @@ -1240,10 +1246,10 @@ fi fi GREP=$ac_cv_prog_GREP if test -n "$GREP"; then - echo "$as_me:1243: result: $GREP" >&5 + echo "$as_me:1249: result: $GREP" >&5 echo "${ECHO_T}$GREP" >&6 else - echo "$as_me:1246: result: no" >&5 + echo "$as_me:1252: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1251,7 +1257,7 @@ fi done test -n "$GREP" || GREP=": " -echo "$as_me:1254: checking for fgrep" >&5 +echo "$as_me:1260: 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 @@ -1263,7 +1269,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:1266: checking for $ac_word" >&5 +echo "$as_me:1272: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1280,7 +1286,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:1283: found $ac_dir/$ac_word" >&5 + echo "$as_me:1289: found $ac_dir/$ac_word" >&5 break fi done @@ -1291,10 +1297,10 @@ fi FGREP=$ac_cv_path_FGREP if test -n "$FGREP"; then - echo "$as_me:1294: result: $FGREP" >&5 + echo "$as_me:1300: result: $FGREP" >&5 echo "${ECHO_T}$FGREP" >&6 else - echo "$as_me:1297: result: no" >&5 + echo "$as_me:1303: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1302,16 +1308,16 @@ fi done test -n "$FGREP" || FGREP=": " - test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1305: error: cannot find workable fgrep" >&5 + test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1311: error: cannot find workable fgrep" >&5 echo "$as_me: error: cannot find workable fgrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:1310: result: $ac_cv_path_FGREP" >&5 +echo "$as_me:1316: result: $ac_cv_path_FGREP" >&5 echo "${ECHO_T}$ac_cv_path_FGREP" >&6 FGREP="$ac_cv_path_FGREP" -echo "$as_me:1314: checking for prefix" >&5 +echo "$as_me:1320: checking for prefix" >&5 echo $ECHO_N "checking for prefix... $ECHO_C" >&6 if test "x$prefix" = "xNONE" ; then case "$cf_cv_system_name" in @@ -1323,11 +1329,11 @@ if test "x$prefix" = "xNONE" ; then ;; esac fi -echo "$as_me:1326: result: $prefix" >&5 +echo "$as_me:1332: result: $prefix" >&5 echo "${ECHO_T}$prefix" >&6 if test "x$prefix" = "xNONE" ; then -echo "$as_me:1330: checking for default include-directory" >&5 +echo "$as_me:1336: checking for default include-directory" >&5 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6 test -n "$verbose" && echo 1>&6 for cf_symbol in \ @@ -1350,12 +1356,322 @@ do fi test -n "$verbose" && echo " tested $cf_dir" 1>&6 done -echo "$as_me:1353: result: $includedir" >&5 +echo "$as_me:1359: result: $includedir" >&5 echo "${ECHO_T}$includedir" >&6 fi ### Checks for programs. +# Check whether --with-ada or --without-ada was given. +if test "${with_ada+set}" = set; then + withval="$with_ada" + cf_with_ada=$withval +else + cf_with_ada=yes +fi; + +cf_prog_cc="gcc cc" +if test "x$cf_with_ada" = xyes +then + +for cf_prog_gnat in gnat gnatmake gprconfig gprbuild +do + +cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + unset ac_cv_path_cf_TEMP_gnat + unset cf_TEMP_gnat + # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. +set dummy $cf_prog_gnat; ac_word=$2 +echo "$as_me:1386: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $cf_TEMP_gnat in + [\\/]* | ?:[\\/]*) + ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" + echo "$as_me:1403: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no" + ;; +esac +fi +cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat + +if test -n "$cf_TEMP_gnat"; then + echo "$as_me:1415: result: $cf_TEMP_gnat" >&5 +echo "${ECHO_T}$cf_TEMP_gnat" >&6 +else + echo "$as_me:1418: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + eval "cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat" + + if test "x$cf_TEMP_gnat" != xno; then + unset cf_cv_gnat_version + unset cf_TEMP_gnat + +echo "$as_me:1428: checking for $cf_prog_gnat version" >&5 +echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 +if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ + grep '[0-9].[0-9][0-9]*' |\ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + +fi +echo "$as_me:1439: result: $cf_cv_gnat_version" >&5 +echo "${ECHO_T}$cf_cv_gnat_version" >&6 +test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no +eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version + + fi + eval "cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat" + + unset cf_TEMP_gnat + unset cf_cv_gnat_version + unset ac_cv_path_cf_TEMP_gnat +done + +if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then + cf_ada_make= + cf_cv_prog_gnat_correct=no +else + cf_ada_make=gnatmake + if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then + # gprconfig is newer than gnatmake; we can continue... + cf_ada_config="##" + else + rm -rf ./conftest* ./*~conftest* + if mkdir conftest.src + then + cf_ada_config="" + cd conftest.src + for cf_gprconfig in Ada C + do + echo "$as_me:1468: checking for gprconfig name for $cf_gprconfig" >&5 +echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 + if test "$cf_gprconfig" = C + then + for cf_gprconfig_param in \ + "$cf_gprconfig,,,,GNATGCC" \ + "$cf_gprconfig,,,,GCC" \ + "$cf_gprconfig" + do + cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` + test -n "$cf_gprconfig_value" && break + done + else + cf_gprconfig_param=$cf_gprconfig + cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` + fi + if test -n "$cf_gprconfig_value" + then + eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" + echo "$as_me:1487: result: $cf_gprconfig_value" >&5 +echo "${ECHO_T}$cf_gprconfig_value" >&6 + else + echo "$as_me:1490: result: missing" >&5 +echo "${ECHO_T}missing" >&6 + cf_ada_config="#" + break + fi + done + cd .. + rm -rf ./conftest* ./*~conftest* + fi + fi + if test "x$cf_ada_config" != "x#" + then + +echo "$as_me:1503: checking for gnat version" >&5 +echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 +if test "${cf_cv_gnat_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ + grep '[0-9].[0-9][0-9]*' |\ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + +fi +echo "$as_me:1514: result: $cf_cv_gnat_version" >&5 +echo "${ECHO_T}$cf_cv_gnat_version" >&6 +test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no + +case "$cf_cv_gnat_version" in +(3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) + cf_cv_prog_gnat_correct=yes + ;; +(*) + { echo "$as_me:1523: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 +echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} + cf_cv_prog_gnat_correct=no + ;; +esac + + # Extract the first word of "m4", so it can be a program name with args. +set dummy m4; ac_word=$2 +echo "$as_me:1531: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_M4_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$M4_exists"; then + ac_cv_prog_M4_exists="$M4_exists" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_M4_exists="yes" +echo "$as_me:1546: found $ac_dir/$ac_word" >&5 +break +done + + test -z "$ac_cv_prog_M4_exists" && ac_cv_prog_M4_exists="no" +fi +fi +M4_exists=$ac_cv_prog_M4_exists +if test -n "$M4_exists"; then + echo "$as_me:1555: result: $M4_exists" >&5 +echo "${ECHO_T}$M4_exists" >&6 +else + echo "$as_me:1558: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test "$ac_cv_prog_M4_exists" = no; then + cf_cv_prog_gnat_correct=no + { echo "$as_me:1564: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 +echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} + fi + if test "$cf_cv_prog_gnat_correct" = yes; then + echo "$as_me:1568: checking if GNAT works" >&5 +echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + +rm -rf ./conftest* ./*~conftest* +cat >>conftest.ads <>conftest.adb <&5 2>&1 ) ; then + if ( ./conftest 1>&5 2>&1 ) ; then + cf_cv_prog_gnat_correct=yes + else + cf_cv_prog_gnat_correct=no + fi +else + cf_cv_prog_gnat_correct=no +fi +rm -rf ./conftest* ./*~conftest* + + echo "$as_me:1596: result: $cf_cv_prog_gnat_correct" >&5 +echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + else + cf_cv_prog_gnat_correct=no + fi +fi + + if test "x$cf_cv_prog_gnat_correct" = xyes; then + # gcc's developers chose to deprecate gnatgcc before making gprconfig + # work. They replaced gnatgcc in gcc 13 with a script which spits out + # a warning offering advice which could never work. + # + # Here is a workaround. + # Extract the first word of "gnatgcc", so it can be a program name with args. +set dummy gnatgcc; ac_word=$2 +echo "$as_me:1612: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $cf_cv_path_gnatgcc in + [\\/]* | ?:[\\/]*) + ac_cv_path_cf_cv_path_gnatgcc="$cf_cv_path_gnatgcc" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word" + echo "$as_me:1629: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_cf_cv_path_gnatgcc" && ac_cv_path_cf_cv_path_gnatgcc="no" + ;; +esac +fi +cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc + +if test -n "$cf_cv_path_gnatgcc"; then + echo "$as_me:1641: result: $cf_cv_path_gnatgcc" >&5 +echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6 +else + echo "$as_me:1644: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test "$cf_cv_path_gnatgcc" != no + then + echo "$as_me:1650: checking for improvement" >&5 +echo $ECHO_N "checking for improvement... $ECHO_C" >&6 + cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null` + case "x$cf_file_gnatgcc" in + (*script*) + cf_cv_path_gnatgcc=`sh -x "$cf_cv_path_gnatgcc" --version 2>&1 | grep -w exec | sed -e 's/^[ ]*+[ ]*//' -e 's/exec[ ]//' -e 's/ .*//'` + ;; + (*) + cf_cv_path_gnatgcc=no + ;; + esac + echo "$as_me:1661: result: $cf_cv_path_gnatgcc" >&5 +echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6 + test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc + cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc" + fi + fi +fi +case "$cf_prog_cc" in +(*/*) + CC="$cf_prog_cc" + + ;; +(*) + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' @@ -1363,11 +1679,11 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" if test -n "$ac_tool_prefix"; then - for ac_prog in gnatgcc gcc cc + for ac_prog in $cf_prog_cc 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:1370: checking for $ac_word" >&5 +echo "$as_me:1686: 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 @@ -1382,7 +1698,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:1385: found $ac_dir/$ac_word" >&5 +echo "$as_me:1701: found $ac_dir/$ac_word" >&5 break done @@ -1390,10 +1706,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1393: result: $CC" >&5 + echo "$as_me:1709: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1396: result: no" >&5 + echo "$as_me:1712: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1402,11 +1718,11 @@ fi fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in gnatgcc gcc cc + for ac_prog in $cf_prog_cc 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:1409: checking for $ac_word" >&5 +echo "$as_me:1725: 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 @@ -1421,7 +1737,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:1424: found $ac_dir/$ac_word" >&5 +echo "$as_me:1740: found $ac_dir/$ac_word" >&5 break done @@ -1429,10 +1745,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1432: result: $ac_ct_CC" >&5 + echo "$as_me:1748: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1435: result: no" >&5 + echo "$as_me:1751: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1442,32 +1758,32 @@ done CC=$ac_ct_CC fi -test -z "$CC" && { { echo "$as_me:1445: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1761: 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:1450:" \ +echo "$as_me:1766:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo "$2"` -{ (eval echo "$as_me:1453: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1769: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1456: \$? = $ac_status" >&5 + echo "$as_me:1772: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:1458: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1774: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1461: \$? = $ac_status" >&5 + echo "$as_me:1777: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:1463: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1779: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1466: \$? = $ac_status" >&5 + echo "$as_me:1782: \$? = $ac_status" >&5 (exit "$ac_status"); } cat >"conftest.$ac_ext" <<_ACEOF -#line 1470 "configure" +#line 1786 "configure" #include "confdefs.h" int @@ -1483,13 +1799,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:1486: checking for C compiler default output" >&5 +echo "$as_me:1802: 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:1489: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1805: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1492: \$? = $ac_status" >&5 + echo "$as_me:1808: \$? = $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 @@ -1512,34 +1828,34 @@ done else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -{ { echo "$as_me:1515: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1831: 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:1521: result: $ac_file" >&5 +echo "$as_me:1837: 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:1526: checking whether the C compiler works" >&5 +echo "$as_me:1842: 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:1532: \"$ac_try\"") >&5 + { (eval echo "$as_me:1848: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1535: \$? = $ac_status" >&5 + echo "$as_me:1851: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1542: error: cannot run C compiled programs. + { { echo "$as_me:1858: 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;} @@ -1547,24 +1863,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1550: result: yes" >&5 +echo "$as_me:1866: 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:1557: checking whether we are cross compiling" >&5 +echo "$as_me:1873: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1559: result: $cross_compiling" >&5 +echo "$as_me:1875: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1562: checking for executable suffix" >&5 +echo "$as_me:1878: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1564: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1880: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1567: \$? = $ac_status" >&5 + echo "$as_me:1883: \$? = $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 @@ -1580,25 +1896,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1583: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1899: 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:1589: result: $ac_cv_exeext" >&5 +echo "$as_me:1905: 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:1595: checking for object suffix" >&5 +echo "$as_me:1911: 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 1601 "configure" +#line 1917 "configure" #include "confdefs.h" int @@ -1610,10 +1926,10 @@ main (void) } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1613: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1929: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1616: \$? = $ac_status" >&5 + echo "$as_me:1932: \$? = $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 @@ -1625,24 +1941,24 @@ done else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -{ { echo "$as_me:1628: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1944: 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:1635: result: $ac_cv_objext" >&5 +echo "$as_me:1951: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1639: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1955: 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 1645 "configure" +#line 1961 "configure" #include "confdefs.h" int @@ -1657,16 +1973,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1660: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1976: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1663: \$? = $ac_status" >&5 + echo "$as_me:1979: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1666: \"$ac_try\"") >&5 + { (eval echo "$as_me:1982: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1669: \$? = $ac_status" >&5 + echo "$as_me:1985: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_compiler_gnu=yes else @@ -1678,19 +1994,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1681: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1997: 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:1687: checking whether $CC accepts -g" >&5 +echo "$as_me:2003: 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 1693 "configure" +#line 2009 "configure" #include "confdefs.h" int @@ -1702,16 +2018,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1705: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2021: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1708: \$? = $ac_status" >&5 + echo "$as_me:2024: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1711: \"$ac_try\"") >&5 + { (eval echo "$as_me:2027: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1714: \$? = $ac_status" >&5 + echo "$as_me:2030: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cc_g=yes else @@ -1721,7 +2037,7 @@ ac_cv_prog_cc_g=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:1724: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:2040: 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 @@ -1748,16 +2064,16 @@ cat >"conftest.$ac_ext" <<_ACEOF #endif _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1751: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2067: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1754: \$? = $ac_status" >&5 + echo "$as_me:2070: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1757: \"$ac_try\"") >&5 + { (eval echo "$as_me:2073: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1760: \$? = $ac_status" >&5 + echo "$as_me:2076: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then for ac_declaration in \ ''\ @@ -1769,7 +2085,7 @@ if { (eval echo "$as_me:1751: \"$ac_compile\"") >&5 'void exit (int);' do cat >"conftest.$ac_ext" <<_ACEOF -#line 1772 "configure" +#line 2088 "configure" #include "confdefs.h" #include $ac_declaration @@ -1782,16 +2098,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1785: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2101: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1788: \$? = $ac_status" >&5 + echo "$as_me:2104: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1791: \"$ac_try\"") >&5 + { (eval echo "$as_me:2107: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1794: \$? = $ac_status" >&5 + echo "$as_me:2110: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -1801,7 +2117,7 @@ continue fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 1804 "configure" +#line 2120 "configure" #include "confdefs.h" $ac_declaration int @@ -1813,16 +2129,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1816: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2132: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1819: \$? = $ac_status" >&5 + echo "$as_me:2135: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1822: \"$ac_try\"") >&5 + { (eval echo "$as_me:2138: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1825: \$? = $ac_status" >&5 + echo "$as_me:2141: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -1852,11 +2168,11 @@ ac_main_return="return" GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:1855: checking version of $CC" >&5 + echo "$as_me:2171: 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/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:1859: result: $GCC_VERSION" >&5 + echo "$as_me:2175: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi @@ -1865,12 +2181,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case "$host_os" in (linux*|gnu*) - echo "$as_me:1868: checking if this is really Intel C compiler" >&5 + echo "$as_me:2184: 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 1873 "configure" +#line 2189 "configure" #include "confdefs.h" int @@ -1887,16 +2203,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1890: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2206: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1893: \$? = $ac_status" >&5 + echo "$as_me:2209: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1896: \"$ac_try\"") >&5 + { (eval echo "$as_me:2212: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1899: \$? = $ac_status" >&5 + echo "$as_me:2215: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -1907,7 +2223,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:1910: result: $INTEL_COMPILER" >&5 + echo "$as_me:2226: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -1916,11 +2232,11 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:1919: checking if this is really Clang C compiler" >&5 + echo "$as_me:2235: 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 1923 "configure" +#line 2239 "configure" #include "confdefs.h" int @@ -1937,16 +2253,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1940: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2256: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1943: \$? = $ac_status" >&5 + echo "$as_me:2259: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1946: \"$ac_try\"") >&5 + { (eval echo "$as_me:2262: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1949: \$? = $ac_status" >&5 + echo "$as_me:2265: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then CLANG_COMPILER=yes @@ -1956,7 +2272,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:1959: result: $CLANG_COMPILER" >&5 + echo "$as_me:2275: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi @@ -1965,30 +2281,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:1968: WARNING: replacing broken compiler alias $CC" >&5 + { echo "$as_me:2284: 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:1975: checking version of $CC" >&5 + echo "$as_me:2291: 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:1979: result: $CLANG_VERSION" >&5 + echo "$as_me:2295: 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:1986: checking if option $cf_clang_opt works" >&5 + echo "$as_me:2302: 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 1991 "configure" +#line 2307 "configure" #include "confdefs.h" #include @@ -2002,16 +2318,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:2005: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2321: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2008: \$? = $ac_status" >&5 + echo "$as_me:2324: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:2011: \"$ac_try\"") >&5 + { (eval echo "$as_me:2327: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2014: \$? = $ac_status" >&5 + echo "$as_me:2330: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_clang_optok=yes @@ -2022,13 +2338,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:2025: result: $cf_clang_optok" >&5 + echo "$as_me:2341: 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}:2031: testing adding option $cf_clang_opt ..." 1>&5 +echo "${as_me:-configure}:2347: testing adding option $cf_clang_opt ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_clang_opt" @@ -2037,7 +2353,7 @@ echo "${as_me:-configure}:2031: testing adding option $cf_clang_opt ..." 1>&5 done fi -echo "$as_me:2040: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:2356: 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 @@ -2045,7 +2361,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >"conftest.$ac_ext" <<_ACEOF -#line 2048 "configure" +#line 2364 "configure" #include "confdefs.h" #include #include @@ -2092,16 +2408,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:2095: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2411: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2098: \$? = $ac_status" >&5 + echo "$as_me:2414: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2101: \"$ac_try\"") >&5 + { (eval echo "$as_me:2417: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2104: \$? = $ac_status" >&5 + echo "$as_me:2420: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2118,10 +2434,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2121: result: none needed" >&5 + echo "$as_me:2437: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2124: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2440: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -2129,13 +2445,13 @@ esac # This should have been defined by AC_PROG_CC : "${CC:=cc}" -echo "$as_me:2132: checking \$CFLAGS variable" >&5 +echo "$as_me:2448: checking \$CFLAGS variable" >&5 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 case "x$CFLAGS" in (*-[IUD]*) - echo "$as_me:2136: result: broken" >&5 + echo "$as_me:2452: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2138: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 + { echo "$as_me:2454: 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= @@ -2243,18 +2559,18 @@ fi done ;; (*) - echo "$as_me:2246: result: ok" >&5 + echo "$as_me:2562: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2251: checking \$CC variable" >&5 +echo "$as_me:2567: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in (*[\ \ ]-*) - echo "$as_me:2255: result: broken" >&5 + echo "$as_me:2571: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2257: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:2573: 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/[ ]*[ ]-[^ ].*//'` @@ -2371,24 +2687,27 @@ fi done test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 -echo "${as_me:-configure}:2374: testing resulting CC: '$CC' ..." 1>&5 +echo "${as_me:-configure}:2690: testing resulting CC: '$CC' ..." 1>&5 test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 -echo "${as_me:-configure}:2378: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2694: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 -echo "${as_me:-configure}:2382: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2698: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ;; (*) - echo "$as_me:2386: result: ok" >&5 + echo "$as_me:2702: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2391: checking for egrep" >&5 + ;; +esac + +echo "$as_me:2710: 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 @@ -2400,7 +2719,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:2403: checking for $ac_word" >&5 +echo "$as_me:2722: 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 @@ -2417,7 +2736,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:2420: found $ac_dir/$ac_word" >&5 + echo "$as_me:2739: found $ac_dir/$ac_word" >&5 break fi done @@ -2428,10 +2747,10 @@ fi EGREP=$ac_cv_path_EGREP if test -n "$EGREP"; then - echo "$as_me:2431: result: $EGREP" >&5 + echo "$as_me:2750: result: $EGREP" >&5 echo "${ECHO_T}$EGREP" >&6 else - echo "$as_me:2434: result: no" >&5 + echo "$as_me:2753: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2439,12 +2758,12 @@ fi done test -n "$EGREP" || EGREP=": " - test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2442: error: cannot find workable egrep" >&5 + test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2761: error: cannot find workable egrep" >&5 echo "$as_me: error: cannot find workable egrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:2447: result: $ac_cv_path_EGREP" >&5 +echo "$as_me:2766: result: $ac_cv_path_EGREP" >&5 echo "${ECHO_T}$ac_cv_path_EGREP" >&6 EGREP="$ac_cv_path_EGREP" @@ -2454,7 +2773,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:2457: checking how to run the C preprocessor" >&5 +echo "$as_me:2776: 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 @@ -2475,18 +2794,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 2478 "configure" +#line 2797 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2483: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2802: \"$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:2489: \$? = $ac_status" >&5 + echo "$as_me:2808: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2509,17 +2828,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 2512 "configure" +#line 2831 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2516: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2835: \"$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:2522: \$? = $ac_status" >&5 + echo "$as_me:2841: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2556,7 +2875,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2559: result: $CPP" >&5 +echo "$as_me:2878: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2566,18 +2885,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 2569 "configure" +#line 2888 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2574: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2893: \"$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:2580: \$? = $ac_status" >&5 + echo "$as_me:2899: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2600,17 +2919,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 2603 "configure" +#line 2922 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2607: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2926: \"$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:2613: \$? = $ac_status" >&5 + echo "$as_me:2932: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2638,7 +2957,7 @@ rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then : else - { { echo "$as_me:2641: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2960: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2651,14 +2970,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:2654: checking whether $CC needs -traditional" >&5 + echo "$as_me:2973: checking whether $CC needs -traditional" >&5 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 if test "${ac_cv_prog_gcc_traditional+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_pattern="Autoconf.*'x'" cat >"conftest.$ac_ext" <<_ACEOF -#line 2661 "configure" +#line 2980 "configure" #include "confdefs.h" #include int Autoconf = TIOCGETP; @@ -2673,7 +2992,7 @@ rm -rf conftest* if test $ac_cv_prog_gcc_traditional = no; then cat >"conftest.$ac_ext" <<_ACEOF -#line 2676 "configure" +#line 2995 "configure" #include "confdefs.h" #include int Autoconf = TCGETA; @@ -2686,14 +3005,14 @@ rm -rf conftest* fi fi -echo "$as_me:2689: result: $ac_cv_prog_gcc_traditional" >&5 +echo "$as_me:3008: result: $ac_cv_prog_gcc_traditional" >&5 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi fi -echo "$as_me:2696: checking whether $CC understands -c and -o together" >&5 +echo "$as_me:3015: checking whether $CC understands -c and -o together" >&5 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6 if test "${cf_cv_prog_CC_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2708,15 +3027,15 @@ CF_EOF # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='$CC $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me:2711: \"$ac_try\"") >&5 +if { (eval echo "$as_me:3030: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2714: \$? = $ac_status" >&5 + echo "$as_me:3033: \$? = $ac_status" >&5 (exit "$ac_status"); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:2716: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:3035: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2719: \$? = $ac_status" >&5 + echo "$as_me:3038: \$? = $ac_status" >&5 (exit "$ac_status"); }; then eval cf_cv_prog_CC_c_o=yes @@ -2727,10 +3046,10 @@ rm -rf ./conftest* fi if test "$cf_cv_prog_CC_c_o" = yes; then - echo "$as_me:2730: result: yes" >&5 + echo "$as_me:3049: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2733: result: no" >&5 + echo "$as_me:3052: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2751,7 +3070,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:2754: checking for $ac_word" >&5 +echo "$as_me:3073: 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 @@ -2766,7 +3085,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:2769: found $ac_dir/$ac_word" >&5 +echo "$as_me:3088: found $ac_dir/$ac_word" >&5 break done @@ -2774,21 +3093,21 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:2777: result: $AWK" >&5 + echo "$as_me:3096: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:2780: result: no" >&5 + echo "$as_me:3099: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -test -z "$AWK" && { { echo "$as_me:2787: error: No awk program found" >&5 +test -z "$AWK" && { { echo "$as_me:3106: error: No awk program found" >&5 echo "$as_me: error: No awk program found" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:2791: checking for egrep" >&5 +echo "$as_me:3110: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_prog_egrep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2798,11 +3117,11 @@ else else ac_cv_prog_egrep='egrep' fi fi -echo "$as_me:2801: result: $ac_cv_prog_egrep" >&5 +echo "$as_me:3120: result: $ac_cv_prog_egrep" >&5 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 EGREP=$ac_cv_prog_egrep - test -z "$EGREP" && { { echo "$as_me:2805: error: No egrep program found" >&5 + test -z "$EGREP" && { { echo "$as_me:3124: error: No egrep program found" >&5 echo "$as_me: error: No egrep program found" >&2;} { (exit 1); exit 1; }; } @@ -2818,7 +3137,7 @@ echo "$as_me: error: No egrep program found" >&2;} # 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:2821: checking for a BSD compatible install" >&5 +echo "$as_me:3140: 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 @@ -2867,7 +3186,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2870: result: $INSTALL" >&5 +echo "$as_me:3189: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2878,18 +3197,18 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:2881: checking whether ln -s works" >&5 +echo "$as_me:3200: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:2885: result: yes" >&5 + echo "$as_me:3204: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2888: result: no, using $LN_S" >&5 + echo "$as_me:3207: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:2892: checking if $LN_S -f options work" >&5 +echo "$as_me:3211: checking if $LN_S -f options work" >&5 echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6 rm -f conf$$.src conf$$dst @@ -2901,11 +3220,22 @@ else cf_prog_ln_sf=no fi rm -f conf$$.dst conf$$src -echo "$as_me:2904: result: $cf_prog_ln_sf" >&5 +echo "$as_me:3223: result: $cf_prog_ln_sf" >&5 echo "${ECHO_T}$cf_prog_ln_sf" >&6 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" +case "$cf_cv_system_name" in +(cygwin*|msys*|mingw32*|mingw64|os2*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER='[a-zA-Z]:[\\/]*' + ;; +(*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX + ;; +esac + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -2918,7 +3248,7 @@ test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" # 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:2921: checking for a BSD compatible install" >&5 +echo "$as_me:3251: 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 @@ -2967,7 +3297,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2970: result: $INSTALL" >&5 +echo "$as_me:3300: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2978,8 +3308,17 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -case $INSTALL in -(/*) +if test "x$INSTALL" = "x./install-sh -c"; then + if test -f /usr/sbin/install ; then + case "$host_os" in + (linux*gnu*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) + INSTALL=/usr/sbin/install + ;; + esac + fi +fi +case x$INSTALL in +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; (*) cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'` @@ -2988,7 +3327,7 @@ case $INSTALL in ;; esac -echo "$as_me:2991: checking if you want to install stripped executables" >&5 +echo "$as_me:3330: 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. @@ -3005,7 +3344,7 @@ else enable_stripping=yes fi; -echo "$as_me:3008: result: $enable_stripping" >&5 +echo "$as_me:3347: result: $enable_stripping" >&5 echo "${ECHO_T}$enable_stripping" >&6 if test "$enable_stripping" = yes @@ -3016,7 +3355,7 @@ else fi : "${INSTALL:=install}" -echo "$as_me:3019: checking if install accepts -p option" >&5 +echo "$as_me:3358: 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 @@ -3047,10 +3386,10 @@ else rm -rf ./conftest* fi -echo "$as_me:3050: result: $cf_cv_install_p" >&5 +echo "$as_me:3389: result: $cf_cv_install_p" >&5 echo "${ECHO_T}$cf_cv_install_p" >&6 -echo "$as_me:3053: checking if install needs to be told about ownership" >&5 +echo "$as_me:3392: 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) @@ -3061,7 +3400,7 @@ case `$ac_config_guess` in ;; esac -echo "$as_me:3064: result: $with_install_o" >&5 +echo "$as_me:3403: result: $with_install_o" >&5 echo "${ECHO_T}$with_install_o" >&6 if test "x$with_install_o" = xyes then @@ -3072,7 +3411,7 @@ fi if test -n "$INSTALL_OPT_S" then - echo "$as_me:3075: checking if you want to specify strip-program" >&5 + echo "$as_me:3414: 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. @@ -3082,11 +3421,11 @@ if test "${with_strip_program+set}" = set; then else with_strip_program=no fi; - echo "$as_me:3085: result: $with_strip_program" >&5 + echo "$as_me:3424: result: $with_strip_program" >&5 echo "${ECHO_T}$with_strip_program" >&6 if test "$with_strip_program" != no then - echo "$as_me:3089: checking if strip-program is supported with this installer" >&5 + echo "$as_me:3428: 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 @@ -3107,11 +3446,11 @@ echo $ECHO_N "checking if strip-program is supported with this installer... $ECH done fi fi - echo "$as_me:3110: result: $check_install_strip" >&5 + echo "$as_me:3449: result: $check_install_strip" >&5 echo "${ECHO_T}$check_install_strip" >&6 case "$check_install_strip" in (no) - { echo "$as_me:3114: WARNING: $cf_install_program does not support strip program option" >&5 + { echo "$as_me:3453: 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 ;; @@ -3126,7 +3465,7 @@ echo "$as_me: WARNING: $cf_install_program does not support strip program option chmod +x "$INSTALL" test -n "$verbose" && echo " created $INSTALL" 1>&6 -echo "${as_me:-configure}:3129: testing created $INSTALL ..." 1>&5 +echo "${as_me:-configure}:3468: testing created $INSTALL ..." 1>&5 ;; (option) @@ -3136,7 +3475,7 @@ echo "${as_me:-configure}:3129: testing created $INSTALL ..." 1>&5 fi fi -echo "$as_me:3139: checking for long file names" >&5 +echo "$as_me:3478: checking for long file names" >&5 echo $ECHO_N "checking for long file names... $ECHO_C" >&6 if test "${ac_cv_sys_long_file_names+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3175,7 +3514,7 @@ for ac_dir in . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do rm -rf "$ac_xdir" 2>/dev/null done fi -echo "$as_me:3178: result: $ac_cv_sys_long_file_names" >&5 +echo "$as_me:3517: result: $ac_cv_sys_long_file_names" >&5 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 if test "$ac_cv_sys_long_file_names" = yes; then @@ -3187,7 +3526,7 @@ fi # if we find pkg-config, check if we should install the ".pc" files. -echo "$as_me:3190: checking if you want to use pkg-config" >&5 +echo "$as_me:3529: 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. @@ -3197,7 +3536,7 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:3200: result: $cf_pkg_config" >&5 +echo "$as_me:3539: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 case "$cf_pkg_config" in @@ -3209,7 +3548,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:3212: checking for $ac_word" >&5 +echo "$as_me:3551: 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 @@ -3226,7 +3565,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:3229: found $ac_dir/$ac_word" >&5 + echo "$as_me:3568: found $ac_dir/$ac_word" >&5 break fi done @@ -3237,10 +3576,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:3240: result: $PKG_CONFIG" >&5 + echo "$as_me:3579: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:3243: result: no" >&5 + echo "$as_me:3582: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3249,7 +3588,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:3252: checking for $ac_word" >&5 +echo "$as_me:3591: 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 @@ -3266,7 +3605,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:3269: found $ac_dir/$ac_word" >&5 + echo "$as_me:3608: found $ac_dir/$ac_word" >&5 break fi done @@ -3278,10 +3617,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:3281: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:3620: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:3284: result: no" >&5 + echo "$as_me:3623: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3305,43 +3644,41 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$PKG_CONFIG" in -(.\$\(*\)*|.\'*\'*) +case "x$PKG_CONFIG" in +(x\$\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval PKG_CONFIG="$PKG_CONFIG" - case ".$PKG_CONFIG" in - (.NONE/*) + case "x$PKG_CONFIG" in + (xNONE/*) PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:3327: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:3664: 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:3334: WARNING: pkg-config is not installed" >&5 + { echo "$as_me:3671: WARNING: pkg-config is not installed" >&5 echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi case "$PKG_CONFIG" in (no|none|yes) - echo "$as_me:3340: checking for pkg-config library directory" >&5 + echo "$as_me:3677: checking for pkg-config library directory" >&5 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6 ;; (*) - echo "$as_me:3344: checking for $PKG_CONFIG library directory" >&5 + echo "$as_me:3681: checking for $PKG_CONFIG library directory" >&5 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 ;; esac @@ -3368,27 +3705,27 @@ fi; case "x$cf_search_path" in (xlibdir) PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' - echo "$as_me:3371: result: $PKG_CONFIG_LIBDIR" >&5 + echo "$as_me:3708: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 cf_search_path= ;; (x) ;; -(x/*\ *) +(x$GLOB_FULLPATH_POSIX\ *|x$GLOB_FULLPATH_OTHER\ *) PKG_CONFIG_LIBDIR= ;; -(x/*) +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) PKG_CONFIG_LIBDIR="$cf_search_path" - echo "$as_me:3382: result: $PKG_CONFIG_LIBDIR" >&5 + echo "$as_me:3719: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 cf_search_path= ;; (xyes|xauto) - echo "$as_me:3387: result: auto" >&5 + echo "$as_me:3724: result: auto" >&5 echo "${ECHO_T}auto" >&6 cf_search_path= # Look for the library directory using the same prefix as the executable - echo "$as_me:3391: checking for search-list" >&5 + echo "$as_me:3728: checking for search-list" >&5 echo $ECHO_N "checking for search-list... $ECHO_C" >&6 if test "x$PKG_CONFIG" != xnone then @@ -3399,7 +3736,15 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6 pkg-config \ pkgconf do - cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` + cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null` + case "$cf_raw_search_path" in + (*\\*) + cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'` + ;; + (*/*) + cf_search_path=`echo "$cf_raw_search_path" | tr : ' '` + ;; + esac test -n "$cf_search_path" && break done @@ -3415,11 +3760,11 @@ echo $ECHO_N "checking for search-list... $ECHO_C" >&6 "` fi - echo "$as_me:3418: result: $cf_search_path" >&5 + echo "$as_me:3763: result: $cf_search_path" >&5 echo "${ECHO_T}$cf_search_path" >&6 ;; (*) - { { echo "$as_me:3422: error: Unexpected option value: $cf_search_path" >&5 + { { echo "$as_me:3767: error: Unexpected option value: $cf_search_path" >&5 echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;} { (exit 1); exit 1; }; } ;; @@ -3427,7 +3772,7 @@ esac if test -n "$cf_search_path" then - echo "$as_me:3430: checking for first directory" >&5 + echo "$as_me:3775: checking for first directory" >&5 echo $ECHO_N "checking for first directory... $ECHO_C" >&6 cf_pkg_config_path=none for cf_config in $cf_search_path @@ -3438,7 +3783,7 @@ echo $ECHO_N "checking for first directory... $ECHO_C" >&6 break fi done - echo "$as_me:3441: result: $cf_pkg_config_path" >&5 + echo "$as_me:3786: result: $cf_pkg_config_path" >&5 echo "${ECHO_T}$cf_pkg_config_path" >&6 if test "x$cf_pkg_config_path" != xnone ; then @@ -3448,7 +3793,7 @@ echo "${ECHO_T}$cf_pkg_config_path" >&6 if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" then - echo "$as_me:3451: checking for workaround" >&5 + echo "$as_me:3796: checking for workaround" >&5 echo $ECHO_N "checking for workaround... $ECHO_C" >&6 if test "$prefix" = "NONE" ; then cf_prefix="$ac_default_prefix" @@ -3471,12 +3816,12 @@ echo $ECHO_N "checking for workaround... $ECHO_C" >&6 esac done test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup - echo "$as_me:3474: result: $PKG_CONFIG_LIBDIR" >&5 + echo "$as_me:3819: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 fi fi -echo "$as_me:3479: checking if you want to build test-programs" >&5 +echo "$as_me:3824: checking if you want to build test-programs" >&5 echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6 # Check whether --with-tests or --without-tests was given. @@ -3486,10 +3831,10 @@ if test "${with_tests+set}" = set; then else cf_with_tests=yes fi; -echo "$as_me:3489: result: $cf_with_tests" >&5 +echo "$as_me:3834: result: $cf_with_tests" >&5 echo "${ECHO_T}$cf_with_tests" >&6 -echo "$as_me:3492: checking if we should assume mixed-case filenames" >&5 +echo "$as_me:3837: checking if we should assume mixed-case filenames" >&5 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 # Check whether --enable-mixed-case or --disable-mixed-case was given. @@ -3499,11 +3844,11 @@ if test "${enable_mixed_case+set}" = set; then else enable_mixedcase=auto fi; -echo "$as_me:3502: result: $enable_mixedcase" >&5 +echo "$as_me:3847: result: $enable_mixedcase" >&5 echo "${ECHO_T}$enable_mixedcase" >&6 if test "$enable_mixedcase" = "auto" ; then -echo "$as_me:3506: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:3851: 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 @@ -3530,7 +3875,7 @@ else fi fi -echo "$as_me:3533: result: $cf_cv_mixedcase" >&5 +echo "$as_me:3878: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -3548,7 +3893,7 @@ EOF fi # do this after mixed-case option (tags/TAGS is not as important as tic). -echo "$as_me:3551: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:3896: 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 @@ -3568,16 +3913,16 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:3571: result: yes" >&5 + echo "$as_me:3916: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:3575: result: no" >&5 + echo "$as_me:3920: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi -echo "$as_me:3580: checking for \".PHONY\" make-support" >&5 +echo "$as_me:3925: 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 @@ -3632,7 +3977,7 @@ CF_EOF rm -rf conftest* fi -echo "$as_me:3635: result: $cf_cv_make_PHONY" >&5 +echo "$as_me:3980: result: $cf_cv_make_PHONY" >&5 echo "${ECHO_T}$cf_cv_make_PHONY" >&6 MAKE_NO_PHONY="#" MAKE_PHONY="#" @@ -3643,7 +3988,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:3646: checking for $ac_word" >&5 +echo "$as_me:3991: 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 @@ -3658,7 +4003,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:3661: found $ac_dir/$ac_word" >&5 +echo "$as_me:4006: found $ac_dir/$ac_word" >&5 break done @@ -3666,10 +4011,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:3669: result: $CTAGS" >&5 + echo "$as_me:4014: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:3672: result: no" >&5 + echo "$as_me:4017: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3680,7 +4025,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:3683: checking for $ac_word" >&5 +echo "$as_me:4028: 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 @@ -3695,7 +4040,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:3698: found $ac_dir/$ac_word" >&5 +echo "$as_me:4043: found $ac_dir/$ac_word" >&5 break done @@ -3703,10 +4048,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:3706: result: $ETAGS" >&5 + echo "$as_me:4051: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:3709: result: no" >&5 + echo "$as_me:4054: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3715,7 +4060,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:3718: checking for $ac_word" >&5 +echo "$as_me:4063: 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 @@ -3730,7 +4075,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:3733: found $ac_dir/$ac_word" >&5 +echo "$as_me:4078: found $ac_dir/$ac_word" >&5 break done @@ -3739,17 +4084,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:3742: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:4087: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:3745: result: no" >&5 + echo "$as_me:4090: 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:3752: checking for $ac_word" >&5 +echo "$as_me:4097: 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 @@ -3764,7 +4109,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:3767: found $ac_dir/$ac_word" >&5 +echo "$as_me:4112: found $ac_dir/$ac_word" >&5 break done @@ -3773,10 +4118,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:3776: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:4121: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:3779: result: no" >&5 + echo "$as_me:4124: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3796,51 +4141,10 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:3799: checking for makeflags variable" >&5 -echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 -if test "${cf_cv_makeflags+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cf_cv_makeflags='' - for cf_option in '-${MAKEFLAGS}' '${MFLAGS}' - do - cat >cf_makeflags.tmp </dev/null | ${FGREP-fgrep} -v "ing directory" | sed -e 's,[ ]*$,,'` - case "$cf_result" in - (.*k|.*kw) - cf_result="`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`" - case "$cf_result" in - (.*CC=*) cf_cv_makeflags= - ;; - (*) cf_cv_makeflags=$cf_option - ;; - esac - break - ;; - (.-) - ;; - (*) - -echo "${as_me:-configure}:3829: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 - - ;; - esac - done - rm -f cf_makeflags.tmp - -fi -echo "$as_me:3837: result: $cf_cv_makeflags" >&5 -echo "${ECHO_T}$cf_cv_makeflags" >&6 - if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:3843: checking for $ac_word" >&5 +echo "$as_me:4147: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3855,7 +4159,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_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:3858: found $ac_dir/$ac_word" >&5 +echo "$as_me:4162: found $ac_dir/$ac_word" >&5 break done @@ -3863,10 +4167,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:3866: result: $RANLIB" >&5 + echo "$as_me:4170: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:3869: result: no" >&5 + echo "$as_me:4173: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3875,7 +4179,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:3878: checking for $ac_word" >&5 +echo "$as_me:4182: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3890,7 +4194,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_RANLIB="ranlib" -echo "$as_me:3893: found $ac_dir/$ac_word" >&5 +echo "$as_me:4197: found $ac_dir/$ac_word" >&5 break done @@ -3899,10 +4203,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:3902: result: $ac_ct_RANLIB" >&5 + echo "$as_me:4206: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:3905: result: no" >&5 + echo "$as_me:4209: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3914,7 +4218,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 -echo "$as_me:3917: checking for $ac_word" >&5 +echo "$as_me:4221: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3929,7 +4233,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_LD="${ac_tool_prefix}ld" -echo "$as_me:3932: found $ac_dir/$ac_word" >&5 +echo "$as_me:4236: found $ac_dir/$ac_word" >&5 break done @@ -3937,10 +4241,10 @@ fi fi LD=$ac_cv_prog_LD if test -n "$LD"; then - echo "$as_me:3940: result: $LD" >&5 + echo "$as_me:4244: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:3943: result: no" >&5 + echo "$as_me:4247: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3949,7 +4253,7 @@ if test -z "$ac_cv_prog_LD"; then ac_ct_LD=$LD # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 -echo "$as_me:3952: checking for $ac_word" >&5 +echo "$as_me:4256: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3964,7 +4268,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_LD="ld" -echo "$as_me:3967: found $ac_dir/$ac_word" >&5 +echo "$as_me:4271: found $ac_dir/$ac_word" >&5 break done @@ -3973,10 +4277,10 @@ fi fi ac_ct_LD=$ac_cv_prog_ac_ct_LD if test -n "$ac_ct_LD"; then - echo "$as_me:3976: result: $ac_ct_LD" >&5 + echo "$as_me:4280: result: $ac_ct_LD" >&5 echo "${ECHO_T}$ac_ct_LD" >&6 else - echo "$as_me:3979: result: no" >&5 + echo "$as_me:4283: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3988,7 +4292,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:3991: checking for $ac_word" >&5 +echo "$as_me:4295: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4003,7 +4307,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_AR="${ac_tool_prefix}ar" -echo "$as_me:4006: found $ac_dir/$ac_word" >&5 +echo "$as_me:4310: found $ac_dir/$ac_word" >&5 break done @@ -4011,10 +4315,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:4014: result: $AR" >&5 + echo "$as_me:4318: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:4017: result: no" >&5 + echo "$as_me:4321: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4023,7 +4327,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:4026: checking for $ac_word" >&5 +echo "$as_me:4330: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4038,7 +4342,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_AR="ar" -echo "$as_me:4041: found $ac_dir/$ac_word" >&5 +echo "$as_me:4345: found $ac_dir/$ac_word" >&5 break done @@ -4047,10 +4351,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:4050: result: $ac_ct_AR" >&5 + echo "$as_me:4354: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:4053: result: no" >&5 + echo "$as_me:4357: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4062,7 +4366,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:4065: checking for $ac_word" >&5 +echo "$as_me:4369: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4077,7 +4381,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_AR="${ac_tool_prefix}ar" -echo "$as_me:4080: found $ac_dir/$ac_word" >&5 +echo "$as_me:4384: found $ac_dir/$ac_word" >&5 break done @@ -4085,10 +4389,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:4088: result: $AR" >&5 + echo "$as_me:4392: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:4091: result: no" >&5 + echo "$as_me:4395: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4097,7 +4401,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:4100: checking for $ac_word" >&5 +echo "$as_me:4404: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4112,7 +4416,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_AR="ar" -echo "$as_me:4115: found $ac_dir/$ac_word" >&5 +echo "$as_me:4419: found $ac_dir/$ac_word" >&5 break done @@ -4121,10 +4425,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:4124: result: $ac_ct_AR" >&5 + echo "$as_me:4428: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:4127: result: no" >&5 + echo "$as_me:4431: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4133,7 +4437,7 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:4136: checking for options to update archives" >&5 +echo "$as_me:4440: checking for options to update archives" >&5 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 if test "${cf_cv_ar_flags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4170,13 +4474,13 @@ else rm -f conftest.a cat >"conftest.$ac_ext" <&5 + if { (eval echo "$as_me:4480: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4179: \$? = $ac_status" >&5 + echo "$as_me:4483: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null @@ -4187,7 +4491,7 @@ EOF else test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me:-configure}:4190: testing cannot compile test-program ..." 1>&5 +echo "${as_me:-configure}:4494: testing cannot compile test-program ..." 1>&5 break fi @@ -4197,7 +4501,7 @@ echo "${as_me:-configure}:4190: testing cannot compile test-program ..." 1>&5 esac fi -echo "$as_me:4200: result: $cf_cv_ar_flags" >&5 +echo "$as_me:4504: result: $cf_cv_ar_flags" >&5 echo "${ECHO_T}$cf_cv_ar_flags" >&6 if test -n "$ARFLAGS" ; then @@ -4208,31 +4512,60 @@ else ARFLAGS=$cf_cv_ar_flags fi - echo "$as_me:4211: checking for PATH separator" >&5 + echo "$as_me:4515: checking for PATH separator" >&5 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 case "$cf_cv_system_name" in (os2*) PATH_SEPARATOR=';' ;; (*) ${PATH_SEPARATOR:=':'} ;; esac - echo "$as_me:4218: result: $PATH_SEPARATOR" >&5 + echo "$as_me:4522: result: $PATH_SEPARATOR" >&5 echo "${ECHO_T}$PATH_SEPARATOR" >&6 -echo "$as_me:4221: checking if you have specified an install-prefix" >&5 -echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 +echo "$as_me:4525: checking for an installation directory prefix" >&5 +echo $ECHO_N "checking for an installation directory prefix... $ECHO_C" >&6 # Check whether --with-install-prefix or --without-install-prefix was given. if test "${with_install_prefix+set}" = set; then withval="$with_install_prefix" - case "$withval" in - (yes|no) + case "x$withval" in + (xyes|xno) ;; (*) DESTDIR="$withval" ;; esac fi; -echo "$as_me:4234: result: $DESTDIR" >&5 -echo "${ECHO_T}$DESTDIR" >&6 +echo "$as_me:4538: result: ${DESTDIR:-(none)}" >&5 +echo "${ECHO_T}${DESTDIR:-(none)}" >&6 + +SET_DESTDIR= +test -n "$DESTDIR" && SET_DESTDIR="DESTDIR=$DESTDIR" + +echo "$as_me:4544: checking if installation directory prefix should be merged" >&5 +echo $ECHO_N "checking if installation directory prefix should be merged... $ECHO_C" >&6 + +# Check whether --enable-install-prefix or --disable-install-prefix was given. +if test "${enable_install_prefix+set}" = set; then + enableval="$enable_install_prefix" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + cf_install_prefix=yes + else + cf_install_prefix=no + fi +else + enableval=no + cf_install_prefix=no + +fi; +echo "$as_me:4561: result: $cf_install_prefix" >&5 +echo "${ECHO_T}$cf_install_prefix" >&6 + +if test "$cf_install_prefix" = yes ; then + MERGE_PREFIX=':$(prefix)%=%' +else + MERGE_PREFIX='' +fi ############################################################################### @@ -4259,7 +4592,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:4262: checking for $ac_word" >&5 +echo "$as_me:4595: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_BUILD_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4274,7 +4607,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_BUILD_CC="$ac_prog" -echo "$as_me:4277: found $ac_dir/$ac_word" >&5 +echo "$as_me:4610: found $ac_dir/$ac_word" >&5 break done @@ -4282,10 +4615,10 @@ fi fi BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - echo "$as_me:4285: result: $BUILD_CC" >&5 + echo "$as_me:4618: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 else - echo "$as_me:4288: result: no" >&5 + echo "$as_me:4621: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4294,12 +4627,12 @@ done test -n "$BUILD_CC" || BUILD_CC="none" fi; - echo "$as_me:4297: checking for native build C compiler" >&5 + echo "$as_me:4630: checking for native build C compiler" >&5 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 - echo "$as_me:4299: result: $BUILD_CC" >&5 + echo "$as_me:4632: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 - echo "$as_me:4302: checking for native build C preprocessor" >&5 + echo "$as_me:4635: checking for native build C preprocessor" >&5 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 # Check whether --with-build-cpp or --without-build-cpp was given. @@ -4309,10 +4642,10 @@ if test "${with_build_cpp+set}" = set; then else BUILD_CPP='${BUILD_CC} -E' fi; - echo "$as_me:4312: result: $BUILD_CPP" >&5 + echo "$as_me:4645: result: $BUILD_CPP" >&5 echo "${ECHO_T}$BUILD_CPP" >&6 - echo "$as_me:4315: checking for native build C flags" >&5 + echo "$as_me:4648: checking for native build C flags" >&5 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 # Check whether --with-build-cflags or --without-build-cflags was given. @@ -4320,10 +4653,10 @@ if test "${with_build_cflags+set}" = set; then withval="$with_build_cflags" BUILD_CFLAGS="$withval" fi; - echo "$as_me:4323: result: $BUILD_CFLAGS" >&5 + echo "$as_me:4656: result: $BUILD_CFLAGS" >&5 echo "${ECHO_T}$BUILD_CFLAGS" >&6 - echo "$as_me:4326: checking for native build C preprocessor-flags" >&5 + echo "$as_me:4659: checking for native build C preprocessor-flags" >&5 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 # Check whether --with-build-cppflags or --without-build-cppflags was given. @@ -4331,10 +4664,10 @@ if test "${with_build_cppflags+set}" = set; then withval="$with_build_cppflags" BUILD_CPPFLAGS="$withval" fi; - echo "$as_me:4334: result: $BUILD_CPPFLAGS" >&5 + echo "$as_me:4667: result: $BUILD_CPPFLAGS" >&5 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - echo "$as_me:4337: checking for native build linker-flags" >&5 + echo "$as_me:4670: checking for native build linker-flags" >&5 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 # Check whether --with-build-ldflags or --without-build-ldflags was given. @@ -4342,10 +4675,10 @@ if test "${with_build_ldflags+set}" = set; then withval="$with_build_ldflags" BUILD_LDFLAGS="$withval" fi; - echo "$as_me:4345: result: $BUILD_LDFLAGS" >&5 + echo "$as_me:4678: result: $BUILD_LDFLAGS" >&5 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - echo "$as_me:4348: checking for native build linker-libraries" >&5 + echo "$as_me:4681: checking for native build linker-libraries" >&5 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 # Check whether --with-build-libs or --without-build-libs was given. @@ -4353,7 +4686,7 @@ if test "${with_build_libs+set}" = set; then withval="$with_build_libs" BUILD_LIBS="$withval" fi; - echo "$as_me:4356: result: $BUILD_LIBS" >&5 + echo "$as_me:4689: result: $BUILD_LIBS" >&5 echo "${ECHO_T}$BUILD_LIBS" >&6 # this assumes we're on Unix. @@ -4362,7 +4695,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6 : ${BUILD_CC:='${CC}'} - echo "$as_me:4365: checking if the build-compiler \"$BUILD_CC\" works" >&5 + echo "$as_me:4698: checking if the build-compiler \"$BUILD_CC\" works" >&5 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6 cf_save_crossed=$cross_compiling @@ -4376,25 +4709,25 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6 cf_ok_build_cc=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 4379 "configure" +#line 4712 "configure" #include "confdefs.h" #include int main(int argc, char *argv[]) { - ${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0); + ${cf_cv_main_return:-return}(argc < 0 || argv == (void*)0 || argv[0] == (void*)0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:4389: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4722: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4392: \$? = $ac_status" >&5 + echo "$as_me:4725: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:4394: \"$ac_try\"") >&5 + { (eval echo "$as_me:4727: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4397: \$? = $ac_status" >&5 + echo "$as_me:4730: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_ok_build_cc=yes else @@ -4409,12 +4742,12 @@ fi cross_compiling=$cf_save_crossed ac_link=$cf_save_ac_link - echo "$as_me:4412: result: $cf_ok_build_cc" >&5 + echo "$as_me:4745: result: $cf_ok_build_cc" >&5 echo "${ECHO_T}$cf_ok_build_cc" >&6 if test "$cf_ok_build_cc" != yes then - { { echo "$as_me:4417: error: Cross-build requires two compilers. + { { echo "$as_me:4750: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&5 echo "$as_me: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&2;} @@ -4439,7 +4772,7 @@ fi ### shared, for example. cf_list_models="" -echo "$as_me:4442: checking if you want to build shared C-objects" >&5 +echo "$as_me:4775: checking if you want to build shared C-objects" >&5 echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6 # Check whether --with-shared or --without-shared was given. @@ -4449,27 +4782,27 @@ if test "${with_shared+set}" = set; then else with_shared=no fi; -echo "$as_me:4452: result: $with_shared" >&5 +echo "$as_me:4785: result: $with_shared" >&5 echo "${ECHO_T}$with_shared" >&6 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" -echo "$as_me:4456: checking for specified models" >&5 +echo "$as_me:4789: checking for specified models" >&5 echo $ECHO_N "checking for specified models... $ECHO_C" >&6 test -z "$cf_list_models" && cf_list_models=normal -echo "$as_me:4459: result: $cf_list_models" >&5 +echo "$as_me:4792: result: $cf_list_models" >&5 echo "${ECHO_T}$cf_list_models" >&6 ### Use the first model as the default, and save its suffix for use in building ### up test-applications. -echo "$as_me:4464: checking for default model" >&5 +echo "$as_me:4797: checking for default model" >&5 echo $ECHO_N "checking for default model... $ECHO_C" >&6 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` -echo "$as_me:4467: result: $DFT_LWR_MODEL" >&5 +echo "$as_me:4800: result: $DFT_LWR_MODEL" >&5 echo "${ECHO_T}$DFT_LWR_MODEL" >&6 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -echo "$as_me:4472: checking for specific curses-directory" >&5 +echo "$as_me:4805: 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. @@ -4479,7 +4812,7 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:4482: result: $cf_cv_curses_dir" >&5 +echo "$as_me:4815: 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" @@ -4491,26 +4824,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in -(.\$\(*\)*|.\'*\'*) +case "x$withval" in +(x\$\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval withval="$withval" - case ".$withval" in - (.NONE/*) + case "x$withval" in + (xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:4513: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:4844: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -4546,7 +4877,7 @@ if test -n "$cf_cv_curses_dir/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 4549 "configure" +#line 4880 "configure" #include "confdefs.h" #include int @@ -4558,16 +4889,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4561: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4892: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4564: \$? = $ac_status" >&5 + echo "$as_me:4895: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4567: \"$ac_try\"") >&5 + { (eval echo "$as_me:4898: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4570: \$? = $ac_status" >&5 + echo "$as_me:4901: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4584,7 +4915,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}:4587: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:4918: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -4620,7 +4951,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}:4623: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:4954: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -4635,13 +4966,13 @@ cf_ncuconfig_root=ncurses cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:4638: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:4969: 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:4641: result: yes" >&5 + echo "$as_me:4972: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:4644: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:4975: 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 @@ -4774,7 +5105,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 4777 "configure" +#line 5108 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -4786,37 +5117,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4789: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5120: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4792: \$? = $ac_status" >&5 + echo "$as_me:5123: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4795: \"$ac_try\"") >&5 + { (eval echo "$as_me:5126: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4798: \$? = $ac_status" >&5 + echo "$as_me:5129: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 4804 "configure" +#line 5135 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:4811: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5142: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4814: \$? = $ac_status" >&5 + echo "$as_me:5145: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:4816: \"$ac_try\"") >&5 + { (eval echo "$as_me:5147: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4819: \$? = $ac_status" >&5 + echo "$as_me:5150: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -4847,6 +5178,20 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ;; esac +for cf_required in $cf_ncuconfig_root +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done + for cf_add_cflags in $cf_pkg_cflags do case "x$cf_add_cflags" in @@ -4990,7 +5335,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 4993 "configure" +#line 5338 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -5002,37 +5347,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:5005: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5350: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5008: \$? = $ac_status" >&5 + echo "$as_me:5353: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:5011: \"$ac_try\"") >&5 + { (eval echo "$as_me:5356: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5014: \$? = $ac_status" >&5 + echo "$as_me:5359: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 5020 "configure" +#line 5365 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:5027: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5372: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5030: \$? = $ac_status" >&5 + echo "$as_me:5375: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:5032: \"$ac_try\"") >&5 + { (eval echo "$as_me:5377: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5035: \$? = $ac_status" >&5 + echo "$as_me:5380: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -5049,7 +5394,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:5052: result: $cf_have_ncuconfig" >&5 + echo "$as_me:5397: 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" @@ -5065,7 +5410,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:5068: checking for terminfo header" >&5 +echo "$as_me:5413: 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 @@ -5083,7 +5428,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 5086 "configure" +#line 5431 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -5098,16 +5443,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5101: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5446: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5104: \$? = $ac_status" >&5 + echo "$as_me:5449: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5107: \"$ac_try\"") >&5 + { (eval echo "$as_me:5452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5110: \$? = $ac_status" >&5 + echo "$as_me:5455: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -5123,7 +5468,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5126: result: $cf_cv_term_header" >&5 +echo "$as_me:5471: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -5158,7 +5503,7 @@ esac fi else - echo "$as_me:5161: result: no" >&5 + echo "$as_me:5506: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -5174,7 +5519,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:5177: checking for $ac_word" >&5 +echo "$as_me:5522: 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 @@ -5189,7 +5534,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:5192: found $ac_dir/$ac_word" >&5 +echo "$as_me:5537: found $ac_dir/$ac_word" >&5 break done @@ -5197,10 +5542,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:5200: result: $NCURSES_CONFIG" >&5 + echo "$as_me:5545: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:5203: result: no" >&5 + echo "$as_me:5548: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5213,7 +5558,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:5216: checking for $ac_word" >&5 +echo "$as_me:5561: 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 @@ -5228,7 +5573,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:5231: found $ac_dir/$ac_word" >&5 +echo "$as_me:5576: found $ac_dir/$ac_word" >&5 break done @@ -5236,10 +5581,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:5239: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:5584: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:5242: result: no" >&5 + echo "$as_me:5587: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5396,7 +5741,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:5399: checking if we have identified curses headers" >&5 +echo "$as_me:5744: 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 @@ -5408,7 +5753,7 @@ for cf_header in \ curses.h ncurses/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 5411 "configure" +#line 5756 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -5420,16 +5765,16 @@ initscr(); endwin() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5423: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5768: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5426: \$? = $ac_status" >&5 + echo "$as_me:5771: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5429: \"$ac_try\"") >&5 + { (eval echo "$as_me:5774: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5432: \$? = $ac_status" >&5 + echo "$as_me:5777: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -5440,11 +5785,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5443: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:5788: 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:5447: error: No curses header-files found" >&5 + { { echo "$as_me:5792: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -5454,23 +5799,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:5457: checking for $ac_header" >&5 +echo "$as_me:5802: 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 5463 "configure" +#line 5808 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5467: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:5812: \"$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:5473: \$? = $ac_status" >&5 + echo "$as_me:5818: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5489,7 +5834,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:5492: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:5837: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF -#line 5548 "configure" +#line 5893 "configure" #include "confdefs.h" #include int @@ -5557,16 +5902,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5560: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5905: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5563: \$? = $ac_status" >&5 + echo "$as_me:5908: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5566: \"$ac_try\"") >&5 + { (eval echo "$as_me:5911: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5569: \$? = $ac_status" >&5 + echo "$as_me:5914: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5583,7 +5928,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}:5586: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5931: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5602,7 +5947,7 @@ fi } -echo "$as_me:5605: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:5950: 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 @@ -5614,7 +5959,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 5617 "configure" +#line 5962 "configure" #include "confdefs.h" #include <$cf_header> @@ -5638,16 +5983,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5641: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5986: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5644: \$? = $ac_status" >&5 + echo "$as_me:5989: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5647: \"$ac_try\"") >&5 + { (eval echo "$as_me:5992: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5650: \$? = $ac_status" >&5 + echo "$as_me:5995: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -5662,14 +6007,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5665: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:6010: 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:5672: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:6017: 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 @@ -5790,7 +6135,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 5793 "configure" +#line 6138 "configure" #include "confdefs.h" #include int @@ -5802,16 +6147,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5805: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6150: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5808: \$? = $ac_status" >&5 + echo "$as_me:6153: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5811: \"$ac_try\"") >&5 + { (eval echo "$as_me:6156: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5814: \$? = $ac_status" >&5 + echo "$as_me:6159: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5828,7 +6173,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}:5831: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6176: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5851,7 +6196,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 5854 "configure" +#line 6199 "configure" #include "confdefs.h" #include <$cf_header> @@ -5875,16 +6220,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5878: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6223: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5881: \$? = $ac_status" >&5 + echo "$as_me:6226: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5884: \"$ac_try\"") >&5 + { (eval echo "$as_me:6229: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5887: \$? = $ac_status" >&5 + echo "$as_me:6232: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -5905,12 +6250,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:5908: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6253: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:5913: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:6258: 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%/[^/]*$%%'` @@ -5946,7 +6291,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 5949 "configure" +#line 6294 "configure" #include "confdefs.h" #include int @@ -5958,16 +6303,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5961: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6306: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5964: \$? = $ac_status" >&5 + echo "$as_me:6309: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5967: \"$ac_try\"") >&5 + { (eval echo "$as_me:6312: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5970: \$? = $ac_status" >&5 + echo "$as_me:6315: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5984,7 +6329,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}:5987: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6332: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6032,7 +6377,7 @@ EOF ;; esac -echo "$as_me:6035: checking for terminfo header" >&5 +echo "$as_me:6380: 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 @@ -6050,7 +6395,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 6053 "configure" +#line 6398 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -6065,16 +6410,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6068: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6413: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6071: \$? = $ac_status" >&5 + echo "$as_me:6416: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6074: \"$ac_try\"") >&5 + { (eval echo "$as_me:6419: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6077: \$? = $ac_status" >&5 + echo "$as_me:6422: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -6090,7 +6435,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:6093: result: $cf_cv_term_header" >&5 +echo "$as_me:6438: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -6128,7 +6473,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:6131: checking for ncurses version" >&5 +echo "$as_me:6476: 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 @@ -6154,10 +6499,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:6157: \"$cf_try\"") >&5 + { (eval echo "$as_me:6502: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:6160: \$? = $ac_status" >&5 + echo "$as_me:6505: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -6167,7 +6512,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 6170 "configure" +#line 6515 "configure" #include "confdefs.h" $ac_includes_default @@ -6194,15 +6539,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:6197: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6542: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6200: \$? = $ac_status" >&5 + echo "$as_me:6545: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:6202: \"$ac_try\"") >&5 + { (eval echo "$as_me:6547: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6205: \$? = $ac_status" >&5 + echo "$as_me:6550: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -6216,7 +6561,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:6219: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:6564: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -6229,7 +6574,7 @@ cf_nculib_root=ncurses # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:6232: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:6577: 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 @@ -6237,7 +6582,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6240 "configure" +#line 6585 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6256,16 +6601,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6259: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6604: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6262: \$? = $ac_status" >&5 + echo "$as_me:6607: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6265: \"$ac_try\"") >&5 + { (eval echo "$as_me:6610: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6268: \$? = $ac_status" >&5 + echo "$as_me:6613: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -6276,10 +6621,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6279: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:6624: 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:6282: checking for initscr in -lgpm" >&5 + echo "$as_me:6627: 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 @@ -6287,7 +6632,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6290 "configure" +#line 6635 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6306,16 +6651,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6309: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6654: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6312: \$? = $ac_status" >&5 + echo "$as_me:6657: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6315: \"$ac_try\"") >&5 + { (eval echo "$as_me:6660: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6318: \$? = $ac_status" >&5 + echo "$as_me:6663: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -6326,7 +6671,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6329: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:6674: 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" @@ -6341,7 +6686,7 @@ case "$host_os" in # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:6344: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:6689: 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 @@ -6349,7 +6694,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6352 "configure" +#line 6697 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6368,16 +6713,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6371: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6716: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6374: \$? = $ac_status" >&5 + echo "$as_me:6719: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6377: \"$ac_try\"") >&5 + { (eval echo "$as_me:6722: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6380: \$? = $ac_status" >&5 + echo "$as_me:6725: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -6388,7 +6733,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6391: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:6736: 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" @@ -6437,13 +6782,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:6440: checking for initscr" >&5 + echo "$as_me:6785: 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 6446 "configure" +#line 6791 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -6474,16 +6819,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6477: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6822: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6480: \$? = $ac_status" >&5 + echo "$as_me:6825: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6483: \"$ac_try\"") >&5 + { (eval echo "$as_me:6828: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6486: \$? = $ac_status" >&5 + echo "$as_me:6831: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -6493,18 +6838,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:6496: result: $ac_cv_func_initscr" >&5 +echo "$as_me:6841: 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:6503: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:6848: 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 6507 "configure" +#line 6852 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6516,25 +6861,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6519: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6864: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6522: \$? = $ac_status" >&5 + echo "$as_me:6867: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6525: \"$ac_try\"") >&5 + { (eval echo "$as_me:6870: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6528: \$? = $ac_status" >&5 + echo "$as_me:6873: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:6530: result: yes" >&5 + echo "$as_me:6875: 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:6537: result: no" >&5 +echo "$as_me:6882: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -6602,11 +6947,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:6605: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:6950: 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 6609 "configure" +#line 6954 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6618,25 +6963,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6621: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6966: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6624: \$? = $ac_status" >&5 + echo "$as_me:6969: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6627: \"$ac_try\"") >&5 + { (eval echo "$as_me:6972: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6630: \$? = $ac_status" >&5 + echo "$as_me:6975: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:6632: result: yes" >&5 + echo "$as_me:6977: 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:6639: result: no" >&5 +echo "$as_me:6984: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -6651,7 +6996,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:6654: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:6999: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -6659,7 +7004,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:6662: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:7007: 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 @@ -6669,7 +7014,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 6672 "configure" +#line 7017 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6681,23 +7026,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6684: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7029: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6687: \$? = $ac_status" >&5 + echo "$as_me:7032: \$? = $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:7035: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6693: \$? = $ac_status" >&5 + echo "$as_me:7038: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:6695: result: yes" >&5 + echo "$as_me:7040: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:6700: result: no" >&5 +echo "$as_me:7045: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -6715,40 +7060,131 @@ else NCURSES_CONFIG=none fi -echo "$as_me:6718: checking if you want wide-character code" >&5 -echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 +echo "$as_me:7063: checking for specified curses library type" >&5 +echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6 -# Check whether --enable-widec or --disable-widec was given. -if test "${enable_widec+set}" = set; then - enableval="$enable_widec" - with_widec=$enableval +# Check whether --with-screen or --without-screen was given. +if test "${with_screen+set}" = set; then + withval="$with_screen" + cf_cv_screen=$withval else - with_widec=no + cf_cv_screen=ncurses fi; -echo "$as_me:6728: result: $with_widec" >&5 -echo "${ECHO_T}$with_widec" >&6 -if test "$with_widec" = yes ; then -for ac_header in wchar.h +case $cf_cv_screen in +(curses|curses_*) + +echo "$as_me:7077: 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 +else + +cf_cv_curses_incdir=no +case "$host_os" in +(hpux10.*) + if test "x$cf_cv_screen" = "xcurses_colr" + then + test -d /usr/include/curses_colr && \ + cf_cv_curses_incdir="-I/usr/include/curses_colr" + fi + ;; +(sunos3*|sunos4*) + if test "x$cf_cv_screen" = "xcurses_5lib" + then + test -d /usr/5lib && \ + test -d /usr/5include && \ + cf_cv_curses_incdir="-I/usr/5include" + fi + ;; +esac + +fi +echo "$as_me:7103: result: $cf_cv_curses_incdir" >&5 +echo "${ECHO_T}$cf_cv_curses_incdir" >&6 +if test "$cf_cv_curses_incdir" != no +then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_curses_incdir" + +fi + +echo "$as_me:7113: 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 +else + +cf_cv_ncurses_header=none +for cf_header in \ + ncurses.h \ + curses.h ncurses/ncurses.h ncurses/curses.h +do +cat >"conftest.$ac_ext" <<_ACEOF +#line 7125 "configure" +#include "confdefs.h" +#include <${cf_header}> +int +main (void) +{ +initscr(); endwin() + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:7137: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:7140: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:7143: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7146: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_header=$cf_header; break +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +done + +fi +echo "$as_me:7157: 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:7161: error: No curses header-files found" >&5 +echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } +fi + +# cheat, to get the right #define's for HAVE_NCURSES_H, etc. + +for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:6735: checking for $ac_header" >&5 +echo "$as_me:7171: 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 6741 "configure" +#line 7177 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:6745: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:7181: \"$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:6751: \$? = $ac_status" >&5 + echo "$as_me:7187: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6767,7 +7203,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6770: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:7206: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:7216: 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 +else + +case "${cf_cv_ncurses_header}" in +(*/ncurses.h|*/ncursesw.h) + cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` + ;; +(*) + cf_term_header=term.h + ;; +esac + +for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" +do +cat >"conftest.$ac_ext" <<_ACEOF +#line 7234 "configure" +#include "confdefs.h" +#include +#include <${cf_cv_ncurses_header:-curses.h}> +#include <$cf_test> + +int +main (void) +{ +int x = auto_left_margin; (void)x + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:7249: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:7252: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:7255: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7258: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + cf_cv_term_header=unknown + +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + test "$cf_cv_term_header" != unknown && break +done + +fi +echo "$as_me:7274: result: $cf_cv_term_header" >&5 +echo "${ECHO_T}$cf_cv_term_header" >&6 + +# Set definitions to allow ifdef'ing to accommodate subdirectories + +case "$cf_cv_term_header" in +(*term.h) + +cat >>confdefs.h <<\EOF +#define HAVE_TERM_H 1 +EOF + + ;; +esac + +case "$cf_cv_term_header" in +(ncurses/term.h) + +cat >>confdefs.h <<\EOF +#define HAVE_NCURSES_TERM_H 1 +EOF + + ;; +(ncursesw/term.h) + +cat >>confdefs.h <<\EOF +#define HAVE_NCURSESW_TERM_H 1 +EOF + + ;; +esac + +echo "$as_me:7306: 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 +else + + cf_cv_ncurses_version=no + cf_tempfile=out$$ + rm -f "$cf_tempfile" + if test "$cross_compiling" = yes; then + + # This will not work if the preprocessor splits the line after the + # Autoconf token. The 'unproto' program does that. + cat > "conftest.$ac_ext" < +#undef Autoconf +#ifdef NCURSES_VERSION +Autoconf NCURSES_VERSION +#else +#ifdef __NCURSES_H +Autoconf "old" +#endif +; +#endif +EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" + { (eval echo "$as_me:7332: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? + echo "$as_me:7335: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` + test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" + rm -f conftest.out + fi + +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 7345 "configure" +#include "confdefs.h" + +$ac_includes_default + +#include <${cf_cv_ncurses_header:-curses.h}> + +int main(void) +{ + FILE *fp = fopen("$cf_tempfile", "w"); +#ifdef NCURSES_VERSION +# ifdef NCURSES_VERSION_PATCH + fprintf(fp, "%s.%d\\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); +# else + fprintf(fp, "%s\\n", NCURSES_VERSION); +# endif +#else +# ifdef __NCURSES_H + fprintf(fp, "old\\n"); +# else + #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:7372: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7375: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:7377: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7380: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" +fi + rm -f "$cf_tempfile" + +fi +echo "$as_me:7394: 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:7401: 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 7404 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr(); endwin() + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7416: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7419: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7422: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7425: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_result=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +echo "$as_me:7434: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 + +if test "$cf_result" = no ; then +case "$host_os" in +(freebsd*) + echo "$as_me:7440: 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 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmytinfo $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7448 "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 tgoto (void); +int +main (void) +{ +tgoto (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7467: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7470: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7473: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7476: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_mytinfo_tgoto=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_lib_mytinfo_tgoto=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7487: 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_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lmytinfo; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + +fi + + ;; +(hpux10.*) + # Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr + # next (1998), and xcurses "newer" (2000). There is no header file for + # Hcurses; the subdirectory curses_colr has the headers (curses.h and + # term.h) for cur_colr + if test "x$cf_cv_screen" = "xcurses_colr" + then + echo "$as_me:7517: 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 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcur_colr $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7525 "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 initscr (void); +int +main (void) +{ +initscr (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7544: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7547: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7550: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7553: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_cur_colr_initscr=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_lib_cur_colr_initscr=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7564: 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 + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lcur_colr; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + + ac_cv_func_initscr=yes + +else + + echo "$as_me:7588: 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 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lHcurses $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7596 "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 initscr (void); +int +main (void) +{ +initscr (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7615: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7618: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7621: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7624: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_Hcurses_initscr=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_lib_Hcurses_initscr=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7635: 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 + + # HP's header uses __HP_CURSES, but user claims _HP_CURSES. + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lHcurses; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D__HP_CURSES -D_HP_CURSES" + + ac_cv_func_initscr=yes + +fi + +fi + + fi + ;; +(linux*) + case `arch 2>/dev/null` in + (x86_64) + if test -d /lib64 + then + +if test -n "/lib64" ; then + for cf_add_libdir in /lib64 + do + if test "$cf_add_libdir" = /usr/lib ; then + : + elif test -d "$cf_add_libdir" + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +echo "${as_me:-configure}:7693: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi + + else + +if test -n "/lib" ; then + for cf_add_libdir in /lib + do + if test "$cf_add_libdir" = /usr/lib ; then + : + elif test -d "$cf_add_libdir" + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +echo "${as_me:-configure}:7722: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi + + fi + ;; + (*) + +if test -n "/lib" ; then + for cf_add_libdir in /lib + do + if test "$cf_add_libdir" = /usr/lib ; then + : + elif test -d "$cf_add_libdir" + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +echo "${as_me:-configure}:7753: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi + + ;; + esac + ;; +(sunos3*|sunos4*) + if test "x$cf_cv_screen" = "xcurses_5lib" + then + if test -d /usr/5lib ; then + +if test -n "/usr/5lib" ; then + for cf_add_libdir in /usr/5lib + do + if test "$cf_add_libdir" = /usr/lib ; then + : + elif test -d "$cf_add_libdir" + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +echo "${as_me:-configure}:7788: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lcurses -ltermcap; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + + fi + fi + ac_cv_func_initscr=yes + ;; +esac + +if test ".$ac_cv_func_initscr" != .yes ; then + cf_save_LIBS="$LIBS" + + if test ".${cf_cv_ncurses_version:-no}" != .no + then + cf_check_list="ncurses curses cursesX" + else + cf_check_list="cursesX curses ncurses" + fi + + # Check for library containing tgoto. Do this before curses library + # because it may be needed to link the test-case for initscr. + if test "x$cf_term_lib" = x + then + echo "$as_me:7832: 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 7838 "configure" +#include "confdefs.h" +#define tgoto autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef tgoto + +#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 tgoto (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_tgoto) || defined (__stub___tgoto) +#error found stub for tgoto +#endif + + return tgoto (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7869: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7872: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7875: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7878: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_tgoto=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_func_tgoto=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +fi +echo "$as_me:7888: 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 +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:7897: 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 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$cf_term_lib $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7905 "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 tgoto (void); +int +main (void) +{ +tgoto (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7924: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7927: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7930: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7933: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Lib=yes" +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +eval "$as_ac_Lib=no" +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7944: 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_nculib_root:=$cf_term_lib}" + break + +fi + + done + +fi + + fi + + # Check for library containing initscr + test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" + if test "x$cf_curs_lib" = x + then + for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown + 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:7967: 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 7970 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr() + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7982: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7985: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7988: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7991: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_result=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:8000: 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:8006: 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 8009 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr(); endwin(); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:8021: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8024: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:8027: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8030: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=no +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8039 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr() + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:8051: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8054: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:8057: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8060: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_result=error +fi +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:8072: 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:8078: error: no curses library found" >&5 +echo "$as_me: error: no curses library found" >&2;} + { (exit 1); exit 1; }; } +fi +fi + + ;; +(ncursesw*) + +for ac_header in wchar.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:8090: 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 8096 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:8100: \"$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:8106: \$? = $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:8125: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 echo $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 @@ -6785,7 +8140,7 @@ else cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6788 "configure" +#line 8143 "configure" #include "confdefs.h" $ac_includes_default @@ -6802,16 +8157,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6805: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8160: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6808: \$? = $ac_status" >&5 + echo "$as_me:8163: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6811: \"$ac_try\"") >&5 + { (eval echo "$as_me:8166: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6814: \$? = $ac_status" >&5 + echo "$as_me:8169: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_utf8_lib=yes else @@ -6819,16 +8174,16 @@ else cat "conftest.$ac_ext" >&5 # If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these -# will be set on completion of the AC_TRY_LINK below. +# will be set on completion of the AC_LINK_IFELSE below. cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:6826: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:8181: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6831 "configure" +#line 8186 "configure" #include "confdefs.h" #include @@ -6841,16 +8196,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6844: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8199: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6847: \$? = $ac_status" >&5 + echo "$as_me:8202: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6850: \"$ac_try\"") >&5 + { (eval echo "$as_me:8205: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6853: \$? = $ac_status" >&5 + echo "$as_me:8208: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -6864,7 +8219,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lutf8 $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6867 "configure" +#line 8222 "configure" #include "confdefs.h" #include @@ -6877,16 +8232,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6880: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8235: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6883: \$? = $ac_status" >&5 + echo "$as_me:8238: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6886: \"$ac_try\"") >&5 + { (eval echo "$as_me:8241: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6889: \$? = $ac_status" >&5 + echo "$as_me:8244: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -6903,9 +8258,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:6906: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:8261: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:6908: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:8263: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -6996,7 +8351,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}:6999: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8354: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -7004,7 +8359,7 @@ echo "${as_me:-configure}:6999: testing ... testing $cf_cv_header_path_utf8 ..." CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" cat >"conftest.$ac_ext" <<_ACEOF -#line 7007 "configure" +#line 8362 "configure" #include "confdefs.h" #include @@ -7017,21 +8372,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7020: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8375: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7023: \$? = $ac_status" >&5 + echo "$as_me:8378: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7026: \"$ac_try\"") >&5 + { (eval echo "$as_me:8381: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7029: \$? = $ac_status" >&5 + echo "$as_me:8384: \$? = $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}:7034: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8389: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -7049,7 +8404,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:7052: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:8407: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -7124,13 +8479,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}:7127: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8482: 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 7133 "configure" +#line 8488 "configure" #include "confdefs.h" #include @@ -7143,21 +8498,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7146: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8501: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7149: \$? = $ac_status" >&5 + echo "$as_me:8504: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7152: \"$ac_try\"") >&5 + { (eval echo "$as_me:8507: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7155: \$? = $ac_status" >&5 + echo "$as_me:8510: \$? = $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}:7160: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8515: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -7199,7 +8554,7 @@ fi fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:7202: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:8557: 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 @@ -7237,7 +8592,7 @@ if test -n "$cf_cv_header_path_utf8" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 7240 "configure" +#line 8595 "configure" #include "confdefs.h" #include int @@ -7249,16 +8604,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7252: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8607: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7255: \$? = $ac_status" >&5 + echo "$as_me:8610: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7258: \"$ac_try\"") >&5 + { (eval echo "$as_me:8613: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7261: \$? = $ac_status" >&5 + echo "$as_me:8616: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -7275,7 +8630,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}:7278: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8633: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7311,7 +8666,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}:7314: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:8669: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7337,17 +8692,17 @@ LIBS="$cf_add_libs" fi -cf_ncuconfig_root=ncursesw +cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:7344: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:8699: 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:7347: result: yes" >&5 + echo "$as_me:8702: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:7350: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:8705: 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 @@ -7480,7 +8835,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 7483 "configure" +#line 8838 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7492,37 +8847,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7495: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8850: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7498: \$? = $ac_status" >&5 + echo "$as_me:8853: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7501: \"$ac_try\"") >&5 + { (eval echo "$as_me:8856: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7504: \$? = $ac_status" >&5 + echo "$as_me:8859: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 7510 "configure" +#line 8865 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:7517: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8872: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7520: \$? = $ac_status" >&5 + echo "$as_me:8875: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:7522: \"$ac_try\"") >&5 + { (eval echo "$as_me:8877: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7525: \$? = $ac_status" >&5 + echo "$as_me:8880: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -7553,6 +8908,20 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ;; esac +for cf_required in $cf_ncuconfig_root +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done + for cf_add_cflags in $cf_pkg_cflags do case "x$cf_add_cflags" in @@ -7696,7 +9065,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 7699 "configure" +#line 9068 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7708,37 +9077,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7711: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9080: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7714: \$? = $ac_status" >&5 + echo "$as_me:9083: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7717: \"$ac_try\"") >&5 + { (eval echo "$as_me:9086: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7720: \$? = $ac_status" >&5 + echo "$as_me:9089: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 7726 "configure" +#line 9095 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:7733: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9102: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7736: \$? = $ac_status" >&5 + echo "$as_me:9105: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:7738: \"$ac_try\"") >&5 + { (eval echo "$as_me:9107: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7741: \$? = $ac_status" >&5 + echo "$as_me:9110: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -7755,7 +9124,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:7758: result: $cf_have_ncuconfig" >&5 + echo "$as_me:9127: 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" @@ -7771,7 +9140,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:7774: checking for terminfo header" >&5 +echo "$as_me:9143: 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 @@ -7789,7 +9158,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 7792 "configure" +#line 9161 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -7804,16 +9173,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7807: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9176: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7810: \$? = $ac_status" >&5 + echo "$as_me:9179: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7813: \"$ac_try\"") >&5 + { (eval echo "$as_me:9182: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7816: \$? = $ac_status" >&5 + echo "$as_me:9185: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -7829,7 +9198,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:7832: result: $cf_cv_term_header" >&5 +echo "$as_me:9201: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -7864,7 +9233,7 @@ esac fi else - echo "$as_me:7867: result: no" >&5 + echo "$as_me:9236: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -7880,7 +9249,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:7883: checking for $ac_word" >&5 +echo "$as_me:9252: 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 @@ -7895,7 +9264,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:7898: found $ac_dir/$ac_word" >&5 +echo "$as_me:9267: found $ac_dir/$ac_word" >&5 break done @@ -7903,10 +9272,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:7906: result: $NCURSES_CONFIG" >&5 + echo "$as_me:9275: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:7909: result: no" >&5 + echo "$as_me:9278: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7919,7 +9288,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:7922: checking for $ac_word" >&5 +echo "$as_me:9291: 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 @@ -7934,7 +9303,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:7937: found $ac_dir/$ac_word" >&5 +echo "$as_me:9306: found $ac_dir/$ac_word" >&5 break done @@ -7942,10 +9311,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:7945: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:9314: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:7948: result: no" >&5 + echo "$as_me:9317: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8102,7 +9471,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:8105: checking if we have identified curses headers" >&5 +echo "$as_me:9474: 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 @@ -8110,11 +9479,11 @@ else cf_cv_ncurses_header=none for cf_header in \ - ncurses.h ncursesw/ncurses.h \ - curses.h ncursesw/curses.h + ncurses.h $cf_cv_screen/ncurses.h \ + curses.h $cf_cv_screen/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 8117 "configure" +#line 9486 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -8126,16 +9495,16 @@ initscr(); endwin() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8129: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9498: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8132: \$? = $ac_status" >&5 + echo "$as_me:9501: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8135: \"$ac_try\"") >&5 + { (eval echo "$as_me:9504: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8138: \$? = $ac_status" >&5 + echo "$as_me:9507: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -8146,11 +9515,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8149: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:9518: 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:8153: error: No curses header-files found" >&5 + { { echo "$as_me:9522: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -8160,23 +9529,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:8163: checking for $ac_header" >&5 +echo "$as_me:9532: 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 8169 "configure" +#line 9538 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:8173: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:9542: \"$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:8179: \$? = $ac_status" >&5 + echo "$as_me:9548: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -8195,7 +9564,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:8198: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:9567: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF -#line 8254 "configure" +#line 9623 "configure" #include "confdefs.h" #include int @@ -8263,16 +9632,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8266: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9635: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8269: \$? = $ac_status" >&5 + echo "$as_me:9638: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8272: \"$ac_try\"") >&5 + { (eval echo "$as_me:9641: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8275: \$? = $ac_status" >&5 + echo "$as_me:9644: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8289,7 +9658,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}:8292: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9661: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8308,7 +9677,7 @@ fi } -echo "$as_me:8311: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:9680: 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 @@ -8320,13 +9689,9 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 8323 "configure" +#line 9692 "configure" #include "confdefs.h" -#define _XOPEN_SOURCE_EXTENDED -#undef HAVE_LIBUTF8_H /* in case we used CF_UTF8_LIB */ -#define HAVE_LIBUTF8_H /* to force ncurses' header file to use cchar_t */ - #include <$cf_header> int main (void) @@ -8334,10 +9699,6 @@ main (void) #ifdef NCURSES_VERSION -#ifndef WACS_BSSB - #error WACS_BSSB is not defined -#endif - printf("%s\\n", NCURSES_VERSION); #else #ifdef __NCURSES_H @@ -8352,16 +9713,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8355: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9716: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8358: \$? = $ac_status" >&5 + echo "$as_me:9719: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8361: \"$ac_try\"") >&5 + { (eval echo "$as_me:9722: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8364: \$? = $ac_status" >&5 + echo "$as_me:9725: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -8376,14 +9737,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8379: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:9740: 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:8386: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:9747: 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 @@ -8504,7 +9865,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 8507 "configure" +#line 9868 "configure" #include "confdefs.h" #include int @@ -8516,16 +9877,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8519: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9880: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8522: \$? = $ac_status" >&5 + echo "$as_me:9883: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8525: \"$ac_try\"") >&5 + { (eval echo "$as_me:9886: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8528: \$? = $ac_status" >&5 + echo "$as_me:9889: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8542,7 +9903,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}:8545: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9906: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8565,7 +9926,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 8568 "configure" +#line 9929 "configure" #include "confdefs.h" #include <$cf_header> @@ -8589,16 +9950,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8592: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9953: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8595: \$? = $ac_status" >&5 + echo "$as_me:9956: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8598: \"$ac_try\"") >&5 + { (eval echo "$as_me:9959: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8601: \$? = $ac_status" >&5 + echo "$as_me:9962: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -8619,12 +9980,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:8622: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9983: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:8627: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:9988: 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%/[^/]*$%%'` @@ -8660,7 +10021,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 8663 "configure" +#line 10024 "configure" #include "confdefs.h" #include int @@ -8672,16 +10033,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8675: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10036: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8678: \$? = $ac_status" >&5 + echo "$as_me:10039: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8681: \"$ac_try\"") >&5 + { (eval echo "$as_me:10042: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8684: \$? = $ac_status" >&5 + echo "$as_me:10045: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8698,7 +10059,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}:8701: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10062: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8746,7 +10107,7 @@ EOF ;; esac -echo "$as_me:8749: checking for terminfo header" >&5 +echo "$as_me:10110: 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 @@ -8764,7 +10125,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 8767 "configure" +#line 10128 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -8779,16 +10140,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8782: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10143: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8785: \$? = $ac_status" >&5 + echo "$as_me:10146: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8788: \"$ac_try\"") >&5 + { (eval echo "$as_me:10149: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8791: \$? = $ac_status" >&5 + echo "$as_me:10152: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -8804,7 +10165,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8807: result: $cf_cv_term_header" >&5 +echo "$as_me:10168: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -8842,7 +10203,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:8845: checking for ncurses version" >&5 +echo "$as_me:10206: 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 @@ -8868,10 +10229,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:8871: \"$cf_try\"") >&5 + { (eval echo "$as_me:10232: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:8874: \$? = $ac_status" >&5 + echo "$as_me:10235: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -8881,7 +10242,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 8884 "configure" +#line 10245 "configure" #include "confdefs.h" $ac_includes_default @@ -8908,15 +10269,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:8911: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10272: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8914: \$? = $ac_status" >&5 + echo "$as_me:10275: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:8916: \"$ac_try\"") >&5 + { (eval echo "$as_me:10277: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8919: \$? = $ac_status" >&5 + echo "$as_me:10280: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -8930,20 +10291,20 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:8933: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:10294: 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 -cf_nculib_root=ncursesw +cf_nculib_root=$cf_cv_screen # This works, except for the special case where we find gpm, but # ncurses is in a nonstandard location via $LIBS, and we really want # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:8946: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:10307: 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 @@ -8951,7 +10312,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 8954 "configure" +#line 10315 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8970,16 +10331,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8973: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10334: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8976: \$? = $ac_status" >&5 + echo "$as_me:10337: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8979: \"$ac_try\"") >&5 + { (eval echo "$as_me:10340: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8982: \$? = $ac_status" >&5 + echo "$as_me:10343: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -8990,10 +10351,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8993: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:10354: 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:8996: checking for initscr in -lgpm" >&5 + echo "$as_me:10357: 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 @@ -9001,7 +10362,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 9004 "configure" +#line 10365 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9020,16 +10381,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9023: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10384: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9026: \$? = $ac_status" >&5 + echo "$as_me:10387: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9029: \"$ac_try\"") >&5 + { (eval echo "$as_me:10390: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9032: \$? = $ac_status" >&5 + echo "$as_me:10393: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -9040,7 +10401,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9043: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:10404: 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" @@ -9055,7 +10416,7 @@ case "$host_os" in # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:9058: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:10419: 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 @@ -9063,7 +10424,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 9066 "configure" +#line 10427 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9082,16 +10443,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9085: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10446: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9088: \$? = $ac_status" >&5 + echo "$as_me:10449: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9091: \"$ac_try\"") >&5 + { (eval echo "$as_me:10452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9094: \$? = $ac_status" >&5 + echo "$as_me:10455: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -9102,7 +10463,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9105: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:10466: 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" @@ -9151,13 +10512,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:9154: checking for initscr" >&5 + echo "$as_me:10515: 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 9160 "configure" +#line 10521 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -9188,16 +10549,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9191: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10552: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9194: \$? = $ac_status" >&5 + echo "$as_me:10555: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9197: \"$ac_try\"") >&5 + { (eval echo "$as_me:10558: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9200: \$? = $ac_status" >&5 + echo "$as_me:10561: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -9207,18 +10568,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:9210: result: $ac_cv_func_initscr" >&5 +echo "$as_me:10571: 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:9217: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:10578: 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 9221 "configure" +#line 10582 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9230,25 +10591,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9233: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10594: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9236: \$? = $ac_status" >&5 + echo "$as_me:10597: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9239: \"$ac_try\"") >&5 + { (eval echo "$as_me:10600: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9242: \$? = $ac_status" >&5 + echo "$as_me:10603: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:9244: result: yes" >&5 + echo "$as_me:10605: 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:9251: result: no" >&5 +echo "$as_me:10612: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -9316,11 +10677,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:9319: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:10680: 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 9323 "configure" +#line 10684 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9332,25 +10693,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9335: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10696: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9338: \$? = $ac_status" >&5 + echo "$as_me:10699: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9341: \"$ac_try\"") >&5 + { (eval echo "$as_me:10702: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9344: \$? = $ac_status" >&5 + echo "$as_me:10705: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:9346: result: yes" >&5 + echo "$as_me:10707: 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:9353: result: no" >&5 +echo "$as_me:10714: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -9365,7 +10726,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:9368: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:10729: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -9373,7 +10734,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:9376: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:10737: 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 @@ -9383,7 +10744,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 9386 "configure" +#line 10747 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9395,23 +10756,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9398: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10759: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9401: \$? = $ac_status" >&5 + echo "$as_me:10762: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9404: \"$ac_try\"") >&5 + { (eval echo "$as_me:10765: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9407: \$? = $ac_status" >&5 + echo "$as_me:10768: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:9409: result: yes" >&5 + echo "$as_me:10770: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:9414: result: no" >&5 +echo "$as_me:10775: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -9429,19 +10790,20 @@ else NCURSES_CONFIG=none fi -else + ;; +(ncurses*) -cf_ncuconfig_root=ncurses +cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:9438: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:10800: 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:9441: result: yes" >&5 + echo "$as_me:10803: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:9444: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:10806: 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 @@ -9574,7 +10936,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 9577 "configure" +#line 10939 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9586,37 +10948,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9589: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10951: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9592: \$? = $ac_status" >&5 + echo "$as_me:10954: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9595: \"$ac_try\"") >&5 + { (eval echo "$as_me:10957: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9598: \$? = $ac_status" >&5 + echo "$as_me:10960: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 9604 "configure" +#line 10966 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:9611: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10973: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9614: \$? = $ac_status" >&5 + echo "$as_me:10976: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:9616: \"$ac_try\"") >&5 + { (eval echo "$as_me:10978: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9619: \$? = $ac_status" >&5 + echo "$as_me:10981: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -9647,6 +11009,20 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ;; esac +for cf_required in $cf_ncuconfig_root +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done + for cf_add_cflags in $cf_pkg_cflags do case "x$cf_add_cflags" in @@ -9790,7 +11166,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 9793 "configure" +#line 11169 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9802,37 +11178,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9805: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11181: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9808: \$? = $ac_status" >&5 + echo "$as_me:11184: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9811: \"$ac_try\"") >&5 + { (eval echo "$as_me:11187: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9814: \$? = $ac_status" >&5 + echo "$as_me:11190: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 9820 "configure" +#line 11196 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:9827: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11203: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9830: \$? = $ac_status" >&5 + echo "$as_me:11206: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:9832: \"$ac_try\"") >&5 + { (eval echo "$as_me:11208: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9835: \$? = $ac_status" >&5 + echo "$as_me:11211: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -9849,7 +11225,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:9852: result: $cf_have_ncuconfig" >&5 + echo "$as_me:11228: 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" @@ -9865,7 +11241,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:9868: checking for terminfo header" >&5 +echo "$as_me:11244: 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 @@ -9883,7 +11259,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 9886 "configure" +#line 11262 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -9898,1392 +11274,1392 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9901: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11277: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9904: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9907: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:9910: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - - cf_cv_term_header="$cf_test" -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 - - cf_cv_term_header=unknown - -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" - test "$cf_cv_term_header" != unknown && break -done - -fi -echo "$as_me:9926: result: $cf_cv_term_header" >&5 -echo "${ECHO_T}$cf_cv_term_header" >&6 - -# Set definitions to allow ifdef'ing to accommodate subdirectories - -case "$cf_cv_term_header" in -(*term.h) - -cat >>confdefs.h <<\EOF -#define HAVE_TERM_H 1 -EOF - - ;; -esac - -case "$cf_cv_term_header" in -(ncurses/term.h) - -cat >>confdefs.h <<\EOF -#define HAVE_NCURSES_TERM_H 1 -EOF - - ;; -(ncursesw/term.h) - -cat >>confdefs.h <<\EOF -#define HAVE_NCURSESW_TERM_H 1 -EOF - - ;; -esac - - fi - - else - echo "$as_me:9961: result: no" >&5 -echo "${ECHO_T}no" >&6 - NCURSES_CONFIG_PKG=none - fi -else - NCURSES_CONFIG_PKG=none -fi - -if test "x$cf_have_ncuconfig" = "xno"; then - cf_ncurses_config="${cf_ncuconfig_root}${NCURSES_CONFIG_SUFFIX}-config"; echo "Looking for ${cf_ncurses_config}" - -if test -n "$ac_tool_prefix"; then - for ac_prog in ${cf_ncurses_config} ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config - 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:9977: 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 -else - if test -n "$NCURSES_CONFIG"; then - ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:9992: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG -if test -n "$NCURSES_CONFIG"; then - echo "$as_me:10000: result: $NCURSES_CONFIG" >&5 -echo "${ECHO_T}$NCURSES_CONFIG" >&6 -else - echo "$as_me:10003: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$NCURSES_CONFIG" && break - done -fi -if test -z "$NCURSES_CONFIG"; then - ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG - for ac_prog in ${cf_ncurses_config} ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config -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:10016: 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 -else - if test -n "$ac_ct_NCURSES_CONFIG"; then - ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:10031: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG -if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:10039: result: $ac_ct_NCURSES_CONFIG" >&5 -echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 -else - echo "$as_me:10042: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$ac_ct_NCURSES_CONFIG" && break -done -test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" - - NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG -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 $cf_add_cflags -do -case "$cf_fix_cppflags" in -(no) - case "$cf_add_cflags" in - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case "$cf_add_cflags" in - (-D*) - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - - if test "$cf_fix_cppflags" = yes ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue - elif test "${cf_tst_cflags}" = "\"'" ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue - fi - ;; - esac - case "$CPPFLAGS" in - (*$cf_add_cflags) - ;; - (*) - case "$cf_add_cflags" in - (-D*) - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` - - ;; - esac - - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" - - ;; - esac - ;; - (*) - - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" - - ;; - esac - ;; -(yes) - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac -done - -if test -n "$cf_new_cflags" ; then - - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" - -fi - -if test -n "$cf_new_cppflags" ; then - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" - -fi - -if test -n "$cf_new_extra_cppflags" ; then - - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" - -fi - -done - -cf_add_libs="$LIBS" -# reverse order -cf_add_0lib= -for cf_add_1lib in `$NCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done -# filter duplicates -for cf_add_1lib in $cf_add_0lib; do - for cf_add_2lib in $cf_add_libs; do - if test "x$cf_add_1lib" = "x$cf_add_2lib"; then - cf_add_1lib= - break - fi - done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" -done -LIBS="$cf_add_libs" - - # even with config script, some packages use no-override for curses.h - -echo "$as_me:10199: 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 -else - -cf_cv_ncurses_header=none -for cf_header in \ - ncurses.h ncurses/ncurses.h \ - curses.h ncurses/curses.h -do -cat >"conftest.$ac_ext" <<_ACEOF -#line 10211 "configure" -#include "confdefs.h" -#include <${cf_header}> -int -main (void) -{ -initscr(); endwin() - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10223: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:10226: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10229: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10232: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_ncurses_header=$cf_header; break -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" -done - -fi -echo "$as_me:10243: 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:10247: error: No curses header-files found" >&5 -echo "$as_me: error: No curses header-files found" >&2;} - { (exit 1); exit 1; }; } -fi - -# cheat, to get the right #define's for HAVE_NCURSES_H, etc. - -for ac_header in $cf_cv_ncurses_header -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:10257: 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 10263 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:10267: \"$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:10273: \$? = $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:10292: 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 <>confdefs.h <<\EOF -#define NCURSES 1 -EOF - -cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - - cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF -#line 10348 "configure" -#include "confdefs.h" -#include -int -main (void) -{ -printf("Hello") - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10360: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:10363: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10366: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10369: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -cf_have_incdir=yes -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:10386: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done -fi - -} - -echo "$as_me:10405: 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 -else - - cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" - { test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw; } && cf_header_list="$cf_header_list curses.h ncurses.h" - for cf_header in $cf_header_list - do - - cat >"conftest.$ac_ext" <<_ACEOF -#line 10417 "configure" -#include "confdefs.h" - -#include <$cf_header> -int -main (void) -{ - -#ifdef NCURSES_VERSION - -printf("%s\\n", NCURSES_VERSION); -#else -#ifdef __NCURSES_H -printf("old\\n"); -#else - #error __NCURSES_H is not defined -#endif -#endif - - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10441: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:10444: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10447: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10450: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_ncurses_h=$cf_header - -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -cf_cv_ncurses_h=no -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" - - test "$cf_cv_ncurses_h" != no && break - done - -fi -echo "$as_me:10465: 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:10472: 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 -else - - test -n "$verbose" && echo - -cf_search= - -# collect the current set of include-directories from compiler flags -cf_header_path_list="" -if test -n "${CFLAGS}${CPPFLAGS}" ; then - for cf_header_path in $CPPFLAGS $CFLAGS - do - case "$cf_header_path" in - (-I*) - cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` - -test "x$cf_header_path" != "xNONE" && \ -test -d "$cf_header_path" && \ - { - test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" - test -d "$cf_header_path/include" && cf_search="$cf_search $cf_header_path/include" - test -d "$cf_header_path/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root" - test -d "$cf_header_path/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include" - test -d "$cf_header_path/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include" - test -d "$cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} - - cf_header_path_list="$cf_header_path_list $cf_search" - ;; - esac - done -fi - -# add the variations for the package we are looking for - -cf_search= - -test "x$prefix" != "xNONE" && \ -test -d "$prefix" && \ - { - test -n "$verbose" && echo " ... testing for include-directories under $prefix" - test -d "$prefix/include" && cf_search="$cf_search $prefix/include" - test -d "$prefix/include/$cf_ncuhdr_root" && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" - test -d "$prefix/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" - test -d "$prefix/$cf_ncuhdr_root/include" && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include" - test -d "$prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} - -for cf_subdir_prefix in \ - /usr \ - /usr/local \ - /usr/pkg \ - /opt \ - /opt/local \ - $HOME -do - -test "x$cf_subdir_prefix" != "x$prefix" && \ -test -d "$cf_subdir_prefix" && \ -{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { - test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" - test -d "$cf_subdir_prefix/include" && cf_search="$cf_search $cf_subdir_prefix/include" - test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root" - test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include" - test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include" - test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} - -done - -test "$includedir" != NONE && \ -test "$includedir" != "/usr/include" && \ -test -d "$includedir" && { - test -d "$includedir" && cf_search="$cf_search $includedir" - test -d "$includedir/$cf_ncuhdr_root" && cf_search="$cf_search $includedir/$cf_ncuhdr_root" -} - -test "$oldincludedir" != NONE && \ -test "$oldincludedir" != "/usr/include" && \ -test -d "$oldincludedir" && { - test -d "$oldincludedir" && cf_search="$cf_search $oldincludedir" - test -d "$oldincludedir/$cf_ncuhdr_root" && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" -} - -cf_search="$cf_search $cf_header_path_list" - - test -n "$verbose" && echo "search path $cf_search" - cf_save2_CPPFLAGS="$CPPFLAGS" - for cf_incdir in $cf_search - do - -if test -n "$cf_incdir" ; then - for cf_add_incdir in $cf_incdir - do - while test "$cf_add_incdir" != /usr/include - do - if test -d "$cf_add_incdir" - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi - - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - - cat >"conftest.$ac_ext" <<_ACEOF -#line 10593 "configure" -#include "confdefs.h" -#include -int -main (void) -{ -printf("Hello") - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10605: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:10608: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10611: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10614: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -cf_have_incdir=yes -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:10631: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done -fi - - for cf_header in \ - ncurses.h \ - curses.h - do - - cat >"conftest.$ac_ext" <<_ACEOF -#line 10654 "configure" -#include "confdefs.h" - -#include <$cf_header> -int -main (void) -{ - -#ifdef NCURSES_VERSION - -printf("%s\\n", NCURSES_VERSION); -#else -#ifdef __NCURSES_H -printf("old\\n"); -#else - #error __NCURSES_H is not defined -#endif -#endif - - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10678: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:10681: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10684: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10687: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_ncurses_h2=$cf_header - -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -cf_cv_ncurses_h2=no -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" - - if test "$cf_cv_ncurses_h2" != no ; then - cf_cv_ncurses_h2=$cf_incdir/$cf_header - test -n "$verbose" && echo $ECHO_N " ... found $ECHO_C" 1>&6 - break - fi - test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&6 - done - CPPFLAGS="$cf_save2_CPPFLAGS" - test "$cf_cv_ncurses_h2" != no && break - done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10708: error: not found" >&5 -echo "$as_me: error: not found" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:10713: 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%/[^/]*$%%'` - cf_cv_ncurses_header="`basename "$cf_cv_ncurses_h2"`" - if test "`basename "$cf_1st_incdir"`" = "$cf_ncuhdr_root" ; then - cf_cv_ncurses_header="$cf_ncuhdr_root/$cf_cv_ncurses_header" - fi - -if test -n "$cf_1st_incdir" ; then - for cf_add_incdir in $cf_1st_incdir - do - while test "$cf_add_incdir" != /usr/include - do - if test -d "$cf_add_incdir" - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi - - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - - cat >"conftest.$ac_ext" <<_ACEOF -#line 10749 "configure" -#include "confdefs.h" -#include -int -main (void) -{ -printf("Hello") - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10761: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:10764: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10767: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10770: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -cf_have_incdir=yes -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:10787: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done -fi - -fi - -# Set definitions to allow ifdef'ing for ncurses.h - -case "$cf_cv_ncurses_header" in -(*ncurses.h) - -cat >>confdefs.h <<\EOF -#define HAVE_NCURSES_H 1 -EOF - - ;; -esac - -case "$cf_cv_ncurses_header" in -(ncurses/curses.h|ncurses/ncurses.h) - -cat >>confdefs.h <<\EOF -#define HAVE_NCURSES_NCURSES_H 1 -EOF - - ;; -(ncursesw/curses.h|ncursesw/ncurses.h) - -cat >>confdefs.h <<\EOF -#define HAVE_NCURSESW_NCURSES_H 1 -EOF - - ;; -esac - -echo "$as_me:10835: 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 -else - -case "${cf_cv_ncurses_header}" in -(*/ncurses.h|*/ncursesw.h) - cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` - ;; -(*) - cf_term_header=term.h - ;; -esac - -for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" -do -cat >"conftest.$ac_ext" <<_ACEOF -#line 10853 "configure" -#include "confdefs.h" -#include -#include <${cf_cv_ncurses_header:-curses.h}> -#include <$cf_test> - -int -main (void) -{ -int x = auto_left_margin; (void)x - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10868: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:10871: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10874: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10877: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - - cf_cv_term_header="$cf_test" -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 - - cf_cv_term_header=unknown - -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" - test "$cf_cv_term_header" != unknown && break -done - -fi -echo "$as_me:10893: result: $cf_cv_term_header" >&5 -echo "${ECHO_T}$cf_cv_term_header" >&6 - -# Set definitions to allow ifdef'ing to accommodate subdirectories - -case "$cf_cv_term_header" in -(*term.h) - -cat >>confdefs.h <<\EOF -#define HAVE_TERM_H 1 -EOF - - ;; -esac - -case "$cf_cv_term_header" in -(ncurses/term.h) - -cat >>confdefs.h <<\EOF -#define HAVE_NCURSES_TERM_H 1 -EOF - - ;; -(ncursesw/term.h) - -cat >>confdefs.h <<\EOF -#define HAVE_NCURSESW_TERM_H 1 -EOF - - ;; -esac - -# some applications need this, but should check for NCURSES_VERSION - -cat >>confdefs.h <<\EOF -#define NCURSES 1 -EOF - -echo "$as_me:10931: 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 -else - - cf_cv_ncurses_version=no - cf_tempfile=out$$ - rm -f "$cf_tempfile" - if test "$cross_compiling" = yes; then - - # This will not work if the preprocessor splits the line after the - # Autoconf token. The 'unproto' program does that. - cat > "conftest.$ac_ext" < -#undef Autoconf -#ifdef NCURSES_VERSION -Autoconf NCURSES_VERSION -#else -#ifdef __NCURSES_H -Autoconf "old" -#endif -; -#endif -EOF - cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:10957: \"$cf_try\"") >&5 - (eval $cf_try) 2>&5 - ac_status=$? - echo "$as_me:10960: \$? = $ac_status" >&5 - (exit "$ac_status"); } - if test -f conftest.out ; then - cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` - test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" - rm -f conftest.out - fi - -else - cat >"conftest.$ac_ext" <<_ACEOF -#line 10970 "configure" -#include "confdefs.h" - -$ac_includes_default - -#include <${cf_cv_ncurses_header:-curses.h}> - -int main(void) -{ - FILE *fp = fopen("$cf_tempfile", "w"); -#ifdef NCURSES_VERSION -# ifdef NCURSES_VERSION_PATCH - fprintf(fp, "%s.%d\\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); -# else - fprintf(fp, "%s\\n", NCURSES_VERSION); -# endif -#else -# ifdef __NCURSES_H - fprintf(fp, "old\\n"); -# else - #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:10997: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:11000: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:11002: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11005: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - - cf_cv_ncurses_version=`cat $cf_tempfile` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -fi -rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" -fi - rm -f "$cf_tempfile" - -fi -echo "$as_me:11019: 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 - -cf_nculib_root=ncurses - # This works, except for the special case where we find gpm, but - # ncurses is in a nonstandard location via $LIBS, and we really want - # to link gpm. -cf_ncurses_LIBS="" -cf_ncurses_SAVE="$LIBS" -echo "$as_me:11032: 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 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgpm $LIBS" -cat >"conftest.$ac_ext" <<_ACEOF -#line 11040 "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 Gpm_Open (void); -int -main (void) -{ -Gpm_Open (); - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11059: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:11062: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11065: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11068: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_lib_gpm_Gpm_Open=yes -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -ac_cv_lib_gpm_Gpm_Open=no -fi -rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:11079: 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:11082: 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 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgpm $LIBS" -cat >"conftest.$ac_ext" <<_ACEOF -#line 11090 "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 initscr (void); -int -main (void) -{ -initscr (); - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11109: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:11112: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11115: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11118: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_lib_gpm_initscr=yes -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -ac_cv_lib_gpm_initscr=no -fi -rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:11129: 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" -else - cf_ncurses_LIBS="-lgpm" -fi - -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 is static). - if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:11144: 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 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmytinfo $LIBS" -cat >"conftest.$ac_ext" <<_ACEOF -#line 11152 "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 tgoto (void); -int -main (void) -{ -tgoto (); - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11171: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:11174: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11177: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11180: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_lib_mytinfo_tgoto=yes -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -ac_cv_lib_mytinfo_tgoto=no -fi -rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:11191: 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" -fi - - fi - ;; -esac - -cf_add_libs="$LIBS" -# reverse order -cf_add_0lib= -for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done -# filter duplicates -for cf_add_1lib in $cf_add_0lib; do - for cf_add_2lib in $cf_add_libs; do - if test "x$cf_add_1lib" = "x$cf_add_2lib"; then - cf_add_1lib= - break - fi - done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" -done -LIBS="$cf_add_libs" - -if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" -then - -cf_add_libs="$LIBS" -# reverse order -cf_add_0lib= -for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done -# filter duplicates -for cf_add_1lib in $cf_add_0lib; do - for cf_add_2lib in $cf_add_libs; do - if test "x$cf_add_1lib" = "x$cf_add_2lib"; then - cf_add_1lib= - break - fi - done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" -done -LIBS="$cf_add_libs" - -else - - eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' - cf_libdir="" - echo "$as_me:11240: 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 11246 "configure" -#include "confdefs.h" -#define initscr autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef initscr - -#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 initscr (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_initscr) || defined (__stub___initscr) -#error found stub for initscr -#endif - - return initscr (); - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11277: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? echo "$as_me:11280: \$? = $ac_status" >&5 (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' + { ac_try='test -s "conftest.$ac_objext"' { (eval echo "$as_me:11283: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:11286: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + cf_cv_term_header=unknown + +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + test "$cf_cv_term_header" != unknown && break +done + +fi +echo "$as_me:11302: result: $cf_cv_term_header" >&5 +echo "${ECHO_T}$cf_cv_term_header" >&6 + +# Set definitions to allow ifdef'ing to accommodate subdirectories + +case "$cf_cv_term_header" in +(*term.h) + +cat >>confdefs.h <<\EOF +#define HAVE_TERM_H 1 +EOF + + ;; +esac + +case "$cf_cv_term_header" in +(ncurses/term.h) + +cat >>confdefs.h <<\EOF +#define HAVE_NCURSES_TERM_H 1 +EOF + + ;; +(ncursesw/term.h) + +cat >>confdefs.h <<\EOF +#define HAVE_NCURSESW_TERM_H 1 +EOF + + ;; +esac + + fi + + else + echo "$as_me:11337: result: no" >&5 +echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +else + NCURSES_CONFIG_PKG=none +fi + +if test "x$cf_have_ncuconfig" = "xno"; then + cf_ncurses_config="${cf_ncuconfig_root}${NCURSES_CONFIG_SUFFIX}-config"; echo "Looking for ${cf_ncurses_config}" + +if test -n "$ac_tool_prefix"; then + for ac_prog in ${cf_ncurses_config} ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + 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:11353: 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 +else + if test -n "$NCURSES_CONFIG"; then + ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" +echo "$as_me:11368: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG +if test -n "$NCURSES_CONFIG"; then + echo "$as_me:11376: result: $NCURSES_CONFIG" >&5 +echo "${ECHO_T}$NCURSES_CONFIG" >&6 +else + echo "$as_me:11379: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$NCURSES_CONFIG" && break + done +fi +if test -z "$NCURSES_CONFIG"; then + ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG + for ac_prog in ${cf_ncurses_config} ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config +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:11392: 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 +else + if test -n "$ac_ct_NCURSES_CONFIG"; then + ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" +echo "$as_me:11407: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG +if test -n "$ac_ct_NCURSES_CONFIG"; then + echo "$as_me:11415: result: $ac_ct_NCURSES_CONFIG" >&5 +echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 +else + echo "$as_me:11418: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$ac_ct_NCURSES_CONFIG" && break +done +test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" + + NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG +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 $cf_add_cflags +do +case "$cf_fix_cppflags" in +(no) + case "$cf_add_cflags" in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case "$cf_add_cflags" in + (-D*) + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test "$cf_fix_cppflags" = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case "$cf_add_cflags" in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + +done + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in `$NCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + + # even with config script, some packages use no-override for curses.h + +echo "$as_me:11575: 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 +else + +cf_cv_ncurses_header=none +for cf_header in \ + ncurses.h $cf_cv_screen/ncurses.h \ + curses.h $cf_cv_screen/curses.h +do +cat >"conftest.$ac_ext" <<_ACEOF +#line 11587 "configure" +#include "confdefs.h" +#include <${cf_header}> +int +main (void) +{ +initscr(); endwin() + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11599: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11602: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11605: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11608: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_header=$cf_header; break +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +done + +fi +echo "$as_me:11619: 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:11623: error: No curses header-files found" >&5 +echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } +fi + +# cheat, to get the right #define's for HAVE_NCURSES_H, etc. + +for ac_header in $cf_cv_ncurses_header +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:11633: 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 11639 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:11643: \"$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:11649: \$? = $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:11668: 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 <>confdefs.h <<\EOF +#define NCURSES 1 +EOF + +cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF +#line 11724 "configure" +#include "confdefs.h" +#include +int +main (void) +{ +printf("Hello") + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11736: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11739: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11742: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11745: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_have_incdir=yes +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi + + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +echo "${as_me:-configure}:11762: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done +fi + +} + +echo "$as_me:11781: 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 +else + + cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" + { test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw; } && cf_header_list="$cf_header_list curses.h ncurses.h" + for cf_header in $cf_header_list + do + + cat >"conftest.$ac_ext" <<_ACEOF +#line 11793 "configure" +#include "confdefs.h" + +#include <$cf_header> +int +main (void) +{ + +#ifdef NCURSES_VERSION + +printf("%s\\n", NCURSES_VERSION); +#else +#ifdef __NCURSES_H +printf("old\\n"); +#else + #error __NCURSES_H is not defined +#endif +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11817: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11820: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11823: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11826: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h=$cf_header + +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_ncurses_h=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + test "$cf_cv_ncurses_h" != no && break + done + +fi +echo "$as_me:11841: 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:11848: 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 +else + + test -n "$verbose" && echo + +cf_search= + +# collect the current set of include-directories from compiler flags +cf_header_path_list="" +if test -n "${CFLAGS}${CPPFLAGS}" ; then + for cf_header_path in $CPPFLAGS $CFLAGS + do + case "$cf_header_path" in + (-I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` + +test "x$cf_header_path" != "xNONE" && \ +test -d "$cf_header_path" && \ + { + test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" + test -d "$cf_header_path/include" && cf_search="$cf_search $cf_header_path/include" + test -d "$cf_header_path/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root" + test -d "$cf_header_path/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include" + test -d "$cf_header_path/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include" + test -d "$cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" +} + + cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +fi + +# add the variations for the package we are looking for + +cf_search= + +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for include-directories under $prefix" + test -d "$prefix/include" && cf_search="$cf_search $prefix/include" + test -d "$prefix/include/$cf_ncuhdr_root" && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" + test -d "$prefix/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" + test -d "$prefix/$cf_ncuhdr_root/include" && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include" + test -d "$prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" +} + +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do + +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { + test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" + test -d "$cf_subdir_prefix/include" && cf_search="$cf_search $cf_subdir_prefix/include" + test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root" + test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include" + test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include" + test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" +} + +done + +test "$includedir" != NONE && \ +test "$includedir" != "/usr/include" && \ +test -d "$includedir" && { + test -d "$includedir" && cf_search="$cf_search $includedir" + test -d "$includedir/$cf_ncuhdr_root" && cf_search="$cf_search $includedir/$cf_ncuhdr_root" +} + +test "$oldincludedir" != NONE && \ +test "$oldincludedir" != "/usr/include" && \ +test -d "$oldincludedir" && { + test -d "$oldincludedir" && cf_search="$cf_search $oldincludedir" + test -d "$oldincludedir/$cf_ncuhdr_root" && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" +} + +cf_search="$cf_search $cf_header_path_list" + + test -n "$verbose" && echo "search path $cf_search" + cf_save2_CPPFLAGS="$CPPFLAGS" + for cf_incdir in $cf_search + do + +if test -n "$cf_incdir" ; then + for cf_add_incdir in $cf_incdir + do + while test "$cf_add_incdir" != /usr/include + do + if test -d "$cf_add_incdir" + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi + + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +#line 11969 "configure" +#include "confdefs.h" +#include +int +main (void) +{ +printf("Hello") + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11981: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11984: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11987: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11990: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_have_incdir=yes +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi + + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +echo "${as_me:-configure}:12007: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done +fi + + for cf_header in \ + ncurses.h \ + curses.h + do + + cat >"conftest.$ac_ext" <<_ACEOF +#line 12030 "configure" +#include "confdefs.h" + +#include <$cf_header> +int +main (void) +{ + +#ifdef NCURSES_VERSION + +printf("%s\\n", NCURSES_VERSION); +#else +#ifdef __NCURSES_H +printf("old\\n"); +#else + #error __NCURSES_H is not defined +#endif +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:12054: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:12057: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:12060: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12063: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_ncurses_h2=$cf_header + +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_ncurses_h2=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + + if test "$cf_cv_ncurses_h2" != no ; then + cf_cv_ncurses_h2=$cf_incdir/$cf_header + test -n "$verbose" && echo $ECHO_N " ... found $ECHO_C" 1>&6 + break + fi + test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&6 + done + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12084: error: not found" >&5 +echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:12089: 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%/[^/]*$%%'` + cf_cv_ncurses_header="`basename "$cf_cv_ncurses_h2"`" + if test "`basename "$cf_1st_incdir"`" = "$cf_ncuhdr_root" ; then + cf_cv_ncurses_header="$cf_ncuhdr_root/$cf_cv_ncurses_header" + fi + +if test -n "$cf_1st_incdir" ; then + for cf_add_incdir in $cf_1st_incdir + do + while test "$cf_add_incdir" != /usr/include + do + if test -d "$cf_add_incdir" + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi + + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +#line 12125 "configure" +#include "confdefs.h" +#include +int +main (void) +{ +printf("Hello") + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:12137: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:12140: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:12143: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12146: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_have_incdir=yes +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi + + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +echo "${as_me:-configure}:12163: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done +fi + +fi + +# Set definitions to allow ifdef'ing for ncurses.h + +case "$cf_cv_ncurses_header" in +(*ncurses.h) + +cat >>confdefs.h <<\EOF +#define HAVE_NCURSES_H 1 +EOF + + ;; +esac + +case "$cf_cv_ncurses_header" in +(ncurses/curses.h|ncurses/ncurses.h) + +cat >>confdefs.h <<\EOF +#define HAVE_NCURSES_NCURSES_H 1 +EOF + + ;; +(ncursesw/curses.h|ncursesw/ncurses.h) + +cat >>confdefs.h <<\EOF +#define HAVE_NCURSESW_NCURSES_H 1 +EOF + + ;; +esac + +echo "$as_me:12211: 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 +else + +case "${cf_cv_ncurses_header}" in +(*/ncurses.h|*/ncursesw.h) + cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` + ;; +(*) + cf_term_header=term.h + ;; +esac + +for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" +do +cat >"conftest.$ac_ext" <<_ACEOF +#line 12229 "configure" +#include "confdefs.h" +#include +#include <${cf_cv_ncurses_header:-curses.h}> +#include <$cf_test> + +int +main (void) +{ +int x = auto_left_margin; (void)x + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:12244: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:12247: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:12250: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12253: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_term_header="$cf_test" +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + cf_cv_term_header=unknown + +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + test "$cf_cv_term_header" != unknown && break +done + +fi +echo "$as_me:12269: result: $cf_cv_term_header" >&5 +echo "${ECHO_T}$cf_cv_term_header" >&6 + +# Set definitions to allow ifdef'ing to accommodate subdirectories + +case "$cf_cv_term_header" in +(*term.h) + +cat >>confdefs.h <<\EOF +#define HAVE_TERM_H 1 +EOF + + ;; +esac + +case "$cf_cv_term_header" in +(ncurses/term.h) + +cat >>confdefs.h <<\EOF +#define HAVE_NCURSES_TERM_H 1 +EOF + + ;; +(ncursesw/term.h) + +cat >>confdefs.h <<\EOF +#define HAVE_NCURSESW_TERM_H 1 +EOF + + ;; +esac + +# some applications need this, but should check for NCURSES_VERSION + +cat >>confdefs.h <<\EOF +#define NCURSES 1 +EOF + +echo "$as_me:12307: 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 +else + + cf_cv_ncurses_version=no + cf_tempfile=out$$ + rm -f "$cf_tempfile" + if test "$cross_compiling" = yes; then + + # This will not work if the preprocessor splits the line after the + # Autoconf token. The 'unproto' program does that. + cat > "conftest.$ac_ext" < +#undef Autoconf +#ifdef NCURSES_VERSION +Autoconf NCURSES_VERSION +#else +#ifdef __NCURSES_H +Autoconf "old" +#endif +; +#endif +EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" + { (eval echo "$as_me:12333: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? + echo "$as_me:12336: \$? = $ac_status" >&5 + (exit "$ac_status"); } + if test -f conftest.out ; then + cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` + test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" + rm -f conftest.out + fi + +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 12346 "configure" +#include "confdefs.h" + +$ac_includes_default + +#include <${cf_cv_ncurses_header:-curses.h}> + +int main(void) +{ + FILE *fp = fopen("$cf_tempfile", "w"); +#ifdef NCURSES_VERSION +# ifdef NCURSES_VERSION_PATCH + fprintf(fp, "%s.%d\\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); +# else + fprintf(fp, "%s\\n", NCURSES_VERSION); +# endif +#else +# ifdef __NCURSES_H + fprintf(fp, "old\\n"); +# else + #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:12373: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12376: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:12378: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12381: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" +fi + rm -f "$cf_tempfile" + +fi +echo "$as_me:12395: 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 + +cf_nculib_root=$cf_cv_screen + # This works, except for the special case where we find gpm, but + # ncurses is in a nonstandard location via $LIBS, and we really want + # to link gpm. +cf_ncurses_LIBS="" +cf_ncurses_SAVE="$LIBS" +echo "$as_me:12408: 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 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgpm $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 12416 "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 Gpm_Open (void); +int +main (void) +{ +Gpm_Open (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12435: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12438: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12441: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12444: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_lib_gpm_Gpm_Open=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:12455: 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:12458: 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 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgpm $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 12466 "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 initscr (void); +int +main (void) +{ +initscr (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12485: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12488: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12491: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12494: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_gpm_initscr=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_lib_gpm_initscr=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:12505: 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" +else + cf_ncurses_LIBS="-lgpm" +fi + +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 is static). + if test "$cf_nculib_root" = ncurses ; then + echo "$as_me:12520: 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 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmytinfo $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 12528 "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 tgoto (void); +int +main (void) +{ +tgoto (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12547: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12550: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12553: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12556: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_mytinfo_tgoto=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_lib_mytinfo_tgoto=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:12567: 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" +fi + + fi + ;; +esac + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + +if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" +then + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + +else + + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' + cf_libdir="" + echo "$as_me:12616: 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 12622 "configure" +#include "confdefs.h" +#define initscr autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef initscr + +#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 initscr (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_initscr) || defined (__stub___initscr) +#error found stub for initscr +#endif + + return initscr (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12653: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12656: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12659: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12662: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -11293,18 +12669,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:11296: result: $ac_cv_func_initscr" >&5 +echo "$as_me:12672: 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:11303: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:12679: 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 11307 "configure" +#line 12683 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11316,25 +12692,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11319: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12695: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11322: \$? = $ac_status" >&5 + echo "$as_me:12698: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11325: \"$ac_try\"") >&5 + { (eval echo "$as_me:12701: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11328: \$? = $ac_status" >&5 + echo "$as_me:12704: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:11330: result: yes" >&5 + echo "$as_me:12706: 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:11337: result: no" >&5 +echo "$as_me:12713: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -11402,11 +12778,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:11405: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:12781: 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 11409 "configure" +#line 12785 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11418,25 +12794,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11421: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12797: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11424: \$? = $ac_status" >&5 + echo "$as_me:12800: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11427: \"$ac_try\"") >&5 + { (eval echo "$as_me:12803: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11430: \$? = $ac_status" >&5 + echo "$as_me:12806: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:11432: result: yes" >&5 + echo "$as_me:12808: 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:11439: result: no" >&5 +echo "$as_me:12815: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -11451,7 +12827,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:11454: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:12830: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -11459,7 +12835,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:11462: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:12838: 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 @@ -11469,7 +12845,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 11472 "configure" +#line 12848 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11481,23 +12857,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11484: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12860: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11487: \$? = $ac_status" >&5 + echo "$as_me:12863: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11490: \"$ac_try\"") >&5 + { (eval echo "$as_me:12866: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11493: \$? = $ac_status" >&5 + echo "$as_me:12869: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:11495: result: yes" >&5 + echo "$as_me:12871: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:11500: result: no" >&5 +echo "$as_me:12876: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -11515,7 +12891,13 @@ else NCURSES_CONFIG=none fi -fi + ;; +(*) + { { echo "$as_me:12896: error: unexpected screen-value: $cf_cv_screen" >&5 +echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;} + { (exit 1); exit 1; }; } + ;; +esac if test "$NCURSES_CONFIG_PKG" != none ; then cf_version=`$PKG_CONFIG --modversion $NCURSES_CONFIG_PKG 2>/dev/null` @@ -11550,10 +12932,10 @@ else AUTOCONF_$cf_name NCURSES_VERSION_$cf_name CF_EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out" - { (eval echo "$as_me:11553: \"$cf_try\"") >&5 + { (eval echo "$as_me:12935: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:11556: \$? = $ac_status" >&5 + echo "$as_me:12938: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ ][ ]*//" conftest.out` @@ -11571,10 +12953,53 @@ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} cf_cv_timestamp=`date` -echo "$as_me:11574: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 +echo "$as_me:12956: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 -echo "$as_me:11577: checking if you want to have a library-prefix" >&5 +echo "$as_me:12959: checking if KEY_RESIZE is supported" >&5 +echo $ECHO_N "checking if KEY_RESIZE is supported... $ECHO_C" >&6 +if test "${cf_cv_curses_resizes+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >"conftest.$ac_ext" <<_ACEOF +#line 12966 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +int key = KEY_RESIZE; (void)key + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:12978: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:12981: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:12984: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12987: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_curses_resizes=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_curses_resizes=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +fi +echo "$as_me:12997: result: $cf_cv_curses_resizes" >&5 +echo "${ECHO_T}$cf_cv_curses_resizes" >&6 +cf_cv_enable_sigwinch=0 +test "$cf_cv_curses_resizes" = yes && cf_cv_enable_sigwinch=1 + +echo "$as_me:13002: checking if you want to have a library-prefix" >&5 echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 # Check whether --with-lib-prefix or --without-lib-prefix was given. @@ -11584,7 +13009,7 @@ if test "${with_lib_prefix+set}" = set; then else with_lib_prefix=auto fi; -echo "$as_me:11587: result: $with_lib_prefix" >&5 +echo "$as_me:13012: result: $with_lib_prefix" >&5 echo "${ECHO_T}$with_lib_prefix" >&6 if test "$with_lib_prefix" = auto @@ -11622,7 +13047,7 @@ if test X"$CC_G_OPT" = X"" ; then test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT='' fi -echo "$as_me:11625: checking for default loader flags" >&5 +echo "$as_me:13050: checking for default loader flags" >&5 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 case $DFT_LWR_MODEL in (normal) LD_MODEL='' ;; @@ -11630,13 +13055,13 @@ case $DFT_LWR_MODEL in (profile) LD_MODEL='-pg';; (shared) LD_MODEL='' ;; esac -echo "$as_me:11633: result: $LD_MODEL" >&5 +echo "$as_me:13058: result: $LD_MODEL" >&5 echo "${ECHO_T}$LD_MODEL" >&6 LD_RPATH_OPT= if test "x$cf_cv_enable_rpath" != xno then - echo "$as_me:11639: checking for an rpath option" >&5 + echo "$as_me:13064: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case "$cf_cv_system_name" in (irix*) @@ -11667,12 +13092,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 (*) ;; esac - echo "$as_me:11670: result: $LD_RPATH_OPT" >&5 + echo "$as_me:13095: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:11675: checking if we need a space after rpath option" >&5 + echo "$as_me:13100: 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" @@ -11693,7 +13118,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 11696 "configure" +#line 13121 "configure" #include "confdefs.h" int @@ -11705,16 +13130,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11708: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13133: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11711: \$? = $ac_status" >&5 + echo "$as_me:13136: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11714: \"$ac_try\"") >&5 + { (eval echo "$as_me:13139: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11717: \$? = $ac_status" >&5 + echo "$as_me:13142: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_space=no else @@ -11724,7 +13149,7 @@ cf_rpath_space=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:11727: result: $cf_rpath_space" >&5 + echo "$as_me:13152: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; @@ -11746,7 +13171,7 @@ fi cf_ld_rpath_opt= test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - echo "$as_me:11749: checking whether to use release or ABI version in shared library file names" >&5 + echo "$as_me:13174: checking whether to use release or ABI version in shared library file names" >&5 echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6 # Check whether --with-shlib-version or --without-shlib-version was given. @@ -11761,9 +13186,9 @@ if test "${with_shlib_version+set}" = set; then cf_cv_shlib_version=$withval ;; (*) - echo "$as_me:11764: result: $withval" >&5 + echo "$as_me:13189: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 - { { echo "$as_me:11766: error: option value must be one of: rel, abi, or auto" >&5 + { { echo "$as_me:13191: error: option value must be one of: rel, abi, or auto" >&5 echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} { (exit 1); exit 1; }; } ;; @@ -11772,7 +13197,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} else cf_cv_shlib_version=auto fi; - echo "$as_me:11775: result: $cf_cv_shlib_version" >&5 + echo "$as_me:13200: result: $cf_cv_shlib_version" >&5 echo "${ECHO_T}$cf_cv_shlib_version" >&6 cf_cv_rm_so_locs=no @@ -11795,14 +13220,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6 if test "$cf_try_fPIC" = yes then - echo "$as_me:11798: checking which $CC option to use" >&5 + echo "$as_me:13223: checking which $CC option to use" >&5 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" for CC_SHARED_OPTS in -fPIC -fpic '' do CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11805 "configure" +#line 13230 "configure" #include "confdefs.h" #include int @@ -11814,16 +13239,16 @@ int x = 1; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11817: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13242: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11820: \$? = $ac_status" >&5 + echo "$as_me:13245: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11823: \"$ac_try\"") >&5 + { (eval echo "$as_me:13248: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11826: \$? = $ac_status" >&5 + echo "$as_me:13251: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -11832,7 +13257,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" done - echo "$as_me:11835: result: $CC_SHARED_OPTS" >&5 + echo "$as_me:13260: result: $CC_SHARED_OPTS" >&5 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 CFLAGS="$cf_save_CFLAGS" fi @@ -11903,7 +13328,7 @@ CF_EOF MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi cf_cv_shlib_version_infix=yes - echo "$as_me:11906: checking if ld -search_paths_first works" >&5 + echo "$as_me:13331: checking if ld -search_paths_first works" >&5 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11912,7 +13337,7 @@ else cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" cat >"conftest.$ac_ext" <<_ACEOF -#line 11915 "configure" +#line 13340 "configure" #include "confdefs.h" int @@ -11924,16 +13349,16 @@ int i; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11927: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13352: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11930: \$? = $ac_status" >&5 + echo "$as_me:13355: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11933: \"$ac_try\"") >&5 + { (eval echo "$as_me:13358: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11936: \$? = $ac_status" >&5 + echo "$as_me:13361: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ldflags_search_paths_first=yes else @@ -11944,7 +13369,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LDFLAGS=$cf_save_LDFLAGS fi -echo "$as_me:11947: result: $cf_cv_ldflags_search_paths_first" >&5 +echo "$as_me:13372: result: $cf_cv_ldflags_search_paths_first" >&5 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 if test "$cf_cv_ldflags_search_paths_first" = yes; then LDFLAGS="$LDFLAGS -Wl,-search_paths_first" @@ -12088,7 +13513,7 @@ CF_EOF -L*) ldopts+=("\`echo \"\$1\" | sed \"s/^-L/-LIBPATH:/\"\`") ;; - *.obj | *.o) + *.obj | *.$OBJEXT) ldopts+=("\$1") ;; -Wl,*) @@ -12294,7 +13719,7 @@ CF_EOF do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" cat >"conftest.$ac_ext" <<_ACEOF -#line 12297 "configure" +#line 13722 "configure" #include "confdefs.h" #include int @@ -12306,16 +13731,16 @@ printf("Hello\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12309: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13734: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12312: \$? = $ac_status" >&5 + echo "$as_me:13737: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12315: \"$ac_try\"") >&5 + { (eval echo "$as_me:13740: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12318: \$? = $ac_status" >&5 + echo "$as_me:13743: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -12352,7 +13777,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes ;; (*) - { echo "$as_me:12355: WARNING: ignored --with-shlib-version" >&5 + { echo "$as_me:13780: WARNING: ignored --with-shlib-version" >&5 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} ;; esac @@ -12362,30 +13787,30 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} if test -n "$cf_try_cflags" then cat > conftest.$ac_ext < int main(int argc, char *argv[]) { printf("hello\\n"); - return (argv[argc-1] == 0) ; + return (argv[argc-1] == NULL) ; } EOF cf_save_CFLAGS="$CFLAGS" for cf_opt in $cf_try_cflags do CFLAGS="$cf_save_CFLAGS -$cf_opt" - echo "$as_me:12377: checking if CFLAGS option -$cf_opt works" >&5 + echo "$as_me:13802: checking if CFLAGS option -$cf_opt works" >&5 echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6 - if { (eval echo "$as_me:12379: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13804: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12382: \$? = $ac_status" >&5 + echo "$as_me:13807: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - echo "$as_me:12384: result: yes" >&5 + echo "$as_me:13809: result: yes" >&5 echo "${ECHO_T}yes" >&6 cf_save_CFLAGS="$CFLAGS" else - echo "$as_me:12388: result: no" >&5 + echo "$as_me:13813: result: no" >&5 echo "${ECHO_T}no" >&6 fi done @@ -12400,17 +13825,17 @@ echo "${ECHO_T}no" >&6 test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 -echo "${as_me:-configure}:12403: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 +echo "${as_me:-configure}:13828: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 -echo "${as_me:-configure}:12407: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:13832: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 # The test/sample programs in the original tree link using rpath option. # Make it optional for packagers. if test -n "$LOCAL_LDFLAGS" then - echo "$as_me:12413: checking if you want to link sample programs with rpath option" >&5 + echo "$as_me:13838: checking if you want to link sample programs with rpath option" >&5 echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6 # Check whether --enable-rpath-link or --disable-rpath-link was given. @@ -12420,7 +13845,7 @@ if test "${enable_rpath_link+set}" = set; then else with_rpath_link=yes fi; - echo "$as_me:12423: result: $with_rpath_link" >&5 + echo "$as_me:13848: result: $with_rpath_link" >&5 echo "${ECHO_T}$with_rpath_link" >&6 if test "$with_rpath_link" = no then @@ -12433,7 +13858,7 @@ fi ### use option --enable-broken-linker to force on use of broken-linker support -echo "$as_me:12436: checking if you want broken-linker support code" >&5 +echo "$as_me:13861: checking if you want broken-linker support code" >&5 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 # Check whether --enable-broken_linker or --disable-broken_linker was given. @@ -12443,7 +13868,7 @@ if test "${enable_broken_linker+set}" = set; then else with_broken_linker=no fi; -echo "$as_me:12446: result: $with_broken_linker" >&5 +echo "$as_me:13871: result: $with_broken_linker" >&5 echo "${ECHO_T}$with_broken_linker" >&6 : "${BROKEN_LINKER:=0}" @@ -12458,14 +13883,14 @@ fi # Check to define _XOPEN_SOURCE "automatically" -echo "$as_me:12461: checking if the POSIX test-macros are already defined" >&5 +echo "$as_me:13886: 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 12468 "configure" +#line 13893 "configure" #include "confdefs.h" #include int @@ -12484,16 +13909,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12487: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13912: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12490: \$? = $ac_status" >&5 + echo "$as_me:13915: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12493: \"$ac_try\"") >&5 + { (eval echo "$as_me:13918: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12496: \$? = $ac_status" >&5 + echo "$as_me:13921: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_visible=no else @@ -12504,7 +13929,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12507: result: $cf_cv_posix_visible" >&5 +echo "$as_me:13932: result: $cf_cv_posix_visible" >&5 echo "${ECHO_T}$cf_cv_posix_visible" >&6 if test "$cf_cv_posix_visible" = no; then @@ -12542,18 +13967,18 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) +(linux*gnu*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) cf_gnu_xopen_source=$cf_XOPEN_SOURCE -echo "$as_me:12549: checking if this is the GNU C library" >&5 +echo "$as_me:13974: 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 12556 "configure" +#line 13981 "configure" #include "confdefs.h" #include int @@ -12572,16 +13997,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12575: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14000: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12578: \$? = $ac_status" >&5 + echo "$as_me:14003: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12581: \"$ac_try\"") >&5 + { (eval echo "$as_me:14006: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12584: \$? = $ac_status" >&5 + echo "$as_me:14009: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library=yes else @@ -12592,7 +14017,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12595: result: $cf_cv_gnu_library" >&5 +echo "$as_me:14020: result: $cf_cv_gnu_library" >&5 echo "${ECHO_T}$cf_cv_gnu_library" >&6 if test x$cf_cv_gnu_library = xyes; then @@ -12600,7 +14025,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:12603: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo "$as_me:14028: 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 @@ -12612,7 +14037,7 @@ else CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 12615 "configure" +#line 14040 "configure" #include "confdefs.h" #include int @@ -12631,16 +14056,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12634: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14059: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12637: \$? = $ac_status" >&5 + echo "$as_me:14062: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12640: \"$ac_try\"") >&5 + { (eval echo "$as_me:14065: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12643: \$? = $ac_status" >&5 + echo "$as_me:14068: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library_219=yes else @@ -12652,12 +14077,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save" fi -echo "$as_me:12655: result: $cf_cv_gnu_library_219" >&5 +echo "$as_me:14080: 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:12660: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo "$as_me:14085: 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 @@ -12762,7 +14187,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 12765 "configure" +#line 14190 "configure" #include "confdefs.h" #include @@ -12782,16 +14207,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12785: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14210: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12788: \$? = $ac_status" >&5 + echo "$as_me:14213: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12791: \"$ac_try\"") >&5 + { (eval echo "$as_me:14216: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12794: \$? = $ac_status" >&5 + echo "$as_me:14219: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_dftsrc_219=yes else @@ -12802,7 +14227,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12805: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "$as_me:14230: 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 @@ -12811,14 +14236,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 if test "x$cf_cv_gnu_dftsrc_219" != xyes; then - echo "$as_me:12814: checking if we must define _GNU_SOURCE" >&5 + echo "$as_me:14239: 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 12821 "configure" +#line 14246 "configure" #include "confdefs.h" #include int @@ -12833,16 +14258,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12836: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14261: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12839: \$? = $ac_status" >&5 + echo "$as_me:14264: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12842: \"$ac_try\"") >&5 + { (eval echo "$as_me:14267: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12845: \$? = $ac_status" >&5 + echo "$as_me:14270: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -12949,7 +14374,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 12952 "configure" +#line 14377 "configure" #include "confdefs.h" #include int @@ -12964,16 +14389,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12967: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14392: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12970: \$? = $ac_status" >&5 + echo "$as_me:14395: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12973: \"$ac_try\"") >&5 + { (eval echo "$as_me:14398: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12976: \$? = $ac_status" >&5 + echo "$as_me:14401: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -12988,12 +14413,12 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12991: result: $cf_cv_gnu_source" >&5 +echo "$as_me:14416: 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:12996: checking if we should also define _DEFAULT_SOURCE" >&5 + echo "$as_me:14421: 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 @@ -13003,7 +14428,7 @@ else CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 13006 "configure" +#line 14431 "configure" #include "confdefs.h" #include int @@ -13018,16 +14443,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13021: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14446: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13024: \$? = $ac_status" >&5 + echo "$as_me:14449: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13027: \"$ac_try\"") >&5 + { (eval echo "$as_me:14452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13030: \$? = $ac_status" >&5 + echo "$as_me:14455: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_default_source=no else @@ -13038,7 +14463,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13041: result: $cf_cv_default_source" >&5 +echo "$as_me:14466: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 if test "$cf_cv_default_source" = yes then @@ -13052,6 +14477,9 @@ echo "${ECHO_T}$cf_cv_default_source" >&6 fi + ;; +linux*musl) + cf_xopen_source="-D_BSD_SOURCE" ;; (minix*) cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this... @@ -13075,16 +14503,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:13078: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:14506: 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}:13084: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:14512: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13087 "configure" +#line 14515 "configure" #include "confdefs.h" #include int @@ -13099,16 +14527,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13102: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14530: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13105: \$? = $ac_status" >&5 + echo "$as_me:14533: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13108: \"$ac_try\"") >&5 + { (eval echo "$as_me:14536: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13111: \$? = $ac_status" >&5 + echo "$as_me:14539: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -13129,7 +14557,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 13132 "configure" +#line 14560 "configure" #include "confdefs.h" #include int @@ -13144,16 +14572,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13147: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14575: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13150: \$? = $ac_status" >&5 + echo "$as_me:14578: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13153: \"$ac_try\"") >&5 + { (eval echo "$as_me:14581: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13156: \$? = $ac_status" >&5 + echo "$as_me:14584: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13164,7 +14592,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:13167: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:14595: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -13172,10 +14600,10 @@ echo "${as_me:-configure}:13167: testing ifdef from value $cf_POSIX_C_SOURCE ... test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:13175: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:14603: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13178 "configure" +#line 14606 "configure" #include "confdefs.h" #include int @@ -13190,16 +14618,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13193: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14621: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13196: \$? = $ac_status" >&5 + echo "$as_me:14624: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13199: \"$ac_try\"") >&5 + { (eval echo "$as_me:14627: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13202: \$? = $ac_status" >&5 + echo "$as_me:14630: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13215,7 +14643,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13218: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:14646: 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 @@ -13332,7 +14760,7 @@ fi # cf_cv_posix_visible # 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:13335: WARNING: this system does not provide usable locale support" >&5 + { echo "$as_me:14763: 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 @@ -13364,14 +14792,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} ;; (*) -echo "$as_me:13367: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:14795: 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 13374 "configure" +#line 14802 "configure" #include "confdefs.h" $ac_includes_default @@ -13389,16 +14817,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13392: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14820: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13395: \$? = $ac_status" >&5 + echo "$as_me:14823: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13398: \"$ac_try\"") >&5 + { (eval echo "$as_me:14826: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13401: \$? = $ac_status" >&5 + echo "$as_me:14829: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -13410,7 +14838,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 13413 "configure" +#line 14841 "configure" #include "confdefs.h" $ac_includes_default @@ -13428,16 +14856,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13431: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14859: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13434: \$? = $ac_status" >&5 + echo "$as_me:14862: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13437: \"$ac_try\"") >&5 + { (eval echo "$as_me:14865: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13440: \$? = $ac_status" >&5 + echo "$as_me:14868: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -13452,7 +14880,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13455: result: $cf_cv_xopen_source" >&5 +echo "$as_me:14883: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -13612,16 +15040,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:13615: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:15043: 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}:13621: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:15049: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13624 "configure" +#line 15052 "configure" #include "confdefs.h" #include int @@ -13636,16 +15064,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13639: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15067: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13642: \$? = $ac_status" >&5 + echo "$as_me:15070: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13645: \"$ac_try\"") >&5 + { (eval echo "$as_me:15073: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13648: \$? = $ac_status" >&5 + echo "$as_me:15076: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -13666,7 +15094,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 13669 "configure" +#line 15097 "configure" #include "confdefs.h" #include int @@ -13681,16 +15109,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13684: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15112: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13687: \$? = $ac_status" >&5 + echo "$as_me:15115: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13690: \"$ac_try\"") >&5 + { (eval echo "$as_me:15118: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13693: \$? = $ac_status" >&5 + echo "$as_me:15121: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13701,7 +15129,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:13704: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:15132: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -13709,10 +15137,10 @@ echo "${as_me:-configure}:13704: testing ifdef from value $cf_POSIX_C_SOURCE ... test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:13712: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:15140: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13715 "configure" +#line 15143 "configure" #include "confdefs.h" #include int @@ -13727,16 +15155,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13730: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15158: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13733: \$? = $ac_status" >&5 + echo "$as_me:15161: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13736: \"$ac_try\"") >&5 + { (eval echo "$as_me:15164: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13739: \$? = $ac_status" >&5 + echo "$as_me:15167: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13752,7 +15180,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13755: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:15183: 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 @@ -13865,10 +15293,10 @@ fi # cf_cv_posix_visible 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}:13868: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5 +echo "${as_me:-configure}:15296: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13871 "configure" +#line 15299 "configure" #include "confdefs.h" $ac_includes_default @@ -13886,23 +15314,23 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13889: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15317: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13892: \$? = $ac_status" >&5 + echo "$as_me:15320: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13895: \"$ac_try\"") >&5 + { (eval echo "$as_me:15323: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13898: \$? = $ac_status" >&5 + echo "$as_me:15326: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 - { echo "$as_me:13905: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 + { echo "$as_me:15333: 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 @@ -13925,7 +15353,7 @@ do test "$CFLAGS" != "$cf_old_cflag" || break test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6 -echo "${as_me:-configure}:13928: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15356: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 CFLAGS="$cf_old_cflag" done @@ -13937,7 +15365,7 @@ do test "$CPPFLAGS" != "$cf_old_cflag" || break test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6 -echo "${as_me:-configure}:13940: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:15368: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_old_cflag" done @@ -14025,7 +15453,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}:14028: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:15456: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -14035,7 +15463,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}:14038: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:15466: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -14045,7 +15473,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}:14048: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:15476: 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" @@ -14057,10 +15485,10 @@ done fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:14060: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:15488: 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 14063 "configure" +#line 15491 "configure" #include "confdefs.h" #include int @@ -14075,16 +15503,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14078: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15506: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14081: \$? = $ac_status" >&5 + echo "$as_me:15509: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14084: \"$ac_try\"") >&5 + { (eval echo "$as_me:15512: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14087: \$? = $ac_status" >&5 + echo "$as_me:15515: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -14093,12 +15521,12 @@ cat "conftest.$ac_ext" >&5 cf_XOPEN_SOURCE_set=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:14096: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:15524: 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 14101 "configure" +#line 15529 "configure" #include "confdefs.h" #include int @@ -14113,16 +15541,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14116: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15544: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14119: \$? = $ac_status" >&5 + echo "$as_me:15547: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14122: \"$ac_try\"") >&5 + { (eval echo "$as_me:15550: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14125: \$? = $ac_status" >&5 + echo "$as_me:15553: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -14133,19 +15561,19 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_XOPEN_SOURCE_set_ok" = no then - { echo "$as_me:14136: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:15564: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:14141: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:15569: 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 14148 "configure" +#line 15576 "configure" #include "confdefs.h" $ac_includes_default @@ -14163,16 +15591,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14166: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15594: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14169: \$? = $ac_status" >&5 + echo "$as_me:15597: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14172: \"$ac_try\"") >&5 + { (eval echo "$as_me:15600: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14175: \$? = $ac_status" >&5 + echo "$as_me:15603: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -14184,7 +15612,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 14187 "configure" +#line 15615 "configure" #include "confdefs.h" $ac_includes_default @@ -14202,16 +15630,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14205: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15633: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14208: \$? = $ac_status" >&5 + echo "$as_me:15636: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14211: \"$ac_try\"") >&5 + { (eval echo "$as_me:15639: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14214: \$? = $ac_status" >&5 + echo "$as_me:15642: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -14226,7 +15654,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14229: result: $cf_cv_xopen_source" >&5 +echo "$as_me:15657: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -14373,13 +15801,13 @@ fi fi fi # cf_cv_posix_visible -echo "$as_me:14376: checking for ANSI C header files" >&5 +echo "$as_me:15804: 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 14382 "configure" +#line 15810 "configure" #include "confdefs.h" #include #include @@ -14387,13 +15815,13 @@ else #include _ACEOF -if { (eval echo "$as_me:14390: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:15818: \"$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:14396: \$? = $ac_status" >&5 + echo "$as_me:15824: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14415,7 +15843,7 @@ 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 14418 "configure" +#line 15846 "configure" #include "confdefs.h" #include @@ -14433,7 +15861,7 @@ 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 14436 "configure" +#line 15864 "configure" #include "confdefs.h" #include @@ -14454,7 +15882,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >"conftest.$ac_ext" <<_ACEOF -#line 14457 "configure" +#line 15885 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -14480,15 +15908,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:14483: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15911: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14486: \$? = $ac_status" >&5 + echo "$as_me:15914: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:14488: \"$ac_try\"") >&5 + { (eval echo "$as_me:15916: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14491: \$? = $ac_status" >&5 + echo "$as_me:15919: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -14501,7 +15929,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi fi -echo "$as_me:14504: result: $ac_cv_header_stdc" >&5 +echo "$as_me:15932: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -14517,28 +15945,28 @@ 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:14520: checking for $ac_header" >&5 +echo "$as_me:15948: 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 14526 "configure" +#line 15954 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14532: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15960: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14535: \$? = $ac_status" >&5 + echo "$as_me:15963: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14538: \"$ac_try\"") >&5 + { (eval echo "$as_me:15966: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14541: \$? = $ac_status" >&5 + echo "$as_me:15969: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -14548,7 +15976,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14551: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:15979: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:15989: 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 14567 "configure" +#line 15995 "configure" #include "confdefs.h" $ac_includes_default int @@ -14579,16 +16007,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14582: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16010: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14585: \$? = $ac_status" >&5 + echo "$as_me:16013: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14588: \"$ac_try\"") >&5 + { (eval echo "$as_me:16016: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14591: \$? = $ac_status" >&5 + echo "$as_me:16019: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_have_decl_exit=yes else @@ -14598,7 +16026,7 @@ ac_cv_have_decl_exit=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14601: result: $ac_cv_have_decl_exit" >&5 +echo "$as_me:16029: result: $ac_cv_have_decl_exit" >&5 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6 # Check whether --enable-largefile or --disable-largefile was given. @@ -14608,7 +16036,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:14611: checking for special C compiler options needed for large files" >&5 + echo "$as_me:16039: checking for special C compiler options needed for large files" >&5 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14620,7 +16048,7 @@ else # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. cat >"conftest.$ac_ext" <<_ACEOF -#line 14623 "configure" +#line 16051 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -14640,16 +16068,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14643: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16071: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14646: \$? = $ac_status" >&5 + echo "$as_me:16074: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14649: \"$ac_try\"") >&5 + { (eval echo "$as_me:16077: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14652: \$? = $ac_status" >&5 + echo "$as_me:16080: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14659,16 +16087,16 @@ fi rm -f "conftest.$ac_objext" CC="$CC -n32" rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14662: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16090: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14665: \$? = $ac_status" >&5 + echo "$as_me:16093: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14668: \"$ac_try\"") >&5 + { (eval echo "$as_me:16096: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14671: \$? = $ac_status" >&5 + echo "$as_me:16099: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -14682,13 +16110,13 @@ rm -f "conftest.$ac_objext" rm -f "conftest.$ac_ext" fi fi -echo "$as_me:14685: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:16113: result: $ac_cv_sys_largefile_CC" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:14691: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:16119: checking for _FILE_OFFSET_BITS value needed for large files" >&5 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14696,7 +16124,7 @@ else while :; do ac_cv_sys_file_offset_bits=no cat >"conftest.$ac_ext" <<_ACEOF -#line 14699 "configure" +#line 16127 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -14716,16 +16144,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14719: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16147: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14722: \$? = $ac_status" >&5 + echo "$as_me:16150: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14725: \"$ac_try\"") >&5 + { (eval echo "$as_me:16153: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14728: \$? = $ac_status" >&5 + echo "$as_me:16156: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14734,7 +16162,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 14737 "configure" +#line 16165 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -14755,16 +16183,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14758: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16186: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14761: \$? = $ac_status" >&5 + echo "$as_me:16189: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14764: \"$ac_try\"") >&5 + { (eval echo "$as_me:16192: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14767: \$? = $ac_status" >&5 + echo "$as_me:16195: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -14775,7 +16203,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14778: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:16206: result: $ac_cv_sys_file_offset_bits" >&5 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 if test "$ac_cv_sys_file_offset_bits" != no; then @@ -14785,7 +16213,7 @@ EOF fi rm -rf conftest* - echo "$as_me:14788: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:16216: checking for _LARGE_FILES value needed for large files" >&5 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14793,7 +16221,7 @@ else while :; do ac_cv_sys_large_files=no cat >"conftest.$ac_ext" <<_ACEOF -#line 14796 "configure" +#line 16224 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -14813,16 +16241,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14816: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16244: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14819: \$? = $ac_status" >&5 + echo "$as_me:16247: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14822: \"$ac_try\"") >&5 + { (eval echo "$as_me:16250: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14825: \$? = $ac_status" >&5 + echo "$as_me:16253: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14831,7 +16259,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 14834 "configure" +#line 16262 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -14852,16 +16280,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14855: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16283: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14858: \$? = $ac_status" >&5 + echo "$as_me:16286: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14861: \"$ac_try\"") >&5 + { (eval echo "$as_me:16289: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14864: \$? = $ac_status" >&5 + echo "$as_me:16292: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_large_files=1; break else @@ -14872,7 +16300,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14875: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:16303: result: $ac_cv_sys_large_files" >&5 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 if test "$ac_cv_sys_large_files" != no; then @@ -14885,7 +16313,7 @@ rm -rf conftest* fi if test "$enable_largefile" != no ; then - echo "$as_me:14888: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:16316: checking for _LARGEFILE_SOURCE value needed for large files" >&5 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14893,7 +16321,7 @@ else while :; do ac_cv_sys_largefile_source=no cat >"conftest.$ac_ext" <<_ACEOF -#line 14896 "configure" +#line 16324 "configure" #include "confdefs.h" #include #include @@ -14908,16 +16336,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14911: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16339: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14914: \$? = $ac_status" >&5 + echo "$as_me:16342: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14917: \"$ac_try\"") >&5 + { (eval echo "$as_me:16345: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14920: \$? = $ac_status" >&5 + echo "$as_me:16348: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14926,7 +16354,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 14929 "configure" +#line 16357 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include @@ -14942,16 +16370,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14945: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16373: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14948: \$? = $ac_status" >&5 + echo "$as_me:16376: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14951: \"$ac_try\"") >&5 + { (eval echo "$as_me:16379: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14954: \$? = $ac_status" >&5 + echo "$as_me:16382: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_largefile_source=1; break else @@ -14962,7 +16390,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14965: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:16393: result: $ac_cv_sys_largefile_source" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 if test "$ac_cv_sys_largefile_source" != no; then @@ -14976,13 +16404,13 @@ rm -rf conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -echo "$as_me:14979: checking for fseeko" >&5 +echo "$as_me:16407: checking for fseeko" >&5 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 if test "${ac_cv_func_fseeko+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14985 "configure" +#line 16413 "configure" #include "confdefs.h" #include #include @@ -14996,16 +16424,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14999: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16427: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15002: \$? = $ac_status" >&5 + echo "$as_me:16430: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15005: \"$ac_try\"") >&5 + { (eval echo "$as_me:16433: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15008: \$? = $ac_status" >&5 + echo "$as_me:16436: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_fseeko=yes else @@ -15015,7 +16443,7 @@ ac_cv_func_fseeko=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15018: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:16446: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -15054,14 +16482,14 @@ fi fi - echo "$as_me:15057: checking whether to use struct dirent64" >&5 + echo "$as_me:16485: checking whether to use struct dirent64" >&5 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 if test "${cf_cv_struct_dirent64+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15064 "configure" +#line 16492 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types" @@ -15088,16 +16516,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15091: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16519: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15094: \$? = $ac_status" >&5 + echo "$as_me:16522: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15097: \"$ac_try\"") >&5 + { (eval echo "$as_me:16525: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15100: \$? = $ac_status" >&5 + echo "$as_me:16528: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_struct_dirent64=yes else @@ -15108,7 +16536,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15111: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:16539: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF @@ -15118,7 +16546,7 @@ EOF fi ### Enable compiling-in rcs id's -echo "$as_me:15121: checking if RCS identifiers should be compiled-in" >&5 +echo "$as_me:16549: checking if RCS identifiers should be compiled-in" >&5 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 # Check whether --with-rcs-ids or --without-rcs-ids was given. @@ -15128,7 +16556,7 @@ if test "${with_rcs_ids+set}" = set; then else with_rcs_ids=no fi; -echo "$as_me:15131: result: $with_rcs_ids" >&5 +echo "$as_me:16559: result: $with_rcs_ids" >&5 echo "${ECHO_T}$with_rcs_ids" >&6 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF @@ -15138,7 +16566,7 @@ EOF ############################################################################### ### Note that some functions (such as const) are normally disabled anyway. -echo "$as_me:15141: checking if you want to build with function extensions" >&5 +echo "$as_me:16569: checking if you want to build with function extensions" >&5 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 # Check whether --enable-ext-funcs or --disable-ext-funcs was given. @@ -15148,7 +16576,7 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:15151: result: $with_ext_funcs" >&5 +echo "$as_me:16579: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 if test "$with_ext_funcs" = yes ; then NCURSES_EXT_FUNCS=1 @@ -15166,7 +16594,7 @@ else fi ### use option --enable-const to turn on use of const beyond that in XSI. -echo "$as_me:15169: checking for extended use of const keyword" >&5 +echo "$as_me:16597: checking for extended use of const keyword" >&5 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 # Check whether --enable-const or --disable-const was given. @@ -15176,7 +16604,7 @@ if test "${enable_const+set}" = set; then else with_ext_const=no fi; -echo "$as_me:15179: result: $with_ext_const" >&5 +echo "$as_me:16607: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' if test "$with_ext_const" = yes ; then @@ -15186,7 +16614,7 @@ fi ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:15189: checking if you want all development code" >&5 +echo "$as_me:16617: checking if you want all development code" >&5 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 # Check whether --with-develop or --without-develop was given. @@ -15196,7 +16624,7 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:15199: result: $with_develop" >&5 +echo "$as_me:16627: result: $with_develop" >&5 echo "${ECHO_T}$with_develop" >&6 ############################################################################### @@ -15205,7 +16633,7 @@ echo "${ECHO_T}$with_develop" >&6 # This is still experimental (20080329), but should ultimately be moved to # the script-block --with-normal, etc. -echo "$as_me:15208: checking if you want to link with the pthread library" >&5 +echo "$as_me:16636: checking if you want to link with the pthread library" >&5 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 # Check whether --with-pthread or --without-pthread was given. @@ -15215,27 +16643,27 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:15218: result: $with_pthread" >&5 +echo "$as_me:16646: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:15222: checking for pthread.h" >&5 + echo "$as_me:16650: checking for pthread.h" >&5 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 if test "${ac_cv_header_pthread_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15228 "configure" +#line 16656 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:15232: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:16660: \"$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:15238: \$? = $ac_status" >&5 + echo "$as_me:16666: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15254,7 +16682,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:15257: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:16685: result: $ac_cv_header_pthread_h" >&5 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 if test "$ac_cv_header_pthread_h" = yes; then @@ -15264,7 +16692,7 @@ EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:15267: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:16695: checking if we can link with the $cf_lib_pthread library" >&5 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -15285,7 +16713,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 15288 "configure" +#line 16716 "configure" #include "confdefs.h" #include @@ -15302,16 +16730,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15305: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16733: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15308: \$? = $ac_status" >&5 + echo "$as_me:16736: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15311: \"$ac_try\"") >&5 + { (eval echo "$as_me:16739: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15314: \$? = $ac_status" >&5 + echo "$as_me:16742: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then with_pthread=yes else @@ -15321,7 +16749,7 @@ with_pthread=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:15324: result: $with_pthread" >&5 + echo "$as_me:16752: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done @@ -15349,7 +16777,7 @@ cat >>confdefs.h <<\EOF EOF else - { { echo "$as_me:15352: error: Cannot link with pthread library" >&5 + { { echo "$as_me:16780: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -15358,7 +16786,7 @@ fi fi -echo "$as_me:15361: checking if you want to use weak-symbols for pthreads" >&5 +echo "$as_me:16789: checking if you want to use weak-symbols for pthreads" >&5 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. @@ -15368,18 +16796,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; -echo "$as_me:15371: result: $use_weak_symbols" >&5 +echo "$as_me:16799: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "$use_weak_symbols" = yes ; then -echo "$as_me:15375: checking if $CC supports weak symbols" >&5 +echo "$as_me:16803: checking if $CC supports weak symbols" >&5 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 if test "${cf_cv_weak_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15382 "configure" +#line 16810 "configure" #include "confdefs.h" #include @@ -15405,16 +16833,16 @@ weak_symbol(fopen); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15408: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16836: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15411: \$? = $ac_status" >&5 + echo "$as_me:16839: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15414: \"$ac_try\"") >&5 + { (eval echo "$as_me:16842: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15417: \$? = $ac_status" >&5 + echo "$as_me:16845: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_weak_symbols=yes else @@ -15425,7 +16853,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15428: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:16856: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -15454,13 +16882,13 @@ EOF fi # OpenSUSE is installing ncurses6, using reentrant option. -echo "$as_me:15457: checking for _nc_TABSIZE" >&5 +echo "$as_me:16885: checking for _nc_TABSIZE" >&5 echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6 if test "${ac_cv_func__nc_TABSIZE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15463 "configure" +#line 16891 "configure" #include "confdefs.h" #define _nc_TABSIZE autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15491,16 +16919,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15494: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16922: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15497: \$? = $ac_status" >&5 + echo "$as_me:16925: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15500: \"$ac_try\"") >&5 + { (eval echo "$as_me:16928: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15503: \$? = $ac_status" >&5 + echo "$as_me:16931: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func__nc_TABSIZE=yes else @@ -15510,7 +16938,7 @@ ac_cv_func__nc_TABSIZE=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15513: result: $ac_cv_func__nc_TABSIZE" >&5 +echo "$as_me:16941: result: $ac_cv_func__nc_TABSIZE" >&5 echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6 if test "$ac_cv_func__nc_TABSIZE" = yes; then assume_reentrant=yes @@ -15522,7 +16950,7 @@ fi # opaque outside of that, so there is no --enable-opaque option. We can use # this option without --with-pthreads, but this will be always set for # pthreads. -echo "$as_me:15525: checking if you want experimental reentrant code" >&5 +echo "$as_me:16953: checking if you want experimental reentrant code" >&5 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 # Check whether --enable-reentrant or --disable-reentrant was given. @@ -15532,7 +16960,7 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=$assume_reentrant fi; -echo "$as_me:15535: result: $with_reentrant" >&5 +echo "$as_me:16963: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 if test "$with_reentrant" = yes ; then cf_cv_enable_reentrant=1 @@ -15555,7 +16983,7 @@ fi ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:15558: checking for prefix used to wrap public variables" >&5 + echo "$as_me:16986: checking for prefix used to wrap public variables" >&5 echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 # Check whether --with-wrap-prefix or --without-wrap-prefix was given. @@ -15565,7 +16993,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:15568: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:16996: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -15579,7 +17007,7 @@ EOF ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:15582: checking if you want to see long compiling messages" >&5 +echo "$as_me:17010: 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. @@ -15613,10 +17041,10 @@ else ECHO_CC='' fi; -echo "$as_me:15616: result: $enableval" >&5 +echo "$as_me:17044: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:15619: checking if you want to use C11 _Noreturn feature" >&5 +echo "$as_me:17047: 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. @@ -15633,17 +17061,17 @@ else enable_stdnoreturn=no fi; -echo "$as_me:15636: result: $enable_stdnoreturn" >&5 +echo "$as_me:17064: result: $enable_stdnoreturn" >&5 echo "${ECHO_T}$enable_stdnoreturn" >&6 if test $enable_stdnoreturn = yes; then -echo "$as_me:15640: checking for C11 _Noreturn feature" >&5 +echo "$as_me:17068: 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 15646 "configure" +#line 17074 "configure" #include "confdefs.h" $ac_includes_default @@ -15659,16 +17087,16 @@ if (feof(stdin)) giveup() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15662: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17090: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15665: \$? = $ac_status" >&5 + echo "$as_me:17093: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15668: \"$ac_try\"") >&5 + { (eval echo "$as_me:17096: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15671: \$? = $ac_status" >&5 + echo "$as_me:17099: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_c11_noreturn=yes else @@ -15679,7 +17107,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15682: result: $cf_cv_c11_noreturn" >&5 +echo "$as_me:17110: result: $cf_cv_c11_noreturn" >&5 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 else cf_cv_c11_noreturn=no, @@ -15735,16 +17163,16 @@ then then test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 -echo "${as_me:-configure}:15738: testing repairing CFLAGS: $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17166: testing repairing CFLAGS: $CFLAGS ..." 1>&5 CFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:15743: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17171: testing ... fixed $CFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:15747: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17175: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -15783,16 +17211,16 @@ then then test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:15786: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:17214: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:15791: testing ... fixed $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:17219: testing ... fixed $CPPFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:15795: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17223: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -15831,23 +17259,23 @@ then then test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 -echo "${as_me:-configure}:15834: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:17262: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 LDFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 -echo "${as_me:-configure}:15839: testing ... fixed $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:17267: testing ... fixed $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:15843: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17271: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; esac fi -echo "$as_me:15850: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:17278: 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. @@ -15864,7 +17292,7 @@ else enable_warnings=no fi; -echo "$as_me:15867: result: $enable_warnings" >&5 +echo "$as_me:17295: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then @@ -15888,10 +17316,10 @@ do done cat >"conftest.$ac_ext" <<_ACEOF -#line 15891 "configure" +#line 17319 "configure" #include "confdefs.h" -#include +$ac_includes_default #include int @@ -15903,32 +17331,32 @@ String foo = malloc(1); free((void*)foo) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15906: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17334: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15909: \$? = $ac_status" >&5 + echo "$as_me:17337: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15912: \"$ac_try\"") >&5 + { (eval echo "$as_me:17340: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15915: \$? = $ac_status" >&5 + echo "$as_me:17343: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then -echo "$as_me:15918: checking for X11/Xt const-feature" >&5 +echo "$as_me:17346: 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 15925 "configure" +#line 17353 "configure" #include "confdefs.h" #undef _CONST_X_STRING #define _CONST_X_STRING /* X11R7.8 (perhaps) */ #undef XTSTRINGDEFINES /* X11R5 and later */ -#include +$ac_includes_default #include int @@ -15940,16 +17368,16 @@ String foo = malloc(1); *foo = 0 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15943: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17371: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15946: \$? = $ac_status" >&5 + echo "$as_me:17374: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15949: \"$ac_try\"") >&5 + { (eval echo "$as_me:17377: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15952: \$? = $ac_status" >&5 + echo "$as_me:17380: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_const_x_string=no @@ -15964,7 +17392,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15967: result: $cf_cv_const_x_string" >&5 +echo "$as_me:17395: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" @@ -15993,7 +17421,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi cat > "conftest.$ac_ext" <&5 -echo "$as_me: checking for $CC warning options..." >&6;} + echo "$as_me:17440: checking for $CC warning options" >&5 +echo $ECHO_N "checking for $CC warning options... $ECHO_C" >&6 + test -n "$verbose" && echo "$as_me:17442: result: " >&5 +echo "${ECHO_T}" >&6 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" for cf_opt in \ @@ -16025,12 +17455,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:16028: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17458: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16031: \$? = $ac_status" >&5 + echo "$as_me:17461: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:16033: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:17463: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -16038,8 +17468,10 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:16041: checking for $CC warning options..." >&5 -echo "$as_me: checking for $CC warning options..." >&6;} + echo "$as_me:17471: checking for $CC warning options" >&5 +echo $ECHO_N "checking for $CC warning options... $ECHO_C" >&6 + test -n "$verbose" && echo "$as_me:17473: result: " >&5 +echo "${ECHO_T}" >&6 cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" @@ -16061,12 +17493,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:16064: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17496: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16067: \$? = $ac_status" >&5 + echo "$as_me:17499: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:16069: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:17501: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -16074,7 +17506,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}:16077: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:17509: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -16084,7 +17516,7 @@ echo "${as_me:-configure}:16077: 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}:16087: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:17519: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -16117,10 +17549,12 @@ cat > conftest.i <&5 -echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + echo "$as_me:17552: checking for $CC __attribute__ directives" >&5 +echo $ECHO_N "checking for $CC __attribute__ directives... $ECHO_C" >&6 + test -n "$verbose" && echo "$as_me:17554: result: " >&5 +echo "${ECHO_T}" >&6 cat > "conftest.$ac_ext" < #include "confdefs.h" #include "conftest.h" @@ -16170,12 +17604,12 @@ EOF ;; esac - if { (eval echo "$as_me:16173: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17607: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16176: \$? = $ac_status" >&5 + echo "$as_me:17610: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:16178: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:17612: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -16243,7 +17677,7 @@ if test "x$enable_warnings" = "xyes"; then fi ### use option --enable-assertions to turn on generation of assertion code -echo "$as_me:16246: checking if you want to enable runtime assertions" >&5 +echo "$as_me:17680: checking if you want to enable runtime assertions" >&5 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 # Check whether --enable-assertions or --disable-assertions was given. @@ -16253,7 +17687,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:16256: result: $with_assertions" >&5 +echo "$as_me:17690: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -16306,7 +17740,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:16309: checking whether to add trace feature to all models" >&5 +echo "$as_me:17743: checking whether to add trace feature to all models" >&5 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 # Check whether --with-trace or --without-trace was given. @@ -16316,115 +17750,21 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:16319: result: $cf_with_trace" >&5 +echo "$as_me:17753: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "$cf_with_trace" = yes ; then ADA_TRACE=TRUE -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= - -for cf_add_cflags in -DTRACE -do -case "$cf_fix_cppflags" in -(no) - case "$cf_add_cflags" in - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case "$cf_add_cflags" in - (-D*) - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - - if test "$cf_fix_cppflags" = yes ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue - elif test "${cf_tst_cflags}" = "\"'" ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue - fi - ;; - esac - case "$CPPFLAGS" in - (*$cf_add_cflags) - ;; - (*) - case "$cf_add_cflags" in - (-D*) - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` - - ;; - esac - - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" - - ;; - esac - ;; - (*) - - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" - - ;; - esac - ;; -(yes) - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac -done - -if test -n "$cf_new_cflags" ; then - - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" - -fi - -if test -n "$cf_new_cppflags" ; then - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" - -fi - -if test -n "$cf_new_extra_cppflags" ; then - - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" - -fi +cat >>confdefs.h <<\EOF +#define TRACE 1 +EOF else ADA_TRACE=FALSE fi -echo "$as_me:16427: checking if we want to use GNAT projects" >&5 +echo "$as_me:17767: checking if we want to use GNAT projects" >&5 echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 # Check whether --enable-gnat-projects or --disable-gnat-projects was given. @@ -16441,21 +17781,21 @@ else enable_gnat_projects=yes fi; -echo "$as_me:16444: result: $enable_gnat_projects" >&5 +echo "$as_me:17784: result: $enable_gnat_projects" >&5 echo "${ECHO_T}$enable_gnat_projects" >&6 ### Checks for libraries. case $cf_cv_system_name in (*mingw32*) -echo "$as_me:16451: checking if ssp library is needed" >&5 +echo "$as_me:17791: checking if ssp library is needed" >&5 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6 if test "${cf_cv_need_libssp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16458 "configure" +#line 17798 "configure" #include "confdefs.h" #include @@ -16472,16 +17812,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16475: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17815: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16478: \$? = $ac_status" >&5 + echo "$as_me:17818: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16481: \"$ac_try\"") >&5 + { (eval echo "$as_me:17821: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16484: \$? = $ac_status" >&5 + echo "$as_me:17824: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_libssp=no else @@ -16491,7 +17831,7 @@ cat "conftest.$ac_ext" >&5 cf_save_LIBS="$LIBS" LIBS="$LIBS -lssp" cat >"conftest.$ac_ext" <<_ACEOF -#line 16494 "configure" +#line 17834 "configure" #include "confdefs.h" #include @@ -16508,16 +17848,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16511: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17851: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16514: \$? = $ac_status" >&5 + echo "$as_me:17854: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16517: \"$ac_try\"") >&5 + { (eval echo "$as_me:17857: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16520: \$? = $ac_status" >&5 + echo "$as_me:17860: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_libssp=yes else @@ -16531,7 +17871,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16534: result: $cf_cv_need_libssp" >&5 +echo "$as_me:17874: result: $cf_cv_need_libssp" >&5 echo "${ECHO_T}$cf_cv_need_libssp" >&6 if test "x$cf_cv_need_libssp" = xyes @@ -16558,36 +17898,162 @@ fi ;; (*) -echo "$as_me:16561: checking for clock_gettime" >&5 +cf_save_libs="$LIBS" +echo "$as_me:17902: 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 +if test "${ac_cv_func_clock_gettime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >"conftest.$ac_ext" <<_ACEOF -#line 16568 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17908 "configure" #include "confdefs.h" -#include +#define clock_gettime autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef clock_gettime + +#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 clock_gettime (void); + int main (void) { -struct timespec ts; - int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts + +/* 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_clock_gettime) || defined (__stub___clock_gettime) +#error found stub for clock_gettime +#endif + + return clock_gettime (); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16581: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17939: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16584: \$? = $ac_status" >&5 + echo "$as_me:17942: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16587: \"$ac_try\"") >&5 + { (eval echo "$as_me:17945: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16590: \$? = $ac_status" >&5 + echo "$as_me:17948: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_clock_gettime=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_func_clock_gettime=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +fi +echo "$as_me:17958: result: $ac_cv_func_clock_gettime" >&5 +echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6 +if test "$ac_cv_func_clock_gettime" = yes; then + cf_cv_test_clock_gettime=yes +else + echo "$as_me:17963: checking for clock_gettime in -lrt" >&5 +echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6 +if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrt $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 17971 "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 clock_gettime (void); +int +main (void) +{ +clock_gettime (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17990: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17993: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17996: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17999: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_rt_clock_gettime=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_lib_rt_clock_gettime=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:18010: result: $ac_cv_lib_rt_clock_gettime" >&5 +echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6 +if test "$ac_cv_lib_rt_clock_gettime" = yes; then + LIBS="-lrt $LIBS" + cf_cv_test_clock_gettime=yes +else + cf_cv_test_clock_gettime=no +fi + +fi + +if test "$cf_cv_test_clock_gettime" = yes ; then +echo "$as_me:18022: checking if clock_gettime links" >&5 +echo $ECHO_N "checking if clock_gettime links... $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 18029 "configure" +#include "confdefs.h" + +$ac_includes_default +#include + +int +main (void) +{ +struct timespec ts; + int rc = clock_gettime(CLOCK_REALTIME, &ts) + + clock_gettime(CLOCK_MONOTONIC, &ts); + (void) rc; (void)ts + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18047: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:18050: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18053: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18056: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_clock_gettime=yes else @@ -16598,8 +18064,11 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16601: result: $cf_cv_func_clock_gettime" >&5 +echo "$as_me:18067: result: $cf_cv_func_clock_gettime" >&5 echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6 +else + cf_cv_func_clock_gettime=no +fi if test "$cf_cv_func_clock_gettime" = yes then @@ -16609,13 +18078,13 @@ cat >>confdefs.h <<\EOF EOF else -echo "$as_me:16612: checking for gettimeofday" >&5 +echo "$as_me:18081: 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 16618 "configure" +#line 18087 "configure" #include "confdefs.h" #define gettimeofday autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -16646,16 +18115,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16649: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18118: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16652: \$? = $ac_status" >&5 + echo "$as_me:18121: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16655: \"$ac_try\"") >&5 + { (eval echo "$as_me:18124: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16658: \$? = $ac_status" >&5 + echo "$as_me:18127: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gettimeofday=yes else @@ -16665,7 +18134,7 @@ ac_cv_func_gettimeofday=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16668: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:18137: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test "$ac_cv_func_gettimeofday" = yes; then @@ -16675,7 +18144,7 @@ EOF else -echo "$as_me:16678: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:18147: 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 @@ -16683,7 +18152,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16686 "configure" +#line 18155 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16702,16 +18171,16 @@ gettimeofday (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16705: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18174: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16708: \$? = $ac_status" >&5 + echo "$as_me:18177: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16711: \"$ac_try\"") >&5 + { (eval echo "$as_me:18180: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16714: \$? = $ac_status" >&5 + echo "$as_me:18183: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -16722,7 +18191,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16725: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:18194: 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 @@ -16755,13 +18224,13 @@ fi esac ### Checks for header files. -echo "$as_me:16758: checking for signed char" >&5 +echo "$as_me:18227: checking for signed char" >&5 echo $ECHO_N "checking for signed char... $ECHO_C" >&6 if test "${ac_cv_type_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16764 "configure" +#line 18233 "configure" #include "confdefs.h" $ac_includes_default int @@ -16776,16 +18245,16 @@ if (sizeof (signed char)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16779: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18248: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16782: \$? = $ac_status" >&5 + echo "$as_me:18251: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16785: \"$ac_try\"") >&5 + { (eval echo "$as_me:18254: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16788: \$? = $ac_status" >&5 + echo "$as_me:18257: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_signed_char=yes else @@ -16795,10 +18264,10 @@ ac_cv_type_signed_char=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16798: result: $ac_cv_type_signed_char" >&5 +echo "$as_me:18267: result: $ac_cv_type_signed_char" >&5 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:16801: checking size of signed char" >&5 +echo "$as_me:18270: checking size of signed char" >&5 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 if test "${ac_cv_sizeof_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16807,7 +18276,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 16810 "configure" +#line 18279 "configure" #include "confdefs.h" $ac_includes_default int @@ -16819,21 +18288,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16822: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18291: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16825: \$? = $ac_status" >&5 + echo "$as_me:18294: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16828: \"$ac_try\"") >&5 + { (eval echo "$as_me:18297: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16831: \$? = $ac_status" >&5 + echo "$as_me:18300: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 16836 "configure" +#line 18305 "configure" #include "confdefs.h" $ac_includes_default int @@ -16845,16 +18314,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16848: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18317: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16851: \$? = $ac_status" >&5 + echo "$as_me:18320: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16854: \"$ac_try\"") >&5 + { (eval echo "$as_me:18323: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16857: \$? = $ac_status" >&5 + echo "$as_me:18326: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -16870,7 +18339,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 16873 "configure" +#line 18342 "configure" #include "confdefs.h" $ac_includes_default int @@ -16882,16 +18351,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16885: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18354: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16888: \$? = $ac_status" >&5 + echo "$as_me:18357: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16891: \"$ac_try\"") >&5 + { (eval echo "$as_me:18360: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16894: \$? = $ac_status" >&5 + echo "$as_me:18363: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -16907,7 +18376,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 16910 "configure" +#line 18379 "configure" #include "confdefs.h" $ac_includes_default int @@ -16919,16 +18388,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16922: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18391: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16925: \$? = $ac_status" >&5 + echo "$as_me:18394: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16928: \"$ac_try\"") >&5 + { (eval echo "$as_me:18397: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16931: \$? = $ac_status" >&5 + echo "$as_me:18400: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -16941,12 +18410,12 @@ done ac_cv_sizeof_signed_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:16944: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:18413: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >"conftest.$ac_ext" <<_ACEOF -#line 16949 "configure" +#line 18418 "configure" #include "confdefs.h" $ac_includes_default int @@ -16962,15 +18431,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:16965: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18434: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16968: \$? = $ac_status" >&5 + echo "$as_me:18437: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:16970: \"$ac_try\"") >&5 + { (eval echo "$as_me:18439: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16973: \$? = $ac_status" >&5 + echo "$as_me:18442: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_signed_char=`cat conftest.val` else @@ -16986,7 +18455,7 @@ else ac_cv_sizeof_signed_char=0 fi fi -echo "$as_me:16989: result: $ac_cv_sizeof_signed_char" >&5 +echo "$as_me:18458: result: $ac_cv_sizeof_signed_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 cat >>confdefs.h <&5 +echo "$as_me:18467: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17004 "configure" +#line 18473 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -17016,16 +18485,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17019: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18488: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17022: \$? = $ac_status" >&5 + echo "$as_me:18491: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17025: \"$ac_try\"") >&5 + { (eval echo "$as_me:18494: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17028: \$? = $ac_status" >&5 + echo "$as_me:18497: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -17035,7 +18504,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17038: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18507: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 + echo "$as_me:18520: checking for opendir in -ldir" >&5 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 if test "${ac_cv_lib_dir_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17056,7 +18525,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17059 "configure" +#line 18528 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17075,16 +18544,16 @@ opendir (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17078: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18547: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17081: \$? = $ac_status" >&5 + echo "$as_me:18550: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17084: \"$ac_try\"") >&5 + { (eval echo "$as_me:18553: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17087: \$? = $ac_status" >&5 + echo "$as_me:18556: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dir_opendir=yes else @@ -17095,14 +18564,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17098: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:18567: result: $ac_cv_lib_dir_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 if test "$ac_cv_lib_dir_opendir" = yes; then LIBS="$LIBS -ldir" fi else - echo "$as_me:17105: checking for opendir in -lx" >&5 + echo "$as_me:18574: checking for opendir in -lx" >&5 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 if test "${ac_cv_lib_x_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17110,7 +18579,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17113 "configure" +#line 18582 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17129,16 +18598,16 @@ opendir (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17132: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18601: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17135: \$? = $ac_status" >&5 + echo "$as_me:18604: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17138: \"$ac_try\"") >&5 + { (eval echo "$as_me:18607: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17141: \$? = $ac_status" >&5 + echo "$as_me:18610: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_x_opendir=yes else @@ -17149,7 +18618,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17152: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:18621: result: $ac_cv_lib_x_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 if test "$ac_cv_lib_x_opendir" = yes; then LIBS="$LIBS -lx" @@ -17157,13 +18626,13 @@ fi fi -echo "$as_me:17160: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:18629: 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 17166 "configure" +#line 18635 "configure" #include "confdefs.h" #include #include @@ -17179,16 +18648,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17182: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18651: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17185: \$? = $ac_status" >&5 + echo "$as_me:18654: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17188: \"$ac_try\"") >&5 + { (eval echo "$as_me:18657: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17191: \$? = $ac_status" >&5 + echo "$as_me:18660: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_header_time=yes else @@ -17198,7 +18667,7 @@ ac_cv_header_time=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17201: result: $ac_cv_header_time" >&5 +echo "$as_me:18670: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -17216,13 +18685,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" -echo "$as_me:17219: checking for an ANSI C-conforming const" >&5 +echo "$as_me:18688: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17225 "configure" +#line 18694 "configure" #include "confdefs.h" int @@ -17232,13 +18701,13 @@ main (void) #ifndef __cplusplus /* Ultrix mips cc rejects this. */ typedef int charset[2]; - const charset x; (void)x; + const charset x; /* SunOS 4.1.1 cc rejects this. */ char const *const *ccp; char **p; /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; - static struct point const zero = {0,0}; (void)zero; + static struct point const zero = {0,0}; /* AIX XL C 1.02.0.0 rejects this. It does not let you subtract one const X* pointer from another in an arm of an if-expression whose if-part is not a constant @@ -17254,7 +18723,7 @@ main (void) char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; - (void)s; + (void)s; (void)x; (void)zero; } { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ int x[] = {25, 17}; @@ -17284,16 +18753,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17287: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18756: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17290: \$? = $ac_status" >&5 + echo "$as_me:18759: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17293: \"$ac_try\"") >&5 + { (eval echo "$as_me:18762: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17296: \$? = $ac_status" >&5 + echo "$as_me:18765: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_c_const=yes else @@ -17303,7 +18772,7 @@ ac_cv_c_const=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17306: result: $ac_cv_c_const" >&5 +echo "$as_me:18775: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -17315,7 +18784,7 @@ fi ### Checks for external-data -echo "$as_me:17318: checking if data-only library module links" >&5 +echo "$as_me:18787: checking if data-only library module links" >&5 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 if test "${cf_cv_link_dataonly+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17323,20 +18792,20 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:18798: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17332: \$? = $ac_status" >&5 + echo "$as_me:18801: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then - mv conftest.o data.o && \ - ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null + mv conftest.$OBJEXT data.$OBJEXT && \ + ( $AR $ARFLAGS conftest.a data.$OBJEXT ) 2>&5 1>/dev/null fi - rm -f conftest.$ac_ext data.o + rm -f conftest.$ac_ext data.$OBJEXT cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:18825: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17359: \$? = $ac_status" >&5 + echo "$as_me:18828: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - mv conftest.o func.o && \ - ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null + mv conftest.$OBJEXT func.$OBJEXT && \ + ( $AR $ARFLAGS conftest.a func.$OBJEXT ) 2>&5 1>/dev/null fi - rm -f conftest.$ac_ext func.o + rm -f conftest.$ac_ext func.$OBJEXT ( eval $RANLIB conftest.a ) 2>&5 >/dev/null cf_saveLIBS="$LIBS" LIBS="conftest.a $LIBS" @@ -17369,7 +18838,7 @@ EOF cf_cv_link_dataonly=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 17372 "configure" +#line 18841 "configure" #include "confdefs.h" extern int testfunc(void); @@ -17380,15 +18849,15 @@ else _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:17383: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18852: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17386: \$? = $ac_status" >&5 + echo "$as_me:18855: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:17388: \"$ac_try\"") >&5 + { (eval echo "$as_me:18857: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17391: \$? = $ac_status" >&5 + echo "$as_me:18860: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_link_dataonly=yes else @@ -17403,7 +18872,7 @@ fi fi -echo "$as_me:17406: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:18875: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -17422,23 +18891,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:17425: checking for $ac_header" >&5 +echo "$as_me:18894: 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 17431 "configure" +#line 18900 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17435: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18904: \"$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:17441: \$? = $ac_status" >&5 + echo "$as_me:18910: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17457,7 +18926,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:17460: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18929: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:18939: checking for working mkstemp" >&5 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 if test "${cf_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17478,7 +18947,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 17481 "configure" +#line 18950 "configure" #include "confdefs.h" $ac_includes_default @@ -17513,15 +18982,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:17516: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18985: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17519: \$? = $ac_status" >&5 + echo "$as_me:18988: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:17521: \"$ac_try\"") >&5 + { (eval echo "$as_me:18990: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17524: \$? = $ac_status" >&5 + echo "$as_me:18993: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_mkstemp=yes @@ -17536,16 +19005,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:17539: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:19008: result: $cf_cv_func_mkstemp" >&5 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 if test "x$cf_cv_func_mkstemp" = xmaybe ; then - echo "$as_me:17542: checking for mkstemp" >&5 + echo "$as_me:19011: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 if test "${ac_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 17548 "configure" +#line 19017 "configure" #include "confdefs.h" #define mkstemp autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -17576,16 +19045,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17579: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19048: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17582: \$? = $ac_status" >&5 + echo "$as_me:19051: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17585: \"$ac_try\"") >&5 + { (eval echo "$as_me:19054: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17588: \$? = $ac_status" >&5 + echo "$as_me:19057: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_mkstemp=yes else @@ -17595,7 +19064,7 @@ ac_cv_func_mkstemp=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:17598: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:19067: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -17614,237 +19083,9 @@ fi cf_with_ada=yes if test "$cf_with_ada" != "no" ; then - -for cf_prog_gnat in gnat gnatmake gprconfig gprbuild -do - -cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - - unset ac_cv_path_cf_TEMP_gnat - unset cf_TEMP_gnat - # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. -set dummy $cf_prog_gnat; ac_word=$2 -echo "$as_me:17627: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $cf_TEMP_gnat in - [\\/]* | ?:[\\/]*) - ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" - echo "$as_me:17644: found $ac_dir/$ac_word" >&5 - break -fi -done - - test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no" - ;; -esac -fi -cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat - -if test -n "$cf_TEMP_gnat"; then - echo "$as_me:17656: result: $cf_TEMP_gnat" >&5 -echo "${ECHO_T}$cf_TEMP_gnat" >&6 -else - echo "$as_me:17659: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - eval "cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat" - - if test "x$cf_TEMP_gnat" != xno; then - unset cf_cv_gnat_version - unset cf_TEMP_gnat - -echo "$as_me:17669: checking for $cf_prog_gnat version" >&5 -echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 -if test "${cf_cv_gnat_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ - grep '[0-9].[0-9][0-9]*' |\ - sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` - -fi -echo "$as_me:17680: result: $cf_cv_gnat_version" >&5 -echo "${ECHO_T}$cf_cv_gnat_version" >&6 -test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no -eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version - - fi - eval "cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat" - - unset cf_TEMP_gnat - unset cf_cv_gnat_version - unset ac_cv_path_cf_TEMP_gnat -done - -if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then - cf_ada_make= - cf_cv_prog_gnat_correct=no -else - cf_ada_make=gnatmake - if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then - # gprconfig is newer than gnatmake; we can continue... - cf_ada_config="##" - else - rm -rf ./conftest* ./*~conftest* - if mkdir conftest.src - then - cf_ada_config="" - cd conftest.src - for cf_gprconfig in Ada C - do - echo "$as_me:17709: checking for gprconfig name for $cf_gprconfig" >&5 -echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 - if test "$cf_gprconfig" = C - then - for cf_gprconfig_param in \ - "$cf_gprconfig,,,,GNATGCC" \ - "$cf_gprconfig,,,,GCC" \ - "$cf_gprconfig" - do - cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` - test -n "$cf_gprconfig_value" && break - done - else - cf_gprconfig_param=$cf_gprconfig - cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` - fi - if test -n "$cf_gprconfig_value" - then - eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" - echo "$as_me:17728: result: $cf_gprconfig_value" >&5 -echo "${ECHO_T}$cf_gprconfig_value" >&6 - else - echo "$as_me:17731: result: missing" >&5 -echo "${ECHO_T}missing" >&6 - cf_ada_config="#" - break - fi - done - cd .. - rm -rf ./conftest* ./*~conftest* - fi - fi - if test "x$cf_ada_config" != "x#" - then - -echo "$as_me:17744: checking for gnat version" >&5 -echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 -if test "${cf_cv_gnat_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ - grep '[0-9].[0-9][0-9]*' |\ - sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` - -fi -echo "$as_me:17755: result: $cf_cv_gnat_version" >&5 -echo "${ECHO_T}$cf_cv_gnat_version" >&6 -test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no - -case "$cf_cv_gnat_version" in -(3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) - cf_cv_prog_gnat_correct=yes - ;; -(*) - { echo "$as_me:17764: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 -echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} - cf_cv_prog_gnat_correct=no - ;; -esac - - # Extract the first word of "m4", so it can be a program name with args. -set dummy m4; ac_word=$2 -echo "$as_me:17772: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_M4_exists+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$M4_exists"; then - ac_cv_prog_M4_exists="$M4_exists" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_M4_exists="yes" -echo "$as_me:17787: found $ac_dir/$ac_word" >&5 -break -done - - test -z "$ac_cv_prog_M4_exists" && ac_cv_prog_M4_exists="no" -fi -fi -M4_exists=$ac_cv_prog_M4_exists -if test -n "$M4_exists"; then - echo "$as_me:17796: result: $M4_exists" >&5 -echo "${ECHO_T}$M4_exists" >&6 -else - echo "$as_me:17799: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - if test "$ac_cv_prog_M4_exists" = no; then - cf_cv_prog_gnat_correct=no - { echo "$as_me:17805: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 -echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} - fi - if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:17809: checking if GNAT works" >&5 -echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 - -rm -rf ./conftest* ./*~conftest* -cat >>conftest.ads <>conftest.adb <&5 2>&1 ) ; then - if ( ./conftest 1>&5 2>&1 ) ; then - cf_cv_prog_gnat_correct=yes - else - cf_cv_prog_gnat_correct=no - fi -else - cf_cv_prog_gnat_correct=no -fi -rm -rf ./conftest* ./*~conftest* - - echo "$as_me:17837: result: $cf_cv_prog_gnat_correct" >&5 -echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 - fi - else - cf_cv_prog_gnat_correct=no - fi -fi - if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:17847: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:19088: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in (*-g*) @@ -17861,10 +19102,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:17864: result: $ADAFLAGS" >&5 + echo "$as_me:19105: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:17867: checking if GNATPREP supports -T option" >&5 +echo "$as_me:19108: checking if GNATPREP supports -T option" >&5 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 if test "${cf_cv_gnatprep_opt_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17874,11 +19115,11 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:17877: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:19118: result: $cf_cv_gnatprep_opt_t" >&5 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" -echo "$as_me:17881: checking if GNAT supports generics" >&5 +echo "$as_me:19122: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case "$cf_cv_gnat_version" in (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) @@ -17888,7 +19129,7 @@ case "$cf_cv_gnat_version" in cf_gnat_generics=no ;; esac -echo "$as_me:17891: result: $cf_gnat_generics" >&5 +echo "$as_me:19132: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -17900,7 +19141,7 @@ else cf_generic_objects= fi -echo "$as_me:17903: checking if GNAT supports SIGINT" >&5 +echo "$as_me:19144: checking if GNAT supports SIGINT" >&5 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 if test "${cf_cv_gnat_sigint+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17948,7 +19189,7 @@ fi rm -rf ./conftest* ./*~conftest* fi -echo "$as_me:17951: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:19192: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test "$cf_cv_gnat_sigint" = yes ; then @@ -17961,7 +19202,7 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:17964: checking if GNAT supports project files" >&5 +echo "$as_me:19205: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case "$cf_cv_gnat_version" in (3.[0-9]*) @@ -18024,15 +19265,15 @@ CF_EOF esac ;; esac -echo "$as_me:18027: result: $cf_gnat_projects" >&5 +echo "$as_me:19268: result: $cf_gnat_projects" >&5 echo "${ECHO_T}$cf_gnat_projects" >&6 fi # enable_gnat_projects if test "$cf_gnat_projects" = yes then - echo "$as_me:18033: checking if GNAT supports libraries" >&5 + echo "$as_me:19274: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:18035: result: $cf_gnat_libraries" >&5 + echo "$as_me:19276: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -18052,7 +19293,7 @@ then then USE_GNAT_MAKE_GPR="" else - { echo "$as_me:18055: WARNING: use old makefile rules since tools are missing" >&5 + { echo "$as_me:19296: WARNING: use old makefile rules since tools are missing" >&5 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} fi fi @@ -18064,7 +19305,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:18067: checking for Ada95 compiler" >&5 +echo "$as_me:19308: checking for Ada95 compiler" >&5 echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6 # Check whether --with-ada-compiler or --without-ada-compiler was given. @@ -18075,12 +19316,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:18078: result: $cf_ada_compiler" >&5 +echo "$as_me:19319: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:18083: checking for Ada95 include directory" >&5 +echo "$as_me:19324: checking for Ada95 include directory" >&5 echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6 # Check whether --with-ada-include or --without-ada-include was given. @@ -18097,26 +19338,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in -(.\$\(*\)*|.\'*\'*) +case "x$withval" in +(x\$\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval withval="$withval" - case ".$withval" in - (.NONE/*) + case "x$withval" in + (xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:18119: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:19358: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -18125,10 +19364,10 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:18128: result: $ADA_INCLUDE" >&5 +echo "$as_me:19367: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:18131: checking for Ada95 object directory" >&5 +echo "$as_me:19370: checking for Ada95 object directory" >&5 echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6 # Check whether --with-ada-objects or --without-ada-objects was given. @@ -18145,26 +19384,24 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in -(.\$\(*\)*|.\'*\'*) +case "x$withval" in +(x\$\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) +(x\$\{*prefix\}*|x\$\{*dir\}*) eval withval="$withval" - case ".$withval" in - (.NONE/*) + case "x$withval" in + (xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:18167: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:19404: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -18173,10 +19410,10 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:18176: result: $ADA_OBJECTS" >&5 +echo "$as_me:19413: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:18179: checking whether to build an Ada95 shared library" >&5 +echo "$as_me:19416: checking whether to build an Ada95 shared library" >&5 echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. @@ -18197,11 +19434,11 @@ then fi fi -echo "$as_me:18200: result: $with_ada_sharedlib" >&5 +echo "$as_me:19437: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 if test "x$cf_ada_sharedlib_warn" != xno then - { echo "$as_me:18204: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5 + { echo "$as_me:19441: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5 echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;} fi @@ -18219,7 +19456,7 @@ fi # allow the Ada binding to be renamed -echo "$as_me:18222: checking for Ada95 curses library name" >&5 +echo "$as_me:19459: checking for Ada95 curses library name" >&5 echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6 # Check whether --with-ada-libname or --without-ada-libname was given. @@ -18235,16 +19472,16 @@ case "x$ADA_LIBNAME" in ;; esac -echo "$as_me:18238: result: $ADA_LIBNAME" >&5 +echo "$as_me:19475: result: $ADA_LIBNAME" >&5 echo "${ECHO_T}$ADA_LIBNAME" >&6 else - { { echo "$as_me:18242: error: No usable Ada compiler found" >&5 + { { echo "$as_me:19479: error: No usable Ada compiler found" >&5 echo "$as_me: error: No usable Ada compiler found" >&2;} { (exit 1); exit 1; }; } fi else - { { echo "$as_me:18247: error: The Ada compiler is needed for this package" >&5 + { { echo "$as_me:19484: error: The Ada compiler is needed for this package" >&5 echo "$as_me: error: The Ada compiler is needed for this package" >&2;} { (exit 1); exit 1; }; } fi @@ -18284,7 +19521,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:18287: checking default library suffix" >&5 +echo "$as_me:19524: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -18295,10 +19532,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 (shared) DFT_ARG_SUFFIX='' ;; esac test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" -echo "$as_me:18298: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:19535: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:18301: checking default library-dependency suffix" >&5 +echo "$as_me:19538: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in @@ -18381,10 +19618,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" fi -echo "$as_me:18384: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:19621: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:18387: checking default object directory" >&5 +echo "$as_me:19624: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -18400,7 +19637,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:18403: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:19640: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 ### Set up low-level terminfo dependencies for makefiles. @@ -18418,7 +19655,7 @@ fi USE_ARG_SUFFIX=${DFT_ARG_SUFFIX} -USE_LIB_SUFFIX=${DFT_ARG_SUFFIX} +ABI_SUFFIX=${DFT_ARG_SUFFIX} USE_CFG_SUFFIX=${DFT_ARG_SUFFIX} @@ -18462,7 +19699,11 @@ else fi ac_config_files="$ac_config_files $SUB_MAKEFILES src/library.gpr:src/library.gpr.in doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in Makefile" + ac_config_commands="$ac_config_commands default" + +DEFS=-DHAVE_CONFIG_H + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -18542,7 +19783,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:18545: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:19786: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -18678,7 +19919,7 @@ EOF cat >>"$CONFIG_STATUS" <>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:18726: error: ambiguous option: $1 + { { echo "$as_me:19967: 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;} @@ -18742,7 +19983,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:18745: error: unrecognized option: $1 + -*) { { echo "$as_me:19986: 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;} @@ -18761,7 +20002,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20231210, executed with +This file was extended by $as_me 2.52.20250126, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -18817,7 +20058,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; - *) { { echo "$as_me:18820: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:20061: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -18917,6 +20158,13 @@ s,@target_vendor@,$target_vendor,;t t s,@target_os@,$target_os,;t t s,@GREP@,$GREP,;t t s,@FGREP@,$FGREP,;t t +s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t +s,@M4_exists@,$M4_exists,;t t +s,@cf_ada_make@,$cf_ada_make,;t t +s,@cf_ada_config@,$cf_ada_config,;t t +s,@cf_ada_config_Ada@,$cf_ada_config_Ada,;t t +s,@cf_ada_config_C@,$cf_ada_config_C,;t t +s,@cf_cv_path_gnatgcc@,$cf_cv_path_gnatgcc,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t @@ -18932,6 +20180,8 @@ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@LN_S@,$LN_S,;t t +s,@GLOB_FULLPATH_POSIX@,$GLOB_FULLPATH_POSIX,;t t +s,@GLOB_FULLPATH_OTHER@,$GLOB_FULLPATH_OTHER,;t t s,@INSTALL_OPT_S@,$INSTALL_OPT_S,;t t s,@INSTALL_OPT_O@,$INSTALL_OPT_O,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t @@ -18944,7 +20194,6 @@ s,@CTAGS@,$CTAGS,;t t s,@ETAGS@,$ETAGS,;t t s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t s,@MAKE_UPPER_TAGS@,$MAKE_UPPER_TAGS,;t t -s,@cf_cv_makeflags@,$cf_cv_makeflags,;t t s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@LD@,$LD,;t t @@ -18953,6 +20202,8 @@ s,@AR@,$AR,;t t s,@ac_ct_AR@,$ac_ct_AR,;t t s,@ARFLAGS@,$ARFLAGS,;t t s,@DESTDIR@,$DESTDIR,;t t +s,@SET_DESTDIR@,$SET_DESTDIR,;t t +s,@MERGE_PREFIX@,$MERGE_PREFIX,;t t s,@BUILD_CC@,$BUILD_CC,;t t s,@BUILD_CPP@,$BUILD_CPP,;t t s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t @@ -18963,16 +20214,16 @@ s,@BUILD_EXEEXT@,$BUILD_EXEEXT,;t t s,@BUILD_OBJEXT@,$BUILD_OBJEXT,;t t s,@DFT_LWR_MODEL@,$DFT_LWR_MODEL,;t t s,@DFT_UPR_MODEL@,$DFT_UPR_MODEL,;t t +s,@REQUIRE_PKG@,$REQUIRE_PKG,;t t s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t +s,@cf_cv_screen@,$cf_cv_screen,;t t s,@NCURSES_MAJOR@,$NCURSES_MAJOR,;t t s,@NCURSES_MINOR@,$NCURSES_MINOR,;t t s,@NCURSES_PATCH@,$NCURSES_PATCH,;t t s,@cf_cv_rel_version@,$cf_cv_rel_version,;t t s,@cf_cv_abi_version@,$cf_cv_abi_version,;t t -s,@cf_cv_builtin_bool@,$cf_cv_builtin_bool,;t t -s,@cf_cv_header_stdbool_h@,$cf_cv_header_stdbool_h,;t t -s,@cf_cv_type_of_bool@,$cf_cv_type_of_bool,;t t +s,@cf_cv_enable_sigwinch@,$cf_cv_enable_sigwinch,;t t s,@LIB_PREFIX@,$LIB_PREFIX,;t t s,@LIB_SUFFIX@,$LIB_SUFFIX,;t t s,@CC_G_OPT@,$CC_G_OPT,;t t @@ -19007,12 +20258,6 @@ s,@HAVE_STDNORETURN_H@,$HAVE_STDNORETURN_H,;t t s,@STDC_NORETURN@,$STDC_NORETURN,;t t s,@ADAFLAGS@,$ADAFLAGS,;t t s,@ADA_TRACE@,$ADA_TRACE,;t t -s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t -s,@M4_exists@,$M4_exists,;t t -s,@cf_ada_make@,$cf_ada_make,;t t -s,@cf_ada_config@,$cf_ada_config,;t t -s,@cf_ada_config_Ada@,$cf_ada_config_Ada,;t t -s,@cf_ada_config_C@,$cf_ada_config_C,;t t s,@GNATPREP_OPTS@,$GNATPREP_OPTS,;t t s,@cf_compile_generics@,$cf_compile_generics,;t t s,@cf_generic_objects@,$cf_generic_objects,;t t @@ -19036,7 +20281,7 @@ s,@DFT_ARG_SUFFIX@,$DFT_ARG_SUFFIX,;t t s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t s,@DFT_OBJ_SUBDIR@,$DFT_OBJ_SUBDIR,;t t s,@USE_ARG_SUFFIX@,$USE_ARG_SUFFIX,;t t -s,@USE_LIB_SUFFIX@,$USE_LIB_SUFFIX,;t t +s,@ABI_SUFFIX@,$ABI_SUFFIX,;t t s,@USE_CFG_SUFFIX@,$USE_CFG_SUFFIX,;t t s,@TEST_ARG2@,$TEST_ARG2,;t t s,@TEST_LIBS2@,$TEST_LIBS2,;t t @@ -19073,14 +20318,14 @@ 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' && sed -e 's/\\\\*$//g' -e 's/$/\\/' -e 's/;t t\\/;t t/' -e 't' -e '3,'$ac_max_sed_lines's/$/\\/' "$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 + grep '^s,@[^@,][^@,]*@,.*$' "$tmp"/subs.next | grep -v '^s,@.*;t t$' >"$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 @@ -19178,7 +20423,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:19181: creating $ac_file" >&5 + { echo "$as_me:20426: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -19196,7 +20441,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:19199: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:20444: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo "$f";; @@ -19209,7 +20454,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:19212: error: cannot find input file: $f" >&5 + { { echo "$as_me:20457: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -19225,7 +20470,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:19228: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:20473: 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;} @@ -19234,7 +20479,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:19237: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:20482: 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;} @@ -19279,7 +20524,7 @@ cat >>"$CONFIG_STATUS" <<\EOF 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:19282: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:20527: 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;} @@ -19290,7 +20535,7 @@ $ac_seen" >&2;} $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:19293: WARNING: Some variables may not be substituted: + { echo "$as_me:20538: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -19339,7 +20584,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:19342: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:20587: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -19350,7 +20595,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:19353: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:20598: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -19363,7 +20608,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:19366: error: cannot find input file: $f" >&5 + { { echo "$as_me:20611: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -19421,7 +20666,7 @@ cat >>"$CONFIG_STATUS" <<\EOF 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:19424: $ac_file is unchanged" >&5 + { echo "$as_me:20669: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -19505,4 +20750,5 @@ if test "$no_create" != yes; then # would make configure fail if this is the last instruction. "$ac_cs_success" || { (exit 1); exit 1; } fi + ${MAKE:-make} preinstall diff --git a/Ada95/configure.in b/Ada95/configure.in index 3384df2..646924d 100644 --- a/Ada95/configure.in +++ b/Ada95/configure.in @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2022,2023 Thomas E. Dickey * +dnl Copyright 2018-2024,2025 Thomas E. Dickey * dnl Copyright 2010-2016,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 dnl -dnl $Id: configure.in,v 1.91 2023/02/18 23:21:29 tom Exp $ +dnl $Id: configure.in,v 1.97 2025/12/25 23:49:07 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl For additional information, see @@ -38,9 +38,10 @@ dnl https://invisible-island.net/autoconf/my-autoconf.html dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20210509) -AC_REVISION($Revision: 1.91 $) -AC_INIT(gen/gen.c) -AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) +AC_REVISION($Revision: 1.97 $) +AC_INIT +AC_CONFIG_SRCDIR([gen/gen.c]) +AC_CONFIG_HEADERS([include/ncurses_cfg.h:include/ncurses_cfg.hin]) AC_DEFUN([AC_PATH_XTRA],[])dnl ignore dependencies on this @@ -59,7 +60,7 @@ cf_user_CFLAGS="$CFLAGS" CF_CFG_DEFAULTS ### Checks for programs. -CF_PROG_CC(gnatgcc gcc cc) +CF_WITH_ADA AC_PROG_CPP AC_PROG_GCC_TRADITIONAL CF_PROG_CC_C_O(CC,[$CFLAGS $CPPFLAGS]) @@ -106,7 +107,6 @@ fi AC_PROG_MAKE_SET CF_MAKE_PHONY CF_MAKE_TAGS -CF_MAKEFLAGS dnl These are standard among *NIX systems, but not when cross-compiling AC_CHECK_TOOL(RANLIB, ranlib, ':') @@ -115,20 +115,7 @@ AC_CHECK_TOOL(AR, ar, ar) CF_AR_FLAGS CF_PATHSEP -dnl Special option for use by system-builders: the install-prefix is used to -dnl adjust the location into which the actual install is done, so that an -dnl archive can be built without modifying the host system's configuration. -AC_MSG_CHECKING(if you have specified an install-prefix) -AC_ARG_WITH(install-prefix, - [ --with-install-prefix prefixes actual install-location ($DESTDIR)], - [case "$withval" in - (yes|no) - ;; - (*) DESTDIR="$withval" - ;; - esac]) -AC_MSG_RESULT($DESTDIR) -AC_SUBST(DESTDIR) +CF_INSTALL_PREFIX ############################################################################### CF_HELP_MESSAGE(Build-Tools Needed to Compile Temporary Applications for Cross-compiling:) @@ -410,7 +397,7 @@ AC_MSG_RESULT($cf_with_trace) if test "$cf_with_trace" = yes ; then ADA_TRACE=TRUE - CF_ADD_CFLAGS(-DTRACE) + AC_DEFINE(TRACE,1,[Define to 1 if we have support trace functions]) else ADA_TRACE=FALSE fi @@ -435,7 +422,7 @@ AC_HEADER_DIRENT AC_HEADER_TIME ### checks for compiler characteristics -AC_LANG_C +AC_LANG([C]) AC_C_CONST ### Checks for external-data @@ -455,7 +442,6 @@ cf_with_ada=yes dnl Check for availability of GNU Ada Translator (GNAT). dnl At the moment we support no other Ada95 compiler. if test "$cf_with_ada" != "no" ; then - CF_PROG_GNAT if test "$cf_cv_prog_gnat_correct" = yes; then CF_FIXUP_ADAFLAGS @@ -527,8 +513,8 @@ fi USE_ARG_SUFFIX=${DFT_ARG_SUFFIX} AC_SUBST(USE_ARG_SUFFIX) -USE_LIB_SUFFIX=${DFT_ARG_SUFFIX} -AC_SUBST(USE_LIB_SUFFIX) +ABI_SUFFIX=${DFT_ARG_SUFFIX} +AC_SUBST(ABI_SUFFIX) USE_CFG_SUFFIX=${DFT_ARG_SUFFIX} AC_SUBST(USE_CFG_SUFFIX) @@ -580,11 +566,12 @@ fi AC_SUBST(ADAGEN_LDFLAGS) -AC_OUTPUT( \ +AC_CONFIG_FILES([\ $SUB_MAKEFILES \ src/library.gpr:src/library.gpr.in \ doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in \ - Makefile,[ + Makefile]) +AC_CONFIG_COMMANDS([default],[ $AWK -v PACKAGE=$PACKAGE -f $srcdir/mk-pkg.awk > Makefile if test -z "$USE_OLD_MAKERULES" ; then $AWK -f $srcdir/mk-1st.awk <$srcdir/src/modules >>src/Makefile @@ -617,5 +604,7 @@ cf_cv_system_name="$cf_cv_system_name" host="$host" target="$target" -],cat)dnl +]) +AC_SETUP_DEFS([cat]) +AC_OUTPUT ${MAKE:-make} preinstall diff --git a/Ada95/doc/Makefile.in b/Ada95/doc/Makefile.in index 0aed33f..27b1af7 100644 --- a/Ada95/doc/Makefile.in +++ b/Ada95/doc/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.9 2021/07/03 15:45:33 tom Exp $ +# $Id: Makefile.in,v 1.11 2025/10/18 16:08:08 tom Exp $ ############################################################################## -# Copyright 2019-2020,2021 Thomas E. Dickey # +# Copyright 2019-2024,2025 Thomas E. Dickey # # Copyright 2011-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -35,7 +35,7 @@ SHELL = @SHELL@ VPATH = @srcdir@ -DESTDIR = @DESTDIR@ +@SET_DESTDIR@ srcdir = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -49,8 +49,8 @@ INSTALL_DATA = @INSTALL_DATA@ DFT_ARG_SUFFIX = @DFT_ARG_SUFFIX@ THIS = @ADA_LIBNAME@ -DOCDIR = $(DESTDIR)$(datadir)/doc/$(THIS) -MANDIR = $(DESTDIR)$(mandir)/man1 +DOCDIR = $(DESTDIR)$(datadir@MERGE_PREFIX@)/doc/$(THIS) +MANDIR = $(DESTDIR)$(mandir@MERGE_PREFIX@)/man1 ################################################################################ diff --git a/Ada95/gen/Makefile.in b/Ada95/gen/Makefile.in index 525ce99..7045ac9 100644 --- a/Ada95/gen/Makefile.in +++ b/Ada95/gen/Makefile.in @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2019-2022,2024 Thomas E. Dickey # +# Copyright 2019-2024,2025 Thomas E. Dickey # # Copyright 1998-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -30,7 +30,7 @@ # Author: Juergen Pfeifer, 1996 # and: Thomas E. Dickey, 1997 # -# $Id: Makefile.in,v 1.103 2024/01/19 16:51:56 tom Exp $ +# $Id: Makefile.in,v 1.109 2025/10/18 22:11:58 tom Exp $ # .SUFFIXES: @@ -38,16 +38,19 @@ SHELL = @SHELL@ VPATH = @srcdir@ THIS = Makefile +@SET_DESTDIR@ + x = @EXEEXT@ top_srcdir = @top_srcdir@ -DESTDIR = @DESTDIR@ srcdir = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ includedir = @includedir@ +BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@) + INSTALL = @INSTALL@ @INSTALL_OPT_O@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ @@ -111,36 +114,37 @@ ABASE = $(ALIB)-curses ADA_SRCDIR = ../src -GEN_TARGETS = $(ADA_SRCDIR)/$(ABASE).ads \ - $(ADA_SRCDIR)/$(ABASE).adb \ - $(ADA_SRCDIR)/$(ABASE)-aux.ads \ - $(ADA_SRCDIR)/$(ABASE)-trace.ads \ - $(ADA_SRCDIR)/$(ABASE)-menus.ads \ - $(ADA_SRCDIR)/$(ABASE)-forms.ads \ - $(ADA_SRCDIR)/$(ABASE)-mouse.ads \ - $(ADA_SRCDIR)/$(ABASE)-panels.ads \ - $(ADA_SRCDIR)/$(ABASE)-menus-menu_user_data.ads \ - $(ADA_SRCDIR)/$(ABASE)-menus-item_user_data.ads \ - $(ADA_SRCDIR)/$(ABASE)-forms-form_user_data.ads \ - $(ADA_SRCDIR)/$(ABASE)-forms-field_types.ads \ - $(ADA_SRCDIR)/$(ABASE)-forms-field_user_data.ads \ - $(ADA_SRCDIR)/$(ABASE)-panels-user_data.ads \ - $(ADA_SRCDIR)/$(ABASE)_constants.ads +GEN_TARGETS = options.m4 \ + $(ADA_SRCDIR)/$(ABASE).ads \ + $(ADA_SRCDIR)/$(ABASE).adb \ + $(ADA_SRCDIR)/$(ABASE)-aux.ads \ + $(ADA_SRCDIR)/$(ABASE)-trace.ads \ + $(ADA_SRCDIR)/$(ABASE)-menus.ads \ + $(ADA_SRCDIR)/$(ABASE)-forms.ads \ + $(ADA_SRCDIR)/$(ABASE)-mouse.ads \ + $(ADA_SRCDIR)/$(ABASE)-panels.ads \ + $(ADA_SRCDIR)/$(ABASE)-menus-menu_user_data.ads \ + $(ADA_SRCDIR)/$(ABASE)-menus-item_user_data.ads \ + $(ADA_SRCDIR)/$(ABASE)-forms-form_user_data.ads \ + $(ADA_SRCDIR)/$(ABASE)-forms-field_types.ads \ + $(ADA_SRCDIR)/$(ABASE)-forms-field_user_data.ads \ + $(ADA_SRCDIR)/$(ABASE)-panels-user_data.ads \ + $(ADA_SRCDIR)/$(ABASE)_constants.ads GEN_SRC = $(srcdir)/$(ABASE).ads.m4 \ $(srcdir)/$(ABASE).adb.m4 \ - $(srcdir)/$(ABASE)-aux.ads.m4 \ - $(srcdir)/$(ABASE)-trace.ads.m4 \ - $(srcdir)/$(ABASE)-menus.ads.m4 \ - $(srcdir)/$(ABASE)-forms.ads.m4 \ - $(srcdir)/$(ABASE)-mouse.ads.m4 \ - $(srcdir)/$(ABASE)-panels.ads.m4 \ - $(srcdir)/$(ABASE)-menus-menu_user_data.ads.m4 \ - $(srcdir)/$(ABASE)-menus-item_user_data.ads.m4 \ - $(srcdir)/$(ABASE)-forms-form_user_data.ads.m4 \ - $(srcdir)/$(ABASE)-forms-field_types.ads.m4 \ - $(srcdir)/$(ABASE)-forms-field_user_data.ads.m4 \ - $(srcdir)/$(ABASE)-panels-user_data.ads.m4 + $(srcdir)/$(ABASE)-aux.ads.m4 \ + $(srcdir)/$(ABASE)-trace.ads.m4 \ + $(srcdir)/$(ABASE)-menus.ads.m4 \ + $(srcdir)/$(ABASE)-forms.ads.m4 \ + $(srcdir)/$(ABASE)-mouse.ads.m4 \ + $(srcdir)/$(ABASE)-panels.ads.m4 \ + $(srcdir)/$(ABASE)-menus-menu_user_data.ads.m4 \ + $(srcdir)/$(ABASE)-menus-item_user_data.ads.m4 \ + $(srcdir)/$(ABASE)-forms-form_user_data.ads.m4 \ + $(srcdir)/$(ABASE)-forms-field_types.ads.m4 \ + $(srcdir)/$(ABASE)-forms-field_user_data.ads.m4 \ + $(srcdir)/$(ABASE)-panels-user_data.ads.m4 ################################################################################ @@ -162,19 +166,24 @@ libs : $(GEN_TARGETS) sources: -$(DESTDIR)$(bindir) : +$(BINDIR) : mkdir -p $@ install \ -install.libs :: $(DESTDIR)$(bindir) $(ADACURSES_CONFIG) - $(INSTALL_SCRIPT) $(ADACURSES_CONFIG) $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG) +install.libs :: \ + $(GEN_TARGETS) \ + $(BINDIR) \ + $(ADACURSES_CONFIG) + $(INSTALL_SCRIPT) $(ADACURSES_CONFIG) $(BINDIR)/$(ADACURSES_CONFIG) uninstall \ uninstall.libs :: - -rm -f $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG) + -rm -f $(BINDIR)/$(ADACURSES_CONFIG) $(PROG_GENERATE): gen.o @ECHO_LD@ $(LINK) $(CFLAGS_NORMAL) gen.o $(ACTUAL_LDFLAGS) -o $@ + @$(PROG_GENERATE) "-?" + @echo "... made $@" gen.o: $(srcdir)/gen.c $(HOST_CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/gen.c diff --git a/Ada95/gen/adacurses-config.in b/Ada95/gen/adacurses-config.in index a539417..742e9c6 100644 --- a/Ada95/gen/adacurses-config.in +++ b/Ada95/gen/adacurses-config.in @@ -1,7 +1,7 @@ #! /bin/sh -# $Id: adacurses-config.in,v 1.15 2022/07/16 21:16:43 tom Exp $ +# $Id: adacurses-config.in,v 1.17 2025/11/12 00:56:49 Branden.Robinson Exp $ ############################################################################## -# Copyright 2019-2020,2022 Thomas E. Dickey # +# Copyright 2019-2022,2025 Thomas E. Dickey # # Copyright 2007-2014,2016 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -31,7 +31,7 @@ # # This script returns the options to add to `gnatmake' for using AdaCurses. -DESTDIR=@DESTDIR@ +: "${@SET_DESTDIR@}" prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ @@ -66,14 +66,14 @@ case "x$1" in Usage: ${THIS_CFG} [options] Options: - --cflags echos the gnat (Ada compiler) flags needed to compile with ${THIS} - --libs echos the gnat libraries needed to link with ${THIS} + --cflags echoes the gnat (Ada compiler) flags needed to compile with ${THIS} + --libs echoes the gnat libraries needed to link with ${THIS} - --version echos the release+patchdate version of ${THIS} + --version echoes the release+patchdate version of ${THIS} --help prints this message -If no options are given, echos the full set of flags needed by gnatmake. +If no options are given, echoes the full set of flags needed by gnatmake. ENDHELP ;; *) diff --git a/Ada95/gen/gen.c b/Ada95/gen/gen.c index b37de1b..21f54a5 100644 --- a/Ada95/gen/gen.c +++ b/Ada95/gen/gen.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020-2021,2024 Thomas E. Dickey * + * Copyright 2020-2024,2025 Thomas E. Dickey * * Copyright 1998-2014,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -35,7 +35,7 @@ /* Version Control - $Id: gen.c,v 1.79 2024/01/19 13:41:45 tom Exp $ + $Id: gen.c,v 1.84 2025/11/12 00:49:19 Branden.Robinson Exp $ --------------------------------------------------------------------------*/ /* This program prints on its standard output the source for the @@ -189,7 +189,7 @@ find_pos(const UCHAR * const data, int main(int argc, const char *argv[]) { - FILE *fp = 0; + FILE *fp = NULL; const int x = 0x12345678; little_endian = (*((const char *)&x) == 0x78); @@ -203,6 +203,10 @@ main(int argc, const char *argv[]) { fp = fopen(argv[2], "wb"); } + else if (argc == 2 && !strcmp(argv[1], "-?")) + { + return EXIT_SUCCESS; + } else if (argc == 2) { fp = stdout; @@ -301,7 +305,7 @@ main(int argc, const char *argv[]) PRINT_NAMED_CONSTANT(E_INVALID_FIELD); PRINT_NAMED_CONSTANT(E_CURRENT); - print_comment(fp, "Input key codes not defined in any ncurses manpage"); + print_comment(fp, "Input key codes not defined in any ncurses man page"); PRINT_NAMED_CONSTANT(KEY_MIN); PRINT_NAMED_CONSTANT(KEY_MAX); #ifdef KEY_CODE_YES diff --git a/Ada95/include/Makefile.in b/Ada95/include/Makefile.in index 89bb27d..1bb1aa6 100644 --- a/Ada95/include/Makefile.in +++ b/Ada95/include/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.7 2021/07/03 15:45:33 tom Exp $ +# $Id: Makefile.in,v 1.8 2025/10/18 15:23:07 tom Exp $ ############################################################################## -# Copyright 2020,2021 Thomas E. Dickey # +# Copyright 2020-2021,2025 Thomas E. Dickey # # Copyright 2010-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -44,7 +44,8 @@ SHELL = @SHELL@ VPATH = @srcdir@ THIS = Makefile -DESTDIR = @DESTDIR@ +@SET_DESTDIR@ + srcdir = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ diff --git a/Ada95/include/ncurses_cfg.hin b/Ada95/include/ncurses_cfg.hin index f8bcb66..c19ac8a 100644 --- a/Ada95/include/ncurses_cfg.hin +++ b/Ada95/include/ncurses_cfg.hin @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2024 Thomas E. Dickey * * Copyright 2005-2017,2018 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -31,7 +31,7 @@ * Author: Thomas E. Dickey 1997 * ****************************************************************************/ /* - * $Id: ncurses_cfg.hin,v 1.11 2020/02/02 23:34:34 tom Exp $ + * $Id: ncurses_cfg.hin,v 1.13 2024/06/08 14:04:14 tom Exp $ * * This is a template-file used to generate the "ncurses_cfg.h" file. * @@ -41,7 +41,7 @@ * * See: * https://invisible-island.net/autoconf/ - * ftp://ftp.invisible-island.net/autoconf/ + * https://invisible-island.net/archives/autoconf/ */ #ifndef NC_CONFIG_H #define NC_CONFIG_H diff --git a/Ada95/make-tar.sh b/Ada95/make-tar.sh index 083812d..a964150 100755 --- a/Ada95/make-tar.sh +++ b/Ada95/make-tar.sh @@ -1,7 +1,7 @@ #!/bin/sh -# $Id: make-tar.sh,v 1.23 2022/11/05 20:29:41 tom Exp $ +# $Id: make-tar.sh,v 1.26 2025/06/20 19:42:53 tom Exp $ ############################################################################## -# Copyright 2019-2021,2022 Thomas E. Dickey # +# Copyright 2019-2022,2025 Thomas E. Dickey # # Copyright 2010-2015,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -44,6 +44,7 @@ TARGET=`pwd` # make timestamps of generated files predictable same_timestamp() { + [ -f ../NEWS ] || echo "OOPS $1" touch -r ../NEWS "$1" } @@ -61,10 +62,12 @@ grep_patchdate() { # The rpm spec-file in the ncurses tree is a template. Fill in the version # information from dist.mk edit_specfile() { + RPM_DATE=`date +'%a %b %d %Y' -d "$NCURSES_PATCH"` sed \ -e "s/\\/$NCURSES_MAJOR/g" \ -e "s/\\/$NCURSES_MINOR/g" \ - -e "s/\\/$NCURSES_PATCH/g" "$1" >"$1.new" + -e "s/\\/$NCURSES_PATCH/g" \ + -e "s/\\/$RPM_DATE/g" "$1" >"$1.new" chmod u+w "$1" mv "$1.new" "$1" same_timestamp "$1" @@ -73,7 +76,7 @@ edit_specfile() { make_changelog() { [ -f "$1" ] && chmod u+w "$1" cat >"$1" <MANIFEST ) -same_timestamp $BUILD/$ROOTNAME/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 {} \; -find $BUILD/$ROOTNAME -type d -exec rmdir {} \; 2>/dev/null -find $BUILD/$ROOTNAME -type d -exec rmdir {} \; 2>/dev/null -find $BUILD/$ROOTNAME -type d -exec rmdir {} \; 2>/dev/null +find "$BUILD/$ROOTNAME" -type d -exec rmdir {} \; 2>/dev/null +find "$BUILD/$ROOTNAME" -type d -exec rmdir {} \; 2>/dev/null +find "$BUILD/$ROOTNAME" -type d -exec rmdir {} \; 2>/dev/null # There is no need for this script in the tar file. -rm -f $ROOTNAME/make-tar.sh +rm -f "$ROOTNAME"/make-tar.sh # Remove build-artifacts. find . -name "*.gz" -exec rm -rf {} \; @@ -165,10 +168,10 @@ chmod -R u+w . # Cleanup timestamps [ -n "$TOUCH_DIRS" ] && "$TOUCH_DIRS" "$ROOTNAME" -tar cf - $TAR_OPTIONS $ROOTNAME | gzip >"$DESTDIR/$ROOTNAME.tar.gz" +tar cf - $TAR_OPTIONS "$ROOTNAME" | gzip >"$DESTDIR/$ROOTNAME.tar.gz" cd "$DESTDIR" || exit pwd -ls -l $ROOTNAME.tar.gz +ls -l "$ROOTNAME".tar.gz # vi:ts=4 sw=4 diff --git a/Ada95/package/AdaCurses-doc.spec b/Ada95/package/AdaCurses-doc.spec index c5b68dd..a5aee9c 100644 --- a/Ada95/package/AdaCurses-doc.spec +++ b/Ada95/package/AdaCurses-doc.spec @@ -3,13 +3,13 @@ Summary: AdaCurses - Ada95 binding documentation for ncurses %define AppVersion MAJOR.MINOR %define AppRelease YYYYMMDD %define AppPackage %{AppProgram}-doc -# $Id: AdaCurses-doc.spec,v 1.7 2019/11/23 21:15:53 tom Exp $ +# $Id: AdaCurses-doc.spec,v 1.10 2025/06/21 18:34:55 tom Exp $ Name: %{AppPackage} Version: %{AppVersion} Release: %{AppRelease} -License: MIT +License: X11 License Distribution Modification Variant Group: Applications/Development -URL: ftp://ftp.invisible-island.net/%{AppProgram} +URL: https://invisible-island.net/%{AppProgram} Source0: %{AppProgram}-%{AppRelease}.tgz Packager: Thomas Dickey @@ -51,6 +51,9 @@ exit 0 %changelog # each patch should add its ChangeLog entries here +* RPM_DATE Thomas Dickey +- testing ncurses MAJOR.MINOR.YYYYMMDD + * Sat Nov 16 2019 Thomas Dickey - modify clean-rule to work around Fedora NFS bugs. diff --git a/Ada95/package/AdaCurses.spec b/Ada95/package/AdaCurses.spec index 540e8e5..64e9a19 100644 --- a/Ada95/package/AdaCurses.spec +++ b/Ada95/package/AdaCurses.spec @@ -2,13 +2,13 @@ Summary: Ada95 binding for ncurses %define AppProgram AdaCurses %define AppVersion MAJOR.MINOR %define AppRelease YYYYMMDD -# $Id: AdaCurses.spec,v 1.31 2022/12/18 00:08:17 tom Exp $ +# $Id: AdaCurses.spec,v 1.36 2025/06/21 18:34:55 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppRelease} -License: MIT +License: X11 License Distribution Modification Variant Group: Applications/Development -URL: ftp://ftp.invisible-island.net/%{AppProgram} +URL: https://invisible-island.net/%{AppProgram} Source0: %{AppProgram}-%{AppRelease}.tgz Packager: Thomas Dickey @@ -69,6 +69,7 @@ INSTALL_PROGRAM='${INSTALL}' \ --disable-rpath-link \ --disable-echo \ --verbose \ + --with-screen=ncursesw6dev \ --enable-warnings make @@ -106,6 +107,9 @@ exit 0 %changelog # each patch should add its ChangeLog entries here +* RPM_DATE Thomas Dickey +- testing ncurses MAJOR.MINOR.YYYYMMDD + * Sat Dec 17 2022 Thomas Dickey - install sample programs in libexec diff --git a/Ada95/package/debian/adacurses.lintian-overrides b/Ada95/package/debian/adacurses.lintian-overrides new file mode 100644 index 0000000..1e4bd36 --- /dev/null +++ b/Ada95/package/debian/adacurses.lintian-overrides @@ -0,0 +1,4 @@ +# $Id: adacurses.lintian-overrides,v 1.1 2025/06/14 19:16:06 tom Exp $ + +# dh_fixperms sets *.ali to 444, but lintian disagrees +non-standard-file-perm 0444 != 0644 [usr/lib/ada/adalib/*.ali] diff --git a/package/debian/ncurses6.triggers b/Ada95/package/debian/adacurses.triggers similarity index 100% rename from package/debian/ncurses6.triggers rename to Ada95/package/debian/adacurses.triggers diff --git a/Ada95/package/debian/control b/Ada95/package/debian/control index 1a9aefd..81b2216 100644 --- a/Ada95/package/debian/control +++ b/Ada95/package/debian/control @@ -3,9 +3,10 @@ Maintainer: Thomas E. Dickey Section: misc Priority: optional Build-Depends: debhelper (>= 5), + chrpath, gnat, gprbuild -Homepage: https://invisible-island.net/adacurses/ +Homepage: https://invisible-island.net/ncurses/ncurses-Ada95.html Standards-Version: 4.6.1.0 Package: adacurses diff --git a/Ada95/package/debian/copyright b/Ada95/package/debian/copyright index b406015..3acd2d0 100644 --- a/Ada95/package/debian/copyright +++ b/Ada95/package/debian/copyright @@ -1,79 +1,60 @@ -Upstream source https://invisible-island.net/ncurses/Ada95.html +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: AdaCurses +Upstream-Contact: Thomas E. Dickey +Source: https://invisible-island.net/ncurses/Ada95.html -Current ncurses maintainer: Thomas Dickey - -------------------------------------------------------------------------------- Files: * -Copyright: 2017-2023,2024 by Thomas E. Dickey +Copyright: 2017-2024,2025 by Thomas E. Dickey Copyright: 1998-2016,2017 Free Software Foundation, Inc. -License: X11 +License: X11 License Distribution Modification Variant + 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. +Comment: + https://invisible-island.net/ncurses/ncurses-license.html -Files: aclocal.m4 package -Copyright: 2010-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 - "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. - -------------------------------------------------------------------------------- -Files: install-sh -Copyright: 1994 X Consortium -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 - deal in the Software without restriction, including without limitation the - rights to use, copy, modify, merge, publish, distribute, 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 - X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- - TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the name of the X Consortium shall not - be used in advertising or otherwise to promote the sale, use or other deal- - ings in this Software without prior written authorization from the X Consor- - tium. - - FSF changes to this file are in the public domain. - - Calling this script install-sh is preferred over install.sh, to prevent - `make' implicit rules from creating a file called install from it - when there is no Makefile. - - This script is compatible with the BSD install script, but was written - from scratch. It can only install one file at a time, a restriction - shared with many OS's install programs. - -On Debian systems, the complete text of the GNU General -Public License can be found in '/usr/share/common-licenses/GPL-2' - --- vile: txtmode file-encoding=utf-8 +Files: install-sh +Copyright: 1994 X Consortium +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 + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, 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 LISTED COPYRIGHT HOLDER(S) 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. +Comment: vile: txtmode file-encoding=utf-8 diff --git a/Ada95/package/debian/rules b/Ada95/package/debian/rules index 0adde8d..d46d6e3 100755 --- a/Ada95/package/debian/rules +++ b/Ada95/package/debian/rules @@ -1,11 +1,18 @@ #!/usr/bin/make -f -# MAde with the aid of dh_make, by Craig Small +# $Id: rules,v 1.18 2025/06/14 20:41:28 tom Exp $ +# Made with the aid of dh_make, by Craig Small # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. # Some lines taken from debmake, by Cristoph Lameter. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +SHELL = /bin/bash +DPKG_EXPORT_BUILDFLAGS = 1 +export DEB_BUILD_MAINT_OPTIONS := hardening=+all qa=+bug reproducible=+all + +include /usr/share/dpkg/buildflags.mk + # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -13,10 +20,7 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) TARGET_DIR = $(CURDIR)/debian/adacurses SAMPLE_DIR = $(TARGET_DIR)/usr/libexec/AdaCurses - -CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(CC_NORMAL) -CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) -LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) +OUR_LIBDIR = /usr/lib/$(DEB_HOST_GNU_TYPE) ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -27,20 +31,21 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif +verbose = # -v configure: configure-stamp configure-stamp: dh_testdir - CFLAGS="$(CFLAGS)" \ - CPPFLAGS="$(CPPFLAGS)" \ - LDFLAGS="$(LDFLAGS)" ./configure \ + ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ + --libdir=$(OUR_LIBDIR) \ --prefix=/usr \ --disable-rpath-link \ --with-shared \ --with-ada-sharedlib \ + --with-screen=ncursesw6td \ --without-pkg-config touch configure-stamp @@ -61,14 +66,14 @@ clean: rm -f configure-stamp build-stamp install-stamp - dh_clean + dh_clean $(verbose) install: install-stamp install-stamp: build-stamp dh_testdir dh_testroot - dh_prep - dh_installdirs + dh_prep $(verbose) + dh_installdirs $(verbose) $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -76,6 +81,8 @@ install-stamp: build-stamp ( cd samples && $(MAKE) install.examples DESTDIR=$(TARGET_DIR) BINDIR=$(SAMPLE_DIR) ) ( cd doc && $(MAKE) install.html DESTDIR=$(TARGET_DIR) ) + find $(TARGET_DIR) -type f -name '*.so*' -print -exec chrpath -d {} \; + touch install-stamp # Build architecture-independent files here. @@ -86,18 +93,19 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot - dh_installdocs - dh_installexamples - dh_installchangelogs NEWS - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_makeshlibs - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb + dh_lintian $(verbose) + dh_installdocs $(verbose) + dh_installexamples $(verbose) + dh_installchangelogs $(verbose) NEWS + dh_strip $(verbose) + dh_compress $(verbose) + dh_fixperms $(verbose) + dh_installdeb $(verbose) + dh_makeshlibs $(verbose) + dh_shlibdeps $(verbose) -l$(OUR_LIBDIR) + dh_gencontrol $(verbose) + dh_md5sums $(verbose) + dh_builddeb $(verbose) binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install install-stamp diff --git a/Ada95/package/debian/watch b/Ada95/package/debian/watch index 1b870ba..5a8f1d2 100644 --- a/Ada95/package/debian/watch +++ b/Ada95/package/debian/watch @@ -1,4 +1,4 @@ version=3 -opts=passive ftp://ftp.invisible-island.net/AdaCurses/AdaCurses-([\d.]+)\.tgz \ +opts=passive https://invisible-island.net/archives/AdaCurses/AdaCurses-([\d.]+)\.tgz \ debian uupdate diff --git a/Ada95/samples/Makefile.in b/Ada95/samples/Makefile.in index 3731085..d3cee07 100644 --- a/Ada95/samples/Makefile.in +++ b/Ada95/samples/Makefile.in @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2018-2020,2021 Thomas E. Dickey # +# Copyright 2018-2024,2025 Thomas E. Dickey # # Copyright 1998-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -29,7 +29,7 @@ # # Author: Juergen Pfeifer, 1996 # -# $Id: Makefile.in,v 1.64 2021/07/03 15:45:33 tom Exp $ +# $Id: Makefile.in,v 1.67 2025/10/18 13:40:00 tom Exp $ # .SUFFIXES: @@ -37,6 +37,8 @@ SHELL = @SHELL@ VPATH = @srcdir@ THIS = Makefile +@SET_DESTDIR@ + x = @EXEEXT@ srcdir = @srcdir@ @@ -78,9 +80,9 @@ LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ RANLIB = @RANLIB@ ################################################################################ -BINDIR = $(DESTDIR)$(bindir) -DATADIR = $(DESTDIR)$(datadir) -LIBDIR = $(DESTDIR)$(libdir) +BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@) +DATADIR = $(DESTDIR)$(datadir@MERGE_PREFIX@) +LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@) MY_DATADIR = $(DATADIR)/@ADA_LIBNAME@ THIS_DATADIR = $(datadir)/@ADA_LIBNAME@ @@ -133,7 +135,7 @@ sources : libs \ install \ -install.libs :: +install.libs :: $(PROGS) @echo made $@ uninstall \ diff --git a/Ada95/samples/sample-explanation.adb_p b/Ada95/samples/sample-explanation.adb_p index f99ceb6..79348e9 100644 --- a/Ada95/samples/sample-explanation.adb_p +++ b/Ada95/samples/sample-explanation.adb_p @@ -7,7 +7,7 @@ -- B O D Y -- -- -- ------------------------------------------------------------------------------ --- Copyright 2019,2020 Thomas E. Dickey -- +-- Copyright 2019-2020,2025 Thomas E. Dickey -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files (the -- @@ -35,8 +35,8 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control --- $Revision: 1.5 $ --- $Date: 2020/02/02 23:34:34 $ +-- $Revision: 1.6 $ +-- $Date: 2025/01/24 20:39:23 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ -- Poor mans help system. This scans a sequential file for key lines and @@ -136,7 +136,7 @@ package body Sample.Explanation is H : Help_Line_Access := Top_Line; begin if Top_Line /= null then - for L in 0 .. (Height - 1) loop + for L in 0 .. Height - 1 loop Add (W, L, 0, H.all.Line.all); exit when H.all.Next = null; H := H.all.Next; diff --git a/Ada95/samples/sample-menu_demo-handler.adb b/Ada95/samples/sample-menu_demo-handler.adb index ebbaf43..eab03f1 100644 --- a/Ada95/samples/sample-menu_demo-handler.adb +++ b/Ada95/samples/sample-menu_demo-handler.adb @@ -16,7 +16,7 @@ -- 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 : -- +-- 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. -- @@ -36,7 +36,7 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control --- $Revision: 1.17 $ +-- $Revision: 1.18 $ -- $Date: 2020/02/02 23:34:34 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ diff --git a/Ada95/src/Makefile.in b/Ada95/src/Makefile.in index eb4489b..ec12cf6 100644 --- a/Ada95/src/Makefile.in +++ b/Ada95/src/Makefile.in @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2018-2020,2021 Thomas E. Dickey # +# Copyright 2018-2024,2025 Thomas E. Dickey # # Copyright 1999-2016,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -29,7 +29,7 @@ # # Author: Juergen Pfeifer, 1996 # -# $Id: Makefile.in,v 1.96 2021/07/03 15:45:33 tom Exp $ +# $Id: Makefile.in,v 1.102 2025/10/18 13:35:27 tom Exp $ # .SUFFIXES: @@ -37,13 +37,12 @@ SHELL = @SHELL@ VPATH = @srcdir@ THIS = Makefile -ADA_MFLAGS = @cf_cv_makeflags@ +ADA_MFLAGS = @SET_MAKE@ +@SET_DESTDIR@ MODEL = ../../@DFT_OBJ_SUBDIR@ -DESTDIR = @DESTDIR@ - top_srcdir = @top_srcdir@ srcdir = @srcdir@ prefix = @prefix@ @@ -51,7 +50,7 @@ exec_prefix = @exec_prefix@ includedir = @includedir@ libdir = @libdir@ -LIBDIR = $(DESTDIR)$(libdir) +LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@) ADA_INCLUDE = $(DESTDIR)@ADA_INCLUDE@ ADA_OBJECTS = $(DESTDIR)@ADA_OBJECTS@ @@ -284,9 +283,11 @@ STATIC_DIRS = \ $(BUILD_DIR)/static-obj @USE_GNAT_PROJECTS@$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \ -@USE_GNAT_PROJECTS@ $(ABASE)-trace.adb \ -@USE_GNAT_PROJECTS@ $(STATIC_C_OBJS) \ @USE_GNAT_PROJECTS@ $(STATIC_DIRS) +@USE_GNAT_PROJECTS@$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \ +@USE_GNAT_PROJECTS@ $(ABASE)-trace.adb \ +@USE_GNAT_PROJECTS@ $(STATIC_C_OBJS) +@USE_GNAT_PROJECTS@ @echo "Making $@" @USE_GNAT_PROJECTS@ @cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@ @USE_GNAT_PROJECTS@ -rm -f $(GNAT_PROJECT) @USE_GNAT_PROJECTS@ $(SHELL) $(srcdir)/library-cfg.sh static library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT) @@ -320,6 +321,7 @@ STATIC_DIRS = \ #NEW:BEGIN #@USE_GNAT_LIBRARIES@install \ #@USE_GNAT_LIBRARIES@install.libs :: +#@USE_GNAT_LIBRARIES@ @echo "Making $@" #@USE_GNAT_LIBRARIES@ @cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@ #@USE_GNAT_LIBRARIES@ -rm -f $(GNAT_PROJECT) #@USE_GNAT_LIBRARIES@ $(SHELL) $(srcdir)/library-cfg.sh static library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT) @@ -344,6 +346,7 @@ uninstall.libs :: #NEW:BEGIN #@USE_GNAT_LIBRARIES@uninstall \ #@USE_GNAT_LIBRARIES@uninstall.libs :: +#@USE_GNAT_LIBRARIES@ @echo "Making $@" #@USE_GNAT_LIBRARIES@ @cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@ #@USE_GNAT_LIBRARIES@ -rm -f $(GNAT_PROJECT) #@USE_GNAT_LIBRARIES@ $(SHELL) $(srcdir)/library-cfg.sh static library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT) @@ -369,9 +372,11 @@ SHARED_DIRS = \ @MAKE_ADA_SHAREDLIB@all :: $(BUILD_DIR_LIB)/$(SHARED_LIBNAME) @MAKE_ADA_SHAREDLIB@$(BUILD_DIR_LIB)/$(SHARED_LIBNAME) :: \ +@MAKE_ADA_SHAREDLIB@ $(SHARED_DIRS) +@MAKE_ADA_SHAREDLIB@$(BUILD_DIR_LIB)/$(SHARED_LIBNAME) :: \ @MAKE_ADA_SHAREDLIB@ $(ABASE)-trace.adb \ -@MAKE_ADA_SHAREDLIB@ $(SHARED_DIRS) \ @MAKE_ADA_SHAREDLIB@ $(SHARED_OBJS) +@MAKE_ADA_SHAREDLIB@ @echo "Making $@" @MAKE_ADA_SHAREDLIB@ cp $(SHARED_OBJS) $(BUILD_DIR)/dynamic-obj/ @MAKE_ADA_SHAREDLIB@ @cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@ @MAKE_ADA_SHAREDLIB@ -rm -f $(GNAT_PROJECT) diff --git a/Ada95/src/library.gpr.in b/Ada95/src/library.gpr.in index 37cbb9d..b256b07 100644 --- a/Ada95/src/library.gpr.in +++ b/Ada95/src/library.gpr.in @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------ --- Copyright 2019,2020 Thomas E. Dickey -- +-- Copyright 2019-2020,2025 Thomas E. Dickey -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files (the -- @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------ --- $Id: library.gpr.in,v 1.3 2020/06/27 20:47:40 tom Exp $ +-- $Id: library.gpr.in,v 1.5 2025/10/04 20:20:42 tom Exp $ -- http://gcc.gnu.org/onlinedocs/gnat_ugn_unw/Library-Projects.html -- http://www.adaworld.com/debian/debian-ada-policy.html project AdaCurses is @@ -43,7 +43,7 @@ project AdaCurses is for Source_Dirs use (Source_Dir & "/src", Source_Dir2, Build_Dir & "/src"); - -- for Library_Options use ("-lncurses@USE_LIB_SUFFIX@", "-lpanel@USE_LIB_SUFFIX@", "-lmenu@USE_LIB_SUFFIX@", "-lform@USE_LIB_SUFFIX@"); + -- for Library_Options use ("-lncurses@ABI_SUFFIX@", "-lpanel@ABI_SUFFIX@", "-lmenu@ABI_SUFFIX@", "-lform@ABI_SUFFIX@"); package Compiler is for Default_Switches ("Ada") use ("-g", diff --git a/Ada95/src/modules b/Ada95/src/modules index 29a0d8b..cb1fb84 100644 --- a/Ada95/src/modules +++ b/Ada95/src/modules @@ -1,6 +1,6 @@ -# $Id: modules,v 1.4 2020/02/02 23:34:34 tom Exp $ +# $Id: modules,v 1.5 2024/06/15 20:51:03 tom Exp $ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2024 Thomas E. Dickey # # Copyright 2010 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -69,3 +69,5 @@ $(ABASE)-text_io-decimal_io $(srcdir) $(srcdir) body $(ABASE)-text_io-enumeration_io $(srcdir) $(srcdir) body $(ABASE)-text_io-modular_io $(srcdir) $(srcdir) body $(ABASE)-text_io-complex_io $(srcdir) $(srcdir) body + +# vile:makemode diff --git a/Ada95/src/terminal_interface-curses-forms.adb b/Ada95/src/terminal_interface-curses-forms.adb index f50420e..2e6fd16 100644 --- a/Ada95/src/terminal_interface-curses-forms.adb +++ b/Ada95/src/terminal_interface-curses-forms.adb @@ -7,7 +7,7 @@ -- B O D Y -- -- -- ------------------------------------------------------------------------------ --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2025 Thomas E. Dickey -- -- Copyright 1999-2011,2014 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -36,8 +36,8 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- $Revision: 1.33 $ --- $Date: 2020/02/02 23:34:34 $ +-- $Revision: 1.34 $ +-- $Date: 2025/01/24 20:39:23 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with Ada.Unchecked_Deallocation; @@ -1006,7 +1006,7 @@ package body Terminal_Interface.Curses.Forms is (Field_Array, Field_Array_Access); begin if FA /= null and then Free_Fields then - for I in FA'First .. (FA'Last - 1) loop + for I in FA'First .. FA'Last - 1 loop if FA.all (I) /= Null_Field then Delete (FA.all (I)); end if; diff --git a/Ada95/src/terminal_interface-curses-menus.adb b/Ada95/src/terminal_interface-curses-menus.adb index 76f3e36..9febcf9 100644 --- a/Ada95/src/terminal_interface-curses-menus.adb +++ b/Ada95/src/terminal_interface-curses-menus.adb @@ -7,7 +7,7 @@ -- B O D Y -- -- -- ------------------------------------------------------------------------------ --- Copyright 2018,2020 Thomas E. Dickey -- +-- Copyright 2018-2020,2025 Thomas E. Dickey -- -- Copyright 1999-2011,2014 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -36,8 +36,8 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- $Revision: 1.34 $ --- $Date: 2020/02/02 23:34:34 $ +-- $Revision: 1.35 $ +-- $Date: 2025/01/24 20:39:23 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with Ada.Unchecked_Deallocation; @@ -878,7 +878,7 @@ package body Terminal_Interface.Curses.Menus is (Item_Array, Item_Array_Access); begin if IA /= null and then Free_Items then - for I in IA'First .. (IA'Last - 1) loop + for I in IA'First .. IA'Last - 1 loop if IA.all (I) /= Null_Item then Delete (IA.all (I)); end if; diff --git a/Ada95/src/terminal_interface-curses-panels-user_data.adb b/Ada95/src/terminal_interface-curses-panels-user_data.adb index 504b07d..4a951a4 100644 --- a/Ada95/src/terminal_interface-curses-panels-user_data.adb +++ b/Ada95/src/terminal_interface-curses-panels-user_data.adb @@ -7,7 +7,7 @@ -- B O D Y -- -- -- ------------------------------------------------------------------------------ --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2025 Thomas E. Dickey -- -- Copyright 1999-2003,2009 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -36,7 +36,7 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- $Revision: 1.13 $ +-- $Revision: 1.14 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with Interfaces.C; diff --git a/MANIFEST b/MANIFEST index a9395d2..dc791db 100644 --- a/MANIFEST +++ b/MANIFEST @@ -36,6 +36,8 @@ ./Ada95/mk-pkg.awk ./Ada95/package/AdaCurses-doc.spec ./Ada95/package/AdaCurses.spec +./Ada95/package/debian/adacurses.lintian-overrides +./Ada95/package/debian/adacurses.triggers ./Ada95/package/debian/compat ./Ada95/package/debian/control ./Ada95/package/debian/copyright @@ -556,21 +558,18 @@ ./include/headers ./include/nc_access.h ./include/nc_alloc.h -./include/nc_mingw.h ./include/nc_panel.h ./include/nc_string.h ./include/nc_termios.h ./include/nc_tparm.h -./include/nc_win32.h +./include/nc_win32.h.in ./include/ncurses_cfg.hin ./include/ncurses_defs ./include/ncurses_dll.h.in -./include/ncurses_mingw.h ./include/term_entry.h ./include/termcap.h.in ./include/tic.h ./include/unctrl.h.in -./include/win32_curses.h ./install-sh ./man/MKada_config.in ./man/MKncu_config.in @@ -900,6 +899,7 @@ ./ncurses/llib-ltinfow ./ncurses/modules ./ncurses/new_pair.h +./ncurses/report_ctype.c ./ncurses/report_hashing.c ./ncurses/report_offsets.c ./ncurses/term.priv.h @@ -1007,12 +1007,11 @@ ./ncurses/win32con/gettimeofday.c ./ncurses/win32con/wcwidth.c ./ncurses/win32con/win32_driver.c -./ncurses/win32con/win_driver.c ./package/debian-mingw/changelog ./package/debian-mingw/compat ./package/debian-mingw/control ./package/debian-mingw/copyright -./package/debian-mingw/mingw32-ncurses6.lintian-overrides +./package/debian-mingw/mingw32-ncurses6td.lintian-overrides ./package/debian-mingw/rules ./package/debian-mingw/source/format ./package/debian-mingw/watch @@ -1020,7 +1019,7 @@ ./package/debian-mingw64/compat ./package/debian-mingw64/control ./package/debian-mingw64/copyright -./package/debian-mingw64/mingw64-ncurses6.lintian-overrides +./package/debian-mingw64/mingw64-ncurses6td.lintian-overrides ./package/debian-mingw64/rules ./package/debian-mingw64/source/format ./package/debian-mingw64/watch @@ -1028,10 +1027,10 @@ ./package/debian/compat ./package/debian/control ./package/debian/copyright -./package/debian/ncurses6.lintian-overrides -./package/debian/ncurses6.triggers -./package/debian/ncursest6.lintian-overrides -./package/debian/ncursest6.triggers +./package/debian/ncurses6td.lintian-overrides +./package/debian/ncurses6td.triggers +./package/debian/ncursest6td.lintian-overrides +./package/debian/ncursest6td.triggers ./package/debian/rules ./package/debian/source/format ./package/debian/watch @@ -1190,6 +1189,8 @@ ./test/package/debian/control ./test/package/debian/copyright ./test/package/debian/docs +./test/package/debian/ncurses-examples.lintian-overrides +./test/package/debian/ncursest-examples.lintian-overrides ./test/package/debian/rules ./test/package/debian/source/format ./test/package/debian/watch diff --git a/Makefile.in b/Makefile.in index 1303e17..9a55006 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.46 2022/10/01 22:53:36 tom Exp $ +# $Id: Makefile.in,v 1.51 2025/10/25 18:01:01 tom Exp $ ############################################################################## -# Copyright 2018-2021,2022 Thomas E. Dickey # +# Copyright 2018-2022,2025 Thomas E. Dickey # # Copyright 1998-2014,2015 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -35,11 +35,10 @@ SHELL = @SHELL@ VPATH = @srcdir@ -DESTDIR=@DESTDIR@ -RPATH_LIST=@RPATH_LIST@ -TOP_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)" - @SET_MAKE@ +@SET_DESTDIR@ +RPATH_LIST = @RPATH_LIST@ +TOP_MFLAGS = DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)" NCURSES_MAJOR = @NCURSES_MAJOR@ NCURSES_MINOR = @NCURSES_MINOR@ @@ -93,6 +92,7 @@ preinstall : @ echo '' @ echo ' extended funcs: '`test @NCURSES_EXT_FUNCS@ != 0 && echo yes || echo no` @ echo ' xterm terminfo: '@WHICH_XTERM@ + @ echo ' ABI suffix: '`if test -n "@ABI_SUFFIX@"; then echo @ABI_SUFFIX@; else echo "(none)"; fi` @ echo '' @ echo ' bin directory: '$(bindir) @ echo ' lib directory: '$(libdir) @@ -114,13 +114,10 @@ preinstall : distclean \ realclean :: -check : - @ echo The test-programs are interactive - - # Put the common rules here so that we can easily construct the list of # directories to visit. all \ +check \ clean \ distclean \ mostlyclean \ diff --git a/Makefile.os2 b/Makefile.os2 index bc3407d..68d4f89 100644 --- a/Makefile.os2 +++ b/Makefile.os2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2020,2021 Thomas E. Dickey # +# Copyright 2020-2021,2025 Thomas E. Dickey # # Copyright 1998-2000,2006 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ################################################################################ -# $Id: Makefile.os2,v 1.13 2021/06/17 21:20:30 tom Exp $ +# $Id: Makefile.os2,v 1.15 2025/07/12 10:48:01 tom Exp $ # # Wrapper Makefile for ncurses library under OS/2. # Author: Juan Jose Garcia Ripoll . @@ -247,7 +247,7 @@ OS2NAME=ncurses-$(NCURSES_MAJOR).$(NCURSES_MINOR)-emx os2dist : $(MAKE) -f Makefile.os2 os2clean ./configure --without-debug --with-install-prefix=`pwd|sed -e 's@^.:@@'`/$(OS2NAME) - $(MAKE) -f Makefile.os2 $(CF_MFLAGS) install.os2 + $(MAKE) -f Makefile.os2 install.os2 -rm -f $(OS2NAME).zip echo NCurses-$(NCURSES_MAJOR).$(NCURSES_MINOR)-$(NCURSES_PATCH) for emx > $(OS2NAME)/FILE_ID.DIZ echo Binary release. >> $(OS2NAME)/FILE_ID.DIZ diff --git a/NEWS b/NEWS index 8bedbc8..c10767b 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2018-2023,2024 Thomas E. Dickey -- +-- Copyright 2018-2024,2025 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: NEWS,v 1.4114 2024/04/27 18:00:35 tom Exp $ +-- $Id: NEWS,v 1.4390 2025/12/30 20:31:07 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,575 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20251230 6.6 release for upload to ftp.gnu.org + + update announcement + + corrected an ifdef needed for mouse support in MinGW/Windows + + eliminate remaining duplicate code between MinGW/Windows drivers + +20251227 + + make win32_curses.h obsolete in favor of nc_win32.h + + modify MinGW32 configuration to account for its use of Windows-style + pathnames in filesystem checks. + + replace --enable-exp-win32 option with --enable-named-pipes + +20251220 + > in-progress work to merge MinGW/Windows port. + + eliminate EXP_WIN32_DRIVER with USE_NAMED_PIPES + + change MS_TERMINAL to DEFAULT_TERM_VAR + +20251213 + + in-progress work to merge MinGW/Windows port. + + add a null-pointer check in tic -c option. + + add a limit-check in infocmp -i option (report/example by Yixuan Cao). + +20251206 + + in-progress work to merge MinGW/Windows port. + +20251129 + + in-progress work to merge MinGW/Windows port. + +20251123 + + revert change using NCURSES_SBOOL in tic.h which interfered with + sign-extension in tigetflag (Debian #1121191, cf: 20251101). + +20251122 + + in-progress work to merge MinGW/Windows port. + + correct expression for TINFO_LIB variable in misc/ncurses-config.in + (Debian #1121208, cf: 20251004). + +20251115 + + check for special case of wcrtomb() converting a single byte code to + a different single byte code, which glibc does for code 160 in the + KOI8-R encoding (report by Yury V Zaytsev). + + improve formatting/style of manpages (patches by Branden Robinson). + + amend recent changes to mouse handling to avoid a case which caused + a loop in wgetch until additional input is provided (htop #1769, + cf: 20250913). + +20251101 + + adjust generated terminfo.5 to omit tbl "x" column modifier if that + is unsupported, i.e., with old nroff/tbl (adapted from patch by + Branden Robinson). + + in-progress work to merge MinGW/Windows port. + +20251025 + + amend locale-portability fix in tty_update.c (MidnightCommander #4799, + cf: 20240203). + + add testing utility report_ctype + + update configure macros, improving check for $host_os + + correct a recent change to curs_termino.3x, along with formatting + fixes for manpages. + + corrected note about box() in curs_border.3x (patch by Jakub Horky, + cf: 20250201). + +20251018 + + add check for build-time utilities, in case cross-compiling is setup + with an invalid $BUILD_CC (prompted by discussion with Stas Sergeev). + + modify configure-script and makefiles to make it easier to override + the "--with-install-prefix" default with environment variable + (report by Stas Sergeev). + +20251010 + + fix stray "\" in curs_extend.3x, regen html manpages. + + regen html manpages with man2html 1.42, fixing a few cases where + headers were not linked (report by Branden Robinson). + +20251004 + + improve formatting/style of manpages (patches by Branden Robinson). + + in-progress work to merge MinGW/Windows port. + + improve configure check for "install". + +20250927 + + in-progress work to merge MinGW/Windows port. + +20250920 + + in-progress work to merge MinGW/Windows port. + + add configure check for , build-fix for flatpacks + (report by Stas Sergeev). + + update config.guess, config.sub + +20250913 + + update ncurses-howto. + + modify MKfallback.sh to eliminate TERMINFO environment variable. + + improve checks in run_tic.sh script, change some variable names to + reduce packager confusion (report by Stas Sergeev). + + disallow configure options which apply only to multiuser systems, to + improve ports to single-user systems such as Haiku (report by Stas + Sergeev). + + update ncurses/wcwidth.c, for MinGW ports, from xterm. + + correct _nc_to_char() for the case when wctob() is not found by + configure script (report/patch by Benno Schulenberg). + > patches by Robin Haberkorn + + modify handle_wheel case 2 to ignore the event as in case 1 for + mouse version 1, since that corresponds to a button 6 or 7 event + which is not supported with ABI 6. + + use separate read/write pointers in the mouse event queue to work + with too-close events for the click-detection to work reliably, + and further improve that in case mouseinterval(0) is used to + suppress click-detection. + +20250830 + + in-progress work to merge MinGW/Windows port. + + build-fix for experimental Windows configuration (report by Kirill + Makurin). + + improve pattern used for configure --with-xterm-kbs option. + +20250823 + + improve style of MKterminfo.sh script (patches by Branden Robinson). + + improve formatting/style of manpages (patches by Branden Robinson). + + remove redundant definition of ConsoleInfo. + + change scope of TTY, GET_TTY and SET_TTY to ncurses-internals + +20250816 + + remove redundant reference to compiler in libtool configuration of + mk-1st.awk (report by Lorinczy Zsigmond). + + build-fixes for --enable-exp-win32 configuration + + improve formatting/style of manpages (patches by Branden Robinson). + +20250809 + + add configure check for Win32 named pipes feature, using that to make + nc_mingw.h obsolete in favor of nc_win32.h + + amend limit used in alloc_pair, by applying an adjustment for default + colors only when the maximum number of color pairs is greater than + the maximum number of colors (report by "Ingvix"). + +20250802 + + fixes for reading Unicode characters in MinGW/Windows port (report by + Axel Reinhold). + +20250726 + + modify configure script cases for $host_os, to accommodate 64-bit + big-endian POWER linux with glibc (patch by Cosima Neidahl). + + add warning to configure script to address conflict between the + --enable-lp64 option and the options for overriding the types used + for chtype and mmask_t. + +20250720 + + further improve readability of header-files + + add a consistency-check for termio(s)/tty headers, to help with + cross-compiles (report by Stas Sergeev). + + remove some unused configure-macros + + add xterm+keypad to pccon+base -TD + + trim trailing blanks from a few files (report by Stas Sergeev). + +20250712 + + improve readability of term.h + + modify recursive make rules to avoid interference with GNU make's + "-j" option (report by Stas Sergeev). + +20250705 + + when installing the terminfo database, check if symbolic links are + supported before attemping to link lib/terminfo from share/terminfo + (report by Kirill Makurin). + + modify configure check for MAKEFLAGS/MFLAGS to ignore existing value + of these environment variables (report by Stas Sergeev). + + reserve -c/-l options in test/*.c for command/logging like vttest. + + add options to test/worm.c for benchmarking (Nibby Nebbulous) + + improve formatting/style of manpages (patches by Branden Robinson). + + improve readability of header-files (patches by Branden Robinson). + +20250628 + + fix a few compiler-warnings. + + simplify include for wchar.h in Windows port by removing the platform + ifdef's (report by Kirill Makurin). + + regen Ada95/configure (report by Sven Joachim). + +20250621 + + revise loop in wins_nwstr, to ensure that non-spacing characters are + combined with the base spacing character (report by Karl Knechtel). + + fixes for port using clang-cl or cl MSVC (report by Kirill Makurin). + + improve test-packages: + + convert debian*/copyright to DEP-5 format. + + modify ".spec" test-files to work around timestamp-clamping in + recent Fedora releases. + +20250614 + + reduce lintian warnings for test-packages. + + clean up some shellcheck warnings + + improve test/configure checks for X libraries, reducing duplicates + + fix some typos/errata in license text, to help with scripted checks + +20250531 + + improve logic in misc/run_tic.in for constructing symbolic link + when $DESTDIR is set. + +20250524 + + correct option-name used in configure script, which resulted in size + change for cchar_t (cf: 20250517). + +20250517 + + initial changes for some ABI 7 features: + + disable wgetch-events + + add feature for extending mouse-buttons + + add feature for extending direct-color support + + use bracketed+paste in nsterm, rlogin-color, screen, terminology -TD + +20250510 + + add rv/xr codes for domterm, mintty, mlterm -TD + + add xr code for putty -TD + + update teraterm to 5.0 -TD + + add rlogin-color -TD + +20250503 + + update/correct some of the rv/xr strings, checked with tack -TD + + use ansi+rca in sclp -TD + + use vt220+pcedit in sclp (Werner Fink) + + move some building blocks from illumos to sun-color, based on + illumos source-history -TD + + improve use-clauses: ansi+cup, ansi+idl1, ansi+rca, ansi+rca2, + ansi+sgrso, ansi+sgrul -TD + + add ecma+standout, ecma+underline -TD + + add rv code for alacritty -TD + + add rv/xr codes for contour, ghostty, iterm2, kitty, konsole, + vscode, vte, wezterm -TD + +20250426 + + expand note on extensions in curs_addch.3x + + add illumos, sun-16color, sun-256color, sun-direct -TD + + add wyse+cvis -TD + +20250419 + + add note on scrolling and lower-right corner to waddch and wadd_wch + manual pages. + +20250412 + + add pangoterm -TD + + add kf1 to kf5 to sclp (report by Werner Fink) + + add vt100+pf1-pf4 -TD + +20250405 + + improve formatting/style of manpages (patches by Branden Robinson). + + improve infocmp -E/-e fallback feature (report by Ville Rissanen): + + prefix names with "ti_" if they begin with a digit, e.g., 9term + + escape backslashes and double-quotes in description fields + + modify infocmp -E/-e fallback feature to reduce stricter compiler + warnings for the extended capability data. + + add sclp -TD + + add op to vt525 -TD + + update contour -TD + +20250329 + + add XM/xm to ms-terminal, to enable mouse with experimental Windows + driver -TD + + add -x option to infocmp in MKfallback.sh + + improve experimental Windows driver by restoring the scroll buffer + and console mode, e.g., when reset_prog_mode or endwin is called + (patch by Daniel Starke). + + add a buffer-limit check in postprocess_termcap (report/testcase by + Yifan Zhang). + +20250322 + + add a null pointer check in mouse-initialization, for the + experimental Windows driver (patch by Daniel Starke). + + improve makefile dependency in Ada95/src + + add note in user_caps.5 addressing a quibble about dates. + +20250315 + + improve formatting/style of manpages (patches by Branden Robinson). + +20250308 + + remove test in wgetch which applied notimeout to the initial read + of a character (patch by Branden Robinson). + + improve formatting/style of manpages (patches by Branden Robinson). + + fix a few compiler-warnings in MinGW port. + +20250301 + + add color to vt525 (Branden Robinson) + + add vt520-w and vt525-w (Branden Robinson) + + improve formatting/style of manpages (patches by Branden Robinson). + + improve configurability of alloca() as used in Windows ports. + + fix some typos in manpages. + + modify configure script checks for stdbool.h to fix build with older + gcc version. + +20250222 + + modify treatment of "n" parameter for waddnstr, waddnwstr, and + wins_nwstr to return OK when "n" is zero, for consistency with other + implementations (report by Benjamin Barenblat, cf: 20231118). + + formatting improvements for terminfo.5 (Debian #1096164). + +20250216 + + add limit-checks in alloc_entry.c and alloc_ttype.c to avoid indexing + errors when using infocmp to compare all capabilities when processing + a malformed terminfo binary which has a valid header (testcase by + "Ekkosun"). + +20250215 + + add gzip option for suppressing filename/timestamp information to an + overlooked case (cf: 20240330). + + correct spelling errors found with codespell. + + fix some typos in manpages (report by Sven Joachim) + + amend change to lib_set_term.c to work with thread configuration + (report by Rajeev Pillai, cf: 20250208). + +20250208 + + change etip.h.in to include either/both of and , + needed for another old BSD. + + update st (report by Alexander Kashpir) -TD + + add note for ghostty 1.1.0 -TD + + fix a few issues found with coverity. + +20250201 + + add to the possible headers declaring the C++ std::bad_alloc + (report by Carl Hansen). + + modify check for stdbool.h to be more conservative in case the + headers are used with a compiler other than that which was used to + configure (Redhat #2342514). + + improve MKlib_gen.sh handling of "bool" type, for building link_test + + improve formatting/style of manpages (patches by Branden Robinson). + +20250125 + + improve error-handling in c++ binding (report by Mingjie Shen). + + strict compiler-warning fixes for upcoming gcc15 + +20250118 + + improve pattern used for configure --with-xterm-kbs option (report by + Mingyu Wang) + + update configure macros, from work on cdk and dialog. + + change a parameter name in curs_sp_funcs.3x, for consistency (patch + by "WHR"). + > patches by Branden Robinson: + + improve formatting/style of manpages + + change winwstr() to a generated function, using the macro definition, + moving its handling of negative length parameter into winnwstr(). + + correct actual-function name in a few trace calls. + +20250111 + + add check for infinite loop in tic's use-resolution. + + increase limit on use-clauses from 32 to 40, warn but allow entries + which exceed the old limit. + + add some null-pointer checks after mallocs in test-programs. + +20250104 + + modify tput to warn about capabilities which expect parameters where + none are given; also repair the feature where multiple capabilities + can be handled on a single line. + + cleanup use-clauses -TD + + add linux+lockeys, xterm+r5+lockeys, xterm+r5+fkeys -TD + + add vt220+ufkeys, vt220+sfkeys + + revert man/manlinks.sed change, which loses aliases (cf: 20241228). + + modify MKlib_gen.c to allow for Solaris's definition of NULL as 0L + +20241228 + + correct conditional-compile for a case when the C compiler does not + have a bool type. + + add ghostty -TD + > patches by Branden Robinson: + + add comments to generated term.h to hint the configure options used + + use same subdir-convention for term.h, in configure script + + improve formatting/style of manpages + +20241221 + + modify ncurses/tinfo/MKfallback.sh to work with MacOS sed, which + lacks BSD-style \< and \> + + trim padding from sgr expression used in trim_sgr0, to avoid copying + the padding into the resulting sgr0 (report by Rajeev Pillai). + + strict compiler-warning fixes for upcoming gcc15 + +20241214 + + avoid redefining bool in curses.h if the platform already supports + that type (cf: 20241123). + + move include from etip.h.in to cursesw.h, to work around + breakage in Apple's port of ncurses. + + strict compiler-warning fixes for upcoming gcc15 + +20241207 + + strict compiler-warning fixes for upcoming gcc15 + +20241130 + + improve configure check for lint program. + + adjust options in test-programs to allow for consistent use of -c/-l + for command/logging. + + modify win_driver.c for MinGW to handle shift-tab and control-tab as + back-tab (report by Axel Reinhold) + +20241123 + + remove dependency on stdbool.h from configure script check for type + of bool when C++ binding is omitted (report by Sam James). + + compiler-warning fixes + +20241109 + + work around musl header ifdef's (report by Urs Jansen, cf: Gentoo + #920266). + + improve error-reporting in write_entry.c (report by Changqing Li). + + remove unused #include from DJGPP configuration (report by Stas + Sergeev). + + workaround/fix issues from clang-analyze + +20241102 + + remove djgpp-specific initialization to binary mode (report/patch by + Stas Sergeev). + + add extended-keys for djgpp 2.05 -TD + +20241026 + + update ms-terminal -TD + + add ms-terminal-direct -TD + + correct dimensions in test/popup_msg.c, fixing an overrun (patch by + Stas Sergeev, cf: 20211219). + +20241019 + + fixes for compiler warnings/cppcheck. + + build-fixes for DJGPP configuration (patches by Stas Sergeev) + +20241006 + + fixes for compiler warnings/cppcheck. + + use xterm+alt+title in wezterm -TD + +20240928 + + improve error-message from infocmp when a terminal entry cannot be + opened (patch by Branden Robinson). + + improve filtering of -L options in misc/gen-pkgconfig.in and in + misc/ncurses-config.in + + add check in wresize() for out-of-range dimensions (report by Peter + Bierma). + +20240922 + + add a few null-pointer checks in ncurses + + improve test-driver in ncurses/link_test.c + + restore background character in manpages as described in X/Open + Curses section 3.3.6, and add option "-c" to test programs to + illustrate a non-blank character in the window background property. + + improve formatting/style of manpages (patches by Branden Robinson). + + modify ncurses*-config to add -I option in --cflag where needed for + --disable-overwrite to match ".pc" files. + + disallow directories and block/character devices in safe-open. + + amend scr_restore() and scr_init() to remove the target window only + after validating the source window which will replace the target + (report by Zixi Liu). + +20240914 + + modify _nc_flush() to also flush stderr to help the flash capability + to work in bash (patch by Harm te Hennepe, cf: 20201128) + + omit -g and -fXXX flags from CFLAGS in misc/ncurses-config.in + + improve formatting/style of manpages (patches by Branden Robinson). + + improve examples in NCURSES-Programming-HOWTO.html + + update comments in terminfo.src -TD + +20240831 + + build-fix for a case in msys2 where gettimeofday() was available but + the fallback was partly configured. + > patch by Rafael Kitover: + + separate the _NC_WINDOWS platform macro into _NC_WINDOWS_NATIVE, + for MinGW and other native Win32 support, and _NC_WINDOWS, to make + some Win32 features available under the Cygwin runtime, in this case + the term-driver. + + make some minor adjustments to allow + ./configure --enable-term-driver + to also work on Cygwin platforms such as Cygwin and MSYS2. + +20240824 + + modify infocmp and tabs to use actual name in usage and header. + + modify test/demo_keyok.c to accept ^Q for quit, for consistency. + +20240817 + + review/update foot for 1.18.1 -TD + + add a note about DomTerm 3.2.0 -TD + + add new glob-expressions variables to list in config.status script + (patch by Werner Fink). + + add --enable-install-prefix to modify behavior of $DESTDIR to merge + or replace the value set by --prefix (adapted from suggestion by + Eli Zaretskii). + +20240810 + + modify misc/Makefile.in and misc/run_tic.in so that $DESTDIR is set + and used only in the makefile. + + modify CF_WITH_PKG_CONFIG_LIBDIR to allow for pkg-config using + DOS/Windows pathname syntax (report by Eli Zaretskii). + + improve glob-expressions in configure script + + remove unused Get_Menu_Screen() macro from menu.priv.h + + update config.guess, config.sub + +20240727 + + improve formatting/style of manpages (patches by Branden Robinson). + + fixes for compiler warnings/cppcheck. + + modify wattron/wattroff calls in form/m_post.c to call wattr_on and + wattr_off to omit cast used in the former for X/Open compatibility + (patch by Bill Gray). + + modify wezterm, omitting its broken left/right margin feature (report + by Thayne McCombs) -TD + +20240720 + + improve formatting/style of manpages (patches by Branden Robinson). + + modify configure script and misc/Makefile to accept glob expressions + that include Windows/DOS drive-letters (report by Eli Zaretskii). + + fix misspelled ifdef and correct return-value of _nc_mingw_tcflush in + win_driver.c (report/patch by Eli Zaretskii). + +20240713 + + modify misc/ncurses-config.in, improved match with pkg-config output. + +20240706 + + update configure script to use macro changes from dialog. + + modify CF_NCURSES_PTHREADS to avoid equating package and library + names. + +20240629 + + build-fix for ncurses-examples with newer PDCurses, which no longer + has stubs for unimplemented features. + + add help-popup for test_instr.c, test_inwstr.c + + modify checks in delwin to avoid checking if the window is a pad + until first checking if it is still on the active window-list + (cf: 20211115). + + improve -t option of test/gdc.c, allowing hours only, or hours and + minutes only. + +20240622 + + improve test/gdc.c (patch by Branden Robinson). + + improve formatting/style of manpages (patches by Branden Robinson). + + adjust naming of mingw *-config scripts to match the pkg-config names + + widen pattern in pc/*-config scripts to disallow more linker options + + add --cflags-only-I and --cflags-only-other options to + misc/ncurses-config.in + + revert change to CF_BUILD_CC macro (report by Vassili Courzakis, + cf: 20240518). + +20240615 + + improve formatting/style of manpages (patches by Branden Robinson). + + review/update modules files. + + improve install-rules in Ada95 makefiles (report by Branden Robinson). + + improve formatting/style of manpages in test-directory. + +20240608 + + change winwstr to return wide character count instead of OK (patch + by Branden Robinson). + + improve formatting/style of manpages (patches by Branden Robinson). + + rename testing dpkg's for ncurses6 to resolve a naming conflict with + Debian's ncurses packages. + +20240601 + + improve formatting/style of manpages (patches by Branden Robinson). + + change Ada95/configure to use --with-screen option rather than + --enable-widec, to provide more choices of underlying curses library + +20240525 + + build-fix for configure option --disable-ext-funcs + + improve formatting/style of manpages (patches by Branden Robinson). + + review/update iTerm2 for 3.5.0 -TD + +20240519 + + update Ada95/configure to match change for -DTRACE + + revert change to include/ncurses_defs, which caused build failure if + tracing was not enabled (report by Branden Robinson). + +20240518 + + improve formatting/style of manpages (patches by Branden Robinson). + + move makefile's -DTRACE into include/ncurses_cfg.h, to simplify use + of CFLAGS/CPPFLAGS. + + improve check for clock_gettime(), from xterm. + + modify configure script to work around broken gnatgcc script found in + gcc-13 builds. + +20240511 + + improve formatting/style of manpages (patches by Branden Robinson). + + limit value from ESCDELAY environment variable to 30 seconds, like + other delay limits. + + limit values from LINES and COLUMNS environment variables to 512 + (report by Miroslav Lichvar). + +20240504 + + update ncurses/wcwidth.c, for MinGW ports, from xterm. + + trim obsolete comment about tack from INSTALL. + 20240427 6.5 release for upload to ftp.gnu.org + update announcement + fixes/corrections for manpages (patches by Branden Robinson). @@ -223,7 +792,7 @@ it is not possible to add this information. modem (prompted by discussion with Werner Fink, Michal Suchanek, OpenSUSE #1201384, Debian #60377). + build-fixes for --with-caps variations. - + correct a couple of section-references in INSTALL. + + correct a couple of section references in INSTALL. 20231028 + move xterm focus mode 1004 from xterm+sm+1006 into xterm+focus as @@ -319,7 +888,7 @@ it is not possible to add this information. + minor grammatical fix for manpages (Branden Robinson). 20230729 - + improve manpages for wgetnstr() and wget_wnstr(). + + improve manpages for wgetnstr() and wget_nwstr(). + modify MinGW configuration to provide for running in MSYS/MSYS2 shells, assuming ConPTY support (patch by Pavel Fedin). + add assignment in CF_MAN_PAGES to fill in value for TERMINFO_DIRS in @@ -4262,7 +4831,7 @@ it is not possible to add this information. 20140621 + change shared-library suffix for AIX 5 and 6 to ".so", avoiding conflict with the static library (report by Ben Lentz). - + document RPATH_LIST in INSTALLATION file, as part of workarounds for + + document RPATH_LIST in INSTALL file, as part of workarounds for upgrading an ncurses library using the "--with-shared" option. + modify test/ncurses.c c/C tests to cycle through subsets of the total number of colors, to better illustrate 8/16/88/256-colors by @@ -10577,7 +11146,7 @@ it is not possible to add this information. (adapted from a patch by Ilya Zakharevich). + correct parameter types of vidputs() and vidattr() to agree with header files (report by William P Setzer). - + fix typos in several man-pages (patch by William P Setzer). + + fix typos in several man pages (patch by William P Setzer). + remove unneeded ifdef for __GNUG__ in CF_CPP_VSCAN_FUNC configure macro, which made ncurses C++ binding fail to build with other C++ compilers such as HPUX 11.x (report by Albert Chin-A-Young). @@ -10630,7 +11199,7 @@ it is not possible to add this information. wide-character structures (report by ). + ensure that _XOPEN_SOURCE_EXTENDED is defined in curses.priv.h if compiling for wide-character configuration. - + make addwnstr() handle non-spacing characters (patch by Sven + + make addnwstr() handle non-spacing characters (patch by Sven Verdoolaege). 20010630 @@ -11109,7 +11678,7 @@ it is not possible to add this information. absolute pathname for the build tree's lib directory (prompted by discussion with Albert Chin-A-Young). + modify "make install.man" and "make uninstall.man" to include tack's - man-page. + man page. + various fixes for install scripts used to support configure --srcdir and --with-install-prefix (reported by Matthew Clarke ). @@ -11336,7 +11905,7 @@ it is not possible to add this information. 20000708 5.1 release for upload to ftp.gnu.org + document configure options in INSTALL. - + add man-page for ncurses trace functions. + + add man page for ncurses trace functions. + correct return value shown in curs_touch.3x for is_linetouched() and is_wintouched(), in curs_initscr.3x for isendwin(), and in curs_termattr.3x for has_ic() and has_il(). @@ -12465,7 +13034,7 @@ it is not possible to add this information. running screen built with ncurses. + check if tmp_fp is opened in tic.c before closing it (patch by Pavel Roskin ). - + correct several font specification typos in man-pages. + + correct several font specification typos in man pages. 981220 + correct default value for BUILD_CC (reported by Larry Virden). @@ -12814,7 +13383,7 @@ it is not possible to add this information. + modify init_pair so that if a color-pair is reinitialized, we will repaint the areas of the screen whose color changes, like SVr4 curses (reported by Christian Maurer ). - + modify getsyx/setsyx macros to comply with SVr4 man-page which + + modify getsyx/setsyx macros to comply with SVr4 man page which says that leaveok() affects their behavior (report by Darryl Miles, patch by Alexander V Lukyanov). @@ -12827,7 +13396,7 @@ it is not possible to add this information. + implement tparm dynamic variables (reported by Xiaodan Tang). 980613 - + update man-page for for wattr_set, wattr_get (cf: 980509) + + update man page for wattr_set, wattr_get (cf: 980509) + correct limits in hashtest, which would cause nonprinting characters to be written to large screens. + correct configure script, when --without-cxx was specified: the @@ -13009,12 +13578,12 @@ it is not possible to add this information. option (patch by Jesse Thilo). + correct some places in configure script where $enableval was used rather than $withval (patch by Darryl Miles ). - + modify some man-pages so no '.' or '..' falls between TH and SH + + modify some man pages so no '.' or '..' falls between TH and SH macros, to accommodate man_db program (reported by Ian T. Zimmerman ). + terminfo.src 10.2.1 downloaded from ESR's webpage (ESR). > several changes by Juergen Pfeifer: - + add copyright notices (and rcs id's) on remaining man-pages. + + add copyright notices (and rcs id's) on remaining man pages. + corrected prototypes for slk_* functions, using chtype rather than attr_t. + implemented the wcolor_set() and slk_color() functions @@ -13164,7 +13733,7 @@ it is not possible to add this information. implemented. + correct _tracef calls in _tracedump(), which did not separate format from parameters. - + correct getopt string for tic "-o" option, and add it to man-page + + correct getopt string for tic "-o" option, and add it to man page synopsis (reported by Darren Hiebert ). + correct typo in panel/Makefile.in, reversed if-statement in scrolling optimization (Alexander V. Lukyanov). @@ -13251,7 +13820,7 @@ it is not possible to add this information. + resynchronizes the generated html manpages 971213 - + additional fixes for man-pages section-references + + additional fixes for man pages' section references + add (for debugging) a check for ich/ich1 conflict with smir/rmir to tic, etc. + remove hpa/vpa from rxvt terminal description because they are not @@ -13263,7 +13832,7 @@ it is not possible to add this information. + modify protection when installing libraries to (normally) not executable. HP-UX shared libraries are an exception. + add configure check for 'tack'. - + implement script for renaming section-references in man-page install, + + implement script for renaming section references in man page install, for Debian configuration. + add validity-check for SP in trace code in baudrate() (reported by Daniel Weaver). @@ -14398,9 +14967,9 @@ it is not possible to add this information. 970104 + workaround defect in autoconf 2.12 (which terminates configuration if no C++ compiler is found) by adding an option --without-cxx. - + modify several man-pages to use tbl, where .nf/.fi was used (reported + + modify several man pages to use tbl, where .nf/.fi was used (reported by Jesse Thilo). - + correct font-codes in some man-pages (patch by Jesse Thilo + + correct font codes in some man pages (patch by Jesse Thilo ) + use configure script's knowledge of existence of g++ library for the c++ Makefile (reported by Paul Jackson). @@ -14666,7 +15235,7 @@ it is not possible to add this information. simpler to construct tests (for double-check of _nc_hash_map tests). + correct ifdef's for c++ in curses.h + change default xterm type to xterm-x11r6. - + correct quoting in configure that made man-pages installed with + + correct quoting in configure that made man pages installed with $datadir instead of actual terminfo path. + correct whitespace in include/Caps, which caused kf11, clr_eol and clr_end to be omitted from terminfo.5 @@ -14878,7 +15447,7 @@ it is not possible to add this information. 960707 + rollback ESR's #305 change to terminfo.src (it breaks existing applications, e.g., 'less 290'). - + correct path of edit_man.sh, and fix typo that made all man-pages + + correct path of edit_man.sh, and fix typo that made all man pages preformatted. + restore man/menu_requestname.3x omitted in Zeyd's resync (oops). + auto-configure the GCC_PRINTFLIKE/GCC_SCANFLIKE macros (reported by @@ -14890,7 +15459,7 @@ it is not possible to add this information. descriptions. + work around autoconf bug, force $INSTALL to absolute path (reported by Zeyd). - + modify man-page install for BSDI to install preformatted .0 files + + modify man page install for BSDI to install preformatted .0 files (reported by David MacKenzie). + add/use gcc __attribute__ for printf and scanf in curses.h + added SGR attributes test-case to ncurses @@ -14991,7 +15560,7 @@ it is not possible to add this information. + misc/ncurses-intro.html syntax fix (Kajiyama Tamito). 960601 - snapshot - + auto-configure man-page compression-format and renames for Debian. + + auto-configure man page compression format and renames for Debian. + corrected several typos in curses.h.in (i.e., the mvXXXX macros). + re-order curses.priv.h for lint. + added rules for lintlib, lint diff --git a/README.OpenSource b/README.OpenSource index 5d19beb..4bc2e9f 100644 --- a/README.OpenSource +++ b/README.OpenSource @@ -3,9 +3,9 @@ "Name": "ncurses", "License": "MIT", "License File": "COPYING", - "Version Number": "6.5", + "Version Number": "6.6", "Owner": "liyiming13@huawei.com", - "Upstream URL": "https://invisible-mirror.net/archives/ncurses/ncurses-6.5.tar.gz", + "Upstream URL": "https://invisible-mirror.net/archives/ncurses/ncurses-6.6.tar.gz", "Description": "The ncurses (new curses) library is a free software emulation of curses in System V Release 4.0 (SVr4), and more. It uses terminfo format, supports pads and color and multiple highlights and forms characters and function-key mapping, and has all the other SVr4-curses enhancements over BSD curses. SVr4 curses became the basis of X/Open Curses." } ] \ No newline at end of file diff --git a/VERSION b/VERSION index 8ebef8f..f05a0db 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.5 20240427 +5:0:10 6.6 20251230 diff --git a/aclocal.m4 b/aclocal.m4 index 1c2b788..1463b24 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2023,2024 Thomas E. Dickey * +dnl Copyright 2018-2024,2025 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 1995-on dnl -dnl $Id: aclocal.m4,v 1.1069 2024/03/30 22:15:45 tom Exp $ +dnl $Id: aclocal.m4,v 1.1148 2025/12/25 23:44:16 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -42,7 +42,7 @@ dnl https://invisible-island.net/autoconf/my-autoconf.html dnl dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- -dnl AM_LANGINFO_CODESET version: 7 updated: 2023/01/11 04:05:23 +dnl AM_LANGINFO_CODESET version: 8 updated: 2025/12/22 04:16:14 dnl ------------------- dnl Inserted as requested by gettext 0.10.40 dnl File from /usr/share/aclocal @@ -54,10 +54,10 @@ dnl From Bruno Haible. AC_DEFUN([AM_LANGINFO_CODESET], [ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, - [AC_TRY_LINK([ + [AC_LINK_IFELSE([AC_LANG_PROGRAM([ $ac_includes_default #include ], - [char* cs = nl_langinfo(CODESET); (void)cs], + [char* cs = nl_langinfo(CODESET); (void)cs])], am_cv_langinfo_codeset=yes, am_cv_langinfo_codeset=no) ]) @@ -67,7 +67,7 @@ $ac_includes_default fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ABI_DEFAULTS version: 5 updated: 2023/10/21 08:54:23 +dnl CF_ABI_DEFAULTS version: 6 updated: 2025/05/17 14:54:28 dnl --------------- dnl Provide configure-script defaults for different ncurses ABIs. AC_DEFUN([CF_ABI_DEFAULTS],[ @@ -79,6 +79,7 @@ cf_dft_chtype=auto cf_dft_ext_colors=no cf_dft_ext_const=no cf_dft_ext_mouse=no +cf_dft_ext_mouse2=no cf_dft_ext_putwin=no cf_dft_ext_spfuncs=no cf_dft_filter_syms=no @@ -86,6 +87,7 @@ cf_dft_interop=no cf_dft_mmask_t=auto cf_dft_opaque_curses=no cf_dft_ordinate_type=short +cf_dft_rgb_color=no cf_dft_signed_char=no cf_dft_tparm_arg=long cf_dft_widec=no @@ -114,8 +116,10 @@ esac case x$cf_cv_abi_default in (x[[789]]) cf_dft_ccharw_max=6 + cf_dft_ext_mouse2=yes cf_dft_mmask_t=uint64_t cf_dft_ordinate_type=int + cf_dft_rgb_color=yes cf_dft_signed_char=yes # also: remove the wgetch-events feature in ABI 7 ;; @@ -286,7 +290,7 @@ CXXFLAGS="$CFLAGS" CFLAGS="$cf_save_CXXFLAGS" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_INCDIR version: 17 updated: 2021/09/04 06:35:04 +dnl CF_ADD_INCDIR version: 18 updated: 2025/12/22 04:16:14 dnl ------------- 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, @@ -318,8 +322,8 @@ if test -n "$1" ; then then cf_save_CPPFLAGS=$CPPFLAGS CF_APPEND_TEXT(CPPFLAGS,-I$cf_add_incdir) - AC_TRY_COMPILE([#include ], - [printf("Hello")], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], + [printf("Hello")])], [], [cf_have_incdir=yes]) CPPFLAGS=$cf_save_CPPFLAGS @@ -478,7 +482,7 @@ dnl Allow user to enable a normally-off option. AC_DEFUN([CF_ARG_ENABLE], [CF_ARG_OPTION($1,[$2],[$3],[$4],no)])dnl dnl --------------------------------------------------------------------------- -dnl CF_ARG_OPTION version: 5 updated: 2015/05/10 19:52:14 +dnl CF_ARG_OPTION version: 6 updated: 2025/08/05 04:09:09 dnl ------------- dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus dnl values. @@ -487,7 +491,7 @@ dnl Parameters: dnl $1 = option name dnl $2 = help-string dnl $3 = action to perform if option is not default -dnl $4 = action if perform if option is default +dnl $4 = action to perform if option is default dnl $5 = default option value (either 'yes' or 'no') AC_DEFUN([CF_ARG_OPTION], [AC_ARG_ENABLE([$1],[$2],[test "$enableval" != ifelse([$5],no,yes,no) && enableval=ifelse([$5],no,no,yes) @@ -501,7 +505,7 @@ ifelse([$3],,[ :]dnl ])dnl ])])dnl dnl --------------------------------------------------------------------------- -dnl CF_AR_FLAGS version: 9 updated: 2021/01/01 13:31:04 +dnl CF_AR_FLAGS version: 10 updated: 2025/12/14 20:07:31 dnl ----------- dnl Check for suitable "ar" (archiver) options for updating an archive. dnl @@ -547,8 +551,8 @@ AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[ int testdata[[3]] = { 123, 456, 789 }; EOF if AC_TRY_EVAL(ac_compile) ; then - echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&AC_FD_CC - $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&AC_FD_CC 1>/dev/null + echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&AS_MESSAGE_LOG_FD + $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&AS_MESSAGE_LOG_FD 1>/dev/null if test -f conftest.a ; then cf_cv_ar_flags="$cf_ar_flags" break @@ -598,54 +602,25 @@ AC_DEFUN([CF_AWK_BIG_PRINTF], esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_BOOL_DECL version: 9 updated: 2023/12/03 09:21:34 +dnl CF_BOOL_DECL version: 12 updated: 2025/12/24 12:27:29 dnl ------------ -dnl Test if 'bool' is a builtin type in the configured C++ compiler. Some +dnl Test if 'bool' is a builtin type in the configured C/C++ compiler. Some dnl older compilers (e.g., gcc 2.5.8) don't support 'bool' directly; gcc dnl 2.6.3 does, in anticipation of the ANSI C++ standard. dnl -dnl Treat the configuration-variable specially here, since we're directly -dnl substituting its value (i.e., 1/0). -dnl dnl $1 is the shell variable to store the result in, if not $cv_cv_builtin_bool AC_DEFUN([CF_BOOL_DECL], [ -AC_MSG_CHECKING(if we should include stdbool.h) - -AC_CACHE_VAL(cf_cv_header_stdbool_h,[ - AC_TRY_COMPILE([],[bool foo = false; (void)foo], - [cf_cv_header_stdbool_h=0], - [AC_TRY_COMPILE([ -#ifndef __BEOS__ -#include -#endif -],[bool foo = false; (void)foo], - [cf_cv_header_stdbool_h=1], - [cf_cv_header_stdbool_h=0])])]) - -if test "$cf_cv_header_stdbool_h" = 1 -then AC_MSG_RESULT(yes) -else AC_MSG_RESULT(no) -fi - -AC_MSG_CHECKING([for builtin bool type]) - -AC_CACHE_VAL(ifelse($1,,cf_cv_builtin_bool,[$1]),[ - AC_TRY_COMPILE([ -#include -#include -],[bool x = false; (void)x], - [ifelse($1,,cf_cv_builtin_bool,[$1])=1], - [ifelse($1,,cf_cv_builtin_bool,[$1])=0]) - ]) - -if test "$ifelse($1,,cf_cv_builtin_bool,[$1])" = 1 -then AC_MSG_RESULT(yes) -else AC_MSG_RESULT(no) -fi +AC_REQUIRE([CF_C99_STDBOOL_H]) +AC_CACHE_CHECK(for builtin bool type, ifelse($1,,cf_cv_builtin_bool,[$1]),[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +$ac_includes_default +],[bool x = false; (void)x])], + [ifelse($1,,cf_cv_builtin_bool,[$1])=yes], + [ifelse($1,,cf_cv_builtin_bool,[$1])=no])]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_BOOL_SIZE version: 20 updated: 2023/02/18 17:41:25 +dnl CF_BOOL_SIZE version: 22 updated: 2025/02/22 20:49:45 dnl ------------ dnl Test for the size of 'bool' in the configured C++ compiler (e.g., a type). dnl Don't bother looking for bool.h, since it has been deprecated. @@ -654,6 +629,7 @@ dnl If the current compiler is C rather than C++, we get the bool definition dnl from . AC_DEFUN([CF_BOOL_SIZE], [ +AC_REQUIRE([CF_C99_STDBOOL_H]) AC_CHECK_SIZEOF(bool,,[ $ac_includes_default @@ -669,7 +645,7 @@ $ac_includes_default #else -#if $cf_cv_header_stdbool_h +#if $USE_STDBOOL_H #include #endif @@ -693,7 +669,7 @@ $ac_includes_default #else -#if $cf_cv_header_stdbool_h +#if $USE_STDBOOL_H #include #endif @@ -702,7 +678,7 @@ $ac_includes_default int main(void) { FILE *fp = fopen("cf_test.out", "w"); - if (fp != 0) { + if (fp != NULL) { bool x = true; if ((bool)(-x) >= 0) fputs("unsigned ", fp); @@ -741,7 +717,7 @@ if test "$cf_cv_type_of_bool" = unknown ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_BUILD_CC version: 11 updated: 2022/12/04 15:40:08 +dnl CF_BUILD_CC version: 14 updated: 2024/12/14 11:58:01 dnl ----------- dnl If we're cross-compiling, allow the user to override the tools and their dnl options. The configure script is oriented toward identifying the host @@ -819,7 +795,7 @@ if test "$cross_compiling" = yes ; then AC_TRY_RUN([#include int main(int argc, char *argv[]) { - ${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0); + ${cf_cv_main_return:-return}(argc < 0 || argv == (void*)0 || argv[0] == (void*)0); } ], cf_ok_build_cc=yes, @@ -858,7 +834,7 @@ AC_SUBST(BUILD_EXEEXT) AC_SUBST(BUILD_OBJEXT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_C11_NORETURN version: 4 updated: 2023/02/18 17:41:25 +dnl CF_C11_NORETURN version: 5 updated: 2025/12/14 17:40:20 dnl --------------- AC_DEFUN([CF_C11_NORETURN], [ @@ -871,12 +847,12 @@ 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_COMPILE_IFELSE([AC_LANG_PROGRAM([ $ac_includes_default #include static _Noreturn void giveup(void) { exit(0); } ], - [if (feof(stdin)) giveup()], + [if (feof(stdin)) giveup()])], cf_cv_c11_noreturn=yes, cf_cv_c11_noreturn=no) ]) @@ -896,6 +872,27 @@ AC_SUBST(HAVE_STDNORETURN_H) AC_SUBST(STDC_NORETURN) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_C99_STDBOOL_H version: 2 updated: 2025/12/24 12:27:29 +dnl ---------------- +dnl Check if we can compile using and get a valid "bool" type. +AC_DEFUN([CF_C99_STDBOOL_H], +[ +AC_CACHE_CHECK(if we can include stdbool.h,cf_cv_header_stdbool_h,[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +$ac_includes_default +#include +],[bool foo = false; (void)foo])], + [cf_cv_header_stdbool_h=yes], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[bool foo = false; (void)foo])], + [cf_cv_header_stdbool_h=no])])]) + +if test "$cf_cv_header_stdbool_h" = yes +then USE_STDBOOL_H=1 +else USE_STDBOOL_H=0 +fi +AC_SUBST(USE_STDBOOL_H) +])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 @@ -960,7 +957,7 @@ case "$CC" in esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CFG_DEFAULTS version: 16 updated: 2021/01/04 19:33:05 +dnl CF_CFG_DEFAULTS version: 17 updated: 2025/12/24 12:27:29 dnl --------------- dnl Determine the default configuration into which we'll install ncurses. This dnl can be overridden by the user's command-line options. There's two items to @@ -990,7 +987,7 @@ AC_MSG_RESULT($prefix) if test "x$prefix" = "xNONE" ; then AC_MSG_CHECKING(for default include-directory) -test -n "$verbose" && echo 1>&AC_FD_MSG +test -n "$verbose" && echo 1>&AS_MESSAGE_FD for cf_symbol in \ "$includedir" \ "$includedir/ncurses" \ @@ -1005,31 +1002,31 @@ do if test -f "$cf_dir/curses.h" ; then if ( ${FGREP-fgrep} NCURSES_VERSION "$cf_dir/curses.h" >/dev/null 2>&1 ) ; then includedir="$cf_symbol" - test -n "$verbose" && echo $ECHO_N " found " 1>&AC_FD_MSG + test -n "$verbose" && echo $ECHO_N " found " 1>&AS_MESSAGE_FD break fi fi - test -n "$verbose" && echo " tested $cf_dir" 1>&AC_FD_MSG + test -n "$verbose" && echo " tested $cf_dir" 1>&AS_MESSAGE_FD done AC_MSG_RESULT($includedir) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CGETENT version: 7 updated: 2023/02/18 17:41:25 +dnl CF_CGETENT version: 8 updated: 2025/12/24 12:27:29 dnl ---------- dnl Check if the terminal-capability database functions are available. If not, dnl ncurses has a much-reduced version. AC_DEFUN([CF_CGETENT],[ AC_CACHE_CHECK(for terminal-capability database functions,cf_cv_cgetent,[ -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ $ac_includes_default],[ - char temp[128]; + char temp[[128]]; char *buf = temp; char *db_array = temp; cgetent(&buf, &db_array, "vt100"); cgetcap(buf, "tc", '='); cgetmatch(buf, "tc"); - ], + ])], [cf_cv_cgetent=yes], [cf_cv_cgetent=no]) ]) @@ -1038,10 +1035,10 @@ if test "$cf_cv_cgetent" = yes then AC_DEFINE(HAVE_BSD_CGETENT,1,[Define to 1 if we have BSD cgetent]) AC_CACHE_CHECK(if cgetent uses const parameter,cf_cv_cgetent_const,[ -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers" $ac_includes_default],[ - char temp[128]; + char temp[[128]]; char *buf = temp; #ifndef _NETBSD_SOURCE /* given, since April 2004 in stdlib.h */ const char *db_array = temp; @@ -1049,7 +1046,7 @@ $ac_includes_default],[ #endif cgetcap(buf, "tc", '='); cgetmatch(buf, "tc"); - ], + ])], [cf_cv_cgetent_const=yes], [cf_cv_cgetent_const=no]) ]) @@ -1095,7 +1092,7 @@ if test ".$system_name" != ".$cf_cv_system_name" ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_ENVIRON version: 5 updated: 2023/02/18 17:41:25 +dnl CF_CHECK_ENVIRON version: 6 updated: 2025/12/24 12:27:29 dnl ---------------- dnl Check for data that is usually declared in , e.g., the 'environ' dnl variable. Define a DECL_xxx symbol if we must declare it ourselves. @@ -1105,9 +1102,9 @@ dnl $2 = the assumed type AC_DEFUN([CF_CHECK_ENVIRON], [ AC_CACHE_CHECK(if external $1 is declared, cf_cv_dcl_$1,[ - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ $ac_includes_default], - ifelse([$2],,void*,[$2]) x = (ifelse([$2],,void*,[$2])) $1; (void)x, + [ifelse([$2],,void*,[$2]) x = (ifelse([$2],,void*,[$2])) $1; (void)x])], [cf_cv_dcl_$1=yes], [cf_cv_dcl_$1=no]) ]) @@ -1121,7 +1118,7 @@ fi CF_CHECK_EXTERN_DATA($1,ifelse([$2],,int,[$2])) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_ERRNO version: 14 updated: 2023/02/18 17:41:25 +dnl CF_CHECK_ERRNO version: 15 updated: 2025/12/23 18:53:34 dnl -------------- dnl Check for data that is usually declared in or , e.g., dnl the 'errno' variable. Define a DECL_xxx symbol if we must declare it @@ -1132,10 +1129,10 @@ dnl $2 = the assumed type AC_DEFUN([CF_CHECK_ERRNO], [ AC_CACHE_CHECK(if external $1 is declared, cf_cv_dcl_$1,[ - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ $ac_includes_default #include ], - ifelse([$2],,int,[$2]) x = (ifelse([$2],,int,[$2])) $1; (void)x, + [ifelse([$2],,int,[$2]) x = (ifelse([$2],,int,[$2])) $1; (void)x])], [cf_cv_dcl_$1=yes], [cf_cv_dcl_$1=no]) ]) @@ -1149,7 +1146,7 @@ fi CF_CHECK_EXTERN_DATA($1,ifelse([$2],,int,[$2])) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_EXTERN_DATA version: 5 updated: 2021/09/04 06:35:04 +dnl CF_CHECK_EXTERN_DATA version: 6 updated: 2025/12/23 18:53:34 dnl -------------------- dnl Check for existence of external data in the current set of libraries. If dnl we can modify it, it is real enough. @@ -1158,11 +1155,11 @@ dnl $2 = its type AC_DEFUN([CF_CHECK_EXTERN_DATA], [ AC_CACHE_CHECK(if external $1 exists, cf_cv_have_$1,[ - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #undef $1 extern $2 $1; ], - [$1 = 2], + [$1 = 2])], [cf_cv_have_$1=yes], [cf_cv_have_$1=no]) ]) @@ -1174,7 +1171,7 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_FVISIBILITY version: 2 updated: 2020/04/04 16:16:13 +dnl CF_CHECK_FVISIBILITY version: 3 updated: 2025/12/24 12:27:29 dnl -------------------- dnl Check whether the compiler understands -fvisibility=hidden dnl @@ -1185,18 +1182,18 @@ AC_DEFUN([CF_CHECK_FVISIBILITY],[ AC_CACHE_CHECK(if $1 -fvisibility=hidden option works,$3,[ cf_save_cflags="[$]$2" $2="[$]$2 -fvisibility=hidden" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ __attribute__ ((visibility("default"))) int somefunc() {return 42;} ],[ if (somefunc()) return 1; -], +])], [$3=yes], [$3=no]) $2=$cf_save_cflags ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_GETENV version: 4 updated: 2023/12/03 10:18:09 +dnl CF_CHECK_GETENV version: 5 updated: 2024/12/14 16:09:34 dnl --------------- dnl Check if repeated getenv calls return the same pointer, e.g., it does not dnl discard the previous pointer when returning a new one. @@ -1248,7 +1245,7 @@ int main(void) for (j = 0; environ[j]; ++j) { mynames[j] = str_alloc(environ[j]); equals = strchr(mynames[j], '='); - if (equals != 0) { + if (equals != NULL) { *equals++ = '\\0'; myvalues[j] = str_alloc(equals); } else { @@ -1380,26 +1377,26 @@ if test "$cf_cv_check_gpm_wgetch" != yes ; then fi ])])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_LIBSSP version: 1 updated: 2021/10/30 10:40:19 +dnl CF_CHECK_LIBSSP version: 2 updated: 2025/12/24 12:27:29 dnl --------------- dnl Check if libssp is needed, e.g., to work around misconfigured libraries dnl used in cross-compiling to MinGW. AC_DEFUN([CF_CHECK_LIBSSP],[ AC_CACHE_CHECK(if ssp library is needed,cf_cv_need_libssp,[ -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include #include ],[ DIR *dp = opendir("."); -],cf_cv_need_libssp=no,[ +])],cf_cv_need_libssp=no,[ cf_save_LIBS="$LIBS" LIBS="$LIBS -lssp" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include #include ],[ DIR *dp = opendir("."); - ],cf_cv_need_libssp=yes, + ])],cf_cv_need_libssp=yes, cf_cv_need_libssp=maybe) LIBS="$cf_save_LIBS" ])dnl @@ -1411,7 +1408,7 @@ then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_LIBTOOL_VERSION version: 2 updated: 2021/05/01 16:24:34 +dnl CF_CHECK_LIBTOOL_VERSION version: 3 updated: 2024/06/12 04:19:01 dnl ------------------------ dnl Show the version of libtool dnl @@ -1427,6 +1424,7 @@ then AC_MSG_CHECKING(version of $LIBTOOL) CF_LIBTOOL_VERSION AC_MSG_RESULT($cf_cv_libtool_version) + ifdef([LT_PACKAGE_VERSION],,[ if test -n "$cf_cv_libtool_version" then cf_check_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' -e 's,[[()]],...,g' -e 's,[[ ]],-,g' -e '2,$d'` @@ -1440,12 +1438,107 @@ then else AC_MSG_ERROR(No version found for $LIBTOOL) fi + ]) else AC_MSG_ERROR(GNU libtool has not been found) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_WCHAR_H version: 5 updated: 2023/12/03 09:21:34 +dnl CF_CHECK_MULTIUSER version: 1 updated: 2025/09/13 11:43:46 +dnl ------------------ +dnl Runtime features which check for root permissions apply only to multiuser +dnl systems. Check for single-user systems by inspecting /etc/passwd. +AC_DEFUN([CF_CHECK_MULTIUSER],[ +AC_CACHE_CHECK(for conventional multiuser system,cf_cv_multiuser,[ + cf_cv_multiuser=no + if test -f /etc/passwd + then + sed \ + -e '/true$/d' \ + -e '/false$/d' \ + -e '/nologin$/d' \ + -e '/^[[^:]]*:[[^:]]*:[[0-9]]:/d' \ + -e '/^[[^:]]*:[[^:]]*:[[0-9]][[0-9]]:/d' \ + -e '/:$/d' < /etc/passwd >conftest.tmp + test -s conftest.tmp && cf_cv_multiuser=yes + rm -f conftest.tmp + fi +]) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_CHECK_NAMED_PIPES version: 2 updated: 2025/12/24 12:27:29 +dnl -------------------- +dnl Check for existence of Windows named-pipe functions, set cache variable +dnl to reflect the result. +AC_DEFUN([CF_CHECK_NAMED_PIPES],[ +AC_CACHE_CHECK(for named pipe functions,cf_cv_named_pipes,[ + cf_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -DWINVER=0x0600 -DWIN32_LEAN_AND_MEAN" + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], + [ + HANDLE handle = 0; + ULONG pPid = 0; + if (GetNamedPipeInfo(handle, NULL, NULL, NULL, NULL)) { + if (GetNamedPipeServerProcessId(handle, &pPid)) { + ${cf_cv_main_return:-return} (0); + } + } + ])],[cf_cv_named_pipes=yes],[cf_cv_named_pipes=no]) + CPPFLAGS="$cf_save_CPPFLAGS" +])dnl +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_CHECK_TBL_X_OPTION version: 2 updated: 2025/11/11 20:09:36 +dnl --------------------- +AC_DEFUN([CF_CHECK_TBL_X_OPTION],[ +AC_REQUIRE([CF_PROG_TBL]) + +AC_CACHE_CHECK(if $NROFF_TBL supports 'x' column modifier,cf_cv_tbl_x_option_okay,[ + if test "$cross_compiling" = yes ; then + cf_cv_tbl_x_option_okay=unknown + else + cf_cv_tbl_x_option_okay=no + cat > conftest <<-CF_EOF + .TS + L. + table cell + .TE + CF_EOF + if $NROFF_TBL < conftest > /dev/null 2>&1 + then + cat > conftest <<-CF_EOF + .TS + Lx. + table cell + .TE + CF_EOF + if $NROFF_TBL < conftest > /dev/null 2>&1 + then + cf_cv_tbl_x_option_okay=yes + fi + else + AC_MSG_ERROR([$NROFF_TBL not available.]) + fi + rm -f conftest + fi +]) + +TBL_X_OPTION=$cf_cv_tbl_x_option_okay +AC_SUBST(TBL_X_OPTION) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_CHECK_TYPE2 version: 3 updated: 2025/08/08 20:44:18 +dnl -------------- +dnl Check if the given type can be declared via the given header. +dnl $1 = the type to check +dnl $2 = the header (i.e., not one of the default includes) +AC_DEFUN([CF_CHECK_TYPE2],[ + AC_CHECK_TYPES($1,,,[ +$ac_includes_default +ifelse($2,,,[#include <$2>])]) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_CHECK_WCHAR_H version: 6 updated: 2025/12/24 12:27:29 dnl ---------------- dnl Check if wchar.h can be used, i.e., without defining _XOPEN_SOURCE_EXTENDED AC_DEFUN([CF_CHECK_WCHAR_H],[ @@ -1454,7 +1547,7 @@ wchar.h \ wctype.h \ ) AC_CACHE_CHECK(if wchar.h can be used as is,cf_cv_wchar_h_okay,[ -AC_TRY_COMPILE( +AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [ $ac_includes_default #ifdef HAVE_WCHAR_H @@ -1465,7 +1558,7 @@ $ac_includes_default #endif ],[ wint_t foo = 0; - int bar = iswpunct(foo); (void) bar], + int bar = iswpunct(foo); (void) bar])], [cf_cv_wchar_h_okay=yes], [cf_cv_wchar_h_okay=no])]) @@ -1475,7 +1568,7 @@ then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_WCWIDTH_GRAPHICS version: 4 updated: 2023/12/03 10:17:07 +dnl CF_CHECK_WCWIDTH_GRAPHICS version: 5 updated: 2024/12/14 16:09:34 dnl ------------------------- dnl Most "modern" terminal emulators are based to some degree on VT100, and dnl should support line-drawing. Even with Unicode. There is a problem. @@ -1594,8 +1687,8 @@ main(void) setlocale(LC_ALL, "en_US.UTF-8") || setlocale(LC_ALL, "en_US.utf8") || setlocale(LC_ALL, "en_US.utf-8")) { - if ((fp = fopen("conftest.in", "r")) != 0) { - while (fgets(buffer, MY_LEN, fp) != 0) { + if ((fp = fopen("conftest.in", "r")) != NULL) { + while (fgets(buffer, MY_LEN, fp) != NULL) { if (*buffer == '-') { fprintf(stderr, "\\t%s", buffer); } else if (sscanf(buffer, "%x %s", &value, notes) == 2) { @@ -1619,7 +1712,7 @@ main(void) ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CLANG_COMPILER version: 9 updated: 2023/02/18 17:41:25 +dnl CF_CLANG_COMPILER version: 11 updated: 2025/12/14 17:46:02 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 @@ -1638,12 +1731,12 @@ ifelse([$2],,CLANG_COMPILER,[$2])=no if test "$ifelse([$1],,[$1],GCC)" = yes ; then AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler) cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])" - AC_TRY_COMPILE([],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[ #ifdef __clang__ #else #error __clang__ is not defined #endif -],[ifelse([$2],,CLANG_COMPILER,[$2])=yes +])],[ifelse([$2],,CLANG_COMPILER,[$2])=yes ],[]) ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2])) @@ -1672,9 +1765,9 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then AC_MSG_CHECKING(if option $cf_clang_opt works) cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $cf_clang_opt" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include ],[ - printf("hello!\\n");],[ + printf("hello!\\n");])],[ cf_clang_optok=yes],[ cf_clang_optok=no]) AC_MSG_RESULT($cf_clang_optok) @@ -1687,7 +1780,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50 +dnl CF_CONST_X_STRING version: 10 updated: 2025/12/14 17:40:20 dnl ----------------- dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most dnl character-strings. @@ -1712,22 +1805,22 @@ AC_REQUIRE([AC_PATH_XTRA]) CF_SAVE_XTRA_FLAGS([CF_CONST_X_STRING]) -AC_TRY_COMPILE( +AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [ -#include +$ac_includes_default #include ], -[String foo = malloc(1); free((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( + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [ #undef _CONST_X_STRING #define _CONST_X_STRING /* X11R7.8 (perhaps) */ #undef XTSTRINGDEFINES /* X11R5 and later */ -#include +$ac_includes_default #include - ],[String foo = malloc(1); *foo = 0],[ + ],[String foo = malloc(1); *foo = 0])],[ cf_cv_const_x_string=no ],[ cf_cv_const_x_string=yes @@ -1748,7 +1841,7 @@ esac ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CPP_OVERRIDE version: 1 updated: 2022/08/20 16:07:10 +dnl CF_CPP_OVERRIDE version: 2 updated: 2024/11/09 18:07:29 dnl --------------- dnl Check if the C++ compiler accepts the override keyword. This is a C++-11 dnl feature. @@ -1763,7 +1856,7 @@ AC_CACHE_CHECK(if $CXX accepts override keyword,cf_cv_cpp_override,[ class base { public: - virtual int foo(float x) = 0; + virtual int foo(float x) = 0; }; @@ -1819,7 +1912,7 @@ fi test "$cf_cv_cpp_param_init" = yes && AC_DEFINE(CPP_HAS_PARAM_INIT,1,[Define to 1 if C++ has parameter initialization]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CPP_STATIC_CAST version: 3 updated: 2013/04/13 18:03:21 +dnl CF_CPP_STATIC_CAST version: 4 updated: 2025/12/24 12:27:29 dnl ------------------ dnl Check if the C++ compiler accepts static_cast in generics. This appears to dnl not be supported in g++ before 3.0 @@ -1831,7 +1924,7 @@ AC_CACHE_CHECK(if $CXX accepts static_cast,cf_cv_cpp_static_cast,[ AC_LANG_SAVE AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ class NCursesPanel { public: @@ -1863,7 +1956,7 @@ public: virtual ~NCursesUserPanel() {}; }; ],[ - const char* p_UserData = static_cast(0)], + const char* p_UserData = static_cast(0)])], [cf_cv_cpp_static_cast=yes], [cf_cv_cpp_static_cast=no]) @@ -1903,19 +1996,19 @@ AC_DEFUN([CF_CXX_AR_FLAGS],[ AC_SUBST(CXX_ARFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CXX_IOSTREAM_NAMESPACE version: 2 updated: 2012/10/06 17:56:13 +dnl CF_CXX_IOSTREAM_NAMESPACE version: 3 updated: 2025/12/24 12:27:29 dnl ------------------------- dnl For c++, check if iostream uses "std::" namespace. AC_DEFUN([CF_CXX_IOSTREAM_NAMESPACE],[ AC_CHECK_HEADERS(iostream) if test x"$ac_cv_header_iostream" = xyes ; then AC_MSG_CHECKING(if iostream uses std-namespace) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include using std::endl; using std::cerr;],[ cerr << "testing" << endl; -],[cf_iostream_namespace=yes],[cf_iostream_namespace=no]) +])],[cf_iostream_namespace=yes],[cf_iostream_namespace=no]) AC_MSG_RESULT($cf_iostream_namespace) if test "$cf_iostream_namespace" = yes ; then AC_DEFINE(IOSTREAM_NAMESPACE,1,[Define to 1 if C++ has namespace iostream]) @@ -1923,7 +2016,7 @@ cerr << "testing" << endl; fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_C_INLINE version: 6 updated: 2019/09/07 13:38:36 +dnl CF_C_INLINE version: 7 updated: 2025/12/24 12:27:29 dnl ----------- dnl Check if the C compiler supports "inline". dnl $1 is the name of a shell variable to set if inline is supported @@ -1945,8 +2038,8 @@ if test "$ac_cv_c_inline" != no ; then AC_CACHE_CHECK(if $CC supports options to tune inlining,cf_cv_gcc_inline,[ cf_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS --param max-inline-insns-single=$2" - AC_TRY_COMPILE([inline int foo(void) { return 1; }], - [${cf_cv_main_return:-return} foo()], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([inline int foo(void) { return 1; }], + [${cf_cv_main_return:-return} foo()])], [cf_cv_gcc_inline=yes], [cf_cv_gcc_inline=no]) CFLAGS=$cf_save_CFLAGS @@ -2196,7 +2289,7 @@ AC_ARG_ENABLE(rpath, AC_MSG_RESULT($cf_cv_enable_rpath) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ENABLE_STRING_HACKS version: 6 updated: 2021/01/05 19:23:48 +dnl CF_ENABLE_STRING_HACKS version: 7 updated: 2025/11/11 20:09:36 dnl ---------------------- dnl On a few platforms, the compiler and/or loader nags with untruthful dnl comments stating that "most" uses of strcat/strcpy/sprintf are incorrect, @@ -2207,10 +2300,10 @@ dnl functions versus the total of incorrect uses. Samples of a few thousand dnl instances are meaningless compared to the hundreds of millions of lines of dnl existing C code. dnl -dnl strlcat/strlcpy are (as of 2012) non-standard, and are available on some +dnl strlcat/strlcpy are standard as of POSIX.1-2024, and are available on some dnl platforms, in implementations of varying quality. Likewise, snprintf is dnl standard - but evolved through phases, and older implementations are likely -dnl to yield surprising results, as documented in manpages on various systems. +dnl to yield surprising results, as documented in man pages on various systems. AC_DEFUN([CF_ENABLE_STRING_HACKS], [ AC_MSG_CHECKING(if you want to work around bogus compiler/loader warnings) @@ -2274,7 +2367,7 @@ AC_DEFUN([CF_ERRNO], CF_CHECK_ERRNO(errno) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ETIP_DEFINES version: 7 updated: 2023/10/28 11:59:01 +dnl CF_ETIP_DEFINES version: 8 updated: 2025/12/24 12:27:29 dnl --------------- dnl Test for conflicting definitions of exception in gcc 2.8.0, etc., between dnl math.h and builtin.h, only for ncurses @@ -2296,9 +2389,9 @@ do CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -Iinclude -I${srcdir}/include" test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include -],[],[ +],[])],[ test -n "$cf_math" && AC_DEFINE_UNQUOTED(ETIP_NEEDS_${cf_math}) test -n "$cf_excp" && AC_DEFINE_UNQUOTED(ETIP_NEEDS_${cf_excp}) cf_result="$cf_math $cf_excp" @@ -2310,7 +2403,7 @@ AC_MSG_RESULT([${cf_result:-(none)}]) CXXFLAGS="$cf_save_CXXFLAGS" ]) dnl --------------------------------------------------------------------------- -dnl CF_FIND_LINKAGE version: 22 updated: 2020/12/31 20:19:42 +dnl CF_FIND_LINKAGE version: 23 updated: 2025/12/22 04:16:14 dnl --------------- dnl Find a library (specifically the linkage used in the code fragment), dnl searching for it if it is not already in the library path. @@ -2333,7 +2426,7 @@ dnl $cf_cv_library_file_$3 - library-file if needed, e.g., -l$3 AC_DEFUN([CF_FIND_LINKAGE],[ # If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these -# will be set on completion of the AC_TRY_LINK below. +# will be set on completion of the AC_LINK_IFELSE below. cf_cv_header_path_$3= cf_cv_library_path_$3= @@ -2341,7 +2434,7 @@ CF_MSG_LOG([Starting [FIND_LINKAGE]($3,$6)]) cf_save_LIBS="$LIBS" -AC_TRY_LINK([$1],[$2],[ +AC_LINK_IFELSE([AC_LANG_PROGRAM([$1],[$2])],[ cf_cv_find_linkage_$3=yes cf_cv_header_path_$3=/usr/include cf_cv_library_path_$3=/usr/lib @@ -2349,7 +2442,7 @@ AC_TRY_LINK([$1],[$2],[ LIBS="-l$3 $7 $cf_save_LIBS" -AC_TRY_LINK([$1],[$2],[ +AC_LINK_IFELSE([AC_LANG_PROGRAM([$1],[$2])],[ cf_cv_find_linkage_$3=yes cf_cv_header_path_$3=/usr/include cf_cv_library_path_$3=/usr/lib @@ -2371,7 +2464,7 @@ AC_TRY_LINK([$1],[$2],[ CF_VERBOSE(... testing $cf_cv_header_path_$3) CPPFLAGS="$cf_save_CPPFLAGS" CF_APPEND_TEXT(CPPFLAGS,-I$cf_cv_header_path_$3) - AC_TRY_COMPILE([$1],[$2],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$1],[$2])],[ CF_VERBOSE(... found $3 headers in $cf_cv_header_path_$3) cf_cv_find_linkage_$3=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -2391,7 +2484,7 @@ AC_TRY_LINK([$1],[$2],[ ifelse([$6],,,[ CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-l$3 $7 $cf_save_LIBS" - AC_TRY_LINK([$1],[$2],[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([$1],[$2])],[ CF_VERBOSE(... found $3 library in system) cf_cv_find_linkage_$3=yes]) CPPFLAGS="$cf_save_CPPFLAGS" @@ -2407,7 +2500,7 @@ AC_TRY_LINK([$1],[$2],[ CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-l$3 $7 $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_$3" - AC_TRY_LINK([$1],[$2],[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([$1],[$2])],[ CF_VERBOSE(... found $3 library in $cf_cv_library_path_$3) cf_cv_find_linkage_$3=yes cf_cv_library_file_$3="-l$3" @@ -2534,7 +2627,7 @@ fi AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FOPEN_BIN_R version: 3 updated: 2023/01/05 18:05:46 +dnl CF_FOPEN_BIN_R version: 4 updated: 2024/12/14 16:09:34 dnl -------------- dnl Check if fopen works when the "b" (binary) flag is added to the mode dnl parameter. POSIX ignores the "b", which c89 specified. Some very old @@ -2548,14 +2641,14 @@ int main(void) { FILE *fp = fopen("conftest.tmp", "wb"); int rc = 0; - if (fp != 0) { + if (fp != NULL) { int p, q; for (p = 0; p < 256; ++p) { fputc(p, fp); } fclose(fp); fp = fopen("conftest.tmp", "rb"); - if (fp != 0) { + if (fp != NULL) { for (p = 0; p < 256; ++p) { q = fgetc(fp); if (q != p) { @@ -2588,7 +2681,7 @@ unset ac_ct_$1 unset $1 ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_DLSYM version: 4 updated: 2015/09/12 14:46:44 +dnl CF_FUNC_DLSYM version: 6 updated: 2025/12/24 12:27:29 dnl ------------- dnl Test for dlsym() and related functions, as well as libdl. dnl @@ -2608,13 +2701,16 @@ if test "$cf_have_dlsym" = yes ; then test "$cf_have_libdl" = yes && { CF_ADD_LIB(dl) } AC_MSG_CHECKING(whether able to link to dl*() functions) - AC_TRY_LINK([#include ],[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ + #include + #include + ],[ void *obj; - if ((obj = dlopen("filename", 0)) != 0) { + if ((obj = dlopen("filename", 0)) != NULL) { if (dlsym(obj, "symbolname") == 0) { dlclose(obj); } - }],[ + }])],[ AC_DEFINE(HAVE_LIBDL,1,[Define to 1 if we have dl library])],[ AC_MSG_ERROR(Cannot link test program for libdl)]) AC_MSG_RESULT(ok) @@ -2623,19 +2719,36 @@ else fi ]) dnl --------------------------------------------------------------------------- -dnl CF_FUNC_GETTIME version: 2 updated: 2023/02/25 08:45:56 +dnl CF_FUNC_GETTIME version: 4 updated: 2025/12/23 18:53:34 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 ], +cf_save_libs="$LIBS" +AC_CHECK_FUNC(clock_gettime, + cf_cv_test_clock_gettime=yes, + AC_CHECK_LIB(rt, clock_gettime, + [LIBS="-lrt $LIBS" + cf_cv_test_clock_gettime=yes], + cf_cv_test_clock_gettime=no)) + +if test "$cf_cv_test_clock_gettime" = yes ; then +AC_CACHE_CHECK(if clock_gettime links,cf_cv_func_clock_gettime,[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ +$ac_includes_default +#include + ], [struct timespec ts; - int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts], + int rc = clock_gettime(CLOCK_REALTIME, &ts) + + clock_gettime(CLOCK_MONOTONIC, &ts); + (void) rc; (void)ts])], [cf_cv_func_clock_gettime=yes], [cf_cv_func_clock_gettime=no]) ]) +else + cf_cv_func_clock_gettime=no +fi if test "$cf_cv_func_clock_gettime" = yes then @@ -2650,17 +2763,17 @@ AC_CHECK_LIB(bsd, gettimeofday, fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_GETTTYNAM version: 2 updated: 2023/01/05 18:06:28 +dnl CF_FUNC_GETTTYNAM version: 5 updated: 2025/12/24 12:27:29 dnl ----------------- dnl Check if the 4.3BSD function getttyname exists, as well as if dnl defines the _PATH_TTYS symbol. If the corresponding file exists, but the dnl other checks fail, just define HAVE_PATH_TTYS. AC_DEFUN([CF_FUNC_GETTTYNAM],[ AC_CACHE_CHECK(if _PATH_TTYS is defined in ttyent.h,cf_cv_PATH_TTYS,[ -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include #include ],[ -FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp], +FILE *fp = fopen(_PATH_TTYS, "r"); (void)fp])], [cf_cv_PATH_TTYS=yes], [cf_cv_PATH_TTYS=no])]) @@ -2682,12 +2795,11 @@ then AC_CACHE_CHECK(if _PATH_TTYS file exists,cf_cv_have_PATH_TTYS,[ AC_TRY_RUN([ $ac_includes_default - #include int main(void) { FILE *fp = fopen(_PATH_TTYS, "r"); - ${cf_cv_main_return:-return} (fp == 0); + ${cf_cv_main_return:-return} (fp == NULL); }], [cf_cv_have_PATH_TTYS=yes], [cf_cv_have_PATH_TTYS=no], @@ -2699,11 +2811,11 @@ if test $cf_cv_PATH_TTYS != no then AC_DEFINE(HAVE_PATH_TTYS,1,[define to 1 if system can map tty name to terminal type]) AC_CACHE_CHECK(for getttynam,cf_cv_func_getttynam,[ - AC_TRY_LINK([#include ], - [struct ttyent *fp = getttynam("/dev/tty"); (void)fp], + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], + [struct ttyent *fp = getttynam("/dev/tty"); (void)fp])], [cf_cv_func_getttynam=yes], [cf_cv_func_getttynam=no])]) - test "$cf_cv_func_getttynam" = yes && AC_DEFINE(HAVE_GETTTYNAM) + test "$cf_cv_func_getttynam" = yes && AC_DEFINE(HAVE_GETTTYNAM,1,[define to 1 if the system has getttynam()]) fi ])dnl dnl --------------------------------------------------------------------------- @@ -2775,7 +2887,7 @@ int main(void) { test "$cf_cv_func_nanosleep" = "yes" && AC_DEFINE(HAVE_NANOSLEEP,1,[Define to 1 if we have nanosleep()]) ]) dnl --------------------------------------------------------------------------- -dnl CF_FUNC_OPENPTY version: 7 updated: 2023/12/03 09:21:34 +dnl CF_FUNC_OPENPTY version: 8 updated: 2025/12/24 12:27:29 dnl --------------- dnl Check for openpty() function, along with header. It may need the dnl "util" library as well. @@ -2787,13 +2899,13 @@ AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[ test "$cf_cv_lib_util" = yes && { CF_ADD_LIB(util) } for cf_header in pty.h libutil.h util.h do - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include <$cf_header> ],[ int x = openpty((int *)0, (int *)0, (char *)0, (struct termios *)0, (struct winsize *)0); (void)x; -],[ +])],[ cf_cv_func_openpty=$cf_header break ],[ @@ -2866,14 +2978,14 @@ int main(void) { test "$cf_cv_working_poll" = "yes" && AC_DEFINE(HAVE_WORKING_POLL,1,[Define to 1 if the poll function seems to work]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_TERMIOS version: 3 updated: 2012/10/06 17:56:13 +dnl CF_FUNC_TERMIOS version: 4 updated: 2025/12/24 12:27:29 dnl --------------- dnl Some old/broken variations define tcgetattr() only as a macro in dnl termio(s).h AC_DEFUN([CF_FUNC_TERMIOS],[ AC_REQUIRE([CF_STRUCT_TERMIOS]) AC_CACHE_CHECK(for tcgetattr, cf_cv_have_tcgetattr,[ -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include #ifdef HAVE_UNISTD_H #include @@ -2889,13 +3001,13 @@ AC_TRY_LINK([ #endif ],[ TTY foo; -tcgetattr(1, &foo);], +tcgetattr(1, &foo);])], [cf_cv_have_tcgetattr=yes], [cf_cv_have_tcgetattr=no])]) test "$cf_cv_have_tcgetattr" = yes && AC_DEFINE(HAVE_TCGETATTR,1,[Define to 1 if we have tcgetattr]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_VSSCANF version: 8 updated: 2023/12/03 19:09:59 +dnl CF_FUNC_VSSCANF version: 9 updated: 2025/12/24 12:27:29 dnl --------------- dnl Check for vsscanf() function, which is in c9x but generally not in earlier dnl versions of C. It can often be simulated by other functions on older @@ -2903,7 +3015,7 @@ dnl systems (where FILE is not opaque). AC_DEFUN([CF_FUNC_VSSCANF], [ AC_CACHE_CHECK(for vsscanf function or workaround,cf_cv_func_vsscanf,[ -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include #include @@ -2917,8 +3029,8 @@ myfunc(const char *str, const char *fmt, ...) } ],[ myfunc("55", "%d"); -],[cf_cv_func_vsscanf=vsscanf],[ -AC_TRY_LINK([ +])],[cf_cv_func_vsscanf=vsscanf],[ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include #include ],[ FILE strbuf; @@ -2928,8 +3040,8 @@ AC_TRY_LINK([ strbuf._ptr = strbuf._base = (unsigned char *) str; strbuf._cnt = strlen(str); strbuf._file = _NFILE; - return (vfscanf(&strbuf, "%d", ap))],[cf_cv_func_vsscanf=vfscanf],[ -AC_TRY_LINK([ + return (vfscanf(&strbuf, "%d", ap))])],[cf_cv_func_vsscanf=vfscanf],[ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include #include ],[ FILE strbuf; @@ -2939,7 +3051,7 @@ AC_TRY_LINK([ strbuf._ptr = strbuf._base = (unsigned char *) str; strbuf._cnt = strlen(str); strbuf._file = _NFILE; - return (_doscan(&strbuf, "%d", ap))],[cf_cv_func_vsscanf=_doscan],[ + return (_doscan(&strbuf, "%d", ap))])],[cf_cv_func_vsscanf=_doscan],[ cf_cv_func_vsscanf=no])])])]) case "$cf_cv_func_vsscanf" in @@ -2950,7 +3062,7 @@ esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_ATTRIBUTES version: 24 updated: 2021/03/20 12:00:25 +dnl CF_GCC_ATTRIBUTES version: 28 updated: 2025/12/25 18:43:31 dnl ----------------- dnl Test for availability of useful gcc __attribute__ directives to quiet dnl compiler warnings. Though useful, not all are supported -- and contrary @@ -2977,7 +3089,8 @@ cat > conftest.i < "conftest.$ac_ext" < @@ -3005,7 +3118,7 @@ EOF do CF_UPPER(cf_ATTRIBUTE,$cf_attribute) cf_directive="__attribute__(($cf_attribute))" - echo "checking for $CC $cf_directive" 1>&AC_FD_CC + echo "checking for $CC $cf_directive" 1>&AS_MESSAGE_LOG_FD case "$cf_attribute" in (printf) @@ -3080,7 +3193,7 @@ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_WARNINGS version: 41 updated: 2021/01/01 16:53:59 +dnl CF_GCC_WARNINGS version: 45 updated: 2025/12/24 09:07:25 dnl --------------- dnl Check if the compiler supports useful warning options. There's a few that dnl we don't use, simply because they're too noisy: @@ -3121,7 +3234,8 @@ then # remark #981: operands are evaluated in unspecified order # warning #279: controlling expression is constant - AC_CHECKING([for $CC warning options]) + AC_MSG_CHECKING([for $CC warning options]) + test -n "$verbose" && AC_MSG_RESULT() cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" for cf_opt in \ @@ -3144,7 +3258,8 @@ then CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - AC_CHECKING([for $CC warning options]) + AC_MSG_CHECKING([for $CC warning options]) + test -n "$verbose" && AC_MSG_RESULT() cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" @@ -3194,20 +3309,21 @@ rm -rf ./conftest* AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GETOPT_HEADER version: 8 updated: 2021/06/19 19:16:16 +dnl CF_GETOPT_HEADER version: 10 updated: 2025/12/14 17:40:20 dnl ---------------- dnl Check for getopt's variables which are commonly defined in stdlib.h, dnl unistd.h or (nonstandard) in getopt.h AC_DEFUN([CF_GETOPT_HEADER], -[ -AC_HAVE_HEADERS(unistd.h getopt.h) +[AC_REQUIRE([AC_HEADER_STDC]) + +AC_CHECK_HEADERS(getopt.h) AC_CACHE_CHECK(for header declaring getopt variables,cf_cv_getopt_header,[ cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h do -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <$cf_header>], -[int x = optind; char *y = optarg; (void)x; (void)y], +[int x = optind; char *y = optarg; (void)x; (void)y])], [cf_cv_getopt_header=$cf_header break]) done @@ -3220,6 +3336,26 @@ if test "$cf_cv_getopt_header" = getopt.h ; then fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_GLOB_FULLPATH version: 2 updated: 2024/08/03 12:34:02 +dnl ---------------- +dnl Use this in case-statements to check for pathname syntax, i.e., absolute +dnl pathnames. The "x" is assumed since we provide an alternate form for DOS. +AC_DEFUN([CF_GLOB_FULLPATH],[ +AC_REQUIRE([CF_WITH_SYSTYPE])dnl +case "$cf_cv_system_name" in +(cygwin*|msys*|mingw32*|mingw64|os2*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER='[[a-zA-Z]]:[[\\/]]*' + ;; +(*) + GLOB_FULLPATH_POSIX='/*' + GLOB_FULLPATH_OTHER=$GLOB_FULLPATH_POSIX + ;; +esac +AC_SUBST(GLOB_FULLPATH_POSIX) +AC_SUBST(GLOB_FULLPATH_OTHER) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_GNATPREP_OPT_T version: 1 updated: 2014/08/02 18:37:25 dnl ----------------- AC_DEFUN([CF_GNATPREP_OPT_T],[ @@ -3261,7 +3397,7 @@ AC_SUBST(cf_compile_generics) AC_SUBST(cf_generic_objects) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNAT_PROJECTS version: 13 updated: 2021/01/02 17:09:14 +dnl CF_GNAT_PROJECTS version: 14 updated: 2025/12/24 12:27:29 dnl ---------------- dnl GNAT projects are configured with ".gpr" project files. dnl GNAT libraries are a further development, using the project feature. @@ -3322,7 +3458,7 @@ CF_EOF -XLIBRARY_DIR="`cd ../conftest.lib;pwd`" \ -XSOURCE_DIR="`pwd`" \ -XSONAME=libConfTest.so.1 \ - -XLIB_KIND=static 1>&AC_FD_CC 2>&1 ) ; then + -XLIB_KIND=static 1>&AS_MESSAGE_LOG_FD 2>&1 ) ; then cf_gnat_projects=yes fi cd .. @@ -3426,7 +3562,7 @@ fi AC_SUBST(USE_GNAT_SIGINT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNAT_TRY_LINK version: 4 updated: 2021/01/01 13:31:04 +dnl CF_GNAT_TRY_LINK version: 5 updated: 2025/12/24 12:27:29 dnl ---------------- dnl Verify that a test program compiles/links with GNAT. dnl $cf_ada_make is set to the program that compiles/links @@ -3445,7 +3581,7 @@ CF_EOF cat >>conftest.adb <&AC_FD_CC 2>&1 ) ; then +if ( "$cf_ada_make" $ADAFLAGS conftest 1>&AS_MESSAGE_LOG_FD 2>&1 ) ; then ifelse($3,, :,[ $3]) ifelse($4,,,[else $4]) @@ -3453,7 +3589,7 @@ fi rm -rf ./conftest* ./*~conftest* ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNAT_TRY_RUN version: 6 updated: 2021/01/01 13:31:04 +dnl CF_GNAT_TRY_RUN version: 7 updated: 2025/12/24 12:27:29 dnl --------------- dnl Verify that a test program compiles and runs with GNAT dnl $cf_ada_make is set to the program that compiles/links @@ -3472,8 +3608,8 @@ CF_EOF cat >>conftest.adb <&AC_FD_CC 2>&1 ) ; then - if ( ./conftest 1>&AC_FD_CC 2>&1 ) ; then +if ( "$cf_ada_make" $ADAFLAGS conftest 1>&AS_MESSAGE_LOG_FD 2>&1 ) ; then + if ( ./conftest 1>&AS_MESSAGE_LOG_FD 2>&1 ) ; then ifelse($3,, :,[ $3]) ifelse($4,,,[ else $4]) @@ -3500,7 +3636,7 @@ test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no ifelse($1,,,[eval $1=$cf_cv_gnat_version; unset cf_cv_gnat_version]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNU_SOURCE version: 10 updated: 2018/12/10 20:09:41 +dnl CF_GNU_SOURCE version: 11 updated: 2025/12/14 17:40:20 dnl ------------- dnl Check if we must define _GNU_SOURCE to get a reasonable value for dnl _XOPEN_SOURCE, upon which many POSIX definitions depend. This is a defect @@ -3516,14 +3652,14 @@ AC_DEFUN([CF_GNU_SOURCE], cf_gnu_xopen_source=ifelse($1,,500,$1) AC_CACHE_CHECK(if this is the GNU C library,cf_cv_gnu_library,[ -AC_TRY_COMPILE([#include ],[ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #if __GLIBC__ > 0 && __GLIBC_MINOR__ >= 0 return 0; #elif __NEWLIB__ > 0 && __NEWLIB_MINOR__ >= 0 return 0; #else # error not GNU C library - #endif], + #endif])], [cf_cv_gnu_library=yes], [cf_cv_gnu_library=no]) ]) @@ -3536,14 +3672,14 @@ if test x$cf_cv_gnu_library = xyes; then AC_CACHE_CHECK(if _DEFAULT_SOURCE can be used as a basis,cf_cv_gnu_library_219,[ cf_save="$CPPFLAGS" CF_APPEND_TEXT(CPPFLAGS,-D_DEFAULT_SOURCE) - AC_TRY_COMPILE([#include ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19) || (__GLIBC__ > 2) return 0; #elif (__NEWLIB__ == 2 && __NEWLIB_MINOR__ >= 4) || (__GLIBC__ > 3) return 0; #else # error GNU C library __GLIBC__.__GLIBC_MINOR__ is too old - #endif], + #endif])], [cf_cv_gnu_library_219=yes], [cf_cv_gnu_library_219=no]) CPPFLAGS="$cf_save" @@ -3553,7 +3689,7 @@ if test x$cf_cv_gnu_library = xyes; then cf_save="$CPPFLAGS" AC_CACHE_CHECK(if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE,cf_cv_gnu_dftsrc_219,[ CF_ADD_CFLAGS(-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include #include ],[ @@ -3561,7 +3697,7 @@ if test x$cf_cv_gnu_library = xyes; then return 0; #else # error GNU C library is too old - #endif], + #endif])], [cf_cv_gnu_dftsrc_219=yes], [cf_cv_gnu_dftsrc_219=no]) ]) @@ -3573,17 +3709,17 @@ if test x$cf_cv_gnu_library = xyes; then if test "x$cf_cv_gnu_dftsrc_219" != xyes; then AC_CACHE_CHECK(if we must define _GNU_SOURCE,cf_cv_gnu_source,[ - AC_TRY_COMPILE([#include ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #ifndef _XOPEN_SOURCE #error expected _XOPEN_SOURCE to be defined - #endif], + #endif])], [cf_cv_gnu_source=no], [cf_save="$CPPFLAGS" CF_ADD_CFLAGS(-D_GNU_SOURCE) - AC_TRY_COMPILE([#include ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #ifdef _XOPEN_SOURCE #error expected _XOPEN_SOURCE to be undefined - #endif], + #endif])], [cf_cv_gnu_source=no], [cf_cv_gnu_source=yes]) CPPFLAGS="$cf_save" @@ -3594,10 +3730,10 @@ if test x$cf_cv_gnu_library = xyes; then then AC_CACHE_CHECK(if we should also define _DEFAULT_SOURCE,cf_cv_default_source,[ CF_APPEND_TEXT(CPPFLAGS,-D_GNU_SOURCE) - AC_TRY_COMPILE([#include ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #ifdef _DEFAULT_SOURCE #error expected _DEFAULT_SOURCE to be undefined - #endif], + #endif])], [cf_cv_default_source=no], [cf_cv_default_source=yes]) ]) @@ -3611,7 +3747,7 @@ if test x$cf_cv_gnu_library = xyes; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GPP_LIBRARY version: 13 updated: 2021/01/01 13:31:04 +dnl CF_GPP_LIBRARY version: 14 updated: 2025/12/24 12:27:29 dnl -------------- dnl If we're trying to use g++, test if libg++ is installed (a rather common dnl problem :-). If we have the compiler but no library, we'll be able to @@ -3631,10 +3767,10 @@ if test "$GXX" = yes; then AC_MSG_CHECKING([for lib$cf_gpp_libname]) cf_save="$LIBS" CF_ADD_LIB($cf_gpp_libname) - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include <$cf_gpp_libname/builtin.h> ], - [two_arg_error_handler_t foo2 = lib_error_handler], + [two_arg_error_handler_t foo2 = lib_error_handler])], [cf_cxx_library=yes CF_ADD_LIB($cf_gpp_libname,CXXLIBS) if test "$cf_gpp_libname" = cpp ; then @@ -3642,10 +3778,10 @@ if test "$GXX" = yes; then else AC_DEFINE(HAVE_GXX_BUILTIN_H,1,[Define to 1 if we have g++ builtin.h]) fi], - [AC_TRY_LINK([ + [AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include ], - [two_arg_error_handler_t foo2 = lib_error_handler], + [two_arg_error_handler_t foo2 = lib_error_handler])], [cf_cxx_library=yes CF_ADD_LIB($cf_gpp_libname,CXXLIBS) AC_DEFINE(HAVE_BUILTIN_H,1,[Define to 1 if we have builtin.h])], @@ -3673,7 +3809,7 @@ if test "$GXX" = yes; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GXX_WARNINGS version: 11 updated: 2021/01/08 16:50:55 +dnl CF_GXX_WARNINGS version: 14 updated: 2025/12/24 09:07:25 dnl --------------- dnl Check if the compiler supports useful warning options. dnl @@ -3722,7 +3858,8 @@ then # remark #981: operands are evaluated in unspecified order # warning #269: invalid format string conversion - AC_CHECKING([for $CC warning options]) + AC_MSG_CHECKING([for $CC warning options]) + test -n "$verbose" && AC_MSG_RESULT() cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-Wall" for cf_opt in \ @@ -3747,7 +3884,8 @@ then elif test "$GXX" = yes then - AC_CHECKING([for $CXX warning options]) + AC_MSG_CHECKING([for $CXX warning options]) + test -n "$verbose" && AC_MSG_RESULT() cf_save_CXXFLAGS="$CXXFLAGS" EXTRA_CXXFLAGS="-W -Wall" cf_gxx_extra_warnings="" @@ -3836,7 +3974,7 @@ fi ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_HASHED_DB_LIBS version: 10 updated: 2021/01/02 17:09:14 +dnl CF_HASHED_DB_LIBS version: 12 updated: 2025/12/24 12:27:29 dnl ----------------- dnl Given that we have the header and version for hashed database, find the dnl library information. @@ -3851,14 +3989,14 @@ do CF_ADD_LIB($cf_db_libs) fi CF_MSG_LOG(checking for library $cf_db_libs) - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ $ac_includes_default #include ],[ char *path = "/tmp/foo"; #ifdef DB_VERSION_MAJOR #if DB_VERSION_MAJOR >= 4 - DB *result = 0; + DB *result = NULL; db_create(&result, NULL, 0); result->open(result, NULL, @@ -3868,7 +4006,7 @@ $ac_includes_default DB_CREATE, 0644); #elif DB_VERSION_MAJOR >= 3 - DB *result = 0; + DB *result = NULL; db_create(&result, NULL, 0); result->open(result, path, @@ -3877,7 +4015,7 @@ $ac_includes_default DB_CREATE, 0644); #elif DB_VERSION_MAJOR >= 2 - DB *result = 0; + DB *result = NULL; db_open(path, DB_HASH, DB_CREATE, @@ -3893,8 +4031,8 @@ $ac_includes_default DB_HASH, 0); #endif - ${cf_cv_main_return:-return}(result != 0) -],[ + ${cf_cv_main_return:-return}(result != NULL) +])],[ if test -n "$cf_db_libs" ; then cf_cv_hashed_db_libs=$cf_db_libs else @@ -3908,7 +4046,7 @@ done ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_HASHED_DB_VERSION version: 5 updated: 2023/02/18 17:41:25 +dnl CF_HASHED_DB_VERSION version: 6 updated: 2025/12/24 12:27:29 dnl -------------------- dnl Given that we have the header file for hashed database, find the version dnl information. @@ -3920,7 +4058,7 @@ cf_cv_hashed_db_version=unknown for cf_db_version in 1 2 3 4 5 6 do CF_MSG_LOG(checking for db version $cf_db_version) - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ $ac_includes_default #include @@ -3938,7 +4076,7 @@ $ac_includes_default #error $cf_db_version is not 1 #endif #endif -],[DBT *foo = 0],[ +],[DBT *foo = 0])],[ cf_cv_hashed_db_version=$cf_db_version break ]) @@ -4178,7 +4316,45 @@ fi AC_SUBST(INSTALL_OPT_S) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25 +dnl CF_INSTALL_PREFIX version: 2 updated: 2025/10/18 11:14:21 +dnl ----------------- +dnl Special option for use by system-builders: the install-prefix is used to +dnl adjust the location into which the actual install is done, so that an +dnl archive can be built without modifying the host system's configuration. +AC_DEFUN([CF_INSTALL_PREFIX],[ +AC_MSG_CHECKING(for an installation directory prefix) +AC_ARG_WITH(install-prefix, + [ --with-install-prefix=DESTDIR use DESTDIR as installation directory prefix], + [case "x$withval" in + (xyes|xno) + ;; + (*) DESTDIR="$withval" + ;; + esac]) +AC_MSG_RESULT([${DESTDIR:-(none)}]) +AC_SUBST(DESTDIR) + +SET_DESTDIR= +test -n "$DESTDIR" && SET_DESTDIR="DESTDIR=$DESTDIR" +AC_SUBST(SET_DESTDIR) + +AC_MSG_CHECKING(if installation directory prefix should be merged) +CF_ARG_ENABLE(install-prefix, + [ --enable-install-prefix merge DESTDIR with installation prefix], + cf_install_prefix=yes, + cf_install_prefix=no) +AC_MSG_RESULT($cf_install_prefix) + +if test "$cf_install_prefix" = yes ; then + MERGE_PREFIX=':$(prefix)%=%' +else + MERGE_PREFIX='' +fi + +AC_SUBST(MERGE_PREFIX) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_INTEL_COMPILER version: 10 updated: 2025/12/14 17:40:20 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 @@ -4201,12 +4377,12 @@ if test "$ifelse([$1],,[$1],GCC)" = yes ; then AC_MSG_CHECKING(if this is really Intel ifelse([$1],GXX,C++,C) compiler) cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])" ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -no-gcc" - AC_TRY_COMPILE([],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[ #ifdef __INTEL_COMPILER #else #error __INTEL_COMPILER is not defined #endif -],[ifelse([$2],,INTEL_COMPILER,[$2])=yes +])],[ifelse([$2],,INTEL_COMPILER,[$2])=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" ],[]) ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" @@ -4216,14 +4392,14 @@ cf_save_CFLAGS="$cf_save_CFLAGS -we147" fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ISASCII version: 5 updated: 2023/12/03 09:21:34 +dnl CF_ISASCII version: 6 updated: 2025/12/24 12:27:29 dnl ---------- dnl Check if we have either a function or macro for 'isascii()'. AC_DEFUN([CF_ISASCII], [ AC_MSG_CHECKING(for isascii) AC_CACHE_VAL(cf_cv_have_isascii,[ - AC_TRY_LINK([#include ],[int x = isascii(' '); (void)x], + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ],[int x = isascii(' '); (void)x])], [cf_cv_have_isascii=yes], [cf_cv_have_isascii=no]) ])dnl @@ -4231,7 +4407,7 @@ AC_MSG_RESULT($cf_cv_have_isascii) test "$cf_cv_have_isascii" = yes && AC_DEFINE(HAVE_ISASCII,1,[Define to 1 if we have isascii()]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LARGEFILE version: 13 updated: 2023/12/03 19:09:59 +dnl CF_LARGEFILE version: 14 updated: 2025/12/22 04:16:14 dnl ------------ dnl Add checks for large file support. AC_DEFUN([CF_LARGEFILE],[ @@ -4261,7 +4437,7 @@ ifdef([AC_FUNC_FSEEKO],[ fi AC_CACHE_CHECK(whether to use struct dirent64, cf_cv_struct_dirent64,[ - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #pragma GCC diagnostic error "-Wincompatible-pointer-types" #include #include @@ -4276,7 +4452,7 @@ extern struct dirent64 * readdir(DIR *); struct dirent *y = readdir(dp); int z = x - y; (void)z; - ], + ])], [cf_cv_struct_dirent64=yes], [cf_cv_struct_dirent64=no]) ]) @@ -4285,7 +4461,7 @@ extern struct dirent64 * readdir(DIR *); ]) ]) dnl --------------------------------------------------------------------------- -dnl CF_LDFLAGS_STATIC version: 14 updated: 2021/01/02 17:09:14 +dnl CF_LDFLAGS_STATIC version: 17 updated: 2025/12/24 12:27:29 dnl ----------------- dnl Check for compiler/linker flags used to temporarily force usage of static dnl libraries. This depends on the compiler and platform. Use this to help @@ -4306,21 +4482,21 @@ if test "$GCC" = yes ; then esac else case "$cf_cv_system_name" in - (aix[[4-7]]*) # from ld manpage + (aix[[4-7]]*) # from ld man page LDFLAGS_STATIC=-bstatic LDFLAGS_SHARED=-bdynamic ;; - (hpux*) # from ld manpage for hpux10.20, hpux11.11 + (hpux*) # from ld man page for hpux10.20, hpux11.11 # We could also use just "archive" and "shared". LDFLAGS_STATIC=-Wl,-a,archive_shared LDFLAGS_SHARED=-Wl,-a,shared_archive ;; - (irix*) # from ld manpage IRIX64 + (irix*) # from ld man page IRIX64 LDFLAGS_STATIC=-Bstatic LDFLAGS_SHARED=-Bdynamic ;; - (osf[[45]]*) # from ld manpage osf4.0d, osf5.1 - # alternative "-oldstyle_liblookup" (not in cc manpage) + (osf[[45]]*) # from ld man page osf4.0d, osf5.1 + # alternative "-oldstyle_liblookup" (not in cc man page) LDFLAGS_STATIC=-noso LDFLAGS_SHARED=-so_archive ;; @@ -4342,21 +4518,21 @@ then int cf_ldflags_static(FILE *fp) { return fflush(fp); } EOF if AC_TRY_EVAL(ac_compile) ; then - ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&AC_FD_CC 1>/dev/null - ( eval $RANLIB libconftest.a ) 2>&AC_FD_CC >/dev/null + ( $AR $ARFLAGS libconftest.a conftest.$OBJEXT ) 2>&AS_MESSAGE_LOG_FD 1>/dev/null + ( eval $RANLIB libconftest.a ) 2>&AS_MESSAGE_LOG_FD >/dev/null fi rm -f conftest.* cf_save_LIBS="$LIBS" LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #line __oline__ "configure" #include int cf_ldflags_static(FILE *fp); ],[ return cf_ldflags_static(stdin); -],[ +])],[ # some linkers simply ignore the -dynamic case x`file "conftest$ac_exeext" 2>/dev/null` in (*static*) @@ -4387,7 +4563,7 @@ AC_SUBST(LDFLAGS_STATIC) AC_SUBST(LDFLAGS_SHARED) ]) dnl --------------------------------------------------------------------------- -dnl CF_LD_RPATH_OPT version: 9 updated: 2021/01/01 13:31:04 +dnl CF_LD_RPATH_OPT version: 10 updated: 2025/12/15 04:04:20 dnl --------------- dnl For the given system and compiler, find the compiler flags to pass to the dnl loader to use the "rpath" feature. @@ -4435,7 +4611,7 @@ then AC_MSG_CHECKING(if we need a space after rpath option) cf_save_LIBS="$LIBS" CF_ADD_LIBS(${LD_RPATH_OPT}$libdir) - AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes) + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], cf_rpath_space=no, cf_rpath_space=yes) LIBS="$cf_save_LIBS" AC_MSG_RESULT($cf_rpath_space) test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " @@ -4567,9 +4743,12 @@ CF_SUBDIR_PATH($1,$2,lib) $1="$cf_library_path_list [$]$1" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09 +dnl CF_LIBTOOL_VERSION version: 2 updated: 2024/06/12 04:19:01 dnl ------------------ AC_DEFUN([CF_LIBTOOL_VERSION],[ +ifdef([LT_PACKAGE_VERSION],[ + cf_cv_libtool_version=LT_PACKAGE_VERSION +],[ if test -n "$LIBTOOL" && test "$LIBTOOL" != none then cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'` @@ -4578,6 +4757,7 @@ else fi test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version ])dnl +])dnl dnl --------------------------------------------------------------------------- dnl CF_LIB_PREFIX version: 14 updated: 2021/01/01 13:31:04 dnl ------------- @@ -4603,7 +4783,7 @@ ifelse($1,,,[$1=$LIB_PREFIX]) AC_SUBST(LIB_PREFIX) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LIB_RULES version: 100 updated: 2023/06/03 15:17:30 +dnl CF_LIB_RULES version: 103 updated: 2025/11/11 20:09:36 dnl ------------ dnl Append definitions and rules for the given models to the subdirectory dnl Makefiles, and the recursion rule for the top-level Makefile. If the @@ -4621,6 +4801,7 @@ dnl Note: Libs_To_Make is mixed case, since it is not a pure autoconf variable. AC_DEFUN([CF_LIB_RULES], [AC_REQUIRE([AC_PROG_FGREP])dnl AC_REQUIRE([CF_MAKE_PHONY])dnl +AC_REQUIRE([CF_GLOB_FULLPATH])dnl cf_prefix=$LIB_PREFIX AC_REQUIRE([CF_SUBST_NCURSES_VERSION]) @@ -4703,7 +4884,7 @@ CF_EOF if test "$cf_item" = shared ; then if test -n "${LIB_SUFFIX}" then - cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${USE_LIB_SUFFIX}"'//'` + cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${ABI_SUFFIX}"'//'` else cf_shared_suffix="$cf_suffix" fi @@ -4724,16 +4905,16 @@ CF_EOF case "$cf_cv_system_name" in (darwin*) # "w", etc? - cf_suffix="${USE_LIB_SUFFIX}"'.${'$cf_version_name'}'"$cf_shared_suffix" + cf_suffix="${ABI_SUFFIX}"'.${'$cf_version_name'}'"$cf_shared_suffix" ;; (*) cf_suffix="$cf_suffix"'.${'$cf_version_name'}' ;; esac fi - if test -n "${USE_LIB_SUFFIX}" + if test -n "${ABI_SUFFIX}" then - cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${USE_LIB_SUFFIX}"'//'` + cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${ABI_SUFFIX}"'//'` else cf_shared_suffix="$cf_suffix" fi @@ -4785,10 +4966,10 @@ CF_EOF cf_add_lib= case "$cf_l_parts" in (*termlib*) - cf_add_lib=`echo "$cf_liblist" |sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g` + cf_add_lib=`echo "$cf_liblist" |sed -e s%${LIB_NAME}${ABI_SUFFIX}%${TINFO_LIB_SUFFIX}%g` ;; (*ticlib*) - cf_add_lib=`echo "$cf_liblist" |sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g` + cf_add_lib=`echo "$cf_liblist" |sed -e s%${LIB_NAME}${ABI_SUFFIX}%${TICS_LIB_SUFFIX}%g` ;; (*) break @@ -4871,7 +5052,7 @@ CF_EOF if test "$cf_dir" = ncurses ; then case "$cf_subset" in (*base*) - cf_libname=${cf_libname}$USE_LIB_SUFFIX + cf_libname=${cf_libname}$ABI_SUFFIX ;; (*termlib*) cf_libname=$TINFO_LIB_SUFFIX @@ -4882,14 +5063,14 @@ CF_EOF esac elif test "$cf_dir" = c++ ; then CF_MAP_LIB_BASENAME(cf_libname,cxx) - cf_libname=${cf_libname}$USE_LIB_SUFFIX + cf_libname=${cf_libname}$ABI_SUFFIX else CF_MAP_LIB_BASENAME(cf_libname,$cf_dir) - cf_libname=${cf_libname}$USE_LIB_SUFFIX + cf_libname=${cf_libname}$ABI_SUFFIX fi if test -n "${USE_ARG_SUFFIX}" ; then - # undo $USE_LIB_SUFFIX add-on in CF_LIB_SUFFIX - cf_suffix=`echo "$cf_suffix" |sed -e "s%^${USE_LIB_SUFFIX}%%"` + # undo $ABI_SUFFIX add-on in CF_LIB_SUFFIX + cf_suffix=`echo "$cf_suffix" |sed -e "s%^${ABI_SUFFIX}%%"` fi # These dependencies really are for development, not @@ -4910,8 +5091,8 @@ CF_EOF cf_dir_suffix= old_cf_suffix="$cf_suffix" if test "$cf_cv_shlib_version_infix" = yes ; then - if test -n "$USE_LIB_SUFFIX" ; then - case "$USE_LIB_SUFFIX" in + if test -n "$ABI_SUFFIX" ; then + case "$ABI_SUFFIX" in (tw*) cf_libname=`echo "$cf_libname" | sed 's/tw'$EXTRA_SUFFIX'$//'` cf_suffix=`echo "$cf_suffix" | sed 's/^tw'$EXTRA_SUFFIX'//'` @@ -4941,8 +5122,8 @@ CF_EOF traces=$LIB_TRACING \ MODEL=$cf_ITEM \ CXX_MODEL=$CXX_MODEL \ + ABI_SUFFIX=$ABI_SUFFIX \ LIB_SUFFIX=$LIB_SUFFIX \ - USE_LIB_SUFFIX=$USE_LIB_SUFFIX \ make_phony="${cf_cv_make_PHONY:-no}" \ model=$cf_subdir \ prefix=$cf_prefix \ @@ -5127,7 +5308,7 @@ echo creating headers.sh cat >headers.sh <>headers.sh <>headers.sh <>headers.sh <&AC_FD_CC 1>/dev/null + mv conftest.$OBJEXT data.$OBJEXT && \ + ( $AR $ARFLAGS conftest.a data.$OBJEXT ) 2>&AS_MESSAGE_LOG_FD 1>/dev/null fi - rm -f conftest.$ac_ext data.o + rm -f conftest.$ac_ext data.$OBJEXT cat >conftest.$ac_ext <&AC_FD_CC 1>/dev/null + mv conftest.$OBJEXT func.$OBJEXT && \ + ( $AR $ARFLAGS conftest.a func.$OBJEXT ) 2>&AS_MESSAGE_LOG_FD 1>/dev/null fi - rm -f conftest.$ac_ext func.o - ( eval $RANLIB conftest.a ) 2>&AC_FD_CC >/dev/null + rm -f conftest.$ac_ext func.$OBJEXT + ( eval $RANLIB conftest.a ) 2>&AS_MESSAGE_LOG_FD >/dev/null cf_saveLIBS="$LIBS" LIBS="conftest.a $LIBS" AC_TRY_RUN([ @@ -5451,7 +5632,7 @@ AC_SUBST(BROKEN_LINKER) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LINK_FUNCS version: 13 updated: 2023/12/03 09:24:04 +dnl CF_LINK_FUNCS version: 14 updated: 2024/12/14 16:09:34 dnl ------------- dnl Most Unix systems have both link and symlink, a few don't have symlink. dnl A few non-Unix systems implement symlink, but not link. @@ -5486,7 +5667,7 @@ int main(void) char dst[] = "conftest.chk"; struct stat src_sb, dst_sb; FILE *fp = fopen(src, "w"); - if (fp == 0) { fail = 3; } else { + if (fp == NULL) { fail = 3; } else { fclose(fp); stat(src, &src_sb); if ($cf_func(src, dst) < 0) { fail = 1; @@ -5518,50 +5699,7 @@ int main(void) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MAKEFLAGS version: 21 updated: 2021/09/04 06:47:34 -dnl ------------ -dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make' -dnl options to lower-levels. It is very useful for "make -n" -- if we have it. -dnl (GNU 'make' does both, something POSIX 'make', which happens to make the -dnl ${MAKEFLAGS} variable incompatible because it adds the assignments :-) -AC_DEFUN([CF_MAKEFLAGS], -[AC_REQUIRE([AC_PROG_FGREP])dnl - -AC_CACHE_CHECK(for makeflags variable, cf_cv_makeflags,[ - cf_cv_makeflags='' - for cf_option in '-${MAKEFLAGS}' '${MFLAGS}' - do - cat >cf_makeflags.tmp </dev/null | ${FGREP-fgrep} -v "ing directory" | sed -e 's,[[ ]]*$,,'` - case "$cf_result" in - (.*k|.*kw) - cf_result="`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`" - case "$cf_result" in - (.*CC=*) cf_cv_makeflags= - ;; - (*) cf_cv_makeflags=$cf_option - ;; - esac - break - ;; - (.-) - ;; - (*) - CF_MSG_LOG(given option \"$cf_option\", no match \"$cf_result\") - ;; - esac - done - rm -f cf_makeflags.tmp -]) - -AC_SUBST(cf_cv_makeflags) -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_MAKE_PHONY version: 3 updated: 2021/01/08 16:08:21 +dnl CF_MAKE_PHONY version: 4 updated: 2025/12/24 12:27:29 dnl ------------- dnl Check if the make-program handles a ".PHONY" target, e.g,. a target which dnl acts as a placeholder. @@ -5632,7 +5770,7 @@ CF_EOF fi break done - ) >&AC_FD_CC 2>&1 + ) >&AS_MESSAGE_LOG_FD 2>&1 cf_cv_make_PHONY="`cat conftest.tmp`" rm -rf conftest* ]) @@ -5681,9 +5819,9 @@ AC_SUBST(MAKE_UPPER_TAGS) AC_SUBST(MAKE_LOWER_TAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MANPAGE_FORMAT version: 19 updated: 2024/03/30 08:27:40 +dnl CF_MANPAGE_FORMAT version: 20 updated: 2025/11/11 20:09:36 dnl ----------------- -dnl Option to allow user to override automatic configuration of manpage format. +dnl Option to allow user to override automatic configuration of man page format. dnl There are several special cases: dnl dnl compress - man checks for, can display compressed files @@ -5696,15 +5834,15 @@ dnl formatted - installer should format (put files in cat-directory) dnl catonly - installer should only format, e.g., for a turnkey system. dnl dnl There are other configurations which this macro does not test, e.g., HPUX's -dnl compressed manpages (but uncompressed manpages are fine, and HPUX's naming +dnl compressed man pages (but uncompressed man pages are fine, and HPUX's naming dnl convention would not match our use). AC_DEFUN([CF_MANPAGE_FORMAT], [ AC_REQUIRE([CF_PATHSEP]) -AC_MSG_CHECKING(format of man-pages) +AC_MSG_CHECKING(format of man pages) AC_ARG_WITH(manpage-format, - [ --with-manpage-format specify manpage-format: gzip/compress/bzip2/xz, + [ --with-manpage-format specify man page format: gzip/compress/bzip2/xz, BSDI/normal and optionally formatted/catonly, e.g., gzip,formatted], [MANPAGE_FORMAT=$withval], @@ -5721,7 +5859,7 @@ case "$MANPAGE_FORMAT" in MANPATH="/usr/man:/usr/share/man" fi - # look for the 'date' man-page (it is most likely to be installed!) + # look for the 'date' man page (it is most likely to be installed!) MANPAGE_FORMAT= cf_preform="no" cf_catonly="yes" @@ -5768,7 +5906,7 @@ case "$MANPAGE_FORMAT" in test "$cf_found" = yes && break fi done - # only check the first directory in $MANPATH where we find manpages + # only check the first directory in $MANPATH where we find man pages if test -n "$MANPAGE_FORMAT" ; then break fi @@ -5792,7 +5930,7 @@ esac AC_MSG_RESULT($MANPAGE_FORMAT) if test -n "$cf_unknown" ; then - AC_MSG_WARN(Unexpected manpage-format $cf_unknown) + AC_MSG_WARN(Unexpected man page format $cf_unknown) fi cf_manpage_format=no @@ -5840,17 +5978,17 @@ AC_SUBST(cf_manpage_coptions) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MANPAGE_RENAMES version: 17 updated: 2022/10/23 07:46:29 +dnl CF_MANPAGE_RENAMES version: 18 updated: 2025/11/11 20:09:36 dnl ------------------ -dnl The Debian people have their own naming convention for manpages. This +dnl The Debian people have their own naming convention for man pages. This dnl option lets us override the name of the file containing renaming, or dnl disable it altogether. AC_DEFUN([CF_MANPAGE_RENAMES], [ -AC_MSG_CHECKING(for manpage renaming) +AC_MSG_CHECKING(for man page renaming) AC_ARG_WITH(manpage-renames, - [ --with-manpage-renames specify manpage-renaming], + [ --with-manpage-renames specify man page renaming], [MANPAGE_RENAMES=$withval], [MANPAGE_RENAMES=yes]) @@ -5879,17 +6017,17 @@ AC_MSG_RESULT($MANPAGE_RENAMES) AC_SUBST(MANPAGE_RENAMES) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MANPAGE_SYMLINKS version: 7 updated: 2023/01/21 16:37:17 +dnl CF_MANPAGE_SYMLINKS version: 8 updated: 2025/11/11 20:09:36 dnl ------------------- -dnl Some people expect each tool to make all aliases for manpages in the +dnl Some people expect each tool to make all aliases for man pages in the dnl man-directory. This accommodates the older, less-capable implementations dnl of 'man', and is optional. AC_DEFUN([CF_MANPAGE_SYMLINKS], [ -AC_MSG_CHECKING(if manpage aliases will be installed) +AC_MSG_CHECKING(if man page aliases will be installed) AC_ARG_WITH(manpage-aliases, - [ --with-manpage-aliases specify manpage-aliases using .so], + [ --with-manpage-aliases specify man page aliases using .so], [MANPAGE_ALIASES=$withval], [MANPAGE_ALIASES=yes]) @@ -5906,10 +6044,10 @@ esac MANPAGE_SYMLINKS=no if test "$MANPAGE_ALIASES" = yes ; then -AC_MSG_CHECKING(if manpage symlinks should be used) +AC_MSG_CHECKING(if man page symlinks should be used) AC_ARG_WITH(manpage-symlinks, - [ --with-manpage-symlinks specify manpage-aliases using symlinks], + [ --with-manpage-symlinks specify man page aliases using symlinks], [MANPAGE_SYMLINKS=$withval], [MANPAGE_SYMLINKS=$cf_use_symlinks]) @@ -5925,54 +6063,30 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MANPAGE_TBL version: 3 updated: 2002/01/19 22:51:32 +dnl CF_MANPAGE_TBL version: 4 updated: 2025/11/11 20:09:36 dnl -------------- -dnl This option causes manpages to be run through tbl(1) to generate tables +dnl This option causes man pages to be run through tbl(1) to generate tables dnl correctly. AC_DEFUN([CF_MANPAGE_TBL], [ -AC_MSG_CHECKING(for manpage tbl) +AC_MSG_CHECKING(for man page tbl) AC_ARG_WITH(manpage-tbl, - [ --with-manpage-tbl specify manpage processing with tbl], + [ --with-manpage-tbl specify man page processing with tbl], [MANPAGE_TBL=$withval], [MANPAGE_TBL=no]) AC_MSG_RESULT($MANPAGE_TBL) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MB_LEN_MAX version: 1 updated: 2024/03/02 15:45:10 -dnl ------------- -dnl Check if defines a usable MB_LEN_MAX. That may be because it is -dnl not defined, or it may be a bogus value. -AC_DEFUN([CF_MB_LEN_MAX],[ -AC_CACHE_CHECK(if MB_LEN_MAX is usable,cf_cv_mb_len_max,[ -AC_TRY_COMPILE([ -$ac_includes_default -#include ], -[ -#if defined(MB_LEN_MAX) && MB_LEN_MAX >= 6 - ${cf_cv_main_return:-return}(0); -#else -#error MB_LEN_MAX is not usable -#endif -], [cf_cv_mb_len_max=yes], - [cf_cv_mb_len_max=no])]) -if test "$cf_cv_mb_len_max" = yes -then - AC_DEFINE(HAVE_CONSISTENT_MB_LEN_MAX,1,[Define to 1 if MB_LEN_MAX is usable]) -else - AC_MSG_WARN(MB_LEN_MAX is missing/inconsistent in system headers) -fi -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_MAN_PAGES version: 59 updated: 2024/03/30 08:27:40 +dnl CF_MAN_PAGES version: 64 updated: 2025/11/11 20:09:36 dnl ------------ -dnl Try to determine if the man-pages on the system are compressed, and if +dnl Try to determine if the man pages on the system are compressed, and if dnl so, what format is used. Use this information to construct a script that -dnl will install man-pages. +dnl will install man pages. AC_DEFUN([CF_MAN_PAGES], [ +AC_REQUIRE([CF_CHECK_TBL_X_OPTION]) CF_HELP_MESSAGE(Options to Specify How Manpages are Installed:) CF_MANPAGE_FORMAT CF_MANPAGE_RENAMES @@ -5991,8 +6105,8 @@ cf_edit_man=./edit_man.sh cf_man_alias=`pwd`/man_alias.sed cat >$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP.unx + mv \$TMP.unx \$TMP +fi +CF_EOF + cat >>$cf_edit_man <\$TMP.out @@ -6143,14 +6266,21 @@ CF_EOF if test "$with_overwrite" != yes ; then cat >>$cf_edit_man <\$TMP.out + sed -e "/\\#[ ]*include/s,\$TMP.out mv \$TMP.out \$TMP CF_EOF fi if test "$with_curses_h" != yes ; then cat >>$cf_edit_man <\$TMP.out + sed -e "/\\#[ ]*include/s,curses.h,ncurses.h," \ + < \$TMP >\$TMP.out mv \$TMP.out \$TMP CF_EOF fi @@ -6165,7 +6295,7 @@ CF_EOF if test -n "$cf_manpage_compress" ; then cat >>$cf_edit_man < #include #include ], - [double x = rand(); printf("result = %g\\n", ]ifelse([$2],,sin(x),$2)[)], + [double x = rand(); printf("result = %g\\n", ]ifelse([$2],,sin(x),$2)[)])], [cf_cv_need_libm=no], [cf_cv_need_libm=yes])]) @@ -6329,12 +6459,12 @@ then LIBS="$LIBS -lm" AC_CACHE_CHECK(if -lm is available for math functions, cf_cv_have_libm,[ - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include #include #include ], - [double x = rand(); printf("result = %g\\n", ]ifelse([$2],,sin(x),$2)[)], + [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" @@ -6353,6 +6483,31 @@ then fi ]) dnl --------------------------------------------------------------------------- +dnl CF_MB_LEN_MAX version: 2 updated: 2025/12/24 12:27:29 +dnl ------------- +dnl Check if defines a usable MB_LEN_MAX. That may be because it is +dnl not defined, or it may be a bogus value. +AC_DEFUN([CF_MB_LEN_MAX],[ +AC_CACHE_CHECK(if MB_LEN_MAX is usable,cf_cv_mb_len_max,[ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +$ac_includes_default +#include ], +[ +#if defined(MB_LEN_MAX) && MB_LEN_MAX >= 6 + ${cf_cv_main_return:-return}(0); +#else +#error MB_LEN_MAX is not usable +#endif +])], [cf_cv_mb_len_max=yes], + [cf_cv_mb_len_max=no])]) +if test "$cf_cv_mb_len_max" = yes +then + AC_DEFINE(HAVE_CONSISTENT_MB_LEN_MAX,1,[Define to 1 if MB_LEN_MAX is usable]) +else + AC_MSG_WARN(MB_LEN_MAX is missing/inconsistent in system headers) +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_MIXEDCASE_FILENAMES version: 9 updated: 2021/01/01 16:53:59 dnl ---------------------- dnl Check if the file-system supports mixed-case filenames. If we're able to @@ -6383,7 +6538,7 @@ fi test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MKSTEMP version: 13 updated: 2023/12/01 17:22:50 +dnl CF_MKSTEMP version: 14 updated: 2025/12/14 18:08:20 dnl ---------- dnl Check for a working mkstemp. This creates two files, checks that they are dnl successfully created and distinct (AmigaOS apparently fails on the last). @@ -6393,7 +6548,7 @@ unistd.h \ ) AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[ rm -rf ./conftest* -AC_TRY_RUN([ +AC_RUN_IFELSE([AC_LANG_SOURCE([[ $ac_includes_default int main(void) @@ -6423,7 +6578,7 @@ int main(void) result = 1; ${cf_cv_main_return:-return}(result); } -],[cf_cv_func_mkstemp=yes +]])],[cf_cv_func_mkstemp=yes ],[cf_cv_func_mkstemp=no ],[cf_cv_func_mkstemp=maybe]) ]) @@ -6435,12 +6590,12 @@ if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; th fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MSG_LOG version: 5 updated: 2010/10/23 15:52:32 +dnl CF_MSG_LOG version: 6 updated: 2025/12/14 17:51:46 dnl ---------- dnl Write a debug message to config.log, along with the line number in the dnl configure script. AC_DEFUN([CF_MSG_LOG],[ -echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC +echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AS_MESSAGE_LOG_FD ])dnl dnl --------------------------------------------------------------------------- dnl CF_NCURSES_ABI_6 version: 5 updated: 2023/01/07 16:32:06 @@ -6558,7 +6713,7 @@ AC_DEFUN([CF_OBJ_SUBDIR], esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_OUTPUT_MANPAGE_RENAMES version: 2 updated: 2022/10/22 19:12:31 +dnl CF_OUTPUT_MANPAGE_RENAMES version: 3 updated: 2025/11/11 20:09:36 dnl ------------------------- dnl This runs in the output step to config.status, after man_db.renames has dnl been generated. @@ -6566,7 +6721,7 @@ AC_DEFUN([CF_OUTPUT_MANPAGE_RENAMES], [ AC_REQUIRE([CF_MANPAGE_RENAMES]) if test "$MANPAGE_RENAMES" != no ; then - # Construct a sed-script to perform renaming within man-pages + # Construct a sed script to perform renaming within man pages test -n "$verbose" && echo "creating edit_man.sed" test ! -d man && mkdir man FGREP="${FGREP-grep -F}" $SHELL "$srcdir/man/make_sed.sh" "$MANPAGE_RENAMES" >./edit_man.sed @@ -6634,39 +6789,39 @@ if test -n "$cf_path_prog" ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PATH_SYNTAX version: 18 updated: 2020/12/31 18:40:20 +dnl CF_PATH_SYNTAX version: 20 updated: 2025/12/16 04:09:03 dnl -------------- dnl Check the argument to see that it looks like a pathname. Rewrite it if it dnl begins with one of the prefix/exec_prefix variables, and then again if the dnl result begins with 'NONE'. This is necessary to work around autoconf's dnl delayed evaluation of those symbols. AC_DEFUN([CF_PATH_SYNTAX],[ +AC_REQUIRE([CF_GLOB_FULLPATH])dnl + if test "x$prefix" != xNONE; then cf_path_syntax="$prefix" else cf_path_syntax="$ac_default_prefix" fi -case ".[$]$1" in -(.\[$]\(*\)*|.\'*\'*) +case "x[$]$1" in +(x\[$]\(*\)*|x\'*\'*) ;; -(..|./*|.\\*) +(x.|x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; -(.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX - ;; -(.\[$]\{*prefix\}*|.\[$]\{*dir\}*) +(x\[$]\{*prefix\}*|x\[$]\{*dir\}*) eval $1="[$]$1" - case ".[$]$1" in - (.NONE/*) + case "x[$]$1" in + (xNONE/*) $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; -(.no|.NONE/*) +(xno|xNONE/*) $1=`echo "[$]$1" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2) + ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not "[$]$1"])],$2) ;; esac ])dnl @@ -6709,7 +6864,7 @@ fi AC_SUBST(PKG_CONFIG) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_POSIX_C_SOURCE version: 12 updated: 2023/02/18 17:41:25 +dnl CF_POSIX_C_SOURCE version: 13 updated: 2025/12/14 17:40:20 dnl ----------------- dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed. dnl @@ -6738,10 +6893,10 @@ CF_REMOVE_DEFINE(cf_trim_CPPFLAGS,$cf_save_CPPFLAGS,_POSIX_C_SOURCE) 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 ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #ifndef _POSIX_C_SOURCE #error _POSIX_C_SOURCE is not defined -#endif], +#endif])], [cf_cv_posix_c_source=no], [cf_want_posix_source=no case .$cf_POSIX_C_SOURCE in @@ -6757,10 +6912,10 @@ AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_posix_c_source,[ ;; esac if test "$cf_want_posix_source" = yes ; then - AC_TRY_COMPILE([#include ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #ifdef _POSIX_SOURCE #error _POSIX_SOURCE is defined -#endif],[], +#endif])],[], cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE") fi CF_MSG_LOG(ifdef from value $cf_POSIX_C_SOURCE) @@ -6768,10 +6923,10 @@ AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_posix_c_source,[ CPPFLAGS="$cf_trim_CPPFLAGS" CF_APPEND_TEXT(CPPFLAGS,$cf_cv_posix_c_source) CF_MSG_LOG(if the second compile does not leave our definition intact error) - AC_TRY_COMPILE([#include ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #ifndef _POSIX_C_SOURCE #error _POSIX_C_SOURCE is not defined -#endif],, +#endif])],, [cf_cv_posix_c_source=no]) CFLAGS="$cf_save_CFLAGS" CPPFLAGS="$cf_save_CPPFLAGS" @@ -6788,7 +6943,7 @@ fi # cf_cv_posix_visible ])dnl dnl --------------------------------------------------------------------------- -dnl CF_POSIX_VISIBLE version: 1 updated: 2018/12/31 20:46:17 +dnl CF_POSIX_VISIBLE version: 2 updated: 2025/12/14 17:40:20 dnl ---------------- dnl POSIX documents test-macros which an application may set before any system dnl headers are included to make features available. @@ -6804,18 +6959,18 @@ dnl conflicting definition. AC_DEFUN([CF_POSIX_VISIBLE], [ AC_CACHE_CHECK(if the POSIX test-macros are already defined,cf_cv_posix_visible,[ -AC_TRY_COMPILE([#include ],[ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #if defined(__POSIX_VISIBLE) && ((__POSIX_VISIBLE - 0L) > 0) \ && defined(__XSI_VISIBLE) && ((__XSI_VISIBLE - 0L) > 0) \ && defined(__BSD_VISIBLE) && ((__BSD_VISIBLE - 0L) > 0) \ && defined(__ISO_C_VISIBLE) && ((__ISO_C_VISIBLE - 0L) > 0) #error conflicting symbols found #endif -],[cf_cv_posix_visible=no],[cf_cv_posix_visible=yes]) +])],[cf_cv_posix_visible=no],[cf_cv_posix_visible=yes]) ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PREDEFINE version: 3 updated: 2023/02/18 17:41:25 +dnl CF_PREDEFINE version: 4 updated: 2025/12/24 12:27:29 dnl ------------ dnl Add definitions to CPPFLAGS to ensure they're predefined for all compiles. dnl @@ -6824,22 +6979,22 @@ dnl $2 = value (if any) to use for a predefinition AC_DEFUN([CF_PREDEFINE], [ AC_MSG_CHECKING(if we must define $1) -AC_TRY_COMPILE([#include +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #ifndef $1 #error $1 is not defined -#endif],[cf_result=no],[cf_result=yes]) +#endif])],[cf_result=no],[cf_result=yes]) AC_MSG_RESULT($cf_result) if test "$cf_result" = yes ; then CPPFLAGS="$CPPFLAGS ifelse([$2],,-D$1,[-D$1=$2])" elif test "x$2" != "x" ; then AC_MSG_CHECKING(checking for compatible value versus $2) - AC_TRY_COMPILE([#include + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #if $1-$2 < 0 #error $1-$2 is negative -#endif],[cf_result=yes],[cf_result=no]) +#endif])],[cf_result=yes],[cf_result=no]) AC_MSG_RESULT($cf_result) if test "$cf_result" = no ; then # perhaps we can override it - try... @@ -6905,7 +7060,7 @@ CF_ACVERSION_CHECK(2.52, CF_CC_ENV_FLAGS ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_CC_C_O version: 6 updated: 2021/01/01 13:31:04 +dnl CF_PROG_CC_C_O version: 7 updated: 2025/12/24 12:27:29 dnl -------------- dnl Analogous to AC_PROG_CC_C_O, but more useful: tests only $CC, ensures that dnl the output file can be renamed, and allows for a shell variable that can @@ -6929,7 +7084,7 @@ int main(void) CF_EOF # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. -ac_try='[$]$1 $2 -c conftest.$ac_ext -o conftest2.$ac_objext >&AC_FD_CC' +ac_try='[$]$1 $2 -c conftest.$ac_ext -o conftest2.$ac_objext >&AS_MESSAGE_LOG_FD' if AC_TRY_EVAL(ac_try) && test -f conftest2.$ac_objext && AC_TRY_EVAL(ac_try); then @@ -6946,7 +7101,7 @@ else fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_GNAT version: 12 updated: 2021/01/02 17:09:14 +dnl CF_PROG_GNAT version: 13 updated: 2025/12/24 12:27:29 dnl ------------ dnl Check for gnat/gnatmake/etc, ensure that the toolset is complete. AC_DEFUN([CF_PROG_GNAT],[ @@ -6995,12 +7150,12 @@ else "$cf_gprconfig,,,,GCC" \ "$cf_gprconfig" do - cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&AC_FD_CC | ${AWK:-awk} '/^\*/{print [$]3;}' | head -n 1` + cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&AS_MESSAGE_LOG_FD | ${AWK:-awk} '/^\*/{print [$]3;}' | head -n 1` test -n "$cf_gprconfig_value" && break done else cf_gprconfig_param=$cf_gprconfig - cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&AC_FD_CC | ${AWK:-awk} '/^\*/{print [$]3;}' | head -n 1` + cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&AS_MESSAGE_LOG_FD | ${AWK:-awk} '/^\*/{print [$]3;}' | head -n 1` fi if test -n "$cf_gprconfig_value" then @@ -7051,15 +7206,25 @@ AC_SUBST(cf_ada_config_Ada) AC_SUBST(cf_ada_config_C) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_INSTALL version: 10 updated: 2021/01/04 19:33:05 +dnl CF_PROG_INSTALL version: 13 updated: 2025/10/21 16:28:49 dnl --------------- dnl Force $INSTALL to be an absolute-path. Otherwise, edit_man.sh and the dnl misc/tabset install won't work properly. Usually this happens only when dnl using the fallback mkinstalldirs script AC_DEFUN([CF_PROG_INSTALL], [AC_PROG_INSTALL -case $INSTALL in -(/*) +AC_REQUIRE([CF_GLOB_FULLPATH])dnl +if test "x$INSTALL" = "x./install-sh -c"; then + if test -f /usr/sbin/install ; then + case "$host_os" in + (linux*gnu*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) + INSTALL=/usr/sbin/install + ;; + esac + fi +fi +case x$INSTALL in +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) ;; (*) CF_DIRNAME(cf_dir,$INSTALL) @@ -7089,14 +7254,17 @@ fi AC_SUBST(LDCONFIG) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13 +dnl CF_PROG_LINT version: 7 updated: 2024/11/30 14:37:45 dnl ------------ AC_DEFUN([CF_PROG_LINT], [ AC_CHECK_PROGS(LINT, lint cppcheck splint) case "x$LINT" in +(xlint|x*/lint) # NetBSD 10 + test -z "$LINT_OPTS" && LINT_OPTS="-chapbrxzgFS -v -Ac11" + ;; (xcppcheck|x*/cppcheck) - test -z "$LINT_OPTS" && LINT_OPTS="--enable=all" + test -z "$LINT_OPTS" && LINT_OPTS="--enable=all -D__CPPCHECK__" ;; esac AC_SUBST(LINT_OPTS) @@ -7125,7 +7293,15 @@ AC_MSG_RESULT($cf_prog_ln_sf) test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_REGEX version: 18 updated: 2021/01/01 16:53:59 +dnl CF_PROG_TBL version: 1 updated: 2025/11/01 18:43:38 +dnl ----------- +dnl Allow the "tbl" program to be configured. +dnl "TBL" is too short, and likely to conflict. +AC_DEFUN([CF_PROG_TBL],[ +AC_PATH_PROG(NROFF_TBL,tbl) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_REGEX version: 20 updated: 2025/12/24 12:27:29 dnl -------- dnl Attempt to determine if we've got one of the flavors of regular-expression dnl code that we can support. @@ -7181,12 +7357,12 @@ case "$cf_regex_func" in (compile) for cf_regex_hdr in regexp.h regexpr.h do - AC_TRY_LINK([#include <$cf_regex_hdr>],[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <$cf_regex_hdr>],[ char *p = compile("", "", "", 0); int x = step("", ""); (void)p; (void)x; - ],[ + ])],[ cf_cv_regex_hdrs=$cf_regex_hdr break ]) @@ -7195,15 +7371,16 @@ case "$cf_regex_func" in (*) for cf_regex_hdr in regex.h do - AC_TRY_LINK([#include + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include +#include #include <$cf_regex_hdr>],[ - regex_t *p = 0; + regex_t *p = NULL; int x = regcomp(p, "", 0); int y = regexec(p, "", 0, 0, 0); (void)x; (void)y; regfree(p); - ],[ + ])],[ cf_cv_regex_hdrs=$cf_regex_hdr break ]) @@ -7269,6 +7446,30 @@ define([CF_REMOVE_LIB], $1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'` ])dnl dnl --------------------------------------------------------------------------- +dnl CF_REQUIRE_PKG version: 1 updated: 2025/01/10 19:55:54 +dnl -------------- +dnl Update $REQUIRE_PKG, which lists the known required packages for this +dnl program. +dnl +dnl $1 = package(s) to require, e.g., in the generated ".pc" file +define([CF_REQUIRE_PKG], +[ +for cf_required in $1 +do + # check for duplicates + for cf_require_pkg in $REQUIRE_PKG + do + if test "$cf_required" = "$cf_require_pkg" + then + cf_required= + break + fi + done + test -n "$cf_required" && REQUIRE_PKG="$REQUIRE_PKG $cf_required" +done +AC_SUBST(REQUIRE_PKG) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_RESTORE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:47:45 dnl --------------------- dnl Restore flags saved in CF_SAVE_XTRA_FLAGS @@ -7280,7 +7481,7 @@ CFLAGS="$cf_save_CFLAGS_$1" CPPFLAGS="$cf_save_CPPFLAGS_$1" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_RPATH_HACK version: 13 updated: 2021/01/03 18:30:50 +dnl CF_RPATH_HACK version: 14 updated: 2025/12/15 04:04:20 dnl ------------- AC_DEFUN([CF_RPATH_HACK], [AC_REQUIRE([AC_PROG_FGREP])dnl @@ -7296,8 +7497,8 @@ if test -n "$LD_RPATH_OPT" ; then then cf_rpath_oops= -AC_TRY_LINK([#include ], - [printf("Hello");], +AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], + [printf("Hello");])], [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`]) @@ -7423,7 +7624,7 @@ do done ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SHARED_OPTS version: 111 updated: 2024/03/29 20:08:49 +dnl CF_SHARED_OPTS version: 114 updated: 2025/12/15 04:04:20 dnl -------------- dnl -------------- dnl Attempt to determine the appropriate CC/LD options for creating a shared @@ -7513,7 +7714,7 @@ AC_DEFUN([CF_SHARED_OPTS], for CC_SHARED_OPTS in -fPIC -fpic '' do CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" - AC_TRY_COMPILE([#include ],[int x = 1; (void)x],[break],[]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[int x = 1; (void)x])],[break],[]) done AC_MSG_RESULT($CC_SHARED_OPTS) CFLAGS="$cf_save_CFLAGS" @@ -7588,7 +7789,7 @@ CF_EOF AC_CACHE_CHECK([if ld -search_paths_first works], cf_cv_ldflags_search_paths_first, [ cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" - AC_TRY_LINK(, [int i;], cf_cv_ldflags_search_paths_first=yes, cf_cv_ldflags_search_paths_first=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [int i;])], cf_cv_ldflags_search_paths_first=yes, cf_cv_ldflags_search_paths_first=no) LDFLAGS=$cf_save_LDFLAGS]) if test "$cf_cv_ldflags_search_paths_first" = yes; then LDFLAGS="$LDFLAGS -Wl,-search_paths_first" @@ -7718,7 +7919,7 @@ CF_EOF -L*) ldopts+=("\`echo \"\[$]1\" | sed \"s/^-L/-LIBPATH:/\"\`") ;; - *.obj | *.o) + *.obj | *.$OBJEXT) ldopts+=("\[$]1") ;; -Wl,*) @@ -7895,7 +8096,7 @@ CF_EOF for cf_shared_opts in -xcode=pic32 -xcode=pic13 -KPIC -Kpic -O do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" - AC_TRY_COMPILE([#include ],[printf("Hello\\n");],[break]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[printf("Hello\\n");])],[break]) done CFLAGS="$cf_save_CFLAGS" CC_SHARED_OPTS=$cf_shared_opts @@ -7939,7 +8140,7 @@ cat > conftest.$ac_ext < #include -],[int x = SIGWINCH; (void)x], +],[int x = SIGWINCH; (void)x])], [cf_cv_define_sigwinch=yes], - [AC_TRY_COMPILE([ + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #undef _XOPEN_SOURCE #undef _POSIX_SOURCE #undef _POSIX_C_SOURCE #include #include -],[int x = SIGWINCH; (void)x], +],[int x = SIGWINCH; (void)x])], [cf_cv_define_sigwinch=maybe], [cf_cv_define_sigwinch=no]) ]) @@ -8037,7 +8238,7 @@ cf_cv_fixup_sigwinch=unknown cf_sigwinch=32 while test "$cf_sigwinch" != 1 do - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #undef _XOPEN_SOURCE #undef _POSIX_SOURCE #undef _POSIX_C_SOURCE @@ -8047,7 +8248,7 @@ do #if SIGWINCH != $cf_sigwinch #error SIGWINCH is not $cf_sigwinch #endif -int x = SIGWINCH; (void)x], +int x = SIGWINCH; (void)x])], [cf_cv_fixup_sigwinch=$cf_sigwinch break]) @@ -8061,7 +8262,7 @@ done fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SIG_ATOMIC_T version: 5 updated: 2020/03/10 18:53:47 +dnl CF_SIG_ATOMIC_T version: 6 updated: 2025/12/24 12:27:29 dnl --------------- dnl signal handler, but there are some gcc dependencies in that recommendation. dnl Try anyway. @@ -8074,7 +8275,7 @@ AC_CACHE_VAL(cf_cv_sig_atomic_t,[ "sig_atomic_t" \ "int" do - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include #include #include @@ -8087,7 +8288,7 @@ static void handler(int sig) x = 5; }], [signal(SIGINT, handler); - x = 1], + x = 1])], [cf_cv_sig_atomic_t=$cf_type], [cf_cv_sig_atomic_t=no]) test "$cf_cv_sig_atomic_t" != no && break @@ -8097,7 +8298,7 @@ AC_MSG_RESULT($cf_cv_sig_atomic_t) test "$cf_cv_sig_atomic_t" != no && AC_DEFINE_UNQUOTED(SIG_ATOMIC_T, $cf_cv_sig_atomic_t,[Define to signal global datatype]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SIZECHANGE version: 18 updated: 2021/09/04 06:35:04 +dnl CF_SIZECHANGE version: 19 updated: 2025/12/22 04:16:14 dnl ------------- dnl Check for definitions & structures needed for window size-changing dnl @@ -8117,7 +8318,7 @@ do then CF_APPEND_TEXT(CPPFLAGS,-D$cf_opts) fi - AC_TRY_COMPILE([#include + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include #ifdef HAVE_TERMIOS_H #include #else @@ -8155,13 +8356,13 @@ do no TIOCGSIZE or TIOCGWINSZ #endif /* TIOCGWINSZ */ #endif /* TIOCGSIZE */ - ], + ])], [cf_cv_sizechange=yes], [cf_cv_sizechange=no]) CPPFLAGS="$cf_save_CPPFLAGS" if test "$cf_cv_sizechange" = yes ; then - echo "size-change succeeded ($cf_opts)" >&AC_FD_CC + echo "size-change succeeded ($cf_opts)" >&AS_MESSAGE_LOG_FD test -n "$cf_opts" && cf_cv_sizechange="$cf_opts" break fi @@ -8294,7 +8495,7 @@ if test -n "$ADA_SUBDIRS"; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_STDCPP_LIBRARY version: 12 updated: 2021/01/01 13:31:04 +dnl CF_STDCPP_LIBRARY version: 13 updated: 2025/12/24 12:27:29 dnl ----------------- dnl Check for -lstdc++, which is GNU's standard C++ library. dnl If $CXXLIBS is set, add that to the libraries used for test-linking. @@ -8307,9 +8508,9 @@ if test -n "$GXX" ; then cf_save="$LIBS" LIBS="$LIBS $CXXLIBS" AC_MSG_CHECKING(if we already have C++ library) - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include ],[ - std::cout << "Hello World!" << std::endl;], + std::cout << "Hello World!" << std::endl;])], [cf_have_libstdcpp=yes], [cf_have_libstdcpp=no]) AC_MSG_RESULT($cf_have_libstdcpp) @@ -8334,9 +8535,9 @@ if test -n "$GXX" ; then cf_save="$LIBS" LIBS="$LIBS $CXXLIBS" CF_ADD_LIB($cf_stdcpp_libname) - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include ],[ - std::cout << "Hello World!" << std::endl;], + std::cout << "Hello World!" << std::endl;])], [cf_cv_libstdcpp=yes], [cf_cv_libstdcpp=no]) LIBS="$cf_save" @@ -8352,7 +8553,7 @@ dnl Remove "-g" option from the compiler options AC_DEFUN([CF_STRIP_G_OPT], [$1=`echo "${$1}" | CF__SED_TRIMBLANKS(-e 's%-g %%' -e 's%-g$%%')`])dnl dnl --------------------------------------------------------------------------- -dnl CF_STRUCT_SIGACTION version: 6 updated: 2023/12/03 09:21:34 +dnl CF_STRUCT_SIGACTION version: 7 updated: 2025/12/24 12:27:29 dnl ------------------- dnl Check if we need _POSIX_SOURCE defined to use struct sigaction. We'll only dnl do this if we've found the sigaction function. @@ -8361,17 +8562,17 @@ AC_REQUIRE([CF_XOPEN_SOURCE]) if test "$ac_cv_func_sigaction" = yes; then AC_MSG_CHECKING(whether sigaction needs _POSIX_SOURCE) -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include #include ], - [struct sigaction act; (void)act], + [struct sigaction act; (void)act])], [sigact_bad=no], [ -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #define _POSIX_SOURCE #include #include ], - [struct sigaction act; (void)act], + [struct sigaction act; (void)act])], [sigact_bad=yes AC_DEFINE(_POSIX_SOURCE,1,[Define to 1 if we must define _POSIX_SOURCE])], [sigact_bad=unknown])]) @@ -8379,13 +8580,13 @@ AC_MSG_RESULT($sigact_bad) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_STRUCT_TERMIOS version: 13 updated: 2023/12/03 19:38:54 +dnl CF_STRUCT_TERMIOS version: 15 updated: 2025/12/22 04:16:14 dnl ----------------- dnl Some machines require _POSIX_SOURCE to completely define struct termios. AC_DEFUN([CF_STRUCT_TERMIOS],[ AC_REQUIRE([CF_XOPEN_SOURCE]) -AC_CHECK_HEADERS( \ +AC_CHECK_HEADERS( sgtty.h \ termio.h \ termios.h \ unistd.h \ @@ -8401,13 +8602,13 @@ if test "$ac_cv_header_termios_h" = yes ; then esac if test "$termios_bad" = maybe ; then AC_MSG_CHECKING(whether termios.h needs _POSIX_SOURCE) - AC_TRY_COMPILE([#include ], - [struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], + [struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x])], termios_bad=no, [ - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #define _POSIX_SOURCE #include ], - [struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x], + [struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x])], termios_bad=unknown, termios_bad=yes AC_DEFINE(_POSIX_SOURCE,1,[Define to 1 if we must define _POSIX_SOURCE])) ]) @@ -8487,7 +8688,7 @@ AC_SUBST(cf_cv_header_stdbool_h) AC_SUBST(cf_cv_type_of_bool)dnl ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SYS_TIME_SELECT version: 6 updated: 2015/04/18 08:56:57 +dnl CF_SYS_TIME_SELECT version: 7 updated: 2025/12/24 12:27:29 dnl ------------------ dnl Check if we can include with ; this breaks on dnl older SCO configurations. @@ -8495,7 +8696,7 @@ AC_DEFUN([CF_SYS_TIME_SELECT], [ AC_MSG_CHECKING(if sys/time.h works with sys/select.h) AC_CACHE_VAL(cf_cv_sys_time_select,[ -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include #ifdef HAVE_SYS_TIME_H #include @@ -8503,7 +8704,7 @@ AC_TRY_COMPILE([ #ifdef HAVE_SYS_SELECT_H #include #endif -],[],[cf_cv_sys_time_select=yes], +],[])],[cf_cv_sys_time_select=yes], [cf_cv_sys_time_select=no]) ]) AC_MSG_RESULT($cf_cv_sys_time_select) @@ -8519,7 +8720,7 @@ top_builddir=ifelse($1,,`pwd`,$1) AC_SUBST(top_builddir) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TRY_PKG_CONFIG version: 6 updated: 2020/12/31 10:54:15 +dnl CF_TRY_PKG_CONFIG version: 7 updated: 2025/01/10 19:55:54 dnl ----------------- dnl This is a simple wrapper to use for pkg-config, for libraries which may be dnl available in that form. @@ -8536,6 +8737,7 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$1"; then cf_pkgconfig_libs="`$PKG_CONFIG --libs "$1" 2>/dev/null`" CF_VERBOSE(package $1 CFLAGS: $cf_pkgconfig_incs) CF_VERBOSE(package $1 LIBS: $cf_pkgconfig_libs) + CF_REQUIRE_PKG($1) CF_ADD_CFLAGS($cf_pkgconfig_incs) CF_ADD_LIBS($cf_pkgconfig_libs) ifelse([$2],,:,[$2]) @@ -8546,17 +8748,17 @@ else fi ]) dnl --------------------------------------------------------------------------- -dnl CF_TRY_XOPEN_SOURCE version: 4 updated: 2022/09/10 15:16:16 +dnl CF_TRY_XOPEN_SOURCE version: 5 updated: 2025/12/14 17:40:20 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(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(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(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY)], [cf_cv_xopen_source=no], [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) CPPFLAGS="$cf_save" @@ -8571,7 +8773,7 @@ if test "$cf_cv_xopen_source" != no ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_TYPEOF_CHTYPE version: 11 updated: 2023/01/05 17:57:59 +dnl CF_TYPEOF_CHTYPE version: 12 updated: 2024/12/14 16:09:34 dnl ---------------- dnl Determine the type we should use for chtype (and attr_t, which is treated dnl as the same thing). We want around 32 bits, so on most machines want a @@ -8587,7 +8789,7 @@ $ac_includes_default int main(void) { FILE *fp = fopen("cf_test.out", "w"); - if (fp != 0) { + if (fp != NULL) { char *result = "long"; if (sizeof(unsigned long) > sizeof(unsigned int)) { int n; @@ -8623,23 +8825,23 @@ AC_SUBST(cf_cv_typeof_chtype) AC_DEFINE_UNQUOTED(TYPEOF_CHTYPE,$cf_cv_typeof_chtype,[Define to actual type if needed for chtype]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TYPE_SIGACTION version: 5 updated: 2023/12/03 09:21:34 +dnl CF_TYPE_SIGACTION version: 6 updated: 2025/12/24 12:27:29 dnl ----------------- dnl AC_DEFUN([CF_TYPE_SIGACTION], [ AC_MSG_CHECKING([for type sigaction_t]) AC_CACHE_VAL(cf_cv_type_sigaction,[ - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include ], - [sigaction_t x; (void)x], + [sigaction_t x; (void)x])], [cf_cv_type_sigaction=yes], [cf_cv_type_sigaction=no])]) AC_MSG_RESULT($cf_cv_type_sigaction) test "$cf_cv_type_sigaction" = yes && AC_DEFINE(HAVE_TYPE_SIGACTION,1,[Define to 1 if we have the sigaction_t type]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_UNSIGNED_LITERALS version: 3 updated: 2023/12/03 10:02:17 +dnl CF_UNSIGNED_LITERALS version: 4 updated: 2025/12/24 12:27:29 dnl -------------------- dnl Test if the compiler supports 'U' and 'L' suffixes. Only old compilers dnl won't, but they're still there. @@ -8647,7 +8849,7 @@ AC_DEFUN([CF_UNSIGNED_LITERALS], [ AC_MSG_CHECKING([if unsigned literals are legal]) AC_CACHE_VAL(cf_cv_unsigned_literals,[ - AC_TRY_COMPILE([],[long x = 1L + 1UL + 1U + 1; (void)x], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[long x = 1L + 1UL + 1U + 1; (void)x])], [cf_cv_unsigned_literals=yes], [cf_cv_unsigned_literals=no]) ]) @@ -8663,20 +8865,20 @@ AC_DEFUN([CF_UPPER], $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` ])dnl dnl --------------------------------------------------------------------------- -dnl CF_UTF8_LIB version: 10 updated: 2023/01/11 04:05:23 +dnl CF_UTF8_LIB version: 12 updated: 2025/12/22 04:16:14 dnl ----------- dnl Check for multibyte support, and if not found, utf8 compatibility library AC_DEFUN([CF_UTF8_LIB], [ -AC_HAVE_HEADERS(wchar.h) +AC_CHECK_HEADERS(wchar.h) AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[ cf_save_LIBS="$LIBS" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ $ac_includes_default #ifdef HAVE_WCHAR_H #include #endif -],[putwc(0,0);], +],[putwc(0,0);])], [cf_cv_utf8_lib=yes], [CF_FIND_LINKAGE([ #include ],[putwc(0,0);],utf8, @@ -8694,19 +8896,19 @@ if test "$cf_cv_utf8_lib" = "add-on" ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_VA_COPY version: 6 updated: 2018/12/04 18:14:25 +dnl CF_VA_COPY version: 7 updated: 2025/12/24 12:27:29 dnl ---------- dnl check for va_copy, part of stdarg.h starting with ISO C 1999. dnl Also, workaround for glibc's __va_copy, by checking for both. dnl Finally, try to accommodate pre-ISO C 1999 headers. AC_DEFUN([CF_VA_COPY],[ AC_CACHE_CHECK(for va_copy, cf_cv_have_va_copy,[ -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include ],[ static va_list dst; static va_list src; - va_copy(dst, src)], + va_copy(dst, src)])], cf_cv_have_va_copy=yes, cf_cv_have_va_copy=no)]) @@ -8716,12 +8918,12 @@ then else # !cf_cv_have_va_copy AC_CACHE_CHECK(for __va_copy, cf_cv_have___va_copy,[ -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include ],[ static va_list dst; static va_list src; - __va_copy(dst, src)], + __va_copy(dst, src)])], cf_cv_have___va_copy=yes, cf_cv_have___va_copy=no)]) @@ -8731,12 +8933,12 @@ then else # !cf_cv_have___va_copy AC_CACHE_CHECK(for __builtin_va_copy, cf_cv_have___builtin_va_copy,[ -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include ],[ static va_list dst; static va_list src; - __builtin_va_copy(dst, src)], + __builtin_va_copy(dst, src)])], cf_cv_have___builtin_va_copy=yes, cf_cv_have___builtin_va_copy=no)]) @@ -8753,24 +8955,24 @@ case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy (*) AC_CACHE_CHECK(if we can simply copy va_list, cf_cv_pointer_va_list,[ -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include ],[ va_list dst; va_list src; - dst = src], + dst = src])], cf_cv_pointer_va_list=yes, cf_cv_pointer_va_list=no)]) if test "$cf_cv_pointer_va_list" = no then AC_CACHE_CHECK(if we can copy va_list indirectly, cf_cv_array_va_list,[ -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include ],[ va_list dst; va_list src; - *dst = *src], + *dst = *src])], cf_cv_array_va_list=yes, cf_cv_array_va_list=no)]) test "$cf_cv_array_va_list" = yes && AC_DEFINE(ARRAY_VA_LIST,1,[Define to 1 if we can copy va_list indirectly]) @@ -8779,15 +8981,15 @@ AC_TRY_LINK([ esac ]) dnl --------------------------------------------------------------------------- -dnl CF_VERBOSE version: 3 updated: 2007/07/29 09:55:12 +dnl CF_VERBOSE version: 4 updated: 2025/12/14 17:51:46 dnl ---------- dnl Use AC_VERBOSE w/o the warnings AC_DEFUN([CF_VERBOSE], -[test -n "$verbose" && echo " $1" 1>&AC_FD_MSG +[test -n "$verbose" && echo " $1" 1>&AS_MESSAGE_FD CF_MSG_LOG([$1]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_VERSION_INFO version: 8 updated: 2021/01/01 13:31:04 +dnl CF_VERSION_INFO version: 11 updated: 2025/09/20 13:27:11 dnl --------------- dnl Define several useful symbols derived from the VERSION file. A separate dnl file is preferred to embedding the version numbers in various scripts. @@ -8865,17 +9067,19 @@ AC_SUBST(VERSION_PATCH) dnl if a package name is given, define its corresponding version info. We dnl need the package name to ensure that the defined symbols are unique. ifelse($1,,,[ - cf_PACKAGE=$1 + PROGRAM=$1 PACKAGE=ifelse($2,,$1,$2) AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE",[Define to the package-name]) + AC_SUBST(PROGRAM) AC_SUBST(PACKAGE) - CF_UPPER(cf_PACKAGE,$cf_PACKAGE) - AC_DEFINE_UNQUOTED(${cf_PACKAGE}_VERSION,"${VERSION_MAJOR}.${VERSION_MINOR}") - AC_DEFINE_UNQUOTED(${cf_PACKAGE}_PATCHDATE,${VERSION_PATCH}) + AH_TEMPLATE([AS_TR_CPP($1[_VERSION])],[version of package]) + AC_DEFINE_UNQUOTED(AS_TR_CPP($1[_VERSION]),"${VERSION_MAJOR}.${VERSION_MINOR}",[define to version of $1]) + AH_TEMPLATE([AS_TR_CPP($1[_PATCHDATE])],[patchdate of package]) + AC_DEFINE_UNQUOTED(AS_TR_CPP($1[_PATCHDATE]),${VERSION_PATCH},[define to patchdate of $1]) ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WCHAR_TYPE version: 5 updated: 2023/12/03 09:21:34 +dnl CF_WCHAR_TYPE version: 6 updated: 2025/12/24 12:27:29 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 @@ -8885,16 +9089,16 @@ AC_DEFUN([CF_WCHAR_TYPE], [ # This is needed on Tru64 5.0 to declare $1 AC_CACHE_CHECK(if we must include wchar.h to declare $1,cf_cv_$1,[ -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include #include #include #ifdef HAVE_LIBUTF8_H #include #endif], - [$1 state; (void)state], + [$1 state; (void)state])], [cf_cv_$1=no], - [AC_TRY_COMPILE([ + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include #include #include @@ -8902,7 +9106,7 @@ AC_TRY_COMPILE([ #ifdef HAVE_LIBUTF8_H #include #endif], - [$1 value; (void) value], + [$1 value; (void) value])], [cf_cv_$1=yes], [cf_cv_$1=unknown])])]) @@ -8925,14 +9129,14 @@ fi ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WEAK_SYMBOLS version: 1 updated: 2008/08/16 19:18:06 +dnl CF_WEAK_SYMBOLS version: 2 updated: 2025/12/24 12:27:29 dnl --------------- dnl Check for compiler-support for weak symbols. dnl This works with "recent" gcc. AC_DEFUN([CF_WEAK_SYMBOLS],[ AC_CACHE_CHECK(if $CC supports weak symbols,cf_cv_weak_symbols,[ -AC_TRY_COMPILE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include ], [ #if defined(__GNUC__) @@ -8947,7 +9151,7 @@ AC_TRY_COMPILE([ #endif weak_symbol(fopen); -],[cf_cv_weak_symbols=yes],[cf_cv_weak_symbols=no]) +])],[cf_cv_weak_symbols=yes],[cf_cv_weak_symbols=no]) ]) ])dnl dnl --------------------------------------------------------------------------- @@ -9001,6 +9205,56 @@ $1_ABI=$cf_cv_abi_version cf_cv_abi_default=$cf_cv_abi_version ])dnl dnl --------------------------------------------------------------------------- +dnl CF_WITH_ADA version: 2 updated: 2024/11/09 18:07:29 +dnl ----------- +dnl Check for the Ada compiler (unless requested to not do this), which causes +dnl a further check for a C compiler which can work with the Ada compiler. +AC_DEFUN([CF_WITH_ADA],[ +AC_ARG_WITH(ada, + [ --without-ada suppress check for Ada compiler], + [cf_with_ada=$withval], + [cf_with_ada=yes]) + +cf_prog_cc="gcc cc" +if test "x$cf_with_ada" = xyes +then + CF_PROG_GNAT + if test "x$cf_cv_prog_gnat_correct" = xyes; then + # gcc's developers chose to deprecate gnatgcc before making gprconfig + # work. They replaced gnatgcc in gcc 13 with a script which spits out + # a warning offering advice which could never work. + # + # Here is a workaround. + AC_PATH_PROG(cf_cv_path_gnatgcc,gnatgcc,no) + if test "$cf_cv_path_gnatgcc" != no + then + AC_MSG_CHECKING(for improvement) + cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null` + case "x$cf_file_gnatgcc" in + (*script*) + cf_cv_path_gnatgcc=`sh -x "$cf_cv_path_gnatgcc" --version 2>&1 | grep -w exec | sed -e 's/^[[ ]]*+[[ ]]*//' -e 's/exec[[ ]]//' -e 's/ .*//'` + ;; + (*) + cf_cv_path_gnatgcc=no + ;; + esac + AC_MSG_RESULT($cf_cv_path_gnatgcc) + test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc + cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc" + fi + fi +fi +case "$cf_prog_cc" in +(*/*) + CC="$cf_prog_cc" + AC_SUBST(CC) + ;; +(*) + CF_PROG_CC($cf_prog_cc) + ;; +esac +])dnl +dnl --------------------------------------------------------------------------- dnl CF_WITH_ADA_COMPILER version: 3 updated: 2023/10/28 11:59:01 dnl -------------------- dnl Command-line option to specify the Ada95 compiler. @@ -9201,7 +9455,7 @@ if test "$with_gpm" != no ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_WITH_LIBTOOL version: 36 updated: 2021/01/01 13:31:04 +dnl CF_WITH_LIBTOOL version: 38 updated: 2025/10/01 18:05:23 dnl --------------- dnl Provide a configure option to incorporate libtool. Define several useful dnl symbols for the makefile rules. @@ -9285,7 +9539,7 @@ ifdef([AC_PROG_LIBTOOL],[ fi ])dnl LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${libdir} ${LIBTOOL_VERSION} `cut -f1 ${top_srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o' - LIB_OBJECT='${OBJECTS:.o=.lo}' + LIB_OBJECT='${OBJECTS:.${OBJEXT}=.lo}' LIB_SUFFIX=.la LIB_CLEAN='${LIBTOOL} --mode=clean' LIB_COMPILE='${LIBTOOL} --mode=compile' @@ -9565,7 +9819,7 @@ if test "x$with_pcre2" != xno ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_PKG_CONFIG_LIBDIR version: 23 updated: 2023/11/22 20:48:30 +dnl CF_WITH_PKG_CONFIG_LIBDIR version: 25 updated: 2024/08/03 13:34:29 dnl ------------------------- dnl Allow the choice of the pkg-config library directory to be overridden. dnl @@ -9579,6 +9833,7 @@ dnl pkgconf (used with some systems such as FreeBSD in place of pkg-config) dnl optionally ignores $PKG_CONFIG_LIBDIR. Very old versions of pkg-config, dnl e.g., Solaris 10 also do not recognize $PKG_CONFIG_LIBDIR. AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[ +AC_REQUIRE([CF_GLOB_FULLPATH])dnl case "$PKG_CONFIG" in (no|none|yes) @@ -9612,10 +9867,10 @@ case "x$cf_search_path" in ;; (x) ;; -(x/*\ *) +(x$GLOB_FULLPATH_POSIX\ *|x$GLOB_FULLPATH_OTHER\ *) PKG_CONFIG_LIBDIR= ;; -(x/*) +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) PKG_CONFIG_LIBDIR="$cf_search_path" AC_MSG_RESULT($PKG_CONFIG_LIBDIR) cf_search_path= @@ -9634,7 +9889,15 @@ case "x$cf_search_path" in pkg-config \ pkgconf do - cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` + cf_raw_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null` + case "$cf_raw_search_path" in + (*\\*) + cf_search_path=`echo "$cf_raw_search_path" | tr ';' ' ' | tr '\' '/'` + ;; + (*/*) + cf_search_path=`echo "$cf_raw_search_path" | tr : ' '` + ;; + esac test -n "$cf_search_path" && break done @@ -9707,7 +9970,7 @@ fi AC_SUBST(PKG_CONFIG_LIBDIR) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_PTHREAD version: 7 updated: 2015/04/18 08:56:57 +dnl CF_WITH_PTHREAD version: 8 updated: 2025/12/24 12:27:29 dnl --------------- dnl Check for POSIX thread library. AC_DEFUN([CF_WITH_PTHREAD], @@ -9728,12 +9991,12 @@ if test "$with_pthread" != no ; then AC_MSG_CHECKING(if we can link with the $cf_lib_pthread library) cf_save_LIBS="$LIBS" CF_ADD_LIB($cf_lib_pthread) - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include ],[ int rc = pthread_create(0,0,0,0); int r2 = pthread_mutexattr_settype(0, 0); -],[with_pthread=yes],[with_pthread=no]) +])],[with_pthread=yes],[with_pthread=no]) LIBS="$cf_save_LIBS" AC_MSG_RESULT($with_pthread) test "$with_pthread" = yes && break @@ -9775,7 +10038,7 @@ ifelse($1,,[ ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_SYSMOUSE version: 3 updated: 2012/10/06 17:56:13 +dnl CF_WITH_SYSMOUSE version: 4 updated: 2025/12/24 12:27:29 dnl ---------------- dnl If we can compile with sysmouse, make it available unless it is not wanted. AC_DEFUN([CF_WITH_SYSMOUSE],[ @@ -9787,7 +10050,7 @@ AC_ARG_WITH(sysmouse, [cf_with_sysmouse=$withval], [cf_with_sysmouse=maybe]) if test "$cf_with_sysmouse" != no ; then - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include #if (__FreeBSD_version >= 400017) #include @@ -9798,14 +10061,14 @@ AC_ARG_WITH(sysmouse, ],[ struct mouse_info the_mouse; ioctl(0, CONS_MOUSECTL, &the_mouse); -],[cf_with_sysmouse=yes],[cf_with_sysmouse=no]) +])],[cf_with_sysmouse=yes],[cf_with_sysmouse=no]) fi AC_MSG_RESULT($cf_with_sysmouse) test "$cf_with_sysmouse" = yes && AC_DEFINE(USE_SYSMOUSE,1,[Define to 1 if we can/should use the sysmouse interface]) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_SYSTYPE version: 1 updated: 2013/01/26 16:26:12 +dnl CF_WITH_SYSTYPE version: 2 updated: 2025/12/14 18:08:20 dnl --------------- dnl For testing, override the derived host system-type which is used to decide dnl things such as the linker commands used to build shared libraries. This is @@ -9816,7 +10079,7 @@ dnl This is different from the --host option: it is used only for testing parts dnl of the configure script which would not be reachable with --host since that dnl relies on the build environment being real, rather than mocked up. AC_DEFUN([CF_WITH_SYSTYPE],[ -CF_CHECK_CACHE([AC_CANONICAL_SYSTEM]) +CF_CHECK_CACHE([AC_CANONICAL_TARGET]) AC_ARG_WITH(system-type, [ --with-system-type=XXX test: override derived host system-type], [AC_MSG_WARN(overriding system type to $withval) @@ -9854,7 +10117,7 @@ CF_NO_LEAKS_OPTION(valgrind, [USE_VALGRIND]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_VERSIONED_SYMS version: 13 updated: 2023/12/03 09:24:04 +dnl CF_WITH_VERSIONED_SYMS version: 17 updated: 2025/12/16 04:01:46 dnl ---------------------- dnl Use this when building shared library with ELF, to markup symbols with the dnl version identifier from the given input file. Generally that identifier is @@ -9864,7 +10127,11 @@ dnl $1 = basename of the ".map" file (default $PACKAGE) AC_DEFUN([CF_WITH_VERSIONED_SYMS], [AC_REQUIRE([AC_PROG_FGREP])dnl AC_REQUIRE([AC_PROG_EGREP])dnl +AC_REQUIRE([CF_GLOB_FULLPATH])dnl +if test "$with_libtool" = "yes" ; then + : +elif test "$with_shared" = "yes" ; then AC_MSG_CHECKING(if versioned-symbols file should be used) AC_ARG_WITH(versioned-syms, [[ --with-versioned-syms[=MAP-FILE] version ELF shared library symbols per MAP-FILE]], @@ -9877,7 +10144,7 @@ case "x$with_versioned_syms" in ;; (xno) ;; -(x/*) +(x$GLOB_FULLPATH_POSIX|x$GLOB_FULLPATH_OTHER) test -f "$with_versioned_syms" || AC_MSG_ERROR(expected a filename: $with_versioned_syms) ;; (*) @@ -9899,11 +10166,13 @@ then VERSIONED_SYMS="-Wl,--version-script,\${RESULTING_SYMS}" MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\[$]{VERSIONED_SYMS} -Wl,%"` CF_VERBOSE(MK_SHARED_LIB: $MK_SHARED_LIB) + LIB_CREATE="[$]MK_SHARED_LIB" ;; (*-dy\ *) VERSIONED_SYMS="-Wl,-M,\${RESULTING_SYMS}" MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\[$]{VERSIONED_SYMS} -dy%"` CF_VERBOSE(MK_SHARED_LIB: $MK_SHARED_LIB) + LIB_CREATE="[$]MK_SHARED_LIB" ;; (*) AC_MSG_WARN(this system does not support versioned-symbols) @@ -9978,16 +10247,18 @@ conftest.so: conftest.$ac_cv_objext EOF # compile source, make library - if make -f conftest.mk 2>&AC_FD_CC >/dev/null + if make -f conftest.mk 2>&AS_MESSAGE_LOG_FD >/dev/null then # test for missing symbol in either Data or Text section - cf_missing="`nm -P conftest.so 2>&AC_FD_CC |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[[ ]][[DT]][[ ]]'`" + cf_missing="`nm -P conftest.so 2>&AS_MESSAGE_LOG_FD |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[[ ]][[DT]][[ ]]'`" test -n "$cf_missing" && WILDCARD_SYMS=yes fi AC_MSG_RESULT($WILDCARD_SYMS) rm -f conftest.* fi fi + +fi AC_SUBST(RESULTING_SYMS) AC_SUBST(VERSIONED_SYMS) AC_SUBST(WILDCARD_SYMS) @@ -10079,7 +10350,59 @@ fi AC_SUBST(no_x11_rgb) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 67 updated: 2023/09/06 18:55:27 +dnl CF_WITH_XTERM_KBS version: 3 updated: 2025/10/21 03:55:54 +dnl ----------------- +dnl Configure-option with platform-defaults for the "xterm+kbs" building block +dnl in the terminfo file. +dnl +dnl The terminfo "kbs" value corresponds to "stty erase", and is conventionally +dnl assigned to the key which has +dnl +dnl a "Backspace" label and/or +dnl a backarrow symbol. +dnl +dnl See XTerm FAQ "Why doesn't my delete key work?" +dnl https://invisible-island.net/xterm/xterm.faq.html#xterm_erase +AC_DEFUN([CF_WITH_XTERM_KBS],[ +case $host_os in +(linux*gnu*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc|linux*musl|openbsd*|darwin*) + want_xterm_kbs=DEL + ;; +(*) + want_xterm_kbs=BS + ;; +esac + +AC_MSG_CHECKING(if xterm backspace-key sends BS or DEL) +AC_ARG_WITH(xterm-kbs, + [[ --with-xterm-kbs[=XXX] specify if xterm backspace-key sends BS or DEL]], + [with_xterm_kbs=$withval], + [with_xterm_kbs=auto]) +case x$with_xterm_kbs in +(xyes|xno|xBS|xbs|x8) + with_xterm_kbs=BS + ;; +(xDEL|xdel|x127) + with_xterm_kbs=DEL + ;; +(xauto) + with_xterm_kbs=$want_xterm_kbs + ;; +(*) + with_xterm_kbs=$withval + ;; +esac +AC_MSG_RESULT($with_xterm_kbs) +XTERM_KBS=$with_xterm_kbs +AC_SUBST(XTERM_KBS) + +if test "x$with_xterm_kbs" != "x$want_xterm_kbs" +then + AC_MSG_WARN([expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs]) +fi +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_XOPEN_SOURCE version: 71 updated: 2025/12/14 17:40:20 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, @@ -10139,9 +10462,12 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) +(linux*gnu*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) CF_GNU_SOURCE($cf_XOPEN_SOURCE) ;; +linux*musl) + cf_xopen_source="-D_BSD_SOURCE" + ;; (minix*) cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this... ;; @@ -10193,7 +10519,7 @@ case "$host_os" in # 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_COMPILE_IFELSE([AC_LANG_PROGRAM(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY)],,[ AC_MSG_WARN(_POSIX_C_SOURCE definition is not usable) CPPFLAGS="$cf_save_xopen_cppflags"]) fi @@ -10209,19 +10535,19 @@ dnl which is still not guaranteed to provide all of the entrypoints that dnl _XOPEN_SOURCE would yield. 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 ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #ifndef _XOPEN_SOURCE #error _XOPEN_SOURCE is not defined -#endif], +#endif])], [cf_XOPEN_SOURCE_set=yes], [cf_XOPEN_SOURCE_set=no]) AC_MSG_RESULT($cf_XOPEN_SOURCE_set) if test "$cf_XOPEN_SOURCE_set" = yes then - AC_TRY_COMPILE([#include ],[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[ #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE #error (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE -#endif], +#endif])], [cf_XOPEN_SOURCE_set_ok=yes], [cf_XOPEN_SOURCE_set_ok=no]) if test "$cf_XOPEN_SOURCE_set_ok" = no diff --git a/announce.html.in b/announce.html.in index 9889ef1..79ced53 100644 --- a/announce.html.in +++ b/announce.html.in @@ -1,7 +1,7 @@ -adacursesw6\-config 1 2024-04-20 ncurses 6.5 User commands +adacursesw6\-config 1 2025-04-05 ncurses 6.6 User commands -

adacursesw6\-config 1 2024-04-20 ncurses 6.5 User commands

+

adacursesw6\-config 1 2025-04-05 ncurses 6.6 User commands

 adacursesw6-config(1)            User commands           adacursesw6-config(1)
 
 
-
-
 

NAME

        adacursesw6-config - configuration helper for AdaCurses libraries
 
@@ -69,8 +67,8 @@
 
        --libs     reports the GNAT libraries needed to link with AdaCurses.
 
-       --version  reports  the  release  and  patch  date  information  of the
-                  ncurses libraries used to configure and build AdaCurses  and
+       --version  reports the  release  and  patch  date  information  of  the
+                  ncurses  libraries used to configure and build AdaCurses and
                   exits successfully.
 
        --help     issues a usage message and exits successfully.
@@ -112,7 +110,6 @@
               end loop;
 
               End_Windows;
-
            end Hello;
 
        Then, using
@@ -126,9 +123,7 @@
 

SEE ALSO

        curses(3x)
 
-
-
-ncurses 6.5                       2024-04-20             adacursesw6-config(1)
+ncurses 6.6                       2025-04-05             adacursesw6-config(1)