aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2002-05-21 05:30:25 +0000
committerPeter Wemm <peter@FreeBSD.org>2002-05-21 05:30:25 +0000
commit39f2269fcb4873fd97d70af944ec49f4230fadea (patch)
treebd986d58f5a6e348466b5362637ba93e6cd5bf8c /contrib
parent7e6a63408cfb0b48f0e41f77ed82f5d0ca60bda5 (diff)
downloadsrc-39f2269fcb4873fd97d70af944ec49f4230fadea.tar.gz
src-39f2269fcb4873fd97d70af944ec49f4230fadea.zip
Import ncurses-5.2-20020518 onto the vendor branch.
Obtained from: ftp://dickey.his.com/ncurses/
Notes
Notes: svn path=/vendor/ncurses/dist/; revision=97049
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ncurses/INSTALL45
-rw-r--r--contrib/ncurses/MANIFEST54
-rw-r--r--contrib/ncurses/Makefile.glibc4
-rw-r--r--contrib/ncurses/Makefile.in5
-rw-r--r--contrib/ncurses/NEWS796
-rw-r--r--contrib/ncurses/aclocal.m4610
-rw-r--r--contrib/ncurses/c++/Makefile.in20
-rw-r--r--contrib/ncurses/c++/cursesf.cc4
-rw-r--r--contrib/ncurses/c++/cursesf.h4
-rw-r--r--contrib/ncurses/c++/cursesm.cc8
-rw-r--r--contrib/ncurses/c++/cursesmain.cc14
-rw-r--r--contrib/ncurses/c++/cursesp.cc7
-rw-r--r--contrib/ncurses/c++/cursesp.h7
-rw-r--r--contrib/ncurses/c++/cursesw.cc30
-rw-r--r--contrib/ncurses/c++/cursesw.h33
-rw-r--r--contrib/ncurses/c++/demo.cc77
-rwxr-xr-xcontrib/ncurses/c++/edit_cfg.sh8
-rw-r--r--contrib/ncurses/c++/etip.h.in16
-rwxr-xr-xcontrib/ncurses/config.guess483
-rwxr-xr-xcontrib/ncurses/config.sub269
-rwxr-xr-xcontrib/ncurses/configure2156
-rw-r--r--contrib/ncurses/configure.in254
-rw-r--r--contrib/ncurses/dist.mk24
-rw-r--r--contrib/ncurses/doc/html/ncurses-intro.html8
-rw-r--r--contrib/ncurses/form/Makefile.in15
-rw-r--r--contrib/ncurses/form/form.h2
-rw-r--r--contrib/ncurses/include/Caps1320
-rw-r--r--contrib/ncurses/include/Caps.aix41255
-rw-r--r--contrib/ncurses/include/Caps.keys1354
-rw-r--r--contrib/ncurses/include/Caps.osf1r51274
-rw-r--r--contrib/ncurses/include/Caps.uwin1090
-rwxr-xr-xcontrib/ncurses/include/MKkey_defs.sh162
-rw-r--r--contrib/ncurses/include/MKterm.h.awk.in18
-rw-r--r--contrib/ncurses/include/Makefile.in35
-rw-r--r--contrib/ncurses/include/curses.h.in720
-rw-r--r--contrib/ncurses/include/curses.tail134
-rw-r--r--contrib/ncurses/include/curses.wide237
-rwxr-xr-xcontrib/ncurses/include/edit_cfg.sh18
-rw-r--r--contrib/ncurses/include/nc_alloc.h8
-rw-r--r--contrib/ncurses/include/ncurses_defs14
-rw-r--r--contrib/ncurses/include/ncurses_dll.h9
-rw-r--r--contrib/ncurses/include/tic.h17
-rwxr-xr-xcontrib/ncurses/man/MKterminfo.sh8
-rw-r--r--contrib/ncurses/man/Makefile.in16
-rw-r--r--contrib/ncurses/man/curs_add_wch.3x134
-rw-r--r--contrib/ncurses/man/curs_add_wchstr.3x98
-rw-r--r--contrib/ncurses/man/curs_addstr.3x31
-rw-r--r--contrib/ncurses/man/curs_addwstr.3x91
-rw-r--r--contrib/ncurses/man/curs_attr.3x8
-rw-r--r--contrib/ncurses/man/curs_bkgd.3x11
-rw-r--r--contrib/ncurses/man/curs_bkgrnd.3x107
-rw-r--r--contrib/ncurses/man/curs_border.3x58
-rw-r--r--contrib/ncurses/man/curs_border_set.3x202
-rw-r--r--contrib/ncurses/man/curs_color.3x10
-rw-r--r--contrib/ncurses/man/curs_extend.3x11
-rw-r--r--contrib/ncurses/man/curs_get_wch.3x161
-rw-r--r--contrib/ncurses/man/curs_get_wstr.3x164
-rw-r--r--contrib/ncurses/man/curs_getcchar.3x144
-rw-r--r--contrib/ncurses/man/curs_getch.3x75
-rw-r--r--contrib/ncurses/man/curs_getstr.3x14
-rw-r--r--contrib/ncurses/man/curs_in_wch.3x68
-rw-r--r--contrib/ncurses/man/curs_in_wchstr.3x117
-rw-r--r--contrib/ncurses/man/curs_ins_wch.3x65
-rw-r--r--contrib/ncurses/man/curs_ins_wstr.3x104
-rw-r--r--contrib/ncurses/man/curs_insstr.3x6
-rw-r--r--contrib/ncurses/man/curs_instr.3x6
-rw-r--r--contrib/ncurses/man/curs_inwstr.3x95
-rw-r--r--contrib/ncurses/man/curs_kernel.3x4
-rw-r--r--contrib/ncurses/man/curs_mouse.3x80
-rw-r--r--contrib/ncurses/man/curs_move.3x6
-rw-r--r--contrib/ncurses/man/curs_outopts.3x79
-rw-r--r--contrib/ncurses/man/curs_overlay.3x6
-rw-r--r--contrib/ncurses/man/curs_print.3x4
-rw-r--r--contrib/ncurses/man/curs_refresh.3x45
-rw-r--r--contrib/ncurses/man/curs_scroll.3x21
-rw-r--r--contrib/ncurses/man/curs_termattrs.3x42
-rw-r--r--contrib/ncurses/man/curs_termcap.3x35
-rw-r--r--contrib/ncurses/man/curs_terminfo.3x69
-rw-r--r--contrib/ncurses/man/curs_trace.3x5
-rw-r--r--contrib/ncurses/man/curs_util.3x47
-rw-r--r--contrib/ncurses/man/default_colors.3x12
-rw-r--r--contrib/ncurses/man/define_key.3x10
-rw-r--r--contrib/ncurses/man/form.3x6
-rw-r--r--contrib/ncurses/man/form_driver.3x4
-rw-r--r--contrib/ncurses/man/form_field_attributes.3x8
-rw-r--r--contrib/ncurses/man/form_field_buffer.3x6
-rw-r--r--contrib/ncurses/man/form_field_info.3x8
-rw-r--r--contrib/ncurses/man/form_field_just.3x6
-rw-r--r--contrib/ncurses/man/form_field_new.3x4
-rw-r--r--contrib/ncurses/man/form_field_validation.3x4
-rw-r--r--contrib/ncurses/man/form_fieldtype.3x6
-rw-r--r--contrib/ncurses/man/form_new_page.3x6
-rw-r--r--contrib/ncurses/man/infocmp.1m12
-rw-r--r--contrib/ncurses/man/keybound.3x12
-rw-r--r--contrib/ncurses/man/keyok.3x10
-rw-r--r--contrib/ncurses/man/man_db.renames23
-rw-r--r--contrib/ncurses/man/menu.3x6
-rw-r--r--contrib/ncurses/man/menu_attributes.3x6
-rw-r--r--contrib/ncurses/man/menu_driver.3x4
-rw-r--r--contrib/ncurses/man/menu_format.3x6
-rw-r--r--contrib/ncurses/man/menu_pattern.3x4
-rw-r--r--contrib/ncurses/man/menu_spacing.3x8
-rw-r--r--contrib/ncurses/man/mitem_value.3x4
-rw-r--r--contrib/ncurses/man/ncurses.3x208
-rw-r--r--contrib/ncurses/man/resizeterm.3x45
-rw-r--r--contrib/ncurses/man/term.58
-rw-r--r--contrib/ncurses/man/term.76
-rw-r--r--contrib/ncurses/man/terminfo.tail264
-rw-r--r--contrib/ncurses/man/wresize.3x10
-rw-r--r--contrib/ncurses/menu/Makefile.in15
-rw-r--r--contrib/ncurses/menu/menu.priv.h8
-rw-r--r--contrib/ncurses/menu/mf_common.h10
-rw-r--r--contrib/ncurses/misc/Makefile.in41
-rw-r--r--contrib/ncurses/misc/run_tic.in10
-rw-r--r--contrib/ncurses/misc/terminfo.src771
-rw-r--r--contrib/ncurses/mk-0th.awk26
-rw-r--r--contrib/ncurses/mk-1st.awk93
-rw-r--r--contrib/ncurses/ncurses/Makefile.in95
-rw-r--r--contrib/ncurses/ncurses/base/MKkeyname.awk58
-rwxr-xr-xcontrib/ncurses/ncurses/base/MKlib_gen.sh239
-rw-r--r--contrib/ncurses/ncurses/base/MKunctrl.awk6
-rw-r--r--contrib/ncurses/ncurses/base/lib_addch.c128
-rw-r--r--contrib/ncurses/ncurses/base/lib_addstr.c166
-rw-r--r--contrib/ncurses/ncurses/base/lib_bkgd.c94
-rw-r--r--contrib/ncurses/ncurses/base/lib_box.c74
-rw-r--r--contrib/ncurses/ncurses/base/lib_chgat.c7
-rw-r--r--contrib/ncurses/ncurses/base/lib_clrbot.c10
-rw-r--r--contrib/ncurses/ncurses/base/lib_clreol.c10
-rw-r--r--contrib/ncurses/ncurses/base/lib_color.c37
-rw-r--r--contrib/ncurses/ncurses/base/lib_delch.c12
-rw-r--r--contrib/ncurses/ncurses/base/lib_delwin.c10
-rw-r--r--contrib/ncurses/ncurses/base/lib_erase.c10
-rw-r--r--contrib/ncurses/ncurses/base/lib_freeall.c11
-rw-r--r--contrib/ncurses/ncurses/base/lib_getch.c85
-rw-r--r--contrib/ncurses/ncurses/base/lib_hline.c13
-rw-r--r--contrib/ncurses/ncurses/base/lib_inchstr.c8
-rw-r--r--contrib/ncurses/ncurses/base/lib_initscr.c10
-rw-r--r--contrib/ncurses/ncurses/base/lib_insch.c14
-rw-r--r--contrib/ncurses/ncurses/base/lib_insdel.c6
-rw-r--r--contrib/ncurses/ncurses/base/lib_insstr.c12
-rw-r--r--contrib/ncurses/ncurses/base/lib_instr.c6
-rw-r--r--contrib/ncurses/ncurses/base/lib_mouse.c8
-rw-r--r--contrib/ncurses/ncurses/base/lib_mvwin.c7
-rw-r--r--contrib/ncurses/ncurses/base/lib_newterm.c35
-rw-r--r--contrib/ncurses/ncurses/base/lib_newwin.c46
-rw-r--r--contrib/ncurses/ncurses/base/lib_overlay.c19
-rw-r--r--contrib/ncurses/ncurses/base/lib_pad.c30
-rw-r--r--contrib/ncurses/ncurses/base/lib_printw.c63
-rw-r--r--contrib/ncurses/ncurses/base/lib_redrawln.c12
-rw-r--r--contrib/ncurses/ncurses/base/lib_refresh.c8
-rw-r--r--contrib/ncurses/ncurses/base/lib_scanw.c12
-rw-r--r--contrib/ncurses/ncurses/base/lib_screen.c6
-rw-r--r--contrib/ncurses/ncurses/base/lib_scroll.c88
-rw-r--r--contrib/ncurses/ncurses/base/lib_set_term.c18
-rw-r--r--contrib/ncurses/ncurses/base/lib_slkclear.c6
-rw-r--r--contrib/ncurses/ncurses/base/lib_slkset.c8
-rw-r--r--contrib/ncurses/ncurses/base/lib_ungetch.c12
-rw-r--r--contrib/ncurses/ncurses/base/lib_vline.c13
-rw-r--r--contrib/ncurses/ncurses/base/lib_winch.c7
-rw-r--r--contrib/ncurses/ncurses/base/lib_window.c19
-rw-r--r--contrib/ncurses/ncurses/base/resizeterm.c67
-rw-r--r--contrib/ncurses/ncurses/base/safe_sprintf.c6
-rw-r--r--contrib/ncurses/ncurses/base/sigaction.c5
-rw-r--r--contrib/ncurses/ncurses/base/tries.c6
-rw-r--r--contrib/ncurses/ncurses/base/vsscanf.c331
-rw-r--r--contrib/ncurses/ncurses/base/wresize.c25
-rw-r--r--contrib/ncurses/ncurses/curses.priv.h247
-rw-r--r--contrib/ncurses/ncurses/fifo_defs.h12
-rw-r--r--contrib/ncurses/ncurses/llib-lncurses224
-rw-r--r--contrib/ncurses/ncurses/llib-lncursesw3756
-rw-r--r--contrib/ncurses/ncurses/modules28
-rwxr-xr-xcontrib/ncurses/ncurses/tinfo/MKfallback.sh29
-rwxr-xr-xcontrib/ncurses/ncurses/tinfo/MKkeys_list.sh62
-rw-r--r--contrib/ncurses/ncurses/tinfo/access.c35
-rw-r--r--contrib/ncurses/ncurses/tinfo/alloc_entry.c7
-rw-r--r--contrib/ncurses/ncurses/tinfo/captoinfo.c26
-rw-r--r--contrib/ncurses/ncurses/tinfo/comp_error.c22
-rw-r--r--contrib/ncurses/ncurses/tinfo/comp_expand.c15
-rw-r--r--contrib/ncurses/ncurses/tinfo/comp_hash.c8
-rw-r--r--contrib/ncurses/ncurses/tinfo/comp_parse.c8
-rw-r--r--contrib/ncurses/ncurses/tinfo/comp_scan.c40
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_acs.c21
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_baudrate.c12
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_kernel.c44
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_napms.c30
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_options.c6
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_print.c6
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_raw.c8
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_setup.c34
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_termcap.c170
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_termname.c8
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_tgoto.c4
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_tparm.c6
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_tputs.c84
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_ttyflags.c6
-rw-r--r--contrib/ncurses/ncurses/tinfo/name_match.c10
-rw-r--r--contrib/ncurses/ncurses/tinfo/parse_entry.c10
-rw-r--r--contrib/ncurses/ncurses/tinfo/read_termcap.c119
-rw-r--r--contrib/ncurses/ncurses/tinfo/write_entry.c16
-rw-r--r--contrib/ncurses/ncurses/trace/lib_trace.c83
-rw-r--r--contrib/ncurses/ncurses/trace/lib_traceatr.c109
-rw-r--r--contrib/ncurses/ncurses/trace/lib_tracebits.c11
-rw-r--r--contrib/ncurses/ncurses/trace/lib_tracechr.c22
-rw-r--r--contrib/ncurses/ncurses/trace/lib_tracedmp.c115
-rw-r--r--contrib/ncurses/ncurses/trace/lib_tracemse.c74
-rw-r--r--contrib/ncurses/ncurses/trace/trace_tries.c9
-rw-r--r--contrib/ncurses/ncurses/trace/varargs.c171
-rw-r--r--contrib/ncurses/ncurses/trace/visbuf.c232
-rw-r--r--contrib/ncurses/ncurses/tty/hashmap.c55
-rw-r--r--contrib/ncurses/ncurses/tty/lib_mvcur.c89
-rw-r--r--contrib/ncurses/ncurses/tty/lib_tstp.c167
-rw-r--r--contrib/ncurses/ncurses/tty/lib_twait.c24
-rw-r--r--contrib/ncurses/ncurses/tty/lib_vidattr.c23
-rw-r--r--contrib/ncurses/ncurses/tty/tty_update.c332
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_box_set.c113
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_cchar.c114
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_erasewchar.c77
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_get_wch.c99
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_get_wstr.c205
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_hline_set.c79
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_in_wch.c60
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c62
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_ins_nwstr.c84
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_ins_wch.c65
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_inwstr.c96
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_unget_wch.c76
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_vid_attr.c94
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_vline_set.c78
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_wacs.c120
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_wunctrl.c56
-rw-r--r--contrib/ncurses/panel/Makefile.in17
-rw-r--r--contrib/ncurses/panel/panel.priv.h12
-rwxr-xr-xcontrib/ncurses/progs/MKtermsort.sh21
-rw-r--r--contrib/ncurses/progs/Makefile.in41
-rw-r--r--contrib/ncurses/progs/dump_entry.c4
-rw-r--r--contrib/ncurses/progs/infocmp.c116
-rw-r--r--contrib/ncurses/progs/progs.priv.h6
-rw-r--r--contrib/ncurses/progs/tic.c8
-rw-r--r--contrib/ncurses/progs/toe.c52
-rw-r--r--contrib/ncurses/progs/tput.c36
-rw-r--r--contrib/ncurses/progs/tset.c77
-rw-r--r--contrib/ncurses/tack/Makefile.in6
-rw-r--r--contrib/ncurses/tack/ansi.c8
-rw-r--r--contrib/ncurses/tack/charset.c8
-rw-r--r--contrib/ncurses/tack/edit.c4
-rw-r--r--contrib/ncurses/tack/init.c6
-rw-r--r--contrib/ncurses/tack/output.c12
-rw-r--r--contrib/ncurses/tack/sync.c14
-rw-r--r--contrib/ncurses/tack/sysdep.c13
-rw-r--r--contrib/ncurses/tack/tack.c20
-rw-r--r--contrib/ncurses/tack/tack.h4
-rw-r--r--contrib/ncurses/test/Makefile.in6
-rw-r--r--contrib/ncurses/test/blue.c321
-rw-r--r--contrib/ncurses/test/bs.c62
-rw-r--r--contrib/ncurses/test/cardfile.c28
-rwxr-xr-xcontrib/ncurses/test/configure537
-rw-r--r--contrib/ncurses/test/configure.in142
-rw-r--r--contrib/ncurses/test/ditto.c154
-rw-r--r--contrib/ncurses/test/dots.c29
-rw-r--r--contrib/ncurses/test/filter.c11
-rw-r--r--contrib/ncurses/test/firework.c17
-rw-r--r--contrib/ncurses/test/firstlast.c149
-rw-r--r--contrib/ncurses/test/gdc.c18
-rw-r--r--contrib/ncurses/test/hanoi.c22
-rw-r--r--contrib/ncurses/test/hashtest.c14
-rw-r--r--contrib/ncurses/test/keynames.c15
-rw-r--r--contrib/ncurses/test/knight.c10
-rw-r--r--contrib/ncurses/test/lrtest.c5
-rw-r--r--contrib/ncurses/test/ncurses.c826
-rw-r--r--contrib/ncurses/test/newdemo.c14
-rw-r--r--contrib/ncurses/test/railroad.c62
-rw-r--r--contrib/ncurses/test/rain.c101
-rw-r--r--contrib/ncurses/test/tclock.c34
-rw-r--r--contrib/ncurses/test/test.priv.h108
-rw-r--r--contrib/ncurses/test/testaddch.c89
-rw-r--r--contrib/ncurses/test/testcurs.c101
-rw-r--r--contrib/ncurses/test/testscanw.c6
-rw-r--r--contrib/ncurses/test/view.c264
-rw-r--r--contrib/ncurses/test/worm.c28
-rw-r--r--contrib/ncurses/test/xmas.c13
280 files changed, 24329 insertions, 5982 deletions
diff --git a/contrib/ncurses/INSTALL b/contrib/ncurses/INSTALL
index 591738bf64e9..7255dffec239 100644
--- a/contrib/ncurses/INSTALL
+++ b/contrib/ncurses/INSTALL
@@ -1,4 +1,4 @@
--- $Id: INSTALL,v 1.47 2000/11/05 01:57:24 tom Exp $
+-- $Id: INSTALL,v 1.52 2002/01/12 22:56:44 tom Exp $
---------------------------------------------------------------------
How to install Ncurses/Terminfo on your system
---------------------------------------------------------------------
@@ -277,7 +277,9 @@ SUMMARY OF CONFIGURE OPTIONS:
Use only built-in data. The ncurses libraries normally read terminfo
and termcap data from disk. You can configure ncurses to have a
built-in database, aka "fallback" entries. Embedded applications may
- have no need for an external database.
+ have no need for an external database. Some, but not all of the
+ programs are useful in this configuration, e.g., reset and tput versus
+ infocmp and tic.
--disable-ext-funcs
Disable function-extensions. Configure ncurses without the functions
@@ -464,6 +466,41 @@ SUMMARY OF CONFIGURE OPTIONS:
--with-ada-objects=DIR
Tell where to install the Ada objects (default: PREFIX/lib/ada/adalib)
+ --with-bool=TYPE
+ If --without-cxx is specified, override the type used for the "bool"
+ declared in curses.h (normally the type is automatically chosen to
+ correspond with that in <stdbool.h>, or defaults to platform-specific
+ sizes).
+
+ --with-build-cc=XXX
+ If cross-compiling, specify a host C compiler, which is needed to
+ compile a few utilties which generate source modules for ncurses.
+ If you do not give this option, the configure script checks if the
+ $BUILD_CC variable is set, and otherwise defaults to gcc or cc.
+
+ --with-build-cflags=XXX
+ If cross-compiling, specify the host C compiler-flags. You might need
+ to do this if the target compiler has unusual flags which confuse the
+ host compiler.
+
+ --with-build-ldflags=XXX
+ If cross-compiling, specify the host linker-flags. You might need to
+ do this if the target linker has unusual flags which confuse the host
+ compiler.
+
+ --with-build-libs=XXX
+ If cross-compiling, the host libraries. You might need to do this if
+ the target environment requires unusual libraries.
+
+ --with-caps=XXX
+ Specify an alternate terminfo capabilities file, which makes the
+ configure script look for "include/Caps.XXX". A few systems, e.g.,
+ AIX 4.x use the same overall file-format as ncurses for terminfo
+ data, but use different alignments within the tables to support
+ legacy applications. For those systems, you can configure ncurses
+ to use a terminfo database which is compatible with the native
+ applications.
+
--with-database=XXX
Specify the terminfo source file to install. Usually you will wish
to install ncurses' default (misc/terminfo.src). Certain systems
@@ -586,6 +623,10 @@ SUMMARY OF CONFIGURE OPTIONS:
(libtinfo). This is done to accommodate applications that use only
the latter. The terminfo library is about half the size of the total.
+ --with-termpath=XXX
+ Specify a search-list of termcap files which will be compiled into the
+ ncurses library (default: /etc/termcap:/usr/share/misc/termcap)
+
--without-ada
Suppress the configure script's check for Ada95, do not build the
Ada95 binding and related demo.
diff --git a/contrib/ncurses/MANIFEST b/contrib/ncurses/MANIFEST
index f958ac420e74..4559e55bd01b 100644
--- a/contrib/ncurses/MANIFEST
+++ b/contrib/ncurses/MANIFEST
@@ -312,28 +312,41 @@
./doc/html/index.html
./doc/html/man/captoinfo.1m.html
./doc/html/man/clear.1.html
+./doc/html/man/curs_add_wch.3x.html
+./doc/html/man/curs_add_wchstr.3x.html
./doc/html/man/curs_addch.3x.html
./doc/html/man/curs_addchstr.3x.html
./doc/html/man/curs_addstr.3x.html
+./doc/html/man/curs_addwstr.3x.html
./doc/html/man/curs_attr.3x.html
./doc/html/man/curs_beep.3x.html
./doc/html/man/curs_bkgd.3x.html
+./doc/html/man/curs_bkgrnd.3x.html
./doc/html/man/curs_border.3x.html
+./doc/html/man/curs_border_set.3x.html
./doc/html/man/curs_clear.3x.html
./doc/html/man/curs_color.3x.html
./doc/html/man/curs_delch.3x.html
./doc/html/man/curs_deleteln.3x.html
./doc/html/man/curs_extend.3x.html
+./doc/html/man/curs_get_wch.3x.html
+./doc/html/man/curs_get_wstr.3x.html
+./doc/html/man/curs_getcchar.3x.html
./doc/html/man/curs_getch.3x.html
./doc/html/man/curs_getstr.3x.html
./doc/html/man/curs_getyx.3x.html
+./doc/html/man/curs_in_wch.3x.html
+./doc/html/man/curs_in_wchstr.3x.html
./doc/html/man/curs_inch.3x.html
./doc/html/man/curs_inchstr.3x.html
./doc/html/man/curs_initscr.3x.html
./doc/html/man/curs_inopts.3x.html
+./doc/html/man/curs_ins_wch.3x.html
+./doc/html/man/curs_ins_wstr.3x.html
./doc/html/man/curs_insch.3x.html
./doc/html/man/curs_insstr.3x.html
./doc/html/man/curs_instr.3x.html
+./doc/html/man/curs_inwstr.3x.html
./doc/html/man/curs_kernel.3x.html
./doc/html/man/curs_mouse.3x.html
./doc/html/man/curs_move.3x.html
@@ -466,13 +479,20 @@
./form/llib-lform
./form/modules
./include/Caps
+./include/Caps.aix4
+./include/Caps.keys
+./include/Caps.osf1r5
+./include/Caps.uwin
./include/MKhashsize.sh
+./include/MKkey_defs.sh
./include/MKncurses_def.sh
./include/MKparametrized.sh
./include/MKterm.h.awk.in
./include/Makefile.in
./include/capdefaults.c
./include/curses.h.in
+./include/curses.tail
+./include/curses.wide
./include/edit_cfg.sh
./include/headers
./include/nc_alloc.h
@@ -489,28 +509,41 @@
./man/Makefile.in
./man/captoinfo.1m
./man/clear.1
+./man/curs_add_wch.3x
+./man/curs_add_wchstr.3x
./man/curs_addch.3x
./man/curs_addchstr.3x
./man/curs_addstr.3x
+./man/curs_addwstr.3x
./man/curs_attr.3x
./man/curs_beep.3x
./man/curs_bkgd.3x
+./man/curs_bkgrnd.3x
./man/curs_border.3x
+./man/curs_border_set.3x
./man/curs_clear.3x
./man/curs_color.3x
./man/curs_delch.3x
./man/curs_deleteln.3x
./man/curs_extend.3x
+./man/curs_get_wch.3x
+./man/curs_get_wstr.3x
+./man/curs_getcchar.3x
./man/curs_getch.3x
./man/curs_getstr.3x
./man/curs_getyx.3x
+./man/curs_in_wch.3x
+./man/curs_in_wchstr.3x
./man/curs_inch.3x
./man/curs_inchstr.3x
./man/curs_initscr.3x
./man/curs_inopts.3x
+./man/curs_ins_wch.3x
+./man/curs_ins_wstr.3x
./man/curs_insch.3x
./man/curs_insstr.3x
./man/curs_instr.3x
+./man/curs_inwstr.3x
./man/curs_kernel.3x
./man/curs_mouse.3x
./man/curs_move.3x
@@ -753,9 +786,11 @@
./ncurses/curses.priv.h
./ncurses/fifo_defs.h
./ncurses/llib-lncurses
+./ncurses/llib-lncursesw
./ncurses/modules
./ncurses/tinfo/MKcaptab.awk
./ncurses/tinfo/MKfallback.sh
+./ncurses/tinfo/MKkeys_list.sh
./ncurses/tinfo/MKnames.awk
./ncurses/tinfo/README
./ncurses/tinfo/access.c
@@ -773,7 +808,6 @@
./ncurses/tinfo/getenv_num.c
./ncurses/tinfo/home_terminfo.c
./ncurses/tinfo/init_keytry.c
-./ncurses/tinfo/keys.list
./ncurses/tinfo/lib_acs.c
./ncurses/tinfo/lib_baudrate.c
./ncurses/tinfo/lib_cur_term.c
@@ -811,6 +845,8 @@
./ncurses/trace/trace_buf.c
./ncurses/trace/trace_tries.c
./ncurses/trace/trace_xnames.c
+./ncurses/trace/varargs.c
+./ncurses/trace/visbuf.c
./ncurses/tty/MKexpanded.sh
./ncurses/tty/hardscroll.c
./ncurses/tty/hashmap.c
@@ -821,6 +857,22 @@
./ncurses/tty/tty_display.h
./ncurses/tty/tty_input.h
./ncurses/tty/tty_update.c
+./ncurses/widechar/lib_box_set.c
+./ncurses/widechar/lib_cchar.c
+./ncurses/widechar/lib_erasewchar.c
+./ncurses/widechar/lib_get_wch.c
+./ncurses/widechar/lib_get_wstr.c
+./ncurses/widechar/lib_hline_set.c
+./ncurses/widechar/lib_in_wch.c
+./ncurses/widechar/lib_in_wchnstr.c
+./ncurses/widechar/lib_ins_nwstr.c
+./ncurses/widechar/lib_ins_wch.c
+./ncurses/widechar/lib_inwstr.c
+./ncurses/widechar/lib_unget_wch.c
+./ncurses/widechar/lib_vid_attr.c
+./ncurses/widechar/lib_vline_set.c
+./ncurses/widechar/lib_wacs.c
+./ncurses/widechar/lib_wunctrl.c
./panel/Makefile.in
./panel/headers
./panel/llib-lpanel
diff --git a/contrib/ncurses/Makefile.glibc b/contrib/ncurses/Makefile.glibc
index 780650a0a8bd..2535e9f3b8e7 100644
--- a/contrib/ncurses/Makefile.glibc
+++ b/contrib/ncurses/Makefile.glibc
@@ -219,12 +219,14 @@ libncurses-routines = \
trace/trace_buf \
trace/trace_tries \
trace/trace_xnames \
+ trace/varargs \
+ trace/visbuf \
tty/hardscroll \
tty/hashmap \
tty/lib_mvcur \
tty/lib_tstp \
- tty/lib_vidattr \
tty/lib_twait \
+ tty/lib_vidattr \
tty/tty_update \
unctrl
diff --git a/contrib/ncurses/Makefile.in b/contrib/ncurses/Makefile.in
index 9489e9fe45ec..7a30d3227016 100644
--- a/contrib/ncurses/Makefile.in
+++ b/contrib/ncurses/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.20 2000/08/19 19:11:56 tom Exp $
+# $Id: Makefile.in,v 1.22 2001/10/27 18:17:22 tom Exp $
##############################################################################
# Copyright (c) 1998 Free Software Foundation, Inc. #
# #
@@ -69,7 +69,7 @@ preinstall :
@ echo ' lib directory: '$(libdir)
@ echo ' include directory: '$(includedir)
@ echo ' man directory: '$(mandir)
- @ echo ' terminfo directory: '$(ticdir)
+@MAKE_TERMINFO@ @ echo ' terminfo directory: '$(ticdir)
@ echo ''
@ test "$(includedir)" = "$(prefix)/include" || \
echo '** Include-directory is not in a standard location'
@@ -87,6 +87,7 @@ clean \
distclean \
mostlyclean \
realclean \
+depend \
sources \
uninstall \
install ::
diff --git a/contrib/ncurses/NEWS b/contrib/ncurses/NEWS
index 099c5a7f07d5..5b564bfd8261 100644
--- a/contrib/ncurses/NEWS
+++ b/contrib/ncurses/NEWS
@@ -1,4 +1,4 @@
--- $Id: NEWS,v 1.626 2001/05/13 00:11:58 tom Exp $
+-- $Id: NEWS,v 1.686 2002/05/18 21:26:10 tom Exp $
This is a log of changes that ncurses has gone through since Zeyd started
working with Pavel Curtis' original work, pcurses, in 1992.
@@ -6,6 +6,659 @@ working with Pavel Curtis' original work, pcurses, in 1992.
Changes through 1.9.9e are recorded by Zeyd M. Ben-Halim.
Changes since 1.9.9e are recorded by Thomas Dickey.
+20020518
+ + fix lib_pad.c for case of drawing a double-width character which
+ falls off the left margin of the pad (patch by Kriang Lerdsuwanakij
+ <lerdsuwa@users.sourceforge.net>)
+ + modify configure script to work around broken gcc 3.1 "--version"
+ option, which adds unnecessary trash to the requested information.
+ + adjust ifdef's in case SIGWINCH is not defined, e.g., with DJGPP
+ (reported by Ben Decker <deckerben@freenet.de>).
+
+20020511
+ + implement vid_puts(), vid_attr(), term_attrs() based on the narrow-
+ character versions as well.
+ + implement erasewchar(), killwchar() based on erasechar() and
+ killchar().
+ + modify erasechar() and killchar() to return ERR if the value was
+ VDISABLE.
+ + correct a bug in wresize() in handling subwindows (based on patch by
+ Roger Gammans <rgammans@computer-surgery.co.uk>, report by Scott Beck
+ <scott@gossamer-threads.com>).
+ + improve test/tclock.c by making the second-hand update more often
+ if gettimeofday() is available.
+
+20020429
+ + workaround for Solaris sed with MKlib_gen.sh (reported by Andy
+ Tsouladze <andyt@mypoints.com>).
+
+20020427
+ + correct return-value from getcchar(), making it consistent with
+ Solaris and Tru64.
+ + reorder loops that generate makefile rules for different models vs
+ subsets so configure --with-termlib works again. This was broken by
+ logic added to avoid duplicate rules in changes to accommodate cygwin
+ dll's (reported by George.R.Goffe@seagate.com).
+ + update config.guess, config.sub
+
+20020421
+ + modify ifdef's in write_entry.c to allow use of symbolic links on
+ platforms with no hard links, e.g., BeOS.
+ + modify a few includes to allow compile with BeOS, which has stdbool.h
+ with a conflicting definition for 'bool' versus its OS.h definition.
+ + amend MKlib_gen.sh to work with gawk, which defines 'func' as an
+ alias for 'function'.
+
+20020420
+ + correct form of prototype for ripoffline().
+ + modify MKlib_gen.sh to test that all functions marked as implemented
+ can be linked.
+
+20020413
+ + add manpages: curs_get_wstr.3x, curs_in_wchstr.3x
+ + implement wgetn_wstr().
+ + implement win_wchnstr().
+ + remove redefinition of unget_wch() in lib_gen.c (reported by
+ Jungshik Shin <jshin@jtan.com>).
+
+20020406
+ + modified several of the test programs to allow them to compile with
+ vendor curses implementations (Solaris, AIX).
+
+20020323
+ + modified test/configure to allow configuring against ncursesw.
+ + change WACS_xxx definition to use address, to work like Tru64 curses.
+
+20020317
+ + add 'e' and 'm' toggles to 'a', 'A' tests in ncurses.c to demonstrate
+ effect of echo/noecho and meta modes.
+ + add 'A' test to ncurses.c to demonstrate wget_wch() and related
+ functions.
+ + add manpage: curs_get_wch.3x
+ + implement unget_wch().
+ + implement wget_wch().
+
+20020310
+ + regenerated html manpages.
+ + add manpages: curs_in_wch.3x, curs_ins_wch.3x, curs_ins_wstr.3x
+ + implement wins_wch().
+ + implement win_wch().
+ + implement wins_nwstr(), wins_wstr().
+
+20020309
+ + add manpages: curs_addwstr.3x, curs_winwstr.3x
+ + implement winnwstr(), winwstr().
+
+20020223
+ + add manpages: curs_add_wchstr.3x, curs_bkgrnd.3x
+ + document wunctrl, key_name.
+ + implement key_name().
+ + remove const's in lib_box.c incorrectly leftover after splitting off
+ lib_box_set.c
+ + update llib-lncurses, llib-ncursesw, fix configure script related to these.
+
+20020218
+ + remove quotes on "SYNOPSIS" in man/curs_box_set.3x, which resulted
+ in spurious symlinks on install.
+
+20020216
+ + implement whline_set(), wvline_set(), add manpage curs_border_set.
+ + add subtest 'b' to 'F' and 'f' in ncurses.c to demonstrate use of
+ box() and box_set() functions.
+ + add subtest 'u' to 'F' in ncurses.c, to demonstrate use of addstr()
+ given UTF-8 string equivalents of WACS_xxx symbols.
+ + minor fixes to several manpages based on groff -ww output.
+ + add descriptions of external variables of termcap interface to
+ the manpage (report by Bruce Evans <bde@zeta.org.au>).
+ > patches by Bernhard Rosenkraenzer:
+ + correct configure option --with-bool, which was executed as
+ --with-ospeed.
+ + add quotes for parameters of --with-bool and --with-ospeed configure
+ options.
+ > patch by Sven Verdoolaege (report by Gerhard Haering
+ <haering_linux@gmx.de>):
+ + correct typos in definitions of several wide-character macros:
+ waddwstr, wgetbkgrnd, mvaddwstr, mvwadd_wchnstr, mvwadd_wchnstr,
+ mvwaddwstr.
+ + pass $(CPPFLAGS) to MKlib_gen.sh, thereby fixing a missing definition
+ of _XOPEN_SOURCE_EXTENDED, e.g., on Solaris
+
+20020209
+ + implement wide-acs characters for UTF-8 locales. When in UTF-8
+ locale, ignore narrow version of acs. Add 'F' test to test/ncurses.c
+ to demonstrate.
+ + correct prototype in keybound manpage (noted from a Debian mailing
+ list item).
+
+20020202
+ + add several cases to the wscanw() example in testcurs.c, showing the
+ format.
+ + implement a simple vsscanf() fallback function which uses the %n
+ conversion to help parse the input data (prompted by discussion with
+ Albert Chin-A-Young).
+ + modify mk-1st.awk and test/Makefile.in to add $(LDFLAGS) when making
+ shared libraries, and to use $(CFLAGS) when linking test programs
+ (patch by Albert Chin-A-Young).
+ + add a call to _nc_keypad() in keypad() to accommodate applications
+ such as nvi, which use curses for output but not for input (fixes
+ Debian #131263, cf: 20011215).
+ + add entrypoints to resizeterm.c which provide better control over the
+ process: is_term_resized() and resize_term(). The latter restores
+ the original design of resizeterm() before KEY_RESIZE was added in
+ 970906. Do this to accommodate 20010922 changes to view.c, but allow
+ for programs with their own sigwinch handler, such as lynx (reported
+ by Russell Ruby <russ@math.orst.edu>).
+
+20020127
+ + fix a typo in change to mk-1st.awk, which broke the shared-library
+ makefile rules (reported by Martin Mokrejs).
+
+20020126
+ + update config.guess, config.sub
+ + finish changes needed to build dll's on cygwin.
+ + fix a typo in mvwchat() macro (reported by Cy <yam@homerow.net).
+
+20020119
+ + add case in lib_baudrate.c for B921600 (patch by Andrey A Chernov).
+ + correct missing sed-editing stage in manpage installs which is used
+ to rename manpages, broken in 20010324 fix for Debian #89939 (Debian
+ #78866).
+ + remove -L$(libdir) from linker flags, probably not needed any more
+ since HPUX is handled properly (reported by NIIBE Yutaka
+ <gniibe@m17n.org>).
+ + add configure check for mbstate_t, needed for wide-character
+ configuration. On some platforms we must include <wchar.h> to
+ define this (reported by Daniel Jacobowitz).
+ + incorporate some of the changes needed to build dll's on cygwin.
+
+20020112a
+ + workaround for awk did not work with mawk, adjusted shell script.
+
+20020112
+ + add Caps.osf1r5, as an example.
+ + modify behavior of can_clear_with() so that if an application is
+ running in a non-bce terminals with default colors enabled, it
+ returns true, allowing the user to select/paste text without picking
+ up extraneous trailing blanks (adapted from patch by Daniel
+ Jacobowitz <dmj+@andrew.cmu.edu>).
+ + modify generated curses.h to ifdef-out prototypes for extensions if
+ they are disabled, and to define curses_version() as a string in that
+ case. This is needed to make the programs such as tic build in that
+ configuration.
+ + modified generated headers.sh to remove a gzip'd version of the
+ target file if it exists, in case non-gzip'd manpages are installed
+ into a directory where gzip'd ones exist. In that case, the latter
+ would be found.
+ + corrected a redundant initialization of signal handlers from 20010922
+ changes.
+ + clarified bug-reporting address in terminfo.src (report by John H
+ DuBois III <spcecdt@armory.com>).
+ > several fixes from Robert Joop:
+ + do not use "-v" option of awk in MKkey_defs.sh because it does not
+ work with SunOS nawk.
+ + modify definitions for libutf8 in curses.h to avoid redefinition
+ warnings for mblen
+ + quoted references to compiler in shell command in misc/Makefile, in
+ case it uses multiple tokens.
+
+20011229
+ + restore special case from 20010922 changes to omit SA_RESTART when
+ setting up SIGWINCH handler, which is needed to allow wgetch() to be
+ interrupted by that signal.
+ + update configure macro CF_WITH_PATHLIST, to omit some double quotes
+ not needed with autoconf 2.52
+ + revert configure script to autoconf 2.13 patched with
+ autoconf-2.13-19990117.patch.gz (or later)
+ from
+ ftp://invisible-island.net/autoconf/
+ because autoconf 2.52 macro AC_PROG_AWK does not work on HPUX 11.0
+ (report by David Ellement <ellement@sdd.hp.com>). This also fixes a
+ different problem configuring with Mac OS X (reported by Marc Smith
+ <marc.a.smith@home.com>).
+
+20011222
+ + modify include/edit_cfg.h to eliminate BROKEN_LINKER symbol from
+ term.h
+ + move prototype for _nc_vsscanf() into curses.h.in to omit
+ HAVE_VSSCANF symbol from curses.h, which was dependent upon the
+ ncurses_cfg.h file which is not installed.
+ + use ACS_LEN rather than SIZEOF(acs_map) in trace code of lib_acs.c,
+ to work with broken linker configuration, e.g., cygwin (report by
+ Robert Joop <rj@rainbow.in-berlin.de>).
+ + make napms() call _nc_timed_wait() rather than poll() or select(),
+ to work around broken implementations of these on cygwin.
+
+20011218
+ + drop configure macro CF_WIDEC_SHIFT, since that was rendered obsolete
+ by Sven Verdoolaege's rewrite of wide-character support. This makes
+ libncursesw incompatible again, but makes the header files almost the
+ same as in the narrow-character configuration.
+ + simplify definitions that combine wide/narrow versions of bkgd, etc.,
+ to eliminate differences between the wide/narrow versions of curses.h
+ + correct typo in configure macro CF_FUNC_VSSCANF
+ + correct location of call to _nc_keypad() from 20011215 changes which
+ prevented keypad() from being disabled (reported by Lars Hecking).
+
+20011215
+ + rewrote ncurses 'a' test to exercise wgetch() and keypad() functions
+ better, e.g., by adding a 'w' command to create new windows which
+ may have different keypad() settings.
+ + corrected logic of keypad() by adding internal screen state to track
+ whether the terminal's keypad-mode has been set. Use this in
+ wgetch() to update the keypad-mode according to whether the
+ associated window's keypad-mode has been set with keypad(). This
+ corrects a related problem restoring terminal state after handling
+ SIGTSTP (reported by Mike Castle).
+ + regenerate configure using patch for autoconf 2.52
+ autoconf-2.52-patch.gz
+ at
+ ftp://invisible-island.net/autoconf/
+ + update config.guess, config.sub from
+ http://subversions.gnu.org/cgi-bin/viewcvs/config/config/
+ + minor changes to quoting in configure script to allow it to work
+ with autoconf 2.52
+
+20011208
+ + modify final checks in lib_setup.c for line and col values, making
+ them independent.
+ + modify acs_map[] if configure --broken-linker is specified, to make
+ it use a function rather than an array (prompted by an incorrect
+ implementation in cygwin package).
+ + correct spelling of configure option --enable-colorfgbg, which
+ happened to work if --with-develop was set (noted in cygwin package
+ for ncurses).
+ + modify ifdef for genericerror() to compile with SUNWspro Sun WorkShop
+ 6 update 1 C++ 5.2 (patch by Sullivan N Beck <sbeck@cise.ufl.edu>).
+ + add configure checks to see if ncurses' fallback vsscanf() will
+ compile either of the special cases for FILE structs, and if not,
+ force it to the case which simply returns an error (report by
+ Sullivan N Beck <sbeck@cise.ufl.edu> indicates that Solaris 8 with
+ 64-bits does not allow access to FILE's fields).
+ + modify ifdef's for c++/cursesw.cc to use the fallback vsscanf() in
+ the ncurses library if no better substitute for this can be found
+ in the C++ runtime.
+ + modify the build to name dynamic libraries according to the
+ convention used on OS X and Darwin. Rather than something like
+ libncurses.dylib.5.2, Darwin would name it libncurses. 5.dylib.
+ There are a few additional minor fixes, such as setting the library
+ version and compatibility version numbers (patch by Jason Evans
+ <jevans@apple.com>).
+ + use 'sh' to run mkinstalldirs, to work around problems with buggy
+ versions of 'make' on OS/2 (report by John Polterak <jp@eyup.org>).
+ + correct typo in manpage description of curs_set() (Debian #121548).
+ + replace the configure script existence-check for mkstemp() by one
+ that checks if the function works, needed for older glibc and
+ AmigaOS.
+
+20011201
+ + modify script that generates fallbacks.c to compile a temporary
+ copy of the terminfo source in case the host does not contain all of
+ the entries requested for fallbacks (request by Greg Roelofs).
+ + modify configure script to accommodate systems such as Mac OS X whose
+ <stdbool.h> header defines a 'bool' type inconsistent with ncurses,
+ which normally makes 'bool' consistent with C++. Include <stdbool.h>
+ from curses.h to force consistent usage, define a new type
+ NCURSES_BOOL and related that to the exported 'bool' as either a
+ typedef or definition, according to whether <stdbool.h> is present
+ (based on a bug report for tin 1.5.9 by Aaron Adams <adamsa@mac.com>).
+
+20011124
+ + added/updated terminfo entries for M$ telnet and KDE konsole -TD
+
+20011117
+ + updated/expanded Apple_Terminal and Darwin PowerPC terminfo entries
+ (Benjamin C W Sittler).
+ + add putty terminfo entry -TD
+ + if configuring for wide-curses, define _XOPEN_SOURCE_EXTENDED, since
+ this may not otherwise be defined to make test/view.c compile.
+
+20011110
+ + review/correct several missing/generated items in curses.wide, sorted
+ the lists to make subsequent diff's easier to track.
+
+20011103
+ + add manual pages for add_wch(), echo_wchar(), getcchar(),
+ mvadd_wch(), mvwadd_wch(), setcchar(), wadd_wch() and wecho_wchar().
+ + implement wecho_wchar()
+ + modify _tracedump() to handle wide-characters by mapping them to '?'
+ and control-characters to '.', to make the trace file readable. Also
+ dynamically allocate the buffer used by _tracedump() for formatting
+ the results.
+ + modify T_CALLED/T_RETURN macros to ease balancing call/return lines
+ in a trace by using curly braces.
+ + implement _nc_viscbuf(), for tracing cchar_t arrays.
+ + correct trace-calls in setcchar() and getcchar() functions, which
+ traced the return values but not the entry to each function.
+ + correct usage message in test/view.c, which still mentioned -u flag.
+
+20011027
+ + modify configure script to allow building with termcap only, or with
+ fallbacks only. In this case, we do not build tic and toe.
+ + add configure --with-termpath option, to override default TERMPATH
+ value of /etc/termcap:/usr/share/misc/termcap.
+ + cosmetic change to tack: make menu descriptions agree with menu
+ titles.
+
+20011020
+ + rewrote limit-checks in wscrl() and associated _nc_scroll_window(),
+ to ensure that if the parameter of wscrl() is larger than the size of
+ the scrolling region, then the scrolling region will be cleared
+ (report by Ben Kohlen <bckohlen@yahoo.com>).
+ + add trace/varargs.c, using this to trace parameters in lib_printw.c
+ + implement _tracecchar_t2() and _tracecchar_t().
+ + split-out trace/visbuf.c
+ + correct typo in lib_printw.c changes from 20010922 (report by Mike
+ Castle).
+
+20011013
+ + modify run_tic.sh to check if the build is a cross-compile. In that
+ case, do not use the build's tic to install the terminfo database
+ (report by Rafael Rodriguez Velilla <rrv@tid.es>).
+ + modify mouse click resolution so that mouseinterval(-1) will disable
+ it, e.g., to handle touchscreens via a slow connection (request by
+ Byron Stanoszek <gandalf@winds.org>).
+ + correct mouseinterval() default value shown in curs_mouse.3x
+ + remove conflicting definition of mouse_trafo() (reported by Lars
+ Hecking, using gcc 2.95.3).
+
+20011001
+ + simpler fix for signal_name(), to replace the one overlooked in
+ 20010929 (reported by Larry Virden).
+
+20010929
+ + add -i option to view.c, to test ncurses' check for non-default
+ signal handler for SIGINT, etc.
+ + add cases for shared-libraries on Darwin/OS X (patch by Rob Braun
+ <bbraun@synack.net>).
+ + modify tset to restore original I/O modes if an error is encountered.
+ Also modify to use buffered stderr consistently rather than mixing
+ with write().
+ + change signal_name() function to use if-then-else rather than case
+ statement, since signal-values aren't really integers (reported by
+ Larry Virden).
+ + add limit checks in wredrawln(), fixing a problem where lynx was
+ repainting a pad which was much larger than the screen.
+
+20010922
+ + fix: PutRange() was counting the second part of a wide character as
+ part of a run, resulting in a cursor position that was one too far
+ (patch by Sven Verdoolaege).
+ + modify resizeterm() to not queue a KEY_RESIZE if there was no
+ SIGWINCH, thereby separating the two styles of SIGWINCH handling
+ in test/view.c
+ + simplified lib_tstp.c, modify it to use SA_RESTART flag for SIGWINCH.
+ + eliminate several static buffers in the terminfo compiler, using
+ allocated buffers.
+ + modify MKkeyname.awk so that keyname() does not store its result into
+ a static buffer that is overwritten by the next call.
+ + reorganize the output of infocmp -E and -e options to compile cleanly
+ with gcc -Wwrite-strings warnings.
+ + remove redefinition of chgat/wchgat/mvwchgat from curses.wide
+
+20010915
+ + add label to test/view.c, showing the name of the last key or signal
+ that made the screen repaint, to make it clearer when a sigwinch
+ does this.
+ + use ExitProgram() consistently in the test-programs to make it
+ simpler to test leaks with dmalloc, etc.
+ + move hashtab static data out of hashmap.c into SCREEN struct.
+ + make NO_LEAK code compile with revised WINDOWLIST structs.
+
+20010908
+ + modify tgetent() to check if exit_attribute_mode resets the alternate
+ character set, and if so, attempt to adjust the copy of the termcap
+ "me" string which it will return to eliminate that part. In
+ particular, 'screen' would lose track of line-drawing characters
+ (report by Frederic L W Meunier <0@pervalidus.net>, analysis by
+ Michael Schroeder).
+
+20010901
+ + specify DOCTYPE in html manpages.
+ + add missing macros for several "generated" functions: attr_get(),
+ attr_off(), attr_on(), attr_set(), chgat(), mvchgat(), mvwchgat() and
+ mouse_trafo().
+ + modify view.c to agree with non-experimental status of ncurses'
+ sigwinch handler:
+ + change the sense of the -r option, making it default to ncurses'
+ sigwinch handler.
+ + add a note explaining what functions are unsafe in a signal
+ handler.
+ + add a -c option, to set color display, for testing.
+ + unset $data variable in MKterminfo.sh script, to address potential
+ infinite loop if shell malfunction (report by Samuel Mikes
+ <smikes@cubane.com>, for bash 2.05.0 on a Linux 2.0.36 system).
+ + change kbs in mach terminfo entries to ^? (Marcus Brinkmann
+ <Marcus.Brinkmann@ruhr-uni-bochum.de>).
+ + correct logic for COLORFGBG environment variable: if rxvt is compiled
+ with xpm support, the variable has three fields, making it slightly
+ incompatible with itself. In either case, the background color is
+ the last field.
+
+20010825
+ + move calls to def_shell_mode() and def_prog_mode() before loop with
+ callbacks in lib_set_term.c, since the c++ demo otherwise initialized
+ the tty modes before saving them (patch by John David Anglin
+ <dave@hiauly1.hia.nrc.ca>).
+ + duplicate logic used to initialize trace in newterm(), in initscr()
+ to avoid confusing trace of initscr().
+ + simplify allocation of WINDOW and WINDOWLIST structs by making the
+ first a part of the second rather than storing a pointer. This saves
+ a call to malloc for each window (discussion with Philippe Blain).
+ + remove unused variable 'used_ncv' from lib_vidattr.c (Philippe
+ Blain).
+ + modify c++/Makefile.in to accommodate archive programs that are
+ different for C++ than for C, and add cases for vendor's C++
+ compilers on Solaris and IRIX (report by Albert Chin-A-Young).
+ + correct manpage description of criteria for deciding if the terminal
+ supports xterm mouse controls.
+ + add several configure script options to aid with cross-compiling:
+ --with-build-cc, --with-build-cflags, --with-build-ldflags, and
+ --with-build-libs (request by Greg Roelofs).
+ + change criteria for deciding if configure is cross-compiling from
+ host/build mismatch to host/target mismatch (request by Greg Roelofs
+ <greg.roelofs@philips.com>).
+ + correct logic for infocmp -e and -E options which writes the data for
+ the ext_Names[] array. This is needed if one constructs a fallback
+ table for a terminfo entry which uses extended termcap names, e.g.,
+ AX in a color xterm.
+ + fix undefined NCURSES_PATHSEP when configure --disable-database
+ option is given.
+
+20010811
+ + fix for VALID_BOOLEAN() macro when char is not signed.
+ + modify 'clean' rule for C++ binding to work with Sun compiler, which
+ caches additional information in a subdirectory of the objects.
+ + added llib-ncursesw.
+
+20010804
+ + add Caps.keys example for experimental extended function keys
+ (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).
+ + 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).
+ + workaround for bug in HPUX 11.x C compiler: add a blank after
+ NCURSES_EXPORT macro in form.h (report by Albert Chin-A-Young)
+ + ignore blank lines in Caps* files in MKkey_defs.sh script (report by
+ Albert Chin-A-Young).
+ + correct definition of key_end in Caps.aix4, which left KEY_END
+ undefined (report by Albert Chin-A-Young).
+ + remove a QNX-specific fallback prototype for vsscanf(), which is
+ obsolete with QNX RTP.
+ + review/fix some of the T() and TR() macro calls, having noticed that
+ there was no data for delwin() in a trace of dialog because there was
+ no returnVoid call for wtimeout(). Also, traces in lib_twait.c are
+ now selected under TRACE_IEVENT rather than TRACE_CALLS.
+
+20010728
+ + add a _nc_access() check before opening files listed via $TERMPATH.
+ + using modified man2html, regenerate some of the html manpages to fix
+ broken HREF's where the link was hyphenated.
+
+20010721
+ + add some limit/pointer checks to -S option of tputs.
+ + updated/expanded Apple_Terminal and Darwin PowerPC terminfo entries
+ (Benjamin C W Sittler).
+ + add a note in curs_termcap.3x regarding a defect in the XSI
+ description of tgetent (based on a discussion with Urs Jansen
+ regarding the HPUX 11.x implementation, whose termcap interface is
+ not compatible with existing termcap programs).
+ + modify manhtml rule in dist.mk to preserve copyright notice on the
+ generated files, as well as to address HTML style issues reported by
+ tidy and weblint. Regenerated/updated corresponding html files.
+ + comment out use of Protected_Character and related rarely used
+ attributes in ncurses Ada95 test/demo to compile with wide-character
+ configuration.
+
+20010714
+ + implement a simple example in C++ demo to test scanw().
+ + corrected stdio function used to implement scanw() in cursesw.cc
+ + correct definition of RemAttr() macro from 20010602 changes, which
+ caused C++ SillyDemo to not show line-drawing characters.
+ + modify C++ binding, adding getKey() which can be overridden by user
+ to substitute functions other than getch() for keyboard processing
+ of forms and menus (patch by Juergen Pfeifer).
+
+20010707
+ + fix some of the trace calls which needed modification to work with
+ new wide-character structures.
+ + modify magic-cookie code in tty_update.c to compile with new
+ wide-character structures (report by <George.R.Goffe@seagate.com>).
+ + 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
+ Verdoolaege).
+
+20010630
+ + add configure check to define _GNU_SOURCE, needed to prop up glibc
+ header files.
+ + split-out include/curses.wide to solve spurious redefinitions caused
+ by defining _GNU_SOURCE, and move includes for <signal.h> before
+ <curses.h> to work around misdefinition of ERR in glibc 2.1.3 header
+ file.
+ + extended ospeed change to NetBSD and OpenBSD -TD
+ + modify logic in lib_baudrate.c for ospeed, for FreeBSD to make it
+ work properly for termcap applications (patch by Andrey A Chernov).
+
+20010623
+ + correct an overlooked CharOf/UChar instance (reports by Eugene Lee
+ <eugene@anime.net>, Sven Verdoolaege).
+ + correct unneeded ifdef for wunctrl() (reported by Sven Verdoolaege)
+
+20010618
+ + change overlooked several CharOf/UChar instances.
+ > several patches from Sven Verdoolaege:
+ + correct a typo in wunctrl(), which made it appear that botwc() was
+ needed (no such function: use btowc()).
+ + reimplement wide-character demo in test/view.c, using new functions.
+ + implement getcchar(), setcchar(), wadd_wchnstr() and related macros.
+ + fix a syntax problem with do/if/while in PUTC macro (curses.priv.h).
+
+20010616
+ + add parentheses in macros for malloc in test.priv.h, fixes an
+ expression in view.c (report by Wolfgang Gutjahr <gutw@knapp.co.at>).
+ + add Caps.uwin, as an example.
+ + change the way curses.h is generated, making the list of function
+ key definitions extracted from the Caps file.
+ + add #undef's before possible redefinition of ERR and OK in curses.h
+ + modify logic in tic, toe, tput and tset which checks for basename of
+ argv[0] to work properly on systems such as OS/2 which have
+ case-independent filenames and/or program suffixes, e.g., ".ext".
+
+20010609
+ + add a configure check, if --enable-widec is specified, for putwc(),
+ which may be in libutf8.
+ + remove some unnecessary text from curs_extend.3x and
+ default_colors.3x which caused man-db to make incorrect symbolic
+ links (Debian bug report #99550).
+ + add configure check if cast for _IO_va_list is needed to compile
+ C++ vscan code (Debian bug report #97945).
+ > several patches from Sven Verdoolaege:
+ + correct code that used non-standard auto-initialization of a struct,
+ which gcc allows (report by Larry Virden).
+ + use putwc() in PUTC() macro.
+ + make addstr() work for the special case where the codeset is
+ non-stateful (eg. UTF-8), as well as stateful codesets.
+
+20010603
+ + correct loop expression in NEXT_CHAR macro for lib_addstr.c changes
+ from 20010602 (report by Mike Castle).
+
+20010602
+ + modify mvcur() to avoid emitting newline characters when nonl() mode
+ is set. Normally this is not a problem since the actual terminal
+ mode is set to suppress nl/crlf translations, however it is useful to
+ allow the caller to manipulate the terminal mode to avoid staircasing
+ effects after spawning a process which writes messages (for lynx
+ 2.8.4) -TD
+ > several patches from Sven Verdoolaege <skimo@kotnet.org>:
+ + remove redundant type-conversion in fifo_push()
+ + correct definition of addwstr() macro in curses.h.in
+ + remove _nc_utf8_outch()
+ + rename most existing uses of CharOf() to UChar(), e.g., where it is
+ used to prevent sign-extension in ctype macros.
+ + change some chtype's to attr_t's where the corresponding variables
+ are used to manipulate attributes.
+ + UpdateAttr() was applied to both attributes (attr_t) and characters
+ (chtype). Modify macro and calls to it to make these distinct.
+ + add CharEq() macro, use in places where wide-character configuration
+ implementation uses a struct for cchar_t.
+ + moved struct ldat into curses.priv.h, to hide implementation details.
+ + change CharOf() macro to use it for masking A_CHARTEXT data from
+ chtype's.
+ + add L() macro to curses.priv.h, for long-character literals.
+ + replace several assignments from struct ldat entries to chtype or
+ char values with combinations of CharOf() and AttrOf() macros.
+ + add/use intermediate ChAttrOf() and ChCharOf() macros where we know
+ we are using chtype data.
+ + add/use lowlevel attribute manipulation macros AddAttr(), RemAttr()
+ and SetAttr().
+ + add/use SetChar() macro, to change a cchar_t based on a character and
+ attributes.
+ + convert most internal use of chtype to NCURSES_CH_T, to simplify use
+ of cchar_t for wide-character configuration. Similarly, use ARG_CH_T
+ where a pointer would be more useful.
+ + add stubs for tracing cchar_t values.
+ + add/use macro ISBLANK()
+ + add/use constructors for cchar_t's: NewChar(), NewChar2().
+ + add/use macros CHREF(), CHDEREF(), AttrOfD(), CharOfD() to facilitate
+ passing cchar_t's by address.
+ + add/use PUTC_DATA, PUTC() macros.
+ + for wide-character configuration, move the window background data to
+ the end of the WINDOW struct so that whether _XOPEN_SOURCE_EXTENDED
+ is defined or not, the offsets in the struct will not change.
+ + modify addch() to work with wide-characters.
+ + mark several wide-character functions as generated in curses.h.in
+ + implement wunctrl(), wadd_wch(), wbkgrndset(), wbkgrnd(),
+ wborder_set() and waddnwstr().
+
+20010526
+ + add experimental --with-caps=XXX option to customize to similar
+ terminfo database formats such as AIX 4.x
+ + add Caps.aix4 as an example.
+ + modify Caps to add columns for the the KEY_xxx symbols.
+ + modify configure --with-widec to suppress overwrite of libcurses.so
+ and curses.h
+ + add checks to toe.c to avoid being confused by files and directories
+ where we would expect the reverse, e.g., source-files in the
+ top-level terminfo levels as is the case for AIX.
+
+20010519
+ + add top-level 'depend' rule for the C sources, assuming that the
+ makedepend program is available. As a side-effect, this makes
+ the generated sources, as in "make sources" (prompted by a report
+ by Mike Castle that "make -j" fails because the resulting parallel
+ processes race to generate ncurses/names.c).
+ + modify configure script so that --disable-overwrite option's action
+ to add a symbolic link for libcurses applies to the static library as
+ well as the shared library when both are configured (report by Felix
+ Natter <f.natter@ndh.net>).
+ + add ELKS terminfo entries (Federico Bianchi
+ <bianchi@www.arte.unipi.it>)
+ + add u6 (CSR) to Eterm (Michael Jennings).
+
20010512
+ modify test/ncurses.c to work with xterm-256color, which has fewer
color pairs than colors*colors (report by David Ellement
@@ -45,7 +698,7 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
a directory outside the source tree (patch by Sven Verdoolaege
<skimo@kotnet.org>).
> fix 2 bugs in test/bs.c (patch by Erik Sigra <sigra@home.se>):
- + no ships were ever placed in the last row or in the last column.
+ + no ships were ever placed in the last row or in the last column.
This made the game very easy to win, because you never had to waste
any shots there, but the computer did.
+ the squares around a sunken ship that belonged to the player were not
@@ -53,7 +706,7 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
player.
20010331
- + add some examples of customizing screen's terminfo:
+ + add some examples of customizing screen's terminfo:
screen.xterm-xfree86, screen.xterm-r6, screen.teraterm -TD
+ modify screen's terminfo entry to match the khome/kend in screen
3.09.08 (Debian bug report #92215).
@@ -180,7 +833,7 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
termcap.h, which matches X/Open.
> patch by Juergen Pfeifer:
+ a revised version of the Ada enhancements sent in by "H.
- Nanosecond", aka Eugene V. Melaragno <aldomel@ix.netcom.com>. This
+ Nanosecond", aka Eugene V Melaragno <aldomel@ix.netcom.com>. This
patch includes
- small fixes to the existing ncurses binding
- addition of some more low-level functions to the binding, including
@@ -202,8 +855,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
+ alter logic to set default for --disable-overwrite option to set it
to 'yes' if the --prefix/$prefix value is not /usr/local, thereby
accommodating the most common cause of problems: gcc's nonstandard
- search rules. Other locations such as /usr/local/ncurses will default
- to overwriting (report by Lars Hecking <lhecking@nmrc.ie>).
+ search rules. Other locations such as /usr/local/ncurses will
+ default to overwriting (report by Lars Hecking <lhecking@nmrc.ie>).
20001118
+ modify default for --disable-overwrite configure option to disable
@@ -341,7 +994,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
longer than 10000 (report by Jouko Pynnonen).
+ rewrote limit checks in lib_mvcur.c using new functions
_nc_safe_strcat(), etc. Made other related changes to check lengths
- used for strcat/strcpy (report by Jouko Pynnonen <jouko@solutions.fi>).
+ used for strcat/strcpy (report by Jouko Pynnonen
+ <jouko@solutions.fi>).
20000930
+ modify several descriptions, including those for setaf, setab, in
@@ -384,6 +1038,9 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
the expected number of parameters.
+ add error checking to infocmp's -v and -m options to ensure that
the option value is indeed a number.
+ + some cleanup of logic in _nc_signal_handler() to verify if SIGWINCH
+ handler is setup. Separated the old/new sigaction data for SIGTSTP
+ from the other signals.
20000917
+ add S0, E0 extensions to screen's terminfo entry, which is another
@@ -428,8 +1085,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
+ add private entrypoint _nc_basename(), use to consolidate related
code in progs, as well as accommodating OS/2 EMX pathnames.
+ remove NCURSES_CONST line from edit_cfg.sh to compensate for its
- removal (except via AC_SUBST) from configure.in, making --enable-const
- work again (reported by Juergen Pfeifer).
+ removal (except via AC_SUBST) from configure.in, making
+ --enable-const work again (reported by Juergen Pfeifer).
+ regen'd configure to pick up "hpux*" change from 20000902.
20000902
@@ -715,8 +1372,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
+ correct assignment to SP->_has_sgr_39_49 in lib_dft_fgbg.c, which
broke check for screen's AX capability (reported by Valeriy E Ushakov
<uwe@ptc.spbu.ru>).
- + change man2html rule in dist.mk to workaround bug in some man-programs
- that ignores locale when rendering hyphenation.
+ + change man2html rule in dist.mk to workaround bug in some
+ man-programs that ignores locale when rendering hyphenation.
+ change web- and ftp-site to dickey.his.com
20000429
@@ -1267,7 +1924,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
990821 pre-release
+ updated configure macros CF_MAKEFLAGS, CF_CHECK_ERRNO
+ minor corrections to beterm terminfo entry.
- + modify lib_setup.c to reject values of $TERM which have a '/' in them.
+ + modify lib_setup.c to reject values of $TERM which have a '/' in
+ them.
+ add ifdef's to guard against CS5, CS6, CS7, CS8 being zero, as more
than one is on BeOS. That would break a switch statement.
+ add configure macro CF_LINK_FUNCS to detect and work around BeOS's
@@ -1293,11 +1951,11 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
wrefresh(). Whenever a window changes its background attribute to
something different than newscr's background attribute, the whole
window is touched to force a copy to newscr. This is an unwanted
- side-effect of wrefresh() and it is actually not necessary. A changed
- background attribute affects only further outputs of background it
- doesn't mean anything to the current content of the window. So there
- is no need to force a copy. (reported by Frank Heckenbach
- <frank@g-n-u.de>).
+ side-effect of wrefresh() and it is actually not necessary. A
+ changed background attribute affects only further outputs of
+ background it doesn't mean anything to the current content of the
+ window. So there is no need to force a copy. (reported by Frank
+ Heckenbach <frank@g-n-u.de>).
+ an upward compatible enhancement of the NCursesPad class in the C++
binding. It allows one to add a "viewport" window to a pad and then
to use panning to view the pad through the viewport window.
@@ -1344,7 +2002,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
settings in cur_term, which happens when curses and termcap calls are
mixed (from report by Bjorn Helgaas <helgaas@dhc.net>).
+ suppress initialization of key-tries in _nc_keypad() if we are only
- disabling keypad mode, e.g., in endwin() called when keypad() was not.
+ disabling keypad mode, e.g., in endwin() called when keypad() was
+ not.
+ modify the Ada95 makefile to ensure that always the Ada files from
the development tree are used for building and not the eventually
installed ones (patch by Juergen Pfeifer).
@@ -1402,8 +2061,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
+ add a null-pointer check for SP in lib_vidattr.c to logic that checks
for magic cookies.
+ improve fallback declaration of 'bool' when the --without-cxx option
- is given, by using a 'char' on i386 and related hosts (from discussion
- with Alexander Lukyanov).
+ is given, by using a 'char' on i386 and related hosts (from
+ discussion with Alexander Lukyanov).
990605 pre-release
+ include time.h in lib_napms.c if nanosleep is used (patch by
@@ -1454,7 +2113,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
> patch by Juergen Pfeifer:
+ modify menu creation to not inherit status flag from the default menu
which says that the associated marker string has been allocated and
- should be freed (bug reported by Marek Paliwoda" <paliwoda@kki.net.pl>)
+ should be freed (bug reported by Marek Paliwoda"
+ <paliwoda@kki.net.pl>)
990327 pre-release (alpha.gnu.org:/gnu/ncurses-5.0-beta1.tar.gz)
+ minor fixes to xterm-xfree86 terminfo entry - TD.
@@ -1714,7 +2374,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
Otherwise, a relative path in $TERMINFO would confuse tic (from a
Debian bug report).
+ correct/update ncsa terminfo entry (report by Larry Virden).
- + update xterm-xfree86 terminfo to current (patch 90), smcur/rmcur changes
+ + update xterm-xfree86 terminfo to current (patch 90), smcur/rmcur
+ changes
+ add Mathew Vernon's mach console entries to terminfo.src
+ more changes, moving functions, as part of Alexander's restructuring.
+ modify configure script for GNU/Hurd share-library support, introduce
@@ -1838,8 +2499,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
with --srcdir option.
+ modify infocmp "-r" option to remove limit on formatted termcap
output, which makes it more like Solaris' version.
- + modify captoinfo to treat no-argument case more like Solaris' version,
- which uses the contents of $TERMCAP as the entry to format.
+ + modify captoinfo to treat no-argument case more like Solaris'
+ version, which uses the contents of $TERMCAP as the entry to format.
+ modify mk-2nd.awk to handle subdirectories, e.g., ncurses/tty
(patch by Alexander V Lukyanov).
@@ -1910,8 +2571,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
+ improve integration of hashmap scrolling code, by adding oldhash and
newhash data to SP struct.
+ invoke del_curterm from delscreen.
- + modify del_curterm to set cur_term to null if it matches the function's
- parameter which is deleted.
+ + modify del_curterm to set cur_term to null if it matches the
+ function's parameter which is deleted.
+ modify lib_doupdate to prefer parm_ich to the enter_insert_mode and
exit_insert_mode combination, adjusting InsCharCost to check
enter_insert_mode, exit_insert_mode and insert_padding. Add
@@ -1919,8 +2580,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
to the SP struct.
980912
- + modify test-driver in lib_mvcur.s to use _nc_setbuffer, for consistent
- treatment.
+ + modify test-driver in lib_mvcur.s to use _nc_setbuffer, for
+ consistent treatment.
+ modify ncurses to restore output to unbuffered on endwin, and resume
buffering in refresh (see lib_set_term.c and NC_BUFFERED macro).
+ corrected HTML version numbers (according to the W3C validator, they
@@ -1960,8 +2621,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
Jaeger).
980815
- + modify lib_setup.c to eliminate unneeded include of <sys/ioctl.h> when
- termios is not used (patch by Todd C Miller).
+ + modify lib_setup.c to eliminate unneeded include of <sys/ioctl.h>
+ when termios is not used (patch by Todd C Miller).
+ add function _nc_doalloc, to ensure that failed realloc calls do not
leak memory (reported by Todd C Miller).
+ improved ncsa-telnet terminfo entry.
@@ -2010,8 +2671,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
the search path to /usr/lib (reported by Dan Nelson).
+ add -soname option when building shared libraries on OpenBSD 2.x
(request by QingLong).
- + add configure options --with-manpage-format and --with-manpage-renames
- (request by QingLong).
+ + add configure options --with-manpage-format and
+ --with-manpage-renames (request by QingLong).
+ correct conversion of CANCELLED_NUMERIC in write_object(), which was
omitting the high-order byte, producing a 254 in the compiled
terminfo.
@@ -2333,7 +2994,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
+ workaround a quoting problem on SunOS with tar-copy.sh
+ correct init_pair() calls in worm.c to work when use_default_colors()
is not available.
- + include <sys/types.h> in CF_SYS_TIME_SELECT to work with FreeBSD 2.1.5
+ + include <sys/types.h> in CF_SYS_TIME_SELECT to work with FreeBSD
+ 2.1.5
+ add ncv capability to FreeBSD console (cons25w), making reverse
work with color.
+ correct sense of configure-test for sys/time.h inclusion with
@@ -2344,8 +3006,9 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
+ remove shared-library loader flags from test/Makefile.in, etc.
+ simplify test/configure.in using new version of autoconf to create
test/ncurses_cfg.h
- + suppress suffix rules in test/Makefile.in, provide explicit dependency
- to work with --srcdir option and less capable 'make' programs.
+ + suppress suffix rules in test/Makefile.in, provide explicit
+ dependency to work with --srcdir option and less capable 'make'
+ programs.
> adapted from patch for QNX by Xiaodan Tang:
+ initialize %P and %g variables set/used in tparm, and also ensure
that empty strings don't return a null result from tparam_internal
@@ -2598,7 +3261,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
NeXT (reported by Francisco A. Tomei Torres).
971101
- + force mandatory padding in bell and flash_screen, as specified in XSI.
+ + force mandatory padding in bell and flash_screen, as specified in
+ XSI.
+ don't allow padding_baud_rate to override mandatory delays (reported
by Daniel Weaver).
+ modify delay_output() to use _nc_timed_wait() if no baudrate has been
@@ -2732,8 +3396,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
+ add configure script to generate c++/etip.h
+ add configure --with-develop option, to enable by default most of the
experimental options (requested by Alexander V. Lukyanov).
- + rename 'deinstall' to 'uninstall', following GNU convention (suggested
- by Alexander V. Lukyanov).
+ + rename 'deinstall' to 'uninstall', following GNU convention
+ (suggested by Alexander V. Lukyanov).
> patches by Alexander V. Lukyanov:
+ modify tactics 2 and 5 in onscreen_mvcur(), to allow them on the last
line of the screen, since carriage return will not cause a newline.
@@ -2826,7 +3490,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
+ #undef unctrl to avoid symbol conflict in port to RTEMS (reported by
Chris Johns <cjohns@plessey.com.au>)
> patches by Juergen Pfeifer:
- + simplified, made minor corrections to Ada95 binding to form fieldtype.
+ + simplified, made minor corrections to Ada95 binding to form
+ fieldtype.
+ The C++ binding has been enhanced:
+ Improve NCursesWindow class: added additional methods to cover
more ncurses functionality. Make refresh() and noutrefresh()
@@ -3231,7 +3896,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
+ restore original behavior in ncurses 'g' test, i.e., explicitly
set the keypad mode rather than use the default, since it confuses
people.
- + rewrote the newdemo banner so it's readable (reported by Hugh Daniel).
+ + rewrote the newdemo banner so it's readable (reported by Hugh
+ Daniel).
+ tidy up exit from hashtest (reported by Hugh Daniel).
+ restore check for ^Q in ncurses 'g' test broken in 970510 (reported
by Hugh Daniel)
@@ -3295,8 +3961,9 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
970517
+ suppress check for pre-existing ncurses header if the --prefix
option is specified.
- + add configure options "--with-system-type" and "--with-system-release"
- to assist in checking the generated makefiles.
+ + add configure options "--with-system-type" and
+ "--with-system-release" to assist in checking the generated
+ makefiles.
+ add configure option "--enable-rpath" to allow installers to specify
that programs linked against shared libraries will have their library
path embedded, allowing installs into nonstandard locations.
@@ -3335,12 +4002,13 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
+ modify ncurses 'g' test to allow mouse input
+ modify default xterm description to include mouse.
+ modify configure script to add -Wwrite-strings if gcc warnings are
- enabled while configuring --enable-const (and fixed related warnings).
+ enabled while configuring --enable-const (and fixed related
+ warnings).
+ add toggle, status display for keypad mode to ncurses 'g' test to
verify that keypad and scrollok are not inherited from parent window
during a call to newwin.
- + correction to MKexpanded.sh to make it work when configure --srcdir is
- used (reported by H.J.Lu).
+ + correction to MKexpanded.sh to make it work when configure --srcdir
+ is used (reported by H.J.Lu).
+ revise test for bool-type, ensuring that it checks if builtin.h is
available before including it, adding test for sizeof(bool) equal
to sizeof(short), and warning user if the size cannot be determined
@@ -3360,8 +4028,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
970505 4.1 pre-release
+ regenerate the misc directory html dumps without the link list, which
is not useful.
- + correct dependency in form directory makefile which caused unnecessary
- recompiles.
+ + correct dependency in form directory makefile which caused
+ unnecessary recompiles.
+ correct substitution for ABI_VERSION in test-makefile
+ modify install rules for shared-library targets to remove the target
before installing, since some install programs do not properly handle
@@ -3469,8 +4137,9 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
+ check for C++ builtin.h header
+ correct computation of absolute-path for $INSTALL that dropped "-c"
parameter from the expression.
- + rename config.h to ncurses_cfg.h to avoid naming-conflict when ncurses
- is integrated into larger systems (from diffs by H.J.Lu for libc).
+ + rename config.h to ncurses_cfg.h to avoid naming-conflict when
+ ncurses is integrated into larger systems (from diffs by H.J.Lu for
+ libc).
+ correct inequality in lib_doupdate.c that caused a single-char to not
be updated when the char on the right-margin was not blank, idcok()
was true (patch by Alexander V. Lukyanov 970124, also reported by
@@ -3841,7 +4510,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
handle displays wider than 128 chars (Juergen Pfeifer).
+ correct typo curs_outopts.3x (Juergen Pfeifer).
+ correct limit-checking in wenclose() (Juergen Pfeifer).
- + correction to Peter Wemm's newwin change (Thomas Fehr <fehr@suse.de>).
+ + correction to Peter Wemm's newwin change (Thomas Fehr
+ <fehr@suse.de>).
+ corrections to logic that combines colors and attributes; they must
not be OR'd (Juergen Pfeifer, extending from report/patch by Rick
Marshall).
@@ -4066,8 +4736,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
Ju"rgen Fluk <louis@dachau.marco.de>)
+ corrected calls on _nc_render so that background character is set
as per XSI.
- + corrected wbkgdset macro (XSI allows background character to be null),
- and tests that use it.
+ + corrected wbkgdset macro (XSI allows background character to be
+ null), and tests that use it.
+ more corrections to terminfo (xterm & rxvt)
+ undid change to mcprint prototype (cannot use size_t in curses.h
because not all systems declare it in the headers that we can safely
@@ -4135,8 +4805,9 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
msgwin needed scrollok set.
+ corrected last change to IDcTransformLine logic to avoid conflict
between PutRange and InsStr
- + modified run_tic.sh to not use /usr/tmp (reported by David MacKenzie),
- and further revised it and aclocal.m4 to use $TMPDIR if set.
+ + modified run_tic.sh to not use /usr/tmp (reported by David
+ MacKenzie), and further revised it and aclocal.m4 to use $TMPDIR if
+ set.
+ corrected off-by-one in RoomFor call in read_entry.c
960622 - snapshot
@@ -4204,8 +4875,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
+ corrected ifdef for BROKEN_LINKER in MKnames.awk.in
+ corrected missing INSTALL_DATA in misc/Makefile.in
+ flush output when changing cursor-visibility (Rick Marshall)
- + fix a minor bug in the _nc_ripoff() routine and improve error checking
- when creating the label window (Juergen Pfeifer).
+ + fix a minor bug in the _nc_ripoff() routine and improve error
+ checking when creating the label window (Juergen Pfeifer).
+ enhancement to the control over the new PC-style soft key format.
allow caller now to select whether or not one wants to have
the index-line; see curs_slk.3x for documentation (Juergen Pfeifer).
@@ -4308,7 +4979,8 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
+ autogenerate development header-dependencies (config.h, *.priv.h)
+ corrected single-column formatting of "use=" (e.g., in tic)
+ modify tic to read full terminfo-names
- + corrected divide-by-zero that caused hang (or worse) when redirecting output
+ + corrected divide-by-zero that caused hang (or worse) when redirecting
+ output
+ modify tic to generate directories only as-needed (and corrected
instance of use of data from function that had already returned).
@@ -4517,10 +5189,10 @@ Changes since 1.9.9e are recorded by Thomas Dickey.
takes a trace mask argument. The trace masks, defined in curses.h, are
as follows:
- #define TRACE_DISABLE 0x00 /* turn off tracing */
- #define TRACE_ORDINARY 0x01 /* ordinary trace mode */
- #define TRACE_CHARPUT 0x02 /* also trace all character outputs */
- #define TRACE_MAXIMUM 0x0f /* maximum trace level */
+ #define TRACE_DISABLE 0x00 /* turn off tracing */
+ #define TRACE_ORDINARY 0x01 /* ordinary trace mode */
+ #define TRACE_CHARPUT 0x02 /* also trace all character outputs */
+ #define TRACE_MAXIMUM 0x0f /* maximum trace level */
More trace masks may be added, or these may be changed, in future releases.
* The pad code has been improved and the pad test code in test/ncurses.c has
@@ -4808,7 +5480,7 @@ available separately from netcom.com:pub/zmbenhal/
* New scrolling code.
* fixed bug that reversed the sense of nl() and nonl().
-#### ncurses 0.2 -> ncurses 0.3 #### Jan 20, 1993 ####
+#### ncurses 0.2 -> ncurses 0.3 #### Jan 20, 1993 ####
* more support for color and graphics see test/ for examples.
* fixed various files to allow correct update after shelling out.
* more fixes for updates.
diff --git a/contrib/ncurses/aclocal.m4 b/contrib/ncurses/aclocal.m4
index 382aa10629e9..bd1df2660e22 100644
--- a/contrib/ncurses/aclocal.m4
+++ b/contrib/ncurses/aclocal.m4
@@ -1,5 +1,5 @@
dnl***************************************************************************
-dnl Copyright (c) 1998-2000 Free Software Foundation, Inc. *
+dnl Copyright (c) 1998-2000,2001,2002 Free Software Foundation, Inc. *
dnl *
dnl Permission is hereby granted, free of charge, to any person obtaining a *
dnl copy of this software and associated documentation files (the *
@@ -26,9 +26,9 @@ dnl sale, use or other dealings in this Software without prior written *
dnl authorization. *
dnl***************************************************************************
dnl
-dnl Author: Thomas E. Dickey 1996,1997,1998,1999,2000
+dnl Author: Thomas E. Dickey 1996,1997,1998,1999,2000,2001
dnl
-dnl $Id: aclocal.m4,v 1.248 2001/04/21 19:40:04 tom Exp $
+dnl $Id: aclocal.m4,v 1.280 2002/04/27 19:31:30 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl See http://dickey.his.com/autoconf/ for additional information.
@@ -58,33 +58,46 @@ AC_SUBST(ACPPFLAGS)
])dnl
dnl ---------------------------------------------------------------------------
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
+dnl The second parameter if given makes this macro verbose.
AC_DEFUN([CF_ADD_CFLAGS],
[
+cf_new_cflags=
+cf_new_cppflags=
for cf_add_cflags in $1
do
case $cf_add_cflags in #(vi
-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
case "$CPPFLAGS" in
- *$cf_add_cflags)
+ *$cf_add_cflags) #(vi
;;
- *)
- CPPFLAGS="$CPPFLAGS $cf_add_cflags"
+ *) #(vi
+ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
;;
esac
;;
*)
- CFLAGS="$CFLAGS $cf_add_cflags"
+ cf_new_cflags="$cf_new_cflags $cf_add_cflags"
;;
esac
done
+
+if test -n "$cf_new_cflags" ; then
+ ifelse($2,,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
+ CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+ ifelse($2,,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
+ CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
])dnl
dnl ---------------------------------------------------------------------------
dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
dnl in the sharutils 4.2 distribution.
AC_DEFUN([CF_ANSI_CC_CHECK],
[
-AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
-AC_CACHE_VAL(cf_cv_ansi_cc,[
+AC_CACHE_CHECK(for ${CC-cc} option to accept ANSI C, cf_cv_ansi_cc,[
cf_cv_ansi_cc=no
cf_save_CFLAGS="$CFLAGS"
cf_save_CPPFLAGS="$CPPFLAGS"
@@ -120,7 +133,6 @@ done
CFLAGS="$cf_save_CFLAGS"
CPPFLAGS="$cf_save_CPPFLAGS"
])
-AC_MSG_RESULT($cf_cv_ansi_cc)
if test "$cf_cv_ansi_cc" != "no"; then
if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then
@@ -155,6 +167,9 @@ dnl Treat the configuration-variable specially here, since we're directly
dnl substituting its value (i.e., 1/0).
AC_DEFUN([CF_BOOL_DECL],
[
+AC_CHECK_HEADER(stdbool.h,
+ cf_cv_header_stdbool_h=1,
+ cf_cv_header_stdbool_h=0)
AC_MSG_CHECKING([for builtin bool type])
AC_CACHE_VAL(ifelse($1,,cf_cv_builtin_bool,[$1]),[
AC_TRY_COMPILE([
@@ -172,6 +187,9 @@ fi
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's been deprecated.
+dnl
+dnl If the current compiler is C rather than C++, we get the bool definition
+dnl from <stdbool.h>.
AC_DEFUN([CF_BOOL_SIZE],
[
AC_MSG_CHECKING([for size of bool])
@@ -180,6 +198,9 @@ AC_CACHE_VAL(cf_cv_type_of_bool,[
AC_TRY_RUN([
#include <stdlib.h>
#include <stdio.h>
+
+#if defined(__cplusplus)
+
#ifdef HAVE_GXX_BUILTIN_H
#include <g++/builtin.h>
#elif HAVE_GPP_BUILTIN_H
@@ -187,6 +208,15 @@ AC_CACHE_VAL(cf_cv_type_of_bool,[
#elif HAVE_BUILTIN_H
#include <builtin.h>
#endif
+
+#else
+
+#if $cf_cv_header_stdbool_h
+#include <stdbool.h>
+#endif
+
+#endif
+
main()
{
FILE *fp = fopen("cf_test.out", "w");
@@ -203,15 +233,21 @@ main()
exit(0);
}
],
- [cf_cv_type_of_bool=`cat cf_test.out`],
+ [cf_cv_type_of_bool=`cat cf_test.out`
+ if test -z "$cf_cv_type_of_bool"; then
+ cf_cv_type_of_bool=unknown
+ fi],
[cf_cv_type_of_bool=unknown],
[cf_cv_type_of_bool=unknown])
])
rm -f cf_test.out
AC_MSG_RESULT($cf_cv_type_of_bool)
if test "$cf_cv_type_of_bool" = unknown ; then
- AC_MSG_WARN(Assuming unsigned for type of bool)
- cf_cv_type_of_bool=unsigned
+ case .$NCURSES_BOOL in #(vi
+ .auto|.) NCURSES_BOOL=unsigned;;
+ esac
+ AC_MSG_WARN(Assuming $NCURSES_BOOL for type of bool)
+ cf_cv_type_of_bool=$NCURSES_BOOL
fi
])dnl
dnl ---------------------------------------------------------------------------
@@ -310,7 +346,7 @@ test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name")
AC_CACHE_VAL(cf_cv_system_name,[cf_cv_system_name="$system_name"])
test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && AC_MSG_RESULT("Configuring for $cf_cv_system_name")
+test -n "$cf_cv_system_name" && AC_MSG_RESULT(Configuring for $cf_cv_system_name)
if test ".$system_name" != ".$cf_cv_system_name" ; then
AC_MSG_RESULT(Cached system name ($system_name) does not agree with actual ($cf_cv_system_name))
@@ -322,14 +358,10 @@ dnl Check for data that is usually declared in <stdio.h> or <errno.h>, e.g.,
dnl the 'errno' variable. Define a DECL_xxx symbol if we must declare it
dnl ourselves.
dnl
-dnl (I would use AC_CACHE_CHECK here, but it will not work when called in a
-dnl loop from CF_SYS_ERRLIST).
-dnl
dnl $1 = the name to check
AC_DEFUN([CF_CHECK_ERRNO],
[
-AC_MSG_CHECKING(if external $1 is declared)
-AC_CACHE_VAL(cf_cv_dcl_$1,[
+AC_CACHE_CHECK(if external $1 is declared, cf_cv_dcl_$1,[
AC_TRY_COMPILE([
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
@@ -338,16 +370,12 @@ AC_CACHE_VAL(cf_cv_dcl_$1,[
#include <sys/types.h>
#include <errno.h> ],
[long x = (long) $1],
- [eval 'cf_cv_dcl_'$1'=yes'],
- [eval 'cf_cv_dcl_'$1'=no'])
+ [cf_cv_dcl_$1=yes],
+ [cf_cv_dcl_$1=no])
])
-eval 'cf_result=$cf_cv_dcl_'$1
-AC_MSG_RESULT($cf_result)
-
-if test "$cf_result" = no ; then
- eval 'cf_result=DECL_'$1
- CF_UPPER(cf_result,$cf_result)
+if test "$cf_cv_dcl_$1" = no ; then
+ CF_UPPER(cf_result,decl_$1)
AC_DEFINE_UNQUOTED($cf_result)
fi
@@ -361,22 +389,18 @@ dnl $1 = the name to check
dnl $2 = its type
AC_DEFUN([CF_CHECK_EXTERN_DATA],
[
-AC_MSG_CHECKING(if external $1 exists)
-AC_CACHE_VAL(cf_cv_have_$1,[
+AC_CACHE_CHECK(if external $1 exists, cf_cv_have_$1,[
AC_TRY_LINK([
#undef $1
extern $2 $1;
],
[$1 = 2],
- [eval 'cf_cv_have_'$1'=yes'],
- [eval 'cf_cv_have_'$1'=no'])])
-
-eval 'cf_result=$cf_cv_have_'$1
-AC_MSG_RESULT($cf_result)
+ [cf_cv_have_$1=yes],
+ [cf_cv_have_$1=no])
+])
-if test "$cf_result" = yes ; then
- eval 'cf_result=HAVE_'$1
- CF_UPPER(cf_result,$cf_result)
+if test "$cf_cv_have_$1" = yes ; then
+ CF_UPPER(cf_result,have_$1)
AC_DEFINE_UNQUOTED($cf_result)
fi
@@ -425,11 +449,12 @@ AC_LANG_CPLUSPLUS
AC_CHECK_HEADERS(strstream.h)
AC_CACHE_CHECK(if $CXX supports vscan function,cf_cv_cpp_vscan_func,[
- for cf_vscan_func in strstream stdio
+ for cf_vscan_func in strstream strstream_cast stdio
do
case $cf_vscan_func in #(vi
stdio) cf_vscan_defs=USE_STDIO_VSCAN ;; #(vi
strstream) cf_vscan_defs=USE_STRSTREAM_VSCAN ;;
+ strstream_cast) cf_vscan_defs=USE_STRSTREAM_VSCAN_CAST ;;
esac
AC_TRY_LINK([
#include <stdio.h>
@@ -443,25 +468,25 @@ AC_CACHE_CHECK(if $CXX supports vscan function,cf_cv_cpp_vscan_func,[
int scanw(const char* fmt, ...)
{
int result = -1;
-#if defined(__GNUG__)
char buf[BUFSIZ];
va_list args;
va_start(args, fmt);
#if defined(USE_STDIO_VSCAN)
- if (::vscanf(fmt, args) != -1)
+ if (::vsscanf(buf, fmt, args) != -1)
result = 0;
#elif defined(USE_STRSTREAM_VSCAN)
strstreambuf ss(buf, sizeof(buf));
+ if (ss.vscan(fmt, args) != -1)
+ result = 0;
+#elif defined(USE_STRSTREAM_VSCAN_CAST)
+ strstreambuf ss(buf, sizeof(buf));
if (ss.vscan(fmt, (_IO_va_list)args) != -1)
result = 0;
#else
#error case $cf_vscan_func failed
#endif
va_end(args);
-#else
-#error sorry, we only know about the GNU compiler case
-#endif
return result;
}
],[int tmp, foo = scanw("%d", &tmp)],
@@ -483,6 +508,10 @@ strstream)
AC_DEFINE(CPP_HAS_VSCAN_FUNC)
AC_DEFINE(USE_STRSTREAM_VSCAN)
;;
+strstream_cast)
+ AC_DEFINE(CPP_HAS_VSCAN_FUNC)
+ AC_DEFINE(USE_STRSTREAM_VSCAN_CAST)
+ ;;
esac
])dnl
dnl ---------------------------------------------------------------------------
@@ -495,7 +524,11 @@ DIRS_TO_MAKE="lib"
for cf_item in $cf_list_models
do
CF_OBJ_SUBDIR($cf_item,cf_subdir)
- DIRS_TO_MAKE="$DIRS_TO_MAKE $cf_subdir"
+ for cf_item2 in $DIRS_TO_MAKE
+ do
+ test $cf_item2 = $cf_subdir && break
+ done
+ test ".$cf_item2" != ".$cf_subdir" && DIRS_TO_MAKE="$DIRS_TO_MAKE $cf_subdir"
done
for cf_dir in $DIRS_TO_MAKE
do
@@ -621,6 +654,49 @@ tcgetattr(1, &foo);],
test "$cf_cv_have_tcgetattr" = yes && AC_DEFINE(HAVE_TCGETATTR)
])dnl
dnl ---------------------------------------------------------------------------
+dnl Check for vsscanf() function, which is in c9x but generally not in earlier
+dnl versions of C. It is in the GNU C library, and can often be simulated by
+dnl other functions.
+AC_DEFUN([CF_FUNC_VSSCANF],
+[
+AC_CACHE_CHECK(for vsscanf function or workaround,cf_cv_func_vsscanf,[
+AC_TRY_LINK([
+#include <stdarg.h>
+#include <stdio.h>],[
+ va_list ap;
+ vsscanf("from", "%d", ap)],[cf_cv_func_vsscanf=vsscanf],[
+AC_TRY_LINK([
+#include <stdarg.h>
+#include <stdio.h>],[
+ FILE strbuf;
+ char *str = "from";
+
+ strbuf._flag = _IOREAD;
+ 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([
+#include <stdarg.h>
+#include <stdio.h>],[
+ FILE strbuf;
+ char *str = "from";
+
+ strbuf._flag = _IOREAD;
+ strbuf._ptr = strbuf._base = (unsigned char *) str;
+ strbuf._cnt = strlen(str);
+ strbuf._file = _NFILE;
+ return (_doscan(&strbuf, "%d", ap))],[cf_cv_func_vsscanf=_doscan],[
+cf_cv_func_vsscanf=no])])])])
+
+case $cf_cv_func_vsscanf in #(vi
+vsscanf) AC_DEFINE(HAVE_VSSCANF);; #(vi
+vfscanf) AC_DEFINE(HAVE_VFSCANF);; #(vi
+_doscan) AC_DEFINE(HAVE__DOSCAN);;
+esac
+
+])dnl
+dnl ---------------------------------------------------------------------------
dnl Test for availability of useful gcc __attribute__ directives to quiet
dnl compiler warnings. Though useful, not all are supported -- and contrary
dnl to documentation, unrecognized directives cause older compilers to barf.
@@ -790,6 +866,34 @@ case $cf_cv_gnat_version in
esac
])
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
+dnl (or misfeature) of glibc2, which breaks portability of many applications,
+dnl since it is interwoven with GNU extensions.
+dnl
+dnl Well, yes we could work around it...
+AC_DEFUN([CF_GNU_SOURCE],
+[
+AC_CACHE_CHECK(if we must define _GNU_SOURCE,cf_cv_gnu_source,[
+AC_TRY_COMPILE([#include <sys/types.h>],[
+#ifndef _XOPEN_SOURCE
+make an error
+#endif],
+ [cf_cv_gnu_source=no],
+ [cf_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ AC_TRY_COMPILE([#include <sys/types.h>],[
+#ifdef _XOPEN_SOURCE
+make an error
+#endif],
+ [cf_cv_gnu_source=no],
+ [cf_cv_gnu_source=yes])
+ CPPFLAGS="$cf_save"
+ ])
+])
+test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+])dnl
+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
dnl configure, but won't be able to build the c++ demo program.
@@ -874,6 +978,25 @@ AC_MSG_RESULT($cf_cv_have_isascii)
test "$cf_cv_have_isascii" = yes && AC_DEFINE(HAVE_ISASCII)
])dnl
dnl ---------------------------------------------------------------------------
+dnl Check for libutf8
+AC_DEFUN([CF_LIBUTF8],
+[
+AC_CACHE_CHECK(for putwc in libutf8,cf_cv_libutf8,[
+ cf_save_LIBS="$LIBS"
+ LIBS="-lutf8 $LIBS"
+AC_TRY_LINK([
+#include <libutf8.h>],[putwc(0,0);],
+ [cf_cv_libutf8=yes],
+ [cf_cv_libutf8=no])
+ LIBS="$cf_save_LIBS"
+])
+
+if test "$cf_cv_libutf8" = yes ; then
+ AC_DEFINE(HAVE_LIBUTF8_H)
+ LIBS="-lutf8 $LIBS"
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
dnl Compute the library-prefix for the given host system
dnl $1 = variable to set
AC_DEFUN([CF_LIB_PREFIX],
@@ -906,43 +1029,70 @@ for cf_dir in $SRC_SUBDIRS
do
if test -f $srcdir/$cf_dir/modules; then
- cf_libs_to_make=
+ IMPORT_LIB=
+ SHARED_LIB=
+ LIBS_TO_MAKE=
for cf_item in $CF_LIST_MODELS
do
CF_LIB_SUFFIX($cf_item,cf_suffix)
if test $cf_item = shared ; then
if test "$cf_cv_do_symlinks" = yes ; then
case "$cf_cv_shlib_version" in #(vi
- rel) cf_suffix="$cf_suffix"'.$(REL_VERSION)' ;; #(vi
- abi) cf_suffix="$cf_suffix"'.$(ABI_VERSION)' ;;
+ rel) #(vi
+ case "$cf_cv_system_name" in #(vi
+ darwin*) cf_suffix='.$(REL_VERSION)'"$cf_suffix" ;; #(vi
+ *) cf_suffix="$cf_suffix"'.$(REL_VERSION)' ;;
+ esac
+ ;;
+ abi)
+ case "$cf_cv_system_name" in #(vi
+ darwin*) cf_suffix='.$(ABI_VERSION)'"$cf_suffix" ;; #(vi
+ *) cf_suffix="$cf_suffix"'.$(ABI_VERSION)' ;;
+ esac
+ ;;
esac
fi
+ # cygwin needs import library, and has unique naming convention
+ if test $cf_cv_shlib_version = cygdll ; then
+ SHARED_LIB="../lib/${cf_prefix}${cf_dir}\$(ABI_VERSION).dll"
+ IMPORT_LIB="../lib/${cf_prefix}${cf_dir}.dll.a"
+ LIBS_TO_MAKE="$LIBS_TO_MAKE \$(SHARED_LIB) \$(IMPORT_LIB)"
+ continue
fi
- cf_libs_to_make="$cf_libs_to_make ../lib/${cf_prefix}${cf_dir}${cf_suffix}"
+ fi
+ LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/${cf_prefix}${cf_dir}${cf_suffix}"
done
if test $cf_dir = ncurses ; then
+ cf_subsets="$LIB_SUBSETS"
case "$LIB_SUBSETS" in #(vi
termlib+*) #(vi
;;
*) #(vi
- cf_item=`echo $cf_libs_to_make |sed -e s/$LIB_NAME/$TINFO_NAME/g`
- cf_libs_to_make="$cf_item $cf_libs_to_make"
+ cf_item=`echo $LIBS_TO_MAKE |sed -e s/$LIB_NAME/$TINFO_NAME/g`
+ LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
;;
esac
+ else
+ cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib //'`
fi
- sed -e "s@\@LIBS_TO_MAKE\@@$cf_libs_to_make@" \
+ sed -e "s@\@LIBS_TO_MAKE\@@$LIBS_TO_MAKE@" \
+ -e "s@\@IMPORT_LIB\@@$IMPORT_LIB@" \
+ -e "s@\@SHARED_LIB\@@$SHARED_LIB@" \
$cf_dir/Makefile >$cf_dir/Makefile.out
mv $cf_dir/Makefile.out $cf_dir/Makefile
$AWK -f $srcdir/mk-0th.awk \
- name=$cf_dir \
+ libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" \
$srcdir/$cf_dir/modules >>$cf_dir/Makefile
- for cf_item in $CF_LIST_MODELS
+ for cf_subset in $cf_subsets
do
- echo 'Appending rules for '$cf_item' model ('$cf_dir')'
+ cf_subdirs=
+ for cf_item in $CF_LIST_MODELS
+ do
+ echo "Appending rules for ${cf_item} model (${cf_dir}: ${cf_subset})"
CF_UPPER(CF_ITEM,$cf_item)
CF_LIB_SUFFIX($cf_item,cf_suffix)
CF_OBJ_SUBDIR($cf_item,cf_subdir)
@@ -962,8 +1112,6 @@ do
cf_depend="$cf_depend $cf_reldir/curses.priv.h"
fi
- for cf_subset in $LIB_SUBSETS
- do
$AWK -f $srcdir/mk-1st.awk \
name=$cf_dir \
traces=$LIB_TRACING \
@@ -973,6 +1121,7 @@ do
suffix=$cf_suffix \
subset=$cf_subset \
ShlibVer=$cf_cv_shlib_version \
+ ShlibVerInfix=$cf_cv_shlib_version_infix \
DoLinks=$cf_cv_do_symlinks \
rmSoLocs=$cf_cv_rm_so_locs \
ldconfig="$LDCONFIG" \
@@ -980,7 +1129,11 @@ do
depend="$cf_depend" \
target="$target" \
$srcdir/$cf_dir/modules >>$cf_dir/Makefile
- test $cf_dir = ncurses && WITH_OVERWRITE=no
+ for cf_subdir2 in $cf_subdirs lib
+ do
+ test $cf_subdir = $cf_subdir2 && break
+ done
+ test "${cf_subset}.${cf_subdir2}" != "${cf_subset}.${cf_subdir}" && \
$AWK -f $srcdir/mk-2nd.awk \
name=$cf_dir \
traces=$LIB_TRACING \
@@ -990,6 +1143,7 @@ do
srcdir=$srcdir \
echo=$WITH_ECHO \
$srcdir/$cf_dir/modules >>$cf_dir/Makefile
+ cf_subdirs="$cf_subdirs $cf_subdir"
done
done
fi
@@ -1045,11 +1199,11 @@ done
cat >> Makefile <<CF_EOF
-install.data \
+install.data \\
uninstall.data ::
- cd misc && \$(MAKE) \$(CF_MFLAGS) \[$]@
+$MAKE_TERMINFO cd misc && \$(MAKE) \$(CF_MFLAGS) \[$]@
-install.man \
+install.man \\
uninstall.man ::
cd man && \$(MAKE) \$(CF_MFLAGS) \[$]@
@@ -1064,7 +1218,7 @@ if test -d tack ; then
if test -f $srcdir/$tack.h; then
cat >> Makefile <<CF_EOF
-install.man \
+install.man \\
uninstall.man ::
cd tack && \$(MAKE) \$(CF_MFLAGS) \[$]@
CF_EOF
@@ -1148,6 +1302,9 @@ test "\$NAME" = "curses.h" && NAME=ncurses.h
CF_EOF
fi
cat >>headers.sh <<CF_EOF
+# Just in case someone gzip'd manpages, remove the conflicting copy.
+test -f \$DST/\$NAME.gz && rm -f \$DST/\$NAME.gz
+
eval \$PRG \$TMPSRC \$DST/\$NAME
rm -f \$TMPSRC \$TMPSED
CF_EOF
@@ -1159,7 +1316,7 @@ do
if test -f $srcdir/$cf_dir/headers; then
cat >>$cf_dir/Makefile <<CF_EOF
\$(DESTDIR)\$(includedir) :
- \$(srcdir)/../mkinstalldirs \[$]@
+ sh \$(srcdir)/../mkinstalldirs \[$]@
install \\
install.libs \\
@@ -1191,6 +1348,17 @@ CF_EOF
test $i = curses.h && echo " -@ (cd \$(DESTDIR)\$(includedir) && rm -f ncurses.h)" >>$cf_dir/Makefile
done
fi
+
+ if test -f $srcdir/$cf_dir/modules; then
+ if test "$cf_dir" != "c++" ; then
+ cat >>$cf_dir/Makefile <<"CF_EOF"
+depend : $(AUTO_SRC)
+ makedepend -- $(CPPFLAGS) -- $(C_SRC)
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+CF_EOF
+ fi
+ fi
done
])dnl
@@ -1209,6 +1377,8 @@ AC_DEFUN([CF_LIB_SUFFIX],
profile) $2='_p.a' ;;
shared)
case $cf_cv_system_name in
+ cygwin*) $2='.dll' ;;
+ darwin*) $2='.dylib' ;;
hpux*) $2='.sl' ;;
*) $2='.so' ;;
esac
@@ -1285,7 +1455,12 @@ EOF
LIBS="$cf_saveLIBS"
])
AC_MSG_RESULT($cf_cv_link_dataonly)
-test "$cf_cv_link_dataonly" = no && AC_DEFINE(BROKEN_LINKER)
+
+if test "$cf_cv_link_dataonly" = no ; then
+ AC_DEFINE(BROKEN_LINKER)
+ BROKEN_LINKER=1
+fi
+
])dnl
dnl ---------------------------------------------------------------------------
dnl Most Unix systems have both link and symlink, a few don't have symlink.
@@ -1349,12 +1524,12 @@ 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_MSG_CHECKING([for makeflags variable])
-AC_CACHE_VAL(cf_cv_makeflags,[
+AC_CACHE_CHECK(for makeflags variable, cf_cv_makeflags,[
cf_cv_makeflags=''
for cf_option in '-$(MAKEFLAGS)' '$(MFLAGS)'
do
cat >cf_makeflags.tmp <<CF_EOF
+SHELL = /bin/sh
all :
@ echo '.$cf_option'
CF_EOF
@@ -1374,8 +1549,9 @@ CF_EOF
;;
esac
done
- rm -f cf_makeflags.tmp])
-AC_MSG_RESULT($cf_cv_makeflags)
+ rm -f cf_makeflags.tmp
+])
+
AC_SUBST(cf_cv_makeflags)
])dnl
dnl ---------------------------------------------------------------------------
@@ -1416,10 +1592,10 @@ AC_MSG_CHECKING(format of man-pages)
AC_ARG_WITH(manpage-format,
[ --with-manpage-format specify manpage-format: gzip/compress/BSDI/normal and
optionally formatted, e.g., gzip,formatted],
- [cf_manpage_form=$withval],
- [cf_manpage_form=unknown])
+ [MANPAGE_FORMAT=$withval],
+ [MANPAGE_FORMAT=unknown])
-case ".$cf_manpage_form" in
+case ".$MANPAGE_FORMAT" in
.gzip|.compress|.BSDI|.normal|.formatted) # (vi
;;
.unknown|.) # (vi
@@ -1428,7 +1604,7 @@ case ".$cf_manpage_form" in
fi
# look for the 'date' man-page (it's most likely to be installed!)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATHSEP}"
- cf_manpage_form=unknown
+ MANPAGE_FORMAT=unknown
for cf_dir in $MANPATH; do
test -z "$cf_dir" && cf_dir=/usr/man
for cf_name in $cf_dir/*/date.[[01]]* $cf_dir/*/date
@@ -1436,15 +1612,15 @@ case ".$cf_manpage_form" in
cf_test=`echo $cf_name | sed -e 's/*//'`
if test "x$cf_test" = "x$cf_name" ; then
case "$cf_name" in
- *.gz) cf_manpage_form=gzip;;
- *.Z) cf_manpage_form=compress;;
- *.0) cf_manpage_form=BSDI,formatted;;
- *) cf_manpage_form=normal;;
+ *.gz) MANPAGE_FORMAT=gzip;;
+ *.Z) MANPAGE_FORMAT=compress;;
+ *.0) MANPAGE_FORMAT=BSDI,formatted;;
+ *) MANPAGE_FORMAT=normal;;
esac
break
fi
done
- if test "$cf_manpage_form" != "unknown" ; then
+ if test "$MANPAGE_FORMAT" != "unknown" ; then
break
fi
done
@@ -1455,7 +1631,7 @@ case ".$cf_manpage_form" in
;;
esac
-AC_MSG_RESULT($cf_manpage_form)
+AC_MSG_RESULT($MANPAGE_FORMAT)
])dnl
dnl ---------------------------------------------------------------------------
dnl The Debian people have their own naming convention for manpages. This
@@ -1467,37 +1643,40 @@ AC_MSG_CHECKING(for manpage renaming)
AC_ARG_WITH(manpage-renames,
[ --with-manpage-renames specify manpage-renaming],
- [cf_manpage_renames=$withval],
- [cf_manpage_renames=yes])
+ [MANPAGE_RENAMES=$withval],
+ [MANPAGE_RENAMES=yes])
-case ".$cf_manpage_renames" in #(vi
+case ".$MANPAGE_RENAMES" in #(vi
.no) #(vi
;;
.|.yes)
# Debian 'man' program?
if test -f /etc/debian_version ; then
- cf_manpage_renames=`cd $srcdir && pwd`/man/man_db.renames
+ MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames
else
- cf_manpage_renames=no
+ MANPAGE_RENAMES=no
fi
;;
esac
-if test "$cf_manpage_renames" != no ; then
- if test ! -f $cf_manpage_renames ; then
- AC_MSG_ERROR(not a filename: $cf_manpage_renames)
+if test "$MANPAGE_RENAMES" != no ; then
+ if test -f $srcdir/man/$MANPAGE_RENAMES ; then
+ MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
+ elif test ! -f $MANPAGE_RENAMES ; then
+ AC_MSG_ERROR(not a filename: $MANPAGE_RENAMES)
fi
test ! -d man && mkdir man
# Construct a sed-script to perform renaming within man-pages
- if test -n "$cf_manpage_renames" ; then
+ if test -n "$MANPAGE_RENAMES" ; then
test ! -d man && mkdir man
- $srcdir/man/make_sed.sh $cf_manpage_renames >man/edit_man.sed
+ sh $srcdir/man/make_sed.sh $MANPAGE_RENAMES >man/edit_man.sed
fi
fi
-AC_MSG_RESULT($cf_manpage_renames)
+AC_MSG_RESULT($MANPAGE_RENAMES)
+AC_SUBST(MANPAGE_RENAMES)
])dnl
dnl ---------------------------------------------------------------------------
dnl Some people expect each tool to make all aliases for manpages in the
@@ -1509,10 +1688,10 @@ AC_MSG_CHECKING(for manpage symlinks)
AC_ARG_WITH(manpage-symlinks,
[ --with-manpage-symlinks specify manpage-symlinks],
- [cf_manpage_symlinks=$withval],
- [cf_manpage_symlinks=yes])
+ [MANPAGE_SYMLINKS=$withval],
+ [MANPAGE_SYMLINKS=yes])
-AC_MSG_RESULT($cf_manpage_symlinks)
+AC_MSG_RESULT($MANPAGE_SYMLINKS)
])dnl
dnl ---------------------------------------------------------------------------
dnl This option causes manpages to be run through tbl(1) to generate tables
@@ -1523,10 +1702,10 @@ AC_MSG_CHECKING(for manpage tbl)
AC_ARG_WITH(manpage-tbl,
[ --with-manpage-tbl specify manpage processing with tbl],
- [cf_manpage_tbl=$withval],
- [cf_manpage_tbl=no])
+ [MANPAGE_TBL=$withval],
+ [MANPAGE_TBL=no])
-AC_MSG_RESULT($cf_manpage_tbl)
+AC_MSG_RESULT($MANPAGE_TBL)
])dnl
dnl ---------------------------------------------------------------------------
dnl Try to determine if the man-pages on the system are compressed, and if
@@ -1546,7 +1725,7 @@ CF_MANPAGE_TBL
cf_prefix="$prefix"
fi
- case "$cf_manpage_form" in # (vi
+ case "$MANPAGE_FORMAT" in # (vi
*formatted*) # (vi
cf_subdir='$mandir/cat'
cf_format=yes
@@ -1563,8 +1742,9 @@ cat >man/edit_man.sh <<CF_EOF
# this script is generated by the configure-script
prefix="$cf_prefix"
datadir="$datadir"
+NCURSES_OSPEED="$NCURSES_OSPEED"
TERMINFO="$TERMINFO"
-MKDIRS="`cd $srcdir && pwd`/mkinstalldirs"
+MKDIRS="sh `cd $srcdir && pwd`/mkinstalldirs"
INSTALL="$INSTALL"
INSTALL_DATA="$INSTALL_DATA"
transform="$program_transform_name"
@@ -1600,13 +1780,13 @@ case \$i in #(vi
continue
fi
CF_EOF
-if test "$cf_manpage_symlinks" = yes ; then
+if test "$MANPAGE_SYMLINKS" = yes ; then
cat >>man/edit_man.sh <<CF_EOF
aliases=\`sed -f \$srcdir/manlinks.sed \$inalias | sort -u\`
CF_EOF
fi
-if test "$cf_manpage_renames" = no ; then
+if test "$MANPAGE_RENAMES" = no ; then
cat >>man/edit_man.sh <<CF_EOF
# perform program transformations for section 1 man pages
if test \$section = 1 ; then
@@ -1617,7 +1797,7 @@ cat >>man/edit_man.sh <<CF_EOF
CF_EOF
else
cat >>man/edit_man.sh <<CF_EOF
- target=\`grep "^\$source" $cf_manpage_renames | $AWK '{print \[$]2}'\`
+ target=\`grep "^\$source" $MANPAGE_RENAMES | $AWK '{print \[$]2}'\`
if test -z "\$target" ; then
echo '? missing rename for '\$source
target="\$source"
@@ -1638,6 +1818,7 @@ CF_EOF
cat >>man/edit_man.sh <<CF_EOF
sed -e "s,@DATADIR@,\$datadir," \\
-e "s,@TERMINFO@,\$TERMINFO," \\
+ -e "s,@NCURSES_OSPEED@,\$NCURSES_OSPEED," \\
CF_EOF
ifelse($1,,,[
for cf_name in $1
@@ -1648,10 +1829,16 @@ cat >>man/edit_man.sh <<CF_EOF
CF_EOF
done
])
+if test -f $MANPAGE_RENAMES ; then
+cat >>man/edit_man.sh <<CF_EOF
+ < \$i | sed -f edit_man.sed >\$TMP
+CF_EOF
+else
cat >>man/edit_man.sh <<CF_EOF
< \$i >\$TMP
CF_EOF
-if test $cf_manpage_tbl = yes ; then
+fi
+if test $MANPAGE_TBL = yes ; then
cat >>man/edit_man.sh <<CF_EOF
tbl \$TMP >\$TMP.out
mv \$TMP.out \$TMP
@@ -1669,7 +1856,7 @@ cat >>man/edit_man.sh <<CF_EOF
mv \$TMP.out \$TMP
CF_EOF
fi
-case "$cf_manpage_form" in #(vi
+case "$MANPAGE_FORMAT" in #(vi
*compress*) #(vi
cat >>man/edit_man.sh <<CF_EOF
if test \$verb = installing ; then
@@ -1781,6 +1968,37 @@ ifelse($1,,[
fi
])
dnl ---------------------------------------------------------------------------
+dnl Check if mbstate_t is declared, and if so, which header file.
+AC_DEFUN([CF_MBSTATE_T],
+[
+# This is needed on Tru64 5.0 to declare mbstate_t
+AC_CACHE_CHECK(if we must include wchar.h to declare mbstate_t,cf_cv_mbstate_t,[
+AC_TRY_COMPILE([
+#include <stdlib.h>
+#ifdef HAVE_LIBUTF8_H
+#include <libutf8.h>
+#endif],
+ [mbstate_t state],
+ [cf_cv_mbstate_t=no],
+ [AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <wchar.h>
+#ifdef HAVE_LIBUTF8_H
+#include <libutf8.h>
+#endif],
+ [mbstate_t value],
+ [cf_cv_mbstate_t=yes],
+ [cf_cv_mbstate_t=unknown])])])
+
+if test "$cf_cv_mbstate_t" = yes ; then
+ AC_DEFINE(NEED_WCHAR_H)
+fi
+
+if test "$cf_cv_mbstate_t" != unknown ; then
+ AC_DEFINE(HAVE_MBSTATE_T)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
dnl Check if the file-system supports mixed-case filenames. If we're able to
dnl create a lowercase name and see it as uppercase, it doesn't support that.
AC_DEFUN([CF_MIXEDCASE_FILENAMES],
@@ -1798,6 +2016,54 @@ AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
])dnl
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).
+AC_DEFUN([CF_MKSTEMP],[
+AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[
+rm -f conftest*
+AC_TRY_RUN([
+#include <sys/types.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+int main()
+{
+ char *tmpl = "conftestXXXXXX";
+ char name[2][80];
+ int n;
+ int result = 0;
+ int fd;
+ struct stat sb;
+
+ umask(077);
+ for (n = 0; n < 2; ++n) {
+ strcpy(name[n], tmpl);
+ if ((fd = mkstemp(name[n])) >= 0) {
+ if (!strcmp(name[n], tmpl)
+ || stat(name[n], &sb) != 0
+ || (sb.st_mode & S_IFMT) != S_IFREG
+ || (sb.st_mode & 077) != 0) {
+ result = 1;
+ }
+ close(fd);
+ }
+ }
+ if (result == 0
+ && !strcmp(name[0], name[1]))
+ result = 1;
+ exit(result);
+}
+],[cf_cv_func_mkstemp=yes
+],[cf_cv_func_mkstemp=no
+],[AC_CHECK_FUNC(mkstemp)
+])
+])
+if test "$cf_cv_func_mkstemp" = yes ; then
+ AC_DEFINE(HAVE_MKSTEMP)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
dnl Compute the object-directory name from the given model name
AC_DEFUN([CF_OBJ_SUBDIR],
[
@@ -1806,7 +2072,13 @@ AC_DEFUN([CF_OBJ_SUBDIR],
normal) $2='objects' ;;
debug) $2='obj_g' ;;
profile) $2='obj_p' ;;
- shared) $2='obj_s' ;;
+ shared)
+ case $cf_cv_system_name in #(vi
+ cygwin) #(vi
+ $2='objects' ;;
+ *)
+ $2='obj_s' ;;
+ esac
esac
])dnl
dnl ---------------------------------------------------------------------------
@@ -1823,11 +2095,13 @@ ifelse($1,,,[$1=$PATHSEP])
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 workaround autoconf's
+dnl result begins with 'NONE'. This is necessary to work around autoconf's
dnl delayed evaluation of those symbols.
AC_DEFUN([CF_PATH_SYNTAX],[
case ".[$]$1" in #(vi
-./*) #(vi
+.\[$]\(*\)*|.\'*\'*) #(vi
+ ;;
+..|./*|.\\*) #(vi
;;
.[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX
;;
@@ -1843,7 +2117,7 @@ case ".[$]$1" in #(vi
$1=`echo [$]$1 | sed -e s@NONE@$ac_default_prefix@`
;;
*)
- AC_ERROR(expected a pathname, not "[$]$1")
+ ifelse($2,,[AC_ERROR([expected a pathname, not \"[$]$1\"])],$2)
;;
esac
])dnl
@@ -1867,6 +2141,7 @@ cygwin*)
;;
esac
AC_SUBST(PROG_EXT)
+test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT")
])dnl
dnl ---------------------------------------------------------------------------
dnl Force $INSTALL to be an absolute-path. Otherwise, edit_man.sh and the
@@ -1933,12 +2208,16 @@ dnl
dnl The variable 'cf_cv_shlib_version' controls whether we use the rel or abi
dnl version when making symbolic links.
dnl
+dnl The variable 'cf_cv_shlib_version_infix' controls whether shared library
+dnl version numbers are infix (ex: libncurses.<ver>.dylib) or postfix
+dnl (ex: libncurses.so.<ver>).
+dnl
dnl Some loaders leave 'so_locations' lying around. It's nice to clean up.
AC_DEFUN([CF_SHARED_OPTS],
[
AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
- LOCAL_LDFLAGS=
- LOCAL_LDFLAGS2=
+ LOCAL_LDFLAGS=
+ LOCAL_LDFLAGS2=
LD_SHARED_OPTS=
INSTALL_LIB="-m 644"
@@ -1979,10 +2258,25 @@ AC_DEFUN([CF_SHARED_OPTS],
CFLAGS="$cf_save_CFLAGS"
fi
+ cf_cv_shlib_version_infix=no
+
case $cf_cv_system_name in
beos*)
MK_SHARED_LIB='$(CC) -o $[@] -Xlinker -soname=`basename $[@]` -nostart -e 0'
;;
+ cygwin*)
+ CC_SHARED_OPTS=
+ MK_SHARED_LIB='$(CC) -shared -Wl,--out-implib=$(IMPORT_LIB) -Wl,--export-all-symbols -o $(SHARED_LIB)'
+ cf_cv_shlib_version=cygdll
+ cf_cv_shlib_version_infix=cygdll
+ ;;
+ darwin*)
+ EXTRA_CFLAGS="-no-cpp-precomp"
+ CC_SHARED_OPTS="-dynamic"
+ MK_SHARED_LIB='$(CC) -dynamiclib -install_name $(DESTDIR)$(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
+ ;;
hpux*)
# (tested with gcc 2.7.2 -- I don't have c89)
if test "$GCC" = yes; then
@@ -2010,8 +2304,8 @@ AC_DEFUN([CF_SHARED_OPTS],
;;
linux*|gnu*)
if test "$DFT_LWR_MODEL" = "shared" ; then
- LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib"
- LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
fi
if test "$cf_cv_ld_rpath" = yes ; then
cf_ld_rpath_opt="-Wl,-rpath,"
@@ -2033,8 +2327,8 @@ AC_DEFUN([CF_SHARED_OPTS],
CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
test "$cf_cv_ld_rpath" = yes && cf_ld_rpath_opt="-Wl,-rpath,"
if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
- LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib"
- LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
EXTRA_LDFLAGS="-Wl,-rpath,\$(libdir) $EXTRA_LDFLAGS"
MK_SHARED_LIB='$(CC) -shared -Wl,-soname,`basename $[@] .$(REL_VERSION)`.$(ABI_VERSION) -o $[@]'
if test "$cf_cv_shlib_version" = auto; then
@@ -2050,16 +2344,16 @@ AC_DEFUN([CF_SHARED_OPTS],
# tested with OSF/1 V3.2 and 'cc'
# tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
# link with shared libs).
- MK_SHARED_LIB='$(LD) -set_version $(REL_VERSION):$(ABI_VERSION) -expect_unresolved "*" -shared -soname `basename $[@]`'
+ MK_SHARED_LIB='$(LD) -set_version $(REL_VERSION):$(ABI_VERSION) -expect_unresolved "*" -shared -soname `basename $[@]`'
case $host_os in
osf4*)
- MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
+ MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
;;
esac
MK_SHARED_LIB="${MK_SHARED_LIB}"' -o $[@]'
if test "$DFT_LWR_MODEL" = "shared" ; then
- LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib"
- LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
fi
if test "$cf_cv_ld_rpath" = yes ; then
cf_ld_rpath_opt="-rpath"
@@ -2097,7 +2391,7 @@ AC_DEFUN([CF_SHARED_OPTS],
MK_SHARED_LIB='$(LD) -dy -G -h `basename $[@] .$(REL_VERSION)`.$(ABI_VERSION) -o $[@]'
if test "$DFT_LWR_MODEL" = "shared" ; then
LOCAL_LDFLAGS="-R `pwd`/lib:\$(libdir)"
- LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
fi
if test "$cf_cv_ld_rpath" = yes ; then
cf_ld_rpath_opt="-R"
@@ -2282,11 +2576,11 @@ do
fi
done
AC_MSG_RESULT($cf_cv_src_modules)
-TEST_ARGS="-L${LIB_DIR} -L\$(libdir) $TEST_ARGS"
+TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
AC_SUBST(TEST_DEPS)
AC_SUBST(TEST_ARGS)
-PROG_ARGS="-L${LIB_DIR} -L\$(libdir) $PROG_ARGS"
+PROG_ARGS="-L${LIB_DIR} $PROG_ARGS"
AC_SUBST(PROG_ARGS)
SRC_SUBDIRS="man include"
@@ -2294,7 +2588,8 @@ for cf_dir in $cf_cv_src_modules
do
SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
done
-SRC_SUBDIRS="$SRC_SUBDIRS misc test"
+SRC_SUBDIRS="$SRC_SUBDIRS test"
+test -z "$MAKE_TERMINFO" && SRC_SUBDIRS="$SRC_SUBDIRS misc"
test "$cf_with_cxx_binding" != no && SRC_SUBDIRS="$SRC_SUBDIRS c++"
ADA_SUBDIRS=
@@ -2434,7 +2729,8 @@ NCURSES_PATCH="`egrep '^NCURSES_PATCH[[ ]]*=' $srcdir/dist.mk | sed -e 's/^[[^0
cf_cv_abi_version=${NCURSES_MAJOR}
cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
dnl Show the computed version, for logging
-AC_MSG_RESULT(Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version (`date`))
+cf_cv_timestamp=`date`
+AC_MSG_RESULT(Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp))
dnl We need these values in the generated headers
AC_SUBST(NCURSES_MAJOR)
AC_SUBST(NCURSES_MINOR)
@@ -2444,6 +2740,7 @@ AC_SUBST(cf_cv_rel_version)
AC_SUBST(cf_cv_abi_version)
AC_SUBST(cf_cv_cc_bool_type)
AC_SUBST(cf_cv_builtin_bool)
+AC_SUBST(cf_cv_header_stdbool_h)
AC_SUBST(cf_cv_type_of_bool)dnl
])dnl
dnl ---------------------------------------------------------------------------
@@ -2571,57 +2868,9 @@ AC_DEFUN([CF_UPPER],
$1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
])dnl
dnl ---------------------------------------------------------------------------
-dnl Compute the shift-mask that we'll use for wide-character indices. We use
-dnl all but the index portion of chtype for storing attributes.
-AC_DEFUN([CF_WIDEC_SHIFT],
-[
-AC_REQUIRE([CF_TYPEOF_CHTYPE])
-AC_MSG_CHECKING([for number of bits in chtype])
-AC_CACHE_VAL(cf_cv_shift_limit,[
- AC_TRY_RUN([
-#include <stdio.h>
-int main()
-{
- FILE *fp = fopen("cf_test.out", "w");
- if (fp != 0) {
- int n;
- unsigned TYPEOF_CHTYPE x = 1L;
- for (n = 0; ; n++) {
- unsigned long y = (x >> n);
- if (y != 1 || x == 0)
- break;
- x <<= 1;
- }
- fprintf(fp, "%d", n);
- fclose(fp);
- }
- exit(0);
-}
- ],
- [cf_cv_shift_limit=`cat cf_test.out`],
- [cf_cv_shift_limit=32],
- [cf_cv_shift_limit=32])
- rm -f cf_test.out
- ])
-AC_MSG_RESULT($cf_cv_shift_limit)
-AC_SUBST(cf_cv_shift_limit)
-
-AC_MSG_CHECKING([for width of character-index])
-AC_CACHE_VAL(cf_cv_widec_shift,[
-if test ".$with_widec" = ".yes" ; then
- cf_attrs_width=39
- if ( expr $cf_cv_shift_limit \> $cf_attrs_width >/dev/null )
- then
- cf_cv_widec_shift=`expr 16 + $cf_cv_shift_limit - $cf_attrs_width`
- else
- cf_cv_widec_shift=16
- fi
-else
- cf_cv_widec_shift=8
-fi
-])
-AC_MSG_RESULT($cf_cv_widec_shift)
-AC_SUBST(cf_cv_widec_shift)
+dnl Use AC_VERBOSE w/o the warnings
+AC_DEFUN([CF_VERBOSE],
+[test -n "$verbose" && echo " $1" 1>&AC_FD_MSG
])dnl
dnl ---------------------------------------------------------------------------
dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
@@ -2648,13 +2897,14 @@ dnl $2 = help-text
dnl $3 = environment variable to set
dnl $4 = default value, shown in the help-message, must be a constant
dnl $5 = default value, if it's an expression & cannot be in the help-message
+dnl $6 = flag to tell if we want to define or substitute
dnl
AC_DEFUN([CF_WITH_PATHLIST],[
AC_REQUIRE([CF_PATHSEP])
AC_ARG_WITH($1,[$2 ](default: ifelse($4,,empty,$4)),,
-ifelse($4,,[withval="${$3}"],[withval="${$3-ifelse($5,,$4,$5)}"]))dnl
+ifelse($4,,[withval=${$3}],[withval=${$3-ifelse($5,,$4,$5)}]))dnl
-IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATHSEP}"
+IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATHSEP}"
cf_dst_path=
for cf_src_path in $withval
do
@@ -2664,6 +2914,18 @@ do
done
IFS="$ac_save_ifs"
-eval $3="$cf_dst_path"
+ifelse($6,define,[
+# Strip single quotes from the value, e.g., when it was supplied as a literal
+# for $4 or $5.
+case $cf_dst_path in #(vi
+\'*)
+ cf_dst_path=`echo $cf_dst_path |sed -e s/\'// -e s/\'\$//`
+ ;;
+esac
+cf_dst_path=`echo "$cf_dst_path" | sed -e 's/\\\\/\\\\\\\\/g'`
+])
+
+eval '$3="$cf_dst_path"'
AC_SUBST($3)dnl
+
])dnl
diff --git a/contrib/ncurses/c++/Makefile.in b/contrib/ncurses/c++/Makefile.in
index 96f338fbb152..9555320e4c6b 100644
--- a/contrib/ncurses/c++/Makefile.in
+++ b/contrib/ncurses/c++/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.58 2001/04/21 21:31:08 tom Exp $
+# $Id: Makefile.in,v 1.64 2002/01/19 20:25:31 NIIBE.Yutaka Exp $
##############################################################################
-# Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc. #
+# Copyright (c) 1998,1999,2000,2001,2002 Free Software Foundation, Inc. #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
# copy of this software and associated documentation files (the "Software"), #
@@ -55,6 +55,9 @@ INSTALL_DATA = @INSTALL_DATA@
AR = @AR@
AR_OPTS = @AR_OPTS@
+
+CXX_AR = @CXX_AR@
+CXX_AR_OPTS = @CXX_AR_OPTS@
RANLIB = @RANLIB@
CXX = @CXX@
@@ -88,9 +91,9 @@ LIBNAME_LIBTOOL = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.la
LIBNAME_NORMAL = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.a
LIBNAME = @LIB_PREFIX@$(LIBROOT)@CXX_LIB_SUFFIX@
-LINK_FLAGS = @EXTRA_LDFLAGS@ -L../lib -L$(libdir) -l$(LIBROOT)@LIB_SUFFIX@
+LINK_FLAGS = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)@LIB_SUFFIX@
-LINK_LIBTOOL = @EXTRA_LDFLAGS@ -L../lib -L$(libdir) ../lib/$(LIBNAME)
+LINK_LIBTOOL = @EXTRA_LDFLAGS@ -L../lib ../lib/$(LIBNAME)
LINK_NORMAL = $(LINK_FLAGS)
LINK_DEBUG = $(LINK_FLAGS)
LINK_PROFILE = $(LINK_FLAGS)
@@ -117,6 +120,8 @@ all :: demo$x
sources : $(AUTO_SRC)
+depend :
+
# Build a conventional library for installing, since a shared library would
# pull in all of the ncurses libraries (panel, menu, form, ncurses) as direct
# dependencies.
@@ -131,7 +136,7 @@ LIB_OBJS = \
$(MODEL)/cursesmain.o
../lib/$(LIBNAME_NORMAL) : $(LIB_OBJS)
- $(AR) $(AR_OPTS) $@ $?
+ $(CXX_AR) $(CXX_AR_OPTS) $@ $?
$(RANLIB) $@
../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
@@ -154,7 +159,7 @@ etip.h: $(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh
sh $(srcdir)/edit_cfg.sh ../include/ncurses_cfg.h $@
$(DESTDIR)$(libdir) :
- $(srcdir)/../mkinstalldirs $@
+ sh $(srcdir)/../mkinstalldirs $@
install \
install.libs:: ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
@@ -165,9 +170,10 @@ uninstall.libs::
-$(LIBTOOL) rm -f $(DESTDIR)$(libdir)/$(LIBNAME)
mostlyclean ::
- -rm -f core tags TAGS *~ *.i *.ii *.ln *.atac trace
+ -rm -f core tags TAGS *~ *.bak *.i *.ii *.ln *.atac trace
clean :: mostlyclean
+ -rm -rf $(MODEL)/SunWS_cache
-$(LIBTOOL) rm -f demo$x $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(LIB_OBJS:.o=.lo) $(OBJS_DEMO)
-rm -rf .libs
diff --git a/contrib/ncurses/c++/cursesf.cc b/contrib/ncurses/c++/cursesf.cc
index 35e01ee9ea6c..f25d2d5ac6c9 100644
--- a/contrib/ncurses/c++/cursesf.cc
+++ b/contrib/ncurses/c++/cursesf.cc
@@ -35,7 +35,7 @@
#include "cursesf.h"
#include "cursesapp.h"
-MODULE_ID("$Id: cursesf.cc,v 1.13 2001/03/24 20:03:51 tom Exp $")
+MODULE_ID("$Id: cursesf.cc,v 1.14 2001/07/14 20:54:43 juergen Exp $")
NCursesFormField::~NCursesFormField () {
if (field)
@@ -267,7 +267,7 @@ NCursesForm::operator()(void) {
show();
refresh();
- while (((drvCmnd = virtualize((c=getch()))) != CMD_QUIT)) {
+ while (((drvCmnd = virtualize((c=getKey()))) != CMD_QUIT)) {
switch((err=driver(drvCmnd))) {
case E_REQUEST_DENIED:
On_Request_Denied(c);
diff --git a/contrib/ncurses/c++/cursesf.h b/contrib/ncurses/c++/cursesf.h
index 3dc2e9557c0f..e3655f202b55 100644
--- a/contrib/ncurses/c++/cursesf.h
+++ b/contrib/ncurses/c++/cursesf.h
@@ -31,7 +31,7 @@
* Author: Juergen Pfeifer <juergen.pfeifer@gmx.net> 1997 *
****************************************************************************/
-// $Id: cursesf.h,v 1.15 2001/03/24 21:41:23 tom Exp $
+// $Id: cursesf.h,v 1.16 2001/07/15 00:02:53 tom Exp $
#ifndef NCURSES_CURSESF_H_incl
#define NCURSES_CURSESF_H_incl 1
@@ -265,7 +265,7 @@ public:
OnError(::set_field_buffer(field,buffer,val));
}
- // Retrieve the value of a fields buffer. The defaukt buffer is nr. 0
+ // Retrieve the value of a fields buffer. The default buffer is nr. 0
inline char* value(int buffer = 0) const {
return ::field_buffer(field,buffer);
}
diff --git a/contrib/ncurses/c++/cursesm.cc b/contrib/ncurses/c++/cursesm.cc
index 410cdbc892db..d9b0a63d810b 100644
--- a/contrib/ncurses/c++/cursesm.cc
+++ b/contrib/ncurses/c++/cursesm.cc
@@ -35,7 +35,7 @@
#include "cursesm.h"
#include "cursesapp.h"
-MODULE_ID("$Id: cursesm.cc,v 1.15 2001/03/24 20:03:56 tom Exp $")
+MODULE_ID("$Id: cursesm.cc,v 1.16 2001/07/14 20:54:43 juergen Exp $")
NCursesMenuItem::~NCursesMenuItem() {
if (item)
@@ -290,9 +290,9 @@ NCursesMenu::operator()(void) {
post();
show();
refresh();
-
- while (!b_action && ((drvCmnd = virtualize((c=getch()))) != CMD_QUIT)) {
-
+
+ while (!b_action && ((drvCmnd = virtualize((c=getKey()))) != CMD_QUIT)) {
+
switch((err=driver(drvCmnd))) {
case E_REQUEST_DENIED:
On_Request_Denied(c);
diff --git a/contrib/ncurses/c++/cursesmain.cc b/contrib/ncurses/c++/cursesmain.cc
index 03f61bc3da68..6b34b52044ab 100644
--- a/contrib/ncurses/c++/cursesmain.cc
+++ b/contrib/ncurses/c++/cursesmain.cc
@@ -34,7 +34,7 @@
#include "internal.h"
#include "cursesapp.h"
-MODULE_ID("$Id: cursesmain.cc,v 1.7 2001/03/24 21:25:47 tom Exp $")
+MODULE_ID("$Id: cursesmain.cc,v 1.8 2001/07/14 20:54:43 juergen Exp $")
/* This is the default implementation of main() for a NCursesApplication.
* You only have to instantiate a static NCursesApplication object in your
@@ -45,7 +45,13 @@ int main(int argc, char* argv[])
NCursesApplication* A = NCursesApplication::getApplication();
if (!A)
return(1);
- A->handleArgs(argc,argv);
- ::endwin();
- return((*A)());
+ else {
+ int res;
+
+ A->handleArgs(argc,argv);
+ ::endwin();
+ res = (*A)();
+ ::endwin();
+ return(res);
+ }
}
diff --git a/contrib/ncurses/c++/cursesp.cc b/contrib/ncurses/c++/cursesp.cc
index bfd4d9f4dda3..7fb5e51778ef 100644
--- a/contrib/ncurses/c++/cursesp.cc
+++ b/contrib/ncurses/c++/cursesp.cc
@@ -35,7 +35,7 @@
#include "cursesp.h"
#include <string.h>
-MODULE_ID("$Id: cursesp.cc,v 1.18 2001/03/24 20:04:04 tom Exp $")
+MODULE_ID("$Id: cursesp.cc,v 1.19 2001/07/14 20:54:43 juergen Exp $")
NCursesPanel* NCursesPanel::dummy = (NCursesPanel*)0;
@@ -122,3 +122,8 @@ NCursesPanel::centertext(int row,const char *label) {
OnError(addstr(row, x, label, width()));
}
}
+
+int
+NCursesPanel::getKey(void) {
+ return getch();
+}
diff --git a/contrib/ncurses/c++/cursesp.h b/contrib/ncurses/c++/cursesp.h
index b56580a6376f..1a656f5464ad 100644
--- a/contrib/ncurses/c++/cursesp.h
+++ b/contrib/ncurses/c++/cursesp.h
@@ -1,6 +1,6 @@
// * This makes emacs happy -*-Mode: C++;-*-
/****************************************************************************
- * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@@ -34,7 +34,7 @@
#ifndef NCURSES_CURSESP_H_incl
#define NCURSES_CURSESP_H_incl 1
-// $Id: cursesp.h,v 1.14 2001/03/24 21:41:35 tom Exp $
+// $Id: cursesp.h,v 1.15 2001/07/14 20:56:18 juergen Exp $
#include <cursesw.h>
@@ -79,6 +79,9 @@ protected:
// If err is equal to the curses error indicator ERR, an error handler
// is called.
+ // Get a keystroke. Default implementation calls getch()
+ virtual int getKey(void);
+
public:
NCursesPanel(int lines,
int cols,
diff --git a/contrib/ncurses/c++/cursesw.cc b/contrib/ncurses/c++/cursesw.cc
index 463554b404e6..fb6bd8b1fed8 100644
--- a/contrib/ncurses/c++/cursesw.cc
+++ b/contrib/ncurses/c++/cursesw.cc
@@ -25,7 +25,7 @@
#include "internal.h"
#include "cursesw.h"
-MODULE_ID("$Id: cursesw.cc,v 1.21 2001/04/07 22:11:39 tom Exp $")
+MODULE_ID("$Id: cursesw.cc,v 1.24 2001/12/08 21:02:33 tom Exp $")
#define COLORS_NEED_INITIALIZATION -1
#define COLORS_NOT_INITIALIZED 0
@@ -36,6 +36,14 @@ MODULE_ID("$Id: cursesw.cc,v 1.21 2001/04/07 22:11:39 tom Exp $")
long NCursesWindow::count = 0L;
bool NCursesWindow::b_initialized = FALSE;
+/*
+ * The ncurses library has a fallback for vsscanf(), which may work...
+ */
+#if !(USE_STRSTREAM_VSCAN || USE_STRSTREAM_VSCAN_CAST)
+# undef USE_STDIO_VSCAN
+# define USE_STDIO_VSCAN 1
+#endif
+
#if defined(__GNUG__)
# ifndef _IO_va_list
# define _IO_va_list char *
@@ -46,23 +54,25 @@ int
NCursesWindow::scanw(const char* fmt, ...)
{
int result = ERR;
-#if defined(__GNUG__)
char buf[BUFSIZ];
if (::wgetnstr(w, buf, sizeof(buf)) != ERR) {
va_list args;
va_start(args, fmt);
#if USE_STDIO_VSCAN
- if (::vscanf(fmt, args) != -1)
+ if (::vsscanf(buf, fmt, args) != -1)
+ result = OK;
+#elif USE_STRSTREAM_VSCAN /* powerpc, os390 */
+ strstreambuf ss(buf, sizeof(buf));
+ if (ss.vscan(fmt, args) != -1)
result = OK;
-#elif USE_STRSTREAM_VSCAN /* pre-gcc 3.0 */
+#elif USE_STRSTREAM_VSCAN_CAST /* pre-gcc 3.0 */
strstreambuf ss(buf, sizeof(buf));
if (ss.vscan(fmt, (_IO_va_list)args) != -1)
result = OK;
#endif
va_end(args);
}
-#endif
return result;
}
@@ -71,7 +81,6 @@ int
NCursesWindow::scanw(int y, int x, const char* fmt, ...)
{
int result = ERR;
-#if defined(__GNUG__)
char buf[BUFSIZ];
if (::wmove(w, y, x) != ERR) {
@@ -79,9 +88,13 @@ NCursesWindow::scanw(int y, int x, const char* fmt, ...)
va_list args;
va_start(args, fmt);
#if USE_STDIO_VSCAN
- if (::vscanf(fmt, args) != -1)
+ if (::vsscanf(buf, fmt, args) != -1)
result = OK;
-#elif USE_STRSTREAM_VSCAN /* pre-gcc 3.0 */
+#elif USE_STRSTREAM_VSCAN /* powerpc, os390 */
+ strstreambuf ss(buf, sizeof(buf));
+ if (ss.vscan(fmt, args) != -1)
+ result = OK;
+#elif USE_STRSTREAM_VSCAN_CAST /* pre-gcc 3.0 */
strstreambuf ss(buf, sizeof(buf));
if (ss.vscan(fmt, (_IO_va_list)args) != -1)
result = OK;
@@ -89,7 +102,6 @@ NCursesWindow::scanw(int y, int x, const char* fmt, ...)
va_end(args);
}
}
-#endif
return result;
}
diff --git a/contrib/ncurses/c++/cursesw.h b/contrib/ncurses/c++/cursesw.h
index dcaadd9b3098..5383399de4fe 100644
--- a/contrib/ncurses/c++/cursesw.h
+++ b/contrib/ncurses/c++/cursesw.h
@@ -30,13 +30,13 @@
#ifndef NCURSES_CURSESW_H_incl
#define NCURSES_CURSESW_H_incl 1
-// $Id: cursesw.h,v 1.25 2001/04/07 22:44:07 tom Exp $
+// $Id: cursesw.h,v 1.28 2001/07/15 01:17:56 tom Exp $
#include <etip.h>
#include <stdio.h>
#include <stdarg.h>
-#if HAVE_STRSTREAM_H && USE_STRSTREAM_VSCAN
+#if HAVE_STRSTREAM_H && (USE_STRSTREAM_VSCAN||USE_STRSTREAM_VSCAN_CAST)
#include <strstream.h>
#endif
@@ -752,7 +752,7 @@ public:
int cols, // number of columns
int begin_y, // absolute or relative
int begin_x, // origins:
- char absrel = 'a');// if `a', by & bx are
+ char absrel = 'a');// if `a', begin_y & begin_x are
// absolute screen pos, else if `r', they are relative to par origin
NCursesWindow(NCursesWindow& par,// parent window
@@ -778,7 +778,7 @@ public:
// lowlevel ripoffline() function because it uses the internal
// implementation that allows to remove more than just a single line.
// This function must be called before any other ncurses function. The
- // creation of the window is defered until ncurses gets initialized.
+ // creation of the window is deferred until ncurses gets initialized.
// The initialization function is then called.
// -------------------------------------------------------------------------
@@ -796,7 +796,7 @@ public:
static int NumberOfColors();
// Number of available colors
- int colors() const { return NumberOfColors(); }
+ int colors() const { return NumberOfColors(); }
// Number of available colors
// -------------------------------------------------------------------------
@@ -820,25 +820,25 @@ public:
int maxy() const { return w->_maxy; }
// Largest y coord in window
- short getcolor() const;
+ short getcolor() const;
// Actual color pair
- short foreground() const { return getcolor(0); }
+ short foreground() const { return getcolor(0); }
// Actual foreground color
- short background() const { return getcolor(1); }
+ short background() const { return getcolor(1); }
// Actual background color
- int setpalette(short fore, short back);
+ int setpalette(short fore, short back);
// Set color palette entry
- int setcolor(short pair);
+ int setcolor(short pair);
// Set actually used palette entry
// -------------------------------------------------------------------------
// window positioning
// -------------------------------------------------------------------------
- virtual int mvwin(int begin_y, int begin_x) {
+ virtual int mvwin(int begin_y, int begin_x) {
return ::mvwin(w,begin_y,begin_x); }
// Move window to new position with the new position as top left corner.
// This is virtual because it is redefined in NCursesPanel.
@@ -887,8 +887,7 @@ public:
// as described above.
int scanw(const char* fmt, ...)
- // Perform a scanw function from the window. This only works if you're
- // using the GNU C++ compiler.
+ // Perform a scanw function from the window.
#if __GNUG__ >= 2
__attribute__ ((format (scanf, 2, 3)));
#else
@@ -897,7 +896,7 @@ public:
int scanw(int y, int x, const char* fmt, ...)
// Move the cursor to the requested position and then perform a scanw
- // from the window. This nly works if you're using the GNU C++ compiler.
+ // from the window.
#if __GNUG__ >= 2
__attribute__ ((format (scanf, 4, 5)));
#else
@@ -930,7 +929,7 @@ public:
int printw(const char* fmt, ...)
// Do a formatted print to the window.
-#if __GNUG__ >= 2
+#if (__GNUG__ >= 2) && !defined(printf)
__attribute__ ((format (printf, 2, 3)));
#else
;
@@ -938,7 +937,7 @@ public:
int printw(int y, int x, const char * fmt, ...)
// Move the cursor and then do a formatted print to the window.
-#if __GNUG__ >= 2
+#if (__GNUG__ >= 2) && !defined(printf)
__attribute__ ((format (printf, 4, 5)));
#else
;
@@ -1021,7 +1020,7 @@ public:
int box(chtype vert=0, chtype hor=0) {
return ::wborder(w, vert, vert, hor, hor, 0, 0 ,0, 0); }
// Draw a box around the window with the given vertical and horizontal
- // drawing characters. If you specifiy a zero as character, curses will try
+ // drawing characters. If you specify a zero as character, curses will try
// to find a "nice" character.
int border(chtype left=0, chtype right=0,
diff --git a/contrib/ncurses/c++/demo.cc b/contrib/ncurses/c++/demo.cc
index 8db700019b56..56573cdd0d7d 100644
--- a/contrib/ncurses/c++/demo.cc
+++ b/contrib/ncurses/c++/demo.cc
@@ -6,7 +6,7 @@
* Demo code for NCursesMenu and NCursesForm written by
* Juergen Pfeifer <juergen.pfeifer@gmx.net>
*
- * $Id: demo.cc,v 1.20 2001/01/28 02:26:27 tom Exp $
+ * $Id: demo.cc,v 1.21 2001/07/15 01:15:26 tom Exp $
*/
#include "cursesapp.h"
@@ -19,7 +19,7 @@
extern "C" unsigned int sleep(unsigned int);
-#undef index // needed for NeXT
+#undef index // needed for NeXT
//
// -------------------------------------------------------------------------
@@ -140,7 +140,7 @@ template<class T> class MyAction : public NCursesUserItem<T>
{
public:
MyAction (const char* p_name,
- const T* p_UserData)
+ const T* p_UserData)
: NCursesUserItem<T>(p_name, (const char*)0, p_UserData)
{};
@@ -170,7 +170,7 @@ class Label : public NCursesFormField
{
public:
Label(const char* title,
- int row, int col)
+ int row, int col)
: NCursesFormField(1,(int)::strlen(title),row,col) {
set_value(title);
options_off(O_EDIT|O_ACTIVE);
@@ -293,18 +293,18 @@ public:
for (int i=0; i < PADSIZE; i++) {
for (int j=0; j < PADSIZE; j++) {
- if (i % GRIDSIZE == 0 && j % GRIDSIZE == 0) {
- if (i==0 || j==0)
- FP.addch('+');
- else
- FP.addch((chtype)('A' + (gridcount++ % 26)));
- }
- else if (i % GRIDSIZE == 0)
- FP.addch('-');
- else if (j % GRIDSIZE == 0)
- FP.addch('|');
- else
- FP.addch(' ');
+ if (i % GRIDSIZE == 0 && j % GRIDSIZE == 0) {
+ if (i==0 || j==0)
+ FP.addch('+');
+ else
+ FP.addch((chtype)('A' + (gridcount++ % 26)));
+ }
+ else if (i % GRIDSIZE == 0)
+ FP.addch('-');
+ else if (j % GRIDSIZE == 0)
+ FP.addch('|');
+ else
+ FP.addch(' ');
}
}
@@ -324,6 +324,49 @@ public:
options_off(O_SELECTABLE);
}
};
+
+//
+// -------------------------------------------------------------------------
+//
+class ScanAction : public NCursesMenuItem
+{
+public:
+ ScanAction(const char* s) : NCursesMenuItem(s) {
+ }
+
+ bool action() {
+ NCursesPanel *std = new NCursesPanel();
+
+ NCursesPanel *w = new NCursesPanel(std->lines() - 2, std->cols() - 2, 1, 1);
+ w->box();
+ w->refresh();
+
+ NCursesPanel *s = new NCursesPanel(w->lines() - 6, w->cols() - 6, 3, 3);
+ s->scrollok(TRUE);
+ ::echo();
+
+ s->printw("Enter decimal integers. The running total will be shown\n");
+ int value = -1;
+ int result = 0;
+ while (value != 0) {
+ value = 0;
+ s->scanw("%d", &value);
+ if (value != 0) {
+ s->printw("%d: ", result += value);
+ }
+ s->refresh();
+ }
+ s->printw("\nPress any key to continue...");
+ s->getch();
+
+ delete s;
+ delete w;
+ delete std;
+ ::noecho();
+ return FALSE;
+ }
+};
+
//
// -------------------------------------------------------------------------
//
@@ -346,7 +389,7 @@ public:
I[2] = new MyAction<UserData> ("Silly", u);
I[3] = new FormAction("Form");
I[4] = new PadAction("Pad");
- I[5] = new PassiveItem("Six");
+ I[5] = new ScanAction("Scan");
I[6] = new QuitItem();
I[7] = new NCursesMenuItem(); // Terminating empty item
diff --git a/contrib/ncurses/c++/edit_cfg.sh b/contrib/ncurses/c++/edit_cfg.sh
index e2f828a86134..e0c182257d54 100755
--- a/contrib/ncurses/c++/edit_cfg.sh
+++ b/contrib/ncurses/c++/edit_cfg.sh
@@ -1,7 +1,7 @@
#!/bin/sh
-# $Id: edit_cfg.sh,v 1.10 2001/04/07 22:45:11 tom Exp $
+# $Id: edit_cfg.sh,v 1.12 2001/12/08 20:44:59 tom Exp $
##############################################################################
-# Copyright (c) 1998,2000 Free Software Foundation, Inc. #
+# Copyright (c) 1998,2000,2001 Free Software Foundation, Inc. #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
# copy of this software and associated documentation files (the "Software"), #
@@ -47,8 +47,8 @@ for name in \
HAVE_STRSTREAM_H \
HAVE_TYPEINFO \
HAVE_VALUES_H \
- USE_STDIO_VSCAN \
- USE_STRSTREAM_VSCAN
+ USE_STRSTREAM_VSCAN \
+ USE_STRSTREAM_VSCAN_CAST
do
mv $2 $2.bak
if ( grep "[ ]$name[ ]1" $1 2>&1 >/dev/null)
diff --git a/contrib/ncurses/c++/etip.h.in b/contrib/ncurses/c++/etip.h.in
index d3421d2c5f06..85e4df211c0f 100644
--- a/contrib/ncurses/c++/etip.h.in
+++ b/contrib/ncurses/c++/etip.h.in
@@ -1,6 +1,6 @@
// * This makes emacs happy -*-Mode: C++;-*-
/****************************************************************************
- * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@@ -31,7 +31,7 @@
* Author: Juergen Pfeifer <juergen.pfeifer@gmx.net> 1997 *
****************************************************************************/
-// $Id: etip.h.in,v 1.18 2001/04/07 22:45:04 tom Exp $
+// $Id: etip.h.in,v 1.22 2001/12/08 21:26:49 tom Exp $
#ifndef NCURSES_ETIP_H_incl
#define NCURSES_ETIP_H_incl 1
@@ -73,14 +73,14 @@
#define CPP_HAS_PARAM_INIT 0
#endif
-#ifndef USE_STDIO_VSCAN
-#define USE_STDIO_VSCAN 0
-#endif
-
#ifndef USE_STRSTREAM_VSCAN
#define USE_STRSTREAM_VSCAN 0
#endif
+#ifndef USE_STRSTREAM_VSCAN_CAST
+#define USE_STRSTREAM_VSCAN_CAST 0
+#endif
+
#ifdef __GNUG__
# if ((__GNUG__ <= 2) && (__GNUC_MINOR__ < 8))
# if HAVE_TYPEINFO
@@ -274,8 +274,12 @@ inline void THROW(const NCursesException *e) {
throw *e;
#endif
#elif defined(__SUNPRO_CC)
+# if !defined(__SUNPRO_CC_COMPAT) || (__SUNPRO_CC_COMPAT < 5)
genericerror(1, ((e != 0) ? (char *)(e->message) : ""));
#else
+ throw *e;
+#endif
+#else
if (e)
cerr << e->message << endl;
exit(0);
diff --git a/contrib/ncurses/config.guess b/contrib/ncurses/config.guess
index 71de137a6b6c..ff40ddb03874 100755
--- a/contrib/ncurses/config.guess
+++ b/contrib/ncurses/config.guess
@@ -1,9 +1,9 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002 Free Software Foundation, Inc.
-timestamp='2001-03-16'
+timestamp='2002-03-20'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -24,8 +24,9 @@ timestamp='2001-03-16'
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>. Submit a context
+# diff and a properly formatted ChangeLog entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
@@ -52,7 +53,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -95,25 +96,25 @@ trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
# use `HOST_CC' if defined, but it is deprecated.
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int dummy(){}" > $dummy.c
- for c in cc gcc c89 ; do
- ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
+set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,) echo "int dummy(){}" > $dummy.c ;
+ for c in cc gcc c89 c99 ; do
+ ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
if test $? = 0 ; then
- CC_FOR_BUILD="$c"; break
- fi
- done
- rm -f $dummy.c $dummy.o $dummy.rel
+ CC_FOR_BUILD="$c"; break ;
+ fi ;
+ done ;
+ rm -f $dummy.c $dummy.o $dummy.rel ;
if test x"$CC_FOR_BUILD" = x ; then
- CC_FOR_BUILD=no_compiler_found
+ CC_FOR_BUILD=no_compiler_found ;
fi
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac
+esac'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
+# (ghazi@noc.rutgers.edu 1994-08-24)
if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
PATH=$PATH:/.attbin ; export PATH
fi
@@ -127,29 +128,30 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
- # Netbsd (nbsd) targets should (where applicable) match one or
+ # NetBSD (nbsd) targets should (where applicable) match one or
# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward
# compatibility and a consistent mechanism for selecting the
# object file format.
- # Determine the machine/vendor (is the vendor relevant).
- case "${UNAME_MACHINE}" in
- amiga) machine=m68k-unknown ;;
- arm32) machine=arm-unknown ;;
- atari*) machine=m68k-atari ;;
- sun3*) machine=m68k-sun ;;
- mac68k) machine=m68k-apple ;;
- macppc) machine=powerpc-apple ;;
- hp3[0-9][05]) machine=m68k-hp ;;
- ibmrt|romp-ibm) machine=romp-ibm ;;
- *) machine=${UNAME_MACHINE}-unknown ;;
+ #
+ # Note: NetBSD doesn't particularly care about the vendor
+ # portion of the name. We always set it to "unknown".
+ sysctl="sysctl -n hw.machine_arch"
+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+ case "${UNAME_MACHINE_ARCH}" in
+ arm*) machine=arm-unknown ;;
+ sh3el) machine=shl-unknown ;;
+ sh3eb) machine=sh-unknown ;;
+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently, or will in the future.
- case "${UNAME_MACHINE}" in
- i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+ case "${UNAME_MACHINE_ARCH}" in
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep __ELF__ >/dev/null
then
@@ -171,6 +173,45 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
exit 0 ;;
+ amiga:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ arc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ hp300:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mac68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ macppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvmeppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ pmax:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sgi:OpenBSD:*:*)
+ echo mipseb-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sun3:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ wgrisc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
alpha:OSF1:*:*)
if test $UNAME_RELEASE = "V4.0"; then
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -204,6 +245,7 @@ main:
jsr \$26,exit
.end main
EOF
+ eval $set_cc_for_build
$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
if test "$?" = 0 ; then
case `./$dummy` in
@@ -225,6 +267,9 @@ EOF
2-307)
UNAME_MACHINE="alphaev67"
;;
+ 2-1307)
+ UNAME_MACHINE="alphaev68"
+ ;;
esac
fi
rm -f $dummy.s $dummy
@@ -242,29 +287,11 @@ EOF
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
exit 0;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
exit 0 ;;
- arc64:OpenBSD:*:*)
- echo mips64el-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- hkmips:OpenBSD:*:*)
- echo mips-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- pmax:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sgi:OpenBSD:*:*)
- echo mips-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- wgrisc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ *:[Mm]orph[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-morphos
exit 0 ;;
*:OS/390:*:*)
echo i370-ibm-openedition
@@ -314,7 +341,7 @@ EOF
echo m68k-sun-sunos${UNAME_RELEASE}
exit 0 ;;
sun*:*:4.2BSD:*)
- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
@@ -328,9 +355,6 @@ EOF
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
exit 0 ;;
- atari*:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
@@ -357,18 +381,6 @@ EOF
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
exit 0 ;;
- sun3*:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mac68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
exit 0 ;;
@@ -385,6 +397,7 @@ EOF
echo clipper-intergraph-clix${UNAME_RELEASE}
exit 0 ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
+ eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#ifdef __cplusplus
#include <stdio.h> /* for printf() prototype */
@@ -412,6 +425,9 @@ EOF
rm -f $dummy.c $dummy
echo mips-mips-riscos${UNAME_RELEASE}
exit 0 ;;
+ Motorola:PowerMAX_OS:*:*)
+ echo powerpc-motorola-powermax
+ exit 0 ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
exit 0 ;;
@@ -459,7 +475,7 @@ EOF
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
- i?86:AIX:*:*)
+ i*86:AIX:*:*)
echo i386-ibm-aix
exit 0 ;;
ia64:AIX:*:*)
@@ -472,6 +488,7 @@ EOF
exit 0 ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#include <sys/systemcfg.h>
@@ -493,7 +510,7 @@ EOF
fi
exit 0 ;;
*:AIX:*:[45])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
@@ -533,10 +550,8 @@ EOF
9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
- case "${HPUX_REV}" in
- 11.[0-9][0-9])
- if [ -x /usr/bin/getconf ]; then
- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+ if [ -x /usr/bin/getconf ]; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "${sc_cpu_version}" in
523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
@@ -545,12 +560,13 @@ EOF
case "${sc_kernel_bits}" in
32) HP_ARCH="hppa2.0n" ;;
64) HP_ARCH="hppa2.0w" ;;
+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
esac ;;
esac
- fi ;;
- esac
- if [ "${HP_ARCH}" = "" ]; then
- sed 's/^ //' << EOF >$dummy.c
+ fi
+ if [ "${HP_ARCH}" = "" ]; then
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
#define _HPUX_SOURCE
#include <stdlib.h>
@@ -583,10 +599,10 @@ EOF
exit (0);
}
EOF
- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
- rm -f $dummy.c $dummy
- fi ;;
+ (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
+ if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+ rm -f $dummy.c $dummy
+ fi ;;
esac
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
exit 0 ;;
@@ -595,6 +611,7 @@ EOF
echo ia64-hp-hpux${HPUX_REV}
exit 0 ;;
3050*:HI-UX:*:*)
+ eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#include <unistd.h>
int
@@ -630,7 +647,7 @@ EOF
9000/8??:4.3bsd:*:*)
echo hppa1.0-hp-bsd
exit 0 ;;
- *9??*:MPE/iX:*:*)
+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
exit 0 ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@@ -639,7 +656,7 @@ EOF
hp8??:OSF1:*:*)
echo hppa1.0-hp-osf
exit 0 ;;
- i?86:OSF1:*:*)
+ i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
echo ${UNAME_MACHINE}-unknown-osf1mk
else
@@ -649,9 +666,6 @@ EOF
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
exit 0 ;;
- hppa*:OpenBSD:*:*)
- echo hppa-unknown-openbsd
- exit 0 ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
exit 0 ;;
@@ -670,16 +684,14 @@ EOF
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
exit 0 ;;
- CRAY*X-MP:*:*:*)
- echo xmp-cray-unicos
- exit 0 ;;
CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE}
+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
CRAY*[A-Z]90:*:*:*)
echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ -e 's/\.[^.]*$/.X/'
exit 0 ;;
CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
@@ -693,19 +705,13 @@ EOF
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
- CRAY-2:*:*:*)
- echo cray2-cray-unicos
- exit 0 ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit 0 ;;
sparc*:BSD/OS:*:*)
@@ -717,9 +723,6 @@ EOF
*:FreeBSD:*:*)
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit 0 ;;
- *:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- exit 0 ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit 0 ;;
@@ -729,6 +732,9 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit 0 ;;
+ x86:Interix*:3*)
+ echo i386-pc-interix3
+ exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -754,103 +760,49 @@ EOF
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
mips:Linux:*:*)
- cat >$dummy.c <<EOF
-#ifdef __cplusplus
-#include <stdio.h> /* for printf() prototype */
-int main (int argc, char *argv[]) {
-#else
-int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __MIPSEB__
- printf ("%s-unknown-linux-gnu\n", argv[1]);
-#endif
-#ifdef __MIPSEL__
- printf ("%sel-unknown-linux-gnu\n", argv[1]);
-#endif
- return 0;
-}
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips
+ #undef mipsel
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mipsel
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips
+ #else
+ CPU=
+ #endif
+ #endif
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ rm -f $dummy.c
+ test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
;;
ppc:Linux:*:*)
- # Determine Lib Version
- cat >$dummy.c <<EOF
-#include <features.h>
-#if defined(__GLIBC__)
-extern char __libc_version[];
-extern char __libc_release[];
-#endif
-main(argc, argv)
- int argc;
- char *argv[];
-{
-#if defined(__GLIBC__)
- printf("%s %s\n", __libc_version, __libc_release);
-#else
- printf("unknown\n");
-#endif
- return 0;
-}
-EOF
- LIBC=""
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
- if test "$?" = 0 ; then
- ./$dummy | grep 1\.99 > /dev/null
- if test "$?" = 0 ; then LIBC="libc1" ; fi
- fi
- rm -f $dummy.c $dummy
- echo powerpc-unknown-linux-gnu${LIBC}
+ echo powerpc-unknown-linux-gnu
+ exit 0 ;;
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
exit 0 ;;
alpha:Linux:*:*)
- cat <<EOF >$dummy.s
- .data
- \$Lformat:
- .byte 37,100,45,37,120,10,0 # "%d-%x\n"
- .text
- .globl main
- .align 4
- .ent main
- main:
- .frame \$30,16,\$26,0
- ldgp \$29,0(\$27)
- .prologue 1
- .long 0x47e03d80 # implver \$0
- lda \$2,-1
- .long 0x47e20c21 # amask \$2,\$1
- lda \$16,\$Lformat
- mov \$0,\$17
- not \$1,\$18
- jsr \$26,printf
- ldgp \$29,0(\$26)
- mov 0,\$16
- jsr \$26,exit
- .end main
-EOF
- LIBC=""
- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
- if test "$?" = 0 ; then
- case `./$dummy` in
- 0-0) UNAME_MACHINE="alpha" ;;
- 1-0) UNAME_MACHINE="alphaev5" ;;
- 1-1) UNAME_MACHINE="alphaev56" ;;
- 1-101) UNAME_MACHINE="alphapca56" ;;
- 2-303) UNAME_MACHINE="alphaev6" ;;
- 2-307) UNAME_MACHINE="alphaev67" ;;
- esac
- objdump --private-headers $dummy | \
- grep ld.so.1 > /dev/null
- if test "$?" = 0 ; then
- LIBC="libc1"
- fi
- fi
- rm -f $dummy.s $dummy
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit 0 ;;
parisc:Linux:*:* | hppa:Linux:*:*)
@@ -876,78 +828,67 @@ EOF
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit 0 ;;
- i?86:Linux:*:*)
+ i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
# problems with other programs or directories called `ld' in the path.
- ld_supported_emulations=`cd /; ld --help 2>&1 \
- | sed -ne '/supported emulations:/!d
+ # Set LC_ALL=C to ensure ld outputs messages in English.
+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+ | sed -ne '/supported targets:/!d
s/[ ][ ]*/ /g
- s/.*supported emulations: *//
+ s/.*supported targets: *//
s/ .*//
p'`
- case "$ld_supported_emulations" in
- i?86linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit 0
- ;;
- elf_i?86)
+ case "$ld_supported_targets" in
+ elf32-i386)
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
;;
- i?86coff)
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit 0 ;;
+ coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit 0
- ;;
- esac
- # Either a pre-BFD a.out linker (linux-gnuoldld)
- # or one that does not give us useful --help.
- # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
- # If ld does not provide *any* "supported emulations:"
- # that means it is gnuoldld.
- test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
- case "${UNAME_MACHINE}" in
- i?86)
- VENDOR=pc;
- ;;
- *)
- VENDOR=unknown;
- ;;
+ exit 0 ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ exit 0 ;;
esac
# Determine whether the default compiler is a.out or elf
- cat >$dummy.c <<EOF
-#include <features.h>
-#ifdef __cplusplus
-#include <stdio.h> /* for printf() prototype */
- int main (int argc, char *argv[]) {
-#else
- int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-# if __GLIBC__ >= 2
- printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
-# else
- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-# endif
-# else
- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
-# endif
-#else
- printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
-#endif
- return 0;
-}
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <features.h>
+ #ifdef __ELF__
+ # ifdef __GLIBC__
+ # if __GLIBC__ >= 2
+ LIBC=gnu
+ # else
+ LIBC=gnulibc1
+ # endif
+ # else
+ LIBC=gnulibc1
+ # endif
+ #else
+ #ifdef __INTEL_COMPILER
+ LIBC=gnu
+ #else
+ LIBC=gnuaout
+ #endif
+ #endif
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ rm -f $dummy.c
+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
-# are messed up and put the nodename in both sysname and nodename.
- i?86:DYNIX/ptx:4*:*)
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+ # sysname and nodename.
echo i386-sequent-sysv4
exit 0 ;;
- i?86:UNIX_SV:4.2MP:2.*)
+ i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
# I am not positive that other SVR4 systems won't match this,
@@ -955,7 +896,7 @@ EOF
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit 0 ;;
- i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
@@ -963,16 +904,15 @@ EOF
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
exit 0 ;;
- i?86:*:5:7*)
- # Fixed at (any) Pentium or better
- UNAME_MACHINE=i586
- if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
- echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
- else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
- fi
+ i*86:*:5:[78]*)
+ case `/bin/uname -X | grep "^Machine"` in
+ *486*) UNAME_MACHINE=i486 ;;
+ *Pentium) UNAME_MACHINE=i586 ;;
+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ esac
+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
exit 0 ;;
- i?86:*:3.2:*)
+ i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
@@ -990,7 +930,7 @@ EOF
echo ${UNAME_MACHINE}-pc-sysv32
fi
exit 0 ;;
- i?86:*DOS:*:*)
+ i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
exit 0 ;;
pc:*:*:*)
@@ -1018,7 +958,7 @@ EOF
exit 0 ;;
M68*:*:R3V[567]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+ 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1029,13 +969,13 @@ EOF
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& echo i486-ncr-sysv4 && exit 0 ;;
- m68*:LynxOS:2.*:*)
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit 0 ;;
- i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
TSUNAMI:LynxOS:2.*:*)
@@ -1044,7 +984,7 @@ EOF
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:*)
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
SM[BE]S:UNIX_SV:*:*)
@@ -1064,8 +1004,8 @@ EOF
echo ns32k-sni-sysv
fi
exit 0 ;;
- PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel@ccMail.Census.GOV>
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel@ccMail.Census.GOV>
echo i586-unisys-sysv4
exit 0 ;;
*:UNIX_System_V:4*:FTX*)
@@ -1077,6 +1017,10 @@ EOF
# From seanf@swdc.stratus.com.
echo i860-stratus-sysv4
exit 0 ;;
+ *:VOS:*:*)
+ # From Paul.Green@stratus.com.
+ echo hppa1.1-stratus-vos
+ exit 0 ;;
mc68*:A/UX:*:*)
echo m68k-apple-aux${UNAME_RELEASE}
exit 0 ;;
@@ -1115,15 +1059,17 @@ EOF
echo `uname -p`-apple-darwin${UNAME_RELEASE}
exit 0 ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
- if test "${UNAME_MACHINE}" = "x86pc"; then
+ UNAME_PROCESSOR=`uname -p`
+ if test "$UNAME_PROCESSOR" = "x86"; then
+ UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
- echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
exit 0 ;;
*:QNX:*:4*)
echo i386-pc-qnx
exit 0 ;;
- NSR-[KW]:NONSTOP_KERNEL:*:*)
+ NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
*:NonStop-UX:*:*)
@@ -1146,7 +1092,7 @@ EOF
fi
echo ${UNAME_MACHINE}-unknown-plan9
exit 0 ;;
- i?86:OS/2:*:*)
+ i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
echo ${UNAME_MACHINE}-pc-os2-emx
@@ -1169,11 +1115,18 @@ EOF
*:ITS:*:*)
echo pdp10-unknown-its
exit 0 ;;
+ i*86:XTS-300:*:STOP)
+ echo ${UNAME_MACHINE}-unknown-stop
+ exit 0 ;;
+ i*86:atheos:*:*)
+ echo ${UNAME_MACHINE}-unknown-atheos
+ exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
# include <sys/types.h>
diff --git a/contrib/ncurses/config.sub b/contrib/ncurses/config.sub
index 9df4e53f8092..299f3f4c5ea2 100755
--- a/contrib/ncurses/config.sub
+++ b/contrib/ncurses/config.sub
@@ -1,9 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002 Free Software Foundation, Inc.
-timestamp='2001-03-09'
+timestamp='2002-04-26'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -29,7 +29,8 @@ timestamp='2001-03-09'
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# Please send patches to <config-patches@gnu.org>.
+# Please send patches to <config-patches@gnu.org>. Submit a context
+# diff and a properly formatted ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -117,7 +118,7 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
+ nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -157,6 +158,14 @@ case $os in
os=-vxworks
basic_machine=$1
;;
+ -chorusos*)
+ os=-chorusos
+ basic_machine=$1
+ ;;
+ -chorusrdb)
+ os=-chorusrdb
+ basic_machine=$1
+ ;;
-hiux*)
os=-hiuxwe2
;;
@@ -215,24 +224,36 @@ esac
case $basic_machine in
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
- tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
- | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
- | pyramid | mn10200 | mn10300 | tron | a29k \
- | 580 | i960 | h8300 \
- | x86 | ppcbe | mipsbe | mipsle | shbe | shle \
- | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
- | hppa64 \
- | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
- | alphaev6[78] \
- | we32k | ns16k | clipper | i370 | sh | sh[34] \
- | powerpc | powerpcle \
- | 1750a | dsp16xx | pdp10 | pdp11 \
- | mips16 | mips64 | mipsel | mips64el \
- | mips64orion | mips64orionel | mipstx39 | mipstx39el \
- | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
- | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
- | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
- | thumb | d10v | d30v | fr30 | avr | openrisc)
+ 1750a | 580 \
+ | a29k \
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | c4x | clipper \
+ | d10v | d30v | dsp16xx \
+ | fr30 \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | m32r | m68000 | m68k | m88k | mcore \
+ | mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+ | mips64vr4100 | mips64vr4100el | mips64vr4300 \
+ | mips64vr4300el | mips64vr5000 | mips64vr5000el \
+ | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+ | mipsisa32 | mipsisa64 \
+ | mn10200 | mn10300 \
+ | ns16k | ns32k \
+ | openrisc | or32 \
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
+ | sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+ | strongarm \
+ | tahoe | thumb | tic80 | tron \
+ | v850 | v850e \
+ | we32k \
+ | x86 | xscale | xstormy16 | xtensa \
+ | z8k)
basic_machine=$basic_machine-unknown
;;
m6811 | m68hc11 | m6812 | m68hc12)
@@ -240,13 +261,13 @@ case $basic_machine in
basic_machine=$basic_machine-unknown
os=-none
;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
- i[234567]86 | x86_64)
+ i*86 | x86_64)
basic_machine=$basic_machine-pc
;;
# Object if more than one company name word.
@@ -255,30 +276,45 @@ case $basic_machine in
exit 1
;;
# Recognize the basic CPU types with company name.
- # FIXME: clean up the formatting here.
- vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
- | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
- | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
- | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
- | xmp-* | ymp-* \
- | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
- | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
- | hppa2.0n-* | hppa64-* \
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
- | alphaev6[78]-* \
- | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
- | clipper-* | orion-* \
- | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
- | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
- | mips64el-* | mips64orion-* | mips64orionel-* \
- | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
- | mipstx39-* | mipstx39el-* | mcore-* \
- | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
- | [cjt]90-* \
- | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
- | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
- | bs2000-* | tic54x-* | c54x-* | x86_64-*)
+ 580-* \
+ | a29k-* \
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armv*-* \
+ | avr-* \
+ | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c54x-* \
+ | clipper-* | cydra-* \
+ | d10v-* | d30v-* \
+ | elxsi-* \
+ | f30[01]-* | f700-* | fr30-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | m32r-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ | m88110-* | m88k-* | mcore-* \
+ | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+ | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+ | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
+ | orion-* \
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+ | romp-* | rs6000-* \
+ | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
+ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+ | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+ | xtensa-* \
+ | ymp-* \
+ | z8k-*)
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
@@ -341,6 +377,10 @@ case $basic_machine in
basic_machine=ns32k-sequent
os=-dynix
;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
convex-c1)
basic_machine=c1-convex
os=-bsd
@@ -361,16 +401,8 @@ case $basic_machine in
basic_machine=c38-convex
os=-bsd
;;
- cray | ymp)
- basic_machine=ymp-cray
- os=-unicos
- ;;
- cray2)
- basic_machine=cray2-cray
- os=-unicos
- ;;
- [cjt]90)
- basic_machine=${basic_machine}-cray
+ cray | j90)
+ basic_machine=j90-cray
os=-unicos
;;
crds | unos)
@@ -385,6 +417,14 @@ case $basic_machine in
decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
basic_machine=mips-dec
;;
+ decsystem10* | dec10*)
+ basic_machine=pdp10-dec
+ os=-tops10
+ ;;
+ decsystem20* | dec20*)
+ basic_machine=pdp10-dec
+ os=-tops20
+ ;;
delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola)
basic_machine=m68k-motorola
@@ -505,19 +545,19 @@ case $basic_machine in
basic_machine=i370-ibm
;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
- i[34567]86v32)
+ i*86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
;;
- i[34567]86v4*)
+ i*86v4*)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv4
;;
- i[34567]86v)
+ i*86v)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv
;;
- i[34567]86sol2)
+ i*86sol2)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-solaris2
;;
@@ -565,14 +605,6 @@ case $basic_machine in
basic_machine=m68k-atari
os=-mint
;;
- mipsel*-linux*)
- basic_machine=mipsel-unknown
- os=-linux-gnu
- ;;
- mips*-linux*)
- basic_machine=mips-unknown
- os=-linux-gnu
- ;;
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;;
@@ -587,6 +619,10 @@ case $basic_machine in
basic_machine=m68k-rom68k
os=-coff
;;
+ morphos)
+ basic_machine=powerpc-unknown
+ os=-morphos
+ ;;
msdos)
basic_machine=i386-pc
os=-msdos
@@ -666,6 +702,10 @@ case $basic_machine in
basic_machine=hppa1.1-oki
os=-proelf
;;
+ or32 | or32-*)
+ basic_machine=or32-unknown
+ os=-coff
+ ;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
os=-ose
@@ -691,7 +731,7 @@ case $basic_machine in
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
- pentium | p5 | k5 | k6 | nexgen)
+ pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
pentiumpro | p6 | 6x86 | athlon)
@@ -700,7 +740,7 @@ case $basic_machine in
pentiumii | pentium2)
basic_machine=i686-pc
;;
- pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumpro-* | p6-* | 6x86-* | athlon-*)
@@ -724,6 +764,16 @@ case $basic_machine in
ppcle-* | powerpclittle-*)
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
+ ppc64) basic_machine=powerpc64-unknown
+ ;;
+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ basic_machine=powerpc64le-unknown
+ ;;
+ ppc64le-* | powerpc64little-*)
+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
ps2)
basic_machine=i386-ibm
;;
@@ -741,6 +791,12 @@ case $basic_machine in
rtpc | rtpc-*)
basic_machine=romp-ibm
;;
+ s390 | s390-*)
+ basic_machine=s390-ibm
+ ;;
+ s390x | s390x-*)
+ basic_machine=s390x-ibm
+ ;;
sa29200)
basic_machine=a29k-amd
os=-udi
@@ -752,7 +808,7 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
- sparclite-wrs)
+ sparclite-wrs | simso-wrs)
basic_machine=sparclite-wrs
os=-vxworks
;;
@@ -810,7 +866,7 @@ case $basic_machine in
sun386 | sun386i | roadrunner)
basic_machine=i386-sun
;;
- sv1)
+ sv1)
basic_machine=sv1-cray
os=-unicos
;;
@@ -818,8 +874,16 @@ case $basic_machine in
basic_machine=i386-sequent
os=-dynix
;;
+ t3d)
+ basic_machine=alpha-cray
+ os=-unicos
+ ;;
t3e)
- basic_machine=t3e-cray
+ basic_machine=alphaev5-cray
+ os=-unicos
+ ;;
+ t90)
+ basic_machine=t90-cray
os=-unicos
;;
tic54x | c54x*)
@@ -832,6 +896,10 @@ case $basic_machine in
tx39el)
basic_machine=mipstx39el-unknown
;;
+ toad1)
+ basic_machine=pdp10-xkl
+ os=-tops20
+ ;;
tower | tower-32)
basic_machine=m68k-ncr
;;
@@ -878,13 +946,17 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
- xmp)
- basic_machine=xmp-cray
- os=-unicos
+ windows32)
+ basic_machine=i386-pc
+ os=-windows32-msvcrt
;;
xps | xps100)
basic_machine=xps100-honeywell
;;
+ ymp)
+ basic_machine=ymp-cray
+ os=-unicos
+ ;;
z8k-*-coff)
basic_machine=z8k-unknown
os=-sim
@@ -905,13 +977,6 @@ case $basic_machine in
op60c)
basic_machine=hppa1.1-oki
;;
- mips)
- if [ x$os = x-linux-gnu ]; then
- basic_machine=mips-unknown
- else
- basic_machine=mips-mips
- fi
- ;;
romp)
basic_machine=romp-ibm
;;
@@ -931,10 +996,13 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
- sh3 | sh4)
+ sh3 | sh4 | sh3eb | sh4eb)
basic_machine=sh-unknown
;;
- sparc | sparcv9)
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
+ sparc | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
cydra)
@@ -956,6 +1024,9 @@ case $basic_machine in
basic_machine=c4x-none
os=-coff
;;
+ *-unknown)
+ # Make sure to match an already-canonicalized machine name.
+ ;;
*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
exit 1
@@ -1012,16 +1083,19 @@ case $os in
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* )
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
case $basic_machine in
- x86-* | i[34567]86-*)
+ x86-* | i*86-*)
;;
*)
os=-nto$os
@@ -1068,12 +1142,18 @@ case $os in
-acis*)
os=-aos
;;
+ -atheos*)
+ os=-atheos
+ ;;
-386bsd)
os=-bsd
;;
-ctix* | -uts*)
os=-sysv
;;
+ -nova*)
+ os=-rtmk-nova
+ ;;
-ns2 )
os=-nextstep2
;;
@@ -1148,6 +1228,7 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
+ # This must come before the *-dec entry.
pdp10-*)
os=-tops20
;;
@@ -1178,6 +1259,9 @@ case $basic_machine in
mips*-*)
os=-elf
;;
+ or32-*)
+ os=-coff
+ ;;
*-tti) # must be before sparc entry or we get the wrong os.
os=-sysv3
;;
@@ -1325,7 +1409,7 @@ case $basic_machine in
-ptx*)
vendor=sequent
;;
- -vxsim* | -vxworks*)
+ -vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
-aux*)
@@ -1340,6 +1424,9 @@ case $basic_machine in
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
vendor=atari
;;
+ -vos*)
+ vendor=stratus
+ ;;
esac
basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
;;
diff --git a/contrib/ncurses/configure b/contrib/ncurses/configure
index d8e599b277fa..59cd6095e1ec 100755
--- a/contrib/ncurses/configure
+++ b/contrib/ncurses/configure
@@ -1,11 +1,11 @@
#! /bin/sh
-# From configure.in Revision: 1.233
+# From configure.in Revision: 1.267
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13.20000819
+# Generated automatically using autoconf version 2.13.20020210
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
@@ -189,19 +189,23 @@ cat <<EOF
--enable and --with options recognized:
--with-system-type=XXX test: override derived host system-type
--enable-add-ons=DIR... used to check if we are a glibc add-on.
+ --with-build-cc=XXX if cross-compiling, the host C compiler (\$BUILD_CC)
+ --with-build-cflags=XXX if cross-compiling, the host C compiler-flags
+ --with-build-ldflags=XXX if cross-compiling, the host linker-flags
+ --with-build-libs=XXX if cross-compiling, the host libraries
--without-cxx do not adjust ncurses bool to match C++
--without-cxx-binding do not build C++ binding and demo
--without-ada suppress check for Ada95, don't build demo
--without-progs suppress build with programs (e.g., tic)
--without-curses-h install curses.h as ncurses.h only
- --with-install-prefix prefixes actual install-location
+ --with-install-prefix prefixes actual install-location (\$DESTDIR)
Options to Specify the Libraries Built/Used:
+EOF
+cat <<EOF
--with-libtool generate libraries with libtool
--with-shared generate shared-libraries
--with-normal generate normal-libraries (default)
--with-debug generate debug-libraries (default)
-EOF
-cat <<EOF
--with-profile generate profile-libraries
--with-termlib generate separate terminfo library
--with-dbmalloc test: use Conor Cahill's dbmalloc library
@@ -210,26 +214,28 @@ cat <<EOF
--enable-rpath use rpath option when generating shared libraries
--with-shlib-version=X Specify rel or abi version for shared libs
Fine-Tuning Your Configuration:
+EOF
+cat <<EOF
--disable-overwrite leave out the link to -lcurses
- --disable-database use only built-in data
+ --disable-database do not use terminfo, only fallbacks/termcap
--with-database=XXX specify terminfo source to install
--with-fallbacks=XXX specify list of fallback terminal descriptions
-EOF
-cat <<EOF
--with-terminfo-dirs=XXX specify list of terminfo directories (default: DATADIR/terminfo)
--with-default-terminfo-dir=DIR default terminfo directory (default: DATADIR/terminfo)
--disable-big-core assume machine has little memory
--enable-termcap compile in termcap fallback support
+ --with-termpath=XXX specify list of termcap files (default: /etc/termcap:/usr/share/misc/termcap)
--enable-getcap fast termcap load, no xrefs to terminfo
--enable-getcap-cache cache translated termcaps in ~/.terminfo
--enable-symlinks make tic use symbolic links not hard links
+EOF
+cat <<EOF
--enable-broken_linker compile with broken-linker support code
+ --with-bool=TYPE override fallback type of bool variable
--with-ospeed=TYPE override type of ospeed variable
--enable-bsdpad recognize BSD-style prefix padding
--with-rcs-ids compile-in RCS identifiers
Options to Specify How Manpages are Installed:
-EOF
-cat <<EOF
--with-manpage-format specify manpage-format: gzip/compress/BSDI/normal and
optionally formatted, e.g., gzip,formatted
--with-manpage-renames specify manpage-renaming
@@ -237,33 +243,36 @@ cat <<EOF
--with-manpage-tbl specify manpage processing with tbl
Extensions:
--disable-ext-funcs disable function-extensions
+EOF
+cat <<EOF
--enable-const compile with extra/non-standard const
--enable-no-padding compile with \$NCURSES_NO_PADDING code
--enable-sigwinch compile with SIGWINCH handler
--enable-tcap-names compile with user-definable terminal capabilities
Development Code:
--with-develop enable all development options
-EOF
-cat <<EOF
--enable-colorfgbg compile with \$COLORFGBG code
--enable-hard-tabs compile with hard-tabs code
--disable-root-environ limit environment when running as root
--enable-xmc-glitch compile with limited support for xmc
Experimental Code:
--disable-assumed-color do not assume anything about default-colors
+EOF
+cat <<EOF
--disable-hashmap compile without hashmap scrolling-optimization
--enable-safe-sprintf compile with experimental safe-sprintf code
--disable-scroll-hints compile without scroll-hints code
--enable-widec compile with experimental wide-char/UTF-8 code
+ --with-caps=alt compile with experimental alternate Caps file
Testing/development Options:
--enable-echo build: display "compiling" commands (default)
-EOF
-cat <<EOF
--enable-warnings build: turn on GCC compiler warnings
--enable-assertions test: turn on generation of assertion code
--disable-leaks test: suppress permanent memory-leaks
--enable-expanded test: generate functions for certain macros
--disable-macros test: use functions rather than macros
+EOF
+cat <<EOF
Ada95 Binding Options:
--with-ada-compiler=CMD specify Ada95 compiler command (default gnatmake)
--with-ada-include=DIR Ada includes are in DIR (default: PREFIX/lib/ada/adainclude)
@@ -418,7 +427,7 @@ EOF
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version 2.13.20000819"
+ echo "configure generated by autoconf version 2.13.20020210"
exit 0 ;;
-with-* | --with-*)
@@ -614,7 +623,9 @@ NCURSES_MINOR="`egrep '^NCURSES_MINOR[ ]*=' $srcdir/dist.mk | sed -e 's/^[^0-9]
NCURSES_PATCH="`egrep '^NCURSES_PATCH[ ]*=' $srcdir/dist.mk | sed -e 's/^[^0-9]*//'`"
cf_cv_abi_version=${NCURSES_MAJOR}
cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
-echo "$ac_t""Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version (`date`)" 1>&6
+cf_cv_timestamp=`date`
+echo "$ac_t""Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" 1>&6
+
@@ -672,7 +683,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:676: checking host system type" >&5
+echo "configure:687: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -693,7 +704,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6
echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:697: checking target system type" >&5
+echo "configure:708: checking target system type" >&5
target_alias=$target
case "$target_alias" in
@@ -711,7 +722,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$target" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:715: checking build system type" >&5
+echo "configure:726: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@@ -752,7 +763,7 @@ fi
test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$ac_t"""Configuring for $cf_cv_system_name"" 1>&6
+test -n "$cf_cv_system_name" && echo "$ac_t""Configuring for $cf_cv_system_name" 1>&6
if test ".$system_name" != ".$cf_cv_system_name" ; then
echo "$ac_t""Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" 1>&6
@@ -804,7 +815,7 @@ cf_user_CFLAGS="$CFLAGS"
### Default install-location
echo $ac_n "checking for prefix""... $ac_c" 1>&6
-echo "configure:808: checking for prefix" >&5
+echo "configure:819: checking for prefix" >&5
if test "x$prefix" = "xNONE" ; then
case "$cf_cv_system_name" in
# non-vendor systems don't have a conflict
@@ -819,7 +830,7 @@ echo "$ac_t""$prefix" 1>&6
if test "x$prefix" = "xNONE" ; then
echo $ac_n "checking for default include-directory""... $ac_c" 1>&6
-echo "configure:823: checking for default include-directory" >&5
+echo "configure:834: checking for default include-directory" >&5
test -n "$verbose" && echo 1>&6
for cf_symbol in \
$includedir \
@@ -849,7 +860,7 @@ fi
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:853: checking for $ac_word" >&5
+echo "configure:864: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -879,7 +890,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:883: checking for $ac_word" >&5
+echo "configure:894: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -930,7 +941,7 @@ fi
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:934: checking for $ac_word" >&5
+echo "configure:945: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -962,7 +973,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:966: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:977: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -973,12 +984,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 977 "configure"
+#line 988 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1004,12 +1015,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1008: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1019: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1013: checking whether we are using GNU C" >&5
+echo "configure:1024: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1018,7 +1029,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -1037,7 +1048,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1041: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1052: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1068,18 +1079,34 @@ else
fi
fi
+GCC_VERSION=none
if test "$GCC" = yes ; then
echo $ac_n "checking version of gcc""... $ac_c" 1>&6
-echo "configure:1074: checking version of gcc" >&5
- eval "$CC --version"
-fi
-if test "$host" != $build; then
- for ac_prog in $CC gcc cc
+echo "configure:1086: checking version of gcc" >&5
+ GCC_VERSION="`${CC} --version|head -1`"
+ echo "$ac_t""$GCC_VERSION" 1>&6
+fi
+
+# If we're cross-compiling, allow the user to override the tools and their
+# options. The configure script is oriented toward identifying the target
+# compiler, etc., but we need a host compiler to generate parts of the source.
+BUILD_CC='$(CC)'
+BUILD_CFLAGS='$(CFLAGS)'
+BUILD_LDFLAGS='$(LDFLAGS)'
+BUILD_LIBS='$(LIBS)'
+if test "$host_alias" != "$target_alias" ; then
+
+# Check whether --with-build-cc or --without-build-cc was given.
+if test "${with_build_cc+set}" = set; then
+ withval="$with_build_cc"
+ BUILD_CC="$withval"
+else
+ for ac_prog in $CC gcc 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1083: checking for $ac_word" >&5
+echo "configure:1110: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_BUILD_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1108,12 +1135,37 @@ fi
test -n "$BUILD_CC" && break
done
-else
- BUILD_CC="$CC"
fi
+
+# Check whether --with-build-cflags or --without-build-cflags was given.
+if test "${with_build_cflags+set}" = set; then
+ withval="$with_build_cflags"
+ BUILD_CFLAGS="$withval"
+fi
+
+
+# Check whether --with-build-ldflags or --without-build-ldflags was given.
+if test "${with_build_ldflags+set}" = set; then
+ withval="$with_build_ldflags"
+ BUILD_LDFLAGS="$withval"
+fi
+
+
+# Check whether --with-build-libs or --without-build-libs was given.
+if test "${with_build_libs+set}" = set; then
+ withval="$with_build_libs"
+ BUILD_LIBS="$withval"
+fi
+
+fi
+
+
+
+
+
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1117: checking how to run the C preprocessor" >&5
+echo "configure:1169: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1128,13 +1180,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1132 "configure"
+#line 1184 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1145,13 +1197,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1149 "configure"
+#line 1201 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1162,13 +1214,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1166 "configure"
+#line 1218 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1194,13 +1246,13 @@ echo "$ac_t""$CPP" 1>&6
if test $ac_cv_prog_gcc = yes; then
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:1250: checking whether ${CC-cc} needs -traditional" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_pattern="Autoconf.*'x'"
cat > conftest.$ac_ext <<EOF
-#line 1204 "configure"
+#line 1256 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
@@ -1218,7 +1270,7 @@ rm -f conftest*
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 1222 "configure"
+#line 1274 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
@@ -1240,7 +1292,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
fi
echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1244: checking for POSIXized ISC" >&5
+echo "configure:1296: checking for POSIXized ISC" >&5
if test -d /etc/conf/kconfig.d &&
grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
then
@@ -1262,7 +1314,7 @@ fi
echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:1266: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:1318: checking for ${CC-cc} option to accept ANSI C" >&5
if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1286,26 +1338,39 @@ for cf_arg in "-DCC_HAS_PROTOS" \
-Xc
do
+cf_new_cflags=
+cf_new_cppflags=
for cf_add_cflags in $cf_arg
do
case $cf_add_cflags in #(vi
-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
case "$CPPFLAGS" in
- *$cf_add_cflags)
+ *$cf_add_cflags) #(vi
;;
- *)
- CPPFLAGS="$CPPFLAGS $cf_add_cflags"
+ *) #(vi
+ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
;;
esac
;;
*)
- CFLAGS="$CFLAGS $cf_add_cflags"
+ cf_new_cflags="$cf_new_cflags $cf_add_cflags"
;;
esac
done
+if test -n "$cf_new_cflags" ; then
+
+ CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+ CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+
cat > conftest.$ac_ext <<EOF
-#line 1309 "configure"
+#line 1374 "configure"
#include "confdefs.h"
#ifndef CC_HAS_PROTOS
@@ -1321,7 +1386,7 @@ int main() {
struct s2 {int (*f) (double a);};
; return 0; }
EOF
-if { (eval echo configure:1325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_ansi_cc="$cf_arg"; break
else
@@ -1340,24 +1405,37 @@ echo "$ac_t""$cf_cv_ansi_cc" 1>&6
if test "$cf_cv_ansi_cc" != "no"; then
if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then
+cf_new_cflags=
+cf_new_cppflags=
for cf_add_cflags in $cf_cv_ansi_cc
do
case $cf_add_cflags in #(vi
-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
case "$CPPFLAGS" in
- *$cf_add_cflags)
+ *$cf_add_cflags) #(vi
;;
- *)
- CPPFLAGS="$CPPFLAGS $cf_add_cflags"
+ *) #(vi
+ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
;;
esac
;;
*)
- CFLAGS="$CFLAGS $cf_add_cflags"
+ cf_new_cflags="$cf_new_cflags $cf_add_cflags"
;;
esac
done
+if test -n "$cf_new_cflags" ; then
+
+ CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+ CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+fi
+
+
else
cat >> confdefs.h <<\EOF
#define CC_HAS_PROTOS 1
@@ -1392,6 +1470,10 @@ cygwin*)
;;
esac
+test -n "$PROG_EXT" && cat >> confdefs.h <<EOF
+#define PROG_EXT "$PROG_EXT"
+EOF
+
case "$cf_cv_system_name" in
@@ -1402,7 +1484,7 @@ freebsd*) #(vi
# Extract the first word of "ldconfig", so it can be a program name with args.
set dummy ldconfig; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1406: checking for $ac_word" >&5
+echo "configure:1488: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LDCONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1439,7 +1521,7 @@ esac
echo $ac_n "checking if you want to ensure bool is consistent with C++""... $ac_c" 1>&6
-echo "configure:1443: checking if you want to ensure bool is consistent with C++" >&5
+echo "configure:1525: checking if you want to ensure bool is consistent with C++" >&5
# Check whether --with-cxx or --without-cxx was given.
if test "${with_cxx+set}" = set; then
@@ -1459,7 +1541,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1463: checking for $ac_word" >&5
+echo "configure:1545: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1491,7 +1573,7 @@ test -n "$CXX" || CXX="gcc"
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1495: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1577: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1502,12 +1584,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext << EOF
-#line 1506 "configure"
+#line 1588 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:1511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1533,12 +1615,12 @@ if test $ac_cv_prog_cxx_works = no; then
echo "$ac_t""You don't have any C++ compiler, too bad" 1>&6; cf_with_cxx=no; CXX=""; GXX="";
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1537: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1619: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1542: checking whether we are using GNU C++" >&5
+echo "configure:1624: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1547,7 +1629,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
@@ -1566,7 +1648,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1570: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1652: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1599,18 +1681,23 @@ fi
fi
+GXX_VERSION=none
if test "$GXX" = yes; then
- case "`${CXX-g++} --version`" in
+ echo $ac_n "checking version of g++""... $ac_c" 1>&6
+echo "configure:1688: checking version of g++" >&5
+ GXX_VERSION="`${CXX-g++} --version|head -1`"
+ echo "$ac_t""$GXX_VERSION" 1>&6
+ case $GXX_VERSION in
1*|2.[0-6]*)
GXX=""; CXX=""; ac_cv_prog_gxx=no
cf_cxx_library=no
- echo No: templates do not work
+ echo "configure: warning: templates do not work" 1>&2
;;
esac
fi
echo $ac_n "checking if you want to build C++ binding and demo""... $ac_c" 1>&6
-echo "configure:1614: checking if you want to build C++ binding and demo" >&5
+echo "configure:1701: checking if you want to build C++ binding and demo" >&5
# Check whether --with-cxx-binding or --without-cxx-binding was given.
if test "${with_cxx_binding+set}" = set; then
@@ -1623,7 +1710,7 @@ fi
echo "$ac_t""$cf_with_cxx_binding" 1>&6
echo $ac_n "checking if you want to build with Ada95""... $ac_c" 1>&6
-echo "configure:1627: checking if you want to build with Ada95" >&5
+echo "configure:1714: checking if you want to build with Ada95" >&5
# Check whether --with-ada or --without-ada was given.
if test "${with_ada+set}" = set; then
@@ -1636,7 +1723,7 @@ fi
echo "$ac_t""$cf_with_ada" 1>&6
echo $ac_n "checking if you want to build programs such as tic""... $ac_c" 1>&6
-echo "configure:1640: checking if you want to build programs such as tic" >&5
+echo "configure:1727: checking if you want to build programs such as tic" >&5
# Check whether --with-progs or --without-progs was given.
if test "${with_progs+set}" = set; then
@@ -1649,7 +1736,7 @@ fi
echo "$ac_t""$cf_with_progs" 1>&6
echo $ac_n "checking if you wish to install curses.h""... $ac_c" 1>&6
-echo "configure:1653: checking if you wish to install curses.h" >&5
+echo "configure:1740: checking if you wish to install curses.h" >&5
# Check whether --with-curses-h or --without-curses-h was given.
if test "${with_curses_h+set}" = set; then
@@ -1691,7 +1778,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1695: checking for $ac_word" >&5
+echo "configure:1782: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1721,7 +1808,7 @@ test -n "$AWK" && break
done
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1725: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1812: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1759,7 +1846,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1763: checking for a BSD compatible install" >&5
+echo "configure:1850: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1822,7 +1909,7 @@ case $INSTALL in
esac
echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:1826: checking for long file names" >&5
+echo "configure:1913: checking for long file names" >&5
if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1867,7 +1954,7 @@ fi
echo $ac_n "checking if filesystem supports mixed-case filenames""... $ac_c" 1>&6
-echo "configure:1871: checking if filesystem supports mixed-case filenames" >&5
+echo "configure:1958: checking if filesystem supports mixed-case filenames" >&5
if eval "test \"`echo '$''{'cf_cv_mixedcase'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1890,7 +1977,7 @@ EOF
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1894: checking whether ln -s works" >&5
+echo "configure:1981: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1913,7 +2000,7 @@ fi
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1917: checking for $ac_word" >&5
+echo "configure:2004: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1945,7 +2032,7 @@ fi
# Extract the first word of "ctags", so it can be a program name with args.
set dummy ctags; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1949: checking for $ac_word" >&5
+echo "configure:2036: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_MAKE_LOWER_TAGS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1977,7 +2064,7 @@ if test "$cf_cv_mixedcase" = yes ; then
# Extract the first word of "etags", so it can be a program name with args.
set dummy etags; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1981: checking for $ac_word" >&5
+echo "configure:2068: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_MAKE_UPPER_TAGS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2027,7 +2114,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2031: checking for $ac_word" >&5
+echo "configure:2118: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LINT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2061,7 +2148,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2065: checking for $ac_word" >&5
+echo "configure:2152: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_MAN'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2097,7 +2184,7 @@ if eval "test \"`echo '$''{'cf_cv_subst_LD'+set}'`\" = set"; then
else
echo $ac_n "checking for loader (symbol LD)""... $ac_c" 1>&6
-echo "configure:2101: checking for loader (symbol LD)" >&5
+echo "configure:2188: checking for loader (symbol LD)" >&5
test -z "$LD" && LD=ld
echo "$ac_t""$LD" 1>&6
@@ -2111,7 +2198,7 @@ if eval "test \"`echo '$''{'cf_cv_subst_AR'+set}'`\" = set"; then
else
echo $ac_n "checking for archiver (symbol AR)""... $ac_c" 1>&6
-echo "configure:2115: checking for archiver (symbol AR)" >&5
+echo "configure:2202: checking for archiver (symbol AR)" >&5
test -z "$AR" && AR=ar
echo "$ac_t""$AR" 1>&6
@@ -2125,7 +2212,7 @@ if eval "test \"`echo '$''{'cf_cv_subst_AR_OPTS'+set}'`\" = set"; then
else
echo $ac_n "checking for archiver options (symbol AR_OPTS)""... $ac_c" 1>&6
-echo "configure:2129: checking for archiver options (symbol AR_OPTS)" >&5
+echo "configure:2216: checking for archiver options (symbol AR_OPTS)" >&5
test -z "$AR_OPTS" && AR_OPTS=rv
echo "$ac_t""$AR_OPTS" 1>&6
@@ -2137,7 +2224,7 @@ AR_OPTS=${cf_cv_subst_AR_OPTS}
echo $ac_n "checking for makeflags variable""... $ac_c" 1>&6
-echo "configure:2141: checking for makeflags variable" >&5
+echo "configure:2228: checking for makeflags variable" >&5
if eval "test \"`echo '$''{'cf_cv_makeflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2146,6 +2233,7 @@ else
for cf_option in '-$(MAKEFLAGS)' '$(MFLAGS)'
do
cat >cf_makeflags.tmp <<CF_EOF
+SHELL = /bin/sh
all :
@ echo '.$cf_option'
CF_EOF
@@ -2166,14 +2254,16 @@ CF_EOF
esac
done
rm -f cf_makeflags.tmp
+
fi
echo "$ac_t""$cf_cv_makeflags" 1>&6
+
echo $ac_n "checking if you have specified an install-prefix""... $ac_c" 1>&6
-echo "configure:2177: checking if you have specified an install-prefix" >&5
+echo "configure:2267: checking if you have specified an install-prefix" >&5
# Check whether --with-install-prefix or --without-install-prefix was given.
if test "${with_install_prefix+set}" = set; then
@@ -2198,7 +2288,7 @@ echo "$ac_t""$DESTDIR" 1>&6
cf_list_models=""
echo $ac_n "checking if you want to build libraries with libtool""... $ac_c" 1>&6
-echo "configure:2202: checking if you want to build libraries with libtool" >&5
+echo "configure:2292: checking if you want to build libraries with libtool" >&5
# Check whether --with-libtool or --without-libtool was given.
if test "${with_libtool+set}" = set; then
@@ -2218,7 +2308,7 @@ fi
echo $ac_n "checking if you want to build shared libraries""... $ac_c" 1>&6
-echo "configure:2222: checking if you want to build shared libraries" >&5
+echo "configure:2312: checking if you want to build shared libraries" >&5
# Check whether --with-shared or --without-shared was given.
if test "${with_shared+set}" = set; then
@@ -2232,7 +2322,7 @@ echo "$ac_t""$with_shared" 1>&6
test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
echo $ac_n "checking if you want to build static libraries""... $ac_c" 1>&6
-echo "configure:2236: checking if you want to build static libraries" >&5
+echo "configure:2326: checking if you want to build static libraries" >&5
# Check whether --with-normal or --without-normal was given.
if test "${with_normal+set}" = set; then
@@ -2246,7 +2336,7 @@ echo "$ac_t""$with_normal" 1>&6
test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal"
echo $ac_n "checking if you want to build debug libraries""... $ac_c" 1>&6
-echo "configure:2250: checking if you want to build debug libraries" >&5
+echo "configure:2340: checking if you want to build debug libraries" >&5
# Check whether --with-debug or --without-debug was given.
if test "${with_debug+set}" = set; then
@@ -2260,7 +2350,7 @@ echo "$ac_t""$with_debug" 1>&6
test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug"
echo $ac_n "checking if you want to build profiling libraries""... $ac_c" 1>&6
-echo "configure:2264: checking if you want to build profiling libraries" >&5
+echo "configure:2354: checking if you want to build profiling libraries" >&5
# Check whether --with-profile or --without-profile was given.
if test "${with_profile+set}" = set; then
@@ -2276,7 +2366,7 @@ test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile"
###############################################################################
echo $ac_n "checking for specified models""... $ac_c" 1>&6
-echo "configure:2280: checking for specified models" >&5
+echo "configure:2370: checking for specified models" >&5
test -z "$cf_list_models" && cf_list_models=normal
test "$with_libtool" = "yes" && cf_list_models=libtool
echo "$ac_t""$cf_list_models" 1>&6
@@ -2284,7 +2374,7 @@ echo "$ac_t""$cf_list_models" 1>&6
### Use the first model as the default, and save its suffix for use in building
### up test-applications.
echo $ac_n "checking for default model""... $ac_c" 1>&6
-echo "configure:2288: checking for default model" >&5
+echo "configure:2378: checking for default model" >&5
DFT_LWR_MODEL=`echo $cf_list_models | $AWK '{print $1}'`
echo "$ac_t""$DFT_LWR_MODEL" 1>&6
@@ -2317,7 +2407,7 @@ LIB_SUFFIX=
###############################################################################
echo $ac_n "checking if you want to build a separate terminfo library""... $ac_c" 1>&6
-echo "configure:2321: checking if you want to build a separate terminfo library" >&5
+echo "configure:2411: checking if you want to build a separate terminfo library" >&5
# Check whether --with-termlib or --without-termlib was given.
if test "${with_termlib+set}" = set; then
@@ -2331,7 +2421,7 @@ echo "$ac_t""$with_termlib" 1>&6
### Checks for special libraries, must be done up-front.
echo $ac_n "checking if you want to link with dbmalloc for testing""... $ac_c" 1>&6
-echo "configure:2335: checking if you want to link with dbmalloc for testing" >&5
+echo "configure:2425: checking if you want to link with dbmalloc for testing" >&5
# Check whether --with-dbmalloc or --without-dbmalloc was given.
if test "${with_dbmalloc+set}" = set; then
@@ -2344,7 +2434,7 @@ fi
echo "$ac_t""$with_dbmalloc" 1>&6
if test "$with_dbmalloc" = yes ; then
echo $ac_n "checking for debug_malloc in -ldbmalloc""... $ac_c" 1>&6
-echo "configure:2348: checking for debug_malloc in -ldbmalloc" >&5
+echo "configure:2438: checking for debug_malloc in -ldbmalloc" >&5
ac_lib_var=`echo dbmalloc'_'debug_malloc | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2352,7 +2442,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldbmalloc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2356 "configure"
+#line 2446 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2363,7 +2453,7 @@ int main() {
debug_malloc()
; return 0; }
EOF
-if { (eval echo configure:2367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2393,7 +2483,7 @@ fi
fi
echo $ac_n "checking if you want to link with dmalloc for testing""... $ac_c" 1>&6
-echo "configure:2397: checking if you want to link with dmalloc for testing" >&5
+echo "configure:2487: checking if you want to link with dmalloc for testing" >&5
# Check whether --with-dmalloc or --without-dmalloc was given.
if test "${with_dmalloc+set}" = set; then
@@ -2406,7 +2496,7 @@ fi
echo "$ac_t""$with_dmalloc" 1>&6
if test "$with_dmalloc" = yes ; then
echo $ac_n "checking for dmalloc_debug in -ldmalloc""... $ac_c" 1>&6
-echo "configure:2410: checking for dmalloc_debug in -ldmalloc" >&5
+echo "configure:2500: checking for dmalloc_debug in -ldmalloc" >&5
ac_lib_var=`echo dmalloc'_'dmalloc_debug | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2414,7 +2504,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldmalloc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2418 "configure"
+#line 2508 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2425,7 +2515,7 @@ int main() {
dmalloc_debug()
; return 0; }
EOF
-if { (eval echo configure:2429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2456,7 +2546,7 @@ fi
SHLIB_LIST=""
echo $ac_n "checking if you want to link with the gpm mouse library""... $ac_c" 1>&6
-echo "configure:2460: checking if you want to link with the gpm mouse library" >&5
+echo "configure:2550: checking if you want to link with the gpm mouse library" >&5
# Check whether --with-gpm or --without-gpm was given.
if test "${with_gpm+set}" = set; then
@@ -2469,7 +2559,7 @@ fi
echo "$ac_t""$with_gpm" 1>&6
if test "$with_gpm" = yes ; then
echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:2473: checking for Gpm_Open in -lgpm" >&5
+echo "configure:2563: checking for Gpm_Open in -lgpm" >&5
ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2477,7 +2567,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lgpm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2481 "configure"
+#line 2571 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2488,7 +2578,7 @@ int main() {
Gpm_Open()
; return 0; }
EOF
-if { (eval echo configure:2492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2514,17 +2604,17 @@ EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2518: checking for $ac_hdr" >&5
+echo "configure:2608: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2523 "configure"
+#line 2613 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2572,7 +2662,7 @@ fi
echo $ac_n "checking for default loader flags""... $ac_c" 1>&6
-echo "configure:2576: checking for default loader flags" >&5
+echo "configure:2666: checking for default loader flags" >&5
case $DFT_LWR_MODEL in
libtool) LD_MODEL='' ;;
normal) LD_MODEL='' ;;
@@ -2583,7 +2673,7 @@ esac
echo "$ac_t""$LD_MODEL" 1>&6
echo $ac_n "checking if rpath option should be used""... $ac_c" 1>&6
-echo "configure:2587: checking if rpath option should be used" >&5
+echo "configure:2677: checking if rpath option should be used" >&5
# Check whether --enable-rpath or --disable-rpath was given.
if test "${enable_rpath+set}" = set; then
@@ -2597,15 +2687,15 @@ echo "$ac_t""$cf_cv_ld_rpath" 1>&6
- LOCAL_LDFLAGS=
- LOCAL_LDFLAGS2=
+ LOCAL_LDFLAGS=
+ LOCAL_LDFLAGS2=
LD_SHARED_OPTS=
INSTALL_LIB="-m 644"
cf_cv_do_symlinks=no
echo $ac_n "checking if release/abi version should be used for shared libs""... $ac_c" 1>&6
-echo "configure:2609: checking if release/abi version should be used for shared libs" >&5
+echo "configure:2699: checking if release/abi version should be used for shared libs" >&5
# Check whether --with-shlib-version or --without-shlib-version was given.
if test "${with_shlib_version+set}" = set; then
@@ -2636,20 +2726,20 @@ fi
if test "$GCC" = yes
then
echo $ac_n "checking which $CC option to use""... $ac_c" 1>&6
-echo "configure:2640: checking which $CC option to use" >&5
+echo "configure:2730: checking which $CC option to use" >&5
cf_save_CFLAGS="$CFLAGS"
for CC_SHARED_OPTS in -fPIC -fpic ''
do
CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
cat > conftest.$ac_ext <<EOF
-#line 2646 "configure"
+#line 2736 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
int x = 1
; return 0; }
EOF
-if { (eval echo configure:2653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
break
else
@@ -2662,10 +2752,25 @@ rm -f conftest*
CFLAGS="$cf_save_CFLAGS"
fi
+ cf_cv_shlib_version_infix=no
+
case $cf_cv_system_name in
beos*)
MK_SHARED_LIB='$(CC) -o $@ -Xlinker -soname=`basename $@` -nostart -e 0'
;;
+ cygwin*)
+ CC_SHARED_OPTS=
+ MK_SHARED_LIB='$(CC) -shared -Wl,--out-implib=$(IMPORT_LIB) -Wl,--export-all-symbols -o $(SHARED_LIB)'
+ cf_cv_shlib_version=cygdll
+ cf_cv_shlib_version_infix=cygdll
+ ;;
+ darwin*)
+ EXTRA_CFLAGS="-no-cpp-precomp"
+ CC_SHARED_OPTS="-dynamic"
+ MK_SHARED_LIB='$(CC) -dynamiclib -install_name $(DESTDIR)$(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
+ ;;
hpux*)
# (tested with gcc 2.7.2 -- I don't have c89)
if test "$GCC" = yes; then
@@ -2693,8 +2798,8 @@ rm -f conftest*
;;
linux*|gnu*)
if test "$DFT_LWR_MODEL" = "shared" ; then
- LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib"
- LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
fi
if test "$cf_cv_ld_rpath" = yes ; then
cf_ld_rpath_opt="-Wl,-rpath,"
@@ -2716,8 +2821,8 @@ rm -f conftest*
CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
test "$cf_cv_ld_rpath" = yes && cf_ld_rpath_opt="-Wl,-rpath,"
if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
- LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib"
- LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
EXTRA_LDFLAGS="-Wl,-rpath,\$(libdir) $EXTRA_LDFLAGS"
MK_SHARED_LIB='$(CC) -shared -Wl,-soname,`basename $@ .$(REL_VERSION)`.$(ABI_VERSION) -o $@'
if test "$cf_cv_shlib_version" = auto; then
@@ -2733,16 +2838,16 @@ rm -f conftest*
# tested with OSF/1 V3.2 and 'cc'
# tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
# link with shared libs).
- MK_SHARED_LIB='$(LD) -set_version $(REL_VERSION):$(ABI_VERSION) -expect_unresolved "*" -shared -soname `basename $@`'
+ MK_SHARED_LIB='$(LD) -set_version $(REL_VERSION):$(ABI_VERSION) -expect_unresolved "*" -shared -soname `basename $@`'
case $host_os in
osf4*)
- MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
+ MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
;;
esac
MK_SHARED_LIB="${MK_SHARED_LIB}"' -o $@'
if test "$DFT_LWR_MODEL" = "shared" ; then
- LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib"
- LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
fi
if test "$cf_cv_ld_rpath" = yes ; then
cf_ld_rpath_opt="-rpath"
@@ -2780,7 +2885,7 @@ rm -f conftest*
MK_SHARED_LIB='$(LD) -dy -G -h `basename $@ .$(REL_VERSION)`.$(ABI_VERSION) -o $@'
if test "$DFT_LWR_MODEL" = "shared" ; then
LOCAL_LDFLAGS="-R `pwd`/lib:\$(libdir)"
- LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
fi
if test "$cf_cv_ld_rpath" = yes ; then
cf_ld_rpath_opt="-R"
@@ -2817,18 +2922,18 @@ rm -f conftest*
if test -n "$cf_ld_rpath_opt" ; then
echo $ac_n "checking if we need a space after rpath option""... $ac_c" 1>&6
-echo "configure:2821: checking if we need a space after rpath option" >&5
+echo "configure:2926: checking if we need a space after rpath option" >&5
cf_save_LIBS="$LIBS"
LIBS="$LIBS ${cf_ld_rpath_opt}$libdir"
cat > conftest.$ac_ext <<EOF
-#line 2825 "configure"
+#line 2930 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:2832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_rpath_space=no
else
@@ -2867,7 +2972,7 @@ fi
### use option --disable-overwrite to leave out the link to -lcurses
echo $ac_n "checking if you wish to install ncurses overwriting curses""... $ac_c" 1>&6
-echo "configure:2871: checking if you wish to install ncurses overwriting curses" >&5
+echo "configure:2976: checking if you wish to install ncurses overwriting curses" >&5
# Check whether --enable-overwrite or --disable-overwrite was given.
if test "${enable_overwrite+set}" = set; then
@@ -2880,7 +2985,7 @@ fi
echo "$ac_t""$with_overwrite" 1>&6
echo $ac_n "checking if external terminfo-database is used""... $ac_c" 1>&6
-echo "configure:2884: checking if external terminfo-database is used" >&5
+echo "configure:2989: checking if external terminfo-database is used" >&5
# Check whether --enable-database or --disable-database was given.
if test "${enable_database+set}" = set; then
@@ -2902,13 +3007,21 @@ os2*) #(vi
esac
+
+ case $cf_cv_system_name in
+ os2*) PATHSEP=';' ;;
+ *) PATHSEP=':' ;;
+ esac
+
+
+
if test "$use_database" != no ; then
cat >> confdefs.h <<\EOF
#define USE_DATABASE 1
EOF
echo $ac_n "checking which terminfo source-file will be installed""... $ac_c" 1>&6
-echo "configure:2912: checking which terminfo source-file will be installed" >&5
+echo "configure:3025: checking which terminfo source-file will be installed" >&5
# Check whether --enable-database or --disable-database was given.
if test "${enable_database+set}" = set; then
@@ -2920,7 +3033,7 @@ fi
fi
echo $ac_n "checking for list of fallback descriptions""... $ac_c" 1>&6
-echo "configure:2924: checking for list of fallback descriptions" >&5
+echo "configure:3037: checking for list of fallback descriptions" >&5
# Check whether --with-fallbacks or --without-fallbacks was given.
if test "${with_fallbacks+set}" = set; then
@@ -2934,23 +3047,14 @@ echo "$ac_t""$with_fallback" 1>&6
FALLBACK_LIST=`echo $with_fallback|sed -e 's/,/ /g'`
+MAKE_TERMINFO=
if test "$use_database" = no ; then
- if test -z $with_fallback ; then
- { echo "configure: error: You have disabled the database w/o specifying fallbacks" 1>&2; exit 1; }
- fi
TERMINFO="${datadir}/terminfo"
+ MAKE_TERMINFO="#"
else
echo $ac_n "checking for list of terminfo directories""... $ac_c" 1>&6
-echo "configure:2946: checking for list of terminfo directories" >&5
-
- case $cf_cv_system_name in
- os2*) PATHSEP=';' ;;
- *) PATHSEP=':' ;;
- esac
-
-
-
+echo "configure:3058: checking for list of terminfo directories" >&5
@@ -2959,16 +3063,18 @@ if test "${with_terminfo_dirs+set}" = set; then
withval="$with_terminfo_dirs"
:
else
- withval="${TERMINFO_DIRS-${datadir}/terminfo}"
+ withval=${TERMINFO_DIRS-${datadir}/terminfo}
fi
-IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATHSEP}"
+IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATHSEP}"
cf_dst_path=
for cf_src_path in $withval
do
case ".$cf_src_path" in #(vi
-./*) #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+ ;;
+..|./*|.\\*) #(vi
;;
.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
;;
@@ -2984,7 +3090,7 @@ case ".$cf_src_path" in #(vi
cf_src_path=`echo $cf_src_path | sed -e s@NONE@$ac_default_prefix@`
;;
*)
- { echo "configure: error: expected a pathname" 1>&2; exit 1; }
+ { echo "configure: error: expected a pathname, not \"$cf_src_path\"" 1>&2; exit 1; }
;;
esac
@@ -2993,7 +3099,10 @@ esac
done
IFS="$ac_save_ifs"
-eval TERMINFO_DIRS="$cf_dst_path"
+
+
+eval 'TERMINFO_DIRS="$cf_dst_path"'
+
echo "$ac_t""$TERMINFO_DIRS" 1>&6
test -n "$TERMINFO_DIRS" && cat >> confdefs.h <<EOF
@@ -3002,7 +3111,7 @@ EOF
echo $ac_n "checking for default terminfo directory""... $ac_c" 1>&6
-echo "configure:3006: checking for default terminfo directory" >&5
+echo "configure:3115: checking for default terminfo directory" >&5
# Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
if test "${with_default_terminfo_dir+set}" = set; then
@@ -3013,7 +3122,9 @@ else
fi
case ".$withval" in #(vi
-./*) #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+ ;;
+..|./*|.\\*) #(vi
;;
.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
;;
@@ -3029,7 +3140,7 @@ case ".$withval" in #(vi
withval=`echo $withval | sed -e s@NONE@$ac_default_prefix@`
;;
*)
- { echo "configure: error: expected a pathname" 1>&2; exit 1; }
+ { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; }
;;
esac
@@ -3045,10 +3156,11 @@ fi
+
### use option --disable-big-core to make tic run on small machines
### We need 4Mb, check if we can allocate 50% more than that.
echo $ac_n "checking if big-core option selected""... $ac_c" 1>&6
-echo "configure:3052: checking if big-core option selected" >&5
+echo "configure:3164: checking if big-core option selected" >&5
# Check whether --enable-big-core or --disable-big-core was given.
if test "${enable_big_core+set}" = set; then
@@ -3059,7 +3171,7 @@ else
with_big_core=no
else
cat > conftest.$ac_ext <<EOF
-#line 3063 "configure"
+#line 3175 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -3072,7 +3184,7 @@ int main() {
exit(s == 0);
}
EOF
-if { (eval echo configure:3076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
with_big_core=yes
else
@@ -3094,7 +3206,7 @@ EOF
### use option --enable-termcap to compile in the termcap fallback support
echo $ac_n "checking if you want termcap-fallback support""... $ac_c" 1>&6
-echo "configure:3098: checking if you want termcap-fallback support" >&5
+echo "configure:3210: checking if you want termcap-fallback support" >&5
# Check whether --enable-termcap or --disable-termcap was given.
if test "${enable_termcap+set}" = set; then
@@ -3107,15 +3219,81 @@ fi
echo "$ac_t""$with_termcap" 1>&6
if test "$with_termcap" != "yes" ; then
+ if test "$use_database" = no ; then
+ if test -z $with_fallback ; then
+ { echo "configure: error: You have disabled the database w/o specifying fallbacks" 1>&2; exit 1; }
+ fi
+ fi
cat >> confdefs.h <<\EOF
#define PURE_TERMINFO 1
EOF
else
+cat >> confdefs.h <<\EOF
+#define USE_TERMCAP 1
+EOF
+
+echo $ac_n "checking for list of termcap files""... $ac_c" 1>&6
+echo "configure:3239: checking for list of termcap files" >&5
+
+
+
+# Check whether --with-termpath or --without-termpath was given.
+if test "${with_termpath+set}" = set; then
+ withval="$with_termpath"
+ :
+else
+ withval=${TERMPATH-/etc/termcap:/usr/share/misc/termcap}
+fi
+
+IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${PATHSEP}"
+cf_dst_path=
+for cf_src_path in $withval
+do
+
+case ".$cf_src_path" in #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+ ;;
+..|./*|.\\*) #(vi
+ ;;
+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
+ ;;
+.\${*prefix}*) #(vi
+ eval cf_src_path="$cf_src_path"
+ case ".$cf_src_path" in #(vi
+ .NONE/*)
+ cf_src_path=`echo $cf_src_path | sed -e s@NONE@$ac_default_prefix@`
+ ;;
+ esac
+ ;; #(vi
+.NONE/*)
+ cf_src_path=`echo $cf_src_path | sed -e s@NONE@$ac_default_prefix@`
+ ;;
+*)
+ { echo "configure: error: expected a pathname, not \"$cf_src_path\"" 1>&2; exit 1; }
+ ;;
+esac
+
+ test -n "$cf_dst_path" && cf_dst_path="${cf_dst_path}:"
+ cf_dst_path="${cf_dst_path}${cf_src_path}"
+done
+IFS="$ac_save_ifs"
+
+
+
+eval 'TERMPATH="$cf_dst_path"'
+
+
+echo "$ac_t""$TERMPATH" 1>&6
+test -n "$TERMPATH" && cat >> confdefs.h <<EOF
+#define TERMPATH "$TERMPATH"
+EOF
+
+
### use option --enable-getcap to use a hacked getcap for reading termcaps
echo $ac_n "checking if fast termcap-loader is needed""... $ac_c" 1>&6
-echo "configure:3119: checking if fast termcap-loader is needed" >&5
+echo "configure:3297: checking if fast termcap-loader is needed" >&5
# Check whether --enable-getcap or --disable-getcap was given.
if test "${enable_getcap+set}" = set; then
@@ -3132,7 +3310,7 @@ EOF
echo $ac_n "checking if translated termcaps will be cached in ~/.terminfo""... $ac_c" 1>&6
-echo "configure:3136: checking if translated termcaps will be cached in ~/.terminfo" >&5
+echo "configure:3314: checking if translated termcaps will be cached in ~/.terminfo" >&5
# Check whether --enable-getcap-cache or --disable-getcap-cache was given.
if test "${enable_getcap_cache+set}" = set; then
@@ -3158,12 +3336,12 @@ for ac_func in \
unlink
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3162: checking for $ac_func" >&5
+echo "configure:3340: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3167 "configure"
+#line 3345 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3186,7 +3364,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3217,12 +3395,12 @@ if test "$ac_cv_prog_cc_cross" = yes ; then
symlink
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3221: checking for $ac_func" >&5
+echo "configure:3399: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3226 "configure"
+#line 3404 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3245,7 +3423,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3271,7 +3449,7 @@ done
else
echo $ac_n "checking if link/symlink functions work""... $ac_c" 1>&6
-echo "configure:3275: checking if link/symlink functions work" >&5
+echo "configure:3453: checking if link/symlink functions work" >&5
if eval "test \"`echo '$''{'cf_cv_link_funcs'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3283,7 +3461,7 @@ else
eval 'ac_cv_func_'$cf_func'=error'
else
cat > conftest.$ac_ext <<EOF
-#line 3287 "configure"
+#line 3465 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -3312,7 +3490,7 @@ int main()
}
EOF
-if { (eval echo configure:3316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -3349,7 +3527,7 @@ with_symlinks=no
if test "$ac_cv_func_link" != yes ; then
echo $ac_n "checking if tic should use symbolic links""... $ac_c" 1>&6
-echo "configure:3353: checking if tic should use symbolic links" >&5
+echo "configure:3531: checking if tic should use symbolic links" >&5
if test "$ac_cv_func_symlink" = yes ; then
with_symlinks=yes
else
@@ -3358,7 +3536,7 @@ echo "configure:3353: checking if tic should use symbolic links" >&5
echo "$ac_t""$with_symlinks" 1>&6
elif test "$ac_cv_func_symlink" != yes ; then
echo $ac_n "checking if tic should use hard links""... $ac_c" 1>&6
-echo "configure:3362: checking if tic should use hard links" >&5
+echo "configure:3540: checking if tic should use hard links" >&5
if test "$ac_cv_func_link" = yes ; then
with_links=yes
else
@@ -3367,7 +3545,7 @@ echo "configure:3362: checking if tic should use hard links" >&5
echo "$ac_t""$with_links" 1>&6
else
echo $ac_n "checking if tic should use symbolic links""... $ac_c" 1>&6
-echo "configure:3371: checking if tic should use symbolic links" >&5
+echo "configure:3549: checking if tic should use symbolic links" >&5
# Check whether --enable-symlinks or --disable-symlinks was given.
if test "${enable_symlinks+set}" = set; then
@@ -3391,7 +3569,7 @@ EOF
### use option --enable-broken-linker to force on use of broken-linker support
echo $ac_n "checking if you want broken-linker support code""... $ac_c" 1>&6
-echo "configure:3395: checking if you want broken-linker support code" >&5
+echo "configure:3573: checking if you want broken-linker support code" >&5
# Check whether --enable-broken_linker or --disable-broken_linker was given.
if test "${enable_broken_linker+set}" = set; then
@@ -3402,19 +3580,52 @@ else
fi
echo "$ac_t""$with_broken_linker" 1>&6
-test "$with_broken_linker" = yes && cat >> confdefs.h <<\EOF
+
+BROKEN_LINKER=0
+if test "$with_broken_linker" = yes ; then
+ cat >> confdefs.h <<\EOF
+#define BROKEN_LINKER 1
+EOF
+
+ BROKEN_LINKER=1
+elif test $DFT_LWR_MODEL = shared ; then
+ case $cf_cv_system_name in #(vi
+ cygwin*)
+ cat >> confdefs.h <<\EOF
#define BROKEN_LINKER 1
EOF
+ BROKEN_LINKER=1
+ test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6
+
+ ;;
+ esac
+fi
+
+
+### use option --with-bool to override bool's type
+echo $ac_n "checking for type of bool""... $ac_c" 1>&6
+echo "configure:3609: checking for type of bool" >&5
+
+# Check whether --with-bool or --without-bool was given.
+if test "${with_bool+set}" = set; then
+ withval="$with_bool"
+ NCURSES_BOOL="$withval"
+else
+ NCURSES_BOOL=auto
+fi
+
+echo "$ac_t""$NCURSES_BOOL" 1>&6
+
### use option --with-ospeed to override ospeed's type
echo $ac_n "checking for type of ospeed""... $ac_c" 1>&6
-echo "configure:3413: checking for type of ospeed" >&5
+echo "configure:3624: checking for type of ospeed" >&5
# Check whether --with-ospeed or --without-ospeed was given.
if test "${with_ospeed+set}" = set; then
withval="$with_ospeed"
- NCURSES_OSPEED=$withval
+ NCURSES_OSPEED="$withval"
else
NCURSES_OSPEED=short
fi
@@ -3424,7 +3635,7 @@ echo "$ac_t""$NCURSES_OSPEED" 1>&6
### use option --enable-bsdpad to have tputs process BSD-style prefix padding
echo $ac_n "checking if tputs should process BSD-style prefix padding""... $ac_c" 1>&6
-echo "configure:3428: checking if tputs should process BSD-style prefix padding" >&5
+echo "configure:3639: checking if tputs should process BSD-style prefix padding" >&5
# Check whether --enable-bsdpad or --disable-bsdpad was given.
if test "${enable_bsdpad+set}" = set; then
@@ -3442,7 +3653,7 @@ EOF
### Enable compiling-in rcs id's
echo $ac_n "checking if RCS identifiers should be compiled-in""... $ac_c" 1>&6
-echo "configure:3446: checking if RCS identifiers should be compiled-in" >&5
+echo "configure:3657: checking if RCS identifiers should be compiled-in" >&5
# Check whether --with-rcs-ids or --without-rcs-ids was given.
if test "${with_rcs_ids+set}" = set; then
@@ -3464,19 +3675,19 @@ EOF
echo $ac_n "checking format of man-pages""... $ac_c" 1>&6
-echo "configure:3468: checking format of man-pages" >&5
+echo "configure:3679: checking format of man-pages" >&5
# Check whether --with-manpage-format or --without-manpage-format was given.
if test "${with_manpage_format+set}" = set; then
withval="$with_manpage_format"
- cf_manpage_form=$withval
+ MANPAGE_FORMAT=$withval
else
- cf_manpage_form=unknown
+ MANPAGE_FORMAT=unknown
fi
-case ".$cf_manpage_form" in
+case ".$MANPAGE_FORMAT" in
.gzip|.compress|.BSDI|.normal|.formatted) # (vi
;;
.unknown|.) # (vi
@@ -3485,7 +3696,7 @@ case ".$cf_manpage_form" in
fi
# look for the 'date' man-page (it's most likely to be installed!)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATHSEP}"
- cf_manpage_form=unknown
+ MANPAGE_FORMAT=unknown
for cf_dir in $MANPATH; do
test -z "$cf_dir" && cf_dir=/usr/man
for cf_name in $cf_dir/*/date.[01]* $cf_dir/*/date
@@ -3493,15 +3704,15 @@ case ".$cf_manpage_form" in
cf_test=`echo $cf_name | sed -e 's/*//'`
if test "x$cf_test" = "x$cf_name" ; then
case "$cf_name" in
- *.gz) cf_manpage_form=gzip;;
- *.Z) cf_manpage_form=compress;;
- *.0) cf_manpage_form=BSDI,formatted;;
- *) cf_manpage_form=normal;;
+ *.gz) MANPAGE_FORMAT=gzip;;
+ *.Z) MANPAGE_FORMAT=compress;;
+ *.0) MANPAGE_FORMAT=BSDI,formatted;;
+ *) MANPAGE_FORMAT=normal;;
esac
break
fi
done
- if test "$cf_manpage_form" != "unknown" ; then
+ if test "$MANPAGE_FORMAT" != "unknown" ; then
break
fi
done
@@ -3512,82 +3723,85 @@ case ".$cf_manpage_form" in
;;
esac
-echo "$ac_t""$cf_manpage_form" 1>&6
+echo "$ac_t""$MANPAGE_FORMAT" 1>&6
echo $ac_n "checking for manpage renaming""... $ac_c" 1>&6
-echo "configure:3520: checking for manpage renaming" >&5
+echo "configure:3731: checking for manpage renaming" >&5
# Check whether --with-manpage-renames or --without-manpage-renames was given.
if test "${with_manpage_renames+set}" = set; then
withval="$with_manpage_renames"
- cf_manpage_renames=$withval
+ MANPAGE_RENAMES=$withval
else
- cf_manpage_renames=yes
+ MANPAGE_RENAMES=yes
fi
-case ".$cf_manpage_renames" in #(vi
+case ".$MANPAGE_RENAMES" in #(vi
.no) #(vi
;;
.|.yes)
# Debian 'man' program?
if test -f /etc/debian_version ; then
- cf_manpage_renames=`cd $srcdir && pwd`/man/man_db.renames
+ MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames
else
- cf_manpage_renames=no
+ MANPAGE_RENAMES=no
fi
;;
esac
-if test "$cf_manpage_renames" != no ; then
- if test ! -f $cf_manpage_renames ; then
- { echo "configure: error: not a filename: $cf_manpage_renames" 1>&2; exit 1; }
+if test "$MANPAGE_RENAMES" != no ; then
+ if test -f $srcdir/man/$MANPAGE_RENAMES ; then
+ MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
+ elif test ! -f $MANPAGE_RENAMES ; then
+ { echo "configure: error: not a filename: $MANPAGE_RENAMES" 1>&2; exit 1; }
fi
test ! -d man && mkdir man
# Construct a sed-script to perform renaming within man-pages
- if test -n "$cf_manpage_renames" ; then
+ if test -n "$MANPAGE_RENAMES" ; then
test ! -d man && mkdir man
- $srcdir/man/make_sed.sh $cf_manpage_renames >man/edit_man.sed
+ sh $srcdir/man/make_sed.sh $MANPAGE_RENAMES >man/edit_man.sed
fi
fi
-echo "$ac_t""$cf_manpage_renames" 1>&6
+echo "$ac_t""$MANPAGE_RENAMES" 1>&6
+
echo $ac_n "checking for manpage symlinks""... $ac_c" 1>&6
-echo "configure:3563: checking for manpage symlinks" >&5
+echo "configure:3777: checking for manpage symlinks" >&5
# Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
if test "${with_manpage_symlinks+set}" = set; then
withval="$with_manpage_symlinks"
- cf_manpage_symlinks=$withval
+ MANPAGE_SYMLINKS=$withval
else
- cf_manpage_symlinks=yes
+ MANPAGE_SYMLINKS=yes
fi
-echo "$ac_t""$cf_manpage_symlinks" 1>&6
+echo "$ac_t""$MANPAGE_SYMLINKS" 1>&6
echo $ac_n "checking for manpage tbl""... $ac_c" 1>&6
-echo "configure:3579: checking for manpage tbl" >&5
+echo "configure:3793: checking for manpage tbl" >&5
# Check whether --with-manpage-tbl or --without-manpage-tbl was given.
if test "${with_manpage_tbl+set}" = set; then
withval="$with_manpage_tbl"
- cf_manpage_tbl=$withval
+ MANPAGE_TBL=$withval
else
- cf_manpage_tbl=no
+ MANPAGE_TBL=no
fi
-echo "$ac_t""$cf_manpage_tbl" 1>&6
+echo "$ac_t""$MANPAGE_TBL" 1>&6
if test "$prefix" = "NONE" ; then
@@ -3596,7 +3810,7 @@ echo "$ac_t""$cf_manpage_tbl" 1>&6
cf_prefix="$prefix"
fi
- case "$cf_manpage_form" in # (vi
+ case "$MANPAGE_FORMAT" in # (vi
*formatted*) # (vi
cf_subdir='$mandir/cat'
cf_format=yes
@@ -3613,8 +3827,9 @@ cat >man/edit_man.sh <<CF_EOF
# this script is generated by the configure-script
prefix="$cf_prefix"
datadir="$datadir"
+NCURSES_OSPEED="$NCURSES_OSPEED"
TERMINFO="$TERMINFO"
-MKDIRS="`cd $srcdir && pwd`/mkinstalldirs"
+MKDIRS="sh `cd $srcdir && pwd`/mkinstalldirs"
INSTALL="$INSTALL"
INSTALL_DATA="$INSTALL_DATA"
transform="$program_transform_name"
@@ -3650,13 +3865,13 @@ case \$i in #(vi
continue
fi
CF_EOF
-if test "$cf_manpage_symlinks" = yes ; then
+if test "$MANPAGE_SYMLINKS" = yes ; then
cat >>man/edit_man.sh <<CF_EOF
aliases=\`sed -f \$srcdir/manlinks.sed \$inalias | sort -u\`
CF_EOF
fi
-if test "$cf_manpage_renames" = no ; then
+if test "$MANPAGE_RENAMES" = no ; then
cat >>man/edit_man.sh <<CF_EOF
# perform program transformations for section 1 man pages
if test \$section = 1 ; then
@@ -3667,7 +3882,7 @@ cat >>man/edit_man.sh <<CF_EOF
CF_EOF
else
cat >>man/edit_man.sh <<CF_EOF
- target=\`grep "^\$source" $cf_manpage_renames | $AWK '{print \$2}'\`
+ target=\`grep "^\$source" $MANPAGE_RENAMES | $AWK '{print \$2}'\`
if test -z "\$target" ; then
echo '? missing rename for '\$source
target="\$source"
@@ -3688,6 +3903,7 @@ CF_EOF
cat >>man/edit_man.sh <<CF_EOF
sed -e "s,@DATADIR@,\$datadir," \\
-e "s,@TERMINFO@,\$TERMINFO," \\
+ -e "s,@NCURSES_OSPEED@,\$NCURSES_OSPEED," \\
CF_EOF
for cf_name in captoinfo clear infocmp infotocap tic toe tput
@@ -3698,10 +3914,16 @@ cat >>man/edit_man.sh <<CF_EOF
CF_EOF
done
+if test -f $MANPAGE_RENAMES ; then
+cat >>man/edit_man.sh <<CF_EOF
+ < \$i | sed -f edit_man.sed >\$TMP
+CF_EOF
+else
cat >>man/edit_man.sh <<CF_EOF
< \$i >\$TMP
CF_EOF
-if test $cf_manpage_tbl = yes ; then
+fi
+if test $MANPAGE_TBL = yes ; then
cat >>man/edit_man.sh <<CF_EOF
tbl \$TMP >\$TMP.out
mv \$TMP.out \$TMP
@@ -3719,7 +3941,7 @@ cat >>man/edit_man.sh <<CF_EOF
mv \$TMP.out \$TMP
CF_EOF
fi
-case "$cf_manpage_form" in #(vi
+case "$MANPAGE_FORMAT" in #(vi
*compress*) #(vi
cat >>man/edit_man.sh <<CF_EOF
if test \$verb = installing ; then
@@ -3814,7 +4036,7 @@ chmod 755 man/edit_man.sh
### Note that some functions (such as const) are normally disabled anyway.
echo $ac_n "checking if you want to build with function extensions""... $ac_c" 1>&6
-echo "configure:3818: checking if you want to build with function extensions" >&5
+echo "configure:4040: checking if you want to build with function extensions" >&5
# Check whether --enable-ext-funcs or --disable-ext-funcs was given.
if test "${enable_ext_funcs+set}" = set; then
@@ -3826,6 +4048,7 @@ fi
echo "$ac_t""$with_ext_funcs" 1>&6
if test "$with_ext_funcs" = yes ; then
+ NCURSES_EXT_FUNCS=1
cat >> confdefs.h <<\EOF
#define HAVE_CURSES_VERSION 1
EOF
@@ -3850,11 +4073,14 @@ EOF
#define NCURSES_EXT_FUNCS 1
EOF
+else
+ NCURSES_EXT_FUNCS=0
fi
+
### use option --enable-const to turn on use of const beyond that in XSI.
echo $ac_n "checking for extended use of const keyword""... $ac_c" 1>&6
-echo "configure:3858: checking for extended use of const keyword" >&5
+echo "configure:4084: checking for extended use of const keyword" >&5
# Check whether --enable-const or --disable-const was given.
if test "${enable_const+set}" = set; then
@@ -3872,7 +4098,7 @@ fi
echo $ac_n "checking if you want \$NCURSES_NO_PADDING code""... $ac_c" 1>&6
-echo "configure:3876: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "configure:4102: checking if you want \$NCURSES_NO_PADDING code" >&5
# Check whether --enable-no-padding or --disable-no-padding was given.
if test "${enable_no_padding+set}" = set; then
@@ -3890,7 +4116,7 @@ EOF
### use option --enable-sigwinch to turn on use of SIGWINCH logic
echo $ac_n "checking if you want SIGWINCH handler""... $ac_c" 1>&6
-echo "configure:3894: checking if you want SIGWINCH handler" >&5
+echo "configure:4120: checking if you want SIGWINCH handler" >&5
# Check whether --enable-sigwinch or --disable-sigwinch was given.
if test "${enable_sigwinch+set}" = set; then
@@ -3908,7 +4134,7 @@ EOF
### use option --enable-tcap-names to allow user to define new capabilities
echo $ac_n "checking if you want user-definable terminal capabilities like termcap""... $ac_c" 1>&6
-echo "configure:3912: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "configure:4138: checking if you want user-definable terminal capabilities like termcap" >&5
# Check whether --enable-tcap-names or --disable-tcap-names was given.
if test "${enable_tcap_names+set}" = set; then
@@ -3927,7 +4153,7 @@ test "$with_tcap_names" = yes && NCURSES_XNAMES=1
# These options are relatively safe to experiment with.
echo $ac_n "checking if you want all development code""... $ac_c" 1>&6
-echo "configure:3931: checking if you want all development code" >&5
+echo "configure:4157: checking if you want all development code" >&5
# Check whether --with-develop or --without-develop was given.
if test "${with_develop+set}" = set; then
@@ -3941,11 +4167,11 @@ echo "$ac_t""$with_develop" 1>&6
### use option --enable-colorfgbg to turn on use of $COLORFGBG environment
echo $ac_n "checking if you want colorfgbg code""... $ac_c" 1>&6
-echo "configure:3945: checking if you want colorfgbg code" >&5
+echo "configure:4171: checking if you want colorfgbg code" >&5
-# Check whether --enable-hard-tabs or --disable-hard-tabs was given.
-if test "${enable_hard_tabs+set}" = set; then
- enableval="$enable_hard_tabs"
+# Check whether --enable-enable-colorfgbg or --disable-enable-colorfgbg was given.
+if test "${enable_enable_colorfgbg+set}" = set; then
+ enableval="$enable_enable_colorfgbg"
with_colorfgbg=$enableval
else
with_colorfgbg=$with_develop
@@ -3959,7 +4185,7 @@ EOF
### use option --enable-hard-tabs to turn on use of hard-tabs optimize
echo $ac_n "checking if you want hard-tabs code""... $ac_c" 1>&6
-echo "configure:3963: checking if you want hard-tabs code" >&5
+echo "configure:4189: checking if you want hard-tabs code" >&5
# Check whether --enable-hard-tabs or --disable-hard-tabs was given.
if test "${enable_hard_tabs+set}" = set; then
@@ -3976,7 +4202,7 @@ EOF
echo $ac_n "checking if you want to use restrict environment when running as root""... $ac_c" 1>&6
-echo "configure:3980: checking if you want to use restrict environment when running as root" >&5
+echo "configure:4206: checking if you want to use restrict environment when running as root" >&5
# Check whether --enable-root-environ or --disable-root-environ was given.
if test "${enable_root_environ+set}" = set; then
@@ -3994,7 +4220,7 @@ EOF
### use option --enable-xmc-glitch to turn on use of magic-cookie optimize
echo $ac_n "checking if you want limited support for xmc""... $ac_c" 1>&6
-echo "configure:3998: checking if you want limited support for xmc" >&5
+echo "configure:4224: checking if you want limited support for xmc" >&5
# Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
if test "${enable_xmc_glitch+set}" = set; then
@@ -4015,7 +4241,7 @@ EOF
echo $ac_n "checking if you do not want to assume colors are white-on-black""... $ac_c" 1>&6
-echo "configure:4019: checking if you do not want to assume colors are white-on-black" >&5
+echo "configure:4245: checking if you do not want to assume colors are white-on-black" >&5
# Check whether --enable-assumed-color or --disable-assumed-color was given.
if test "${enable_assumed_color+set}" = set; then
@@ -4033,7 +4259,7 @@ EOF
### use option --enable-hashmap to turn on use of hashmap scrolling logic
echo $ac_n "checking if you want hashmap scrolling-optimization code""... $ac_c" 1>&6
-echo "configure:4037: checking if you want hashmap scrolling-optimization code" >&5
+echo "configure:4263: checking if you want hashmap scrolling-optimization code" >&5
# Check whether --enable-hashmap or --disable-hashmap was given.
if test "${enable_hashmap+set}" = set; then
@@ -4050,7 +4276,7 @@ EOF
echo $ac_n "checking if you want experimental safe-sprintf code""... $ac_c" 1>&6
-echo "configure:4054: checking if you want experimental safe-sprintf code" >&5
+echo "configure:4280: checking if you want experimental safe-sprintf code" >&5
# Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
if test "${enable_safe_sprintf+set}" = set; then
@@ -4070,7 +4296,7 @@ EOF
# when hashmap is used scroll hints are useless
if test "$with_hashmap" = no ; then
echo $ac_n "checking if you want to experiment without scrolling-hints code""... $ac_c" 1>&6
-echo "configure:4074: checking if you want to experiment without scrolling-hints code" >&5
+echo "configure:4300: checking if you want to experiment without scrolling-hints code" >&5
# Check whether --enable-scroll-hints or --disable-scroll-hints was given.
if test "${enable_scroll_hints+set}" = set; then
@@ -4088,8 +4314,11 @@ EOF
fi
### use option --enable-widec to turn on use of wide-character support
+NCURSES_CH_T=chtype
+NCURSES_LIBUTF8=0
+NCURSES_MBSTATE_T=0
echo $ac_n "checking if you want experimental wide-character code""... $ac_c" 1>&6
-echo "configure:4093: checking if you want experimental wide-character code" >&5
+echo "configure:4322: checking if you want experimental wide-character code" >&5
# Check whether --enable-widec or --disable-widec was given.
if test "${enable_widec+set}" = set; then
@@ -4106,14 +4335,203 @@ if test "$with_widec" = yes ; then
#define USE_WIDEC_SUPPORT 1
EOF
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ with_overwrite=no
+ NCURSES_CH_T=cchar_t
+ echo $ac_n "checking for putwc""... $ac_c" 1>&6
+echo "configure:4343: checking for putwc" >&5
+if eval "test \"`echo '$''{'ac_cv_func_putwc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 4348 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char putwc(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char putwc();
+
+int main() {
+
+/* The GNU C library defines this 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_putwc) || defined (__stub___putwc)
+choke me
+#else
+putwc();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:4371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_putwc=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_putwc=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'putwc`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+if test "$ac_cv_func_putwc" != yes ; then
+
+echo $ac_n "checking for putwc in libutf8""... $ac_c" 1>&6
+echo "configure:4393: checking for putwc in libutf8" >&5
+if eval "test \"`echo '$''{'cf_cv_libutf8'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ cf_save_LIBS="$LIBS"
+ LIBS="-lutf8 $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 4401 "configure"
+#include "confdefs.h"
+
+#include <libutf8.h>
+int main() {
+putwc(0,0);
+; return 0; }
+EOF
+if { (eval echo configure:4409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ cf_cv_libutf8=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cf_cv_libutf8=no
+fi
+rm -f conftest*
+ LIBS="$cf_save_LIBS"
+
fi
+echo "$ac_t""$cf_cv_libutf8" 1>&6
+
+if test "$cf_cv_libutf8" = yes ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_LIBUTF8_H 1
+EOF
+
+ LIBS="-lutf8 $LIBS"
+fi
+
+ if test "$cf_cv_libutf8" = yes ; then
+ NCURSES_LIBUTF8=1
+ fi
+fi
+
+# This is needed on Tru64 5.0 to declare mbstate_t
+echo $ac_n "checking if we must include wchar.h to declare mbstate_t""... $ac_c" 1>&6
+echo "configure:4440: checking if we must include wchar.h to declare mbstate_t" >&5
+if eval "test \"`echo '$''{'cf_cv_mbstate_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+cat > conftest.$ac_ext <<EOF
+#line 4446 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+#ifdef HAVE_LIBUTF8_H
+#include <libutf8.h>
+#endif
+int main() {
+mbstate_t state
+; return 0; }
+EOF
+if { (eval echo configure:4457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cf_cv_mbstate_t=no
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cat > conftest.$ac_ext <<EOF
+#line 4465 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+#include <wchar.h>
+#ifdef HAVE_LIBUTF8_H
+#include <libutf8.h>
+#endif
+int main() {
+mbstate_t value
+; return 0; }
+EOF
+if { (eval echo configure:4477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cf_cv_mbstate_t=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cf_cv_mbstate_t=unknown
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$cf_cv_mbstate_t" 1>&6
+
+if test "$cf_cv_mbstate_t" = yes ; then
+ cat >> confdefs.h <<\EOF
+#define NEED_WCHAR_H 1
+EOF
+
+fi
+
+if test "$cf_cv_mbstate_t" != unknown ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_MBSTATE_T 1
+EOF
+
+fi
+
+ if test $cf_cv_mbstate_t = yes ; then
+ NCURSES_MBSTATE_T=1
+ fi
+fi
+
+
+
+
+echo $ac_n "checking for terminal capabilities file""... $ac_c" 1>&6
+echo "configure:4516: checking for terminal capabilities file" >&5
+
+# Check whether --with-caps or --without-caps was given.
+if test "${with_caps+set}" = set; then
+ withval="$with_caps"
+ TERMINFO_CAPS=Caps.$withval
+else
+ TERMINFO_CAPS=Caps
+fi
+
+test -f ${srcdir}/include/${TERMINFO_CAPS} || TERMINFO_CAPS=Caps
+echo "$ac_t""$TERMINFO_CAPS" 1>&6
+
+
###############################################################################
### use option --disable-echo to suppress full display compiling commands
echo $ac_n "checking if you want to display full commands during build""... $ac_c" 1>&6
-echo "configure:4117: checking if you want to display full commands during build" >&5
+echo "configure:4535: checking if you want to display full commands during build" >&5
# Check whether --enable-echo or --disable-echo was given.
if test "${enable_echo+set}" = set; then
@@ -4134,7 +4552,7 @@ echo "$ac_t""$with_echo" 1>&6
### use option --enable-warnings to turn on all gcc warnings
echo $ac_n "checking if you want to see compiler warnings""... $ac_c" 1>&6
-echo "configure:4138: checking if you want to see compiler warnings" >&5
+echo "configure:4556: checking if you want to see compiler warnings" >&5
# Check whether --enable-warnings or --disable-warnings was given.
if test "${enable_warnings+set}" = set; then
@@ -4150,11 +4568,11 @@ if test -n "$with_warnings"; then
if test "$GCC" = yes
then
cat > conftest.$ac_ext <<EOF
-#line 4154 "configure"
+#line 4572 "configure"
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
EOF
echo "checking for $CC warning options" 1>&6
-echo "configure:4158: checking for $CC warning options" >&5
+echo "configure:4576: checking for $CC warning options" >&5
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-W -Wall"
cf_warn_CONST=""
@@ -4172,7 +4590,7 @@ echo "configure:4158: checking for $CC warning options" >&5
Wstrict-prototypes $cf_warn_CONST
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo configure:4176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:4594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES"
@@ -4204,9 +4622,9 @@ EOF
if test "$GCC" = yes
then
echo "checking for $CC __attribute__ directives" 1>&6
-echo "configure:4208: checking for $CC __attribute__ directives" >&5
+echo "configure:4626: checking for $CC __attribute__ directives" >&5
cat > conftest.$ac_ext <<EOF
-#line 4210 "configure"
+#line 4628 "configure"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -4244,7 +4662,7 @@ EOF
EOF
;;
esac
- if { (eval echo configure:4248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:4666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6
cat conftest.h >>confdefs.h
# else
@@ -4260,7 +4678,7 @@ fi
### use option --enable-assertions to turn on generation of assertion code
echo $ac_n "checking if you want to enable runtime assertions""... $ac_c" 1>&6
-echo "configure:4264: checking if you want to enable runtime assertions" >&5
+echo "configure:4682: checking if you want to enable runtime assertions" >&5
# Check whether --enable-assertions or --disable-assertions was given.
if test "${enable_assertions+set}" = set; then
@@ -4327,12 +4745,12 @@ fi
### Checks for libraries.
echo $ac_n "checking for gettimeofday""... $ac_c" 1>&6
-echo "configure:4331: checking for gettimeofday" >&5
+echo "configure:4749: checking for gettimeofday" >&5
if eval "test \"`echo '$''{'ac_cv_func_gettimeofday'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4336 "configure"
+#line 4754 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gettimeofday(); below. */
@@ -4355,7 +4773,7 @@ gettimeofday();
; return 0; }
EOF
-if { (eval echo configure:4359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gettimeofday=yes"
else
@@ -4378,7 +4796,7 @@ else
echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
-echo "configure:4382: checking for gettimeofday in -lbsd" >&5
+echo "configure:4800: checking for gettimeofday in -lbsd" >&5
ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4386,7 +4804,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lbsd $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4390 "configure"
+#line 4808 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4397,7 +4815,7 @@ int main() {
gettimeofday()
; return 0; }
EOF
-if { (eval echo configure:4401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4425,13 +4843,13 @@ fi
echo $ac_n "checking if -lm needed for math functions""... $ac_c" 1>&6
-echo "configure:4429: checking if -lm needed for math functions" >&5
+echo "configure:4847: checking if -lm needed for math functions" >&5
if eval "test \"`echo '$''{'cf_cv_need_libm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4435 "configure"
+#line 4853 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -4441,7 +4859,7 @@ int main() {
double x = rand(); printf("result = %g\n", sin(x))
; return 0; }
EOF
-if { (eval echo configure:4445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_need_libm=no
else
@@ -4462,13 +4880,71 @@ fi
### Checks for header files.
+
+echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6
+echo "configure:4886: checking if we must define _GNU_SOURCE" >&5
+if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+cat > conftest.$ac_ext <<EOF
+#line 4892 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+int main() {
+
+#ifndef _XOPEN_SOURCE
+make an error
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:4902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cf_cv_gnu_source=no
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cf_save="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ cat > conftest.$ac_ext <<EOF
+#line 4912 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+int main() {
+
+#ifdef _XOPEN_SOURCE
+make an error
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:4922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ cf_cv_gnu_source=no
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cf_cv_gnu_source=yes
+fi
+rm -f conftest*
+ CPPFLAGS="$cf_save"
+
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$cf_cv_gnu_source" 1>&6
+test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:4467: checking for ANSI C header files" >&5
+echo "configure:4943: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4472 "configure"
+#line 4948 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -4476,7 +4952,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4493,7 +4969,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 4497 "configure"
+#line 4973 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -4511,7 +4987,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 <<EOF
-#line 4515 "configure"
+#line 4991 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -4532,7 +5008,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 4536 "configure"
+#line 5012 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -4543,7 +5019,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:4547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -4571,12 +5047,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:4575: checking for $ac_hdr that defines DIR" >&5
+echo "configure:5051: checking for $ac_hdr that defines DIR" >&5
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4580 "configure"
+#line 5056 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -4584,7 +5060,7 @@ int main() {
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:4588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -4609,7 +5085,7 @@ done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:4613: checking for opendir in -ldir" >&5
+echo "configure:5089: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4617,7 +5093,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4621 "configure"
+#line 5097 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4628,7 +5104,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:4632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4650,7 +5126,7 @@ fi
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:4654: checking for opendir in -lx" >&5
+echo "configure:5130: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4658,7 +5134,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4662 "configure"
+#line 5138 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4669,7 +5145,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:4673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4691,15 +5167,50 @@ fi
fi
+echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
+echo "configure:5172: checking whether time.h and sys/time.h may both be included" >&5
+if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 5177 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+int main() {
+struct tm *tp;
+; return 0; }
+EOF
+if { (eval echo configure:5186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_header_time=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_header_time=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_header_time" 1>&6
+if test $ac_cv_header_time = yes; then
+ cat >> confdefs.h <<\EOF
+#define TIME_WITH_SYS_TIME 1
+EOF
+
+fi
+
echo $ac_n "checking for regular-expression headers""... $ac_c" 1>&6
-echo "configure:4697: checking for regular-expression headers" >&5
+echo "configure:5208: checking for regular-expression headers" >&5
if eval "test \"`echo '$''{'cf_cv_regex'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4703 "configure"
+#line 5214 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <regex.h>
@@ -4712,7 +5223,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:4716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_regex="regex.h"
else
@@ -4721,7 +5232,7 @@ else
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 4725 "configure"
+#line 5236 "configure"
#include "confdefs.h"
#include <regexp.h>
int main() {
@@ -4731,7 +5242,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:4735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_regex="regexp.h"
else
@@ -4742,7 +5253,7 @@ else
cf_save_LIBS="$LIBS"
LIBS="-lgen $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4746 "configure"
+#line 5257 "configure"
#include "confdefs.h"
#include <regexpr.h>
int main() {
@@ -4752,7 +5263,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:4756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_regex="regexpr.h"
else
@@ -4806,17 +5317,17 @@ unistd.h \
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4810: checking for $ac_hdr" >&5
+echo "configure:5321: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4815 "configure"
+#line 5326 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4847,7 +5358,7 @@ done
# Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
if test "$ISC" = yes ; then
echo $ac_n "checking for main in -lcposix""... $ac_c" 1>&6
-echo "configure:4851: checking for main in -lcposix" >&5
+echo "configure:5362: checking for main in -lcposix" >&5
ac_lib_var=`echo cposix'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4855,14 +5366,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4859 "configure"
+#line 5370 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:4866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4890,7 +5401,7 @@ else
fi
echo $ac_n "checking for bzero in -linet""... $ac_c" 1>&6
-echo "configure:4894: checking for bzero in -linet" >&5
+echo "configure:5405: checking for bzero in -linet" >&5
ac_lib_var=`echo inet'_'bzero | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4898,7 +5409,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-linet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 4902 "configure"
+#line 5413 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -4909,7 +5420,7 @@ int main() {
bzero()
; return 0; }
EOF
-if { (eval echo configure:4913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4932,13 +5443,13 @@ fi
echo $ac_n "checking if sys/time.h works with sys/select.h""... $ac_c" 1>&6
-echo "configure:4936: checking if sys/time.h works with sys/select.h" >&5
+echo "configure:5447: checking if sys/time.h works with sys/select.h" >&5
if eval "test \"`echo '$''{'cf_cv_sys_time_select'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4942 "configure"
+#line 5453 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -4953,7 +5464,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:4957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_sys_time_select=yes
else
@@ -4982,12 +5493,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4986: checking for working const" >&5
+echo "configure:5497: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 4991 "configure"
+#line 5502 "configure"
#include "confdefs.h"
int main() {
@@ -5036,7 +5547,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:5040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -5057,21 +5568,21 @@ EOF
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:5061: checking for inline" >&5
+echo "configure:5572: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 5068 "configure"
+#line 5579 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:5075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -5103,20 +5614,20 @@ EOF
echo $ac_n "checking if unsigned literals are legal""... $ac_c" 1>&6
-echo "configure:5107: checking if unsigned literals are legal" >&5
+echo "configure:5618: checking if unsigned literals are legal" >&5
if eval "test \"`echo '$''{'cf_cv_unsigned_literals'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5113 "configure"
+#line 5624 "configure"
#include "confdefs.h"
int main() {
long x = 1L + 1UL + 1U + 1
; return 0; }
EOF
-if { (eval echo configure:5120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_unsigned_literals=yes
else
@@ -5134,7 +5645,7 @@ echo "$ac_t""$cf_cv_unsigned_literals" 1>&6
echo $ac_n "checking for type of chtype""... $ac_c" 1>&6
-echo "configure:5138: checking for type of chtype" >&5
+echo "configure:5649: checking for type of chtype" >&5
if eval "test \"`echo '$''{'cf_cv_typeof_chtype'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5143,7 +5654,7 @@ else
cf_cv_typeof_chtype=long
else
cat > conftest.$ac_ext <<EOF
-#line 5147 "configure"
+#line 5658 "configure"
#include "confdefs.h"
#ifdef USE_WIDEC_SUPPORT
@@ -5189,7 +5700,7 @@ int main()
}
EOF
-if { (eval echo configure:5193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_typeof_chtype=`cat cf_test.out`
else
@@ -5220,94 +5731,17 @@ test "$cf_cv_typeof_chtype" = long && cf_cv_1UL="${cf_cv_1UL}L"
-
-echo $ac_n "checking for number of bits in chtype""... $ac_c" 1>&6
-echo "configure:5226: checking for number of bits in chtype" >&5
-if eval "test \"`echo '$''{'cf_cv_shift_limit'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
-
- if test "$cross_compiling" = yes; then
- cf_cv_shift_limit=32
-else
- cat > conftest.$ac_ext <<EOF
-#line 5235 "configure"
-#include "confdefs.h"
-
-#include <stdio.h>
-int main()
-{
- FILE *fp = fopen("cf_test.out", "w");
- if (fp != 0) {
- int n;
- unsigned TYPEOF_CHTYPE x = 1L;
- for (n = 0; ; n++) {
- unsigned long y = (x >> n);
- if (y != 1 || x == 0)
- break;
- x <<= 1;
- }
- fprintf(fp, "%d", n);
- fclose(fp);
- }
- exit(0);
-}
-
-EOF
-if { (eval echo configure:5258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- cf_cv_shift_limit=`cat cf_test.out`
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- cf_cv_shift_limit=32
-fi
-rm -fr conftest*
-fi
-
- rm -f cf_test.out
-
-fi
-
-echo "$ac_t""$cf_cv_shift_limit" 1>&6
-
-
-echo $ac_n "checking for width of character-index""... $ac_c" 1>&6
-echo "configure:5278: checking for width of character-index" >&5
-if eval "test \"`echo '$''{'cf_cv_widec_shift'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
-
-if test ".$with_widec" = ".yes" ; then
- cf_attrs_width=39
- if ( expr $cf_cv_shift_limit \> $cf_attrs_width >/dev/null )
- then
- cf_cv_widec_shift=`expr 16 + $cf_cv_shift_limit - $cf_attrs_width`
- else
- cf_cv_widec_shift=16
- fi
-else
- cf_cv_widec_shift=8
-fi
-
-fi
-
-echo "$ac_t""$cf_cv_widec_shift" 1>&6
-
-
-
### Checks for external-data
echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6
-echo "configure:5305: checking if external errno is declared" >&5
+echo "configure:5739: checking if external errno is declared" >&5
if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5311 "configure"
+#line 5745 "configure"
#include "confdefs.h"
#ifdef HAVE_STDLIB_H
@@ -5320,27 +5754,24 @@ int main() {
long x = (long) errno
; return 0; }
EOF
-if { (eval echo configure:5324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- eval 'cf_cv_dcl_'errno'=yes'
+ cf_cv_dcl_errno=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval 'cf_cv_dcl_'errno'=no'
+ cf_cv_dcl_errno=no
fi
rm -f conftest*
fi
+echo "$ac_t""$cf_cv_dcl_errno" 1>&6
-eval 'cf_result=$cf_cv_dcl_'errno
-echo "$ac_t""$cf_result" 1>&6
-
-if test "$cf_result" = no ; then
- eval 'cf_result=DECL_'errno
+if test "$cf_cv_dcl_errno" = no ; then
-cf_result=`echo "$cf_result" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+cf_result=`echo "decl_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
cat >> confdefs.h <<EOF
#define $cf_result 1
@@ -5351,13 +5782,13 @@ fi
# It's possible (for near-UNIX clones) that the data doesn't exist
echo $ac_n "checking if external errno exists""... $ac_c" 1>&6
-echo "configure:5355: checking if external errno exists" >&5
+echo "configure:5786: checking if external errno exists" >&5
if eval "test \"`echo '$''{'cf_cv_have_errno'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5361 "configure"
+#line 5792 "configure"
#include "confdefs.h"
#undef errno
@@ -5367,26 +5798,24 @@ int main() {
errno = 2
; return 0; }
EOF
-if { (eval echo configure:5371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- eval 'cf_cv_have_'errno'=yes'
+ cf_cv_have_errno=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval 'cf_cv_have_'errno'=no'
+ cf_cv_have_errno=no
fi
rm -f conftest*
-fi
+fi
-eval 'cf_result=$cf_cv_have_'errno
-echo "$ac_t""$cf_result" 1>&6
+echo "$ac_t""$cf_cv_have_errno" 1>&6
-if test "$cf_result" = yes ; then
- eval 'cf_result=HAVE_'errno
+if test "$cf_cv_have_errno" = yes ; then
-cf_result=`echo "$cf_result" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+cf_result=`echo "have_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
cat >> confdefs.h <<EOF
#define $cf_result 1
@@ -5399,23 +5828,23 @@ fi
echo $ac_n "checking if data-only library module links""... $ac_c" 1>&6
-echo "configure:5403: checking if data-only library module links" >&5
+echo "configure:5832: checking if data-only library module links" >&5
if eval "test \"`echo '$''{'cf_cv_link_dataonly'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
rm -f conftest.a
cat >conftest.$ac_ext <<EOF
-#line 5410 "configure"
+#line 5839 "configure"
int testdata[3] = { 123, 456, 789 };
EOF
- if { (eval echo configure:5413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } ; then
+ if { (eval echo configure:5842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } ; then
mv conftest.o data.o && \
( $AR $AR_OPTS conftest.a data.o ) 2>&5 1>/dev/null
fi
rm -f conftest.$ac_ext data.o
cat >conftest.$ac_ext <<EOF
-#line 5419 "configure"
+#line 5848 "configure"
int testfunc()
{
#if defined(NeXT)
@@ -5428,7 +5857,7 @@ int testfunc()
#endif
}
EOF
- if { (eval echo configure:5432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ if { (eval echo configure:5861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
mv conftest.o func.o && \
( $AR $AR_OPTS conftest.a func.o ) 2>&5 1>/dev/null
fi
@@ -5440,7 +5869,7 @@ EOF
cf_cv_link_dataonly=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 5444 "configure"
+#line 5873 "configure"
#include "confdefs.h"
int main()
@@ -5450,7 +5879,7 @@ else
}
EOF
-if { (eval echo configure:5454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_link_dataonly=yes
else
@@ -5467,10 +5896,15 @@ fi
fi
echo "$ac_t""$cf_cv_link_dataonly" 1>&6
-test "$cf_cv_link_dataonly" = no && cat >> confdefs.h <<\EOF
+
+if test "$cf_cv_link_dataonly" = no ; then
+ cat >> confdefs.h <<\EOF
#define BROKEN_LINKER 1
EOF
+ BROKEN_LINKER=1
+fi
+
### Checks for library functions.
@@ -5481,7 +5915,6 @@ geteuid \
getttynam \
issetugid \
memccpy \
-mkstemp \
nanosleep \
poll \
remove \
@@ -5495,18 +5928,16 @@ strdup \
strstr \
tcgetpgrp \
times \
-vfscanf \
vsnprintf \
-vsscanf \
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5505: checking for $ac_func" >&5
+echo "configure:5936: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5510 "configure"
+#line 5941 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -5529,7 +5960,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:5533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -5556,13 +5987,13 @@ done
if test "$with_getcap" = "yes" ; then
echo $ac_n "checking for terminal-capability database functions""... $ac_c" 1>&6
-echo "configure:5560: checking for terminal-capability database functions" >&5
+echo "configure:5991: checking for terminal-capability database functions" >&5
if eval "test \"`echo '$''{'cf_cv_cgetent'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5566 "configure"
+#line 5997 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -5577,7 +6008,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:5581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_cgetent=yes
else
@@ -5600,20 +6031,20 @@ fi
echo $ac_n "checking for isascii""... $ac_c" 1>&6
-echo "configure:5604: checking for isascii" >&5
+echo "configure:6035: checking for isascii" >&5
if eval "test \"`echo '$''{'cf_cv_have_isascii'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5610 "configure"
+#line 6041 "configure"
#include "confdefs.h"
#include <ctype.h>
int main() {
int x = isascii(' ')
; return 0; }
EOF
-if { (eval echo configure:5617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_have_isascii=yes
else
@@ -5634,9 +6065,9 @@ EOF
if test "$ac_cv_func_sigaction" = yes; then
echo $ac_n "checking whether sigaction needs _POSIX_SOURCE""... $ac_c" 1>&6
-echo "configure:5638: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "configure:6069: checking whether sigaction needs _POSIX_SOURCE" >&5
cat > conftest.$ac_ext <<EOF
-#line 5640 "configure"
+#line 6071 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -5645,7 +6076,7 @@ int main() {
struct sigaction act
; return 0; }
EOF
-if { (eval echo configure:5649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
sigact_bad=no
else
@@ -5654,7 +6085,7 @@ else
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 5658 "configure"
+#line 6089 "configure"
#include "confdefs.h"
#define _POSIX_SOURCE
@@ -5664,7 +6095,7 @@ int main() {
struct sigaction act
; return 0; }
EOF
-if { (eval echo configure:5668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
sigact_bad=yes
cat >> confdefs.h <<\EOF
@@ -5692,17 +6123,17 @@ unistd.h \
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5696: checking for $ac_hdr" >&5
+echo "configure:6127: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5701 "configure"
+#line 6132 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6137: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -5733,17 +6164,17 @@ if test "$ISC" = yes ; then
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5737: checking for $ac_hdr" >&5
+echo "configure:6168: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5742 "configure"
+#line 6173 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -5778,16 +6209,16 @@ if test "$ac_cv_header_termios_h" = yes ; then
esac
if test "$termios_bad" = maybe ; then
echo $ac_n "checking whether termios.h needs _POSIX_SOURCE""... $ac_c" 1>&6
-echo "configure:5782: checking whether termios.h needs _POSIX_SOURCE" >&5
+echo "configure:6213: checking whether termios.h needs _POSIX_SOURCE" >&5
cat > conftest.$ac_ext <<EOF
-#line 5784 "configure"
+#line 6215 "configure"
#include "confdefs.h"
#include <termios.h>
int main() {
struct termios foo; int x = foo.c_iflag
; return 0; }
EOF
-if { (eval echo configure:5791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
termios_bad=no
else
@@ -5796,7 +6227,7 @@ else
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 5800 "configure"
+#line 6231 "configure"
#include "confdefs.h"
#define _POSIX_SOURCE
@@ -5805,7 +6236,7 @@ int main() {
struct termios foo; int x = foo.c_iflag
; return 0; }
EOF
-if { (eval echo configure:5809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
termios_bad=unknown
else
@@ -5828,13 +6259,13 @@ fi
echo $ac_n "checking for tcgetattr""... $ac_c" 1>&6
-echo "configure:5832: checking for tcgetattr" >&5
+echo "configure:6263: checking for tcgetattr" >&5
if eval "test \"`echo '$''{'cf_cv_have_tcgetattr'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5838 "configure"
+#line 6269 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -5857,7 +6288,7 @@ TTY foo;
tcgetattr(1, &foo);
; return 0; }
EOF
-if { (eval echo configure:5861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_have_tcgetattr=yes
else
@@ -5876,11 +6307,247 @@ EOF
+echo $ac_n "checking for vsscanf function or workaround""... $ac_c" 1>&6
+echo "configure:6312: checking for vsscanf function or workaround" >&5
+if eval "test \"`echo '$''{'cf_cv_func_vsscanf'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+cat > conftest.$ac_ext <<EOF
+#line 6318 "configure"
+#include "confdefs.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+int main() {
+
+ va_list ap;
+ vsscanf("from", "%d", ap)
+; return 0; }
+EOF
+if { (eval echo configure:6329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ cf_cv_func_vsscanf=vsscanf
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+
+cat > conftest.$ac_ext <<EOF
+#line 6338 "configure"
+#include "confdefs.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+int main() {
+
+ FILE strbuf;
+ char *str = "from";
+
+ strbuf._flag = _IOREAD;
+ strbuf._ptr = strbuf._base = (unsigned char *) str;
+ strbuf._cnt = strlen(str);
+ strbuf._file = _NFILE;
+ return (vfscanf(&strbuf, "%d", ap))
+; return 0; }
+EOF
+if { (eval echo configure:6355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ cf_cv_func_vsscanf=vfscanf
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+
+cat > conftest.$ac_ext <<EOF
+#line 6364 "configure"
+#include "confdefs.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+int main() {
+
+ FILE strbuf;
+ char *str = "from";
+
+ strbuf._flag = _IOREAD;
+ strbuf._ptr = strbuf._base = (unsigned char *) str;
+ strbuf._cnt = strlen(str);
+ strbuf._file = _NFILE;
+ return (_doscan(&strbuf, "%d", ap))
+; return 0; }
+EOF
+if { (eval echo configure:6381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ cf_cv_func_vsscanf=_doscan
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+
+cf_cv_func_vsscanf=no
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$cf_cv_func_vsscanf" 1>&6
+
+case $cf_cv_func_vsscanf in #(vi
+vsscanf) cat >> confdefs.h <<\EOF
+#define HAVE_VSSCANF 1
+EOF
+;; #(vi
+vfscanf) cat >> confdefs.h <<\EOF
+#define HAVE_VFSCANF 1
+EOF
+;; #(vi
+_doscan) cat >> confdefs.h <<\EOF
+#define HAVE__DOSCAN 1
+EOF
+;;
+esac
+
+
+
+echo $ac_n "checking for working mkstemp""... $ac_c" 1>&6
+echo "configure:6418: checking for working mkstemp" >&5
+if eval "test \"`echo '$''{'cf_cv_func_mkstemp'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+rm -f conftest*
+if test "$cross_compiling" = yes; then
+ echo $ac_n "checking for mkstemp""... $ac_c" 1>&6
+echo "configure:6426: checking for mkstemp" >&5
+if eval "test \"`echo '$''{'ac_cv_func_mkstemp'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 6431 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char mkstemp(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char mkstemp();
+
+int main() {
+
+/* The GNU C library defines this 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_mkstemp) || defined (__stub___mkstemp)
+choke me
+#else
+mkstemp();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:6454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_mkstemp=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_mkstemp=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'mkstemp`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ :
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
+else
+ cat > conftest.$ac_ext <<EOF
+#line 6476 "configure"
+#include "confdefs.h"
+
+#include <sys/types.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+int main()
+{
+ char *tmpl = "conftestXXXXXX";
+ char name[2][80];
+ int n;
+ int result = 0;
+ int fd;
+ struct stat sb;
+
+ umask(077);
+ for (n = 0; n < 2; ++n) {
+ strcpy(name[n], tmpl);
+ if ((fd = mkstemp(name[n])) >= 0) {
+ if (!strcmp(name[n], tmpl)
+ || stat(name[n], &sb) != 0
+ || (sb.st_mode & S_IFMT) != S_IFREG
+ || (sb.st_mode & 077) != 0) {
+ result = 1;
+ }
+ close(fd);
+ }
+ }
+ if (result == 0
+ && !strcmp(name[0], name[1]))
+ result = 1;
+ exit(result);
+}
+
+EOF
+if { (eval echo configure:6513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+ cf_cv_func_mkstemp=yes
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ cf_cv_func_mkstemp=no
+
+fi
+rm -fr conftest*
+fi
+
+
+fi
+
+echo "$ac_t""$cf_cv_func_mkstemp" 1>&6
+if test "$cf_cv_func_mkstemp" = yes ; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_MKSTEMP 1
+EOF
+
+fi
+
+
+# setup for prototype of fallback for vsscanf()
+if test "$cf_cv_func_vsscanf" = vsscanf ; then
+ HAVE_VSSCANF=1
+else
+ HAVE_VSSCANF=0
+fi
+
+
if test "$cross_compiling" = yes ; then
echo "configure: warning: cross compiling: assume setvbuf params not reversed" 1>&2
else
echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
-echo "configure:5884: checking whether setvbuf arguments are reversed" >&5
+echo "configure:6551: checking whether setvbuf arguments are reversed" >&5
if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5888,7 +6555,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 5892 "configure"
+#line 6559 "configure"
#include "confdefs.h"
#include <stdio.h>
/* If setvbuf has the reversed format, exit 0. */
@@ -5902,7 +6569,7 @@ main () {
exit(0); /* Non-reversed systems segv here. */
}
EOF
-if { (eval echo configure:5906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_setvbuf_reversed=yes
else
@@ -5927,12 +6594,12 @@ fi
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:5931: checking return type of signal handlers" >&5
+echo "configure:6598: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5936 "configure"
+#line 6603 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -5949,7 +6616,7 @@ int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:5953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -5969,13 +6636,13 @@ EOF
echo $ac_n "checking for type sigaction_t""... $ac_c" 1>&6
-echo "configure:5973: checking for type sigaction_t" >&5
+echo "configure:6640: checking for type sigaction_t" >&5
if eval "test \"`echo '$''{'cf_cv_type_sigaction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5979 "configure"
+#line 6646 "configure"
#include "confdefs.h"
#include <signal.h>
@@ -5983,7 +6650,7 @@ int main() {
sigaction_t x
; return 0; }
EOF
-if { (eval echo configure:5987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_type_sigaction=yes
else
@@ -6004,7 +6671,7 @@ EOF
echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6
-echo "configure:6008: checking declaration of size-change" >&5
+echo "configure:6675: checking declaration of size-change" >&5
if eval "test \"`echo '$''{'cf_cv_sizechange'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6018,7 +6685,7 @@ do
CPPFLAGS="$cf_save_CPPFLAGS"
test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
cat > conftest.$ac_ext <<EOF
-#line 6022 "configure"
+#line 6689 "configure"
#include "confdefs.h"
#include <sys/types.h>
#ifdef HAVE_TERMIOS_H
@@ -6057,7 +6724,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:6061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_sizechange=yes
else
@@ -6096,12 +6763,12 @@ fi
echo $ac_n "checking for memmove""... $ac_c" 1>&6
-echo "configure:6100: checking for memmove" >&5
+echo "configure:6767: checking for memmove" >&5
if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6105 "configure"
+#line 6772 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char memmove(); below. */
@@ -6124,7 +6791,7 @@ memmove();
; return 0; }
EOF
-if { (eval echo configure:6128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_memmove=yes"
else
@@ -6143,12 +6810,12 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for bcopy""... $ac_c" 1>&6
-echo "configure:6147: checking for bcopy" >&5
+echo "configure:6814: checking for bcopy" >&5
if eval "test \"`echo '$''{'ac_cv_func_bcopy'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6152 "configure"
+#line 6819 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char bcopy(); below. */
@@ -6171,7 +6838,7 @@ bcopy();
; return 0; }
EOF
-if { (eval echo configure:6175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_bcopy=yes"
else
@@ -6187,7 +6854,7 @@ if eval "test \"`echo '$ac_cv_func_'bcopy`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking if bcopy does overlapping moves""... $ac_c" 1>&6
-echo "configure:6191: checking if bcopy does overlapping moves" >&5
+echo "configure:6858: checking if bcopy does overlapping moves" >&5
if eval "test \"`echo '$''{'cf_cv_good_bcopy'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6196,7 +6863,7 @@ else
cf_cv_good_bcopy=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 6200 "configure"
+#line 6867 "configure"
#include "confdefs.h"
int main() {
@@ -6209,7 +6876,7 @@ int main() {
}
EOF
-if { (eval echo configure:6213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_good_bcopy=yes
else
@@ -6247,7 +6914,7 @@ fi
echo $ac_n "checking if poll really works""... $ac_c" 1>&6
-echo "configure:6251: checking if poll really works" >&5
+echo "configure:6918: checking if poll really works" >&5
if eval "test \"`echo '$''{'cf_cv_working_poll'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6256,7 +6923,7 @@ if test "$cross_compiling" = yes; then
cf_cv_working_poll=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 6260 "configure"
+#line 6927 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -6276,7 +6943,7 @@ int main() {
exit(ret != 0);
}
EOF
-if { (eval echo configure:6280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_working_poll=yes
else
@@ -6303,14 +6970,48 @@ if test -z "$cf_user_CFLAGS" ; then
fi
+ac_safe=`echo "stdbool.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for stdbool.h""... $ac_c" 1>&6
+echo "configure:6976: checking for stdbool.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 6981 "configure"
+#include "confdefs.h"
+#include <stdbool.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:6986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ cf_cv_header_stdbool_h=1
+else
+ echo "$ac_t""no" 1>&6
+cf_cv_header_stdbool_h=0
+fi
+
echo $ac_n "checking for builtin bool type""... $ac_c" 1>&6
-echo "configure:6308: checking for builtin bool type" >&5
+echo "configure:7009: checking for builtin bool type" >&5
if eval "test \"`echo '$''{'cf_cv_cc_bool_type'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6314 "configure"
+#line 7015 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -6320,7 +7021,7 @@ int main() {
bool x = false
; return 0; }
EOF
-if { (eval echo configure:6324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_cc_bool_type=1
else
@@ -6357,7 +7058,7 @@ os2*) #(vi
;;
esac
echo $ac_n "checking for library $cf_stdcpp_libname""... $ac_c" 1>&6
-echo "configure:6361: checking for library $cf_stdcpp_libname" >&5
+echo "configure:7062: checking for library $cf_stdcpp_libname" >&5
if eval "test \"`echo '$''{'cf_cv_libstdcpp'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6365,7 +7066,7 @@ else
cf_save="$LIBS"
LIBS="$LIBS -l$cf_stdcpp_libname"
cat > conftest.$ac_ext <<EOF
-#line 6369 "configure"
+#line 7070 "configure"
#include "confdefs.h"
#include <strstream.h>
@@ -6376,7 +7077,7 @@ strstreambuf foo(buf, sizeof(buf))
; return 0; }
EOF
-if { (eval echo configure:6380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_libstdcpp=yes
else
@@ -6395,16 +7096,12 @@ test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname"
fi
- if test "$GXX" = yes; then
- echo $ac_n "checking version of ${CXX-g++}""... $ac_c" 1>&6
-echo "configure:6401: checking version of ${CXX-g++}" >&5
- eval "${CXX-g++} --version"
- case "`${CXX-g++} --version`" in
- 1*|2.0-6*)
- cf_cxx_library=yes
- ;;
- *-2.7*|2.7*)
-
+ case $GXX_VERSION in
+ 1*|2.0-6*)
+ cf_cxx_library=yes
+ ;;
+ *-2.7*|2.7*)
+
cf_cxx_library=unknown
case $cf_cv_system_name in #(vi
os2*) #(vi
@@ -6416,11 +7113,11 @@ os2*) #(vi
esac
if test "$ac_cv_prog_gxx" = yes; then
echo $ac_n "checking for lib$cf_gpp_libname""... $ac_c" 1>&6
-echo "configure:6420: checking for lib$cf_gpp_libname" >&5
+echo "configure:7117: checking for lib$cf_gpp_libname" >&5
cf_save="$LIBS"
LIBS="$LIBS -l$cf_gpp_libname"
cat > conftest.$ac_ext <<EOF
-#line 6424 "configure"
+#line 7121 "configure"
#include "confdefs.h"
#include <$cf_gpp_libname/builtin.h>
@@ -6429,7 +7126,7 @@ int main() {
two_arg_error_handler_t foo2 = lib_error_handler
; return 0; }
EOF
-if { (eval echo configure:6433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cxx_library=yes
CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
@@ -6449,7 +7146,7 @@ else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 6453 "configure"
+#line 7150 "configure"
#include "confdefs.h"
#include <builtin.h>
@@ -6458,7 +7155,7 @@ int main() {
two_arg_error_handler_t foo2 = lib_error_handler
; return 0; }
EOF
-if { (eval echo configure:6462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cxx_library=yes
CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
@@ -6479,17 +7176,14 @@ rm -f conftest*
echo "$ac_t""$cf_cxx_library" 1>&6
fi
- ;;
- *)
- cf_cxx_library=no
- ;;
- esac
- else
+ ;;
+ *)
cf_cxx_library=no
- fi
+ ;;
+ esac
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:6493: checking how to run the C++ preprocessor" >&5
+echo "configure:7187: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6502,12 +7196,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
-#line 6506 "configure"
+#line 7200 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -6535,17 +7229,17 @@ for ac_hdr in typeinfo
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6539: checking for $ac_hdr" >&5
+echo "configure:7233: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6544 "configure"
+#line 7238 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -6573,14 +7267,48 @@ done
+ac_safe=`echo "stdbool.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for stdbool.h""... $ac_c" 1>&6
+echo "configure:7273: checking for stdbool.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 7278 "configure"
+#include "confdefs.h"
+#include <stdbool.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ cf_cv_header_stdbool_h=1
+else
+ echo "$ac_t""no" 1>&6
+cf_cv_header_stdbool_h=0
+fi
+
echo $ac_n "checking for builtin bool type""... $ac_c" 1>&6
-echo "configure:6578: checking for builtin bool type" >&5
+echo "configure:7306: checking for builtin bool type" >&5
if eval "test \"`echo '$''{'cf_cv_builtin_bool'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6584 "configure"
+#line 7312 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -6590,7 +7318,7 @@ int main() {
bool x = false
; return 0; }
EOF
-if { (eval echo configure:6594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cf_cv_builtin_bool=1
else
@@ -6610,7 +7338,7 @@ fi
echo $ac_n "checking for size of bool""... $ac_c" 1>&6
-echo "configure:6614: checking for size of bool" >&5
+echo "configure:7342: checking for size of bool" >&5
if eval "test \"`echo '$''{'cf_cv_type_of_bool'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6620,7 +7348,7 @@ else
cf_cv_type_of_bool=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 6624 "configure"
+#line 7352 "configure"
#include "confdefs.h"
#ifdef __cplusplus
extern "C" void exit(int);
@@ -6628,6 +7356,9 @@ extern "C" void exit(int);
#include <stdlib.h>
#include <stdio.h>
+
+#if defined(__cplusplus)
+
#ifdef HAVE_GXX_BUILTIN_H
#include <g++/builtin.h>
#elif HAVE_GPP_BUILTIN_H
@@ -6635,6 +7366,15 @@ extern "C" void exit(int);
#elif HAVE_BUILTIN_H
#include <builtin.h>
#endif
+
+#else
+
+#if $cf_cv_header_stdbool_h
+#include <stdbool.h>
+#endif
+
+#endif
+
main()
{
FILE *fp = fopen("cf_test.out", "w");
@@ -6652,9 +7392,12 @@ main()
}
EOF
-if { (eval echo configure:6656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_type_of_bool=`cat cf_test.out`
+ if test -z "$cf_cv_type_of_bool"; then
+ cf_cv_type_of_bool=unknown
+ fi
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
@@ -6670,13 +7413,16 @@ fi
rm -f cf_test.out
echo "$ac_t""$cf_cv_type_of_bool" 1>&6
if test "$cf_cv_type_of_bool" = unknown ; then
- echo "configure: warning: Assuming unsigned for type of bool" 1>&2
- cf_cv_type_of_bool=unsigned
+ case .$NCURSES_BOOL in #(vi
+ .auto|.) NCURSES_BOOL=unsigned;;
+ esac
+ echo "configure: warning: Assuming $NCURSES_BOOL for type of bool" 1>&2
+ cf_cv_type_of_bool=$NCURSES_BOOL
fi
echo $ac_n "checking for special defines needed for etip.h""... $ac_c" 1>&6
-echo "configure:6680: checking for special defines needed for etip.h" >&5
+echo "configure:7426: checking for special defines needed for etip.h" >&5
cf_save_CXXFLAGS="$CXXFLAGS"
cf_result="none"
for cf_math in "" MATH_H
@@ -6687,7 +7433,7 @@ do
test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
cat > conftest.$ac_ext <<EOF
-#line 6691 "configure"
+#line 7437 "configure"
#include "confdefs.h"
#include <etip.h.in>
@@ -6696,7 +7442,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:6700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
test -n "$cf_math" && cat >> confdefs.h <<EOF
@@ -6723,7 +7469,7 @@ CXXFLAGS="$cf_save_CXXFLAGS"
if test -n "$CXX"; then
echo $ac_n "checking if $CXX accepts parameter initialization""... $ac_c" 1>&6
-echo "configure:6727: checking if $CXX accepts parameter initialization" >&5
+echo "configure:7473: checking if $CXX accepts parameter initialization" >&5
if eval "test \"`echo '$''{'cf_cv_cpp_param_init'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6740,7 +7486,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
cf_cv_cpp_param_init=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 6744 "configure"
+#line 7490 "configure"
#include "confdefs.h"
#ifdef __cplusplus
extern "C" void exit(int);
@@ -6761,7 +7507,7 @@ TEST::TEST(int x = 1) // some compilers do not like second initializer
void main() { }
EOF
-if { (eval echo configure:6765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cf_cv_cpp_param_init=yes
else
@@ -6805,17 +7551,17 @@ for ac_hdr in strstream.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6809: checking for $ac_hdr" >&5
+echo "configure:7555: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6814 "configure"
+#line 7560 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -6843,19 +7589,20 @@ done
echo $ac_n "checking if $CXX supports vscan function""... $ac_c" 1>&6
-echo "configure:6847: checking if $CXX supports vscan function" >&5
+echo "configure:7593: checking if $CXX supports vscan function" >&5
if eval "test \"`echo '$''{'cf_cv_cpp_vscan_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- for cf_vscan_func in strstream stdio
+ for cf_vscan_func in strstream strstream_cast stdio
do
case $cf_vscan_func in #(vi
stdio) cf_vscan_defs=USE_STDIO_VSCAN ;; #(vi
strstream) cf_vscan_defs=USE_STRSTREAM_VSCAN ;;
+ strstream_cast) cf_vscan_defs=USE_STRSTREAM_VSCAN_CAST ;;
esac
cat > conftest.$ac_ext <<EOF
-#line 6859 "configure"
+#line 7606 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -6869,25 +7616,25 @@ else
int scanw(const char* fmt, ...)
{
int result = -1;
-#if defined(__GNUG__)
char buf[BUFSIZ];
va_list args;
va_start(args, fmt);
#if defined(USE_STDIO_VSCAN)
- if (::vscanf(fmt, args) != -1)
+ if (::vsscanf(buf, fmt, args) != -1)
result = 0;
#elif defined(USE_STRSTREAM_VSCAN)
strstreambuf ss(buf, sizeof(buf));
+ if (ss.vscan(fmt, args) != -1)
+ result = 0;
+#elif defined(USE_STRSTREAM_VSCAN_CAST)
+ strstreambuf ss(buf, sizeof(buf));
if (ss.vscan(fmt, (_IO_va_list)args) != -1)
result = 0;
#else
#error case $cf_vscan_func failed
#endif
va_end(args);
-#else
-#error sorry, we only know about the GNU compiler case
-#endif
return result;
}
@@ -6895,7 +7642,7 @@ int main() {
int tmp, foo = scanw("%d", &tmp)
; return 0; }
EOF
-if { (eval echo configure:6899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cf_cv_cpp_vscan_func=$cf_vscan_func; break
else
@@ -6942,15 +7689,41 @@ EOF
EOF
;;
+strstream_cast)
+ cat >> confdefs.h <<\EOF
+#define CPP_HAS_VSCAN_FUNC 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define USE_STRSTREAM_VSCAN_CAST 1
+EOF
+
+ ;;
esac
+ CXX_AR='$(AR)'
+ CXX_AR_OPTS='$(AR_OPTS)'
case $cf_cv_system_name in #(vi
- sco3.2v5*)
+ irix*) #(vi
+ if test "$GXX" != yes ; then
+ CXX_AR='$(CXX)'
+ CXX_AR_OPTS='-ar -o'
+ fi
+ ;;
+ sco3.2v5*) #(vi
CXXLDFLAGS="-u main"
;;
+ solaris2*)
+ if test "$GXX" != yes ; then
+ CXX_AR='$(CXX)'
+ CXX_AR_OPTS='-xar -o'
+ fi
+ ;;
esac
+
+
else
cf_cxx_library=no
cf_cv_builtin_bool=1
@@ -6964,13 +7737,104 @@ else
# Caveat: since the storage of the bool type is not standardized, it
# may change.
- echo $ac_n "checking for fallback type of bool""... $ac_c" 1>&6
-echo "configure:6969: checking for fallback type of bool" >&5
- case "$host_cpu" in #(vi
- i?86) cf_cv_type_of_bool=char ;; #(vi
- *) cf_cv_type_of_bool=int ;;
+ if test "$NCURSES_BOOL" != auto ; then
+ cf_cv_type_of_bool=$NCURSES_AUTO
+ else
+ if test "$cf_cv_header_stdbool_h" = 1 ; then
+
+echo $ac_n "checking for size of bool""... $ac_c" 1>&6
+echo "configure:7747: checking for size of bool" >&5
+if eval "test \"`echo '$''{'cf_cv_type_of_bool'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+ rm -f cf_test.out
+ if test "$cross_compiling" = yes; then
+ cf_cv_type_of_bool=unknown
+else
+ cat > conftest.$ac_ext <<EOF
+#line 7757 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C" void exit(int);
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#if defined(__cplusplus)
+
+#ifdef HAVE_GXX_BUILTIN_H
+#include <g++/builtin.h>
+#elif HAVE_GPP_BUILTIN_H
+#include <gpp/builtin.h>
+#elif HAVE_BUILTIN_H
+#include <builtin.h>
+#endif
+
+#else
+
+#if $cf_cv_header_stdbool_h
+#include <stdbool.h>
+#endif
+
+#endif
+
+main()
+{
+ FILE *fp = fopen("cf_test.out", "w");
+ if (fp != 0) {
+ bool x = true;
+ if ((bool)(-x) >= 0)
+ fputs("unsigned ", fp);
+ if (sizeof(x) == sizeof(int)) fputs("int", fp);
+ else if (sizeof(x) == sizeof(char)) fputs("char", fp);
+ else if (sizeof(x) == sizeof(short))fputs("short",fp);
+ else if (sizeof(x) == sizeof(long)) fputs("long", fp);
+ fclose(fp);
+ }
+ exit(0);
+}
+
+EOF
+if { (eval echo configure:7801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+ cf_cv_type_of_bool=`cat cf_test.out`
+ if test -z "$cf_cv_type_of_bool"; then
+ cf_cv_type_of_bool=unknown
+ fi
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ cf_cv_type_of_bool=unknown
+fi
+rm -fr conftest*
+fi
+
+
+fi
+
+ rm -f cf_test.out
+echo "$ac_t""$cf_cv_type_of_bool" 1>&6
+if test "$cf_cv_type_of_bool" = unknown ; then
+ case .$NCURSES_BOOL in #(vi
+ .auto|.) NCURSES_BOOL=unsigned;;
esac
- echo "$ac_t""$cf_cv_type_of_bool" 1>&6
+ echo "configure: warning: Assuming $NCURSES_BOOL for type of bool" 1>&2
+ cf_cv_type_of_bool=$NCURSES_BOOL
+fi
+
+ else
+ echo $ac_n "checking for fallback type of bool""... $ac_c" 1>&6
+echo "configure:7831: checking for fallback type of bool" >&5
+ case "$host_cpu" in #(vi
+ i?86) cf_cv_type_of_bool=char ;; #(vi
+ *) cf_cv_type_of_bool=int ;;
+ esac
+ echo "$ac_t""$cf_cv_type_of_bool" 1>&6
+ fi
+ fi
fi
@@ -6981,7 +7845,7 @@ cf_ada_make=gnatmake
# Extract the first word of "$cf_ada_make", so it can be a program name with args.
set dummy $cf_ada_make; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6985: checking for $ac_word" >&5
+echo "configure:7849: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gnat_exists'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7035,7 +7899,7 @@ esac
# Extract the first word of "m4", so it can be a program name with args.
set dummy m4; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7039: checking for $ac_word" >&5
+echo "configure:7903: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_M4_exists'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7068,7 +7932,7 @@ fi
fi
if test "$cf_cv_prog_gnat_correct" = yes; then
echo $ac_n "checking if GNAT works""... $ac_c" 1>&6
-echo "configure:7072: checking if GNAT works" >&5
+echo "configure:7936: checking if GNAT works" >&5
rm -f conftest*
cat >>conftest.ads <<CF_EOF
@@ -7130,7 +7994,9 @@ else
fi
case ".$withval" in #(vi
-./*) #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+ ;;
+..|./*|.\\*) #(vi
;;
.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
;;
@@ -7146,7 +8012,7 @@ case ".$withval" in #(vi
withval=`echo $withval | sed -e s@NONE@$ac_default_prefix@`
;;
*)
- { echo "configure: error: expected a pathname" 1>&2; exit 1; }
+ { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; }
;;
esac
@@ -7164,7 +8030,9 @@ else
fi
case ".$withval" in #(vi
-./*) #(vi
+.\$\(*\)*|.\'*\'*) #(vi
+ ;;
+..|./*|.\\*) #(vi
;;
.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
;;
@@ -7180,7 +8048,7 @@ case ".$withval" in #(vi
withval=`echo $withval | sed -e s@NONE@$ac_default_prefix@`
;;
*)
- { echo "configure: error: expected a pathname" 1>&2; exit 1; }
+ { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; }
;;
esac
@@ -7195,30 +8063,29 @@ fi
### using a 'char' for bools. gcc 2.7.0's conversion-warnings are broken too
### badly to consider using for development purposes, but 2.5.8 is okay.
if test -n "$with_warnings"; then
- if test "$GCC" = yes; then
- case "`$CC --version`" in
- 2.6.3)
- if test "$cf_cv_type_of_bool" != "char"; then
- EXTRA_CFLAGS="$EXTRA_CFLAGS -Wconversion"
- fi
- ;;
- 2.5*)
+ case $GCC_VERSION in
+ 2.6.3)
+ if test "$cf_cv_type_of_bool" != "char"; then
EXTRA_CFLAGS="$EXTRA_CFLAGS -Wconversion"
- ;;
- esac
- fi
+ fi
+ ;;
+ 2.5*)
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wconversion"
+ ;;
+ esac
fi
### Construct the library-subsets, if any, from this set of keywords:
### none, base, ext_funcs, termlib.
echo $ac_n "checking for library subsets""... $ac_c" 1>&6
-echo "configure:7216: checking for library subsets" >&5
+echo "configure:8082: checking for library subsets" >&5
if test "$with_termlib" = yes ; then
LIB_SUBSETS="termlib "
else
LIB_SUBSETS="termlib+"
fi
LIB_SUBSETS="${LIB_SUBSETS}base"
+test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
echo "$ac_t""$LIB_SUBSETS" 1>&6
@@ -7272,7 +8139,7 @@ fi
### Build up pieces for makefile rules
echo $ac_n "checking default library suffix""... $ac_c" 1>&6
-echo "configure:7276: checking default library suffix" >&5
+echo "configure:8143: checking default library suffix" >&5
case $DFT_LWR_MODEL in
libtool) DFT_ARG_SUFFIX='' ;;
@@ -7285,7 +8152,7 @@ echo "configure:7276: checking default library suffix" >&5
echo "$ac_t""$DFT_ARG_SUFFIX" 1>&6
echo $ac_n "checking default library-dependency suffix""... $ac_c" 1>&6
-echo "configure:7289: checking default library-dependency suffix" >&5
+echo "configure:8156: checking default library-dependency suffix" >&5
case $DFT_LWR_MODEL in
@@ -7295,28 +8162,43 @@ echo "configure:7289: checking default library-dependency suffix" >&5
profile) DFT_DEP_SUFFIX='_p.a' ;;
shared)
case $cf_cv_system_name in
+ cygwin*) DFT_DEP_SUFFIX='.dll' ;;
+ darwin*) DFT_DEP_SUFFIX='.dylib' ;;
hpux*) DFT_DEP_SUFFIX='.sl' ;;
*) DFT_DEP_SUFFIX='.so' ;;
esac
esac
test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
+if test $DFT_LWR_MODEL = shared ; then
+ case $cf_cv_system_name in #(vi
+ cygwin*)
+ DFT_DEP_SUFFIX=".dll.a"
+ ;;
+ esac
+fi
echo "$ac_t""$DFT_DEP_SUFFIX" 1>&6
echo $ac_n "checking default object directory""... $ac_c" 1>&6
-echo "configure:7307: checking default object directory" >&5
+echo "configure:8183: checking default object directory" >&5
case $DFT_LWR_MODEL in
libtool) DFT_OBJ_SUBDIR='obj_lo' ;;
normal) DFT_OBJ_SUBDIR='objects' ;;
debug) DFT_OBJ_SUBDIR='obj_g' ;;
profile) DFT_OBJ_SUBDIR='obj_p' ;;
- shared) DFT_OBJ_SUBDIR='obj_s' ;;
+ shared)
+ case $cf_cv_system_name in #(vi
+ cygwin) #(vi
+ DFT_OBJ_SUBDIR='objects' ;;
+ *)
+ DFT_OBJ_SUBDIR='obj_s' ;;
+ esac
esac
echo "$ac_t""$DFT_OBJ_SUBDIR" 1>&6
# libtool thinks it can make c++ shared libraries (perhaps only g++)
echo $ac_n "checking c++ library-dependency suffix""... $ac_c" 1>&6
-echo "configure:7320: checking c++ library-dependency suffix" >&5
+echo "configure:8202: checking c++ library-dependency suffix" >&5
if test "$with_libtool" = "yes"; then
CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX
else
@@ -7329,6 +8211,8 @@ else
profile) CXX_LIB_SUFFIX='_p.a' ;;
shared)
case $cf_cv_system_name in
+ cygwin*) CXX_LIB_SUFFIX='.dll' ;;
+ darwin*) CXX_LIB_SUFFIX='.dylib' ;;
hpux*) CXX_LIB_SUFFIX='.sl' ;;
*) CXX_LIB_SUFFIX='.so' ;;
esac
@@ -7342,7 +8226,7 @@ TINFO_LIST="$SHLIB_LIST"
test "$with_termlib" = yes && SHLIB_LIST="$SHLIB_LIST -ltinfo${LIB_SUFFIX}"
echo $ac_n "checking where we will install curses.h""... $ac_c" 1>&6
-echo "configure:7346: checking where we will install curses.h" >&5
+echo "configure:8230: checking where we will install curses.h" >&5
test "$with_overwrite" = no && \
test "x$includedir" = 'x${prefix}/include' && \
includedir='$(prefix)/include/ncurses'${LIB_SUFFIX}
@@ -7370,7 +8254,7 @@ PROG_ARGS="$TEST_ARGS"
echo $ac_n "checking for src modules""... $ac_c" 1>&6
-echo "configure:7374: checking for src modules" >&5
+echo "configure:8258: checking for src modules" >&5
# dependencies and linker-arguments for test-programs
TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${LIB_NAME}${DFT_DEP_SUFFIX} $TEST_DEPS"
@@ -7430,11 +8314,11 @@ EOF
fi
done
echo "$ac_t""$cf_cv_src_modules" 1>&6
-TEST_ARGS="-L${LIB_DIR} -L\$(libdir) $TEST_ARGS"
+TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-PROG_ARGS="-L${LIB_DIR} -L\$(libdir) $PROG_ARGS"
+PROG_ARGS="-L${LIB_DIR} $PROG_ARGS"
SRC_SUBDIRS="man include"
@@ -7442,7 +8326,8 @@ for cf_dir in $cf_cv_src_modules
do
SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
done
-SRC_SUBDIRS="$SRC_SUBDIRS misc test"
+SRC_SUBDIRS="$SRC_SUBDIRS test"
+test -z "$MAKE_TERMINFO" && SRC_SUBDIRS="$SRC_SUBDIRS misc"
test "$cf_with_cxx_binding" != no && SRC_SUBDIRS="$SRC_SUBDIRS c++"
ADA_SUBDIRS=
@@ -7475,10 +8360,20 @@ do
normal) cf_subdir='objects' ;;
debug) cf_subdir='obj_g' ;;
profile) cf_subdir='obj_p' ;;
- shared) cf_subdir='obj_s' ;;
+ shared)
+ case $cf_cv_system_name in #(vi
+ cygwin) #(vi
+ cf_subdir='objects' ;;
+ *)
+ cf_subdir='obj_s' ;;
+ esac
esac
- DIRS_TO_MAKE="$DIRS_TO_MAKE $cf_subdir"
+ for cf_item2 in $DIRS_TO_MAKE
+ do
+ test $cf_item2 = $cf_subdir && break
+ done
+ test ".$cf_item2" != ".$cf_subdir" && DIRS_TO_MAKE="$DIRS_TO_MAKE $cf_subdir"
done
for cf_dir in $DIRS_TO_MAKE
do
@@ -7586,7 +8481,7 @@ do
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
- echo "$CONFIG_STATUS generated by autoconf version 2.13.20000819"
+ echo "$CONFIG_STATUS generated by autoconf version 2.13.20020210"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
@@ -7599,7 +8494,7 @@ ac_given_INSTALL="$INSTALL"
trap 'rm -fr `echo "\
include/MKterm.h.awk \
- include/curses.h \
+ include/curses.head:include/curses.h.in \
include/termcap.h \
include/unctrl.h \
misc/run_tic.sh:misc/run_tic.in \
@@ -7643,6 +8538,7 @@ s%@cf_cv_rel_version@%$cf_cv_rel_version%g
s%@cf_cv_abi_version@%$cf_cv_abi_version%g
s%@cf_cv_cc_bool_type@%$cf_cv_cc_bool_type%g
s%@cf_cv_builtin_bool@%$cf_cv_builtin_bool%g
+s%@cf_cv_header_stdbool_h@%$cf_cv_header_stdbool_h%g
s%@cf_cv_type_of_bool@%$cf_cv_type_of_bool%g
s%@host@%$host%g
s%@host_alias@%$host_alias%g
@@ -7661,6 +8557,9 @@ s%@build_vendor@%$build_vendor%g
s%@build_os@%$build_os%g
s%@CC@%$CC%g
s%@BUILD_CC@%$BUILD_CC%g
+s%@BUILD_CFLAGS@%$BUILD_CFLAGS%g
+s%@BUILD_LDFLAGS@%$BUILD_LDFLAGS%g
+s%@BUILD_LIBS@%$BUILD_LIBS%g
s%@CPP@%$CPP%g
s%@PROG_EXT@%$PROG_EXT%g
s%@LDCONFIG@%$LDCONFIG%g
@@ -7703,22 +8602,33 @@ s%@LOCAL_LDFLAGS@%$LOCAL_LDFLAGS%g
s%@LOCAL_LDFLAGS2@%$LOCAL_LDFLAGS2%g
s%@INSTALL_LIB@%$INSTALL_LIB%g
s%@TERMINFO_SRC@%$TERMINFO_SRC%g
-s%@FALLBACK_LIST@%$FALLBACK_LIST%g
s%@PATHSEP@%$PATHSEP%g
+s%@FALLBACK_LIST@%$FALLBACK_LIST%g
s%@TERMINFO_DIRS@%$TERMINFO_DIRS%g
s%@TERMINFO@%$TERMINFO%g
+s%@MAKE_TERMINFO@%$MAKE_TERMINFO%g
+s%@TERMPATH@%$TERMPATH%g
+s%@BROKEN_LINKER@%$BROKEN_LINKER%g
+s%@NCURSES_BOOL@%$NCURSES_BOOL%g
s%@NCURSES_OSPEED@%$NCURSES_OSPEED%g
+s%@MANPAGE_RENAMES@%$MANPAGE_RENAMES%g
+s%@NCURSES_EXT_FUNCS@%$NCURSES_EXT_FUNCS%g
s%@NCURSES_CONST@%$NCURSES_CONST%g
s%@NCURSES_XNAMES@%$NCURSES_XNAMES%g
+s%@NCURSES_CH_T@%$NCURSES_CH_T%g
+s%@NCURSES_LIBUTF8@%$NCURSES_LIBUTF8%g
+s%@NCURSES_MBSTATE_T@%$NCURSES_MBSTATE_T%g
+s%@TERMINFO_CAPS@%$TERMINFO_CAPS%g
s%@ECHO_LINK@%$ECHO_LINK%g
s%@EXTRA_CFLAGS@%$EXTRA_CFLAGS%g
s%@MATH_LIB@%$MATH_LIB%g
s%@cf_cv_typeof_chtype@%$cf_cv_typeof_chtype%g
s%@cf_cv_1UL@%$cf_cv_1UL%g
-s%@cf_cv_shift_limit@%$cf_cv_shift_limit%g
-s%@cf_cv_widec_shift@%$cf_cv_widec_shift%g
+s%@HAVE_VSSCANF@%$HAVE_VSSCANF%g
s%@CXXCPP@%$CXXCPP%g
s%@CXXLDFLAGS@%$CXXLDFLAGS%g
+s%@CXX_AR@%$CXX_AR%g
+s%@CXX_AR_OPTS@%$CXX_AR_OPTS%g
s%@CXXLIBS@%$CXXLIBS%g
s%@gnat_exists@%$gnat_exists%g
s%@M4_exists@%$M4_exists%g
@@ -7787,7 +8697,7 @@ cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"\
include/MKterm.h.awk \
- include/curses.h \
+ include/curses.head:include/curses.h.in \
include/termcap.h \
include/unctrl.h \
misc/run_tic.sh:misc/run_tic.in \
@@ -7964,22 +8874,25 @@ CF_LIST_MODELS="$cf_list_models"
DFT_LWR_MODEL="$DFT_LWR_MODEL"
LDCONFIG="$LDCONFIG"
LIB_NAME="$LIB_NAME"
-LIB_SUFFIX="$LIB_SUFFIX"
LIB_SUBSETS="$LIB_SUBSETS"
+LIB_SUFFIX="$LIB_SUFFIX"
LIB_TRACING="$LIB_TRACING"
+MAKE_TERMINFO="$MAKE_TERMINFO"
+NCURSES_OSPEED="$NCURSES_OSPEED"
SRC_SUBDIRS="$SRC_SUBDIRS"
TERMINFO="$TERMINFO"
TINFO_NAME="$TINFO_NAME"
+WITH_CURSES_H="$with_curses_h"
WITH_ECHO="$with_echo"
WITH_OVERWRITE="$with_overwrite"
-WITH_CURSES_H="$with_curses_h"
cf_cv_abi_version="$cf_cv_abi_version"
cf_cv_do_symlinks="$cf_cv_do_symlinks"
cf_cv_rel_version="$cf_cv_rel_version"
cf_cv_rm_so_locs="$cf_cv_rm_so_locs"
+cf_cv_shlib_version="$cf_cv_shlib_version"
+cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
cf_cv_system_name="$cf_cv_system_name"
cf_with_cxx_binding="$cf_with_cxx_binding"
-cf_cv_shlib_version="$cf_cv_shlib_version"
target="$target"
@@ -8002,7 +8915,9 @@ for cf_dir in $SRC_SUBDIRS
do
if test -f $srcdir/$cf_dir/modules; then
- cf_libs_to_make=
+ IMPORT_LIB=
+ SHARED_LIB=
+ LIBS_TO_MAKE=
for cf_item in $CF_LIST_MODELS
do
@@ -8014,6 +8929,8 @@ do
profile) cf_suffix='_p.a' ;;
shared)
case $cf_cv_system_name in
+ cygwin*) cf_suffix='.dll' ;;
+ darwin*) cf_suffix='.dylib' ;;
hpux*) cf_suffix='.sl' ;;
*) cf_suffix='.so' ;;
esac
@@ -8023,36 +8940,61 @@ do
if test $cf_item = shared ; then
if test "$cf_cv_do_symlinks" = yes ; then
case "$cf_cv_shlib_version" in #(vi
- rel) cf_suffix="$cf_suffix"'.$(REL_VERSION)' ;; #(vi
- abi) cf_suffix="$cf_suffix"'.$(ABI_VERSION)' ;;
+ rel) #(vi
+ case "$cf_cv_system_name" in #(vi
+ darwin*) cf_suffix='.$(REL_VERSION)'"$cf_suffix" ;; #(vi
+ *) cf_suffix="$cf_suffix"'.$(REL_VERSION)' ;;
+ esac
+ ;;
+ abi)
+ case "$cf_cv_system_name" in #(vi
+ darwin*) cf_suffix='.$(ABI_VERSION)'"$cf_suffix" ;; #(vi
+ *) cf_suffix="$cf_suffix"'.$(ABI_VERSION)' ;;
+ esac
+ ;;
esac
fi
+ # cygwin needs import library, and has unique naming convention
+ if test $cf_cv_shlib_version = cygdll ; then
+ SHARED_LIB="../lib/${cf_prefix}${cf_dir}\$(ABI_VERSION).dll"
+ IMPORT_LIB="../lib/${cf_prefix}${cf_dir}.dll.a"
+ LIBS_TO_MAKE="$LIBS_TO_MAKE \$(SHARED_LIB) \$(IMPORT_LIB)"
+ continue
+ fi
fi
- cf_libs_to_make="$cf_libs_to_make ../lib/${cf_prefix}${cf_dir}${cf_suffix}"
+ LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/${cf_prefix}${cf_dir}${cf_suffix}"
done
if test $cf_dir = ncurses ; then
+ cf_subsets="$LIB_SUBSETS"
case "$LIB_SUBSETS" in #(vi
termlib+*) #(vi
;;
*) #(vi
- cf_item=`echo $cf_libs_to_make |sed -e s/$LIB_NAME/$TINFO_NAME/g`
- cf_libs_to_make="$cf_item $cf_libs_to_make"
+ cf_item=`echo $LIBS_TO_MAKE |sed -e s/$LIB_NAME/$TINFO_NAME/g`
+ LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
;;
esac
+ else
+ cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib //'`
fi
- sed -e "s@\@LIBS_TO_MAKE\@@$cf_libs_to_make@" \
+ sed -e "s@\@LIBS_TO_MAKE\@@$LIBS_TO_MAKE@" \
+ -e "s@\@IMPORT_LIB\@@$IMPORT_LIB@" \
+ -e "s@\@SHARED_LIB\@@$SHARED_LIB@" \
$cf_dir/Makefile >$cf_dir/Makefile.out
mv $cf_dir/Makefile.out $cf_dir/Makefile
$AWK -f $srcdir/mk-0th.awk \
- name=$cf_dir \
+ libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" \
$srcdir/$cf_dir/modules >>$cf_dir/Makefile
- for cf_item in $CF_LIST_MODELS
+ for cf_subset in $cf_subsets
do
- echo 'Appending rules for '$cf_item' model ('$cf_dir')'
+ cf_subdirs=
+ for cf_item in $CF_LIST_MODELS
+ do
+ echo "Appending rules for ${cf_item} model (${cf_dir}: ${cf_subset})"
CF_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -8065,6 +9007,8 @@ CF_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
profile) cf_suffix='_p.a' ;;
shared)
case $cf_cv_system_name in
+ cygwin*) cf_suffix='.dll' ;;
+ darwin*) cf_suffix='.dylib' ;;
hpux*) cf_suffix='.sl' ;;
*) cf_suffix='.so' ;;
esac
@@ -8077,7 +9021,13 @@ CF_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
normal) cf_subdir='objects' ;;
debug) cf_subdir='obj_g' ;;
profile) cf_subdir='obj_p' ;;
- shared) cf_subdir='obj_s' ;;
+ shared)
+ case $cf_cv_system_name in #(vi
+ cygwin) #(vi
+ cf_subdir='objects' ;;
+ *)
+ cf_subdir='obj_s' ;;
+ esac
esac
@@ -8096,8 +9046,6 @@ CF_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
cf_depend="$cf_depend $cf_reldir/curses.priv.h"
fi
- for cf_subset in $LIB_SUBSETS
- do
$AWK -f $srcdir/mk-1st.awk \
name=$cf_dir \
traces=$LIB_TRACING \
@@ -8107,6 +9055,7 @@ CF_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
suffix=$cf_suffix \
subset=$cf_subset \
ShlibVer=$cf_cv_shlib_version \
+ ShlibVerInfix=$cf_cv_shlib_version_infix \
DoLinks=$cf_cv_do_symlinks \
rmSoLocs=$cf_cv_rm_so_locs \
ldconfig="$LDCONFIG" \
@@ -8114,7 +9063,11 @@ CF_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
depend="$cf_depend" \
target="$target" \
$srcdir/$cf_dir/modules >>$cf_dir/Makefile
- test $cf_dir = ncurses && WITH_OVERWRITE=no
+ for cf_subdir2 in $cf_subdirs lib
+ do
+ test $cf_subdir = $cf_subdir2 && break
+ done
+ test "${cf_subset}.${cf_subdir2}" != "${cf_subset}.${cf_subdir}" && \
$AWK -f $srcdir/mk-2nd.awk \
name=$cf_dir \
traces=$LIB_TRACING \
@@ -8124,6 +9077,7 @@ CF_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
srcdir=$srcdir \
echo=$WITH_ECHO \
$srcdir/$cf_dir/modules >>$cf_dir/Makefile
+ cf_subdirs="$cf_subdirs $cf_subdir"
done
done
fi
@@ -8179,11 +9133,11 @@ done
cat >> Makefile <<CF_EOF
-install.data \
+install.data \\
uninstall.data ::
- cd misc && \$(MAKE) \$(CF_MFLAGS) \$@
+$MAKE_TERMINFO cd misc && \$(MAKE) \$(CF_MFLAGS) \$@
-install.man \
+install.man \\
uninstall.man ::
cd man && \$(MAKE) \$(CF_MFLAGS) \$@
@@ -8198,7 +9152,7 @@ if test -d tack ; then
if test -f $srcdir/$tack.h; then
cat >> Makefile <<CF_EOF
-install.man \
+install.man \\
uninstall.man ::
cd tack && \$(MAKE) \$(CF_MFLAGS) \$@
CF_EOF
@@ -8276,6 +9230,9 @@ test "\$NAME" = "curses.h" && NAME=ncurses.h
CF_EOF
fi
cat >>headers.sh <<CF_EOF
+# Just in case someone gzip'd manpages, remove the conflicting copy.
+test -f \$DST/\$NAME.gz && rm -f \$DST/\$NAME.gz
+
eval \$PRG \$TMPSRC \$DST/\$NAME
rm -f \$TMPSRC \$TMPSED
CF_EOF
@@ -8287,7 +9244,7 @@ do
if test -f $srcdir/$cf_dir/headers; then
cat >>$cf_dir/Makefile <<CF_EOF
\$(DESTDIR)\$(includedir) :
- \$(srcdir)/../mkinstalldirs \$@
+ sh \$(srcdir)/../mkinstalldirs \$@
install \\
install.libs \\
@@ -8319,6 +9276,17 @@ CF_EOF
test $i = curses.h && echo " -@ (cd \$(DESTDIR)\$(includedir) && rm -f ncurses.h)" >>$cf_dir/Makefile
done
fi
+
+ if test -f $srcdir/$cf_dir/modules; then
+ if test "$cf_dir" != "c++" ; then
+ cat >>$cf_dir/Makefile <<"CF_EOF"
+depend : $(AUTO_SRC)
+ makedepend -- $(CPPFLAGS) -- $(C_SRC)
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+CF_EOF
+ fi
+ fi
done
diff --git a/contrib/ncurses/configure.in b/contrib/ncurses/configure.in
index 62e9e829c2a7..b7beda60e814 100644
--- a/contrib/ncurses/configure.in
+++ b/contrib/ncurses/configure.in
@@ -1,5 +1,5 @@
dnl***************************************************************************
-dnl Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc. *
+dnl Copyright (c) 1998,1999,2000,2001,2002 Free Software Foundation, Inc. *
dnl *
dnl Permission is hereby granted, free of charge, to any person obtaining a *
dnl copy of this software and associated documentation files (the *
@@ -28,14 +28,14 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey <dickey@clark.net> 1996,1997
dnl
-dnl $Id: configure.in,v 1.233 2001/04/07 22:09:57 tom Exp $
+dnl $Id: configure.in,v 1.267 2002/05/18 21:14:13 tom Exp $
dnl Process this file with autoconf to produce a configure script.
dnl
dnl See http://dickey.his.com/autoconf/ for additional information.
dnl
dnl ---------------------------------------------------------------------------
AC_PREREQ(2.13.20000819)
-AC_REVISION($Revision: 1.233 $)
+AC_REVISION($Revision: 1.267 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@@ -80,16 +80,40 @@ CF_CFG_DEFAULTS
### Checks for programs.
AC_PROG_CC
+GCC_VERSION=none
if test "$GCC" = yes ; then
AC_MSG_CHECKING(version of gcc)
- eval "$CC --version"
+ GCC_VERSION="`${CC} --version|head -1`"
+ AC_MSG_RESULT($GCC_VERSION)
fi
-if test "$host" != $build; then
- AC_CHECK_PROGS(BUILD_CC, $CC gcc cc)
-else
- BUILD_CC="$CC"
+
+# If we're cross-compiling, allow the user to override the tools and their
+# options. The configure script is oriented toward identifying the target
+# compiler, etc., but we need a host compiler to generate parts of the source.
+BUILD_CC='$(CC)'
+BUILD_CFLAGS='$(CFLAGS)'
+BUILD_LDFLAGS='$(LDFLAGS)'
+BUILD_LIBS='$(LIBS)'
+if test "$host_alias" != "$target_alias" ; then
+ AC_ARG_WITH(build-cc,
+ [ --with-build-cc=XXX if cross-compiling, the host C compiler (\$BUILD_CC)],
+ [BUILD_CC="$withval"],
+ [AC_CHECK_PROGS(BUILD_CC, $CC gcc cc)])
+ AC_ARG_WITH(build-cflags,
+ [ --with-build-cflags=XXX if cross-compiling, the host C compiler-flags],
+ [BUILD_CFLAGS="$withval"])
+ AC_ARG_WITH(build-ldflags,
+ [ --with-build-ldflags=XXX if cross-compiling, the host linker-flags],
+ [BUILD_LDFLAGS="$withval"])
+ AC_ARG_WITH(build-libs,
+ [ --with-build-libs=XXX if cross-compiling, the host libraries],
+ [BUILD_LIBS="$withval"])
fi
AC_SUBST(BUILD_CC)
+AC_SUBST(BUILD_CFLAGS)
+AC_SUBST(BUILD_LDFLAGS)
+AC_SUBST(BUILD_LIBS)
+
AC_PROG_CPP
AC_PROG_GCC_TRADITIONAL
AC_ISC_POSIX
@@ -126,12 +150,16 @@ else
popdef([AC_MSG_ERROR])dnl
fi
+GXX_VERSION=none
if test "$GXX" = yes; then
- case "`${CXX-g++} --version`" in
+ AC_MSG_CHECKING(version of g++)
+ GXX_VERSION="`${CXX-g++} --version|head -1`"
+ AC_MSG_RESULT($GXX_VERSION)
+ case $GXX_VERSION in
1*|2.[[0-6]]*)
GXX=""; CXX=""; ac_cv_prog_gxx=no
cf_cxx_library=no
- echo No: templates do not work
+ AC_MSG_WARN(templates do not work)
;;
esac
fi
@@ -195,7 +223,7 @@ 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],
+ [ --with-install-prefix prefixes actual install-location (\$DESTDIR)],
[case "$withval" in #(vi
yes|no) #(vi
;;
@@ -394,7 +422,7 @@ AC_MSG_RESULT($with_overwrite)
AC_MSG_CHECKING(if external terminfo-database is used)
AC_ARG_ENABLE(database,
- [ --disable-database use only built-in data],
+ [ --disable-database do not use terminfo, only fallbacks/termcap],
[use_database=$enableval],
[use_database=yes])
AC_MSG_RESULT($use_database)
@@ -409,6 +437,7 @@ os2*) #(vi
esac
AC_SUBST(TERMINFO_SRC)
+CF_PATHSEP
if test "$use_database" != no ; then
AC_DEFINE(USE_DATABASE)
AC_MSG_CHECKING(which terminfo source-file will be installed)
@@ -427,11 +456,10 @@ AC_MSG_RESULT($with_fallback)
FALLBACK_LIST=`echo $with_fallback|sed -e 's/,/ /g'`
AC_SUBST(FALLBACK_LIST)
+MAKE_TERMINFO=
if test "$use_database" = no ; then
- if test -z $with_fallback ; then
- AC_ERROR(You have disabled the database w/o specifying fallbacks)
- fi
TERMINFO="${datadir}/terminfo"
+ MAKE_TERMINFO="#"
else
AC_MSG_CHECKING(for list of terminfo directories)
@@ -455,6 +483,7 @@ AC_DEFINE_UNQUOTED(TERMINFO,"$TERMINFO")
fi
AC_SUBST(TERMINFO)
+AC_SUBST(MAKE_TERMINFO)
### use option --disable-big-core to make tic run on small machines
### We need 4Mb, check if we can allocate 50% more than that.
@@ -487,9 +516,23 @@ AC_ARG_ENABLE(termcap,
AC_MSG_RESULT($with_termcap)
if test "$with_termcap" != "yes" ; then
+ if test "$use_database" = no ; then
+ if test -z $with_fallback ; then
+ AC_ERROR(You have disabled the database w/o specifying fallbacks)
+ fi
+ fi
AC_DEFINE(PURE_TERMINFO)
else
+AC_DEFINE(USE_TERMCAP)
+AC_MSG_CHECKING(for list of termcap files)
+CF_WITH_PATHLIST(termpath,
+ [ --with-termpath=XXX specify list of termcap files],
+ TERMPATH,
+ /etc/termcap:/usr/share/misc/termcap)
+AC_MSG_RESULT($TERMPATH)
+test -n "$TERMPATH" && AC_DEFINE_UNQUOTED(TERMPATH,"$TERMPATH")
+
### use option --enable-getcap to use a hacked getcap for reading termcaps
AC_MSG_CHECKING(if fast termcap-loader is needed)
AC_ARG_ENABLE(getcap,
@@ -551,13 +594,36 @@ AC_ARG_ENABLE(broken_linker,
[with_broken_linker=$enableval],
[with_broken_linker=$BROKEN_LINKER])
AC_MSG_RESULT($with_broken_linker)
-test "$with_broken_linker" = yes && AC_DEFINE(BROKEN_LINKER)
+
+BROKEN_LINKER=0
+if test "$with_broken_linker" = yes ; then
+ AC_DEFINE(BROKEN_LINKER)
+ BROKEN_LINKER=1
+elif test $DFT_LWR_MODEL = shared ; then
+ case $cf_cv_system_name in #(vi
+ cygwin*)
+ AC_DEFINE(BROKEN_LINKER)
+ BROKEN_LINKER=1
+ CF_VERBOSE(cygwin linker is broken anyway)
+ ;;
+ esac
+fi
+AC_SUBST(BROKEN_LINKER)
+
+### use option --with-bool to override bool's type
+AC_MSG_CHECKING(for type of bool)
+AC_ARG_WITH(bool,
+ [ --with-bool=TYPE override fallback type of bool variable],
+ [NCURSES_BOOL="$withval"],
+ [NCURSES_BOOL=auto])
+AC_MSG_RESULT($NCURSES_BOOL)
+AC_SUBST(NCURSES_BOOL)
### use option --with-ospeed to override ospeed's type
AC_MSG_CHECKING(for type of ospeed)
AC_ARG_WITH(ospeed,
[ --with-ospeed=TYPE override type of ospeed variable],
- [NCURSES_OSPEED=$withval],
+ [NCURSES_OSPEED="$withval"],
[NCURSES_OSPEED=short])
AC_MSG_RESULT($NCURSES_OSPEED)
AC_SUBST(NCURSES_OSPEED)
@@ -594,13 +660,17 @@ AC_ARG_ENABLE(ext-funcs,
[with_ext_funcs=yes])
AC_MSG_RESULT($with_ext_funcs)
if test "$with_ext_funcs" = yes ; then
+ NCURSES_EXT_FUNCS=1
AC_DEFINE(HAVE_CURSES_VERSION)
AC_DEFINE(HAVE_HAS_KEY)
AC_DEFINE(HAVE_RESIZETERM)
AC_DEFINE(HAVE_USE_DEFAULT_COLORS)
AC_DEFINE(HAVE_WRESIZE)
AC_DEFINE(NCURSES_EXT_FUNCS)
+else
+ NCURSES_EXT_FUNCS=0
fi
+AC_SUBST(NCURSES_EXT_FUNCS)
### use option --enable-const to turn on use of const beyond that in XSI.
AC_MSG_CHECKING(for extended use of const keyword)
@@ -655,7 +725,7 @@ AC_MSG_RESULT($with_develop)
### use option --enable-colorfgbg to turn on use of $COLORFGBG environment
AC_MSG_CHECKING(if you want colorfgbg code)
-AC_ARG_ENABLE(hard-tabs,
+AC_ARG_ENABLE(enable-colorfgbg,
[ --enable-colorfgbg compile with \$COLORFGBG code],
[with_colorfgbg=$enableval],
[with_colorfgbg=$with_develop])
@@ -730,6 +800,9 @@ test "$with_scroll_hints" = yes && AC_DEFINE(USE_SCROLL_HINTS)
fi
### use option --enable-widec to turn on use of wide-character support
+NCURSES_CH_T=chtype
+NCURSES_LIBUTF8=0
+NCURSES_MBSTATE_T=0
AC_MSG_CHECKING(if you want experimental wide-character code)
AC_ARG_ENABLE(widec,
[ --enable-widec compile with experimental wide-char/UTF-8 code],
@@ -739,7 +812,33 @@ AC_MSG_RESULT($with_widec)
if test "$with_widec" = yes ; then
LIB_SUFFIX="w${LIB_SUFFIX}"
AC_DEFINE(USE_WIDEC_SUPPORT)
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ with_overwrite=no
+ NCURSES_CH_T=cchar_t
+ AC_CHECK_FUNC(putwc)
+if test "$ac_cv_func_putwc" != yes ; then
+ CF_LIBUTF8
+ if test "$cf_cv_libutf8" = yes ; then
+ NCURSES_LIBUTF8=1
+ fi
+fi
+ CF_MBSTATE_T
+ if test $cf_cv_mbstate_t = yes ; then
+ NCURSES_MBSTATE_T=1
+ fi
fi
+AC_SUBST(NCURSES_CH_T)
+AC_SUBST(NCURSES_LIBUTF8)
+AC_SUBST(NCURSES_MBSTATE_T)
+
+AC_MSG_CHECKING(for terminal capabilities file)
+AC_ARG_WITH(caps,
+ [ --with-caps=alt compile with experimental alternate Caps file],
+ [TERMINFO_CAPS=Caps.$withval],
+ [TERMINFO_CAPS=Caps])
+test -f ${srcdir}/include/${TERMINFO_CAPS} || TERMINFO_CAPS=Caps
+AC_MSG_RESULT($TERMINFO_CAPS)
+AC_SUBST(TERMINFO_CAPS)
###############################################################################
CF_HELP_MESSAGE(Testing/development Options:)
@@ -818,8 +917,10 @@ CF_MATH_LIB(MATH_LIB,sin(x))
AC_SUBST(MATH_LIB)
### Checks for header files.
+CF_GNU_SOURCE
AC_STDC_HEADERS
AC_HEADER_DIRENT
+AC_HEADER_TIME
CF_REGEX
dnl These are some other potentially nonportable headers.
@@ -857,7 +958,6 @@ AC_C_INLINE
test "$ac_cv_c_inline" != no && AC_DEFINE(CC_HAS_INLINE_FUNCS)
CF_TYPEOF_CHTYPE
-CF_WIDEC_SHIFT
### Checks for external-data
CF_ERRNO
@@ -871,7 +971,6 @@ geteuid \
getttynam \
issetugid \
memccpy \
-mkstemp \
nanosleep \
poll \
remove \
@@ -885,9 +984,7 @@ strdup \
strstr \
tcgetpgrp \
times \
-vfscanf \
vsnprintf \
-vsscanf \
)
if test "$with_getcap" = "yes" ; then
CF_CGETENT
@@ -896,6 +993,16 @@ fi
CF_ISASCII
CF_STRUCT_SIGACTION
CF_FUNC_TERMIOS
+CF_FUNC_VSSCANF
+CF_MKSTEMP
+
+# setup for prototype of fallback for vsscanf()
+if test "$cf_cv_func_vsscanf" = vsscanf ; then
+ HAVE_VSSCANF=1
+else
+ HAVE_VSSCANF=0
+fi
+AC_SUBST(HAVE_VSSCANF)
dnl FIXME (may need this) AC_SYS_RESTARTABLE_SYSCALLS
if test "$cross_compiling" = yes ; then
@@ -921,23 +1028,17 @@ if test -n "$CXX" ; then
AC_LANG_CPLUSPLUS
CF_STDCPP_LIBRARY
- if test "$GXX" = yes; then
- AC_MSG_CHECKING(version of ${CXX-g++})
- eval "${CXX-g++} --version"
- case "`${CXX-g++} --version`" in
- 1*|2.[0-6]*)
- cf_cxx_library=yes
- ;;
- *-2.7*|2.7*)
- CF_GPP_LIBRARY
- ;;
- *)
- cf_cxx_library=no
- ;;
- esac
- else
+ case $GXX_VERSION in
+ 1*|2.[0-6]*)
+ cf_cxx_library=yes
+ ;;
+ *-2.7*|2.7*)
+ CF_GPP_LIBRARY
+ ;;
+ *)
cf_cxx_library=no
- fi
+ ;;
+ esac
AC_CHECK_HEADERS(typeinfo)
@@ -947,12 +1048,28 @@ if test -n "$CXX" ; then
CF_CPP_PARAM_INIT
CF_CPP_VSCAN_FUNC
+ CXX_AR='$(AR)'
+ CXX_AR_OPTS='$(AR_OPTS)'
case $cf_cv_system_name in #(vi
- sco3.2v5*)
+ irix*) #(vi
+ if test "$GXX" != yes ; then
+ CXX_AR='$(CXX)'
+ CXX_AR_OPTS='-ar -o'
+ fi
+ ;;
+ sco3.2v5*) #(vi
CXXLDFLAGS="-u main"
;;
+ solaris2*)
+ if test "$GXX" != yes ; then
+ CXX_AR='$(CXX)'
+ CXX_AR_OPTS='-xar -o'
+ fi
+ ;;
esac
AC_SUBST(CXXLDFLAGS)
+ AC_SUBST(CXX_AR)
+ AC_SUBST(CXX_AR_OPTS)
else
cf_cxx_library=no
cf_cv_builtin_bool=1
@@ -966,12 +1083,20 @@ else
# Caveat: since the storage of the bool type is not standardized, it
# may change.
- AC_MSG_CHECKING(for fallback type of bool)
- case "$host_cpu" in #(vi
- i?86) cf_cv_type_of_bool=char ;; #(vi
- *) cf_cv_type_of_bool=int ;;
- esac
- AC_MSG_RESULT($cf_cv_type_of_bool)
+ if test "$NCURSES_BOOL" != auto ; then
+ cf_cv_type_of_bool=$NCURSES_AUTO
+ else
+ if test "$cf_cv_header_stdbool_h" = 1 ; then
+ CF_BOOL_SIZE
+ else
+ AC_MSG_CHECKING(for fallback type of bool)
+ case "$host_cpu" in #(vi
+ i?86) cf_cv_type_of_bool=char ;; #(vi
+ *) cf_cv_type_of_bool=int ;;
+ esac
+ AC_MSG_RESULT($cf_cv_type_of_bool)
+ fi
+ fi
fi
AC_SUBST(CXXLIBS)
@@ -1043,18 +1168,16 @@ fi
### using a 'char' for bools. gcc 2.7.0's conversion-warnings are broken too
### badly to consider using for development purposes, but 2.5.8 is okay.
if test -n "$with_warnings"; then
- if test "$GCC" = yes; then
- case "`$CC --version`" in
- 2.6.3)
- if test "$cf_cv_type_of_bool" != "char"; then
- EXTRA_CFLAGS="$EXTRA_CFLAGS -Wconversion"
- fi
- ;;
- 2.5*)
+ case $GCC_VERSION in
+ 2.6.3)
+ if test "$cf_cv_type_of_bool" != "char"; then
EXTRA_CFLAGS="$EXTRA_CFLAGS -Wconversion"
- ;;
- esac
- fi
+ fi
+ ;;
+ 2.5*)
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -Wconversion"
+ ;;
+ esac
fi
### Construct the library-subsets, if any, from this set of keywords:
@@ -1066,6 +1189,7 @@ else
LIB_SUBSETS="termlib+"
fi
LIB_SUBSETS="${LIB_SUBSETS}base"
+test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
AC_MSG_RESULT($LIB_SUBSETS)
@@ -1091,6 +1215,13 @@ AC_MSG_RESULT($DFT_ARG_SUFFIX)
AC_MSG_CHECKING(default library-dependency suffix)
CF_LIB_SUFFIX($DFT_LWR_MODEL,DFT_DEP_SUFFIX)dnl
+if test $DFT_LWR_MODEL = shared ; then
+ case $cf_cv_system_name in #(vi
+ cygwin*)
+ DFT_DEP_SUFFIX=".dll.a"
+ ;;
+ esac
+fi
AC_SUBST(DFT_DEP_SUFFIX)dnl the corresponding library-suffix (".a")
AC_MSG_RESULT($DFT_DEP_SUFFIX)
@@ -1149,7 +1280,7 @@ CFLAGS="$CFLAGS $EXTRA_CFLAGS"
################################################################################
AC_OUTPUT( \
include/MKterm.h.awk \
- include/curses.h \
+ include/curses.head:include/curses.h.in \
include/termcap.h \
include/unctrl.h \
misc/run_tic.sh:misc/run_tic.in \
@@ -1165,22 +1296,25 @@ CF_LIST_MODELS="$cf_list_models"
DFT_LWR_MODEL="$DFT_LWR_MODEL"
LDCONFIG="$LDCONFIG"
LIB_NAME="$LIB_NAME"
-LIB_SUFFIX="$LIB_SUFFIX"
LIB_SUBSETS="$LIB_SUBSETS"
+LIB_SUFFIX="$LIB_SUFFIX"
LIB_TRACING="$LIB_TRACING"
+MAKE_TERMINFO="$MAKE_TERMINFO"
+NCURSES_OSPEED="$NCURSES_OSPEED"
SRC_SUBDIRS="$SRC_SUBDIRS"
TERMINFO="$TERMINFO"
TINFO_NAME="$TINFO_NAME"
+WITH_CURSES_H="$with_curses_h"
WITH_ECHO="$with_echo"
WITH_OVERWRITE="$with_overwrite"
-WITH_CURSES_H="$with_curses_h"
cf_cv_abi_version="$cf_cv_abi_version"
cf_cv_do_symlinks="$cf_cv_do_symlinks"
cf_cv_rel_version="$cf_cv_rel_version"
cf_cv_rm_so_locs="$cf_cv_rm_so_locs"
+cf_cv_shlib_version="$cf_cv_shlib_version"
+cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
cf_cv_system_name="$cf_cv_system_name"
cf_with_cxx_binding="$cf_with_cxx_binding"
-cf_cv_shlib_version="$cf_cv_shlib_version"
target="$target"
],sort)dnl
diff --git a/contrib/ncurses/dist.mk b/contrib/ncurses/dist.mk
index 08cb199f0c21..b432b41e2ca6 100644
--- a/contrib/ncurses/dist.mk
+++ b/contrib/ncurses/dist.mk
@@ -1,4 +1,4 @@
-# $Id: dist.mk,v 1.247 2001/05/12 18:18:37 tom Exp $
+# $Id: dist.mk,v 1.303 2002/05/18 19:18:04 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -10,7 +10,7 @@ SHELL = /bin/sh
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 5
NCURSES_MINOR = 2
-NCURSES_PATCH = 20010512
+NCURSES_PATCH = 20020518
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
@@ -63,17 +63,33 @@ manhtml: MANIFEST
echo "s/$${xu}/$${x}/g" >> subst.tmp ;\
fi ;\
done
+ # change some things to make weblint happy:
+ @echo 's/<B>/<STRONG>/g' >> subst.tmp
+ @echo 's/<\/B>/<\/STRONG>/g' >> subst.tmp
+ @echo 's/<I>/<EM>/g' >> subst.tmp
+ @echo 's/<\/I>/<\/EM>/g' >> subst.tmp
+ @echo 's/<\/TITLE>/<\/TITLE><link rev=made href="mailto:bug-ncurses@gnu.org">/' >> subst.tmp
@sort < subst.tmp | uniq > subst.sed
@rm -f subst.tmp
@for f in man/*.[0-9]* ; do \
m=`basename $$f` ;\
+ T=`egrep '^.TH' $$f|sed -e 's/^.TH //' -e s'/"//g' -e 's/[ ]\+$$//'` ; \
g=$${m}.html ;\
if [ -f doc/html/$$g ]; then chmod +w doc/html/$$g; fi;\
echo "Converting $$m to HTML" ;\
- man/edit_man.sh editing /usr/man man $$f | $(MANPROG) | tr '\255' '-' | $(MAN2HTML) | \
+ echo '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">' > doc/html/man/$$g ;\
+ echo '<!-- ' >> doc/html/man/$$g ;\
+ egrep '^.\\"[^#]' $$f | \
+ sed -e 's/\$$/@/g' \
+ -e 's/^.../ */' \
+ -e 's/</\&lt;/g' \
+ -e 's/>/\&gt;/g' \
+ >> doc/html/man/$$g ;\
+ echo '-->' >> doc/html/man/$$g ;\
+ man/edit_man.sh editing /usr/man man $$f | $(MANPROG) | tr '\255' '-' | $(MAN2HTML) -title "$$T" | \
sed -f subst.sed |\
sed -e 's/"curses.3x.html"/"ncurses.3x.html"/g' \
- > doc/html/man/$$g ;\
+ >> doc/html/man/$$g ;\
done
@rm -f subst.sed
@sed -e "\%./doc/html/man/%d" < MANIFEST > MANIFEST.tmp
diff --git a/contrib/ncurses/doc/html/ncurses-intro.html b/contrib/ncurses/doc/html/ncurses-intro.html
index 05c756e0e8b4..bdc5fa0fd09f 100644
--- a/contrib/ncurses/doc/html/ncurses-intro.html
+++ b/contrib/ncurses/doc/html/ncurses-intro.html
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
<!--
- $Id: ncurses-intro.html,v 1.34 2000/06/11 00:03:55 tom Exp $
+ $Id: ncurses-intro.html,v 1.35 2001/09/02 00:23:11 tom Exp $
-->
<HTML>
<HEAD>
@@ -704,7 +704,11 @@ restore the ncurses screen from before the escape.
<CODE>newterm()</CODE> instead of <CODE>initscr()</CODE>. <CODE>newterm()</CODE> should
be called once for each terminal. It returns a variable of type
<CODE>SCREEN *</CODE> which should be saved as a reference to that
-terminal. The arguments are the type of the terminal (a string) and
+terminal.
+(NOTE: a SCREEN variable is not a <em>screen</em> in the sense we
+are describing in this introduction, but a collection of
+parameters used to assist in optimizing the display.)
+The arguments are the type of the terminal (a string) and
<CODE>FILE</CODE> pointers for the output and input of the terminal. If
type is NULL then the environment variable <CODE>$TERM</CODE> is used.
<CODE>endwin()</CODE> should called once at wrapup time for each terminal
diff --git a/contrib/ncurses/form/Makefile.in b/contrib/ncurses/form/Makefile.in
index 8f3f2976e407..e55afcb55e4e 100644
--- a/contrib/ncurses/form/Makefile.in
+++ b/contrib/ncurses/form/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.32 2001/03/24 19:53:31 tom Exp $
+# $Id: Makefile.in,v 1.36 2002/01/20 01:49:17 tom Exp $
##############################################################################
-# Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc. #
+# Copyright (c) 1998,1999,2000,2001,2002 Free Software Foundation, Inc. #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
# copy of this software and associated documentation files (the "Software"), #
@@ -50,6 +50,7 @@ DESTDIR = @DESTDIR@
srcdir = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
+bindir = @bindir@
libdir = @libdir@
includedir = @includedir@
@@ -57,6 +58,7 @@ LIBTOOL = @LIBTOOL@
INSTALL = @INSTALL@
INSTALL_LIB = @INSTALL@ @INSTALL_LIB@
+INSTALL_PROG = @INSTALL_PROG@
INSTALL_DATA = @INSTALL_DATA@
AR = @AR@
@@ -85,7 +87,7 @@ CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
LINK = $(LIBTOOL) $(CC)
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
-SHLIB_DIRS = -L../lib -L$(libdir)
+SHLIB_DIRS = -L../lib
SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
MK_SHARED_LIB = @MK_SHARED_LIB@
@@ -97,6 +99,8 @@ ABI_VERSION = @cf_cv_abi_version@
RANLIB = @RANLIB@
+IMPORT_LIB = @IMPORT_LIB@
+SHARED_LIB = @SHARED_LIB@
LIBRARIES = @LIBS_TO_MAKE@
LINT = @LINT@
@@ -113,8 +117,9 @@ install :: $(AUTO_SRC) $(LIBRARIES)
sources : $(AUTO_SRC)
+$(DESTDIR)$(bindir) \
$(DESTDIR)$(libdir) :
- $(srcdir)/../mkinstalldirs $@
+ sh $(srcdir)/../mkinstalldirs $@
# make copies to simplify include-paths while still keeping form's include
# file in this directory.
@@ -136,7 +141,7 @@ tags:
@MAKE_UPPER_TAGS@ etags *.[ch]
mostlyclean ::
- -rm -f core tags TAGS *~ *.i *.ln *.atac trace
+ -rm -f core tags TAGS *~ *.bak *.i *.ln *.atac trace
clean :: mostlyclean
-rm -f $(AUTO_SRC)
diff --git a/contrib/ncurses/form/form.h b/contrib/ncurses/form/form.h
index 70b7a3ba4e9a..140b25f0ab38 100644
--- a/contrib/ncurses/form/form.h
+++ b/contrib/ncurses/form/form.h
@@ -332,7 +332,7 @@ extern NCURSES_EXPORT(Field_Options) field_opts (const FIELD *);
extern NCURSES_EXPORT(FORM *) new_form (FIELD **);
-extern NCURSES_EXPORT(FIELD **)form_fields (const FORM *);
+extern NCURSES_EXPORT(FIELD **) form_fields (const FORM *);
extern NCURSES_EXPORT(FIELD *) current_field (const FORM *);
extern NCURSES_EXPORT(WINDOW *) form_win (const FORM *);
diff --git a/contrib/ncurses/include/Caps b/contrib/ncurses/include/Caps
index 0e485082a0e6..795f9daa8500 100644
--- a/contrib/ncurses/include/Caps
+++ b/contrib/ncurses/include/Caps
@@ -1,5 +1,5 @@
##############################################################################
-# Copyright (c) 1998 Free Software Foundation, Inc. #
+# Copyright (c) 1998,2001 Free Software Foundation, Inc. #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
# copy of this software and associated documentation files (the "Software"), #
@@ -29,7 +29,7 @@
# Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995
# and: Eric S. Raymond <esr@snark.thyrsus.com>
#
-# $Id: Caps,v 1.31 2001/05/05 21:01:27 tom Exp $
+# $Id: Caps,v 1.35 2002/04/20 15:43:34 tom Exp $
#
# This is the master termcap/terminfo capability table.
#
@@ -49,11 +49,13 @@
# Column 2: terminfo capability name
# Column 3: capability type (boolean, numeric, or string)
# Column 4: termcap capability name
-# Column 5: Lead with `Y' if capability should be emitted in termcap
+# Column 5: KEY_xxx name, if any, `-' otherwise
+# Column 6: value for KEY_xxx name, if any, `-' otherwise
+# Column 7: Lead with `Y' if capability should be emitted in termcap
# translations, `-' otherwise
-# Column 6: capability description
+# Column 8: capability description
#
-# The codes following [Y-] in column 5 describe the versions of termcap which
+# The codes following [Y-] in column 7 describe the versions of termcap which
# use the given capability. This information is not used by the curses library
# proper; rather, it's there to help the terminfo maintainer avoid emitting
# termcap entry translations that are more than 1023 bytes long (and tank a
@@ -67,7 +69,7 @@
# translation if possible. The problem is that preserving all such caps may
# lead to some termcap translations being too long. The termcap maintainer
# has a bit of a juggling act to do...potential problem cases are marked with
-# a * or **.
+# an asterisk (*).
#
# The aliases section has the following format:
#
@@ -207,43 +209,43 @@
#%lw25 lw6 lw2 lw20.
#%\fBVariable Cap- TCap Description\fR
#%\fBBooleans name Code\fR
-auto_left_margin bw bool bw YB-G- cub1 wraps from column 0 to last column
-auto_right_margin am bool am YBCGE terminal has automatic margins
-no_esc_ctlc xsb bool xb YBCG- beehive (f1=escape, f2=ctrl C)
-ceol_standout_glitch xhp bool xs YBCGE standout not erased by overwriting (hp)
-eat_newline_glitch xenl bool xn YBCGE newline ignored after 80 cols (concept)
-erase_overstrike eo bool eo YBCG- can erase overstrikes with a blank
-generic_type gn bool gn YB-G- generic line type
-hard_copy hc bool hc YBCG- hardcopy terminal
-has_meta_key km bool km YB-GE Has a meta key (i.e., sets 8th-bit)
-has_status_line hs bool hs YB-G- has extra status line
-insert_null_glitch in bool in YBCGE insert mode distinguishes nulls
-memory_above da bool da YBCG- display may be retained above the screen
-memory_below db bool db YB-GE display may be retained below the screen
-move_insert_mode mir bool mi YBCGE safe to move while in insert mode
-move_standout_mode msgr bool ms YBCGE safe to move while in standout mode
-over_strike os bool os YBCG- terminal can overstrike
-status_line_esc_ok eslok bool es YB-G- escape can be used on the status line
-dest_tabs_magic_smso xt bool xt YBCGE tabs destructive, magic so char (t1061)
-tilde_glitch hz bool hz YB-GE can't print ~'s (hazeltine)
-transparent_underline ul bool ul YBCGE underline character overstrikes
-xon_xoff xon bool xo YB--- terminal uses xon/xoff handshaking
-needs_xon_xoff nxon bool nx ----- padding won't work, xon/xoff required
-prtr_silent mc5i bool 5i ----- printer won't echo on screen
-hard_cursor chts bool HC ----- cursor is hard to see
-non_rev_rmcup nrrmc bool NR ----- smcup does not reverse rmcup
-no_pad_char npc bool NP ----- pad character does not exist
-non_dest_scroll_region ndscr bool ND ----- scrolling region is non-destructive
-can_change ccc bool cc ----- terminal can re-define existing colors
-back_color_erase bce bool ut ----- screen erased with background color
-hue_lightness_saturation hls bool hl ----- terminal uses only HLS color notation (Tektronix)
-col_addr_glitch xhpa bool YA ----- only positive motion for hpa/mhpa caps
-cr_cancels_micro_mode crxm bool YB ----- using cr turns off micro mode
-has_print_wheel daisy bool YC ----- printer needs operator to change character set
-row_addr_glitch xvpa bool YD ----- only positive motion for vpa/mvpa caps
-semi_auto_right_margin sam bool YE ----- printing in last column causes cr
-cpi_changes_res cpix bool YF ----- changing character pitch changes resolution
-lpi_changes_res lpix bool YG ----- changing line pitch changes resolution
+auto_left_margin bw bool bw - - YB-G- cub1 wraps from column 0 to last column
+auto_right_margin am bool am - - YBCGE terminal has automatic margins
+no_esc_ctlc xsb bool xb - - YBCG- beehive (f1=escape, f2=ctrl C)
+ceol_standout_glitch xhp bool xs - - YBCGE standout not erased by overwriting (hp)
+eat_newline_glitch xenl bool xn - - YBCGE newline ignored after 80 cols (concept)
+erase_overstrike eo bool eo - - YBCG- can erase overstrikes with a blank
+generic_type gn bool gn - - YB-G- generic line type
+hard_copy hc bool hc - - YBCG- hardcopy terminal
+has_meta_key km bool km - - YB-GE Has a meta key (i.e., sets 8th-bit)
+has_status_line hs bool hs - - YB-G- has extra status line
+insert_null_glitch in bool in - - YBCGE insert mode distinguishes nulls
+memory_above da bool da - - YBCG- display may be retained above the screen
+memory_below db bool db - - YB-GE display may be retained below the screen
+move_insert_mode mir bool mi - - YBCGE safe to move while in insert mode
+move_standout_mode msgr bool ms - - YBCGE safe to move while in standout mode
+over_strike os bool os - - YBCG- terminal can overstrike
+status_line_esc_ok eslok bool es - - YB-G- escape can be used on the status line
+dest_tabs_magic_smso xt bool xt - - YBCGE tabs destructive, magic so char (t1061)
+tilde_glitch hz bool hz - - YB-GE cannot print ~'s (hazeltine)
+transparent_underline ul bool ul - - YBCGE underline character overstrikes
+xon_xoff xon bool xo - - YB--- terminal uses xon/xoff handshaking
+needs_xon_xoff nxon bool nx - - ----- padding will not work, xon/xoff required
+prtr_silent mc5i bool 5i - - ----- printer will not echo on screen
+hard_cursor chts bool HC - - ----- cursor is hard to see
+non_rev_rmcup nrrmc bool NR - - ----- smcup does not reverse rmcup
+no_pad_char npc bool NP - - ----- pad character does not exist
+non_dest_scroll_region ndscr bool ND - - ----- scrolling region is non-destructive
+can_change ccc bool cc - - ----- terminal can re-define existing colors
+back_color_erase bce bool ut - - ----- screen erased with background color
+hue_lightness_saturation hls bool hl - - ----- terminal uses only HLS color notation (Tektronix)
+col_addr_glitch xhpa bool YA - - ----- only positive motion for hpa/mhpa caps
+cr_cancels_micro_mode crxm bool YB - - ----- using cr turns off micro mode
+has_print_wheel daisy bool YC - - ----- printer needs operator to change character set
+row_addr_glitch xvpa bool YD - - ----- only positive motion for vpa/mvpa caps
+semi_auto_right_margin sam bool YE - - ----- printing in last column causes cr
+cpi_changes_res cpix bool YF - - ----- changing character pitch changes resolution
+lpi_changes_res lpix bool YG - - ----- changing line pitch changes resolution
#%.TE
#%.ad
#%
@@ -257,23 +259,23 @@ lpi_changes_res lpix bool YG ----- changing line pitch changes resolution
#%lw25 lw6 lw2 lw20.
#%\fBVariable Cap- TCap Description\fR
#%\fBNumeric name Code\fR
-columns cols num co YBCGE number of columns in a line
-init_tabs it num it YB-G- tabs initially every # spaces
-lines lines num li YBCGE number of lines on screen or page
-lines_of_memory lm num lm YB-G- lines of memory if > line. 0 means varies
-magic_cookie_glitch xmc num sg YBCGE number of blank characters left by smso or rmso
-padding_baud_rate pb num pb YB-GE lowest baud rate where padding needed
-virtual_terminal vt num vt YB--- virtual terminal number (CB/unix)
-width_status_line wsl num ws YB-G- number of columns in status line
-num_labels nlab num Nl ----- number of labels on screen
-label_height lh num lh ----- rows in each label
-label_width lw num lw ----- columns in each label
-max_attributes ma num ma YBC-- maximum combined attributes terminal can handle
-maximum_windows wnum num MW ----- maximum number of defineable windows
+columns cols num co - - YBCGE number of columns in a line
+init_tabs it num it - - YB-G- tabs initially every # spaces
+lines lines num li - - YBCGE number of lines on screen or page
+lines_of_memory lm num lm - - YB-G- lines of memory if > line. 0 means varies
+magic_cookie_glitch xmc num sg - - YBCGE number of blank characters left by smso or rmso
+padding_baud_rate pb num pb - - YB-GE lowest baud rate where padding needed
+virtual_terminal vt num vt - - YB--- virtual terminal number (CB/unix)
+width_status_line wsl num ws - - YB-G- number of columns in status line
+num_labels nlab num Nl - - ----- number of labels on screen
+label_height lh num lh - - ----- rows in each label
+label_width lw num lw - - ----- columns in each label
+max_attributes ma num ma - - YBC-- maximum combined attributes terminal can handle
+maximum_windows wnum num MW - - ----- maximum number of defineable windows
# These came in with SVr4's color support
-max_colors colors num Co ----- maximum number of colors on screen
-max_pairs pairs num pa ----- maximum number of color-pairs on the screen
-no_color_video ncv num NC ----- video attributes that can't be used with colors
+max_colors colors num Co - - ----- maximum number of colors on screen
+max_pairs pairs num pa - - ----- maximum number of color-pairs on the screen
+no_color_video ncv num NC - - ----- video attributes that cannot be used with colors
#%.TE
#%.ad
#%
@@ -289,23 +291,23 @@ no_color_video ncv num NC ----- video attributes that can't be used with color
#%lw25 lw6 lw2 lw20.
#%\fBVariable Cap- TCap Description\fR
#%\fBNumeric name Code\fR
-buffer_capacity bufsz num Ya ----- numbers of bytes buffered before printing
-dot_vert_spacing spinv num Yb ----- spacing of pins vertically in pins per inch
-dot_horz_spacing spinh num Yc ----- spacing of dots horizontally in dots per inch
-max_micro_address maddr num Yd ----- maximum value in micro_..._address
-max_micro_jump mjump num Ye ----- maximum value in parm_..._micro
-micro_col_size mcs num Yf ----- character step size when in micro mode
-micro_line_size mls num Yg ----- line step size when in micro mode
-number_of_pins npins num Yh ----- numbers of pins in print-head
-output_res_char orc num Yi ----- horizontal resolution in units per line
-output_res_line orl num Yj ----- vertical resolution in units per line
-output_res_horz_inch orhi num Yk ----- horizontal resolution in units per inch
-output_res_vert_inch orvi num Yl ----- vertical resolution in units per inch
-print_rate cps num Ym ----- print rate in characters per second
-wide_char_size widcs num Yn ----- character step size when in double wide mode
-buttons btns num BT ----- number of buttons on mouse
-bit_image_entwining bitwin num Yo ----- number of passes for each bit-image row
-bit_image_type bitype num Yp ----- type of bit-image device
+buffer_capacity bufsz num Ya - - ----- numbers of bytes buffered before printing
+dot_vert_spacing spinv num Yb - - ----- spacing of pins vertically in pins per inch
+dot_horz_spacing spinh num Yc - - ----- spacing of dots horizontally in dots per inch
+max_micro_address maddr num Yd - - ----- maximum value in micro_..._address
+max_micro_jump mjump num Ye - - ----- maximum value in parm_..._micro
+micro_col_size mcs num Yf - - ----- character step size when in micro mode
+micro_line_size mls num Yg - - ----- line step size when in micro mode
+number_of_pins npins num Yh - - ----- numbers of pins in print-head
+output_res_char orc num Yi - - ----- horizontal resolution in units per line
+output_res_line orl num Yj - - ----- vertical resolution in units per line
+output_res_horz_inch orhi num Yk - - ----- horizontal resolution in units per inch
+output_res_vert_inch orvi num Yl - - ----- vertical resolution in units per inch
+print_rate cps num Ym - - ----- print rate in characters per second
+wide_char_size widcs num Yn - - ----- character step size when in double wide mode
+buttons btns num BT - - ----- number of buttons on mouse
+bit_image_entwining bitwin num Yo - - ----- number of passes for each bit-image row
+bit_image_type bitype num Yp - - ----- type of bit-image device
#%.TE
#%.ad
#%
@@ -319,370 +321,370 @@ bit_image_type bitype num Yp ----- type of bit-image device
#%lw25 lw6 lw2 lw20.
#%\fBVariable Cap- TCap Description\fR
#%\fBString name Code\fR
-back_tab cbt str bt YBCGE back tab (P)
-bell bel str bl YB-GE audible signal (bell) (P)
-carriage_return cr str cr YBCGE carriage return (P*) (P*)
-change_scroll_region csr str cs YBCGE change region to line #1 to line #2 (P)
-clear_all_tabs tbc str ct YB-G- clear all tab stops (P)
-clear_screen clear str cl YBCGE clear screen and home cursor (P*)
-clr_eol el str ce YBCGE clear to end of line (P)
-clr_eos ed str cd YBCGE clear to end of screen (P*)
-column_address hpa str ch -B-GE** horizontal position #1, absolute (P)
-command_character cmdch str CC YB-G- terminal settable cmd character in prototype !?
-cursor_address cup str cm YBCGE move to row #1 columns #2
-cursor_down cud1 str do YBCGE down one line
-cursor_home home str ho YBCGE home cursor (if no cup)
-cursor_invisible civis str vi YB-G- make cursor invisible
-cursor_left cub1 str le YBCGE move left one space
-cursor_mem_address mrcup str CM YB-G- memory relative cursor addressing, move to row #1 columns #2
-cursor_normal cnorm str ve YBCGE make cursor appear normal (undo civis/cvvis)
-cursor_right cuf1 str nd YBCGE non-destructive space (move right one space)
-cursor_to_ll ll str ll YBCGE last line, first column (if no cup)
-cursor_up cuu1 str up YBCGE up one line
-cursor_visible cvvis str vs YBCGE make cursor very visible
-delete_character dch1 str dc YBCGE delete character (P*)
-delete_line dl1 str dl YBCGE delete line (P*)
-dis_status_line dsl str ds YB-G- disable status line
-down_half_line hd str hd YB-G- half a line down
-enter_alt_charset_mode smacs str as YB-G- start alternate character set (P)
-enter_blink_mode blink str mb YB-G- turn on blinking
-enter_bold_mode bold str md YB-G- turn on bold (extra bright) mode
-enter_ca_mode smcup str ti YBCGE string to start programs using cup
-enter_delete_mode smdc str dm YBCGE enter delete mode
-enter_dim_mode dim str mh YB-G- turn on half-bright mode
-enter_insert_mode smir str im YBCGE enter insert mode
-enter_secure_mode invis str mk -B-G-* turn on blank mode (characters invisible)
-enter_protected_mode prot str mp -B-G-* turn on protected mode
-enter_reverse_mode rev str mr YB-G- turn on reverse video mode
-enter_standout_mode smso str so YBCGE begin standout mode
-enter_underline_mode smul str us YBCGE begin underline mode
-erase_chars ech str ec YB-G- erase #1 characters (P)
-exit_alt_charset_mode rmacs str ae YB-G- end alternate character set (P)
-exit_attribute_mode sgr0 str me YB-GE turn off all attributes
-exit_ca_mode rmcup str te YBCGE strings to end programs using cup
-exit_delete_mode rmdc str ed YBCGE end delete mode
-exit_insert_mode rmir str ei YBCGE exit insert mode
-exit_standout_mode rmso str se YBCGE exit standout mode
-exit_underline_mode rmul str ue YBCGE exit underline mode
-flash_screen flash str vb YBCGE visible bell (may not move cursor)
-form_feed ff str ff YB-G- hardcopy terminal page eject (P*)
-from_status_line fsl str fs YB-G- return from status line
-init_1string is1 str i1 YB-G- initialization string
-init_2string is2 str is YB-G- initialization string
-init_3string is3 str i3 YB-G- initialization string
-init_file if str if YB-G- name of initialization file
-insert_character ich1 str ic YBCGE insert character (P)
-insert_line il1 str al YBCGE insert line (P*)
-insert_padding ip str ip YBCGE insert padding after inserted character
-key_backspace kbs str kb YB-G- backspace key
-key_catab ktbc str ka -B-G-* clear-all-tabs key
-key_clear kclr str kC -B-G-* clear-screen or erase key
-key_ctab kctab str kt -B-G-* clear-tab key
-key_dc kdch1 str kD YB-G- delete-character key
-key_dl kdl1 str kL -B-G-* delete-line key
-key_down kcud1 str kd YBCGE down-arrow key
-key_eic krmir str kM -B-G-* sent by rmir or smir in insert mode
-key_eol kel str kE -B-G-* clear-to-end-of-line key
-key_eos ked str kS -B-G-* clear-to-end-of-screen key
-key_f0 kf0 str k0 YBCGE F0 function key
-key_f1 kf1 str k1 YBCGE F1 function key
-key_f10 kf10 str k; ----E F10 function key
-key_f2 kf2 str k2 YBCGE F2 function key
-key_f3 kf3 str k3 YBCGE F3 function key
-key_f4 kf4 str k4 YBCGE F4 function key
-key_f5 kf5 str k5 YBCGE F5 function key
-key_f6 kf6 str k6 YBCGE F6 function key
-key_f7 kf7 str k7 YBCGE F7 function key
-key_f8 kf8 str k8 YBCGE F8 function key
-key_f9 kf9 str k9 YBCGE F9 function key
-key_home khome str kh YBCGE home key
-key_ic kich1 str kI YB-GE insert-character key
-key_il kil1 str kA -B-G-* insert-line key
-key_left kcub1 str kl YBCGE left-arrow key
-key_ll kll str kH YB-G- lower-left key (home down)
-key_npage knp str kN YB-GE next-page key
-key_ppage kpp str kP YB-GE previous-page key
-key_right kcuf1 str kr YBCGE right-arrow key
-key_sf kind str kF -B-G-* scroll-forward key
-key_sr kri str kR -B-G-* scroll-backward key
-key_stab khts str kT -B-G-* set-tab key
-key_up kcuu1 str ku YBCGE up-arrow key
-keypad_local rmkx str ke YBCGE leave 'keyboard_transmit' mode
-keypad_xmit smkx str ks YBCGE enter 'keyboard_transmit' mode
-lab_f0 lf0 str l0 -B-G-* label on function key f0 if not f0
-lab_f1 lf1 str l1 -B-G-* label on function key f1 if not f1
-lab_f10 lf10 str la ----- label on function key f10 if not f10
-lab_f2 lf2 str l2 -B-G-* label on function key f2 if not f2
-lab_f3 lf3 str l3 -B-G-* label on function key f3 if not f3
-lab_f4 lf4 str l4 -B-G-* label on function key f4 if not f4
-lab_f5 lf5 str l5 -B-G-* label on function key f5 if not f5
-lab_f6 lf6 str l6 -B-G-* label on function key f6 if not f6
-lab_f7 lf7 str l7 -B-G-* label on function key f7 if not f7
-lab_f8 lf8 str l8 -B-G-* label on function key f8 if not f8
-lab_f9 lf9 str l9 -B-G-* label on function key f9 if not f9
-meta_off rmm str mo YB-G-* turn off meta mode
-meta_on smm str mm YB-G-* turn on meta mode (8th-bit on)
-newline nel str nw YB-G-* newline (behave like cr followed by lf)
-pad_char pad str pc YBCGE padding char (instead of null)
-parm_dch dch str DC YB-GE delete #1 characters (P*)
-parm_delete_line dl str DL YBCGE delete #1 lines (P*)
-parm_down_cursor cud str DO YBCGE down #1 lines (P*)
-parm_ich ich str IC YB-GE insert #1 characters (P*)
-parm_index indn str SF YBCG- scroll forward #1 lines (P)
-parm_insert_line il str AL YBCGE insert #1 lines (P*)
-parm_left_cursor cub str LE YBCGE move #1 characters to the left (P)
-parm_right_cursor cuf str RI YBCGE move #1 characters to the right (P*)
-parm_rindex rin str SR YBCG- scroll back #1 lines (P)
-parm_up_cursor cuu str UP YBCGE up #1 lines (P*)
-pkey_key pfkey str pk -B--- program function key #1 to type string #2
-pkey_local pfloc str pl -B--- program function key #1 to execute string #2
-pkey_xmit pfx str px -B--- program function key #1 to transmit string #2
-print_screen mc0 str ps -B-G-* print contents of screen
-prtr_off mc4 str pf -B-G-* turn off printer
-prtr_on mc5 str po -B-G-* turn on printer
-repeat_char rep str rp YB-GE repeat char #1 #2 times (P*)
-reset_1string rs1 str r1 -B--- reset string
-reset_2string rs2 str r2 -B--- reset string
-reset_3string rs3 str r3 -B--- reset string
-reset_file rf str rf -B--- name of reset file
-restore_cursor rc str rc YBCG- restore cursor to position of last save_cursor
-row_address vpa str cv -B-GE** vertical position #1 absolute (P)
-save_cursor sc str sc YBCG- save current cursor position (P)
-scroll_forward ind str sf YBCGE scroll text up (P)
-scroll_reverse ri str sr YBCGE scroll text down (P)
-set_attributes sgr str sa YB-G- define video attributes #1-#9 (PG9)
-set_tab hts str st YB-G- set a tab in every row, current columns
-set_window wind str wi -B-GE current window is lines #1-#2 cols #3-#4
-tab ht str ta YBCGE tab to next 8-space hardware tab stop
-to_status_line tsl str ts YB-G- move to status line, column #1
-underline_char uc str uc YBCG- underline char and move past it
-up_half_line hu str hu YB-G- half a line up
-init_prog iprog str iP -B--- path name of program for initialization
-key_a1 ka1 str K1 YB-GE upper left of keypad
-key_a3 ka3 str K3 YB-GE upper right of keypad
-key_b2 kb2 str K2 YB-GE center of keypad
-key_c1 kc1 str K4 YB-GE lower left of keypad
-key_c3 kc3 str K5 YB-GE lower right of keypad
-prtr_non mc5p str pO -B-G-* turn on printer for #1 bytes
+back_tab cbt str bt - - YBCGE back tab (P)
+bell bel str bl - - YB-GE audible signal (bell) (P)
+carriage_return cr str cr - - YBCGE carriage return (P*) (P*)
+change_scroll_region csr str cs - - YBCGE change region to line #1 to line #2 (P)
+clear_all_tabs tbc str ct - - YB-G- clear all tab stops (P)
+clear_screen clear str cl - - YBCGE clear screen and home cursor (P*)
+clr_eol el str ce - - YBCGE clear to end of line (P)
+clr_eos ed str cd - - YBCGE clear to end of screen (P*)
+column_address hpa str ch - - -B-GE* horizontal position #1, absolute (P)
+command_character cmdch str CC - - YB-G- terminal settable cmd character in prototype !?
+cursor_address cup str cm - - YBCGE move to row #1 columns #2
+cursor_down cud1 str do - - YBCGE down one line
+cursor_home home str ho - - YBCGE home cursor (if no cup)
+cursor_invisible civis str vi - - YB-G- make cursor invisible
+cursor_left cub1 str le - - YBCGE move left one space
+cursor_mem_address mrcup str CM - - YB-G- memory relative cursor addressing, move to row #1 columns #2
+cursor_normal cnorm str ve - - YBCGE make cursor appear normal (undo civis/cvvis)
+cursor_right cuf1 str nd - - YBCGE non-destructive space (move right one space)
+cursor_to_ll ll str ll - - YBCGE last line, first column (if no cup)
+cursor_up cuu1 str up - - YBCGE up one line
+cursor_visible cvvis str vs - - YBCGE make cursor very visible
+delete_character dch1 str dc - - YBCGE delete character (P*)
+delete_line dl1 str dl - - YBCGE delete line (P*)
+dis_status_line dsl str ds - - YB-G- disable status line
+down_half_line hd str hd - - YB-G- half a line down
+enter_alt_charset_mode smacs str as - - YB-G- start alternate character set (P)
+enter_blink_mode blink str mb - - YB-G- turn on blinking
+enter_bold_mode bold str md - - YB-G- turn on bold (extra bright) mode
+enter_ca_mode smcup str ti - - YBCGE string to start programs using cup
+enter_delete_mode smdc str dm - - YBCGE enter delete mode
+enter_dim_mode dim str mh - - YB-G- turn on half-bright mode
+enter_insert_mode smir str im - - YBCGE enter insert mode
+enter_secure_mode invis str mk - - -B-G-* turn on blank mode (characters invisible)
+enter_protected_mode prot str mp - - -B-G-* turn on protected mode
+enter_reverse_mode rev str mr - - YB-G- turn on reverse video mode
+enter_standout_mode smso str so - - YBCGE begin standout mode
+enter_underline_mode smul str us - - YBCGE begin underline mode
+erase_chars ech str ec - - YB-G- erase #1 characters (P)
+exit_alt_charset_mode rmacs str ae - - YB-G- end alternate character set (P)
+exit_attribute_mode sgr0 str me - - YB-GE turn off all attributes
+exit_ca_mode rmcup str te - - YBCGE strings to end programs using cup
+exit_delete_mode rmdc str ed - - YBCGE end delete mode
+exit_insert_mode rmir str ei - - YBCGE exit insert mode
+exit_standout_mode rmso str se - - YBCGE exit standout mode
+exit_underline_mode rmul str ue - - YBCGE exit underline mode
+flash_screen flash str vb - - YBCGE visible bell (may not move cursor)
+form_feed ff str ff - - YB-G- hardcopy terminal page eject (P*)
+from_status_line fsl str fs - - YB-G- return from status line
+init_1string is1 str i1 - - YB-G- initialization string
+init_2string is2 str is - - YB-G- initialization string
+init_3string is3 str i3 - - YB-G- initialization string
+init_file if str if - - YB-G- name of initialization file
+insert_character ich1 str ic - - YBCGE insert character (P)
+insert_line il1 str al - - YBCGE insert line (P*)
+insert_padding ip str ip - - YBCGE insert padding after inserted character
+key_backspace kbs str kb KEY_BACKSPACE 0407 YB-G- backspace key
+key_catab ktbc str ka KEY_CATAB 0526 -B-G-* clear-all-tabs key
+key_clear kclr str kC KEY_CLEAR 0515 -B-G-* clear-screen or erase key
+key_ctab kctab str kt KEY_CTAB 0525 -B-G-* clear-tab key
+key_dc kdch1 str kD KEY_DC 0512 YB-G- delete-character key
+key_dl kdl1 str kL KEY_DL 0510 -B-G-* delete-line key
+key_down kcud1 str kd KEY_DOWN 0402 YBCGE down-arrow key
+key_eic krmir str kM KEY_EIC 0514 -B-G-* sent by rmir or smir in insert mode
+key_eol kel str kE KEY_EOL 0517 -B-G-* clear-to-end-of-line key
+key_eos ked str kS KEY_EOS 0516 -B-G-* clear-to-end-of-screen key
+key_f0 kf0 str k0 KEY_F(0) 0410 YBCGE F0 function key
+key_f1 kf1 str k1 KEY_F(1) - YBCGE F1 function key
+key_f10 kf10 str k; KEY_F(10) - ----E F10 function key
+key_f2 kf2 str k2 KEY_F(2) - YBCGE F2 function key
+key_f3 kf3 str k3 KEY_F(3) - YBCGE F3 function key
+key_f4 kf4 str k4 KEY_F(4) - YBCGE F4 function key
+key_f5 kf5 str k5 KEY_F(5) - YBCGE F5 function key
+key_f6 kf6 str k6 KEY_F(6) - YBCGE F6 function key
+key_f7 kf7 str k7 KEY_F(7) - YBCGE F7 function key
+key_f8 kf8 str k8 KEY_F(8) - YBCGE F8 function key
+key_f9 kf9 str k9 KEY_F(9) - YBCGE F9 function key
+key_home khome str kh KEY_HOME 0406 YBCGE home key
+key_ic kich1 str kI KEY_IC 0513 YB-GE insert-character key
+key_il kil1 str kA KEY_IL 0511 -B-G-* insert-line key
+key_left kcub1 str kl KEY_LEFT 0404 YBCGE left-arrow key
+key_ll kll str kH KEY_LL 0533 YB-G- lower-left key (home down)
+key_npage knp str kN KEY_NPAGE 0522 YB-GE next-page key
+key_ppage kpp str kP KEY_PPAGE 0523 YB-GE previous-page key
+key_right kcuf1 str kr KEY_RIGHT 0405 YBCGE right-arrow key
+key_sf kind str kF KEY_SF 0520 -B-G-* scroll-forward key
+key_sr kri str kR KEY_SR 0521 -B-G-* scroll-backward key
+key_stab khts str kT KEY_STAB 0524 -B-G-* set-tab key
+key_up kcuu1 str ku KEY_UP 0403 YBCGE up-arrow key
+keypad_local rmkx str ke - - YBCGE leave 'keyboard_transmit' mode
+keypad_xmit smkx str ks - - YBCGE enter 'keyboard_transmit' mode
+lab_f0 lf0 str l0 - - -B-G-* label on function key f0 if not f0
+lab_f1 lf1 str l1 - - -B-G-* label on function key f1 if not f1
+lab_f10 lf10 str la - - ----- label on function key f10 if not f10
+lab_f2 lf2 str l2 - - -B-G-* label on function key f2 if not f2
+lab_f3 lf3 str l3 - - -B-G-* label on function key f3 if not f3
+lab_f4 lf4 str l4 - - -B-G-* label on function key f4 if not f4
+lab_f5 lf5 str l5 - - -B-G-* label on function key f5 if not f5
+lab_f6 lf6 str l6 - - -B-G-* label on function key f6 if not f6
+lab_f7 lf7 str l7 - - -B-G-* label on function key f7 if not f7
+lab_f8 lf8 str l8 - - -B-G-* label on function key f8 if not f8
+lab_f9 lf9 str l9 - - -B-G-* label on function key f9 if not f9
+meta_off rmm str mo - - YB-G-* turn off meta mode
+meta_on smm str mm - - YB-G-* turn on meta mode (8th-bit on)
+newline nel str nw - - YB-G-* newline (behave like cr followed by lf)
+pad_char pad str pc - - YBCGE padding char (instead of null)
+parm_dch dch str DC - - YB-GE delete #1 characters (P*)
+parm_delete_line dl str DL - - YBCGE delete #1 lines (P*)
+parm_down_cursor cud str DO - - YBCGE down #1 lines (P*)
+parm_ich ich str IC - - YB-GE insert #1 characters (P*)
+parm_index indn str SF - - YBCG- scroll forward #1 lines (P)
+parm_insert_line il str AL - - YBCGE insert #1 lines (P*)
+parm_left_cursor cub str LE - - YBCGE move #1 characters to the left (P)
+parm_right_cursor cuf str RI - - YBCGE move #1 characters to the right (P*)
+parm_rindex rin str SR - - YBCG- scroll back #1 lines (P)
+parm_up_cursor cuu str UP - - YBCGE up #1 lines (P*)
+pkey_key pfkey str pk - - -B--- program function key #1 to type string #2
+pkey_local pfloc str pl - - -B--- program function key #1 to execute string #2
+pkey_xmit pfx str px - - -B--- program function key #1 to transmit string #2
+print_screen mc0 str ps - - -B-G-* print contents of screen
+prtr_off mc4 str pf - - -B-G-* turn off printer
+prtr_on mc5 str po - - -B-G-* turn on printer
+repeat_char rep str rp - - YB-GE repeat char #1 #2 times (P*)
+reset_1string rs1 str r1 - - -B--- reset string
+reset_2string rs2 str r2 - - -B--- reset string
+reset_3string rs3 str r3 - - -B--- reset string
+reset_file rf str rf - - -B--- name of reset file
+restore_cursor rc str rc - - YBCG- restore cursor to position of last save_cursor
+row_address vpa str cv - - -B-GE* vertical position #1 absolute (P)
+save_cursor sc str sc - - YBCG- save current cursor position (P)
+scroll_forward ind str sf - - YBCGE scroll text up (P)
+scroll_reverse ri str sr - - YBCGE scroll text down (P)
+set_attributes sgr str sa - - YB-G- define video attributes #1-#9 (PG9)
+set_tab hts str st - - YB-G- set a tab in every row, current columns
+set_window wind str wi - - -B-GE current window is lines #1-#2 cols #3-#4
+tab ht str ta - - YBCGE tab to next 8-space hardware tab stop
+to_status_line tsl str ts - - YB-G- move to status line, column #1
+underline_char uc str uc - - YBCG- underline char and move past it
+up_half_line hu str hu - - YB-G- half a line up
+init_prog iprog str iP - - -B--- path name of program for initialization
+key_a1 ka1 str K1 KEY_A1 0534 YB-GE upper left of keypad
+key_a3 ka3 str K3 KEY_A3 0535 YB-GE upper right of keypad
+key_b2 kb2 str K2 KEY_B2 0536 YB-GE center of keypad
+key_c1 kc1 str K4 KEY_C1 0537 YB-GE lower left of keypad
+key_c3 kc3 str K5 KEY_C3 0540 YB-GE lower right of keypad
+prtr_non mc5p str pO - - -B-G-* turn on printer for #1 bytes
#
# SVr1 capabilities stop here. IBM's version of terminfo is the same as
# SVr4 up to this point, but has a different set afterwards.
#
-char_padding rmp str rP ----- like ip but when in insert mode
-acs_chars acsc str ac ----- graphics charset pairs, based on vt100
-plab_norm pln str pn ----- program label #1 to show string #2
-key_btab kcbt str kB ----- back-tab key
-enter_xon_mode smxon str SX ----- turn on xon/xoff handshaking
-exit_xon_mode rmxon str RX ----- turn off xon/xoff handshaking
-enter_am_mode smam str SA ----- turn on automatic margins
-exit_am_mode rmam str RA ----- turn off automatic margins
-xon_character xonc str XN ----- XON character
-xoff_character xoffc str XF ----- XOFF character
-ena_acs enacs str eA ----- enable alternate char set
-label_on smln str LO ----- turn on soft labels
-label_off rmln str LF ----- turn off soft labels
-key_beg kbeg str @1 ----- begin key
-key_cancel kcan str @2 ----- cancel key
-key_close kclo str @3 ----- close key
-key_command kcmd str @4 ----- command key
-key_copy kcpy str @5 ----- copy key
-key_create kcrt str @6 ----- create key
-key_end kend str @7 ----- end key
-key_enter kent str @8 ----- enter/send key
-key_exit kext str @9 ----- exit key
-key_find kfnd str @0 ----- find key
-key_help khlp str %1 ----- help key
-key_mark kmrk str %2 ----- mark key
-key_message kmsg str %3 ----- message key
-key_move kmov str %4 ----- move key
-key_next knxt str %5 ----- next key
-key_open kopn str %6 ----- open key
-key_options kopt str %7 ----- options key
-key_previous kprv str %8 ----- previous key
-key_print kprt str %9 ----- print key
-key_redo krdo str %0 ----- redo key
-key_reference kref str &1 ----- reference key
-key_refresh krfr str &2 ----- refresh key
-key_replace krpl str &3 ----- replace key
-key_restart krst str &4 ----- restart key
-key_resume kres str &5 ----- resume key
-key_save ksav str &6 ----- save key
-key_suspend kspd str &7 ----- suspend key
-key_undo kund str &8 ----- undo key
-key_sbeg kBEG str &9 ----- shifted begin key
-key_scancel kCAN str &0 ----- shifted cancel key
-key_scommand kCMD str *1 ----- shifted command key
-key_scopy kCPY str *2 ----- shifted copy key
-key_screate kCRT str *3 ----- shifted create key
-key_sdc kDC str *4 ----- shifted delete-character key
-key_sdl kDL str *5 ----- shifted delete-line key
-key_select kslt str *6 ----- select key
-key_send kEND str *7 ----- shifted end key
-key_seol kEOL str *8 ----- shifted clear-to-end-of-line key
-key_sexit kEXT str *9 ----- shifted exit key
-key_sfind kFND str *0 ----- shifted find key
-key_shelp kHLP str #1 ----- shifted help key
-key_shome kHOM str #2 ----- shifted home key
-key_sic kIC str #3 ----- shifted insert-character key
-key_sleft kLFT str #4 ----- shifted left-arrow key
-key_smessage kMSG str %a ----- shifted message key
-key_smove kMOV str %b ----- shifted move key
-key_snext kNXT str %c ----- shifted next key
-key_soptions kOPT str %d ----- shifted options key
-key_sprevious kPRV str %e ----- shifted previous key
-key_sprint kPRT str %f ----- shifted print key
-key_sredo kRDO str %g ----- shifted redo key
-key_sreplace kRPL str %h ----- shifted replace key
-key_sright kRIT str %i ----- shifted right-arrow key
-key_srsume kRES str %j ----- shifted resume key
-key_ssave kSAV str !1 ----- shifted save key
-key_ssuspend kSPD str !2 ----- shifted suspend key
-key_sundo kUND str !3 ----- shifted undo key
-req_for_input rfi str RF ----- send next input char (for ptys)
-key_f11 kf11 str F1 ----E F11 function key
-key_f12 kf12 str F2 ----E F12 function key
-key_f13 kf13 str F3 ----E F13 function key
-key_f14 kf14 str F4 ----E F14 function key
-key_f15 kf15 str F5 ----E F15 function key
-key_f16 kf16 str F6 ----E F16 function key
-key_f17 kf17 str F7 ----E F17 function key
-key_f18 kf18 str F8 ----E F18 function key
-key_f19 kf19 str F9 ----E F19 function key
-key_f20 kf20 str FA ----E F20 function key
-key_f21 kf21 str FB ----E F21 function key
-key_f22 kf22 str FC ----E F22 function key
-key_f23 kf23 str FD ----E F23 function key
-key_f24 kf24 str FE ----E F24 function key
-key_f25 kf25 str FF ----E F25 function key
-key_f26 kf26 str FG ----E F26 function key
-key_f27 kf27 str FH ----E F27 function key
-key_f28 kf28 str FI ----E F28 function key
-key_f29 kf29 str FJ ----E F29 function key
-key_f30 kf30 str FK ----E F30 function key
-key_f31 kf31 str FL ----E F31 function key
-key_f32 kf32 str FM ----E F32 function key
-key_f33 kf33 str FN ----E F33 function key
-key_f34 kf34 str FO ----E F34 function key
-key_f35 kf35 str FP ----E F35 function key
-key_f36 kf36 str FQ ----E F36 function key
-key_f37 kf37 str FR ----E F37 function key
-key_f38 kf38 str FS ----E F38 function key
-key_f39 kf39 str FT ----E F39 function key
-key_f40 kf40 str FU ----E F40 function key
-key_f41 kf41 str FV ----E F41 function key
-key_f42 kf42 str FW ----E F42 function key
-key_f43 kf43 str FX ----E F43 function key
-key_f44 kf44 str FY ----E F44 function key
-key_f45 kf45 str FZ ----E F45 function key
-key_f46 kf46 str Fa ----E F46 function key
-key_f47 kf47 str Fb ----E F47 function key
-key_f48 kf48 str Fc ----E F48 function key
-key_f49 kf49 str Fd ----E F49 function key
-key_f50 kf50 str Fe ----E F50 function key
-key_f51 kf51 str Ff ----E F51 function key
-key_f52 kf52 str Fg ----E F52 function key
-key_f53 kf53 str Fh ----E F53 function key
-key_f54 kf54 str Fi ----E F54 function key
-key_f55 kf55 str Fj ----E F55 function key
-key_f56 kf56 str Fk ----E F56 function key
-key_f57 kf57 str Fl ----E F57 function key
-key_f58 kf58 str Fm ----E F58 function key
-key_f59 kf59 str Fn ----E F59 function key
-key_f60 kf60 str Fo ----E F60 function key
-key_f61 kf61 str Fp ----E F61 function key
-key_f62 kf62 str Fq ----E F62 function key
-key_f63 kf63 str Fr ----E F63 function key
-clr_bol el1 str cb ----- Clear to beginning of line
-clear_margins mgc str MC ----- clear right and left soft margins
-set_left_margin smgl str ML ----- set left soft margin at current column. See smgl. (ML is not in BSD termcap).
-set_right_margin smgr str MR ----- set right soft margin at current column
-label_format fln str Lf ----- label format
-set_clock sclk str SC ----- set clock, #1 hrs #2 mins #3 secs
-display_clock dclk str DK ----- display clock
-remove_clock rmclk str RC ----- remove clock
-create_window cwin str CW ----- define a window #1 from #2,#3 to #4,#5
-goto_window wingo str WG ----- go to window #1
-hangup hup str HU ----- hang-up phone
-dial_phone dial str DI ----- dial number #1
-quick_dial qdial str QD ----- dial number #1 without checking
-tone tone str TO ----- select touch tone dialing
-pulse pulse str PU ----- select pulse dialing
-flash_hook hook str fh ----- flash switch hook
-fixed_pause pause str PA ----- pause for 2-3 seconds
-wait_tone wait str WA ----- wait for dial-tone
-user0 u0 str u0 ----- User string #0
-user1 u1 str u1 ----- User string #1
-user2 u2 str u2 ----- User string #2
-user3 u3 str u3 ----- User string #3
-user4 u4 str u4 ----- User string #4
-user5 u5 str u5 ----- User string #5
-user6 u6 str u6 ----- User string #6
-user7 u7 str u7 ----- User string #7
-user8 u8 str u8 ----- User string #8
-user9 u9 str u9 ----- User string #9
+char_padding rmp str rP - - ----- like ip but when in insert mode
+acs_chars acsc str ac - - ----- graphics charset pairs, based on vt100
+plab_norm pln str pn - - ----- program label #1 to show string #2
+key_btab kcbt str kB KEY_BTAB 0541 ----- back-tab key
+enter_xon_mode smxon str SX - - ----- turn on xon/xoff handshaking
+exit_xon_mode rmxon str RX - - ----- turn off xon/xoff handshaking
+enter_am_mode smam str SA - - ----- turn on automatic margins
+exit_am_mode rmam str RA - - ----- turn off automatic margins
+xon_character xonc str XN - - ----- XON character
+xoff_character xoffc str XF - - ----- XOFF character
+ena_acs enacs str eA - - ----- enable alternate char set
+label_on smln str LO - - ----- turn on soft labels
+label_off rmln str LF - - ----- turn off soft labels
+key_beg kbeg str @1 KEY_BEG 0542 ----- begin key
+key_cancel kcan str @2 KEY_CANCEL 0543 ----- cancel key
+key_close kclo str @3 KEY_CLOSE 0544 ----- close key
+key_command kcmd str @4 KEY_COMMAND 0545 ----- command key
+key_copy kcpy str @5 KEY_COPY 0546 ----- copy key
+key_create kcrt str @6 KEY_CREATE 0547 ----- create key
+key_end kend str @7 KEY_END 0550 ----- end key
+key_enter kent str @8 KEY_ENTER 0527 ----- enter/send key
+key_exit kext str @9 KEY_EXIT 0551 ----- exit key
+key_find kfnd str @0 KEY_FIND 0552 ----- find key
+key_help khlp str %1 KEY_HELP 0553 ----- help key
+key_mark kmrk str %2 KEY_MARK 0554 ----- mark key
+key_message kmsg str %3 KEY_MESSAGE 0555 ----- message key
+key_move kmov str %4 KEY_MOVE 0556 ----- move key
+key_next knxt str %5 KEY_NEXT 0557 ----- next key
+key_open kopn str %6 KEY_OPEN 0560 ----- open key
+key_options kopt str %7 KEY_OPTIONS 0561 ----- options key
+key_previous kprv str %8 KEY_PREVIOUS 0562 ----- previous key
+key_print kprt str %9 KEY_PRINT 0532 ----- print key
+key_redo krdo str %0 KEY_REDO 0563 ----- redo key
+key_reference kref str &1 KEY_REFERENCE 0564 ----- reference key
+key_refresh krfr str &2 KEY_REFRESH 0565 ----- refresh key
+key_replace krpl str &3 KEY_REPLACE 0566 ----- replace key
+key_restart krst str &4 KEY_RESTART 0567 ----- restart key
+key_resume kres str &5 KEY_RESUME 0570 ----- resume key
+key_save ksav str &6 KEY_SAVE 0571 ----- save key
+key_suspend kspd str &7 KEY_SUSPEND 0627 ----- suspend key
+key_undo kund str &8 KEY_UNDO 0630 ----- undo key
+key_sbeg kBEG str &9 KEY_SBEG 0572 ----- shifted begin key
+key_scancel kCAN str &0 KEY_SCANCEL 0573 ----- shifted cancel key
+key_scommand kCMD str *1 KEY_SCOMMAND 0574 ----- shifted command key
+key_scopy kCPY str *2 KEY_SCOPY 0575 ----- shifted copy key
+key_screate kCRT str *3 KEY_SCREATE 0576 ----- shifted create key
+key_sdc kDC str *4 KEY_SDC 0577 ----- shifted delete-character key
+key_sdl kDL str *5 KEY_SDL 0600 ----- shifted delete-line key
+key_select kslt str *6 KEY_SELECT 0601 ----- select key
+key_send kEND str *7 KEY_SEND 0602 ----- shifted end key
+key_seol kEOL str *8 KEY_SEOL 0603 ----- shifted clear-to-end-of-line key
+key_sexit kEXT str *9 KEY_SEXIT 0604 ----- shifted exit key
+key_sfind kFND str *0 KEY_SFIND 0605 ----- shifted find key
+key_shelp kHLP str #1 KEY_SHELP 0606 ----- shifted help key
+key_shome kHOM str #2 KEY_SHOME 0607 ----- shifted home key
+key_sic kIC str #3 KEY_SIC 0610 ----- shifted insert-character key
+key_sleft kLFT str #4 KEY_SLEFT 0611 ----- shifted left-arrow key
+key_smessage kMSG str %a KEY_SMESSAGE 0612 ----- shifted message key
+key_smove kMOV str %b KEY_SMOVE 0613 ----- shifted move key
+key_snext kNXT str %c KEY_SNEXT 0614 ----- shifted next key
+key_soptions kOPT str %d KEY_SOPTIONS 0615 ----- shifted options key
+key_sprevious kPRV str %e KEY_SPREVIOUS 0616 ----- shifted previous key
+key_sprint kPRT str %f KEY_SPRINT 0617 ----- shifted print key
+key_sredo kRDO str %g KEY_SREDO 0620 ----- shifted redo key
+key_sreplace kRPL str %h KEY_SREPLACE 0621 ----- shifted replace key
+key_sright kRIT str %i KEY_SRIGHT 0622 ----- shifted right-arrow key
+key_srsume kRES str %j KEY_SRSUME 0623 ----- shifted resume key
+key_ssave kSAV str !1 KEY_SSAVE 0624 ----- shifted save key
+key_ssuspend kSPD str !2 KEY_SSUSPEND 0625 ----- shifted suspend key
+key_sundo kUND str !3 KEY_SUNDO 0626 ----- shifted undo key
+req_for_input rfi str RF - - ----- send next input char (for ptys)
+key_f11 kf11 str F1 KEY_F(11) - ----E F11 function key
+key_f12 kf12 str F2 KEY_F(12) - ----E F12 function key
+key_f13 kf13 str F3 KEY_F(13) - ----E F13 function key
+key_f14 kf14 str F4 KEY_F(14) - ----E F14 function key
+key_f15 kf15 str F5 KEY_F(15) - ----E F15 function key
+key_f16 kf16 str F6 KEY_F(16) - ----E F16 function key
+key_f17 kf17 str F7 KEY_F(17) - ----E F17 function key
+key_f18 kf18 str F8 KEY_F(18) - ----E F18 function key
+key_f19 kf19 str F9 KEY_F(19) - ----E F19 function key
+key_f20 kf20 str FA KEY_F(20) - ----E F20 function key
+key_f21 kf21 str FB KEY_F(21) - ----E F21 function key
+key_f22 kf22 str FC KEY_F(22) - ----E F22 function key
+key_f23 kf23 str FD KEY_F(23) - ----E F23 function key
+key_f24 kf24 str FE KEY_F(24) - ----E F24 function key
+key_f25 kf25 str FF KEY_F(25) - ----E F25 function key
+key_f26 kf26 str FG KEY_F(26) - ----E F26 function key
+key_f27 kf27 str FH KEY_F(27) - ----E F27 function key
+key_f28 kf28 str FI KEY_F(28) - ----E F28 function key
+key_f29 kf29 str FJ KEY_F(29) - ----E F29 function key
+key_f30 kf30 str FK KEY_F(30) - ----E F30 function key
+key_f31 kf31 str FL KEY_F(31) - ----E F31 function key
+key_f32 kf32 str FM KEY_F(32) - ----E F32 function key
+key_f33 kf33 str FN KEY_F(33) - ----E F33 function key
+key_f34 kf34 str FO KEY_F(34) - ----E F34 function key
+key_f35 kf35 str FP KEY_F(35) - ----E F35 function key
+key_f36 kf36 str FQ KEY_F(36) - ----E F36 function key
+key_f37 kf37 str FR KEY_F(37) - ----E F37 function key
+key_f38 kf38 str FS KEY_F(38) - ----E F38 function key
+key_f39 kf39 str FT KEY_F(39) - ----E F39 function key
+key_f40 kf40 str FU KEY_F(40) - ----E F40 function key
+key_f41 kf41 str FV KEY_F(41) - ----E F41 function key
+key_f42 kf42 str FW KEY_F(42) - ----E F42 function key
+key_f43 kf43 str FX KEY_F(43) - ----E F43 function key
+key_f44 kf44 str FY KEY_F(44) - ----E F44 function key
+key_f45 kf45 str FZ KEY_F(45) - ----E F45 function key
+key_f46 kf46 str Fa KEY_F(46) - ----E F46 function key
+key_f47 kf47 str Fb KEY_F(47) - ----E F47 function key
+key_f48 kf48 str Fc KEY_F(48) - ----E F48 function key
+key_f49 kf49 str Fd KEY_F(49) - ----E F49 function key
+key_f50 kf50 str Fe KEY_F(50) - ----E F50 function key
+key_f51 kf51 str Ff KEY_F(51) - ----E F51 function key
+key_f52 kf52 str Fg KEY_F(52) - ----E F52 function key
+key_f53 kf53 str Fh KEY_F(53) - ----E F53 function key
+key_f54 kf54 str Fi KEY_F(54) - ----E F54 function key
+key_f55 kf55 str Fj KEY_F(55) - ----E F55 function key
+key_f56 kf56 str Fk KEY_F(56) - ----E F56 function key
+key_f57 kf57 str Fl KEY_F(57) - ----E F57 function key
+key_f58 kf58 str Fm KEY_F(58) - ----E F58 function key
+key_f59 kf59 str Fn KEY_F(59) - ----E F59 function key
+key_f60 kf60 str Fo KEY_F(60) - ----E F60 function key
+key_f61 kf61 str Fp KEY_F(61) - ----E F61 function key
+key_f62 kf62 str Fq KEY_F(62) - ----E F62 function key
+key_f63 kf63 str Fr KEY_F(63) - ----E F63 function key
+clr_bol el1 str cb - - ----- Clear to beginning of line
+clear_margins mgc str MC - - ----- clear right and left soft margins
+set_left_margin smgl str ML - - ----- set left soft margin at current column. See smgl. (ML is not in BSD termcap).
+set_right_margin smgr str MR - - ----- set right soft margin at current column
+label_format fln str Lf - - ----- label format
+set_clock sclk str SC - - ----- set clock, #1 hrs #2 mins #3 secs
+display_clock dclk str DK - - ----- display clock
+remove_clock rmclk str RC - - ----- remove clock
+create_window cwin str CW - - ----- define a window #1 from #2,#3 to #4,#5
+goto_window wingo str WG - - ----- go to window #1
+hangup hup str HU - - ----- hang-up phone
+dial_phone dial str DI - - ----- dial number #1
+quick_dial qdial str QD - - ----- dial number #1 without checking
+tone tone str TO - - ----- select touch tone dialing
+pulse pulse str PU - - ----- select pulse dialing
+flash_hook hook str fh - - ----- flash switch hook
+fixed_pause pause str PA - - ----- pause for 2-3 seconds
+wait_tone wait str WA - - ----- wait for dial-tone
+user0 u0 str u0 - - ----- User string #0
+user1 u1 str u1 - - ----- User string #1
+user2 u2 str u2 - - ----- User string #2
+user3 u3 str u3 - - ----- User string #3
+user4 u4 str u4 - - ----- User string #4
+user5 u5 str u5 - - ----- User string #5
+user6 u6 str u6 - - ----- User string #6
+user7 u7 str u7 - - ----- User string #7
+user8 u8 str u8 - - ----- User string #8
+user9 u9 str u9 - - ----- User string #9
#
# SVr4 added these capabilities to support color
#
-orig_pair op str op ----- Set default pair to its original value
-orig_colors oc str oc ----- Set all color pairs to the original ones
-initialize_color initc str Ic ----- initialize color #1 to (#2,#3,#4)
-initialize_pair initp str Ip ----- Initialize color pair #1 to fg=(#2,#3,#4), bg=(#5,#6,#7)
-set_color_pair scp str sp ----- Set current color pair to #1
-set_foreground setf str Sf ----- Set foreground color #1
-set_background setb str Sb ----- Set background color #1
+orig_pair op str op - - ----- Set default pair to its original value
+orig_colors oc str oc - - ----- Set all color pairs to the original ones
+initialize_color initc str Ic - - ----- initialize color #1 to (#2,#3,#4)
+initialize_pair initp str Ip - - ----- Initialize color pair #1 to fg=(#2,#3,#4), bg=(#5,#6,#7)
+set_color_pair scp str sp - - ----- Set current color pair to #1
+set_foreground setf str Sf - - ----- Set foreground color #1
+set_background setb str Sb - - ----- Set background color #1
#
# SVr4 added these capabilities to support printers
#
-change_char_pitch cpi str ZA ----- Change number of characters per inch to #1
-change_line_pitch lpi str ZB ----- Change number of lines per inch to #1
-change_res_horz chr str ZC ----- Change horizontal resolution to #1
-change_res_vert cvr str ZD ----- Change vertical resolution to #1
-define_char defc str ZE ----- Define a character #1, #2 dots wide, descender #3
-enter_doublewide_mode swidm str ZF ----- Enter double-wide mode
-enter_draft_quality sdrfq str ZG ----- Enter draft-quality mode
-enter_italics_mode sitm str ZH ----- Enter italic mode
-enter_leftward_mode slm str ZI ----- Start leftward carriage motion
-enter_micro_mode smicm str ZJ ----- Start micro-motion mode
-enter_near_letter_quality snlq str ZK ----- Enter NLQ mode
-enter_normal_quality snrmq str ZL ----- Enter normal-quality mode
-enter_shadow_mode sshm str ZM ----- Enter shadow-print mode
-enter_subscript_mode ssubm str ZN ----- Enter subscript mode
-enter_superscript_mode ssupm str ZO ----- Enter superscript mode
-enter_upward_mode sum str ZP ----- Start upward carriage motion
-exit_doublewide_mode rwidm str ZQ ----- End double-wide mode
-exit_italics_mode ritm str ZR ----- End italic mode
-exit_leftward_mode rlm str ZS ----- End left-motion mode
-exit_micro_mode rmicm str ZT ----- End micro-motion mode
-exit_shadow_mode rshm str ZU ----- End shadow-print mode
-exit_subscript_mode rsubm str ZV ----- End subscript mode
-exit_superscript_mode rsupm str ZW ----- End superscript mode
-exit_upward_mode rum str ZX ----- End reverse character motion
-micro_column_address mhpa str ZY ----- Like column_address in micro mode
-micro_down mcud1 str ZZ ----- Like cursor_down in micro mode
-micro_left mcub1 str Za ----- Like cursor_left in micro mode
-micro_right mcuf1 str Zb ----- Like cursor_right in micro mode
-micro_row_address mvpa str Zc ----- Like row_address #1 in micro mode
-micro_up mcuu1 str Zd ----- Like cursor_up in micro mode
-order_of_pins porder str Ze ----- Match software bits to print-head pins
-parm_down_micro mcud str Zf ----- Like parm_down_cursor in micro mode
-parm_left_micro mcub str Zg ----- Like parm_left_cursor in micro mode
-parm_right_micro mcuf str Zh ----- Like parm_right_cursor in micro mode
-parm_up_micro mcuu str Zi ----- Like parm_up_cursor in micro mode
-select_char_set scs str Zj ----- Select character set, #1
-set_bottom_margin smgb str Zk ----- Set bottom margin at current line
-set_bottom_margin_parm smgbp str Zl ----- Set bottom margin at line #1 or (if smgtp is not given) #2 lines from bottom
-set_left_margin_parm smglp str Zm ----- Set left (right) margin at column #1
-set_right_margin_parm smgrp str Zn ----- Set right margin at column #1
-set_top_margin smgt str Zo ----- Set top margin at current line
-set_top_margin_parm smgtp str Zp ----- Set top (bottom) margin at row #1
-start_bit_image sbim str Zq ----- Start printing bit image graphics
-start_char_set_def scsd str Zr ----- Start character set definition #1, with #2 characters in the set
-stop_bit_image rbim str Zs ----- Stop printing bit image graphics
-stop_char_set_def rcsd str Zt ----- End definition of character set #1
-subscript_characters subcs str Zu ----- List of subscriptable characters
-superscript_characters supcs str Zv ----- List of superscriptable characters
-these_cause_cr docr str Zw ----- Printing any of these characters causes CR
-zero_motion zerom str Zx ----- No motion for subsequent character
+change_char_pitch cpi str ZA - - ----- Change number of characters per inch to #1
+change_line_pitch lpi str ZB - - ----- Change number of lines per inch to #1
+change_res_horz chr str ZC - - ----- Change horizontal resolution to #1
+change_res_vert cvr str ZD - - ----- Change vertical resolution to #1
+define_char defc str ZE - - ----- Define a character #1, #2 dots wide, descender #3
+enter_doublewide_mode swidm str ZF - - ----- Enter double-wide mode
+enter_draft_quality sdrfq str ZG - - ----- Enter draft-quality mode
+enter_italics_mode sitm str ZH - - ----- Enter italic mode
+enter_leftward_mode slm str ZI - - ----- Start leftward carriage motion
+enter_micro_mode smicm str ZJ - - ----- Start micro-motion mode
+enter_near_letter_quality snlq str ZK - - ----- Enter NLQ mode
+enter_normal_quality snrmq str ZL - - ----- Enter normal-quality mode
+enter_shadow_mode sshm str ZM - - ----- Enter shadow-print mode
+enter_subscript_mode ssubm str ZN - - ----- Enter subscript mode
+enter_superscript_mode ssupm str ZO - - ----- Enter superscript mode
+enter_upward_mode sum str ZP - - ----- Start upward carriage motion
+exit_doublewide_mode rwidm str ZQ - - ----- End double-wide mode
+exit_italics_mode ritm str ZR - - ----- End italic mode
+exit_leftward_mode rlm str ZS - - ----- End left-motion mode
+exit_micro_mode rmicm str ZT - - ----- End micro-motion mode
+exit_shadow_mode rshm str ZU - - ----- End shadow-print mode
+exit_subscript_mode rsubm str ZV - - ----- End subscript mode
+exit_superscript_mode rsupm str ZW - - ----- End superscript mode
+exit_upward_mode rum str ZX - - ----- End reverse character motion
+micro_column_address mhpa str ZY - - ----- Like column_address in micro mode
+micro_down mcud1 str ZZ - - ----- Like cursor_down in micro mode
+micro_left mcub1 str Za - - ----- Like cursor_left in micro mode
+micro_right mcuf1 str Zb - - ----- Like cursor_right in micro mode
+micro_row_address mvpa str Zc - - ----- Like row_address #1 in micro mode
+micro_up mcuu1 str Zd - - ----- Like cursor_up in micro mode
+order_of_pins porder str Ze - - ----- Match software bits to print-head pins
+parm_down_micro mcud str Zf - - ----- Like parm_down_cursor in micro mode
+parm_left_micro mcub str Zg - - ----- Like parm_left_cursor in micro mode
+parm_right_micro mcuf str Zh - - ----- Like parm_right_cursor in micro mode
+parm_up_micro mcuu str Zi - - ----- Like parm_up_cursor in micro mode
+select_char_set scs str Zj - - ----- Select character set, #1
+set_bottom_margin smgb str Zk - - ----- Set bottom margin at current line
+set_bottom_margin_parm smgbp str Zl - - ----- Set bottom margin at line #1 or (if smgtp is not given) #2 lines from bottom
+set_left_margin_parm smglp str Zm - - ----- Set left (right) margin at column #1
+set_right_margin_parm smgrp str Zn - - ----- Set right margin at column #1
+set_top_margin smgt str Zo - - ----- Set top margin at current line
+set_top_margin_parm smgtp str Zp - - ----- Set top (bottom) margin at row #1
+start_bit_image sbim str Zq - - ----- Start printing bit image graphics
+start_char_set_def scsd str Zr - - ----- Start character set definition #1, with #2 characters in the set
+stop_bit_image rbim str Zs - - ----- Stop printing bit image graphics
+stop_char_set_def rcsd str Zt - - ----- End definition of character set #1
+subscript_characters subcs str Zu - - ----- List of subscriptable characters
+superscript_characters supcs str Zv - - ----- List of superscriptable characters
+these_cause_cr docr str Zw - - ----- Printing any of these characters causes CR
+zero_motion zerom str Zx - - ----- No motion for subsequent character
#%.TE
#%.ad
#%
@@ -697,41 +699,41 @@ zero_motion zerom str Zx ----- No motion for subsequent character
#%lw25 lw6 lw2 lw18.
#%\fBVariable Cap- TCap Description\fR
#%\fBString name Code\fR
-char_set_names csnm str Zy ----- Produce #1'th item from list of character set names
-key_mouse kmous str Km ----- Mouse event has occurred
-mouse_info minfo str Mi ----- Mouse status information
-req_mouse_pos reqmp str RQ ----- Request mouse position
-get_mouse getm str Gm ----- Curses should get button events, parameter #1 not documented.
-set_a_foreground setaf str AF ----- Set foreground color to #1, using ANSI escape
-set_a_background setab str AB ----- Set background color to #1, using ANSI escape
-pkey_plab pfxl str xl ----- Program function key #1 to type string #2 and show string #3
-device_type devt str dv ----- Indicate language/codeset support
-code_set_init csin str ci ----- Init sequence for multiple codesets
-set0_des_seq s0ds str s0 ----- Shift to code set 0 (EUC set 0, ASCII)
-set1_des_seq s1ds str s1 ----- Shift to code set 1
-set2_des_seq s2ds str s2 ----- Shift to code set 2
-set3_des_seq s3ds str s3 ----- Shift to code set 3
-set_lr_margin smglr str ML ----- Set both left and right margins to #1, #2. (ML is not in BSD termcap).
-set_tb_margin smgtb str MT ----- Sets both top and bottom margins to #1, #2
-bit_image_repeat birep str Xy ----- Repeat bit image cell #1 #2 times
-bit_image_newline binel str Zz ----- Move to next row of the bit image
-bit_image_carriage_return bicr str Yv ----- Move to beginning of same row
-color_names colornm str Yw ----- Give name for color #1
-define_bit_image_region defbi str Yx ----- Define rectangualar bit image region
-end_bit_image_region endbi str Yy ----- End a bit-image region
-set_color_band setcolor str Yz ----- Change to ribbon color #1
-set_page_length slines str YZ ----- Set page length to #1 lines
+char_set_names csnm str Zy - - ----- Produce #1'th item from list of character set names
+key_mouse kmous str Km KEY_MOUSE 0631 ----- Mouse event has occurred
+mouse_info minfo str Mi - - ----- Mouse status information
+req_mouse_pos reqmp str RQ - - ----- Request mouse position
+get_mouse getm str Gm - - ----- Curses should get button events, parameter #1 not documented.
+set_a_foreground setaf str AF - - ----- Set foreground color to #1, using ANSI escape
+set_a_background setab str AB - - ----- Set background color to #1, using ANSI escape
+pkey_plab pfxl str xl - - ----- Program function key #1 to type string #2 and show string #3
+device_type devt str dv - - ----- Indicate language/codeset support
+code_set_init csin str ci - - ----- Init sequence for multiple codesets
+set0_des_seq s0ds str s0 - - ----- Shift to codeset 0 (EUC set 0, ASCII)
+set1_des_seq s1ds str s1 - - ----- Shift to codeset 1
+set2_des_seq s2ds str s2 - - ----- Shift to codeset 2
+set3_des_seq s3ds str s3 - - ----- Shift to codeset 3
+set_lr_margin smglr str ML - - ----- Set both left and right margins to #1, #2. (ML is not in BSD termcap).
+set_tb_margin smgtb str MT - - ----- Sets both top and bottom margins to #1, #2
+bit_image_repeat birep str Xy - - ----- Repeat bit image cell #1 #2 times
+bit_image_newline binel str Zz - - ----- Move to next row of the bit image
+bit_image_carriage_return bicr str Yv - - ----- Move to beginning of same row
+color_names colornm str Yw - - ----- Give name for color #1
+define_bit_image_region defbi str Yx - - ----- Define rectangualar bit image region
+end_bit_image_region endbi str Yy - - ----- End a bit-image region
+set_color_band setcolor str Yz - - ----- Change to ribbon color #1
+set_page_length slines str YZ - - ----- Set page length to #1 lines
#
# SVr4 added these capabilities for direct PC-clone support
#
-display_pc_char dispc str S1 ----- Display PC character #1
-enter_pc_charset_mode smpch str S2 ----- Enter PC character display mode
-exit_pc_charset_mode rmpch str S3 ----- Exit PC character display mode
-enter_scancode_mode smsc str S4 ----- Enter PC scancode mode
-exit_scancode_mode rmsc str S5 ----- Exit PC scancode mode
-pc_term_options pctrm str S6 ----- PC terminal options
-scancode_escape scesc str S7 ----- Escape for scancode emulation
-alt_scancode_esc scesa str S8 ----- Alternate escape for scancode emulation
+display_pc_char dispc str S1 - - ----- Display PC character #1
+enter_pc_charset_mode smpch str S2 - - ----- Enter PC character display mode
+exit_pc_charset_mode rmpch str S3 - - ----- Exit PC character display mode
+enter_scancode_mode smsc str S4 - - ----- Enter PC scancode mode
+exit_scancode_mode rmsc str S5 - - ----- Exit PC scancode mode
+pc_term_options pctrm str S6 - - ----- PC terminal options
+scancode_escape scesc str S7 - - ----- Escape for scancode emulation
+alt_scancode_esc scesa str S8 - - ----- Alternate escape for scancode emulation
#%.TE
#%.ad
#%
@@ -751,14 +753,14 @@ alt_scancode_esc scesa str S8 ----- Alternate escape for scancode emulation
#%lw25 lw6 lw2 lw20.
#%\fBVariable Cap- TCap Description\fR
#%\fBString name Code\fR
-enter_horizontal_hl_mode ehhlm str Xh ----- Enter horizontal highlight mode
-enter_left_hl_mode elhlm str Xl ----- Enter left highlight mode
-enter_low_hl_mode elohlm str Xo ----- Enter low highlight mode
-enter_right_hl_mode erhlm str Xr ----- Enter right highlight mode
-enter_top_hl_mode ethlm str Xt ----- Enter top highlight mode
-enter_vertical_hl_mode evhlm str Xv ----- Enter vertical highlight mode
-set_a_attributes sgr1 str sA ----- Define second set of video attributes #1-#6
-set_pglen_inch slength str sL ----- YI Set page length to #1 hundredth of an inch
+enter_horizontal_hl_mode ehhlm str Xh - - ----- Enter horizontal highlight mode
+enter_left_hl_mode elhlm str Xl - - ----- Enter left highlight mode
+enter_low_hl_mode elohlm str Xo - - ----- Enter low highlight mode
+enter_right_hl_mode erhlm str Xr - - ----- Enter right highlight mode
+enter_top_hl_mode ethlm str Xt - - ----- Enter top highlight mode
+enter_vertical_hl_mode evhlm str Xv - - ----- Enter vertical highlight mode
+set_a_attributes sgr1 str sA - - ----- Define second set of video attributes #1-#6
+set_pglen_inch slength str sL - - ----- YI Set page length to #1 hundredth of an inch
#%.TE
#%.ad
#
@@ -795,34 +797,34 @@ set_pglen_inch slength str sL ----- YI Set page length to #1 hundredth of an i
# The ug capability is thrown away, but assumed to be whatever sg is if the
# latter is nonzero and we're dumping in termcap format.
#
-termcap_init2 OTi2 str i2 YB--- secondary initialization string
-termcap_reset OTrs str rs YB-G- terminal reset string
-magic_cookie_glitch_ul OTug num ug YBCGE number of blanks left by ul
+termcap_init2 OTi2 str i2 - - YB--- secondary initialization string
+termcap_reset OTrs str rs - - YB-G- terminal reset string
+magic_cookie_glitch_ul OTug num ug - - YBCGE number of blanks left by ul
#
# Obsolete termcap capabilities. Some are used for termcap translation. The
# code uses the 'OT' prefix we put on obsolete capabilities to suppress
# printing them in terminfo source dumps of compiled entries.
#
-backspaces_with_bs OTbs bool bs YBCGE uses ^H to move left
-crt_no_scrolling OTns bool ns YBCG- crt cannot scroll
-no_correctly_working_cr OTnc bool nc YBCG- no way to go to start of line
-carriage_return_delay OTdC num dC YB-G- pad needed for CR
-new_line_delay OTdN num dN YB-G- pad needed for LF
-linefeed_if_not_lf OTnl str nl YBCGE use to move down
-backspace_if_not_bs OTbc str bc YBCGE move left, if not ^H
+backspaces_with_bs OTbs bool bs - - YBCGE uses ^H to move left
+crt_no_scrolling OTns bool ns - - YBCG- crt cannot scroll
+no_correctly_working_cr OTnc bool nc - - YBCG- no way to go to start of line
+carriage_return_delay OTdC num dC - - YB-G- pad needed for CR
+new_line_delay OTdN num dN - - YB-G- pad needed for LF
+linefeed_if_not_lf OTnl str nl - - YBCGE use to move down
+backspace_if_not_bs OTbc str bc - - YBCGE move left, if not ^H
#
# GNU termcap library extensions. The GNU termcap file distributed with
# Emacs no longer uses these, but MT showed up in pre-9.0 versions of the
# BSD termcap file. The name clash with terminfo MT is resolved by type
# info; MT is converted to km.
#
-gnu_has_meta_key OTMT bool MT ----E has meta key
-# gnu_tab_width OTtw num tw ----E tab width in spaces
+gnu_has_meta_key OTMT bool MT - - ----E has meta key
+# gnu_tab_width OTtw num tw - - ----E tab width in spaces
#
# GNU termcap *does* include the following extended capability, Only the
# now-obsolete Ann Arbor terminals used it.
#
-# gnu_change_scroll_region OTcS str cS ---GE alternate set scrolling region
+# gnu_change_scroll_region OTcS str cS - - ---GE alternate set scrolling region
#
# The following comments describe capnames so ancient that I believe no
# software uses them any longer. Some of these have to go because they
@@ -855,50 +857,50 @@ gnu_has_meta_key OTMT bool MT ----E has meta key
# Applications that use terminfo are supposed to behave as though xr is
# always true.
#
-linefeed_is_newline OTNL bool NL YB--- move down with \n
-# even_parity OTEP bool EP -B--- terminal requires even parity
-# odd_parity OTOP bool OP -B--- terminal requires odd parity
-# half_duplex OTHD bool HD -B--- terminal is half-duplex
-# lower_case_only OTLC bool LC -B--- terminal has only lower case
-# upper_case_only OTUC bool UC -B--- terminal has only upper case
-backspace_delay OTdB num dB YB-G- padding required for ^H
-# form_feed_delay OTdF num dF -B-G- padding required for ^L
-horizontal_tab_delay OTdT num dT YB-G- padding required for ^I
-# vertical_tab_delay OTdV num dV -B--- padding required for ^V
-number_of_function_keys OTkn num kn -B-G- count of function keys
-other_non_function_keys OTko str ko -B-G- list of self-mapped keycaps
-arrow_key_map OTma str ma YBC-- map arrow keys rogue(1) motion keys
-# memory_lock_above OTml str ml -B--- lock visible screen memory above the current line
-# memory_unlock OTmu str mu -B--- unlock visible screen memory above the current line
-has_hardware_tabs OTpt bool pt YB--- has 8-char tabs invoked with ^I
-return_does_clr_eol OTxr bool xr YB--- return clears the line
-# tek_4025_insert_line OTxx bool xx -BC-- Tektronix 4025 insert-line glitch
+linefeed_is_newline OTNL bool NL - - YB--- move down with \n
+# even_parity OTEP bool EP - - -B--- terminal requires even parity
+# odd_parity OTOP bool OP - - -B--- terminal requires odd parity
+# half_duplex OTHD bool HD - - -B--- terminal is half-duplex
+# lower_case_only OTLC bool LC - - -B--- terminal has only lower case
+# upper_case_only OTUC bool UC - - -B--- terminal has only upper case
+backspace_delay OTdB num dB - - YB-G- padding required for ^H
+# form_feed_delay OTdF num dF - - -B-G- padding required for ^L
+horizontal_tab_delay OTdT num dT - - YB-G- padding required for ^I
+# vertical_tab_delay OTdV num dV - - -B--- padding required for ^V
+number_of_function_keys OTkn num kn - - -B-G- count of function keys
+other_non_function_keys OTko str ko - - -B-G- list of self-mapped keycaps
+arrow_key_map OTma str ma - - YBC-- map arrow keys rogue(1) motion keys
+# memory_lock_above OTml str ml - - -B--- lock visible screen memory above the current line
+# memory_unlock OTmu str mu - - -B--- unlock visible screen memory above the current line
+has_hardware_tabs OTpt bool pt - - YB--- has 8-char tabs invoked with ^I
+return_does_clr_eol OTxr bool xr - - YB--- return clears the line
+# tek_4025_insert_line OTxx bool xx - - -BC-- Tektronix 4025 insert-line glitch
#
# mytinfo described this as a termcap capability, but it's not listed in the
# 4.4BSD man pages, and not found in the 4.4BSD termcap file. The ncurses
# package, like System V, behaves as though it is always true.
#
-# rind_only_at_top OTxq bool xq ----- reverse index only works from top line
+# rind_only_at_top OTxq bool xq - - ----- reverse index only works from top line
#
# University of Waterloo termcap extensions (as described in mytinfo).
# The `xl' termcap file clashes with a terminfo name; this ambiguity cannot
# be resolved by a type check. The descriptions are guesses from what was
# in the mytinfo tables.
#
-# key_interrupt_char OTki str ki ----- string set by interrupt key (?)
-# key_kill_char OTkk str kk ----- string set by kill key (?)
-# key_suspend_char OTkz str kz ----- string set by suspend key (?)
-# initialization_messy OTxc bool xc ----- initialization leaves garbage on the screen (?)
-# ind_at_bottom_does_cr OTxl bool xl ----- index does a carriage return
+# key_interrupt_char OTki str ki - - ----- string set by interrupt key (?)
+# key_kill_char OTkk str kk - - ----- string set by kill key (?)
+# key_suspend_char OTkz str kz - - ----- string set by suspend key (?)
+# initialization_messy OTxc bool xc - - ----- initialization leaves garbage on the screen (?)
+# ind_at_bottom_does_cr OTxl bool xl - - ----- index does a carriage return
#
# Nonstandard capabilities unique to Ross Ridge's `mytinfo' package.
# SR clashes with a terminfo name; this ambiguity cannot be resolved by a type
# check.
#
-# scroll_left OTsl1 str Sl ----- scroll screen leftward
-# scroll_right OTsr1 str Sr ----- scroll screen rightward
-# parm_scroll_left OTsl str SL ----- scroll screen leftward #1 characters
-# parm_scroll_right OTsr str SR ----- scroll screen rightward #1 characters
+# scroll_left OTsl1 str Sl - - ----- scroll screen leftward
+# scroll_right OTsr1 str Sr - - ----- scroll screen rightward
+# parm_scroll_left OTsl str SL - - ----- scroll screen leftward #1 characters
+# parm_scroll_right OTsr str SR - - ----- scroll screen rightward #1 characters
#
# The mytinfo capabilities end here.
#
@@ -938,17 +940,17 @@ return_does_clr_eol OTxr bool xr YB--- return clears the line
# that detects the acs_ prefix and uses it to suppress pad translation.
# These terminfo names are invented.
#
-acs_ulcorner OTG2 str G2 ----- single upper left
-acs_llcorner OTG3 str G3 ----- single lower left
-acs_urcorner OTG1 str G1 ----- single upper right
-acs_lrcorner OTG4 str G4 ----- single lower right
-acs_ltee OTGR str GR ----- tee pointing right
-acs_rtee OTGL str GL ----- tee pointing left
-acs_btee OTGU str GU ----- tee pointing up
-acs_ttee OTGD str GD ----- tee pointing down
-acs_hline OTGH str GH ----- single horizontal line
-acs_vline OTGV str GV ----- single vertical line
-acs_plus OTGC str GC ----- single intersection
+acs_ulcorner OTG2 str G2 - - ----- single upper left
+acs_llcorner OTG3 str G3 - - ----- single lower left
+acs_urcorner OTG1 str G1 - - ----- single upper right
+acs_lrcorner OTG4 str G4 - - ----- single lower right
+acs_ltee OTGR str GR - - ----- tee pointing right
+acs_rtee OTGL str GL - - ----- tee pointing left
+acs_btee OTGU str GU - - ----- tee pointing up
+acs_ttee OTGD str GD - - ----- tee pointing down
+acs_hline OTGH str GH - - ----- single horizontal line
+acs_vline OTGV str GV - - ----- single vertical line
+acs_plus OTGC str GC - - ----- single intersection
#
#############################################################################
#
@@ -965,64 +967,64 @@ acs_plus OTGC str GC ----- single intersection
# functionally identical to SVr4 extensions, but they make the binary format
# different. Grrr....
#
-memory_lock meml str ml ----K memory lock above
-memory_unlock memu str mu ----K memory unlock
-#plab_norm pln str pn ----- program label #1 to show string #2
-#label_on smln str LO ----- turn on soft labels
-#label_off rmln str LF ----- turn off soft labels
-#key_f11 kf11 str F1 ----- F11 function key
-#key_f12 kf12 str F2 ----- F12 function key
-#key_f13 kf13 str F3 ----- F13 function key
-#key_f14 kf14 str F4 ----- F14 function key
-#key_f15 kf15 str F5 ----- F15 function key
-#key_f16 kf16 str F6 ----- F16 function key
-#key_f17 kf17 str F7 ----- F17 function key
-#key_f18 kf18 str F8 ----- F18 function key
-#key_f19 kf19 str F9 ----- F19 function key
-#key_f20 kf20 str FA ----- F20 function key
-#key_f21 kf21 str FB ----- F21 function key
-#key_f22 kf22 str FC ----- F22 function key
-#key_f23 kf23 str FD ----- F23 function key
-#key_f24 kf24 str FE ----- F24 function key
-#key_f25 kf25 str FF ----- F25 function key
-#key_f26 kf26 str FG ----- F26 function key
-#key_f27 kf27 str FH ----- F27 function key
-#key_f28 kf28 str FI ----- F28 function key
-#key_f29 kf29 str FJ ----- F29 function key
-#key_f30 kf30 str FK ----- F30 function key
-#key_f31 kf31 str FL ----- F31 function key
-#key_f32 kf32 str FM ----- F32 function key
-#key_f33 kf33 str FN ----- F33 function key
-#key_f34 kf34 str FO ----- F34 function key
-#key_f35 kf35 str FP ----- F35 function key
-#key_f36 kf36 str FQ ----- F36 function key
-#key_f37 kf37 str FR ----- F37 function key
-#key_f38 kf38 str FS ----- F38 function key
-#key_f39 kf39 str FT ----- F39 function key
-#key_f40 kf40 str FU ----- F40 function key
-#key_f41 kf41 str FV ----- F41 function key
-#key_f42 kf42 str FW ----- F42 function key
-#key_f43 kf43 str FX ----- F43 function key
-#key_f44 kf44 str FY ----- F44 function key
-#key_f45 kf45 str FZ ----- F45 function key
-#key_f46 kf46 str Fa ----- F46 function key
-#key_f47 kf47 str Fb ----- F47 function key
-#key_f48 kf48 str Fc ----- F48 function key
-#key_f49 kf49 str Fd ----- F49 function key
-#key_f50 kf50 str Fe ----- F50 function key
-#key_f51 kf51 str Ff ----- F51 function key
-#key_f52 kf52 str Fg ----- F52 function key
-#key_f53 kf53 str Fh ----- F53 function key
-#key_f54 kf54 str Fi ----- F54 function key
-#key_f55 kf55 str Fj ----- F55 function key
-#key_f56 kf56 str Fk ----- F56 function key
-#key_f57 kf57 str Fl ----- F57 function key
-#key_f58 kf58 str Fm ----- F58 function key
-#key_f59 kf59 str Fn ----- F59 function key
-#key_f60 kf60 str Fo ----- F60 function key
-#key_f61 kf61 str Fp ----- F61 function key
-#key_f62 kf62 str Fq ----- F62 function key
-#key_f63 kf63 str Fr ----- F63 function key
+memory_lock meml str ml - - ----K memory lock above
+memory_unlock memu str mu - - ----K memory unlock
+#plab_norm pln str pn - - ----- program label #1 to show string #2
+#label_on smln str LO - - ----- turn on soft labels
+#label_off rmln str LF - - ----- turn off soft labels
+#key_f11 kf11 str F1 - - ----- F11 function key
+#key_f12 kf12 str F2 - - ----- F12 function key
+#key_f13 kf13 str F3 - - ----- F13 function key
+#key_f14 kf14 str F4 - - ----- F14 function key
+#key_f15 kf15 str F5 - - ----- F15 function key
+#key_f16 kf16 str F6 - - ----- F16 function key
+#key_f17 kf17 str F7 - - ----- F17 function key
+#key_f18 kf18 str F8 - - ----- F18 function key
+#key_f19 kf19 str F9 - - ----- F19 function key
+#key_f20 kf20 str FA - - ----- F20 function key
+#key_f21 kf21 str FB - - ----- F21 function key
+#key_f22 kf22 str FC - - ----- F22 function key
+#key_f23 kf23 str FD - - ----- F23 function key
+#key_f24 kf24 str FE - - ----- F24 function key
+#key_f25 kf25 str FF - - ----- F25 function key
+#key_f26 kf26 str FG - - ----- F26 function key
+#key_f27 kf27 str FH - - ----- F27 function key
+#key_f28 kf28 str FI - - ----- F28 function key
+#key_f29 kf29 str FJ - - ----- F29 function key
+#key_f30 kf30 str FK - - ----- F30 function key
+#key_f31 kf31 str FL - - ----- F31 function key
+#key_f32 kf32 str FM - - ----- F32 function key
+#key_f33 kf33 str FN - - ----- F33 function key
+#key_f34 kf34 str FO - - ----- F34 function key
+#key_f35 kf35 str FP - - ----- F35 function key
+#key_f36 kf36 str FQ - - ----- F36 function key
+#key_f37 kf37 str FR - - ----- F37 function key
+#key_f38 kf38 str FS - - ----- F38 function key
+#key_f39 kf39 str FT - - ----- F39 function key
+#key_f40 kf40 str FU - - ----- F40 function key
+#key_f41 kf41 str FV - - ----- F41 function key
+#key_f42 kf42 str FW - - ----- F42 function key
+#key_f43 kf43 str FX - - ----- F43 function key
+#key_f44 kf44 str FY - - ----- F44 function key
+#key_f45 kf45 str FZ - - ----- F45 function key
+#key_f46 kf46 str Fa - - ----- F46 function key
+#key_f47 kf47 str Fb - - ----- F47 function key
+#key_f48 kf48 str Fc - - ----- F48 function key
+#key_f49 kf49 str Fd - - ----- F49 function key
+#key_f50 kf50 str Fe - - ----- F50 function key
+#key_f51 kf51 str Ff - - ----- F51 function key
+#key_f52 kf52 str Fg - - ----- F52 function key
+#key_f53 kf53 str Fh - - ----- F53 function key
+#key_f54 kf54 str Fi - - ----- F54 function key
+#key_f55 kf55 str Fj - - ----- F55 function key
+#key_f56 kf56 str Fk - - ----- F56 function key
+#key_f57 kf57 str Fl - - ----- F57 function key
+#key_f58 kf58 str Fm - - ----- F58 function key
+#key_f59 kf59 str Fn - - ----- F59 function key
+#key_f60 kf60 str Fo - - ----- F60 function key
+#key_f61 kf61 str Fp - - ----- F61 function key
+#key_f62 kf62 str Fq - - ----- F62 function key
+#key_f63 kf63 str Fr - - ----- F63 function key
#
# IBM extensions
#
@@ -1046,94 +1048,94 @@ memory_unlock memu str mu ----K memory unlock
#
# The box2 characters are the double-line versions of these forms graphics.
#
-box_chars_1 box1 str bx ----K box characters primary set
-#box_chars_2 box2 str by ----K box characters secondary set
-#box_attr_1 batt1 str Bx ----K attributes for box1
-#box_attr_2 batt2 str By ----K attributes for box2
-#color_bg_0 colb0 str d0 ----K background color 0
-#color_bg_1 colb1 str d1 ----K background color 1
-#color_bg_2 colb2 str d2 ----K background color 2
-#color_bg_3 colb3 str d3 ----K background color 3
-#color_bg_4 colb4 str d4 ----K background color 4
-#color_bg_5 colb5 str d5 ----K background color 5
-#color_bg_6 colb6 str d6 ----K background color 6
-#color_bg_7 colb7 str d7 ----K background color 7
-#color_fg_0 colf0 str c0 ----K foreground color 0
-#color_fg_1 colf1 str c1 ----K foreground color 1
-#color_fg_2 colf2 str c2 ----K foreground color 2
-#color_fg_3 colf3 str c3 ----K foreground color 3
-#color_fg_4 colf4 str c4 ----K foreground color 4
-#color_fg_5 colf5 str c5 ----K foreground color 5
-#color_fg_6 colf6 str c6 ----K foreground color 6
-#color_fg_7 colf7 str c7 ----K foreground color 7
-#font_0 font0 str f0 ----- select font 0
-#font_1 font1 str f1 ----- select font 1
-#font_2 font2 str f2 ----- select font 2
-#font_3 font3 str f3 ----- select font 3
-#font_4 font4 str f4 ----K select font 4
-#font_5 font5 str f5 ----K select font 5
-#font_6 font6 str f6 ----K select font 6
-#font_7 font7 str f7 ----K select font 7
-#key_back_tab kbtab str k0 ----- backtab key
-#key_do kdo str ki ----K do request key
-#key_command kcmd str kd ----K command-request key
-#key_command_pane kcpn str kW ----K command-pane key
-#key_end kend str kw ----- end key
-#key_help khlp str kq ----- help key
-#key_newline knl str nl ----K newline key
-#key_next_pane knpn str kv ----K next-pane key
-#key_prev_cmd kppn str kp ----K previous-command key
-#key_prev_pane kppn str kV ----K previous-pane key
-#key_quit kquit str kQ ----K quit key
-#key_select ksel str kU ----- select key
-#key_scroll_left kscl str kz ----K scroll left
-#key_scroll_right kscr str kZ ----K scroll right
-#key_tab ktab str ko ----K tab key
-#key_smap_in1 kmpf1 str Kv ----K special mapped key 1 input
-#key_smap_out1 kmpt1 str KV ----K special mapped key 1 output
-#key_smap_in2 kmpf2 str Kw ----K special mapped key 2 input
-#key_smap_out2 kmpt2 str KW ----K special mapped key 2 output
-#key_smap_in3 kmpf3 str Kx ----K special mapped key 3 input
-#key_smap_out3 kmpt3 str KX ----K special mapped key 3 output
-#key_smap_in4 kmpf4 str Ky ----K special mapped key 4 input
-#key_smap_out4 kmpt4 str KY ----K special mapped key 4 output
-#key_smap_in5 kmpf5 str Kz ----K special mapped key 5 input
-#key_smap_out5 kmpt5 str KZ ----K special mapped key 5 output
-#appl_defined_str apstr str za ----K application-defined string
+box_chars_1 box1 str bx - - ----K box characters primary set
+#box_chars_2 box2 str by - - ----K box characters secondary set
+#box_attr_1 batt1 str Bx - - ----K attributes for box1
+#box_attr_2 batt2 str By - - ----K attributes for box2
+#color_bg_0 colb0 str d0 - - ----K background color 0
+#color_bg_1 colb1 str d1 - - ----K background color 1
+#color_bg_2 colb2 str d2 - - ----K background color 2
+#color_bg_3 colb3 str d3 - - ----K background color 3
+#color_bg_4 colb4 str d4 - - ----K background color 4
+#color_bg_5 colb5 str d5 - - ----K background color 5
+#color_bg_6 colb6 str d6 - - ----K background color 6
+#color_bg_7 colb7 str d7 - - ----K background color 7
+#color_fg_0 colf0 str c0 - - ----K foreground color 0
+#color_fg_1 colf1 str c1 - - ----K foreground color 1
+#color_fg_2 colf2 str c2 - - ----K foreground color 2
+#color_fg_3 colf3 str c3 - - ----K foreground color 3
+#color_fg_4 colf4 str c4 - - ----K foreground color 4
+#color_fg_5 colf5 str c5 - - ----K foreground color 5
+#color_fg_6 colf6 str c6 - - ----K foreground color 6
+#color_fg_7 colf7 str c7 - - ----K foreground color 7
+#font_0 font0 str f0 - - ----- select font 0
+#font_1 font1 str f1 - - ----- select font 1
+#font_2 font2 str f2 - - ----- select font 2
+#font_3 font3 str f3 - - ----- select font 3
+#font_4 font4 str f4 - - ----K select font 4
+#font_5 font5 str f5 - - ----K select font 5
+#font_6 font6 str f6 - - ----K select font 6
+#font_7 font7 str f7 - - ----K select font 7
+#key_back_tab kbtab str k0 - - ----- backtab key
+#key_do kdo str ki - - ----K do request key
+#key_command kcmd str kd - - ----K command-request key
+#key_command_pane kcpn str kW - - ----K command-pane key
+#key_end kend str kw - - ----- end key
+#key_help khlp str kq - - ----- help key
+#key_newline knl str nl - - ----K newline key
+#key_next_pane knpn str kv - - ----K next-pane key
+#key_prev_cmd kppn str kp - - ----K previous-command key
+#key_prev_pane kppn str kV - - ----K previous-pane key
+#key_quit kquit str kQ - - ----K quit key
+#key_select ksel str kU - - ----- select key
+#key_scroll_left kscl str kz - - ----K scroll left
+#key_scroll_right kscr str kZ - - ----K scroll right
+#key_tab ktab str ko - - ----K tab key
+#key_smap_in1 kmpf1 str Kv - - ----K special mapped key 1 input
+#key_smap_out1 kmpt1 str KV - - ----K special mapped key 1 output
+#key_smap_in2 kmpf2 str Kw - - ----K special mapped key 2 input
+#key_smap_out2 kmpt2 str KW - - ----K special mapped key 2 output
+#key_smap_in3 kmpf3 str Kx - - ----K special mapped key 3 input
+#key_smap_out3 kmpt3 str KX - - ----K special mapped key 3 output
+#key_smap_in4 kmpf4 str Ky - - ----K special mapped key 4 input
+#key_smap_out4 kmpt4 str KY - - ----K special mapped key 4 output
+#key_smap_in5 kmpf5 str Kz - - ----K special mapped key 5 input
+#key_smap_out5 kmpt5 str KZ - - ----K special mapped key 5 output
+#appl_defined_str apstr str za - - ----K application-defined string
# The key_smap_in[6789] and key_smap_out[6789] capabilities aren't described in
# the IBM manual pages, so the cap name strings are guesses. The terminfo
# names are almost certainly right, the termcap ones almost certainly wrong.
-#key_smap_in6 kmpf6 str k! ----K special mapped key 6 input
-#key_smap_out6 kmpt6 str K@ ----K special mapped key 6 output
-#key_smap_in7 kmpf7 str k# ----K special mapped key 7 input
-#key_smap_out7 kmpt7 str K$ ----K special mapped key 7 output
-#key_smap_in8 kmpf8 str k% ----K special mapped key 8 input
-#key_smap_out8 kmpt8 str K^ ----K special mapped key 8 output
-#key_smap_in9 kmpf9 str k& ----K special mapped key 9 input
-#key_smap_out9 kmpt9 str K* ----K special mapped key 9 output
+#key_smap_in6 kmpf6 str k! - - ----K special mapped key 6 input
+#key_smap_out6 kmpt6 str K@ - - ----K special mapped key 6 output
+#key_smap_in7 kmpf7 str k# - - ----K special mapped key 7 input
+#key_smap_out7 kmpt7 str K$ - - ----K special mapped key 7 output
+#key_smap_in8 kmpf8 str k% - - ----K special mapped key 8 input
+#key_smap_out8 kmpt8 str K^ - - ----K special mapped key 8 output
+#key_smap_in9 kmpf9 str k& - - ----K special mapped key 9 input
+#key_smap_out9 kmpt9 str K* - - ----K special mapped key 9 output
# Undocumented capabilities end here
-#key_sf1 ksf1 str S1 ----K special function key 1
-#key_sf2 ksf2 str S2 ----K special function key 2
-#key_sf3 ksf3 str S3 ----K special function key 3
-#key_sf4 ksf4 str S4 ----K special function key 4
-#key_sf5 ksf5 str S5 ----K special function key 5
-#key_sf6 ksf6 str S6 ----K special function key 6
-#key_sf7 ksf7 str S7 ----K special function key 7
-#key_sf8 ksf8 str S8 ----K special function key 8
-#key_sf9 ksf9 str S9 ----K special function key 9
-#key_sf10 ksf10 str SA ----K special function key 10
+#key_sf1 ksf1 str S1 - - ----K special function key 1
+#key_sf2 ksf2 str S2 - - ----K special function key 2
+#key_sf3 ksf3 str S3 - - ----K special function key 3
+#key_sf4 ksf4 str S4 - - ----K special function key 4
+#key_sf5 ksf5 str S5 - - ----K special function key 5
+#key_sf6 ksf6 str S6 - - ----K special function key 6
+#key_sf7 ksf7 str S7 - - ----K special function key 7
+#key_sf8 ksf8 str S8 - - ----K special function key 8
+#key_sf9 ksf9 str S9 - - ----K special function key 9
+#key_sf10 ksf10 str SA - - ----K special function key 10
# AIX version 3 documents different codes for F11, F12 and does not mention
# F13-F64. AIX version 4 uses the same naming for F0-F63 as above.
-#key_f11 kf11 str k< ----- function key 11
-#key_f12 kf12 str k> ----- function key 12
+#key_f11 kf11 str k< - - ----- function key 11
+#key_f12 kf12 str k> - - ----- function key 12
# Undocumented capabilities end here.
-#key_action kact str kJ ----K sent by action key
+#key_action kact str kJ - - ----K sent by action key
# The IBM docs say these capabilities are for table-drawing, and are
# valid only for aixterm descriptions.
-#enter_topline_mode topl str tp ----K start top-line mode
-#enter_bottom_mode btml str bm ----K start bottom-line mode
-#enter_rvert_mode rvert str rv ----K start right-vertical mode
-#enter_lvert_mode lvert str lv ----K start left-vertical mode
+#enter_topline_mode topl str tp - - ----K start top-line mode
+#enter_bottom_mode btml str bm - - ----K start bottom-line mode
+#enter_rvert_mode rvert str rv - - ----K start right-vertical mode
+#enter_lvert_mode lvert str lv - - ----K start left-vertical mode
#
#############################################################################
#
diff --git a/contrib/ncurses/include/Caps.aix4 b/contrib/ncurses/include/Caps.aix4
new file mode 100644
index 000000000000..c010bbd497ce
--- /dev/null
+++ b/contrib/ncurses/include/Caps.aix4
@@ -0,0 +1,1255 @@
+##############################################################################
+# Copyright (c) 2001 Free Software Foundation, Inc. #
+# #
+# Permission is hereby granted, free of charge, to any person obtaining a #
+# copy of this software and associated documentation files (the "Software"), #
+# to deal in the Software without restriction, including without limitation #
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
+# with modifications, sublicense, and/or sell copies of the Software, and to #
+# permit persons to whom the Software is furnished to do so, subject to the #
+# following conditions: #
+# #
+# The above copyright notice and this permission notice shall be included in #
+# all copies or substantial portions of the Software. #
+# #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
+# DEALINGS IN THE SOFTWARE. #
+# #
+# Except as contained in this notice, the name(s) of the above copyright #
+# holders shall not be used in advertising or otherwise to promote the sale, #
+# use or other dealings in this Software without prior written #
+# authorization. #
+##############################################################################
+#
+# Author: Thomas Dickey
+#
+# $Id: Caps.aix4,v 1.5 2002/04/20 15:43:42 tom Exp $
+#
+# This is an adaptation of ncurses' termcap/terminfo capability table, which
+# is designed to align with AIX 4.x's terminfo.
+#
+# This table is used to generate initializers for tables that drive tic,
+# infocmp, and the library compilation code used to support the termcap
+# compatibility hack. It is also used to generate the tabular portion of the
+# terminfo(5) man page; lines beginning with `#%' are passed through to become
+# the terminfo table.
+#
+# This file has three major sections; a standard-capabilities table, two
+# extension-capability tables, and a section of aliases declarations.
+# The first two have the same format, as follows:
+#
+# FILE FORMAT
+#
+# Column 1: terminfo variable name
+# Column 2: terminfo capability name
+# Column 3: capability type (boolean, numeric, or string)
+# Column 4: termcap capability name
+# Column 5: KEY_xxx name, if any, `-' otherwise
+# Column 6: value for KEY_xxx name, if any, `-' otherwise
+# Column 7: Lead with `Y' if capability should be emitted in termcap
+# translations, `-' otherwise
+# Column 8: capability description
+#
+# The codes following [Y-] in column 7 describe the versions of termcap which
+# use the given capability. This information is not used by the curses library
+# proper; rather, it's there to help the terminfo maintainer avoid emitting
+# termcap entry translations that are more than 1023 bytes long (and tank a
+# lot of old termcap-using programs). The codes read as follows:
+# B = mentioned in the BSD man page for 4.4BSD curses
+# C = used by the 4.4BSD curses library
+# G = mentioned in the documentation for GNU termcap
+# E = used by GNU Emacs
+# K = remove this terminfo capability when translating to standard format
+# The important codes are C and E. A cap with C or E should be preserved in
+# translation if possible. The problem is that preserving all such caps may
+# lead to some termcap translations being too long. The termcap maintainer
+# has a bit of a juggling act to do...potential problem cases are marked with
+# an asterisk (*).
+#
+# The aliases section has the following format:
+#
+# Column 1: either `capalias' or `infoalias'
+# Column 2: name to be aliased
+# Column 3: what name it should translate to. The name IGNORE means it
+# should be discarded with a warning message.
+# Column 4: name of the extension set (used for compiler warning messages)
+# Column 5: capability description (usually an associated terminfo variable)
+#
+# HANDLING TERMCAP AND TERMINFO EXTENSIONS
+#
+# There are basically five different ways to handle termcap and terminfo
+# extensions:
+#
+# 1. Don't list the capname here, or list it but comment it out (the latter
+# is preferable; someone might want to handle it in the future). If you do
+# this, the capability will be treated as unknown and raise a warning from
+# the compiler.
+#
+# 2. Alias it. This is appropriate if the capability has the same meaning
+# as an already-supported one. The compiler will handle aliasing, emitting
+# an appropriate informational message whenever an alias fires.
+#
+# 3. List it in the standard table. You almost certainly do *not* want
+# to do this -- the capabilities in that one, and their order, have been
+# carefully chosen to be SVr4-binary-compatible when they're written out
+# as a terminfo object, and breaking this would be bad. It's up the ncurses
+# library what to do with the terminfo data after it's read in.
+#
+# 4. List it in the aliases table with an IGNORE target field. If you
+# do this, the capability will be ignored on input (though the user will
+# get a warning message about it).
+#
+# 5. List it in the extensions table. If you do this, the compiler will
+# silently accept the capability, but the curses library proper will never
+# see it (because it won't be written out as part of the terminfo object
+# format). It's up to you what you have the compiler do with it.
+#
+# There are two opposite reasons to choose option 5. One is when you want
+# to eat the capability silently and discard it when doing translations
+# to terminfo with tic -I. Some very old obsolete BSD caps like :kn: are
+# in this class. Nothing will ever use them again.
+#
+# More usually, you want the compiler to try to deduce something from the
+# capability value that it can use to translate it into your output format.
+# You'll need to write custom code, probably in postprocess_termcap() or
+# postprocess_terminfo(), to handle the translation.
+#
+# CONTROLLING ENTRY LENGTH
+#
+# Notes on specific elisions made to fit translations within 1023 bytes:
+#
+# Machines with IBM PC-like keyboards want to be able to define the following
+# keys: key_npage, key_ppage, key_home, key_ll (which is used for in termcap-
+# only environments for End or Home-Down), key_dc, and key_ic. This is also
+# the set of keys the `joe' editor will be upset if it can't see. So don't
+# trim those out of the set to be translated to termcap, or various users of
+# the termcap file will become irate.
+#
+# It might look tempting to leave those long init strings out of translations.
+# We can't do it (yet); 4.4BSD tput and tset use them.
+#
+# We retain the sgr capability in translation in spite of the fact that neither
+# 4.4BSD nor GNU Emacs uses it, because (a) some entry naming distinctions are
+# hard to understand without it, and (b) the entries in which it is long tend
+# to be older types that don't use up a lot of string space on function keys.
+# The tic(1) translation code will complain and elide it if it makes a critical
+# difference (there is special code in tic to recognize this situation).
+#
+# Yes, BSD tset(1) uses hpa. We elide hpa/vpa anyway because the motion
+# optimizer in BSD curses didn't use them. This omission seems to be the
+# single most effective one, it shortened the resolved length of all thirteen
+# problem entries in the 9.9.0 version of the terminfo master below critical.
+#
+# It would be nice to keep f11 and f12 for Emacs use, but a couple of termcap
+# translations go back over critical if we do this. As 4.4BSD curses fades
+# into history and GNU termcap's application base shrinks towards being GNU
+# Emacs only, we'll probably elide out some BSD-only capabilities in order
+# to buy space for non-essentials Emacs is still using. Capabilities high
+# on that hit list: rc, sc, uc.
+#
+#############################################################################
+#
+# STANDARD CAPABILITIES
+#
+#%The following is a complete table of the capabilities included in a
+#%terminfo description block and available to terminfo-using code. In each
+#%line of the table,
+#%
+#%The \fBvariable\fR is the name by which the programmer (at the terminfo level)
+#%accesses the capability.
+#%
+#%The \fBcapname\fR is the short name used in the text of the database,
+#%and is used by a person updating the database.
+#%Whenever possible, capnames are chosen to be the same as or similar to
+#%the ANSI X3.64-1979 standard (now superseded by ECMA-48, which uses
+#%identical or very similar names). Semantics are also intended to match
+#%those of the specification.
+#%
+#%The termcap code is the old
+#%.B termcap
+#%capability name (some capabilities are new, and have names which termcap
+#%did not originate).
+#%.P
+#%Capability names have no hard length limit, but an informal limit of 5
+#%characters has been adopted to keep them short and to allow the tabs in
+#%the source file
+#%.B Caps
+#%to line up nicely.
+#%
+#%Finally, the description field attempts to convey the semantics of the
+#%capability. You may find some codes in the description field:
+#%.TP
+#%(P)
+#%indicates that padding may be specified
+#%.TP
+#%#[1-9]
+#%in the description field indicates that the string is passed through tparm with
+#%parms as given (#\fIi\fP).
+#%.TP
+#%(P*)
+#%indicates that padding may vary in proportion to the number of
+#%lines affected
+#%.TP
+#%(#\d\fIi\fP\u)
+#%indicates the \fIi\fP\uth\d parameter.
+#%
+#%.PP
+#% These are the boolean capabilities:
+#%
+#%.na
+#%.TS H
+#%center expand;
+#%c l l c
+#%c l l c
+#%lw25 lw6 lw2 lw20.
+#%\fBVariable Cap- TCap Description\fR
+#%\fBBooleans name Code\fR
+auto_left_margin bw bool bw - - YB-G- cub1 wraps from column 0 to last column
+auto_right_margin am bool am - - YBCGE terminal has automatic margins
+no_esc_ctlc xsb bool xb - - YBCG- beehive (f1=escape, f2=ctrl C)
+ceol_standout_glitch xhp bool xs - - YBCGE standout not erased by overwriting (hp)
+eat_newline_glitch xenl bool xn - - YBCGE newline ignored after 80 cols (concept)
+erase_overstrike eo bool eo - - YBCG- can erase overstrikes with a blank
+generic_type gn bool gn - - YB-G- generic line type
+hard_copy hc bool hc - - YBCG- hardcopy terminal
+has_meta_key km bool km - - YB-GE Has a meta key (i.e., sets 8th-bit)
+has_status_line hs bool hs - - YB-G- has extra status line
+insert_null_glitch in bool in - - YBCGE insert mode distinguishes nulls
+memory_above da bool da - - YBCG- display may be retained above the screen
+memory_below db bool db - - YB-GE display may be retained below the screen
+move_insert_mode mir bool mi - - YBCGE safe to move while in insert mode
+move_standout_mode msgr bool ms - - YBCGE safe to move while in standout mode
+over_strike os bool os - - YBCG- terminal can overstrike
+status_line_esc_ok eslok bool es - - YB-G- escape can be used on the status line
+dest_tabs_magic_smso xt bool xt - - YBCGE tabs destructive, magic so char (t1061)
+tilde_glitch hz bool hz - - YB-GE can't print ~'s (hazeltine)
+transparent_underline ul bool ul - - YBCGE underline character overstrikes
+xon_xoff xon bool xo - - YB--- terminal uses xon/xoff handshaking
+needs_xon_xoff nxon bool nx - - ----- padding won't work, xon/xoff required
+prtr_silent mc5i bool 5i - - ----- printer won't echo on screen
+hard_cursor chts bool HC - - ----- cursor is hard to see
+non_rev_rmcup nrrmc bool NR - - ----- smcup does not reverse rmcup
+no_pad_char npc bool NP - - ----- pad character does not exist
+non_dest_scroll_region ndscr bool ND - - ----- scrolling region is non-destructive
+can_change ccc bool cc - - ----- terminal can re-define existing colors
+back_color_erase bce bool ut - - ----- screen erased with background color
+hue_lightness_saturation hls bool hl - - ----- terminal uses only HLS color notation (Tektronix)
+col_addr_glitch xhpa bool YA - - ----- only positive motion for hpa/mhpa caps
+cr_cancels_micro_mode crxm bool YB - - ----- using cr turns off micro mode
+has_print_wheel daisy bool YC - - ----- printer needs operator to change character set
+row_addr_glitch xvpa bool YD - - ----- only positive motion for vpa/mvpa caps
+semi_auto_right_margin sam bool YE - - ----- printing in last column causes cr
+cpi_changes_res cpix bool YF - - ----- changing character pitch changes resolution
+lpi_changes_res lpix bool YG - - ----- changing line pitch changes resolution
+#%.TE
+#%.ad
+#%
+#%These are the numeric capabilities:
+#%
+#%.na
+#%.TS H
+#%center expand;
+#%c l l c
+#%c l l c
+#%lw25 lw6 lw2 lw20.
+#%\fBVariable Cap- TCap Description\fR
+#%\fBNumeric name Code\fR
+columns cols num co - - YBCGE number of columns in a line
+init_tabs it num it - - YB-G- tabs initially every # spaces
+lines lines num li - - YBCGE number of lines on screen or page
+lines_of_memory lm num lm - - YB-G- lines of memory if > line. 0 means varies
+magic_cookie_glitch xmc num sg - - YBCGE number of blank characters left by smso or rmso
+padding_baud_rate pb num pb - - YB-GE lowest baud rate where padding needed
+virtual_terminal vt num vt - - YB--- virtual terminal number (CB/unix)
+width_status_line wsl num ws - - YB-G- number of columns in status line
+num_labels nlab num Nl - - ----- number of labels on screen
+label_height lh num lh - - ----- rows in each label
+label_width lw num lw - - ----- columns in each label
+max_attributes ma num ma - - YBC-- maximum combined attributes terminal can handle
+maximum_windows wnum num MW - - ----- maximum number of defineable windows
+# These came in with SVr4's color support
+max_colors colors num Co - - ----- maximum number of colors on screen
+max_pairs pairs num pa - - ----- maximum number of color-pairs on the screen
+no_color_video ncv num NC - - ----- video attributes that can't be used with colors
+#%.TE
+#%.ad
+#%
+#%The following numeric capabilities are present in the SVr4.0 term structure,
+#%but are not yet documented in the man page. They came in with SVr4's
+#%printer support.
+#%
+#%.na
+#%.TS H
+#%center expand;
+#%c l l c
+#%c l l c
+#%lw25 lw6 lw2 lw20.
+#%\fBVariable Cap- TCap Description\fR
+#%\fBNumeric name Code\fR
+buffer_capacity bufsz num Ya - - ----- numbers of bytes buffered before printing
+dot_vert_spacing spinv num Yb - - ----- spacing of pins vertically in pins per inch
+dot_horz_spacing spinh num Yc - - ----- spacing of dots horizontally in dots per inch
+max_micro_address maddr num Yd - - ----- maximum value in micro_..._address
+max_micro_jump mjump num Ye - - ----- maximum value in parm_..._micro
+micro_col_size mcs num Yf - - ----- character step size when in micro mode
+micro_line_size mls num Yg - - ----- line step size when in micro mode
+number_of_pins npins num Yh - - ----- numbers of pins in print-head
+output_res_char orc num Yi - - ----- horizontal resolution in units per line
+output_res_line orl num Yj - - ----- vertical resolution in units per line
+output_res_horz_inch orhi num Yk - - ----- horizontal resolution in units per inch
+output_res_vert_inch orvi num Yl - - ----- vertical resolution in units per inch
+print_rate cps num Ym - - ----- print rate in characters per second
+wide_char_size widcs num Yn - - ----- character step size when in double wide mode
+buttons btns num BT - - ----- number of buttons on mouse
+bit_image_entwining bitwin num Yo - - ----- number of passes for each bit-image row
+bit_image_type bitype num Yp - - ----- type of bit-image device
+#%.TE
+#%.ad
+#%
+#%These are the string capabilities:
+#%
+#%.na
+#%.TS H
+#%center expand;
+#%c l l c
+#%c l l c
+#%lw25 lw6 lw2 lw20.
+#%\fBVariable Cap- TCap Description\fR
+#%\fBString name Code\fR
+back_tab cbt str bt - - YBCGE back tab (P)
+bell bel str bl - - YB-GE audible signal (bell) (P)
+carriage_return cr str cr - - YBCGE carriage return (P*) (P*)
+change_scroll_region csr str cs - - YBCGE change region to line #1 to line #2 (P)
+clear_all_tabs tbc str ct - - YB-G- clear all tab stops (P)
+clear_screen clear str cl - - YBCGE clear screen and home cursor (P*)
+clr_eol el str ce - - YBCGE clear to end of line (P)
+clr_eos ed str cd - - YBCGE clear to end of screen (P*)
+column_address hpa str ch - - -B-GE* horizontal position #1, absolute (P)
+command_character cmdch str CC - - YB-G- terminal settable cmd character in prototype !?
+cursor_address cup str cm - - YBCGE move to row #1 columns #2
+cursor_down cud1 str do - - YBCGE down one line
+cursor_home home str ho - - YBCGE home cursor (if no cup)
+cursor_invisible civis str vi - - YB-G- make cursor invisible
+cursor_left cub1 str le - - YBCGE move left one space
+cursor_mem_address mrcup str CM - - YB-G- memory relative cursor addressing, move to row #1 columns #2
+cursor_normal cnorm str ve - - YBCGE make cursor appear normal (undo civis/cvvis)
+cursor_right cuf1 str nd - - YBCGE non-destructive space (move right one space)
+cursor_to_ll ll str ll - - YBCGE last line, first column (if no cup)
+cursor_up cuu1 str up - - YBCGE up one line
+cursor_visible cvvis str vs - - YBCGE make cursor very visible
+delete_character dch1 str dc - - YBCGE delete character (P*)
+delete_line dl1 str dl - - YBCGE delete line (P*)
+dis_status_line dsl str ds - - YB-G- disable status line
+down_half_line hd str hd - - YB-G- half a line down
+enter_alt_charset_mode smacs str as - - YB-G- start alternate character set (P)
+enter_blink_mode blink str mb - - YB-G- turn on blinking
+enter_bold_mode bold str md - - YB-G- turn on bold (extra bright) mode
+enter_ca_mode smcup str ti - - YBCGE string to start programs using cup
+enter_delete_mode smdc str dm - - YBCGE enter delete mode
+enter_dim_mode dim str mh - - YB-G- turn on half-bright mode
+enter_insert_mode smir str im - - YBCGE enter insert mode
+enter_secure_mode invis str mk - - -B-G-* turn on blank mode (characters invisible)
+enter_protected_mode prot str mp - - -B-G-* turn on protected mode
+enter_reverse_mode rev str mr - - YB-G- turn on reverse video mode
+enter_standout_mode smso str so - - YBCGE begin standout mode
+enter_underline_mode smul str us - - YBCGE begin underline mode
+erase_chars ech str ec - - YB-G- erase #1 characters (P)
+exit_alt_charset_mode rmacs str ae - - YB-G- end alternate character set (P)
+exit_attribute_mode sgr0 str me - - YB-GE turn off all attributes
+exit_ca_mode rmcup str te - - YBCGE strings to end programs using cup
+exit_delete_mode rmdc str ed - - YBCGE end delete mode
+exit_insert_mode rmir str ei - - YBCGE exit insert mode
+exit_standout_mode rmso str se - - YBCGE exit standout mode
+exit_underline_mode rmul str ue - - YBCGE exit underline mode
+flash_screen flash str vb - - YBCGE visible bell (may not move cursor)
+form_feed ff str ff - - YB-G- hardcopy terminal page eject (P*)
+from_status_line fsl str fs - - YB-G- return from status line
+init_1string is1 str i1 - - YB-G- initialization string
+init_2string is2 str is - - YB-G- initialization string
+init_3string is3 str i3 - - YB-G- initialization string
+init_file if str if - - YB-G- name of initialization file
+insert_character ich1 str ic - - YBCGE insert character (P)
+insert_line il1 str al - - YBCGE insert line (P*)
+insert_padding ip str ip - - YBCGE insert padding after inserted character
+key_backspace kbs str kb KEY_BACKSPACE 0407 YB-G- backspace key
+key_catab ktbc str ka KEY_CATAB 0526 -B-G-* clear-all-tabs key
+key_clear kclr str kC KEY_CLEAR 0515 -B-G-* clear-screen or erase key
+key_ctab kctab str kt KEY_CTAB 0525 -B-G-* clear-tab key
+key_dc kdch1 str kD KEY_DC 0512 YB-G- delete-character key
+key_dl kdl1 str kL KEY_DL 0510 -B-G-* delete-line key
+key_down kcud1 str kd KEY_DOWN 0402 YBCGE down-arrow key
+key_eic krmir str kM KEY_EIC 0514 -B-G-* sent by rmir or smir in insert mode
+key_eol kel str kE KEY_EOL 0517 -B-G-* clear-to-end-of-line key
+key_eos ked str kS KEY_EOS 0516 -B-G-* clear-to-end-of-screen key
+key_f0 kf0 str k0 KEY_F(0) 0410 YBCGE F0 function key
+key_f1 kf1 str k1 KEY_F(1) - YBCGE F1 function key
+key_f10 kf10 str k; KEY_F(10) - ----E F10 function key
+key_f2 kf2 str k2 KEY_F(2) - YBCGE F2 function key
+key_f3 kf3 str k3 KEY_F(3) - YBCGE F3 function key
+key_f4 kf4 str k4 KEY_F(4) - YBCGE F4 function key
+key_f5 kf5 str k5 KEY_F(5) - YBCGE F5 function key
+key_f6 kf6 str k6 KEY_F(6) - YBCGE F6 function key
+key_f7 kf7 str k7 KEY_F(7) - YBCGE F7 function key
+key_f8 kf8 str k8 KEY_F(8) - YBCGE F8 function key
+key_f9 kf9 str k9 KEY_F(9) - YBCGE F9 function key
+key_home khome str kh KEY_HOME 0406 YBCGE home key
+key_ic kich1 str kI KEY_IC 0513 YB-GE insert-character key
+key_il kil1 str kA KEY_IL 0511 -B-G-* insert-line key
+key_left kcub1 str kl KEY_LEFT 0404 YBCGE left-arrow key
+key_ll kll str kH KEY_LL 0533 YB-G- lower-left key (home down)
+key_npage knp str kN KEY_NPAGE 0522 YB-GE next-page key
+key_ppage kpp str kP KEY_PPAGE 0523 YB-GE previous-page key
+key_right kcuf1 str kr KEY_RIGHT 0405 YBCGE right-arrow key
+key_sf kind str kF KEY_SF 0520 -B-G-* scroll-forward key
+key_sr kri str kR KEY_SR 0521 -B-G-* scroll-backward key
+key_stab khts str kT KEY_STAB 0524 -B-G-* set-tab key
+key_up kcuu1 str ku KEY_UP 0403 YBCGE up-arrow key
+keypad_local rmkx str ke - - YBCGE leave 'keyboard_transmit' mode
+keypad_xmit smkx str ks - - YBCGE enter 'keyboard_transmit' mode
+lab_f0 lf0 str l0 - - -B-G-* label on function key f0 if not f0
+lab_f1 lf1 str l1 - - -B-G-* label on function key f1 if not f1
+lab_f10 lf10 str la - - ----- label on function key f10 if not f10
+lab_f2 lf2 str l2 - - -B-G-* label on function key f2 if not f2
+lab_f3 lf3 str l3 - - -B-G-* label on function key f3 if not f3
+lab_f4 lf4 str l4 - - -B-G-* label on function key f4 if not f4
+lab_f5 lf5 str l5 - - -B-G-* label on function key f5 if not f5
+lab_f6 lf6 str l6 - - -B-G-* label on function key f6 if not f6
+lab_f7 lf7 str l7 - - -B-G-* label on function key f7 if not f7
+lab_f8 lf8 str l8 - - -B-G-* label on function key f8 if not f8
+lab_f9 lf9 str l9 - - -B-G-* label on function key f9 if not f9
+meta_off rmm str mo - - YB-G-* turn off meta mode
+meta_on smm str mm - - YB-G-* turn on meta mode (8th-bit on)
+newline nel str nw - - YB-G-* newline (behave like cr followed by lf)
+pad_char pad str pc - - YBCGE padding char (instead of null)
+parm_dch dch str DC - - YB-GE delete #1 characters (P*)
+parm_delete_line dl str DL - - YBCGE delete #1 lines (P*)
+parm_down_cursor cud str DO - - YBCGE down #1 lines (P*)
+parm_ich ich str IC - - YB-GE insert #1 characters (P*)
+parm_index indn str SF - - YBCG- scroll forward #1 lines (P)
+parm_insert_line il str AL - - YBCGE insert #1 lines (P*)
+parm_left_cursor cub str LE - - YBCGE move #1 characters to the left (P)
+parm_right_cursor cuf str RI - - YBCGE move #1 characters to the right (P*)
+parm_rindex rin str SR - - YBCG- scroll back #1 lines (P)
+parm_up_cursor cuu str UP - - YBCGE up #1 lines (P*)
+pkey_key pfkey str pk - - -B--- program function key #1 to type string #2
+pkey_local pfloc str pl - - -B--- program function key #1 to execute string #2
+pkey_xmit pfx str px - - -B--- program function key #1 to transmit string #2
+print_screen mc0 str ps - - -B-G-* print contents of screen
+prtr_off mc4 str pf - - -B-G-* turn off printer
+prtr_on mc5 str po - - -B-G-* turn on printer
+repeat_char rep str rp - - YB-GE repeat char #1 #2 times (P*)
+reset_1string rs1 str r1 - - -B--- reset string
+reset_2string rs2 str r2 - - -B--- reset string
+reset_3string rs3 str r3 - - -B--- reset string
+reset_file rf str rf - - -B--- name of reset file
+restore_cursor rc str rc - - YBCG- restore cursor to position of last save_cursor
+row_address vpa str cv - - -B-GE* vertical position #1 absolute (P)
+save_cursor sc str sc - - YBCG- save current cursor position (P)
+scroll_forward ind str sf - - YBCGE scroll text up (P)
+scroll_reverse ri str sr - - YBCGE scroll text down (P)
+set_attributes sgr str sa - - YB-G- define video attributes #1-#9 (PG9)
+set_tab hts str st - - YB-G- set a tab in every row, current columns
+set_window wind str wi - - -B-GE current window is lines #1-#2 cols #3-#4
+tab ht str ta - - YBCGE tab to next 8-space hardware tab stop
+to_status_line tsl str ts - - YB-G- move to status line, column #1
+underline_char uc str uc - - YBCG- underline char and move past it
+up_half_line hu str hu - - YB-G- half a line up
+init_prog iprog str iP - - -B--- path name of program for initialization
+key_a1 ka1 str K1 KEY_A1 0534 YB-GE upper left of keypad
+key_a3 ka3 str K3 KEY_A3 0535 YB-GE upper right of keypad
+key_b2 kb2 str K2 KEY_B2 0536 YB-GE center of keypad
+key_c1 kc1 str K4 KEY_C1 0537 YB-GE lower left of keypad
+key_c3 kc3 str K5 KEY_C3 0540 YB-GE lower right of keypad
+prtr_non mc5p str pO - - -B-G-* turn on printer for #1 bytes
+#
+# IBM extensions
+#
+# These extensions follow ptr_non (replacing everything after it) in IBM
+# terminfo files.
+#
+# The places in the box[12] capabilities correspond to acsc characters, here is
+# the mapping:
+#
+# box1[0] = ACS_ULCORNER
+# box1[1] = ACS_HLINE
+# box1[2] = ACS_URCORNER
+# box1[3] = ACS_VLINE
+# box1[4] = ACS_LRCORNER
+# box1[5] = ACS_LLCORNER
+# box1[6] = ACS_TTEE
+# box1[7] = ACS_RTEE
+# box1[8] = ACS_BTEE
+# box1[9] = ACS_LTEE
+# box1[10] = ACS_PLUS
+#
+# The box2 characters are the double-line versions of these forms graphics.
+#
+box_chars_1 box1 str bx - - ----K box characters primary set
+box_chars_2 box2 str by - - ----K box characters secondary set
+box_attr_1 batt1 str Bx - - ----K attributes for box1
+box_attr_2 batt2 str By - - ----K attributes for box2
+color_bg_0 colb0 str d0 - - ----K background color 0
+color_bg_1 colb1 str d1 - - ----K background color 1
+color_bg_2 colb2 str d2 - - ----K background color 2
+color_bg_3 colb3 str d3 - - ----K background color 3
+color_bg_4 colb4 str d4 - - ----K background color 4
+color_bg_5 colb5 str d5 - - ----K background color 5
+color_bg_6 colb6 str d6 - - ----K background color 6
+color_bg_7 colb7 str d7 - - ----K background color 7
+color_fg_0 colf0 str c0 - - ----K foreground color 0
+color_fg_1 colf1 str c1 - - ----K foreground color 1
+color_fg_2 colf2 str c2 - - ----K foreground color 2
+color_fg_3 colf3 str c3 - - ----K foreground color 3
+color_fg_4 colf4 str c4 - - ----K foreground color 4
+color_fg_5 colf5 str c5 - - ----K foreground color 5
+color_fg_6 colf6 str c6 - - ----K foreground color 6
+color_fg_7 colf7 str c7 - - ----K foreground color 7
+font_0 font0 str f0 - - ----K select font 0
+font_1 font1 str f1 - - ----K select font 1
+font_2 font2 str f2 - - ----K select font 2
+font_3 font3 str f3 - - ----K select font 3
+font_4 font4 str f4 - - ----K select font 4
+font_5 font5 str f5 - - ----K select font 5
+font_6 font6 str f6 - - ----K select font 6
+font_7 font7 str f7 - - ----K select font 7
+key_back_tab kbtab str k0 - - ----K backtab key
+key_do kdo str ki - - ----K do request key
+key_command kcmd str kd - - ----K command-request key
+key_command_pane kcpn str kW - - ----K command-pane key
+key_end kend str kw KEY_END 0550 ----- end key
+key_help khlp str kq - - ----- help key
+key_newline knl str nl - - ----K newline key
+key_next_pane knpn str kv - - ----K next-pane key
+key_prev_cmd kppn str kp - - ----K previous-command key
+key_prev_pane kppn str kV - - ----K previous-pane key
+key_quit kquit str kQ - - ----K quit key
+key_select_aix ksel str kU - - ----- select key
+key_scroll_left kscl str kz - - ----K scroll left
+key_scroll_right kscr str kZ - - ----K scroll right
+key_tab ktab str ko - - ----K tab key
+key_smap_in1 kmpf1 str Kv - - ----K special mapped key 1 input
+key_smap_out1 kmpt1 str KV - - ----K special mapped key 1 output
+key_smap_in2 kmpf2 str Kw - - ----K special mapped key 2 input
+key_smap_out2 kmpt2 str KW - - ----K special mapped key 2 output
+key_smap_in3 kmpf3 str Kx - - ----K special mapped key 3 input
+key_smap_out3 kmpt3 str KX - - ----K special mapped key 3 output
+key_smap_in4 kmpf4 str Ky - - ----K special mapped key 4 input
+key_smap_out4 kmpt4 str KY - - ----K special mapped key 4 output
+key_smap_in5 kmpf5 str Kz - - ----K special mapped key 5 input
+key_smap_out5 kmpt5 str KZ - - ----K special mapped key 5 output
+appl_defined_str apstr str za - - ----K application-defined string
+key_smap_in6 kmpf6 str kr - - ----K special mapped key 6 input
+key_smap_out6 kmpt6 str KR - - ----K special mapped key 6 output
+key_smap_in7 kmpf7 str ks - - ----K special mapped key 7 input
+key_smap_out7 kmpt7 str KS - - ----K special mapped key 7 output
+key_smap_in8 kmpf8 str kt - - ----K special mapped key 8 input
+key_smap_out8 kmpt8 str KT - - ----K special mapped key 8 output
+key_smap_in9 kmpf9 str ku - - ----K special mapped key 9 input
+key_smap_out9 kmpt9 str KU - - ----K special mapped key 9 output
+key_sf1 ksf1 str S1 - - ----K special function key 1
+key_sf2 ksf2 str S2 - - ----K special function key 2
+key_sf3 ksf3 str S3 - - ----K special function key 3
+key_sf4 ksf4 str S4 - - ----K special function key 4
+key_sf5 ksf5 str S5 - - ----K special function key 5
+key_sf6 ksf6 str S6 - - ----K special function key 6
+key_sf7 ksf7 str S7 - - ----K special function key 7
+key_sf8 ksf8 str S8 - - ----K special function key 8
+key_sf9 ksf9 str S9 - - ----K special function key 9
+key_sf10 ksf10 str S0 - - ----K special function key 10
+key_f11 kf11 str F1 KEY_F(11) - ----E F11 function key
+key_f12 kf12 str F2 KEY_F(12) - ----E F12 function key
+key_f13 kf13 str F3 KEY_F(13) - ----E F13 function key
+key_f14 kf14 str F4 KEY_F(14) - ----E F14 function key
+key_f15 kf15 str F5 KEY_F(15) - ----E F15 function key
+key_f16 kf16 str F6 KEY_F(16) - ----E F16 function key
+key_f17 kf17 str F7 KEY_F(17) - ----E F17 function key
+key_f18 kf18 str F8 KEY_F(18) - ----E F18 function key
+key_f19 kf19 str F9 KEY_F(19) - ----E F19 function key
+key_f20 kf20 str FA KEY_F(20) - ----E F20 function key
+key_f21 kf21 str FB KEY_F(21) - ----E F21 function key
+key_f22 kf22 str FC KEY_F(22) - ----E F22 function key
+key_f23 kf23 str FD KEY_F(23) - ----E F23 function key
+key_f24 kf24 str FE KEY_F(24) - ----E F24 function key
+key_f25 kf25 str FF KEY_F(25) - ----E F25 function key
+key_f26 kf26 str FG KEY_F(26) - ----E F26 function key
+key_f27 kf27 str FH KEY_F(27) - ----E F27 function key
+key_f28 kf28 str FI KEY_F(28) - ----E F28 function key
+key_f29 kf29 str FJ KEY_F(29) - ----E F29 function key
+key_f30 kf30 str FK KEY_F(30) - ----E F30 function key
+key_f31 kf31 str FL KEY_F(31) - ----E F31 function key
+key_f32 kf32 str FM KEY_F(32) - ----E F32 function key
+key_f33 kf33 str FN KEY_F(33) - ----E F33 function key
+key_f34 kf34 str FO KEY_F(34) - ----E F34 function key
+key_f35 kf35 str FP KEY_F(35) - ----E F35 function key
+key_f36 kf36 str FQ KEY_F(36) - ----E F36 function key
+key_f37 kf37 str FR KEY_F(37) - ----E F37 function key
+key_f38 kf38 str FS KEY_F(38) - ----E F38 function key
+key_f39 kf39 str FT KEY_F(39) - ----E F39 function key
+key_f40 kf40 str FU KEY_F(40) - ----E F40 function key
+key_f41 kf41 str FV KEY_F(41) - ----E F41 function key
+key_f42 kf42 str FW KEY_F(42) - ----E F42 function key
+key_f43 kf43 str FX KEY_F(43) - ----E F43 function key
+key_f44 kf44 str FY KEY_F(44) - ----E F44 function key
+key_f45 kf45 str FZ KEY_F(45) - ----E F45 function key
+key_f46 kf46 str Fa KEY_F(46) - ----E F46 function key
+key_f47 kf47 str Fb KEY_F(47) - ----E F47 function key
+key_f48 kf48 str Fc KEY_F(48) - ----E F48 function key
+key_f49 kf49 str Fd KEY_F(49) - ----E F49 function key
+key_f50 kf50 str Fe KEY_F(50) - ----E F50 function key
+key_f51 kf51 str Ff KEY_F(51) - ----E F51 function key
+key_f52 kf52 str Fg KEY_F(52) - ----E F52 function key
+key_f53 kf53 str Fh KEY_F(53) - ----E F53 function key
+key_f54 kf54 str Fi KEY_F(54) - ----E F54 function key
+key_f55 kf55 str Fj KEY_F(55) - ----E F55 function key
+key_f56 kf56 str Fk KEY_F(56) - ----E F56 function key
+key_f57 kf57 str Fl KEY_F(57) - ----E F57 function key
+key_f58 kf58 str Fm KEY_F(58) - ----E F58 function key
+key_f59 kf59 str Fn KEY_F(59) - ----E F59 function key
+key_f60 kf60 str Fo KEY_F(60) - ----E F60 function key
+key_f61 kf61 str Fp KEY_F(61) - ----E F61 function key
+key_f62 kf62 str Fq KEY_F(62) - ----E F62 function key
+key_f63 kf63 str Fr KEY_F(63) - ----E F63 function key
+key_action kact str kJ - - ----K sent by action key
+
+# The IBM docs say these capabilities are for table-drawing, and are
+# valid only for aixterm descriptions.
+enter_topline_mode topl str tp - - ----K start top-line mode
+enter_bottom_mode btml str bm - - ----K start bottom-line mode
+enter_rvert_mode rvert str rv - - ----K start right-vertical mode
+enter_lvert_mode lvert str lv - - ----K start left-vertical mode
+#
+# SVr4 capabilities resume here. Note that key_end is in the IBM-extensions.
+#
+char_padding rmp str rP - - ----- like ip but when in insert mode
+acs_chars acsc str ac - - ----- graphics charset pairs, based on vt100
+plab_norm pln str pn - - ----- program label #1 to show string #2
+key_btab kcbt str kB KEY_BTAB 0541 ----- back-tab key
+enter_xon_mode smxon str SX - - ----- turn on xon/xoff handshaking
+exit_xon_mode rmxon str RX - - ----- turn off xon/xoff handshaking
+enter_am_mode smam str SA - - ----- turn on automatic margins
+exit_am_mode rmam str RA - - ----- turn off automatic margins
+xon_character xonc str XN - - ----- XON character
+xoff_character xoffc str XF - - ----- XOFF character
+ena_acs enacs str eA - - ----- enable alternate char set
+label_on smln str LO - - ----- turn on soft labels
+label_off rmln str LF - - ----- turn off soft labels
+key_beg kbeg str @1 KEY_BEG 0542 ----- begin key
+key_cancel kcan str @2 KEY_CANCEL 0543 ----- cancel key
+key_close kclo str @3 KEY_CLOSE 0544 ----- close key
+#key_command kcmd str @4 KEY_COMMAND 0545 ----- command key
+key_copy kcpy str @5 KEY_COPY 0546 ----- copy key
+key_create kcrt str @6 KEY_CREATE 0547 ----- create key
+#key_end kend str @7 KEY_END 0550 ----- end key
+key_enter kent str @8 KEY_ENTER 0527 ----- enter/send key
+key_exit kext str @9 KEY_EXIT 0551 ----- exit key
+key_find kfnd str @0 KEY_FIND 0552 ----- find key
+#key_help khlp str %1 KEY_HELP 0553 ----- help key
+key_mark kmrk str %2 KEY_MARK 0554 ----- mark key
+key_message kmsg str %3 KEY_MESSAGE 0555 ----- message key
+key_move kmov str %4 KEY_MOVE 0556 ----- move key
+key_next knxt str %5 KEY_NEXT 0557 ----- next key
+key_open kopn str %6 KEY_OPEN 0560 ----- open key
+key_options kopt str %7 KEY_OPTIONS 0561 ----- options key
+key_previous kprv str %8 KEY_PREVIOUS 0562 ----- previous key
+key_print kprt str %9 KEY_PRINT 0532 ----- print key
+key_redo krdo str %0 KEY_REDO 0563 ----- redo key
+key_reference kref str &1 KEY_REFERENCE 0564 ----- reference key
+key_refresh krfr str &2 KEY_REFRESH 0565 ----- refresh key
+key_replace krpl str &3 KEY_REPLACE 0566 ----- replace key
+key_restart krst str &4 KEY_RESTART 0567 ----- restart key
+key_resume kres str &5 KEY_RESUME 0570 ----- resume key
+key_save ksav str &6 KEY_SAVE 0571 ----- save key
+key_suspend kspd str &7 KEY_SUSPEND 0627 ----- suspend key
+key_undo kund str &8 KEY_UNDO 0630 ----- undo key
+key_sbeg kBEG str &9 KEY_SBEG 0572 ----- shifted begin key
+key_scancel kCAN str &0 KEY_SCANCEL 0573 ----- shifted cancel key
+key_scommand kCMD str *1 KEY_SCOMMAND 0574 ----- shifted command key
+key_scopy kCPY str *2 KEY_SCOPY 0575 ----- shifted copy key
+key_screate kCRT str *3 KEY_SCREATE 0576 ----- shifted create key
+key_sdc kDC str *4 KEY_SDC 0577 ----- shifted delete-character key
+key_sdl kDL str *5 KEY_SDL 0600 ----- shifted delete-line key
+key_select kslt str *6 KEY_SELECT 0601 ----- select key
+key_send kEND str *7 KEY_SEND 0602 ----- shifted end key
+key_seol kEOL str *8 KEY_SEOL 0603 ----- shifted clear-to-end-of-line key
+key_sexit kEXT str *9 KEY_SEXIT 0604 ----- shifted exit key
+key_sfind kFND str *0 KEY_SFIND 0605 ----- shifted find key
+key_shelp kHLP str #1 KEY_SHELP 0606 ----- shifted help key
+key_shome kHOM str #2 KEY_SHOME 0607 ----- shifted home key
+key_sic kIC str #3 KEY_SIC 0610 ----- shifted insert-character key
+key_sleft kLFT str #4 KEY_SLEFT 0611 ----- shifted left-arrow key
+key_smessage kMSG str %a KEY_SMESSAGE 0612 ----- shifted message key
+key_smove kMOV str %b KEY_SMOVE 0613 ----- shifted move key
+key_snext kNXT str %c KEY_SNEXT 0614 ----- shifted next key
+key_soptions kOPT str %d KEY_SOPTIONS 0615 ----- shifted options key
+key_sprevious kPRV str %e KEY_SPREVIOUS 0616 ----- shifted previous key
+key_sprint kPRT str %f KEY_SPRINT 0617 ----- shifted print key
+key_sredo kRDO str %g KEY_SREDO 0620 ----- shifted redo key
+key_sreplace kRPL str %h KEY_SREPLACE 0621 ----- shifted replace key
+key_sright kRIT str %i KEY_SRIGHT 0622 ----- shifted right-arrow key
+key_srsume kRES str %j KEY_SRSUME 0623 ----- shifted resume key
+key_ssave kSAV str !1 KEY_SSAVE 0624 ----- shifted save key
+key_ssuspend kSPD str !2 KEY_SSUSPEND 0625 ----- shifted suspend key
+key_sundo kUND str !3 KEY_SUNDO 0626 ----- shifted undo key
+req_for_input rfi str RF - - ----- send next input char (for ptys)
+clr_bol el1 str cb - - ----- Clear to beginning of line
+clear_margins mgc str MC - - ----- clear right and left soft margins
+set_left_margin smgl str ML - - ----- set left soft margin at current column. See smgl. (ML is not in BSD termcap).
+set_right_margin smgr str MR - - ----- set right soft margin at current column
+label_format fln str Lf - - ----- label format
+set_clock sclk str SC - - ----- set clock, #1 hrs #2 mins #3 secs
+display_clock dclk str DK - - ----- display clock
+remove_clock rmclk str RC - - ----- remove clock
+create_window cwin str CW - - ----- define a window #1 from #2,#3 to #4,#5
+goto_window wingo str WG - - ----- go to window #1
+hangup hup str HU - - ----- hang-up phone
+dial_phone dial str DI - - ----- dial number #1
+quick_dial qdial str QD - - ----- dial number #1 without checking
+tone tone str TO - - ----- select touch tone dialing
+pulse pulse str PU - - ----- select pulse dialing
+flash_hook hook str fh - - ----- flash switch hook
+fixed_pause pause str PA - - ----- pause for 2-3 seconds
+wait_tone wait str WA - - ----- wait for dial-tone
+user0 u0 str u0 - - ----- User string #0
+user1 u1 str u1 - - ----- User string #1
+user2 u2 str u2 - - ----- User string #2
+user3 u3 str u3 - - ----- User string #3
+user4 u4 str u4 - - ----- User string #4
+user5 u5 str u5 - - ----- User string #5
+user6 u6 str u6 - - ----- User string #6
+user7 u7 str u7 - - ----- User string #7
+user8 u8 str u8 - - ----- User string #8
+user9 u9 str u9 - - ----- User string #9
+#
+# SVr4 added these capabilities to support color
+#
+orig_pair op str op - - ----- Set default pair to its original value
+orig_colors oc str oc - - ----- Set all color pairs to the original ones
+initialize_color initc str Ic - - ----- initialize color #1 to (#2,#3,#4)
+initialize_pair initp str Ip - - ----- Initialize color pair #1 to fg=(#2,#3,#4), bg=(#5,#6,#7)
+set_color_pair scp str sp - - ----- Set current color pair to #1
+set_foreground setf str Sf - - ----- Set foreground color #1
+set_background setb str Sb - - ----- Set background color #1
+#
+# SVr4 added these capabilities to support printers
+#
+change_char_pitch cpi str ZA - - ----- Change number of characters per inch to #1
+change_line_pitch lpi str ZB - - ----- Change number of lines per inch to #1
+change_res_horz chr str ZC - - ----- Change horizontal resolution to #1
+change_res_vert cvr str ZD - - ----- Change vertical resolution to #1
+define_char defc str ZE - - ----- Define a character #1, #2 dots wide, descender #3
+enter_doublewide_mode swidm str ZF - - ----- Enter double-wide mode
+enter_draft_quality sdrfq str ZG - - ----- Enter draft-quality mode
+enter_italics_mode sitm str ZH - - ----- Enter italic mode
+enter_leftward_mode slm str ZI - - ----- Start leftward carriage motion
+enter_micro_mode smicm str ZJ - - ----- Start micro-motion mode
+enter_near_letter_quality snlq str ZK - - ----- Enter NLQ mode
+enter_normal_quality snrmq str ZL - - ----- Enter normal-quality mode
+enter_shadow_mode sshm str ZM - - ----- Enter shadow-print mode
+enter_subscript_mode ssubm str ZN - - ----- Enter subscript mode
+enter_superscript_mode ssupm str ZO - - ----- Enter superscript mode
+enter_upward_mode sum str ZP - - ----- Start upward carriage motion
+exit_doublewide_mode rwidm str ZQ - - ----- End double-wide mode
+exit_italics_mode ritm str ZR - - ----- End italic mode
+exit_leftward_mode rlm str ZS - - ----- End left-motion mode
+exit_micro_mode rmicm str ZT - - ----- End micro-motion mode
+exit_shadow_mode rshm str ZU - - ----- End shadow-print mode
+exit_subscript_mode rsubm str ZV - - ----- End subscript mode
+exit_superscript_mode rsupm str ZW - - ----- End superscript mode
+exit_upward_mode rum str ZX - - ----- End reverse character motion
+micro_column_address mhpa str ZY - - ----- Like column_address in micro mode
+micro_down mcud1 str ZZ - - ----- Like cursor_down in micro mode
+micro_left mcub1 str Za - - ----- Like cursor_left in micro mode
+micro_right mcuf1 str Zb - - ----- Like cursor_right in micro mode
+micro_row_address mvpa str Zc - - ----- Like row_address #1 in micro mode
+micro_up mcuu1 str Zd - - ----- Like cursor_up in micro mode
+order_of_pins porder str Ze - - ----- Match software bits to print-head pins
+parm_down_micro mcud str Zf - - ----- Like parm_down_cursor in micro mode
+parm_left_micro mcub str Zg - - ----- Like parm_left_cursor in micro mode
+parm_right_micro mcuf str Zh - - ----- Like parm_right_cursor in micro mode
+parm_up_micro mcuu str Zi - - ----- Like parm_up_cursor in micro mode
+select_char_set scs str Zj - - ----- Select character set, #1
+set_bottom_margin smgb str Zk - - ----- Set bottom margin at current line
+set_bottom_margin_parm smgbp str Zl - - ----- Set bottom margin at line #1 or (if smgtp is not given) #2 lines from bottom
+set_left_margin_parm smglp str Zm - - ----- Set left (right) margin at column #1
+set_right_margin_parm smgrp str Zn - - ----- Set right margin at column #1
+set_top_margin smgt str Zo - - ----- Set top margin at current line
+set_top_margin_parm smgtp str Zp - - ----- Set top (bottom) margin at row #1
+start_bit_image sbim str Zq - - ----- Start printing bit image graphics
+start_char_set_def scsd str Zr - - ----- Start character set definition #1, with #2 characters in the set
+stop_bit_image rbim str Zs - - ----- Stop printing bit image graphics
+stop_char_set_def rcsd str Zt - - ----- End definition of character set #1
+subscript_characters subcs str Zu - - ----- List of subscriptable characters
+superscript_characters supcs str Zv - - ----- List of superscriptable characters
+these_cause_cr docr str Zw - - ----- Printing any of these characters causes CR
+zero_motion zerom str Zx - - ----- No motion for subsequent character
+#%.TE
+#%.ad
+#%
+#%The following string capabilities are present in the SVr4.0 term structure,
+#%but were originally not documented in the man page.
+#%
+#%.na
+#%.TS H
+#%center expand;
+#%c l l c
+#%c l l c
+#%lw25 lw6 lw2 lw18.
+#%\fBVariable Cap- TCap Description\fR
+#%\fBString name Code\fR
+char_set_names csnm str Zy - - ----- Produce #1'th item from list of character set names
+key_mouse kmous str Km KEY_MOUSE 0631 ----- Mouse event has occurred
+mouse_info minfo str Mi - - ----- Mouse status information
+req_mouse_pos reqmp str RQ - - ----- Request mouse position
+get_mouse getm str Gm - - ----- Curses should get button events, parameter #1 not documented.
+set_a_foreground setaf str AF - - ----- Set foreground color to #1, using ANSI escape
+set_a_background setab str AB - - ----- Set background color to #1, using ANSI escape
+pkey_plab pfxl str xl - - ----- Program function key #1 to type string #2 and show string #3
+device_type devt str dv - - ----- Indicate language/codeset support
+code_set_init csin str ci - - ----- Init sequence for multiple codesets
+set0_des_seq s0ds str s0 - - ----- Shift to codeset 0 (EUC set 0, ASCII)
+set1_des_seq s1ds str s1 - - ----- Shift to codeset 1
+set2_des_seq s2ds str s2 - - ----- Shift to codeset 2
+set3_des_seq s3ds str s3 - - ----- Shift to codeset 3
+set_lr_margin smglr str ML - - ----- Set both left and right margins to #1, #2. (ML is not in BSD termcap).
+set_tb_margin smgtb str MT - - ----- Sets both top and bottom margins to #1, #2
+bit_image_repeat birep str Xy - - ----- Repeat bit image cell #1 #2 times
+bit_image_newline binel str Zz - - ----- Move to next row of the bit image
+bit_image_carriage_return bicr str Yv - - ----- Move to beginning of same row
+color_names colornm str Yw - - ----- Give name for color #1
+define_bit_image_region defbi str Yx - - ----- Define rectangualar bit image region
+end_bit_image_region endbi str Yy - - ----- End a bit-image region
+set_color_band setcolor str Yz - - ----- Change to ribbon color #1
+set_page_length slines str YZ - - ----- Set page length to #1 lines
+#
+# SVr4 added these capabilities for direct PC-clone support
+#
+display_pc_char dispc str S1 - - ----- Display PC character #1
+enter_pc_charset_mode smpch str S2 - - ----- Enter PC character display mode
+exit_pc_charset_mode rmpch str S3 - - ----- Exit PC character display mode
+enter_scancode_mode smsc str S4 - - ----- Enter PC scancode mode
+exit_scancode_mode rmsc str S5 - - ----- Exit PC scancode mode
+pc_term_options pctrm str S6 - - ----- PC terminal options
+scancode_escape scesc str S7 - - ----- Escape for scancode emulation
+alt_scancode_esc scesa str S8 - - ----- Alternate escape for scancode emulation
+#%.TE
+#%.ad
+#%
+#%.in .8i
+#%The XSI Curses standard added these. They are some post-4.1
+#%versions of System V curses, e.g., Solaris 2.5 and IRIX 6.x.
+#%The \fBncurses\fR termcap names for them are invented; according to the
+#%XSI Curses standard, they have no termcap names. If your compiled terminfo
+#%entries use these, they may not be binary-compatible with System V terminfo
+#%entries after SVr4.1; beware!
+#%
+#%.na
+#%.TS H
+#%center expand;
+#%c l l c
+#%c l l c
+#%lw25 lw6 lw2 lw20.
+#%\fBVariable Cap- TCap Description\fR
+#%\fBString name Code\fR
+enter_horizontal_hl_mode ehhlm str Xh - - ----- Enter horizontal highlight mode
+enter_left_hl_mode elhlm str Xl - - ----- Enter left highlight mode
+enter_low_hl_mode elohlm str Xo - - ----- Enter low highlight mode
+enter_right_hl_mode erhlm str Xr - - ----- Enter right highlight mode
+enter_top_hl_mode ethlm str Xt - - ----- Enter top highlight mode
+enter_vertical_hl_mode evhlm str Xv - - ----- Enter vertical highlight mode
+set_a_attributes sgr1 str sA - - ----- Define second set of video attributes #1-#6
+set_pglen_inch slength str sL - - ----- YI Set page length to #1 hundredth of an inch
+#%.TE
+#%.ad
+#
+# The magic token below tells the tic compiler-generator code that all the caps
+# past it should be ignored (not written out) when dumping terminfo objects. It
+# also tells the man page table generator not to pass through following lines
+# This means we can have obsolete capabilities and pseudo-capabilities that are
+# recognized for termcap or terminfo compilation, but not output.
+#
+# %%-STOP-HERE-%%
+#
+# Don't move this casually! In fact, don't move it at all unless you're
+# either doing it to add System V or XPG4 extensions, or have decided you
+# don't care about SVr4 binary compatibility.
+#
+#############################################################################
+#
+# TERMCAP EXTENSION CAPABILITIES
+#
+# The capabilities below are either obsolete or extensions on certain systems.
+# They are not used by SVR4 terminfo. Some are used by captoinfo to translate
+# termcap sources; the rest are listed for completeness, and in case somebody
+# cares about them enough to hack in code that will translate them into
+# terminfo capabilities.
+#
+# The first part of the list is from Ross Ridge's `mytinfo' package
+# (comp.sources.unix, volume 26); the variable names and terminfo names (as
+# well as the termcap codes) match his list.
+#
+# This group of codes is not marked obsolete in 4.4BSD, but have no direct
+# terminfo equivalents. The rs capability is specially translated to terminfo
+# r2, and vice versa, if an entry does not already have an r2. Similarly,
+# i2 is translated to r3 if there is no r3 (because SV terminfo maps is to i2).
+# The ug capability is thrown away, but assumed to be whatever sg is if the
+# latter is nonzero and we're dumping in termcap format.
+#
+termcap_init2 OTi2 str i2 - - YB--- secondary initialization string
+termcap_reset OTrs str rs - - YB-G- terminal reset string
+magic_cookie_glitch_ul OTug num ug - - YBCGE number of blanks left by ul
+#
+# Obsolete termcap capabilities. Some are used for termcap translation. The
+# code uses the 'OT' prefix we put on obsolete capabilities to suppress
+# printing them in terminfo source dumps of compiled entries.
+#
+backspaces_with_bs OTbs bool bs - - YBCGE uses ^H to move left
+crt_no_scrolling OTns bool ns - - YBCG- crt cannot scroll
+no_correctly_working_cr OTnc bool nc - - YBCG- no way to go to start of line
+carriage_return_delay OTdC num dC - - YB-G- pad needed for CR
+new_line_delay OTdN num dN - - YB-G- pad needed for LF
+linefeed_if_not_lf OTnl str nl - - YBCGE use to move down
+backspace_if_not_bs OTbc str bc - - YBCGE move left, if not ^H
+#
+# GNU termcap library extensions. The GNU termcap file distributed with
+# Emacs no longer uses these, but MT showed up in pre-9.0 versions of the
+# BSD termcap file. The name clash with terminfo MT is resolved by type
+# info; MT is converted to km.
+#
+gnu_has_meta_key OTMT bool MT - - ----E has meta key
+# gnu_tab_width OTtw num tw - - ----E tab width in spaces
+#
+# GNU termcap *does* include the following extended capability, Only the
+# now-obsolete Ann Arbor terminals used it.
+#
+# gnu_change_scroll_region OTcS str cS - - ---GE alternate set scrolling region
+#
+# The following comments describe capnames so ancient that I believe no
+# software uses them any longer. Some of these have to go because they
+# clash with terminfo names in ways that cannot be resolved by type
+# information.
+#
+# These mytinfo codes are not used in the 4.4BSD curses code. They are
+# marked obsolete in the 4.4BSD manual pages.
+#
+# There is one conflict with terminfo; ma is in both. This conflict is
+# resolved by type information.
+#
+# The `ko' capability is translated by special code. It should contain a
+# comma-separated list of capabilities for which there are corresponding keys.
+# The `kn' code is accepted but ignored.
+#
+# The `ma' capability seems to have been designed to map between the rogue(2)
+# motion keys (including jkhl) and characters emitted by arrow keys on some
+# primitive pre-ANSI terminals. It's so obsolete it's fossilized...
+#
+# Here is a description of memory_lock_above and memory_unlock:
+# "You can 'freeze' data on the screen by turning on Memory Lock in a line of
+# text. All lines above the cursor's current line become locked in place on
+# the screen. Then enter data normally. When the screen fills up, any
+# further data entered forces the first line of unfrozen line text to scroll
+# under the frozen data. Lines scrolled off the screen are inserted into
+# memory immediately preceding the first frozen line." (from the HP 700/96
+# User's manual). VT100/ANSI memory lock set is \E[>2h, reset is \E[>2l.
+#
+# Applications that use terminfo are supposed to behave as though xr is
+# always true.
+#
+linefeed_is_newline OTNL bool NL - - YB--- move down with \n
+# even_parity OTEP bool EP - - -B--- terminal requires even parity
+# odd_parity OTOP bool OP - - -B--- terminal requires odd parity
+# half_duplex OTHD bool HD - - -B--- terminal is half-duplex
+# lower_case_only OTLC bool LC - - -B--- terminal has only lower case
+# upper_case_only OTUC bool UC - - -B--- terminal has only upper case
+backspace_delay OTdB num dB - - YB-G- padding required for ^H
+# form_feed_delay OTdF num dF - - -B-G- padding required for ^L
+horizontal_tab_delay OTdT num dT - - YB-G- padding required for ^I
+# vertical_tab_delay OTdV num dV - - -B--- padding required for ^V
+number_of_function_keys OTkn num kn - - -B-G- count of function keys
+other_non_function_keys OTko str ko - - -B-G- list of self-mapped keycaps
+arrow_key_map OTma str ma - - YBC-- map arrow keys rogue(1) motion keys
+# memory_lock_above OTml str ml - - -B--- lock visible screen memory above the current line
+# memory_unlock OTmu str mu - - -B--- unlock visible screen memory above the current line
+has_hardware_tabs OTpt bool pt - - YB--- has 8-char tabs invoked with ^I
+return_does_clr_eol OTxr bool xr - - YB--- return clears the line
+# tek_4025_insert_line OTxx bool xx - - -BC-- Tektronix 4025 insert-line glitch
+#
+# mytinfo described this as a termcap capability, but it's not listed in the
+# 4.4BSD man pages, and not found in the 4.4BSD termcap file. The ncurses
+# package, like System V, behaves as though it is always true.
+#
+# rind_only_at_top OTxq bool xq - - ----- reverse index only works from top line
+#
+# University of Waterloo termcap extensions (as described in mytinfo).
+# The `xl' termcap file clashes with a terminfo name; this ambiguity cannot
+# be resolved by a type check. The descriptions are guesses from what was
+# in the mytinfo tables.
+#
+# key_interrupt_char OTki str ki - - ----- string set by interrupt key (?)
+# key_kill_char OTkk str kk - - ----- string set by kill key (?)
+# key_suspend_char OTkz str kz - - ----- string set by suspend key (?)
+# initialization_messy OTxc bool xc - - ----- initialization leaves garbage on the screen (?)
+# ind_at_bottom_does_cr OTxl bool xl - - ----- index does a carriage return
+#
+# Nonstandard capabilities unique to Ross Ridge's `mytinfo' package.
+# SR clashes with a terminfo name; this ambiguity cannot be resolved by a type
+# check.
+#
+# scroll_left OTsl1 str Sl - - ----- scroll screen leftward
+# scroll_right OTsr1 str Sr - - ----- scroll screen rightward
+# parm_scroll_left OTsl str SL - - ----- scroll screen leftward #1 characters
+# parm_scroll_right OTsr str SR - - ----- scroll screen rightward #1 characters
+#
+# The mytinfo capabilities end here.
+#
+# XENIX extensions:
+#
+# Xenix defined its own set of forms-drawing capabilities:
+#
+# cap IBM ASCII description ACS ASCII
+# --- ----------- -------------------- ------------- ------
+# G1 191 \277 M-? single upper right ACS_URCORNER
+# G2 218 \332 M-Z single upper left ACS_ULCORNER
+# G3 192 \300 M-@ single lower left ACS_LLCORNER
+# G4 217 \331 M-Y single lower right ACS_LRCORNER
+# G5 187 \273 M-; double upper right
+# G6 201 \311 M-I double upper left
+# G7 200 \310 M-H double lower left
+# G8 188 \274 M-< double lower right
+# GC 197 \305 M-E single intersection ACS_PLUS _ _
+# GD 194 \302 M-B single down-tick ACS_TTEE |
+# GH 196 \304 M-D single horizontal line ACS_HLINE
+# GL 180 \264 M-4 single left tick ACS_RTEE -|
+# GR 195 \303 M-C single right tick ACS_LTEE |-
+# GU 193 \301 M-A single up tick ACS_BTEE _|_
+# GV 179 \263 M-3 single vertical line ACS_VLINE
+# Gc 206 \316 M-N double intersection
+# Gd 203 \313 M-K double down tick
+# Gh 205 \315 M-M double horizontal line
+# Gl 204 \204 M-L double left tick
+# Gr 185 \271 M-9 double right tick
+# Gu 202 \312 M-J double up tick
+# Gv 186 \272 M-: double vertical line
+#
+# The compiler will translate the single-line caps and discard the others
+# (via IGNORE aliases further down). We don't want to do normal pad
+# translation on these, they're often single-character printable ASCII
+# strings that happen to be numerics. There's awk code in parametrized.sh
+# that detects the acs_ prefix and uses it to suppress pad translation.
+# These terminfo names are invented.
+#
+acs_ulcorner OTG2 str G2 - - ----- single upper left
+acs_llcorner OTG3 str G3 - - ----- single lower left
+acs_urcorner OTG1 str G1 - - ----- single upper right
+acs_lrcorner OTG4 str G4 - - ----- single lower right
+acs_ltee OTGR str GR - - ----- tee pointing right
+acs_rtee OTGL str GL - - ----- tee pointing left
+acs_btee OTGU str GU - - ----- tee pointing up
+acs_ttee OTGD str GD - - ----- tee pointing down
+acs_hline OTGH str GH - - ----- single horizontal line
+acs_vline OTGV str GV - - ----- single vertical line
+acs_plus OTGC str GC - - ----- single intersection
+#
+#############################################################################
+#
+# TERMINFO EXTENSION CAPABILITIES
+#
+# This section is almost all comments. What it's mainly for is to describe
+# what capabilities need to be squeezed out to get down to the XSI Curses
+# standard set. They are flagged with K.
+#
+# HP extensions
+#
+# These extensions follow ptr_non (replacing everything after it) in HP
+# terminfo files. Except for memory_lock and memory_unlock, they are
+# functionally identical to SVr4 extensions, but they make the binary format
+# different. Grrr....
+#
+memory_lock meml str ml - - ----K memory lock above
+memory_unlock memu str mu - - ----K memory unlock
+#plab_norm pln str pn - - ----- program label #1 to show string #2
+#label_on smln str LO - - ----- turn on soft labels
+#label_off rmln str LF - - ----- turn off soft labels
+#key_f11 kf11 str F1 - - ----- F11 function key
+#key_f12 kf12 str F2 - - ----- F12 function key
+#key_f13 kf13 str F3 - - ----- F13 function key
+#key_f14 kf14 str F4 - - ----- F14 function key
+#key_f15 kf15 str F5 - - ----- F15 function key
+#key_f16 kf16 str F6 - - ----- F16 function key
+#key_f17 kf17 str F7 - - ----- F17 function key
+#key_f18 kf18 str F8 - - ----- F18 function key
+#key_f19 kf19 str F9 - - ----- F19 function key
+#key_f20 kf20 str FA - - ----- F20 function key
+#key_f21 kf21 str FB - - ----- F21 function key
+#key_f22 kf22 str FC - - ----- F22 function key
+#key_f23 kf23 str FD - - ----- F23 function key
+#key_f24 kf24 str FE - - ----- F24 function key
+#key_f25 kf25 str FF - - ----- F25 function key
+#key_f26 kf26 str FG - - ----- F26 function key
+#key_f27 kf27 str FH - - ----- F27 function key
+#key_f28 kf28 str FI - - ----- F28 function key
+#key_f29 kf29 str FJ - - ----- F29 function key
+#key_f30 kf30 str FK - - ----- F30 function key
+#key_f31 kf31 str FL - - ----- F31 function key
+#key_f32 kf32 str FM - - ----- F32 function key
+#key_f33 kf33 str FN - - ----- F33 function key
+#key_f34 kf34 str FO - - ----- F34 function key
+#key_f35 kf35 str FP - - ----- F35 function key
+#key_f36 kf36 str FQ - - ----- F36 function key
+#key_f37 kf37 str FR - - ----- F37 function key
+#key_f38 kf38 str FS - - ----- F38 function key
+#key_f39 kf39 str FT - - ----- F39 function key
+#key_f40 kf40 str FU - - ----- F40 function key
+#key_f41 kf41 str FV - - ----- F41 function key
+#key_f42 kf42 str FW - - ----- F42 function key
+#key_f43 kf43 str FX - - ----- F43 function key
+#key_f44 kf44 str FY - - ----- F44 function key
+#key_f45 kf45 str FZ - - ----- F45 function key
+#key_f46 kf46 str Fa - - ----- F46 function key
+#key_f47 kf47 str Fb - - ----- F47 function key
+#key_f48 kf48 str Fc - - ----- F48 function key
+#key_f49 kf49 str Fd - - ----- F49 function key
+#key_f50 kf50 str Fe - - ----- F50 function key
+#key_f51 kf51 str Ff - - ----- F51 function key
+#key_f52 kf52 str Fg - - ----- F52 function key
+#key_f53 kf53 str Fh - - ----- F53 function key
+#key_f54 kf54 str Fi - - ----- F54 function key
+#key_f55 kf55 str Fj - - ----- F55 function key
+#key_f56 kf56 str Fk - - ----- F56 function key
+#key_f57 kf57 str Fl - - ----- F57 function key
+#key_f58 kf58 str Fm - - ----- F58 function key
+#key_f59 kf59 str Fn - - ----- F59 function key
+#key_f60 kf60 str Fo - - ----- F60 function key
+#key_f61 kf61 str Fp - - ----- F61 function key
+#key_f62 kf62 str Fq - - ----- F62 function key
+#key_f63 kf63 str Fr - - ----- F63 function key
+#
+#############################################################################
+#
+# ALIAS DECLARATIONS
+#
+# Here we set up aliases for translating extensions into standard terminfo.
+#
+#---------------------------------- Termcap aliases -------------------------
+#
+# BSD aliases:
+#
+# This is a common error in many termcap files. We'll get notified during
+# translation when this (or any other alias) fires.
+#
+capalias sb sr BSD scroll text down
+#
+# AT&T extensions:
+#
+# The old AT&T 5410, 5420, 5425, pc6300plus, 610, and s4 entries used a set of
+# nonstandard capabilities. Its signature is the KM capability, used to name
+# some sort of keymap file. EE, BO, CI, CV, XS, DS, FL and FE are in this
+# set. Comments in the original, and a little cross-checking with other AT&T
+# documentation, seem to establish the following mappings:
+#
+capalias BO mr AT&T enter_reverse_mode
+capalias CI vi AT&T cursor_invisible
+capalias CV ve AT&T cursor_normal
+capalias DS mh AT&T enter_dim_mode
+#capalias EE me AT&T exit_attribute_mode
+capalias FE LF AT&T label_on
+capalias FL LO AT&T label_off
+capalias XS mk AT&T enter_secure_mode
+#
+# We comment out EE because the conflicting XENIX EE is more common in
+# old entries.
+#
+# XENIX extensions:
+#
+# These are the ones we know how to translate directly:
+#
+capalias EE mh XENIX exit_attribute_mode
+capalias GE ae XENIX exit_alt_charset_mode
+capalias GS as XENIX enter_alt_charset_mode
+capalias CF vi XENIX cursor_invis
+capalias CO ve XENIX cursor_normal
+capalias EN @7 XENIX key_end
+capalias HM kh XENIX key_home
+capalias LD kL XENIX key_dl
+capalias PD kN XENIX key_npage
+capalias PN po XENIX prtr_off
+capalias PS pf XENIX prtr_on
+capalias PU kP XENIX key_ppage
+capalias RT @8 XENIX kent
+capalias UP ku XENIX kcuu1
+capalias G6 IGNORE XENIX double-ACS_ULCORNER
+capalias G7 IGNORE XENIX double-ACS_LLCORNER
+capalias G5 IGNORE XENIX double-ACS_URCORNER
+capalias G8 IGNORE XENIX double-ACS_LRCORNER
+capalias Gr IGNORE XENIX double-ACS_LTEE
+capalias Gr IGNORE XENIX double-ACS_RTEE
+capalias Gu IGNORE XENIX double-ACS_BTEE
+capalias Gd IGNORE XENIX double ACS_TTEE
+capalias Gh IGNORE XENIX double-ACS_HLINE
+capalias Gv IGNORE XENIX double-ACS_VLINE
+capalias Gc IGNORE XENIX double-ACS_PLUS
+capalias GG IGNORE XENIX acs-glitch
+#
+# IBM extensions:
+#
+capalias kq %1 IBM key_help
+#
+# Iris extensions:
+#
+capalias HS mh IRIS enter_dim_mode
+#
+# Tektronix extensions:
+#
+capalias KA k; Tek key_f10
+capalias KB F1 Tek key_f11
+capalias KC F2 Tek key_f12
+capalias KD F3 Tek key_f13
+capalias KE F4 Tek key_f14
+capalias KF F5 Tek key_f15
+capalias BC Sb Tek set_background
+capalias FC Sf Tek set_foreground
+#
+# There are also the following:
+#
+# XENIX XENIX variable name name clash with terminfo?
+# ----- ------------------- -------------------------
+# CL key_char_left
+# CR key_char_right
+# CW key_change_window
+# HP ??
+# LF key_linefeed label_off
+# NU key_next_unlocked_cell
+# PL ??
+# PR ??
+# RC key_recalc remove_clock
+# RF key_toggle_ref req_for_input
+# WL key_word_left
+# WR key_word_right
+#
+# If you know what any of the question-marked ones mean, please tell us.
+#
+#--------------------------------- Terminfo aliases ------------------------
+#
+# IBM extensions:
+#
+infoalias font0 s0ds IBM set0_des_seq
+infoalias font1 s1ds IBM set1_des_seq
+infoalias font2 s2ds IBM set2_des_seq
+infoalias font3 s3ds IBM set3_des_seq
+infoalias kbtab kcbt IBM key_backtab
+infoalias ksel kslt IBM key_select
+#
+# Some others are identical to SVr4/XPG4 capabilities, in particular:
+# kcmd, kend, khlp, and kf11...kf63.
+#
+#############################################################################
+#
+# The following sets edit modes for GNU EMACS
+# Local Variables:
+# case-fold-search:nil
+# truncate-lines:t
+# End:
diff --git a/contrib/ncurses/include/Caps.keys b/contrib/ncurses/include/Caps.keys
new file mode 100644
index 000000000000..7ef7545fa5bc
--- /dev/null
+++ b/contrib/ncurses/include/Caps.keys
@@ -0,0 +1,1354 @@
+##############################################################################
+# Copyright (c) 2001 Free Software Foundation, Inc. #
+# #
+# Permission is hereby granted, free of charge, to any person obtaining a #
+# copy of this software and associated documentation files (the "Software"), #
+# to deal in the Software without restriction, including without limitation #
+# the rights to use, copy, modify, merge, publish, distribute, distribute #
+# with modifications, sublicense, and/or sell copies of the Software, and to #
+# permit persons to whom the Software is furnished to do so, subject to the #
+# following conditions: #
+# #
+# The above copyright notice and this permission notice shall be included in #
+# all copies or substantial portions of the Software. #
+# #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
+# DEALINGS IN THE SOFTWARE. #
+# #
+# Except as contained in this notice, the name(s) of the above copyright #
+# holders shall not be used in advertising or otherwise to promote the sale, #
+# use or other dealings in this Software without prior written #
+# authorization. #
+##############################################################################
+#
+# Author: Thomas Dickey
+# and: Ilya Zakharevich
+#
+# $Id: Caps.keys,v 1.2 2002/04/20 15:43:49 tom Exp $
+#
+# This is an adaptation of ncurses' termcap/terminfo capability table, which
+# is illustrates an experimental extension to describe alt-, shift- and
+# control-modifiers applied to function and normal keys, as done on IBM pc's.
+#
+# This table is used to generate initializers for tables that drive tic,
+# infocmp, and the library compilation code used to support the termcap
+# compatibility hack. It is also used to generate the tabular portion of the
+# terminfo(5) man page; lines beginning with `#%' are passed through to become
+# the terminfo table.
+#
+# This file has three major sections; a standard-capabilities table, two
+# extension-capability tables, and a section of aliases declarations.
+# The first two have the same format, as follows:
+#
+# FILE FORMAT
+#
+# Column 1: terminfo variable name
+# Column 2: terminfo capability name
+# Column 3: capability type (boolean, numeric, or string)
+# Column 4: termcap capability name
+# Column 5: KEY_xxx name, if any, `-' otherwise
+# Column 6: value for KEY_xxx name, if any, `-' otherwise
+# Column 7: Lead with `Y' if capability should be emitted in termcap
+# translations, `-' otherwise
+# Column 8: capability description
+#
+# The codes following [Y-] in column 7 describe the versions of termcap which
+# use the given capability. This information is not used by the curses library
+# proper; rather, it's there to help the terminfo maintainer avoid emitting
+# termcap entry translations that are more than 1023 bytes long (and tank a
+# lot of old termcap-using programs). The codes read as follows:
+# B = mentioned in the BSD man page for 4.4BSD curses
+# C = used by the 4.4BSD curses library
+# G = mentioned in the documentation for GNU termcap
+# E = used by GNU Emacs
+# K = remove this terminfo capability when translating to standard format
+# The important codes are C and E. A cap with C or E should be preserved in
+# translation if possible. The problem is that preserving all such caps may
+# lead to some termcap translations being too long. The termcap maintainer
+# has a bit of a juggling act to do...potential problem cases are marked with
+# an asterisk (*).
+#
+# The aliases section has the following format:
+#
+# Column 1: either `capalias' or `infoalias'
+# Column 2: name to be aliased
+# Column 3: what name it should translate to. The name IGNORE means it
+# should be discarded with a warning message.
+# Column 4: name of the extension set (used for compiler warning messages)
+# Column 5: capability description (usually an associated terminfo variable)
+#
+# HANDLING TERMCAP AND TERMINFO EXTENSIONS
+#
+# There are basically five different ways to handle termcap and terminfo
+# extensions:
+#
+# 1. Don't list the capname here, or list it but comment it out (the latter
+# is preferable; someone might want to handle it in the future). If you do
+# this, the capability will be treated as unknown and raise a warning from
+# the compiler.
+#
+# 2. Alias it. This is appropriate if the capability has the same meaning
+# as an already-supported one. The compiler will handle aliasing, emitting
+# an appropriate informational message whenever an alias fires.
+#
+# 3. List it in the standard table. You almost certainly do *not* want
+# to do this -- the capabilities in that one, and their order, have been
+# carefully chosen to be SVr4-binary-compatible when they're written out
+# as a terminfo object, and breaking this would be bad. It's up the ncurses
+# library what to do with the terminfo data after it's read in.
+#
+# 4. List it in the aliases table with an IGNORE target field. If you
+# do this, the capability will be ignored on input (though the user will
+# get a warning message about it).
+#
+# 5. List it in the extensions table. If you do this, the compiler will
+# silently accept the capability, but the curses library proper will never
+# see it (because it won't be written out as part of the terminfo object
+# format). It's up to you what you have the compiler do with it.
+#
+# There are two opposite reasons to choose option 5. One is when you want
+# to eat the capability silently and discard it when doing translations
+# to terminfo with tic -I. Some very old obsolete BSD caps like :kn: are
+# in this class. Nothing will ever use them again.
+#
+# More usually, you want the compiler to try to deduce something from the
+# capability value that it can use to translate it into your output format.
+# You'll need to write custom code, probably in postprocess_termcap() or
+# postprocess_terminfo(), to handle the translation.
+#
+# CONTROLLING ENTRY LENGTH
+#
+# Notes on specific elisions made to fit translations within 1023 bytes:
+#
+# Machines with IBM PC-like keyboards want to be able to define the following
+# keys: key_npage, key_ppage, key_home, key_ll (which is used for in termcap-
+# only environments for End or Home-Down), key_dc, and key_ic. This is also
+# the set of keys the `joe' editor will be upset if it can't see. So don't
+# trim those out of the set to be translated to termcap, or various users of
+# the termcap file will become irate.
+#
+# It might look tempting to leave those long init strings out of translations.
+# We can't do it (yet); 4.4BSD tput and tset use them.
+#
+# We retain the sgr capability in translation in spite of the fact that neither
+# 4.4BSD nor GNU Emacs uses it, because (a) some entry naming distinctions are
+# hard to understand without it, and (b) the entries in which it is long tend
+# to be older types that don't use up a lot of string space on function keys.
+# The tic(1) translation code will complain and elide it if it makes a critical
+# difference (there is special code in tic to recognize this situation).
+#
+# Yes, BSD tset(1) uses hpa. We elide hpa/vpa anyway because the motion
+# optimizer in BSD curses didn't use them. This omission seems to be the
+# single most effective one, it shortened the resolved length of all thirteen
+# problem entries in the 9.9.0 version of the terminfo master below critical.
+#
+# It would be nice to keep f11 and f12 for Emacs use, but a couple of termcap
+# translations go back over critical if we do this. As 4.4BSD curses fades
+# into history and GNU termcap's application base shrinks towards being GNU
+# Emacs only, we'll probably elide out some BSD-only capabilities in order
+# to buy space for non-essentials Emacs is still using. Capabilities high
+# on that hit list: rc, sc, uc.
+#
+#############################################################################
+#
+# STANDARD CAPABILITIES
+#
+#%The following is a complete table of the capabilities included in a
+#%terminfo description block and available to terminfo-using code. In each
+#%line of the table,
+#%
+#%The \fBvariable\fR is the name by which the programmer (at the terminfo level)
+#%accesses the capability.
+#%
+#%The \fBcapname\fR is the short name used in the text of the database,
+#%and is used by a person updating the database.
+#%Whenever possible, capnames are chosen to be the same as or similar to
+#%the ANSI X3.64-1979 standard (now superseded by ECMA-48, which uses
+#%identical or very similar names). Semantics are also intended to match
+#%those of the specification.
+#%
+#%The termcap code is the old
+#%.B termcap
+#%capability name (some capabilities are new, and have names which termcap
+#%did not originate).
+#%.P
+#%Capability names have no hard length limit, but an informal limit of 5
+#%characters has been adopted to keep them short and to allow the tabs in
+#%the source file
+#%.B Caps
+#%to line up nicely.
+#%
+#%Finally, the description field attempts to convey the semantics of the
+#%capability. You may find some codes in the description field:
+#%.TP
+#%(P)
+#%indicates that padding may be specified
+#%.TP
+#%#[1-9]
+#%in the description field indicates that the string is passed through tparm with
+#%parms as given (#\fIi\fP).
+#%.TP
+#%(P*)
+#%indicates that padding may vary in proportion to the number of
+#%lines affected
+#%.TP
+#%(#\d\fIi\fP\u)
+#%indicates the \fIi\fP\uth\d parameter.
+#%
+#%.PP
+#% These are the boolean capabilities:
+#%
+#%.na
+#%.TS H
+#%center expand;
+#%c l l c
+#%c l l c
+#%lw25 lw6 lw2 lw20.
+#%\fBVariable Cap- TCap Description\fR
+#%\fBBooleans name Code\fR
+auto_left_margin bw bool bw - - YB-G- cub1 wraps from column 0 to last column
+auto_right_margin am bool am - - YBCGE terminal has automatic margins
+no_esc_ctlc xsb bool xb - - YBCG- beehive (f1=escape, f2=ctrl C)
+ceol_standout_glitch xhp bool xs - - YBCGE standout not erased by overwriting (hp)
+eat_newline_glitch xenl bool xn - - YBCGE newline ignored after 80 cols (concept)
+erase_overstrike eo bool eo - - YBCG- can erase overstrikes with a blank
+generic_type gn bool gn - - YB-G- generic line type
+hard_copy hc bool hc - - YBCG- hardcopy terminal
+has_meta_key km bool km - - YB-GE Has a meta key (i.e., sets 8th-bit)
+has_status_line hs bool hs - - YB-G- has extra status line
+insert_null_glitch in bool in - - YBCGE insert mode distinguishes nulls
+memory_above da bool da - - YBCG- display may be retained above the screen
+memory_below db bool db - - YB-GE display may be retained below the screen
+move_insert_mode mir bool mi - - YBCGE safe to move while in insert mode
+move_standout_mode msgr bool ms - - YBCGE safe to move while in standout mode
+over_strike os bool os - - YBCG- terminal can overstrike
+status_line_esc_ok eslok bool es - - YB-G- escape can be used on the status line
+dest_tabs_magic_smso xt bool xt - - YBCGE tabs destructive, magic so char (t1061)
+tilde_glitch hz bool hz - - YB-GE can't print ~'s (hazeltine)
+transparent_underline ul bool ul - - YBCGE underline character overstrikes
+xon_xoff xon bool xo - - YB--- terminal uses xon/xoff handshaking
+needs_xon_xoff nxon bool nx - - ----- padding won't work, xon/xoff required
+prtr_silent mc5i bool 5i - - ----- printer won't echo on screen
+hard_cursor chts bool HC - - ----- cursor is hard to see
+non_rev_rmcup nrrmc bool NR - - ----- smcup does not reverse rmcup
+no_pad_char npc bool NP - - ----- pad character does not exist
+non_dest_scroll_region ndscr bool ND - - ----- scrolling region is non-destructive
+can_change ccc bool cc - - ----- terminal can re-define existing colors
+back_color_erase bce bool ut - - ----- screen erased with background color
+hue_lightness_saturation hls bool hl - - ----- terminal uses only HLS color notation (Tektronix)
+col_addr_glitch xhpa bool YA - - ----- only positive motion for hpa/mhpa caps
+cr_cancels_micro_mode crxm bool YB - - ----- using cr turns off micro mode
+has_print_wheel daisy bool YC - - ----- printer needs operator to change character set
+row_addr_glitch xvpa bool YD - - ----- only positive motion for vpa/mvpa caps
+semi_auto_right_margin sam bool YE - - ----- printing in last column causes cr
+cpi_changes_res cpix bool YF - - ----- changing character pitch changes resolution
+lpi_changes_res lpix bool YG - - ----- changing line pitch changes resolution
+#%.TE
+#%.ad
+#%
+#%These are the numeric capabilities:
+#%
+#%.na
+#%.TS H
+#%center expand;
+#%c l l c
+#%c l l c
+#%lw25 lw6 lw2 lw20.
+#%\fBVariable Cap- TCap Description\fR
+#%\fBNumeric name Code\fR
+columns cols num co - - YBCGE number of columns in a line
+init_tabs it num it - - YB-G- tabs initially every # spaces
+lines lines num li - - YBCGE number of lines on screen or page
+lines_of_memory lm num lm - - YB-G- lines of memory if > line. 0 means varies
+magic_cookie_glitch xmc num sg - - YBCGE number of blank characters left by smso or rmso
+padding_baud_rate pb num pb - - YB-GE lowest baud rate where padding needed
+virtual_terminal vt num vt - - YB--- virtual terminal number (CB/unix)
+width_status_line wsl num ws - - YB-G- number of columns in status line
+num_labels nlab num Nl - - ----- number of labels on screen
+label_height lh num lh - - ----- rows in each label
+label_width lw num lw - - ----- columns in each label
+max_attributes ma num ma - - YBC-- maximum combined attributes terminal can handle
+maximum_windows wnum num MW - - ----- maximum number of defineable windows
+# These came in with SVr4's color support
+max_colors colors num Co - - ----- maximum number of colors on screen
+max_pairs pairs num pa - - ----- maximum number of color-pairs on the screen
+no_color_video ncv num NC - - ----- video attributes that can't be used with colors
+#%.TE
+#%.ad
+#%
+#%The following numeric capabilities are present in the SVr4.0 term structure,
+#%but are not yet documented in the man page. They came in with SVr4's
+#%printer support.
+#%
+#%.na
+#%.TS H
+#%center expand;
+#%c l l c
+#%c l l c
+#%lw25 lw6 lw2 lw20.
+#%\fBVariable Cap- TCap Description\fR
+#%\fBNumeric name Code\fR
+buffer_capacity bufsz num Ya - - ----- numbers of bytes buffered before printing
+dot_vert_spacing spinv num Yb - - ----- spacing of pins vertically in pins per inch
+dot_horz_spacing spinh num Yc - - ----- spacing of dots horizontally in dots per inch
+max_micro_address maddr num Yd - - ----- maximum value in micro_..._address
+max_micro_jump mjump num Ye - - ----- maximum value in parm_..._micro
+micro_col_size mcs num Yf - - ----- character step size when in micro mode
+micro_line_size mls num Yg - - ----- line step size when in micro mode
+number_of_pins npins num Yh - - ----- numbers of pins in print-head
+output_res_char orc num Yi - - ----- horizontal resolution in units per line
+output_res_line orl num Yj - - ----- vertical resolution in units per line
+output_res_horz_inch orhi num Yk - - ----- horizontal resolution in units per inch
+output_res_vert_inch orvi num Yl - - ----- vertical resolution in units per inch
+print_rate cps num Ym - - ----- print rate in characters per second
+wide_char_size widcs num Yn - - ----- character step size when in double wide mode
+buttons btns num BT - - ----- number of buttons on mouse
+bit_image_entwining bitwin num Yo - - ----- number of passes for each bit-image row
+bit_image_type bitype num Yp - - ----- type of bit-image device
+#%.TE
+#%.ad
+#%
+#%These are the string capabilities:
+#%
+#%.na
+#%.TS H
+#%center expand;
+#%c l l c
+#%c l l c
+#%lw25 lw6 lw2 lw20.
+#%\fBVariable Cap- TCap Description\fR
+#%\fBString name Code\fR
+back_tab cbt str bt - - YBCGE back tab (P)
+bell bel str bl - - YB-GE audible signal (bell) (P)
+carriage_return cr str cr - - YBCGE carriage return (P*) (P*)
+change_scroll_region csr str cs - - YBCGE change region to line #1 to line #2 (P)
+clear_all_tabs tbc str ct - - YB-G- clear all tab stops (P)
+clear_screen clear str cl - - YBCGE clear screen and home cursor (P*)
+clr_eol el str ce - - YBCGE clear to end of line (P)
+clr_eos ed str cd - - YBCGE clear to end of screen (P*)
+column_address hpa str ch - - -B-GE* horizontal position #1, absolute (P)
+command_character cmdch str CC - - YB-G- terminal settable cmd character in prototype !?
+cursor_address cup str cm - - YBCGE move to row #1 columns #2
+cursor_down cud1 str do - - YBCGE down one line
+cursor_home home str ho - - YBCGE home cursor (if no cup)
+cursor_invisible civis str vi - - YB-G- make cursor invisible
+cursor_left cub1 str le - - YBCGE move left one space
+cursor_mem_address mrcup str CM - - YB-G- memory relative cursor addressing, move to row #1 columns #2
+cursor_normal cnorm str ve - - YBCGE make cursor appear normal (undo civis/cvvis)
+cursor_right cuf1 str nd - - YBCGE non-destructive space (move right one space)
+cursor_to_ll ll str ll - - YBCGE last line, first column (if no cup)
+cursor_up cuu1 str up - - YBCGE up one line
+cursor_visible cvvis str vs - - YBCGE make cursor very visible
+delete_character dch1 str dc - - YBCGE delete character (P*)
+delete_line dl1 str dl - - YBCGE delete line (P*)
+dis_status_line dsl str ds - - YB-G- disable status line
+down_half_line hd str hd - - YB-G- half a line down
+enter_alt_charset_mode smacs str as - - YB-G- start alternate character set (P)
+enter_blink_mode blink str mb - - YB-G- turn on blinking
+enter_bold_mode bold str md - - YB-G- turn on bold (extra bright) mode
+enter_ca_mode smcup str ti - - YBCGE string to start programs using cup
+enter_delete_mode smdc str dm - - YBCGE enter delete mode
+enter_dim_mode dim str mh - - YB-G- turn on half-bright mode
+enter_insert_mode smir str im - - YBCGE enter insert mode
+enter_secure_mode invis str mk - - -B-G-* turn on blank mode (characters invisible)
+enter_protected_mode prot str mp - - -B-G-* turn on protected mode
+enter_reverse_mode rev str mr - - YB-G- turn on reverse video mode
+enter_standout_mode smso str so - - YBCGE begin standout mode
+enter_underline_mode smul str us - - YBCGE begin underline mode
+erase_chars ech str ec - - YB-G- erase #1 characters (P)
+exit_alt_charset_mode rmacs str ae - - YB-G- end alternate character set (P)
+exit_attribute_mode sgr0 str me - - YB-GE turn off all attributes
+exit_ca_mode rmcup str te - - YBCGE strings to end programs using cup
+exit_delete_mode rmdc str ed - - YBCGE end delete mode
+exit_insert_mode rmir str ei - - YBCGE exit insert mode
+exit_standout_mode rmso str se - - YBCGE exit standout mode
+exit_underline_mode rmul str ue - - YBCGE exit underline mode
+flash_screen flash str vb - - YBCGE visible bell (may not move cursor)
+form_feed ff str ff - - YB-G- hardcopy terminal page eject (P*)
+from_status_line fsl str fs - - YB-G- return from status line
+init_1string is1 str i1 - - YB-G- initialization string
+init_2string is2 str is - - YB-G- initialization string
+init_3string is3 str i3 - - YB-G- initialization string
+init_file if str if - - YB-G- name of initialization file
+insert_character ich1 str ic - - YBCGE insert character (P)
+insert_line il1 str al - - YBCGE insert line (P*)
+insert_padding ip str ip - - YBCGE insert padding after inserted character
+key_backspace kbs str kb KEY_BACKSPACE 0407 YB-G- backspace key
+key_catab ktbc str ka KEY_CATAB 0526 -B-G-* clear-all-tabs key
+key_clear kclr str kC KEY_CLEAR 0515 -B-G-* clear-screen or erase key
+key_ctab kctab str kt KEY_CTAB 0525 -B-G-* clear-tab key
+key_dc kdch1 str kD KEY_DC 0512 YB-G- delete-character key
+key_dl kdl1 str kL KEY_DL 0510 -B-G-* delete-line key
+key_down kcud1 str kd KEY_DOWN 0402 YBCGE down-arrow key
+key_eic krmir str kM KEY_EIC 0514 -B-G-* sent by rmir or smir in insert mode
+key_eol kel str kE KEY_EOL 0517 -B-G-* clear-to-end-of-line key
+key_eos ked str kS KEY_EOS 0516 -B-G-* clear-to-end-of-screen key
+key_f0 kf0 str k0 KEY_F(0) 0410 YBCGE F0 function key
+key_f1 kf1 str k1 KEY_F(1) - YBCGE F1 function key
+key_f10 kf10 str k; KEY_F(10) - ----E F10 function key
+key_f2 kf2 str k2 KEY_F(2) - YBCGE F2 function key
+key_f3 kf3 str k3 KEY_F(3) - YBCGE F3 function key
+key_f4 kf4 str k4 KEY_F(4) - YBCGE F4 function key
+key_f5 kf5 str k5 KEY_F(5) - YBCGE F5 function key
+key_f6 kf6 str k6 KEY_F(6) - YBCGE F6 function key
+key_f7 kf7 str k7 KEY_F(7) - YBCGE F7 function key
+key_f8 kf8 str k8 KEY_F(8) - YBCGE F8 function key
+key_f9 kf9 str k9 KEY_F(9) - YBCGE F9 function key
+key_home khome str kh KEY_HOME 0406 YBCGE home key
+key_ic kich1 str kI KEY_IC 0513 YB-GE insert-character key
+key_il kil1 str kA KEY_IL 0511 -B-G-* insert-line key
+key_left kcub1 str kl KEY_LEFT 0404 YBCGE left-arrow key
+key_ll kll str kH KEY_LL 0533 YB-G- lower-left key (home down)
+key_npage knp str kN KEY_NPAGE 0522 YB-GE next-page key
+key_ppage kpp str kP KEY_PPAGE 0523 YB-GE previous-page key
+key_right kcuf1 str kr KEY_RIGHT 0405 YBCGE right-arrow key
+key_sf kind str kF KEY_SF 0520 -B-G-* scroll-forward key
+key_sr kri str kR KEY_SR 0521 -B-G-* scroll-backward key
+key_stab khts str kT KEY_STAB 0524 -B-G-* set-tab key
+key_up kcuu1 str ku KEY_UP 0403 YBCGE up-arrow key
+keypad_local rmkx str ke - - YBCGE leave 'keyboard_transmit' mode
+keypad_xmit smkx str ks - - YBCGE enter 'keyboard_transmit' mode
+lab_f0 lf0 str l0 - - -B-G-* label on function key f0 if not f0
+lab_f1 lf1 str l1 - - -B-G-* label on function key f1 if not f1
+lab_f10 lf10 str la - - ----- label on function key f10 if not f10
+lab_f2 lf2 str l2 - - -B-G-* label on function key f2 if not f2
+lab_f3 lf3 str l3 - - -B-G-* label on function key f3 if not f3
+lab_f4 lf4 str l4 - - -B-G-* label on function key f4 if not f4
+lab_f5 lf5 str l5 - - -B-G-* label on function key f5 if not f5
+lab_f6 lf6 str l6 - - -B-G-* label on function key f6 if not f6
+lab_f7 lf7 str l7 - - -B-G-* label on function key f7 if not f7
+lab_f8 lf8 str l8 - - -B-G-* label on function key f8 if not f8
+lab_f9 lf9 str l9 - - -B-G-* label on function key f9 if not f9
+meta_off rmm str mo - - YB-G-* turn off meta mode
+meta_on smm str mm - - YB-G-* turn on meta mode (8th-bit on)
+newline nel str nw - - YB-G-* newline (behave like cr followed by lf)
+pad_char pad str pc - - YBCGE padding char (instead of null)
+parm_dch dch str DC - - YB-GE delete #1 characters (P*)
+parm_delete_line dl str DL - - YBCGE delete #1 lines (P*)
+parm_down_cursor cud str DO - - YBCGE down #1 lines (P*)
+parm_ich ich str IC - - YB-GE insert #1 characters (P*)
+parm_index indn str SF - - YBCG- scroll forward #1 lines (P)
+parm_insert_line il str AL - - YBCGE insert #1 lines (P*)
+parm_left_cursor cub str LE - - YBCGE move #1 characters to the left (P)
+parm_right_cursor cuf str RI - - YBCGE move #1 characters to the right (P*)
+parm_rindex rin str SR - - YBCG- scroll back #1 lines (P)
+parm_up_cursor cuu str UP - - YBCGE up #1 lines (P*)
+pkey_key pfkey str pk - - -B--- program function key #1 to type string #2
+pkey_local pfloc str pl - - -B--- program function key #1 to execute string #2
+pkey_xmit pfx str px - - -B--- program function key #1 to transmit string #2
+print_screen mc0 str ps - - -B-G-* print contents of screen
+prtr_off mc4 str pf - - -B-G-* turn off printer
+prtr_on mc5 str po - - -B-G-* turn on printer
+repeat_char rep str rp - - YB-GE repeat char #1 #2 times (P*)
+reset_1string rs1 str r1 - - -B--- reset string
+reset_2string rs2 str r2 - - -B--- reset string
+reset_3string rs3 str r3 - - -B--- reset string
+reset_file rf str rf - - -B--- name of reset file
+restore_cursor rc str rc - - YBCG- restore cursor to position of last save_cursor
+row_address vpa str cv - - -B-GE* vertical position #1 absolute (P)
+save_cursor sc str sc - - YBCG- save current cursor position (P)
+scroll_forward ind str sf - - YBCGE scroll text up (P)
+scroll_reverse ri str sr - - YBCGE scroll text down (P)
+set_attributes sgr str sa - - YB-G- define video attributes #1-#9 (PG9)
+set_tab hts str st - - YB-G- set a tab in every row, current columns
+set_window wind str wi - - -B-GE current window is lines #1-#2 cols #3-#4
+tab ht str ta - - YBCGE tab to next 8-space hardware tab stop
+to_status_line tsl str ts - - YB-G- move to status line, column #1
+underline_char uc str uc - - YBCG- underline char and move past it
+up_half_line hu str hu - - YB-G- half a line up
+init_prog iprog str iP - - -B--- path name of program for initialization
+key_a1 ka1 str K1 KEY_A1 0534 YB-GE upper left of keypad
+key_a3 ka3 str K3 KEY_A3 0535 YB-GE upper right of keypad
+key_b2 kb2 str K2 KEY_B2 0536 YB-GE center of keypad
+key_c1 kc1 str K4 KEY_C1 0537 YB-GE lower left of keypad
+key_c3 kc3 str K5 KEY_C3 0540 YB-GE lower right of keypad
+prtr_non mc5p str pO - - -B-G-* turn on printer for #1 bytes
+#
+# SVr1 capabilities stop here. IBM's version of terminfo is the same as
+# SVr4 up to this point, but has a different set afterwards.
+#
+char_padding rmp str rP - - ----- like ip but when in insert mode
+acs_chars acsc str ac - - ----- graphics charset pairs, based on vt100
+plab_norm pln str pn - - ----- program label #1 to show string #2
+key_btab kcbt str kB KEY_BTAB 0541 ----- back-tab key
+enter_xon_mode smxon str SX - - ----- turn on xon/xoff handshaking
+exit_xon_mode rmxon str RX - - ----- turn off xon/xoff handshaking
+enter_am_mode smam str SA - - ----- turn on automatic margins
+exit_am_mode rmam str RA - - ----- turn off automatic margins
+xon_character xonc str XN - - ----- XON character
+xoff_character xoffc str XF - - ----- XOFF character
+ena_acs enacs str eA - - ----- enable alternate char set
+label_on smln str LO - - ----- turn on soft labels
+label_off rmln str LF - - ----- turn off soft labels
+key_beg kbeg str @1 KEY_BEG 0542 ----- begin key
+key_cancel kcan str @2 KEY_CANCEL 0543 ----- cancel key
+key_close kclo str @3 KEY_CLOSE 0544 ----- close key
+key_command kcmd str @4 KEY_COMMAND 0545 ----- command key
+key_copy kcpy str @5 KEY_COPY 0546 ----- copy key
+key_create kcrt str @6 KEY_CREATE 0547 ----- create key
+key_end kend str @7 KEY_END 0550 ----- end key
+key_enter kent str @8 KEY_ENTER 0527 ----- enter/send key
+key_exit kext str @9 KEY_EXIT 0551 ----- exit key
+key_find kfnd str @0 KEY_FIND 0552 ----- find key
+key_help khlp str %1 KEY_HELP 0553 ----- help key
+key_mark kmrk str %2 KEY_MARK 0554 ----- mark key
+key_message kmsg str %3 KEY_MESSAGE 0555 ----- message key
+key_move kmov str %4 KEY_MOVE 0556 ----- move key
+key_next knxt str %5 KEY_NEXT 0557 ----- next key
+key_open kopn str %6 KEY_OPEN 0560 ----- open key
+key_options kopt str %7 KEY_OPTIONS 0561 ----- options key
+key_previous kprv str %8 KEY_PREVIOUS 0562 ----- previous key
+key_print kprt str %9 KEY_PRINT 0532 ----- print key
+key_redo krdo str %0 KEY_REDO 0563 ----- redo key
+key_reference kref str &1 KEY_REFERENCE 0564 ----- reference key
+key_refresh krfr str &2 KEY_REFRESH 0565 ----- refresh key
+key_replace krpl str &3 KEY_REPLACE 0566 ----- replace key
+key_restart krst str &4 KEY_RESTART 0567 ----- restart key
+key_resume kres str &5 KEY_RESUME 0570 ----- resume key
+key_save ksav str &6 KEY_SAVE 0571 ----- save key
+key_suspend kspd str &7 KEY_SUSPEND 0627 ----- suspend key
+key_undo kund str &8 KEY_UNDO 0630 ----- undo key
+key_sbeg kBEG str &9 KEY_SBEG 0572 ----- shifted begin key
+key_scancel kCAN str &0 KEY_SCANCEL 0573 ----- shifted cancel key
+key_scommand kCMD str *1 KEY_SCOMMAND 0574 ----- shifted command key
+key_scopy kCPY str *2 KEY_SCOPY 0575 ----- shifted copy key
+key_screate kCRT str *3 KEY_SCREATE 0576 ----- shifted create key
+key_sdc kDC str *4 KEY_SDC 0577 ----- shifted delete-character key
+key_sdl kDL str *5 KEY_SDL 0600 ----- shifted delete-line key
+key_select kslt str *6 KEY_SELECT 0601 ----- select key
+key_send kEND str *7 KEY_SEND 0602 ----- shifted end key
+key_seol kEOL str *8 KEY_SEOL 0603 ----- shifted clear-to-end-of-line key
+key_sexit kEXT str *9 KEY_SEXIT 0604 ----- shifted exit key
+key_sfind kFND str *0 KEY_SFIND 0605 ----- shifted find key
+key_shelp kHLP str #1 KEY_SHELP 0606 ----- shifted help key
+key_shome kHOM str #2 KEY_SHOME 0607 ----- shifted home key
+key_sic kIC str #3 KEY_SIC 0610 ----- shifted insert-character key
+key_sleft kLFT str #4 KEY_SLEFT 0611 ----- shifted left-arrow key
+key_smessage kMSG str %a KEY_SMESSAGE 0612 ----- shifted message key
+key_smove kMOV str %b KEY_SMOVE 0613 ----- shifted move key
+key_snext kNXT str %c KEY_SNEXT 0614 ----- shifted next key
+key_soptions kOPT str %d KEY_SOPTIONS 0615 ----- shifted options key
+key_sprevious kPRV str %e KEY_SPREVIOUS 0616 ----- shifted previous key
+key_sprint kPRT str %f KEY_SPRINT 0617 ----- shifted print key
+key_sredo kRDO str %g KEY_SREDO 0620 ----- shifted redo key
+key_sreplace kRPL str %h KEY_SREPLACE 0621 ----- shifted replace key
+key_sright kRIT str %i KEY_SRIGHT 0622 ----- shifted right-arrow key
+key_srsume kRES str %j KEY_SRSUME 0623 ----- shifted resume key
+key_ssave kSAV str !1 KEY_SSAVE 0624 ----- shifted save key
+key_ssuspend kSPD str !2 KEY_SSUSPEND 0625 ----- shifted suspend key
+key_sundo kUND str !3 KEY_SUNDO 0626 ----- shifted undo key
+req_for_input rfi str RF - - ----- send next input char (for ptys)
+key_f11 kf11 str F1 KEY_F(11) - ----E F11 function key
+key_f12 kf12 str F2 KEY_F(12) - ----E F12 function key
+key_f13 kf13 str F3 KEY_F(13) - ----E F13 function key
+key_f14 kf14 str F4 KEY_F(14) - ----E F14 function key
+key_f15 kf15 str F5 KEY_F(15) - ----E F15 function key
+key_f16 kf16 str F6 KEY_F(16) - ----E F16 function key
+key_f17 kf17 str F7 KEY_F(17) - ----E F17 function key
+key_f18 kf18 str F8 KEY_F(18) - ----E F18 function key
+key_f19 kf19 str F9 KEY_F(19) - ----E F19 function key
+key_f20 kf20 str FA KEY_F(20) - ----E F20 function key
+key_f21 kf21 str FB KEY_F(21) - ----E F21 function key
+key_f22 kf22 str FC KEY_F(22) - ----E F22 function key
+key_f23 kf23 str FD KEY_F(23) - ----E F23 function key
+key_f24 kf24 str FE KEY_F(24) - ----E F24 function key
+key_f25 kf25 str FF KEY_F(25) - ----E F25 function key
+key_f26 kf26 str FG KEY_F(26) - ----E F26 function key
+key_f27 kf27 str FH KEY_F(27) - ----E F27 function key
+key_f28 kf28 str FI KEY_F(28) - ----E F28 function key
+key_f29 kf29 str FJ KEY_F(29) - ----E F29 function key
+key_f30 kf30 str FK KEY_F(30) - ----E F30 function key
+key_f31 kf31 str FL KEY_F(31) - ----E F31 function key
+key_f32 kf32 str FM KEY_F(32) - ----E F32 function key
+key_f33 kf33 str FN KEY_F(33) - ----E F33 function key
+key_f34 kf34 str FO KEY_F(34) - ----E F34 function key
+key_f35 kf35 str FP KEY_F(35) - ----E F35 function key
+key_f36 kf36 str FQ KEY_F(36) - ----E F36 function key
+key_f37 kf37 str FR KEY_F(37) - ----E F37 function key
+key_f38 kf38 str FS KEY_F(38) - ----E F38 function key
+key_f39 kf39 str FT KEY_F(39) - ----E F39 function key
+key_f40 kf40 str FU KEY_F(40) - ----E F40 function key
+key_f41 kf41 str FV KEY_F(41) - ----E F41 function key
+key_f42 kf42 str FW KEY_F(42) - ----E F42 function key
+key_f43 kf43 str FX KEY_F(43) - ----E F43 function key
+key_f44 kf44 str FY KEY_F(44) - ----E F44 function key
+key_f45 kf45 str FZ KEY_F(45) - ----E F45 function key
+key_f46 kf46 str Fa KEY_F(46) - ----E F46 function key
+key_f47 kf47 str Fb KEY_F(47) - ----E F47 function key
+key_f48 kf48 str Fc KEY_F(48) - ----E F48 function key
+key_f49 kf49 str Fd KEY_F(49) - ----E F49 function key
+key_f50 kf50 str Fe KEY_F(50) - ----E F50 function key
+key_f51 kf51 str Ff KEY_F(51) - ----E F51 function key
+key_f52 kf52 str Fg KEY_F(52) - ----E F52 function key
+key_f53 kf53 str Fh KEY_F(53) - ----E F53 function key
+key_f54 kf54 str Fi KEY_F(54) - ----E F54 function key
+key_f55 kf55 str Fj KEY_F(55) - ----E F55 function key
+key_f56 kf56 str Fk KEY_F(56) - ----E F56 function key
+key_f57 kf57 str Fl KEY_F(57) - ----E F57 function key
+key_f58 kf58 str Fm KEY_F(58) - ----E F58 function key
+key_f59 kf59 str Fn KEY_F(59) - ----E F59 function key
+key_f60 kf60 str Fo KEY_F(60) - ----E F60 function key
+key_f61 kf61 str Fp KEY_F(61) - ----E F61 function key
+key_f62 kf62 str Fq KEY_F(62) - ----E F62 function key
+key_f63 kf63 str Fr KEY_F(63) - ----E F63 function key
+clr_bol el1 str cb - - ----- Clear to beginning of line
+clear_margins mgc str MC - - ----- clear right and left soft margins
+set_left_margin smgl str ML - - ----- set left soft margin at current column. See smgl. (ML is not in BSD termcap).
+set_right_margin smgr str MR - - ----- set right soft margin at current column
+label_format fln str Lf - - ----- label format
+set_clock sclk str SC - - ----- set clock, #1 hrs #2 mins #3 secs
+display_clock dclk str DK - - ----- display clock
+remove_clock rmclk str RC - - ----- remove clock
+create_window cwin str CW - - ----- define a window #1 from #2,#3 to #4,#5
+goto_window wingo str WG - - ----- go to window #1
+hangup hup str HU - - ----- hang-up phone
+dial_phone dial str DI - - ----- dial number #1
+quick_dial qdial str QD - - ----- dial number #1 without checking
+tone tone str TO - - ----- select touch tone dialing
+pulse pulse str PU - - ----- select pulse dialing
+flash_hook hook str fh - - ----- flash switch hook
+fixed_pause pause str PA - - ----- pause for 2-3 seconds
+wait_tone wait str WA - - ----- wait for dial-tone
+user0 u0 str u0 - - ----- User string #0
+user1 u1 str u1 - - ----- User string #1
+user2 u2 str u2 - - ----- User string #2
+user3 u3 str u3 - - ----- User string #3
+user4 u4 str u4 - - ----- User string #4
+user5 u5 str u5 - - ----- User string #5
+user6 u6 str u6 - - ----- User string #6
+user7 u7 str u7 - - ----- User string #7
+user8 u8 str u8 - - ----- User string #8
+user9 u9 str u9 - - ----- User string #9
+#
+# NCurses extensions for keys accessible on most PC consoles
+#
+key_sup kUP str !5 KEY_SUP + ----- shifted up-arrow key
+key_sdown kDOWN str !6 KEY_SDOWN + ----- shifted down-arrow key
+key_sbackspace kBS str !7 KEY_SBACKSPACE + ----- shifted backspace key
+key_c_delete kcdelete str !8 KEY_C_DELETE + ----- control- delete-character key
+key_c_end kcend str !9 KEY_C_END + ----- control- end key
+key_c_home kchom str !0 KEY_C_HOME + ----- control- home key
+key_c_insert kcinsert str !_ KEY_C_INSERT + ----- control- insert-character key
+key_c_left kclft str %k KEY_C_LEFT + ----- control- left-arrow key
+key_c_next kcnxt str %l KEY_C_NEXT + ----- control- next key
+key_c_previous kcprv str %m KEY_C_PREVIOUS + ----- control- previous key
+key_c_print kcprt str %n KEY_C_PRINT + ----- control- print key
+key_c_right kcrit str %o KEY_C_RIGHT + ----- control- right-arrow key
+key_c_backspace kcbs str %p KEY_C_BACKSPACE + ----- control- backspace key
+key_c_up kcup str %q KEY_C_UP + ----- control- up-arrow key
+key_c_down kcdown str %r KEY_C_DOWN + ----- control- down-arrow key
+key_a_delete kadelete str %s KEY_A_DELETE + ----- alt- delete-character key
+key_a_end kaend str %t KEY_A_END + ----- alt- end key
+key_a_home kahom str %u KEY_A_HOME + ----- alt- home key
+key_a_insert kainsert str %v KEY_A_INSERT + ----- alt- insert-character key
+key_a_left kalft str %w KEY_A_LEFT + ----- alt- left-arrow key
+key_a_next kanxt str %x KEY_A_NEXT + ----- alt- next key
+key_a_previous kaprv str %y KEY_A_PREVIOUS + ----- alt- previous key
+key_a_print kaprt str %z KEY_A_PRINT + ----- alt- print key
+key_a_right karit str %! KEY_A_RIGHT + ----- alt- right-arrow key
+key_a_backspace kabs str %@ KEY_A_BACKSPACE + ----- alt- backspace key
+key_a_up kaup str %# KEY_A_UP + ----- alt- up-arrow key
+key_a_down kadown str %$ KEY_A_DOWN + ----- alt- down-arrow key
+key_a_a kaa str $a KEY_A_A + ----- alt- a key
+key_a_b kab str $b KEY_A_B + ----- alt- b key
+key_a_c kac str $c KEY_A_C + ----- alt- c key
+key_a_d kad str $d KEY_A_D + ----- alt- d key
+key_a_e kae str $e KEY_A_E + ----- alt- e key
+key_a_f kaf str $f KEY_A_F + ----- alt- f key
+key_a_g kag str $g KEY_A_G + ----- alt- g key
+key_a_h kah str $h KEY_A_H + ----- alt- h key
+key_a_i kai str $i KEY_A_I + ----- alt- i key
+key_a_j kaj str $j KEY_A_J + ----- alt- j key
+key_a_k kak str $k KEY_A_K + ----- alt- k key
+key_a_l kal str $l KEY_A_L + ----- alt- l key
+key_a_m kam str $m KEY_A_M + ----- alt- m key
+key_a_n kan str $n KEY_A_N + ----- alt- n key
+key_a_o kao str $o KEY_A_O + ----- alt- o key
+key_a_p kap str $p KEY_A_P + ----- alt- p key
+key_a_q kaq str $q KEY_A_Q + ----- alt- q key
+key_a_r kar str $r KEY_A_R + ----- alt- r key
+key_a_s kas str $s KEY_A_S + ----- alt- s key
+key_a_t kat str $t KEY_A_T + ----- alt- t key
+key_a_u kau str $u KEY_A_U + ----- alt- u key
+key_a_v kav str $v KEY_A_V + ----- alt- v key
+key_a_w kaw str $w KEY_A_W + ----- alt- w key
+key_a_x kax str $x KEY_A_X + ----- alt- x key
+key_a_y kay str $y KEY_A_Y + ----- alt- y key
+key_a_z kaz str $z KEY_A_Z + ----- alt- z key
+key_a_0 ka_0 str $0 KEY_A_0 + ----- alt- 0 key
+key_a_1 ka_1 str $1 KEY_A_1 + ----- alt- 1 key
+key_a_2 ka_2 str $2 KEY_A_2 + ----- alt- 2 key
+key_a_3 ka_3 str $3 KEY_A_3 + ----- alt- 3 key
+key_a_4 ka_4 str $4 KEY_A_4 + ----- alt- 4 key
+key_a_5 ka_5 str $5 KEY_A_5 + ----- alt- 5 key
+key_a_6 ka_6 str $6 KEY_A_6 + ----- alt- 6 key
+key_a_7 ka_7 str $7 KEY_A_7 + ----- alt- 7 key
+key_a_8 ka_8 str $8 KEY_A_8 + ----- alt- 8 key
+key_a_9 ka_9 str $9 KEY_A_9 + ----- alt- 9 key
+key_a_backtick ka_bt str $` KEY_A_BACKTICK + ----- alt- ` key
+key_a_under ka_und str $_ KEY_A_UNDER + ----- alt- _ key
+key_a_equals ka_eq str $= KEY_A_EQUALS + ----- alt- = key
+key_a_bar ka_bsl str $| KEY_A_BAR + ----- alt- | key
+key_a_lbracker ka_lbr str $[ KEY_A_LBRACKER + ----- alt- [ key
+key_a_rbracker ka_rbr str $] KEY_A_RBRACKER + ----- alt- ] key
+key_a_semi ka_semi str $; KEY_A_SEMI + ----- alt- ; key
+key_a_tick ka_tick str $' KEY_A_TICK + ----- alt- ' key
+key_a_comma ka_com str $, KEY_A_COMMA + ----- alt- , key
+key_a_dot ka_dot str $. KEY_A_DOT + ----- alt- . key
+key_a_question ka_sla str $? KEY_A_QUESTION + ----- alt- ? key
+key_a_divide ka_div str $/ KEY_A_DIVIDE + ----- alt- keypad / key
+key_a_multiply ka_mul str $* KEY_A_MULTIPLY + ----- alt- keypad * key
+key_a_add ka_add str $+ KEY_A_ADD + ----- alt- keypad + key
+key_a_subtract ka_sub str $- KEY_A_SUBTRACT + ----- alt- keypad - key
+key_a_kenter ka_kent str $< KEY_A_KENTER + ----- alt- keypad enter key
+key_a_enter ka_ent str $> KEY_A_ENTER + ----- alt- enter key
+key_c_at kcat str %% KEY_C_AT + ----- control- @ key
+key_c_divide kcdiv str %/ KEY_C_DIVIDE + ----- control- keypad / key
+key_c_multiply kcmul str %* KEY_C_MULTIPLY + ----- control- keypad * key
+key_c_add kcadd str %+ KEY_C_ADD + ----- control- keypad + key
+key_c_subtract kcsub str %- KEY_C_SUBTRACT + ----- control- keypad - key
+#
+# SVr4 added these capabilities to support color
+#
+orig_pair op str op - - ----- Set default pair to its original value
+orig_colors oc str oc - - ----- Set all color pairs to the original ones
+initialize_color initc str Ic - - ----- initialize color #1 to (#2,#3,#4)
+initialize_pair initp str Ip - - ----- Initialize color pair #1 to fg=(#2,#3,#4), bg=(#5,#6,#7)
+set_color_pair scp str sp - - ----- Set current color pair to #1
+set_foreground setf str Sf - - ----- Set foreground color #1
+set_background setb str Sb - - ----- Set background color #1
+#
+# SVr4 added these capabilities to support printers
+#
+change_char_pitch cpi str ZA - - ----- Change number of characters per inch to #1
+change_line_pitch lpi str ZB - - ----- Change number of lines per inch to #1
+change_res_horz chr str ZC - - ----- Change horizontal resolution to #1
+change_res_vert cvr str ZD - - ----- Change vertical resolution to #1
+define_char defc str ZE - - ----- Define a character #1, #2 dots wide, descender #3
+enter_doublewide_mode swidm str ZF - - ----- Enter double-wide mode
+enter_draft_quality sdrfq str ZG - - ----- Enter draft-quality mode
+enter_italics_mode sitm str ZH - - ----- Enter italic mode
+enter_leftward_mode slm str ZI - - ----- Start leftward carriage motion
+enter_micro_mode smicm str ZJ - - ----- Start micro-motion mode
+enter_near_letter_quality snlq str ZK - - ----- Enter NLQ mode
+enter_normal_quality snrmq str ZL - - ----- Enter normal-quality mode
+enter_shadow_mode sshm str ZM - - ----- Enter shadow-print mode
+enter_subscript_mode ssubm str ZN - - ----- Enter subscript mode
+enter_superscript_mode ssupm str ZO - - ----- Enter superscript mode
+enter_upward_mode sum str ZP - - ----- Start upward carriage motion
+exit_doublewide_mode rwidm str ZQ - - ----- End double-wide mode
+exit_italics_mode ritm str ZR - - ----- End italic mode
+exit_leftward_mode rlm str ZS - - ----- End left-motion mode
+exit_micro_mode rmicm str ZT - - ----- End micro-motion mode
+exit_shadow_mode rshm str ZU - - ----- End shadow-print mode
+exit_subscript_mode rsubm str ZV - - ----- End subscript mode
+exit_superscript_mode rsupm str ZW - - ----- End superscript mode
+exit_upward_mode rum str ZX - - ----- End reverse character motion
+micro_column_address mhpa str ZY - - ----- Like column_address in micro mode
+micro_down mcud1 str ZZ - - ----- Like cursor_down in micro mode
+micro_left mcub1 str Za - - ----- Like cursor_left in micro mode
+micro_right mcuf1 str Zb - - ----- Like cursor_right in micro mode
+micro_row_address mvpa str Zc - - ----- Like row_address #1 in micro mode
+micro_up mcuu1 str Zd - - ----- Like cursor_up in micro mode
+order_of_pins porder str Ze - - ----- Match software bits to print-head pins
+parm_down_micro mcud str Zf - - ----- Like parm_down_cursor in micro mode
+parm_left_micro mcub str Zg - - ----- Like parm_left_cursor in micro mode
+parm_right_micro mcuf str Zh - - ----- Like parm_right_cursor in micro mode
+parm_up_micro mcuu str Zi - - ----- Like parm_up_cursor in micro mode
+select_char_set scs str Zj - - ----- Select character set, #1
+set_bottom_margin smgb str Zk - - ----- Set bottom margin at current line
+set_bottom_margin_parm smgbp str Zl - - ----- Set bottom margin at line #1 or (if smgtp is not given) #2 lines from bottom
+set_left_margin_parm smglp str Zm - - ----- Set left (right) margin at column #1
+set_right_margin_parm smgrp str Zn - - ----- Set right margin at column #1
+set_top_margin smgt str Zo - - ----- Set top margin at current line
+set_top_margin_parm smgtp str Zp - - ----- Set top (bottom) margin at row #1
+start_bit_image sbim str Zq - - ----- Start printing bit image graphics
+start_char_set_def scsd str Zr - - ----- Start character set definition #1, with #2 characters in the set
+stop_bit_image rbim str Zs - - ----- Stop printing bit image graphics
+stop_char_set_def rcsd str Zt - - ----- End definition of character set #1
+subscript_characters subcs str Zu - - ----- List of subscriptable characters
+superscript_characters supcs str Zv - - ----- List of superscriptable characters
+these_cause_cr docr str Zw - - ----- Printing any of these characters causes CR
+zero_motion zerom str Zx - - ----- No motion for subsequent character
+#%.TE
+#%.ad
+#%
+#%The following string capabilities are present in the SVr4.0 term structure,
+#%but were originally not documented in the man page.
+#%
+#%.na
+#%.TS H
+#%center expand;
+#%c l l c
+#%c l l c
+#%lw25 lw6 lw2 lw18.
+#%\fBVariable Cap- TCap Description\fR
+#%\fBString name Code\fR
+char_set_names csnm str Zy - - ----- Produce #1'th item from list of character set names
+key_mouse kmous str Km KEY_MOUSE 0631 ----- Mouse event has occurred
+mouse_info minfo str Mi - - ----- Mouse status information
+req_mouse_pos reqmp str RQ - - ----- Request mouse position
+get_mouse getm str Gm - - ----- Curses should get button events, parameter #1 not documented.
+set_a_foreground setaf str AF - - ----- Set foreground color to #1, using ANSI escape
+set_a_background setab str AB - - ----- Set background color to #1, using ANSI escape
+pkey_plab pfxl str xl - - ----- Program function key #1 to type string #2 and show string #3
+device_type devt str dv - - ----- Indicate language/codeset support
+code_set_init csin str ci - - ----- Init sequence for multiple codesets
+set0_des_seq s0ds str s0 - - ----- Shift to codeset 0 (EUC set 0, ASCII)
+set1_des_seq s1ds str s1 - - ----- Shift to codeset 1
+set2_des_seq s2ds str s2 - - ----- Shift to codeset 2
+set3_des_seq s3ds str s3 - - ----- Shift to codeset 3
+set_lr_margin smglr str ML - - ----- Set both left and right margins to #1, #2. (ML is not in BSD termcap).
+set_tb_margin smgtb str MT - - ----- Sets both top and bottom margins to #1, #2
+bit_image_repeat birep str Xy - - ----- Repeat bit image cell #1 #2 times
+bit_image_newline binel str Zz - - ----- Move to next row of the bit image
+bit_image_carriage_return bicr str Yv - - ----- Move to beginning of same row
+color_names colornm str Yw - - ----- Give name for color #1
+define_bit_image_region defbi str Yx - - ----- Define rectangualar bit image region
+end_bit_image_region endbi str Yy - - ----- End a bit-image region
+set_color_band setcolor str Yz - - ----- Change to ribbon color #1
+set_page_length slines str YZ - - ----- Set page length to #1 lines
+#
+# SVr4 added these capabilities for direct PC-clone support
+#
+display_pc_char dispc str S1 - - ----- Display PC character #1
+enter_pc_charset_mode smpch str S2 - - ----- Enter PC character display mode
+exit_pc_charset_mode rmpch str S3 - - ----- Exit PC character display mode
+enter_scancode_mode smsc str S4 - - ----- Enter PC scancode mode
+exit_scancode_mode rmsc str S5 - - ----- Exit PC scancode mode
+pc_term_options pctrm str S6 - - ----- PC terminal options
+scancode_escape scesc str S7 - - ----- Escape for scancode emulation
+alt_scancode_esc scesa str S8 - - ----- Alternate escape for scancode emulation
+#%.TE
+#%.ad
+#%
+#%.in .8i
+#%The XSI Curses standard added these. They are some post-4.1
+#%versions of System V curses, e.g., Solaris 2.5 and IRIX 6.x.
+#%The \fBncurses\fR termcap names for them are invented; according to the
+#%XSI Curses standard, they have no termcap names. If your compiled terminfo
+#%entries use these, they may not be binary-compatible with System V terminfo
+#%entries after SVr4.1; beware!
+#%
+#%.na
+#%.TS H
+#%center expand;
+#%c l l c
+#%c l l c
+#%lw25 lw6 lw2 lw20.
+#%\fBVariable Cap- TCap Description\fR
+#%\fBString name Code\fR
+enter_horizontal_hl_mode ehhlm str Xh - - ----- Enter horizontal highlight mode
+enter_left_hl_mode elhlm str Xl - - ----- Enter left highlight mode
+enter_low_hl_mode elohlm str Xo - - ----- Enter low highlight mode
+enter_right_hl_mode erhlm str Xr - - ----- Enter right highlight mode
+enter_top_hl_mode ethlm str Xt - - ----- Enter top highlight mode
+enter_vertical_hl_mode evhlm str Xv - - ----- Enter vertical highlight mode
+set_a_attributes sgr1 str sA - - ----- Define second set of video attributes #1-#6
+set_pglen_inch slength str sL - - ----- YI Set page length to #1 hundredth of an inch
+#%.TE
+#%.ad
+#
+# The magic token below tells the tic compiler-generator code that all the caps
+# past it should be ignored (not written out) when dumping terminfo objects. It
+# also tells the man page table generator not to pass through following lines
+# This means we can have obsolete capabilities and pseudo-capabilities that are
+# recognized for termcap or terminfo compilation, but not output.
+#
+# %%-STOP-HERE-%%
+#
+# Don't move this casually! In fact, don't move it at all unless you're
+# either doing it to add System V or XPG4 extensions, or have decided you
+# don't care about SVr4 binary compatibility.
+#
+#############################################################################
+#
+# TERMCAP EXTENSION CAPABILITIES
+#
+# The capabilities below are either obsolete or extensions on certain systems.
+# They are not used by SVR4 terminfo. Some are used by captoinfo to translate
+# termcap sources; the rest are listed for completeness, and in case somebody
+# cares about them enough to hack in code that will translate them into
+# terminfo capabilities.
+#
+# The first part of the list is from Ross Ridge's `mytinfo' package
+# (comp.sources.unix, volume 26); the variable names and terminfo names (as
+# well as the termcap codes) match his list.
+#
+# This group of codes is not marked obsolete in 4.4BSD, but have no direct
+# terminfo equivalents. The rs capability is specially translated to terminfo
+# r2, and vice versa, if an entry does not already have an r2. Similarly,
+# i2 is translated to r3 if there is no r3 (because SV terminfo maps is to i2).
+# The ug capability is thrown away, but assumed to be whatever sg is if the
+# latter is nonzero and we're dumping in termcap format.
+#
+termcap_init2 OTi2 str i2 - - YB--- secondary initialization string
+termcap_reset OTrs str rs - - YB-G- terminal reset string
+magic_cookie_glitch_ul OTug num ug - - YBCGE number of blanks left by ul
+#
+# Obsolete termcap capabilities. Some are used for termcap translation. The
+# code uses the 'OT' prefix we put on obsolete capabilities to suppress
+# printing them in terminfo source dumps of compiled entries.
+#
+backspaces_with_bs OTbs bool bs - - YBCGE uses ^H to move left
+crt_no_scrolling OTns bool ns - - YBCG- crt cannot scroll
+no_correctly_working_cr OTnc bool nc - - YBCG- no way to go to start of line
+carriage_return_delay OTdC num dC - - YB-G- pad needed for CR
+new_line_delay OTdN num dN - - YB-G- pad needed for LF
+linefeed_if_not_lf OTnl str nl - - YBCGE use to move down
+backspace_if_not_bs OTbc str bc - - YBCGE move left, if not ^H
+#
+# GNU termcap library extensions. The GNU termcap file distributed with
+# Emacs no longer uses these, but MT showed up in pre-9.0 versions of the
+# BSD termcap file. The name clash with terminfo MT is resolved by type
+# info; MT is converted to km.
+#
+gnu_has_meta_key OTMT bool MT - - ----E has meta key
+# gnu_tab_width OTtw num tw - - ----E tab width in spaces
+#
+# GNU termcap *does* include the following extended capability, Only the
+# now-obsolete Ann Arbor terminals used it.
+#
+# gnu_change_scroll_region OTcS str cS - - ---GE alternate set scrolling region
+#
+# The following comments describe capnames so ancient that I believe no
+# software uses them any longer. Some of these have to go because they
+# clash with terminfo names in ways that cannot be resolved by type
+# information.
+#
+# These mytinfo codes are not used in the 4.4BSD curses code. They are
+# marked obsolete in the 4.4BSD manual pages.
+#
+# There is one conflict with terminfo; ma is in both. This conflict is
+# resolved by type information.
+#
+# The `ko' capability is translated by special code. It should contain a
+# comma-separated list of capabilities for which there are corresponding keys.
+# The `kn' code is accepted but ignored.
+#
+# The `ma' capability seems to have been designed to map between the rogue(2)
+# motion keys (including jkhl) and characters emitted by arrow keys on some
+# primitive pre-ANSI terminals. It's so obsolete it's fossilized...
+#
+# Here is a description of memory_lock_above and memory_unlock:
+# "You can 'freeze' data on the screen by turning on Memory Lock in a line of
+# text. All lines above the cursor's current line become locked in place on
+# the screen. Then enter data normally. When the screen fills up, any
+# further data entered forces the first line of unfrozen line text to scroll
+# under the frozen data. Lines scrolled off the screen are inserted into
+# memory immediately preceding the first frozen line." (from the HP 700/96
+# User's manual). VT100/ANSI memory lock set is \E[>2h, reset is \E[>2l.
+#
+# Applications that use terminfo are supposed to behave as though xr is
+# always true.
+#
+linefeed_is_newline OTNL bool NL - - YB--- move down with \n
+# even_parity OTEP bool EP - - -B--- terminal requires even parity
+# odd_parity OTOP bool OP - - -B--- terminal requires odd parity
+# half_duplex OTHD bool HD - - -B--- terminal is half-duplex
+# lower_case_only OTLC bool LC - - -B--- terminal has only lower case
+# upper_case_only OTUC bool UC - - -B--- terminal has only upper case
+backspace_delay OTdB num dB - - YB-G- padding required for ^H
+# form_feed_delay OTdF num dF - - -B-G- padding required for ^L
+horizontal_tab_delay OTdT num dT - - YB-G- padding required for ^I
+# vertical_tab_delay OTdV num dV - - -B--- padding required for ^V
+number_of_function_keys OTkn num kn - - -B-G- count of function keys
+other_non_function_keys OTko str ko - - -B-G- list of self-mapped keycaps
+arrow_key_map OTma str ma - - YBC-- map arrow keys rogue(1) motion keys
+# memory_lock_above OTml str ml - - -B--- lock visible screen memory above the current line
+# memory_unlock OTmu str mu - - -B--- unlock visible screen memory above the current line
+has_hardware_tabs OTpt bool pt - - YB--- has 8-char tabs invoked with ^I
+return_does_clr_eol OTxr bool xr - - YB--- return clears the line
+# tek_4025_insert_line OTxx bool xx - - -BC-- Tektronix 4025 insert-line glitch
+#
+# mytinfo described this as a termcap capability, but it's not listed in the
+# 4.4BSD man pages, and not found in the 4.4BSD termcap file. The ncurses
+# package, like System V, behaves as though it is always true.
+#
+# rind_only_at_top OTxq bool xq - - ----- reverse index only works from top line
+#
+# University of Waterloo termcap extensions (as described in mytinfo).
+# The `xl' termcap file clashes with a terminfo name; this ambiguity cannot
+# be resolved by a type check. The descriptions are guesses from what was
+# in the mytinfo tables.
+#
+# key_interrupt_char OTki str ki - - ----- string set by interrupt key (?)
+# key_kill_char OTkk str kk - - ----- string set by kill key (?)
+# key_suspend_char OTkz str kz - - ----- string set by suspend key (?)
+# initialization_messy OTxc bool xc - - ----- initialization leaves garbage on the screen (?)
+# ind_at_bottom_does_cr OTxl bool xl - - ----- index does a carriage return
+#
+# Nonstandard capabilities unique to Ross Ridge's `mytinfo' package.
+# SR clashes with a terminfo name; this ambiguity cannot be resolved by a type
+# check.
+#
+# scroll_left OTsl1 str Sl - - ----- scroll screen leftward
+# scroll_right OTsr1 str Sr - - ----- scroll screen rightward
+# parm_scroll_left OTsl str SL - - ----- scroll screen leftward #1 characters
+# parm_scroll_right OTsr str SR - - ----- scroll screen rightward #1 characters
+#
+# The mytinfo capabilities end here.
+#
+# XENIX extensions:
+#
+# Xenix defined its own set of forms-drawing capabilities:
+#
+# cap IBM ASCII description ACS ASCII
+# --- ----------- -------------------- ------------- ------
+# G1 191 \277 M-? single upper right ACS_URCORNER
+# G2 218 \332 M-Z single upper left ACS_ULCORNER
+# G3 192 \300 M-@ single lower left ACS_LLCORNER
+# G4 217 \331 M-Y single lower right ACS_LRCORNER
+# G5 187 \273 M-; double upper right
+# G6 201 \311 M-I double upper left
+# G7 200 \310 M-H double lower left
+# G8 188 \274 M-< double lower right
+# GC 197 \305 M-E single intersection ACS_PLUS _ _
+# GD 194 \302 M-B single down-tick ACS_TTEE |
+# GH 196 \304 M-D single horizontal line ACS_HLINE
+# GL 180 \264 M-4 single left tick ACS_RTEE -|
+# GR 195 \303 M-C single right tick ACS_LTEE |-
+# GU 193 \301 M-A single up tick ACS_BTEE _|_
+# GV 179 \263 M-3 single vertical line ACS_VLINE
+# Gc 206 \316 M-N double intersection
+# Gd 203 \313 M-K double down tick
+# Gh 205 \315 M-M double horizontal line
+# Gl 204 \204 M-L double left tick
+# Gr 185 \271 M-9 double right tick
+# Gu 202 \312 M-J double up tick
+# Gv 186 \272 M-: double vertical line
+#
+# The compiler will translate the single-line caps and discard the others
+# (via IGNORE aliases further down). We don't want to do normal pad
+# translation on these, they're often single-character printable ASCII
+# strings that happen to be numerics. There's awk code in parametrized.sh
+# that detects the acs_ prefix and uses it to suppress pad translation.
+# These terminfo names are invented.
+#
+acs_ulcorner OTG2 str G2 - - ----- single upper left
+acs_llcorner OTG3 str G3 - - ----- single lower left