aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/ncurses/INSTALL60
-rw-r--r--contrib/ncurses/MANIFEST48
-rw-r--r--contrib/ncurses/NEWS522
-rw-r--r--contrib/ncurses/TO-DO23
-rw-r--r--contrib/ncurses/aclocal.m4642
-rwxr-xr-xcontrib/ncurses/config.guess34
-rwxr-xr-xcontrib/ncurses/config.sub28
-rwxr-xr-xcontrib/ncurses/configure4139
-rw-r--r--contrib/ncurses/configure.in265
-rw-r--r--contrib/ncurses/dist.mk7
-rw-r--r--contrib/ncurses/doc/hackguide.doc2
-rw-r--r--contrib/ncurses/doc/html/ncurses-intro.html36
-rw-r--r--contrib/ncurses/doc/ncurses-intro.doc33
-rw-r--r--contrib/ncurses/form/Makefile.in12
-rw-r--r--contrib/ncurses/form/fld_def.c13
-rw-r--r--contrib/ncurses/form/fld_dup.c7
-rw-r--r--contrib/ncurses/form/fld_ftlink.c7
-rw-r--r--contrib/ncurses/form/fld_link.c7
-rw-r--r--contrib/ncurses/form/fld_newftyp.c7
-rw-r--r--contrib/ncurses/form/frm_def.c10
-rw-r--r--contrib/ncurses/form/frm_driver.c131
-rw-r--r--contrib/ncurses/form/fty_alnum.c18
-rw-r--r--contrib/ncurses/form/fty_alpha.c18
-rw-r--r--contrib/ncurses/form/fty_enum.c14
-rw-r--r--contrib/ncurses/form/fty_int.c14
-rw-r--r--contrib/ncurses/form/fty_num.c14
-rw-r--r--contrib/ncurses/form/fty_regex.c19
-rw-r--r--contrib/ncurses/form/headers3
-rw-r--r--contrib/ncurses/form/modules8
-rw-r--r--contrib/ncurses/include/MKterm.h.awk.in49
-rw-r--r--contrib/ncurses/include/curses.h.in237
-rw-r--r--contrib/ncurses/include/curses.tail3
-rw-r--r--contrib/ncurses/include/curses.wide9
-rw-r--r--contrib/ncurses/include/headers11
-rw-r--r--contrib/ncurses/include/nc_alloc.h10
-rw-r--r--contrib/ncurses/include/ncurses_defs12
-rw-r--r--contrib/ncurses/include/ncurses_dll.h11
-rw-r--r--contrib/ncurses/include/tic.h29
-rwxr-xr-xcontrib/ncurses/install-sh139
-rw-r--r--contrib/ncurses/man/Makefile.in8
-rw-r--r--contrib/ncurses/man/captoinfo.1m28
-rw-r--r--contrib/ncurses/man/clear.112
-rw-r--r--contrib/ncurses/man/curs_add_wch.3x6
-rw-r--r--contrib/ncurses/man/curs_addch.3x8
-rw-r--r--contrib/ncurses/man/curs_attr.3x7
-rw-r--r--contrib/ncurses/man/curs_border.3x8
-rw-r--r--contrib/ncurses/man/curs_deleteln.3x6
-rw-r--r--contrib/ncurses/man/curs_extend.3x6
-rw-r--r--contrib/ncurses/man/curs_getcchar.3x8
-rw-r--r--contrib/ncurses/man/curs_getyx.3x27
-rw-r--r--contrib/ncurses/man/curs_insstr.3x4
-rw-r--r--contrib/ncurses/man/curs_legacy.3x93
-rw-r--r--contrib/ncurses/man/curs_mouse.3x42
-rw-r--r--contrib/ncurses/man/curs_opaque.3x133
-rw-r--r--contrib/ncurses/man/curs_outopts.3x6
-rw-r--r--contrib/ncurses/man/curs_printw.3x8
-rw-r--r--contrib/ncurses/man/curs_scanw.3x6
-rw-r--r--contrib/ncurses/man/curs_scr_dump.3x4
-rw-r--r--contrib/ncurses/man/curs_slk.3x6
-rw-r--r--contrib/ncurses/man/curs_termattrs.3x6
-rw-r--r--contrib/ncurses/man/curs_termcap.3x8
-rw-r--r--contrib/ncurses/man/curs_terminfo.3x26
-rw-r--r--contrib/ncurses/man/curs_trace.3x6
-rw-r--r--contrib/ncurses/man/curs_util.3x47
-rw-r--r--contrib/ncurses/man/default_colors.3x7
-rw-r--r--contrib/ncurses/man/form_driver.3x57
-rw-r--r--contrib/ncurses/man/form_field_new.3x8
-rw-r--r--contrib/ncurses/man/form_field_opts.3x12
-rw-r--r--contrib/ncurses/man/form_field_validation.3x4
-rw-r--r--contrib/ncurses/man/form_hook.3x20
-rw-r--r--contrib/ncurses/man/form_opts.3x12
-rw-r--r--contrib/ncurses/man/infocmp.1m30
-rw-r--r--contrib/ncurses/man/infotocap.1m18
-rw-r--r--contrib/ncurses/man/legacy_coding.3x4
-rw-r--r--contrib/ncurses/man/man_db.renames23
-rw-r--r--contrib/ncurses/man/menu_driver.3x61
-rw-r--r--contrib/ncurses/man/menu_hook.3x20
-rw-r--r--contrib/ncurses/man/menu_opts.3x12
-rw-r--r--contrib/ncurses/man/mitem_opts.3x12
-rw-r--r--contrib/ncurses/man/ncurses.3x269
-rw-r--r--contrib/ncurses/man/panel.3x37
-rw-r--r--contrib/ncurses/man/term.56
-rw-r--r--contrib/ncurses/man/term.716
-rw-r--r--contrib/ncurses/man/terminfo.head14
-rw-r--r--contrib/ncurses/man/terminfo.tail22
-rw-r--r--contrib/ncurses/man/tic.1m6
-rw-r--r--contrib/ncurses/man/toe.1m6
-rw-r--r--contrib/ncurses/man/tput.176
-rw-r--r--contrib/ncurses/man/tset.14
-rw-r--r--contrib/ncurses/menu/Makefile.in12
-rw-r--r--contrib/ncurses/menu/headers3
-rw-r--r--contrib/ncurses/menu/menu.h12
-rw-r--r--contrib/ncurses/menu/modules8
-rw-r--r--contrib/ncurses/misc/Makefile.in15
-rw-r--r--contrib/ncurses/misc/ncurses-config.in9
-rwxr-xr-xcontrib/ncurses/misc/shlib3
-rw-r--r--contrib/ncurses/misc/terminfo.src430
-rw-r--r--contrib/ncurses/mk-1st.awk183
-rw-r--r--contrib/ncurses/mk-hdr.awk107
-rw-r--r--contrib/ncurses/mkdirs.sh51
-rw-r--r--contrib/ncurses/ncurses/Makefile.in51
-rw-r--r--contrib/ncurses/ncurses/base/MKkeyname.awk83
-rwxr-xr-xcontrib/ncurses/ncurses/base/MKlib_gen.sh12
-rw-r--r--contrib/ncurses/ncurses/base/MKunctrl.awk92
-rw-r--r--contrib/ncurses/ncurses/base/define_key.c13
-rw-r--r--contrib/ncurses/ncurses/base/key_defined.c22
-rw-r--r--contrib/ncurses/ncurses/base/keyok.c14
-rw-r--r--contrib/ncurses/ncurses/base/lib_addstr.c15
-rw-r--r--contrib/ncurses/ncurses/base/lib_color.c48
-rw-r--r--contrib/ncurses/ncurses/base/lib_delwin.c31
-rw-r--r--contrib/ncurses/ncurses/base/lib_freeall.c55
-rw-r--r--contrib/ncurses/ncurses/base/lib_getch.c39
-rw-r--r--contrib/ncurses/ncurses/base/lib_initscr.c9
-rw-r--r--contrib/ncurses/ncurses/base/lib_instr.c10
-rw-r--r--contrib/ncurses/ncurses/base/lib_mouse.c24
-rw-r--r--contrib/ncurses/ncurses/base/lib_newterm.c34
-rw-r--r--contrib/ncurses/ncurses/base/lib_newwin.c75
-rw-r--r--contrib/ncurses/ncurses/base/lib_overlay.c11
-rw-r--r--contrib/ncurses/ncurses/base/lib_redrawln.c10
-rw-r--r--contrib/ncurses/ncurses/base/lib_refresh.c144
-rw-r--r--contrib/ncurses/ncurses/base/lib_restart.c18
-rw-r--r--contrib/ncurses/ncurses/base/lib_screen.c19
-rw-r--r--contrib/ncurses/ncurses/base/lib_set_term.c147
-rw-r--r--contrib/ncurses/ncurses/base/lib_slkinit.c15
-rw-r--r--contrib/ncurses/ncurses/base/lib_slkset.c13
-rw-r--r--contrib/ncurses/ncurses/base/lib_ungetch.c8
-rw-r--r--contrib/ncurses/ncurses/base/lib_window.c6
-rw-r--r--contrib/ncurses/ncurses/base/memmove.c6
-rw-r--r--contrib/ncurses/ncurses/base/resizeterm.c113
-rw-r--r--contrib/ncurses/ncurses/base/safe_sprintf.c56
-rw-r--r--contrib/ncurses/ncurses/base/tries.c22
-rw-r--r--contrib/ncurses/ncurses/base/use_window.c80
-rw-r--r--contrib/ncurses/ncurses/base/wresize.c17
-rw-r--r--contrib/ncurses/ncurses/curses.priv.h382
-rw-r--r--contrib/ncurses/ncurses/llib-lncurses549
-rw-r--r--contrib/ncurses/ncurses/llib-lncursesw573
-rw-r--r--contrib/ncurses/ncurses/modules31
-rw-r--r--contrib/ncurses/ncurses/tinfo/MKcaptab.awk134
-rw-r--r--contrib/ncurses/ncurses/tinfo/MKcaptab.sh149
-rw-r--r--contrib/ncurses/ncurses/tinfo/MKcodes.awk161
-rw-r--r--contrib/ncurses/ncurses/tinfo/MKnames.awk226
-rw-r--r--contrib/ncurses/ncurses/tinfo/access.c10
-rw-r--r--contrib/ncurses/ncurses/tinfo/add_tries.c39
-rw-r--r--contrib/ncurses/ncurses/tinfo/comp_error.c34
-rw-r--r--contrib/ncurses/ncurses/tinfo/comp_hash.c111
-rw-r--r--contrib/ncurses/ncurses/tinfo/comp_parse.c96
-rw-r--r--contrib/ncurses/ncurses/tinfo/db_iterator.c52
-rw-r--r--contrib/ncurses/ncurses/tinfo/entries.c144
-rw-r--r--contrib/ncurses/ncurses/tinfo/home_terminfo.c21
-rw-r--r--contrib/ncurses/ncurses/tinfo/init_keytry.c16
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_acs.c28
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_baudrate.c27
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_data.c148
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_options.c4
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_raw.c8
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_setup.c112
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_termcap.c60
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_tparm.c153
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_tputs.c17
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_ttyflags.c80
-rw-r--r--contrib/ncurses/ncurses/tinfo/make_keys.c6
-rw-r--r--contrib/ncurses/ncurses/tinfo/name_match.c24
-rw-r--r--contrib/ncurses/ncurses/tinfo/parse_entry.c20
-rw-r--r--contrib/ncurses/ncurses/tinfo/read_entry.c6
-rw-r--r--contrib/ncurses/ncurses/tinfo/setbuf.c6
-rw-r--r--contrib/ncurses/ncurses/tinfo/strings.c6
-rw-r--r--contrib/ncurses/ncurses/tinfo/trim_sgr0.c10
-rw-r--r--contrib/ncurses/ncurses/tinfo/use_screen.c60
-rw-r--r--contrib/ncurses/ncurses/tinfo/write_entry.c22
-rw-r--r--contrib/ncurses/ncurses/trace/lib_trace.c161
-rw-r--r--contrib/ncurses/ncurses/trace/lib_traceatr.c50
-rw-r--r--contrib/ncurses/ncurses/trace/lib_tracebits.c27
-rw-r--r--contrib/ncurses/ncurses/trace/lib_tracechr.c15
-rw-r--r--contrib/ncurses/ncurses/trace/lib_tracedmp.c57
-rw-r--r--contrib/ncurses/ncurses/trace/lib_tracemse.c27
-rw-r--r--contrib/ncurses/ncurses/trace/trace_buf.c42
-rw-r--r--contrib/ncurses/ncurses/trace/trace_tries.c30
-rw-r--r--contrib/ncurses/ncurses/trace/varargs.c26
-rw-r--r--contrib/ncurses/ncurses/trace/visbuf.c32
-rw-r--r--contrib/ncurses/ncurses/tty/hardscroll.c34
-rw-r--r--contrib/ncurses/ncurses/tty/hashmap.c43
-rw-r--r--contrib/ncurses/ncurses/tty/lib_mvcur.c11
-rw-r--r--contrib/ncurses/ncurses/tty/lib_tstp.c38
-rw-r--r--contrib/ncurses/ncurses/tty/lib_twait.c48
-rw-r--r--contrib/ncurses/ncurses/tty/lib_vidattr.c42
-rw-r--r--contrib/ncurses/ncurses/tty/tty_update.c25
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_cchar.c9
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_get_wch.c6
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c26
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_key_name.c62
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_unget_wch.c20
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_vid_attr.c5
-rw-r--r--contrib/ncurses/ncurses/widechar/lib_wunctrl.c16
-rw-r--r--contrib/ncurses/panel/Makefile.in12
-rw-r--r--contrib/ncurses/panel/headers3
-rw-r--r--contrib/ncurses/panel/modules6
-rw-r--r--contrib/ncurses/progs/Makefile.in35
-rw-r--r--contrib/ncurses/progs/clear.c5
-rw-r--r--contrib/ncurses/progs/dump_entry.c21
-rw-r--r--contrib/ncurses/progs/infocmp.c161
-rw-r--r--contrib/ncurses/progs/modules8
-rw-r--r--contrib/ncurses/progs/progs.priv.h13
-rw-r--r--contrib/ncurses/progs/tic.c38
-rw-r--r--contrib/ncurses/progs/toe.c11
-rw-r--r--contrib/ncurses/progs/tput.c8
-rw-r--r--contrib/ncurses/progs/tset.c24
206 files changed, 9821 insertions, 4972 deletions
diff --git a/contrib/ncurses/INSTALL b/contrib/ncurses/INSTALL
index 45b13a9b46ef..dbd175f0a6f1 100644
--- a/contrib/ncurses/INSTALL
+++ b/contrib/ncurses/INSTALL
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: INSTALL,v 1.114 2006/12/17 19:58:19 tom Exp $
+-- $Id: INSTALL,v 1.122 2007/12/01 19:37:47 tom Exp $
---------------------------------------------------------------------
How to install Ncurses/Terminfo on your system
---------------------------------------------------------------------
@@ -304,6 +304,11 @@ SUMMARY OF CONFIGURE OPTIONS:
return deceptive results, so you may have to override the configure
script. Or you may be building tic for a smaller machine.
+ --disable-big-strings
+ Disable compile-time optimization of predefined tables which puts
+ all of their strings into a very long string, to reduce relocation
+ overhead.
+
--disable-database
Use only built-in data. The ncurses libraries normally read terminfo
and termcap data from disk. You can configure ncurses to have a
@@ -334,6 +339,16 @@ SUMMARY OF CONFIGURE OPTIONS:
For testing, compile-in code that frees memory that normally would not
be freed, to simplify analysis of memory-leaks.
+ Any implementation of curses must not free the memory associated with
+ a screen, since (even after calling endwin()), it must be available
+ for use in the next call to refresh(). There are also chunks of
+ memory held for performance reasons. That makes it hard to analyze
+ curses applications for memory leaks. To work around this, build
+ a debugging version of the ncurses library which frees those chunks
+ which it can, and provides the _nc_free_and_exit() function to free
+ the remainder on exit. The ncurses utility and test programs use this
+ feature, e.g., via the ExitProgram() macro.
+
--disable-lp64
The header files will ignore use of the _LP64 symbol to make chtype
and mmask_t types 32 bits (they may be long on 64-bit hosts, for
@@ -358,6 +373,13 @@ SUMMARY OF CONFIGURE OPTIONS:
rather than the include directory. This makes it simpler to avoid
compile-time conflicts with other versions of curses.h
+ --disable-relink
+ If --enable-rpath is given, the generated makefiles normally will
+ rebuild the libraries during install. Use this option to simply
+ copy whatever the linked produced.
+
+ This option is ignored if --enable-rpath is not given.
+
--disable-root-environ
Compile with environment restriction, so certain environment variables
are not available when running as root, or via a setuid/setgid
@@ -476,12 +498,22 @@ SUMMARY OF CONFIGURE OPTIONS:
may not be accurate, or that your stty settings have disabled the use
of tabs.
+ --enable-mixed-case
+ Controls whether the filesystem on which the terminfo database resides
+ supports mixed-case filenames (normal for UNIX, but not on other
+ systems). If you do not specify this option, the configure script
+ checks the current filesystem.
+
--enable-no-padding
Compile-in support for the $NCURSES_NO_PADDING environment variable,
which allows you to suppress the effect of non-mandatory padding in
terminfo entries. This is the default, unless you have disabled the
extended functions.
+ --enable-reentrant
+ Compile experimental configuration which improves reentrant use of the
+ library by reducing global and static variables.
+
--enable-rpath
Use rpath option when generating shared libraries, and (with some
restrictions) when linking the corresponding programs. This originally
@@ -495,6 +527,9 @@ SUMMARY OF CONFIGURE OPTIONS:
environment variable, they do not work with setuid applications since
the LD_LIBRARY_PATH variable would be unset in that situation.
+ This option does not apply to --with-libtool, since libtool makes
+ extra assumptions about rpath.
+
--enable-safe-sprintf
Compile with experimental safe-sprintf code. You may consider using
this if you are building ncurses for a system that has neither
@@ -659,10 +694,16 @@ SUMMARY OF CONFIGURE OPTIONS:
See also --without-dlsym
- --with-hashed-db
+ --with-hashed-db[=XXX]
Use a hashed database for storing terminfo data rather than storing
each compiled entry in a separate binary file within a directory
tree.
+
+ In particular, this uses the Berkeley database 1.8.5 interface, as
+ provided by that and its successors db 2, 3, and 4. The actual
+ interface is slightly different in the successor versions of the
+ Berkeley database. The database should have been configured using
+ "--enable-compat185".
If you use this option for configuring ncurses, tic will only be able
to write entries in the hashed database. infocmp can still read
@@ -674,6 +715,12 @@ SUMMARY OF CONFIGURE OPTIONS:
You cannot have a directory containing both hashed-database and
filesystem-based terminfo entries.
+ Use the parameter value to give the install-prefix used for the
+ datbase, e.g.,
+ --with-hashed-db=/usr/local/BigBase
+ to find the corresponding include- and lib-directories under the
+ given directory.
+
See also the --enable-getcap option.
--with-install-prefix=XXX
@@ -833,6 +880,15 @@ SUMMARY OF CONFIGURE OPTIONS:
Specify a search-list of termcap files which will be compiled into the
ncurses library (default: /etc/termcap:/usr/share/misc/termcap)
+ --with-ticlib[=XXX]
+ When building the ncurses library, build a separate library for
+ the modules that are used only by the utility programs. Normally
+ those would be bundled with the termlib or ncurses libraries.
+
+ If an option value is given, that overrides the name of the tic
+ library. As in termlib, there is no ABI difference between the
+ "wide" libticw.so and libtic.so
+
--with-trace
Configure the trace() function as part of the all models of the ncurses
library. Normally it is part of the debug (libncurses_g) library only.
diff --git a/contrib/ncurses/MANIFEST b/contrib/ncurses/MANIFEST
index 97faa3813c02..3923e0855616 100644
--- a/contrib/ncurses/MANIFEST
+++ b/contrib/ncurses/MANIFEST
@@ -4,6 +4,7 @@
./Ada95/README
./Ada95/TODO
./Ada95/gen/Makefile.in
+./Ada95/gen/adacurses-config.in
./Ada95/gen/gen.c
./Ada95/gen/html.m4
./Ada95/gen/normal.m4
@@ -20,6 +21,7 @@
./Ada95/gen/terminal_interface-curses-panels-user_data.ads.m4
./Ada95/gen/terminal_interface-curses-panels.ads.m4
./Ada95/gen/terminal_interface-curses-trace.ads.m4
+./Ada95/gen/terminal_interface-curses.adb.m4
./Ada95/gen/terminal_interface-curses.ads.m4
./Ada95/samples/Makefile.in
./Ada95/samples/README
@@ -163,7 +165,6 @@
./Ada95/src/terminal_interface-curses-text_io.adb
./Ada95/src/terminal_interface-curses-text_io.ads
./Ada95/src/terminal_interface-curses-trace.adb_p
-./Ada95/src/terminal_interface-curses.adb
./Ada95/src/terminal_interface.ads
./INSTALL
./MANIFEST
@@ -553,8 +554,10 @@
./man/curs_instr.3x
./man/curs_inwstr.3x
./man/curs_kernel.3x
+./man/curs_legacy.3x
./man/curs_mouse.3x
./man/curs_move.3x
+./man/curs_opaque.3x
./man/curs_outopts.3x
./man/curs_overlay.3x
./man/curs_pad.3x
@@ -709,7 +712,8 @@
./mk-0th.awk
./mk-1st.awk
./mk-2nd.awk
-./mkinstalldirs
+./mk-hdr.awk
+./mkdirs.sh
./ncurses/Makefile.in
./ncurses/README
./ncurses/README.IZ
@@ -799,6 +803,7 @@
./ncurses/base/safe_sprintf.c
./ncurses/base/sigaction.c
./ncurses/base/tries.c
+./ncurses/base/use_window.c
./ncurses/base/version.c
./ncurses/base/vsscanf.c
./ncurses/base/wresize.c
@@ -808,6 +813,8 @@
./ncurses/llib-lncursesw
./ncurses/modules
./ncurses/tinfo/MKcaptab.awk
+./ncurses/tinfo/MKcaptab.sh
+./ncurses/tinfo/MKcodes.awk
./ncurses/tinfo/MKfallback.sh
./ncurses/tinfo/MKkeys_list.sh
./ncurses/tinfo/MKnames.awk
@@ -824,6 +831,7 @@
./ncurses/tinfo/comp_scan.c
./ncurses/tinfo/db_iterator.c
./ncurses/tinfo/doalloc.c
+./ncurses/tinfo/entries.c
./ncurses/tinfo/free_ttype.c
./ncurses/tinfo/getenv_num.c
./ncurses/tinfo/hashed_db.c
@@ -856,6 +864,7 @@
./ncurses/tinfo/setbuf.c
./ncurses/tinfo/strings.c
./ncurses/tinfo/trim_sgr0.c
+./ncurses/tinfo/use_screen.c
./ncurses/tinfo/write_entry.c
./ncurses/trace/README
./ncurses/trace/lib_trace.c
@@ -891,6 +900,7 @@
./ncurses/widechar/lib_in_wchnstr.c
./ncurses/widechar/lib_ins_wch.c
./ncurses/widechar/lib_inwstr.c
+./ncurses/widechar/lib_key_name.c
./ncurses/widechar/lib_pecho_wchar.c
./ncurses/widechar/lib_slk_wset.c
./ncurses/widechar/lib_unget_wch.c
@@ -934,29 +944,6 @@
./progs/toe.c
./progs/tput.c
./progs/tset.c
-./tack/COPYING
-./tack/HISTORY
-./tack/Makefile.in
-./tack/README
-./tack/ansi.c
-./tack/charset.c
-./tack/color.c
-./tack/control.c
-./tack/crum.c
-./tack/edit.c
-./tack/fun.c
-./tack/init.c
-./tack/menu.c
-./tack/modes.c
-./tack/modules
-./tack/output.c
-./tack/pad.c
-./tack/scan.c
-./tack/sync.c
-./tack/sysdep.c
-./tack/tack.1
-./tack/tack.c
-./tack/tack.h
./tar-copy.sh
./test/Makefile.in
./test/README
@@ -981,6 +968,7 @@
./test/demo_termcap.c
./test/ditto.c
./test/dots.c
+./test/dots_mvcur.c
./test/echochar.c
./test/edit_field.c
./test/edit_field.h
@@ -992,8 +980,11 @@
./test/gdc.c
./test/hanoi.c
./test/hashtest.c
+./test/inch_wide.c
+./test/inchs.c
./test/ins_wide.c
./test/inserts.c
+./test/key_names.c
./test/keynames.c
./test/knight.c
./test/linux-color.dat
@@ -1010,8 +1001,15 @@
./test/rain.c
./test/redraw.c
./test/savescreen.c
+./test/savescreen.sh
./test/tclock.c
./test/test.priv.h
+./test/test_arrays.c
+./test/test_get_wstr.c
+./test/test_getstr.c
+./test/test_instr.c
+./test/test_inwstr.c
+./test/test_opaque.c
./test/testaddch.c
./test/testcurs.c
./test/testscanw.c
diff --git a/contrib/ncurses/NEWS b/contrib/ncurses/NEWS
index 6286091697f4..5965909102f5 100644
--- a/contrib/ncurses/NEWS
+++ b/contrib/ncurses/NEWS
@@ -1,5 +1,5 @@
-------------------------------------------------------------------------------
--- Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. --
+-- Copyright (c) 1998-2006,2007 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 --
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1056 2006/12/17 20:36:26 tom Exp $
+-- $Id: NEWS,v 1.1188 2007/12/22 23:56:08 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,9 +45,512 @@ See the AUTHORS file for the corresponding full names.
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20071222
+ + continue implementing support for threading demo by adding mutex
+ for delwin().
+
+20071215
+ + add several functions to C++ binding which wrap C functions that
+ pass a WINDOW* parameter (request by Chris Lee).
+
+20071201
+ + add note about configure options needed for Berkeley database to the
+ INSTALL file.
+ + improve checks for version of Berkeley database libraries.
+ + amend fix for rpath to not modify LDFLAGS if the platform has no
+ applicable transformation (report by Christian Ebert, cf: 20071124).
+
+20071124
+ + modify configure option --with-hashed-db to accept a parameter which
+ is the install-prefix of a given Berkeley Database (prompted by
+ pierre4d2 comments).
+ + rewrite wrapper for wcrtomb(), making it work on Solaris. This is
+ used in the form library to determine the length of the buffer needed
+ by field_buffer (report by Alfred Fung).
+ + remove unneeded window-parameter from C++ binding for wresize (report
+ by Chris Lee).
+
+20071117
+ + modify the support for filesystems which do not support mixed-case to
+ generate 2-character (hexadecimal) codes for the lower-level of the
+ filesystem terminfo database (request by Michail Vidiassov).
+ + add configure option --enable-mixed-case, to allow overriding the
+ configure script's check if the filesystem supports mixed-case
+ filenames.
+ + add wresize() to C++ binding (request by Chris Lee).
+ + define NCURSES_EXT_FUNCS and NCURSES_EXT_COLORS in curses.h to make
+ it simpler to tell if the extended functions and/or colors are
+ declared.
+
+20071103
+ + update memory-leak checks for changes to names.c and codes.c
+ + correct acsc strings in h19, z100 (patch by Benjamin C W Sittler).
+
+20071020
+ + continue implementing support for threading demo by adding mutex
+ for use_window().
+ + add mrxvt terminfo entry, add/fix xterm building blocks for modified
+ cursor keys -TD
+ + compile with FreeBSD "contemporary" TTY interface (patch by
+ Rong-En Fan).
+
+20071013
+ + modify makefile rules to allow clear, tput and tset to be built
+ without libtic. The other programs (infocmp, tic and toe) rely on
+ that library.
+ + add/modify null-pointer checks in several functions for SP and/or
+ the WINDOW* parameter (report by Thorben Krueger).
+ + fixes for field_buffer() in formw library (see Redhat Bugzilla
+ #310071, patches by Miroslav Lichvar).
+ + improve performance of NCURSES_CHAR_EQ code (patch by Miroslav
+ Lichvar).
+ + update/improve mlterm and rxvt terminfo entries, e.g., for
+ the modified cursor- and keypad-keys -TD
+
+20071006
+ + add code to curses.priv.h ifdef'd with NCURSES_CHAR_EQ, which
+ changes the CharEq() macro to an inline function to allow comparing
+ cchar_t struct's without comparing gaps in a possibly unpacked
+ memory layout (report by Miroslav Lichvar).
+
+20070929
+ + add new functions to lib_trace.c to setup mutex's for the _tracef()
+ calls within the ncurses library.
+ + for the reentrant model, move _nc_tputs_trace and _nc_outchars into
+ the SCREEN.
+ + start modifying test/worm.c to provide threading demo (incomplete).
+ + separated ifdef's for some BSD-related symbols in tset.c, to make
+ it compile on LynxOS (report by Greg Gemmer).
+20070915
+ + modify Ada95/gen/Makefile to use shlib script, to simplify building
+ shared-library configuration on platforms lacking rpath support.
+ + build-fix for Ada95/src/Makefile to reflect changed dependency for
+ the terminal-interface-curses-aux.adb file which is now generated.
+ + restructuring test/worm.c, for use_window() example.
+
+20070908
+ + add use_window() and use_screen() functions, to develop into support
+ for threaded library (incomplete).
+ + fix typos in man/curs_opaque.3x which kept the install script from
+ creating symbolic links to two aliases created in 20070818 (report by
+ Rong-En Fan).
+
+20070901
+ + remove a spurious newline from output of html.m4, which caused links
+ for Ada95 html to be incorrect for the files generated using m4.
+ + start investigating mutex's for SCREEN manipulation (incomplete).
+ + minor cleanup of codes.c/names.c for --enable-const
+ + expand/revise "Routine and Argument Names" section of ncurses manpage
+ to address report by David Givens in newsgroup discussion.
+ + fix interaction between --without-progs/--with-termcap configure
+ options (report by Michail Vidiassov).
+ + fix typo in "--disable-relink" option (report by Michail Vidiassov).
+
+20070825
+ + fix a sign-extension bug in infocmp's repair_acsc() function
+ (cf: 971004).
+ + fix old configure script bug which prevented "--disable-warnings"
+ option from working (patch by Mike Frysinger).
+
+20070818
+ + add 9term terminal description (request by Juhapekka Tolvanen) -TD
+ + modify comp_hash.c's string output to avoid misinterpreting a null
+ "\0" followed by a digit.
+ + modify MKnames.awk and MKcodes.awk to support big-strings.
+ This only applies to the cases (broken linker, reentrant) where
+ the corresponding arrays are accessed via wrapper functions.
+ + split MKnames.awk into two scripts, eliminating the shell redirection
+ which complicated the make process and also the bogus timestamp file
+ which was introduced to fix "make -j".
+ + add test/test_opaque.c, test/test_arrays.c
+ + add wgetscrreg() and wgetparent() for applications that may need it
+ when NCURSES_OPAQUE is defined (prompted by Bryan Christ).
+
+20070812
+ + amend treatment of infocmp "-r" option to retain the 1023-byte limit
+ unless "-T" is given (cf: 981017).
+ + modify comp_captab.c generation to use big-strings.
+ + make _nc_capalias_table and _nc_infoalias_table private accessed via
+ _nc_get_alias_table() since the tables are used only within the tic
+ library.
+ + modify configure script to skip Intel compiler in CF_C_INLINE.
+ + make _nc_info_hash_table and _nc_cap_hash_table private accessed via
+ _nc_get_hash_table() since the tables are used only within the tic
+ library.
+
+20070728
+ + make _nc_capalias_table and _nc_infoalias_table private, accessed via
+ _nc_get_alias_table() since they are used only by parse_entry.c
+ + make _nc_key_names private since it is used only by lib_keyname.c
+ + add --disable-big-strings configure option to control whether
+ unctrl.c is generated using the big-string optimization - which may
+ use strings longer than supported by a given compiler.
+ + reduce relocation tables for tic, infocmp by changing type of
+ internal hash tables to short, and make those private symbols.
+ + eliminate large fixed arrays from progs/infocmp.c
+
+20070721
+ + change winnstr() to stop at the end of the line (cf: 970315).
+ + add test/test_get_wstr.c
+ + add test/test_getstr.c
+ + add test/test_inwstr.c
+ + add test/test_instr.c
+
+20070716
+ + restore a call to obtain screen-size in _nc_setupterm(), which
+ is used in tput and other non-screen applications via setupterm()
+ (Debian #433357, reported by Florent Bayle, Christian Ohm,
+ cf: 20070310).
+
+20070714
+ + add test/savescreen.c test-program
+ + add check to trace-file open, if the given name is a directory, add
+ ".log" to the name and try again.
+ + add konsole-256color entry -TD
+ + add extra gcc warning options from xterm.
+ + minor fixes for ncurses/hashmap test-program.
+ + modify configure script to quiet c++ build with libtool when the
+ --disable-echo option is used.
+ + modify configure script to disable ada95 if libtool is selected,
+ writing a warning message (addresses FreeBSD ports/114493).
+ + update config.guess, config.sub
+
+20070707
+ + add continuous-move "M" to demo_panels to help test refresh changes.
+ + improve fix for refresh of window on top of multi-column characters,
+ taking into account some split characters on left/right window
+ boundaries.
+
+20070630
+ + add "widec" row to _tracedump() output to help diagnose remaining
+ problems with multi-column characters.
+ + partial fix for refresh of window on top of multi-column characters
+ which are partly overwritten (report by Sadrul H Chowdhury).
+ + ignore A_CHARTEXT bits in vidattr() and vid_attr(), in case
+ multi-column extension bits are passed there.
+ + add setlocale() call to demo_panels.c, needed for wide-characters.
+ + add some output flags to _nc_trace_ttymode to help diagnose a bug
+ report by Larry Virden, i.e., ONLCR, OCRNL, ONOCR and ONLRET,
+
+20070623
+ + add test/demo_panels.c
+ + implement opaque version of setsyx() and getsyx().
+
+20070612
+ + corrected xterm+pcf2 terminfo modifiers for F1-F4, to match xterm
+ #226 -TD
+ + split-out key_name() from MKkeyname.awk since it now depends upon
+ wunctrl() which is not in libtinfo (report by Rong-En Fan).
+
+20070609
+ + add test/key_name.c
+ + add stdscr cases to test/inchs.c and test_inch_wide.c
+ + update test/configure
+ + correct formatting of DEL (0x7f) in _nc_vischar().
+ + null-terminate result of wunctrl().
+ + add null-pointer check in key_name() (report by Andreas Krennmair,
+ cf: 20020901).
+
+20070602
+ + adapt mouse-handling code from menu library in form-library
+ (discussion with Clive Nicolson).
+ + add a modification of test/dots.c, i.e., test/dots_mvcur.c to
+ illustrate how to use mvcur().
+ + modify wide-character flavor of SetAttr() to preserve the
+ WidecExt() value stored in the .attr field, e.g., in case it
+ is overwritten by chgat (report by Aleksi Torhamo).
+ + correct buffer-size for _nc_viswbuf2n() (report by Aleksi Torhamo).
+ + build-fixes for Solaris 2.6 and 2.7 (patch by Peter O'Gorman).
+
+20070526
+ + modify keyname() to use "^X" form only if meta() has been called, or
+ if keyname() is called without initializing curses, e.g., via
+ initscr() or newterm() (prompted by LinuxBase #1604).
+ + document some portability issues in man/curs_util.3x
+ + add a shadow copy of TTY buffer to _nc_prescreen to fix applications
+ broken by moving that data into SCREEN (cf: 20061230).
+
+20070512
+ + add 'O' (wide-character panel test) in ncurses.c to demonstrate a
+ problem reported by Sadrul H Chowdhury with repainting parts of
+ a fullwidth cell.
+ + modify slk_init() so that if there are preceding calls to
+ ripoffline(), those affect the available lines for soft-keys (adapted
+ from patch by Clive Nicolson).
+ + document some portability issues in man/curs_getyx.3x
+
+20070505
+ + fix a bug in Ada95/samples/ncurses which caused a variable to
+ become uninitialized in the "b" test.
+ + fix Ada95/gen/Makefile.in adahtml rule to account for recent
+ movement of files, fix a few incorrect manpage references in the
+ generated html.
+ + add Ada95 binding to _nc_freeall() as Curses_Free_All to help with
+ memory-checking.
+ + correct some functions in Ada95 binding which were using return value
+ from C where none was returned: idcok(), immedok() and wtimeout().
+ + amend recent changes for Ada95 binding to make it build with
+ Cygwin's linker, e.g., with configure options
+ --enable-broken-linker --with-ticlib
+
+20070428
+ + add a configure check for gcc's options for inlining, use that to
+ quiet a warning message where gcc's default behavior changed from
+ 3.x to 4.x.
+ + improve warning message when checking if GPM is linked to curses
+ library by not warning if its use of "wgetch" is via a weak symbol.
+ + add loader options when building with static libraries to ensure that
+ an installed shared library for ncurses does not conflict. This is
+ reported as problem with Tru64, but could affect other platforms
+ (report Martin Mokrejs, analysis by Tim Mooney).
+ + fix build on cygwin after recent ticlib/termlib changes, i.e.,
+ + adjust TINFO_SUFFIX value to work with cygwin's dll naming
+ + revert a change from 20070303 which commented out dependency of
+ SHLIB_LIST in form/menu/panel/c++ libraries.
+ + fix initialization of ripoff stack pointer (cf: 20070421).
+
+20070421
+ + move most static variables into structures _nc_globals and
+ _nc_prescreen, to simplify storage.
+ + add/use configure script macro CF_SIG_ATOMIC_T, use the corresponding
+ type for data manipulated by signal handlers (prompted by comments
+ in mailing.openbsd.bugs newsgroup).
+ + modify CF_WITH_LIBTOOL to allow one to pass options such as -static
+ to the libtool create- and link-operations.
+
+20070414
+ + fix whitespace in curs_opaque.3x which caused a spurious ';' in
+ the installed aliases (report by Peter Santoro).
+ + fix configure script to not try to generate adacurses-config when
+ Ada95 tree is not built.
+
+20070407
+ + add man/curs_legacy.3x, man/curs_opaque.3x
+ + fix acs_map binding for Ada95 when --enable-reentrant is used.
+ + add adacurses-config to the Ada95 install, based on version from
+ FreeBSD port, in turn by Juergen Pfeifer in 2000 (prompted by
+ comment on comp.lang.ada newsgroup).
+ + fix includes in c++ binding to build with Intel compiler
+ (cf: 20061209).
+ + update install rule in Ada95 to use mkdirs.sh
+ > other fixes prompted by inspection for Coverity report:
+ + modify ifdef's for c++ binding to use try/catch/throw statements
+ + add a null-pointer check in tack/ansi.c request_cfss()
+ + fix a memory leak in ncurses/base/wresize.c
+ + corrected check for valid memu/meml capabilities in
+ progs/dump_entry.c when handling V_HPUX case.
+ > fixes based on Coverity report:
+ + remove dead code in test/bs.c
+ + remove dead code in test/demo_defkey.c
+ + remove an unused assignment in progs/infocmp.c
+ + fix a limit check in tack/ansi.c tools_charset()
+ + fix tack/ansi.c tools_status() to perform the VT320/VT420
+ tests in request_cfss(). The function had exited too soon.
+ + fix a memory leak in tic.c's make_namelist()
+ + fix a couple of places in tack/output.c which did not check for EOF.
+ + fix a loop-condition in test/bs.c
+ + add index checks in lib_color.c for color palettes
+ + add index checks in progs/dump_entry.c for version_filter() handling
+ of V_BSD case.
+ + fix a possible null-pointer dereference in copywin()
+ + fix a possible null-pointer dereference in waddchnstr()
+ + add a null-pointer check in _nc_expand_try()
+ + add a null-pointer check in tic.c's make_namelist()
+ + add a null-pointer check in _nc_expand_try()
+ + add null-pointer checks in test/cardfile.c
+ + fix a double-free in ncurses/tinfo/trim_sgr0.c
+ + fix a double-free in ncurses/base/wresize.c
+ + add try/catch block to c++/cursesmain.cc
+
+20070331
+ + modify Ada95 binding to build with --enable-reentrant by wrapping
+ global variables (bug: acs_map does not yet work).
+ + modify Ada95 binding to use the new access-functions, allowing it
+ to build/run when NCURSES_OPAQUE is set.
+ + add access-functions and macros to return properties of the WINDOW
+ structure, e.g., when NCURSES_OPAQUE is set.
+ + improved install-sh's quoting.
+ + use mkdirs.sh rather than mkinstalldirs, e.g., to use fixes from
+ other programs.
+
+20070324
+ + eliminate part of the direct use of WINDOW data from Ada95 interface.
+ + fix substitutions for termlib filename to make configure option
+ --enable-reentrant work with --with-termlib.
+ + change a constructor for NCursesWindow to allow compiling with
+ NCURSES_OPAQUE set, since we cannot pass a reference to
+ an opaque pointer.
+
+20070317
+ + ignore --with-chtype=unsigned since unsigned is always added to
+ the type in curses.h; do the same for --with-mmask-t.
+ + change warning regarding --enable-ext-colors and wide-character
+ in the configure script to an error.
+ + tweak error message in CF_WITH_LIBTOOL to distinguish other programs
+ such as Darwin's libtool program (report by Michail Vidiassov)
+ + modify edit_man.sh to allow for multiple substitutions per line.
+ + set locale in misc/ncurses-config.in since it uses a range
+ + change permissions libncurses++.a install (report by Michail
+ Vidiassov).
+ + corrected length of temporary buffer in wide-character version
+ of set_field_buffer() (related to report by Bryan Christ).
+
+20070311
+ + fix mk-1st.awk script install_shlib() function, broken in 20070224
+ changes for cygwin (report by Michail Vidiassov).
+
+20070310
+ + increase size of array in _nc_visbuf2n() to make "tic -v" work
+ properly in its similar_sgr() function (report/analysis by Peter
+ Santoro).
+ + add --enable-reentrant configure option for ongoing changes to
+ implement a reentrant version of ncurses:
+ + libraries are suffixed with "t"
+ + wrap several global variables (curscr, newscr, stdscr, ttytype,
+ COLORS, COLOR_PAIRS, COLS, ESCDELAY, LINES and TABSIZE) as
+ functions returning values stored in SCREEN or cur_term.
+ + move some initialization (LINES, COLS) from lib_setup.c,
+ i.e., setupterm() to _nc_setupscreen(), i.e., newterm().
+
+20070303
+ + regenerated html documentation.
+ + add NCURSES_OPAQUE symbol to curses.h, will use to make structs
+ opaque in selected configurations.
+ + move the chunk in lib_acs.c which resets acs capabilities when
+ running on a terminal whose locale interferes with those into
+ _nc_setupscreen(), so the libtinfo/libtinfow files can be made
+ identical (requested by Miroslav Lichvar).
+ + do not use configure variable SHLIB_LIBS for building libraries
+ outside the ncurses directory, since that symbol is customized
+ only for that directory, and using it introduces an unneeded
+ dependency on libdl (requested by Miroslav Lichvar).
+ + modify mk-1st.awk so the generated makefile rules for linking or
+ installing shared libraries do not first remove the library, in
+ case it is in use, e.g., libncurses.so by /bin/sh (report by Jeff
+ Chua).
+ + revised section "Using NCURSES under XTERM" in ncurses-intro.html
+ (prompted by newsgroup comment by Nick Guenther).
+
+20070224
+ + change internal return codes of _nc_wgetch() to check for cases
+ where KEY_CODE_YES should be returned, e.g., if a KEY_RESIZE was
+ ungetch'd, and read by wget_wch().
+ + fix static-library build broken in 20070217 changes to remove "-ldl"
+ (report by Miroslav Lichvar).
+ + change makefile/scripts for cygwin to allow building termlib.
+ + use Form_Hook in manpages to match form.h
+ + use Menu_Hook in manpages, as well as a few places in menu.h
+ + correct form- and menu-manpages to use specific Field_Options,
+ Menu_Options and Item_Options types.
+ + correct prototype for _tracechar() in manpage (cf: 20011229).
+ + correct prototype for wunctrl() in manpage.
+
+20070217
+ + fixes for $(TICS_LIST) in ncurses/Makefile (report by Miroslav
+ Lichvar).
+ + modify relinking of shared libraries to apply only when rpath is
+ enabled, and add --disable-relink option which can be used to
+ disable the feature altogether (reports by Michail Vidiassov,
+ Adam J Richter).
+ + fix --with-termlib option for wide-character configuration, stripping
+ the "w" suffix in one place (report by Miroslav Lichvar).
+ + remove "-ldl" from some library lists to reduce dependencies in
+ programs (report by Miroslav Lichvar).
+ + correct description of --enable-signed-char in configure --help
+ (report by Michail Vidiassov).
+ + add pattern for GNU/kFreeBSD configuration to CF_XOPEN_SOURCE,
+ which matches an earlier change to CF_SHARED_OPTS, from xterm #224
+ fixes.
+ + remove "${DESTDIR}" from -install_name option used for linking
+ shared libraries on Darwin (report by Michail Vidiassov).
+
+20070210
+ + add test/inchs.c, test_inch_wide.c, to test win_wchnstr().
+ + remove libdl from library list for termlib (report by Miroslav
+ Lichvar).
+ + fix configure.in to allow --without-progs --with-termlib (patch by
+ Miroslav Lichvar).
+ + modify win_wchnstr() to ensure that only a base cell is returned
+ for each multi-column character (prompted by report by Wei Kong
+ regarding change in mvwin_wch() cf: 20041023).
+
+20070203
+ + modify fix_wchnstr() in form library to strip attributes (and color)
+ from the cchar_t array (field cells) read from a field's window.
+ Otherwise, when copying the field cells back to the window, the
+ associated color overrides the field's background color (report by
+ Ricardo Cantu).
+ + improve tracing for form library, showing created forms, fields, etc.
+ + ignore --enable-rpath configure option if --with-shared was omitted.
+ + add _nc_leaks_tinfo(), _nc_free_tic(), _nc_free_tinfo() entrypoints
+ to allow leak-checking when both tic- and tinfo-libraries are built.
+ + drop CF_CPP_VSCAN_FUNC macro from configure script, since C++ binding
+ no longer relies on it.
+ + disallow combining configure script options --with-ticlib and
+ --enable-termcap (report by Rong-En Fan).
+ + remove tack from ncurses tree.
+
+20070128
+ + fix typo in configure script that broke --with-termlib option
+ (report by Rong-En Fan).
+
+20070127
+ + improve fix for FreeBSD gnu/98975, to allow for null pointer passed
+ to tgetent() (report by Rong-en Fan).
+ + update tack/HISTORY and tack/README to tell how to build it after
+ it is removed from the ncurses tree.
+ + fix configure check for libtool's version to trim blank lines
+ (report by sci-fi@hush.ai).
+ + review/eliminate other original-file artifacts in cursesw.cc, making
+ its license consistent with ncurses.
+ + use ncurses vw_scanw() rather than reading into a fixed buffer in
+ the c++ binding for scanw() methods (prompted by report by Nuno Dias).
+ + eliminate fixed-buffer vsprintf() calls in c++ binding.
+
+20070120
+ + add _nc_leaks_tic() to separate leak-checking of tic library from
+ term/ncurses libraries, and thereby eliminate a library dependency.
+ + fix test/mk-test.awk to ignore blank lines.
+ + correct paths in include/headers, for --srcdir (patch by Miroslav
+ Lichvar).
+
+20070113
+ + add a break-statement in misc/shlib to ensure that it exits on the
+ _first_ matched directory (report by Paul Novak).
+ + add tack/configure, which can be used to build tack outside the
+ ncurses build-tree.
+ + add --with-ticlib option, to build/install the tic-support functions
+ in a separate library (suggested by Miroslav Lichvar).
+
+20070106
+ + change MKunctrl.awk to reduce relocation table for unctrl.o
+ + change MKkeyname.awk to reduce relocation table for keyname.o
+ (patch by Miroslav Lichvar).
+
+20061230
+ + modify configure check for libtool's version to trim blank lines
+ (report by sci-fi@hush.ai).
+ + modify some modules to allow them to be reentrant if _REENTRANT is
+ defined: lib_baudrate.c, resizeterm.c (local data only)
+ + eliminate static data from some modules: add_tries.c, hardscroll.c,
+ lib_ttyflags.c, lib_twait.c
+ + improve manpage install to add aliases for the transformed program
+ names, e.g., from --program-prefix.
+ + used linklint to verify links in the HTML documentation, made fixes
+ to manpages as needed.
+ + fix a typo in curs_mouse.3x (report by William McBrine).
+ + fix install-rule for ncurses5-config to make the bin-directory.
+
+20061223
+ + modify configure script to omit the tic (terminfo compiler) support
+ from ncurses library if --without-progs option is given.
+ + modify install rule for ncurses5-config to do this via "install.libs"
+ + modify shared-library rules to allow FreeBSD 3.x to use rpath.
+ + update config.guess, config.sub
+
20061217 5.6 release for upload to ftp.gnu.org
-20061217
+20061217
+ add ifdef's for <wctype.h> for HPUX, which has the corresponding
definitions in <wchar.h>.
+ revert the va_copy() change from 20061202, since it was neither
@@ -62,7 +565,7 @@ it is not possible to add this information.
+ modify configure --with-gpm option to allow it to accept a parameter,
i.e., the name of the dynamic GPM library to load via dlopen()
(requested by Bryan Henderson).
- + add configure option --with-valgrind (from vile).
+ + add configure option --with-valgrind, changes from vile.
+ modify configure script AC_TRY_RUN and AC_TRY_LINK checks to use
'return' in preference to 'exit()'.
@@ -1524,7 +2027,8 @@ it is not possible to add this information.
20031108
+ add DJGPP to special case of DOS-style drive letters potentially
appearing in TERMCAP environment variable.
- + fix some spelling in comments (reports by jmc, Jonathon Gray).
+ + fix some spelling in comments (reports by Jason McIntyre, Jonathon
+ Gray).
+ update config.guess, config.sub
20031101
@@ -1814,7 +2318,7 @@ it is not possible to add this information.
"--srcdir" work (report by Warren L Dodge).
+ correct missing definition of $(CC) in Ada95/gen/Makefile.in
(reported by Warren L Dodge <warrend@mdhost.cse.tek.com>).
- + fix typos and whitespace in manpages (patch by jmc
+ + fix typos and whitespace in manpages (patch by Jason McIntyre
<jmc@prioris.mini.pw.edu.pl>).
20030503
@@ -3449,7 +3953,7 @@ it is not possible to add this information.
20000923
+ modify rs2 capability in xterm-r6 and similar where cursor
- save/restore bracketed the sequence for resetting video attributes.
+ save/restore bracketed the sequence for resetting video attributes.
The cursor restore would undo that (report by John Hawkinson
<jhawk@MIT.EDU> (see NetBSD misc/11052)).
+ using parameter check added to tic, corrected 27 typos in
@@ -4266,7 +4770,7 @@ it is not possible to add this information.
<bledp@voila.fr>)).
+ change renaming of dft_fgbg.3x to use_default_colors.3ncurses in
man_db.renames, since Debian is not concerned with 14-character
- filename limitation (from Debian bug report by Josip Rodin
+ filename limitation (Debian bug report by Josip Rodin
<joy@cibalia.gkvk.hr>).
+ corrected scoansi terminfo entry by testing with scoterm and console.
+ revert change from 990614 to terminal_interface-curses-forms.ads.m4,
@@ -5309,7 +5813,7 @@ it is not possible to add this information.
980321
+ revise configure macro CF_SPEED_TYPE so that termcap.h has speed_t
- declared (from Adam J. Richter <adam@yggdrasil.com>)
+ declared (from Adam J Richter <adam@yggdrasil.com>)
+ remove spurious curs_set() call from leaveok() (J T Conklin).
+ corrected handling leaveok() in doupdate() (patch by Alexander V.
Lukyanov).
diff --git a/contrib/ncurses/TO-DO b/contrib/ncurses/TO-DO
index 6834e0380b37..22acd0f1f3c6 100644
--- a/contrib/ncurses/TO-DO
+++ b/contrib/ncurses/TO-DO
@@ -1,5 +1,5 @@
-------------------------------------------------------------------------------
--- Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. --
+-- Copyright (c) 1998-2006,2007 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 --
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: TO-DO,v 1.48 2006/10/28 19:49:16 tom Exp $
+-- $Id: TO-DO,v 1.49 2007/02/03 16:29:17 tom Exp $
-------------------------------------------------------------------------------
SHORT-TERM TO-DO ITEMS:
@@ -58,9 +58,6 @@ Known Problems:
+ The window classes defined in the c++ subdirectory need documentation. Some
C++ programmer could earn a lot of good karma by doing this...
-+ The resizeterm() function does not handle ripped-off lines such as that done
- for the slk_XXX functions.
-
+ vid_attr() should support the set_a_attributes (sgr1) string, but does not.
There appear to be no terminals that require that functionality.
@@ -75,19 +72,19 @@ Portability (or lack thereof):
ncurses/tty/lib_tstp.c .
+ In theory, vwprintw and vwscanf are supposed to use the older varargs.h
- interface for handling variadic argument lists. Linux doesn't have
- varargs.h, it has the newer X/Open-standard stdargs.h equivalent. So these
- functions use stdargs instead. This is unlikely to be a problem unless
- you're building ncurses on a System V old enough to only have varargs.h.
- (Solaris 2.5.1 uses the stdarg.h binding as well).
+ interface for handling variadic argument lists (and are deprecated by X/Open
+ for that reason). Linux doesn't have varargs.h, it has the newer
+ X/Open-standard stdargs.h equivalent. So these functions use stdargs
+ instead. This is unlikely to be a problem unless you're building ncurses on
+ a System V old enough to only have varargs.h. (Solaris 2.5.1 used the
+ stdarg.h binding as well).
+ If you're using a BSD earlier than 4.4BSD, or a Linux old enough not to have
a native vsscanf(3) in its library, vwscanw() will not work. You lose. (It
should work on any System V, however). If you want to fix this, add an
implementation to ncurses/vsscanf.c.
-+ The C++ binding fails to build with a few C++ compilers, mainly with
- configure script problems with vsscanf().
++ The C++ binding fails to build with a few C++ compilers.
+ terminfo.5 does not format with the SunOS (and most other platform's) tbl
utility because it relies on a diversion for each table entry. Get the
@@ -106,7 +103,7 @@ LONGER-TERM TO-DO ITEMS:
1. Extended COSE conformance
-There is an XPG4 standard recently released which describes a superset
+There is an XPG4 standard released in 1996 which describes a superset
of the SVr4 API. The library is BASE conformant with this standard.
We would like to make ncurses fully conformant at the EXTENDED level
supporting internationalization.
diff --git a/contrib/ncurses/aclocal.m4 b/contrib/ncurses/aclocal.m4
index b57ec00d18a0..dfe38668ac4f 100644
--- a/contrib/ncurses/aclocal.m4
+++ b/contrib/ncurses/aclocal.m4
@@ -1,5 +1,5 @@
dnl***************************************************************************
-dnl Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
+dnl Copyright (c) 1998-2006,2007 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,7 +28,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: aclocal.m4,v 1.407 2006/12/17 16:12:38 tom Exp $
+dnl $Id: aclocal.m4,v 1.442 2007/12/01 20:02:42 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@@ -168,6 +168,99 @@ AC_SUBST(EXTRA_CPPFLAGS)
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_ADD_INCDIR version: 8 updated: 2007/07/30 19:22:58
+dnl -------------
+dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it's
+dnl redundant. We don't normally need to add -I/usr/local/include for gcc,
+dnl but old versions (and some misinstalled ones) need that. To make things
+dnl worse, gcc 3.x may give error messages if -I/usr/local/include is added to
+dnl the include-path).
+AC_DEFUN([CF_ADD_INCDIR],
+[
+if test -n "$1" ; then
+ for cf_add_incdir in $1
+ do
+ while test $cf_add_incdir != /usr/include
+ do
+ if test -d $cf_add_incdir
+ then
+ cf_have_incdir=no
+ if test -n "$CFLAGS$CPPFLAGS" ; then
+ # a loop is needed to ensure we can add subdirs of existing dirs
+ for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
+ if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
+ cf_have_incdir=yes; break
+ fi
+ done
+ fi
+
+ if test "$cf_have_incdir" = no ; then
+ if test "$cf_add_incdir" = /usr/local/include ; then
+ if test "$GCC" = yes
+ then
+ cf_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ AC_TRY_COMPILE([#include <stdio.h>],
+ [printf("Hello")],
+ [],
+ [cf_have_incdir=yes])
+ CPPFLAGS=$cf_save_CPPFLAGS
+ fi
+ fi
+ fi
+
+ if test "$cf_have_incdir" = no ; then
+ AC_VERBOSE(adding $cf_add_incdir to include-path)
+ ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)"
+
+ cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+ test "$cf_top_incdir" = "$cf_add_incdir" && break
+ cf_add_incdir="$cf_top_incdir"
+ else
+ break
+ fi
+ fi
+ done
+ done
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ADD_LIBDIR version: 5 updated: 2007/07/30 19:12:03
+dnl -------------
+dnl Adds to the library-path
+dnl
+dnl Some machines have trouble with multiple -L options.
+dnl
+dnl $1 is the (list of) directory(s) to add
+dnl $2 is the optional name of the variable to update (default LDFLAGS)
+dnl
+AC_DEFUN([CF_ADD_LIBDIR],
+[
+if test -n "$1" ; then
+ for cf_add_libdir in $1
+ do
+ if test $cf_add_libdir = /usr/lib ; then
+ :
+ elif test -d $cf_add_libdir
+ then
+ cf_have_libdir=no
+ if test -n "$LDFLAGS$LIBS" ; then
+ # a loop is needed to ensure we can add subdirs of existing dirs
+ for cf_test_libdir in $LDFLAGS $LIBS ; do
+ if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+ cf_have_libdir=yes; break
+ fi
+ done
+ fi
+ if test "$cf_have_libdir" = no ; then
+ AC_VERBOSE(adding $cf_add_libdir to library-path)
+ ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,[$]$2)"
+ fi
+ fi
+ done
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_ANSI_CC_CHECK version: 9 updated: 2001/12/30 17:53:34
dnl ----------------
dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
@@ -612,6 +705,50 @@ fi
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_CHECK_GPM_WGETCH version: 1 updated: 2007/04/28 14:38:06
+dnl -------------------
+dnl Check if GPM is already linked with curses. If so - and if the linkage
+dnl is not "weak" - warn about this because it can create problems linking
+dnl applications with ncurses.
+AC_DEFUN([CF_CHECK_GPM_WGETCH],[
+AC_CHECK_LIB(gpm,Gpm_Wgetch,[
+
+AC_CACHE_CHECK(if GPM is weakly bound to curses library, cf_cv_check_gpm_wgetch,[
+cf_cv_check_gpm_wgetch=unknown
+if test "$cross_compiling" != yes ; then
+
+cat >conftest.$ac_ext <<CF_EOF
+#include <gpm.h>
+int main()
+{
+ Gpm_Wgetch();
+ ${cf_cv_main_return:-return}(0);
+}
+CF_EOF
+
+ cf_save_LIBS="$LIBS"
+ # This only works if we can look at the symbol table. If a shared
+ # library is stripped for install, we cannot use that. So we're forced
+ # to rely on the static library, noting that some packagers may not
+ # include it.
+ LIBS="-static -lgpm -dynamic $LIBS"
+ if AC_TRY_EVAL(ac_compile) ; then
+ if AC_TRY_EVAL(ac_link) ; then
+ cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[[vVwW]]\>'`
+ test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
+ test -z "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=no
+ fi
+ fi
+ rm -f conftest*
+ LIBS="$cf_save_LIBS"
+fi
+])
+
+if test "$cf_cv_check_gpm_wgetch" != yes ; then
+ AC_MSG_WARN(GPM library is already linked with curses - read the FAQ)
+fi
+])])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_CPP_PARAM_INIT version: 4 updated: 2001/04/07 22:31:18
dnl -----------------
dnl Check if the C++ compiler accepts duplicate parameter initialization. This
@@ -703,82 +840,36 @@ fi
test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CPP_VSCAN_FUNC version: 5 updated: 2001/12/02 01:39:28
-dnl -----------------
-dnl Check if the g++ compiler supports vscan function (not a standard feature).
-AC_DEFUN([CF_CPP_VSCAN_FUNC],
-[
-if test -n "$CXX"; then
-
-AC_LANG_SAVE
-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 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>
-#include <stdarg.h>
-#define $cf_vscan_defs 1
-#if defined(USE_STDIO_VSCAN)
-#elif defined(HAVE_STRSTREAM_H) && defined(USE_STRSTREAM_VSCAN)
-#include <strstream.h>
-#endif
-
-int scanw(const char* fmt, ...)
-{
- int result = -1;
- char buf[BUFSIZ];
-
- va_list args;
- va_start(args, fmt);
-#if defined(USE_STDIO_VSCAN)
- 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);
- return result;
-}
-],[int tmp, foo = scanw("%d", &tmp)],
- [cf_cv_cpp_vscan_func=$cf_vscan_func; break],
- [cf_cv_cpp_vscan_func=no])
- test "$cf_cv_cpp_vscan_func" != no && break
- done
-])
-
-AC_LANG_RESTORE
+dnl CF_C_INLINE version: 2 updated: 2007/08/11 14:09:50
+dnl -----------
+dnl Check if the C compiler supports "inline".
+dnl $1 is the name of a shell variable to set if inline is supported
+dnl $2 is the threshold for gcc 4.x's option controlling maximum inline size
+AC_DEFUN([CF_C_INLINE],[
+AC_C_INLINE
+$1=
+if test "$ac_cv_c_inline" != no ; then
+ $1=inline
+ if test "$INTEL_COMPILER" = yes
+ then
+ :
+ elif test "$GCC" = yes
+ then
+ AC_CACHE_CHECK(if gcc supports options to tune inlining,cf_cv_gcc_inline,[
+ cf_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS --param max-inline-insns-single=$2"
+ AC_TRY_COMPILE([inline int foo(void) { return 1; }],
+ [${cf_cv_main_return:-return} foo()],
+ [cf_cv_gcc_inline=yes],
+ [cf_cv_gcc_inline=no])
+ CFLAGS=$cf_save_CFLAGS
+ ])
+ if test "$cf_cv_gcc_inline" = yes ; then
+ CF_ADD_CFLAGS([--param max-inline-insns-single=$2])
+ fi
+ fi
fi
-
-case $cf_cv_cpp_vscan_func in #(vi
-stdio) #(vi
- AC_DEFINE(CPP_HAS_VSCAN_FUNC)
- AC_DEFINE(USE_STDIO_VSCAN)
- ;;
-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
+AC_SUBST($1)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52
@@ -1070,7 +1161,7 @@ esac
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GCC_ATTRIBUTES version: 10 updated: 2005/05/28 13:16:28
+dnl CF_GCC_ATTRIBUTES version: 11 updated: 2007/07/29 09:55:12
dnl -----------------
dnl Test for availability of useful gcc __attribute__ directives to quiet
dnl compiler warnings. Though useful, not all are supported -- and contrary
@@ -1097,7 +1188,7 @@ if test "$GCC" = yes
then
AC_CHECKING([for $CC __attribute__ directives])
cat > conftest.$ac_ext <<EOF
-#line __oline__ "configure"
+#line __oline__ "${as_me-configure}"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -1159,7 +1250,7 @@ if test "$GCC" = yes ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 20 updated: 2005/08/06 18:37:29
+dnl CF_GCC_WARNINGS version: 22 updated: 2007/07/29 09:55:12
dnl ---------------
dnl Check if the compiler supports useful warning options. There's a few that
dnl we don't use, simply because they're too noisy:
@@ -1184,7 +1275,7 @@ AC_REQUIRE([CF_GCC_VERSION])
CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
cat > conftest.$ac_ext <<EOF
-#line __oline__ "configure"
+#line __oline__ "${as_me-configure}"
int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
EOF
@@ -1205,7 +1296,7 @@ then
AC_CHECKING([for $CC warning options])
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-Wall"
- for cf_opt in $1 \
+ for cf_opt in \
wd1419 \
wd1682 \
wd1683 \
@@ -1561,11 +1652,24 @@ AC_LANG_RESTORE
AC_SUBST(EXTRA_CXXFLAGS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_HASHED_DB version: 1 updated: 2006/08/19 09:16:14
+dnl CF_HASHED_DB version: 3 updated: 2007/11/24 17:43:37
dnl ------------
dnl Look for an instance of the Berkeley hashed database.
+dnl
+dnl $1 = optional parameter, to specify install-prefix for the database.
AC_DEFUN([CF_HASHED_DB],
[
+ifelse([$1],,,[
+case $1 in #(vi
+yes|*able*) #(vi
+ ;;
+*)
+ if test -d "$1" ; then
+ CF_ADD_INCDIR($1/include)
+ CF_ADD_LIBDIR($1/lib)
+ fi
+esac
+])
AC_CHECK_HEADER(db.h,[
CF_HASHED_DB_VERSION
if test "$cf_cv_hashed_db_version" = unknown ; then
@@ -1583,7 +1687,7 @@ fi
])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_HASHED_DB_LIBS version: 6 updated: 2006/12/16 12:33:30
+dnl CF_HASHED_DB_LIBS version: 7 updated: 2007/12/01 15:01:37
dnl -----------------
dnl Given that we have the header and version for hashed database, find the
dnl library information.
@@ -1591,7 +1695,7 @@ AC_DEFUN([CF_HASHED_DB_LIBS],
[
AC_CACHE_CHECK(for db libraries, cf_cv_hashed_db_libs,[
cf_cv_hashed_db_libs=unknown
-for cf_db_libs in db$cf_cv_hashed_db_version db ''
+for cf_db_libs in db$cf_cv_hashed_db_version db-$cf_cv_hashed_db_version db ''
do
cf_save_libs="$LIBS"
if test -n "$cf_db_libs"; then
@@ -1655,7 +1759,7 @@ done
])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_HASHED_DB_VERSION version: 2 updated: 2006/08/19 15:12:49
+dnl CF_HASHED_DB_VERSION version: 3 updated: 2007/12/01 15:01:37
dnl --------------------
dnl Given that we have the header file for hashed database, find the version
dnl information.
@@ -1664,7 +1768,7 @@ AC_DEFUN([CF_HASHED_DB_VERSION],
AC_CACHE_CHECK(for version of db, cf_cv_hashed_db_version,[
cf_cv_hashed_db_version=unknown
-for cf_db_version in 1 2 3 4
+for cf_db_version in 1 2 3 4 5
do
CF_MSG_LOG(checking for db version $cf_db_version)
AC_TRY_COMPILE([
@@ -1778,7 +1882,7 @@ AC_MSG_RESULT($cf_cv_have_isascii)
test "$cf_cv_have_isascii" = yes && AC_DEFINE(HAVE_ISASCII)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_LARGEFILE version: 6 updated: 2006/09/23 19:07:52
+dnl CF_LARGEFILE version: 7 updated: 2007/06/02 11:58:50
dnl ------------
dnl Add checks for large file support.
AC_DEFUN([CF_LARGEFILE],[
@@ -1796,6 +1900,7 @@ ifdef([AC_FUNC_FSEEKO],[
# the config.h
test "$ac_cv_sys_large_files" != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES "
test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
+ test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
AC_CACHE_CHECK(whether to use struct dirent64, cf_cv_struct_dirent64,[
AC_TRY_COMPILE([
@@ -1816,6 +1921,48 @@ ifdef([AC_FUNC_FSEEKO],[
])
])
dnl ---------------------------------------------------------------------------
+dnl CF_LDFLAGS_STATIC version: 2 updated: 2007/04/28 15:25:27
+dnl -----------------
+dnl Check for compiler/linker flags used to temporarily force usage of static
+dnl libraries. This depends on the compiler and platform. Use this to help
+dnl ensure that the linker picks up a given library based on its position in
+dnl the list of linker options and libraries.
+AC_DEFUN([CF_LDFLAGS_STATIC],[
+
+if test "$GCC" = yes ; then
+ LDFLAGS_STATIC=-static
+ LDFLAGS_SHARED=-dynamic
+else
+ case $cf_cv_system_name in #(
+ aix[[45]]*) #( from ld manpage
+ LDFLAGS_STATIC=-bstatic
+ LDFLAGS_SHARED=-bdynamic
+ ;;
+ hpux*) #( from ld manpage for hpux10.20, hpux11.11
+ # We could also use just "archive" and "shared".
+ LDFLAGS_STATIC=-Wl,-a,archive_shared
+ LDFLAGS_SHARED=-Wl,-a,shared_archive
+ ;;
+ irix*) #( from ld manpage IRIX64
+ LDFLAGS_STATIC=-Bstatic
+ LDFLAGS_SHARED=-Bdynamic
+ ;;
+ osf[[45]]*) #( from ld manpage osf4.0d, osf5.1
+ # alternative "-oldstyle_liblookup" (not in cc manpage)
+ LDFLAGS_STATIC=-noso
+ LDFLAGS_SHARED=-so_archive
+ ;;
+ solaris2*)
+ LDFLAGS_STATIC=-Bstatic
+ LDFLAGS_SHARED=-Bdynamic
+ ;;
+ esac
+fi
+
+AC_SUBST(LDFLAGS_STATIC)
+AC_SUBST(LDFLAGS_SHARED)
+])
+dnl ---------------------------------------------------------------------------
dnl CF_LIBUTF8 version: 2 updated: 2002/01/19 22:51:32
dnl ----------
dnl Check for libutf8
@@ -1852,11 +1999,11 @@ ifelse($1,,,[$1=$LIB_PREFIX])
AC_SUBST(LIB_PREFIX)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_LIB_RULES version: 40 updated: 2006/10/14 15:23:15
+dnl CF_LIB_RULES version: 50 updated: 2007/03/24 18:26:59
dnl ------------
dnl Append definitions and rules for the given models to the subdirectory
dnl Makefiles, and the recursion rule for the top-level Makefile. If the
-dnl subdirectory is a library-source directory, modify the LIBRARIES list in
+dnl subdirectory is a library-source directory, modify the LIBS_TO_MAKE list in
dnl the corresponding makefile to list the models that we'll generate.
dnl
dnl For shared libraries, make a list of symbolic links to construct when
@@ -1875,7 +2022,6 @@ do
continue
elif test -f $srcdir/$cf_dir/modules; then
- IMPORT_LIB=
SHARED_LIB=
LIBS_TO_MAKE=
for cf_item in $cf_LIST_MODELS
@@ -1922,9 +2068,7 @@ do
# use autodetected ${cf_prefix} for import lib and static lib, but
# use 'cyg' prefix for shared lib.
if test $cf_cv_shlib_version = cygdll ; then
- SHARED_LIB="cyg${cf_dir}\${ABI_VERSION}.dll"
- IMPORT_LIB="${cf_prefix}${cf_dir}.dll.a"
- LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/\${SHARED_LIB} ../lib/\${IMPORT_LIB}"
+ LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}\${ABI_VERSION}.dll"
continue
fi
fi
@@ -1933,17 +2077,34 @@ do
if test $cf_dir = ncurses ; then
cf_subsets="$LIB_SUBSETS"
- cf_termlib=`echo "$cf_subsets" |sed -e 's/ .*$//'`
- if test "$cf_termlib" != "$cf_subsets" ; then
- cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
- LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
- fi
+ cf_r_parts="$cf_subsets"
+
+ while test -n "$cf_r_parts"
+ do
+ cf_l_parts=`echo "$cf_r_parts" |sed -e 's/ .*$//'`
+ cf_r_parts=`echo "$cf_r_parts" |sed -e 's/^[[^ ]]* //'`
+ if test "$cf_l_parts" != "$cf_r_parts" ; then
+ case $cf_l_parts in #(vi
+ *termlib*) #(vi
+ cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
+ ;;
+ *ticlib*)
+ cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g`
+ ;;
+ *)
+ break
+ ;;
+ esac
+ LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
+ else
+ break
+ fi
+ done
else
cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib.* //'`
fi
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
@@ -1968,13 +2129,20 @@ do
case $cf_subset in
*base*)
;;
- termlib*)
+ *termlib*)
cf_libname=$TINFO_LIB_SUFFIX
if test -n "${DFT_ARG_SUFFIX}" ; then
# undo $LIB_SUFFIX add-on in CF_LIB_SUFFIX
cf_suffix=`echo $cf_suffix |sed -e "s%^${LIB_SUFFIX}%%"`
fi
- ;;
+ ;;
+ ticlib*)
+ cf_libname=$TICS_LIB_SUFFIX
+ if test -n "${DFT_ARG_SUFFIX}" ; then
+ # undo $LIB_SUFFIX add-on in CF_LIB_SUFFIX
+ cf_suffix=`echo $cf_suffix |sed -e "s%^${LIB_SUFFIX}%%"`
+ fi
+ ;;
esac
fi
@@ -2015,8 +2183,11 @@ do
prefix=$cf_prefix \
suffix=$cf_suffix \
subset=$cf_subset \
+ TermlibRoot=$TINFO_NAME \
+ TermlibSuffix=$TINFO_SUFFIX \
ShlibVer=$cf_cv_shlib_version \
ShlibVerInfix=$cf_cv_shlib_version_infix \
+ ReLink=${cf_cv_do_relink-no} \
DoLinks=$cf_cv_do_symlinks \
rmSoLocs=$cf_cv_rm_so_locs \
ldconfig="$LDCONFIG" \
@@ -2103,8 +2274,8 @@ done
cat >> Makefile <<CF_EOF
-install.data \\
-uninstall.data ::
+install.libs uninstall.libs \\
+install.data uninstall.data ::
$MAKE_TERMINFO cd misc && \${MAKE} \${CF_MFLAGS} \[$]@
install.man \\
@@ -2113,7 +2284,7 @@ uninstall.man ::
distclean ::
rm -f config.cache config.log config.status Makefile include/ncurses_cfg.h
- rm -f headers.sh headers.sed
+ rm -f headers.sh headers.sed mk_shared_lib.sh
rm -rf \${DIRS_TO_MAKE}
CF_EOF
@@ -2224,41 +2395,10 @@ do
fi
if test -f $srcdir/$cf_dir/headers; then
- cat >>$cf_dir/Makefile <<CF_EOF
-\${DESTDIR}\${includedir} :
- sh \${srcdir}/../mkinstalldirs \[$]@
-
-install \\
-install.libs \\
-install.includes :: \${AUTO_SRC} \${DESTDIR}\${includedir} \\
-CF_EOF
- j=""
- for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
- do
- test -n "$j" && echo " $j \\" >>$cf_dir/Makefile
- j=$i
- done
-
- echo " $j" >>$cf_dir/Makefile
-
- for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
- do
- echo " @ (cd \${DESTDIR}\${includedir} && rm -f `basename $i`) ; ../headers.sh \${INSTALL_DATA} \${DESTDIR}\${includedir} \${srcdir} $i" >>$cf_dir/Makefile
- test $i = curses.h && test $WITH_CURSES_H = yes && echo " @ (cd \${DESTDIR}\${includedir} && rm -f ncurses.h && \${LN_S} curses.h ncurses.h)" >>$cf_dir/Makefile
- done
-
- cat >>$cf_dir/Makefile <<CF_EOF
-
-uninstall \\
-uninstall.libs \\
-uninstall.includes ::
-CF_EOF
- for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
- do
- i=`basename $i`
- echo " -@ (cd \${DESTDIR}\${includedir} && rm -f $i)" >>$cf_dir/Makefile
- test $i = curses.h && echo " -@ (cd \${DESTDIR}\${includedir} && rm -f ncurses.h)" >>$cf_dir/Makefile
- done
+ $AWK -f $srcdir/mk-hdr.awk \
+ subset="$LIB_SUBSETS" \
+ compat="$WITH_CURSES_H" \
+ $srcdir/$cf_dir/headers >>$cf_dir/Makefile
fi
if test -f $srcdir/$cf_dir/modules; then
@@ -2776,7 +2916,7 @@ AC_ARG_WITH(manpage-tbl,
AC_MSG_RESULT($MANPAGE_TBL)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MAN_PAGES version: 31 updated: 2006/12/09 12:27:08
+dnl CF_MAN_PAGES version: 35 updated: 2007/03/31 11:47:29
dnl ------------
dnl Try to determine if the man-pages on the system are compressed, and if
dnl so, what format is used. Use this information to construct a script that
@@ -2826,6 +2966,7 @@ case "$MANPAGE_FORMAT" in #(vi
esac
cf_edit_man=./edit_man.sh
+cf_man_alias=`pwd`/man_alias.sed
cat >$cf_edit_man <<CF_EOF
#! /bin/sh
@@ -2841,7 +2982,7 @@ NCURSES_PATCH="$NCURSES_PATCH"
NCURSES_OSPEED="$NCURSES_OSPEED"
TERMINFO="$TERMINFO"
-MKDIRS="sh `cd $srcdir && pwd`/mkinstalldirs"
+MKDIRS="sh `cd $srcdir && pwd`/mkdirs.sh"
INSTALL="$INSTALL"
INSTALL_DATA="$INSTALL_DATA"
@@ -2889,6 +3030,32 @@ case \$i in #(vi
\$MKDIRS \$cf_subdir\$section
fi
fi
+
+ # replace variables in man page
+ if test ! -f $cf_man_alias ; then
+cat >>$cf_man_alias <<-CF_EOF2
+ s,@DATADIR@,\$datadir,g
+ s,@TERMINFO@,\$TERMINFO,g
+ s,@NCURSES_MAJOR@,\$NCURSES_MAJOR,g
+ s,@NCURSES_MINOR@,\$NCURSES_MINOR,g
+ s,@NCURSES_PATCH@,\$NCURSES_PATCH,g
+ s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g
+CF_EOF
+ ifelse($1,,,[
+ for cf_name in $1
+ do
+ cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ cf_name=`echo $cf_name|sed "$program_transform_name"`
+cat >>$cf_edit_man <<-CF_EOF
+ s,@$cf_NAME@,$cf_name,
+CF_EOF
+ done
+ ])
+cat >>$cf_edit_man <<CF_EOF
+CF_EOF2
+ echo "...made $cf_man_alias"
+ fi
+
aliases=
cf_source=\`basename \$i\`
inalias=\$cf_source
@@ -2901,7 +3068,7 @@ CF_EOF
if test "$MANPAGE_ALIASES" != no ; then
cat >>$cf_edit_man <<CF_EOF
- aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias | sort -u\`
+ aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias |sed -f $cf_man_alias | sort -u\`
CF_EOF
fi
@@ -2922,36 +3089,13 @@ cat >>$cf_edit_man <<CF_EOF
cf_target="\$cf_source"
fi
cf_target="\$cf_subdir\${section}/\${cf_target}"
-CF_EOF
-fi
- # replace variables in man page
- ifelse($1,,,[
- for cf_name in $1
- do
-cat >>$cf_edit_man <<CF_EOF
- prog_$cf_name=\`echo $cf_name|sed "\${transform}"\`
-CF_EOF
- done
- ])
-cat >>$cf_edit_man <<CF_EOF
- sed -e "s,@DATADIR@,\$datadir," \\
- -e "s,@TERMINFO@,\$TERMINFO," \\
- -e "s,@NCURSES_MAJOR@,\$NCURSES_MAJOR," \\
- -e "s,@NCURSES_MINOR@,\$NCURSES_MINOR," \\
- -e "s,@NCURSES_PATCH@,\$NCURSES_PATCH," \\
- -e "s,@NCURSES_OSPEED@,\$NCURSES_OSPEED," \\
CF_EOF
+fi
- ifelse($1,,,[
- for cf_name in $1
- do
- cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
cat >>$cf_edit_man <<CF_EOF
- -e "s,@$cf_NAME@,\$prog_$cf_name," \\
+ sed -f $cf_man_alias \\
CF_EOF
- done
- ])
if test -f $MANPAGE_RENAMES ; then
cat >>$cf_edit_man <<CF_EOF
@@ -3012,6 +3156,7 @@ cat >>$cf_edit_man <<CF_EOF
if test \$verb = installing ; then
echo \$verb \$cf_target
\$INSTALL_DATA \$TMP \$cf_target
+ test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
cd \$cf_subdir\${section} && (
cf_source=\`echo \$cf_target |sed -e 's%^.*/\([[^/]][[^/]]*/[[^/]][[^/]]*$\)%\1%'\`
@@ -3053,8 +3198,11 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
- echo \$verb \$cf_target
- rm -f \$cf_target
+ test -f \$cf_target && (
+ echo \$verb \$cf_target
+ rm -f \$cf_target
+ )
+ test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
cd \$cf_subdir\${section} && (
for cf_alias in \$aliases
@@ -3192,12 +3340,12 @@ if test "$cf_cv_func_mkstemp" = yes ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MSG_LOG version: 3 updated: 1997/09/07 14:05:52
+dnl CF_MSG_LOG version: 4 updated: 2007/07/29 09:55:12
dnl ----------
dnl Write a debug message to config.log, along with the line number in the
dnl configure script.
AC_DEFUN([CF_MSG_LOG],[
-echo "(line __oline__) testing $* ..." 1>&AC_FD_CC
+echo "${as_me-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_NCURSES_ABI_6 version: 1 updated: 2005/09/17 18:42:49
@@ -3680,7 +3828,73 @@ $1=`echo "$2" | \
-e 's/-[[UD]]$3\(=[[^ ]]*\)\?[$]//g'`
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 41 updated: 2006/12/09 12:32:00
+dnl CF_REMOVE_LIB version: 1 updated: 2007/02/17 14:11:52
+dnl -------------
+dnl Remove the given library from the symbol
+dnl
+dnl $1 = target (which could be the same as the source variable)
+dnl $2 = source (including '$')
+dnl $3 = library to remove
+define([CF_REMOVE_LIB],
+[
+# remove $3 library from $2
+$1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'`
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_RPATH_HACK version: 3 updated: 2007/12/01 11:14:13
+dnl -------------
+AC_DEFUN([CF_RPATH_HACK],
+[
+AC_REQUIRE([CF_SHARED_OPTS])
+AC_MSG_CHECKING(for updated LDFLAGS)
+if test -n "$LDFLAGS" ; then
+AC_MSG_RESULT(maybe)
+CF_VERBOSE(...checking LDFLAGS $LDFLAGS)
+CF_VERBOSE(...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS)
+case "$EXTRA_LDFLAGS" in #(vi
+-Wl,-rpath,*) #(vi
+ cf_rpath_hack="-Wl,-rpath,"
+ ;;
+-R\ *)
+ cf_rpath_hack="-R "
+ ;;
+-R*)
+ cf_rpath_hack="-R"
+ ;;
+*)
+ cf_rpath_hack=
+ ;;
+esac
+if test -n "$cf_rpath_hack" ; then
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+ do
+ CF_VERBOSE(Filtering $cf_rpath_src)
+ case $cf_rpath_src in #(vi
+ -L*) #(vi
+ if test "$cf_rpath_hack" = "-R " ; then
+ cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e 's%-L%-R %'`
+ else
+ cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e s%-L%$cf_rpath_hack%`
+ fi
+ CF_VERBOSE(...Filter $cf_rpath_tmp)
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ ;;
+ *)
+ cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
+ ;;
+ esac
+ done
+ LDFLAGS=$cf_rpath_dst
+ CF_VERBOSE(...checked LDFLAGS $LDFLAGS)
+ CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS)
+fi
+else
+AC_MSG_RESULT(no)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_SHARED_OPTS version: 46 updated: 2007/02/24 18:58:09
dnl --------------
dnl --------------
dnl Attempt to determine the appropriate CC/LD options for creating a shared
@@ -3757,14 +3971,27 @@ AC_DEFUN([CF_SHARED_OPTS],
;;
cygwin*)
CC_SHARED_OPTS=
- MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,--out-implib=../lib/${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/${SHARED_LIB}'
+ MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
cf_cv_shlib_version=cygdll
cf_cv_shlib_version_infix=cygdll
+ cat >mk_shared_lib.sh <<-CF_EOF
+ #!/bin/sh
+ SHARED_LIB=\[$]1
+ IMPORT_LIB=\`echo "\[$]1" | sed -e 's/cyg/lib/' -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
+ shift
+ cat <<-EOF
+ Linking shared library
+ ** SHARED_LIB \[$]SHARED_LIB
+ ** IMPORT_LIB \[$]IMPORT_LIB
+EOF
+ exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
+CF_EOF
+ chmod +x mk_shared_lib.sh
;;
darwin*)
EXTRA_CFLAGS="-no-cpp-precomp"
CC_SHARED_OPTS="-dynamic"
- MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${DESTDIR}${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]'
+ MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]'
test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
cf_cv_shlib_version_infix=yes
AC_CACHE_CHECK([if ld -search_paths_first works], cf_cv_ldflags_search_paths_first, [
@@ -3818,11 +4045,11 @@ AC_DEFUN([CF_SHARED_OPTS],
CF_SHARED_SONAME
MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,-lc -o $[@]'
;;
- openbsd2*)
+ openbsd[[2-9]].*)
CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
MK_SHARED_LIB='${LD} -Bshareable -soname,`basename $[@].${ABI_VERSION}` -o $[@]'
;;
- openbsd*|freebsd[[23]]*)
+ openbsd*|freebsd[[12]].*)
CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
@@ -4043,6 +4270,41 @@ done
fi
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_SIG_ATOMIC_T version: 2 updated: 2005/09/18 17:27:12
+dnl ---------------
+dnl signal handler, but there are some gcc depedencies in that recommendation.
+dnl Try anyway.
+AC_DEFUN([CF_SIG_ATOMIC_T],
+[
+AC_MSG_CHECKING(for signal global datatype)
+AC_CACHE_VAL(cf_cv_sig_atomic_t,[
+ for cf_type in \
+ "volatile sig_atomic_t" \
+ "sig_atomic_t" \
+ "int"
+ do
+ AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <signal.h>
+#include <stdio.h>
+
+extern $cf_type x;
+$cf_type x;
+static void handler(int sig)
+{
+ x = 5;
+}],
+ [signal(SIGINT, handler);
+ x = 1],
+ [cf_cv_sig_atomic_t=$cf_type],
+ [cf_cv_sig_atomic_t=no])
+ test "$cf_cv_sig_atomic_t" != no && break
+ done
+ ])
+AC_MSG_RESULT($cf_cv_sig_atomic_t)
+test "$cf_cv_sig_atomic_t" != no && AC_DEFINE_UNQUOTED(SIG_ATOMIC_T, $cf_cv_sig_atomic_t)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_SIZECHANGE version: 8 updated: 2000/11/04 12:22:16
dnl -------------
dnl Check for definitions & structures needed for window size-changing
@@ -4503,11 +4765,12 @@ AC_DEFUN([CF_UPPER],
$1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_VERBOSE version: 2 updated: 1997/09/05 10:45:14
+dnl CF_VERBOSE version: 3 updated: 2007/07/29 09:55:12
dnl ----------
dnl Use AC_VERBOSE w/o the warnings
AC_DEFUN([CF_VERBOSE],
[test -n "$verbose" && echo " $1" 1>&AC_FD_MSG
+CF_MSG_LOG([$1])
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_WCHAR_TYPE version: 2 updated: 2004/01/17 19:18:20
@@ -4643,7 +4906,7 @@ if test "$with_gpm" != no ; then
fi
])
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_LIBTOOL version: 10 updated: 2006/10/14 15:23:15
+dnl CF_WITH_LIBTOOL version: 18 updated: 2007/04/08 20:02:38
dnl ---------------
dnl Provide a configure option to incorporate libtool. Define several useful
dnl symbols for the makefile rules.
@@ -4692,7 +4955,7 @@ LIB_PREP="$RANLIB"
# doing:
LIB_CLEAN=
LIB_COMPILE=
-LIB_LINK=
+LIB_LINK='${CC}'
LIB_INSTALL=
LIB_UNINSTALL=
@@ -4718,12 +4981,12 @@ ifdef([AC_PROG_LIBTOOL],[
AC_MSG_ERROR(Cannot find libtool)
fi
])dnl
- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` -o'
- LIB_OBJECT='${OBJECTS}.o=.lo)'
+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
+ LIB_OBJECT='${OBJECTS:.o=.lo}'
LIB_SUFFIX=.la
LIB_CLEAN='${LIBTOOL} --mode=clean'
LIB_COMPILE='${LIBTOOL} --mode=compile'
- LIB_LINK='${LIBTOOL} --mode=link'
+ LIB_LINK='${LIBTOOL} --mode=link ${CC} ${LIBTOOL_OPTS}'
LIB_INSTALL='${LIBTOOL} --mode=install'
LIB_UNINSTALL='${LIBTOOL} --mode=uninstall'
LIB_PREP=:
@@ -4734,10 +4997,10 @@ ifdef([AC_PROG_LIBTOOL],[
# Save the version in a cache variable - this is not entirely a good
# thing, but the version string from libtool is very ugly, and for
# bug reports it might be useful to have the original string.
- cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
+ cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
AC_MSG_RESULT($cf_cv_libtool_version)
if test -z "$cf_cv_libtool_version" ; then
- AC_MSG_ERROR(This is not libtool)
+ AC_MSG_ERROR(This is not GNU libtool)
fi
# special hack to add --tag option for C++ compiler
@@ -4758,6 +5021,7 @@ test -z "$LIBTOOL" && ECHO_LT=
AC_SUBST(LIBTOOL)
AC_SUBST(LIBTOOL_CXX)
+AC_SUBST(LIBTOOL_OPTS)
AC_SUBST(LIB_CREATE)
AC_SUBST(LIB_OBJECT)
@@ -4772,7 +5036,7 @@ AC_SUBST(LIB_UNINSTALL)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_PATH version: 7 updated: 2006/08/03 15:20:08
+dnl CF_WITH_PATH version: 8 updated: 2007/05/13 13:16:35
dnl ------------
dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
dnl defaulting to yes/no.
@@ -4786,7 +5050,9 @@ dnl
AC_DEFUN([CF_WITH_PATH],
[AC_ARG_WITH($1,[$2 ](default: ifelse($4,,empty,$4)),,
ifelse($4,,[withval="${$3}"],[withval="${$3-ifelse($5,,$4,$5)}"]))dnl
+if ifelse($5,,true,[test -n "$5"]) ; then
CF_PATH_SYNTAX(withval)
+fi
$3="$withval"
AC_SUBST($3)dnl
])dnl
@@ -4896,7 +5162,7 @@ CF_NO_LEAKS_OPTION(valgrind,
[USE_VALGRIND])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 24 updated: 2006/04/02 16:41:09
+dnl CF_XOPEN_SOURCE version: 25 updated: 2007/01/29 18:36:38
dnl ---------------
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -4930,7 +5196,7 @@ hpux*) #(vi
irix[[56]].*) #(vi
CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
;;
-linux*|gnu*) #(vi
+linux*|gnu*|k*bsd*-gnu) #(vi
CF_GNU_SOURCE
;;
mirbsd*) #(vi
diff --git a/contrib/ncurses/config.guess b/contrib/ncurses/config.guess
index 396482d6cb50..951383e35544 100755
--- a/contrib/ncurses/config.guess
+++ b/contrib/ncurses/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2007-05-17'
# 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
@@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -329,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -780,7 +781,7 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -790,12 +791,15 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[3456]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T:Interix*:[3456]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -950,6 +954,9 @@ EOF
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
+ xtensa:Linux:*:*)
+ echo xtensa-unknown-linux-gnu
+ exit ;;
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
@@ -1208,6 +1215,15 @@ EOF
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
diff --git a/contrib/ncurses/config.sub b/contrib/ncurses/config.sub
index 53954dbe90a9..1761d8bdf630 100755
--- a/contrib/ncurses/config.sub
+++ b/contrib/ncurses/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-08-14'
+timestamp='2007-06-28'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@ case $basic_machine in
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -276,6 +276,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -323,7 +324,7 @@ case $basic_machine in
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -474,8 +475,8 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -682,6 +683,10 @@ case $basic_machine in
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -924,6 +929,9 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1218,7 +1226,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1370,6 +1378,9 @@ else
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
spu-*)
os=-elf
;;
@@ -1410,6 +1421,9 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
diff --git a/contrib/ncurses/configure b/contrib/ncurses/configure
index f46dcb6d248d..65bb06a32f36 100755
--- a/contrib/ncurses/configure
+++ b/contrib/ncurses/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.383 .
+# From configure.in Revision: 1.429 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20061216.
#
@@ -699,6 +699,7 @@ Optional Features:
--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
+ --enable-mixed-case tic should assume mixed-case filenames
--with-install-prefix prefixes actual install-location ($DESTDIR)
Build-Tools Needed to Compile Temporary Applications for Cross-compiling:
--with-build-cc=XXX the build C compiler ($BUILD_CC)
@@ -714,10 +715,12 @@ Options to Specify the Libraries Built/Used:
--with-debug generate debug-libraries (default)
--with-profile generate profile-libraries
--with-termlib generate separate terminfo library
+ --with-ticlib generate separate tic library
--with-gpm use Alessandro Rubini's GPM library
--without-dlsym do not use dlsym() to load GPM dynamically
--with-sysmouse use sysmouse (FreeBSD console)
--enable-rpath use rpath option when generating shared libraries
+ --disable-relink relink shared libraries during install
--with-shlib-version=X Specify rel or abi version for shared libs
Fine-Tuning Your Configuration:
--disable-overwrite leave out the link to -lcurses
@@ -729,6 +732,7 @@ Fine-Tuning Your Configuration:
--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
+ --disable-big-strings assume compiler has only standard-size strings
--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
@@ -759,7 +763,7 @@ Extensions:
--disable-ext-funcs disable function-extensions
--enable-const compile with extra/non-standard const
--enable-no-padding compile with $NCURSES_NO_PADDING code
- --enable-signed-char compile with SIGWINCH handler
+ --enable-signed-char compile using signed Boolean's in term.h
--enable-sigwinch compile with SIGWINCH handler
--enable-tcap-names compile with user-definable terminal capabilities
Development Code:
@@ -772,6 +776,7 @@ Experimental Code:
--enable-colorfgbg compile with $COLORFGBG code
--enable-ext-colors compile for experimental 256-color support
--enable-ext-mouse compile for experimental mouse-encoding
+ --enable-reentrant compile with experimental reentrant code
--enable-safe-sprintf compile with experimental safe-sprintf code
--disable-scroll-hints compile without scroll-hints code
--enable-wgetch-events compile with experimental wgetch-events code
@@ -986,7 +991,7 @@ if test -z "$CONFIG_SITE"; then
fi
for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
- { echo "$as_me:989: loading site script $ac_site_file" >&5
+ { echo "$as_me:994: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
cat "$ac_site_file" >&5
. "$ac_site_file"
@@ -997,7 +1002,7 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { echo "$as_me:1000: loading cache $cache_file" >&5
+ { echo "$as_me:1005: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -1005,7 +1010,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
esac
fi
else
- { echo "$as_me:1008: creating cache $cache_file" >&5
+ { echo "$as_me:1013: creating cache $cache_file" >&5
echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -1021,21 +1026,21 @@ for ac_var in `(set) 2>&1 |
eval ac_new_val="\$ac_env_${ac_var}_value"
case $ac_old_set,$ac_new_set in
set,)
- { echo "$as_me:1024: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ { echo "$as_me:1029: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { echo "$as_me:1028: error: \`$ac_var' was not set in the previous run" >&5
+ { echo "$as_me:1033: error: \`$ac_var' was not set in the previous run" >&5
echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:1034: error: \`$ac_var' has changed since the previous run:" >&5
+ { echo "$as_me:1039: error: \`$ac_var' has changed since the previous run:" >&5
echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:1036: former value: $ac_old_val" >&5
+ { echo "$as_me:1041: former value: $ac_old_val" >&5
echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:1038: current value: $ac_new_val" >&5
+ { echo "$as_me:1043: current value: $ac_new_val" >&5
echo "$as_me: current value: $ac_new_val" >&2;}
ac_cache_corrupted=:
fi;;
@@ -1054,9 +1059,9 @@ echo "$as_me: current value: $ac_new_val" >&2;}
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:1057: error: changes in the environment can compromise the build" >&5
+ { echo "$as_me:1062: error: changes in the environment can compromise the build" >&5
echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { echo "$as_me:1059: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ { { echo "$as_me:1064: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1077,10 +1082,10 @@ esac
echo "#! $SHELL" >conftest.sh
echo "exit 0" >>conftest.sh
chmod +x conftest.sh
-if { (echo "$as_me:1080: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1085: PATH=\".;.\"; conftest.sh") >&5
(PATH=".;."; conftest.sh) 2>&5
ac_status=$?
- echo "$as_me:1083: \$? = $ac_status" >&5
+ echo "$as_me:1088: \$? = $ac_status" >&5
(exit $ac_status); }; then
ac_path_separator=';'
else
@@ -1093,7 +1098,7 @@ ac_config_headers="$ac_config_headers include/ncurses_cfg.h:include/ncurses_cfg.
top_builddir=`pwd`
-echo "$as_me:1096: checking for egrep" >&5
+echo "$as_me:1101: checking for egrep" >&5
echo $ECHO_N "checking for egrep... $ECHO_C" >&6
if test "${ac_cv_prog_egrep+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1103,11 +1108,11 @@ else
else ac_cv_prog_egrep='egrep'
fi
fi
-echo "$as_me:1106: result: $ac_cv_prog_egrep" >&5
+echo "$as_me:1111: result: $ac_cv_prog_egrep" >&5
echo "${ECHO_T}$ac_cv_prog_egrep" >&6
EGREP=$ac_cv_prog_egrep
-test -z "$EGREP" && { { echo "$as_me:1110: error: No egrep program found" >&5
+test -z "$EGREP" && { { echo "$as_me:1115: error: No egrep program found" >&5
echo "$as_me: error: No egrep program found" >&2;}
{ (exit 1); exit 1; }; }
@@ -1117,7 +1122,7 @@ NCURSES_PATCH="`$ac_cv_prog_egrep '^NCURSES_PATCH[ ]*=' $srcdir/dist.mk | sed -
cf_cv_abi_version=${NCURSES_MAJOR}
cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
cf_cv_timestamp=`date`
-echo "$as_me:1120: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+echo "$as_me:1125: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
@@ -1125,7 +1130,7 @@ test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
# Check whether --with-rel-version or --without-rel-version was given.
if test "${with_rel_version+set}" = set; then
withval="$with_rel_version"
- { echo "$as_me:1128: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
+ { echo "$as_me:1133: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
cf_cv_rel_version=$withval
fi;
@@ -1138,13 +1143,13 @@ if test -n "$NCURSES_MAJOR" ; then
[0-9]*) #(vi
;;
*)
- { { echo "$as_me:1141: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
+ { { echo "$as_me:1146: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
{ (exit 1); exit 1; }; }
;;
esac
else
- { { echo "$as_me:1147: error: Release major-version value is empty" >&5
+ { { echo "$as_me:1152: error: Release major-version value is empty" >&5
echo "$as_me: error: Release major-version value is empty" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1154,13 +1159,13 @@ if test -n "$NCURSES_MINOR" ; then
[0-9]*) #(vi
;;
*)
- { { echo "$as_me:1157: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
+ { { echo "$as_me:1162: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
{ (exit 1); exit 1; }; }
;;
esac
else
- { { echo "$as_me:1163: error: Release minor-version value is empty" >&5
+ { { echo "$as_me:1168: error: Release minor-version value is empty" >&5
echo "$as_me: error: Release minor-version value is empty" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1170,7 +1175,7 @@ test -z "$cf_cv_abi_version" && cf_cv_abi_version=0
# Check whether --with-abi-version or --without-abi-version was given.
if test "${with_abi_version+set}" = set; then
withval="$with_abi_version"
- { echo "$as_me:1173: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+ { echo "$as_me:1178: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
cf_cv_abi_version=$withval
fi;
@@ -1180,13 +1185,13 @@ if test -n "$cf_cv_abi_version" ; then
[0-9]*) #(vi
;;
*)
- { { echo "$as_me:1183: error: ABI version is not a number: $cf_cv_abi_version" >&5
+ { { echo "$as_me:1188: error: ABI version is not a number: $cf_cv_abi_version" >&5
echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
{ (exit 1); exit 1; }; }
;;
esac
else
- { { echo "$as_me:1189: error: ABI version value is empty" >&5
+ { { echo "$as_me:1194: error: ABI version value is empty" >&5
echo "$as_me: error: ABI version value is empty" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1208,7 +1213,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:1211: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ { { echo "$as_me:1216: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1218,11 +1223,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
# Make sure we can run config.sub.
$ac_config_sub sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:1221: error: cannot run $ac_config_sub" >&5
+ { { echo "$as_me:1226: error: cannot run $ac_config_sub" >&5
echo "$as_me: error: cannot run $ac_config_sub" >&2;}
{ (exit 1); exit 1; }; }
-echo "$as_me:1225: checking build system type" >&5
+echo "$as_me:1230: checking build system type" >&5
echo $ECHO_N "checking build system type... $ECHO_C" >&6
if test "${ac_cv_build+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1231,23 +1236,23 @@ else
test -z "$ac_cv_build_alias" &&
ac_cv_build_alias=`$ac_config_guess`
test -z "$ac_cv_build_alias" &&
- { { echo "$as_me:1234: error: cannot guess build type; you must specify one" >&5
+ { { echo "$as_me:1239: error: cannot guess build type; you must specify one" >&5
echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
{ (exit 1); exit 1; }; }
ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
- { { echo "$as_me:1238: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ { { echo "$as_me:1243: error: $ac_config_sub $ac_cv_build_alias failed." >&5
echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:1243: result: $ac_cv_build" >&5
+echo "$as_me:1248: result: $ac_cv_build" >&5
echo "${ECHO_T}$ac_cv_build" >&6
build=$ac_cv_build
build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$as_me:1250: checking host system type" >&5
+echo "$as_me:1255: checking host system type" >&5
echo $ECHO_N "checking host system type... $ECHO_C" >&6
if test "${ac_cv_host+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1256,12 +1261,12 @@ else
test -z "$ac_cv_host_alias" &&
ac_cv_host_alias=$ac_cv_build_alias
ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
- { { echo "$as_me:1259: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ { { echo "$as_me:1264: error: $ac_config_sub $ac_cv_host_alias failed" >&5
echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:1264: result: $ac_cv_host" >&5
+echo "$as_me:1269: result: $ac_cv_host" >&5
echo "${ECHO_T}$ac_cv_host" >&6
host=$ac_cv_host
host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1269,7 +1274,7 @@ host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
- echo "$as_me:1272: checking target system type" >&5
+ echo "$as_me:1277: checking target system type" >&5
echo $ECHO_N "checking target system type... $ECHO_C" >&6
if test "${ac_cv_target+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1278,12 +1283,12 @@ else
test "x$ac_cv_target_alias" = "x" &&
ac_cv_target_alias=$ac_cv_host_alias
ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
- { { echo "$as_me:1281: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+ { { echo "$as_me:1286: error: $ac_config_sub $ac_cv_target_alias failed" >&5
echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:1286: result: $ac_cv_target" >&5
+echo "$as_me:1291: result: $ac_cv_target" >&5
echo "${ECHO_T}$ac_cv_target" >&6
target=$ac_cv_target
target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1314,13 +1319,13 @@ else
fi
test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1317: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1322: result: Configuring for $cf_cv_system_name" >&5
echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
if test ".$system_name" != ".$cf_cv_system_name" ; then
- echo "$as_me:1321: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+ echo "$as_me:1326: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
- { { echo "$as_me:1323: error: \"Please remove config.cache and try again.\"" >&5
+ { { echo "$as_me:1328: error: \"Please remove config.cache and try again.\"" >&5
echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1328,7 +1333,7 @@ fi
# Check whether --with-system-type or --without-system-type was given.
if test "${with_system_type+set}" = set; then
withval="$with_system_type"
- { echo "$as_me:1331: WARNING: overriding system type to $withval" >&5
+ { echo "$as_me:1336: WARNING: overriding system type to $withval" >&5
echo "$as_me: WARNING: overriding system type to $withval" >&2;}
cf_cv_system_name=$withval
fi;
@@ -1338,7 +1343,7 @@ cf_user_CFLAGS="$CFLAGS"
### Default install-location
-echo "$as_me:1341: checking for prefix" >&5
+echo "$as_me:1346: checking for prefix" >&5
echo $ECHO_N "checking for prefix... $ECHO_C" >&6
if test "x$prefix" = "xNONE" ; then
case "$cf_cv_system_name" in
@@ -1350,11 +1355,11 @@ if test "x$prefix" = "xNONE" ; then
;;
esac
fi
-echo "$as_me:1353: result: $prefix" >&5
+echo "$as_me:1358: result: $prefix" >&5
echo "${ECHO_T}$prefix" >&6
if test "x$prefix" = "xNONE" ; then
-echo "$as_me:1357: checking for default include-directory" >&5
+echo "$as_me:1362: checking for default include-directory" >&5
echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
test -n "$verbose" && echo 1>&6
for cf_symbol in \
@@ -1377,7 +1382,7 @@ do
fi
test -n "$verbose" && echo " tested $cf_dir" 1>&6
done
-echo "$as_me:1380: result: $includedir" >&5
+echo "$as_me:1385: result: $includedir" >&5
echo "${ECHO_T}$includedir" >&6
fi
@@ -1391,7 +1396,7 @@ ac_main_return=return
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1394: checking for $ac_word" >&5
+echo "$as_me:1399: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1406,7 +1411,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1409: found $ac_dir/$ac_word" >&5
+echo "$as_me:1414: found $ac_dir/$ac_word" >&5
break
done
@@ -1414,10 +1419,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1417: result: $CC" >&5
+ echo "$as_me:1422: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1420: result: no" >&5
+ echo "$as_me:1425: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1426,7 +1431,7 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-echo "$as_me:1429: checking for $ac_word" >&5
+echo "$as_me:1434: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1441,7 +1446,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1444: found $ac_dir/$ac_word" >&5
+echo "$as_me:1449: found $ac_dir/$ac_word" >&5
break
done
@@ -1449,10 +1454,10 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1452: result: $ac_ct_CC" >&5
+ echo "$as_me:1457: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1455: result: no" >&5
+ echo "$as_me:1460: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1465,7 +1470,7 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1468: checking for $ac_word" >&5
+echo "$as_me:1473: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1480,7 +1485,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1483: found $ac_dir/$ac_word" >&5
+echo "$as_me:1488: found $ac_dir/$ac_word" >&5
break
done
@@ -1488,10 +1493,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1491: result: $CC" >&5
+ echo "$as_me:1496: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1494: result: no" >&5
+ echo "$as_me:1499: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1500,7 +1505,7 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-echo "$as_me:1503: checking for $ac_word" >&5
+echo "$as_me:1508: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1515,7 +1520,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1518: found $ac_dir/$ac_word" >&5
+echo "$as_me:1523: found $ac_dir/$ac_word" >&5
break
done
@@ -1523,10 +1528,10 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1526: result: $ac_ct_CC" >&5
+ echo "$as_me:1531: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1529: result: no" >&5
+ echo "$as_me:1534: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1539,7 +1544,7 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-echo "$as_me:1542: checking for $ac_word" >&5
+echo "$as_me:1547: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1559,7 +1564,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
continue
fi
ac_cv_prog_CC="cc"
-echo "$as_me:1562: found $ac_dir/$ac_word" >&5
+echo "$as_me:1567: found $ac_dir/$ac_word" >&5
break
done
@@ -1581,10 +1586,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1584: result: $CC" >&5
+ echo "$as_me:1589: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1587: result: no" >&5
+ echo "$as_me:1592: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1595,7 +1600,7 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1598: checking for $ac_word" >&5
+echo "$as_me:1603: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1610,7 +1615,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1613: found $ac_dir/$ac_word" >&5
+echo "$as_me:1618: found $ac_dir/$ac_word" >&5
break
done
@@ -1618,10 +1623,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1621: result: $CC" >&5
+ echo "$as_me:1626: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1624: result: no" >&5
+ echo "$as_me:1629: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1634,7 +1639,7 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:1637: checking for $ac_word" >&5
+echo "$as_me:1642: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1649,7 +1654,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1652: found $ac_dir/$ac_word" >&5
+echo "$as_me:1657: found $ac_dir/$ac_word" >&5
break
done
@@ -1657,10 +1662,10 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1660: result: $ac_ct_CC" >&5
+ echo "$as_me:1665: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1663: result: no" >&5
+ echo "$as_me:1668: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1672,32 +1677,32 @@ fi
fi
-test -z "$CC" && { { echo "$as_me:1675: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1680: error: no acceptable cc found in \$PATH" >&5
echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
-echo "$as_me:1680:" \
+echo "$as_me:1685:" \
"checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1683: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1688: \"$ac_compiler --version </dev/null >&5\"") >&5
(eval $ac_compiler --version </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1686: \$? = $ac_status" >&5
+ echo "$as_me:1691: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:1688: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1693: \"$ac_compiler -v </dev/null >&5\"") >&5
(eval $ac_compiler -v </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1691: \$? = $ac_status" >&5
+ echo "$as_me:1696: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:1693: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1698: \"$ac_compiler -V </dev/null >&5\"") >&5
(eval $ac_compiler -V </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1696: \$? = $ac_status" >&5
+ echo "$as_me:1701: \$? = $ac_status" >&5
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
-#line 1700 "configure"
+#line 1705 "configure"
#include "confdefs.h"
int
@@ -1713,13 +1718,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-echo "$as_me:1716: checking for C compiler default output" >&5
+echo "$as_me:1721: checking for C compiler default output" >&5
echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1719: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1724: \"$ac_link_default\"") >&5
(eval $ac_link_default) 2>&5
ac_status=$?
- echo "$as_me:1722: \$? = $ac_status" >&5
+ echo "$as_me:1727: \$? = $ac_status" >&5
(exit $ac_status); }; then
# Find the output, starting from the most likely. This scheme is
# not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -1742,34 +1747,34 @@ done
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-{ { echo "$as_me:1745: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1750: error: C compiler cannot create executables" >&5
echo "$as_me: error: C compiler cannot create executables" >&2;}
{ (exit 77); exit 77; }; }
fi
ac_exeext=$ac_cv_exeext
-echo "$as_me:1751: result: $ac_file" >&5
+echo "$as_me:1756: result: $ac_file" >&5
echo "${ECHO_T}$ac_file" >&6
# Check the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-echo "$as_me:1756: checking whether the C compiler works" >&5
+echo "$as_me:1761: checking whether the C compiler works" >&5
echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
if { ac_try='./$ac_file'
- { (eval echo "$as_me:1762: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1767: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1765: \$? = $ac_status" >&5
+ echo "$as_me:1770: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cross_compiling=no
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { echo "$as_me:1772: error: cannot run C compiled programs.
+ { { echo "$as_me:1777: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'." >&5
echo "$as_me: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'." >&2;}
@@ -1777,24 +1782,24 @@ If you meant to cross compile, use \`--host'." >&2;}
fi
fi
fi
-echo "$as_me:1780: result: yes" >&5
+echo "$as_me:1785: result: yes" >&5
echo "${ECHO_T}yes" >&6
rm -f a.out a.exe conftest$ac_cv_exeext
ac_clean_files=$ac_clean_files_save
# Check the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-echo "$as_me:1787: checking whether we are cross compiling" >&5
+echo "$as_me:1792: checking whether we are cross compiling" >&5
echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1789: result: $cross_compiling" >&5
+echo "$as_me:1794: result: $cross_compiling" >&5
echo "${ECHO_T}$cross_compiling" >&6
-echo "$as_me:1792: checking for executable suffix" >&5
+echo "$as_me:1797: checking for executable suffix" >&5
echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1794: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1799: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:1797: \$? = $ac_status" >&5
+ echo "$as_me:1802: \$? = $ac_status" >&5
(exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
@@ -1810,25 +1815,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
esac
done
else
- { { echo "$as_me:1813: error: cannot compute EXEEXT: cannot compile and link" >&5
+ { { echo "$as_me:1818: error: cannot compute EXEEXT: cannot compile and link" >&5
echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f conftest$ac_cv_exeext
-echo "$as_me:1819: result: $ac_cv_exeext" >&5
+echo "$as_me:1824: result: $ac_cv_exeext" >&5
echo "${ECHO_T}$ac_cv_exeext" >&6
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-echo "$as_me:1825: checking for object suffix" >&5
+echo "$as_me:1830: checking for object suffix" >&5
echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 1831 "configure"
+#line 1836 "configure"
#include "confdefs.h"
int
@@ -1840,10 +1845,10 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1843: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1848: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1846: \$? = $ac_status" >&5
+ echo "$as_me:1851: \$? = $ac_status" >&5
(exit $ac_status); }; then
for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
case $ac_file in
@@ -1855,24 +1860,24 @@ done
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-{ { echo "$as_me:1858: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1863: error: cannot compute OBJEXT: cannot compile" >&5
echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-echo "$as_me:1865: result: $ac_cv_objext" >&5
+echo "$as_me:1870: result: $ac_cv_objext" >&5
echo "${ECHO_T}$ac_cv_objext" >&6
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-echo "$as_me:1869: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1874: checking whether we are using the GNU C compiler" >&5
echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 1875 "configure"
+#line 1880 "configure"
#include "confdefs.h"
int
@@ -1887,16 +1892,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1890: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1895: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1893: \$? = $ac_status" >&5
+ echo "$as_me:1898: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1896: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1901: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1899: \$? = $ac_status" >&5
+ echo "$as_me:1904: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_compiler_gnu=yes
else
@@ -1908,19 +1913,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:1911: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1916: result: $ac_cv_c_compiler_gnu" >&5
echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
GCC=`test $ac_compiler_gnu = yes && echo yes`
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
CFLAGS="-g"
-echo "$as_me:1917: checking whether $CC accepts -g" >&5
+echo "$as_me:1922: checking whether $CC accepts -g" >&5
echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
if test "${ac_cv_prog_cc_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 1923 "configure"
+#line 1928 "configure"
#include "confdefs.h"
int
@@ -1932,16 +1937,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1935: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1940: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1938: \$? = $ac_status" >&5
+ echo "$as_me:1943: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1941: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1946: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1944: \$? = $ac_status" >&5
+ echo "$as_me:1949: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cc_g=yes
else
@@ -1951,7 +1956,7 @@ ac_cv_prog_cc_g=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:1954: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1959: result: $ac_cv_prog_cc_g" >&5
echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
@@ -1978,16 +1983,16 @@ cat >conftest.$ac_ext <<_ACEOF
#endif
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1981: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1986: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1984: \$? = $ac_status" >&5
+ echo "$as_me:1989: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1987: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1992: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1990: \$? = $ac_status" >&5
+ echo "$as_me:1995: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
''\
@@ -1999,7 +2004,7 @@ if { (eval echo "$as_me:1981: \"$ac_compile\"") >&5
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
-#line 2002 "configure"
+#line 2007 "configure"
#include "confdefs.h"
#include <stdlib.h>
$ac_declaration
@@ -2012,16 +2017,16 @@ exit (42);
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2020: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2018: \$? = $ac_status" >&5
+ echo "$as_me:2023: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2021: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2026: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2024: \$? = $ac_status" >&5
+ echo "$as_me:2029: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -2031,7 +2036,7 @@ continue
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 2034 "configure"
+#line 2039 "configure"
#include "confdefs.h"
$ac_declaration
int
@@ -2043,16 +2048,16 @@ exit (42);
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2046: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2051: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2049: \$? = $ac_status" >&5
+ echo "$as_me:2054: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2052: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2057: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2055: \$? = $ac_status" >&5
+ echo "$as_me:2060: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -2082,11 +2087,11 @@ ac_main_return=return
GCC_VERSION=none
if test "$GCC" = yes ; then
- echo "$as_me:2085: checking version of $CC" >&5
+ echo "$as_me:2090: checking version of $CC" >&5
echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
test -z "$GCC_VERSION" && GCC_VERSION=unknown
- echo "$as_me:2089: result: $GCC_VERSION" >&5
+ echo "$as_me:2094: result: $GCC_VERSION" >&5
echo "${ECHO_T}$GCC_VERSION" >&6
fi
@@ -2096,7 +2101,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_main_return=return
-echo "$as_me:2099: checking how to run the C preprocessor" >&5
+echo "$as_me:2104: checking how to run the C preprocessor" >&5
echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
@@ -2117,18 +2122,18 @@ do
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
-#line 2120 "configure"
+#line 2125 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax error
_ACEOF
-if { (eval echo "$as_me:2125: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2130: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:2131: \$? = $ac_status" >&5
+ echo "$as_me:2136: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2151,17 +2156,17 @@ rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line 2154 "configure"
+#line 2159 "configure"
#include "confdefs.h"
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:2158: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2163: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:2164: \$? = $ac_status" >&5
+ echo "$as_me:2169: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2198,7 +2203,7 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-echo "$as_me:2201: result: $CPP" >&5
+echo "$as_me:2206: result: $CPP" >&5
echo "${ECHO_T}$CPP" >&6
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
@@ -2208,18 +2213,18 @@ do
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
-#line 2211 "configure"
+#line 2216 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax error
_ACEOF
-if { (eval echo "$as_me:2216: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2221: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:2222: \$? = $ac_status" >&5
+ echo "$as_me:2227: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2242,17 +2247,17 @@ rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line 2245 "configure"
+#line 2250 "configure"
#include "confdefs.h"
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:2249: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2254: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:2255: \$? = $ac_status" >&5
+ echo "$as_me:2260: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2280,7 +2285,7 @@ rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then
:
else
- { { echo "$as_me:2283: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ { { echo "$as_me:2288: error: C preprocessor \"$CPP\" fails sanity check" >&5
echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -2293,14 +2298,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_main_return=return
if test $ac_cv_c_compiler_gnu = yes; then
- echo "$as_me:2296: checking whether $CC needs -traditional" >&5
+ echo "$as_me:2301: checking whether $CC needs -traditional" >&5
echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
if test "${ac_cv_prog_gcc_traditional+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_pattern="Autoconf.*'x'"
cat >conftest.$ac_ext <<_ACEOF
-#line 2303 "configure"
+#line 2308 "configure"
#include "confdefs.h"
#include <sgtty.h>
int Autoconf = TIOCGETP;
@@ -2315,7 +2320,7 @@ rm -f conftest*
if test $ac_cv_prog_gcc_traditional = no; then
cat >conftest.$ac_ext <<_ACEOF
-#line 2318 "configure"
+#line 2323 "configure"
#include "confdefs.h"
#include <termio.h>
int Autoconf = TCGETA;
@@ -2328,14 +2333,14 @@ rm -f conftest*
fi
fi
-echo "$as_me:2331: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:2336: result: $ac_cv_prog_gcc_traditional" >&5
echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
if test $ac_cv_prog_gcc_traditional = yes; then
CC="$CC -traditional"
fi
fi
-echo "$as_me:2338: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:2343: checking whether $CC understands -c and -o together" >&5
echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
if test "${cf_cv_prog_CC_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2351,15 +2356,15 @@ CF_EOF
# We do the test twice because some compilers refuse to overwrite an
# existing .o file with -o, though they will create one.
ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-if { (eval echo "$as_me:2354: \"$ac_try\"") >&5
+if { (eval echo "$as_me:2359: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2357: \$? = $ac_status" >&5
+ echo "$as_me:2362: \$? = $ac_status" >&5
(exit $ac_status); } &&
- test -f conftest2.$ac_objext && { (eval echo "$as_me:2359: \"$ac_try\"") >&5
+ test -f conftest2.$ac_objext && { (eval echo "$as_me:2364: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2362: \$? = $ac_status" >&5
+ echo "$as_me:2367: \$? = $ac_status" >&5
(exit $ac_status); };
then
eval cf_cv_prog_CC_c_o=yes
@@ -2370,19 +2375,19 @@ rm -f conftest*
fi
if test $cf_cv_prog_CC_c_o = yes; then
- echo "$as_me:2373: result: yes" >&5
+ echo "$as_me:2378: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
- echo "$as_me:2376: result: no" >&5
+ echo "$as_me:2381: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:2380: checking for POSIXized ISC" >&5
+echo "$as_me:2385: checking for POSIXized ISC" >&5
echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
if test -d /etc/conf/kconfig.d &&
grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
then
- echo "$as_me:2385: result: yes" >&5
+ echo "$as_me:2390: result: yes" >&5
echo "${ECHO_T}yes" >&6
ISC=yes # If later tests want to check for ISC.
@@ -2396,12 +2401,12 @@ EOF
CC="$CC -Xp"
fi
else
- echo "$as_me:2399: result: no" >&5
+ echo "$as_me:2404: result: no" >&5
echo "${ECHO_T}no" >&6
ISC=
fi
-echo "$as_me:2404: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "$as_me:2409: checking for ${CC-cc} option to accept ANSI C" >&5
echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
if test "${cf_cv_ansi_cc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2495,7 +2500,7 @@ if test -n "$cf_new_extra_cppflags" ; then
fi
cat >conftest.$ac_ext <<_ACEOF
-#line 2498 "configure"
+#line 2503 "configure"
#include "confdefs.h"
#ifndef CC_HAS_PROTOS
@@ -2516,16 +2521,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2519: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2524: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2522: \$? = $ac_status" >&5
+ echo "$as_me:2527: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2525: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2530: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2528: \$? = $ac_status" >&5
+ echo "$as_me:2533: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ansi_cc="$cf_arg"; break
else
@@ -2538,7 +2543,7 @@ CFLAGS="$cf_save_CFLAGS"
CPPFLAGS="$cf_save_CPPFLAGS"
fi
-echo "$as_me:2541: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:2546: result: $cf_cv_ansi_cc" >&5
echo "${ECHO_T}$cf_cv_ansi_cc" >&6
if test "$cf_cv_ansi_cc" != "no"; then
@@ -2621,7 +2626,7 @@ fi
fi
if test "$cf_cv_ansi_cc" = "no"; then
- { { echo "$as_me:2624: error: Your compiler does not appear to recognize prototypes.
+ { { echo "$as_me:2629: error: Your compiler does not appear to recognize prototypes.
You have the following choices:
a. adjust your compiler options
b. get an up-to-date compiler
@@ -2661,7 +2666,7 @@ freebsd*) #(vi
*) LDPATH=$PATH:/sbin:/usr/sbin
# Extract the first word of "ldconfig", so it can be a program name with args.
set dummy ldconfig; ac_word=$2
-echo "$as_me:2664: checking for $ac_word" >&5
+echo "$as_me:2669: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_LDCONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2678,7 +2683,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
- echo "$as_me:2681: found $ac_dir/$ac_word" >&5
+ echo "$as_me:2686: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -2689,10 +2694,10 @@ fi
LDCONFIG=$ac_cv_path_LDCONFIG
if test -n "$LDCONFIG"; then
- echo "$as_me:2692: result: $LDCONFIG" >&5
+ echo "$as_me:2697: result: $LDCONFIG" >&5
echo "${ECHO_T}$LDCONFIG" >&6
else
- echo "$as_me:2695: result: no" >&5
+ echo "$as_me:2700: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -2700,7 +2705,7 @@ fi
esac
fi
-echo "$as_me:2703: checking if you want to ensure bool is consistent with C++" >&5
+echo "$as_me:2708: checking if you want to ensure bool is consistent with C++" >&5
echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
# Check whether --with-cxx or --without-cxx was given.
@@ -2710,7 +2715,7 @@ if test "${with_cxx+set}" = set; then
else
cf_with_cxx=yes
fi;
-echo "$as_me:2713: result: $cf_with_cxx" >&5
+echo "$as_me:2718: result: $cf_with_cxx" >&5
echo "${ECHO_T}$cf_with_cxx" >&6
if test "X$cf_with_cxx" = Xno ; then
CXX=""
@@ -2728,7 +2733,7 @@ if test -n "$ac_tool_prefix"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:2731: checking for $ac_word" >&5
+echo "$as_me:2736: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2743,7 +2748,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-echo "$as_me:2746: found $ac_dir/$ac_word" >&5
+echo "$as_me:2751: found $ac_dir/$ac_word" >&5
break
done
@@ -2751,10 +2756,10 @@ fi
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
- echo "$as_me:2754: result: $CXX" >&5
+ echo "$as_me:2759: result: $CXX" >&5
echo "${ECHO_T}$CXX" >&6
else
- echo "$as_me:2757: result: no" >&5
+ echo "$as_me:2762: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -2767,7 +2772,7 @@ if test -z "$CXX"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:2770: checking for $ac_word" >&5
+echo "$as_me:2775: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2782,7 +2787,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_CXX="$ac_prog"
-echo "$as_me:2785: found $ac_dir/$ac_word" >&5
+echo "$as_me:2790: found $ac_dir/$ac_word" >&5
break
done
@@ -2790,10 +2795,10 @@ fi
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
- echo "$as_me:2793: result: $ac_ct_CXX" >&5
+ echo "$as_me:2798: result: $ac_ct_CXX" >&5
echo "${ECHO_T}$ac_ct_CXX" >&6
else
- echo "$as_me:2796: result: no" >&5
+ echo "$as_me:2801: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -2805,32 +2810,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
fi
# Provide some information about the compiler.
-echo "$as_me:2808:" \
+echo "$as_me:2813:" \
"checking for C++ compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:2811: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2816: \"$ac_compiler --version </dev/null >&5\"") >&5
(eval $ac_compiler --version </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:2814: \$? = $ac_status" >&5
+ echo "$as_me:2819: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:2816: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2821: \"$ac_compiler -v </dev/null >&5\"") >&5
(eval $ac_compiler -v </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:2819: \$? = $ac_status" >&5
+ echo "$as_me:2824: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:2821: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2826: \"$ac_compiler -V </dev/null >&5\"") >&5
(eval $ac_compiler -V </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:2824: \$? = $ac_status" >&5
+ echo "$as_me:2829: \$? = $ac_status" >&5
(exit $ac_status); }
-echo "$as_me:2827: checking whether we are using the GNU C++ compiler" >&5
+echo "$as_me:2832: checking whether we are using the GNU C++ compiler" >&5
echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 2833 "configure"
+#line 2838 "configure"
#include "confdefs.h"
int
@@ -2845,16 +2850,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2848: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2853: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2851: \$? = $ac_status" >&5
+ echo "$as_me:2856: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2854: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2859: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2857: \$? = $ac_status" >&5
+ echo "$as_me:2862: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_compiler_gnu=yes
else
@@ -2866,19 +2871,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:2869: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "$as_me:2874: result: $ac_cv_cxx_compiler_gnu" >&5
echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
GXX=`test $ac_compiler_gnu = yes && echo yes`
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="-g"
-echo "$as_me:2875: checking whether $CXX accepts -g" >&5
+echo "$as_me:2880: checking whether $CXX accepts -g" >&5
echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
if test "${ac_cv_prog_cxx_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 2881 "configure"
+#line 2886 "configure"
#include "confdefs.h"
int
@@ -2890,16 +2895,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2893: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2898: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2896: \$? = $ac_status" >&5
+ echo "$as_me:2901: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2899: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2904: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2902: \$? = $ac_status" >&5
+ echo "$as_me:2907: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cxx_g=yes
else
@@ -2909,7 +2914,7 @@ ac_cv_prog_cxx_g=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:2912: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:2917: result: $ac_cv_prog_cxx_g" >&5
echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
@@ -2936,7 +2941,7 @@ for ac_declaration in \
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
-#line 2939 "configure"
+#line 2944 "configure"
#include "confdefs.h"
#include <stdlib.h>
$ac_declaration
@@ -2949,16 +2954,16 @@ exit (42);
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2952: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2957: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2955: \$? = $ac_status" >&5
+ echo "$as_me:2960: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2958: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2963: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2961: \$? = $ac_status" >&5
+ echo "$as_me:2966: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -2968,7 +2973,7 @@ continue
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 2971 "configure"
+#line 2976 "configure"
#include "confdefs.h"
$ac_declaration
int
@@ -2980,16 +2985,16 @@ exit (42);
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2983: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2988: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2986: \$? = $ac_status" >&5
+ echo "$as_me:2991: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2989: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2994: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2992: \$? = $ac_status" >&5
+ echo "$as_me:2997: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -3016,7 +3021,7 @@ ac_main_return=return
if test "$CXX" = "g++" ; then
# Extract the first word of "g++", so it can be a program name with args.
set dummy g++; ac_word=$2
-echo "$as_me:3019: checking for $ac_word" >&5
+echo "$as_me:3024: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3033,7 +3038,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_CXX="$ac_dir/$ac_word"
- echo "$as_me:3036: found $ac_dir/$ac_word" >&5
+ echo "$as_me:3041: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -3044,16 +3049,16 @@ fi
CXX=$ac_cv_path_CXX
if test -n "$CXX"; then
- echo "$as_me:3047: result: $CXX" >&5
+ echo "$as_me:3052: result: $CXX" >&5
echo "${ECHO_T}$CXX" >&6
else
- echo "$as_me:3050: result: no" >&5
+ echo "$as_me:3055: result: no" >&5
echo "${ECHO_T}no" >&6
fi
fi
if test "$CXX" = "g++" ; then
- { echo "$as_me:3056: WARNING: ignoring hardcoded g++" >&5
+ { echo "$as_me:3061: WARNING: ignoring hardcoded g++" >&5
echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
cf_with_cxx=no; CXX=""; GXX="";
fi
@@ -3061,11 +3066,11 @@ fi
GXX_VERSION=none
if test "$GXX" = yes; then
- echo "$as_me:3064: checking version of g++" >&5
+ echo "$as_me:3069: checking version of g++" >&5
echo $ECHO_N "checking version of g++... $ECHO_C" >&6
GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
test -z "$GXX_VERSION" && GXX_VERSION=unknown
- echo "$as_me:3068: result: $GXX_VERSION" >&5
+ echo "$as_me:3073: result: $GXX_VERSION" >&5
echo "${ECHO_T}$GXX_VERSION" >&6
fi
@@ -3073,12 +3078,12 @@ case $GXX_VERSION in
1*|2.[0-6]*)
# GXX=""; CXX=""; ac_cv_prog_gxx=no
# cf_cxx_library=no
- { echo "$as_me:3076: WARNING: templates do not work" >&5
+ { echo "$as_me:3081: WARNING: templates do not work" >&5
echo "$as_me: WARNING: templates do not work" >&2;}
;;
esac
-echo "$as_me:3081: checking if you want to build C++ binding and demo" >&5
+echo "$as_me:3086: checking if you want to build C++ binding and demo" >&5
echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
# Check whether --with-cxx-binding or --without-cxx-binding was given.
@@ -3088,10 +3093,10 @@ if test "${with_cxx_binding+set}" = set; then
else
cf_with_cxx_binding=$cf_with_cxx
fi;
-echo "$as_me:3091: result: $cf_with_cxx_binding" >&5
+echo "$as_me:3096: result: $cf_with_cxx_binding" >&5
echo "${ECHO_T}$cf_with_cxx_binding" >&6
-echo "$as_me:3094: checking if you want to build with Ada95" >&5
+echo "$as_me:3099: checking if you want to build with Ada95" >&5
echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
# Check whether --with-ada or --without-ada was given.
@@ -3101,10 +3106,10 @@ if test "${with_ada+set}" = set; then
else
cf_with_ada=yes
fi;
-echo "$as_me:3104: result: $cf_with_ada" >&5
+echo "$as_me:3109: result: $cf_with_ada" >&5
echo "${ECHO_T}$cf_with_ada" >&6
-echo "$as_me:3107: checking if you want to build programs such as tic" >&5
+echo "$as_me:3112: checking if you want to build programs such as tic" >&5
echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
# Check whether --with-progs or --without-progs was given.
@@ -3114,10 +3119,10 @@ if test "${with_progs+set}" = set; then
else
cf_with_progs=yes
fi;
-echo "$as_me:3117: result: $cf_with_progs" >&5
+echo "$as_me:3122: result: $cf_with_progs" >&5
echo "${ECHO_T}$cf_with_progs" >&6
-echo "$as_me:3120: checking if you wish to install curses.h" >&5
+echo "$as_me:3125: checking if you wish to install curses.h" >&5
echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
# Check whether --with-curses-h or --without-curses-h was given.
@@ -3127,7 +3132,7 @@ if test "${with_curses_h+set}" = set; then
else
with_curses_h=yes
fi;
-echo "$as_me:3130: result: $with_curses_h" >&5
+echo "$as_me:3135: result: $with_curses_h" >&5
echo "${ECHO_T}$with_curses_h" >&6
modules_to_build="ncurses"
@@ -3153,7 +3158,7 @@ for ac_prog in mawk gawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:3156: checking for $ac_word" >&5
+echo "$as_me:3161: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3168,7 +3173,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:3171: found $ac_dir/$ac_word" >&5
+echo "$as_me:3176: found $ac_dir/$ac_word" >&5
break
done
@@ -3176,21 +3181,21 @@ fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- echo "$as_me:3179: result: $AWK" >&5
+ echo "$as_me:3184: result: $AWK" >&5
echo "${ECHO_T}$AWK" >&6
else
- echo "$as_me:3182: result: no" >&5
+ echo "$as_me:3187: result: no" >&5
echo "${ECHO_T}no" >&6
fi
test -n "$AWK" && break
done
-test -z "$AWK" && { { echo "$as_me:3189: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:3194: error: No awk program found" >&5
echo "$as_me: error: No awk program found" >&2;}
{ (exit 1); exit 1; }; }
-echo "$as_me:3193: checking for egrep" >&5
+echo "$as_me:3198: checking for egrep" >&5
echo $ECHO_N "checking for egrep... $ECHO_C" >&6
if test "${ac_cv_prog_egrep+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3200,11 +3205,11 @@ else
else ac_cv_prog_egrep='egrep'
fi
fi
-echo "$as_me:3203: result: $ac_cv_prog_egrep" >&5
+echo "$as_me:3208: result: $ac_cv_prog_egrep" >&5
echo "${ECHO_T}$ac_cv_prog_egrep" >&6
EGREP=$ac_cv_prog_egrep
-test -z "$EGREP" && { { echo "$as_me:3207: error: No egrep program found" >&5
+test -z "$EGREP" && { { echo "$as_me:3212: error: No egrep program found" >&5
echo "$as_me: error: No egrep program found" >&2;}
{ (exit 1); exit 1; }; }
@@ -3220,7 +3225,7 @@ echo "$as_me: error: No egrep program found" >&2;}
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:3223: checking for a BSD compatible install" >&5
+echo "$as_me:3228: checking for a BSD compatible install" >&5
echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
@@ -3269,7 +3274,7 @@ fi
INSTALL=$ac_install_sh
fi
fi
-echo "$as_me:3272: result: $INSTALL" >&5
+echo "$as_me:3277: result: $INSTALL" >&5
echo "${ECHO_T}$INSTALL" >&6
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3294,7 +3299,7 @@ for ac_prog in tdlint lint alint
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:3297: checking for $ac_word" >&5
+echo "$as_me:3302: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_LINT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3309,7 +3314,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:3312: found $ac_dir/$ac_word" >&5
+echo "$as_me:3317: found $ac_dir/$ac_word" >&5
break
done
@@ -3317,57 +3322,91 @@ fi
fi
LINT=$ac_cv_prog_LINT
if test -n "$LINT"; then
- echo "$as_me:3320: result: $LINT" >&5
+ echo "$as_me:3325: result: $LINT" >&5
echo "${ECHO_T}$LINT" >&6
else
- echo "$as_me:3323: result: no" >&5
+ echo "$as_me:3328: result: no" >&5
echo "${ECHO_T}no" >&6
fi
test -n "$LINT" && break
done
-echo "$as_me:3330: checking whether ln -s works" >&5
+echo "$as_me:3335: checking whether ln -s works" >&5
echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
LN_S=$as_ln_s
if test "$LN_S" = "ln -s"; then
- echo "$as_me:3334: result: yes" >&5
+ echo "$as_me:3339: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
- echo "$as_me:3337: result: no, using $LN_S" >&5
+ echo "$as_me:3342: result: no, using $LN_S" >&5
echo "${ECHO_T}no, using $LN_S" >&6
fi
-echo "$as_me:3341: checking whether ${MAKE-make} sets \${MAKE}" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+echo "$as_me:3346: checking for long file names" >&5
+echo $ECHO_N "checking for long file names... $ECHO_C" >&6
+if test "${ac_cv_sys_long_file_names+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.make <<\EOF
-all:
- @echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
- eval ac_cv_prog_make_${ac_make}_set=yes
+ ac_cv_sys_long_file_names=yes
+# Test for long file names in all the places we know might matter:
+# . the current directory, where building will happen
+# $prefix/lib where we will be installing things
+# $exec_prefix/lib likewise
+# eval it to expand exec_prefix.
+# $TMPDIR if set, where it might want to write temporary files
+# if $TMPDIR is not set:
+# /tmp where it might want to write temporary files
+# /var/tmp likewise
+# /usr/tmp likewise
+if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then
+ ac_tmpdirs=$TMPDIR
else
- eval ac_cv_prog_make_${ac_make}_set=no
+ ac_tmpdirs='/tmp /var/tmp /usr/tmp'
fi
-rm -f conftest.make
+for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
+ test -d $ac_dir || continue
+ test -w $ac_dir || continue # It is less confusing to not echo anything here.
+ ac_xdir=$ac_dir/cf$$
+ (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue
+ ac_tf1=$ac_xdir/conftest9012345
+ ac_tf2=$ac_xdir/conftest9012346
+ (echo 1 >$ac_tf1) 2>/dev/null
+ (echo 2 >$ac_tf2) 2>/dev/null
+ ac_val=`cat $ac_tf1 2>/dev/null`
+ if test ! -f $ac_tf1 || test "$ac_val" != 1; then
+ ac_cv_sys_long_file_names=no
+ rm -rf $ac_xdir 2>/dev/null
+ break
+ fi
+ rm -rf $ac_xdir 2>/dev/null
+done
fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$as_me:3361: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- SET_MAKE=
-else
- echo "$as_me:3365: result: no" >&5
-echo "${ECHO_T}no" >&6
- SET_MAKE="MAKE=${MAKE-make}"
+echo "$as_me:3385: result: $ac_cv_sys_long_file_names" >&5
+echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
+if test $ac_cv_sys_long_file_names = yes; then
+
+cat >>confdefs.h <<\EOF
+#define HAVE_LONG_FILE_NAMES 1
+EOF
+
fi
-echo "$as_me:3370: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3395: checking if we should assume mixed-case filenames" >&5
+echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
+
+# Check whether --enable-mixed-case or --disable-mixed-case was given.
+if test "${enable_mixed_case+set}" = set; then
+ enableval="$enable_mixed_case"
+ enable_mixedcase=$enableval
+else
+ enable_mixedcase=auto
+fi;
+echo "$as_me:3405: result: $enable_mixedcase" >&5
+echo "${ECHO_T}$enable_mixedcase" >&6
+if test "$enable_mixedcase" = "auto" ; then
+
+echo "$as_me:3409: checking if filesystem supports mixed-case filenames" >&5
echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
if test "${cf_cv_mixedcase+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3394,15 +3433,55 @@ else
fi
fi
-echo "$as_me:3397: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3436: result: $cf_cv_mixedcase" >&5
echo "${ECHO_T}$cf_cv_mixedcase" >&6
test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
#define MIXEDCASE_FILENAMES 1
EOF
+else
+ cf_cv_mixedcase=$enable_mixedcase
+ if test "$enable_mixedcase" = "yes" ; then
+ cat >>confdefs.h <<\EOF
+#define MIXEDCASE_FILENAMES 1
+EOF
+
+ fi
+fi
+
+# do this after mixed-case option (tags/TAGS is not as important as tic).
+echo "$as_me:3453: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.make <<\EOF
+all:
+ @echo 'ac_maketemp="${MAKE}"'
+EOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+ eval ac_cv_prog_make_${ac_make}_set=yes
+else
+ eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftest.make
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+ echo "$as_me:3473: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ SET_MAKE=
+else
+ echo "$as_me:3477: result: no" >&5
+echo "${ECHO_T}no" >&6
+ SET_MAKE="MAKE=${MAKE-make}"
+fi
+
# Extract the first word of "ctags", so it can be a program name with args.
set dummy ctags; ac_word=$2
-echo "$as_me:3405: checking for $ac_word" >&5
+echo "$as_me:3484: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3417,7 +3496,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:3420: found $ac_dir/$ac_word" >&5
+echo "$as_me:3499: found $ac_dir/$ac_word" >&5
break
done
@@ -3426,17 +3505,17 @@ fi
fi
MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
if test -n "$MAKE_LOWER_TAGS"; then
- echo "$as_me:3429: result: $MAKE_LOWER_TAGS" >&5
+ echo "$as_me:3508: result: $MAKE_LOWER_TAGS" >&5
echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
else
- echo "$as_me:3432: result: no" >&5
+ echo "$as_me:3511: result: no" >&5
echo "${ECHO_T}no" >&6
fi
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 "$as_me:3439: checking for $ac_word" >&5
+echo "$as_me:3518: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3451,7 +3530,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:3454: found $ac_dir/$ac_word" >&5
+echo "$as_me:3533: found $ac_dir/$ac_word" >&5
break
done
@@ -3460,10 +3539,10 @@ fi
fi
MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
if test -n "$MAKE_UPPER_TAGS"; then
- echo "$as_me:3463: result: $MAKE_UPPER_TAGS" >&5
+ echo "$as_me:3542: result: $MAKE_UPPER_TAGS" >&5
echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
else
- echo "$as_me:3466: result: no" >&5
+ echo "$as_me:3545: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3483,7 +3562,7 @@ else
MAKE_LOWER_TAGS="#"
fi
-echo "$as_me:3486: checking for makeflags variable" >&5
+echo "$as_me:3565: checking for makeflags variable" >&5
echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
if test "${cf_cv_makeflags+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3517,95 +3596,13 @@ CF_EOF
rm -f cf_makeflags.tmp
fi
-echo "$as_me:3520: result: $cf_cv_makeflags" >&5
+echo "$as_me:3599: result: $cf_cv_makeflags" >&5
echo "${ECHO_T}$cf_cv_makeflags" >&6
-echo "$as_me:3523: checking for long file names" >&5
-echo $ECHO_N "checking for long file names... $ECHO_C" >&6
-if test "${ac_cv_sys_long_file_names+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_sys_long_file_names=yes
-# Test for long file names in all the places we know might matter:
-# . the current directory, where building will happen
-# $prefix/lib where we will be installing things
-# $exec_prefix/lib likewise
-# eval it to expand exec_prefix.
-# $TMPDIR if set, where it might want to write temporary files
-# if $TMPDIR is not set:
-# /tmp where it might want to write temporary files
-# /var/tmp likewise
-# /usr/tmp likewise
-if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then
- ac_tmpdirs=$TMPDIR
-else
- ac_tmpdirs='/tmp /var/tmp /usr/tmp'
-fi
-for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
- test -d $ac_dir || continue
- test -w $ac_dir || continue # It is less confusing to not echo anything here.
- ac_xdir=$ac_dir/cf$$
- (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue
- ac_tf1=$ac_xdir/conftest9012345
- ac_tf2=$ac_xdir/conftest9012346
- (echo 1 >$ac_tf1) 2>/dev/null
- (echo 2 >$ac_tf2) 2>/dev/null
- ac_val=`cat $ac_tf1 2>/dev/null`
- if test ! -f $ac_tf1 || test "$ac_val" != 1; then
- ac_cv_sys_long_file_names=no
- rm -rf $ac_xdir 2>/dev/null
- break
- fi
- rm -rf $ac_xdir 2>/dev/null
-done
-fi
-echo "$as_me:3562: result: $ac_cv_sys_long_file_names" >&5
-echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
-if test $ac_cv_sys_long_file_names = yes; then
-
-cat >>confdefs.h <<\EOF
-#define HAVE_LONG_FILE_NAMES 1
-EOF
-
-fi
-
-echo "$as_me:3572: checking if filesystem supports mixed-case filenames" >&5
-echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
-if test "${cf_cv_mixedcase+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-if test "$cross_compiling" = yes ; then
- case $target_alias in #(vi
- *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi
- cf_cv_mixedcase=no
- ;;
- *)
- cf_cv_mixedcase=yes
- ;;
- esac
-else
- rm -f conftest CONFTEST
- echo test >conftest
- if test -f CONFTEST ; then
- cf_cv_mixedcase=no
- else
- cf_cv_mixedcase=yes
- fi
- rm -f conftest CONFTEST
-fi
-
-fi
-echo "$as_me:3599: result: $cf_cv_mixedcase" >&5
-echo "${ECHO_T}$cf_cv_mixedcase" >&6
-test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
-#define MIXEDCASE_FILENAMES 1
-EOF
-
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:3608: checking for $ac_word" >&5
+echo "$as_me:3605: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3620,7 +3617,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:3623: found $ac_dir/$ac_word" >&5
+echo "$as_me:3620: found $ac_dir/$ac_word" >&5
break
done
@@ -3628,10 +3625,10 @@ fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- echo "$as_me:3631: result: $RANLIB" >&5
+ echo "$as_me:3628: result: $RANLIB" >&5
echo "${ECHO_T}$RANLIB" >&6
else
- echo "$as_me:3634: result: no" >&5
+ echo "$as_me:3631: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3640,7 +3637,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
-echo "$as_me:3643: checking for $ac_word" >&5
+echo "$as_me:3640: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3655,7 +3652,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:3658: found $ac_dir/$ac_word" >&5
+echo "$as_me:3655: found $ac_dir/$ac_word" >&5
break
done
@@ -3664,10 +3661,10 @@ fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- echo "$as_me:3667: result: $ac_ct_RANLIB" >&5
+ echo "$as_me:3664: result: $ac_ct_RANLIB" >&5
echo "${ECHO_T}$ac_ct_RANLIB" >&6
else
- echo "$as_me:3670: result: no" >&5
+ echo "$as_me:3667: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3679,7 +3676,7 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
set dummy ${ac_tool_prefix}ld; ac_word=$2
-echo "$as_me:3682: checking for $ac_word" >&5
+echo "$as_me:3679: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3694,7 +3691,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_LD="${ac_tool_prefix}ld"
-echo "$as_me:3697: found $ac_dir/$ac_word" >&5
+echo "$as_me:3694: found $ac_dir/$ac_word" >&5
break
done
@@ -3702,10 +3699,10 @@ fi
fi
LD=$ac_cv_prog_LD
if test -n "$LD"; then
- echo "$as_me:3705: result: $LD" >&5
+ echo "$as_me:3702: result: $LD" >&5
echo "${ECHO_T}$LD" >&6
else
- echo "$as_me:3708: result: no" >&5
+ echo "$as_me:3705: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3714,7 +3711,7 @@ if test -z "$ac_cv_prog_LD"; then
ac_ct_LD=$LD
# Extract the first word of "ld", so it can be a program name with args.
set dummy ld; ac_word=$2
-echo "$as_me:3717: checking for $ac_word" >&5
+echo "$as_me:3714: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3729,7 +3726,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_LD="ld"
-echo "$as_me:3732: found $ac_dir/$ac_word" >&5
+echo "$as_me:3729: found $ac_dir/$ac_word" >&5
break
done
@@ -3738,10 +3735,10 @@ fi
fi
ac_ct_LD=$ac_cv_prog_ac_ct_LD
if test -n "$ac_ct_LD"; then
- echo "$as_me:3741: result: $ac_ct_LD" >&5
+ echo "$as_me:3738: result: $ac_ct_LD" >&5
echo "${ECHO_T}$ac_ct_LD" >&6
else
- echo "$as_me:3744: result: no" >&5
+ echo "$as_me:3741: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3753,7 +3750,7 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:3756: checking for $ac_word" >&5
+echo "$as_me:3753: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3768,7 +3765,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_AR="${ac_tool_prefix}ar"
-echo "$as_me:3771: found $ac_dir/$ac_word" >&5
+echo "$as_me:3768: found $ac_dir/$ac_word" >&5
break
done
@@ -3776,10 +3773,10 @@ fi
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
- echo "$as_me:3779: result: $AR" >&5
+ echo "$as_me:3776: result: $AR" >&5
echo "${ECHO_T}$AR" >&6
else
- echo "$as_me:3782: result: no" >&5
+ echo "$as_me:3779: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3788,7 +3785,7 @@ if test -z "$ac_cv_prog_AR"; then
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
-echo "$as_me:3791: checking for $ac_word" >&5
+echo "$as_me:3788: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3803,7 +3800,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_AR="ar"
-echo "$as_me:3806: found $ac_dir/$ac_word" >&5
+echo "$as_me:3803: found $ac_dir/$ac_word" >&5
break
done
@@ -3812,10 +3809,10 @@ fi
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
- echo "$as_me:3815: result: $ac_ct_AR" >&5
+ echo "$as_me:3812: result: $ac_ct_AR" >&5
echo "${ECHO_T}$ac_ct_AR" >&6
else
- echo "$as_me:3818: result: no" >&5
+ echo "$as_me:3815: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3828,7 +3825,7 @@ if test "${cf_cv_subst_AR_OPTS+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-echo "$as_me:3831: checking for archiver options (symbol AR_OPTS)" >&5
+echo "$as_me:3828: checking for archiver options (symbol AR_OPTS)" >&5
echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
if test -z "$AR_OPTS" ; then
@@ -3837,12 +3834,12 @@ if test -z "$AR_OPTS" ; then
fi
cf_cv_subst_AR_OPTS=$AR_OPTS
-echo "$as_me:3840: result: $AR_OPTS" >&5
+echo "$as_me:3837: result: $AR_OPTS" >&5
echo "${ECHO_T}$AR_OPTS" >&6
fi
-echo "$as_me:3845: checking if you have specified an install-prefix" >&5
+echo "$as_me:3842: checking if you have specified an install-prefix" >&5
echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
# Check whether --with-install-prefix or --without-install-prefix was given.
@@ -3855,7 +3852,7 @@ if test "${with_install_prefix+set}" = set; then
;;
esac
fi;
-echo "$as_me:3858: result: $DESTDIR" >&5
+echo "$as_me:3855: result: $DESTDIR" >&5
echo "${ECHO_T}$DESTDIR" >&6
###############################################################################
@@ -3883,7 +3880,7 @@ else
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:3886: checking for $ac_word" >&5
+echo "$as_me:3883: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_BUILD_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3898,7 +3895,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_BUILD_CC="$ac_prog"
-echo "$as_me:3901: found $ac_dir/$ac_word" >&5
+echo "$as_me:3898: found $ac_dir/$ac_word" >&5
break
done
@@ -3906,10 +3903,10 @@ fi
fi
BUILD_CC=$ac_cv_prog_BUILD_CC
if test -n "$BUILD_CC"; then
- echo "$as_me:3909: result: $BUILD_CC" >&5
+ echo "$as_me:3906: result: $BUILD_CC" >&5
echo "${ECHO_T}$BUILD_CC" >&6
else
- echo "$as_me:3912: result: no" >&5
+ echo "$as_me:3909: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3917,12 +3914,12 @@ fi
done
fi;
- echo "$as_me:3920: checking for native build C compiler" >&5
+ echo "$as_me:3917: checking for native build C compiler" >&5
echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
- echo "$as_me:3922: result: $BUILD_CC" >&5
+ echo "$as_me:3919: result: $BUILD_CC" >&5
echo "${ECHO_T}$BUILD_CC" >&6
- echo "$as_me:3925: checking for native build C preprocessor" >&5
+ echo "$as_me:3922: checking for native build C preprocessor" >&5
echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
# Check whether --with-build-cpp or --without-build-cpp was given.
@@ -3932,10 +3929,10 @@ if test "${with_build_cpp+set}" = set; then
else
BUILD_CPP='${BUILD_CC} -E'
fi;
- echo "$as_me:3935: result: $BUILD_CPP" >&5
+ echo "$as_me:3932: result: $BUILD_CPP" >&5
echo "${ECHO_T}$BUILD_CPP" >&6
- echo "$as_me:3938: checking for native build C flags" >&5
+ echo "$as_me:3935: checking for native build C flags" >&5
echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
# Check whether --with-build-cflags or --without-build-cflags was given.
@@ -3943,10 +3940,10 @@ if test "${with_build_cflags+set}" = set; then
withval="$with_build_cflags"
BUILD_CFLAGS="$withval"
fi;
- echo "$as_me:3946: result: $BUILD_CFLAGS" >&5
+ echo "$as_me:3943: result: $BUILD_CFLAGS" >&5
echo "${ECHO_T}$BUILD_CFLAGS" >&6
- echo "$as_me:3949: checking for native build C preprocessor-flags" >&5
+ echo "$as_me:3946: checking for native build C preprocessor-flags" >&5
echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
# Check whether --with-build-cppflags or --without-build-cppflags was given.
@@ -3954,10 +3951,10 @@ if test "${with_build_cppflags+set}" = set; then
withval="$with_build_cppflags"
BUILD_CPPFLAGS="$withval"
fi;
- echo "$as_me:3957: result: $BUILD_CPPFLAGS" >&5
+ echo "$as_me:3954: result: $BUILD_CPPFLAGS" >&5
echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
- echo "$as_me:3960: checking for native build linker-flags" >&5
+ echo "$as_me:3957: checking for native build linker-flags" >&5
echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
# Check whether --with-build-ldflags or --without-build-ldflags was given.
@@ -3965,10 +3962,10 @@ if test "${with_build_ldflags+set}" = set; then
withval="$with_build_ldflags"
BUILD_LDFLAGS="$withval"
fi;
- echo "$as_me:3968: result: $BUILD_LDFLAGS" >&5
+ echo "$as_me:3965: result: $BUILD_LDFLAGS" >&5
echo "${ECHO_T}$BUILD_LDFLAGS" >&6
- echo "$as_me:3971: checking for native build linker-libraries" >&5
+ echo "$as_me:3968: checking for native build linker-libraries" >&5
echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
# Check whether --with-build-libs or --without-build-libs was given.
@@ -3976,7 +3973,7 @@ if test "${with_build_libs+set}" = set; then
withval="$with_build_libs"
BUILD_LIBS="$withval"
fi;
- echo "$as_me:3979: result: $BUILD_LIBS" >&5
+ echo "$as_me:3976: result: $BUILD_LIBS" >&5
echo "${ECHO_T}$BUILD_LIBS" >&6
# this assumes we're on Unix.
@@ -3986,7 +3983,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
: ${BUILD_CC:='${CC}'}
if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
- { { echo "$as_me:3989: error: Cross-build requires two compilers.
+ { { echo "$as_me:3986: error: Cross-build requires two compilers.
Use --with-build-cc to specify the native compiler." >&5
echo "$as_me: error: Cross-build requires two compilers.
Use --with-build-cc to specify the native compiler." >&2;}
@@ -4023,11 +4020,11 @@ LIB_PREP="$RANLIB"
# doing:
LIB_CLEAN=
LIB_COMPILE=
-LIB_LINK=
+LIB_LINK='${CC}'
LIB_INSTALL=
LIB_UNINSTALL=
-echo "$as_me:4030: checking if you want to build libraries with libtool" >&5
+echo "$as_me:4027: checking if you want to build libraries with libtool" >&5
echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
# Check whether --with-libtool or --without-libtool was given.
@@ -4037,7 +4034,7 @@ if test "${with_libtool+set}" = set; then
else
with_libtool=no
fi;
-echo "$as_me:4040: result: $with_libtool" >&5
+echo "$as_me:4037: result: $with_libtool" >&5
echo "${ECHO_T}$with_libtool" >&6
if test "$with_libtool" != "no"; then
@@ -4068,7 +4065,7 @@ case ".$with_libtool" in #(vi
with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:4071: error: expected a pathname, not \"$with_libtool\"" >&5
+ { { echo "$as_me:4068: error: expected a pathname, not \"$with_libtool\"" >&5
echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -4078,7 +4075,7 @@ esac
else
# Extract the first word of "libtool", so it can be a program name with args.
set dummy libtool; ac_word=$2
-echo "$as_me:4081: checking for $ac_word" >&5
+echo "$as_me:4078: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_LIBTOOL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4095,7 +4092,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_LIBTOOL="$ac_dir/$ac_word"
- echo "$as_me:4098: found $ac_dir/$ac_word" >&5
+ echo "$as_me:4095: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -4106,42 +4103,42 @@ fi
LIBTOOL=$ac_cv_path_LIBTOOL
if test -n "$LIBTOOL"; then
- echo "$as_me:4109: result: $LIBTOOL" >&5
+ echo "$as_me:4106: result: $LIBTOOL" >&5
echo "${ECHO_T}$LIBTOOL" >&6
else
- echo "$as_me:4112: result: no" >&5
+ echo "$as_me:4109: result: no" >&5
echo "${ECHO_T}no" >&6
fi
fi
if test -z "$LIBTOOL" ; then
- { { echo "$as_me:4118: error: Cannot find libtool" >&5
+ { { echo "$as_me:4115: error: Cannot find libtool" >&5
echo "$as_me: error: Cannot find libtool" >&2;}
{ (exit 1); exit 1; }; }
fi
- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` -o'
- LIB_OBJECT='${OBJECTS}.o=.lo)'
+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
+ LIB_OBJECT='${OBJECTS:.o=.lo}'
LIB_SUFFIX=.la
LIB_CLEAN='${LIBTOOL} --mode=clean'
LIB_COMPILE='${LIBTOOL} --mode=compile'
- LIB_LINK='${LIBTOOL} --mode=link'
+ LIB_LINK='${LIBTOOL} --mode=link ${CC} ${LIBTOOL_OPTS}'
LIB_INSTALL='${LIBTOOL} --mode=install'
LIB_UNINSTALL='${LIBTOOL} --mode=uninstall'
LIB_PREP=:
# Show the version of libtool
- echo "$as_me:4133: checking version of libtool" >&5
+ echo "$as_me:4130: checking version of libtool" >&5
echo $ECHO_N "checking version of libtool... $ECHO_C" >&6
# Save the version in a cache variable - this is not entirely a good
# thing, but the version string from libtool is very ugly, and for
# bug reports it might be useful to have the original string.
- cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
- echo "$as_me:4140: result: $cf_cv_libtool_version" >&5
+ cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
+ echo "$as_me:4137: result: $cf_cv_libtool_version" >&5
echo "${ECHO_T}$cf_cv_libtool_version" >&6
if test -z "$cf_cv_libtool_version" ; then
- { { echo "$as_me:4143: error: This is not libtool" >&5
-echo "$as_me: error: This is not libtool" >&2;}
+ { { echo "$as_me:4140: error: This is not GNU libtool" >&5
+echo "$as_me: error: This is not GNU libtool" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -4167,7 +4164,7 @@ cf_list_models="$cf_list_models libtool"
else
-echo "$as_me:4170: checking if you want to build shared libraries" >&5
+echo "$as_me:4167: checking if you want to build shared libraries" >&5
echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
# Check whether --with-shared or --without-shared was given.
@@ -4177,11 +4174,11 @@ if test "${with_shared+set}" = set; then
else
with_shared=no
fi;
-echo "$as_me:4180: result: $with_shared" >&5
+echo "$as_me:4177: result: $with_shared" >&5
echo "${ECHO_T}$with_shared" >&6
test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
-echo "$as_me:4184: checking if you want to build static libraries" >&5
+echo "$as_me:4181: checking if you want to build static libraries" >&5
echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
# Check whether --with-normal or --without-normal was given.
@@ -4191,11 +4188,11 @@ if test "${with_normal+set}" = set; then
else
with_normal=yes
fi;
-echo "$as_me:4194: result: $with_normal" >&5
+echo "$as_me:4191: result: $with_normal" >&5
echo "${ECHO_T}$with_normal" >&6
test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal"
-echo "$as_me:4198: checking if you want to build debug libraries" >&5
+echo "$as_me:4195: checking if you want to build debug libraries" >&5
echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
# Check whether --with-debug or --without-debug was given.
@@ -4205,11 +4202,11 @@ if test "${with_debug+set}" = set; then
else
with_debug=yes
fi;
-echo "$as_me:4208: result: $with_debug" >&5
+echo "$as_me:4205: result: $with_debug" >&5
echo "${ECHO_T}$with_debug" >&6
test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug"
-echo "$as_me:4212: checking if you want to build profiling libraries" >&5
+echo "$as_me:4209: checking if you want to build profiling libraries" >&5
echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
# Check whether --with-profile or --without-profile was given.
@@ -4219,7 +4216,7 @@ if test "${with_profile+set}" = set; then
else
with_profile=no
fi;
-echo "$as_me:4222: result: $with_profile" >&5
+echo "$as_me:4219: result: $with_profile" >&5
echo "${ECHO_T}$with_profile" >&6
test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile"
@@ -4227,23 +4224,25 @@ fi
###############################################################################
-echo "$as_me:4230: checking for specified models" >&5
+echo "$as_me:4227: checking for specified models" >&5
echo $ECHO_N "checking for specified models... $ECHO_C" >&6
test -z "$cf_list_models" && cf_list_models=normal
test "$with_libtool" != "no" && cf_list_models=libtool
-echo "$as_me:4234: result: $cf_list_models" >&5
+echo "$as_me:4231: result: $cf_list_models" >&5
echo "${ECHO_T}$cf_list_models" >&6
### Use the first model as the default, and save its suffix for use in building
### up test-applications.
-echo "$as_me:4239: checking for default model" >&5
+echo "$as_me:4236: checking for default model" >&5
echo $ECHO_N "checking for default model... $ECHO_C" >&6
DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
-echo "$as_me:4242: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:4239: result: $DFT_LWR_MODEL" >&5
echo "${ECHO_T}$DFT_LWR_MODEL" >&6
DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+TICS_NAME=tic
+
TINFO_NAME=tinfo
LIB_NAME=ncurses
@@ -4264,7 +4263,7 @@ LIB_SUFFIX=
###############################################################################
-echo "$as_me:4267: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:4266: checking if you want to build a separate terminfo library" >&5
echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
# Check whether --with-termlib or --without-termlib was given.
@@ -4274,13 +4273,26 @@ if test "${with_termlib+set}" = set; then
else
with_termlib=no
fi;
-echo "$as_me:4277: result: $with_termlib" >&5
+echo "$as_me:4276: result: $with_termlib" >&5
echo "${ECHO_T}$with_termlib" >&6
+echo "$as_me:4279: checking if you want to build a separate tic library" >&5
+echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
+
+# Check whether --with-ticlib or --without-ticlib was given.
+if test "${with_ticlib+set}" = set; then
+ withval="$with_ticlib"
+ with_ticlib=$withval
+else
+ with_ticlib=no
+fi;
+echo "$as_me:4289: result: $with_ticlib" >&5
+echo "${ECHO_T}$with_ticlib" >&6
+
### Checks for special libraries, must be done up-front.
SHLIB_LIST=""
-echo "$as_me:4283: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:4295: checking if you want to link with the GPM mouse library" >&5
echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
# Check whether --with-gpm or --without-gpm was given.
@@ -4290,27 +4302,27 @@ if test "${with_gpm+set}" = set; then
else
with_gpm=maybe
fi;
-echo "$as_me:4293: result: $with_gpm" >&5
+echo "$as_me:4305: result: $with_gpm" >&5
echo "${ECHO_T}$with_gpm" >&6
if test "$with_gpm" != no ; then
- echo "$as_me:4297: checking for gpm.h" >&5
+ echo "$as_me:4309: checking for gpm.h" >&5
echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
if test "${ac_cv_header_gpm_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4303 "configure"
+#line 4315 "configure"
#include "confdefs.h"
#include <gpm.h>
_ACEOF
-if { (eval echo "$as_me:4307: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4319: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:4313: \$? = $ac_status" >&5
+ echo "$as_me:4325: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4329,7 +4341,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:4332: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:4344: result: $ac_cv_header_gpm_h" >&5
echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
if test $ac_cv_header_gpm_h = yes; then
@@ -4340,12 +4352,14 @@ EOF
if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
test -n "$verbose" && echo " assuming we really have GPM library" 1>&6
+echo "${as_me-configure}:4355: testing assuming we really have GPM library ..." 1>&5
+
cat >>confdefs.h <<\EOF
#define HAVE_LIBGPM 1
EOF
else
- echo "$as_me:4348: checking for Gpm_Open in -lgpm" >&5
+ echo "$as_me:4362: checking for Gpm_Open in -lgpm" >&5
echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4353,7 +4367,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 4356 "configure"
+#line 4370 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4372,16 +4386,16 @@ Gpm_Open ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4375: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4389: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4378: \$? = $ac_status" >&5
+ echo "$as_me:4392: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4381: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4395: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4384: \$? = $ac_status" >&5
+ echo "$as_me:4398: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gpm_Gpm_Open=yes
else
@@ -4392,13 +4406,13 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:4395: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:4409: result: $ac_cv_lib_gpm_Gpm_Open" >&5
echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
if test $ac_cv_lib_gpm_Gpm_Open = yes; then
:
else
- { { echo "$as_me:4401: error: Cannot link with GPM library" >&5
+ { { echo "$as_me:4415: error: Cannot link with GPM library" >&5
echo "$as_me: error: Cannot link with GPM library" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -4408,7 +4422,7 @@ fi
else
- test "$with_gpm" != maybe && { echo "$as_me:4411: WARNING: Cannot find GPM header" >&5
+ test "$with_gpm" != maybe && { echo "$as_me:4425: WARNING: Cannot find GPM header" >&5
echo "$as_me: WARNING: Cannot find GPM header" >&2;}
with_gpm=no
@@ -4417,7 +4431,7 @@ fi
fi
if test "$with_gpm" != no ; then
- echo "$as_me:4420: checking if you want to load GPM dynamically" >&5
+ echo "$as_me:4434: checking if you want to load GPM dynamically" >&5
echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
# Check whether --with-dlsym or --without-dlsym was given.
@@ -4427,18 +4441,18 @@ if test "${with_dlsym+set}" = set; then
else
with_dlsym=yes
fi;
- echo "$as_me:4430: result: $with_dlsym" >&5
+ echo "$as_me:4444: result: $with_dlsym" >&5
echo "${ECHO_T}$with_dlsym" >&6
if test "$with_dlsym" = yes ; then
cf_have_dlsym=no
-echo "$as_me:4435: checking for dlsym" >&5
+echo "$as_me:4449: checking for dlsym" >&5
echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
if test "${ac_cv_func_dlsym+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4441 "configure"
+#line 4455 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlsym (); below. */
@@ -4469,16 +4483,16 @@ f = dlsym;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4472: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4486: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4475: \$? = $ac_status" >&5
+ echo "$as_me:4489: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4478: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4492: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4481: \$? = $ac_status" >&5
+ echo "$as_me:4495: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_dlsym=yes
else
@@ -4488,14 +4502,14 @@ ac_cv_func_dlsym=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:4491: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:4505: result: $ac_cv_func_dlsym" >&5
echo "${ECHO_T}$ac_cv_func_dlsym" >&6
if test $ac_cv_func_dlsym = yes; then
cf_have_dlsym=yes
else
cf_have_libdl=no
-echo "$as_me:4498: checking for dlsym in -ldl" >&5
+echo "$as_me:4512: checking for dlsym in -ldl" >&5
echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
if test "${ac_cv_lib_dl_dlsym+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4503,7 +4517,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 4506 "configure"
+#line 4520 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4522,16 +4536,16 @@ dlsym ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4525: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4539: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4528: \$? = $ac_status" >&5
+ echo "$as_me:4542: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4531: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4545: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4534: \$? = $ac_status" >&5
+ echo "$as_me:4548: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dl_dlsym=yes
else
@@ -4542,7 +4556,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:4545: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:4559: result: $ac_cv_lib_dl_dlsym" >&5
echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
if test $ac_cv_lib_dl_dlsym = yes; then
@@ -4555,10 +4569,10 @@ fi
if test "$cf_have_dlsym" = yes ; then
test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
- echo "$as_me:4558: checking whether able to link to dl*() functions" >&5
+ echo "$as_me:4572: checking whether able to link to dl*() functions" >&5
echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 4561 "configure"
+#line 4575 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int
@@ -4576,16 +4590,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4579: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4593: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4582: \$? = $ac_status" >&5
+ echo "$as_me:4596: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4585: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4599: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4588: \$? = $ac_status" >&5
+ echo "$as_me:4602: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cat >>confdefs.h <<\EOF
@@ -4596,15 +4610,15 @@ else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- { { echo "$as_me:4599: error: Cannot link test program for libdl" >&5
+ { { echo "$as_me:4613: error: Cannot link test program for libdl" >&5
echo "$as_me: error: Cannot link test program for libdl" >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:4604: result: ok" >&5
+ echo "$as_me:4618: result: ok" >&5
echo "${ECHO_T}ok" >&6
else
- { { echo "$as_me:4607: error: Cannot find dlsym function" >&5
+ { { echo "$as_me:4621: error: Cannot find dlsym function" >&5
echo "$as_me: error: Cannot find dlsym function" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -4612,10 +4626,12 @@ fi
if test "$with_gpm" != yes ; then
test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6
+echo "${as_me-configure}:4629: testing assuming soname for gpm is $with_gpm ..." 1>&5
+
cf_cv_gpm_soname="$with_gpm"
else
-echo "$as_me:4618: checking for soname of gpm library" >&5
+echo "$as_me:4634: checking for soname of gpm library" >&5
echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
if test "${cf_cv_gpm_soname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4633,15 +4649,15 @@ if (Gpm_Open(0,0)) Gpm_Close();
CF_EOF
cf_save_LIBS="$LIBS"
LIBS="-lgpm $LIBS"
- if { (eval echo "$as_me:4636: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:4652: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4639: \$? = $ac_status" >&5
+ echo "$as_me:4655: \$? = $ac_status" >&5
(exit $ac_status); } ; then
- if { (eval echo "$as_me:4641: \"$ac_link\"") >&5
+ if { (eval echo "$as_me:4657: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4644: \$? = $ac_status" >&5
+ echo "$as_me:4660: \$? = $ac_status" >&5
(exit $ac_status); } ; then
cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
@@ -4652,7 +4668,7 @@ LIBS="$cf_save_LIBS"
fi
fi
-echo "$as_me:4655: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:4671: result: $cf_cv_gpm_soname" >&5
echo "${ECHO_T}$cf_cv_gpm_soname" >&6
fi
@@ -4668,7 +4684,7 @@ EOF
#define HAVE_LIBGPM 1
EOF
- echo "$as_me:4671: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:4687: checking for Gpm_Wgetch in -lgpm" >&5
echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4676,7 +4692,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 4679 "configure"
+#line 4695 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4695,16 +4711,16 @@ Gpm_Wgetch ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4698: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4714: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4701: \$? = $ac_status" >&5
+ echo "$as_me:4717: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4704: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4720: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4707: \$? = $ac_status" >&5
+ echo "$as_me:4723: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gpm_Gpm_Wgetch=yes
else
@@ -4715,12 +4731,61 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:4718: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:4734: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
- { echo "$as_me:4722: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+echo "$as_me:4738: checking if GPM is weakly bound to curses library" >&5
+echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
+if test "${cf_cv_check_gpm_wgetch+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cf_cv_check_gpm_wgetch=unknown
+if test "$cross_compiling" != yes ; then
+
+cat >conftest.$ac_ext <<CF_EOF
+#include <gpm.h>
+int main()
+{
+ Gpm_Wgetch();
+ ${cf_cv_main_return:-return}(0);
+}
+CF_EOF
+
+ cf_save_LIBS="$LIBS"
+ # This only works if we can look at the symbol table. If a shared
+ # library is stripped for install, we cannot use that. So we're forced
+ # to rely on the static library, noting that some packagers may not
+ # include it.
+ LIBS="-static -lgpm -dynamic $LIBS"
+ if { (eval echo "$as_me:4762: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:4765: \$? = $ac_status" >&5
+ (exit $ac_status); } ; then
+ if { (eval echo "$as_me:4767: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:4770: \$? = $ac_status" >&5
+ (exit $ac_status); } ; then
+ cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
+ test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
+ test -z "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=no
+ fi
+ fi
+ rm -f conftest*
+ LIBS="$cf_save_LIBS"
+fi
+
+fi
+echo "$as_me:4782: result: $cf_cv_check_gpm_wgetch" >&5
+echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
+
+if test "$cf_cv_check_gpm_wgetch" != yes ; then
+ { echo "$as_me:4786: WARNING: GPM library is already linked with curses - read the FAQ" >&5
echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
+fi
fi
@@ -4728,7 +4793,7 @@ fi
# not everyone has "test -c"
if test -c /dev/sysmouse 2>/dev/null ; then
-echo "$as_me:4731: checking if you want to use sysmouse" >&5
+echo "$as_me:4796: checking if you want to use sysmouse" >&5
echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
# Check whether --with-sysmouse or --without-sysmouse was given.
@@ -4740,7 +4805,7 @@ else
fi;
if test "$cf_with_sysmouse" != no ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 4743 "configure"
+#line 4808 "configure"
#include "confdefs.h"
#include <osreldate.h>
@@ -4763,16 +4828,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4766: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4831: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4769: \$? = $ac_status" >&5
+ echo "$as_me:4834: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4772: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4837: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4775: \$? = $ac_status" >&5
+ echo "$as_me:4840: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_with_sysmouse=yes
else
@@ -4782,7 +4847,7 @@ cf_with_sysmouse=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4785: result: $cf_with_sysmouse" >&5
+echo "$as_me:4850: result: $cf_with_sysmouse" >&5
echo "${ECHO_T}$cf_with_sysmouse" >&6
test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF
#define USE_SYSMOUSE 1
@@ -4800,7 +4865,7 @@ if test X"$CXX_G_OPT" = X"" ; then
test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT=''
fi
-echo "$as_me:4803: checking for default loader flags" >&5
+echo "$as_me:4868: checking for default loader flags" >&5
echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
case $DFT_LWR_MODEL in
libtool) LD_MODEL='' ;;
@@ -4809,10 +4874,12 @@ debug) LD_MODEL=$CC_G_OPT ;;
profile) LD_MODEL='-pg';;
shared) LD_MODEL='' ;;
esac
-echo "$as_me:4812: result: $LD_MODEL" >&5
+echo "$as_me:4877: result: $LD_MODEL" >&5
echo "${ECHO_T}$LD_MODEL" >&6
-echo "$as_me:4815: checking if rpath option should be used" >&5
+case $DFT_LWR_MODEL in
+shared)
+echo "$as_me:4882: checking if rpath option should be used" >&5
echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
# Check whether --enable-rpath or --disable-rpath was given.
@@ -4822,8 +4889,22 @@ if test "${enable_rpath+set}" = set; then
else
cf_cv_ld_rpath=no
fi;
-echo "$as_me:4825: result: $cf_cv_ld_rpath" >&5
+echo "$as_me:4892: result: $cf_cv_ld_rpath" >&5
echo "${ECHO_T}$cf_cv_ld_rpath" >&6
+echo "$as_me:4894: checking if shared libraries should be relinked during install" >&5
+echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
+
+# Check whether --enable-relink or --disable-relink was given.
+if test "${enable_relink+set}" = set; then
+ enableval="$enable_relink"
+ cf_cv_do_relink=$enableval
+else
+ cf_cv_do_relink=yes
+fi;
+echo "$as_me:4904: result: $cf_cv_do_relink" >&5
+echo "${ECHO_T}$cf_cv_do_relink" >&6
+ ;;
+esac
LOCAL_LDFLAGS=
LOCAL_LDFLAGS2=
@@ -4832,7 +4913,7 @@ echo "${ECHO_T}$cf_cv_ld_rpath" >&6
cf_cv_do_symlinks=no
- echo "$as_me:4835: checking if release/abi version should be used for shared libs" >&5
+ echo "$as_me:4916: checking if release/abi version should be used for shared libs" >&5
echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
# Check whether --with-shlib-version or --without-shlib-version was given.
@@ -4847,7 +4928,7 @@ if test "${with_shlib_version+set}" = set; then
cf_cv_shlib_version=$withval
;;
*)
- { { echo "$as_me:4850: error: option value must be one of: rel, abi, auto or no" >&5
+ { { echo "$as_me:4931: error: option value must be one of: rel, abi, auto or no" >&5
echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -4856,7 +4937,7 @@ echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
else
cf_cv_shlib_version=auto
fi;
- echo "$as_me:4859: result: $cf_cv_shlib_version" >&5
+ echo "$as_me:4940: result: $cf_cv_shlib_version" >&5
echo "${ECHO_T}$cf_cv_shlib_version" >&6
cf_cv_rm_so_locs=no
@@ -4865,14 +4946,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
CC_SHARED_OPTS=
if test "$GCC" = yes
then
- echo "$as_me:4868: checking which $CC option to use" >&5
+ echo "$as_me:4949: checking which $CC option to use" >&5
echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
cf_save_CFLAGS="$CFLAGS"
for CC_SHARED_OPTS in -fPIC -fpic ''
do
CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
cat >conftest.$ac_ext <<_ACEOF
-#line 4875 "configure"
+#line 4956 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -4884,16 +4965,16 @@ int x = 1
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4887: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4968: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4890: \$? = $ac_status" >&5
+ echo "$as_me:4971: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4893: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4974: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4896: \$? = $ac_status" >&5
+ echo "$as_me:4977: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -4902,7 +4983,7 @@ cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
done
- echo "$as_me:4905: result: $CC_SHARED_OPTS" >&5
+ echo "$as_me:4986: result: $CC_SHARED_OPTS" >&5
echo "${ECHO_T}$CC_SHARED_OPTS" >&6
CFLAGS="$cf_save_CFLAGS"
fi
@@ -4915,17 +4996,30 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
;;
cygwin*)
CC_SHARED_OPTS=
- MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,--out-implib=../lib/${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/${SHARED_LIB}'
+ MK_SHARED_LIB='sh ../mk_shared_lib.sh $@ ${CC} ${CFLAGS}'
cf_cv_shlib_version=cygdll
cf_cv_shlib_version_infix=cygdll
+ cat >mk_shared_lib.sh <<-CF_EOF
+ #!/bin/sh
+ SHARED_LIB=\$1
+ IMPORT_LIB=\`echo "\$1" | sed -e 's/cyg/lib/' -e 's/[0-9]*\.dll$/.dll.a/'\`
+ shift
+ cat <<-EOF
+ Linking shared library
+ ** SHARED_LIB \$SHARED_LIB
+ ** IMPORT_LIB \$IMPORT_LIB
+EOF
+ exec \$* -shared -Wl,--out-implib=../lib/\${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\${SHARED_LIB}
+CF_EOF
+ chmod +x mk_shared_lib.sh
;;
darwin*)
EXTRA_CFLAGS="-no-cpp-precomp"
CC_SHARED_OPTS="-dynamic"
- MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${DESTDIR}${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
+ MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
cf_cv_shlib_version_infix=yes
- echo "$as_me:4928: checking if ld -search_paths_first works" >&5
+ echo "$as_me:5022: checking if ld -search_paths_first works" >&5
echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4934,7 +5028,7 @@ else
cf_save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
cat >conftest.$ac_ext <<_ACEOF
-#line 4937 "configure"
+#line 5031 "configure"
#include "confdefs.h"
int
@@ -4946,16 +5040,16 @@ int i;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4949: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5043: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4952: \$? = $ac_status" >&5
+ echo "$as_me:5046: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4955: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5049: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4958: \$? = $ac_status" >&5
+ echo "$as_me:5052: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ldflags_search_paths_first=yes
else
@@ -4966,7 +5060,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$cf_save_LDFLAGS
fi
-echo "$as_me:4969: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:5063: result: $cf_cv_ldflags_search_paths_first" >&5
echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
if test $cf_cv_ldflags_search_paths_first = yes; then
LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
@@ -5021,11 +5115,11 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,-lc -o $@'
;;
- openbsd2*)
+ openbsd[2-9].*)
CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
MK_SHARED_LIB='${LD} -Bshareable -soname,`basename $@.${ABI_VERSION}` -o $@'
;;
- openbsd*|freebsd[23]*)
+ openbsd*|freebsd[12].*)
CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
MK_SHARED_LIB='${LD} -Bshareable -o $@'
test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
@@ -5162,7 +5256,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
;;
*)
- { echo "$as_me:5165: WARNING: ignored --with-shlib-version" >&5
+ { echo "$as_me:5259: WARNING: ignored --with-shlib-version" >&5
echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
;;
esac
@@ -5170,12 +5264,12 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
esac
if test -n "$cf_ld_rpath_opt" ; then
- echo "$as_me:5173: checking if we need a space after rpath option" >&5
+ echo "$as_me:5267: checking if we need a space after rpath option" >&5
echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
cf_save_LIBS="$LIBS"
LIBS="$LIBS ${cf_ld_rpath_opt}$libdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 5178 "configure"
+#line 5272 "configure"
#include "confdefs.h"
int
@@ -5187,16 +5281,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5190: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5284: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5193: \$? = $ac_status" >&5
+ echo "$as_me:5287: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5196: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5290: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5199: \$? = $ac_status" >&5
+ echo "$as_me:5293: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_rpath_space=no
else
@@ -5206,7 +5300,7 @@ cf_rpath_space=yes
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS="$cf_save_LIBS"
- echo "$as_me:5209: result: $cf_rpath_space" >&5
+ echo "$as_me:5303: result: $cf_rpath_space" >&5
echo "${ECHO_T}$cf_rpath_space" >&6
test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
@@ -5215,7 +5309,7 @@ echo "${ECHO_T}$cf_rpath_space" >&6
if test "$CC_SHARED_OPTS" = "unknown"; then
for model in $cf_list_models; do
if test "$model" = "shared"; then
- { { echo "$as_me:5218: error: Shared libraries are not supported in this version" >&5
+ { { echo "$as_me:5312: error: Shared libraries are not supported in this version" >&5
echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -5225,7 +5319,7 @@ fi
###############################################################################
### use option --disable-overwrite to leave out the link to -lcurses
-echo "$as_me:5228: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:5322: checking if you wish to install ncurses overwriting curses" >&5
echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
# Check whether --enable-overwrite or --disable-overwrite was given.
@@ -5235,10 +5329,10 @@ if test "${enable_overwrite+set}" = set; then
else
if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
fi;
-echo "$as_me:5238: result: $with_overwrite" >&5
+echo "$as_me:5332: result: $with_overwrite" >&5
echo "${ECHO_T}$with_overwrite" >&6
-echo "$as_me:5241: checking if external terminfo-database is used" >&5
+echo "$as_me:5335: checking if external terminfo-database is used" >&5
echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
# Check whether --enable-database or --disable-database was given.
@@ -5248,7 +5342,7 @@ if test "${enable_database+set}" = set; then
else
use_database=yes
fi;
-echo "$as_me:5251: result: $use_database" >&5
+echo "$as_me:5345: result: $use_database" >&5
echo "${ECHO_T}$use_database" >&6
case $host_os in #(vi
@@ -5270,7 +5364,7 @@ if test "$use_database" != no ; then
#define USE_DATABASE 1
EOF
- echo "$as_me:5273: checking which terminfo source-file will be installed" >&5
+ echo "$as_me:5367: checking which terminfo source-file will be installed" >&5
echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
# Check whether --enable-database or --disable-database was given.
@@ -5278,10 +5372,10 @@ if test "${enable_database+set}" = set; then
enableval="$enable_database"
TERMINFO_SRC=$withval
fi;
- echo "$as_me:5281: result: $TERMINFO_SRC" >&5
+ echo "$as_me:5375: result: $TERMINFO_SRC" >&5
echo "${ECHO_T}$TERMINFO_SRC" >&6
- echo "$as_me:5284: checking whether to use hashed database instead of directory/tree" >&5
+ echo "$as_me:5378: checking whether to use hashed database instead of directory/tree" >&5
echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
# Check whether --with-hashed-db or --without-hashed-db was given.
@@ -5291,11 +5385,11 @@ if test "${with_hashed_db+set}" = set; then
else
with_hashed_db=no
fi;
- echo "$as_me:5294: result: $with_hashed_db" >&5
+ echo "$as_me:5388: result: $with_hashed_db" >&5
echo "${ECHO_T}$with_hashed_db" >&6
fi
-echo "$as_me:5298: checking for list of fallback descriptions" >&5
+echo "$as_me:5392: checking for list of fallback descriptions" >&5
echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
# Check whether --with-fallbacks or --without-fallbacks was given.
@@ -5305,11 +5399,11 @@ if test "${with_fallbacks+set}" = set; then
else
with_fallback=
fi;
-echo "$as_me:5308: result: $with_fallback" >&5
+echo "$as_me:5402: result: $with_fallback" >&5
echo "${ECHO_T}$with_fallback" >&6
FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
-echo "$as_me:5312: checking if you want modern xterm or antique" >&5
+echo "$as_me:5406: checking if you want modern xterm or antique" >&5
echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
# Check whether --with-xterm-new or --without-xterm-new was given.
@@ -5323,7 +5417,7 @@ case $with_xterm_new in
no) with_xterm_new=xterm-old;;
*) with_xterm_new=xterm-new;;
esac
-echo "$as_me:5326: result: $with_xterm_new" >&5
+echo "$as_me:5420: result: $with_xterm_new" >&5
echo "${ECHO_T}$with_xterm_new" >&6
WHICH_XTERM=$with_xterm_new
@@ -5333,7 +5427,7 @@ if test "$use_database" = no ; then
MAKE_TERMINFO="#"
else
-echo "$as_me:5336: checking for list of terminfo directories" >&5
+echo "$as_me:5430: checking for list of terminfo directories" >&5
echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
# Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
@@ -5373,7 +5467,7 @@ case ".$cf_src_path" in #(vi
cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:5376: error: expected a pathname, not \"$cf_src_path\"" >&5
+ { { echo "$as_me:5470: error: expected a pathname, not \"$cf_src_path\"" >&5
echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -5386,13 +5480,13 @@ IFS="$ac_save_ifs"
eval 'TERMINFO_DIRS="$cf_dst_path"'
-echo "$as_me:5389: result: $TERMINFO_DIRS" >&5
+echo "$as_me:5483: result: $TERMINFO_DIRS" >&5
echo "${ECHO_T}$TERMINFO_DIRS" >&6
test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF
#define TERMINFO_DIRS "$TERMINFO_DIRS"
EOF
-echo "$as_me:5395: checking for default terminfo directory" >&5
+echo "$as_me:5489: checking for default terminfo directory" >&5
echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
# Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
@@ -5401,7 +5495,8 @@ if test "${with_default_terminfo_dir+set}" = set; then
else
withval="${TERMINFO-${datadir}/terminfo}"
-fi;
+fi; if test -n "${datadir}/terminfo" ; then
+
if test "x$prefix" != xNONE; then
cf_path_syntax="$prefix"
else
@@ -5427,15 +5522,16 @@ case ".$withval" in #(vi
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:5430: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:5525: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
esac
+fi
TERMINFO="$withval"
-echo "$as_me:5438: result: $TERMINFO" >&5
+echo "$as_me:5534: result: $TERMINFO" >&5
echo "${ECHO_T}$TERMINFO" >&6
cat >>confdefs.h <<EOF
#define TERMINFO "$TERMINFO"
@@ -5445,7 +5541,7 @@ 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 "$as_me:5448: checking if big-core option selected" >&5
+echo "$as_me:5544: checking if big-core option selected" >&5
echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
# Check whether --enable-big-core or --disable-big-core was given.
@@ -5457,7 +5553,7 @@ else
with_big_core=no
else
cat >conftest.$ac_ext <<_ACEOF
-#line 5460 "configure"
+#line 5556 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -5471,15 +5567,15 @@ int main() {
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5474: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5570: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5477: \$? = $ac_status" >&5
+ echo "$as_me:5573: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:5479: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5575: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5482: \$? = $ac_status" >&5
+ echo "$as_me:5578: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
with_big_core=yes
else
@@ -5491,14 +5587,32 @@ fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi;
-echo "$as_me:5494: result: $with_big_core" >&5
+echo "$as_me:5590: result: $with_big_core" >&5
echo "${ECHO_T}$with_big_core" >&6
test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF
#define HAVE_BIG_CORE 1
EOF
+### ISO C only guarantees 512-char strings, we have tables which load faster
+### when constructed using "big" strings.
+echo "$as_me:5598: checking if big-strings option selected" >&5
+echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
+
+# Check whether --enable-big-strings or --disable-big-strings was given.
+if test "${enable_big_strings+set}" = set; then
+ enableval="$enable_big_strings"
+ with_big_strings=no
+else
+ with_big_strings=yes
+fi;
+echo "$as_me:5608: result: $with_big_strings" >&5
+echo "${ECHO_T}$with_big_strings" >&6
+
+USE_BIG_STRINGS=0
+test "$with_big_strings" = "yes" && USE_BIG_STRINGS=1
+
### use option --enable-termcap to compile in the termcap fallback support
-echo "$as_me:5501: checking if you want termcap-fallback support" >&5
+echo "$as_me:5615: checking if you want termcap-fallback support" >&5
echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
# Check whether --enable-termcap or --disable-termcap was given.
@@ -5508,13 +5622,13 @@ if test "${enable_termcap+set}" = set; then
else
with_termcap=no
fi;
-echo "$as_me:5511: result: $with_termcap" >&5
+echo "$as_me:5625: result: $with_termcap" >&5
echo "${ECHO_T}$with_termcap" >&6
if test "$with_termcap" != "yes" ; then
if test "$use_database" = no ; then
if test -z "$with_fallback" ; then
- { { echo "$as_me:5517: error: You have disabled the database w/o specifying fallbacks" >&5
+ { { echo "$as_me:5631: error: You have disabled the database w/o specifying fallbacks" >&5
echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -5525,11 +5639,17 @@ EOF
else
+if test "$with_ticlib" != no ; then
+ { { echo "$as_me:5643: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
cat >>confdefs.h <<\EOF
#define USE_TERMCAP 1
EOF
-echo "$as_me:5532: checking for list of termcap files" >&5
+echo "$as_me:5652: checking for list of termcap files" >&5
echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
# Check whether --with-termpath or --without-termpath was given.
@@ -5569,7 +5689,7 @@ case ".$cf_src_path" in #(vi
cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:5572: error: expected a pathname, not \"$cf_src_path\"" >&5
+ { { echo "$as_me:5692: error: expected a pathname, not \"$cf_src_path\"" >&5
echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -5582,14 +5702,14 @@ IFS="$ac_save_ifs"
eval 'TERMPATH="$cf_dst_path"'
-echo "$as_me:5585: result: $TERMPATH" >&5
+echo "$as_me:5705: result: $TERMPATH" >&5
echo "${ECHO_T}$TERMPATH" >&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 "$as_me:5592: checking if fast termcap-loader is needed" >&5
+echo "$as_me:5712: checking if fast termcap-loader is needed" >&5
echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
# Check whether --enable-getcap or --disable-getcap was given.
@@ -5599,13 +5719,13 @@ if test "${enable_getcap+set}" = set; then
else
with_getcap=no
fi;
-echo "$as_me:5602: result: $with_getcap" >&5
+echo "$as_me:5722: result: $with_getcap" >&5
echo "${ECHO_T}$with_getcap" >&6
test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF
#define USE_GETCAP 1
EOF
-echo "$as_me:5608: checking if translated termcaps will be cached in ~/.terminfo" >&5
+echo "$as_me:5728: checking if translated termcaps will be cached in ~/.terminfo" >&5
echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
# Check whether --enable-getcap-cache or --disable-getcap-cache was given.
@@ -5615,7 +5735,7 @@ if test "${enable_getcap_cache+set}" = set; then
else
with_getcap_cache=no
fi;
-echo "$as_me:5618: result: $with_getcap_cache" >&5
+echo "$as_me:5738: result: $with_getcap_cache" >&5
echo "${ECHO_T}$with_getcap_cache" >&6
test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF
#define USE_GETCAP_CACHE 1
@@ -5624,7 +5744,7 @@ EOF
fi
### Use option --disable-home-terminfo to completely remove ~/.terminfo
-echo "$as_me:5627: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:5747: checking if ~/.terminfo is wanted" >&5
echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
# Check whether --enable-home-terminfo or --disable-home-terminfo was given.
@@ -5634,13 +5754,13 @@ if test "${enable_home_terminfo+set}" = set; then
else
with_home_terminfo=yes
fi;
-echo "$as_me:5637: result: $with_home_terminfo" >&5
+echo "$as_me:5757: result: $with_home_terminfo" >&5
echo "${ECHO_T}$with_home_terminfo" >&6
test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF
#define USE_HOME_TERMINFO 1
EOF
-echo "$as_me:5643: checking if you want to use restricted environment when running as root" >&5
+echo "$as_me:5763: checking if you want to use restricted environment when running as root" >&5
echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
# Check whether --enable-root-environ or --disable-root-environ was given.
@@ -5650,7 +5770,7 @@ if test "${enable_root_environ+set}" = set; then
else
with_root_environ=yes
fi;
-echo "$as_me:5653: result: $with_root_environ" >&5
+echo "$as_me:5773: result: $with_root_environ" >&5
echo "${ECHO_T}$with_root_environ" >&6
test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF
#define USE_ROOT_ENVIRON 1
@@ -5664,13 +5784,13 @@ for ac_func in \
unlink
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5667: checking for $ac_func" >&5
+echo "$as_me:5787: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 5673 "configure"
+#line 5793 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -5701,16 +5821,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5704: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5824: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5707: \$? = $ac_status" >&5
+ echo "$as_me:5827: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5710: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5830: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5713: \$? = $ac_status" >&5
+ echo "$as_me:5833: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -5720,7 +5840,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:5723: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5843: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -5737,13 +5857,13 @@ for ac_func in \
symlink
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5740: checking for $ac_func" >&5
+echo "$as_me:5860: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 5746 "configure"
+#line 5866 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -5774,16 +5894,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5777: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5897: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5780: \$? = $ac_status" >&5
+ echo "$as_me:5900: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5783: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5903: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5786: \$? = $ac_status" >&5
+ echo "$as_me:5906: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -5793,7 +5913,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:5796: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5916: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -5804,7 +5924,7 @@ fi
done
else
- echo "$as_me:5807: checking if link/symlink functions work" >&5
+ echo "$as_me:5927: checking if link/symlink functions work" >&5
echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
if test "${cf_cv_link_funcs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5817,7 +5937,7 @@ else
eval 'ac_cv_func_'$cf_func'=error'
else
cat >conftest.$ac_ext <<_ACEOF
-#line 5820 "configure"
+#line 5940 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -5847,15 +5967,15 @@ int main()
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5850: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5970: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5853: \$? = $ac_status" >&5
+ echo "$as_me:5973: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:5855: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5975: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5858: \$? = $ac_status" >&5
+ echo "$as_me:5978: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -5873,7 +5993,7 @@ fi
test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
fi
-echo "$as_me:5876: result: $cf_cv_link_funcs" >&5
+echo "$as_me:5996: result: $cf_cv_link_funcs" >&5
echo "${ECHO_T}$cf_cv_link_funcs" >&6
test "$ac_cv_func_link" = yes && cat >>confdefs.h <<\EOF
#define HAVE_LINK 1
@@ -5891,7 +6011,7 @@ with_symlinks=no
# soft links (symbolic links) are useful for some systems where hard links do
# not work, or to make it simpler to copy terminfo trees around.
if test "$ac_cv_func_symlink" = yes ; then
- echo "$as_me:5894: checking if tic should use symbolic links" >&5
+ echo "$as_me:6014: checking if tic should use symbolic links" >&5
echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
# Check whether --enable-symlinks or --disable-symlinks was given.
@@ -5901,21 +6021,21 @@ if test "${enable_symlinks+set}" = set; then
else
with_symlinks=no
fi;
- echo "$as_me:5904: result: $with_symlinks" >&5
+ echo "$as_me:6024: result: $with_symlinks" >&5
echo "${ECHO_T}$with_symlinks" >&6
fi
# If we have hard links and did not choose to use soft links instead, there is
# no reason to make this choice optional - use the hard links.
if test "$with_symlinks" = no ; then
- echo "$as_me:5911: checking if tic should use hard links" >&5
+ echo "$as_me:6031: checking if tic should use hard links" >&5
echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
if test "$ac_cv_func_link" = yes ; then
with_links=yes
else
with_links=no
fi
- echo "$as_me:5918: result: $with_links" >&5
+ echo "$as_me:6038: result: $with_links" >&5
echo "${ECHO_T}$with_links" >&6
fi
@@ -5928,7 +6048,7 @@ test "$with_symlinks" = yes && cat >>confdefs.h <<\EOF
EOF
### use option --enable-broken-linker to force on use of broken-linker support
-echo "$as_me:5931: checking if you want broken-linker support code" >&5
+echo "$as_me:6051: checking if you want broken-linker support code" >&5
echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
# Check whether --enable-broken_linker or --disable-broken_linker was given.
@@ -5938,7 +6058,7 @@ if test "${enable_broken_linker+set}" = set; then
else
with_broken_linker=${BROKEN_LINKER-no}
fi;
-echo "$as_me:5941: result: $with_broken_linker" >&5
+echo "$as_me:6061: result: $with_broken_linker" >&5
echo "${ECHO_T}$with_broken_linker" >&6
BROKEN_LINKER=0
@@ -5958,12 +6078,14 @@ EOF
BROKEN_LINKER=1
test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6
+echo "${as_me-configure}:6081: testing cygwin linker is broken anyway ..." 1>&5
+
;;
esac
fi
### use option --enable-bsdpad to have tputs process BSD-style prefix padding
-echo "$as_me:5966: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:6088: checking if tputs should process BSD-style prefix padding" >&5
echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
# Check whether --enable-bsdpad or --disable-bsdpad was given.
@@ -5973,7 +6095,7 @@ if test "${enable_bsdpad+set}" = set; then
else
with_bsdpad=no
fi;
-echo "$as_me:5976: result: $with_bsdpad" >&5
+echo "$as_me:6098: result: $with_bsdpad" >&5
echo "${ECHO_T}$with_bsdpad" >&6
test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF
#define BSD_TPUTS 1
@@ -5990,7 +6112,7 @@ NCURSES_WINT_T=0
# Check to define _XOPEN_SOURCE "automatically"
-echo "$as_me:5993: checking if $CC -U and -D options work together" >&5
+echo "$as_me:6115: checking if $CC -U and -D options work together" >&5
echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
if test "${cf_cv_cc_u_d_options+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5999,7 +6121,7 @@ else
cf_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
cat >conftest.$ac_ext <<_ACEOF
-#line 6002 "configure"
+#line 6124 "configure"
#include "confdefs.h"
int
@@ -6018,16 +6140,16 @@ make a defined-error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6143: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6024: \$? = $ac_status" >&5
+ echo "$as_me:6146: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6027: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6149: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6030: \$? = $ac_status" >&5
+ echo "$as_me:6152: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_cc_u_d_options=yes
@@ -6041,7 +6163,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
CPPFLAGS="$cf_save_CPPFLAGS"
fi
-echo "$as_me:6044: result: $cf_cv_cc_u_d_options" >&5
+echo "$as_me:6166: result: $cf_cv_cc_u_d_options" >&5
echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
cf_XOPEN_SOURCE=500
@@ -6065,16 +6187,16 @@ hpux*) #(vi
irix[56].*) #(vi
CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
;;
-linux*|gnu*) #(vi
+linux*|gnu*|k*bsd*-gnu) #(vi
-echo "$as_me:6070: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:6192: checking if we must define _GNU_SOURCE" >&5
echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
if test "${cf_cv_gnu_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 6077 "configure"
+#line 6199 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -6089,16 +6211,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6092: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6214: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6095: \$? = $ac_status" >&5
+ echo "$as_me:6217: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6098: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6220: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6101: \$? = $ac_status" >&5
+ echo "$as_me:6223: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_gnu_source=no
else
@@ -6107,7 +6229,7 @@ cat conftest.$ac_ext >&5
cf_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
cat >conftest.$ac_ext <<_ACEOF
-#line 6110 "configure"
+#line 6232 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -6122,16 +6244,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6125: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6247: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6128: \$? = $ac_status" >&5
+ echo "$as_me:6250: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6131: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6253: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6134: \$? = $ac_status" >&5
+ echo "$as_me:6256: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_gnu_source=no
else
@@ -6146,7 +6268,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:6149: result: $cf_cv_gnu_source" >&5
+echo "$as_me:6271: result: $cf_cv_gnu_source" >&5
echo "${ECHO_T}$cf_cv_gnu_source" >&6
test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
@@ -6173,14 +6295,14 @@ solaris*) #(vi
CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
;;
*)
- echo "$as_me:6176: checking if we should define _XOPEN_SOURCE" >&5
+ echo "$as_me:6298: checking if we should define _XOPEN_SOURCE" >&5
echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
if test "${cf_cv_xopen_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 6183 "configure"
+#line 6305 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -6195,16 +6317,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6198: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6320: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6201: \$? = $ac_status" >&5
+ echo "$as_me:6323: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6204: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6326: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6207: \$? = $ac_status" >&5
+ echo "$as_me:6329: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -6213,7 +6335,7 @@ cat conftest.$ac_ext >&5
cf_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
cat >conftest.$ac_ext <<_ACEOF
-#line 6216 "configure"
+#line 6338 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -6228,16 +6350,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6231: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6353: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6234: \$? = $ac_status" >&5
+ echo "$as_me:6356: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6237: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6359: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6240: \$? = $ac_status" >&5
+ echo "$as_me:6362: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -6252,7 +6374,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:6255: result: $cf_cv_xopen_source" >&5
+echo "$as_me:6377: result: $cf_cv_xopen_source" >&5
echo "${ECHO_T}$cf_cv_xopen_source" >&6
if test "$cf_cv_xopen_source" != no ; then
@@ -6286,16 +6408,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \
-e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'`
-echo "$as_me:6289: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:6411: checking if we should define _POSIX_C_SOURCE" >&5
echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
if test "${cf_cv_posix_c_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-echo "(line 6295) testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me-configure}:6417: testing if the symbol is already defined go no further ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 6298 "configure"
+#line 6420 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -6310,16 +6432,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6313: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6435: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6316: \$? = $ac_status" >&5
+ echo "$as_me:6438: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6319: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6441: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6322: \$? = $ac_status" >&5
+ echo "$as_me:6444: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_posix_c_source=no
else
@@ -6340,7 +6462,7 @@ cf_want_posix_source=no
esac
if test "$cf_want_posix_source" = yes ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 6343 "configure"
+#line 6465 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -6355,16 +6477,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6358: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6480: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6361: \$? = $ac_status" >&5
+ echo "$as_me:6483: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6364: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6486: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6367: \$? = $ac_status" >&5
+ echo "$as_me:6489: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -6375,15 +6497,15 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "(line 6378) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me-configure}:6500: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
CFLAGS="$cf_trim_CFLAGS"
CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
-echo "(line 6383) testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me-configure}:6505: testing if the second compile does not leave our definition intact error ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 6386 "configure"
+#line 6508 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -6398,16 +6520,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6401: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6523: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6404: \$? = $ac_status" >&5
+ echo "$as_me:6526: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6407: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6529: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6410: \$? = $ac_status" >&5
+ echo "$as_me:6532: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -6423,7 +6545,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:6426: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:6548: result: $cf_cv_posix_c_source" >&5
echo "${ECHO_T}$cf_cv_posix_c_source" >&6
if test "$cf_cv_posix_c_source" != no ; then
@@ -6442,14 +6564,14 @@ esac
# Work around breakage on OS X
-echo "$as_me:6445: checking if SIGWINCH is defined" >&5
+echo "$as_me:6567: checking if SIGWINCH is defined" >&5
echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
if test "${cf_cv_define_sigwinch+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 6452 "configure"
+#line 6574 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -6464,23 +6586,23 @@ int x = SIGWINCH
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6467: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6589: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6470: \$? = $ac_status" >&5
+ echo "$as_me:6592: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6473: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6595: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6476: \$? = $ac_status" >&5
+ echo "$as_me:6598: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_define_sigwinch=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 6483 "configure"
+#line 6605 "configure"
#include "confdefs.h"
#undef _XOPEN_SOURCE
@@ -6498,16 +6620,16 @@ int x = SIGWINCH
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6501: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6623: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6504: \$? = $ac_status" >&5
+ echo "$as_me:6626: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6507: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6629: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6510: \$? = $ac_status" >&5
+ echo "$as_me:6632: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_define_sigwinch=maybe
else
@@ -6521,11 +6643,11 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:6524: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:6646: result: $cf_cv_define_sigwinch" >&5
echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
if test "$cf_cv_define_sigwinch" = maybe ; then
-echo "$as_me:6528: checking for actual SIGWINCH definition" >&5
+echo "$as_me:6650: checking for actual SIGWINCH definition" >&5
echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
if test "${cf_cv_fixup_sigwinch+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6536,7 +6658,7 @@ cf_sigwinch=32
while test $cf_sigwinch != 1
do
cat >conftest.$ac_ext <<_ACEOF
-#line 6539 "configure"
+#line 6661 "configure"
#include "confdefs.h"
#undef _XOPEN_SOURCE
@@ -6558,16 +6680,16 @@ int x = SIGWINCH
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6561: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6683: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6564: \$? = $ac_status" >&5
+ echo "$as_me:6686: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6567: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6689: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6570: \$? = $ac_status" >&5
+ echo "$as_me:6692: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_fixup_sigwinch=$cf_sigwinch
break
@@ -6581,7 +6703,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
done
fi
-echo "$as_me:6584: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:6706: result: $cf_cv_fixup_sigwinch" >&5
echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -6591,13 +6713,13 @@ fi
# Checks for CODESET support.
- echo "$as_me:6594: checking for nl_langinfo and CODESET" >&5
+ echo "$as_me:6716: checking for nl_langinfo and CODESET" >&5
echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
if test "${am_cv_langinfo_codeset+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 6600 "configure"
+#line 6722 "configure"
#include "confdefs.h"
#include <langinfo.h>
int
@@ -6609,16 +6731,16 @@ char* cs = nl_langinfo(CODESET);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6612: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6734: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6615: \$? = $ac_status" >&5
+ echo "$as_me:6737: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6618: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6740: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6621: \$? = $ac_status" >&5
+ echo "$as_me:6743: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
am_cv_langinfo_codeset=yes
else
@@ -6629,7 +6751,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:6632: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:6754: result: $am_cv_langinfo_codeset" >&5
echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
if test $am_cv_langinfo_codeset = yes; then
@@ -6643,7 +6765,7 @@ EOF
NCURSES_OK_WCHAR_T=
NCURSES_OK_WINT_T=
-echo "$as_me:6646: checking if you want wide-character code" >&5
+echo "$as_me:6768: checking if you want wide-character code" >&5
echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
# Check whether --enable-widec or --disable-widec was given.
@@ -6653,7 +6775,7 @@ if test "${enable_widec+set}" = set; then
else
with_widec=no
fi;
-echo "$as_me:6656: result: $with_widec" >&5
+echo "$as_me:6778: result: $with_widec" >&5
echo "${ECHO_T}$with_widec" >&6
if test "$with_widec" = yes ; then
LIB_SUFFIX="w${LIB_SUFFIX}"
@@ -6661,10 +6783,10 @@ if test "$with_widec" = yes ; then
#define USE_WIDEC_SUPPORT 1
EOF
-echo "$as_me:6664: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:6786: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 6667 "configure"
+#line 6789 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -6680,16 +6802,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6683: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6805: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6686: \$? = $ac_status" >&5
+ echo "$as_me:6808: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6689: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6811: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6692: \$? = $ac_status" >&5
+ echo "$as_me:6814: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=no
else
@@ -6698,16 +6820,16 @@ cat conftest.$ac_ext >&5
cf_result=yes
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:6701: result: $cf_result" >&5
+echo "$as_me:6823: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test "$cf_result" = yes ; then
CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
elif test "x" != "x" ; then
- echo "$as_me:6707: checking checking for compatible value versus " >&5
+ echo "$as_me:6829: checking checking for compatible value versus " >&5
echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 6710 "configure"
+#line 6832 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -6723,16 +6845,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6726: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6848: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6729: \$? = $ac_status" >&5
+ echo "$as_me:6851: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6732: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6854: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6735: \$? = $ac_status" >&5
+ echo "$as_me:6857: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -6741,7 +6863,7 @@ cat conftest.$ac_ext >&5
cf_result=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:6744: result: $cf_result" >&5
+ echo "$as_me:6866: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test "$cf_result" = no ; then
# perhaps we can override it - try...
@@ -6755,13 +6877,13 @@ fi
for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6758: checking for $ac_func" >&5
+echo "$as_me:6880: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 6764 "configure"
+#line 6886 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -6792,16 +6914,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6795: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6917: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6798: \$? = $ac_status" >&5
+ echo "$as_me:6920: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6801: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6923: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6804: \$? = $ac_status" >&5
+ echo "$as_me:6926: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -6811,7 +6933,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:6814: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6936: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -6823,7 +6945,7 @@ done
if test "$ac_cv_func_putwc" != yes ; then
-echo "$as_me:6826: checking for putwc in libutf8" >&5
+echo "$as_me:6948: checking for putwc in libutf8" >&5
echo $ECHO_N "checking for putwc in libutf8... $ECHO_C" >&6
if test "${cf_cv_libutf8+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6832,7 +6954,7 @@ else
cf_save_LIBS="$LIBS"
LIBS="-lutf8 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 6835 "configure"
+#line 6957 "configure"
#include "confdefs.h"
#include <libutf8.h>
@@ -6845,16 +6967,16 @@ putwc(0,0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6848: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6970: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6851: \$? = $ac_status" >&5
+ echo "$as_me:6973: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6854: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6976: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6857: \$? = $ac_status" >&5
+ echo "$as_me:6979: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_libutf8=yes
else
@@ -6866,7 +6988,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS="$cf_save_LIBS"
fi
-echo "$as_me:6869: result: $cf_cv_libutf8" >&5
+echo "$as_me:6991: result: $cf_cv_libutf8" >&5
echo "${ECHO_T}$cf_cv_libutf8" >&6
if test "$cf_cv_libutf8" = yes ; then
@@ -6883,14 +7005,14 @@ fi
fi
# This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:6886: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:7008: checking if we must include wchar.h to declare mbstate_t" >&5
echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
if test "${cf_cv_mbstate_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 6893 "configure"
+#line 7015 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -6908,23 +7030,23 @@ mbstate_t state
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6911: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7033: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6914: \$? = $ac_status" >&5
+ echo "$as_me:7036: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6917: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7039: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6920: \$? = $ac_status" >&5
+ echo "$as_me:7042: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_mbstate_t=no
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 6927 "configure"
+#line 7049 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -6943,16 +7065,16 @@ mbstate_t value
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6946: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7068: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6949: \$? = $ac_status" >&5
+ echo "$as_me:7071: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6952: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7074: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6955: \$? = $ac_status" >&5
+ echo "$as_me:7077: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_mbstate_t=yes
else
@@ -6964,7 +7086,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:6967: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:7089: result: $cf_cv_mbstate_t" >&5
echo "${ECHO_T}$cf_cv_mbstate_t" >&6
if test "$cf_cv_mbstate_t" = yes ; then
@@ -6981,14 +7103,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
fi
# This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:6984: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:7106: checking if we must include wchar.h to declare wchar_t" >&5
echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
if test "${cf_cv_wchar_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 6991 "configure"
+#line 7113 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -7006,23 +7128,23 @@ wchar_t state
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7009: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7131: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7012: \$? = $ac_status" >&5
+ echo "$as_me:7134: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7015: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7137: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7018: \$? = $ac_status" >&5
+ echo "$as_me:7140: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_wchar_t=no
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 7025 "configure"
+#line 7147 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -7041,16 +7163,16 @@ wchar_t value
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7044: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7166: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7047: \$? = $ac_status" >&5
+ echo "$as_me:7169: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7050: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7172: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7053: \$? = $ac_status" >&5
+ echo "$as_me:7175: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_wchar_t=yes
else
@@ -7062,7 +7184,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:7065: result: $cf_cv_wchar_t" >&5
+echo "$as_me:7187: result: $cf_cv_wchar_t" >&5
echo "${ECHO_T}$cf_cv_wchar_t" >&6
if test "$cf_cv_wchar_t" = yes ; then
@@ -7084,14 +7206,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
fi
# This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:7087: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:7209: checking if we must include wchar.h to declare wint_t" >&5
echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
if test "${cf_cv_wint_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 7094 "configure"
+#line 7216 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -7109,23 +7231,23 @@ wint_t state
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7112: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7234: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7115: \$? = $ac_status" >&5
+ echo "$as_me:7237: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7118: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7240: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7121: \$? = $ac_status" >&5
+ echo "$as_me:7243: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_wint_t=no
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 7128 "configure"
+#line 7250 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -7144,16 +7266,16 @@ wint_t value
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7147: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7269: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7150: \$? = $ac_status" >&5
+ echo "$as_me:7272: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7153: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7275: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7156: \$? = $ac_status" >&5
+ echo "$as_me:7278: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_wint_t=yes
else
@@ -7165,7 +7287,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:7168: result: $cf_cv_wint_t" >&5
+echo "$as_me:7290: result: $cf_cv_wint_t" >&5
echo "${ECHO_T}$cf_cv_wint_t" >&6
if test "$cf_cv_wint_t" = yes ; then
@@ -7204,7 +7326,7 @@ case $cf_cv_abi_version in
;;
esac
-echo "$as_me:7207: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:7329: checking whether to enable _LP64 definition in curses.h" >&5
echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
# Check whether --enable-lp64 or --disable-lp64 was given.
@@ -7214,7 +7336,7 @@ if test "${enable_lp64+set}" = set; then
else
with_lp64=$default_with_lp64
fi;
-echo "$as_me:7217: result: $with_lp64" >&5
+echo "$as_me:7339: result: $with_lp64" >&5
echo "${ECHO_T}$with_lp64" >&6
if test "$with_lp64" = yes ; then
@@ -7230,7 +7352,7 @@ if test "${enable_largefile+set}" = set; then
fi;
if test "$enable_largefile" != no; then
- echo "$as_me:7233: checking for special C compiler options needed for large files" >&5
+ echo "$as_me:7355: checking for special C compiler options needed for large files" >&5
echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
if test "${ac_cv_sys_largefile_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7242,7 +7364,7 @@ else
# IRIX 6.2 and later do not support large files by default,
# so use the C compiler's -n32 option if that helps.
cat >conftest.$ac_ext <<_ACEOF
-#line 7245 "configure"
+#line 7367 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -7262,16 +7384,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7265: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7387: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7268: \$? = $ac_status" >&5
+ echo "$as_me:7390: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7271: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7393: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7274: \$? = $ac_status" >&5
+ echo "$as_me:7396: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -7281,16 +7403,16 @@ fi
rm -f conftest.$ac_objext
CC="$CC -n32"
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7284: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7406: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7287: \$? = $ac_status" >&5
+ echo "$as_me:7409: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7290: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7412: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7293: \$? = $ac_status" >&5
+ echo "$as_me:7415: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_largefile_CC=' -n32'; break
else
@@ -7304,13 +7426,13 @@ rm -f conftest.$ac_objext
rm -f conftest.$ac_ext
fi
fi
-echo "$as_me:7307: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:7429: result: $ac_cv_sys_largefile_CC" >&5
echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
if test "$ac_cv_sys_largefile_CC" != no; then
CC=$CC$ac_cv_sys_largefile_CC
fi
- echo "$as_me:7313: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+ echo "$as_me:7435: checking for _FILE_OFFSET_BITS value needed for large files" >&5
echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
if test "${ac_cv_sys_file_offset_bits+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7318,7 +7440,7 @@ else
while :; do
ac_cv_sys_file_offset_bits=no
cat >conftest.$ac_ext <<_ACEOF
-#line 7321 "configure"
+#line 7443 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -7338,16 +7460,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7341: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7463: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7344: \$? = $ac_status" >&5
+ echo "$as_me:7466: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7347: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7469: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7350: \$? = $ac_status" >&5
+ echo "$as_me:7472: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -7356,7 +7478,7 @@ cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 7359 "configure"
+#line 7481 "configure"
#include "confdefs.h"
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
@@ -7377,16 +7499,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7380: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7502: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7383: \$? = $ac_status" >&5
+ echo "$as_me:7505: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7386: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7508: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7389: \$? = $ac_status" >&5
+ echo "$as_me:7511: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_file_offset_bits=64; break
else
@@ -7397,7 +7519,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
break
done
fi
-echo "$as_me:7400: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:7522: result: $ac_cv_sys_file_offset_bits" >&5
echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
if test "$ac_cv_sys_file_offset_bits" != no; then
@@ -7407,7 +7529,7 @@ EOF
fi
rm -f conftest*
- echo "$as_me:7410: checking for _LARGE_FILES value needed for large files" >&5
+ echo "$as_me:7532: checking for _LARGE_FILES value needed for large files" >&5
echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
if test "${ac_cv_sys_large_files+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7415,7 +7537,7 @@ else
while :; do
ac_cv_sys_large_files=no
cat >conftest.$ac_ext <<_ACEOF
-#line 7418 "configure"
+#line 7540 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -7435,16 +7557,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7438: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7560: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7441: \$? = $ac_status" >&5
+ echo "$as_me:7563: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7444: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7566: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7447: \$? = $ac_status" >&5
+ echo "$as_me:7569: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -7453,7 +7575,7 @@ cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 7456 "configure"
+#line 7578 "configure"
#include "confdefs.h"
#define _LARGE_FILES 1
#include <sys/types.h>
@@ -7474,16 +7596,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7477: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7599: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7480: \$? = $ac_status" >&5
+ echo "$as_me:7602: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7483: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7605: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7486: \$? = $ac_status" >&5
+ echo "$as_me:7608: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_large_files=1; break
else
@@ -7494,7 +7616,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
break
done
fi
-echo "$as_me:7497: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:7619: result: $ac_cv_sys_large_files" >&5
echo "${ECHO_T}$ac_cv_sys_large_files" >&6
if test "$ac_cv_sys_large_files" != no; then
@@ -7507,7 +7629,7 @@ rm -f conftest*
fi
if test "$enable_largefile" != no ; then
- echo "$as_me:7510: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+ echo "$as_me:7632: checking for _LARGEFILE_SOURCE value needed for large files" >&5
echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
if test "${ac_cv_sys_largefile_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7515,7 +7637,7 @@ else
while :; do
ac_cv_sys_largefile_source=no
cat >conftest.$ac_ext <<_ACEOF
-#line 7518 "configure"
+#line 7640 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -7527,16 +7649,16 @@ return !fseeko;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7530: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7652: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7533: \$? = $ac_status" >&5
+ echo "$as_me:7655: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7536: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7658: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7539: \$? = $ac_status" >&5
+ echo "$as_me:7661: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -7545,7 +7667,7 @@ cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 7548 "configure"
+#line 7670 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -7558,16 +7680,16 @@ return !fseeko;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7561: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7683: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7564: \$? = $ac_status" >&5
+ echo "$as_me:7686: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7567: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7689: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7570: \$? = $ac_status" >&5
+ echo "$as_me:7692: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_largefile_source=1; break
else
@@ -7578,7 +7700,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
break
done
fi
-echo "$as_me:7581: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:7703: result: $ac_cv_sys_largefile_source" >&5
echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
if test "$ac_cv_sys_largefile_source" != no; then
@@ -7592,13 +7714,13 @@ rm -f conftest*
# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
# in glibc 2.1.3, but that breaks too many other things.
# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:7595: checking for fseeko" >&5
+echo "$as_me:7717: checking for fseeko" >&5
echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
if test "${ac_cv_func_fseeko+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 7601 "configure"
+#line 7723 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -7610,16 +7732,16 @@ return fseeko && fseeko (stdin, 0, 0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7613: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7735: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7616: \$? = $ac_status" >&5
+ echo "$as_me:7738: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7619: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7741: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7622: \$? = $ac_status" >&5
+ echo "$as_me:7744: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_fseeko=yes
else
@@ -7629,7 +7751,7 @@ ac_cv_func_fseeko=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:7632: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:7754: result: $ac_cv_func_fseeko" >&5
echo "${ECHO_T}$ac_cv_func_fseeko" >&6
if test $ac_cv_func_fseeko = yes; then
@@ -7648,15 +7770,16 @@ fi
# the config.h
test "$ac_cv_sys_large_files" != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES "
test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
+ test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
- echo "$as_me:7652: checking whether to use struct dirent64" >&5
+ echo "$as_me:7775: checking whether to use struct dirent64" >&5
echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
if test "${cf_cv_struct_dirent64+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 7659 "configure"
+#line 7782 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -7677,16 +7800,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7680: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7803: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7683: \$? = $ac_status" >&5
+ echo "$as_me:7806: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7686: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7809: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7689: \$? = $ac_status" >&5
+ echo "$as_me:7812: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_struct_dirent64=yes
else
@@ -7697,7 +7820,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:7700: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:7823: result: $cf_cv_struct_dirent64" >&5
echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
#define HAVE_STRUCT_DIRENT64 1
@@ -7706,7 +7829,7 @@ EOF
fi
### use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:7709: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:7832: checking if you want tparm not to use X/Open fixed-parameter list" >&5
echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
# Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
@@ -7716,13 +7839,13 @@ if test "${enable_tparm_varargs+set}" = set; then
else
with_tparm_varargs=yes
fi;
-echo "$as_me:7719: result: $with_tparm_varargs" >&5
+echo "$as_me:7842: result: $with_tparm_varargs" >&5
echo "${ECHO_T}$with_tparm_varargs" >&6
NCURSES_TPARM_VARARGS=0
test "$with_tparm_varargs" = yes && NCURSES_TPARM_VARARGS=1
### use option --with-bool to override bool's type
-echo "$as_me:7725: checking for type of bool" >&5
+echo "$as_me:7848: checking for type of bool" >&5
echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
# Check whether --with-bool or --without-bool was given.
@@ -7732,10 +7855,10 @@ if test "${with_bool+set}" = set; then
else
NCURSES_BOOL=auto
fi;
-echo "$as_me:7735: result: $NCURSES_BOOL" >&5
+echo "$as_me:7858: result: $NCURSES_BOOL" >&5
echo "${ECHO_T}$NCURSES_BOOL" >&6
-echo "$as_me:7738: checking for alternate terminal capabilities file" >&5
+echo "$as_me:7861: checking for alternate terminal capabilities file" >&5
echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
# Check whether --with-caps or --without-caps was given.
@@ -7746,11 +7869,11 @@ else
TERMINFO_CAPS=Caps
fi;
test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
-echo "$as_me:7749: result: $TERMINFO_CAPS" >&5
+echo "$as_me:7872: result: $TERMINFO_CAPS" >&5
echo "${ECHO_T}$TERMINFO_CAPS" >&6
### use option --with-chtype to override chtype's type
-echo "$as_me:7753: checking for type of chtype" >&5
+echo "$as_me:7876: checking for type of chtype" >&5
echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
# Check whether --with-chtype or --without-chtype was given.
@@ -7760,11 +7883,11 @@ if test "${with_chtype+set}" = set; then
else
NCURSES_CHTYPE=auto
fi;
-echo "$as_me:7763: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:7886: result: $NCURSES_CHTYPE" >&5
echo "${ECHO_T}$NCURSES_CHTYPE" >&6
### use option --with-ospeed to override ospeed's type
-echo "$as_me:7767: checking for type of ospeed" >&5
+echo "$as_me:7890: checking for type of ospeed" >&5
echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
# Check whether --with-ospeed or --without-ospeed was given.
@@ -7774,11 +7897,11 @@ if test "${with_ospeed+set}" = set; then
else
NCURSES_OSPEED=short
fi;
-echo "$as_me:7777: result: $NCURSES_OSPEED" >&5
+echo "$as_me:7900: result: $NCURSES_OSPEED" >&5
echo "${ECHO_T}$NCURSES_OSPEED" >&6
### use option --with-mmask-t to override mmask_t's type
-echo "$as_me:7781: checking for type of mmask_t" >&5
+echo "$as_me:7904: checking for type of mmask_t" >&5
echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
# Check whether --with-mmask-t or --without-mmask-t was given.
@@ -7788,11 +7911,11 @@ if test "${with_mmask_t+set}" = set; then
else
NCURSES_MMASK_T=auto
fi;
-echo "$as_me:7791: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:7914: result: $NCURSES_MMASK_T" >&5
echo "${ECHO_T}$NCURSES_MMASK_T" >&6
### Enable compiling-in rcs id's
-echo "$as_me:7795: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:7918: checking if RCS identifiers should be compiled-in" >&5
echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
# Check whether --with-rcs-ids or --without-rcs-ids was given.
@@ -7802,7 +7925,7 @@ if test "${with_rcs_ids+set}" = set; then
else
with_rcs_ids=no
fi;
-echo "$as_me:7805: result: $with_rcs_ids" >&5
+echo "$as_me:7928: result: $with_rcs_ids" >&5
echo "${ECHO_T}$with_rcs_ids" >&6
test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF
#define USE_RCS_IDS 1
@@ -7810,7 +7933,7 @@ EOF
###############################################################################
-echo "$as_me:7813: checking format of man-pages" >&5
+echo "$as_me:7936: checking format of man-pages" >&5
echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
# Check whether --with-manpage-format or --without-manpage-format was given.
@@ -7899,14 +8022,14 @@ unknown)
;;
esac
-echo "$as_me:7902: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:8025: result: $MANPAGE_FORMAT" >&5
echo "${ECHO_T}$MANPAGE_FORMAT" >&6
if test -n "$cf_unknown" ; then
- { echo "$as_me:7905: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ { echo "$as_me:8028: WARNING: Unexpected manpage-format $cf_unknown" >&5
echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
fi
-echo "$as_me:7909: checking for manpage renaming" >&5
+echo "$as_me:8032: checking for manpage renaming" >&5
echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
# Check whether --with-manpage-renames or --without-manpage-renames was given.
@@ -7934,7 +8057,7 @@ 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 "$as_me:7937: error: not a filename: $MANPAGE_RENAMES" >&5
+ { { echo "$as_me:8060: error: not a filename: $MANPAGE_RENAMES" >&5
echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -7948,10 +8071,10 @@ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
fi
fi
-echo "$as_me:7951: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:8074: result: $MANPAGE_RENAMES" >&5
echo "${ECHO_T}$MANPAGE_RENAMES" >&6
-echo "$as_me:7954: checking if manpage aliases will be installed" >&5
+echo "$as_me:8077: checking if manpage aliases will be installed" >&5
echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
# Check whether --with-manpage-aliases or --without-manpage-aliases was given.
@@ -7962,7 +8085,7 @@ else
MANPAGE_ALIASES=yes
fi;
-echo "$as_me:7965: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:8088: result: $MANPAGE_ALIASES" >&5
echo "${ECHO_T}$MANPAGE_ALIASES" >&6
if test "$LN_S" = "ln -s"; then
@@ -7973,7 +8096,7 @@ fi
MANPAGE_SYMLINKS=no
if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:7976: checking if manpage symlinks should be used" >&5
+echo "$as_me:8099: checking if manpage symlinks should be used" >&5
echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
# Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
@@ -7986,17 +8109,17 @@ fi;
if test "$$cf_use_symlinks" = no; then
if test "$MANPAGE_SYMLINKS" = yes ; then
- { echo "$as_me:7989: WARNING: cannot make symlinks" >&5
+ { echo "$as_me:8112: WARNING: cannot make symlinks" >&5
echo "$as_me: WARNING: cannot make symlinks" >&2;}
MANPAGE_SYMLINKS=no
fi
fi
-echo "$as_me:7995: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:8118: result: $MANPAGE_SYMLINKS" >&5
echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
fi
-echo "$as_me:7999: checking for manpage tbl" >&5
+echo "$as_me:8122: checking for manpage tbl" >&5
echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
# Check whether --with-manpage-tbl or --without-manpage-tbl was given.
@@ -8007,7 +8130,7 @@ else
MANPAGE_TBL=no
fi;
-echo "$as_me:8010: result: $MANPAGE_TBL" >&5
+echo "$as_me:8133: result: $MANPAGE_TBL" >&5
echo "${ECHO_T}$MANPAGE_TBL" >&6
if test "$prefix" = "NONE" ; then
@@ -8047,6 +8170,7 @@ case "$MANPAGE_FORMAT" in #(vi
esac
cf_edit_man=./edit_man.sh
+cf_man_alias=`pwd`/man_alias.sed
cat >$cf_edit_man <<CF_EOF
#! /bin/sh
@@ -8062,7 +8186,7 @@ NCURSES_PATCH="$NCURSES_PATCH"
NCURSES_OSPEED="$NCURSES_OSPEED"
TERMINFO="$TERMINFO"
-MKDIRS="sh `cd $srcdir && pwd`/mkinstalldirs"
+MKDIRS="sh `cd $srcdir && pwd`/mkdirs.sh"
INSTALL="$INSTALL"
INSTALL_DATA="$INSTALL_DATA"
@@ -8110,6 +8234,32 @@ case \$i in #(vi
\$MKDIRS \$cf_subdir\$section
fi
fi
+
+ # replace variables in man page
+ if test ! -f $cf_man_alias ; then
+cat >>$cf_man_alias <<-CF_EOF2
+ s,@DATADIR@,\$datadir,g
+ s,@TERMINFO@,\$TERMINFO,g
+ s,@NCURSES_MAJOR@,\$NCURSES_MAJOR,g
+ s,@NCURSES_MINOR@,\$NCURSES_MINOR,g
+ s,@NCURSES_PATCH@,\$NCURSES_PATCH,g
+ s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g
+CF_EOF
+
+ for cf_name in captoinfo clear infocmp infotocap tic toe tput
+ do
+ cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
+ cf_name=`echo $cf_name|sed "$program_transform_name"`
+cat >>$cf_edit_man <<-CF_EOF
+ s,@$cf_NAME@,$cf_name,
+CF_EOF
+ done
+
+cat >>$cf_edit_man <<CF_EOF
+CF_EOF2
+ echo "...made $cf_man_alias"
+ fi
+
aliases=
cf_source=\`basename \$i\`
inalias=\$cf_source
@@ -8122,7 +8272,7 @@ CF_EOF
if test "$MANPAGE_ALIASES" != no ; then
cat >>$cf_edit_man <<CF_EOF
- aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias | sort -u\`
+ aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias |sed -f $cf_man_alias | sort -u\`
CF_EOF
fi
@@ -8143,34 +8293,13 @@ cat >>$cf_edit_man <<CF_EOF
cf_target="\$cf_source"
fi
cf_target="\$cf_subdir\${section}/\${cf_target}"
-CF_EOF
-fi
-
- # replace variables in man page
- for cf_name in captoinfo clear infocmp infotocap tic toe tput
- do
-cat >>$cf_edit_man <<CF_EOF
- prog_$cf_name=\`echo $cf_name|sed "\${transform}"\`
-CF_EOF
- done
-
-cat >>$cf_edit_man <<CF_EOF
- sed -e "s,@DATADIR@,\$datadir," \\
- -e "s,@TERMINFO@,\$TERMINFO," \\
- -e "s,@NCURSES_MAJOR@,\$NCURSES_MAJOR," \\
- -e "s,@NCURSES_MINOR@,\$NCURSES_MINOR," \\
- -e "s,@NCURSES_PATCH@,\$NCURSES_PATCH," \\
- -e "s,@NCURSES_OSPEED@,\$NCURSES_OSPEED," \\
CF_EOF
+fi
- for cf_name in captoinfo clear infocmp infotocap tic toe tput
- do
- cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
cat >>$cf_edit_man <<CF_EOF
- -e "s,@$cf_NAME@,\$prog_$cf_name," \\
+ sed -f $cf_man_alias \\
CF_EOF
- done
if test -f $MANPAGE_RENAMES ; then
cat >>$cf_edit_man <<CF_EOF
@@ -8231,6 +8360,7 @@ cat >>$cf_edit_man <<CF_EOF
if test \$verb = installing ; then
echo \$verb \$cf_target
\$INSTALL_DATA \$TMP \$cf_target
+ test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
cd \$cf_subdir\${section} && (
cf_source=\`echo \$cf_target |sed -e 's%^.*/\([^/][^/]*/[^/][^/]*$\)%\1%'\`
@@ -8272,8 +8402,11 @@ cat >>$cf_edit_man <<CF_EOF
)
)
elif test \$verb = removing ; then
- echo \$verb \$cf_target
- rm -f \$cf_target
+ test -f \$cf_target && (
+ echo \$verb \$cf_target
+ rm -f \$cf_target
+ )
+ test -d \$cf_subdir\${section} &&
test -n "\$aliases" && (
cd \$cf_subdir\${section} && (
for cf_alias in \$aliases
@@ -8308,7 +8441,7 @@ chmod 755 $cf_edit_man
###############################################################################
### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:8311: checking if you want to build with function extensions" >&5
+echo "$as_me:8444: checking if you want to build with function extensions" >&5
echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
# Check whether --enable-ext-funcs or --disable-ext-funcs was given.
@@ -8318,7 +8451,7 @@ if test "${enable_ext_funcs+set}" = set; then
else
with_ext_funcs=yes
fi;
-echo "$as_me:8321: result: $with_ext_funcs" >&5
+echo "$as_me:8454: result: $with_ext_funcs" >&5
echo "${ECHO_T}$with_ext_funcs" >&6
if test "$with_ext_funcs" = yes ; then
NCURSES_EXT_FUNCS=1
@@ -8355,7 +8488,7 @@ else
fi
### use option --enable-const to turn on use of const beyond that in XSI.
-echo "$as_me:8358: checking for extended use of const keyword" >&5
+echo "$as_me:8491: checking for extended use of const keyword" >&5
echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
# Check whether --enable-const or --disable-const was given.
@@ -8365,14 +8498,14 @@ if test "${enable_const+set}" = set; then
else
with_ext_const=no
fi;
-echo "$as_me:8368: result: $with_ext_const" >&5
+echo "$as_me:8501: result: $with_ext_const" >&5
echo "${ECHO_T}$with_ext_const" >&6
NCURSES_CONST='/*nothing*/'
if test "$with_ext_const" = yes ; then
NCURSES_CONST=const
fi
-echo "$as_me:8375: checking if you want \$NCURSES_NO_PADDING code" >&5
+echo "$as_me:8508: checking if you want \$NCURSES_NO_PADDING code" >&5
echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
# Check whether --enable-no-padding or --disable-no-padding was given.
@@ -8382,19 +8515,19 @@ if test "${enable_no_padding+set}" = set; then
else
with_no_padding=$with_ext_funcs
fi;
-echo "$as_me:8385: result: $with_no_padding" >&5
+echo "$as_me:8518: result: $with_no_padding" >&5
echo "${ECHO_T}$with_no_padding" >&6
test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF
#define NCURSES_NO_PADDING 1
EOF
-echo "$as_me:8391: checking for ANSI C header files" >&5
+echo "$as_me:8524: checking for ANSI C header files" >&5
echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 8397 "configure"
+#line 8530 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -8402,13 +8535,13 @@ else
#include <float.h>
_ACEOF
-if { (eval echo "$as_me:8405: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8538: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:8411: \$? = $ac_status" >&5
+ echo "$as_me:8544: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8430,7 +8563,7 @@ rm -f conftest.err conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line 8433 "configure"
+#line 8566 "configure"
#include "confdefs.h"
#include <string.h>
@@ -8448,7 +8581,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line 8451 "configure"
+#line 8584 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -8469,7 +8602,7 @@ if test $ac_cv_header_stdc = yes; then
:
else
cat >conftest.$ac_ext <<_ACEOF
-#line 8472 "configure"
+#line 8605 "configure"
#include "confdefs.h"
#include <ctype.h>
#if ((' ' & 0x0FF) == 0x020)
@@ -8495,15 +8628,15 @@ main ()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8498: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8631: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8501: \$? = $ac_status" >&5
+ echo "$as_me:8634: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:8503: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8636: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8506: \$? = $ac_status" >&5
+ echo "$as_me:8639: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -8516,7 +8649,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
-echo "$as_me:8519: result: $ac_cv_header_stdc" >&5
+echo "$as_me:8652: result: $ac_cv_header_stdc" >&5
echo "${ECHO_T}$ac_cv_header_stdc" >&6
if test $ac_cv_header_stdc = yes; then
@@ -8532,28 +8665,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8535: checking for $ac_header" >&5
+echo "$as_me:8668: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 8541 "configure"
+#line 8674 "configure"
#include "confdefs.h"
$ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8547: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8680: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:8550: \$? = $ac_status" >&5
+ echo "$as_me:8683: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:8553: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8686: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8556: \$? = $ac_status" >&5
+ echo "$as_me:8689: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Header=yes"
else
@@ -8563,7 +8696,7 @@ eval "$as_ac_Header=no"
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:8566: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8699: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -8573,13 +8706,13 @@ EOF
fi
done
-echo "$as_me:8576: checking for signed char" >&5
+echo "$as_me:8709: checking for signed char" >&5
echo $ECHO_N "checking for signed char... $ECHO_C" >&6
if test "${ac_cv_type_signed_char+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 8582 "configure"
+#line 8715 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -8594,16 +8727,16 @@ if (sizeof (signed char))
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8597: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8730: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:8600: \$? = $ac_status" >&5
+ echo "$as_me:8733: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:8603: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8736: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8606: \$? = $ac_status" >&5
+ echo "$as_me:8739: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_signed_char=yes
else
@@ -8613,10 +8746,10 @@ ac_cv_type_signed_char=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:8616: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:8749: result: $ac_cv_type_signed_char" >&5
echo "${ECHO_T}$ac_cv_type_signed_char" >&6
-echo "$as_me:8619: checking size of signed char" >&5
+echo "$as_me:8752: checking size of signed char" >&5
echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
if test "${ac_cv_sizeof_signed_char+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8625,7 +8758,7 @@ else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-#line 8628 "configure"
+#line 8761 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -8637,21 +8770,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8640: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8773: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:8643: \$? = $ac_status" >&5
+ echo "$as_me:8776: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:8646: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8779: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8649: \$? = $ac_status" >&5
+ echo "$as_me:8782: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 8654 "configure"
+#line 8787 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -8663,16 +8796,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8666: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8799: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:8669: \$? = $ac_status" >&5
+ echo "$as_me:8802: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:8672: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8805: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8675: \$? = $ac_status" >&5
+ echo "$as_me:8808: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid; break
else
@@ -8688,7 +8821,7 @@ cat conftest.$ac_ext >&5
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 8691 "configure"
+#line 8824 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -8700,16 +8833,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8703: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8836: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:8706: \$? = $ac_status" >&5
+ echo "$as_me:8839: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:8709: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8842: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8712: \$? = $ac_status" >&5
+ echo "$as_me:8845: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=$ac_mid; break
else
@@ -8725,7 +8858,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
cat >conftest.$ac_ext <<_ACEOF
-#line 8728 "configure"
+#line 8861 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -8737,16 +8870,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8740: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8873: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:8743: \$? = $ac_status" >&5
+ echo "$as_me:8876: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:8746: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8879: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8749: \$? = $ac_status" >&5
+ echo "$as_me:8882: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid
else
@@ -8759,12 +8892,12 @@ done
ac_cv_sizeof_signed_char=$ac_lo
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:8762: error: cannot run test program while cross compiling" >&5
+ { { echo "$as_me:8895: error: cannot run test program while cross compiling" >&5
echo "$as_me: error: cannot run test program while cross compiling" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-#line 8767 "configure"
+#line 8900 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -8780,15 +8913,15 @@ fclose (f);
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8783: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8916: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8786: \$? = $ac_status" >&5
+ echo "$as_me:8919: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:8788: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8921: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8791: \$? = $ac_status" >&5
+ echo "$as_me:8924: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_signed_char=`cat conftest.val`
else
@@ -8804,7 +8937,7 @@ else
ac_cv_sizeof_signed_char=0
fi
fi
-echo "$as_me:8807: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:8940: result: $ac_cv_sizeof_signed_char" >&5
echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
cat >>confdefs.h <<EOF
#define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
@@ -8815,7 +8948,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
else
NCURSES_SBOOL="char"
fi
-echo "$as_me:8818: checking if you want to use signed Boolean array in term.h" >&5
+echo "$as_me:8951: checking if you want to use signed Boolean array in term.h" >&5
echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
# Check whether --enable-signed-char or --disable-signed-char was given.
@@ -8825,12 +8958,12 @@ if test "${enable_signed_char+set}" = set; then
else
with_signed_char=no
fi;
-echo "$as_me:8828: result: $with_signed_char" >&5
+echo "$as_me:8961: result: $with_signed_char" >&5
echo "${ECHO_T}$with_signed_char" >&6
test "$with_signed_char" != yes && NCURSES_SBOOL="char"
### use option --enable-sigwinch to turn on use of SIGWINCH logic
-echo "$as_me:8833: checking if you want SIGWINCH handler" >&5
+echo "$as_me:8966: checking if you want SIGWINCH handler" >&5
echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
# Check whether --enable-sigwinch or --disable-sigwinch was given.
@@ -8840,14 +8973,14 @@ if test "${enable_sigwinch+set}" = set; then
else
with_sigwinch=$with_ext_funcs
fi;
-echo "$as_me:8843: result: $with_sigwinch" >&5
+echo "$as_me:8976: result: $with_sigwinch" >&5
echo "${ECHO_T}$with_sigwinch" >&6
test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF
#define USE_SIGWINCH 1
EOF
### use option --enable-tcap-names to allow user to define new capabilities
-echo "$as_me:8850: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:8983: checking if you want user-definable terminal capabilities like termcap" >&5
echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
# Check whether --enable-tcap-names or --disable-tcap-names was given.
@@ -8857,7 +8990,7 @@ if test "${enable_tcap_names+set}" = set; then
else
with_tcap_names=$with_ext_funcs
fi;
-echo "$as_me:8860: result: $with_tcap_names" >&5
+echo "$as_me:8993: result: $with_tcap_names" >&5
echo "${ECHO_T}$with_tcap_names" >&6
NCURSES_XNAMES=0
test "$with_tcap_names" = yes && NCURSES_XNAMES=1
@@ -8865,7 +8998,7 @@ test "$with_tcap_names" = yes && NCURSES_XNAMES=1
###############################################################################
# These options are relatively safe to experiment with.
-echo "$as_me:8868: checking if you want all development code" >&5
+echo "$as_me:9001: checking if you want all development code" >&5
echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
# Check whether --with-develop or --without-develop was given.
@@ -8875,11 +9008,11 @@ if test "${with_develop+set}" = set; then
else
with_develop=no
fi;
-echo "$as_me:8878: result: $with_develop" >&5
+echo "$as_me:9011: result: $with_develop" >&5
echo "${ECHO_T}$with_develop" >&6
### use option --enable-hard-tabs to turn on use of hard-tabs optimize
-echo "$as_me:8882: checking if you want hard-tabs code" >&5
+echo "$as_me:9015: checking if you want hard-tabs code" >&5
echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
# Check whether --enable-hard-tabs or --disable-hard-tabs was given.
@@ -8889,14 +9022,14 @@ if test "${enable_hard_tabs+set}" = set; then
else
enable_hard_tabs=$with_develop
fi;
-echo "$as_me:8892: result: $enable_hard_tabs" >&5
+echo "$as_me:9025: result: $enable_hard_tabs" >&5
echo "${ECHO_T}$enable_hard_tabs" >&6
test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF
#define USE_HARD_TABS 1
EOF
### use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-echo "$as_me:8899: checking if you want limited support for xmc" >&5
+echo "$as_me:9032: checking if you want limited support for xmc" >&5
echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
# Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
@@ -8906,7 +9039,7 @@ if test "${enable_xmc_glitch+set}" = set; then
else
enable_xmc_glitch=$with_develop
fi;
-echo "$as_me:8909: result: $enable_xmc_glitch" >&5
+echo "$as_me:9042: result: $enable_xmc_glitch" >&5
echo "${ECHO_T}$enable_xmc_glitch" >&6
test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF
#define USE_XMC_SUPPORT 1
@@ -8915,7 +9048,7 @@ EOF
###############################################################################
# These are just experimental, probably should not be in a package:
-echo "$as_me:8918: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:9051: checking if you do not want to assume colors are white-on-black" >&5
echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
# Check whether --enable-assumed-color or --disable-assumed-color was given.
@@ -8925,14 +9058,14 @@ if test "${enable_assumed_color+set}" = set; then
else
with_assumed_color=yes
fi;
-echo "$as_me:8928: result: $with_assumed_color" >&5
+echo "$as_me:9061: result: $with_assumed_color" >&5
echo "${ECHO_T}$with_assumed_color" >&6
test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF
#define USE_ASSUMED_COLOR 1
EOF
### use option --enable-hashmap to turn on use of hashmap scrolling logic
-echo "$as_me:8935: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:9068: checking if you want hashmap scrolling-optimization code" >&5
echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
# Check whether --enable-hashmap or --disable-hashmap was given.
@@ -8942,14 +9075,14 @@ if test "${enable_hashmap+set}" = set; then
else
with_hashmap=yes
fi;
-echo "$as_me:8945: result: $with_hashmap" >&5
+echo "$as_me:9078: result: $with_hashmap" >&5
echo "${ECHO_T}$with_hashmap" >&6
test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF
#define USE_HASHMAP 1
EOF
### use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-echo "$as_me:8952: checking if you want colorfgbg code" >&5
+echo "$as_me:9085: checking if you want colorfgbg code" >&5
echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
# Check whether --enable-colorfgbg or --disable-colorfgbg was given.
@@ -8959,14 +9092,14 @@ if test "${enable_colorfgbg+set}" = set; then
else
with_colorfgbg=no
fi;
-echo "$as_me:8962: result: $with_colorfgbg" >&5
+echo "$as_me:9095: result: $with_colorfgbg" >&5
echo "${ECHO_T}$with_colorfgbg" >&6
test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF
#define USE_COLORFGBG 1
EOF
### use option --enable-ext-colors to turn on use of colors beyond 16.
-echo "$as_me:8969: checking if you want to use experimental extended colors" >&5
+echo "$as_me:9102: checking if you want to use experimental extended colors" >&5
echo $ECHO_N "checking if you want to use experimental extended colors... $ECHO_C" >&6
# Check whether --enable-ext-colors or --disable-ext-colors was given.
@@ -8976,13 +9109,14 @@ if test "${enable_ext_colors+set}" = set; then
else
with_ext_colors=no
fi;
-echo "$as_me:8979: result: $with_ext_colors" >&5
+echo "$as_me:9112: result: $with_ext_colors" >&5
echo "${ECHO_T}$with_ext_colors" >&6
NCURSES_EXT_COLORS=0
if test "$with_ext_colors" = yes ; then
if test "$with_widec" != yes ; then
- { echo "$as_me:8984: WARNING: This option applies only to wide-character library" >&5
-echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
+ { { echo "$as_me:9117: error: This option applies only to wide-character library" >&5
+echo "$as_me: error: This option applies only to wide-character library" >&2;}
+ { (exit 1); exit 1; }; }
else
# cannot be ABI 5 since it changes sizeof(cchar_t)
@@ -8991,7 +9125,7 @@ if test "${with_abi_version+set}" != set; then
5.*)
cf_cv_rel_version=6.0
cf_cv_abi_version=6
- { echo "$as_me:8994: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
+ { echo "$as_me:9128: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
;;
esac
@@ -9006,7 +9140,7 @@ EOF
fi
### use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:9009: checking if you want to use experimental extended mouse encoding" >&5
+echo "$as_me:9143: checking if you want to use experimental extended mouse encoding" >&5
echo $ECHO_N "checking if you want to use experimental extended mouse encoding... $ECHO_C" >&6
# Check whether --enable-ext-mouse or --disable-ext-mouse was given.
@@ -9016,7 +9150,7 @@ if test "${enable_ext_mouse+set}" = set; then
else
with_ext_mouse=no
fi;
-echo "$as_me:9019: result: $with_ext_mouse" >&5
+echo "$as_me:9153: result: $with_ext_mouse" >&5
echo "${ECHO_T}$with_ext_mouse" >&6
NCURSES_MOUSE_VERSION=1
if test "$with_ext_mouse" = yes ; then
@@ -9027,7 +9161,7 @@ if test "${with_abi_version+set}" != set; then
5.*)
cf_cv_rel_version=6.0
cf_cv_abi_version=6
- { echo "$as_me:9030: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
+ { echo "$as_me:9164: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
;;
esac
@@ -9035,7 +9169,49 @@ fi
fi
-echo "$as_me:9038: checking if you want experimental safe-sprintf code" >&5
+# Reentrant code has to be opaque; there's little advantage to making ncurses
+# opaque outside of that, so there is no --enable-opaque option.
+echo "$as_me:9174: checking if you want experimental reentrant code" >&5
+echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
+
+# Check whether --enable-reentrant or --disable-reentrant was given.
+if test "${enable_reentrant+set}" = set; then
+ enableval="$enable_reentrant"
+ with_reentrant=$enableval
+else
+ with_reentrant=no
+fi;
+echo "$as_me:9184: result: $with_reentrant" >&5
+echo "${ECHO_T}$with_reentrant" >&6
+if test "$with_reentrant" = yes ; then
+ cf_cv_enable_reentrant=1
+ cf_cv_enable_opaque="NCURSES_INTERNALS"
+ NCURSES_OPAQUE=1
+ NCURSES_SIZE_T=int
+ LIB_SUFFIX="t${LIB_SUFFIX}"
+ cat >>confdefs.h <<\EOF
+#define USE_REENTRANT 1
+EOF
+
+if test "${with_abi_version+set}" != set; then
+ case $cf_cv_rel_version in
+ 5.*)
+ cf_cv_rel_version=6.0
+ cf_cv_abi_version=6
+ { echo "$as_me:9201: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
+echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
+ ;;
+ esac
+fi
+
+else
+ cf_cv_enable_reentrant=0
+ cf_cv_enable_opaque="NCURSES_OPAQUE"
+ NCURSES_OPAQUE=0
+ NCURSES_SIZE_T=short
+fi
+
+echo "$as_me:9214: checking if you want experimental safe-sprintf code" >&5
echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
# Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
@@ -9045,7 +9221,7 @@ if test "${enable_safe_sprintf+set}" = set; then
else
with_safe_sprintf=no
fi;
-echo "$as_me:9048: result: $with_safe_sprintf" >&5
+echo "$as_me:9224: result: $with_safe_sprintf" >&5
echo "${ECHO_T}$with_safe_sprintf" >&6
test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF
#define USE_SAFE_SPRINTF 1
@@ -9054,7 +9230,7 @@ EOF
### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
# when hashmap is used scroll hints are useless
if test "$with_hashmap" = no ; then
-echo "$as_me:9057: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:9233: checking if you want to experiment without scrolling-hints code" >&5
echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
# Check whether --enable-scroll-hints or --disable-scroll-hints was given.
@@ -9064,7 +9240,7 @@ if test "${enable_scroll_hints+set}" = set; then
else
with_scroll_hints=yes
fi;
-echo "$as_me:9067: result: $with_scroll_hints" >&5
+echo "$as_me:9243: result: $with_scroll_hints" >&5
echo "${ECHO_T}$with_scroll_hints" >&6
test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF
#define USE_SCROLL_HINTS 1
@@ -9072,7 +9248,7 @@ EOF
fi
-echo "$as_me:9075: checking if you want experimental wgetch-events code" >&5
+echo "$as_me:9251: checking if you want experimental wgetch-events code" >&5
echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6
# Check whether --enable-wgetch-events or --disable-wgetch-events was given.
@@ -9082,7 +9258,7 @@ if test "${enable_wgetch_events+set}" = set; then
else
with_wgetch_events=no
fi;
-echo "$as_me:9085: result: $with_wgetch_events" >&5
+echo "$as_me:9261: result: $with_wgetch_events" >&5
echo "${ECHO_T}$with_wgetch_events" >&6
test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF
#define NCURSES_WGETCH_EVENTS 1
@@ -9091,7 +9267,7 @@ EOF
###############################################################################
### use option --disable-echo to suppress full display compiling commands
-echo "$as_me:9094: checking if you want to display full commands during build" >&5
+echo "$as_me:9270: checking if you want to display full commands during build" >&5
echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6
# Check whether --enable-echo or --disable-echo was given.
@@ -9106,12 +9282,13 @@ if test "$with_echo" = yes; then
else
ECHO_LINK='@ echo linking $@ ... ;'
test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
+ test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
fi
-echo "$as_me:9110: result: $with_echo" >&5
+echo "$as_me:9287: result: $with_echo" >&5
echo "${ECHO_T}$with_echo" >&6
### use option --enable-warnings to turn on all gcc warnings
-echo "$as_me:9114: checking if you want to see compiler warnings" >&5
+echo "$as_me:9291: checking if you want to see compiler warnings" >&5
echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
# Check whether --enable-warnings or --disable-warnings was given.
@@ -9119,10 +9296,10 @@ if test "${enable_warnings+set}" = set; then
enableval="$enable_warnings"
with_warnings=$enableval
fi;
-echo "$as_me:9122: result: $with_warnings" >&5
+echo "$as_me:9299: result: $with_warnings" >&5
echo "${ECHO_T}$with_warnings" >&6
-if test -n "$with_warnings"; then
+if test "x$with_warnings" = "xyes"; then
ADAFLAGS="$ADAFLAGS -gnatg"
INTEL_COMPILER=no
@@ -9130,12 +9307,12 @@ INTEL_COMPILER=no
if test "$GCC" = yes ; then
case $host_os in
linux*|gnu*)
- echo "$as_me:9133: checking if this is really Intel C compiler" >&5
+ echo "$as_me:9310: checking if this is really Intel C compiler" >&5
echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
cf_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -no-gcc"
cat >conftest.$ac_ext <<_ACEOF
-#line 9138 "configure"
+#line 9315 "configure"
#include "confdefs.h"
int
@@ -9152,16 +9329,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9155: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9332: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9158: \$? = $ac_status" >&5
+ echo "$as_me:9335: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9161: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9338: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9164: \$? = $ac_status" >&5
+ echo "$as_me:9341: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
INTEL_COMPILER=yes
cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -9172,14 +9349,14 @@ cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
CFLAGS="$cf_save_CFLAGS"
- echo "$as_me:9175: result: $INTEL_COMPILER" >&5
+ echo "$as_me:9352: result: $INTEL_COMPILER" >&5
echo "${ECHO_T}$INTEL_COMPILER" >&6
;;
esac
fi
cat > conftest.$ac_ext <<EOF
-#line 9182 "configure"
+#line 9359 "${as_me-configure}"
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
EOF
@@ -9197,11 +9374,11 @@ then
# remark #981: operands are evaluated in unspecified order
# warning #269: invalid format string conversion
- { echo "$as_me:9200: checking for $CC warning options..." >&5
+ { echo "$as_me:9377: checking for $CC warning options..." >&5
echo "$as_me: checking for $CC warning options..." >&6;}
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-Wall"
- for cf_opt in \
+ for cf_opt in \
wd1419 \
wd1682 \
wd1683 \
@@ -9214,12 +9391,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
wd981
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo "$as_me:9217: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:9394: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9220: \$? = $ac_status" >&5
+ echo "$as_me:9397: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:9222: result: ... -$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:9399: result: ... -$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
fi
@@ -9228,7 +9405,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
elif test "$GCC" = yes
then
- { echo "$as_me:9231: checking for $CC warning options..." >&5
+ { echo "$as_me:9408: checking for $CC warning options..." >&5
echo "$as_me: checking for $CC warning options..." >&6;}
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-W -Wall"
@@ -9245,15 +9422,15 @@ echo "$as_me: checking for $CC warning options..." >&6;}
Wpointer-arith \
Wshadow \
Wstrict-prototypes \
- Wundef $cf_warn_CONST
+ Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo "$as_me:9251: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:9428: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9254: \$? = $ac_status" >&5
+ echo "$as_me:9431: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:9256: result: ... -$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:9433: result: ... -$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
case $cf_opt in #(vi
Wcast-qual) #(vi
@@ -9264,6 +9441,8 @@ echo "${ECHO_T}... -$cf_opt" >&6
3.3*)
test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
+echo "${as_me-configure}:9444: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+
continue;;
esac
;;
@@ -9282,12 +9461,12 @@ INTEL_CPLUSPLUS=no
if test "$GCC" = yes ; then
case $host_os in
linux*|gnu*)
- echo "$as_me:9285: checking if this is really Intel C++ compiler" >&5
+ echo "$as_me:9464: checking if this is really Intel C++ compiler" >&5
echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
cf_save_CFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -no-gcc"
cat >conftest.$ac_ext <<_ACEOF
-#line 9290 "configure"
+#line 9469 "configure"
#include "confdefs.h"
int
@@ -9304,16 +9483,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9307: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9486: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9310: \$? = $ac_status" >&5
+ echo "$as_me:9489: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9313: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9492: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9316: \$? = $ac_status" >&5
+ echo "$as_me:9495: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
INTEL_CPLUSPLUS=yes
cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -9324,7 +9503,7 @@ cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$cf_save_CFLAGS"
- echo "$as_me:9327: result: $INTEL_CPLUSPLUS" >&5
+ echo "$as_me:9506: result: $INTEL_CPLUSPLUS" >&5
echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
;;
esac
@@ -9338,7 +9517,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
ac_main_return=return
cat > conftest.$ac_ext <<EOF
-#line 9341 "configure"
+#line 9520 "configure"
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
EOF
@@ -9356,7 +9535,7 @@ then
# remark #981: operands are evaluated in unspecified order
# warning #269: invalid format string conversion
- { echo "$as_me:9359: checking for $CC warning options..." >&5
+ { echo "$as_me:9538: checking for $CC warning options..." >&5
echo "$as_me: checking for $CC warning options..." >&6;}
cf_save_CXXFLAGS="$CXXFLAGS"
EXTRA_CXXFLAGS="-Wall"
@@ -9373,12 +9552,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
wd981
do
CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
- if { (eval echo "$as_me:9376: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:9555: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9379: \$? = $ac_status" >&5
+ echo "$as_me:9558: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:9381: result: ... -$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:9560: result: ... -$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
fi
@@ -9387,7 +9566,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
elif test "$GXX" = yes
then
- { echo "$as_me:9390: checking for $CXX warning options..." >&5
+ { echo "$as_me:9569: checking for $CXX warning options..." >&5
echo "$as_me: checking for $CXX warning options..." >&6;}
cf_save_CXXFLAGS="$CXXFLAGS"
EXTRA_CXXFLAGS="-W -Wall"
@@ -9416,16 +9595,16 @@ echo "$as_me: checking for $CXX warning options..." >&6;}
Wundef $cf_gxx_extra_warnings Wno-unused
do
CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
- if { (eval echo "$as_me:9419: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:9598: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9422: \$? = $ac_status" >&5
+ echo "$as_me:9601: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:9424: result: ... -$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:9603: result: ... -$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
else
- test -n "$verbose" && echo "$as_me:9428: result: ... no -$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:9607: result: ... no -$cf_opt" >&5
echo "${ECHO_T}... no -$cf_opt" >&6
fi
done
@@ -9461,10 +9640,10 @@ cat > conftest.i <<EOF
EOF
if test "$GCC" = yes
then
- { echo "$as_me:9464: checking for $CC __attribute__ directives..." >&5
+ { echo "$as_me:9643: checking for $CC __attribute__ directives..." >&5
echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
cat > conftest.$ac_ext <<EOF
-#line 9467 "configure"
+#line 9646 "${as_me-configure}"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -9502,12 +9681,12 @@ EOF
EOF
;;
esac
- if { (eval echo "$as_me:9505: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:9684: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9508: \$? = $ac_status" >&5
+ echo "$as_me:9687: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:9510: result: ... $cf_attribute" >&5
+ test -n "$verbose" && echo "$as_me:9689: result: ... $cf_attribute" >&5
echo "${ECHO_T}... $cf_attribute" >&6
cat conftest.h >>confdefs.h
fi
@@ -9519,7 +9698,7 @@ rm -rf conftest*
fi
### use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:9522: checking if you want to enable runtime assertions" >&5
+echo "$as_me:9701: checking if you want to enable runtime assertions" >&5
echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
# Check whether --enable-assertions or --disable-assertions was given.
@@ -9529,7 +9708,7 @@ if test "${enable_assertions+set}" = set; then
else
with_assertions=no
fi;
-echo "$as_me:9532: result: $with_assertions" >&5
+echo "$as_me:9711: result: $with_assertions" >&5
echo "${ECHO_T}$with_assertions" >&6
if test -n "$GCC"
then
@@ -9547,7 +9726,7 @@ fi
### use option --disable-leaks to suppress "permanent" leaks, for testing
-echo "$as_me:9550: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:9729: checking if you want to use dmalloc for testing" >&5
echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
# Check whether --with-dmalloc or --without-dmalloc was given.
@@ -9563,7 +9742,7 @@ EOF
else
with_dmalloc=
fi;
-echo "$as_me:9566: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:9745: result: ${with_dmalloc:-no}" >&5
echo "${ECHO_T}${with_dmalloc:-no}" >&6
case .$with_cflags in #(vi
@@ -9647,23 +9826,23 @@ fi
esac
if test "$with_dmalloc" = yes ; then
- echo "$as_me:9650: checking for dmalloc.h" >&5
+ echo "$as_me:9829: checking for dmalloc.h" >&5
echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
if test "${ac_cv_header_dmalloc_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 9656 "configure"
+#line 9835 "configure"
#include "confdefs.h"
#include <dmalloc.h>
_ACEOF
-if { (eval echo "$as_me:9660: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9839: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:9666: \$? = $ac_status" >&5
+ echo "$as_me:9845: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9682,11 +9861,11 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:9685: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:9864: result: $ac_cv_header_dmalloc_h" >&5
echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
if test $ac_cv_header_dmalloc_h = yes; then
-echo "$as_me:9689: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:9868: checking for dmalloc_debug in -ldmalloc" >&5
echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9694,7 +9873,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldmalloc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 9697 "configure"
+#line 9876 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -9713,16 +9892,16 @@ dmalloc_debug ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9895: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9719: \$? = $ac_status" >&5
+ echo "$as_me:9898: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9722: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9901: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9725: \$? = $ac_status" >&5
+ echo "$as_me:9904: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dmalloc_dmalloc_debug=yes
else
@@ -9733,7 +9912,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:9736: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:9915: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
cat >>confdefs.h <<EOF
@@ -9748,7 +9927,7 @@ fi
fi
-echo "$as_me:9751: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:9930: checking if you want to use dbmalloc for testing" >&5
echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
# Check whether --with-dbmalloc or --without-dbmalloc was given.
@@ -9764,7 +9943,7 @@ EOF
else
with_dbmalloc=
fi;
-echo "$as_me:9767: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:9946: result: ${with_dbmalloc:-no}" >&5
echo "${ECHO_T}${with_dbmalloc:-no}" >&6
case .$with_cflags in #(vi
@@ -9848,23 +10027,23 @@ fi
esac
if test "$with_dbmalloc" = yes ; then
- echo "$as_me:9851: checking for dbmalloc.h" >&5
+ echo "$as_me:10030: checking for dbmalloc.h" >&5
echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
if test "${ac_cv_header_dbmalloc_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 9857 "configure"
+#line 10036 "configure"
#include "confdefs.h"
#include <dbmalloc.h>
_ACEOF
-if { (eval echo "$as_me:9861: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10040: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:9867: \$? = $ac_status" >&5
+ echo "$as_me:10046: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9883,11 +10062,11 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:9886: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:10065: result: $ac_cv_header_dbmalloc_h" >&5
echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
if test $ac_cv_header_dbmalloc_h = yes; then
-echo "$as_me:9890: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:10069: checking for debug_malloc in -ldbmalloc" >&5
echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9895,7 +10074,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldbmalloc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 9898 "configure"
+#line 10077 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -9914,16 +10093,16 @@ debug_malloc ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9917: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10096: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9920: \$? = $ac_status" >&5
+ echo "$as_me:10099: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9923: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10102: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9926: \$? = $ac_status" >&5
+ echo "$as_me:10105: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dbmalloc_debug_malloc=yes
else
@@ -9934,7 +10113,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:9937: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:10116: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
cat >>confdefs.h <<EOF
@@ -9949,7 +10128,7 @@ fi
fi
-echo "$as_me:9952: checking if you want to use valgrind for testing" >&5
+echo "$as_me:10131: checking if you want to use valgrind for testing" >&5
echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
# Check whether --with-valgrind or --without-valgrind was given.
@@ -9965,7 +10144,7 @@ EOF
else
with_valgrind=
fi;
-echo "$as_me:9968: result: ${with_valgrind:-no}" >&5
+echo "$as_me:10147: result: ${with_valgrind:-no}" >&5
echo "${ECHO_T}${with_valgrind:-no}" >&6
case .$with_cflags in #(vi
@@ -10048,7 +10227,7 @@ fi
;;
esac
-echo "$as_me:10051: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:10230: checking if you want to perform memory-leak testing" >&5
echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
# Check whether --enable-leaks or --disable-leaks was given.
@@ -10058,7 +10237,7 @@ if test "${enable_leaks+set}" = set; then
else
: ${with_no_leaks:=no}
fi;
-echo "$as_me:10061: result: $with_no_leaks" >&5
+echo "$as_me:10240: result: $with_no_leaks" >&5
echo "${ECHO_T}$with_no_leaks" >&6
if test "$with_no_leaks" = yes ; then
@@ -10103,7 +10282,7 @@ case "$CFLAGS $CPPFLAGS" in
;;
esac
-echo "$as_me:10106: checking whether to add trace feature to all models" >&5
+echo "$as_me:10285: checking whether to add trace feature to all models" >&5
echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
# Check whether --with-trace or --without-trace was given.
@@ -10113,7 +10292,7 @@ if test "${with_trace+set}" = set; then
else
cf_with_trace=$cf_all_traces
fi;
-echo "$as_me:10116: result: $cf_with_trace" >&5
+echo "$as_me:10295: result: $cf_with_trace" >&5
echo "${ECHO_T}$cf_with_trace" >&6
if test "$cf_with_trace" = yes ; then
@@ -10194,13 +10373,13 @@ else
fi
### Checks for libraries.
-echo "$as_me:10197: checking for gettimeofday" >&5
+echo "$as_me:10376: checking for gettimeofday" >&5
echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
if test "${ac_cv_func_gettimeofday+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10203 "configure"
+#line 10382 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gettimeofday (); below. */
@@ -10231,16 +10410,16 @@ f = gettimeofday;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10234: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10413: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10237: \$? = $ac_status" >&5
+ echo "$as_me:10416: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10240: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10419: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10243: \$? = $ac_status" >&5
+ echo "$as_me:10422: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_gettimeofday=yes
else
@@ -10250,7 +10429,7 @@ ac_cv_func_gettimeofday=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:10253: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:10432: result: $ac_cv_func_gettimeofday" >&5
echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
if test $ac_cv_func_gettimeofday = yes; then
cat >>confdefs.h <<\EOF
@@ -10259,7 +10438,7 @@ EOF
else
-echo "$as_me:10262: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:10441: checking for gettimeofday in -lbsd" >&5
echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10267,7 +10446,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbsd $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10270 "configure"
+#line 10449 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10286,16 +10465,16 @@ gettimeofday ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10289: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10468: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10292: \$? = $ac_status" >&5
+ echo "$as_me:10471: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10295: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10474: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10298: \$? = $ac_status" >&5
+ echo "$as_me:10477: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_bsd_gettimeofday=yes
else
@@ -10306,7 +10485,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10309: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:10488: result: $ac_cv_lib_bsd_gettimeofday" >&5
echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
if test $ac_cv_lib_bsd_gettimeofday = yes; then
cat >>confdefs.h <<\EOF
@@ -10318,14 +10497,14 @@ fi
fi
-echo "$as_me:10321: checking if -lm needed for math functions" >&5
+echo "$as_me:10500: checking if -lm needed for math functions" >&5
echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
if test "${cf_cv_need_libm+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10328 "configure"
+#line 10507 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -10340,16 +10519,16 @@ double x = rand(); printf("result = %g\n", sin(x))
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10343: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10522: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10346: \$? = $ac_status" >&5
+ echo "$as_me:10525: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10349: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10528: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10352: \$? = $ac_status" >&5
+ echo "$as_me:10531: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_need_libm=no
else
@@ -10359,7 +10538,7 @@ cf_cv_need_libm=yes
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:10362: result: $cf_cv_need_libm" >&5
+echo "$as_me:10541: result: $cf_cv_need_libm" >&5
echo "${ECHO_T}$cf_cv_need_libm" >&6
if test "$cf_cv_need_libm" = yes
then
@@ -10367,13 +10546,13 @@ MATH_LIB=-lm
fi
### Checks for header files.
-echo "$as_me:10370: checking for ANSI C header files" >&5
+echo "$as_me:10549: checking for ANSI C header files" >&5
echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10376 "configure"
+#line 10555 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -10381,13 +10560,13 @@ else
#include <float.h>
_ACEOF
-if { (eval echo "$as_me:10384: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10563: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:10390: \$? = $ac_status" >&5
+ echo "$as_me:10569: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10409,7 +10588,7 @@ rm -f conftest.err conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line 10412 "configure"
+#line 10591 "configure"
#include "confdefs.h"
#include <string.h>
@@ -10427,7 +10606,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line 10430 "configure"
+#line 10609 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -10448,7 +10627,7 @@ if test $ac_cv_header_stdc = yes; then
:
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10451 "configure"
+#line 10630 "configure"
#include "confdefs.h"
#include <ctype.h>
#if ((' ' & 0x0FF) == 0x020)
@@ -10474,15 +10653,15 @@ main ()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10477: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10656: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10480: \$? = $ac_status" >&5
+ echo "$as_me:10659: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:10482: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10661: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10485: \$? = $ac_status" >&5
+ echo "$as_me:10664: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -10495,7 +10674,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
-echo "$as_me:10498: result: $ac_cv_header_stdc" >&5
+echo "$as_me:10677: result: $ac_cv_header_stdc" >&5
echo "${ECHO_T}$ac_cv_header_stdc" >&6
if test $ac_cv_header_stdc = yes; then
@@ -10508,13 +10687,13 @@ fi
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:10511: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:10690: checking for $ac_hdr that defines DIR" >&5
echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10517 "configure"
+#line 10696 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -10529,16 +10708,16 @@ return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10532: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10711: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10535: \$? = $ac_status" >&5
+ echo "$as_me:10714: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10538: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10717: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10541: \$? = $ac_status" >&5
+ echo "$as_me:10720: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Header=yes"
else
@@ -10548,7 +10727,7 @@ eval "$as_ac_Header=no"
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:10551: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10730: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -10561,7 +10740,7 @@ fi
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
- echo "$as_me:10564: checking for opendir in -ldir" >&5
+ echo "$as_me:10743: checking for opendir in -ldir" >&5
echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
if test "${ac_cv_lib_dir_opendir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10569,7 +10748,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldir $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10572 "configure"
+#line 10751 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10588,16 +10767,16 @@ opendir ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10591: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10770: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10594: \$? = $ac_status" >&5
+ echo "$as_me:10773: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10597: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10776: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10600: \$? = $ac_status" >&5
+ echo "$as_me:10779: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dir_opendir=yes
else
@@ -10608,14 +10787,14 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10611: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:10790: result: $ac_cv_lib_dir_opendir" >&5
echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
if test $ac_cv_lib_dir_opendir = yes; then
LIBS="$LIBS -ldir"
fi
else
- echo "$as_me:10618: checking for opendir in -lx" >&5
+ echo "$as_me:10797: checking for opendir in -lx" >&5
echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
if test "${ac_cv_lib_x_opendir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10623,7 +10802,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lx $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10626 "configure"
+#line 10805 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10642,16 +10821,16 @@ opendir ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10645: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10824: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10648: \$? = $ac_status" >&5
+ echo "$as_me:10827: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10651: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10830: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10654: \$? = $ac_status" >&5
+ echo "$as_me:10833: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_x_opendir=yes
else
@@ -10662,7 +10841,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10665: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:10844: result: $ac_cv_lib_x_opendir" >&5
echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
if test $ac_cv_lib_x_opendir = yes; then
LIBS="$LIBS -lx"
@@ -10670,13 +10849,13 @@ fi
fi
-echo "$as_me:10673: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:10852: checking whether time.h and sys/time.h may both be included" >&5
echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10679 "configure"
+#line 10858 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -10692,16 +10871,16 @@ return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10695: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10874: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10698: \$? = $ac_status" >&5
+ echo "$as_me:10877: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10701: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10880: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10704: \$? = $ac_status" >&5
+ echo "$as_me:10883: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_header_time=yes
else
@@ -10711,7 +10890,7 @@ ac_cv_header_time=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:10714: result: $ac_cv_header_time" >&5
+echo "$as_me:10893: result: $ac_cv_header_time" >&5
echo "${ECHO_T}$ac_cv_header_time" >&6
if test $ac_cv_header_time = yes; then
@@ -10721,14 +10900,14 @@ EOF
fi
-echo "$as_me:10724: checking for regular-expression headers" >&5
+echo "$as_me:10903: checking for regular-expression headers" >&5
echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
if test "${cf_cv_regex+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10731 "configure"
+#line 10910 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <regex.h>
@@ -10746,16 +10925,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10749: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10928: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10752: \$? = $ac_status" >&5
+ echo "$as_me:10931: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10755: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10934: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10758: \$? = $ac_status" >&5
+ echo "$as_me:10937: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_regex="regex.h"
else
@@ -10763,7 +10942,7 @@ else
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 10766 "configure"
+#line 10945 "configure"
#include "confdefs.h"
#include <regexp.h>
int
@@ -10778,16 +10957,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10781: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10960: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10784: \$? = $ac_status" >&5
+ echo "$as_me:10963: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10787: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10966: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10790: \$? = $ac_status" >&5
+ echo "$as_me:10969: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_regex="regexp.h"
else
@@ -10797,7 +10976,7 @@ cat conftest.$ac_ext >&5
cf_save_LIBS="$LIBS"
LIBS="-lgen $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10800 "configure"
+#line 10979 "configure"
#include "confdefs.h"
#include <regexpr.h>
int
@@ -10812,16 +10991,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10815: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10994: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10818: \$? = $ac_status" >&5
+ echo "$as_me:10997: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10821: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11000: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10824: \$? = $ac_status" >&5
+ echo "$as_me:11003: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_regex="regexpr.h"
else
@@ -10837,7 +11016,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:10840: result: $cf_cv_regex" >&5
+echo "$as_me:11019: result: $cf_cv_regex" >&5
echo "${ECHO_T}$cf_cv_regex" >&6
case $cf_cv_regex in
regex.h) cat >>confdefs.h <<\EOF
@@ -10873,23 +11052,23 @@ wctype.h \
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10876: checking for $ac_header" >&5
+echo "$as_me:11055: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10882 "configure"
+#line 11061 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:10886: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11065: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:10892: \$? = $ac_status" >&5
+ echo "$as_me:11071: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10908,7 +11087,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:10911: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11090: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -10922,7 +11101,7 @@ done
# Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
if test "$ISC" = yes ; then
-echo "$as_me:10925: checking for main in -lcposix" >&5
+echo "$as_me:11104: checking for main in -lcposix" >&5
echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
if test "${ac_cv_lib_cposix_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10930,7 +11109,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcposix $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10933 "configure"
+#line 11112 "configure"
#include "confdefs.h"
int
@@ -10942,16 +11121,16 @@ main ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11124: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10948: \$? = $ac_status" >&5
+ echo "$as_me:11127: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10951: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11130: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10954: \$? = $ac_status" >&5
+ echo "$as_me:11133: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_cposix_main=yes
else
@@ -10962,7 +11141,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10965: result: $ac_cv_lib_cposix_main" >&5
+echo "$as_me:11144: result: $ac_cv_lib_cposix_main" >&5
echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
if test $ac_cv_lib_cposix_main = yes; then
cat >>confdefs.h <<EOF
@@ -10973,7 +11152,7 @@ EOF
fi
- echo "$as_me:10976: checking for bzero in -linet" >&5
+ echo "$as_me:11155: checking for bzero in -linet" >&5
echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
if test "${ac_cv_lib_inet_bzero+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10981,7 +11160,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-linet $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10984 "configure"
+#line 11163 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -11000,16 +11179,16 @@ bzero ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11003: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11182: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11006: \$? = $ac_status" >&5
+ echo "$as_me:11185: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11009: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11188: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11012: \$? = $ac_status" >&5
+ echo "$as_me:11191: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_inet_bzero=yes
else
@@ -11020,21 +11199,21 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:11023: result: $ac_cv_lib_inet_bzero" >&5
+echo "$as_me:11202: result: $ac_cv_lib_inet_bzero" >&5
echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
if test $ac_cv_lib_inet_bzero = yes; then
LIBS="$LIBS -linet"
fi
fi
-echo "$as_me:11030: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:11209: checking if sys/time.h works with sys/select.h" >&5
echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
if test "${cf_cv_sys_time_select+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11037 "configure"
+#line 11216 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -11054,16 +11233,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11057: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11236: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11060: \$? = $ac_status" >&5
+ echo "$as_me:11239: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11063: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11242: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11066: \$? = $ac_status" >&5
+ echo "$as_me:11245: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_sys_time_select=yes
else
@@ -11075,7 +11254,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:11078: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:11257: result: $cf_cv_sys_time_select" >&5
echo "${ECHO_T}$cf_cv_sys_time_select" >&6
test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF
#define HAVE_SYS_TIME_SELECT 1
@@ -11089,7 +11268,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_main_return=return
-echo "$as_me:11092: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:11271: checking for $CC option to accept ANSI C" >&5
echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
if test "${ac_cv_prog_cc_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11097,7 +11276,7 @@ else
ac_cv_prog_cc_stdc=no
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
-#line 11100 "configure"
+#line 11279 "configure"
#include "confdefs.h"
#include <stdarg.h>
#include <stdio.h>
@@ -11146,16 +11325,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
do
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11149: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11328: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11152: \$? = $ac_status" >&5
+ echo "$as_me:11331: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11155: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11334: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11158: \$? = $ac_status" >&5
+ echo "$as_me:11337: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cc_stdc=$ac_arg
break
@@ -11172,21 +11351,21 @@ fi
case "x$ac_cv_prog_cc_stdc" in
x|xno)
- echo "$as_me:11175: result: none needed" >&5
+ echo "$as_me:11354: result: none needed" >&5
echo "${ECHO_T}none needed" >&6 ;;
*)
- echo "$as_me:11178: result: $ac_cv_prog_cc_stdc" >&5
+ echo "$as_me:11357: result: $ac_cv_prog_cc_stdc" >&5
echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
CC="$CC $ac_cv_prog_cc_stdc" ;;
esac
-echo "$as_me:11183: checking for an ANSI C-conforming const" >&5
+echo "$as_me:11362: checking for an ANSI C-conforming const" >&5
echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
if test "${ac_cv_c_const+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11189 "configure"
+#line 11368 "configure"
#include "confdefs.h"
int
@@ -11244,16 +11423,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11247: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11426: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11250: \$? = $ac_status" >&5
+ echo "$as_me:11429: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11253: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11432: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11256: \$? = $ac_status" >&5
+ echo "$as_me:11435: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_const=yes
else
@@ -11263,7 +11442,7 @@ ac_cv_c_const=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:11266: result: $ac_cv_c_const" >&5
+echo "$as_me:11445: result: $ac_cv_c_const" >&5
echo "${ECHO_T}$ac_cv_c_const" >&6
if test $ac_cv_c_const = no; then
@@ -11273,7 +11452,7 @@ EOF
fi
-echo "$as_me:11276: checking for inline" >&5
+echo "$as_me:11455: checking for inline" >&5
echo $ECHO_N "checking for inline... $ECHO_C" >&6
if test "${ac_cv_c_inline+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11281,7 +11460,7 @@ else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat >conftest.$ac_ext <<_ACEOF
-#line 11284 "configure"
+#line 11463 "configure"
#include "confdefs.h"
#ifndef __cplusplus
static $ac_kw int static_foo () {return 0; }
@@ -11290,16 +11469,16 @@ $ac_kw int foo () {return 0; }
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11293: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11472: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11296: \$? = $ac_status" >&5
+ echo "$as_me:11475: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11299: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11478: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11302: \$? = $ac_status" >&5
+ echo "$as_me:11481: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_inline=$ac_kw; break
else
@@ -11310,7 +11489,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:11313: result: $ac_cv_c_inline" >&5
+echo "$as_me:11492: result: $ac_cv_c_inline" >&5
echo "${ECHO_T}$ac_cv_c_inline" >&6
case $ac_cv_c_inline in
inline | yes) ;;
@@ -11327,16 +11506,197 @@ esac
NCURSES_INLINE=
if test "$ac_cv_c_inline" != no ; then
- cat >>confdefs.h <<\EOF
-#define CC_HAS_INLINE_FUNCS 1
-EOF
+ NCURSES_INLINE=inline
+ if test "$INTEL_COMPILER" = yes
+ then
+ :
+ elif test "$GCC" = yes
+ then
+ echo "$as_me:11515: checking if gcc supports options to tune inlining" >&5
+echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6
+if test "${cf_cv_gcc_inline+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ cf_save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 11524 "configure"
+#include "confdefs.h"
+inline int foo(void) { return 1; }
+int
+main ()
+{
+${cf_cv_main_return:-return} foo()
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:11536: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:11539: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:11542: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:11545: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_gcc_inline=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_gcc_inline=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ CFLAGS=$cf_save_CFLAGS
- NCURSES_INLINE=inline
fi
+echo "$as_me:11557: result: $cf_cv_gcc_inline" >&5
+echo "${ECHO_T}$cf_cv_gcc_inline" >&6
+ if test "$cf_cv_gcc_inline" = yes ; then
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in --param max-inline-insns-single=1200
+do
+case $cf_fix_cppflags in
+no)
+ case $cf_add_cflags in #(vi
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+ case $cf_add_cflags in
+ -D*)
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=yes
+
+ if test $cf_fix_cppflags = yes ; then
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ continue
+ elif test "${cf_tst_cflags}" = "\"'" ; then
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+ continue
+ fi
+ ;;
+ esac
+ case "$CPPFLAGS" in
+ *$cf_add_cflags) #(vi
+ ;;
+ *) #(vi
+ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+ ;;
+ esac
+ ;;
+ *)
+ cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+ ;;
+ esac
+ ;;
+yes)
+ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+ test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ && test -z "${cf_tst_cflags}" \
+ && cf_fix_cppflags=no
+ ;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+ CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+ CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+ fi
+ fi
+fi
+
+echo "$as_me:11633: checking for signal global datatype" >&5
+echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
+if test "${cf_cv_sig_atomic_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ for cf_type in \
+ "volatile sig_atomic_t" \
+ "sig_atomic_t" \
+ "int"
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+#line 11645 "configure"
+#include "confdefs.h"
+
+#include <sys/types.h>
+#include <signal.h>
+#include <stdio.h>
+
+extern $cf_type x;
+$cf_type x;
+static void handler(int sig)
+{
+ x = 5;
+}
+int
+main ()
+{
+signal(SIGINT, handler);
+ x = 1
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:11668: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:11671: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:11674: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:11677: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_sig_atomic_t=$cf_type
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_sig_atomic_t=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ test "$cf_cv_sig_atomic_t" != no && break
+ done
+
+fi
+
+echo "$as_me:11691: result: $cf_cv_sig_atomic_t" >&5
+echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
+test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF
+#define SIG_ATOMIC_T $cf_cv_sig_atomic_t
+EOF
if test $NCURSES_CHTYPE = auto ; then
-echo "$as_me:11339: checking for type of chtype" >&5
+echo "$as_me:11699: checking for type of chtype" >&5
echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
if test "${cf_cv_typeof_chtype+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11346,7 +11706,7 @@ else
cf_cv_typeof_chtype=long
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11349 "configure"
+#line 11709 "configure"
#include "confdefs.h"
#define WANT_BITS 31
@@ -11381,15 +11741,15 @@ int main()
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11384: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11744: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11387: \$? = $ac_status" >&5
+ echo "$as_me:11747: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:11389: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11749: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11392: \$? = $ac_status" >&5
+ echo "$as_me:11752: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_typeof_chtype=`cat cf_test.out`
else
@@ -11404,7 +11764,7 @@ fi
fi
-echo "$as_me:11407: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:11767: result: $cf_cv_typeof_chtype" >&5
echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
cat >>confdefs.h <<EOF
@@ -11414,15 +11774,16 @@ EOF
else
cf_cv_typeof_chtype=$NCURSES_CHTYPE
fi
+test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
-echo "$as_me:11418: checking if unsigned literals are legal" >&5
+echo "$as_me:11779: checking if unsigned literals are legal" >&5
echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
if test "${cf_cv_unsigned_literals+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11425 "configure"
+#line 11786 "configure"
#include "confdefs.h"
int
@@ -11434,16 +11795,16 @@ long x = 1L + 1UL + 1U + 1
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11437: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11798: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11440: \$? = $ac_status" >&5
+ echo "$as_me:11801: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11443: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11804: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11446: \$? = $ac_status" >&5
+ echo "$as_me:11807: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_unsigned_literals=yes
else
@@ -11455,29 +11816,30 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:11458: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:11819: result: $cf_cv_unsigned_literals" >&5
echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
cf_cv_1UL="1"
-test "$cf_cv_unsigned_literals" = yes && cf_cv_1UL="${cf_cv_1UL}U"
-test "$cf_cv_typeof_chtype" = long && cf_cv_1UL="${cf_cv_1UL}L"
+test ".$cf_cv_unsigned_literals" = .yes && cf_cv_1UL="${cf_cv_1UL}U"
+test ".$cf_cv_typeof_chtype" = .long && cf_cv_1UL="${cf_cv_1UL}L"
if test $NCURSES_MMASK_T = auto ; then
cf_cv_typeof_mmask_t=long
else
cf_cv_typeof_mmask_t=$NCURSES_MMASK_T
fi
+test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
### Checks for external-data
-echo "$as_me:11473: checking if external errno is declared" >&5
+echo "$as_me:11835: checking if external errno is declared" >&5
echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
if test "${cf_cv_dcl_errno+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11480 "configure"
+#line 11842 "configure"
#include "confdefs.h"
#ifdef HAVE_STDLIB_H
@@ -11495,16 +11857,16 @@ long x = (long) errno
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11498: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11860: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11501: \$? = $ac_status" >&5
+ echo "$as_me:11863: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11504: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11866: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11507: \$? = $ac_status" >&5
+ echo "$as_me:11869: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_dcl_errno=yes
else
@@ -11515,7 +11877,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:11518: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:11880: result: $cf_cv_dcl_errno" >&5
echo "${ECHO_T}$cf_cv_dcl_errno" >&6
if test "$cf_cv_dcl_errno" = no ; then
@@ -11530,14 +11892,14 @@ fi
# It's possible (for near-UNIX clones) that the data doesn't exist
-echo "$as_me:11533: checking if external errno exists" >&5
+echo "$as_me:11895: checking if external errno exists" >&5
echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
if test "${cf_cv_have_errno+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11540 "configure"
+#line 11902 "configure"
#include "confdefs.h"
#undef errno
@@ -11552,16 +11914,16 @@ errno = 2
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11555: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11917: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11558: \$? = $ac_status" >&5
+ echo "$as_me:11920: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11561: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11923: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11564: \$? = $ac_status" >&5
+ echo "$as_me:11926: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_errno=yes
else
@@ -11572,7 +11934,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:11575: result: $cf_cv_have_errno" >&5
+echo "$as_me:11937: result: $cf_cv_have_errno" >&5
echo "${ECHO_T}$cf_cv_have_errno" >&6
if test "$cf_cv_have_errno" = yes ; then
@@ -11585,7 +11947,7 @@ EOF
fi
-echo "$as_me:11588: checking if data-only library module links" >&5
+echo "$as_me:11950: checking if data-only library module links" >&5
echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
if test "${cf_cv_link_dataonly+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11593,20 +11955,20 @@ else
rm -f conftest.a
cat >conftest.$ac_ext <<EOF
-#line 11596 "configure"
+#line 11958 "configure"
int testdata[3] = { 123, 456, 789 };
EOF
- if { (eval echo "$as_me:11599: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:11961: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11602: \$? = $ac_status" >&5
+ echo "$as_me:11964: \$? = $ac_status" >&5
(exit $ac_status); } ; 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 11609 "configure"
+#line 11971 "configure"
int testfunc()
{
#if defined(NeXT)
@@ -11619,10 +11981,10 @@ int testfunc()
#endif
}
EOF
- if { (eval echo "$as_me:11622: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:11984: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11625: \$? = $ac_status" >&5
+ echo "$as_me:11987: \$? = $ac_status" >&5
(exit $ac_status); }; then
mv conftest.o func.o && \
( $AR $AR_OPTS conftest.a func.o ) 2>&5 1>/dev/null
@@ -11635,7 +11997,7 @@ EOF
cf_cv_link_dataonly=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11638 "configure"
+#line 12000 "configure"
#include "confdefs.h"
int main()
@@ -11646,15 +12008,15 @@ else
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11649: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12011: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11652: \$? = $ac_status" >&5
+ echo "$as_me:12014: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:11654: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12016: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11657: \$? = $ac_status" >&5
+ echo "$as_me:12019: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_link_dataonly=yes
else
@@ -11669,7 +12031,7 @@ fi
fi
-echo "$as_me:11672: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:12034: result: $cf_cv_link_dataonly" >&5
echo "${ECHO_T}$cf_cv_link_dataonly" >&6
if test "$cf_cv_link_dataonly" = no ; then
@@ -11704,13 +12066,13 @@ vsnprintf \
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11707: checking for $ac_func" >&5
+echo "$as_me:12069: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11713 "configure"
+#line 12075 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -11741,16 +12103,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11744: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12106: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11747: \$? = $ac_status" >&5
+ echo "$as_me:12109: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11750: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12112: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11753: \$? = $ac_status" >&5
+ echo "$as_me:12115: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -11760,7 +12122,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:11763: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12125: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -11772,14 +12134,14 @@ done
if test "$with_getcap" = "yes" ; then
-echo "$as_me:11775: checking for terminal-capability database functions" >&5
+echo "$as_me:12137: checking for terminal-capability database functions" >&5
echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
if test "${cf_cv_cgetent+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11782 "configure"
+#line 12144 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -11799,16 +12161,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11802: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12164: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11805: \$? = $ac_status" >&5
+ echo "$as_me:12167: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11808: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12170: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11811: \$? = $ac_status" >&5
+ echo "$as_me:12173: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_cgetent=yes
else
@@ -11820,7 +12182,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:11823: result: $cf_cv_cgetent" >&5
+echo "$as_me:12185: result: $cf_cv_cgetent" >&5
echo "${ECHO_T}$cf_cv_cgetent" >&6
test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF
#define HAVE_BSD_CGETENT 1
@@ -11828,14 +12190,14 @@ EOF
fi
-echo "$as_me:11831: checking for isascii" >&5
+echo "$as_me:12193: checking for isascii" >&5
echo $ECHO_N "checking for isascii... $ECHO_C" >&6
if test "${cf_cv_have_isascii+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11838 "configure"
+#line 12200 "configure"
#include "confdefs.h"
#include <ctype.h>
int
@@ -11847,16 +12209,16 @@ int x = isascii(' ')
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11850: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12212: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11853: \$? = $ac_status" >&5
+ echo "$as_me:12215: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11856: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12218: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11859: \$? = $ac_status" >&5
+ echo "$as_me:12221: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_isascii=yes
else
@@ -11867,17 +12229,17 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:11870: result: $cf_cv_have_isascii" >&5
+echo "$as_me:12232: result: $cf_cv_have_isascii" >&5
echo "${ECHO_T}$cf_cv_have_isascii" >&6
test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF
#define HAVE_ISASCII 1
EOF
if test "$ac_cv_func_sigaction" = yes; then
-echo "$as_me:11877: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:12239: checking whether sigaction needs _POSIX_SOURCE" >&5
echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 11880 "configure"
+#line 12242 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -11891,16 +12253,16 @@ struct sigaction act
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11894: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12256: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11897: \$? = $ac_status" >&5
+ echo "$as_me:12259: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11900: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12262: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11903: \$? = $ac_status" >&5
+ echo "$as_me:12265: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
sigact_bad=no
else
@@ -11908,7 +12270,7 @@ else
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 11911 "configure"
+#line 12273 "configure"
#include "confdefs.h"
#define _POSIX_SOURCE
@@ -11923,16 +12285,16 @@ struct sigaction act
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11926: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12288: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11929: \$? = $ac_status" >&5
+ echo "$as_me:12291: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11932: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12294: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11935: \$? = $ac_status" >&5
+ echo "$as_me:12297: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
sigact_bad=yes
cat >>confdefs.h <<\EOF
@@ -11947,11 +12309,11 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:11950: result: $sigact_bad" >&5
+echo "$as_me:12312: result: $sigact_bad" >&5
echo "${ECHO_T}$sigact_bad" >&6
fi
-echo "$as_me:11954: checking if nanosleep really works" >&5
+echo "$as_me:12316: checking if nanosleep really works" >&5
echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
if test "${cf_cv_func_nanosleep+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11961,7 +12323,7 @@ if test "$cross_compiling" = yes; then
cf_cv_func_nanosleep=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11964 "configure"
+#line 12326 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -11986,15 +12348,15 @@ int main() {
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11989: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12351: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11992: \$? = $ac_status" >&5
+ echo "$as_me:12354: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:11994: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12356: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11997: \$? = $ac_status" >&5
+ echo "$as_me:12359: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_func_nanosleep=yes
else
@@ -12006,7 +12368,7 @@ fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:12009: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:12371: result: $cf_cv_func_nanosleep" >&5
echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF
@@ -12020,23 +12382,23 @@ unistd.h \
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12023: checking for $ac_header" >&5
+echo "$as_me:12385: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12029 "configure"
+#line 12391 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:12033: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12395: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:12039: \$? = $ac_status" >&5
+ echo "$as_me:12401: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12055,7 +12417,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:12058: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12420: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -12070,23 +12432,23 @@ if test "$ISC" = yes ; then
for ac_header in sys/termio.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12073: checking for $ac_header" >&5
+echo "$as_me:12435: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12079 "configure"
+#line 12441 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:12083: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12445: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:12089: \$? = $ac_status" >&5
+ echo "$as_me:12451: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12105,7 +12467,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:12108: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12470: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -12123,10 +12485,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
*) termios_bad=maybe ;;
esac
if test "$termios_bad" = maybe ; then
- echo "$as_me:12126: checking whether termios.h needs _POSIX_SOURCE" >&5
+ echo "$as_me:12488: checking whether termios.h needs _POSIX_SOURCE" >&5
echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 12129 "configure"
+#line 12491 "configure"
#include "confdefs.h"
#include <termios.h>
int
@@ -12138,16 +12500,16 @@ struct termios foo; int x = foo.c_iflag
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12141: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12503: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12144: \$? = $ac_status" >&5
+ echo "$as_me:12506: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12147: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12509: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12150: \$? = $ac_status" >&5
+ echo "$as_me:12512: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
termios_bad=no
else
@@ -12155,7 +12517,7 @@ else
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 12158 "configure"
+#line 12520 "configure"
#include "confdefs.h"
#define _POSIX_SOURCE
@@ -12169,16 +12531,16 @@ struct termios foo; int x = foo.c_iflag
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12172: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12534: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12175: \$? = $ac_status" >&5
+ echo "$as_me:12537: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12178: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12540: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12181: \$? = $ac_status" >&5
+ echo "$as_me:12543: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
termios_bad=unknown
else
@@ -12193,19 +12555,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:12196: result: $termios_bad" >&5
+ echo "$as_me:12558: result: $termios_bad" >&5
echo "${ECHO_T}$termios_bad" >&6
fi
fi
-echo "$as_me:12201: checking for tcgetattr" >&5
+echo "$as_me:12563: checking for tcgetattr" >&5
echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
if test "${cf_cv_have_tcgetattr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12208 "configure"
+#line 12570 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -12233,16 +12595,16 @@ tcgetattr(1, &foo);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12236: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12598: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12239: \$? = $ac_status" >&5
+ echo "$as_me:12601: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12242: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12604: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12245: \$? = $ac_status" >&5
+ echo "$as_me:12607: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_tcgetattr=yes
else
@@ -12252,20 +12614,20 @@ cf_cv_have_tcgetattr=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12255: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:12617: result: $cf_cv_have_tcgetattr" >&5
echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF
#define HAVE_TCGETATTR 1
EOF
-echo "$as_me:12261: checking for vsscanf function or workaround" >&5
+echo "$as_me:12623: checking for vsscanf function or workaround" >&5
echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
if test "${cf_cv_func_vsscanf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12268 "configure"
+#line 12630 "configure"
#include "confdefs.h"
#include <stdarg.h>
@@ -12281,16 +12643,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12284: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12646: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12287: \$? = $ac_status" >&5
+ echo "$as_me:12649: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12290: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12652: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12293: \$? = $ac_status" >&5
+ echo "$as_me:12655: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_func_vsscanf=vsscanf
else
@@ -12298,7 +12660,7 @@ else
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 12301 "configure"
+#line 12663 "configure"
#include "confdefs.h"
#include <stdarg.h>
@@ -12320,16 +12682,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12323: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12685: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12326: \$? = $ac_status" >&5
+ echo "$as_me:12688: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12329: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12691: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12332: \$? = $ac_status" >&5
+ echo "$as_me:12694: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_func_vsscanf=vfscanf
else
@@ -12337,7 +12699,7 @@ else
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 12340 "configure"
+#line 12702 "configure"
#include "confdefs.h"
#include <stdarg.h>
@@ -12359,16 +12721,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12362: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12724: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12365: \$? = $ac_status" >&5
+ echo "$as_me:12727: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12368: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12730: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12371: \$? = $ac_status" >&5
+ echo "$as_me:12733: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_func_vsscanf=_doscan
else
@@ -12383,7 +12745,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12386: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:12748: result: $cf_cv_func_vsscanf" >&5
echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
case $cf_cv_func_vsscanf in #(vi
@@ -12401,7 +12763,7 @@ EOF
;;
esac
-echo "$as_me:12404: checking for working mkstemp" >&5
+echo "$as_me:12766: checking for working mkstemp" >&5
echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
if test "${cf_cv_func_mkstemp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12409,13 +12771,13 @@ else
rm -f conftest*
if test "$cross_compiling" = yes; then
- echo "$as_me:12412: checking for mkstemp" >&5
+ echo "$as_me:12774: checking for mkstemp" >&5
echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
if test "${ac_cv_func_mkstemp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12418 "configure"
+#line 12780 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mkstemp (); below. */
@@ -12446,16 +12808,16 @@ f = mkstemp;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12449: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12811: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12452: \$? = $ac_status" >&5
+ echo "$as_me:12814: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12455: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12817: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12458: \$? = $ac_status" >&5
+ echo "$as_me:12820: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_mkstemp=yes
else
@@ -12465,12 +12827,12 @@ ac_cv_func_mkstemp=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12468: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:12830: result: $ac_cv_func_mkstemp" >&5
echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12473 "configure"
+#line 12835 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -12508,15 +12870,15 @@ int main()
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12873: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12514: \$? = $ac_status" >&5
+ echo "$as_me:12876: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:12516: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12878: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12519: \$? = $ac_status" >&5
+ echo "$as_me:12881: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_func_mkstemp=yes
@@ -12531,7 +12893,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:12534: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:12896: result: $cf_cv_func_mkstemp" >&5
echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
if test "$cf_cv_func_mkstemp" = yes ; then
cat >>confdefs.h <<\EOF
@@ -12549,21 +12911,21 @@ else
fi
if test "$cross_compiling" = yes ; then
- { echo "$as_me:12552: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+ { echo "$as_me:12914: WARNING: cross compiling: assume setvbuf params not reversed" >&5
echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
else
- echo "$as_me:12555: checking whether setvbuf arguments are reversed" >&5
+ echo "$as_me:12917: checking whether setvbuf arguments are reversed" >&5
echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:12561: error: cannot run test program while cross compiling" >&5
+ { { echo "$as_me:12923: error: cannot run test program while cross compiling" >&5
echo "$as_me: error: cannot run test program while cross compiling" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12566 "configure"
+#line 12928 "configure"
#include "confdefs.h"
#include <stdio.h>
/* If setvbuf has the reversed format, exit 0. */
@@ -12580,15 +12942,15 @@ main ()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12583: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12945: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12586: \$? = $ac_status" >&5
+ echo "$as_me:12948: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:12588: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12950: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12591: \$? = $ac_status" >&5
+ echo "$as_me:12953: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_setvbuf_reversed=yes
else
@@ -12601,7 +12963,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f core core.* *.core
fi
-echo "$as_me:12604: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:12966: result: $ac_cv_func_setvbuf_reversed" >&5
echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
if test $ac_cv_func_setvbuf_reversed = yes; then
@@ -12612,13 +12974,13 @@ EOF
fi
fi
-echo "$as_me:12615: checking return type of signal handlers" >&5
+echo "$as_me:12977: checking return type of signal handlers" >&5
echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
if test "${ac_cv_type_signal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12621 "configure"
+#line 12983 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -12640,16 +13002,16 @@ int i;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12643: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13005: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12646: \$? = $ac_status" >&5
+ echo "$as_me:13008: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12649: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13011: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12652: \$? = $ac_status" >&5
+ echo "$as_me:13014: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_signal=void
else
@@ -12659,21 +13021,21 @@ ac_cv_type_signal=int
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:12662: result: $ac_cv_type_signal" >&5
+echo "$as_me:13024: result: $ac_cv_type_signal" >&5
echo "${ECHO_T}$ac_cv_type_signal" >&6
cat >>confdefs.h <<EOF
#define RETSIGTYPE $ac_cv_type_signal
EOF
-echo "$as_me:12669: checking for type sigaction_t" >&5
+echo "$as_me:13031: checking for type sigaction_t" >&5
echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
if test "${cf_cv_type_sigaction+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12676 "configure"
+#line 13038 "configure"
#include "confdefs.h"
#include <signal.h>
@@ -12686,16 +13048,16 @@ sigaction_t x
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12689: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13051: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12692: \$? = $ac_status" >&5
+ echo "$as_me:13054: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12695: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13057: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12698: \$? = $ac_status" >&5
+ echo "$as_me:13060: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_sigaction=yes
else
@@ -12706,13 +13068,13 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:12709: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:13071: result: $cf_cv_type_sigaction" >&5
echo "${ECHO_T}$cf_cv_type_sigaction" >&6
test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF
#define HAVE_TYPE_SIGACTION 1
EOF
-echo "$as_me:12715: checking declaration of size-change" >&5
+echo "$as_me:13077: checking declaration of size-change" >&5
echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
if test "${cf_cv_sizechange+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12727,7 +13089,7 @@ do
CPPFLAGS="$cf_save_CPPFLAGS"
test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
cat >conftest.$ac_ext <<_ACEOF
-#line 12730 "configure"
+#line 13092 "configure"
#include "confdefs.h"
#include <sys/types.h>
#ifdef HAVE_TERMIOS_H
@@ -12771,16 +13133,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12774: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13136: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12777: \$? = $ac_status" >&5
+ echo "$as_me:13139: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12780: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13142: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12783: \$? = $ac_status" >&5
+ echo "$as_me:13145: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_sizechange=yes
else
@@ -12799,7 +13161,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:12802: result: $cf_cv_sizechange" >&5
+echo "$as_me:13164: result: $cf_cv_sizechange" >&5
echo "${ECHO_T}$cf_cv_sizechange" >&6
if test "$cf_cv_sizechange" != no ; then
cat >>confdefs.h <<\EOF
@@ -12816,13 +13178,13 @@ EOF
esac
fi
-echo "$as_me:12819: checking for memmove" >&5
+echo "$as_me:13181: checking for memmove" >&5
echo $ECHO_N "checking for memmove... $ECHO_C" >&6
if test "${ac_cv_func_memmove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12825 "configure"
+#line 13187 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char memmove (); below. */
@@ -12853,16 +13215,16 @@ f = memmove;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12856: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13218: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12859: \$? = $ac_status" >&5
+ echo "$as_me:13221: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12862: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13224: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12865: \$? = $ac_status" >&5
+ echo "$as_me:13227: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_memmove=yes
else
@@ -12872,19 +13234,19 @@ ac_cv_func_memmove=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12875: result: $ac_cv_func_memmove" >&5
+echo "$as_me:13237: result: $ac_cv_func_memmove" >&5
echo "${ECHO_T}$ac_cv_func_memmove" >&6
if test $ac_cv_func_memmove = yes; then
:
else
-echo "$as_me:12881: checking for bcopy" >&5
+echo "$as_me:13243: checking for bcopy" >&5
echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
if test "${ac_cv_func_bcopy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12887 "configure"
+#line 13249 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char bcopy (); below. */
@@ -12915,16 +13277,16 @@ f = bcopy;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12918: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13280: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12921: \$? = $ac_status" >&5
+ echo "$as_me:13283: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12924: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13286: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12927: \$? = $ac_status" >&5
+ echo "$as_me:13289: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_bcopy=yes
else
@@ -12934,11 +13296,11 @@ ac_cv_func_bcopy=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12937: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:13299: result: $ac_cv_func_bcopy" >&5
echo "${ECHO_T}$ac_cv_func_bcopy" >&6
if test $ac_cv_func_bcopy = yes; then
- echo "$as_me:12941: checking if bcopy does overlapping moves" >&5
+ echo "$as_me:13303: checking if bcopy does overlapping moves" >&5
echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
if test "${cf_cv_good_bcopy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12948,7 +13310,7 @@ else
cf_cv_good_bcopy=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12951 "configure"
+#line 13313 "configure"
#include "confdefs.h"
int main() {
@@ -12962,15 +13324,15 @@ int main() {
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12965: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13327: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12968: \$? = $ac_status" >&5
+ echo "$as_me:13330: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:12970: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13332: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12973: \$? = $ac_status" >&5
+ echo "$as_me:13335: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_good_bcopy=yes
else
@@ -12983,7 +13345,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:12986: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:13348: result: $cf_cv_good_bcopy" >&5
echo "${ECHO_T}$cf_cv_good_bcopy" >&6
else
@@ -13004,7 +13366,7 @@ EOF
fi
-echo "$as_me:13007: checking if poll really works" >&5
+echo "$as_me:13369: checking if poll really works" >&5
echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
if test "${cf_cv_working_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13014,7 +13376,7 @@ if test "$cross_compiling" = yes; then
cf_cv_working_poll=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 13017 "configure"
+#line 13379 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -13035,15 +13397,15 @@ int main() {
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13038: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13400: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13041: \$? = $ac_status" >&5
+ echo "$as_me:13403: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:13043: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13405: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13046: \$? = $ac_status" >&5
+ echo "$as_me:13408: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_working_poll=yes
else
@@ -13055,7 +13417,7 @@ fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:13058: result: $cf_cv_working_poll" >&5
+echo "$as_me:13420: result: $cf_cv_working_poll" >&5
echo "${ECHO_T}$cf_cv_working_poll" >&6
test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF
#define HAVE_WORKING_POLL 1
@@ -13066,23 +13428,132 @@ if test "$with_hashed_db" != no ; then
#define USE_HASHED_DB 1
EOF
-echo "$as_me:13069: checking for db.h" >&5
+case $with_hashed_db in #(vi
+yes|*able*) #(vi
+ ;;
+*)
+ if test -d "$with_hashed_db" ; then
+
+if test -n "$with_hashed_db/include" ; then
+ for cf_add_incdir in $with_hashed_db/include
+ do
+ while test $cf_add_incdir != /usr/include
+ do
+ if test -d $cf_add_incdir
+ then
+ cf_have_incdir=no
+ if test -n "$CFLAGS$CPPFLAGS" ; then
+ # a loop is needed to ensure we can add subdirs of existing dirs
+ for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
+ if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
+ cf_have_incdir=yes; break
+ fi
+ done
+ fi
+
+ if test "$cf_have_incdir" = no ; then
+ if test "$cf_add_incdir" = /usr/local/include ; then
+ if test "$GCC" = yes
+ then
+ cf_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 13461 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+printf("Hello")
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:13473: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:13476: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:13479: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:13482: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_have_incdir=yes
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ CPPFLAGS=$cf_save_CPPFLAGS
+ fi
+ fi
+ fi
+
+ if test "$cf_have_incdir" = no ; then
+ echo "$as_me:13497: result: adding $cf_add_incdir to include-path" >&5
+echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
+ CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
+
+ cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+ test "$cf_top_incdir" = "$cf_add_incdir" && break
+ cf_add_incdir="$cf_top_incdir"
+ else
+ break
+ fi
+ fi
+ done
+ done
+fi
+
+if test -n "$with_hashed_db/lib" ; then
+ for cf_add_libdir in $with_hashed_db/lib
+ do
+ if test $cf_add_libdir = /usr/lib ; then
+ :
+ elif test -d $cf_add_libdir
+ then
+ cf_have_libdir=no
+ if test -n "$LDFLAGS$LIBS" ; then
+ # a loop is needed to ensure we can add subdirs of existing dirs
+ for cf_test_libdir in $LDFLAGS $LIBS ; do
+ if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+ cf_have_libdir=yes; break
+ fi
+ done
+ fi
+ if test "$cf_have_libdir" = no ; then
+ echo "$as_me:13529: result: adding $cf_add_libdir to library-path" >&5
+echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+ fi
+ done
+fi
+
+ fi
+esac
+
+echo "$as_me:13540: checking for db.h" >&5
echo $ECHO_N "checking for db.h... $ECHO_C" >&6
if test "${ac_cv_header_db_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 13075 "configure"
+#line 13546 "configure"
#include "confdefs.h"
#include <db.h>
_ACEOF
-if { (eval echo "$as_me:13079: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13550: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:13085: \$? = $ac_status" >&5
+ echo "$as_me:13556: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13101,11 +13572,11 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:13104: result: $ac_cv_header_db_h" >&5
+echo "$as_me:13575: result: $ac_cv_header_db_h" >&5
echo "${ECHO_T}$ac_cv_header_db_h" >&6
if test $ac_cv_header_db_h = yes; then
-echo "$as_me:13108: checking for version of db" >&5
+echo "$as_me:13579: checking for version of db" >&5
echo $ECHO_N "checking for version of db... $ECHO_C" >&6
if test "${cf_cv_hashed_db_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13113,13 +13584,13 @@ else
cf_cv_hashed_db_version=unknown
-for cf_db_version in 1 2 3 4
+for cf_db_version in 1 2 3 4 5
do
-echo "(line 13119) testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me-configure}:13590: testing checking for db version $cf_db_version ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 13122 "configure"
+#line 13593 "configure"
#include "confdefs.h"
$ac_includes_default
@@ -13149,16 +13620,16 @@ DBT *foo = 0
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13152: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13623: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13155: \$? = $ac_status" >&5
+ echo "$as_me:13626: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13158: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13629: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13161: \$? = $ac_status" >&5
+ echo "$as_me:13632: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_hashed_db_version=$cf_db_version
@@ -13172,33 +13643,33 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:13175: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:13646: result: $cf_cv_hashed_db_version" >&5
echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
if test "$cf_cv_hashed_db_version" = unknown ; then
- { { echo "$as_me:13179: error: Cannot determine version of db" >&5
+ { { echo "$as_me:13650: error: Cannot determine version of db" >&5
echo "$as_me: error: Cannot determine version of db" >&2;}
{ (exit 1); exit 1; }; }
else
-echo "$as_me:13184: checking for db libraries" >&5
+echo "$as_me:13655: checking for db libraries" >&5
echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
if test "${cf_cv_hashed_db_libs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cf_cv_hashed_db_libs=unknown
-for cf_db_libs in db$cf_cv_hashed_db_version db ''
+for cf_db_libs in db$cf_cv_hashed_db_version db-$cf_cv_hashed_db_version db ''
do
cf_save_libs="$LIBS"
if test -n "$cf_db_libs"; then
LIBS="-l$cf_db_libs $LIBS"
fi
-echo "(line 13198) testing checking for library "$cf_db_libs" ..." 1>&5
+echo "${as_me-configure}:13669: testing checking for library "$cf_db_libs" ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 13201 "configure"
+#line 13672 "configure"
#include "confdefs.h"
$ac_includes_default
@@ -13253,16 +13724,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13256: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13727: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13259: \$? = $ac_status" >&5
+ echo "$as_me:13730: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13262: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13733: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13265: \$? = $ac_status" >&5
+ echo "$as_me:13736: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
if test -n "$cf_db_libs" ; then
@@ -13282,11 +13753,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
done
fi
-echo "$as_me:13285: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:13756: result: $cf_cv_hashed_db_libs" >&5
echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
if test "$cf_cv_hashed_db_libs" = unknown ; then
- { { echo "$as_me:13289: error: Cannot determine library for db" >&5
+ { { echo "$as_me:13760: error: Cannot determine library for db" >&5
echo "$as_me: error: Cannot determine library for db" >&2;}
{ (exit 1); exit 1; }; }
elif test "$cf_cv_hashed_db_libs" != default ; then
@@ -13296,7 +13767,7 @@ fi
else
- { { echo "$as_me:13299: error: Cannot find db.h" >&5
+ { { echo "$as_me:13770: error: Cannot find db.h" >&5
echo "$as_me: error: Cannot find db.h" >&2;}
{ (exit 1); exit 1; }; }
@@ -13311,7 +13782,7 @@ fi
# Just in case, check if the C compiler has a bool type.
-echo "$as_me:13314: checking if we should include stdbool.h" >&5
+echo "$as_me:13785: checking if we should include stdbool.h" >&5
echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
if test "${cf_cv_header_stdbool_h+set}" = set; then
@@ -13319,7 +13790,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
else
cat >conftest.$ac_ext <<_ACEOF
-#line 13322 "configure"
+#line 13793 "configure"
#include "confdefs.h"
int
@@ -13331,23 +13802,23 @@ bool foo = false
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13334: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13805: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13337: \$? = $ac_status" >&5
+ echo "$as_me:13808: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13340: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13811: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13343: \$? = $ac_status" >&5
+ echo "$as_me:13814: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_header_stdbool_h=0
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 13350 "configure"
+#line 13821 "configure"
#include "confdefs.h"
#ifndef __BEOS__
@@ -13363,16 +13834,16 @@ bool foo = false
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13366: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13837: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13369: \$? = $ac_status" >&5
+ echo "$as_me:13840: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13372: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13843: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13375: \$? = $ac_status" >&5
+ echo "$as_me:13846: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_header_stdbool_h=1
else
@@ -13386,13 +13857,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
if test "$cf_cv_header_stdbool_h" = 1
-then echo "$as_me:13389: result: yes" >&5
+then echo "$as_me:13860: result: yes" >&5
echo "${ECHO_T}yes" >&6
-else echo "$as_me:13391: result: no" >&5
+else echo "$as_me:13862: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:13395: checking for builtin bool type" >&5
+echo "$as_me:13866: checking for builtin bool type" >&5
echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
if test "${cf_cv_cc_bool_type+set}" = set; then
@@ -13400,7 +13871,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
else
cat >conftest.$ac_ext <<_ACEOF
-#line 13403 "configure"
+#line 13874 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -13415,16 +13886,16 @@ bool x = false
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13418: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13889: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13421: \$? = $ac_status" >&5
+ echo "$as_me:13892: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13424: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13895: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13427: \$? = $ac_status" >&5
+ echo "$as_me:13898: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_cc_bool_type=1
else
@@ -13437,9 +13908,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
if test "$cf_cv_cc_bool_type" = 1
-then echo "$as_me:13440: result: yes" >&5
+then echo "$as_me:13911: result: yes" >&5
echo "${ECHO_T}yes" >&6
-else echo "$as_me:13442: result: no" >&5
+else echo "$as_me:13913: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -13461,7 +13932,7 @@ os2*) #(vi
cf_stdcpp_libname=stdc++
;;
esac
-echo "$as_me:13464: checking for library $cf_stdcpp_libname" >&5
+echo "$as_me:13935: checking for library $cf_stdcpp_libname" >&5
echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
if test "${cf_cv_libstdcpp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13470,7 +13941,7 @@ else
cf_save="$LIBS"
LIBS="$LIBS -l$cf_stdcpp_libname"
cat >conftest.$ac_ext <<_ACEOF
-#line 13473 "configure"
+#line 13944 "configure"
#include "confdefs.h"
#include <strstream.h>
@@ -13486,16 +13957,16 @@ strstreambuf foo(buf, sizeof(buf))
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13960: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13492: \$? = $ac_status" >&5
+ echo "$as_me:13963: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13495: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13966: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13498: \$? = $ac_status" >&5
+ echo "$as_me:13969: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_libstdcpp=yes
else
@@ -13507,12 +13978,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS="$cf_save"
fi
-echo "$as_me:13510: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:13981: result: $cf_cv_libstdcpp" >&5
echo "${ECHO_T}$cf_cv_libstdcpp" >&6
test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname"
fi
- echo "$as_me:13515: checking whether $CXX understands -c and -o together" >&5
+ echo "$as_me:13986: checking whether $CXX understands -c and -o together" >&5
echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
if test "${cf_cv_prog_CXX_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13528,15 +13999,15 @@ CF_EOF
# We do the test twice because some compilers refuse to overwrite an
# existing .o file with -o, though they will create one.
ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-if { (eval echo "$as_me:13531: \"$ac_try\"") >&5
+if { (eval echo "$as_me:14002: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13534: \$? = $ac_status" >&5
+ echo "$as_me:14005: \$? = $ac_status" >&5
(exit $ac_status); } &&
- test -f conftest2.$ac_objext && { (eval echo "$as_me:13536: \"$ac_try\"") >&5
+ test -f conftest2.$ac_objext && { (eval echo "$as_me:14007: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13539: \$? = $ac_status" >&5
+ echo "$as_me:14010: \$? = $ac_status" >&5
(exit $ac_status); };
then
eval cf_cv_prog_CXX_c_o=yes
@@ -13547,10 +14018,10 @@ rm -f conftest*
fi
if test $cf_cv_prog_CXX_c_o = yes; then
- echo "$as_me:13550: result: yes" >&5
+ echo "$as_me:14021: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
- echo "$as_me:13553: result: no" >&5
+ echo "$as_me:14024: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -13570,12 +14041,12 @@ os2*) #(vi
;;
esac
if test "$GXX" = yes; then
- echo "$as_me:13573: checking for lib$cf_gpp_libname" >&5
+ echo "$as_me:14044: checking for lib$cf_gpp_libname" >&5
echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
cf_save="$LIBS"
LIBS="$LIBS -l$cf_gpp_libname"
cat >conftest.$ac_ext <<_ACEOF
-#line 13578 "configure"
+#line 14049 "configure"
#include "confdefs.h"
#include <$cf_gpp_libname/builtin.h>
@@ -13589,16 +14060,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13592: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14063: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13595: \$? = $ac_status" >&5
+ echo "$as_me:14066: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13598: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14069: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13601: \$? = $ac_status" >&5
+ echo "$as_me:14072: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cxx_library=yes
CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
@@ -13617,7 +14088,7 @@ else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 13620 "configure"
+#line 14091 "configure"
#include "confdefs.h"
#include <builtin.h>
@@ -13631,16 +14102,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13634: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14105: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13637: \$? = $ac_status" >&5
+ echo "$as_me:14108: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13640: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14111: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13643: \$? = $ac_status" >&5
+ echo "$as_me:14114: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cxx_library=yes
CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
@@ -13657,7 +14128,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS="$cf_save"
- echo "$as_me:13660: result: $cf_cxx_library" >&5
+ echo "$as_me:14131: result: $cf_cxx_library" >&5
echo "${ECHO_T}$cf_cxx_library" >&6
fi
@@ -13673,7 +14144,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
ac_main_return=return
-echo "$as_me:13676: checking how to run the C++ preprocessor" >&5
+echo "$as_me:14147: checking how to run the C++ preprocessor" >&5
echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
@@ -13690,18 +14161,18 @@ do
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
-#line 13693 "configure"
+#line 14164 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax error
_ACEOF
-if { (eval echo "$as_me:13698: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14169: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:13704: \$? = $ac_status" >&5
+ echo "$as_me:14175: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -13724,17 +14195,17 @@ rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line 13727 "configure"
+#line 14198 "configure"
#include "confdefs.h"
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:13731: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14202: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:13737: \$? = $ac_status" >&5
+ echo "$as_me:14208: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -13771,7 +14242,7 @@ fi
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
-echo "$as_me:13774: result: $CXXCPP" >&5
+echo "$as_me:14245: result: $CXXCPP" >&5
echo "${ECHO_T}$CXXCPP" >&6
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
@@ -13781,18 +14252,18 @@ do
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
-#line 13784 "configure"
+#line 14255 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax error
_ACEOF
-if { (eval echo "$as_me:13789: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14260: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:13795: \$? = $ac_status" >&5
+ echo "$as_me:14266: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -13815,17 +14286,17 @@ rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line 13818 "configure"
+#line 14289 "configure"
#include "confdefs.h"
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:13822: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14293: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:13828: \$? = $ac_status" >&5
+ echo "$as_me:14299: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -13853,7 +14324,7 @@ rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then
:
else
- { { echo "$as_me:13856: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ { { echo "$as_me:14327: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -13865,26 +14336,26 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
ac_main_return=return
-for ac_header in typeinfo
+for ac_header in iostream typeinfo
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:13871: checking for $ac_header" >&5
+echo "$as_me:14342: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 13877 "configure"
+#line 14348 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:13881: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14352: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:13887: \$? = $ac_status" >&5
+ echo "$as_me:14358: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -13903,7 +14374,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:13906: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:14377: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -13913,7 +14384,7 @@ EOF
fi
done
-echo "$as_me:13916: checking if we should include stdbool.h" >&5
+echo "$as_me:14387: checking if we should include stdbool.h" >&5
echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
if test "${cf_cv_header_stdbool_h+set}" = set; then
@@ -13921,7 +14392,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
else
cat >conftest.$ac_ext <<_ACEOF
-#line 13924 "configure"
+#line 14395 "configure"
#include "confdefs.h"
int
@@ -13933,23 +14404,23 @@ bool foo = false
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13936: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14407: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13939: \$? = $ac_status" >&5
+ echo "$as_me:14410: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13942: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14413: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13945: \$? = $ac_status" >&5
+ echo "$as_me:14416: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_header_stdbool_h=0
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 13952 "configure"
+#line 14423 "configure"
#include "confdefs.h"
#ifndef __BEOS__
@@ -13965,16 +14436,16 @@ bool foo = false
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13968: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14439: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13971: \$? = $ac_status" >&5
+ echo "$as_me:14442: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13974: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14445: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13977: \$? = $ac_status" >&5
+ echo "$as_me:14448: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_header_stdbool_h=1
else
@@ -13988,13 +14459,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
if test "$cf_cv_header_stdbool_h" = 1
-then echo "$as_me:13991: result: yes" >&5
+then echo "$as_me:14462: result: yes" >&5
echo "${ECHO_T}yes" >&6
-else echo "$as_me:13993: result: no" >&5
+else echo "$as_me:14464: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:13997: checking for builtin bool type" >&5
+echo "$as_me:14468: checking for builtin bool type" >&5
echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
if test "${cf_cv_builtin_bool+set}" = set; then
@@ -14002,7 +14473,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
else
cat >conftest.$ac_ext <<_ACEOF
-#line 14005 "configure"
+#line 14476 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -14017,16 +14488,16 @@ bool x = false
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14020: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14491: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:14023: \$? = $ac_status" >&5
+ echo "$as_me:14494: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:14026: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14497: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14029: \$? = $ac_status" >&5
+ echo "$as_me:14500: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_builtin_bool=1
else
@@ -14039,13 +14510,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
if test "$cf_cv_builtin_bool" = 1
-then echo "$as_me:14042: result: yes" >&5
+then echo "$as_me:14513: result: yes" >&5
echo "${ECHO_T}yes" >&6
-else echo "$as_me:14044: result: no" >&5
+else echo "$as_me:14515: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:14048: checking for size of bool" >&5
+echo "$as_me:14519: checking for size of bool" >&5
echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
if test "${cf_cv_type_of_bool+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14056,7 +14527,7 @@ else
cf_cv_type_of_bool=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 14059 "configure"
+#line 14530 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -14098,15 +14569,15 @@ main()
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14101: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14572: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14104: \$? = $ac_status" >&5
+ echo "$as_me:14575: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:14106: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14577: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14109: \$? = $ac_status" >&5
+ echo "$as_me:14580: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_of_bool=`cat cf_test.out`
if test -z "$cf_cv_type_of_bool"; then
@@ -14124,18 +14595,18 @@ fi
fi
rm -f cf_test.out
-echo "$as_me:14127: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:14598: result: $cf_cv_type_of_bool" >&5
echo "${ECHO_T}$cf_cv_type_of_bool" >&6
if test "$cf_cv_type_of_bool" = unknown ; then
case .$NCURSES_BOOL in #(vi
.auto|.) NCURSES_BOOL=unsigned;;
esac
- { echo "$as_me:14133: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ { echo "$as_me:14604: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
cf_cv_type_of_bool=$NCURSES_BOOL
fi
-echo "$as_me:14138: checking for special defines needed for etip.h" >&5
+echo "$as_me:14609: checking for special defines needed for etip.h" >&5
echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
cf_save_CXXFLAGS="$CXXFLAGS"
cf_result="none"
@@ -14147,7 +14618,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 <<_ACEOF
-#line 14150 "configure"
+#line 14621 "configure"
#include "confdefs.h"
#include <etip.h.in>
@@ -14161,16 +14632,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14164: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14635: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:14167: \$? = $ac_status" >&5
+ echo "$as_me:14638: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:14170: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14641: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14173: \$? = $ac_status" >&5
+ echo "$as_me:14644: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -14191,12 +14662,12 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
done
done
-echo "$as_me:14194: result: $cf_result" >&5
+echo "$as_me:14665: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
CXXFLAGS="$cf_save_CXXFLAGS"
if test -n "$CXX"; then
-echo "$as_me:14199: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:14670: checking if $CXX accepts parameter initialization" >&5
echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
if test "${cf_cv_cpp_param_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14213,7 +14684,7 @@ ac_main_return=return
cf_cv_cpp_param_init=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 14216 "configure"
+#line 14687 "configure"
#include "confdefs.h"
class TEST {
@@ -14232,15 +14703,15 @@ void main() { }
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14235: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14706: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14238: \$? = $ac_status" >&5
+ echo "$as_me:14709: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:14240: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14711: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14243: \$? = $ac_status" >&5
+ echo "$as_me:14714: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_cpp_param_init=yes
else
@@ -14259,7 +14730,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
ac_main_return=return
fi
-echo "$as_me:14262: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:14733: result: $cf_cv_cpp_param_init" >&5
echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
fi
test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF
@@ -14268,7 +14739,7 @@ EOF
if test -n "$CXX"; then
-echo "$as_me:14271: checking if $CXX accepts static_cast" >&5
+echo "$as_me:14742: checking if $CXX accepts static_cast" >&5
echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
if test "${cf_cv_cpp_static_cast+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14282,7 +14753,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
ac_main_return=return
cat >conftest.$ac_ext <<_ACEOF
-#line 14285 "configure"
+#line 14756 "configure"
#include "confdefs.h"
class NCursesPanel
@@ -14326,16 +14797,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14329: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14800: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:14332: \$? = $ac_status" >&5
+ echo "$as_me:14803: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:14335: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14806: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14338: \$? = $ac_status" >&5
+ echo "$as_me:14809: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_cpp_static_cast=yes
else
@@ -14353,7 +14824,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
ac_main_return=return
fi
-echo "$as_me:14356: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:14827: result: $cf_cv_cpp_static_cast" >&5
echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
fi
@@ -14362,189 +14833,6 @@ test "$cf_cv_cpp_static_cast" = yes && cat >>confdefs.h <<\EOF
#define CPP_HAS_STATIC_CAST 1
EOF
-if test -n "$CXX"; then
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-ac_main_return=return
-
-for ac_header in strstream.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:14377: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 14383 "configure"
-#include "confdefs.h"
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:14387: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- egrep -v '^ *\+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:14393: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- eval "$as_ac_Header=yes"
-else
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_ext
-fi
-echo "$as_me:14412: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-EOF
-
-fi
-done
-
-echo "$as_me:14422: checking if $CXX supports vscan function" >&5
-echo $ECHO_N "checking if $CXX supports vscan function... $ECHO_C" >&6
-if test "${cf_cv_cpp_vscan_func+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- 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 <<_ACEOF
-#line 14436 "configure"
-#include "confdefs.h"
-
-#include <stdio.h>
-#include <stdarg.h>
-#define $cf_vscan_defs 1
-#if defined(USE_STDIO_VSCAN)
-#elif defined(HAVE_STRSTREAM_H) && defined(USE_STRSTREAM_VSCAN)
-#include <strstream.h>
-#endif
-
-int scanw(const char* fmt, ...)
-{
- int result = -1;
- char buf[BUFSIZ];
-
- va_list args;
- va_start(args, fmt);
-#if defined(USE_STDIO_VSCAN)
- 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);
- return result;
-}
-
-int
-main ()
-{
-int tmp, foo = scanw("%d", &tmp)
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14481: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:14484: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14487: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:14490: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cf_cv_cpp_vscan_func=$cf_vscan_func; break
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-cf_cv_cpp_vscan_func=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- test "$cf_cv_cpp_vscan_func" != no && break
- done
-
-fi
-echo "$as_me:14503: result: $cf_cv_cpp_vscan_func" >&5
-echo "${ECHO_T}$cf_cv_cpp_vscan_func" >&6
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-ac_main_return=return
-
-fi
-
-case $cf_cv_cpp_vscan_func in #(vi
-stdio) #(vi
- cat >>confdefs.h <<\EOF
-#define CPP_HAS_VSCAN_FUNC 1
-EOF
-
- cat >>confdefs.h <<\EOF
-#define USE_STDIO_VSCAN 1
-EOF
-
- ;;
-strstream)
- cat >>confdefs.h <<\EOF
-#define CPP_HAS_VSCAN_FUNC 1
-EOF
-
- cat >>confdefs.h <<\EOF
-#define USE_STRSTREAM_VSCAN 1
-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
@@ -14584,7 +14872,7 @@ else
else
if test "$cf_cv_header_stdbool_h" = 1 ; then
-echo "$as_me:14587: checking for size of bool" >&5
+echo "$as_me:14875: checking for size of bool" >&5
echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
if test "${cf_cv_type_of_bool+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14595,7 +14883,7 @@ else
cf_cv_type_of_bool=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 14598 "configure"
+#line 14886 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -14637,15 +14925,15 @@ main()
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14640: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14928: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14643: \$? = $ac_status" >&5
+ echo "$as_me:14931: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:14645: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14933: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14648: \$? = $ac_status" >&5
+ echo "$as_me:14936: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_of_bool=`cat cf_test.out`
if test -z "$cf_cv_type_of_bool"; then
@@ -14663,25 +14951,25 @@ fi
fi
rm -f cf_test.out
-echo "$as_me:14666: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:14954: result: $cf_cv_type_of_bool" >&5
echo "${ECHO_T}$cf_cv_type_of_bool" >&6
if test "$cf_cv_type_of_bool" = unknown ; then
case .$NCURSES_BOOL in #(vi
.auto|.) NCURSES_BOOL=unsigned;;
esac
- { echo "$as_me:14672: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ { echo "$as_me:14960: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
cf_cv_type_of_bool=$NCURSES_BOOL
fi
else
- echo "$as_me:14678: checking for fallback type of bool" >&5
+ echo "$as_me:14966: checking for fallback type of bool" >&5
echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
case "$host_cpu" in #(vi
i?86) cf_cv_type_of_bool=char ;; #(vi
*) cf_cv_type_of_bool=int ;;
esac
- echo "$as_me:14684: result: $cf_cv_type_of_bool" >&5
+ echo "$as_me:14972: result: $cf_cv_type_of_bool" >&5
echo "${ECHO_T}$cf_cv_type_of_bool" >&6
fi
fi
@@ -14707,11 +14995,20 @@ else
fi
if test -f "${srcdir}/Ada95/Makefile.in" ; then
+
+if test "$cf_with_ada" != "no" ; then
+ if test "$with_libtool" != "no"; then
+ { echo "$as_me:15001: WARNING: libtool does not support Ada - disabling feature" >&5
+echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
+ cf_with_ada=no
+ fi
+fi
+
if test "$cf_with_ada" != "no" ; then
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 "$as_me:14714: checking for $ac_word" >&5
+echo "$as_me:15011: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_gnat_exists+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14726,7 +15023,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_gnat_exists="yes"
-echo "$as_me:14729: found $ac_dir/$ac_word" >&5
+echo "$as_me:15026: found $ac_dir/$ac_word" >&5
break
done
@@ -14735,10 +15032,10 @@ fi
fi
gnat_exists=$ac_cv_prog_gnat_exists
if test -n "$gnat_exists"; then
- echo "$as_me:14738: result: $gnat_exists" >&5
+ echo "$as_me:15035: result: $gnat_exists" >&5
echo "${ECHO_T}$gnat_exists" >&6
else
- echo "$as_me:14741: result: no" >&5
+ echo "$as_me:15038: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -14746,11 +15043,11 @@ if test "$ac_cv_prog_gnat_exists" = no; then
cf_ada_make=
else
-echo "$as_me:14749: checking for gnat version" >&5
+echo "$as_me:15046: checking for gnat version" >&5
echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
cf_gnat_version=`${cf_ada_make-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\
sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
-echo "$as_me:14753: result: $cf_gnat_version" >&5
+echo "$as_me:15050: result: $cf_gnat_version" >&5
echo "${ECHO_T}$cf_gnat_version" >&6
case $cf_gnat_version in
@@ -14773,7 +15070,7 @@ esac
# Extract the first word of "m4", so it can be a program name with args.
set dummy m4; ac_word=$2
-echo "$as_me:14776: checking for $ac_word" >&5
+echo "$as_me:15073: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_M4_exists+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14788,7 +15085,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_M4_exists="yes"
-echo "$as_me:14791: found $ac_dir/$ac_word" >&5
+echo "$as_me:15088: found $ac_dir/$ac_word" >&5
break
done
@@ -14797,10 +15094,10 @@ fi
fi
M4_exists=$ac_cv_prog_M4_exists
if test -n "$M4_exists"; then
- echo "$as_me:14800: result: $M4_exists" >&5
+ echo "$as_me:15097: result: $M4_exists" >&5
echo "${ECHO_T}$M4_exists" >&6
else
- echo "$as_me:14803: result: no" >&5
+ echo "$as_me:15100: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -14809,7 +15106,7 @@ fi
echo Ada95 binding required program m4 not found. Ada95 binding disabled.
fi
if test "$cf_cv_prog_gnat_correct" = yes; then
- echo "$as_me:14812: checking if GNAT works" >&5
+ echo "$as_me:15109: checking if GNAT works" >&5
echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
rm -f conftest*
@@ -14837,14 +15134,14 @@ else
fi
rm -f conftest*
- echo "$as_me:14840: result: $cf_cv_prog_gnat_correct" >&5
+ echo "$as_me:15137: result: $cf_cv_prog_gnat_correct" >&5
echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
fi
fi
if test "$cf_cv_prog_gnat_correct" = yes; then
ADAFLAGS="-O3 -gnatpn $ADAFLAGS"
- echo "$as_me:14847: checking if GNAT pragma Unreferenced works" >&5
+ echo "$as_me:15144: checking if GNAT pragma Unreferenced works" >&5
echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
rm -f conftest*
@@ -14871,7 +15168,7 @@ else
fi
rm -f conftest*
- echo "$as_me:14874: result: $cf_cv_pragma_unreferenced" >&5
+ echo "$as_me:15171: result: $cf_cv_pragma_unreferenced" >&5
echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
# if the pragma is supported, use it (needed in the Trace code).
@@ -14897,7 +15194,8 @@ if test "${with_ada_include+set}" = set; then
else
withval="${ADA_INCLUDE-$prefix/lib/ada/adainclude}"
-fi;
+fi; if test -n "$prefix/lib/ada/adainclude" ; then
+
if test "x$prefix" != xNONE; then
cf_path_syntax="$prefix"
else
@@ -14923,12 +15221,13 @@ case ".$withval" in #(vi
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:14926: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:15224: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
esac
+fi
ADA_INCLUDE="$withval"
# Check whether --with-ada-objects or --without-ada-objects was given.
@@ -14937,7 +15236,8 @@ if test "${with_ada_objects+set}" = set; then
else
withval="${ADA_OBJECTS-$prefix/lib/ada/adalib}"
-fi;
+fi; if test -n "$prefix/lib/ada/adalib" ; then
+
if test "x$prefix" != xNONE; then
cf_path_syntax="$prefix"
else
@@ -14963,34 +15263,57 @@ case ".$withval" in #(vi
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:14966: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:15266: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
esac
+fi
ADA_OBJECTS="$withval"
fi
fi
+else
+ cf_with_ada=no
fi
-### Construct the library-subsets, if any, from this set of keywords:
-### none, base, ext_funcs, ext_tinfo, termlib, widechar (see CF_LIB_RULES).
-echo "$as_me:14980: checking for library subsets" >&5
+### Construct the ncurses library-subsets, if any, from this set of keywords:
+### none, base, ext_funcs, ext_tinfo, ticlib, termlib, widechar
+###
+### ticlib modules may be a separate library, otherwise contained in termlib.
+### termlib modules may be a separate library, otherwise contained in ncurses.
+###
+### The of "+" or " " between the tokens controls the way the script
+### chooses to split module lists into libraries.
+###
+### (see CF_LIB_RULES).
+echo "$as_me:15291: checking for library subsets" >&5
echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+LIB_SUBSETS=
+
+if test "$cf_with_progs" = yes || test "$with_ticlib" != no || test "$with_termcap" != no; then
+ LIB_SUBSETS="${LIB_SUBSETS}ticlib"
+ if test "$with_ticlib" != no ; then
+ LIB_SUBSETS="${LIB_SUBSETS} "
+ else
+ LIB_SUBSETS="${LIB_SUBSETS}+"
+ fi
+fi
+
+LIB_SUBSETS="${LIB_SUBSETS}termlib"
+test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
if test "$with_termlib" != no ; then
- LIB_SUBSETS="termlib"
- test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
LIB_SUBSETS="${LIB_SUBSETS} "
else
- LIB_SUBSETS="termlib+"
- test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}ext_tinfo+"
+ LIB_SUBSETS="${LIB_SUBSETS}+"
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 "$as_me:14993: result: $LIB_SUBSETS" >&5
+
+echo "$as_me:15316: result: $LIB_SUBSETS" >&5
echo "${ECHO_T}$LIB_SUBSETS" >&6
### Construct the list of include-directories to be generated
@@ -15028,7 +15351,7 @@ elif test "$includedir" != "/usr/include"; then
fi
### Build up pieces for makefile rules
-echo "$as_me:15031: checking default library suffix" >&5
+echo "$as_me:15354: checking default library suffix" >&5
echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
case $DFT_LWR_MODEL in
@@ -15039,10 +15362,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
shared) DFT_ARG_SUFFIX='' ;;
esac
test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-echo "$as_me:15042: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:15365: result: $DFT_ARG_SUFFIX" >&5
echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
-echo "$as_me:15045: checking default library-dependency suffix" >&5
+echo "$as_me:15368: checking default library-dependency suffix" >&5
echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
case $DFT_LWR_MODEL in
@@ -15064,17 +15387,19 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
esac
esac
test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
+DFT_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"
+ DFT_LIB_SUFFIX=".dll"
;;
esac
fi
-echo "$as_me:15074: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:15399: result: $DFT_DEP_SUFFIX" >&5
echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
-echo "$as_me:15077: checking default object directory" >&5
+echo "$as_me:15402: checking default object directory" >&5
echo $ECHO_N "checking default object directory... $ECHO_C" >&6
case $DFT_LWR_MODEL in
@@ -15090,12 +15415,12 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
DFT_OBJ_SUBDIR='obj_s' ;;
esac
esac
-echo "$as_me:15093: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:15418: result: $DFT_OBJ_SUBDIR" >&5
echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
# libtool thinks it can make c++ shared libraries (perhaps only g++)
if test "$cf_with_cxx" = yes ; then
-echo "$as_me:15098: checking c++ library-dependency suffix" >&5
+echo "$as_me:15423: checking c++ library-dependency suffix" >&5
echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
if test "$with_libtool" != "no"; then
CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX
@@ -15121,21 +15446,60 @@ else
esac
test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
fi
-echo "$as_me:15124: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:15449: result: $CXX_LIB_SUFFIX" >&5
echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
fi
+# do not want -ldl in build except as needed for -lncurses dependency
+if test "$with_dlsym" = yes ; then
+if test $DFT_LWR_MODEL = shared || \
+ test $DFT_LWR_MODEL = libtool ; then
+
+# remove dl library from $LIBS
+LIBS=`echo "$LIBS" | sed -e 's/-ldl[ ]//g' -e 's/-ldl$//'`
+
+fi
+fi
### Set up low-level terminfo dependencies for makefiles.
-TINFO_LIST="$SHLIB_LIST"
+
+# TICS_LIST and TINFO_LIST are needed to build libtic.so and libterm.so, but
+# do not need libdl
+TICS_LIST=
+if test "$with_dlsym" = yes ; then
+
+# remove dl library from $SHLIB_LIST
+TINFO_LIST=`echo "$SHLIB_LIST" | sed -e 's/-ldl[ ]//g' -e 's/-ldl$//'`
+
+fi
+
+if test "$with_ticlib" != no ; then
+
+ if test "$with_ticlib" != yes ; then
+ TICS_NAME=$with_ticlib
+ TICS_ARG_SUFFIX="${with_ticlib}`echo ${DFT_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
+ TICS_DEP_SUFFIX="${with_ticlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
+ TICS_LIB_SUFFIX="${with_ticlib}"
+ else
+ TICS_ARG_SUFFIX="${TICS_NAME}${DFT_ARG_SUFFIX}"
+ TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
+ TICS_LIB_SUFFIX="${TICS_NAME}${LIB_SUFFIX}"
+ fi
+ TICS_ARGS="-L${LIB_DIR} -l${TICS_LIB_SUFFIX}"
+else
+ TICS_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
+fi
+
if test "$with_termlib" != no ; then
if test "$with_termlib" != yes ; then
TINFO_NAME=$with_termlib
+ TINFO_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
TINFO_ARG_SUFFIX="${with_termlib}`echo ${DFT_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
TINFO_DEP_SUFFIX="${with_termlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
TINFO_LIB_SUFFIX="${with_termlib}"
else
+ TINFO_SUFFIX=${DFT_LIB_SUFFIX}
TINFO_ARG_SUFFIX="${TINFO_NAME}${DFT_ARG_SUFFIX}"
TINFO_DEP_SUFFIX="${TINFO_NAME}${DFT_DEP_SUFFIX}"
TINFO_LIB_SUFFIX="${TINFO_NAME}${LIB_SUFFIX}"
@@ -15150,22 +15514,81 @@ if test "$with_termlib" != no ; then
else
TEST_ARGS="-l${TINFO_ARG_SUFFIX}"
TEST_ARG2="-l${TINFO_ARG_SUFFIX}"
+ TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
else
+ # the next lines are needed for linking libtic over libncurses
+ TINFO_NAME=${LIB_NAME}
+ TINFO_SUFFIX=${DFT_LIB_SUFFIX}
+ TINFO_ARG_SUFFIX=${LIB_NAME}${DFT_ARG_SUFFIX}
+ TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}"
+
TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
fi
+if test "$DFT_LWR_MODEL" = shared ; then
+ case $cf_cv_system_name in #(vi
+ cygwin*)
+ # "lib" files have ".dll.a" suffix, "cyg" files have ".dll"
+ TINFO_SUFFIX=.dll
+ ;;
+ esac
+fi
+
+if test "$with_dlsym" = yes ; then
+
+# remove dl library from $TICS_LIST
+TICS_LIST=`echo "$TICS_LIST" | sed -e 's/-ldl[ ]//g' -e 's/-ldl$//'`
+
+fi
+
# needed for Ada95
TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'`
-echo "$as_me:15163: checking where we will install curses.h" >&5
+case $DFT_LWR_MODEL in
+normal|debug|profile)
+
+if test "$GCC" = yes ; then
+ LDFLAGS_STATIC=-static
+ LDFLAGS_SHARED=-dynamic
+else
+ case $cf_cv_system_name in #(
+ aix[45]*) #( from ld manpage
+ LDFLAGS_STATIC=-bstatic
+ LDFLAGS_SHARED=-bdynamic
+ ;;
+ hpux*) #( from ld manpage for hpux10.20, hpux11.11
+ # We could also use just "archive" and "shared".
+ LDFLAGS_STATIC=-Wl,-a,archive_shared
+ LDFLAGS_SHARED=-Wl,-a,shared_archive
+ ;;
+ irix*) #( from ld manpage IRIX64
+ LDFLAGS_STATIC=-Bstatic
+ LDFLAGS_SHARED=-Bdynamic
+ ;;
+ osf[45]*) #( from ld manpage osf4.0d, osf5.1
+ # alternative "-oldstyle_liblookup" (not in cc manpage)
+ LDFLAGS_STATIC=-noso
+ LDFLAGS_SHARED=-so_archive
+ ;;
+ solaris2*)
+ LDFLAGS_STATIC=-Bstatic
+ LDFLAGS_SHARED=-Bdynamic
+ ;;
+ esac
+fi
+
+ ;;
+esac
+
+echo "$as_me:15586: checking where we will install curses.h" >&5
echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
test "$with_overwrite" = no && \
test "x$includedir" = 'x${prefix}/include' && \
includedir='${prefix}/include/ncurses'${LIB_SUFFIX}
-echo "$as_me:15168: result: $includedir" >&5
+echo "$as_me:15591: result: $includedir" >&5
echo "${ECHO_T}$includedir" >&6
### Resolve a conflict between normal and wide-curses by forcing applications
@@ -15173,11 +15596,14 @@ echo "${ECHO_T}$includedir" >&6
if test "$with_overwrite" != no ; then
if test "$NCURSES_LIBUTF8" = 1 ; then
NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
- { echo "$as_me:15176: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+ { echo "$as_me:15599: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
fi
fi
+# used to separate tack out of the tree
+NCURSES_TREE=
+
### predefined stuff for the test programs
cat >>confdefs.h <<\EOF
#define HAVE_SLK_COLOR 1
@@ -15186,7 +15612,7 @@ EOF
### Construct the list of subdirectories for which we'll customize makefiles
### with the appropriate compile-rules.
-echo "$as_me:15189: checking for src modules" >&5
+echo "$as_me:15615: checking for src modules" >&5
echo $ECHO_N "checking for src modules... $ECHO_C" >&6
# dependencies and linker-arguments for test-programs
@@ -15249,7 +15675,7 @@ EOF
fi
fi
done
-echo "$as_me:15252: result: $cf_cv_src_modules" >&5
+echo "$as_me:15678: result: $cf_cv_src_modules" >&5
echo "${ECHO_T}$cf_cv_src_modules" >&6
TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -15284,6 +15710,10 @@ if test -n "$ADA_SUBDIRS"; then
fi
+if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then
+ SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses-config"
+fi
+
DIRS_TO_MAKE="lib"
for cf_item in $cf_list_models
do
@@ -15391,6 +15821,79 @@ if test -n "$cf_new_extra_cppflags" ; then
EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
fi
+### If we're building with rpath, try to link non-standard libs that way too.
+if test "$DFT_LWR_MODEL" = "shared"; then
+
+echo "$as_me:15827: checking for updated LDFLAGS" >&5
+echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
+if test -n "$LDFLAGS" ; then
+echo "$as_me:15830: result: maybe" >&5
+echo "${ECHO_T}maybe" >&6
+test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6
+
+echo "${as_me-configure}:15834: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+
+test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+echo "${as_me-configure}:15838: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+case "$EXTRA_LDFLAGS" in #(vi
+-Wl,-rpath,*) #(vi
+ cf_rpath_hack="-Wl,-rpath,"
+ ;;
+-R\ *)
+ cf_rpath_hack="-R "
+ ;;
+-R*)
+ cf_rpath_hack="-R"
+ ;;
+*)
+ cf_rpath_hack=
+ ;;
+esac
+if test -n "$cf_rpath_hack" ; then
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+ do
+ test -n "$verbose" && echo " Filtering $cf_rpath_src" 1>&6
+
+echo "${as_me-configure}:15860: testing Filtering $cf_rpath_src ..." 1>&5
+
+ case $cf_rpath_src in #(vi
+ -L*) #(vi
+ if test "$cf_rpath_hack" = "-R " ; then
+ cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e 's%-L%-R %'`
+ else
+ cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e s%-L%$cf_rpath_hack%`
+ fi
+ test -n "$verbose" && echo " ...Filter $cf_rpath_tmp" 1>&6
+
+echo "${as_me-configure}:15871: testing ...Filter $cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ ;;
+ *)
+ cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
+ ;;
+ esac
+ done
+ LDFLAGS=$cf_rpath_dst
+ test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
+
+echo "${as_me-configure}:15883: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+
+ test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+
+echo "${as_me-configure}:15887: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+
+fi
+else
+echo "$as_me:15891: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+
### Define substitutions for header files to avoid name-pollution
if test "$cf_cv_have_tcgetattr" = yes ; then
@@ -15495,7 +15998,7 @@ DEFS=-DHAVE_CONFIG_H
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:15498: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:16001: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
@@ -15671,7 +16174,7 @@ cat >>$CONFIG_STATUS <<\EOF
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:15674: error: ambiguous option: $1
+ { { echo "$as_me:16177: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2;}
@@ -15690,7 +16193,7 @@ Try \`$0 --help' for more information." >&2;}
ac_need_defaults=false;;
# This is an error.
- -*) { { echo "$as_me:15693: error: unrecognized option: $1
+ -*) { { echo "$as_me:16196: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;}
@@ -15747,13 +16250,19 @@ TERMINFO="$TERMINFO"
TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
TINFO_NAME="$TINFO_NAME"
+TINFO_SUFFIX="$TINFO_SUFFIX"
+TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
+TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
+TICS_NAME="$TICS_NAME"
WITH_CURSES_H="$with_curses_h"
WITH_ECHO="$with_echo"
WITH_OVERWRITE="$with_overwrite"
cf_LIST_MODELS="$cf_list_models"
cf_cv_abi_version="$cf_cv_abi_version"
+cf_cv_do_relink="$cf_cv_do_relink"
cf_cv_do_symlinks="$cf_cv_do_symlinks"
cf_cv_enable_lp64="$cf_cv_enable_lp64"
+cf_cv_enable_opaque="$cf_cv_enable_opaque"
cf_cv_prog_CC_c_o=$cf_cv_prog_CC_c_o
cf_cv_prog_CXX_c_o=$cf_cv_prog_CXX_c_o
cf_cv_rel_version="$cf_cv_rel_version"
@@ -15780,7 +16289,7 @@ do
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
- *) { { echo "$as_me:15783: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:16292: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
@@ -15928,6 +16437,7 @@ s,@BUILD_OBJEXT@,$BUILD_OBJEXT,;t t
s,@cf_list_models@,$cf_list_models,;t t
s,@LIBTOOL@,$LIBTOOL,;t t
s,@LIBTOOL_CXX@,$LIBTOOL_CXX,;t t
+s,@LIBTOOL_OPTS@,$LIBTOOL_OPTS,;t t
s,@LIB_CREATE@,$LIB_CREATE,;t t
s,@LIB_OBJECT@,$LIB_OBJECT,;t t
s,@LIB_SUFFIX@,$LIB_SUFFIX,;t t
@@ -15939,6 +16449,7 @@ s,@LIB_INSTALL@,$LIB_INSTALL,;t t
s,@LIB_UNINSTALL@,$LIB_UNINSTALL,;t t
s,@DFT_LWR_MODEL@,$DFT_LWR_MODEL,;t t
s,@DFT_UPR_MODEL@,$DFT_UPR_MODEL,;t t
+s,@TICS_NAME@,$TICS_NAME,;t t
s,@TINFO_NAME@,$TINFO_NAME,;t t
s,@LIB_NAME@,$LIB_NAME,;t t
s,@LIB_PREFIX@,$LIB_PREFIX,;t t
@@ -15961,6 +16472,7 @@ s,@WHICH_XTERM@,$WHICH_XTERM,;t t
s,@TERMINFO_DIRS@,$TERMINFO_DIRS,;t t
s,@TERMINFO@,$TERMINFO,;t t
s,@MAKE_TERMINFO@,$MAKE_TERMINFO,;t t
+s,@USE_BIG_STRINGS@,$USE_BIG_STRINGS,;t t
s,@TERMPATH@,$TERMPATH,;t t
s,@BROKEN_LINKER@,$BROKEN_LINKER,;t t
s,@NCURSES_CH_T@,$NCURSES_CH_T,;t t
@@ -15983,6 +16495,10 @@ s,@NCURSES_SBOOL@,$NCURSES_SBOOL,;t t
s,@NCURSES_XNAMES@,$NCURSES_XNAMES,;t t
s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t
s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t
+s,@cf_cv_enable_reentrant@,$cf_cv_enable_reentrant,;t t
+s,@cf_cv_enable_opaque@,$cf_cv_enable_opaque,;t t
+s,@NCURSES_OPAQUE@,$NCURSES_OPAQUE,;t t
+s,@NCURSES_SIZE_T@,$NCURSES_SIZE_T,;t t
s,@ECHO_LINK@,$ECHO_LINK,;t t
s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
s,@EXTRA_CXXFLAGS@,$EXTRA_CXXFLAGS,;t t
@@ -16015,14 +16531,22 @@ s,@DFT_ARG_SUFFIX@,$DFT_ARG_SUFFIX,;t t
s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t
s,@DFT_OBJ_SUBDIR@,$DFT_OBJ_SUBDIR,;t t
s,@CXX_LIB_SUFFIX@,$CXX_LIB_SUFFIX,;t t
+s,@TICS_ARG_SUFFIX@,$TICS_ARG_SUFFIX,;t t
+s,@TICS_DEP_SUFFIX@,$TICS_DEP_SUFFIX,;t t
+s,@TICS_LIB_SUFFIX@,$TICS_LIB_SUFFIX,;t t
+s,@TICS_ARGS@,$TICS_ARGS,;t t
s,@TINFO_ARG_SUFFIX@,$TINFO_ARG_SUFFIX,;t t
s,@TINFO_DEP_SUFFIX@,$TINFO_DEP_SUFFIX,;t t
s,@TINFO_LIB_SUFFIX@,$TINFO_LIB_SUFFIX,;t t
s,@TINFO_ARGS@,$TINFO_ARGS,;t t
s,@TINFO_ARGS2@,$TINFO_ARGS2,;t t
+s,@LDFLAGS_STATIC@,$LDFLAGS_STATIC,;t t
+s,@LDFLAGS_SHARED@,$LDFLAGS_SHARED,;t t
s,@WITH_OVERWRITE@,$WITH_OVERWRITE,;t t
+s,@TICS_LIST@,$TICS_LIST,;t t
s,@TINFO_LIST@,$TINFO_LIST,;t t
s,@SHLIB_LIST@,$SHLIB_LIST,;t t
+s,@NCURSES_TREE@,$NCURSES_TREE,;t t
s,@TEST_ARGS@,$TEST_ARGS,;t t
s,@TEST_DEPS@,$TEST_DEPS,;t t
s,@TEST_ARG2@,$TEST_ARG2,;t t
@@ -16146,7 +16670,7 @@ done; }
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:16149: creating $ac_file" >&5
+ { echo "$as_me:16673: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@@ -16164,7 +16688,7 @@ echo "$as_me: creating $ac_file" >&6;}
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:16167: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:16691: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -16177,7 +16701,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:16180: error: cannot find input file: $f" >&5
+ { { echo "$as_me:16704: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -16243,7 +16767,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:16246: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:16770: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
@@ -16254,7 +16778,7 @@ echo "$as_me: creating $ac_file" >&6;}
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:16257: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:16781: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -16267,7 +16791,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:16270: error: cannot find input file: $f" >&5
+ { { echo "$as_me:16794: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -16325,7 +16849,7 @@ cat >>$CONFIG_STATUS <<\EOF
rm -f $tmp/in
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
- { echo "$as_me:16328: $ac_file is unchanged" >&5
+ { echo "$as_me:16852: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -16400,7 +16924,6 @@ do
continue
elif test -f $srcdir/$cf_dir/modules; then
- IMPORT_LIB=
SHARED_LIB=
LIBS_TO_MAKE=
for cf_item in $cf_LIST_MODELS
@@ -16467,9 +16990,7 @@ do
# use autodetected ${cf_prefix} for import lib and static lib, but
# use 'cyg' prefix for shared lib.
if test $cf_cv_shlib_version = cygdll ; then
- SHARED_LIB="cyg${cf_dir}\${ABI_VERSION}.dll"
- IMPORT_LIB="${cf_prefix}${cf_dir}.dll.a"
- LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/\${SHARED_LIB} ../lib/\${IMPORT_LIB}"
+ LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}\${ABI_VERSION}.dll"
continue
fi
fi
@@ -16478,17 +16999,34 @@ do
if test $cf_dir = ncurses ; then
cf_subsets="$LIB_SUBSETS"
- cf_termlib=`echo "$cf_subsets" |sed -e 's/ .*$//'`
- if test "$cf_termlib" != "$cf_subsets" ; then
- cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
- LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
- fi
+ cf_r_parts="$cf_subsets"
+
+ while test -n "$cf_r_parts"
+ do
+ cf_l_parts=`echo "$cf_r_parts" |sed -e 's/ .*$//'`
+ cf_r_parts=`echo "$cf_r_parts" |sed -e 's/^[^ ]* //'`
+ if test "$cf_l_parts" != "$cf_r_parts" ; then
+ case $cf_l_parts in #(vi
+ *termlib*) #(vi
+ cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
+ ;;
+ *ticlib*)
+ cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g`
+ ;;
+ *)
+ break
+ ;;
+ esac
+ LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
+ else
+ break
+ fi
+ done
else
cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib.* //'`
fi
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
@@ -16546,13 +17084,20 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
case $cf_subset in
*base*)
;;
- termlib*)
+ *termlib*)
cf_libname=$TINFO_LIB_SUFFIX
if test -n "${DFT_ARG_SUFFIX}" ; then
# undo $LIB_SUFFIX add-on in CF_LIB_SUFFIX
cf_suffix=`echo $cf_suffix |sed -e "s%^${LIB_SUFFIX}%%"`
fi
- ;;
+ ;;
+ ticlib*)
+ cf_libname=$TICS_LIB_SUFFIX
+ if test -n "${DFT_ARG_SUFFIX}" ; then
+ # undo $LIB_SUFFIX add-on in CF_LIB_SUFFIX
+ cf_suffix=`echo $cf_suffix |sed -e "s%^${LIB_SUFFIX}%%"`
+ fi
+ ;;
esac
fi
@@ -16593,8 +17138,11 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
prefix=$cf_prefix \
suffix=$cf_suffix \
subset=$cf_subset \
+ TermlibRoot=$TINFO_NAME \
+ TermlibSuffix=$TINFO_SUFFIX \
ShlibVer=$cf_cv_shlib_version \
ShlibVerInfix=$cf_cv_shlib_version_infix \
+ ReLink=${cf_cv_do_relink-no} \
DoLinks=$cf_cv_do_symlinks \
rmSoLocs=$cf_cv_rm_so_locs \
ldconfig="$LDCONFIG" \
@@ -16681,8 +17229,8 @@ done
cat >> Makefile <<CF_EOF
-install.data \\
-uninstall.data ::
+install.libs uninstall.libs \\
+install.data uninstall.data ::
$MAKE_TERMINFO cd misc && \${MAKE} \${CF_MFLAGS} \$@
install.man \\
@@ -16691,7 +17239,7 @@ uninstall.man ::
distclean ::
rm -f config.cache config.log config.status Makefile include/ncurses_cfg.h
- rm -f headers.sh headers.sed
+ rm -f headers.sh headers.sed mk_shared_lib.sh
rm -rf \${DIRS_TO_MAKE}
CF_EOF
@@ -16795,41 +17343,10 @@ do
fi
if test -f $srcdir/$cf_dir/headers; then
- cat >>$cf_dir/Makefile <<CF_EOF
-\${DESTDIR}\${includedir} :
- sh \${srcdir}/../mkinstalldirs \$@
-
-install \\
-install.libs \\
-install.includes :: \${AUTO_SRC} \${DESTDIR}\${includedir} \\
-CF_EOF
- j=""
- for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
- do
- test -n "$j" && echo " $j \\" >>$cf_dir/Makefile
- j=$i
- done
-
- echo " $j" >>$cf_dir/Makefile
-
- for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
- do
- echo " @ (cd \${DESTDIR}\${includedir} && rm -f `basename $i`) ; ../headers.sh \${INSTALL_DATA} \${DESTDIR}\${includedir} \${srcdir} $i" >>$cf_dir/Makefile
- test $i = curses.h && test $WITH_CURSES_H = yes && echo " @ (cd \${DESTDIR}\${includedir} && rm -f ncurses.h && \${LN_S} curses.h ncurses.h)" >>$cf_dir/Makefile
- done
-
- cat >>$cf_dir/Makefile <<CF_EOF
-
-uninstall \\
-uninstall.libs \\
-uninstall.includes ::
-CF_EOF
- for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
- do
- i=`basename $i`
- echo " -@ (cd \${DESTDIR}\${includedir} && rm -f $i)" >>$cf_dir/Makefile
- test $i = curses.h && echo " -@ (cd \${DESTDIR}\${includedir} && rm -f ncurses.h)" >>$cf_dir/Makefile
- done
+ $AWK -f $srcdir/mk-hdr.awk \
+ subset="$LIB_SUBSETS" \
+ compat="$WITH_CURSES_H" \
+ $srcdir/$cf_dir/headers >>$cf_dir/Makefile
fi
if test -f $srcdir/$cf_dir/modules; then
diff --git a/contrib/ncurses/configure.in b/contrib/ncurses/configure.in
index 34b5c0a191e5..50892dd70320 100644
--- a/contrib/ncurses/configure.in
+++ b/contrib/ncurses/configure.in
@@ -1,5 +1,5 @@
dnl***************************************************************************
-dnl Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
+dnl Copyright (c) 1998-2006,2007 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 1995-on
dnl
-dnl $Id: configure.in,v 1.383 2006/12/17 01:26:06 tom Exp $
+dnl $Id: configure.in,v 1.429 2007/11/24 22:42:43 tom Exp $
dnl Process this file with autoconf to produce a configure script.
dnl
dnl See http://invisible-island.net/autoconf/ for additional information.
dnl
dnl ---------------------------------------------------------------------------
AC_PREREQ(2.13.20020210)
-AC_REVISION($Revision: 1.383 $)
+AC_REVISION($Revision: 1.429 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@@ -150,13 +150,28 @@ CF_PROG_INSTALL
CF_PROG_LINT
AC_PROG_LN_S
+AC_SYS_LONG_FILE_NAMES
+
+AC_MSG_CHECKING(if we should assume mixed-case filenames)
+AC_ARG_ENABLE(mixed-case,
+ [ --enable-mixed-case tic should assume mixed-case filenames],
+ [enable_mixedcase=$enableval],
+ [enable_mixedcase=auto])
+AC_MSG_RESULT($enable_mixedcase)
+if test "$enable_mixedcase" = "auto" ; then
+ CF_MIXEDCASE_FILENAMES
+else
+ cf_cv_mixedcase=$enable_mixedcase
+ if test "$enable_mixedcase" = "yes" ; then
+ AC_DEFINE(MIXEDCASE_FILENAMES)
+ fi
+fi
+
+# do this after mixed-case option (tags/TAGS is not as important as tic).
AC_PROG_MAKE_SET
CF_MAKE_TAGS
CF_MAKEFLAGS
-AC_SYS_LONG_FILE_NAMES
-CF_MIXEDCASE_FILENAMES
-
dnl These are standard among *NIX systems, but not when cross-compiling
AC_CHECK_TOOL(RANLIB, ranlib, ':')
AC_CHECK_TOOL(LD, ld, ld)
@@ -255,6 +270,9 @@ CF_UPPER(DFT_UPR_MODEL,$DFT_LWR_MODEL)dnl
AC_SUBST(DFT_LWR_MODEL)dnl the default model ("normal")
AC_SUBST(DFT_UPR_MODEL)dnl the default model ("NORMAL")
+TICS_NAME=tic
+AC_SUBST(TICS_NAME)
+
TINFO_NAME=tinfo
AC_SUBST(TINFO_NAME)
@@ -280,6 +298,13 @@ AC_ARG_WITH(termlib,
[with_termlib=no])
AC_MSG_RESULT($with_termlib)
+AC_MSG_CHECKING(if you want to build a separate tic library)
+AC_ARG_WITH(ticlib,
+ [ --with-ticlib generate separate tic library],
+ [with_ticlib=$withval],
+ [with_ticlib=no])
+AC_MSG_RESULT($with_ticlib)
+
### Checks for special libraries, must be done up-front.
SHLIB_LIST=""
CF_WITH_GPM
@@ -304,9 +329,7 @@ if test "$with_gpm" != no ; then
SHLIB_LIST="-lgpm $SHLIB_LIST"
fi
AC_DEFINE(HAVE_LIBGPM)
- AC_CHECK_LIB(gpm,Gpm_Wgetch,[
- AC_MSG_WARN(GPM library is already linked with curses - read the FAQ)
- ])
+ CF_CHECK_GPM_WGETCH
fi
CF_WITH_SYSMOUSE
@@ -336,12 +359,22 @@ esac
AC_SUBST(LD_MODEL)dnl the type of link (e.g., -g or -pg)
AC_MSG_RESULT($LD_MODEL)
+case $DFT_LWR_MODEL in
+shared)
AC_MSG_CHECKING(if rpath option should be used)
AC_ARG_ENABLE(rpath,
[ --enable-rpath use rpath option when generating shared libraries],
[cf_cv_ld_rpath=$enableval],
[cf_cv_ld_rpath=no])
AC_MSG_RESULT($cf_cv_ld_rpath)
+AC_MSG_CHECKING(if shared libraries should be relinked during install)
+AC_ARG_ENABLE(relink,
+[ --disable-relink relink shared libraries during install],
+[cf_cv_do_relink=$enableval],
+[cf_cv_do_relink=yes])
+AC_MSG_RESULT($cf_cv_do_relink)
+ ;;
+esac
CF_SHARED_OPTS
if test "$CC_SHARED_OPTS" = "unknown"; then
@@ -470,6 +503,19 @@ int main() {
AC_MSG_RESULT($with_big_core)
test "$with_big_core" = "yes" && AC_DEFINE(HAVE_BIG_CORE)
+### ISO C only guarantees 512-char strings, we have tables which load faster
+### when constructed using "big" strings.
+AC_MSG_CHECKING(if big-strings option selected)
+AC_ARG_ENABLE(big-strings,
+ [ --disable-big-strings assume compiler has only standard-size strings],
+ [with_big_strings=no],
+ [with_big_strings=yes])
+AC_MSG_RESULT($with_big_strings)
+
+USE_BIG_STRINGS=0
+test "$with_big_strings" = "yes" && USE_BIG_STRINGS=1
+AC_SUBST(USE_BIG_STRINGS)
+
### use option --enable-termcap to compile in the termcap fallback support
AC_MSG_CHECKING(if you want termcap-fallback support)
AC_ARG_ENABLE(termcap,
@@ -487,6 +533,10 @@ if test "$with_termcap" != "yes" ; then
AC_DEFINE(PURE_TERMINFO)
else
+if test "$with_ticlib" != no ; then
+ AC_ERROR(Options --with-ticlib and --enable-termcap cannot be combined)
+fi
+
AC_DEFINE(USE_TERMCAP)
AC_MSG_CHECKING(for list of termcap files)
CF_WITH_PATHLIST(termpath,
@@ -683,7 +733,7 @@ AC_SUBST(cf_cv_enable_lp64)
CF_LARGEFILE
-### use option --disable-tparm-varargs to make tparm() conform to X/Open
+### use option --disable-tparm-varargs to make tparm() conform to X/Open
AC_MSG_CHECKING(if you want tparm not to use X/Open fixed-parameter list)
AC_ARG_ENABLE(tparm-varargs,
[ --disable-tparm-varargs compile tparm() without varargs interface],
@@ -802,7 +852,7 @@ else
fi
AC_MSG_CHECKING(if you want to use signed Boolean array in term.h)
AC_ARG_ENABLE(signed-char,
- [ --enable-signed-char compile with SIGWINCH handler],
+ [ --enable-signed-char compile using signed Boolean's in term.h],
[with_signed_char=$enableval],
[with_signed_char=no])
AC_MSG_RESULT($with_signed_char)
@@ -895,7 +945,7 @@ AC_MSG_RESULT($with_ext_colors)
NCURSES_EXT_COLORS=0
if test "$with_ext_colors" = yes ; then
if test "$with_widec" != yes ; then
- AC_MSG_WARN(This option applies only to wide-character library)
+ AC_MSG_ERROR(This option applies only to wide-character library)
else
# cannot be ABI 5 since it changes sizeof(cchar_t)
CF_NCURSES_ABI_6
@@ -919,6 +969,33 @@ if test "$with_ext_mouse" = yes ; then
fi
AC_SUBST(NCURSES_MOUSE_VERSION)
+# Reentrant code has to be opaque; there's little advantage to making ncurses
+# opaque outside of that, so there is no --enable-opaque option.
+AC_MSG_CHECKING(if you want experimental reentrant code)
+AC_ARG_ENABLE(reentrant,
+ [ --enable-reentrant compile with experimental reentrant code],
+ [with_reentrant=$enableval],
+ [with_reentrant=no])
+AC_MSG_RESULT($with_reentrant)
+if test "$with_reentrant" = yes ; then
+ cf_cv_enable_reentrant=1
+ cf_cv_enable_opaque="NCURSES_INTERNALS"
+ NCURSES_OPAQUE=1
+ NCURSES_SIZE_T=int
+ LIB_SUFFIX="t${LIB_SUFFIX}"
+ AC_DEFINE(USE_REENTRANT)
+ CF_NCURSES_ABI_6
+else
+ cf_cv_enable_reentrant=0
+ cf_cv_enable_opaque="NCURSES_OPAQUE"
+ NCURSES_OPAQUE=0
+ NCURSES_SIZE_T=short
+fi
+AC_SUBST(cf_cv_enable_reentrant)
+AC_SUBST(cf_cv_enable_opaque)
+AC_SUBST(NCURSES_OPAQUE)
+AC_SUBST(NCURSES_SIZE_T)
+
AC_MSG_CHECKING(if you want experimental safe-sprintf code)
AC_ARG_ENABLE(safe-sprintf,
[ --enable-safe-sprintf compile with experimental safe-sprintf code],
@@ -961,6 +1038,7 @@ if test "$with_echo" = yes; then
else
ECHO_LINK='@ echo linking $@ ... ;'
test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
+ test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
fi
AC_MSG_RESULT($with_echo)
AC_SUBST(ECHO_LINK)
@@ -972,9 +1050,9 @@ AC_ARG_ENABLE(warnings,
[with_warnings=$enableval])
AC_MSG_RESULT($with_warnings)
-if test -n "$with_warnings"; then
+if test "x$with_warnings" = "xyes"; then
ADAFLAGS="$ADAFLAGS -gnatg"
- CF_GCC_WARNINGS
+ CF_GCC_WARNINGS(Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum)
if test "$cf_with_cxx" = yes ; then
CF_GXX_WARNINGS(Wno-unused)
fi
@@ -1088,26 +1166,21 @@ CF_SYS_TIME_SELECT
### checks for compiler characteristics
AC_LANG_C
AC_C_CONST
-AC_C_INLINE
-
-NCURSES_INLINE=
-if test "$ac_cv_c_inline" != no ; then
- AC_DEFINE(CC_HAS_INLINE_FUNCS)
- NCURSES_INLINE=inline
-fi
-AC_SUBST(NCURSES_INLINE)
+CF_C_INLINE(NCURSES_INLINE,1200)
+CF_SIG_ATOMIC_T
if test $NCURSES_CHTYPE = auto ; then
CF_TYPEOF_CHTYPE
else
cf_cv_typeof_chtype=$NCURSES_CHTYPE
fi
+test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
AC_SUBST(cf_cv_typeof_chtype)
CF_UNSIGNED_LITERALS
cf_cv_1UL="1"
-test "$cf_cv_unsigned_literals" = yes && cf_cv_1UL="${cf_cv_1UL}U"
-test "$cf_cv_typeof_chtype" = long && cf_cv_1UL="${cf_cv_1UL}L"
+test ".$cf_cv_unsigned_literals" = .yes && cf_cv_1UL="${cf_cv_1UL}U"
+test ".$cf_cv_typeof_chtype" = .long && cf_cv_1UL="${cf_cv_1UL}L"
AC_SUBST(cf_cv_1UL)
if test $NCURSES_MMASK_T = auto ; then
@@ -1115,6 +1188,7 @@ if test $NCURSES_MMASK_T = auto ; then
else
cf_cv_typeof_mmask_t=$NCURSES_MMASK_T
fi
+test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
AC_SUBST(cf_cv_typeof_mmask_t)
### Checks for external-data
@@ -1170,7 +1244,7 @@ CF_FUNC_POLL
if test "$with_hashed_db" != no ; then
AC_DEFINE(USE_HASHED_DB)
- CF_HASHED_DB
+ CF_HASHED_DB($with_hashed_db)
fi
dnl We'll do our own -g libraries, unless the user's overridden via $CFLAGS
@@ -1200,14 +1274,13 @@ if test -n "$CXX" ; then
;;
esac
- AC_CHECK_HEADERS(typeinfo)
+ AC_CHECK_HEADERS(iostream typeinfo)
CF_BOOL_DECL
CF_BOOL_SIZE
CF_ETIP_DEFINES
CF_CPP_PARAM_INIT
CF_CPP_STATIC_CAST
- CF_CPP_VSCAN_FUNC
CXX_AR='$(AR)'
CXX_AR_OPTS='$(AR_OPTS)'
@@ -1284,9 +1357,22 @@ AC_SUBST(USE_CXX_BOOL)
CF_HELP_MESSAGE(Ada95 Binding Options:)
+dnl If the Ada95 source-tree is present, add that to the build unless it will
+dnl not work, or was not requested.
+if test -f "${srcdir}/Ada95/Makefile.in" ; then
+
+dnl libtool does not know anything about GNAT, though a change made in 1998
+dnl provided for it "someday". Disable the ada subtree if we are using
+dnl libtool -TD 20070714
+if test "$cf_with_ada" != "no" ; then
+ if test "$with_libtool" != "no"; then
+ AC_MSG_WARN(libtool does not support Ada - disabling feature)
+ cf_with_ada=no
+ fi
+fi
+
dnl Check for availability of GNU Ada Translator (GNAT).
dnl At the moment we support no other Ada95 compiler.
-if test -f "${srcdir}/Ada95/Makefile.in" ; then
if test "$cf_with_ada" != "no" ; then
cf_ada_make=gnatmake
AC_CHECK_PROG(gnat_exists, $cf_ada_make, yes, no)
@@ -1369,22 +1455,44 @@ end conftest;],[cf_cv_pragma_unreferenced=yes],[cf_cv_pragma_unreferenced=no])
fi
fi
+else
+ cf_with_ada=no
fi
-### Construct the library-subsets, if any, from this set of keywords:
-### none, base, ext_funcs, ext_tinfo, termlib, widechar (see CF_LIB_RULES).
+### Construct the ncurses library-subsets, if any, from this set of keywords:
+### none, base, ext_funcs, ext_tinfo, ticlib, termlib, widechar
+###
+### ticlib modules may be a separate library, otherwise contained in termlib.
+### termlib modules may be a separate library, otherwise contained in ncurses.
+###
+### The of "+" or " " between the tokens controls the way the script
+### chooses to split module lists into libraries.
+###
+### (see CF_LIB_RULES).
AC_MSG_CHECKING(for library subsets)
+LIB_SUBSETS=
+
+if test "$cf_with_progs" = yes || test "$with_ticlib" != no || test "$with_termcap" != no; then
+ LIB_SUBSETS="${LIB_SUBSETS}ticlib"
+ if test "$with_ticlib" != no ; then
+ LIB_SUBSETS="${LIB_SUBSETS} "
+ else
+ LIB_SUBSETS="${LIB_SUBSETS}+"
+ fi
+fi
+
+LIB_SUBSETS="${LIB_SUBSETS}termlib"
+test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
if test "$with_termlib" != no ; then
- LIB_SUBSETS="termlib"
- test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
LIB_SUBSETS="${LIB_SUBSETS} "
else
- LIB_SUBSETS="termlib+"
- test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}ext_tinfo+"
+ LIB_SUBSETS="${LIB_SUBSETS}+"
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)
### Construct the list of include-directories to be generated
@@ -1399,10 +1507,12 @@ AC_MSG_RESULT($DFT_ARG_SUFFIX)
AC_MSG_CHECKING(default library-dependency suffix)
CF_LIB_SUFFIX($DFT_LWR_MODEL,DFT_DEP_SUFFIX)dnl
+DFT_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"
+ DFT_LIB_SUFFIX=".dll"
;;
esac
fi
@@ -1426,16 +1536,53 @@ AC_MSG_RESULT($CXX_LIB_SUFFIX)
AC_SUBST(CXX_LIB_SUFFIX)
fi
+# do not want -ldl in build except as needed for -lncurses dependency
+if test "$with_dlsym" = yes ; then
+if test $DFT_LWR_MODEL = shared || \
+ test $DFT_LWR_MODEL = libtool ; then
+ CF_REMOVE_LIB(LIBS,$LIBS,dl)
+fi
+fi
### Set up low-level terminfo dependencies for makefiles.
-TINFO_LIST="$SHLIB_LIST"
+
+# TICS_LIST and TINFO_LIST are needed to build libtic.so and libterm.so, but
+# do not need libdl
+TICS_LIST=
+if test "$with_dlsym" = yes ; then
+ CF_REMOVE_LIB(TINFO_LIST,$SHLIB_LIST,dl)
+fi
+
+if test "$with_ticlib" != no ; then
+
+ if test "$with_ticlib" != yes ; then
+ TICS_NAME=$with_ticlib
+ TICS_ARG_SUFFIX="${with_ticlib}`echo ${DFT_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
+ TICS_DEP_SUFFIX="${with_ticlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
+ TICS_LIB_SUFFIX="${with_ticlib}"
+ else
+ TICS_ARG_SUFFIX="${TICS_NAME}${DFT_ARG_SUFFIX}"
+ TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
+ TICS_LIB_SUFFIX="${TICS_NAME}${LIB_SUFFIX}"
+ fi
+ TICS_ARGS="-L${LIB_DIR} -l${TICS_LIB_SUFFIX}"
+else
+ TICS_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
+fi
+AC_SUBST(TICS_ARG_SUFFIX)
+AC_SUBST(TICS_DEP_SUFFIX)
+AC_SUBST(TICS_LIB_SUFFIX)
+AC_SUBST(TICS_ARGS)
+
if test "$with_termlib" != no ; then
if test "$with_termlib" != yes ; then
TINFO_NAME=$with_termlib
+ TINFO_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
TINFO_ARG_SUFFIX="${with_termlib}`echo ${DFT_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
TINFO_DEP_SUFFIX="${with_termlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
TINFO_LIB_SUFFIX="${with_termlib}"
else
+ TINFO_SUFFIX=${DFT_LIB_SUFFIX}
TINFO_ARG_SUFFIX="${TINFO_NAME}${DFT_ARG_SUFFIX}"
TINFO_DEP_SUFFIX="${TINFO_NAME}${DFT_DEP_SUFFIX}"
TINFO_LIB_SUFFIX="${TINFO_NAME}${LIB_SUFFIX}"
@@ -1450,21 +1597,48 @@ if test "$with_termlib" != no ; then
else
TEST_ARGS="-l${TINFO_ARG_SUFFIX}"
TEST_ARG2="-l${TINFO_ARG_SUFFIX}"
+ TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
fi
else
+ # the next lines are needed for linking libtic over libncurses
+ TINFO_NAME=${LIB_NAME}
+ TINFO_SUFFIX=${DFT_LIB_SUFFIX}
+ TINFO_ARG_SUFFIX=${LIB_NAME}${DFT_ARG_SUFFIX}
+ TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}"
+
TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
fi
+
+if test "$DFT_LWR_MODEL" = shared ; then
+ case $cf_cv_system_name in #(vi
+ cygwin*)
+ # "lib" files have ".dll.a" suffix, "cyg" files have ".dll"
+ TINFO_SUFFIX=.dll
+ ;;
+ esac
+fi
+
AC_SUBST(TINFO_ARG_SUFFIX)
AC_SUBST(TINFO_DEP_SUFFIX)
AC_SUBST(TINFO_LIB_SUFFIX)
AC_SUBST(TINFO_ARGS)
+if test "$with_dlsym" = yes ; then
+ CF_REMOVE_LIB(TICS_LIST,$TICS_LIST,dl)
+fi
+
# needed for Ada95
TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'`
AC_SUBST(TINFO_ARGS2)
+case $DFT_LWR_MODEL in
+normal|debug|profile)
+ CF_LDFLAGS_STATIC
+ ;;
+esac
+
AC_MSG_CHECKING(where we will install curses.h)
test "$with_overwrite" = no && \
test "x$includedir" = 'x${prefix}/include' && \
@@ -1481,9 +1655,14 @@ fi
fi
AC_SUBST(WITH_OVERWRITE)
+AC_SUBST(TICS_LIST)
AC_SUBST(TINFO_LIST)
AC_SUBST(SHLIB_LIST)
+# used to separate tack out of the tree
+NCURSES_TREE=
+AC_SUBST(NCURSES_TREE)
+
### predefined stuff for the test programs
AC_DEFINE(HAVE_SLK_COLOR)
@@ -1491,6 +1670,11 @@ AC_DEFINE(HAVE_SLK_COLOR)
### with the appropriate compile-rules.
CF_SRC_MODULES($modules_to_build)
+
+if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then
+ SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses-config"
+fi
+
CF_DIRS_TO_MAKE
AC_DEFINE_UNQUOTED(NCURSES_PATHSEP,'$PATHSEP')
@@ -1500,6 +1684,11 @@ AC_DEFINE_UNQUOTED(NCURSES_VERSION_STRING, "${NCURSES_MAJOR}.${NCURSES_MINOR}.${
### Now that we're done running tests, add the compiler-warnings, if any
CF_ADD_CFLAGS($EXTRA_CFLAGS)
+### If we're building with rpath, try to link non-standard libs that way too.
+if test "$DFT_LWR_MODEL" = "shared"; then
+ CF_RPATH_HACK
+fi
+
### Define substitutions for header files to avoid name-pollution
CF_SUBST_IF(["$cf_cv_have_tcgetattr" = yes], HAVE_TCGETATTR, 1, 0)
CF_SUBST_IF(["$ac_cv_header_termio_h" = yes], HAVE_TERMIO_H, 1, 0)
@@ -1540,13 +1729,19 @@ TERMINFO="$TERMINFO"
TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
TINFO_NAME="$TINFO_NAME"
+TINFO_SUFFIX="$TINFO_SUFFIX"
+TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
+TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
+TICS_NAME="$TICS_NAME"
WITH_CURSES_H="$with_curses_h"
WITH_ECHO="$with_echo"
WITH_OVERWRITE="$with_overwrite"
cf_LIST_MODELS="$cf_list_models"
cf_cv_abi_version="$cf_cv_abi_version"
+cf_cv_do_relink="$cf_cv_do_relink"
cf_cv_do_symlinks="$cf_cv_do_symlinks"
cf_cv_enable_lp64="$cf_cv_enable_lp64"
+cf_cv_enable_opaque="$cf_cv_enable_opaque"
cf_cv_prog_CC_c_o=$cf_cv_prog_CC_c_o
cf_cv_prog_CXX_c_o=$cf_cv_prog_CXX_c_o
cf_cv_rel_version="$cf_cv_rel_version"
diff --git a/contrib/ncurses/dist.mk b/contrib/ncurses/dist.mk
index 49d8ac4d61d2..a29dd36ec56b 100644
--- a/contrib/ncurses/dist.mk
+++ b/contrib/ncurses/dist.mk
@@ -1,5 +1,5 @@
##############################################################################
-# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. #
+# Copyright (c) 1998-2006,2007 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"), #
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.567 2006/12/17 19:58:35 tom Exp $
+# $Id: dist.mk,v 1.620 2007/12/22 20:41:31 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@ SHELL = /bin/sh
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 5
NCURSES_MINOR = 6
-NCURSES_PATCH = 20061217
+NCURSES_PATCH = 20071222
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
@@ -106,6 +106,7 @@ manhtml:
fi ;\
done
# change some things to make weblint happy:
+ @cat man_alias.sed >> subst.tmp
@echo 's/<B>/<STRONG>/g' >> subst.tmp
@echo 's/<\/B>/<\/STRONG>/g' >> subst.tmp
@echo 's/<I>/<EM>/g' >> subst.tmp
diff --git a/contrib/ncurses/doc/hackguide.doc b/contrib/ncurses/doc/hackguide.doc
index ddd75210f7ef..8e0ba5c0f85b 100644
--- a/contrib/ncurses/doc/hackguide.doc
+++ b/contrib/ncurses/doc/hackguide.doc
@@ -261,7 +261,7 @@ Library Overview
lib_tracedmp.c lib_tracemse.c trace_buf.c
It is rather unlikely you will ever need to change these, unless you
- want to introduce a new debug trace level for some reasoon.
+ want to introduce a new debug trace level for some reason.
There is another group of files that do direct I/O via tputs(),
computations on the terminal capabilities, or queries to the OS
diff --git a/contrib/ncurses/doc/html/ncurses-intro.html b/contrib/ncurses/doc/html/ncurses-intro.html
index e62ead7ac07a..451e7ab4d32d 100644
--- a/contrib/ncurses/doc/html/ncurses-intro.html
+++ b/contrib/ncurses/doc/html/ncurses-intro.html
@@ -1,8 +1,8 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
<!--
- $Id: ncurses-intro.html,v 1.41 2005/12/24 15:47:05 tom Exp $
+ $Id: ncurses-intro.html,v 1.43 2007/03/03 19:31:50 tom Exp $
****************************************************************************
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,2007 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 *
@@ -914,15 +914,14 @@ Here is some sample code for shellout:
<H3><A NAME="xterm">Using NCURSES under XTERM</A></H3>
-A resize operation in X sends SIGWINCH to the application running under xterm.
-The <CODE>ncurses</CODE> library provides an experimental signal
-handler, but in general does not catch this signal, because it cannot
-know how you want the screen re-painted. You will usually have to write the
-SIGWINCH handler yourself. Ncurses can give you some help. <P>
+A resize operation in X sends <CODE>SIGWINCH</CODE> to the application running
+under xterm.
-The easiest way to code your SIGWINCH handler is to have it do an
-<CODE>endwin</CODE>, followed by an <CODE>refresh</CODE> and a screen repaint you code
-yourself. The <CODE>refresh</CODE> will pick up the new screen size from the
+The easiest way to handle <CODE>SIGWINCH</CODE>
+is to do an <CODE>endwin</CODE>,
+followed by an <CODE>refresh</CODE> and a screen repaint you code
+yourself.
+The <CODE>refresh</CODE> will pick up the new screen size from the
xterm's environment. <P>
That is the standard way, of course (it even works with some vendor's curses
@@ -934,8 +933,17 @@ not resize subwindows which must be shrunk.
are limited to the new screen dimensions, and pads <CODE>stdscr</CODE>
with blanks if the screen is larger. <P>
-Finally, ncurses can be configured to provide its own SIGWINCH handler,
-based on <CODE>resizeterm</CODE>.
+The <CODE>ncurses</CODE> library provides a SIGWINCH signal handler,
+which pushes a <CODE>KEY_RESIZE</CODE> via the wgetch() calls.
+When <CODE>ncurses</CODE> returns that code,
+it calls <code>resizeterm</CODE>
+to update the size of the standard screen's window, repainting that
+(filling with blanks or truncating as needed).
+It also resizes other windows,
+but its effect may be less satisfactory because it cannot
+know how you want the screen re-painted.
+You will usually have to write special-purpose code to handle
+<CODE>KEY_RESIZE</CODE> yourself.
<H3><A NAME="screens">Handling Multiple Terminal Screens</A></H3>
@@ -2184,7 +2192,7 @@ These requests treat the list as cyclic; that is, <CODE>REQ_NEXT_PAGE</CODE>
from the last page goes to the first, and <CODE>REQ_PREV_PAGE</CODE> from
the first page goes to the last.
-<H3><A NAME="#ffield">Inter-Field Navigation Requests</A></H3>
+<H3><A NAME="ffield">Inter-Field Navigation Requests</A></H3>
These requests handle navigation between fields on the same page.
@@ -2238,7 +2246,7 @@ of B and C to the right of B. A <CODE>REQ_MOVE_RIGHT</CODE> from A will
go to B only if A, B, and C <EM>all</EM> share the same first line;
otherwise it will skip over B to C.
-<H3><A NAME="#fifield">Intra-Field Navigation Requests</A></H3>
+<H3><A NAME="fifield">Intra-Field Navigation Requests</A></H3>
These requests drive movement of the edit cursor within the currently
selected field.
diff --git a/contrib/ncurses/doc/ncurses-intro.doc b/contrib/ncurses/doc/ncurses-intro.doc
index 3e607e658401..85179d166696 100644
--- a/contrib/ncurses/doc/ncurses-intro.doc
+++ b/contrib/ncurses/doc/ncurses-intro.doc
@@ -174,7 +174,7 @@ Scope of This Document
The ncurses package was originated by Pavel Curtis. The original
maintainer of this package is Zeyd Ben-Halim <zmbenhal@netcom.com>.
Eric S. Raymond <esr@snark.thyrsus.com> wrote many of the new features
- in versions after 1.8.1 and wrote most of this introduction. Jürgen
+ in versions after 1.8.1 and wrote most of this introduction. Juergen
Pfeifer wrote all of the menu and forms code as well as the Ada95
binding. Ongoing work is being done by Thomas Dickey (maintainer).
Contact the current maintainers at bug-ncurses@gnu.org.
@@ -798,15 +798,9 @@ Hints, Tips, and Tricks
Using NCURSES under XTERM
A resize operation in X sends SIGWINCH to the application running
- under xterm. The ncurses library provides an experimental signal
- handler, but in general does not catch this signal, because it cannot
- know how you want the screen re-painted. You will usually have to
- write the SIGWINCH handler yourself. Ncurses can give you some help.
-
- The easiest way to code your SIGWINCH handler is to have it do an
- endwin, followed by an refresh and a screen repaint you code yourself.
- The refresh will pick up the new screen size from the xterm's
- environment.
+ under xterm. The easiest way to handle SIGWINCH is to do an endwin,
+ followed by an refresh and a screen repaint you code yourself. The
+ refresh will pick up the new screen size from the xterm's environment.
That is the standard way, of course (it even works with some vendor's
curses implementations). Its drawback is that it clears the screen to
@@ -816,8 +810,13 @@ Hints, Tips, and Tricks
limited to the new screen dimensions, and pads stdscr with blanks if
the screen is larger.
- Finally, ncurses can be configured to provide its own SIGWINCH
- handler, based on resizeterm.
+ The ncurses library provides a SIGWINCH signal handler, which pushes a
+ KEY_RESIZE via the wgetch() calls. When ncurses returns that code, it
+ calls resizeterm to update the size of the standard screen's window,
+ repainting that (filling with blanks or truncating as needed). It also
+ resizes other windows, but its effect may be less satisfactory because
+ it cannot know how you want the screen re-painted. You will usually
+ have to write special-purpose code to handle KEY_RESIZE yourself.
Handling Multiple Terminal Screens
@@ -889,11 +888,11 @@ Compatibility with Older Versions
To understand why this is a problem, remember that screen updates are
calculated between two representations of the entire display. The
documentation says that when you refresh a window, it is first copied
- to the virtual screen, and then changes are calculated to update
- the physical screen (and applied to the terminal). But "copied to" is
- not very specific, and subtle differences in how copying works can
- produce different behaviors in the case where two overlapping windows
- are each being refreshed at unpredictable intervals.
+ to the virtual screen, and then changes are calculated to update the
+ physical screen (and applied to the terminal). But "copied to" is not
+ very specific, and subtle differences in how copying works can produce
+ different behaviors in the case where two overlapping windows are each
+ being refreshed at unpredictable intervals.
What happens to the overlapping region depends on what wnoutrefresh()
does with its argument -- what portions of the argument window it
diff --git a/contrib/ncurses/form/Makefile.in b/contrib/ncurses/form/Makefile.in
index 682f0a4afc76..2bf31e15f347 100644
--- a/contrib/ncurses/form/Makefile.in
+++ b/contrib/ncurses/form/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.42 2006/10/14 20:40:36 tom Exp $
+# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $
##############################################################################
-# Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. #
+# Copyright (c) 1998-2006,2007 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"), #
@@ -27,7 +27,7 @@
# authorization. #
##############################################################################
#
-# Author: Thomas E. Dickey <dickey@clark.net> 1996,1997
+# Author: Thomas E. Dickey 1996-on
#
# Makefile for form source code.
#
@@ -91,7 +91,7 @@ CFLAGS_SHARED = $(CCFLAGS) @CC_SHARED_OPTS@
CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
-LINK = $(LIBTOOL_LINK) $(CC)
+LINK = $(LIBTOOL_LINK)
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
SHLIB_DIRS = -L../lib
@@ -106,8 +106,6 @@ ABI_VERSION = @cf_cv_abi_version@
RANLIB = @LIB_PREP@
-IMPORT_LIB = @IMPORT_LIB@
-SHARED_LIB = @SHARED_LIB@
LIBRARIES = @LIBS_TO_MAKE@
LINT = @LINT@
@@ -126,7 +124,7 @@ sources : $(AUTO_SRC)
$(DESTDIR)$(bindir) \
$(DESTDIR)$(libdir) :
- sh $(srcdir)/../mkinstalldirs $@
+ sh $(srcdir)/../mkdirs.sh $@
# make copies to simplify include-paths while still keeping form's include
# file in this directory.
diff --git a/contrib/ncurses/form/fld_def.c b/contrib/ncurses/form/fld_def.c
index dc023795ac90..3559ba67241c 100644
--- a/contrib/ncurses/form/fld_def.c
+++ b/contrib/ncurses/form/fld_def.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2005,2007 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 *
@@ -32,7 +32,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: fld_def.c,v 1.33 2005/04/16 17:31:17 tom Exp $")
+MODULE_ID("$Id: fld_def.c,v 1.36 2007/10/13 19:29:58 tom Exp $")
/* this can't be readonly */
static FIELD default_field =
@@ -93,7 +93,7 @@ _nc_Make_Argument(const FIELDTYPE *typ, va_list *ap, int *err)
assert(err != 0 && ap != (va_list *)0);
if ((typ->status & _LINKED_TYPE) != 0)
{
- p = (TypeArgument *)malloc(sizeof(TypeArgument));
+ p = typeMalloc(TypeArgument, 1);
if (p != 0)
{
@@ -141,7 +141,7 @@ _nc_Copy_Argument(const FIELDTYPE *typ, const TypeArgument *argp, int *err)
assert(err != 0 && argp != 0);
if ((typ->status & _LINKED_TYPE) != 0)
{
- p = (TypeArgument *)malloc(sizeof(TypeArgument));
+ p = typeMalloc(TypeArgument, 1);
if (p != 0)
{
@@ -289,8 +289,9 @@ new_field(int rows, int cols, int frow, int fcol, int nrow, int nbuf)
nrow >= 0 &&
nbuf >= 0 &&
((err = E_SYSTEM_ERROR) != 0) && /* trick: this resets the default error */
- (New_Field = (FIELD *)malloc(sizeof(FIELD))) != 0)
+ (New_Field = typeMalloc(FIELD, 1)) != 0)
{
+ T((T_CREATE("field %p"), New_Field));
*New_Field = default_field;
New_Field->rows = rows;
New_Field->cols = cols;
@@ -304,7 +305,7 @@ new_field(int rows, int cols, int frow, int fcol, int nrow, int nbuf)
#if USE_WIDEC_SUPPORT
New_Field->working = newpad(1, Buffer_Length(New_Field) + 1);
- New_Field->expanded = (char **)calloc(1 + (unsigned)rows, sizeof(char *));
+ New_Field->expanded = typeCalloc(char *, 1 + (unsigned)nbuf);
#endif
if (_nc_Copy_Type(New_Field, &default_field))
diff --git a/contrib/ncurses/form/fld_dup.c b/contrib/ncurses/form/fld_dup.c
index 2ffcd3670581..bbc38a3eb715 100644
--- a/contrib/ncurses/form/fld_dup.c
+++ b/contrib/ncurses/form/fld_dup.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2004,2007 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 *
@@ -32,7 +32,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: fld_dup.c,v 1.10 2004/12/25 22:24:10 tom Exp $")
+MODULE_ID("$Id: fld_dup.c,v 1.12 2007/10/13 19:30:21 tom Exp $")
/*---------------------------------------------------------------------------
| Facility : libnform
@@ -56,8 +56,9 @@ dup_field(FIELD *field, int frow, int fcol)
T((T_CALLED("dup_field(%p,%d,%d)"), field, frow, fcol));
if (field && (frow >= 0) && (fcol >= 0) &&
((err = E_SYSTEM_ERROR) != 0) && /* trick : this resets the default error */
- (New_Field = (FIELD *)malloc(sizeof(FIELD))))
+ (New_Field = typeMalloc(FIELD, 1)))
{
+ T((T_CREATE("field %p"), New_Field));
*New_Field = *_nc_Default_Field;
New_Field->frow = frow;
New_Field->fcol = fcol;
diff --git a/contrib/ncurses/form/fld_ftlink.c b/contrib/ncurses/form/fld_ftlink.c
index ce6014dbb81a..4ed2219262aa 100644
--- a/contrib/ncurses/form/fld_ftlink.c
+++ b/contrib/ncurses/form/fld_ftlink.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2004,2007 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 *
@@ -32,7 +32,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: fld_ftlink.c,v 1.11 2004/12/25 22:24:10 tom Exp $")
+MODULE_ID("$Id: fld_ftlink.c,v 1.13 2007/10/13 19:30:35 tom Exp $")
/*---------------------------------------------------------------------------
| Facility : libnform
@@ -56,10 +56,11 @@ link_fieldtype(FIELDTYPE *type1, FIELDTYPE *type2)
T((T_CALLED("link_fieldtype(%p,%p)"), type1, type2));
if (type1 && type2)
{
- nftyp = (FIELDTYPE *)malloc(sizeof(FIELDTYPE));
+ nftyp = typeMalloc(FIELDTYPE, 1);
if (nftyp)
{
+ T((T_CREATE("fieldtype %p"), nftyp));
*nftyp = *_nc_Default_FieldType;
nftyp->status |= _LINKED_TYPE;
if ((type1->status & _HAS_ARGS) || (type2->status & _HAS_ARGS))
diff --git a/contrib/ncurses/form/fld_link.c b/contrib/ncurses/form/fld_link.c
index f15166401f9a..0aac7db78d12 100644
--- a/contrib/ncurses/form/fld_link.c
+++ b/contrib/ncurses/form/fld_link.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2004,2007 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 *
@@ -32,7 +32,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: fld_link.c,v 1.9 2004/12/25 22:24:10 tom Exp $")
+MODULE_ID("$Id: fld_link.c,v 1.11 2007/10/13 19:30:43 tom Exp $")
/*---------------------------------------------------------------------------
| Facility : libnform
@@ -57,8 +57,9 @@ link_field(FIELD *field, int frow, int fcol)
T((T_CALLED("link_field(%p,%d,%d)"), field, frow, fcol));
if (field && (frow >= 0) && (fcol >= 0) &&
((err = E_SYSTEM_ERROR) != 0) && /* trick: this resets the default error */
- (New_Field = (FIELD *)malloc(sizeof(FIELD))))
+ (New_Field = typeMalloc(FIELD, 1)))
{
+ T((T_CREATE("field %p"), New_Field));
*New_Field = *_nc_Default_Field;
New_Field->frow = frow;
New_Field->fcol = fcol;
diff --git a/contrib/ncurses/form/fld_newftyp.c b/contrib/ncurses/form/fld_newftyp.c
index 235cd5f5e432..c2984b10e3c7 100644
--- a/contrib/ncurses/form/fld_newftyp.c
+++ b/contrib/ncurses/form/fld_newftyp.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2004,2007 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 *
@@ -32,7 +32,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: fld_newftyp.c,v 1.13 2004/12/25 22:24:10 tom Exp $")
+MODULE_ID("$Id: fld_newftyp.c,v 1.15 2007/10/13 19:30:55 tom Exp $")
static FIELDTYPE const default_fieldtype =
{
@@ -76,10 +76,11 @@ new_fieldtype(bool (*const field_check) (FIELD *, const void *),
T((T_CALLED("new_fieldtype(%p,%p)"), field_check, char_check));
if ((field_check) || (char_check))
{
- nftyp = (FIELDTYPE *)malloc(sizeof(FIELDTYPE));
+ nftyp = typeMalloc(FIELDTYPE, 1);
if (nftyp)
{
+ T((T_CREATE("fieldtype %p"), nftyp));
*nftyp = default_fieldtype;
nftyp->fcheck = field_check;
nftyp->ccheck = char_check;
diff --git a/contrib/ncurses/form/frm_def.c b/contrib/ncurses/form/frm_def.c
index d15237e911e2..c2044a39dccd 100644
--- a/contrib/ncurses/form/frm_def.c
+++ b/contrib/ncurses/form/frm_def.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,2007 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 *
@@ -32,7 +32,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: frm_def.c,v 1.20 2006/11/04 16:57:15 tom Exp $")
+MODULE_ID("$Id: frm_def.c,v 1.22 2007/10/13 19:31:17 tom Exp $")
/* this can't be readonly */
static FORM default_form =
@@ -186,8 +186,9 @@ Connect_Fields(FORM *form, FIELD **fields)
RETURN(E_BAD_ARGUMENT);
/* allocate page structures */
- if ((pg = (_PAGE *) malloc(page_nr * sizeof(_PAGE))) != (_PAGE *) 0)
+ if ((pg = typeMalloc(_PAGE, page_nr)) != (_PAGE *) 0)
{
+ T((T_CREATE("_PAGE %p"), pg));
form->page = pg;
}
else
@@ -290,11 +291,12 @@ new_form(FIELD **fields)
{
int err = E_SYSTEM_ERROR;
- FORM *form = (FORM *)malloc(sizeof(FORM));
+ FORM *form = typeMalloc(FORM, 1);
T((T_CALLED("new_form(%p)"), fields));
if (form)
{
+ T((T_CREATE("form %p"), form));
*form = *_nc_Default_Form;
if ((err = Associate_Fields(form, fields)) != E_OK)
{
diff --git a/contrib/ncurses/form/frm_driver.c b/contrib/ncurses/form/frm_driver.c
index 354bace8b4f3..25928c5d108c 100644
--- a/contrib/ncurses/form/frm_driver.c
+++ b/contrib/ncurses/form/frm_driver.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,2007 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 *
@@ -32,7 +32,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: frm_driver.c,v 1.76 2006/11/04 18:45:35 tom Exp $")
+MODULE_ID("$Id: frm_driver.c,v 1.85 2007/11/24 21:32:53 tom Exp $")
/*----------------------------------------------------------------------------
This is the core module of the form library. It contains the majority
@@ -262,7 +262,19 @@ wins_wchnstr(WINDOW *w, cchar_t *s, int n)
static int
fix_wchnstr(WINDOW *w, cchar_t *s, int n)
{
+ int x;
+
win_wchnstr(w, s, n);
+ /*
+ * This function is used to extract the text only from the window.
+ * Strip attributes and color from the string so they will not be added
+ * back when copying the string to the window.
+ */
+ for (x = 0; x < n; ++x)
+ {
+ RemAttr(s[x], A_ATTRIBUTES);
+ SetPair(s[x], 0);
+ }
return n;
}
@@ -651,6 +663,7 @@ Field_Grown(FIELD *field, int amount)
result = TRUE; /* allow sharing of recovery on failure */
+ T((T_CREATE("fieldcell %p"), newbuf));
field->buf = newbuf;
for (i = 0; i <= field->nbuf; i++)
{
@@ -724,6 +737,34 @@ Field_Grown(FIELD *field, int amount)
return (result);
}
+#ifdef NCURSES_MOUSE_VERSION
+/*---------------------------------------------------------------------------
+| Facility : libnform
+| Function : int Field_encloses(FIELD *field, int ry, int rx)
+|
+| Description : Check if the given coordinates lie within the given field.
+|
+| Return Values : E_OK - success
+| E_BAD_ARGUMENT - invalid form pointer
+| E_SYSTEM_ERROR - form has no current field or
+| field-window
++--------------------------------------------------------------------------*/
+static int
+Field_encloses(FIELD *field, int ry, int rx)
+{
+ T((T_CALLED("Field_encloses(%p)"), field));
+ if (field != 0
+ && field->frow <= ry
+ && (field->frow + field->rows) > ry
+ && field->fcol <= rx
+ && (field->fcol + field->cols) > rx)
+ {
+ RETURN(E_OK);
+ }
+ RETURN(E_INVALID_FIELD);
+}
+#endif
+
/*---------------------------------------------------------------------------
| Facility : libnform
| Function : int _nc_Position_Form_Cursor(FORM * form)
@@ -4149,6 +4190,83 @@ form_driver(FORM *form, int c)
res = (BI->cmd) (form);
}
}
+#ifdef NCURSES_MOUSE_VERSION
+ else if (KEY_MOUSE == c)
+ {
+ MEVENT event;
+ WINDOW *win = form->win ? form->win : stdscr;
+ WINDOW *sub = form->sub ? form->sub : win;
+
+ getmouse(&event);
+ if ((event.bstate & (BUTTON1_CLICKED |
+ BUTTON1_DOUBLE_CLICKED |
+ BUTTON1_TRIPLE_CLICKED))
+ && wenclose(win, event.y, event.x))
+ { /* we react only if the click was in the userwin, that means
+ * inside the form display area or at the decoration window.
+ */
+ int ry = event.y, rx = event.x; /* screen coordinates */
+
+ res = E_REQUEST_DENIED;
+ if (mouse_trafo(&ry, &rx, FALSE))
+ { /* rx, ry are now "curses" coordinates */
+ if (ry < sub->_begy)
+ { /* we clicked above the display region; this is
+ * interpreted as "scroll up" request
+ */
+ if (event.bstate & BUTTON1_CLICKED)
+ res = form_driver(form, REQ_PREV_FIELD);
+ else if (event.bstate & BUTTON1_DOUBLE_CLICKED)
+ res = form_driver(form, REQ_PREV_PAGE);
+ else if (event.bstate & BUTTON1_TRIPLE_CLICKED)
+ res = form_driver(form, REQ_FIRST_FIELD);
+ }
+ else if (ry > sub->_begy + sub->_maxy)
+ { /* we clicked below the display region; this is
+ * interpreted as "scroll down" request
+ */
+ if (event.bstate & BUTTON1_CLICKED)
+ res = form_driver(form, REQ_NEXT_FIELD);
+ else if (event.bstate & BUTTON1_DOUBLE_CLICKED)
+ res = form_driver(form, REQ_NEXT_PAGE);
+ else if (event.bstate & BUTTON1_TRIPLE_CLICKED)
+ res = form_driver(form, REQ_LAST_FIELD);
+ }
+ else if (wenclose(sub, event.y, event.x))
+ { /* Inside the area we try to find the hit item */
+ int i;
+
+ ry = event.y;
+ rx = event.x;
+ if (wmouse_trafo(sub, &ry, &rx, FALSE))
+ {
+ int min_field = form->page[form->curpage].pmin;
+ int max_field = form->page[form->curpage].pmax;
+
+ for (i = min_field; i <= max_field; ++i)
+ {
+ FIELD *field = form->field[i];
+
+ if (Field_Is_Selectable(field)
+ && Field_encloses(field, ry, rx) == E_OK)
+ {
+ res = _nc_Set_Current_Field(form, field);
+ if (res == E_OK)
+ res = _nc_Position_Form_Cursor(form);
+ if (res == E_OK
+ && (event.bstate & BUTTON1_DOUBLE_CLICKED))
+ res = E_UNKNOWN_COMMAND;
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ else
+ res = E_REQUEST_DENIED;
+ }
+#endif /* NCURSES_MOUSE_VERSION */
else if (!(c & (~(int)MAX_REGULAR_CHARACTER)))
{
/*
@@ -4261,7 +4379,7 @@ set_field_buffer(FIELD *field, int buffer, const char *value)
wclear(field->working);
mvwaddstr(field->working, 0, 0, value);
- if ((widevalue = (FIELD_CELL *)calloc(len, sizeof(FIELD_CELL))) == 0)
+ if ((widevalue = typeCalloc(FIELD_CELL, len + 1)) == 0)
{
RETURN(E_SYSTEM_ERROR);
}
@@ -4341,10 +4459,7 @@ field_buffer(const FIELD *field, int buffer)
init_mb(state);
next = _nc_wcrtomb(0, data[n].chars[0], &state);
if (!isEILSEQ(next))
- {
- if (next != 0)
- need += next;
- }
+ need += next;
}
}
@@ -4358,7 +4473,7 @@ field_buffer(const FIELD *field, int buffer)
{
wclear(field->working);
mvwadd_wchnstr(field->working, 0, 0, data, size);
- mvwinnstr(field->working, 0, 0, result, (int)need + 1);
+ mvwinnstr(field->working, 0, 0, result, (int)need);
}
#else
result = Address_Of_Nth_Buffer(field, buffer);
diff --git a/contrib/ncurses/form/fty_alnum.c b/contrib/ncurses/form/fty_alnum.c
index c2d056b70acb..59dd2736e8ab 100644
--- a/contrib/ncurses/form/fty_alnum.c
+++ b/contrib/ncurses/form/fty_alnum.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,2007 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 @@
#include "form.priv.h"
-MODULE_ID("$Id: fty_alnum.c,v 1.19 2006/04/22 21:33:05 tom Exp $")
+MODULE_ID("$Id: fty_alnum.c,v 1.21 2007/10/13 19:31:52 tom Exp $")
#define thisARG alnumARG
@@ -55,10 +55,13 @@ thisARG;
static void *
Make_This_Type(va_list *ap)
{
- thisARG *argp = (thisARG *) malloc(sizeof(thisARG));
+ thisARG *argp = typeMalloc(thisARG, 1);
if (argp)
- argp->width = va_arg(*ap, int);
+ {
+ T((T_CREATE("thisARG %p"), argp));
+ argp->width = va_arg(*ap, int);
+ }
return ((void *)argp);
}
@@ -75,10 +78,13 @@ static void *
Copy_This_Type(const void *argp)
{
const thisARG *ap = (const thisARG *)argp;
- thisARG *result = (thisARG *) malloc(sizeof(thisARG));
+ thisARG *result = typeMalloc(thisARG, 1);
if (result)
- *result = *ap;
+ {
+ T((T_CREATE("thisARG %p"), result));
+ *result = *ap;
+ }
return ((void *)result);
}
diff --git a/contrib/ncurses/form/fty_alpha.c b/contrib/ncurses/form/fty_alpha.c
index bd7e000edf97..bd49544ffdb5 100644
--- a/contrib/ncurses/form/fty_alpha.c
+++ b/contrib/ncurses/form/fty_alpha.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,2007 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 @@
#include "form.priv.h"
-MODULE_ID("$Id: fty_alpha.c,v 1.21 2006/04/22 21:33:05 tom Exp $")
+MODULE_ID("$Id: fty_alpha.c,v 1.23 2007/10/13 19:32:09 tom Exp $")
#define thisARG alphaARG
@@ -55,10 +55,13 @@ thisARG;
static void *
Make_This_Type(va_list *ap)
{
- thisARG *argp = (thisARG *) malloc(sizeof(thisARG));
+ thisARG *argp = typeMalloc(thisARG, 1);
if (argp)
- argp->width = va_arg(*ap, int);
+ {
+ T((T_CREATE("thisARG %p"), argp));
+ argp->width = va_arg(*ap, int);
+ }
return ((void *)argp);
}
@@ -75,10 +78,13 @@ static void *
Copy_This_Type(const void *argp)
{
const thisARG *ap = (const thisARG *)argp;
- thisARG *result = (thisARG *) malloc(sizeof(thisARG));
+ thisARG *result = typeMalloc(thisARG, 1);
if (result)
- *result = *ap;
+ {
+ T((T_CREATE("thisARG %p"), result));
+ *result = *ap;
+ }
return ((void *)result);
}
diff --git a/contrib/ncurses/form/fty_enum.c b/contrib/ncurses/form/fty_enum.c
index 054cc4dc862d..c96a080db09d 100644
--- a/contrib/ncurses/form/fty_enum.c
+++ b/contrib/ncurses/form/fty_enum.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,2007 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 @@
#include "form.priv.h"
-MODULE_ID("$Id: fty_enum.c,v 1.20 2006/04/22 21:33:05 tom Exp $")
+MODULE_ID("$Id: fty_enum.c,v 1.22 2007/10/13 19:32:26 tom Exp $")
typedef struct
{
@@ -56,7 +56,7 @@ enumARG;
static void *
Make_Enum_Type(va_list *ap)
{
- enumARG *argp = (enumARG *)malloc(sizeof(enumARG));
+ enumARG *argp = typeMalloc(enumARG, 1);
if (argp)
{
@@ -64,6 +64,7 @@ Make_Enum_Type(va_list *ap)
char **kp = (char **)0;
int ccase, cunique;
+ T((T_CREATE("enumARG %p"), argp));
argp->kwds = va_arg(*ap, char **);
ccase = va_arg(*ap, int);
cunique = va_arg(*ap, int);
@@ -96,10 +97,13 @@ Copy_Enum_Type(const void *argp)
{
const enumARG *ap = (const enumARG *)argp;
- result = (enumARG *)malloc(sizeof(enumARG));
+ result = typeMalloc(enumARG, 1);
if (result)
- *result = *ap;
+ {
+ T((T_CREATE("enumARG %p"), result));
+ *result = *ap;
+ }
}
return (void *)result;
}
diff --git a/contrib/ncurses/form/fty_int.c b/contrib/ncurses/form/fty_int.c
index 13fef6272366..8a5367f74084 100644
--- a/contrib/ncurses/form/fty_int.c
+++ b/contrib/ncurses/form/fty_int.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,2007 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 @@
#include "form.priv.h"
-MODULE_ID("$Id: fty_int.c,v 1.20 2006/04/22 21:33:05 tom Exp $")
+MODULE_ID("$Id: fty_int.c,v 1.22 2007/10/13 19:32:40 tom Exp $")
#if USE_WIDEC_SUPPORT
#define isDigit(c) (iswdigit((wint_t)(c)) || isdigit(UChar(c)))
@@ -63,10 +63,11 @@ thisARG;
static void *
Make_This_Type(va_list *ap)
{
- thisARG *argp = (thisARG *) malloc(sizeof(thisARG));
+ thisARG *argp = typeMalloc(thisARG, 1);
if (argp)
{
+ T((T_CREATE("thisARG %p"), argp));
argp->precision = va_arg(*ap, int);
argp->low = va_arg(*ap, long);
argp->high = va_arg(*ap, long);
@@ -90,9 +91,12 @@ Copy_This_Type(const void *argp)
if (argp)
{
- result = (thisARG *) malloc(sizeof(thisARG));
+ result = typeMalloc(thisARG, 1);
if (result)
- *result = *ap;
+ {
+ T((T_CREATE("thisARG %p"), result));
+ *result = *ap;
+ }
}
return (void *)result;
}
diff --git a/contrib/ncurses/form/fty_num.c b/contrib/ncurses/form/fty_num.c
index cd09dfb001fe..e74e8e36fe25 100644
--- a/contrib/ncurses/form/fty_num.c
+++ b/contrib/ncurses/form/fty_num.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,2007 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 @@
#include "form.priv.h"
-MODULE_ID("$Id: fty_num.c,v 1.23 2006/04/22 21:33:05 tom Exp $")
+MODULE_ID("$Id: fty_num.c,v 1.25 2007/10/13 19:32:54 tom Exp $")
#if HAVE_LOCALE_H
#include <locale.h>
@@ -74,10 +74,11 @@ thisARG;
static void *
Make_This_Type(va_list *ap)
{
- thisARG *argn = (thisARG *) malloc(sizeof(thisARG));
+ thisARG *argn = typeMalloc(thisARG, 1);
if (argn)
{
+ T((T_CREATE("thisARG %p"), argn));
argn->precision = va_arg(*ap, int);
argn->low = va_arg(*ap, double);
argn->high = va_arg(*ap, double);
@@ -107,9 +108,12 @@ Copy_This_Type(const void *argp)
if (argp)
{
- result = (thisARG *) malloc(sizeof(thisARG));
+ result = typeMalloc(thisARG, 1);
if (result)
- *result = *ap;
+ {
+ T((T_CREATE("thisARG %p"), result));
+ *result = *ap;
+ }
}
return (void *)result;
}
diff --git a/contrib/ncurses/form/fty_regex.c b/contrib/ncurses/form/fty_regex.c
index 087ff11ec30c..247779f28c1d 100644
--- a/contrib/ncurses/form/fty_regex.c
+++ b/contrib/ncurses/form/fty_regex.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,2007 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 @@
#include "form.priv.h"
-MODULE_ID("$Id: fty_regex.c,v 1.19 2006/04/22 21:33:05 tom Exp $")
+MODULE_ID("$Id: fty_regex.c,v 1.21 2007/10/13 19:33:50 tom Exp $")
#if HAVE_REGEX_H_FUNCS /* We prefer POSIX regex */
#include <regex.h>
@@ -105,15 +105,17 @@ Make_RegularExpression_Type(va_list *ap)
char *rx = va_arg(*ap, char *);
RegExp_Arg *preg;
- preg = (RegExp_Arg *)malloc(sizeof(RegExp_Arg));
+ preg = typeMalloc(RegExp_Arg, 1);
if (preg)
{
- if (((preg->pRegExp = (regex_t *) malloc(sizeof(regex_t))) != 0)
+ T((T_CREATE("RegExp_Arg %p"), preg));
+ if (((preg->pRegExp = typeMalloc(regex_t, 1)) != 0)
&& !regcomp(preg->pRegExp, rx,
(REG_EXTENDED | REG_NOSUB | REG_NEWLINE)))
{
- preg->refCount = (unsigned long *)malloc(sizeof(unsigned long));
+ T((T_CREATE("regex_t %p"), preg->pRegExp));
+ preg->refCount = typeMalloc(unsigned long, 1);
*(preg->refCount) = 1;
}
@@ -130,20 +132,21 @@ Make_RegularExpression_Type(va_list *ap)
char *rx = va_arg(*ap, char *);
RegExp_Arg *pArg;
- pArg = (RegExp_Arg *)malloc(sizeof(RegExp_Arg));
+ pArg = typeMalloc(RegExp_Arg, 1);
if (pArg)
{
int blen = RX_INCREMENT;
+ T((T_CREATE("RegExp_Arg %p"), pArg));
pArg->compiled_expression = NULL;
- pArg->refCount = (unsigned long *)malloc(sizeof(unsigned long));
+ pArg->refCount = typeMalloc(unsigned long, 1);
*(pArg->refCount) = 1;
do
{
- char *buf = (char *)malloc(blen);
+ char *buf = typeMalloc(char, blen);
if (buf)
{
diff --git a/contrib/ncurses/form/headers b/contrib/ncurses/form/headers
index f2267c8722c1..56d72f012238 100644
--- a/contrib/ncurses/form/headers
+++ b/contrib/ncurses/form/headers
@@ -1,5 +1,5 @@
##############################################################################
-# Copyright (c) 1998 Free Software Foundation, Inc. #
+# Copyright (c) 1998,2006 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,3 +29,4 @@
# Author: Thomas E. Dickey <dickey@clark.net> 1996
#
$(srcdir)/form.h
+# vile:makemode
diff --git a/contrib/ncurses/form/modules b/contrib/ncurses/form/modules
index a11dade0ba55..89f9f9f54346 100644
--- a/contrib/ncurses/form/modules
+++ b/contrib/ncurses/form/modules
@@ -1,6 +1,6 @@
-# $Id: modules,v 1.14 2004/12/25 23:29:22 tom Exp $
+# $Id: modules,v 1.15 2006/12/24 00:52:58 tom Exp $
##############################################################################
-# Copyright (c) 1998,2004 Free Software Foundation, Inc. #
+# Copyright (c) 1998-2004,2006 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"), #
@@ -27,7 +27,7 @@
# authorization. #
##############################################################################
#
-# Author: Thomas E. Dickey
+# Author: Thomas E. Dickey 1995-on
#
@ base
@@ -72,3 +72,5 @@ fty_int lib $(srcdir) $(FORM_PRIV_H)
fty_ipv4 lib $(srcdir) $(FORM_PRIV_H)
fty_num lib $(srcdir) $(FORM_PRIV_H)
fty_regex lib $(srcdir) $(FORM_PRIV_H)
+
+# vile:makemode
diff --git a/contrib/ncurses/include/MKterm.h.awk.in b/contrib/ncurses/include/MKterm.h.awk.in
index ee22f014d128..6f0fca33c7c8 100644
--- a/contrib/ncurses/include/MKterm.h.awk.in
+++ b/contrib/ncurses/include/MKterm.h.awk.in
@@ -1,6 +1,7 @@
+# vile:awkmode
BEGIN {
print "/****************************************************************************"
- print " * Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. *"
+ print " * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *"
print " * *"
print " * Permission is hereby granted, free of charge, to any person obtaining a *"
print " * copy of this software and associated documentation files (the *"
@@ -33,7 +34,7 @@ BEGIN {
print "/* and: Thomas E. Dickey 1995-on */"
print "/****************************************************************************/"
print ""
- print "/* $Id: MKterm.h.awk.in,v 1.47 2006/11/26 01:18:23 tom Exp $ */"
+ print "/* $Id: MKterm.h.awk.in,v 1.49 2007/08/18 11:44:26 tom Exp $ */"
print ""
print "/*"
print "** term.h -- Definition of struct term"
@@ -229,26 +230,26 @@ END {
print ""
print "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
print ""
- print "#if BROKEN_LINKER"
- print "#define boolnames _nc_boolnames()"
- print "#define boolcodes _nc_boolcodes()"
- print "#define boolfnames _nc_boolfnames()"
- print "#define numnames _nc_numnames()"
- print "#define numcodes _nc_numcodes()"
- print "#define numfnames _nc_numfnames()"
- print "#define strnames _nc_strnames()"
- print "#define strcodes _nc_strcodes()"
- print "#define strfnames _nc_strfnames()"
+ print "#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@"
+ print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolnames);"
+ print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolcodes);"
+ print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolfnames);"
+ print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numnames);"
+ print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numcodes);"
+ print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numfnames);"
+ print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strnames);"
+ print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strcodes);"
+ print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strfnames);"
print ""
- print "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_boolnames (void);"
- print "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_boolcodes (void);"
- print "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_boolfnames (void);"
- print "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_numnames (void);"
- print "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_numcodes (void);"
- print "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_numfnames (void);"
- print "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strnames (void);"
- print "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strcodes (void);"
- print "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strfnames (void);"
+ print "#define boolnames NCURSES_PUBLIC_VAR(boolnames())"
+ print "#define boolcodes NCURSES_PUBLIC_VAR(boolcodes())"
+ print "#define boolfnames NCURSES_PUBLIC_VAR(boolfnames())"
+ print "#define numnames NCURSES_PUBLIC_VAR(numnames())"
+ print "#define numcodes NCURSES_PUBLIC_VAR(numcodes())"
+ print "#define numfnames NCURSES_PUBLIC_VAR(numfnames())"
+ print "#define strnames NCURSES_PUBLIC_VAR(strnames())"
+ print "#define strcodes NCURSES_PUBLIC_VAR(strcodes())"
+ print "#define strfnames NCURSES_PUBLIC_VAR(strfnames())"
print ""
print "#else"
print ""
@@ -291,10 +292,10 @@ END {
print "extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *);"
print ""
print "#if @NCURSES_TPARM_VARARGS@ /* NCURSES_TPARM_VARARGS */"
- print "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...); /* implemented */"
+ print "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...); /* special */"
print "#else"
- print "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long); /* implemented */"
- print "extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...); /* implemented */"
+ print "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long); /* special */"
+ print "extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...); /* special */"
print "#endif"
print ""
print "#endif /* __NCURSES_H */"
diff --git a/contrib/ncurses/include/curses.h.in b/contrib/ncurses/include/curses.h.in
index 6e517f765651..fef51760111e 100644
--- a/contrib/ncurses/include/curses.h.in
+++ b/contrib/ncurses/include/curses.h.in
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,2007 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 *
@@ -32,7 +32,7 @@
* and: Thomas E. Dickey 1996-on *
****************************************************************************/
-/* $Id: curses.h.in,v 1.167 2006/11/26 01:14:54 tom Exp $ */
+/* $Id: curses.h.in,v 1.181 2007/11/18 00:32:03 tom Exp $ */
#ifndef __NCURSES_H
#define __NCURSES_H
@@ -103,10 +103,17 @@
#define NCURSES_COLOR_T short
/*
+ * Definition used to make WINDOW and similar structs opaque.
+ */
+#ifndef @cf_cv_enable_opaque@
+#define NCURSES_OPAQUE @NCURSES_OPAQUE@
+#endif
+
+/*
* The internal type used for window dimensions.
*/
#undef NCURSES_SIZE_T
-#define NCURSES_SIZE_T short
+#define NCURSES_SIZE_T @NCURSES_SIZE_T@
/*
* Control whether tparm() supports varargs or fixed-parameter list.
@@ -137,7 +144,7 @@ typedef unsigned @cf_cv_typeof_mmask_t@ mmask_t;
#include <stddef.h> /* we want wchar_t */
#endif /* _XOPEN_SOURCE_EXTENDED */
-/* XSI and SVr4 specify that curses implements 'bool'. However, C++ may also
+/* X/Open and SVr4 specify that curses implements 'bool'. However, C++ may also
* implement it. If so, we must use the C++ compiler's type to avoid conflict
* with other interfaces.
*
@@ -184,7 +191,7 @@ extern "C" {
#endif
/*
- * XSI attributes. In the ncurses implementation, they are identical to the
+ * X/Open attributes. In the ncurses implementation, they are identical to the
* A_ attributes.
*/
#define WA_ATTRIBUTES A_ATTRIBUTES
@@ -206,9 +213,6 @@ extern "C" {
#define WA_VERTICAL A_VERTICAL
/* colors */
-extern NCURSES_EXPORT_VAR(int) COLORS;
-extern NCURSES_EXPORT_VAR(int) COLOR_PAIRS;
-
#define COLOR_BLACK 0
#define COLOR_RED 1
#define COLOR_GREEN 2
@@ -220,8 +224,8 @@ extern NCURSES_EXPORT_VAR(int) COLOR_PAIRS;
/* line graphics */
-#if @BROKEN_LINKER@
-extern NCURSES_EXPORT_VAR(chtype*) _nc_acs_map(void);
+#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@
+NCURSES_WRAPPED_VAR(chtype*, acs_map);
#define acs_map (_nc_acs_map())
#else
extern NCURSES_EXPORT_VAR(chtype) acs_map[];
@@ -346,6 +350,8 @@ typedef struct
attr_t attr;
wchar_t chars[CCHARW_MAX];
#if @NCURSES_EXT_COLORS@
+#undef NCURSES_EXT_COLORS
+#define NCURSES_EXT_COLORS @NCURSES_PATCH@
int ext_color; /* color pair, must be more than 16-bits */
#endif
}
@@ -353,6 +359,7 @@ cchar_t;
#endif /* _XOPEN_SOURCE_EXTENDED */
+#if !NCURSES_OPAQUE
struct ldat;
struct _win_st
@@ -409,41 +416,7 @@ struct _win_st
#endif
#endif
};
-
-extern NCURSES_EXPORT_VAR(WINDOW *) stdscr;
-extern NCURSES_EXPORT_VAR(WINDOW *) curscr;
-extern NCURSES_EXPORT_VAR(WINDOW *) newscr;
-
-extern NCURSES_EXPORT_VAR(int) LINES;
-extern NCURSES_EXPORT_VAR(int) COLS;
-extern NCURSES_EXPORT_VAR(int) TABSIZE;
-
-/*
- * This global was an undocumented feature under AIX curses.
- */
-extern NCURSES_EXPORT_VAR(int) ESCDELAY; /* ESC expire time in milliseconds */
-
-/*
- * These functions are extensions - not in XSI Curses.
- */
-#if @NCURSES_EXT_FUNCS@
-extern NCURSES_EXPORT(bool) is_term_resized (int, int);
-extern NCURSES_EXPORT(char *) keybound (int, int);
-extern NCURSES_EXPORT(const char *) curses_version (void);
-extern NCURSES_EXPORT(int) assume_default_colors (int, int);
-extern NCURSES_EXPORT(int) define_key (const char *, int);
-extern NCURSES_EXPORT(int) key_defined (const char *);
-extern NCURSES_EXPORT(int) keyok (int, bool);
-extern NCURSES_EXPORT(int) resize_term (int, int);
-extern NCURSES_EXPORT(int) resizeterm (int, int);
-extern NCURSES_EXPORT(int) use_default_colors (void);
-extern NCURSES_EXPORT(int) use_extended_names (bool);
-extern NCURSES_EXPORT(int) use_legacy_coding (int);
-extern NCURSES_EXPORT(int) wresize (WINDOW *, int, int);
-extern NCURSES_EXPORT(void) nofilter(void);
-#else
-#define curses_version() NCURSES_VERSION
-#endif
+#endif /* NCURSES_OPAQUE */
/*
* This is an extension to support events...
@@ -537,7 +510,7 @@ extern NCURSES_EXPORT(int) wgetnstr_events(WINDOW *,char *,int,_nc_eventlist *);
#endif
/*
- * Function prototypes. This is the complete XSI Curses list of required
+ * Function prototypes. This is the complete X/Open Curses list of required
* functions. Those marked `generated' will have sources generated from the
* macro definitions later in this file, in order to satisfy XPG4.2
* requirements.
@@ -741,7 +714,7 @@ extern NCURSES_EXPORT(int) standout (void); /* generated */
extern NCURSES_EXPORT(int) standend (void); /* generated */
extern NCURSES_EXPORT(int) start_color (void); /* implemented */
extern NCURSES_EXPORT(WINDOW *) subpad (WINDOW *, int, int, int, int); /* implemented */
-extern NCURSES_EXPORT(WINDOW *) subwin (WINDOW *,int,int,int,int); /* implemented */
+extern NCURSES_EXPORT(WINDOW *) subwin (WINDOW *, int, int, int, int); /* implemented */
extern NCURSES_EXPORT(int) syncok (WINDOW *, bool); /* implemented */
extern NCURSES_EXPORT(chtype) termattrs (void); /* implemented */
extern NCURSES_EXPORT(char *) termname (void); /* implemented */
@@ -825,17 +798,16 @@ extern NCURSES_EXPORT(char *) tigetstr (NCURSES_CONST char *); /* implemented *
extern NCURSES_EXPORT(int) putp (const char *); /* implemented */
#if NCURSES_TPARM_VARARGS
-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...); /* implemented */
+extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...); /* special */
#else
-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long); /* implemented */
-extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...); /* implemented */
+extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long); /* special */
+extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...); /* special */
#endif
-extern NCURSES_EXPORT_VAR(char) ttytype[]; /* needed for backward compatibility */
-
/*
* These functions are not in X/Open, but we use them in macro definitions:
*/
+extern NCURSES_EXPORT(int) getattrs (const WINDOW *); /* generated */
extern NCURSES_EXPORT(int) getcurx (const WINDOW *); /* generated */
extern NCURSES_EXPORT(int) getcury (const WINDOW *); /* generated */
extern NCURSES_EXPORT(int) getbegx (const WINDOW *); /* generated */
@@ -846,12 +818,58 @@ extern NCURSES_EXPORT(int) getparx (const WINDOW *); /* generated */
extern NCURSES_EXPORT(int) getpary (const WINDOW *); /* generated */
/*
- * vid_attr() was implemented originally based on a draft of XSI curses.
+ * vid_attr() was implemented originally based on a draft of X/Open curses.
*/
#ifndef _XOPEN_SOURCE_EXTENDED
#define vid_attr(a,pair,opts) vidattr(a)
#endif
+/*
+ * These functions are extensions - not in X/Open Curses.
+ */
+#undef NCURSES_EXT_FUNCS
+#if @NCURSES_EXT_FUNCS@
+#undef NCURSES_EXT_FUNCS
+#define NCURSES_EXT_FUNCS @NCURSES_PATCH@
+typedef int (*NCURSES_CALLBACK)(WINDOW *, void *);
+extern NCURSES_EXPORT(bool) is_term_resized (int, int);
+extern NCURSES_EXPORT(char *) keybound (int, int);
+extern NCURSES_EXPORT(const char *) curses_version (void);
+extern NCURSES_EXPORT(int) assume_default_colors (int, int);
+extern NCURSES_EXPORT(int) define_key (const char *, int);
+extern NCURSES_EXPORT(int) key_defined (const char *);
+extern NCURSES_EXPORT(int) keyok (int, bool);
+extern NCURSES_EXPORT(int) resize_term (int, int);
+extern NCURSES_EXPORT(int) resizeterm (int, int);
+extern NCURSES_EXPORT(int) use_default_colors (void);
+extern NCURSES_EXPORT(int) use_extended_names (bool);
+extern NCURSES_EXPORT(int) use_legacy_coding (int);
+extern NCURSES_EXPORT(int) use_screen (SCREEN *, NCURSES_CALLBACK, void *);
+extern NCURSES_EXPORT(int) use_window (WINDOW *, NCURSES_CALLBACK, void *);
+extern NCURSES_EXPORT(int) wresize (WINDOW *, int, int);
+extern NCURSES_EXPORT(void) nofilter(void);
+
+/*
+ * These extensions provide access to information stored in the WINDOW even
+ * when NCURSES_OPAQUE is set:
+ */
+extern NCURSES_EXPORT(WINDOW *) wgetparent (const WINDOW *); /* generated */
+extern NCURSES_EXPORT(bool) is_cleared (const WINDOW *); /* generated */
+extern NCURSES_EXPORT(bool) is_idcok (const WINDOW *); /* generated */
+extern NCURSES_EXPORT(bool) is_idlok (const WINDOW *); /* generated */
+extern NCURSES_EXPORT(bool) is_immedok (const WINDOW *); /* generated */
+extern NCURSES_EXPORT(bool) is_keypad (const WINDOW *); /* generated */
+extern NCURSES_EXPORT(bool) is_leaveok (const WINDOW *); /* generated */
+extern NCURSES_EXPORT(bool) is_nodelay (const WINDOW *); /* generated */
+extern NCURSES_EXPORT(bool) is_notimeout (const WINDOW *); /* generated */
+extern NCURSES_EXPORT(bool) is_scrollok (const WINDOW *); /* generated */
+extern NCURSES_EXPORT(bool) is_syncok (const WINDOW *); /* generated */
+extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* generated */
+
+#else
+#define curses_version() NCURSES_VERSION
+#endif
+
/* attributes */
#define NCURSES_ATTR_SHIFT 8
@@ -892,11 +910,18 @@ extern NCURSES_EXPORT(int) getpary (const WINDOW *); /* generated */
#define getmaxyx(win,y,x) (y = getmaxy(win), x = getmaxx(win))
#define getparyx(win,y,x) (y = getpary(win), x = getparx(win))
-#define getsyx(y,x) do { if(newscr->_leaveok) (y)=(x)=-1; \
- else getyx(newscr,(y),(x)); \
+#define getsyx(y,x) do { if (is_leaveok(newscr)) \
+ (y) = (x) = -1; \
+ else \
+ getyx(newscr,(y), (x)); \
} while(0)
-#define setsyx(y,x) do { if((y)==-1 && (x)==-1) newscr->_leaveok=TRUE; \
- else {newscr->_leaveok=FALSE;wmove(newscr,(y),(x));} \
+
+#define setsyx(y,x) do { if ((y) == -1 && (x) == -1) \
+ leaveok(newscr, TRUE); \
+ else { \
+ leaveok(newscr, FALSE); \
+ wmove(newscr, (y), (x)); \
+ } \
} while(0)
#ifndef NCURSES_NOMACROS
@@ -918,15 +943,17 @@ extern NCURSES_EXPORT(int) getpary (const WINDOW *); /* generated */
#define gettmode()
/* It seems older SYSV curses versions define these */
-#define getattrs(win) ((win)?(win)->_attrs:A_NORMAL)
-#define getcurx(win) ((win)?(win)->_curx:ERR)
-#define getcury(win) ((win)?(win)->_cury:ERR)
-#define getbegx(win) ((win)?(win)->_begx:ERR)
-#define getbegy(win) ((win)?(win)->_begy:ERR)
-#define getmaxx(win) ((win)?((win)->_maxx + 1):ERR)
-#define getmaxy(win) ((win)?((win)->_maxy + 1):ERR)
-#define getparx(win) ((win)?(win)->_parx:ERR)
-#define getpary(win) ((win)?(win)->_pary:ERR)
+#if !NCURSES_OPAQUE
+#define getattrs(win) ((win) ? (win)->_attrs : A_NORMAL)
+#define getcurx(win) ((win) ? (win)->_curx : ERR)
+#define getcury(win) ((win) ? (win)->_cury : ERR)
+#define getbegx(win) ((win) ? (win)->_begx : ERR)
+#define getbegy(win) ((win) ? (win)->_begy : ERR)
+#define getmaxx(win) ((win) ? ((win)->_maxx + 1) : ERR)
+#define getmaxy(win) ((win) ? ((win)->_maxy + 1) : ERR)
+#define getparx(win) ((win) ? (win)->_parx : ERR)
+#define getpary(win) ((win) ? (win)->_pary : ERR)
+#endif /* NCURSES_OPAQUE */
#define wstandout(win) (wattrset(win,A_STANDOUT))
#define wstandend(win) (wattrset(win,A_NORMAL))
@@ -934,12 +961,14 @@ extern NCURSES_EXPORT(int) getpary (const WINDOW *); /* generated */
#define wattron(win,at) wattr_on(win, NCURSES_CAST(attr_t, at), NULL)
#define wattroff(win,at) wattr_off(win, NCURSES_CAST(attr_t, at), NULL)
+#if !NCURSES_OPAQUE
#if defined(_XOPEN_SOURCE_EXTENDED) && @NCURSES_EXT_COLORS@
#define wattrset(win,at) ((win)->_color = PAIR_NUMBER(at), \
(win)->_attrs = (at))
#else
#define wattrset(win,at) ((win)->_attrs = (at))
#endif
+#endif /* NCURSES_OPAQUE */
#define scroll(win) wscrl(win,1)
@@ -956,7 +985,10 @@ extern NCURSES_EXPORT(int) getpary (const WINDOW *); /* generated */
#define winchstr(w, s) winchnstr(w, s, -1)
#define winsstr(w, s) winsnstr(w, s, -1)
+#if !NCURSES_OPAQUE
#define redrawwin(win) wredrawln(win, 0, (win)->_maxy+1)
+#endif /* NCURSES_OPAQUE */
+
#define waddstr(win,str) waddnstr(win,str,-1)
#define waddchstr(win,str) waddchnstr(win,str,-1)
@@ -1064,11 +1096,14 @@ extern NCURSES_EXPORT(int) getpary (const WINDOW *); /* generated */
/*
* Some wide-character functions can be implemented without the extensions.
*/
+#if !NCURSES_OPAQUE
#define getbkgd(win) ((win)->_bkgd)
+#endif /* NCURSES_OPAQUE */
#define slk_attr_off(a,v) ((v) ? ERR : slk_attroff(a))
#define slk_attr_on(a,v) ((v) ? ERR : slk_attron(a))
+#if !NCURSES_OPAQUE
#if defined(_XOPEN_SOURCE_EXTENDED) && @NCURSES_EXT_COLORS@
#define wattr_set(win,a,p,opts) ((win)->_attrs = ((a) & ~A_COLOR), \
(win)->_color = (p), \
@@ -1082,9 +1117,10 @@ extern NCURSES_EXPORT(int) getpary (const WINDOW *); /* generated */
(void)((p) != 0 && (*(p) = PAIR_NUMBER((win)->_attrs))), \
OK)
#endif
+#endif /* NCURSES_OPAQUE */
/*
- * XSI curses deprecates SVr4 vwprintw/vwscanw, which are supposed to use
+ * X/Open curses deprecates SVr4 vwprintw/vwscanw, which are supposed to use
* varargs.h. It adds new calls vw_printw/vw_scanw, which are supposed to
* use POSIX stdarg.h. The ncurses versions of vwprintw/vwscanw already
* use stdarg.h, so...
@@ -1100,9 +1136,76 @@ extern NCURSES_EXPORT(int) getpary (const WINDOW *); /* generated */
NCURSES_EXPORT(int) vsscanf(const char *, const char *, va_list);
#endif
+/*
+ * These macros are extensions - not in X/Open Curses.
+ */
+#if @NCURSES_EXT_FUNCS@
+#if !NCURSES_OPAQUE
+#define is_cleared(win) ((win)->_clear)
+#define is_idcok(win) ((win)->_idcok)
+#define is_idlok(win) ((win)->_idlok)
+#define is_immedok(win) ((win)->_immed)
+#define is_keypad(win) ((win)->_use_keypad)
+#define is_leaveok(win) ((win)->_leaveok)
+#define is_nodelay(win) ((win)->_delay == 0)
+#define is_notimeout(win) ((win)->_notimeout)
+#define is_scrollok(win) ((win)->_scroll)
+#define is_syncok(win) ((win)->_sync)
+#define wgetparent(win) ((win) ? (win)->_parent : 0)
+#define wgetscrreg(win,t,b) ((win) ? (*(t) = (win)->_regtop, *(b) = (win)->_regbottom, OK) : ERR)
+#endif
+#endif
+
#endif /* NCURSES_NOMACROS */