aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRong-En Fan <rafan@FreeBSD.org>2008-11-09 14:08:54 +0000
committerRong-En Fan <rafan@FreeBSD.org>2008-11-09 14:08:54 +0000
commit6181f4622a00a9de81df01cecb5fa73ffdb697bc (patch)
treec963ba08ac935d7f048b78517309fe6fc2f496e6
parentc0e48ca1322e978a8f9795a5ddb251df2479f930 (diff)
downloadsrc-6181f4622a00a9de81df01cecb5fa73ffdb697bc.tar.gz
src-6181f4622a00a9de81df01cecb5fa73ffdb697bc.zip
- Import ncurses 5.7-20081102 (5.7 release) onto vendor branchvendor/ncurses/5.7-20081102
Notes
Notes: svn path=/vendor/ncurses/dist/; revision=184798 svn path=/vendor/ncurses/5.7-20081102/; revision=184799; tag=vendor/ncurses/5.7-20081102
-rw-r--r--ANNOUNCE412
-rw-r--r--INSTALL148
-rw-r--r--MANIFEST5
-rw-r--r--NEWS238
-rw-r--r--TO-DO15
-rw-r--r--aclocal.m4546
-rw-r--r--announce.html.in444
-rwxr-xr-xconfig.guess156
-rwxr-xr-xconfig.sub47
-rwxr-xr-xconfigure4180
-rw-r--r--configure.in168
-rw-r--r--dist.mk11
-rw-r--r--doc/html/announce.html448
-rw-r--r--form/form.priv.h6
-rw-r--r--form/frm_def.c16
-rw-r--r--form/frm_driver.c35
-rw-r--r--form/frm_req_name.c6
-rw-r--r--include/MKterm.h.awk.in10
-rw-r--r--include/capdefaults.c14
-rw-r--r--include/curses.h.in5
-rw-r--r--include/curses.tail14
-rw-r--r--include/nc_alloc.h8
-rw-r--r--include/nc_panel.h11
-rw-r--r--include/ncurses_defs9
-rw-r--r--include/term_entry.h8
-rw-r--r--man/curs_getcchar.3x15
-rw-r--r--man/curs_memleaks.3x75
-rw-r--r--man/curs_terminfo.3x38
-rw-r--r--man/curs_util.3x44
-rw-r--r--man/form.3x16
-rw-r--r--man/form_driver.3x31
-rw-r--r--man/form_field_buffer.3x54
-rw-r--r--man/man_db.renames3
-rw-r--r--man/menu_attributes.3x6
-rw-r--r--man/menu_driver.3x32
-rw-r--r--man/menu_pattern.3x6
-rw-r--r--man/ncurses.3x35
-rw-r--r--menu/m_driver.c10
-rw-r--r--menu/m_req_name.c6
-rwxr-xr-xmisc/ncu-indent6
-rw-r--r--misc/ncurses.supp205
-rw-r--r--misc/terminfo.src150
-rw-r--r--ncurses/Makefile.in14
-rw-r--r--ncurses/base/MKkeyname.awk15
-rwxr-xr-xncurses/base/MKlib_gen.sh15
-rw-r--r--ncurses/base/MKunctrl.awk27
-rw-r--r--ncurses/base/lib_addch.c13
-rw-r--r--ncurses/base/lib_delwin.c9
-rw-r--r--ncurses/base/lib_freeall.c33
-rw-r--r--ncurses/base/lib_getch.c101
-rw-r--r--ncurses/base/lib_getstr.c23
-rw-r--r--ncurses/base/lib_initscr.c8
-rw-r--r--ncurses/base/lib_mouse.c548
-rw-r--r--ncurses/base/lib_newterm.c26
-rw-r--r--ncurses/base/lib_newwin.c30
-rw-r--r--ncurses/base/lib_overlay.c17
-rw-r--r--ncurses/base/lib_restart.c4
-rw-r--r--ncurses/base/lib_screen.c16
-rw-r--r--ncurses/base/lib_set_term.c52
-rw-r--r--ncurses/base/lib_slk.c32
-rw-r--r--ncurses/base/lib_slkrefr.c28
-rw-r--r--ncurses/base/lib_ungetch.c8
-rw-r--r--ncurses/base/lib_window.c6
-rw-r--r--ncurses/base/resizeterm.c12
-rw-r--r--ncurses/base/tries.c8
-rw-r--r--ncurses/base/use_window.c36
-rw-r--r--ncurses/base/wresize.c6
-rw-r--r--ncurses/curses.priv.h116
-rw-r--r--ncurses/fifo_defs.h4
-rw-r--r--ncurses/llib-lncurses101
-rw-r--r--ncurses/llib-lncursest280
-rw-r--r--ncurses/llib-lncursesw101
-rw-r--r--ncurses/tinfo/MKcodes.awk7
-rw-r--r--ncurses/tinfo/MKnames.awk9
-rw-r--r--ncurses/tinfo/alloc_entry.c70
-rw-r--r--ncurses/tinfo/alloc_ttype.c15
-rw-r--r--ncurses/tinfo/captoinfo.c17
-rw-r--r--ncurses/tinfo/comp_expand.c12
-rw-r--r--ncurses/tinfo/comp_hash.c18
-rw-r--r--ncurses/tinfo/comp_parse.c7
-rw-r--r--ncurses/tinfo/comp_scan.c99
-rw-r--r--ncurses/tinfo/entries.c11
-rw-r--r--ncurses/tinfo/home_terminfo.c12
-rw-r--r--ncurses/tinfo/init_keytry.c9
-rw-r--r--ncurses/tinfo/lib_acs.c9
-rw-r--r--ncurses/tinfo/lib_baudrate.c21
-rw-r--r--ncurses/tinfo/lib_cur_term.c47
-rw-r--r--ncurses/tinfo/lib_data.c72
-rw-r--r--ncurses/tinfo/lib_options.c185
-rw-r--r--ncurses/tinfo/lib_setup.c93
-rw-r--r--ncurses/tinfo/lib_termcap.c7
-rw-r--r--ncurses/tinfo/lib_tgoto.c6
-rw-r--r--ncurses/tinfo/lib_tparm.c14
-rw-r--r--ncurses/tinfo/lib_tputs.c23
-rw-r--r--ncurses/tinfo/lib_ttyflags.c56
-rw-r--r--ncurses/tinfo/make_keys.c18
-rw-r--r--ncurses/tinfo/name_match.c27
-rw-r--r--ncurses/tinfo/parse_entry.c30
-rw-r--r--ncurses/tinfo/read_entry.c8
-rw-r--r--ncurses/tinfo/use_screen.c8
-rw-r--r--ncurses/tinfo/write_entry.c24
-rw-r--r--ncurses/trace/lib_trace.c16
-rw-r--r--ncurses/trace/lib_traceatr.c270
-rw-r--r--ncurses/trace/lib_tracebits.c81
-rw-r--r--ncurses/trace/lib_tracechr.c22
-rw-r--r--ncurses/trace/lib_tracedmp.c28
-rw-r--r--ncurses/trace/lib_tracemse.c16
-rw-r--r--ncurses/trace/trace_buf.c51
-rw-r--r--ncurses/trace/trace_tries.c6
-rw-r--r--ncurses/trace/varargs.c6
-rw-r--r--ncurses/trace/visbuf.c182
-rw-r--r--ncurses/tty/hardscroll.c19
-rw-r--r--ncurses/tty/lib_mvcur.c14
-rw-r--r--ncurses/tty/lib_twait.c8
-rw-r--r--ncurses/tty/tty_update.c6
-rw-r--r--ncurses/widechar/charable.c6
-rw-r--r--ncurses/widechar/lib_get_wch.c75
-rw-r--r--ncurses/widechar/lib_get_wstr.c27
-rw-r--r--ncurses/widechar/lib_key_name.c4
-rw-r--r--ncurses/widechar/lib_unget_wch.c6
-rw-r--r--panel/p_new.c9
-rw-r--r--panel/panel.priv.h12
-rwxr-xr-xprogs/MKtermsort.sh22
-rw-r--r--progs/Makefile.in2
-rw-r--r--progs/dump_entry.c77
-rw-r--r--progs/dump_entry.h6
-rw-r--r--progs/infocmp.c89
-rw-r--r--progs/progs.priv.h5
-rw-r--r--progs/tic.c86
-rw-r--r--progs/toe.c25
-rw-r--r--progs/tput.c5
-rw-r--r--progs/tset.c90
132 files changed, 7196 insertions, 4390 deletions
diff --git a/ANNOUNCE b/ANNOUNCE
index bbeeb8922d47..e09e73177a45 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
- Announcing ncurses 5.6
+ Announcing ncurses 5.7
The ncurses (new curses) library is a free software emulation of
curses in System V Release 4.0, and more. It uses terminfo format,
@@ -27,205 +27,217 @@
Release Notes
This release is designed to be upward compatible from ncurses 5.0
- through 5.5; very few applications will require recompilation,
+ through 5.6; very few applications will require recompilation,
depending on the platform. These are the highlights from the
- change-log since ncurses 5.5 release.
+ change-log since ncurses 5.6 release.
Interface changes:
* generate linkable stubs for some macros:
- getbegx, getbegy, getcurx, getcury, getmaxx, getmaxy, getparx,
- getpary, getpary,
- and (for libncursesw)
- wgetbkgrnd
+ getattrs
New features and improvements:
* library
- + support hashed databases for the terminal descriptions. This
- uses the Berkeley database, has been tested for several
- versions on different platforms.
- + add use_legacy_coding() function to support lynx's
- font-switching feature.
- + add extension nofilter(), to cancel a prior filter() call.
- + add/install a package config script, e.g., ncurses5-config or
- ncursesw5-config, according to configuration options.
- + provide ifdef for NCURSES_NOMACROS which suppresses most
- macro definitions from curses.h, i.e., where a macro is
- defined to override a function to improve performance.
- + make ifdef's consistent in curses.h for the extended colors
- so the header file can be used for the normal curses library.
- The header file installed for extended colors is a variation
- of the wide-character configuration.
- + improve tgetstr() by making the return value point into the
- user's buffer, if provided.
- + add ifdef's allowing ncurses to be built with tparm() using
- either varargs (the existing status), or using a
- fixed-parameter list (to match X/Open).
- + widen the test for xterm kmous a little to allow for other
- strings than "\E[M", e.g., for xterm-sco functionality in
- xterm.
- + modify wgetnstr() to return KEY_RESIZE if a sigwinch occurs.
- + move prototypes for wide-character trace functions from
- curses.tail to curses.wide to avoid accidental reference to
- those if _XOPEN_SOURCE_EXTENDED is defined without ensuring
- that <wchar.h> is included.
- + change the way shared libraries (other than libtool) are
- installed. Rather than copying the build-tree's libraries,
- link the shared objects into the install directory. This
- makes the --with-rpath option work except with $(DESTDIR).
- + several improvements for rendering in hpterm. These are only
- available if the library is configured using
- --enable-xmc-glitch.
- + Add NCURSES_NO_HARD_TABS and NCURSES_NO_MAGIC_COOKIE
- environment variables to allow runtime suppression of the
- related hard-tabs and xmc-glitch features.
+ + new flavor of the ncurses library provides rudimentary
+ support for POSIX threads. Several functions are reentrant,
+ but most require either a window-level or screen-level mutex.
+ (This is API-compatible, but not ABI-compatible with the
+ normal library).
+ + add NCURSES_OPAQUE symbol to curses.h, will use to make
+ structs opaque in selected configurations.
+ + add NCURSES_EXT_FUNCS and NCURSES_EXT_COLORS symbols to
+ curses.h to make it simpler to tell if the extended functions
+ and/or colors are declared.
+ + add wresize() to C++ binding
+ + eliminate fixed-buffer vsprintf() calls in C++ binding.
+ + add several functions to C++ binding which wrap C functions
+ that pass a WINDOW* parameter.
+ + adapt mouse-handling code from menu library in form-library
+ + improve tracing for form library, showing created forms,
+ fields, etc.
+ + make $NCURSES_NO_PADDING feature work for termcap interface .
+ + add check to trace-file open, if the given name is a
+ directory, add ".log" to the name and try again.
+ + several new manpages: curs_legacy.3x, curs_memleaks.3x,
+ curs_opaque.3x and curs_threads.3x
* programs:
- + add new test programs: chgat.c, demo_altkeys.c, echochar.c,
- foldkeys.c, movewindow.c, redraw.c, (noting that existing
- test programs also were modified to test additional
- features).
- + modify tack to test extended capability function-key strings.
- + modify toe to access termcap data, e.g., via cgetent()
- functions, or as a text file if those are not available.
- + improve infocmp/tic -f option formatting.
- + add toe -a option, to show all databases. This uses new
- private interfaces in the ncurses library for iterating
- through the list of databases.
- + modify MKfallback.sh to use tic -x when constructing fallback
- tables to allow extended capabilities to be retrieved from a
- fallback entry.
+ + modified three test-programs to demonstrate the threading
+ support in this version: ditto, rain, worm.
+ + several new test-programs: demo_panels, dots_mvcur,
+ inch_wide, inchs, key_name, key_names, savescreen,
+ savescreen.sh test_arrays, test_get_wstr, test_getstr,
+ test_instr, test_inwstr and test_opaque.
+ + add adacurses-config to the Ada95 install.
+ + modify tic -f option to format spaces as \s to prevent them
+ from being lost when that is read back in unformatted
+ strings.
+ + The tack program is now distributed separately from ncurses.
* terminal database
- + add terminfo entries for xfce terminal (xfce) and multi gnome
- terminal (mgt)
- + add nsterm-16color entry
- + updated mlterm terminfo entry
- + add kon, kon2 and jfbterm terminfo entry
- + remove invis capability from klone+sgr, mainly used by linux
- entry, since it does not really do this
- + add ka2, kb1, kb3, kc2 to vt220-keypad as an extension
- + add shifted up/down arrow codes to xterm-new as kind/kri
- strings
- + add hpterm-color terminfo entry
- + add 256color variants of terminfo entries for programs which
- are reported to implement this feature
- + correct order of use-clauses in rxvt-basic entry which made
- codes for f1-f4 vt100-style rather than vt220-style.
+ + added entries:
+ o Eterm-256color, Eterm-88color and rxvt-88color
+ o aterm
+ o konsole-256color
+ o mrxvt
+ o screen.mlterm
+ o screen.rxvt
+ o teraterm4.59 is now the primary primary teraterm entry,
+ renamed original to teraterm2.3
+ o 9term terminal
+ o Newbury Data entries
+ + updated/improved entries:
+ o gnome to version 2.22.3
+ o h19, z100
+ o konsole to version 1.6.6
+ o mlterm, mlterm+pcfkeys
+ o xterm, and building-blocks for function-keys to [3]xterm
+ patch #230.
Major bug fixes:
- * correct a typo in configure --with-bool option for the case where
- --without-cxx is used.
- * move assignment from environment variable ESCDELAY from initscr()
- down to newterm() so the environment variable affects timeouts for
- terminals opened with newterm() as well.
- * modify werase to clear multicolumn characters that extend into a
- derived window.
- * modify wchgat() to mark updated cells as changed so a refresh will
- repaint those cells.
- * correct logic in wadd_wch() and wecho_wch(), which did not guard
- against passing the multi-column attribute into a call on
- waddch(), e.g., using data returned by win_wch()
- * fix redrawing of windows other than stdscr using wredrawln() by
- touching the corresponding rows in curscr.
- * reduce memory leaks in repeated calls to tgetent() by remembering
- the last TERMINAL* value allocated to hold the corresponding data
- and freeing that if the tgetent() result buffer is the same as the
- previous call.
- * modify read_termtype() so the term_names data is always allocated
- as part of the str_table, a better fix for a memory leak.
- * fix wins_nwstr(), which did not handle single-column non-8bit
- codes.
- * modify wbkgrnd() to avoid clearing the A_CHARTEXT attribute bits
- since those record the state of multicolumn characters.
- * improve SIGWINCH handling by postponing its effect during
- newterm(), etc., when allocating screens.
- * remove 970913 feature for copying subwindows as they are moved in
- mvwin().
- * add checks in waddchnstr() and wadd_wchnstr() to stop copying when
- a null character is found.
- * add some checks to ensure current position is within scrolling
- region before scrolling on a new line.
- * add a workaround to ACS mapping to allow applications such as
- test/blue.c to use the "PC ROM" characters by masking them with
- A_ALTCHARSET. This worked up til 5.5, but was lost in the revision
- of legacy coding.
+ * add logic to tic for cancelling strings in user-defined
+ capabilities (this is needed for current konsole terminfo entry).
+ * 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.
+ * correct check for notimeout() in wgetch().
+ * fix a sign-extension bug in infocmp's repair_acsc() function.
+ * change winnstr() to stop at the end of the line.
+ * make Ada95 demo_panels() example work.
+ * fix for adding a non-spacing character at the beginning of a line.
+ * fill in extended-color pair to make colors work for
+ wide-characters using extended-colors.
+ * improve refresh of window on top of multi-column characters,
+ taking into account split characters on left/right window
+ boundaries.
+ * modify win_wchnstr() to ensure that only a base cell is returned
+ for each multi-column character.
+ * improve waddch() and winsch() handling of EILSEQ from mbrtowc() by
+ using unctrl() to display illegal bytes rather than trying to
+ append further bytes to make up a valid sequence.
+ * restore curs_set() state after endwin()/refresh()
+ * 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().
+ * modify unctrl() to check codes in 128-255 range versus isprint().
+ If they are not printable, and locale was set, use a "M-" or "~"
+ sequence.
+ * improve resizeterm() by moving ripped-off lines, and repainting
+ the soft-keys.
+ * modify form library to accept control characters such as newline
+ in set_field_buffer(), which is compatible with Solaris.
+ * use NCURSES_MOUSE_MASK() in definition of BUTTON_RELEASE(), etc.,
+ to make those work properly with the --enable-ext-mouse
+ configuration
+ * correct some functions in Ada95 binding which were using return
+ value from C where none was returned.
+ * reviewed/fixed issues reported by Coverity and Klocwork tools.
Portability:
* configure script:
+ new options:
- --with-hashed-db
- Use Berkeley hashed database for storing terminfo
- data rather than storing each compiled entry in a
- separate binary file within a directory tree.
-
- --without-dlsym
- Do not use dlsym() to load GPM dynamically.
+ --disable-big-strings
+ control whether static string tables are generated
+ as single large strings (to improve startup
+ performance), or as array of individual strings.
+
+ --disable-relink
+ control whether shared libraries are relinked
+ (during install) when rpath is enabled.
+
+ --disable-tic-depends
+ make explicit whether tic library depends on
+ ncurses/ncursesw library.
+
+ --enable-mixed-case
+ override the configure script's check if the
+ filesystem supports mixed-case filenames. This
+ allows one to control how the terminal database
+ maps to the filesystem. For filesystems that do not
+ support mixed-case, the library uses generate
+ 2-character (hexadecimal) codes for the lower-level
+ of the filesystem terminfo database
+
+ --enable-reentrant
+ builds a different flavor of the ncurses library
+ (ncursest) which improves reentrant use of the
+ library by reducing global and static variables
+ (see the "--with-pthread" option for the threaded
+ support).
+
+ --enable-weak-symbols
+ use weak-symbols for linking to the POSIX thread
+ library, and use the same soname for the ncurses
+ shared library as the normal library (caveat: the
+ ABI is for the threaded library, which makes global
+ data accessed via functions).
+
+ --with-pthread
+ build with the POSIX thread library (tested with
+ AIX, Linux, FreeBSD, OpenBSD, HPUX, IRIX64,
+ Solaris, Tru64).
+
+ --with-ticlib
+ build/install the tic-support functions in a
+ separate library
- --with-valgrind
- Simplify building for testing with valgrind.
+ + improved options:
- --enable-wgetch-events
- Compile with experimental wgetch-events code.
+ --enable-ext-colors
+ requires the wide-character configuration.
- --enable-signed-char
- Store booleans in "signed char" rather than "char".
+ --with-chtype
+ ignore option value "unsigned" is always added to
+ the type in curses.h; do the same for
+ --with-mmask-t.
- + improved options:
+ --with-dmalloc
+ build-fix for redefinition of strndup.
- --disable-largefile
- make the option work both ways.
+ --with-hashed-db
+ accepts a parameter which is the install-prefix of
+ a given Berkeley Database.
- --with-gpm
- The option now accepts a parameter, i.e., the name
- of the dynamic GPM library to load via dlopen()
+ --with-hashed-db
+ the $LIBS environment variable overrides the search
+ for the db library.
- --disable-symlinks
- The option now allows one to disable symlink() in
- tic even when link() does not work.
+ --without-hashed-db
+ assumed when "--disable-database" is used.
* other configure/build issues:
- + remove special case for Darwin in CF_XOPEN_SOURCE configure
- macro.
- + add configure check to ensure that SIGWINCH is defined on
- platforms such as OS X which exclude that when _XOPEN_SOURCE,
- etc., are defined
- + use ld's -search_paths_first option on Darwin to work around
- odd search rules on that platform.
- + improve ifdef's for _POSIX_VDISABLE in tset to work with Mac
- OS X.
- + modify configure script to ensure that if the C compiler is
- used rather than the loader in making shared libraries, the
- $(CFLAGS) variable is also used.
- + use ${CC} rather than ${LD} in shared library rules for
- IRIX64, Solaris to help ensure that initialization sections
- are provided for extra linkage requirements, e.g., of C++
- applications.
- + improve some shared-library configure scripting for Linux,
- FreeBSD and NetBSD to make --with-shlib-version work.
- + split up dependency of names.c and codes.c in
- ncurses/Makefile to work with parallel make.
- + modify MKlib_gen.sh to change preprocessor-expanded _Bool
- back to bool.
- + modify progs/Makefile.in to make tput init work properly with
- cygwin, i.e., do not pass a .exe in the reference string used
- in check_aliases.
+ + build-fixes for LynxOS
+ + modify shared-library rules to allow FreeBSD 3.x to use
+ rpath.
+ + build-fix for FreeBSD "contemporary" TTY interface.
+ + build-fixes for AIX with libtool.
+ + build-fixes for Darwin and libtool.
+ + modify BeOS-specific ifdef's to build on Haiku.
+ + corrected gcc options for building shared libraries on
+ Solaris and IRIX64.
+ + change shared-library configuration for OpenBSD, make rpath
+ work.
+ + build-fixes for using libutf8, e.g., on OpenBSD 3.7
+ + add "-e" option in ncurses/Makefile.in when generating
+ source-files to force earlier exit if the build environment
+ fails unexpectedly.
+ + add support for shared libraries for QNX.
+ + change delimiter in MKlib_gen.sh from '%' to '@', to avoid
+ substitution by IBM xlc to '#' as part of its extensions to
+ digraphs.
* library:
- + ignore wide-acs line-drawing characters that wcwidth() claims
- are not one-column. This is a workaround for Solaris' broken
- locale support.
- + reduce name-pollution in term.h by removing #define's for
- HAVE_xxx symbols.
- + fix #ifdef in c++/internal.h for QNX 6.1
+ + 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.
+ + add/use configure script macro CF_SIG_ATOMIC_T, use the
+ corresponding type for data manipulated by signal handlers.
+ + set locale in misc/ncurses-config.in since it uses a range
+ + disable GPM mouse support when $TERM does not happen to
+ contain "linux", since Gpm_Open() no longer limits its
+ assertion to terminals that it might handle, e.g., within
+ "screen" in xterm.
+ + reset mouse file-descriptor when unloading GPM library.
* test programs:
- + modify test/configure script to allow building test programs
- with PDCurses/X11.
- + modified test programs to allow some to work with NetBSD
- curses. Several do not because NetBSD curses implements a
- subset of X/Open curses, and also lacks much of SVr4
- additions. But it is enough for comparison.
- + improved test/configure to build test/ncurses on HPUX 11
- using the vendor curses.
- + change configure script to produce test/Makefile from data
- file.
+ + update test programs to build/work with various UNIX curses
+ for comparisons.
Features of Ncurses
@@ -271,6 +283,8 @@
the use of function keys, e.g., disabling the ncurses KEY_MOUSE,
or by defining more than one control sequence to map to a given
key code.
+ * Support for 256-color terminals, such as modern xterm, when
+ configured using the --enable-ext-colors option.
* Support for 16-color terminals, such as aixterm and modern xterm.
* Better cursor-movement optimization. The package now features a
cursor-local-movement computation more efficient than either BSD's
@@ -342,49 +356,45 @@
cdk
Curses Development Kit
- [3]http://invisible-island.net/cdk/
- [4]http://www.vexus.ca/products/CDK/
+ [4]http://invisible-island.net/cdk/
+ [5]http://www.vexus.ca/products/CDK/
ded
directory-editor
- [5]http://invisible-island.net/ded/
+ [6]http://invisible-island.net/ded/
dialog
the underlying application used in Slackware's setup, and the
basis for similar applications on GNU/Linux.
- [6]http://invisible-island.net/dialog/
+ [7]http://invisible-island.net/dialog/
lynx
the character-screen WWW browser
- [7]http://lynx.isc.org/release/
+ [8]http://lynx.isc.org/release/
Midnight Commander
file manager
- [8]http://www.ibiblio.org/mc/
+ [9]http://www.ibiblio.org/mc/
mutt
mail utility
- [9]http://www.mutt.org/
+ [10]http://www.mutt.org/
ncftp
file-transfer utility
- [10]http://www.ncftp.com/
+ [11]http://www.ncftp.com/
nvi
New vi versions 1.50 are able to use ncurses versions 1.9.7 and
later.
- [11]http://www.bostic.com/vi/
+ [12]http://www.bostic.com/vi/
pinfo
Lynx-like info browser.
- [12]http://dione.ids.pl/~pborys/software/pinfo/
+ [13]https://alioth.debian.org/projects/pinfo/
tin
- newsreader, supporting color, MIME [13]http://www.tin.org/
-
- vh-1.6
- Volks-Hypertext browser for the Jargon File
- [14]http://www.debian.org/Packages/unstable/text/vh.html
+ newsreader, supporting color, MIME [14]http://www.tin.org/
as well as some that use ncurses for the terminfo support alone:
@@ -402,7 +412,7 @@
Who's Who and What's What
Zeyd Ben-Halim started it from a previous package pcurses, written by
- Pavel Curtis. Eric S. Raymond continued development. Juergen Pfeifer
+ Pavel Curtis. Eric S. Raymond continued development. Jürgen Pfeifer
wrote most of the form and menu libraries. Ongoing work is being done
by [17]Thomas Dickey. Thomas Dickey acts as the maintainer for the
Free Software Foundation, which holds the copyright on ncurses.
@@ -442,18 +452,18 @@ References
1. ftp://ftp.gnu.org/gnu/ncurses/
2. ftp://invisible-island.net/ncurses/
- 3. http://invisible-island.net/cdk/
- 4. http://www.vexus.ca/products/CDK/
- 5. http://invisible-island.net/ded/
- 6. http://invisible-island.net/dialog/
- 7. http://lynx.isc.org/release/
- 8. http://www.ibiblio.org/mc/
- 9. http://www.mutt.org/
- 10. http://www.ncftp.com/
- 11. http://www.bostic.com/vi/
- 12. http://dione.ids.pl/~pborys/software/pinfo/
- 13. http://www.tin.org/
- 14. http://www.debian.org/Packages/unstable/text/vh.html
+ 3. http://invisible-island.net/xterm/xterm.log.html#xterm_230
+ 4. http://invisible-island.net/cdk/
+ 5. http://www.vexus.ca/products/CDK/
+ 6. http://invisible-island.net/ded/
+ 7. http://invisible-island.net/dialog/
+ 8. http://lynx.isc.org/release/
+ 9. http://www.ibiblio.org/mc/
+ 10. http://www.mutt.org/
+ 11. http://www.ncftp.com/
+ 12. http://www.bostic.com/vi/
+ 13. https://alioth.debian.org/projects/pinfo/
+ 14. http://www.tin.org/
15. http://alioth.debian.org/projects/minicom/
16. http://invisible-island.net/vile/
17. mailto:dickey@invisible-island.net
diff --git a/INSTALL b/INSTALL
index 7917e299abae..ab7dcd829959 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-------------------------------------------------------------------------------
--- Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. --
+-- Copyright (c) 1998-2006,2008 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: INSTALL,v 1.124 2008/03/29 18:07:32 tom Exp $
+-- $Id: INSTALL,v 1.135 2008/11/02 21:13:51 tom Exp $
---------------------------------------------------------------------
How to install Ncurses/Terminfo on your system
---------------------------------------------------------------------
@@ -393,6 +393,18 @@ SUMMARY OF CONFIGURE OPTIONS:
Compile without scroll-hints code. This option is ignored when
hashmap scrolling is configured, which is the default.
+ --disable-tic-depends
+ When building shared libraries, normally the tic library is linked to
+ depend upon the ncurses library (and in turn, on the term-library if
+ the --with-termlib option was given). The tic- and term-libraries
+ ABI does not depend on the --enable-widec option. Some packagers have
+ used this to reduce the number of library files which are packaged
+ by using only one copy of those libraries. To make this work properly,
+ the tic library must be built without an explicit dependency on the
+ ncurses (or ncursesw) library. Use this configure option to do that.
+ For example
+ configure --with-ticlib --with-shared --disable-tic-depends
+
--disable-tparm-varargs
Portable programs should call tparm() using the fixed-length parameter
list documented in X/Open. ncurses provides varargs support for this
@@ -572,6 +584,13 @@ SUMMARY OF CONFIGURE OPTIONS:
--enable-warnings
Turn on GCC compiler warnings. There should be only a few.
+ --enable-weak-symbols
+ If the --with-pthread option is set, check if the compiler supports
+ weak-symbols. If it does, then name the thread-capable library without
+ the "t" (libncurses rather than libncursest), and provide for
+ dynamically loading the pthreads entrypoints at runtime. This allows
+ one to reduce the number of library files for ncurses.
+
--enable-wgetch-events
Compile with experimental wgetch-events code. See ncurses/README.IZ
@@ -598,6 +617,9 @@ SUMMARY OF CONFIGURE OPTIONS:
Normally this is the same as the release version; some ports have
special requirements for compatibility.
+ This option does not affect linking with libtool, which uses the
+ release major/minor numbers.
+
--with-ada-compiler=CMD
Specify the Ada95 compiler command (default "gnatmake")
@@ -625,20 +647,32 @@ SUMMARY OF CONFIGURE OPTIONS:
to do this if the target compiler has unusual flags which confuse the
host compiler.
+ You can also set the environment variable $BUILD_CFLAGS rather than
+ use this option.
+
--with-build-cppflags=XXX
If cross-compiling, specify the host C preprocessor-flags. You might
need to do this if the target compiler has unusual flags which confuse
the host compiler.
+ You can also set the environment variable $BUILD_CPPFLAGS rather than
+ use this option.
+
--with-build-ldflags=XXX
If cross-compiling, specify the host linker-flags. You might need to
do this if the target linker has unusual flags which confuse the host
compiler.
+ You can also set the environment variable $BUILD_LDFLAGS rather than
+ use this option.
+
--with-build-libs=XXX
If cross-compiling, the host libraries. You might need to do this if
the target environment requires unusual libraries.
+ You can also set the environment variable $BUILD_LIBS rather than
+ use this option.
+
--with-caps=XXX
Specify an alternate terminfo capabilities file, which makes the
configure script look for "include/Caps.XXX". A few systems, e.g.,
@@ -795,6 +829,14 @@ SUMMARY OF CONFIGURE OPTIONS:
may be unsigned. Use this option if you need to preserve compatibility
with 64-bit executables.
+ --with-normal
+ Generate normal (i.e., static) libraries (default).
+
+ Note: on Linux, the configure script will attempt to use the GPM
+ library via the dlsym() function call. Use --without-dlsym to disable
+ this feature, or --without-gpm, depending on whether you wish to use
+ GPM.
+
--with-ospeed=TYPE
Override type of ospeed variable, which is part of the termcap
compatibility interface. In termcap, this is a 'short', which works
@@ -808,14 +850,6 @@ SUMMARY OF CONFIGURE OPTIONS:
those using termcap, do not use the higher speeds. Your application
(or system, in general) may or may not.
- --with-normal
- Generate normal (i.e., static) libraries (default).
-
- Note: on Linux, the configure script will attempt to use the GPM
- library via the dlsym() function call. Use --without-dlsym to disable
- this feature, or --without-gpm, depending on whether you wish to use
- GPM.
-
--with-profile
Generate profile-libraries These are named by adding "_p" to the root,
e.g., libncurses_p.a
@@ -898,6 +932,12 @@ SUMMARY OF CONFIGURE OPTIONS:
library. As in termlib, there is no ABI difference between the
"wide" libticw.so and libtic.so
+ NOTE: Overriding the name of the tic library may be useful if you are
+ also using the --with-termlib option to rename libtinfo. If you are
+ not doing that, renaming the tic library can result in conflicting
+ library dependencies for tic and other programs built with the tic
+ library.
+
--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.
@@ -961,6 +1001,94 @@ COMPATIBILITY WITH OLDER VERSIONS OF NCURSES:
you may encounter when building a system with different versions of
ncurses:
+ 5.7 (November 2, 2008)
+ Interface changes:
+
+ + generate linkable stubs for some macros:
+ getattrs
+
+ + Add new library configuration for tic-library (the non-curses portion
+ of the ncurses library used for the tic program as well as some
+ others such as tack. There is no API change, but makefiles would be
+ changed to use the tic-library built separately.
+
+ tack, distributed separately from ncurses, uses some of the internal
+ _nc_XXX functions, which are declared in the tic.h header file.
+
+ The reason for providing this separate library is that none of the
+ functions in it are suitable for threaded applications.
+
+ + Add new library configuration (ncursest, ncurseswt) which provides
+ rudimentary support for POSIX threads. This introduces opaque
+ access functions to the WINDOW structure and adds a parameter to
+ several internal functions.
+
+ + move most internal variables (except tic-library) into data blocks
+ _nc_globals and _nc_prescreen to simplify analysis. Those were
+ globally accessible, but since they were not part of the documented
+ API, there is no ABI change.
+
+ + changed static tables of strings to be indices into long strings, to
+ improve startup performance. This changes parameter lists for some
+ of the internal functions.
+
+ Added extensions:
+
+ + add NCURSES_OPAQUE definition in curses.h to control whether internal
+ details of the WINDOW structure are visible to an application. This
+ is always defined when the threaded library is built, and is optional
+ otherwise. New functions for this: is_cleared, is_idcok, is_idlok,
+ is_immedok, is_keypad, is_leaveok, is_nodelay, is_notimeout,
+ is_scrollok, is_syncok, wgetparent and wgetscrreg.
+
+ + the threaded library (ncursest) also disallows direct updating of
+ global curses-level variables, providing functions (via macros) for
+ obtaining their value. A few of those variables can be modified by
+ the application, using new functions: set_escdelay, set_tabsize
+
+ + added functions use_window() and use_screen() which wrap a mutex
+ (if threading is configured) around a call to a user-supplied
+ function.
+
+ Added internal functions:
+ _nc_get_alias_table
+ _nc_get_screensize
+ _nc_keyname
+ _nc_screen_of
+ _nc_set_no_padding
+ _nc_tracechar
+ _nc_tracemouse
+ _nc_unctrl
+ _nc_ungetch
+
+ These are used for leak-testing, and are stubs for
+ ABI compatibility when ncurses is not configured for that
+ using the --disable-leaks configure script option:
+
+ _nc_free_and_exit
+ _nc_leaks_tinfo
+
+ Removed internal functions:
+ none
+
+ Modified internal functions:
+ _nc_fifo_dump
+ _nc_find_entry
+ _nc_handle_sigwinch
+ _nc_init_keytry
+ _nc_keypad
+ _nc_locale_breaks_acs
+ _nc_timed_wait
+ _nc_update_screensize
+
+ Use new typedef TRIES to replace "struct tries":
+
+ _nc_add_to_try
+ _nc_expand_try
+ _nc_remove_key
+ _nc_remove_string
+ _nc_trace_tries
+
5.6 (December 17, 2006)
Interface changes:
diff --git a/MANIFEST b/MANIFEST
index 62f052ff1801..db3871f2e11e 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -349,8 +349,10 @@
./doc/html/man/curs_instr.3x.html
./doc/html/man/curs_inwstr.3x.html
./doc/html/man/curs_kernel.3x.html
+./doc/html/man/curs_legacy.3x.html
./doc/html/man/curs_mouse.3x.html
./doc/html/man/curs_move.3x.html
+./doc/html/man/curs_opaque.3x.html
./doc/html/man/curs_outopts.3x.html
./doc/html/man/curs_overlay.3x.html
./doc/html/man/curs_pad.3x.html
@@ -364,6 +366,7 @@
./doc/html/man/curs_termattrs.3x.html
./doc/html/man/curs_termcap.3x.html
./doc/html/man/curs_terminfo.3x.html
+./doc/html/man/curs_threads.3x.html
./doc/html/man/curs_touch.3x.html
./doc/html/man/curs_trace.3x.html
./doc/html/man/curs_util.3x.html
@@ -555,6 +558,7 @@
./man/curs_inwstr.3x
./man/curs_kernel.3x
./man/curs_legacy.3x
+./man/curs_memleaks.3x
./man/curs_mouse.3x
./man/curs_move.3x
./man/curs_opaque.3x
@@ -700,6 +704,7 @@
./misc/ncurses-config.in
./misc/ncurses.def
./misc/ncurses.ref
+./misc/ncurses.supp
./misc/panel.def
./misc/panel.ref
./misc/run_tic.in
diff --git a/NEWS b/NEWS
index c5126da03699..a64450b30228 100644
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1233 2008/05/03 23:14:39 tom Exp $
+-- $Id: NEWS,v 1.1320 2008/11/02 00:56:22 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,238 @@ 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.
+20081102 5.7 release for upload to ftp.gnu.org
+
+20081025
+ + add a manpage to discuss memory leaks.
+ + add support for shared libraries for QNX (other than libtool, which
+ does not work well on that platform).
+ + build-fix for QNX C++ binding.
+
+20081018
+ + build-fixes for OS/2 EMX.
+ + modify form library to accept control characters such as newline
+ in set_field_buffer(), which is compatible with Solaris (report by
+ Nit Khair).
+ + modify configure script to assume --without-hashed-db when
+ --disable-database is used.
+ + add "-e" option in ncurses/Makefile.in when generating source-files
+ to force earlier exit if the build environment fails unexpectedly
+ (prompted by patch by Adrian Bunk).
+ + change configure script to use CF_UTF8_LIB, improved variant of
+ CF_LIBUTF8.
+
+20081012
+ + add teraterm4.59 terminfo entry, use that as primary teraterm entry, rename
+ original to teraterm2.3 -TD
+ + update "gnome" terminfo to 2.22.3 -TD
+ + update "konsole" terminfo to 1.6.6, needs today's fix for tic -TD
+ + add "aterm" terminfo -TD
+ + add "linux2.6.26" terminfo -TD
+ + add logic to tic for cancelling strings in user-defined capabilities,
+ overlooked til now.
+
+20081011
+ + update html documentation.
+ + add -m and -s options to test/keynames.c and test/key_names.c to test
+ the meta() function with keyname() or key_name(), respectively.
+ + correct return value of key_name() on error; it is null.
+ + document some unresolved issues for rpath and pthreads in TO-DO.
+ + fix a missing prototype for ioctl() on OpenBSD in tset.c
+ + add configure option --disable-tic-depends to make explicit whether
+ tic library depends on ncurses/ncursesw library, amends change from
+ 20080823 (prompted by Debian #501421).
+
+20081004
+ + some build-fixes for configure --disable-ext-funcs (incomplete, but
+ works for C/C++ parts).
+ + improve configure-check for awks unable to handle large strings, e.g.
+ AIX 5.1 whose awk silently gives up on large printf's.
+
+20080927
+ + fix build for --with-dmalloc by workaround for redefinition of
+ strndup between string.h and dmalloc.h
+ + fix build for --disable-sigwinch
+ + add environment variable NCURSES_GPM_TERMS to allow override to use
+ GPM on terminals other than "linux", etc.
+ + disable GPM mouse support when $TERM does not happen to contain
+ "linux", since Gpm_Open() no longer limits its assertion to terminals
+ that it might handle, e.g., within "screen" in xterm.
+ + reset mouse file-descriptor when unloading GPM library (report by
+ Miroslav Lichvar).
+ + fix build for --disable-leaks --enable-widec --with-termlib
+ > patch by Juergen Pfeifer:
+ + use improved initialization for soft-label keys in Ada95 sample code.
+ + discard internal symbol _nc_slk_format (unused since 20080112).
+ + move call of slk_paint_info() from _nc_slk_initialize() to
+ slk_intern_refresh(), improving initialization.
+
+20080925
+ + fix bug in mouse code for GPM from 20080920 changes (reported in
+ Debian #500103, also Miroslav Lichvar).
+
+20080920
+ + fix shared-library rules for cygwin with tic- and tinfo-libraries.
+ + fix a memory leak when failure to connect to GPM.
+ + correct check for notimeout() in wgetch() (report on linux.redhat
+ newsgroup by FurtiveBertie).
+ + add an example warning-suppression file for valgrind,
+ misc/ncurses.supp (based on example from Reuben Thomas)
+
+20080913
+ + change shared-library configuration for OpenBSD, make rpath work.
+ + build-fixes for using libutf8, e.g., on OpenBSD 3.7
+
+20080907
+ + corrected fix for --enable-weak-symbols (report by Frederic L W
+ Meunier).
+
+20080906
+ + corrected gcc options for building shared libraries on IRIX64.
+ + add configure check for awk programs unable to handle big-strings,
+ use that to improve the default for --enable-big-strings option.
+ + makefile-fixes for --enable-weak-symbols (report by Frederic L W
+ Meunier).
+ + update test/configure script.
+ + adapt ifdef's from library to make test/view.c build when mbrtowc()
+ is unavailable, e.g., with HPUX 10.20.
+ + add configure check for wcsrtombs, mbsrtowcs, which are used in
+ test/ncurses.c, and use wcstombs, mbstowcs instead if available,
+ fixing build of ncursew for HPUX 11.00
+
+20080830
+ + fixes to make Ada95 demo_panels() example work.
+ + modify Ada95 'rain' test program to accept keyboard commands like the
+ C-version.
+ + modify BeOS-specific ifdef's to build on Haiku (patch by Scott
+ Mccreary).
+ + add configure-check to see if the std namespace is legal for cerr
+ and endl, to fix a build issue with Tru64.
+ + consistently use NCURSES_BOOL in lib_gen.c
+ + filter #line's from lib_gen.c
+ + change delimiter in MKlib_gen.sh from '%' to '@', to avoid
+ substitution by IBM xlc to '#' as part of its extensions to digraphs.
+ + update config.guess, config.sub from
+ http://savannah.gnu.org/projects/config
+ (caveat - its maintainer removed support for older Linux systems).
+
+20080823
+ + modify configure check for pthread library to work with OSF/1 5.1,
+ which uses #define's to associate its header and library.
+ + use pthread_mutexattr_init() for initializing pthread_mutexattr_t,
+ makes threaded code work on HPUX 11.23
+ + fix a bug in demo_menus in freeing menus (cf: 20080804).
+ + modify configure script for the case where tic library is used (and
+ possibly renamed) to remove its dependency upon ncurses/ncursew
+ library (patch by Dr Werner Fink).
+ + correct manpage for menu_fore() which gave wrong default for
+ the attribute used to display a selected entry (report by Mike Gran).
+ + add Eterm-256color, Eterm-88color and rxvt-88color (prompted by
+ Debian #495815) -TD
+
+20080816
+ + add configure option --enable-weak-symbols to turn on new feature.
+ + add configure-check for availability of weak symbols.
+ + modify linkage with pthread library to use weak symbols so that
+ applications not linked to that library will not use the mutexes,
+ etc. This relies on gcc, and may be platform-specific (patch by Dr
+ Werner Fink).
+ + add note to INSTALL to document limitation of renaming of tic library
+ using the --with-ticlib configure option (report by Dr Werner Fink).
+ + document (in manpage) why tputs does not detect I/O errors (prompted
+ by comments by Samuel Thibault).
+ + fix remaining warnings from Klocwork report.
+
+20080804
+ + modify _nc_panelhook() data to account for a permanent memory leak.
+ + fix memory leaks in test/demo_menus
+ + fix most warnings from Klocwork tool (report by Larry Zhou).
+ + modify configure script CF_XOPEN_SOURCE macro to add case for
+ "dragonfly" from xterm #236 changes.
+ + modify configure script --with-hashed-db to let $LIBS override the
+ search for the db library (prompted by report by Samson Pierre).
+
+20080726
+ + build-fixes for gcc 4.3.1 (changes to gnat "warnings", and C inlining
+ thresholds).
+
+20080713
+ + build-fix (reports by Christian Ebert, Funda Wang).
+
+20080712
+ + compiler-warning fixes for Solaris.
+
+20080705
+ + use NCURSES_MOUSE_MASK() in definition of BUTTON_RELEASE(), etc., to
+ make those work properly with the "--enable-ext-mouse" configuration
+ (cf: 20050205).
+ + improve documentation of build-cc options in INSTALL.
+ + work-around a bug in gcc 4.2.4 on AIX, which does not pass the
+ -static/-dynamic flags properly to linker, causing test/bs to
+ not link.
+
+20080628
+ + correct some ifdef's needed for the broken-linker configuration.
+ + make debugging library's $BAUDRATE feature work for termcap
+ interface.
+ + make $NCURSES_NO_PADDING feature work for termcap interface (prompted
+ by comment on FreeBSD mailing list).
+ + add screen.mlterm terminfo entry -TD
+ + improve mlterm and mlterm+pcfkeys terminfo entries -TD
+
+20080621
+ + regenerated html documentation.
+ + expand manpage description of parameters for form_driver() and
+ menu_driver() (prompted by discussion with Adam Spragg).
+ + add null-pointer checks for cur_term in baudrate() and
+ def_shell_mode(), def_prog_mode()
+ + fix some memory leaks in delscreen() and wide acs.
+
+20080614
+ + modify test/ditto.c to illustrate multi-threaded use_screen().
+ + change CC_SHARED_OPTS from -KPIC to -xcode=pic32 for Solaris.
+ + add "-shared" option to MK_SHARED_LIB for gcc on Solaris (report
+ by Poor Yorick).
+
+20080607
+ + finish changes to wgetch(), making it switch as needed to the
+ window's actual screen when calling wrefresh() and wgetnstr(). That
+ allows wgetch() to get used concurrently in different threads with
+ some minor restrictions, e.g., the application should not delete a
+ window which is being used in a wgetch().
+ + simplify mutex's, combining the window- and screen-mutex's.
+
+20080531
+ + modify wgetch() to use the screen which corresponds to its window
+ parameter rather than relying on SP; some dependent functions still
+ use SP internally.
+ + factor out most use of SP in lib_mouse.c, using parameter.
+ + add internal _nc_keyname(), replacing keyname() to associate with a
+ particular SCREEN rather than the global SP.
+ + add internal _nc_unctrl(), replacing unctrl() to associate with a
+ particular SCREEN rather than the global SP.
+ + add internal _nc_tracemouse(), replacing _tracemouse() to eliminate
+ its associated global buffer _nc_globals.tracemse_buf now in SCREEN.
+ + add internal _nc_tracechar(), replacing _tracechar() to use SCREEN in
+ preference to the global _nc_globals.tracechr_buf buffer.
+
+20080524
+ + modify _nc_keypad() to make it switch temporarily as needed to the
+ screen which must be updated.
+ + wrap cur_term variable to help make _nc_keymap() thread-safe, and
+ always set the screen's copy of this variable in set_curterm().
+ + restore curs_set() state after endwin()/refresh() (report/patch
+ Miroslav Lichvar)
+
+20080517
+ + modify configure script to note that --enable-ext-colors and
+ --enable-ext-mouse are not experimental, but extensions from
+ the ncurses ABI 5.
+ + corrected manpage description of setcchar() (discussion with
+ Emanuele Giaquinta).
+ + fix for adding a non-spacing character at the beginning of a line
+ (report/patch by Miroslav Lichvar).
+
20080503
+ modify screen.* terminfo entries using new screen+fkeys to fix
overridden keys in screen.rxvt (Debian #478094) -TD
@@ -375,7 +607,7 @@ it is not possible to add this information.
20070609
+ add test/key_name.c
- + add stdscr cases to test/inchs.c and test_inch_wide.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().
@@ -596,7 +828,7 @@ it is not possible to add this information.
shared libraries on Darwin (report by Michail Vidiassov).
20070210
- + add test/inchs.c, test_inch_wide.c, to test win_wchnstr().
+ + 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
diff --git a/TO-DO b/TO-DO
index 22acd0f1f3c6..ca47d02d0ec8 100644
--- a/TO-DO
+++ b/TO-DO
@@ -1,5 +1,5 @@
-------------------------------------------------------------------------------
--- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. --
+-- Copyright (c) 1998-2007,2008 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.49 2007/02/03 16:29:17 tom Exp $
+-- $Id: TO-DO,v 1.51 2008/10/11 19:22:27 tom Exp $
-------------------------------------------------------------------------------
SHORT-TERM TO-DO ITEMS:
@@ -61,6 +61,17 @@ Known Problems:
+ vid_attr() should support the set_a_attributes (sgr1) string, but does not.
There appear to be no terminals that require that functionality.
++ the configure --disable-ext-funcs option does not work for Ada95 tree.
+
++ the --with-pthread configuration builds for Cygwin, but does not work
+ properly (test/worm.c shows all of the worms in the same location).
+
++ the --enable-rpath configure option builds for the corresponding platforms;
+ however combining it with --with-ticlib and --with-termlib does not always
+ produce libraries that can be run without setting environment variables.
+ Building those with libtool does not work either. (This is a problem with
+ the BSD platforms).
+
Portability (or lack thereof):
+ Users of older System V UNIXes (but not Solaris, and probably not SVr4) may
diff --git a/aclocal.m4 b/aclocal.m4
index faba48922c24..4c8e818f2403 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: aclocal.m4,v 1.447 2008/04/12 23:49:55 tom Exp $
+dnl $Id: aclocal.m4,v 1.470 2008/10/25 22:15:32 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@@ -261,6 +261,28 @@ if test -n "$1" ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_ADD_SUBDIR_PATH version: 2 updated: 2007/07/29 10:12:59
+dnl ------------------
+dnl Append to a search-list for a nonstandard header/lib-file
+dnl $1 = the variable to return as result
+dnl $2 = the package name
+dnl $3 = the subdirectory, e.g., bin, include or lib
+dnl $4 = the directory under which we will test for subdirectories
+dnl $5 = a directory that we do not want $4 to match
+AC_DEFUN([CF_ADD_SUBDIR_PATH],
+[
+test "$4" != "$5" && \
+test -d "$4" && \
+ifelse([$5],NONE,,[(test $5 = NONE || test -d $5) &&]) {
+ test -n "$verbose" && echo " ... testing for $3-directories under $4"
+ test -d $4/$3 && $1="[$]$1 $4/$3"
+ test -d $4/$3/$2 && $1="[$]$1 $4/$3/$2"
+ test -d $4/$3/$2/$3 && $1="[$]$1 $4/$3/$2/$3"
+ test -d $4/$2/$3 && $1="[$]$1 $4/$2/$3"
+ test -d $4/$2/$3/$2 && $1="[$]$1 $4/$2/$3/$2"
+}
+])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'
@@ -331,6 +353,30 @@ You have the following choices:
fi
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_AWK_BIG_PRINTF version: 2 updated: 2008/10/04 17:16:18
+dnl -----------------
+dnl Check if awk can handle big strings using printf. Some older versions of
+dnl awk choke on large strings passed via "%s".
+dnl
+dnl $1 = desired string size
+dnl $2 = variable to set with result
+AC_DEFUN([CF_AWK_BIG_PRINTF],
+[
+ case x$AWK in #(vi
+ x)
+ eval $2=no
+ ;;
+ *) #(vi
+ if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < $1) { xx = xx "x"; }; printf("%s\n", xx); }' \
+ | $AWK '{ printf "%d\n", length([$]0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
+ eval $2=yes
+ else
+ eval $2=no
+ fi
+ ;;
+ esac
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_BOOL_DECL version: 8 updated: 2004/01/30 15:51:18
dnl ------------
dnl Test if 'bool' is a builtin type in the configured C++ compiler. Some
@@ -649,13 +695,14 @@ if test ".$system_name" != ".$cf_cv_system_name" ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_ERRNO version: 9 updated: 2001/12/30 18:03:23
+dnl CF_CHECK_ERRNO version: 10 updated: 2008/08/22 16:33:22
dnl --------------
dnl Check for data that is usually declared in <stdio.h> or <errno.h>, e.g.,
dnl the 'errno' variable. Define a DECL_xxx symbol if we must declare it
dnl ourselves.
dnl
dnl $1 = the name to check
+dnl $2 = the assumed type
AC_DEFUN([CF_CHECK_ERRNO],
[
AC_CACHE_CHECK(if external $1 is declared, cf_cv_dcl_$1,[
@@ -666,7 +713,7 @@ AC_CACHE_CHECK(if external $1 is declared, cf_cv_dcl_$1,[
#include <stdio.h>
#include <sys/types.h>
#include <errno.h> ],
- [long x = (long) $1],
+ ifelse($2,,int,$2) x = (ifelse($2,,int,$2)) $1,
[cf_cv_dcl_$1=yes],
[cf_cv_dcl_$1=no])
])
@@ -677,7 +724,7 @@ if test "$cf_cv_dcl_$1" = no ; then
fi
# It's possible (for near-UNIX clones) that the data doesn't exist
-CF_CHECK_EXTERN_DATA($1,int)
+CF_CHECK_EXTERN_DATA($1,ifelse($2,,int,$2))
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_CHECK_EXTERN_DATA version: 3 updated: 2001/12/30 18:03:23
@@ -920,6 +967,20 @@ if test "$with_no_leaks" = yes ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_ENABLE_RPATH version: 1 updated: 2008/09/13 10:22:30
+dnl ---------------
+dnl Check if the rpath option should be used, setting cache variable
+dnl cf_cv_ld_rpath if so.
+AC_DEFUN([CF_ENABLE_RPATH],
+[
+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)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_ERRNO version: 5 updated: 1997/11/30 12:44:39
dnl --------
dnl Check if 'errno' is declared in <errno.h>
@@ -958,6 +1019,118 @@ AC_MSG_RESULT($cf_result)
CXXFLAGS="$cf_save_CXXFLAGS"
])
dnl ---------------------------------------------------------------------------
+dnl CF_FIND_LINKAGE version: 12 updated: 2007/07/29 20:13:53
+dnl ---------------
+dnl Find a library (specifically the linkage used in the code fragment),
+dnl searching for it if it is not already in the library path.
+dnl See also CF_ADD_SEARCHPATH.
+dnl
+dnl Parameters (4-on are optional):
+dnl $1 = headers for library entrypoint
+dnl $2 = code fragment for library entrypoint
+dnl $3 = the library name without the "-l" option or ".so" suffix.
+dnl $4 = action to perform if successful (default: update CPPFLAGS, etc)
+dnl $5 = action to perform if not successful
+dnl $6 = module name, if not the same as the library name
+dnl $7 = extra libraries
+dnl
+dnl Sets these variables:
+dnl $cf_cv_find_linkage_$3 - yes/no according to whether linkage is found
+dnl $cf_cv_header_path_$3 - include-directory if needed
+dnl $cf_cv_library_path_$3 - library-directory if needed
+dnl $cf_cv_library_file_$3 - library-file if needed, e.g., -l$3
+AC_DEFUN([CF_FIND_LINKAGE],[
+
+# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
+# will be set on completion of the AC_TRY_LINK below.
+cf_cv_header_path_$3=
+cf_cv_library_path_$3=
+
+CF_MSG_LOG([Starting [FIND_LINKAGE]($3,$6)])
+
+AC_TRY_LINK([$1],[$2],
+ cf_cv_find_linkage_$3=yes,[
+ cf_cv_find_linkage_$3=no
+
+ CF_MSG_LOG([Searching for headers in [FIND_LINKAGE]($3,$6)])
+
+ cf_save_CPPFLAGS="$CPPFLAGS"
+ cf_test_CPPFLAGS="$CPPFLAGS"
+
+ CF_HEADER_PATH(cf_search,ifelse([$6],,[$3],[$6]))
+ for cf_cv_header_path_$3 in $cf_search
+ do
+ if test -d $cf_cv_header_path_$3 ; then
+ CF_VERBOSE(... testing $cf_cv_header_path_$3)
+ CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_$3"
+ AC_TRY_COMPILE([$1],[$2],[
+ CF_VERBOSE(... found $3 headers in $cf_cv_header_path_$3)
+ cf_cv_find_linkage_$3=maybe
+ cf_test_CPPFLAGS="$CPPFLAGS"
+ break],[
+ CPPFLAGS="$cf_save_CPPFLAGS"
+ ])
+ fi
+ done
+
+ if test "$cf_cv_find_linkage_$3" = maybe ; then
+
+ CF_MSG_LOG([Searching for $3 library in [FIND_LINKAGE]($3,$6)])
+
+ cf_save_LIBS="$LIBS"
+ cf_save_LDFLAGS="$LDFLAGS"
+
+ ifelse([$6],,,[
+ CPPFLAGS="$cf_test_CPPFLAGS"
+ LIBS="-l$3 $7 $cf_save_LIBS"
+ AC_TRY_LINK([$1],[$2],[
+ CF_VERBOSE(... found $3 library in system)
+ cf_cv_find_linkage_$3=yes])
+ CPPFLAGS="$cf_save_CPPFLAGS"
+ LIBS="$cf_save_LIBS"
+ ])
+
+ if test "$cf_cv_find_linkage_$3" != yes ; then
+ CF_LIBRARY_PATH(cf_search,$3)
+ for cf_cv_library_path_$3 in $cf_search
+ do
+ if test -d $cf_cv_library_path_$3 ; then
+ CF_VERBOSE(... testing $cf_cv_library_path_$3)
+ CPPFLAGS="$cf_test_CPPFLAGS"
+ LIBS="-l$3 $7 $cf_save_LIBS"
+ LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_$3"
+ AC_TRY_LINK([$1],[$2],[
+ CF_VERBOSE(... found $3 library in $cf_cv_library_path_$3)
+ cf_cv_find_linkage_$3=yes
+ cf_cv_library_file_$3="-l$3"
+ break],[
+ CPPFLAGS="$cf_save_CPPFLAGS"
+ LIBS="$cf_save_LIBS"
+ LDFLAGS="$cf_save_LDFLAGS"
+ ])
+ fi
+ done
+ LIBS="$cf_save_LIBS"
+ CPPFLAGS="$cf_save_CPPFLAGS"
+ LDFLAGS="$cf_save_LDFLAGS"
+ fi
+
+ else
+ cf_cv_find_linkage_$3=no
+ fi
+ ],$7)
+
+if test "$cf_cv_find_linkage_$3" = yes ; then
+ifelse([$4],,[
+ CF_ADD_INCDIR($cf_cv_header_path_$3)
+ CF_ADD_LIBDIR($cf_cv_library_path_$3)
+ LIBS="-l$3 $LIBS"
+],[$4])
+else
+ifelse([$5],,AC_MSG_WARN(Cannot find $3 library),[$5])
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_FUNC_DLSYM version: 1 updated: 2004/06/16 20:52:45
dnl -------------
dnl Test for dlsym() and related functions, as well as libdl.
@@ -1278,7 +1451,7 @@ if test "$GCC" = yes ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 22 updated: 2007/07/29 09:55:12
+dnl CF_GCC_WARNINGS version: 23 updated: 2008/07/26 17:54:02
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:
@@ -1373,7 +1546,7 @@ then
;;
Winline) #(vi
case $GCC_VERSION in
- 3.3*)
+ [[34]].*)
CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
continue;;
esac
@@ -1715,7 +1888,7 @@ fi
])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_HASHED_DB_LIBS version: 7 updated: 2007/12/01 15:01:37
+dnl CF_HASHED_DB_LIBS version: 8 updated: 2008/08/04 06:18:06
dnl -----------------
dnl Given that we have the header and version for hashed database, find the
dnl library information.
@@ -1723,7 +1896,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-$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
@@ -1825,6 +1998,27 @@ done
])
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_HEADER_PATH version: 8 updated: 2002/11/10 14:46:59
+dnl --------------
+dnl Construct a search-list for a nonstandard header-file
+AC_DEFUN([CF_HEADER_PATH],
+[CF_SUBDIR_PATH($1,$2,include)
+test "$includedir" != NONE && \
+test "$includedir" != "/usr/include" && \
+test -d "$includedir" && {
+ test -d $includedir && $1="[$]$1 $includedir"
+ test -d $includedir/$2 && $1="[$]$1 $includedir/$2"
+}
+
+test "$oldincludedir" != NONE && \
+test "$oldincludedir" != "/usr/include" && \
+test -d "$oldincludedir" && {
+ test -d $oldincludedir && $1="[$]$1 $oldincludedir"
+ test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2"
+}
+
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
dnl ---------------
dnl Insert text into the help-message, for readability, from AC_ARG_WITH.
@@ -1949,7 +2143,7 @@ ifdef([AC_FUNC_FSEEKO],[
])
])
dnl ---------------------------------------------------------------------------
-dnl CF_LDFLAGS_STATIC version: 2 updated: 2007/04/28 15:25:27
+dnl CF_LDFLAGS_STATIC version: 4 updated: 2008/10/18 17:58:20
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
@@ -1958,8 +2152,16 @@ dnl the list of linker options and libraries.
AC_DEFUN([CF_LDFLAGS_STATIC],[
if test "$GCC" = yes ; then
- LDFLAGS_STATIC=-static
- LDFLAGS_SHARED=-dynamic
+ case $cf_cv_system_name in #(
+ OS/2*|os2*|aix[[45]]*) #( vi
+ LDFLAGS_STATIC=
+ LDFLAGS_SHARED=
+ ;;
+ *) #( normally, except when broken
+ LDFLAGS_STATIC=-static
+ LDFLAGS_SHARED=-dynamic
+ ;;
+ esac
else
case $cf_cv_system_name in #(
aix[[45]]*) #( from ld manpage
@@ -1991,43 +2193,30 @@ 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
-AC_DEFUN([CF_LIBUTF8],
-[
-AC_CACHE_CHECK(for putwc in libutf8,cf_cv_libutf8,[
- cf_save_LIBS="$LIBS"
- LIBS="-lutf8 $LIBS"
-AC_TRY_LINK([
-#include <libutf8.h>],[putwc(0,0);],
- [cf_cv_libutf8=yes],
- [cf_cv_libutf8=no])
- LIBS="$cf_save_LIBS"
-])
-
-if test "$cf_cv_libutf8" = yes ; then
- AC_DEFINE(HAVE_LIBUTF8_H)
- LIBS="-lutf8 $LIBS"
-fi
-])dnl
+dnl CF_LIBRARY_PATH version: 7 updated: 2002/11/10 14:46:59
+dnl ---------------
+dnl Construct a search-list for a nonstandard library-file
+AC_DEFUN([CF_LIBRARY_PATH],
+[CF_SUBDIR_PATH($1,$2,lib)])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_LIB_PREFIX version: 7 updated: 2001/01/12 01:23:48
+dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16
dnl -------------
dnl Compute the library-prefix for the given host system
dnl $1 = variable to set
AC_DEFUN([CF_LIB_PREFIX],
[
- case $cf_cv_system_name in
- OS/2*) LIB_PREFIX='' ;;
- os2*) LIB_PREFIX='' ;;
- *) LIB_PREFIX='lib' ;;
+ case $cf_cv_system_name in #(vi
+ OS/2*|os2*) #(vi
+ LIB_PREFIX=''
+ ;;
+ *) LIB_PREFIX='lib'
+ ;;
esac
ifelse($1,,,[$1=$LIB_PREFIX])
AC_SUBST(LIB_PREFIX)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_LIB_RULES version: 50 updated: 2007/03/24 18:26:59
+dnl CF_LIB_RULES version: 53 updated: 2008/09/20 19:51: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
@@ -2044,6 +2233,12 @@ AC_DEFUN([CF_LIB_RULES],
[
CF_LIB_PREFIX(cf_prefix)
AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
+
+if test $cf_cv_shlib_version = cygdll ; then
+ TINFO_NAME=$TINFO_ARG_SUFFIX
+ TINFO_SUFFIX=.dll
+fi
+
for cf_dir in $SRC_SUBDIRS
do
if test ! -d $srcdir/$cf_dir ; then
@@ -2054,7 +2249,7 @@ do
LIBS_TO_MAKE=
for cf_item in $cf_LIST_MODELS
do
- CF_LIB_SUFFIX($cf_item,cf_suffix)
+ CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf)
if test $cf_item = shared ; then
if test "$cf_cv_do_symlinks" = yes ; then
case "$cf_cv_shlib_version" in #(vi
@@ -2096,7 +2291,8 @@ 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
- LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}\${ABI_VERSION}.dll"
+ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
+ LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}${cf_cygsuf}"
continue
fi
fi
@@ -2106,24 +2302,28 @@ do
if test $cf_dir = ncurses ; then
cf_subsets="$LIB_SUBSETS"
cf_r_parts="$cf_subsets"
+ cf_liblist="$LIBS_TO_MAKE"
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
+ cf_item=
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`
+ cf_item=`echo $cf_liblist |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`
+ cf_item=`echo $cf_liblist |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g`
;;
*)
break
;;
esac
- LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
+ if test -n "$cf_item"; then
+ LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
+ fi
else
break
fi
@@ -2148,7 +2348,7 @@ do
do
echo "Appending rules for ${cf_item} model (${cf_dir}: ${cf_subset})"
CF_UPPER(cf_ITEM,$cf_item)
- CF_LIB_SUFFIX($cf_item,cf_suffix)
+ CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf)
CF_OBJ_SUBDIR($cf_item,cf_subdir)
# Test for case where we build libtinfo with a different name.
@@ -2156,22 +2356,21 @@ do
if test $cf_dir = ncurses ; then
case $cf_subset in
*base*)
+ cf_libname=${cf_libname}$LIB_SUFFIX
;;
*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
+ else
+ cf_libname=${cf_libname}$LIB_SUFFIX
+ fi
+ 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
# These dependencies really are for development, not
@@ -2480,34 +2679,62 @@ fi
])
])
dnl ---------------------------------------------------------------------------
-dnl CF_LIB_SUFFIX version: 13 updated: 2003/11/01 16:09:07
+dnl CF_LIB_SUFFIX version: 15 updated: 2008/09/13 11:54:48
dnl -------------
dnl Compute the library file-suffix from the given model name
dnl $1 = model name
-dnl $2 = variable to set
+dnl $2 = variable to set (the nominal library suffix)
+dnl $3 = dependency variable to set (actual filename)
dnl The variable $LIB_SUFFIX, if set, prepends the variable to set.
AC_DEFUN([CF_LIB_SUFFIX],
[
AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
case $1 in
- libtool) $2='.la' ;;
- normal) $2='.a' ;;
- debug) $2='_g.a' ;;
- profile) $2='_p.a' ;;
+ libtool)
+ $2='.la'
+ $3=[$]$2
+ ;;
+ normal)
+ $2='.a'
+ $3=[$]$2
+ ;;
+ debug)
+ $2='_g.a'
+ $3=[$]$2
+ ;;
+ profile)
+ $2='_p.a'
+ $3=[$]$2
+ ;;
shared)
case $cf_cv_system_name in
- cygwin*) $2='.dll' ;;
- darwin*) $2='.dylib' ;;
+ cygwin*)
+ $2='.dll'
+ $3='.dll.a'
+ ;;
+ darwin*)
+ $2='.dylib'
+ $3=[$]$2
+ ;;
hpux*)
case $target in
- ia64*) $2='.so' ;;
- *) $2='.sl' ;;
+ ia64*)
+ $2='.so'
+ $3=[$]$2
+ ;;
+ *)
+ $2='.sl'
+ $3=[$]$2
+ ;;
esac
;;
- *) $2='.so' ;;
+ *) $2='.so'
+ $3=[$]$2
+ ;;
esac
esac
test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
+ test -n "$LIB_SUFFIX" && $3="${LIB_SUFFIX}[$]{$3}"
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_LIB_TYPE version: 4 updated: 2000/10/20 22:57:49
@@ -3869,7 +4096,7 @@ define([CF_REMOVE_LIB],
$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 CF_RPATH_HACK version: 4 updated: 2008/09/13 12:53:26
dnl -------------
AC_DEFUN([CF_RPATH_HACK],
[
@@ -3881,48 +4108,46 @@ 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,"
- ;;
+ cf_rpath_hack="-Wl,-rpath,"
+ ;;
-R\ *)
- cf_rpath_hack="-R "
- ;;
+ cf_rpath_hack="-R "
+ ;;
-R*)
- cf_rpath_hack="-R"
- ;;
+ cf_rpath_hack="-R"
+ ;;
*)
- cf_rpath_hack=
- ;;
+ 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)
+ 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"
+ ;;
+ esac
+ cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
+ 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: 47 updated: 2008/03/23 14:48:54
+dnl CF_SHARED_OPTS version: 53 updated: 2008/10/25 18:14:20
dnl --------------
dnl --------------
dnl Attempt to determine the appropriate CC/LD options for creating a shared
@@ -4057,8 +4282,10 @@ CF_EOF
# tested with IRIX 5.2 and 'cc'.
if test "$GCC" != yes; then
CC_SHARED_OPTS='-KPIC'
+ MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $[@]` -o $[@]'
+ else
+ MK_SHARED_LIB='${CC} -shared -Wl,-soname,`basename $[@]` -o $[@]'
fi
- MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $[@]` -o $[@]'
cf_cv_rm_so_locs=yes
;;
linux*|gnu*|k*bsd*-gnu)
@@ -4071,13 +4298,22 @@ CF_EOF
EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
fi
CF_SHARED_SONAME
- MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,-lc -o $[@]'
+ MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
;;
openbsd[[2-9]].*)
+ if test "$DFT_LWR_MODEL" = "shared" ; then
+ LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ fi
+ if test "$cf_cv_ld_rpath" = yes ; then
+ cf_ld_rpath_opt="-Wl,-rpath,"
+ EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
+ fi
CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
- MK_SHARED_LIB='${LD} -Bshareable -soname,`basename $[@].${ABI_VERSION}` -o $[@]'
+ CF_SHARED_SONAME
+ MK_SHARED_LIB='${CC} ${CFLAGS} -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
;;
- openbsd*|freebsd[[12]].*)
+ nto-qnx*|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
@@ -4108,7 +4344,7 @@ CF_EOF
fi
fi
CF_SHARED_SONAME
- MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname' -o $[@]'
+ MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
else
MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
fi
@@ -4158,9 +4394,7 @@ CF_EOF
;;
solaris2*)
# tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2
- if test "$GCC" != yes; then
- CC_SHARED_OPTS='-KPIC'
- fi
+ # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3
if test "$DFT_LWR_MODEL" = "shared" ; then
LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}"
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
@@ -4170,7 +4404,12 @@ CF_EOF
EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
fi
CF_SHARED_SONAME
- MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $[@]'
+ if test "$GCC" != yes; then
+ CC_SHARED_OPTS='-xcode=pic32'
+ MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+ else
+ MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+ fi
;;
sysv5uw7*|unix_sv*)
# tested with UnixWare 7.1.0 (gcc 2.95.2 and cc)
@@ -4221,9 +4460,9 @@ CF_EOF
AC_SUBST(INSTALL_LIB)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_SONAME version: 2 updated: 2006/10/21 12:33:41
+dnl CF_SHARED_SONAME version: 3 updated: 2008/09/08 18:34:43
dnl ----------------
-dnl utility macro for CF_SHARED_OPTS, constructs "$cf_shared_soname" for
+dnl utility macro for CF_SHARED_OPTS, constructs "$cf_cv_shared_soname" for
dnl substitution into MK_SHARED_LIB string for the "-soname" (or similar)
dnl option.
dnl
@@ -4233,9 +4472,9 @@ define([CF_SHARED_SONAME],
[
test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=ifelse($1,,rel,$1)
if test "$cf_cv_shlib_version" = rel; then
- cf_shared_soname='`basename $[@] .${REL_VERSION}`.${ABI_VERSION}'
+ cf_cv_shared_soname='`basename $[@] .${REL_VERSION}`.${ABI_VERSION}'
else
- cf_shared_soname='`basename $[@]`'
+ cf_cv_shared_soname='`basename $[@]`'
fi
])
dnl ---------------------------------------------------------------------------
@@ -4607,6 +4846,22 @@ if test "$ac_cv_header_termios_h" = yes ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_SUBDIR_PATH version: 5 updated: 2007/07/29 09:55:12
+dnl --------------
+dnl Construct a search-list for a nonstandard header/lib-file
+dnl $1 = the variable to return as result
+dnl $2 = the package name
+dnl $3 = the subdirectory, e.g., bin, include or lib
+AC_DEFUN([CF_SUBDIR_PATH],
+[$1=""
+
+CF_ADD_SUBDIR_PATH($1,$2,$3,/usr,$prefix)
+CF_ADD_SUBDIR_PATH($1,$2,$3,$prefix,NONE)
+CF_ADD_SUBDIR_PATH($1,$2,$3,/usr/local,$prefix)
+CF_ADD_SUBDIR_PATH($1,$2,$3,/opt,$prefix)
+CF_ADD_SUBDIR_PATH($1,$2,$3,[$]HOME,$prefix)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_SUBST version: 4 updated: 2006/06/17 12:33:03
dnl --------
dnl Shorthand macro for substituting things that the user may override
@@ -4793,6 +5048,32 @@ AC_DEFUN([CF_UPPER],
$1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_UTF8_LIB version: 5 updated: 2008/10/17 19:37:52
+dnl -----------
+dnl Check for multibyte support, and if not found, utf8 compatibility library
+AC_DEFUN([CF_UTF8_LIB],
+[
+AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
+ cf_save_LIBS="$LIBS"
+ AC_TRY_LINK([
+#include <stdlib.h>],[putwc(0,0);],
+ [cf_cv_utf8_lib=yes],
+ [CF_FIND_LINKAGE([
+#include <libutf8.h>],[putwc(0,0);],utf8,
+ [cf_cv_utf8_lib=add-on],
+ [cf_cv_utf8_lib=no])
+])])
+
+# HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
+# ncurses/ncursesw:
+if test "$cf_cv_utf8_lib" = "add-on" ; then
+ AC_DEFINE(HAVE_LIBUTF8_H)
+ CF_ADD_INCDIR($cf_cv_header_path_utf8)
+ CF_ADD_LIBDIR($cf_cv_library_path_utf8)
+ LIBS="-lutf8 $LIBS"
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_VERBOSE version: 3 updated: 2007/07/29 09:55:12
dnl ----------
dnl Use AC_VERBOSE w/o the warnings
@@ -4851,6 +5132,32 @@ fi
])
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_WEAK_SYMBOLS version: 1 updated: 2008/08/16 19:18:06
+dnl ---------------
+dnl Check for compiler-support for weak symbols.
+dnl This works with "recent" gcc.
+AC_DEFUN([CF_WEAK_SYMBOLS],[
+AC_CACHE_CHECK(if $CC supports weak symbols,cf_cv_weak_symbols,[
+
+AC_TRY_COMPILE([
+#include <stdio.h>],
+[
+#if defined(__GNUC__)
+# if defined __USE_ISOC99
+# define _cat_pragma(exp) _Pragma(#exp)
+# define _weak_pragma(exp) _cat_pragma(weak name)
+# else
+# define _weak_pragma(exp)
+# endif
+# define _declare(name) __extension__ extern __typeof__(name) name
+# define weak_symbol(name) _weak_pragma(name) _declare(name) __attribute__((weak))
+#endif
+
+weak_symbol(fopen);
+],[cf_cv_weak_symbols=yes],[cf_cv_weak_symbols=no])
+])
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_WITH_ABI_VERSION version: 1 updated: 2003/09/20 18:12:49
dnl -------------------
dnl Allow library's ABI to be overridden. Generally this happens when a
@@ -5128,7 +5435,7 @@ AC_SUBST($3)dnl
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_PTHREAD version: 1 updated: 2008/03/29 13:42:21
+dnl CF_WITH_PTHREAD version: 2 updated: 2008/08/23 18:26:05
dnl ---------------
dnl Check for POSIX thread library.
AC_DEFUN([CF_WITH_PTHREAD],
@@ -5143,13 +5450,24 @@ AC_MSG_RESULT($with_pthread)
if test "$with_pthread" != no ; then
AC_CHECK_HEADER(pthread.h,[
AC_DEFINE(HAVE_PTHREADS_H)
- AC_CHECK_LIB(pthread,pthread_create,[
+
+ AC_MSG_CHECKING(if we can link with the pthread library)
+ cf_save_LIBS="$LIBS"
+ LIBS="-lpthread $LIBS"
+ AC_TRY_LINK([
+#include <pthread.h>
+],[
+ int rc = pthread_create(0,0,0,0);
+],[with_pthread=yes],[with_pthread=no])
+ LIBS="$cf_save_LIBS"
+ AC_MSG_RESULT($with_pthread)
+
+ if test "$with_pthread" = yes ; then
LIBS="-lpthread $LIBS"
AC_DEFINE(HAVE_LIBPTHREADS)
- with_pthread=yes
- ],[
+ else
AC_MSG_ERROR(Cannot link with pthread library)
- ])
+ fi
])
fi
])
@@ -5217,7 +5535,7 @@ CF_NO_LEAKS_OPTION(valgrind,
[USE_VALGRIND])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 25 updated: 2007/01/29 18:36:38
+dnl CF_XOPEN_SOURCE version: 26 updated: 2008/07/27 11:26:57
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,
@@ -5237,7 +5555,7 @@ case $host_os in #(vi
aix[[45]]*) #(vi
CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
;;
-freebsd*) #(vi
+freebsd*|dragonfly*) #(vi
# 5.x headers associate
# _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
# _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
diff --git a/announce.html.in b/announce.html.in
index 84d5bbe127c7..1d4121ee4ff1 100644
--- a/announce.html.in
+++ b/announce.html.in
@@ -1,8 +1,8 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
<!--
- $Id: announce.html.in,v 1.64 2006/12/17 23:31:26 tom Exp $
+ $Id: announce.html.in,v 1.70 2008/11/02 01:03:05 tom Exp $
****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,2008 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 *
@@ -69,185 +69,170 @@ the GNU distribution site
<H1>Release Notes</H1>
-This release is designed to be upward compatible from ncurses 5.0 through 5.5;
+This release is designed to be upward compatible from ncurses 5.0 through 5.6;
very few applications will require recompilation, depending on the platform.
-These are the highlights from the change-log since ncurses 5.5 release.
+These are the highlights from the change-log since ncurses 5.6 release.
<p>
Interface changes:
<ul>
<li>generate linkable stubs for some macros:
<br>
- getbegx, getbegy, getcurx, getcury, getmaxx, getmaxy, getparx,
- getpary, getpary,
- <br>
- and (for libncursesw)
- <br>
- wgetbkgrnd
+ getattrs
</ul>
New features and improvements:
<ul>
<li>library
<ul>
- <li>support hashed databases for the terminal descriptions.
- This uses the Berkeley database, has been tested for
- several versions on different platforms.
-
- <li>add <code>use_legacy_coding()</code> function to support
- lynx's font-switching feature.
-
- <li>add extension <code>nofilter()</code>, to cancel a prior
- <code>filter()</code> call.
-
- <li>add/install a package config script, e.g.,
- <code>ncurses5-config</code> or
- <code>ncursesw5-config</code>, according to
- configuration options.
-
- <li>provide ifdef for <code>NCURSES_NOMACROS</code> which
- suppresses most macro definitions from curses.h, i.e.,
- where a macro is defined to override a function to improve
- performance.
-
- <li>make ifdef's consistent in <code>curses.h</code> for the
- extended colors so the header file can be used for the
- normal curses library. The header file installed for
- extended colors is a variation of the wide-character
- configuration.
-
- <li>improve <code>tgetstr()</code> by making the return value
- point into the user's buffer, if provided.
-
- <li>add ifdef's allowing ncurses to be built with
- <code>tparm()</code> using either varargs (the existing
- status), or using a fixed-parameter list (to match X/Open).
-
- <li>widen the test for xterm <code>kmous</code> a little to
- <code>allow</code> for other
- strings than "\E[M", e.g., for <code>xterm-sco</code>
- functionality in xterm.
-
- <li>modify <code>wgetnstr()</code> to return
- <code>KEY_RESIZE</code> if a sigwinch occurs.
-
- <li>move prototypes for wide-character trace functions from
- curses.tail to curses.wide to avoid accidental reference to
- those if <code>_XOPEN_SOURCE_EXTENDED</code> is defined
- without ensuring that &lt;wchar.h&gt; is included.
-
- <li>change the way shared libraries (other than libtool) are
- installed. Rather than copying the build-tree's libraries,
- link the shared objects into the install directory. This
- makes the <code>--with-rpath</code> option work except with
- <code>$(DESTDIR)</code>.
-
- <li>several improvements for rendering in hpterm. These are
- only available if the library is configured using
- <code>--enable-xmc-glitch</code>.
-
- <li>Add <code>NCURSES_NO_HARD_TABS</code> and
- <code>NCURSES_NO_MAGIC_COOKIE</code> environment variables
- to allow runtime suppression of the related hard-tabs and
- xmc-glitch features.
+ <li>new flavor of the ncurses library provides rudimentary
+ support for POSIX threads. Several functions are
+ reentrant, but most require either a window-level or
+ screen-level mutex.<br>
+ (This is <em>API</em>-compatible,
+ but not <em>ABI</em>-compatible with the normal library).
+
+ <li>add <code>NCURSES_OPAQUE</code> symbol to curses.h, will
+ use to make structs opaque in selected configurations.
+
+ <li>add <code>NCURSES_EXT_FUNCS</code> and
+ <code>NCURSES_EXT_COLORS</code> symbols to curses.h to make
+ it simpler to tell if the extended functions and/or colors
+ are declared.
+
+ <li>add wresize() to C++ binding
+
+ <li>eliminate fixed-buffer vsprintf() calls in C++ binding.
+
+ <li>add several functions to C++ binding which wrap C functions
+ that pass a WINDOW* parameter.
+
+ <li>adapt mouse-handling code from menu library in form-library
+
+ <li>improve tracing for form library, showing created forms,
+ fields, etc.
+
+ <li>make $NCURSES_NO_PADDING feature work for termcap interface .
+
+ <li>add check to trace-file open, if the given name is a
+ directory, add ".log" to the name and try again.
+
+ <li>several new manpages: curs_legacy.3x, curs_memleaks.3x,
+ curs_opaque.3x and curs_threads.3x
</ul>
<li>programs:
<ul>
- <li>add new test programs: chgat.c, demo_altkeys.c,
- echochar.c, foldkeys.c, movewindow.c, redraw.c, (noting
- that existing test programs also were modified to test
- additional features).
-
- <li>modify tack to test extended capability function-key
- strings.
+ <li>modified three test-programs to demonstrate the threading
+ support in this version: ditto, rain, worm.
- <li>modify toe to access termcap data, e.g., via <code>cgetent()</code>
- functions, or as a text file if those are not available.
+ <li>several new test-programs: demo_panels, dots_mvcur,
+ inch_wide, inchs, key_name, key_names, savescreen,
+ savescreen.sh test_arrays, test_get_wstr, test_getstr,
+ test_instr, test_inwstr and test_opaque.
- <li>improve infocmp/tic <code>-f</code> option formatting.
+ <li>add <code>adacurses-config</code> to the Ada95 install.
- <li>add <code>toe -a</code> option, to show all databases.
- This uses new private interfaces in the ncurses library for
- iterating through the list of databases.
+ <li>modify tic <code>-f</code> option to format spaces as
+ <code>\s</code> to prevent them from being lost when that
+ is read back in unformatted strings.
- <li>modify <code>MKfallback.sh</code> to use
- <code>tic&nbsp;-x</code> when constructing fallback tables to
- allow extended capabilities to be retrieved from a fallback entry.
+ <li>The <code>tack</code> program is now distributed separately
+ from ncurses.
</ul>
<li>terminal database
<ul>
- <li>add terminfo entries for xfce terminal (xfce) and multi gnome terminal (mgt)
- <li>add nsterm-16color entry
- <li>updated mlterm terminfo entry
- <li>add kon, kon2 and jfbterm terminfo entry
- <li>remove invis capability from klone+sgr, mainly used by linux entry, since it does not really do this
- <li>add ka2, kb1, kb3, kc2 to vt220-keypad as an extension
- <li>add shifted up/down arrow codes to xterm-new as kind/kri strings
- <li>add hpterm-color terminfo entry
- <li>add 256color variants of terminfo entries for programs which are reported to implement this feature
- <li>correct order of use-clauses in rxvt-basic entry which made codes for f1-f4 vt100-style rather than vt220-style.
+ <li>added entries:
+ <ul>
+ <li><code>Eterm-256color</code>,
+ <code>Eterm-88color</code> and
+ <code>rxvt-88color</code>
+ <li><code>aterm</code>
+ <li><code>konsole-256color</code>
+ <li><code>mrxvt</code>
+ <li><code>screen.mlterm</code>
+ <li><code>screen.rxvt</code>
+ <li><code>teraterm4.59</code> is now the primary primary
+ teraterm entry, renamed original to
+ <code>teraterm2.3</code>
+ <li><code>9term</code> terminal
+ <li>Newbury Data entries
+ </ul>
+ <li>updated/improved entries:
+ <ul>
+ <li><code>gnome</code> to version 2.22.3
+ <li><code>h19</code>, <code>z100</code>
+ <li><code>konsole</code> to version 1.6.6
+ <li><code>mlterm</code>, <code>mlterm+pcfkeys</code>
+ <li><code>xterm</code>, and building-blocks for function-keys
+ to <a href="http://invisible-island.net/xterm/xterm.log.html#xterm_230">xterm patch #230</a>.
+ </ul>
</ul>
</ul>
Major bug fixes:
<ul>
- <li>correct a typo in configure <code>--with-bool</code> option for the
- case where <code>--without-cxx</code> is used.
+ <li>add logic to tic for cancelling strings in user-defined
+ capabilities
+ (this is <em>needed</em> for
+ current <code>konsole</code> terminfo entry).
+
+ <li>modify <code>mk-1st.awk</code> 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., <code>libncurses.so</code> by
+ <code>/bin/sh</code>.
+
+ <li>correct check for notimeout() in wgetch().
+
+ <li>fix a sign-extension bug in infocmp's repair_acsc() function.
- <li>move assignment from environment variable <code>ESCDELAY</code>
- from <code>initscr()</code> down to <code>newterm()</code> so the
- environment variable affects timeouts for terminals opened with
- newterm() as well.
+ <li>change winnstr() to stop at the end of the line.
- <li>modify <code>werase</code> to clear multicolumn characters that
- extend into a derived window.
+ <li>make Ada95 demo_panels() example work.
- <li>modify <code>wchgat()</code> to mark updated cells as changed so a
- refresh will repaint those cells.
+ <li>fix for adding a non-spacing character at the beginning of a line.
- <li>correct logic in <code>wadd_wch()</code> and
- <code>wecho_wch()</code>, which did not guard against passing the
- multi-column attribute into a call on <code>waddch()</code>, e.g.,
- using data returned by <code>win_wch()</code>
+ <li>fill in extended-color pair to make colors work
+ for wide-characters using extended-colors.
- <li>fix redrawing of windows other than <code>stdscr</code> using
- <code>wredrawln()</code> by touching the corresponding rows in
- <code>curscr</code>.
+ <li>improve refresh of window on top of multi-column characters,
+ taking into account split characters on left/right window
+ boundaries.
- <li>reduce memory leaks in repeated calls to <code>tgetent()</code> by
- remembering the last <code>TERMINAL*</code> value allocated to hold
- the corresponding data and freeing that if the
- <code>tgetent()</code> result buffer is the same as the previous
- call.
+ <li>modify <code>win_wchnstr()</code> to ensure that only a base cell
+ is returned for each multi-column character.
- <li>modify <code>read_termtype()</code> so the <code>term_names</code>
- data is always allocated as part of the <code>str_table</code>, a
- better fix for a memory leak.
+ <li>improve <code>waddch()</code> and <code>winsch()</code> handling of
+ EILSEQ from <code>mbrtowc()</code> by using <code>unctrl()</code>
+ to display illegal bytes rather than trying to append further bytes
+ to make up a valid sequence.
- <li>fix <code>wins_nwstr(),</code> which did not handle single-column
- non-8bit codes.
+ <li>restore <code>curs_set()</code> state after
+ <code>endwin()</code>/<code>refresh()</code>
- <li>modify <code>wbkgrnd()</code> to avoid clearing the
- <code>A_CHARTEXT</code> attribute bits since those record the state
- of multicolumn characters.
+ <li>modify <code>keyname()</code> to use "^X" form only if
+ <code>meta()</code> has been called, or if <code>keyname()</code>
+ is called without initializing curses, e.g., via
+ <code>initscr()</code> or <code>newterm()</code>.
- <li>improve <code>SIGWINCH</code> handling by postponing its effect
- during <code>newterm()</code>, etc., when allocating screens.
+ <li>modify <code>unctrl()</code> to check codes in 128-255 range versus
+ <code>isprint()</code>.
+ If they are not printable, and locale was set, use a "M-" or "~"
+ sequence.
- <li>remove 970913 feature for copying subwindows as they are moved in
- <code>mvwin()</code>.
+ <li>improve <code>resizeterm()</code> by moving ripped-off lines, and
+ repainting the soft-keys.
- <li>add checks in <code>waddchnstr()</code> and
- <code>wadd_wchnstr()</code> to stop copying when a null character
- is found.
+ <li>modify form library to accept control characters such as newline
+ in set_field_buffer(), which is compatible with Solaris.
- <li>add some checks to ensure current position is within scrolling
- region before scrolling on a new line.
+ <li>use <code>NCURSES_MOUSE_MASK()</code> in definition of
+ <code>BUTTON_RELEASE()</code>, etc., to make those work properly
+ with the <code>--enable-ext-mouse</code> configuration
- <li>add a workaround to ACS mapping to allow applications such as
- test/blue.c to use the "PC ROM" characters by masking them with
- A_ALTCHARSET. This worked up til 5.5, but was lost in the revision
- of legacy coding.
+ <li>correct some functions in Ada95 binding which were using return
+ value from C where none was returned.
+
+ <li>reviewed/fixed issues reported by Coverity and Klocwork tools.
</ul>
Portability:
@@ -257,110 +242,115 @@ Portability:
<li>new options:
<dl>
- <dt>--with-hashed-db
- <dd>Use Berkeley hashed database for storing terminfo data rather than storing
- each compiled entry in a separate binary file within a directory
- tree.
-
- <dt>--without-dlsym
- <dd>Do not use <code>dlsym()</code> to load GPM dynamically.
-
- <dt>--with-valgrind
- <dd>Simplify building for testing with valgrind.
-
- <dt>--enable-wgetch-events
- <dd>Compile with experimental wgetch-events code.
-
- <dt>--enable-signed-char
- <dd>Store booleans in "signed char" rather than "char".
+ <dt>--disable-big-strings
+ <dd>control whether static string tables are generated as single
+ large strings (to improve startup performance), or as array
+ of individual strings.
+
+ <dt>--disable-relink
+ <dd>control whether shared libraries are relinked (during install)
+ when rpath is enabled.
+
+ <dt>--disable-tic-depends
+ <dd>make explicit whether tic library depends on ncurses/ncursesw
+ library.
+
+ <dt>--enable-mixed-case
+ <dd>override the configure script's check if the filesystem
+ supports mixed-case filenames.
+ This allows one to control how the terminal database
+ maps to the filesystem.
+ For filesystems that do not support mixed-case, the library
+ uses generate 2-character (hexadecimal) codes for the
+ lower-level of the filesystem terminfo database
+
+ <dt>--enable-reentrant
+ <dd>builds a different flavor of the ncurses library (ncursest)
+ which improves reentrant use of the
+ library by reducing global and static variables
+ (see the "--with-pthread" option for the threaded support).
+
+ <dt>--enable-weak-symbols
+ <dd>use weak-symbols for linking to the POSIX thread library,
+ and use the same soname for the ncurses shared library
+ as the normal library (caveat: the ABI is for the threaded
+ library, which makes global data accessed via functions).
+
+ <dt>--with-pthread
+ <dd>build with the POSIX thread library (tested with AIX,
+ Linux, FreeBSD, OpenBSD, HPUX, IRIX64, Solaris, Tru64).
+
+ <dt>--with-ticlib
+ <dd>build/install the tic-support functions in a separate library
</dl>
<li>improved options:
<dl>
- <dt>--disable-largefile
- <dd>make the option work both ways.
-
- <dt>--with-gpm
- <dd>The option now accepts a parameter,
- i.e., the name of the dynamic GPM library to load via
- <code>dlopen()</code>
-
- <dt>--disable-symlinks
- <dd>The option now allows one to
- disable <code>symlink()</code> in <code>tic</code> even when
- <code>link()</code> does not work.
-
- </dl>
-
- </ul>
-
- <li>other configure/build issues: <ul> <li>remove special case for
- Darwin in <code>CF_XOPEN_SOURCE</code> configure macro.
+ <dt>--enable-ext-colors
+ <dd>requires the wide-character configuration.
- <li>add configure check to ensure that <code>SIGWINCH</code> is
- defined on platforms such as OS X which exclude that when
- <code>_XOPEN_SOURCE,</code> etc., are defined
+ <dt>--with-chtype
+ <dd>ignore option value "unsigned" is always added to
+ the type in curses.h; do the same for --with-mmask-t.
- <li>use ld's <code>-search_paths_first</code> option on Darwin
- to work around odd search rules on that platform.
+ <dt>--with-dmalloc
+ <dd>build-fix for redefinition of <code>strndup</code>.
- <li>improve ifdef's for <code>_POSIX_VDISABLE</code> in tset to
- work with Mac OS X.
-
- <li>modify configure script to ensure that if the C compiler is
- used rather than the loader in making shared libraries, the
- <code>$(CFLAGS)</code> variable is also used.
+ <dt>--with-hashed-db
+ <dd>accepts a parameter which is the install-prefix of a given
+ Berkeley Database.
- <li>use <code>${CC}</code> rather than <code>${LD}</code> in
- shared library rules for IRIX64, Solaris to help ensure
- that initialization sections are provided for extra linkage
- requirements, e.g., of C++ applications.
+ <dt>--with-hashed-db
+ <dd>the $LIBS environment variable overrides the search for the db
+ library.
- <li>improve some shared-library configure scripting for Linux,
- FreeBSD and NetBSD to make
- <code>--with-shlib-version</code> work.
+ <dt>--without-hashed-db
+ <dd>assumed when "--disable-database" is used.
- <li>split up dependency of <code>names.c</code> and
- <code>codes.c</code> in <code>ncurses/Makefile</code> to
- work with parallel make.
+ </dl>
- <li>modify <code>MKlib_gen.sh</code> to change
- preprocessor-expanded <code>_Bool</code> back to <code>bool</code>.
+ </ul>
- <li>modify <code>progs/Makefile.in</code> to make
- <code>tput&nbsp;init</code> work properly with cygwin,
- i.e., do not pass a <code>.exe</code> in the reference
- string used in check_aliases.
+ <li>other configure/build issues:
+ <ul>
+ <li>build-fixes for LynxOS
+ <li>modify shared-library rules to allow FreeBSD 3.x to use rpath.
+ <li>build-fix for FreeBSD "contemporary" TTY interface.
+ <li>build-fixes for AIX with libtool.
+ <li>build-fixes for Darwin and libtool.
+ <li>modify BeOS-specific ifdef's to build on Haiku.
+ <li>corrected gcc options for building shared libraries on Solaris
+ and IRIX64.
+ <li>change shared-library configuration for OpenBSD, make rpath work.
+ <li>build-fixes for using libutf8, e.g., on OpenBSD 3.7
+ <li>add "-e" option in ncurses/Makefile.in when generating source-files
+ to force earlier exit if the build environment fails unexpectedly.
+ <li>add support for shared libraries for QNX.
+ <li>change delimiter in <code>MKlib_gen.sh</code> from '%' to '@', to
+ avoid substitution by IBM xlc to '#' as part of its extensions to
+ digraphs.
</ul>
<li>library:
<ul>
- <li>ignore wide-acs line-drawing characters that
- <code>wcwidth()</code> claims are not one-column. This is
- a workaround for Solaris' broken locale support.
-
- <li>reduce name-pollution in <code>term.h</code> by removing
- <code>#define</code>'s for HAVE_xxx symbols.
-
- <li>fix <code>#ifdef</code> in <code>c++/internal.h</code> for
- QNX 6.1
+ <li>rewrite wrapper for <code>wcrtomb()</code>, making it work on
+ Solaris. This is used in the form library to determine the length
+ of the buffer needed by <code>field_buffer</code>.
+ <li>add/use configure script macro CF_SIG_ATOMIC_T, use the corresponding
+ type for data manipulated by signal handlers.
+ <li>set locale in misc/ncurses-config.in since it uses a range
+ <li>disable GPM mouse support when $TERM does not happen to contain
+ "linux", since Gpm_Open() no longer limits its assertion to terminals
+ that it might handle, e.g., within "screen" in xterm.
+ <li>reset mouse file-descriptor when unloading GPM library.
</ul>
- <li>test programs: <ul> <li>modify <code>test/configure</code> script
- to allow building test programs with PDCurses/X11.
-
- <li>modified test programs to allow some to work with NetBSD
- curses. Several do not because NetBSD curses implements a
- subset of X/Open curses, and also lacks much of SVr4
- additions. But it is enough for comparison.
-
- <li>improved <code>test/configure</code> to build test/ncurses
- on HPUX 11 using the vendor curses.
-
- <li>change configure script to produce
- <code>test/Makefile</code> from data file.
+ <li>test programs:
+ <ul>
+ <li>update test programs to build/work with various UNIX curses for
+ comparisons.
</ul>
</ul>
@@ -410,6 +400,8 @@ and <CODE>define_key()</CODE> allow
you to better control the use of function keys,
e.g., disabling the ncurses KEY_MOUSE,
or by defining more than one control sequence to map to a given key code.
+<LI>Support for 256-color terminals, such as modern xterm, when configured
+using the <code>--enable-ext-colors</code> option.
<LI>Support for 16-color terminals, such as aixterm and modern xterm.
<LI>Better cursor-movement optimization. The package now features a
cursor-local-movement computation more efficient than either BSD's
@@ -513,14 +505,10 @@ for similar applications on GNU/Linux.
<br>
<DT> pinfo
<DD> Lynx-like info browser.
-<A HREF="http://dione.ids.pl/~pborys/software/pinfo/">http://dione.ids.pl/~pborys/software/pinfo/</A>
+<A HREF="https://alioth.debian.org/projects/pinfo/">https://alioth.debian.org/projects/pinfo/</A>
<DT> tin
<DD> newsreader, supporting color, MIME
<A HREF="http://www.tin.org/">http://www.tin.org/</A>
-<DT> vh-1.6
-<DD> Volks-Hypertext browser for the Jargon File
-<br>
-<A HREF="http://www.debian.org/Packages/unstable/text/vh.html">http://www.debian.org/Packages/unstable/text/vh.html</A>
</DL>
as well as some that use ncurses for the terminfo support alone:
<DL>
diff --git a/config.guess b/config.guess
index 6ac1d64a47e7..c7607c74f1b8 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2008-03-12'
+timestamp='2008-04-14'
# 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
@@ -180,7 +180,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
fi
;;
*)
- os=netbsd
+ os=netbsd
;;
esac
# The OS release
@@ -219,11 +219,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
- *4.0)
+ *4.0)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
;;
- *5.*)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ *5.*)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
;;
esac
# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -295,7 +295,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo s390-ibm-zvmoe
exit ;;
*:OS400:*:*)
- echo powerpc-ibm-os400
+ echo powerpc-ibm-os400
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
@@ -375,23 +375,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-unknown-mint${UNAME_RELEASE}
+ exit ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
exit ;;
@@ -461,8 +461,8 @@ EOF
echo m88k-motorola-sysv3
exit ;;
AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -575,8 +575,8 @@ EOF
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
532) # CPU_PA_RISC2_0
@@ -711,22 +711,22 @@ EOF
exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit ;;
+ exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd
- exit ;;
+ exit ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd
- exit ;;
+ exit ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
- exit ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
@@ -750,14 +750,14 @@ EOF
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -785,14 +785,14 @@ EOF
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
*:Interix*:[3456]*)
- case ${UNAME_MACHINE} in
+ case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
@@ -800,8 +800,8 @@ EOF
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
@@ -837,7 +837,8 @@ EOF
exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null | grep -q __ARM_EABI__
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
then
echo ${UNAME_MACHINE}-unknown-linux-gnu
else
@@ -854,7 +855,7 @@ EOF
echo crisv32-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-gnu
+ echo frv-unknown-linux-gnu
exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -882,10 +883,10 @@ EOF
#endif
EOF
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
@@ -905,15 +906,15 @@ EOF
#endif
EOF
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
- echo or32-unknown-linux-gnu
- exit ;;
+ echo or32-unknown-linux-gnu
+ exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
exit ;;
@@ -929,7 +930,7 @@ EOF
EV6) UNAME_MACHINE=alphaev6 ;;
EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
+ esac
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -949,7 +950,7 @@ EOF
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -964,7 +965,7 @@ EOF
echo x86_64-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
@@ -977,16 +978,13 @@ EOF
s/.*supported targets: *//
s/ .*//
p'`
- case "$ld_supported_targets" in
+ case "$ld_supported_targets" in
elf32-i386)
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
;;
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
exit ;;
- coff-i386)
- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit ;;
"")
# Either a pre-BFD a.out linker (linux-gnuoldld) or
# one that does not give us useful --help.
@@ -1019,10 +1017,10 @@ EOF
#endif
EOF
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^LIBC/{
- s: ::g
- p
- }'`"
+ /^LIBC/{
+ s: ::g
+ p
+ }'`"
test x"${LIBC}" != x && {
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit
@@ -1036,11 +1034,11 @@ EOF
echo i386-sequent-sysv4
exit ;;
i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
+ # Unixware is an offshoot of SVR4, but it has its own version
+ # number series starting with 2...
+ # I am not positive that other SVR4 systems won't match this,
# I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
+ # Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit ;;
i*86:OS/2:*:*)
@@ -1072,7 +1070,7 @@ EOF
fi
exit ;;
i*86:*:5:[678]*)
- # UnixWare 7.x, OpenUNIX and OpenServer 6.
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
@@ -1100,10 +1098,10 @@ EOF
exit ;;
pc:*:*:*)
# Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i386.
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i386.
echo i386-pc-msdosdjgpp
- exit ;;
+ exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
exit ;;
@@ -1138,8 +1136,8 @@ EOF
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -1173,9 +1171,9 @@ EOF
fi
exit ;;
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel@ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit ;;
+ # says <Richard.M.Bartel@ccMail.Census.GOV>
+ echo i586-unisys-sysv4
+ exit ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes@openmarket.com>.
# How about differentiating between stratus architectures? -djm
@@ -1205,7 +1203,7 @@ EOF
else
echo mips-unknown-sysv${UNAME_RELEASE}
fi
- exit ;;
+ exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
exit ;;
@@ -1252,8 +1250,8 @@ EOF
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = "x86"; then
- UNAME_PROCESSOR=i386
- UNAME_MACHINE=pc
+ UNAME_PROCESSOR=i386
+ UNAME_MACHINE=pc
fi
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
exit ;;
@@ -1305,13 +1303,13 @@ EOF
echo pdp10-unknown-its
exit ;;
SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
+ echo mips-sei-seiux${UNAME_RELEASE}
exit ;;
*:DragonFly:*:*)
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
*:*VMS:*:*)
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
case "${UNAME_MACHINE}" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
@@ -1486,9 +1484,9 @@ This script, last modified $timestamp, has failed to recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
and
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
diff --git a/config.sub b/config.sub
index d89676ebe7c0..a649350a6ca7 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2008-03-08'
+timestamp='2008-06-16'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -250,7 +250,7 @@ case $basic_machine in
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep \
+ | maxq | mb | microblaze | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -306,8 +306,8 @@ case $basic_machine in
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
i*86 | x86_64)
- basic_machine=$basic_machine-pc
- ;;
+ basic_machine=$basic_machine-pc
+ ;;
# Object if more than one company name word.
*-*-*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@ -331,9 +331,9 @@ case $basic_machine in
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
- | m32c- | m32r-* | m32rle-* \
+ | m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -397,7 +397,7 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
;;
- abacus)
+ abacus)
basic_machine=abacus-unknown
;;
adobe68k)
@@ -463,6 +463,10 @@ case $basic_machine in
basic_machine=c90-cray
os=-unicos
;;
+ cegcc)
+ basic_machine=arm-unknown
+ os=-cegcc
+ ;;
convex-c1)
basic_machine=c1-convex
os=-bsd
@@ -530,6 +534,10 @@ case $basic_machine in
basic_machine=m88k-motorola
os=-sysv3
;;
+ dicos)
+ basic_machine=i686-pc
+ os=-dicos
+ ;;
djgpp)
basic_machine=i586-pc
os=-msdosdjgpp
@@ -1217,8 +1225,8 @@ esac
if [ x"$os" != x"" ]
then
case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
+ # First match some system type aliases
+ # that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1252,7 +1260,7 @@ case $os in
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1301,7 +1309,7 @@ case $os in
-opened*)
os=-openedition
;;
- -os400*)
+ -os400*)
os=-os400
;;
-wince*)
@@ -1350,7 +1358,7 @@ case $os in
-sinix*)
os=-sysv4
;;
- -tpf*)
+ -tpf*)
os=-tpf
;;
-triton*)
@@ -1392,6 +1400,9 @@ case $os in
-zvmoe)
os=-zvmoe
;;
+ -dicos*)
+ os=-dicos
+ ;;
-none)
;;
*)
@@ -1414,10 +1425,10 @@ else
# system, and we'll never get to this point.
case $basic_machine in
- score-*)
+ score-*)
os=-elf
;;
- spu-*)
+ spu-*)
os=-elf
;;
*-acorn)
@@ -1429,8 +1440,8 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
+ c4x-* | tic4x-*)
+ os=-coff
;;
# This must come before the *-dec entry.
pdp10-*)
@@ -1457,7 +1468,7 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
- mep-*)
+ mep-*)
os=-elf
;;
mips*-cisco)
@@ -1484,7 +1495,7 @@ case $basic_machine in
*-ibm)
os=-aix
;;
- *-knuth)
+ *-knuth)
os=-mmixware
;;
*-wec)
diff --git a/configure b/configure
index 7ef479b76e8a..1342387ce63e 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.433 .
+# From configure.in Revision: 1.454 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20080325.
#
@@ -746,6 +746,7 @@ Fine-Tuning Your Configuration:
--disable-lp64 allow chtype to be long (ignore _LP64)
--disable-largefile omit support for large files
--disable-tparm-varargs compile tparm() without varargs interface
+ --disable-tic-depends link tic library without explicit dependency on ncurses library
--with-bool=TYPE override fallback type of bool variable
--with-caps=alt compile with alternate Caps file
--with-chtype=TYPE override type of chtype
@@ -762,6 +763,8 @@ Options to Specify How Manpages are Installed:
Extensions:
--disable-ext-funcs disable function-extensions
--enable-const compile with extra/non-standard const
+ --enable-ext-colors compile for 256-color support
+ --enable-ext-mouse compile for extended mouse-encoding
--enable-no-padding compile with $NCURSES_NO_PADDING code
--enable-signed-char compile using signed Boolean's in term.h
--enable-sigwinch compile with SIGWINCH handler
@@ -774,9 +777,8 @@ Experimental Code:
--disable-assumed-color do not assume anything about default-colors
--disable-hashmap compile without hashmap scrolling-optimization
--enable-colorfgbg compile with $COLORFGBG code
- --enable-ext-colors compile for experimental 256-color support
- --enable-ext-mouse compile for experimental mouse-encoding
--with-pthread use POSIX thread library
+ --enable-weak-symbols enable weak-symbols for pthreads
--enable-reentrant compile with experimental reentrant code
--enable-safe-sprintf compile with experimental safe-sprintf code
--disable-scroll-hints compile without scroll-hints code
@@ -992,7 +994,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:995: loading site script $ac_site_file" >&5
+ { echo "$as_me:997: 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"
@@ -1003,7 +1005,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:1006: loading cache $cache_file" >&5
+ { echo "$as_me:1008: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -1011,7 +1013,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
esac
fi
else
- { echo "$as_me:1014: creating cache $cache_file" >&5
+ { echo "$as_me:1016: creating cache $cache_file" >&5
echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -1027,21 +1029,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:1030: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ { echo "$as_me:1032: 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:1034: error: \`$ac_var' was not set in the previous run" >&5
+ { echo "$as_me:1036: 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:1040: error: \`$ac_var' has changed since the previous run:" >&5
+ { echo "$as_me:1042: 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:1042: former value: $ac_old_val" >&5
+ { echo "$as_me:1044: former value: $ac_old_val" >&5
echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:1044: current value: $ac_new_val" >&5
+ { echo "$as_me:1046: current value: $ac_new_val" >&5
echo "$as_me: current value: $ac_new_val" >&2;}
ac_cache_corrupted=:
fi;;
@@ -1060,9 +1062,9 @@ echo "$as_me: current value: $ac_new_val" >&2;}
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:1063: error: changes in the environment can compromise the build" >&5
+ { echo "$as_me:1065: 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:1065: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ { { echo "$as_me:1067: 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
@@ -1083,10 +1085,10 @@ esac
echo "#! $SHELL" >conftest.sh
echo "exit 0" >>conftest.sh
chmod +x conftest.sh
-if { (echo "$as_me:1086: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1088: PATH=\".;.\"; conftest.sh") >&5
(PATH=".;."; conftest.sh) 2>&5
ac_status=$?
- echo "$as_me:1089: \$? = $ac_status" >&5
+ echo "$as_me:1091: \$? = $ac_status" >&5
(exit $ac_status); }; then
ac_path_separator=';'
else
@@ -1099,7 +1101,7 @@ ac_config_headers="$ac_config_headers include/ncurses_cfg.h:include/ncurses_cfg.
top_builddir=`pwd`
-echo "$as_me:1102: checking for egrep" >&5
+echo "$as_me:1104: 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
@@ -1109,11 +1111,11 @@ else
else ac_cv_prog_egrep='egrep'
fi
fi
-echo "$as_me:1112: result: $ac_cv_prog_egrep" >&5
+echo "$as_me:1114: 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:1116: error: No egrep program found" >&5
+test -z "$EGREP" && { { echo "$as_me:1118: error: No egrep program found" >&5
echo "$as_me: error: No egrep program found" >&2;}
{ (exit 1); exit 1; }; }
@@ -1123,7 +1125,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:1126: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
+echo "$as_me:1128: 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
@@ -1131,7 +1133,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:1134: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
+ { echo "$as_me:1136: 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;
@@ -1144,13 +1146,13 @@ if test -n "$NCURSES_MAJOR" ; then
[0-9]*) #(vi
;;
*)
- { { echo "$as_me:1147: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
+ { { echo "$as_me:1149: 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:1153: error: Release major-version value is empty" >&5
+ { { echo "$as_me:1155: error: Release major-version value is empty" >&5
echo "$as_me: error: Release major-version value is empty" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1160,13 +1162,13 @@ if test -n "$NCURSES_MINOR" ; then
[0-9]*) #(vi
;;
*)
- { { echo "$as_me:1163: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
+ { { echo "$as_me:1165: 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:1169: error: Release minor-version value is empty" >&5
+ { { echo "$as_me:1171: error: Release minor-version value is empty" >&5
echo "$as_me: error: Release minor-version value is empty" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1176,7 +1178,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:1179: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
+ { echo "$as_me:1181: 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;
@@ -1186,13 +1188,13 @@ if test -n "$cf_cv_abi_version" ; then
[0-9]*) #(vi
;;
*)
- { { echo "$as_me:1189: error: ABI version is not a number: $cf_cv_abi_version" >&5
+ { { echo "$as_me:1191: 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:1195: error: ABI version value is empty" >&5
+ { { echo "$as_me:1197: error: ABI version value is empty" >&5
echo "$as_me: error: ABI version value is empty" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1214,7 +1216,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:1217: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ { { echo "$as_me:1219: 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
@@ -1224,11 +1226,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:1227: error: cannot run $ac_config_sub" >&5
+ { { echo "$as_me:1229: error: cannot run $ac_config_sub" >&5
echo "$as_me: error: cannot run $ac_config_sub" >&2;}
{ (exit 1); exit 1; }; }
-echo "$as_me:1231: checking build system type" >&5
+echo "$as_me:1233: 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
@@ -1237,23 +1239,23 @@ else
test -z "$ac_cv_build_alias" &&
ac_cv_build_alias=`$ac_config_guess`
test -z "$ac_cv_build_alias" &&
- { { echo "$as_me:1240: error: cannot guess build type; you must specify one" >&5
+ { { echo "$as_me:1242: 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:1244: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ { { echo "$as_me:1246: 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:1249: result: $ac_cv_build" >&5
+echo "$as_me:1251: 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:1256: checking host system type" >&5
+echo "$as_me:1258: 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
@@ -1262,12 +1264,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:1265: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ { { echo "$as_me:1267: 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:1270: result: $ac_cv_host" >&5
+echo "$as_me:1272: 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/'`
@@ -1275,7 +1277,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:1278: checking target system type" >&5
+ echo "$as_me:1280: 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
@@ -1284,12 +1286,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:1287: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+ { { echo "$as_me:1289: 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:1292: result: $ac_cv_target" >&5
+echo "$as_me:1294: 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/'`
@@ -1320,13 +1322,13 @@ else
fi
test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1323: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1325: 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:1327: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+ echo "$as_me:1329: 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:1329: error: \"Please remove config.cache and try again.\"" >&5
+ { { echo "$as_me:1331: 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
@@ -1334,7 +1336,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:1337: WARNING: overriding system type to $withval" >&5
+ { echo "$as_me:1339: WARNING: overriding system type to $withval" >&5
echo "$as_me: WARNING: overriding system type to $withval" >&2;}
cf_cv_system_name=$withval
fi;
@@ -1344,7 +1346,7 @@ cf_user_CFLAGS="$CFLAGS"
### Default install-location
-echo "$as_me:1347: checking for prefix" >&5
+echo "$as_me:1349: 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
@@ -1356,11 +1358,11 @@ if test "x$prefix" = "xNONE" ; then
;;
esac
fi
-echo "$as_me:1359: result: $prefix" >&5
+echo "$as_me:1361: result: $prefix" >&5
echo "${ECHO_T}$prefix" >&6
if test "x$prefix" = "xNONE" ; then
-echo "$as_me:1363: checking for default include-directory" >&5
+echo "$as_me:1365: 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 \
@@ -1383,7 +1385,7 @@ do
fi
test -n "$verbose" && echo " tested $cf_dir" 1>&6
done
-echo "$as_me:1386: result: $includedir" >&5
+echo "$as_me:1388: result: $includedir" >&5
echo "${ECHO_T}$includedir" >&6
fi
@@ -1397,7 +1399,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:1400: checking for $ac_word" >&5
+echo "$as_me:1402: 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
@@ -1412,7 +1414,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:1415: found $ac_dir/$ac_word" >&5
+echo "$as_me:1417: found $ac_dir/$ac_word" >&5
break
done
@@ -1420,10 +1422,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1423: result: $CC" >&5
+ echo "$as_me:1425: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1426: result: no" >&5
+ echo "$as_me:1428: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1432,7 +1434,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:1435: checking for $ac_word" >&5
+echo "$as_me:1437: 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
@@ -1447,7 +1449,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:1450: found $ac_dir/$ac_word" >&5
+echo "$as_me:1452: found $ac_dir/$ac_word" >&5
break
done
@@ -1455,10 +1457,10 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1458: result: $ac_ct_CC" >&5
+ echo "$as_me:1460: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1461: result: no" >&5
+ echo "$as_me:1463: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1471,7 +1473,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:1474: checking for $ac_word" >&5
+echo "$as_me:1476: 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
@@ -1486,7 +1488,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:1489: found $ac_dir/$ac_word" >&5
+echo "$as_me:1491: found $ac_dir/$ac_word" >&5
break
done
@@ -1494,10 +1496,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1497: result: $CC" >&5
+ echo "$as_me:1499: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1500: result: no" >&5
+ echo "$as_me:1502: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1506,7 +1508,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:1509: checking for $ac_word" >&5
+echo "$as_me:1511: 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
@@ -1521,7 +1523,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:1524: found $ac_dir/$ac_word" >&5
+echo "$as_me:1526: found $ac_dir/$ac_word" >&5
break
done
@@ -1529,10 +1531,10 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1532: result: $ac_ct_CC" >&5
+ echo "$as_me:1534: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1535: result: no" >&5
+ echo "$as_me:1537: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1545,7 +1547,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:1548: checking for $ac_word" >&5
+echo "$as_me:1550: 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
@@ -1565,7 +1567,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
continue
fi
ac_cv_prog_CC="cc"
-echo "$as_me:1568: found $ac_dir/$ac_word" >&5
+echo "$as_me:1570: found $ac_dir/$ac_word" >&5
break
done
@@ -1587,10 +1589,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1590: result: $CC" >&5
+ echo "$as_me:1592: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1593: result: no" >&5
+ echo "$as_me:1595: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1601,7 +1603,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:1604: checking for $ac_word" >&5
+echo "$as_me:1606: 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
@@ -1616,7 +1618,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:1619: found $ac_dir/$ac_word" >&5
+echo "$as_me:1621: found $ac_dir/$ac_word" >&5
break
done
@@ -1624,10 +1626,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1627: result: $CC" >&5
+ echo "$as_me:1629: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1630: result: no" >&5
+ echo "$as_me:1632: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1640,7 +1642,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:1643: checking for $ac_word" >&5
+echo "$as_me:1645: 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
@@ -1655,7 +1657,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:1658: found $ac_dir/$ac_word" >&5
+echo "$as_me:1660: found $ac_dir/$ac_word" >&5
break
done
@@ -1663,10 +1665,10 @@ fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1666: result: $ac_ct_CC" >&5
+ echo "$as_me:1668: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1669: result: no" >&5
+ echo "$as_me:1671: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1678,32 +1680,32 @@ fi
fi
-test -z "$CC" && { { echo "$as_me:1681: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1683: 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:1686:" \
+echo "$as_me:1688:" \
"checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1689: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1691: \"$ac_compiler --version </dev/null >&5\"") >&5
(eval $ac_compiler --version </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1692: \$? = $ac_status" >&5
+ echo "$as_me:1694: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:1694: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1696: \"$ac_compiler -v </dev/null >&5\"") >&5
(eval $ac_compiler -v </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1697: \$? = $ac_status" >&5
+ echo "$as_me:1699: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:1699: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1701: \"$ac_compiler -V </dev/null >&5\"") >&5
(eval $ac_compiler -V </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1702: \$? = $ac_status" >&5
+ echo "$as_me:1704: \$? = $ac_status" >&5
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
-#line 1706 "configure"
+#line 1708 "configure"
#include "confdefs.h"
int
@@ -1719,13 +1721,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:1722: checking for C compiler default output" >&5
+echo "$as_me:1724: 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:1725: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1727: \"$ac_link_default\"") >&5
(eval $ac_link_default) 2>&5
ac_status=$?
- echo "$as_me:1728: \$? = $ac_status" >&5
+ echo "$as_me:1730: \$? = $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
@@ -1748,34 +1750,34 @@ done
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-{ { echo "$as_me:1751: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1753: 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:1757: result: $ac_file" >&5
+echo "$as_me:1759: 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:1762: checking whether the C compiler works" >&5
+echo "$as_me:1764: 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:1768: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1770: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1771: \$? = $ac_status" >&5
+ echo "$as_me:1773: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cross_compiling=no
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { echo "$as_me:1778: error: cannot run C compiled programs.
+ { { echo "$as_me:1780: 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;}
@@ -1783,24 +1785,24 @@ If you meant to cross compile, use \`--host'." >&2;}
fi
fi
fi
-echo "$as_me:1786: result: yes" >&5
+echo "$as_me:1788: 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:1793: checking whether we are cross compiling" >&5
+echo "$as_me:1795: checking whether we are cross compiling" >&5
echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1795: result: $cross_compiling" >&5
+echo "$as_me:1797: result: $cross_compiling" >&5
echo "${ECHO_T}$cross_compiling" >&6
-echo "$as_me:1798: checking for executable suffix" >&5
+echo "$as_me:1800: checking for executable suffix" >&5
echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1800: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1802: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:1803: \$? = $ac_status" >&5
+ echo "$as_me:1805: \$? = $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
@@ -1816,25 +1818,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
esac
done
else
- { { echo "$as_me:1819: error: cannot compute EXEEXT: cannot compile and link" >&5
+ { { echo "$as_me:1821: 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:1825: result: $ac_cv_exeext" >&5
+echo "$as_me:1827: 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:1831: checking for object suffix" >&5
+echo "$as_me:1833: 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 1837 "configure"
+#line 1839 "configure"
#include "confdefs.h"
int
@@ -1846,10 +1848,10 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1849: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1851: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1852: \$? = $ac_status" >&5
+ echo "$as_me:1854: \$? = $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
@@ -1861,24 +1863,24 @@ done
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-{ { echo "$as_me:1864: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1866: 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:1871: result: $ac_cv_objext" >&5
+echo "$as_me:1873: result: $ac_cv_objext" >&5
echo "${ECHO_T}$ac_cv_objext" >&6
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-echo "$as_me:1875: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1877: 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 1881 "configure"
+#line 1883 "configure"
#include "confdefs.h"
int
@@ -1893,16 +1895,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1896: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1898: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1899: \$? = $ac_status" >&5
+ echo "$as_me:1901: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1902: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1904: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1905: \$? = $ac_status" >&5
+ echo "$as_me:1907: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_compiler_gnu=yes
else
@@ -1914,19 +1916,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:1917: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1919: 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:1923: checking whether $CC accepts -g" >&5
+echo "$as_me:1925: 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 1929 "configure"
+#line 1931 "configure"
#include "confdefs.h"
int
@@ -1938,16 +1940,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1941: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1943: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1944: \$? = $ac_status" >&5
+ echo "$as_me:1946: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1947: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1949: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1950: \$? = $ac_status" >&5
+ echo "$as_me:1952: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cc_g=yes
else
@@ -1957,7 +1959,7 @@ ac_cv_prog_cc_g=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:1960: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1962: 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
@@ -1984,16 +1986,16 @@ cat >conftest.$ac_ext <<_ACEOF
#endif
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1989: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1990: \$? = $ac_status" >&5
+ echo "$as_me:1992: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1993: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1995: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1996: \$? = $ac_status" >&5
+ echo "$as_me:1998: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
''\
@@ -2005,7 +2007,7 @@ if { (eval echo "$as_me:1987: \"$ac_compile\"") >&5
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
-#line 2008 "configure"
+#line 2010 "configure"
#include "confdefs.h"
#include <stdlib.h>
$ac_declaration
@@ -2018,16 +2020,16 @@ exit (42);
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2023: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2024: \$? = $ac_status" >&5
+ echo "$as_me:2026: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2027: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2029: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2030: \$? = $ac_status" >&5
+ echo "$as_me:2032: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -2037,7 +2039,7 @@ continue
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 2040 "configure"
+#line 2042 "configure"
#include "confdefs.h"
$ac_declaration
int
@@ -2049,16 +2051,16 @@ exit (42);
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2052: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2054: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2055: \$? = $ac_status" >&5
+ echo "$as_me:2057: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2058: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2060: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2061: \$? = $ac_status" >&5
+ echo "$as_me:2063: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -2088,11 +2090,11 @@ ac_main_return=return
GCC_VERSION=none
if test "$GCC" = yes ; then
- echo "$as_me:2091: checking version of $CC" >&5
+ echo "$as_me:2093: 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:2095: result: $GCC_VERSION" >&5
+ echo "$as_me:2097: result: $GCC_VERSION" >&5
echo "${ECHO_T}$GCC_VERSION" >&6
fi
@@ -2102,7 +2104,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:2105: checking how to run the C preprocessor" >&5
+echo "$as_me:2107: 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
@@ -2123,18 +2125,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 2126 "configure"
+#line 2128 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax error
_ACEOF
-if { (eval echo "$as_me:2131: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2133: \"$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:2137: \$? = $ac_status" >&5
+ echo "$as_me:2139: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2157,17 +2159,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 2160 "configure"
+#line 2162 "configure"
#include "confdefs.h"
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:2164: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2166: \"$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:2170: \$? = $ac_status" >&5
+ echo "$as_me:2172: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2204,7 +2206,7 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-echo "$as_me:2207: result: $CPP" >&5
+echo "$as_me:2209: result: $CPP" >&5
echo "${ECHO_T}$CPP" >&6
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
@@ -2214,18 +2216,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 2217 "configure"
+#line 2219 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax error
_ACEOF
-if { (eval echo "$as_me:2222: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2224: \"$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:2228: \$? = $ac_status" >&5
+ echo "$as_me:2230: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2248,17 +2250,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 2251 "configure"
+#line 2253 "configure"
#include "confdefs.h"
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:2255: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2257: \"$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:2261: \$? = $ac_status" >&5
+ echo "$as_me:2263: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2286,7 +2288,7 @@ rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then
:
else
- { { echo "$as_me:2289: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ { { echo "$as_me:2291: error: C preprocessor \"$CPP\" fails sanity check" >&5
echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -2299,14 +2301,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:2302: checking whether $CC needs -traditional" >&5
+ echo "$as_me:2304: 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 2309 "configure"
+#line 2311 "configure"
#include "confdefs.h"
#include <sgtty.h>
int Autoconf = TIOCGETP;
@@ -2321,7 +2323,7 @@ rm -f conftest*
if test $ac_cv_prog_gcc_traditional = no; then
cat >conftest.$ac_ext <<_ACEOF
-#line 2324 "configure"
+#line 2326 "configure"
#include "confdefs.h"
#include <termio.h>
int Autoconf = TCGETA;
@@ -2334,14 +2336,14 @@ rm -f conftest*
fi
fi
-echo "$as_me:2337: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:2339: 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:2344: checking whether $CC understands -c and -o together" >&5
+echo "$as_me:2346: 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
@@ -2357,15 +2359,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:2360: \"$ac_try\"") >&5
+if { (eval echo "$as_me:2362: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2363: \$? = $ac_status" >&5
+ echo "$as_me:2365: \$? = $ac_status" >&5
(exit $ac_status); } &&
- test -f conftest2.$ac_objext && { (eval echo "$as_me:2365: \"$ac_try\"") >&5
+ test -f conftest2.$ac_objext && { (eval echo "$as_me:2367: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2368: \$? = $ac_status" >&5
+ echo "$as_me:2370: \$? = $ac_status" >&5
(exit $ac_status); };
then
eval cf_cv_prog_CC_c_o=yes
@@ -2376,19 +2378,19 @@ rm -f conftest*
fi
if test $cf_cv_prog_CC_c_o = yes; then
- echo "$as_me:2379: result: yes" >&5
+ echo "$as_me:2381: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
- echo "$as_me:2382: result: no" >&5
+ echo "$as_me:2384: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:2386: checking for POSIXized ISC" >&5
+echo "$as_me:2388: 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:2391: result: yes" >&5
+ echo "$as_me:2393: result: yes" >&5
echo "${ECHO_T}yes" >&6
ISC=yes # If later tests want to check for ISC.
@@ -2402,12 +2404,12 @@ EOF
CC="$CC -Xp"
fi
else
- echo "$as_me:2405: result: no" >&5
+ echo "$as_me:2407: result: no" >&5
echo "${ECHO_T}no" >&6
ISC=
fi
-echo "$as_me:2410: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "$as_me:2412: 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
@@ -2501,7 +2503,7 @@ if test -n "$cf_new_extra_cppflags" ; then
fi
cat >conftest.$ac_ext <<_ACEOF
-#line 2504 "configure"
+#line 2506 "configure"
#include "confdefs.h"
#ifndef CC_HAS_PROTOS
@@ -2522,16 +2524,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2525: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2527: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2528: \$? = $ac_status" >&5
+ echo "$as_me:2530: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2531: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2533: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2534: \$? = $ac_status" >&5
+ echo "$as_me:2536: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ansi_cc="$cf_arg"; break
else
@@ -2544,7 +2546,7 @@ CFLAGS="$cf_save_CFLAGS"
CPPFLAGS="$cf_save_CPPFLAGS"
fi
-echo "$as_me:2547: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:2549: result: $cf_cv_ansi_cc" >&5
echo "${ECHO_T}$cf_cv_ansi_cc" >&6
if test "$cf_cv_ansi_cc" != "no"; then
@@ -2627,7 +2629,7 @@ fi
fi
if test "$cf_cv_ansi_cc" = "no"; then
- { { echo "$as_me:2630: error: Your compiler does not appear to recognize prototypes.
+ { { echo "$as_me:2632: 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
@@ -2667,7 +2669,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:2670: checking for $ac_word" >&5
+echo "$as_me:2672: 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
@@ -2684,7 +2686,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:2687: found $ac_dir/$ac_word" >&5
+ echo "$as_me:2689: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -2695,10 +2697,10 @@ fi
LDCONFIG=$ac_cv_path_LDCONFIG
if test -n "$LDCONFIG"; then
- echo "$as_me:2698: result: $LDCONFIG" >&5
+ echo "$as_me:2700: result: $LDCONFIG" >&5
echo "${ECHO_T}$LDCONFIG" >&6
else
- echo "$as_me:2701: result: no" >&5
+ echo "$as_me:2703: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -2706,7 +2708,7 @@ fi
esac
fi
-echo "$as_me:2709: checking if you want to ensure bool is consistent with C++" >&5
+echo "$as_me:2711: 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.
@@ -2716,7 +2718,7 @@ if test "${with_cxx+set}" = set; then
else
cf_with_cxx=yes
fi;
-echo "$as_me:2719: result: $cf_with_cxx" >&5
+echo "$as_me:2721: result: $cf_with_cxx" >&5
echo "${ECHO_T}$cf_with_cxx" >&6
if test "X$cf_with_cxx" = Xno ; then
CXX=""
@@ -2734,7 +2736,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:2737: checking for $ac_word" >&5
+echo "$as_me:2739: 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
@@ -2749,7 +2751,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:2752: found $ac_dir/$ac_word" >&5
+echo "$as_me:2754: found $ac_dir/$ac_word" >&5
break
done
@@ -2757,10 +2759,10 @@ fi
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
- echo "$as_me:2760: result: $CXX" >&5
+ echo "$as_me:2762: result: $CXX" >&5
echo "${ECHO_T}$CXX" >&6
else
- echo "$as_me:2763: result: no" >&5
+ echo "$as_me:2765: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -2773,7 +2775,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:2776: checking for $ac_word" >&5
+echo "$as_me:2778: 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
@@ -2788,7 +2790,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:2791: found $ac_dir/$ac_word" >&5
+echo "$as_me:2793: found $ac_dir/$ac_word" >&5
break
done
@@ -2796,10 +2798,10 @@ fi
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
- echo "$as_me:2799: result: $ac_ct_CXX" >&5
+ echo "$as_me:2801: result: $ac_ct_CXX" >&5
echo "${ECHO_T}$ac_ct_CXX" >&6
else
- echo "$as_me:2802: result: no" >&5
+ echo "$as_me:2804: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -2811,32 +2813,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
fi
# Provide some information about the compiler.
-echo "$as_me:2814:" \
+echo "$as_me:2816:" \
"checking for C++ compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:2817: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2819: \"$ac_compiler --version </dev/null >&5\"") >&5
(eval $ac_compiler --version </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:2820: \$? = $ac_status" >&5
+ echo "$as_me:2822: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:2822: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2824: \"$ac_compiler -v </dev/null >&5\"") >&5
(eval $ac_compiler -v </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:2825: \$? = $ac_status" >&5
+ echo "$as_me:2827: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:2827: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:2829: \"$ac_compiler -V </dev/null >&5\"") >&5
(eval $ac_compiler -V </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:2830: \$? = $ac_status" >&5
+ echo "$as_me:2832: \$? = $ac_status" >&5
(exit $ac_status); }
-echo "$as_me:2833: checking whether we are using the GNU C++ compiler" >&5
+echo "$as_me:2835: 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 2839 "configure"
+#line 2841 "configure"
#include "confdefs.h"
int
@@ -2851,16 +2853,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2854: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2856: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2857: \$? = $ac_status" >&5
+ echo "$as_me:2859: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2860: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2862: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2863: \$? = $ac_status" >&5
+ echo "$as_me:2865: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_compiler_gnu=yes
else
@@ -2872,19 +2874,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:2875: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "$as_me:2877: 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:2881: checking whether $CXX accepts -g" >&5
+echo "$as_me:2883: 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 2887 "configure"
+#line 2889 "configure"
#include "confdefs.h"
int
@@ -2896,16 +2898,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2899: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2901: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2902: \$? = $ac_status" >&5
+ echo "$as_me:2904: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2905: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2907: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2908: \$? = $ac_status" >&5
+ echo "$as_me:2910: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cxx_g=yes
else
@@ -2915,7 +2917,7 @@ ac_cv_prog_cxx_g=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:2918: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:2920: 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
@@ -2942,7 +2944,7 @@ for ac_declaration in \
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
-#line 2945 "configure"
+#line 2947 "configure"
#include "confdefs.h"
#include <stdlib.h>
$ac_declaration
@@ -2955,16 +2957,16 @@ exit (42);
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2958: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2960: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2961: \$? = $ac_status" >&5
+ echo "$as_me:2963: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2964: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2966: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2967: \$? = $ac_status" >&5
+ echo "$as_me:2969: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -2974,7 +2976,7 @@ continue
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 2977 "configure"
+#line 2979 "configure"
#include "confdefs.h"
$ac_declaration
int
@@ -2986,16 +2988,16 @@ exit (42);
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2989: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2992: \$? = $ac_status" >&5
+ echo "$as_me:2994: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2995: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2997: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2998: \$? = $ac_status" >&5
+ echo "$as_me:3000: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -3022,7 +3024,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:3025: checking for $ac_word" >&5
+echo "$as_me:3027: 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
@@ -3039,7 +3041,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:3042: found $ac_dir/$ac_word" >&5
+ echo "$as_me:3044: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -3050,16 +3052,16 @@ fi
CXX=$ac_cv_path_CXX
if test -n "$CXX"; then
- echo "$as_me:3053: result: $CXX" >&5
+ echo "$as_me:3055: result: $CXX" >&5
echo "${ECHO_T}$CXX" >&6
else
- echo "$as_me:3056: result: no" >&5
+ echo "$as_me:3058: result: no" >&5
echo "${ECHO_T}no" >&6
fi
fi
if test "$CXX" = "g++" ; then
- { echo "$as_me:3062: WARNING: ignoring hardcoded g++" >&5
+ { echo "$as_me:3064: WARNING: ignoring hardcoded g++" >&5
echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
cf_with_cxx=no; CXX=""; GXX="";
fi
@@ -3067,11 +3069,11 @@ fi
GXX_VERSION=none
if test "$GXX" = yes; then
- echo "$as_me:3070: checking version of g++" >&5
+ echo "$as_me:3072: 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:3074: result: $GXX_VERSION" >&5
+ echo "$as_me:3076: result: $GXX_VERSION" >&5
echo "${ECHO_T}$GXX_VERSION" >&6
fi
@@ -3079,12 +3081,12 @@ case $GXX_VERSION in
1*|2.[0-6]*)
# GXX=""; CXX=""; ac_cv_prog_gxx=no
# cf_cxx_library=no
- { echo "$as_me:3082: WARNING: templates do not work" >&5
+ { echo "$as_me:3084: WARNING: templates do not work" >&5
echo "$as_me: WARNING: templates do not work" >&2;}
;;
esac
-echo "$as_me:3087: checking if you want to build C++ binding and demo" >&5
+echo "$as_me:3089: 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.
@@ -3094,10 +3096,10 @@ if test "${with_cxx_binding+set}" = set; then
else
cf_with_cxx_binding=$cf_with_cxx
fi;
-echo "$as_me:3097: result: $cf_with_cxx_binding" >&5
+echo "$as_me:3099: result: $cf_with_cxx_binding" >&5
echo "${ECHO_T}$cf_with_cxx_binding" >&6
-echo "$as_me:3100: checking if you want to build with Ada95" >&5
+echo "$as_me:3102: 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.
@@ -3107,10 +3109,10 @@ if test "${with_ada+set}" = set; then
else
cf_with_ada=yes
fi;
-echo "$as_me:3110: result: $cf_with_ada" >&5
+echo "$as_me:3112: result: $cf_with_ada" >&5
echo "${ECHO_T}$cf_with_ada" >&6
-echo "$as_me:3113: checking if you want to build programs such as tic" >&5
+echo "$as_me:3115: 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.
@@ -3120,10 +3122,10 @@ if test "${with_progs+set}" = set; then
else
cf_with_progs=yes
fi;
-echo "$as_me:3123: result: $cf_with_progs" >&5
+echo "$as_me:3125: result: $cf_with_progs" >&5
echo "${ECHO_T}$cf_with_progs" >&6
-echo "$as_me:3126: checking if you wish to install curses.h" >&5
+echo "$as_me:3128: 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.
@@ -3133,7 +3135,7 @@ if test "${with_curses_h+set}" = set; then
else
with_curses_h=yes
fi;
-echo "$as_me:3136: result: $with_curses_h" >&5
+echo "$as_me:3138: result: $with_curses_h" >&5
echo "${ECHO_T}$with_curses_h" >&6
modules_to_build="ncurses"
@@ -3159,7 +3161,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:3162: checking for $ac_word" >&5
+echo "$as_me:3164: 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
@@ -3174,7 +3176,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:3177: found $ac_dir/$ac_word" >&5
+echo "$as_me:3179: found $ac_dir/$ac_word" >&5
break
done
@@ -3182,21 +3184,21 @@ fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- echo "$as_me:3185: result: $AWK" >&5
+ echo "$as_me:3187: result: $AWK" >&5
echo "${ECHO_T}$AWK" >&6
else
- echo "$as_me:3188: result: no" >&5
+ echo "$as_me:3190: result: no" >&5
echo "${ECHO_T}no" >&6
fi
test -n "$AWK" && break
done
-test -z "$AWK" && { { echo "$as_me:3195: error: No awk program found" >&5
+test -z "$AWK" && { { echo "$as_me:3197: error: No awk program found" >&5
echo "$as_me: error: No awk program found" >&2;}
{ (exit 1); exit 1; }; }
-echo "$as_me:3199: checking for egrep" >&5
+echo "$as_me:3201: 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
@@ -3206,11 +3208,11 @@ else
else ac_cv_prog_egrep='egrep'
fi
fi
-echo "$as_me:3209: result: $ac_cv_prog_egrep" >&5
+echo "$as_me:3211: 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:3213: error: No egrep program found" >&5
+test -z "$EGREP" && { { echo "$as_me:3215: error: No egrep program found" >&5
echo "$as_me: error: No egrep program found" >&2;}
{ (exit 1); exit 1; }; }
@@ -3226,7 +3228,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:3229: checking for a BSD compatible install" >&5
+echo "$as_me:3231: 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
@@ -3275,7 +3277,7 @@ fi
INSTALL=$ac_install_sh
fi
fi
-echo "$as_me:3278: result: $INSTALL" >&5
+echo "$as_me:3280: result: $INSTALL" >&5
echo "${ECHO_T}$INSTALL" >&6
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3300,7 +3302,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:3303: checking for $ac_word" >&5
+echo "$as_me:3305: 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
@@ -3315,7 +3317,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:3318: found $ac_dir/$ac_word" >&5
+echo "$as_me:3320: found $ac_dir/$ac_word" >&5
break
done
@@ -3323,28 +3325,28 @@ fi
fi
LINT=$ac_cv_prog_LINT
if test -n "$LINT"; then
- echo "$as_me:3326: result: $LINT" >&5
+ echo "$as_me:3328: result: $LINT" >&5
echo "${ECHO_T}$LINT" >&6
else
- echo "$as_me:3329: result: no" >&5
+ echo "$as_me:3331: result: no" >&5
echo "${ECHO_T}no" >&6
fi
test -n "$LINT" && break
done
-echo "$as_me:3336: checking whether ln -s works" >&5
+echo "$as_me:3338: 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:3340: result: yes" >&5
+ echo "$as_me:3342: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
- echo "$as_me:3343: result: no, using $LN_S" >&5
+ echo "$as_me:3345: result: no, using $LN_S" >&5
echo "${ECHO_T}no, using $LN_S" >&6
fi
-echo "$as_me:3347: checking for long file names" >&5
+echo "$as_me:3349: 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
@@ -3383,7 +3385,7 @@ for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
rm -rf $ac_xdir 2>/dev/null
done
fi
-echo "$as_me:3386: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:3388: 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
@@ -3393,7 +3395,7 @@ EOF
fi
-echo "$as_me:3396: checking if we should assume mixed-case filenames" >&5
+echo "$as_me:3398: 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.
@@ -3403,11 +3405,11 @@ if test "${enable_mixed_case+set}" = set; then
else
enable_mixedcase=auto
fi;
-echo "$as_me:3406: result: $enable_mixedcase" >&5
+echo "$as_me:3408: result: $enable_mixedcase" >&5
echo "${ECHO_T}$enable_mixedcase" >&6
if test "$enable_mixedcase" = "auto" ; then
-echo "$as_me:3410: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3412: 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
@@ -3434,7 +3436,7 @@ else
fi
fi
-echo "$as_me:3437: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3439: 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
@@ -3451,7 +3453,7 @@ EOF
fi
# do this after mixed-case option (tags/TAGS is not as important as tic).
-echo "$as_me:3454: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:3456: 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
@@ -3471,18 +3473,18 @@ fi
rm -f conftest.make
fi
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$as_me:3474: result: yes" >&5
+ echo "$as_me:3476: result: yes" >&5
echo "${ECHO_T}yes" >&6
SET_MAKE=
else
- echo "$as_me:3478: result: no" >&5
+ echo "$as_me:3480: 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:3485: checking for $ac_word" >&5
+echo "$as_me:3487: 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
@@ -3497,7 +3499,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:3500: found $ac_dir/$ac_word" >&5
+echo "$as_me:3502: found $ac_dir/$ac_word" >&5
break
done
@@ -3506,17 +3508,17 @@ fi
fi
MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
if test -n "$MAKE_LOWER_TAGS"; then
- echo "$as_me:3509: result: $MAKE_LOWER_TAGS" >&5
+ echo "$as_me:3511: result: $MAKE_LOWER_TAGS" >&5
echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
else
- echo "$as_me:3512: result: no" >&5
+ echo "$as_me:3514: 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:3519: checking for $ac_word" >&5
+echo "$as_me:3521: 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
@@ -3531,7 +3533,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:3534: found $ac_dir/$ac_word" >&5
+echo "$as_me:3536: found $ac_dir/$ac_word" >&5
break
done
@@ -3540,10 +3542,10 @@ fi
fi
MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
if test -n "$MAKE_UPPER_TAGS"; then
- echo "$as_me:3543: result: $MAKE_UPPER_TAGS" >&5
+ echo "$as_me:3545: result: $MAKE_UPPER_TAGS" >&5
echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
else
- echo "$as_me:3546: result: no" >&5
+ echo "$as_me:3548: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3563,7 +3565,7 @@ else
MAKE_LOWER_TAGS="#"
fi
-echo "$as_me:3566: checking for makeflags variable" >&5
+echo "$as_me:3568: 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
@@ -3597,13 +3599,13 @@ CF_EOF
rm -f cf_makeflags.tmp
fi
-echo "$as_me:3600: result: $cf_cv_makeflags" >&5
+echo "$as_me:3602: result: $cf_cv_makeflags" >&5
echo "${ECHO_T}$cf_cv_makeflags" >&6
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:3606: checking for $ac_word" >&5
+echo "$as_me:3608: 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
@@ -3618,7 +3620,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:3621: found $ac_dir/$ac_word" >&5
+echo "$as_me:3623: found $ac_dir/$ac_word" >&5
break
done
@@ -3626,10 +3628,10 @@ fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- echo "$as_me:3629: result: $RANLIB" >&5
+ echo "$as_me:3631: result: $RANLIB" >&5
echo "${ECHO_T}$RANLIB" >&6
else
- echo "$as_me:3632: result: no" >&5
+ echo "$as_me:3634: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3638,7 +3640,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:3641: checking for $ac_word" >&5
+echo "$as_me:3643: 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
@@ -3653,7 +3655,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:3656: found $ac_dir/$ac_word" >&5
+echo "$as_me:3658: found $ac_dir/$ac_word" >&5
break
done
@@ -3662,10 +3664,10 @@ fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- echo "$as_me:3665: result: $ac_ct_RANLIB" >&5
+ echo "$as_me:3667: result: $ac_ct_RANLIB" >&5
echo "${ECHO_T}$ac_ct_RANLIB" >&6
else
- echo "$as_me:3668: result: no" >&5
+ echo "$as_me:3670: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3677,7 +3679,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:3680: checking for $ac_word" >&5
+echo "$as_me:3682: 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
@@ -3692,7 +3694,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:3695: found $ac_dir/$ac_word" >&5
+echo "$as_me:3697: found $ac_dir/$ac_word" >&5
break
done
@@ -3700,10 +3702,10 @@ fi
fi
LD=$ac_cv_prog_LD
if test -n "$LD"; then
- echo "$as_me:3703: result: $LD" >&5
+ echo "$as_me:3705: result: $LD" >&5
echo "${ECHO_T}$LD" >&6
else
- echo "$as_me:3706: result: no" >&5
+ echo "$as_me:3708: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3712,7 +3714,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:3715: checking for $ac_word" >&5
+echo "$as_me:3717: 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
@@ -3727,7 +3729,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:3730: found $ac_dir/$ac_word" >&5
+echo "$as_me:3732: found $ac_dir/$ac_word" >&5
break
done
@@ -3736,10 +3738,10 @@ fi
fi
ac_ct_LD=$ac_cv_prog_ac_ct_LD
if test -n "$ac_ct_LD"; then
- echo "$as_me:3739: result: $ac_ct_LD" >&5
+ echo "$as_me:3741: result: $ac_ct_LD" >&5
echo "${ECHO_T}$ac_ct_LD" >&6
else
- echo "$as_me:3742: result: no" >&5
+ echo "$as_me:3744: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3751,7 +3753,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:3754: checking for $ac_word" >&5
+echo "$as_me:3756: 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
@@ -3766,7 +3768,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:3769: found $ac_dir/$ac_word" >&5
+echo "$as_me:3771: found $ac_dir/$ac_word" >&5
break
done
@@ -3774,10 +3776,10 @@ fi
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
- echo "$as_me:3777: result: $AR" >&5
+ echo "$as_me:3779: result: $AR" >&5
echo "${ECHO_T}$AR" >&6
else
- echo "$as_me:3780: result: no" >&5
+ echo "$as_me:3782: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3786,7 +3788,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:3789: checking for $ac_word" >&5
+echo "$as_me:3791: 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
@@ -3801,7 +3803,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:3804: found $ac_dir/$ac_word" >&5
+echo "$as_me:3806: found $ac_dir/$ac_word" >&5
break
done
@@ -3810,10 +3812,10 @@ fi
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
- echo "$as_me:3813: result: $ac_ct_AR" >&5
+ echo "$as_me:3815: result: $ac_ct_AR" >&5
echo "${ECHO_T}$ac_ct_AR" >&6
else
- echo "$as_me:3816: result: no" >&5
+ echo "$as_me:3818: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3826,7 +3828,7 @@ if test "${cf_cv_subst_AR_OPTS+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-echo "$as_me:3829: checking for archiver options (symbol AR_OPTS)" >&5
+echo "$as_me:3831: 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
@@ -3835,12 +3837,12 @@ if test -z "$AR_OPTS" ; then
fi
cf_cv_subst_AR_OPTS=$AR_OPTS
-echo "$as_me:3838: result: $AR_OPTS" >&5
+echo "$as_me:3840: result: $AR_OPTS" >&5
echo "${ECHO_T}$AR_OPTS" >&6
fi
-echo "$as_me:3843: checking if you have specified an install-prefix" >&5
+echo "$as_me:3845: 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.
@@ -3853,7 +3855,7 @@ if test "${with_install_prefix+set}" = set; then
;;
esac
fi;
-echo "$as_me:3856: result: $DESTDIR" >&5
+echo "$as_me:3858: result: $DESTDIR" >&5
echo "${ECHO_T}$DESTDIR" >&6
###############################################################################
@@ -3881,7 +3883,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:3884: checking for $ac_word" >&5
+echo "$as_me:3886: 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
@@ -3896,7 +3898,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:3899: found $ac_dir/$ac_word" >&5
+echo "$as_me:3901: found $ac_dir/$ac_word" >&5
break
done
@@ -3904,10 +3906,10 @@ fi
fi
BUILD_CC=$ac_cv_prog_BUILD_CC
if test -n "$BUILD_CC"; then
- echo "$as_me:3907: result: $BUILD_CC" >&5
+ echo "$as_me:3909: result: $BUILD_CC" >&5
echo "${ECHO_T}$BUILD_CC" >&6
else
- echo "$as_me:3910: result: no" >&5
+ echo "$as_me:3912: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3915,12 +3917,12 @@ fi
done
fi;
- echo "$as_me:3918: checking for native build C compiler" >&5
+ echo "$as_me:3920: checking for native build C compiler" >&5
echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
- echo "$as_me:3920: result: $BUILD_CC" >&5
+ echo "$as_me:3922: result: $BUILD_CC" >&5
echo "${ECHO_T}$BUILD_CC" >&6
- echo "$as_me:3923: checking for native build C preprocessor" >&5
+ echo "$as_me:3925: 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.
@@ -3930,10 +3932,10 @@ if test "${with_build_cpp+set}" = set; then
else
BUILD_CPP='${BUILD_CC} -E'
fi;
- echo "$as_me:3933: result: $BUILD_CPP" >&5
+ echo "$as_me:3935: result: $BUILD_CPP" >&5
echo "${ECHO_T}$BUILD_CPP" >&6
- echo "$as_me:3936: checking for native build C flags" >&5
+ echo "$as_me:3938: 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.
@@ -3941,10 +3943,10 @@ if test "${with_build_cflags+set}" = set; then
withval="$with_build_cflags"
BUILD_CFLAGS="$withval"
fi;
- echo "$as_me:3944: result: $BUILD_CFLAGS" >&5
+ echo "$as_me:3946: result: $BUILD_CFLAGS" >&5
echo "${ECHO_T}$BUILD_CFLAGS" >&6
- echo "$as_me:3947: checking for native build C preprocessor-flags" >&5
+ echo "$as_me:3949: 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.
@@ -3952,10 +3954,10 @@ if test "${with_build_cppflags+set}" = set; then
withval="$with_build_cppflags"
BUILD_CPPFLAGS="$withval"
fi;
- echo "$as_me:3955: result: $BUILD_CPPFLAGS" >&5
+ echo "$as_me:3957: result: $BUILD_CPPFLAGS" >&5
echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
- echo "$as_me:3958: checking for native build linker-flags" >&5
+ echo "$as_me:3960: 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.
@@ -3963,10 +3965,10 @@ if test "${with_build_ldflags+set}" = set; then
withval="$with_build_ldflags"
BUILD_LDFLAGS="$withval"
fi;
- echo "$as_me:3966: result: $BUILD_LDFLAGS" >&5
+ echo "$as_me:3968: result: $BUILD_LDFLAGS" >&5
echo "${ECHO_T}$BUILD_LDFLAGS" >&6
- echo "$as_me:3969: checking for native build linker-libraries" >&5
+ echo "$as_me:3971: 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.
@@ -3974,7 +3976,7 @@ if test "${with_build_libs+set}" = set; then
withval="$with_build_libs"
BUILD_LIBS="$withval"
fi;
- echo "$as_me:3977: result: $BUILD_LIBS" >&5
+ echo "$as_me:3979: result: $BUILD_LIBS" >&5
echo "${ECHO_T}$BUILD_LIBS" >&6
# this assumes we're on Unix.
@@ -3984,7 +3986,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
: ${BUILD_CC:='${CC}'}
if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
- { { echo "$as_me:3987: error: Cross-build requires two compilers.
+ { { echo "$as_me:3989: 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;}
@@ -4025,7 +4027,7 @@ LIB_LINK='${CC}'
LIB_INSTALL=
LIB_UNINSTALL=
-echo "$as_me:4028: checking if you want to build libraries with libtool" >&5
+echo "$as_me:4030: 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.
@@ -4035,7 +4037,7 @@ if test "${with_libtool+set}" = set; then
else
with_libtool=no
fi;
-echo "$as_me:4038: result: $with_libtool" >&5
+echo "$as_me:4040: result: $with_libtool" >&5
echo "${ECHO_T}$with_libtool" >&6
if test "$with_libtool" != "no"; then
@@ -4066,7 +4068,7 @@ case ".$with_libtool" in #(vi
with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:4069: error: expected a pathname, not \"$with_libtool\"" >&5
+ { { echo "$as_me:4071: error: expected a pathname, not \"$with_libtool\"" >&5
echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -4076,7 +4078,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:4079: checking for $ac_word" >&5
+echo "$as_me:4081: 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
@@ -4093,7 +4095,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:4096: found $ac_dir/$ac_word" >&5
+ echo "$as_me:4098: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -4104,16 +4106,16 @@ fi
LIBTOOL=$ac_cv_path_LIBTOOL
if test -n "$LIBTOOL"; then
- echo "$as_me:4107: result: $LIBTOOL" >&5
+ echo "$as_me:4109: result: $LIBTOOL" >&5
echo "${ECHO_T}$LIBTOOL" >&6
else
- echo "$as_me:4110: result: no" >&5
+ echo "$as_me:4112: result: no" >&5
echo "${ECHO_T}no" >&6
fi
fi
if test -z "$LIBTOOL" ; then
- { { echo "$as_me:4116: error: Cannot find libtool" >&5
+ { { echo "$as_me:4118: error: Cannot find libtool" >&5
echo "$as_me: error: Cannot find libtool" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -4128,17 +4130,17 @@ echo "$as_me: error: Cannot find libtool" >&2;}
LIB_PREP=:
# Show the version of libtool
- echo "$as_me:4131: checking version of libtool" >&5
+ echo "$as_me:4133: 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 '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
- echo "$as_me:4138: result: $cf_cv_libtool_version" >&5
+ echo "$as_me:4140: 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:4141: error: This is not GNU libtool" >&5
+ { { echo "$as_me:4143: error: This is not GNU libtool" >&5
echo "$as_me: error: This is not GNU libtool" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -4166,7 +4168,7 @@ cf_list_models="$cf_list_models libtool"
else
-echo "$as_me:4169: checking if you want to build shared libraries" >&5
+echo "$as_me:4171: 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.
@@ -4176,11 +4178,11 @@ if test "${with_shared+set}" = set; then
else
with_shared=no
fi;
-echo "$as_me:4179: result: $with_shared" >&5
+echo "$as_me:4181: result: $with_shared" >&5
echo "${ECHO_T}$with_shared" >&6
test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
-echo "$as_me:4183: checking if you want to build static libraries" >&5
+echo "$as_me:4185: 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.
@@ -4190,11 +4192,11 @@ if test "${with_normal+set}" = set; then
else
with_normal=yes
fi;
-echo "$as_me:4193: result: $with_normal" >&5
+echo "$as_me:4195: result: $with_normal" >&5
echo "${ECHO_T}$with_normal" >&6
test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal"
-echo "$as_me:4197: checking if you want to build debug libraries" >&5
+echo "$as_me:4199: 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.
@@ -4204,11 +4206,11 @@ if test "${with_debug+set}" = set; then
else
with_debug=yes
fi;
-echo "$as_me:4207: result: $with_debug" >&5
+echo "$as_me:4209: result: $with_debug" >&5
echo "${ECHO_T}$with_debug" >&6
test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug"
-echo "$as_me:4211: checking if you want to build profiling libraries" >&5
+echo "$as_me:4213: 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.
@@ -4218,7 +4220,7 @@ if test "${with_profile+set}" = set; then
else
with_profile=no
fi;
-echo "$as_me:4221: result: $with_profile" >&5
+echo "$as_me:4223: result: $with_profile" >&5
echo "${ECHO_T}$with_profile" >&6
test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile"
@@ -4226,19 +4228,19 @@ fi
###############################################################################
-echo "$as_me:4229: checking for specified models" >&5
+echo "$as_me:4231: 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:4233: result: $cf_list_models" >&5
+echo "$as_me:4235: 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:4238: checking for default model" >&5
+echo "$as_me:4240: 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:4241: result: $DFT_LWR_MODEL" >&5
+echo "$as_me:4243: result: $DFT_LWR_MODEL" >&5
echo "${ECHO_T}$DFT_LWR_MODEL" >&6
DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -4252,10 +4254,12 @@ LIB_NAME=ncurses
LIB_DIR=../lib
LIB_2ND=../../lib
- case $cf_cv_system_name in
- OS/2*) LIB_PREFIX='' ;;
- os2*) LIB_PREFIX='' ;;
- *) LIB_PREFIX='lib' ;;
+ case $cf_cv_system_name in #(vi
+ OS/2*|os2*) #(vi
+ LIB_PREFIX=''
+ ;;
+ *) LIB_PREFIX='lib'
+ ;;
esac
cf_prefix=$LIB_PREFIX
@@ -4265,7 +4269,7 @@ LIB_SUFFIX=
###############################################################################
-echo "$as_me:4268: checking if you want to build a separate terminfo library" >&5
+echo "$as_me:4272: 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.
@@ -4275,10 +4279,10 @@ if test "${with_termlib+set}" = set; then
else
with_termlib=no
fi;
-echo "$as_me:4278: result: $with_termlib" >&5
+echo "$as_me:4282: result: $with_termlib" >&5
echo "${ECHO_T}$with_termlib" >&6
-echo "$as_me:4281: checking if you want to build a separate tic library" >&5
+echo "$as_me:4285: 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.
@@ -4288,13 +4292,13 @@ if test "${with_ticlib+set}" = set; then
else
with_ticlib=no
fi;
-echo "$as_me:4291: result: $with_ticlib" >&5
+echo "$as_me:4295: result: $with_ticlib" >&5
echo "${ECHO_T}$with_ticlib" >&6
### Checks for special libraries, must be done up-front.
SHLIB_LIST=""
-echo "$as_me:4297: checking if you want to link with the GPM mouse library" >&5
+echo "$as_me:4301: 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.
@@ -4304,27 +4308,27 @@ if test "${with_gpm+set}" = set; then
else
with_gpm=maybe
fi;
-echo "$as_me:4307: result: $with_gpm" >&5
+echo "$as_me:4311: result: $with_gpm" >&5
echo "${ECHO_T}$with_gpm" >&6
if test "$with_gpm" != no ; then
- echo "$as_me:4311: checking for gpm.h" >&5
+ echo "$as_me:4315: 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 4317 "configure"
+#line 4321 "configure"
#include "confdefs.h"
#include <gpm.h>
_ACEOF
-if { (eval echo "$as_me:4321: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4325: \"$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:4327: \$? = $ac_status" >&5
+ echo "$as_me:4331: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4343,7 +4347,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:4346: result: $ac_cv_header_gpm_h" >&5
+echo "$as_me:4350: 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
@@ -4354,14 +4358,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}:4357: testing assuming we really have GPM library ..." 1>&5
+echo "${as_me-configure}:4361: testing assuming we really have GPM library ..." 1>&5
cat >>confdefs.h <<\EOF
#define HAVE_LIBGPM 1
EOF
else
- echo "$as_me:4364: checking for Gpm_Open in -lgpm" >&5
+ echo "$as_me:4368: 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
@@ -4369,7 +4373,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 4372 "configure"
+#line 4376 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4388,16 +4392,16 @@ Gpm_Open ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4391: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4395: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4394: \$? = $ac_status" >&5
+ echo "$as_me:4398: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4397: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4401: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4400: \$? = $ac_status" >&5
+ echo "$as_me:4404: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gpm_Gpm_Open=yes
else
@@ -4408,13 +4412,13 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:4411: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:4415: 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:4417: error: Cannot link with GPM library" >&5
+ { { echo "$as_me:4421: error: Cannot link with GPM library" >&5
echo "$as_me: error: Cannot link with GPM library" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -4424,7 +4428,7 @@ fi
else
- test "$with_gpm" != maybe && { echo "$as_me:4427: WARNING: Cannot find GPM header" >&5
+ test "$with_gpm" != maybe && { echo "$as_me:4431: WARNING: Cannot find GPM header" >&5
echo "$as_me: WARNING: Cannot find GPM header" >&2;}
with_gpm=no
@@ -4433,7 +4437,7 @@ fi
fi
if test "$with_gpm" != no ; then
- echo "$as_me:4436: checking if you want to load GPM dynamically" >&5
+ echo "$as_me:4440: 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.
@@ -4443,18 +4447,18 @@ if test "${with_dlsym+set}" = set; then
else
with_dlsym=yes
fi;
- echo "$as_me:4446: result: $with_dlsym" >&5
+ echo "$as_me:4450: result: $with_dlsym" >&5
echo "${ECHO_T}$with_dlsym" >&6
if test "$with_dlsym" = yes ; then
cf_have_dlsym=no
-echo "$as_me:4451: checking for dlsym" >&5
+echo "$as_me:4455: 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 4457 "configure"
+#line 4461 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlsym (); below. */
@@ -4485,16 +4489,16 @@ f = dlsym;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4488: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4492: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4491: \$? = $ac_status" >&5
+ echo "$as_me:4495: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4494: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4498: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4497: \$? = $ac_status" >&5
+ echo "$as_me:4501: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_dlsym=yes
else
@@ -4504,14 +4508,14 @@ ac_cv_func_dlsym=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:4507: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:4511: 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:4514: checking for dlsym in -ldl" >&5
+echo "$as_me:4518: 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
@@ -4519,7 +4523,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 4522 "configure"
+#line 4526 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4538,16 +4542,16 @@ dlsym ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4541: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4545: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4544: \$? = $ac_status" >&5
+ echo "$as_me:4548: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4547: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4551: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4550: \$? = $ac_status" >&5
+ echo "$as_me:4554: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dl_dlsym=yes
else
@@ -4558,7 +4562,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:4561: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:4565: 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
@@ -4571,10 +4575,10 @@ fi
if test "$cf_have_dlsym" = yes ; then
test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
- echo "$as_me:4574: checking whether able to link to dl*() functions" >&5
+ echo "$as_me:4578: 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 4577 "configure"
+#line 4581 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int
@@ -4592,16 +4596,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4595: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4599: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4598: \$? = $ac_status" >&5
+ echo "$as_me:4602: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4601: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4605: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4604: \$? = $ac_status" >&5
+ echo "$as_me:4608: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cat >>confdefs.h <<\EOF
@@ -4612,15 +4616,15 @@ else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- { { echo "$as_me:4615: error: Cannot link test program for libdl" >&5
+ { { echo "$as_me:4619: 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:4620: result: ok" >&5
+ echo "$as_me:4624: result: ok" >&5
echo "${ECHO_T}ok" >&6
else
- { { echo "$as_me:4623: error: Cannot find dlsym function" >&5
+ { { echo "$as_me:4627: error: Cannot find dlsym function" >&5
echo "$as_me: error: Cannot find dlsym function" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -4628,12 +4632,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}:4631: testing assuming soname for gpm is $with_gpm ..." 1>&5
+echo "${as_me-configure}:4635: testing assuming soname for gpm is $with_gpm ..." 1>&5
cf_cv_gpm_soname="$with_gpm"
else
-echo "$as_me:4636: checking for soname of gpm library" >&5
+echo "$as_me:4640: 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
@@ -4651,15 +4655,15 @@ if (Gpm_Open(0,0)) Gpm_Close();
CF_EOF
cf_save_LIBS="$LIBS"
LIBS="-lgpm $LIBS"
- if { (eval echo "$as_me:4654: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:4658: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4657: \$? = $ac_status" >&5
+ echo "$as_me:4661: \$? = $ac_status" >&5
(exit $ac_status); } ; then
- if { (eval echo "$as_me:4659: \"$ac_link\"") >&5
+ if { (eval echo "$as_me:4663: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4662: \$? = $ac_status" >&5
+ echo "$as_me:4666: \$? = $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
@@ -4670,7 +4674,7 @@ LIBS="$cf_save_LIBS"
fi
fi
-echo "$as_me:4673: result: $cf_cv_gpm_soname" >&5
+echo "$as_me:4677: result: $cf_cv_gpm_soname" >&5
echo "${ECHO_T}$cf_cv_gpm_soname" >&6
fi
@@ -4686,7 +4690,7 @@ EOF
#define HAVE_LIBGPM 1
EOF
-echo "$as_me:4689: checking for Gpm_Wgetch in -lgpm" >&5
+echo "$as_me:4693: 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
@@ -4694,7 +4698,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 4697 "configure"
+#line 4701 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4713,16 +4717,16 @@ Gpm_Wgetch ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4720: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4719: \$? = $ac_status" >&5
+ echo "$as_me:4723: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4722: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4726: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4725: \$? = $ac_status" >&5
+ echo "$as_me:4729: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gpm_Gpm_Wgetch=yes
else
@@ -4733,11 +4737,11 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:4736: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
+echo "$as_me:4740: 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:4740: checking if GPM is weakly bound to curses library" >&5
+echo "$as_me:4744: 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
@@ -4761,15 +4765,15 @@ CF_EOF
# to rely on the static library, noting that some packagers may not
# include it.
LIBS="-static -lgpm -dynamic $LIBS"
- if { (eval echo "$as_me:4764: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:4768: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4767: \$? = $ac_status" >&5
+ echo "$as_me:4771: \$? = $ac_status" >&5
(exit $ac_status); } ; then
- if { (eval echo "$as_me:4769: \"$ac_link\"") >&5
+ if { (eval echo "$as_me:4773: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4772: \$? = $ac_status" >&5
+ echo "$as_me:4776: \$? = $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
@@ -4781,11 +4785,11 @@ CF_EOF
fi
fi
-echo "$as_me:4784: result: $cf_cv_check_gpm_wgetch" >&5
+echo "$as_me:4788: 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:4788: WARNING: GPM library is already linked with curses - read the FAQ" >&5
+ { echo "$as_me:4792: 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
@@ -4795,7 +4799,7 @@ fi
# not everyone has "test -c"
if test -c /dev/sysmouse 2>/dev/null ; then
-echo "$as_me:4798: checking if you want to use sysmouse" >&5
+echo "$as_me:4802: 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.
@@ -4807,7 +4811,7 @@ else
fi;
if test "$cf_with_sysmouse" != no ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 4810 "configure"
+#line 4814 "configure"
#include "confdefs.h"
#include <osreldate.h>
@@ -4830,16 +4834,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4833: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4836: \$? = $ac_status" >&5
+ echo "$as_me:4840: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4839: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4843: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4842: \$? = $ac_status" >&5
+ echo "$as_me:4846: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_with_sysmouse=yes
else
@@ -4849,7 +4853,7 @@ cf_with_sysmouse=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4852: result: $cf_with_sysmouse" >&5
+echo "$as_me:4856: 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
@@ -4867,7 +4871,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:4870: checking for default loader flags" >&5
+echo "$as_me:4874: 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='' ;;
@@ -4876,12 +4880,13 @@ debug) LD_MODEL=$CC_G_OPT ;;
profile) LD_MODEL='-pg';;
shared) LD_MODEL='' ;;
esac
-echo "$as_me:4879: result: $LD_MODEL" >&5
+echo "$as_me:4883: result: $LD_MODEL" >&5
echo "${ECHO_T}$LD_MODEL" >&6
case $DFT_LWR_MODEL in
shared)
-echo "$as_me:4884: checking if rpath option should be used" >&5
+
+echo "$as_me:4889: 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.
@@ -4891,9 +4896,10 @@ if test "${enable_rpath+set}" = set; then
else
cf_cv_ld_rpath=no
fi;
-echo "$as_me:4894: result: $cf_cv_ld_rpath" >&5
+echo "$as_me:4899: result: $cf_cv_ld_rpath" >&5
echo "${ECHO_T}$cf_cv_ld_rpath" >&6
-echo "$as_me:4896: checking if shared libraries should be relinked during install" >&5
+
+echo "$as_me:4902: 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.
@@ -4903,7 +4909,7 @@ if test "${enable_relink+set}" = set; then
else
cf_cv_do_relink=yes
fi;
-echo "$as_me:4906: result: $cf_cv_do_relink" >&5
+echo "$as_me:4912: result: $cf_cv_do_relink" >&5
echo "${ECHO_T}$cf_cv_do_relink" >&6
;;
esac
@@ -4915,7 +4921,7 @@ esac
cf_cv_do_symlinks=no
- echo "$as_me:4918: checking if release/abi version should be used for shared libs" >&5
+ echo "$as_me:4924: 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.
@@ -4930,7 +4936,7 @@ if test "${with_shlib_version+set}" = set; then
cf_cv_shlib_version=$withval
;;
*)
- { { echo "$as_me:4933: error: option value must be one of: rel, abi, auto or no" >&5
+ { { echo "$as_me:4939: 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; }; }
;;
@@ -4939,7 +4945,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:4942: result: $cf_cv_shlib_version" >&5
+ echo "$as_me:4948: result: $cf_cv_shlib_version" >&5
echo "${ECHO_T}$cf_cv_shlib_version" >&6
cf_cv_rm_so_locs=no
@@ -4948,14 +4954,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6
CC_SHARED_OPTS=
if test "$GCC" = yes
then
- echo "$as_me:4951: checking which $CC option to use" >&5
+ echo "$as_me:4957: 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 4958 "configure"
+#line 4964 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -4967,16 +4973,16 @@ int x = 1
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4970: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4976: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4973: \$? = $ac_status" >&5
+ echo "$as_me:4979: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4976: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4982: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4979: \$? = $ac_status" >&5
+ echo "$as_me:4985: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -4985,7 +4991,7 @@ cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
done
- echo "$as_me:4988: result: $CC_SHARED_OPTS" >&5
+ echo "$as_me:4994: result: $CC_SHARED_OPTS" >&5
echo "${ECHO_T}$CC_SHARED_OPTS" >&6
CFLAGS="$cf_save_CFLAGS"
fi
@@ -5021,7 +5027,7 @@ CF_EOF
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:5024: checking if ld -search_paths_first works" >&5
+ echo "$as_me:5030: 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
@@ -5030,7 +5036,7 @@ else
cf_save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
cat >conftest.$ac_ext <<_ACEOF
-#line 5033 "configure"
+#line 5039 "configure"
#include "confdefs.h"
int
@@ -5042,16 +5048,16 @@ int i;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5045: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5051: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5048: \$? = $ac_status" >&5
+ echo "$as_me:5054: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5051: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5057: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5054: \$? = $ac_status" >&5
+ echo "$as_me:5060: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ldflags_search_paths_first=yes
else
@@ -5062,7 +5068,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$cf_save_LDFLAGS
fi
-echo "$as_me:5065: result: $cf_cv_ldflags_search_paths_first" >&5
+echo "$as_me:5071: 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"
@@ -5094,8 +5100,10 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
# tested with IRIX 5.2 and 'cc'.
if test "$GCC" != yes; then
CC_SHARED_OPTS='-KPIC'
+ MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $@` -o $@'
+ else
+ MK_SHARED_LIB='${CC} -shared -Wl,-soname,`basename $@` -o $@'
fi
- MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $@` -o $@'
cf_cv_rm_so_locs=yes
;;
linux*|gnu*|k*bsd*-gnu)
@@ -5110,18 +5118,34 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
if test "$cf_cv_shlib_version" = rel; then
- cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
+ cf_cv_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
else
- cf_shared_soname='`basename $@`'
+ cf_cv_shared_soname='`basename $@`'
fi
- MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,-lc -o $@'
+ MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
;;
openbsd[2-9].*)
+ if test "$DFT_LWR_MODEL" = "shared" ; then
+ LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
+ LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+ fi
+ if test "$cf_cv_ld_rpath" = yes ; then
+ cf_ld_rpath_opt="-Wl,-rpath,"
+ EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
+ fi
CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
- MK_SHARED_LIB='${LD} -Bshareable -soname,`basename $@.${ABI_VERSION}` -o $@'
+
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+ if test "$cf_cv_shlib_version" = rel; then
+ cf_cv_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
+ else
+ cf_cv_shared_soname='`basename $@`'
+ fi
+
+ MK_SHARED_LIB='${CC} ${CFLAGS} -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
;;
- openbsd*|freebsd[12].*)
+ nto-qnx*|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
@@ -5137,9 +5161,9 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
if test "$cf_cv_shlib_version" = rel; then
- cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
+ cf_cv_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
else
- cf_shared_soname='`basename $@`'
+ cf_cv_shared_soname='`basename $@`'
fi
MK_SHARED_LIB='${LD} -Bshareable -soname=`basename $@` -o $@'
@@ -5161,12 +5185,12 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
if test "$cf_cv_shlib_version" = rel; then
- cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
+ cf_cv_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
else
- cf_shared_soname='`basename $@`'
+ cf_cv_shared_soname='`basename $@`'
fi
- MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname' -o $@'
+ MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@'
else
MK_SHARED_LIB='${LD} -Bshareable -o $@'
fi
@@ -5216,9 +5240,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
;;
solaris2*)
# tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2
- if test "$GCC" != yes; then
- CC_SHARED_OPTS='-KPIC'
- fi
+ # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3
if test "$DFT_LWR_MODEL" = "shared" ; then
LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}"
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
@@ -5230,12 +5252,17 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
if test "$cf_cv_shlib_version" = rel; then
- cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
+ cf_cv_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
else
- cf_shared_soname='`basename $@`'
+ cf_cv_shared_soname='`basename $@`'
fi
- MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $@'
+ if test "$GCC" != yes; then
+ CC_SHARED_OPTS='-xcode=pic32'
+ MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $@'
+ else
+ MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@'
+ fi
;;
sysv5uw7*|unix_sv*)
# tested with UnixWare 7.1.0 (gcc 2.95.2 and cc)
@@ -5258,7 +5285,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:5261: WARNING: ignored --with-shlib-version" >&5
+ { echo "$as_me:5288: WARNING: ignored --with-shlib-version" >&5
echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
;;
esac
@@ -5266,12 +5293,12 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
esac
if test -n "$cf_ld_rpath_opt" ; then
- echo "$as_me:5269: checking if we need a space after rpath option" >&5
+ echo "$as_me:5296: 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 5274 "configure"
+#line 5301 "configure"
#include "confdefs.h"
int
@@ -5283,16 +5310,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5286: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5313: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5289: \$? = $ac_status" >&5
+ echo "$as_me:5316: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5292: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5319: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5295: \$? = $ac_status" >&5
+ echo "$as_me:5322: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_rpath_space=no
else
@@ -5302,7 +5329,7 @@ cf_rpath_space=yes
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS="$cf_save_LIBS"
- echo "$as_me:5305: result: $cf_rpath_space" >&5
+ echo "$as_me:5332: 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}"
@@ -5311,7 +5338,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:5314: error: Shared libraries are not supported in this version" >&5
+ { { echo "$as_me:5341: 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
@@ -5321,7 +5348,7 @@ fi
###############################################################################
### use option --disable-overwrite to leave out the link to -lcurses
-echo "$as_me:5324: checking if you wish to install ncurses overwriting curses" >&5
+echo "$as_me:5351: 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.
@@ -5331,10 +5358,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:5334: result: $with_overwrite" >&5
+echo "$as_me:5361: result: $with_overwrite" >&5
echo "${ECHO_T}$with_overwrite" >&6
-echo "$as_me:5337: checking if external terminfo-database is used" >&5
+echo "$as_me:5364: 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.
@@ -5344,7 +5371,7 @@ if test "${enable_database+set}" = set; then
else
use_database=yes
fi;
-echo "$as_me:5347: result: $use_database" >&5
+echo "$as_me:5374: result: $use_database" >&5
echo "${ECHO_T}$use_database" >&6
case $host_os in #(vi
@@ -5366,7 +5393,7 @@ if test "$use_database" != no ; then
#define USE_DATABASE 1
EOF
- echo "$as_me:5369: checking which terminfo source-file will be installed" >&5
+ echo "$as_me:5396: 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.
@@ -5374,10 +5401,10 @@ if test "${enable_database+set}" = set; then
enableval="$enable_database"
TERMINFO_SRC=$withval
fi;
- echo "$as_me:5377: result: $TERMINFO_SRC" >&5
+ echo "$as_me:5404: result: $TERMINFO_SRC" >&5
echo "${ECHO_T}$TERMINFO_SRC" >&6
- echo "$as_me:5380: checking whether to use hashed database instead of directory/tree" >&5
+ echo "$as_me:5407: 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.
@@ -5387,11 +5414,13 @@ if test "${with_hashed_db+set}" = set; then
else
with_hashed_db=no
fi;
- echo "$as_me:5390: result: $with_hashed_db" >&5
+ echo "$as_me:5417: result: $with_hashed_db" >&5
echo "${ECHO_T}$with_hashed_db" >&6
+else
+ with_hashed_db=no
fi
-echo "$as_me:5394: checking for list of fallback descriptions" >&5
+echo "$as_me:5423: 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.
@@ -5401,11 +5430,11 @@ if test "${with_fallbacks+set}" = set; then
else
with_fallback=
fi;
-echo "$as_me:5404: result: $with_fallback" >&5
+echo "$as_me:5433: result: $with_fallback" >&5
echo "${ECHO_T}$with_fallback" >&6
FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
-echo "$as_me:5408: checking if you want modern xterm or antique" >&5
+echo "$as_me:5437: 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.
@@ -5419,7 +5448,7 @@ case $with_xterm_new in
no) with_xterm_new=xterm-old;;
*) with_xterm_new=xterm-new;;
esac
-echo "$as_me:5422: result: $with_xterm_new" >&5
+echo "$as_me:5451: result: $with_xterm_new" >&5
echo "${ECHO_T}$with_xterm_new" >&6
WHICH_XTERM=$with_xterm_new
@@ -5429,7 +5458,7 @@ if test "$use_database" = no ; then
MAKE_TERMINFO="#"
else
-echo "$as_me:5432: checking for list of terminfo directories" >&5
+echo "$as_me:5461: 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.
@@ -5469,7 +5498,7 @@ case ".$cf_src_path" in #(vi
cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:5472: error: expected a pathname, not \"$cf_src_path\"" >&5
+ { { echo "$as_me:5501: 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; }; }
;;
@@ -5482,13 +5511,13 @@ IFS="$ac_save_ifs"
eval 'TERMINFO_DIRS="$cf_dst_path"'
-echo "$as_me:5485: result: $TERMINFO_DIRS" >&5
+echo "$as_me:5514: 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:5491: checking for default terminfo directory" >&5
+echo "$as_me:5520: 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.
@@ -5524,7 +5553,7 @@ case ".$withval" in #(vi
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:5527: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:5556: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -5533,7 +5562,7 @@ esac
fi
TERMINFO="$withval"
-echo "$as_me:5536: result: $TERMINFO" >&5
+echo "$as_me:5565: result: $TERMINFO" >&5
echo "${ECHO_T}$TERMINFO" >&6
cat >>confdefs.h <<EOF
#define TERMINFO "$TERMINFO"
@@ -5543,7 +5572,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:5546: checking if big-core option selected" >&5
+echo "$as_me:5575: 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.
@@ -5555,7 +5584,7 @@ else
with_big_core=no
else
cat >conftest.$ac_ext <<_ACEOF
-#line 5558 "configure"
+#line 5587 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -5569,15 +5598,15 @@ int main() {
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5601: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5575: \$? = $ac_status" >&5
+ echo "$as_me:5604: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:5577: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5606: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5580: \$? = $ac_status" >&5
+ echo "$as_me:5609: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
with_big_core=yes
else
@@ -5589,32 +5618,47 @@ fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi;
-echo "$as_me:5592: result: $with_big_core" >&5
+echo "$as_me:5621: 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:5600: checking if big-strings option selected" >&5
+### when constructed using "big" strings. More than the C compiler, the awk
+### program is a limit on most vendor UNIX systems. Check that we can build.
+echo "$as_me:5630: 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
+ with_big_strings=$enableval
+else
+
+ case x$AWK in #(vi
+ x)
+ eval with_big_strings=no
+ ;;
+ *) #(vi
+ if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < 12000) { xx = xx "x"; }; printf("%s\n", xx); }' \
+ | $AWK '{ printf "%d\n", length($0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ($0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
+ eval with_big_strings=yes
+ else
+ eval with_big_strings=no
+ fi
+ ;;
+ esac
+
fi;
-echo "$as_me:5610: result: $with_big_strings" >&5
+echo "$as_me:5654: 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:5617: checking if you want termcap-fallback support" >&5
+echo "$as_me:5661: 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.
@@ -5624,13 +5668,13 @@ if test "${enable_termcap+set}" = set; then
else
with_termcap=no
fi;
-echo "$as_me:5627: result: $with_termcap" >&5
+echo "$as_me:5671: 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:5633: error: You have disabled the database w/o specifying fallbacks" >&5
+ { { echo "$as_me:5677: 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
@@ -5642,7 +5686,7 @@ EOF
else
if test "$with_ticlib" != no ; then
- { { echo "$as_me:5645: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
+ { { echo "$as_me:5689: 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
@@ -5651,7 +5695,7 @@ cat >>confdefs.h <<\EOF
#define USE_TERMCAP 1
EOF
-echo "$as_me:5654: checking for list of termcap files" >&5
+echo "$as_me:5698: 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.
@@ -5691,7 +5735,7 @@ case ".$cf_src_path" in #(vi
cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:5694: error: expected a pathname, not \"$cf_src_path\"" >&5
+ { { echo "$as_me:5738: 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; }; }
;;
@@ -5704,14 +5748,14 @@ IFS="$ac_save_ifs"
eval 'TERMPATH="$cf_dst_path"'
-echo "$as_me:5707: result: $TERMPATH" >&5
+echo "$as_me:5751: 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:5714: checking if fast termcap-loader is needed" >&5
+echo "$as_me:5758: 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.
@@ -5721,13 +5765,13 @@ if test "${enable_getcap+set}" = set; then
else
with_getcap=no
fi;
-echo "$as_me:5724: result: $with_getcap" >&5
+echo "$as_me:5768: 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:5730: checking if translated termcaps will be cached in ~/.terminfo" >&5
+echo "$as_me:5774: 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.
@@ -5737,7 +5781,7 @@ if test "${enable_getcap_cache+set}" = set; then
else
with_getcap_cache=no
fi;
-echo "$as_me:5740: result: $with_getcap_cache" >&5
+echo "$as_me:5784: 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
@@ -5746,7 +5790,7 @@ EOF
fi
### Use option --disable-home-terminfo to completely remove ~/.terminfo
-echo "$as_me:5749: checking if ~/.terminfo is wanted" >&5
+echo "$as_me:5793: 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.
@@ -5756,13 +5800,13 @@ if test "${enable_home_terminfo+set}" = set; then
else
with_home_terminfo=yes
fi;
-echo "$as_me:5759: result: $with_home_terminfo" >&5
+echo "$as_me:5803: 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:5765: checking if you want to use restricted environment when running as root" >&5
+echo "$as_me:5809: 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.
@@ -5772,7 +5816,7 @@ if test "${enable_root_environ+set}" = set; then
else
with_root_environ=yes
fi;
-echo "$as_me:5775: result: $with_root_environ" >&5
+echo "$as_me:5819: 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
@@ -5786,13 +5830,13 @@ for ac_func in \
unlink
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5789: checking for $ac_func" >&5
+echo "$as_me:5833: 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 5795 "configure"
+#line 5839 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -5823,16 +5867,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5826: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5870: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5829: \$? = $ac_status" >&5
+ echo "$as_me:5873: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5832: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5876: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5835: \$? = $ac_status" >&5
+ echo "$as_me:5879: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -5842,7 +5886,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:5845: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5889: 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
@@ -5859,13 +5903,13 @@ for ac_func in \
symlink
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5862: checking for $ac_func" >&5
+echo "$as_me:5906: 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 5868 "configure"
+#line 5912 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -5896,16 +5940,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5899: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5943: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5902: \$? = $ac_status" >&5
+ echo "$as_me:5946: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:5905: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5949: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5908: \$? = $ac_status" >&5
+ echo "$as_me:5952: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -5915,7 +5959,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:5918: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5962: 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
@@ -5926,7 +5970,7 @@ fi
done
else
- echo "$as_me:5929: checking if link/symlink functions work" >&5
+ echo "$as_me:5973: 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
@@ -5939,7 +5983,7 @@ else
eval 'ac_cv_func_'$cf_func'=error'
else
cat >conftest.$ac_ext <<_ACEOF
-#line 5942 "configure"
+#line 5986 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -5969,15 +6013,15 @@ int main()
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5972: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6016: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5975: \$? = $ac_status" >&5
+ echo "$as_me:6019: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:5977: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6021: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5980: \$? = $ac_status" >&5
+ echo "$as_me:6024: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
@@ -5995,7 +6039,7 @@ fi
test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
fi
-echo "$as_me:5998: result: $cf_cv_link_funcs" >&5
+echo "$as_me:6042: 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
@@ -6013,7 +6057,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:6016: checking if tic should use symbolic links" >&5
+ echo "$as_me:6060: 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.
@@ -6023,21 +6067,21 @@ if test "${enable_symlinks+set}" = set; then
else
with_symlinks=no
fi;
- echo "$as_me:6026: result: $with_symlinks" >&5
+ echo "$as_me:6070: 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:6033: checking if tic should use hard links" >&5
+ echo "$as_me:6077: 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:6040: result: $with_links" >&5
+ echo "$as_me:6084: result: $with_links" >&5
echo "${ECHO_T}$with_links" >&6
fi
@@ -6050,7 +6094,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:6053: checking if you want broken-linker support code" >&5
+echo "$as_me:6097: 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.
@@ -6060,7 +6104,7 @@ if test "${enable_broken_linker+set}" = set; then
else
with_broken_linker=${BROKEN_LINKER-no}
fi;
-echo "$as_me:6063: result: $with_broken_linker" >&5
+echo "$as_me:6107: result: $with_broken_linker" >&5
echo "${ECHO_T}$with_broken_linker" >&6
BROKEN_LINKER=0
@@ -6080,14 +6124,14 @@ EOF
BROKEN_LINKER=1
test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6
-echo "${as_me-configure}:6083: testing cygwin linker is broken anyway ..." 1>&5
+echo "${as_me-configure}:6127: 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:6090: checking if tputs should process BSD-style prefix padding" >&5
+echo "$as_me:6134: 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.
@@ -6097,7 +6141,7 @@ if test "${enable_bsdpad+set}" = set; then
else
with_bsdpad=no
fi;
-echo "$as_me:6100: result: $with_bsdpad" >&5
+echo "$as_me:6144: result: $with_bsdpad" >&5
echo "${ECHO_T}$with_bsdpad" >&6
test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF
#define BSD_TPUTS 1
@@ -6114,7 +6158,7 @@ NCURSES_WINT_T=0
# Check to define _XOPEN_SOURCE "automatically"
-echo "$as_me:6117: checking if $CC -U and -D options work together" >&5
+echo "$as_me:6161: 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
@@ -6123,7 +6167,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 6126 "configure"
+#line 6170 "configure"
#include "confdefs.h"
int
@@ -6142,16 +6186,16 @@ make a defined-error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6145: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6189: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6148: \$? = $ac_status" >&5
+ echo "$as_me:6192: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6151: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6195: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6154: \$? = $ac_status" >&5
+ echo "$as_me:6198: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_cc_u_d_options=yes
@@ -6165,7 +6209,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
CPPFLAGS="$cf_save_CPPFLAGS"
fi
-echo "$as_me:6168: result: $cf_cv_cc_u_d_options" >&5
+echo "$as_me:6212: result: $cf_cv_cc_u_d_options" >&5
echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
cf_XOPEN_SOURCE=500
@@ -6175,7 +6219,7 @@ case $host_os in #(vi
aix[45]*) #(vi
CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
;;
-freebsd*) #(vi
+freebsd*|dragonfly*) #(vi
# 5.x headers associate
# _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
# _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
@@ -6191,14 +6235,14 @@ irix[56].*) #(vi
;;
linux*|gnu*|k*bsd*-gnu) #(vi
-echo "$as_me:6194: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:6238: 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 6201 "configure"
+#line 6245 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -6213,16 +6257,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6216: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6260: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6219: \$? = $ac_status" >&5
+ echo "$as_me:6263: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6222: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6266: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6225: \$? = $ac_status" >&5
+ echo "$as_me:6269: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_gnu_source=no
else
@@ -6231,7 +6275,7 @@ cat conftest.$ac_ext >&5
cf_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
cat >conftest.$ac_ext <<_ACEOF
-#line 6234 "configure"
+#line 6278 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -6246,16 +6290,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6249: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6293: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6252: \$? = $ac_status" >&5
+ echo "$as_me:6296: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6255: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6299: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6258: \$? = $ac_status" >&5
+ echo "$as_me:6302: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_gnu_source=no
else
@@ -6270,7 +6314,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:6273: result: $cf_cv_gnu_source" >&5
+echo "$as_me:6317: 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"
@@ -6297,14 +6341,14 @@ solaris*) #(vi
CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
;;
*)
- echo "$as_me:6300: checking if we should define _XOPEN_SOURCE" >&5
+ echo "$as_me:6344: 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 6307 "configure"
+#line 6351 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -6319,16 +6363,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6322: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6325: \$? = $ac_status" >&5
+ echo "$as_me:6369: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6328: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6372: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6331: \$? = $ac_status" >&5
+ echo "$as_me:6375: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -6337,7 +6381,7 @@ cat conftest.$ac_ext >&5
cf_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
cat >conftest.$ac_ext <<_ACEOF
-#line 6340 "configure"
+#line 6384 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -6352,16 +6396,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6355: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6399: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6358: \$? = $ac_status" >&5
+ echo "$as_me:6402: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6361: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6405: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6364: \$? = $ac_status" >&5
+ echo "$as_me:6408: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -6376,7 +6420,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:6379: result: $cf_cv_xopen_source" >&5
+echo "$as_me:6423: result: $cf_cv_xopen_source" >&5
echo "${ECHO_T}$cf_cv_xopen_source" >&6
if test "$cf_cv_xopen_source" != no ; then
@@ -6410,16 +6454,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:6413: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:6457: checking if we should define _POSIX_C_SOURCE" >&5
echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
if test "${cf_cv_posix_c_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-echo "${as_me-configure}:6419: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me-configure}:6463: testing if the symbol is already defined go no further ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 6422 "configure"
+#line 6466 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -6434,16 +6478,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6437: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6481: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6440: \$? = $ac_status" >&5
+ echo "$as_me:6484: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6443: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6487: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6446: \$? = $ac_status" >&5
+ echo "$as_me:6490: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_posix_c_source=no
else
@@ -6464,7 +6508,7 @@ cf_want_posix_source=no
esac
if test "$cf_want_posix_source" = yes ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 6467 "configure"
+#line 6511 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -6479,16 +6523,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6482: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6526: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6485: \$? = $ac_status" >&5
+ echo "$as_me:6529: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6488: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6532: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6491: \$? = $ac_status" >&5
+ echo "$as_me:6535: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -6499,15 +6543,15 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "${as_me-configure}:6502: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me-configure}:6546: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
CFLAGS="$cf_trim_CFLAGS"
CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
-echo "${as_me-configure}:6507: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me-configure}:6551: testing if the second compile does not leave our definition intact error ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 6510 "configure"
+#line 6554 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -6522,16 +6566,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6525: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6569: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6528: \$? = $ac_status" >&5
+ echo "$as_me:6572: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6531: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6575: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6534: \$? = $ac_status" >&5
+ echo "$as_me:6578: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -6547,7 +6591,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:6550: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:6594: 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
@@ -6566,14 +6610,14 @@ esac
# Work around breakage on OS X
-echo "$as_me:6569: checking if SIGWINCH is defined" >&5
+echo "$as_me:6613: 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 6576 "configure"
+#line 6620 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -6588,23 +6632,23 @@ int x = SIGWINCH
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6591: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6635: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6594: \$? = $ac_status" >&5
+ echo "$as_me:6638: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6597: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6641: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6600: \$? = $ac_status" >&5
+ echo "$as_me:6644: \$? = $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 6607 "configure"
+#line 6651 "configure"
#include "confdefs.h"
#undef _XOPEN_SOURCE
@@ -6622,16 +6666,16 @@ int x = SIGWINCH
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6625: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6669: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6628: \$? = $ac_status" >&5
+ echo "$as_me:6672: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6631: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6675: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6634: \$? = $ac_status" >&5
+ echo "$as_me:6678: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_define_sigwinch=maybe
else
@@ -6645,11 +6689,11 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:6648: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:6692: 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:6652: checking for actual SIGWINCH definition" >&5
+echo "$as_me:6696: 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
@@ -6660,7 +6704,7 @@ cf_sigwinch=32
while test $cf_sigwinch != 1
do
cat >conftest.$ac_ext <<_ACEOF
-#line 6663 "configure"
+#line 6707 "configure"
#include "confdefs.h"
#undef _XOPEN_SOURCE
@@ -6682,16 +6726,16 @@ int x = SIGWINCH
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6729: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6688: \$? = $ac_status" >&5
+ echo "$as_me:6732: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6691: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6735: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6694: \$? = $ac_status" >&5
+ echo "$as_me:6738: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_fixup_sigwinch=$cf_sigwinch
break
@@ -6705,7 +6749,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
done
fi
-echo "$as_me:6708: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:6752: result: $cf_cv_fixup_sigwinch" >&5
echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -6715,13 +6759,13 @@ fi
# Checks for CODESET support.
- echo "$as_me:6718: checking for nl_langinfo and CODESET" >&5
+ echo "$as_me:6762: 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 6724 "configure"
+#line 6768 "configure"
#include "confdefs.h"
#include <langinfo.h>
int
@@ -6733,16 +6777,16 @@ char* cs = nl_langinfo(CODESET);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6736: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6780: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6739: \$? = $ac_status" >&5
+ echo "$as_me:6783: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6742: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6786: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6745: \$? = $ac_status" >&5
+ echo "$as_me:6789: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
am_cv_langinfo_codeset=yes
else
@@ -6753,7 +6797,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:6756: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:6800: result: $am_cv_langinfo_codeset" >&5
echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
if test $am_cv_langinfo_codeset = yes; then
@@ -6767,7 +6811,7 @@ EOF
NCURSES_OK_WCHAR_T=
NCURSES_OK_WINT_T=
-echo "$as_me:6770: checking if you want wide-character code" >&5
+echo "$as_me:6814: 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.
@@ -6777,7 +6821,7 @@ if test "${enable_widec+set}" = set; then
else
with_widec=no
fi;
-echo "$as_me:6780: result: $with_widec" >&5
+echo "$as_me:6824: result: $with_widec" >&5
echo "${ECHO_T}$with_widec" >&6
if test "$with_widec" = yes ; then
LIB_SUFFIX="w${LIB_SUFFIX}"
@@ -6785,10 +6829,10 @@ if test "$with_widec" = yes ; then
#define USE_WIDEC_SUPPORT 1
EOF
-echo "$as_me:6788: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:6832: 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 6791 "configure"
+#line 6835 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -6804,16 +6848,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6807: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6851: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6810: \$? = $ac_status" >&5
+ echo "$as_me:6854: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6813: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6857: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6816: \$? = $ac_status" >&5
+ echo "$as_me:6860: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=no
else
@@ -6822,16 +6866,16 @@ cat conftest.$ac_ext >&5
cf_result=yes
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:6825: result: $cf_result" >&5
+echo "$as_me:6869: 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:6831: checking checking for compatible value versus " >&5
+ echo "$as_me:6875: 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 6834 "configure"
+#line 6878 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -6847,16 +6891,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6850: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6894: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6853: \$? = $ac_status" >&5
+ echo "$as_me:6897: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6856: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6900: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6859: \$? = $ac_status" >&5
+ echo "$as_me:6903: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -6865,7 +6909,7 @@ cat conftest.$ac_ext >&5
cf_result=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:6868: result: $cf_result" >&5
+ echo "$as_me:6912: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test "$cf_result" = no ; then
# perhaps we can override it - try...
@@ -6876,16 +6920,16 @@ fi
# with_overwrite=no
NCURSES_CH_T=cchar_t
-for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc
+for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6882: checking for $ac_func" >&5
+echo "$as_me:6926: 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 6888 "configure"
+#line 6932 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -6916,16 +6960,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6919: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6963: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6922: \$? = $ac_status" >&5
+ echo "$as_me:6966: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6925: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6969: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6928: \$? = $ac_status" >&5
+ echo "$as_me:6972: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -6935,7 +6979,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:6938: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6982: 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
@@ -6947,16 +6991,287 @@ done
if test "$ac_cv_func_putwc" != yes ; then
-echo "$as_me:6950: 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 "$as_me:6994: checking for multibyte character support" >&5
+echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
+if test "${cf_cv_utf8_lib+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cf_save_LIBS="$LIBS"
- LIBS="-lutf8 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 7002 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+int
+main ()
+{
+putwc(0,0);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:7015: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:7018: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:7021: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:7024: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_utf8_lib=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
+# will be set on completion of the AC_TRY_LINK below.
+cf_cv_header_path_utf8=
+cf_cv_library_path_utf8=
+
+echo "${as_me-configure}:7036: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
cat >conftest.$ac_ext <<_ACEOF
-#line 6959 "configure"
+#line 7039 "configure"
+#include "confdefs.h"
+
+#include <libutf8.h>
+int
+main ()
+{
+putwc(0,0);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:7052: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:7055: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:7058: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:7061: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_find_linkage_utf8=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+ cf_cv_find_linkage_utf8=no
+
+echo "${as_me-configure}:7070: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_CPPFLAGS="$CPPFLAGS"
+ cf_test_CPPFLAGS="$CPPFLAGS"
+
+ cf_search=""
+
+test "/usr" != "$prefix" && \
+test -d "/usr" && \
+(test $prefix = NONE || test -d $prefix) && {
+ test -n "$verbose" && echo " ... testing for include-directories under /usr"
+ test -d /usr/include && cf_search="$cf_search /usr/include"
+ test -d /usr/include/utf8 && cf_search="$cf_search /usr/include/utf8"
+ test -d /usr/include/utf8/include && cf_search="$cf_search /usr/include/utf8/include"
+ test -d /usr/utf8/include && cf_search="$cf_search /usr/utf8/include"
+ test -d /usr/utf8/include/utf8 && cf_search="$cf_search /usr/utf8/include/utf8"
+}
+
+test "$prefix" != "NONE" && \
+test -d "$prefix" && \
+ {
+ test -n "$verbose" && echo " ... testing for include-directories under $prefix"
+ test -d $prefix/include && cf_search="$cf_search $prefix/include"
+ test -d $prefix/include/utf8 && cf_search="$cf_search $prefix/include/utf8"
+ test -d $prefix/include/utf8/include && cf_search="$cf_search $prefix/include/utf8/include"
+ test -d $prefix/utf8/include && cf_search="$cf_search $prefix/utf8/include"
+ test -d $prefix/utf8/include/utf8 && cf_search="$cf_search $prefix/utf8/include/utf8"
+}
+
+test "/usr/local" != "$prefix" && \
+test -d "/usr/local" && \
+(test $prefix = NONE || test -d $prefix) && {
+ test -n "$verbose" && echo " ... testing for include-directories under /usr/local"
+ test -d /usr/local/include && cf_search="$cf_search /usr/local/include"
+ test -d /usr/local/include/utf8 && cf_search="$cf_search /usr/local/include/utf8"
+ test -d /usr/local/include/utf8/include && cf_search="$cf_search /usr/local/include/utf8/include"
+ test -d /usr/local/utf8/include && cf_search="$cf_search /usr/local/utf8/include"
+ test -d /usr/local/utf8/include/utf8 && cf_search="$cf_search /usr/local/utf8/include/utf8"
+}
+
+test "/opt" != "$prefix" && \
+test -d "/opt" && \
+(test $prefix = NONE || test -d $prefix) && {
+ test -n "$verbose" && echo " ... testing for include-directories under /opt"
+ test -d /opt/include && cf_search="$cf_search /opt/include"
+ test -d /opt/include/utf8 && cf_search="$cf_search /opt/include/utf8"
+ test -d /opt/include/utf8/include && cf_search="$cf_search /opt/include/utf8/include"
+ test -d /opt/utf8/include && cf_search="$cf_search /opt/utf8/include"
+ test -d /opt/utf8/include/utf8 && cf_search="$cf_search /opt/utf8/include/utf8"
+}
+
+test "$HOME" != "$prefix" && \
+test -d "$HOME" && \
+(test $prefix = NONE || test -d $prefix) && {
+ test -n "$verbose" && echo " ... testing for include-directories under $HOME"
+ test -d $HOME/include && cf_search="$cf_search $HOME/include"
+ test -d $HOME/include/utf8 && cf_search="$cf_search $HOME/include/utf8"
+ test -d $HOME/include/utf8/include && cf_search="$cf_search $HOME/include/utf8/include"
+ test -d $HOME/utf8/include && cf_search="$cf_search $HOME/utf8/include"
+ test -d $HOME/utf8/include/utf8 && cf_search="$cf_search $HOME/utf8/include/utf8"
+}
+
+test "$includedir" != NONE && \
+test "$includedir" != "/usr/include" && \
+test -d "$includedir" && {
+ test -d $includedir && cf_search="$cf_search $includedir"
+ test -d $includedir/utf8 && cf_search="$cf_search $includedir/utf8"
+}
+
+test "$oldincludedir" != NONE && \
+test "$oldincludedir" != "/usr/include" && \
+test -d "$oldincludedir" && {
+ test -d $oldincludedir && cf_search="$cf_search $oldincludedir"
+ test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8"
+}
+
+ for cf_cv_header_path_utf8 in $cf_search
+ do
+ if test -d $cf_cv_header_path_utf8 ; then
+ test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6
+
+echo "${as_me-configure}:7151: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+
+ CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 7155 "configure"
+#include "confdefs.h"
+
+#include <libutf8.h>
+int
+main ()
+{
+putwc(0,0);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:7168: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:7171: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:7174: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:7177: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
+
+echo "${as_me-configure}:7182: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=maybe
+ cf_test_CPPFLAGS="$CPPFLAGS"
+ break
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+ CPPFLAGS="$cf_save_CPPFLAGS"
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ done
+
+ if test "$cf_cv_find_linkage_utf8" = maybe ; then
+
+echo "${as_me-configure}:7200: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+
+ cf_save_LIBS="$LIBS"
+ cf_save_LDFLAGS="$LDFLAGS"
+
+ if test "$cf_cv_find_linkage_utf8" != yes ; then
+ cf_search=""
+
+test "/usr" != "$prefix" && \
+test -d "/usr" && \
+(test $prefix = NONE || test -d $prefix) && {
+ test -n "$verbose" && echo " ... testing for lib-directories under /usr"
+ test -d /usr/lib && cf_search="$cf_search /usr/lib"
+ test -d /usr/lib/utf8 && cf_search="$cf_search /usr/lib/utf8"
+ test -d /usr/lib/utf8/lib && cf_search="$cf_search /usr/lib/utf8/lib"
+ test -d /usr/utf8/lib && cf_search="$cf_search /usr/utf8/lib"
+ test -d /usr/utf8/lib/utf8 && cf_search="$cf_search /usr/utf8/lib/utf8"
+}
+
+test "$prefix" != "NONE" && \
+test -d "$prefix" && \
+ {
+ test -n "$verbose" && echo " ... testing for lib-directories under $prefix"
+ test -d $prefix/lib && cf_search="$cf_search $prefix/lib"
+ test -d $prefix/lib/utf8 && cf_search="$cf_search $prefix/lib/utf8"
+ test -d $prefix/lib/utf8/lib && cf_search="$cf_search $prefix/lib/utf8/lib"
+ test -d $prefix/utf8/lib && cf_search="$cf_search $prefix/utf8/lib"
+ test -d $prefix/utf8/lib/utf8 && cf_search="$cf_search $prefix/utf8/lib/utf8"
+}
+
+test "/usr/local" != "$prefix" && \
+test -d "/usr/local" && \
+(test $prefix = NONE || test -d $prefix) && {
+ test -n "$verbose" && echo " ... testing for lib-directories under /usr/local"
+ test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib"
+ test -d /usr/local/lib/utf8 && cf_search="$cf_search /usr/local/lib/utf8"
+ test -d /usr/local/lib/utf8/lib && cf_search="$cf_search /usr/local/lib/utf8/lib"
+ test -d /usr/local/utf8/lib && cf_search="$cf_search /usr/local/utf8/lib"
+ test -d /usr/local/utf8/lib/utf8 && cf_search="$cf_search /usr/local/utf8/lib/utf8"
+}
+
+test "/opt" != "$prefix" && \
+test -d "/opt" && \
+(test $prefix = NONE || test -d $prefix) && {
+ test -n "$verbose" && echo " ... testing for lib-directories under /opt"
+ test -d /opt/lib && cf_search="$cf_search /opt/lib"
+ test -d /opt/lib/utf8 && cf_search="$cf_search /opt/lib/utf8"
+ test -d /opt/lib/utf8/lib && cf_search="$cf_search /opt/lib/utf8/lib"
+ test -d /opt/utf8/lib && cf_search="$cf_search /opt/utf8/lib"
+ test -d /opt/utf8/lib/utf8 && cf_search="$cf_search /opt/utf8/lib/utf8"
+}
+
+test "$HOME" != "$prefix" && \
+test -d "$HOME" && \
+(test $prefix = NONE || test -d $prefix) && {
+ test -n "$verbose" && echo " ... testing for lib-directories under $HOME"
+ test -d $HOME/lib && cf_search="$cf_search $HOME/lib"
+ test -d $HOME/lib/utf8 && cf_search="$cf_search $HOME/lib/utf8"
+ test -d $HOME/lib/utf8/lib && cf_search="$cf_search $HOME/lib/utf8/lib"
+ test -d $HOME/utf8/lib && cf_search="$cf_search $HOME/utf8/lib"
+ test -d $HOME/utf8/lib/utf8 && cf_search="$cf_search $HOME/utf8/lib/utf8"
+}
+
+ for cf_cv_library_path_utf8 in $cf_search
+ do
+ if test -d $cf_cv_library_path_utf8 ; then
+ test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6
+
+echo "${as_me-configure}:7268: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+
+ CPPFLAGS="$cf_test_CPPFLAGS"
+ LIBS="-lutf8 $cf_save_LIBS"
+ LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 7274 "configure"
#include "confdefs.h"
#include <libutf8.h>
@@ -6969,52 +7284,189 @@ putwc(0,0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6972: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7287: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6975: \$? = $ac_status" >&5
+ echo "$as_me:7290: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6978: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7293: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6981: \$? = $ac_status" >&5
+ echo "$as_me:7296: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- cf_cv_libutf8=yes
+
+ test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6
+
+echo "${as_me-configure}:7301: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+
+ cf_cv_find_linkage_utf8=yes
+ cf_cv_library_file_utf8="-lutf8"
+ break
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-cf_cv_libutf8=no
+
+ CPPFLAGS="$cf_save_CPPFLAGS"
+ LIBS="$cf_save_LIBS"
+ LDFLAGS="$cf_save_LDFLAGS"
+
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS="$cf_save_LIBS"
+ fi
+ done
+ LIBS="$cf_save_LIBS"
+ CPPFLAGS="$cf_save_CPPFLAGS"
+ LDFLAGS="$cf_save_LDFLAGS"
+ fi
+
+ else
+ cf_cv_find_linkage_utf8=no
+ fi
fi
-echo "$as_me:6993: result: $cf_cv_libutf8" >&5
-echo "${ECHO_T}$cf_cv_libutf8" >&6
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+if test "$cf_cv_find_linkage_utf8" = yes ; then
+cf_cv_utf8_lib=add-on
+else
+cf_cv_utf8_lib=no
+fi
+
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:7339: result: $cf_cv_utf8_lib" >&5
+echo "${ECHO_T}$cf_cv_utf8_lib" >&6
-if test "$cf_cv_libutf8" = yes ; then
+# HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
+# ncurses/ncursesw:
+if test "$cf_cv_utf8_lib" = "add-on" ; then
cat >>confdefs.h <<\EOF
#define HAVE_LIBUTF8_H 1
EOF
+if test -n "$cf_cv_header_path_utf8" ; then
+ for cf_add_incdir in $cf_cv_header_path_utf8
+ 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 7373 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+printf("Hello")
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:7385: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:7388: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:7391: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:7394: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_have_incdir=yes
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ CPPFLAGS=$cf_save_CPPFLAGS
+ fi
+ fi
+ fi
+
+ if test "$cf_have_incdir" = no ; then
+ test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:7411: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ 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 "$cf_cv_library_path_utf8" ; then
+ for cf_add_libdir in $cf_cv_library_path_utf8
+ do
+ if test $cf_add_libdir = /usr/lib ; then
+ :
+ elif test -d $cf_add_libdir
+ then
+ cf_have_libdir=no
+ if test -n "$LDFLAGS$LIBS" ; then
+ # a loop is needed to ensure we can add subdirs of existing dirs
+ for cf_test_libdir in $LDFLAGS $LIBS ; do
+ if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+ cf_have_libdir=yes; break
+ fi
+ done
+ fi
+ if test "$cf_have_libdir" = no ; then
+ test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:7445: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+ fi
+ done
+fi
+
LIBS="-lutf8 $LIBS"
fi
- if test "$cf_cv_libutf8" = yes ; then
+ if test "$cf_cv_utf8_lib" != no ; then
NCURSES_LIBUTF8=1
fi
fi
# This is needed on Tru64 5.0 to declare mbstate_t
-echo "$as_me:7010: checking if we must include wchar.h to declare mbstate_t" >&5
+echo "$as_me:7462: 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 7017 "configure"
+#line 7469 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -7032,23 +7484,23 @@ mbstate_t state
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7035: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7487: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7038: \$? = $ac_status" >&5
+ echo "$as_me:7490: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7041: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7493: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7044: \$? = $ac_status" >&5
+ echo "$as_me:7496: \$? = $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 7051 "configure"
+#line 7503 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -7067,16 +7519,16 @@ mbstate_t value
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7070: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7522: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7073: \$? = $ac_status" >&5
+ echo "$as_me:7525: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7076: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7528: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7079: \$? = $ac_status" >&5
+ echo "$as_me:7531: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_mbstate_t=yes
else
@@ -7088,7 +7540,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:7091: result: $cf_cv_mbstate_t" >&5
+echo "$as_me:7543: result: $cf_cv_mbstate_t" >&5
echo "${ECHO_T}$cf_cv_mbstate_t" >&6
if test "$cf_cv_mbstate_t" = yes ; then
@@ -7105,14 +7557,14 @@ if test "$cf_cv_mbstate_t" = unknown ; then
fi
# This is needed on Tru64 5.0 to declare wchar_t
-echo "$as_me:7108: checking if we must include wchar.h to declare wchar_t" >&5
+echo "$as_me:7560: 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 7115 "configure"
+#line 7567 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -7130,23 +7582,23 @@ wchar_t state
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7133: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7585: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7136: \$? = $ac_status" >&5
+ echo "$as_me:7588: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7139: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7591: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7142: \$? = $ac_status" >&5
+ echo "$as_me:7594: \$? = $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 7149 "configure"
+#line 7601 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -7165,16 +7617,16 @@ wchar_t value
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7168: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7620: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7171: \$? = $ac_status" >&5
+ echo "$as_me:7623: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7174: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7626: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7177: \$? = $ac_status" >&5
+ echo "$as_me:7629: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_wchar_t=yes
else
@@ -7186,7 +7638,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:7189: result: $cf_cv_wchar_t" >&5
+echo "$as_me:7641: result: $cf_cv_wchar_t" >&5
echo "${ECHO_T}$cf_cv_wchar_t" >&6
if test "$cf_cv_wchar_t" = yes ; then
@@ -7208,14 +7660,14 @@ if test "$cf_cv_wchar_t" != unknown ; then
fi
# This is needed on Tru64 5.0 to declare wint_t
-echo "$as_me:7211: checking if we must include wchar.h to declare wint_t" >&5
+echo "$as_me:7663: 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 7218 "configure"
+#line 7670 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -7233,23 +7685,23 @@ wint_t state
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7236: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7688: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7239: \$? = $ac_status" >&5
+ echo "$as_me:7691: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7242: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7694: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7245: \$? = $ac_status" >&5
+ echo "$as_me:7697: \$? = $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 7252 "configure"
+#line 7704 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -7268,16 +7720,16 @@ wint_t value
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7271: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7723: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7274: \$? = $ac_status" >&5
+ echo "$as_me:7726: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7277: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7729: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7280: \$? = $ac_status" >&5
+ echo "$as_me:7732: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_wint_t=yes
else
@@ -7289,7 +7741,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:7292: result: $cf_cv_wint_t" >&5
+echo "$as_me:7744: result: $cf_cv_wint_t" >&5
echo "${ECHO_T}$cf_cv_wint_t" >&6
if test "$cf_cv_wint_t" = yes ; then
@@ -7328,7 +7780,7 @@ case $cf_cv_abi_version in
;;
esac
-echo "$as_me:7331: checking whether to enable _LP64 definition in curses.h" >&5
+echo "$as_me:7783: 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.
@@ -7338,7 +7790,7 @@ if test "${enable_lp64+set}" = set; then
else
with_lp64=$default_with_lp64
fi;
-echo "$as_me:7341: result: $with_lp64" >&5
+echo "$as_me:7793: result: $with_lp64" >&5
echo "${ECHO_T}$with_lp64" >&6
if test "$with_lp64" = yes ; then
@@ -7354,7 +7806,7 @@ if test "${enable_largefile+set}" = set; then
fi;
if test "$enable_largefile" != no; then
- echo "$as_me:7357: checking for special C compiler options needed for large files" >&5
+ echo "$as_me:7809: 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
@@ -7366,7 +7818,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 7369 "configure"
+#line 7821 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -7386,16 +7838,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7389: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7841: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7392: \$? = $ac_status" >&5
+ echo "$as_me:7844: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7395: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7847: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7398: \$? = $ac_status" >&5
+ echo "$as_me:7850: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -7405,16 +7857,16 @@ fi
rm -f conftest.$ac_objext
CC="$CC -n32"
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7408: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7860: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7411: \$? = $ac_status" >&5
+ echo "$as_me:7863: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7414: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7866: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7417: \$? = $ac_status" >&5
+ echo "$as_me:7869: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_largefile_CC=' -n32'; break
else
@@ -7428,13 +7880,13 @@ rm -f conftest.$ac_objext
rm -f conftest.$ac_ext
fi
fi
-echo "$as_me:7431: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:7883: 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:7437: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+ echo "$as_me:7889: 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
@@ -7442,7 +7894,7 @@ else
while :; do
ac_cv_sys_file_offset_bits=no
cat >conftest.$ac_ext <<_ACEOF
-#line 7445 "configure"
+#line 7897 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -7462,16 +7914,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7465: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7917: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7468: \$? = $ac_status" >&5
+ echo "$as_me:7920: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7471: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7923: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7474: \$? = $ac_status" >&5
+ echo "$as_me:7926: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -7480,7 +7932,7 @@ cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 7483 "configure"
+#line 7935 "configure"
#include "confdefs.h"
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
@@ -7501,16 +7953,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7504: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7956: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7507: \$? = $ac_status" >&5
+ echo "$as_me:7959: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7510: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7962: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7513: \$? = $ac_status" >&5
+ echo "$as_me:7965: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_file_offset_bits=64; break
else
@@ -7521,7 +7973,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
break
done
fi
-echo "$as_me:7524: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:7976: 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
@@ -7531,7 +7983,7 @@ EOF
fi
rm -f conftest*
- echo "$as_me:7534: checking for _LARGE_FILES value needed for large files" >&5
+ echo "$as_me:7986: 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
@@ -7539,7 +7991,7 @@ else
while :; do
ac_cv_sys_large_files=no
cat >conftest.$ac_ext <<_ACEOF
-#line 7542 "configure"
+#line 7994 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -7559,16 +8011,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7562: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8014: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7565: \$? = $ac_status" >&5
+ echo "$as_me:8017: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7568: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8020: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7571: \$? = $ac_status" >&5
+ echo "$as_me:8023: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -7577,7 +8029,7 @@ cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 7580 "configure"
+#line 8032 "configure"
#include "confdefs.h"
#define _LARGE_FILES 1
#include <sys/types.h>
@@ -7598,16 +8050,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7601: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8053: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7604: \$? = $ac_status" >&5
+ echo "$as_me:8056: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7607: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8059: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7610: \$? = $ac_status" >&5
+ echo "$as_me:8062: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_large_files=1; break
else
@@ -7618,7 +8070,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
break
done
fi
-echo "$as_me:7621: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:8073: 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
@@ -7631,7 +8083,7 @@ rm -f conftest*
fi
if test "$enable_largefile" != no ; then
- echo "$as_me:7634: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+ echo "$as_me:8086: 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
@@ -7639,7 +8091,7 @@ else
while :; do
ac_cv_sys_largefile_source=no
cat >conftest.$ac_ext <<_ACEOF
-#line 7642 "configure"
+#line 8094 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -7651,16 +8103,16 @@ return !fseeko;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7654: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8106: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7657: \$? = $ac_status" >&5
+ echo "$as_me:8109: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7660: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8112: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7663: \$? = $ac_status" >&5
+ echo "$as_me:8115: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -7669,7 +8121,7 @@ cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 7672 "configure"
+#line 8124 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -7682,16 +8134,16 @@ return !fseeko;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8137: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7688: \$? = $ac_status" >&5
+ echo "$as_me:8140: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7691: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8143: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7694: \$? = $ac_status" >&5
+ echo "$as_me:8146: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_largefile_source=1; break
else
@@ -7702,7 +8154,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
break
done
fi
-echo "$as_me:7705: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:8157: 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
@@ -7716,13 +8168,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:7719: checking for fseeko" >&5
+echo "$as_me:8171: 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 7725 "configure"
+#line 8177 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -7734,16 +8186,16 @@ return fseeko && fseeko (stdin, 0, 0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7737: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8189: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7740: \$? = $ac_status" >&5
+ echo "$as_me:8192: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7743: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8195: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7746: \$? = $ac_status" >&5
+ echo "$as_me:8198: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_fseeko=yes
else
@@ -7753,7 +8205,7 @@ ac_cv_func_fseeko=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:7756: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:8208: result: $ac_cv_func_fseeko" >&5
echo "${ECHO_T}$ac_cv_func_fseeko" >&6
if test $ac_cv_func_fseeko = yes; then
@@ -7774,14 +8226,14 @@ fi
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:7777: checking whether to use struct dirent64" >&5
+ echo "$as_me:8229: 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 7784 "configure"
+#line 8236 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -7802,16 +8254,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7805: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8257: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7808: \$? = $ac_status" >&5
+ echo "$as_me:8260: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7811: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8263: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7814: \$? = $ac_status" >&5
+ echo "$as_me:8266: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_struct_dirent64=yes
else
@@ -7822,7 +8274,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:7825: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:8277: 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
@@ -7831,7 +8283,7 @@ EOF
fi
### use option --disable-tparm-varargs to make tparm() conform to X/Open
-echo "$as_me:7834: checking if you want tparm not to use X/Open fixed-parameter list" >&5
+echo "$as_me:8286: 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.
@@ -7841,13 +8293,31 @@ if test "${enable_tparm_varargs+set}" = set; then
else
with_tparm_varargs=yes
fi;
-echo "$as_me:7844: result: $with_tparm_varargs" >&5
+echo "$as_me:8296: 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 --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
+if test "$with_ticlib" != no ; then
+echo "$as_me:8303: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
+echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
+
+# Check whether --enable-tic-depends or --disable-tic-depends was given.
+if test "${enable_tic_depends+set}" = set; then
+ enableval="$enable_tic_depends"
+ with_tic_depends=$enableval
+else
+ with_tic_depends=yes
+fi;
+echo "$as_me:8313: result: $with_tic_depends" >&5
+echo "${ECHO_T}$with_tic_depends" >&6
+else
+ with_tic_depends=no
+fi
+
### use option --with-bool to override bool's type
-echo "$as_me:7850: checking for type of bool" >&5
+echo "$as_me:8320: 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.
@@ -7857,10 +8327,10 @@ if test "${with_bool+set}" = set; then
else
NCURSES_BOOL=auto
fi;
-echo "$as_me:7860: result: $NCURSES_BOOL" >&5
+echo "$as_me:8330: result: $NCURSES_BOOL" >&5
echo "${ECHO_T}$NCURSES_BOOL" >&6
-echo "$as_me:7863: checking for alternate terminal capabilities file" >&5
+echo "$as_me:8333: 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.
@@ -7871,11 +8341,11 @@ else
TERMINFO_CAPS=Caps
fi;
test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
-echo "$as_me:7874: result: $TERMINFO_CAPS" >&5
+echo "$as_me:8344: result: $TERMINFO_CAPS" >&5
echo "${ECHO_T}$TERMINFO_CAPS" >&6
### use option --with-chtype to override chtype's type
-echo "$as_me:7878: checking for type of chtype" >&5
+echo "$as_me:8348: 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.
@@ -7885,11 +8355,11 @@ if test "${with_chtype+set}" = set; then
else
NCURSES_CHTYPE=auto
fi;
-echo "$as_me:7888: result: $NCURSES_CHTYPE" >&5
+echo "$as_me:8358: result: $NCURSES_CHTYPE" >&5
echo "${ECHO_T}$NCURSES_CHTYPE" >&6
### use option --with-ospeed to override ospeed's type
-echo "$as_me:7892: checking for type of ospeed" >&5
+echo "$as_me:8362: 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.
@@ -7899,11 +8369,11 @@ if test "${with_ospeed+set}" = set; then
else
NCURSES_OSPEED=short
fi;
-echo "$as_me:7902: result: $NCURSES_OSPEED" >&5
+echo "$as_me:8372: result: $NCURSES_OSPEED" >&5
echo "${ECHO_T}$NCURSES_OSPEED" >&6
### use option --with-mmask-t to override mmask_t's type
-echo "$as_me:7906: checking for type of mmask_t" >&5
+echo "$as_me:8376: 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.
@@ -7913,11 +8383,11 @@ if test "${with_mmask_t+set}" = set; then
else
NCURSES_MMASK_T=auto
fi;
-echo "$as_me:7916: result: $NCURSES_MMASK_T" >&5
+echo "$as_me:8386: result: $NCURSES_MMASK_T" >&5
echo "${ECHO_T}$NCURSES_MMASK_T" >&6
### Enable compiling-in rcs id's
-echo "$as_me:7920: checking if RCS identifiers should be compiled-in" >&5
+echo "$as_me:8390: 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.
@@ -7927,7 +8397,7 @@ if test "${with_rcs_ids+set}" = set; then
else
with_rcs_ids=no
fi;
-echo "$as_me:7930: result: $with_rcs_ids" >&5
+echo "$as_me:8400: 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
@@ -7935,7 +8405,7 @@ EOF
###############################################################################
-echo "$as_me:7938: checking format of man-pages" >&5
+echo "$as_me:8408: 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.
@@ -8024,14 +8494,14 @@ unknown)
;;
esac
-echo "$as_me:8027: result: $MANPAGE_FORMAT" >&5
+echo "$as_me:8497: result: $MANPAGE_FORMAT" >&5
echo "${ECHO_T}$MANPAGE_FORMAT" >&6
if test -n "$cf_unknown" ; then
- { echo "$as_me:8030: WARNING: Unexpected manpage-format $cf_unknown" >&5
+ { echo "$as_me:8500: WARNING: Unexpected manpage-format $cf_unknown" >&5
echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
fi
-echo "$as_me:8034: checking for manpage renaming" >&5
+echo "$as_me:8504: 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.
@@ -8059,7 +8529,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:8062: error: not a filename: $MANPAGE_RENAMES" >&5
+ { { echo "$as_me:8532: error: not a filename: $MANPAGE_RENAMES" >&5
echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -8073,10 +8543,10 @@ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
fi
fi
-echo "$as_me:8076: result: $MANPAGE_RENAMES" >&5
+echo "$as_me:8546: result: $MANPAGE_RENAMES" >&5
echo "${ECHO_T}$MANPAGE_RENAMES" >&6
-echo "$as_me:8079: checking if manpage aliases will be installed" >&5
+echo "$as_me:8549: 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.
@@ -8087,7 +8557,7 @@ else
MANPAGE_ALIASES=yes
fi;
-echo "$as_me:8090: result: $MANPAGE_ALIASES" >&5
+echo "$as_me:8560: result: $MANPAGE_ALIASES" >&5
echo "${ECHO_T}$MANPAGE_ALIASES" >&6
if test "$LN_S" = "ln -s"; then
@@ -8098,7 +8568,7 @@ fi
MANPAGE_SYMLINKS=no
if test "$MANPAGE_ALIASES" = yes ; then
-echo "$as_me:8101: checking if manpage symlinks should be used" >&5
+echo "$as_me:8571: 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.
@@ -8111,17 +8581,17 @@ fi;
if test "$$cf_use_symlinks" = no; then
if test "$MANPAGE_SYMLINKS" = yes ; then
- { echo "$as_me:8114: WARNING: cannot make symlinks" >&5
+ { echo "$as_me:8584: WARNING: cannot make symlinks" >&5
echo "$as_me: WARNING: cannot make symlinks" >&2;}
MANPAGE_SYMLINKS=no
fi
fi
-echo "$as_me:8120: result: $MANPAGE_SYMLINKS" >&5
+echo "$as_me:8590: result: $MANPAGE_SYMLINKS" >&5
echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
fi
-echo "$as_me:8124: checking for manpage tbl" >&5
+echo "$as_me:8594: 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.
@@ -8132,7 +8602,7 @@ else
MANPAGE_TBL=no
fi;
-echo "$as_me:8135: result: $MANPAGE_TBL" >&5
+echo "$as_me:8605: result: $MANPAGE_TBL" >&5
echo "${ECHO_T}$MANPAGE_TBL" >&6
if test "$prefix" = "NONE" ; then
@@ -8443,7 +8913,7 @@ chmod 755 $cf_edit_man
###############################################################################
### Note that some functions (such as const) are normally disabled anyway.
-echo "$as_me:8446: checking if you want to build with function extensions" >&5
+echo "$as_me:8916: 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.
@@ -8453,7 +8923,7 @@ if test "${enable_ext_funcs+set}" = set; then
else
with_ext_funcs=yes
fi;
-echo "$as_me:8456: result: $with_ext_funcs" >&5
+echo "$as_me:8926: result: $with_ext_funcs" >&5
echo "${ECHO_T}$with_ext_funcs" >&6
if test "$with_ext_funcs" = yes ; then
NCURSES_EXT_FUNCS=1
@@ -8490,7 +8960,7 @@ else
fi
### use option --enable-const to turn on use of const beyond that in XSI.
-echo "$as_me:8493: checking for extended use of const keyword" >&5
+echo "$as_me:8963: 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.
@@ -8500,14 +8970,85 @@ if test "${enable_const+set}" = set; then
else
with_ext_const=no
fi;
-echo "$as_me:8503: result: $with_ext_const" >&5
+echo "$as_me:8973: 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:8510: checking if you want \$NCURSES_NO_PADDING code" >&5
+### use option --enable-ext-colors to turn on use of colors beyond 16.
+echo "$as_me:8981: checking if you want to use extended colors" >&5
+echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
+
+# Check whether --enable-ext-colors or --disable-ext-colors was given.
+if test "${enable_ext_colors+set}" = set; then
+ enableval="$enable_ext_colors"
+ with_ext_colors=$enableval
+else
+ with_ext_colors=no
+fi;
+echo "$as_me:8991: 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:8996: 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)
+
+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:9007: 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
+
+ fi
+ NCURSES_EXT_COLORS=1
+ cat >>confdefs.h <<\EOF
+#define NCURSES_EXT_COLORS 1
+EOF
+
+fi
+
+### use option --enable-ext-mouse to modify coding to support 5-button mice
+echo "$as_me:9022: checking if you want to use extended mouse encoding" >&5
+echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
+
+# Check whether --enable-ext-mouse or --disable-ext-mouse was given.
+if test "${enable_ext_mouse+set}" = set; then
+ enableval="$enable_ext_mouse"
+ with_ext_mouse=$enableval
+else
+ with_ext_mouse=no
+fi;
+echo "$as_me:9032: result: $with_ext_mouse" >&5
+echo "${ECHO_T}$with_ext_mouse" >&6
+NCURSES_MOUSE_VERSION=1
+if test "$with_ext_mouse" = yes ; then
+ NCURSES_MOUSE_VERSION=2
+
+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:9043: 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
+
+fi
+
+echo "$as_me:9051: 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.
@@ -8517,19 +9058,19 @@ if test "${enable_no_padding+set}" = set; then
else
with_no_padding=$with_ext_funcs
fi;
-echo "$as_me:8520: result: $with_no_padding" >&5
+echo "$as_me:9061: 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:8526: checking for ANSI C header files" >&5
+echo "$as_me:9067: 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 8532 "configure"
+#line 9073 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -8537,13 +9078,13 @@ else
#include <float.h>
_ACEOF
-if { (eval echo "$as_me:8540: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9081: \"$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:8546: \$? = $ac_status" >&5
+ echo "$as_me:9087: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8565,7 +9106,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 8568 "configure"
+#line 9109 "configure"
#include "confdefs.h"
#include <string.h>
@@ -8583,7 +9124,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 8586 "configure"
+#line 9127 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -8604,7 +9145,7 @@ if test $ac_cv_header_stdc = yes; then
:
else
cat >conftest.$ac_ext <<_ACEOF
-#line 8607 "configure"
+#line 9148 "configure"
#include "confdefs.h"
#include <ctype.h>
#if ((' ' & 0x0FF) == 0x020)
@@ -8630,15 +9171,15 @@ main ()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8633: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9174: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8636: \$? = $ac_status" >&5
+ echo "$as_me:9177: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:8638: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9179: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8641: \$? = $ac_status" >&5
+ echo "$as_me:9182: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -8651,7 +9192,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
-echo "$as_me:8654: result: $ac_cv_header_stdc" >&5
+echo "$as_me:9195: result: $ac_cv_header_stdc" >&5
echo "${ECHO_T}$ac_cv_header_stdc" >&6
if test $ac_cv_header_stdc = yes; then
@@ -8667,28 +9208,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:8670: checking for $ac_header" >&5
+echo "$as_me:9211: 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 8676 "configure"
+#line 9217 "configure"
#include "confdefs.h"
$ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8682: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9223: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:8685: \$? = $ac_status" >&5
+ echo "$as_me:9226: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:8688: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9229: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8691: \$? = $ac_status" >&5
+ echo "$as_me:9232: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Header=yes"
else
@@ -8698,7 +9239,7 @@ eval "$as_ac_Header=no"
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:8701: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9242: 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
@@ -8708,13 +9249,13 @@ EOF
fi
done
-echo "$as_me:8711: checking for signed char" >&5
+echo "$as_me:9252: 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 8717 "configure"
+#line 9258 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -8729,16 +9270,16 @@ if (sizeof (signed char))
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8732: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9273: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:8735: \$? = $ac_status" >&5
+ echo "$as_me:9276: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:8738: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9279: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8741: \$? = $ac_status" >&5
+ echo "$as_me:9282: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_signed_char=yes
else
@@ -8748,10 +9289,10 @@ ac_cv_type_signed_char=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:8751: result: $ac_cv_type_signed_char" >&5
+echo "$as_me:9292: result: $ac_cv_type_signed_char" >&5
echo "${ECHO_T}$ac_cv_type_signed_char" >&6
-echo "$as_me:8754: checking size of signed char" >&5
+echo "$as_me:9295: 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
@@ -8760,7 +9301,7 @@ else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-#line 8763 "configure"
+#line 9304 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -8772,21 +9313,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8775: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9316: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:8778: \$? = $ac_status" >&5
+ echo "$as_me:9319: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:8781: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9322: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8784: \$? = $ac_status" >&5
+ echo "$as_me:9325: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 8789 "configure"
+#line 9330 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -8798,16 +9339,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8801: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:8804: \$? = $ac_status" >&5
+ echo "$as_me:9345: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:8807: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9348: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8810: \$? = $ac_status" >&5
+ echo "$as_me:9351: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid; break
else
@@ -8823,7 +9364,7 @@ cat conftest.$ac_ext >&5
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 8826 "configure"
+#line 9367 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -8835,16 +9376,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8838: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9379: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:8841: \$? = $ac_status" >&5
+ echo "$as_me:9382: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:8844: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9385: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8847: \$? = $ac_status" >&5
+ echo "$as_me:9388: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=$ac_mid; break
else
@@ -8860,7 +9401,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 8863 "configure"
+#line 9404 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -8872,16 +9413,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8875: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9416: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:8878: \$? = $ac_status" >&5
+ echo "$as_me:9419: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:8881: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9422: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8884: \$? = $ac_status" >&5
+ echo "$as_me:9425: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid
else
@@ -8894,12 +9435,12 @@ done
ac_cv_sizeof_signed_char=$ac_lo
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:8897: error: cannot run test program while cross compiling" >&5
+ { { echo "$as_me:9438: 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 8902 "configure"
+#line 9443 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -8915,15 +9456,15 @@ fclose (f);
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8918: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9459: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8921: \$? = $ac_status" >&5
+ echo "$as_me:9462: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:8923: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9464: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8926: \$? = $ac_status" >&5
+ echo "$as_me:9467: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_signed_char=`cat conftest.val`
else
@@ -8939,7 +9480,7 @@ else
ac_cv_sizeof_signed_char=0
fi
fi
-echo "$as_me:8942: result: $ac_cv_sizeof_signed_char" >&5
+echo "$as_me:9483: 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
@@ -8950,7 +9491,7 @@ if test "$ac_cv_sizeof_signed_char" = 1 ; then
else
NCURSES_SBOOL="char"
fi
-echo "$as_me:8953: checking if you want to use signed Boolean array in term.h" >&5
+echo "$as_me:9494: 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.
@@ -8960,12 +9501,12 @@ if test "${enable_signed_char+set}" = set; then
else
with_signed_char=no
fi;
-echo "$as_me:8963: result: $with_signed_char" >&5
+echo "$as_me:9504: 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:8968: checking if you want SIGWINCH handler" >&5
+echo "$as_me:9509: 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.
@@ -8975,14 +9516,14 @@ if test "${enable_sigwinch+set}" = set; then
else
with_sigwinch=$with_ext_funcs
fi;
-echo "$as_me:8978: result: $with_sigwinch" >&5
+echo "$as_me:9519: 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:8985: checking if you want user-definable terminal capabilities like termcap" >&5
+echo "$as_me:9526: 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.
@@ -8992,7 +9533,7 @@ if test "${enable_tcap_names+set}" = set; then
else
with_tcap_names=$with_ext_funcs
fi;
-echo "$as_me:8995: result: $with_tcap_names" >&5
+echo "$as_me:9536: result: $with_tcap_names" >&5
echo "${ECHO_T}$with_tcap_names" >&6
NCURSES_XNAMES=0
test "$with_tcap_names" = yes && NCURSES_XNAMES=1
@@ -9000,7 +9541,7 @@ test "$with_tcap_names" = yes && NCURSES_XNAMES=1
###############################################################################
# These options are relatively safe to experiment with.
-echo "$as_me:9003: checking if you want all development code" >&5
+echo "$as_me:9544: 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.
@@ -9010,11 +9551,11 @@ if test "${with_develop+set}" = set; then
else
with_develop=no
fi;
-echo "$as_me:9013: result: $with_develop" >&5
+echo "$as_me:9554: 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:9017: checking if you want hard-tabs code" >&5
+echo "$as_me:9558: 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.
@@ -9024,14 +9565,14 @@ if test "${enable_hard_tabs+set}" = set; then
else
enable_hard_tabs=$with_develop
fi;
-echo "$as_me:9027: result: $enable_hard_tabs" >&5
+echo "$as_me:9568: 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:9034: checking if you want limited support for xmc" >&5
+echo "$as_me:9575: 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.
@@ -9041,7 +9582,7 @@ if test "${enable_xmc_glitch+set}" = set; then
else
enable_xmc_glitch=$with_develop
fi;
-echo "$as_me:9044: result: $enable_xmc_glitch" >&5
+echo "$as_me:9585: 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
@@ -9050,7 +9591,7 @@ EOF
###############################################################################
# These are just experimental, probably should not be in a package:
-echo "$as_me:9053: checking if you do not want to assume colors are white-on-black" >&5
+echo "$as_me:9594: 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.
@@ -9060,14 +9601,14 @@ if test "${enable_assumed_color+set}" = set; then
else
with_assumed_color=yes
fi;
-echo "$as_me:9063: result: $with_assumed_color" >&5
+echo "$as_me:9604: 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:9070: checking if you want hashmap scrolling-optimization code" >&5
+echo "$as_me:9611: 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.
@@ -9077,14 +9618,14 @@ if test "${enable_hashmap+set}" = set; then
else
with_hashmap=yes
fi;
-echo "$as_me:9080: result: $with_hashmap" >&5
+echo "$as_me:9621: 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:9087: checking if you want colorfgbg code" >&5
+echo "$as_me:9628: 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.
@@ -9094,87 +9635,16 @@ if test "${enable_colorfgbg+set}" = set; then
else
with_colorfgbg=no
fi;
-echo "$as_me:9097: result: $with_colorfgbg" >&5
+echo "$as_me:9638: 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:9104: 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.
-if test "${enable_ext_colors+set}" = set; then
- enableval="$enable_ext_colors"
- with_ext_colors=$enableval
-else
- with_ext_colors=no
-fi;
-echo "$as_me:9114: 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:9119: 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)
-
-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:9130: 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
-
- fi
- NCURSES_EXT_COLORS=1
- cat >>confdefs.h <<\EOF
-#define NCURSES_EXT_COLORS 1
-EOF
-
-fi
-
-### use option --enable-ext-mouse to modify coding to support 5-button mice
-echo "$as_me:9145: 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.
-if test "${enable_ext_mouse+set}" = set; then
- enableval="$enable_ext_mouse"
- with_ext_mouse=$enableval
-else
- with_ext_mouse=no
-fi;
-echo "$as_me:9155: result: $with_ext_mouse" >&5
-echo "${ECHO_T}$with_ext_mouse" >&6
-NCURSES_MOUSE_VERSION=1
-if test "$with_ext_mouse" = yes ; then
- NCURSES_MOUSE_VERSION=2
-
-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:9166: 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
-
-fi
-
# This is still experimental (20080329), but should ultimately be moved to
# the script-block --with-normal, etc.
-echo "$as_me:9177: checking if you want to link with the pthread library" >&5
+echo "$as_me:9647: checking if you want to link with the pthread library" >&5
echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
# Check whether --with-pthread or --without-pthread was given.
@@ -9184,27 +9654,27 @@ if test "${with_pthread+set}" = set; then
else
with_pthread=no
fi;
-echo "$as_me:9187: result: $with_pthread" >&5
+echo "$as_me:9657: result: $with_pthread" >&5
echo "${ECHO_T}$with_pthread" >&6
if test "$with_pthread" != no ; then
- echo "$as_me:9191: checking for pthread.h" >&5
+ echo "$as_me:9661: checking for pthread.h" >&5
echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
if test "${ac_cv_header_pthread_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 9197 "configure"
+#line 9667 "configure"
#include "confdefs.h"
#include <pthread.h>
_ACEOF
-if { (eval echo "$as_me:9201: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9671: \"$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:9207: \$? = $ac_status" >&5
+ echo "$as_me:9677: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9223,7 +9693,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:9226: result: $ac_cv_header_pthread_h" >&5
+echo "$as_me:9696: result: $ac_cv_header_pthread_h" >&5
echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
if test $ac_cv_header_pthread_h = yes; then
@@ -9231,89 +9701,163 @@ if test $ac_cv_header_pthread_h = yes; then
#define HAVE_PTHREADS_H 1
EOF
- echo "$as_me:9234: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line 9242 "configure"
+ echo "$as_me:9704: checking if we can link with the pthread library" >&5
+echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6
+ cf_save_LIBS="$LIBS"
+ LIBS="-lpthread $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+#line 9709 "configure"
#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char pthread_create ();
+#include <pthread.h>
+
int
main ()
{
-pthread_create ();
+
+ int rc = pthread_create(0,0,0,0);
+
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9261: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9725: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9264: \$? = $ac_status" >&5
+ echo "$as_me:9728: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9267: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9731: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9270: \$? = $ac_status" >&5
+ echo "$as_me:9734: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_pthread_pthread_create=yes
+ with_pthread=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-ac_cv_lib_pthread_pthread_create=no
+with_pthread=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:9281: result: $ac_cv_lib_pthread_pthread_create" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
-if test $ac_cv_lib_pthread_pthread_create = yes; then
+ LIBS="$cf_save_LIBS"
+ echo "$as_me:9744: result: $with_pthread" >&5
+echo "${ECHO_T}$with_pthread" >&6
+ if test "$with_pthread" = yes ; then
LIBS="-lpthread $LIBS"
cat >>confdefs.h <<\EOF
#define HAVE_LIBPTHREADS 1
EOF
- with_pthread=yes
+ else
+ { { echo "$as_me:9754: error: Cannot link with pthread library" >&5
+echo "$as_me: error: Cannot link with pthread library" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+fi
+fi
+
+echo "$as_me:9763: checking if you want to use weak-symbols for pthreads" >&5
+echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
+
+# Check whether --enable-weak-symbols or --disable-weak-symbols was given.
+if test "${enable_weak_symbols+set}" = set; then
+ enableval="$enable_weak_symbols"
+ use_weak_symbols=$withval
else
+ use_weak_symbols=no
+fi;
+echo "$as_me:9773: result: $use_weak_symbols" >&5
+echo "${ECHO_T}$use_weak_symbols" >&6
+if test "$use_weak_symbols" = yes ; then
- { { echo "$as_me:9294: error: Cannot link with pthread library" >&5
-echo "$as_me: error: Cannot link with pthread library" >&2;}
- { (exit 1); exit 1; }; }
+echo "$as_me:9777: checking if $CC supports weak symbols" >&5
+echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
+if test "${cf_cv_weak_symbols+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 9784 "configure"
+#include "confdefs.h"
+
+#include <stdio.h>
+int
+main ()
+{
+
+#if defined(__GNUC__)
+# if defined __USE_ISOC99
+# define _cat_pragma(exp) _Pragma(#exp)
+# define _weak_pragma(exp) _cat_pragma(weak name)
+# else
+# define _weak_pragma(exp)
+# endif
+# define _declare(name) __extension__ extern __typeof__(name) name
+# define weak_symbol(name) _weak_pragma(name) _declare(name) __attribute__((weak))
+#endif
+weak_symbol(fopen);
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:9810: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:9813: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:9816: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:9819: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_weak_symbols=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_weak_symbols=no
fi
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
+echo "$as_me:9830: result: $cf_cv_weak_symbols" >&5
+echo "${ECHO_T}$cf_cv_weak_symbols" >&6
+
+else
+ cf_cv_weak_symbols=no
+fi
+
+if test $cf_cv_weak_symbols = yes ; then
+ cat >>confdefs.h <<\EOF
+#define USE_WEAK_SYMBOLS 1
+EOF
fi
+PTHREAD=
if test "$with_pthread" = "yes" ; then
cat >>confdefs.h <<\EOF
#define USE_PTHREADS 1
EOF
enable_reentrant=yes
+ if test $cf_cv_weak_symbols = yes ; then
+ PTHREAD=-lpthread
+ fi
fi
# Reentrant code has to be opaque; there's little advantage to making ncurses
# opaque outside of that, so there is no --enable-opaque option. We can use
# this option without --with-pthreads, but this will be always set for
# pthreads.
-echo "$as_me:9316: checking if you want experimental reentrant code" >&5
+echo "$as_me:9860: 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.
@@ -9323,14 +9867,21 @@ if test "${enable_reentrant+set}" = set; then
else
with_reentrant=no
fi;
-echo "$as_me:9326: result: $with_reentrant" >&5
+echo "$as_me:9870: 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}"
+ if test $cf_cv_weak_symbols = yes ; then
+
+# remove pthread library from $LIBS
+LIBS=`echo "$LIBS" | sed -e 's/-lpthread[ ]//g' -e 's/-lpthread$//'`
+
+ else
+ LIB_SUFFIX="t${LIB_SUFFIX}"
+ fi
cat >>confdefs.h <<\EOF
#define USE_REENTRANT 1
EOF
@@ -9340,7 +9891,7 @@ if test "${with_abi_version+set}" != set; then
5.*)
cf_cv_rel_version=6.0
cf_cv_abi_version=6
- { echo "$as_me:9343: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
+ { echo "$as_me:9894: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
;;
esac
@@ -9353,7 +9904,7 @@ else
NCURSES_SIZE_T=short
fi
-echo "$as_me:9356: checking if you want experimental safe-sprintf code" >&5
+echo "$as_me:9907: 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.
@@ -9363,7 +9914,7 @@ if test "${enable_safe_sprintf+set}" = set; then
else
with_safe_sprintf=no
fi;
-echo "$as_me:9366: result: $with_safe_sprintf" >&5
+echo "$as_me:9917: 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
@@ -9372,7 +9923,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:9375: checking if you want to experiment without scrolling-hints code" >&5
+echo "$as_me:9926: 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.
@@ -9382,7 +9933,7 @@ if test "${enable_scroll_hints+set}" = set; then
else
with_scroll_hints=yes
fi;
-echo "$as_me:9385: result: $with_scroll_hints" >&5
+echo "$as_me:9936: 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
@@ -9390,7 +9941,7 @@ EOF
fi
-echo "$as_me:9393: checking if you want experimental wgetch-events code" >&5
+echo "$as_me:9944: 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.
@@ -9400,7 +9951,7 @@ if test "${enable_wgetch_events+set}" = set; then
else
with_wgetch_events=no
fi;
-echo "$as_me:9403: result: $with_wgetch_events" >&5
+echo "$as_me:9954: 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
@@ -9409,7 +9960,7 @@ EOF
###############################################################################
### use option --disable-echo to suppress full display compiling commands
-echo "$as_me:9412: checking if you want to display full commands during build" >&5
+echo "$as_me:9963: 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.
@@ -9426,11 +9977,11 @@ else
test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
fi
-echo "$as_me:9429: result: $with_echo" >&5
+echo "$as_me:9980: result: $with_echo" >&5
echo "${ECHO_T}$with_echo" >&6
### use option --enable-warnings to turn on all gcc warnings
-echo "$as_me:9433: checking if you want to see compiler warnings" >&5
+echo "$as_me:9984: 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.
@@ -9438,7 +9989,7 @@ if test "${enable_warnings+set}" = set; then
enableval="$enable_warnings"
with_warnings=$enableval
fi;
-echo "$as_me:9441: result: $with_warnings" >&5
+echo "$as_me:9992: result: $with_warnings" >&5
echo "${ECHO_T}$with_warnings" >&6
if test "x$with_warnings" = "xyes"; then
@@ -9449,12 +10000,12 @@ INTEL_COMPILER=no
if test "$GCC" = yes ; then
case $host_os in
linux*|gnu*)
- echo "$as_me:9452: checking if this is really Intel C compiler" >&5
+ echo "$as_me:10003: 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 9457 "configure"
+#line 10008 "configure"
#include "confdefs.h"
int
@@ -9471,16 +10022,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9474: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10025: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9477: \$? = $ac_status" >&5
+ echo "$as_me:10028: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9480: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10031: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9483: \$? = $ac_status" >&5
+ echo "$as_me:10034: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
INTEL_COMPILER=yes
cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -9491,14 +10042,14 @@ cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
CFLAGS="$cf_save_CFLAGS"
- echo "$as_me:9494: result: $INTEL_COMPILER" >&5
+ echo "$as_me:10045: result: $INTEL_COMPILER" >&5
echo "${ECHO_T}$INTEL_COMPILER" >&6
;;
esac
fi
cat > conftest.$ac_ext <<EOF
-#line 9501 "${as_me-configure}"
+#line 10052 "${as_me-configure}"
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
EOF
@@ -9516,7 +10067,7 @@ then
# remark #981: operands are evaluated in unspecified order
# warning #269: invalid format string conversion
- { echo "$as_me:9519: checking for $CC warning options..." >&5
+ { echo "$as_me:10070: checking for $CC warning options..." >&5
echo "$as_me: checking for $CC warning options..." >&6;}
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-Wall"
@@ -9533,12 +10084,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:9536: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:10087: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9539: \$? = $ac_status" >&5
+ echo "$as_me:10090: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:9541: result: ... -$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:10092: result: ... -$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
fi
@@ -9547,7 +10098,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
elif test "$GCC" = yes
then
- { echo "$as_me:9550: checking for $CC warning options..." >&5
+ { echo "$as_me:10101: checking for $CC warning options..." >&5
echo "$as_me: checking for $CC warning options..." >&6;}
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-W -Wall"
@@ -9567,12 +10118,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
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:9570: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:10121: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9573: \$? = $ac_status" >&5
+ echo "$as_me:10124: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:9575: result: ... -$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:10126: result: ... -$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
case $cf_opt in #(vi
Wcast-qual) #(vi
@@ -9580,10 +10131,10 @@ echo "${ECHO_T}... -$cf_opt" >&6
;;
Winline) #(vi
case $GCC_VERSION in
- 3.3*)
+ [34].*)
test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
-echo "${as_me-configure}:9586: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me-configure}:10137: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
continue;;
esac
@@ -9603,12 +10154,12 @@ INTEL_CPLUSPLUS=no
if test "$GCC" = yes ; then
case $host_os in
linux*|gnu*)
- echo "$as_me:9606: checking if this is really Intel C++ compiler" >&5
+ echo "$as_me:10157: 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 9611 "configure"
+#line 10162 "configure"
#include "confdefs.h"
int
@@ -9625,16 +10176,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9628: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9631: \$? = $ac_status" >&5
+ echo "$as_me:10182: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9634: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10185: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9637: \$? = $ac_status" >&5
+ echo "$as_me:10188: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
INTEL_CPLUSPLUS=yes
cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -9645,7 +10196,7 @@ cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$cf_save_CFLAGS"
- echo "$as_me:9648: result: $INTEL_CPLUSPLUS" >&5
+ echo "$as_me:10199: result: $INTEL_CPLUSPLUS" >&5
echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
;;
esac
@@ -9659,7 +10210,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
ac_main_return=return
cat > conftest.$ac_ext <<EOF
-#line 9662 "configure"
+#line 10213 "configure"
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
EOF
@@ -9677,7 +10228,7 @@ then
# remark #981: operands are evaluated in unspecified order
# warning #269: invalid format string conversion
- { echo "$as_me:9680: checking for $CC warning options..." >&5
+ { echo "$as_me:10231: checking for $CC warning options..." >&5
echo "$as_me: checking for $CC warning options..." >&6;}
cf_save_CXXFLAGS="$CXXFLAGS"
EXTRA_CXXFLAGS="-Wall"
@@ -9694,12 +10245,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:9697: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9700: \$? = $ac_status" >&5
+ echo "$as_me:10251: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:9702: result: ... -$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:10253: result: ... -$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
fi
@@ -9708,7 +10259,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
elif test "$GXX" = yes
then
- { echo "$as_me:9711: checking for $CXX warning options..." >&5
+ { echo "$as_me:10262: checking for $CXX warning options..." >&5
echo "$as_me: checking for $CXX warning options..." >&6;}
cf_save_CXXFLAGS="$CXXFLAGS"
EXTRA_CXXFLAGS="-W -Wall"
@@ -9737,16 +10288,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:9740: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:10291: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9743: \$? = $ac_status" >&5
+ echo "$as_me:10294: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:9745: result: ... -$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:10296: result: ... -$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
else
- test -n "$verbose" && echo "$as_me:9749: result: ... no -$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:10300: result: ... no -$cf_opt" >&5
echo "${ECHO_T}... no -$cf_opt" >&6
fi
done
@@ -9782,10 +10333,10 @@ cat > conftest.i <<EOF
EOF
if test "$GCC" = yes
then
- { echo "$as_me:9785: checking for $CC __attribute__ directives..." >&5
+ { echo "$as_me:10336: checking for $CC __attribute__ directives..." >&5
echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
cat > conftest.$ac_ext <<EOF
-#line 9788 "${as_me-configure}"
+#line 10339 "${as_me-configure}"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -9823,12 +10374,12 @@ EOF
EOF
;;
esac
- if { (eval echo "$as_me:9826: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:10377: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9829: \$? = $ac_status" >&5
+ echo "$as_me:10380: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:9831: result: ... $cf_attribute" >&5
+ test -n "$verbose" && echo "$as_me:10382: result: ... $cf_attribute" >&5
echo "${ECHO_T}... $cf_attribute" >&6
cat conftest.h >>confdefs.h
fi
@@ -9840,7 +10391,7 @@ rm -rf conftest*
fi
### use option --enable-assertions to turn on generation of assertion code
-echo "$as_me:9843: checking if you want to enable runtime assertions" >&5
+echo "$as_me:10394: 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.
@@ -9850,7 +10401,7 @@ if test "${enable_assertions+set}" = set; then
else
with_assertions=no
fi;
-echo "$as_me:9853: result: $with_assertions" >&5
+echo "$as_me:10404: result: $with_assertions" >&5
echo "${ECHO_T}$with_assertions" >&6
if test -n "$GCC"
then
@@ -9868,7 +10419,7 @@ fi
### use option --disable-leaks to suppress "permanent" leaks, for testing
-echo "$as_me:9871: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:10422: 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.
@@ -9884,7 +10435,7 @@ EOF
else
with_dmalloc=
fi;
-echo "$as_me:9887: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:10438: result: ${with_dmalloc:-no}" >&5
echo "${ECHO_T}${with_dmalloc:-no}" >&6
case .$with_cflags in #(vi
@@ -9968,23 +10519,23 @@ fi
esac
if test "$with_dmalloc" = yes ; then
- echo "$as_me:9971: checking for dmalloc.h" >&5
+ echo "$as_me:10522: 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 9977 "configure"
+#line 10528 "configure"
#include "confdefs.h"
#include <dmalloc.h>
_ACEOF
-if { (eval echo "$as_me:9981: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10532: \"$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:9987: \$? = $ac_status" >&5
+ echo "$as_me:10538: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10003,11 +10554,11 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:10006: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:10557: 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:10010: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:10561: 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
@@ -10015,7 +10566,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldmalloc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10018 "configure"
+#line 10569 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10034,16 +10585,16 @@ dmalloc_debug ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10037: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10588: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10040: \$? = $ac_status" >&5
+ echo "$as_me:10591: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10043: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10594: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10046: \$? = $ac_status" >&5
+ echo "$as_me:10597: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dmalloc_dmalloc_debug=yes
else
@@ -10054,7 +10605,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10057: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:10608: 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
@@ -10069,7 +10620,7 @@ fi
fi
-echo "$as_me:10072: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:10623: 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.
@@ -10085,7 +10636,7 @@ EOF
else
with_dbmalloc=
fi;
-echo "$as_me:10088: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:10639: result: ${with_dbmalloc:-no}" >&5
echo "${ECHO_T}${with_dbmalloc:-no}" >&6
case .$with_cflags in #(vi
@@ -10169,23 +10720,23 @@ fi
esac
if test "$with_dbmalloc" = yes ; then
- echo "$as_me:10172: checking for dbmalloc.h" >&5
+ echo "$as_me:10723: 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 10178 "configure"
+#line 10729 "configure"
#include "confdefs.h"
#include <dbmalloc.h>
_ACEOF
-if { (eval echo "$as_me:10182: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10733: \"$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:10188: \$? = $ac_status" >&5
+ echo "$as_me:10739: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10204,11 +10755,11 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:10207: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:10758: 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:10211: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:10762: 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
@@ -10216,7 +10767,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldbmalloc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10219 "configure"
+#line 10770 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10235,16 +10786,16 @@ debug_malloc ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10789: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10241: \$? = $ac_status" >&5
+ echo "$as_me:10792: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10244: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10795: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10247: \$? = $ac_status" >&5
+ echo "$as_me:10798: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dbmalloc_debug_malloc=yes
else
@@ -10255,7 +10806,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10258: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:10809: 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
@@ -10270,7 +10821,7 @@ fi
fi
-echo "$as_me:10273: checking if you want to use valgrind for testing" >&5
+echo "$as_me:10824: 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.
@@ -10286,7 +10837,7 @@ EOF
else
with_valgrind=
fi;
-echo "$as_me:10289: result: ${with_valgrind:-no}" >&5
+echo "$as_me:10840: result: ${with_valgrind:-no}" >&5
echo "${ECHO_T}${with_valgrind:-no}" >&6
case .$with_cflags in #(vi
@@ -10369,7 +10920,7 @@ fi
;;
esac
-echo "$as_me:10372: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:10923: 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.
@@ -10379,7 +10930,7 @@ if test "${enable_leaks+set}" = set; then
else
: ${with_no_leaks:=no}
fi;
-echo "$as_me:10382: result: $with_no_leaks" >&5
+echo "$as_me:10933: result: $with_no_leaks" >&5
echo "${ECHO_T}$with_no_leaks" >&6
if test "$with_no_leaks" = yes ; then
@@ -10424,7 +10975,7 @@ case "$CFLAGS $CPPFLAGS" in
;;
esac
-echo "$as_me:10427: checking whether to add trace feature to all models" >&5
+echo "$as_me:10978: 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.
@@ -10434,7 +10985,7 @@ if test "${with_trace+set}" = set; then
else
cf_with_trace=$cf_all_traces
fi;
-echo "$as_me:10437: result: $cf_with_trace" >&5
+echo "$as_me:10988: result: $cf_with_trace" >&5
echo "${ECHO_T}$cf_with_trace" >&6
if test "$cf_with_trace" = yes ; then
@@ -10515,13 +11066,13 @@ else
fi
### Checks for libraries.
-echo "$as_me:10518: checking for gettimeofday" >&5
+echo "$as_me:11069: 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 10524 "configure"
+#line 11075 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gettimeofday (); below. */
@@ -10552,16 +11103,16 @@ f = gettimeofday;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10555: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11106: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10558: \$? = $ac_status" >&5
+ echo "$as_me:11109: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10561: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11112: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10564: \$? = $ac_status" >&5
+ echo "$as_me:11115: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_gettimeofday=yes
else
@@ -10571,7 +11122,7 @@ ac_cv_func_gettimeofday=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:10574: result: $ac_cv_func_gettimeofday" >&5
+echo "$as_me:11125: 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
@@ -10580,7 +11131,7 @@ EOF
else
-echo "$as_me:10583: checking for gettimeofday in -lbsd" >&5
+echo "$as_me:11134: 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
@@ -10588,7 +11139,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbsd $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10591 "configure"
+#line 11142 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10607,16 +11158,16 @@ gettimeofday ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10610: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11161: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10613: \$? = $ac_status" >&5
+ echo "$as_me:11164: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10616: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11167: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10619: \$? = $ac_status" >&5
+ echo "$as_me:11170: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_bsd_gettimeofday=yes
else
@@ -10627,7 +11178,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10630: result: $ac_cv_lib_bsd_gettimeofday" >&5
+echo "$as_me:11181: 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
@@ -10639,14 +11190,14 @@ fi
fi
-echo "$as_me:10642: checking if -lm needed for math functions" >&5
+echo "$as_me:11193: 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 10649 "configure"
+#line 11200 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -10661,16 +11212,16 @@ double x = rand(); printf("result = %g\n", sin(x))
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11215: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10667: \$? = $ac_status" >&5
+ echo "$as_me:11218: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10670: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11221: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10673: \$? = $ac_status" >&5
+ echo "$as_me:11224: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_need_libm=no
else
@@ -10680,7 +11231,7 @@ cf_cv_need_libm=yes
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:10683: result: $cf_cv_need_libm" >&5
+echo "$as_me:11234: result: $cf_cv_need_libm" >&5
echo "${ECHO_T}$cf_cv_need_libm" >&6
if test "$cf_cv_need_libm" = yes
then
@@ -10688,13 +11239,13 @@ MATH_LIB=-lm
fi
### Checks for header files.
-echo "$as_me:10691: checking for ANSI C header files" >&5
+echo "$as_me:11242: 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 10697 "configure"
+#line 11248 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -10702,13 +11253,13 @@ else
#include <float.h>
_ACEOF
-if { (eval echo "$as_me:10705: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11256: \"$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:10711: \$? = $ac_status" >&5
+ echo "$as_me:11262: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10730,7 +11281,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 10733 "configure"
+#line 11284 "configure"
#include "confdefs.h"
#include <string.h>
@@ -10748,7 +11299,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 10751 "configure"
+#line 11302 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -10769,7 +11320,7 @@ if test $ac_cv_header_stdc = yes; then
:
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10772 "configure"
+#line 11323 "configure"
#include "confdefs.h"
#include <ctype.h>
#if ((' ' & 0x0FF) == 0x020)
@@ -10795,15 +11346,15 @@ main ()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11349: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10801: \$? = $ac_status" >&5
+ echo "$as_me:11352: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:10803: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11354: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10806: \$? = $ac_status" >&5
+ echo "$as_me:11357: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -10816,7 +11367,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
-echo "$as_me:10819: result: $ac_cv_header_stdc" >&5
+echo "$as_me:11370: result: $ac_cv_header_stdc" >&5
echo "${ECHO_T}$ac_cv_header_stdc" >&6
if test $ac_cv_header_stdc = yes; then
@@ -10829,13 +11380,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:10832: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:11383: 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 10838 "configure"
+#line 11389 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -10850,16 +11401,16 @@ return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10853: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11404: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10856: \$? = $ac_status" >&5
+ echo "$as_me:11407: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10859: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11410: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10862: \$? = $ac_status" >&5
+ echo "$as_me:11413: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Header=yes"
else
@@ -10869,7 +11420,7 @@ eval "$as_ac_Header=no"
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:10872: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11423: 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
@@ -10882,7 +11433,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:10885: checking for opendir in -ldir" >&5
+ echo "$as_me:11436: 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
@@ -10890,7 +11441,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldir $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10893 "configure"
+#line 11444 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10909,16 +11460,16 @@ opendir ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10912: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11463: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10915: \$? = $ac_status" >&5
+ echo "$as_me:11466: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10918: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11469: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10921: \$? = $ac_status" >&5
+ echo "$as_me:11472: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dir_opendir=yes
else
@@ -10929,14 +11480,14 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10932: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:11483: 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:10939: checking for opendir in -lx" >&5
+ echo "$as_me:11490: 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
@@ -10944,7 +11495,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lx $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10947 "configure"
+#line 11498 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10963,16 +11514,16 @@ opendir ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10966: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11517: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10969: \$? = $ac_status" >&5
+ echo "$as_me:11520: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10972: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11523: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10975: \$? = $ac_status" >&5
+ echo "$as_me:11526: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_x_opendir=yes
else
@@ -10983,7 +11534,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10986: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:11537: 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"
@@ -10991,13 +11542,13 @@ fi
fi
-echo "$as_me:10994: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:11545: 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 11000 "configure"
+#line 11551 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -11013,16 +11564,16 @@ return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11016: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11567: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11019: \$? = $ac_status" >&5
+ echo "$as_me:11570: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11022: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11573: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11025: \$? = $ac_status" >&5
+ echo "$as_me:11576: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_header_time=yes
else
@@ -11032,7 +11583,7 @@ ac_cv_header_time=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:11035: result: $ac_cv_header_time" >&5
+echo "$as_me:11586: result: $ac_cv_header_time" >&5
echo "${ECHO_T}$ac_cv_header_time" >&6
if test $ac_cv_header_time = yes; then
@@ -11042,14 +11593,14 @@ EOF
fi
-echo "$as_me:11045: checking for regular-expression headers" >&5
+echo "$as_me:11596: 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 11052 "configure"
+#line 11603 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <regex.h>
@@ -11067,16 +11618,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11070: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11621: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11073: \$? = $ac_status" >&5
+ echo "$as_me:11624: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11076: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11627: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11079: \$? = $ac_status" >&5
+ echo "$as_me:11630: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_regex="regex.h"
else
@@ -11084,7 +11635,7 @@ else
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 11087 "configure"
+#line 11638 "configure"
#include "confdefs.h"
#include <regexp.h>
int
@@ -11099,16 +11650,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11102: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11653: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11105: \$? = $ac_status" >&5
+ echo "$as_me:11656: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11108: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11659: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11111: \$? = $ac_status" >&5
+ echo "$as_me:11662: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_regex="regexp.h"
else
@@ -11118,7 +11669,7 @@ cat conftest.$ac_ext >&5
cf_save_LIBS="$LIBS"
LIBS="-lgen $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11121 "configure"
+#line 11672 "configure"
#include "confdefs.h"
#include <regexpr.h>
int
@@ -11133,16 +11684,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11136: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11687: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11139: \$? = $ac_status" >&5
+ echo "$as_me:11690: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11142: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11693: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11145: \$? = $ac_status" >&5
+ echo "$as_me:11696: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_regex="regexpr.h"
else
@@ -11158,7 +11709,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:11161: result: $cf_cv_regex" >&5
+echo "$as_me:11712: result: $cf_cv_regex" >&5
echo "${ECHO_T}$cf_cv_regex" >&6
case $cf_cv_regex in
regex.h) cat >>confdefs.h <<\EOF
@@ -11194,23 +11745,23 @@ wctype.h \
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11197: checking for $ac_header" >&5
+echo "$as_me:11748: 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 11203 "configure"
+#line 11754 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:11207: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11758: \"$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:11213: \$? = $ac_status" >&5
+ echo "$as_me:11764: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11229,7 +11780,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:11232: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11783: 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
@@ -11243,7 +11794,7 @@ done
# Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
if test "$ISC" = yes ; then
-echo "$as_me:11246: checking for main in -lcposix" >&5
+echo "$as_me:11797: 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
@@ -11251,7 +11802,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcposix $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11254 "configure"
+#line 11805 "configure"
#include "confdefs.h"
int
@@ -11263,16 +11814,16 @@ main ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11266: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11817: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11269: \$? = $ac_status" >&5
+ echo "$as_me:11820: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11272: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11823: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11275: \$? = $ac_status" >&5
+ echo "$as_me:11826: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_cposix_main=yes
else
@@ -11283,7 +11834,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:11286: result: $ac_cv_lib_cposix_main" >&5
+echo "$as_me:11837: 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
@@ -11294,7 +11845,7 @@ EOF
fi
- echo "$as_me:11297: checking for bzero in -linet" >&5
+ echo "$as_me:11848: 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
@@ -11302,7 +11853,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-linet $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11305 "configure"
+#line 11856 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -11321,16 +11872,16 @@ bzero ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11324: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11875: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11327: \$? = $ac_status" >&5
+ echo "$as_me:11878: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11330: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11881: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11333: \$? = $ac_status" >&5
+ echo "$as_me:11884: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_inet_bzero=yes
else
@@ -11341,21 +11892,21 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:11344: result: $ac_cv_lib_inet_bzero" >&5
+echo "$as_me:11895: 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:11351: checking if sys/time.h works with sys/select.h" >&5
+echo "$as_me:11902: 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 11358 "configure"
+#line 11909 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -11375,16 +11926,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11378: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11929: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11381: \$? = $ac_status" >&5
+ echo "$as_me:11932: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11384: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11935: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11387: \$? = $ac_status" >&5
+ echo "$as_me:11938: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_sys_time_select=yes
else
@@ -11396,7 +11947,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:11399: result: $cf_cv_sys_time_select" >&5
+echo "$as_me:11950: 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
@@ -11410,7 +11961,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:11413: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:11964: 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
@@ -11418,7 +11969,7 @@ else
ac_cv_prog_cc_stdc=no
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
-#line 11421 "configure"
+#line 11972 "configure"
#include "confdefs.h"
#include <stdarg.h>
#include <stdio.h>
@@ -11467,16 +12018,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:11470: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12021: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11473: \$? = $ac_status" >&5
+ echo "$as_me:12024: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11476: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12027: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11479: \$? = $ac_status" >&5
+ echo "$as_me:12030: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cc_stdc=$ac_arg
break
@@ -11493,21 +12044,21 @@ fi
case "x$ac_cv_prog_cc_stdc" in
x|xno)
- echo "$as_me:11496: result: none needed" >&5
+ echo "$as_me:12047: result: none needed" >&5
echo "${ECHO_T}none needed" >&6 ;;
*)
- echo "$as_me:11499: result: $ac_cv_prog_cc_stdc" >&5
+ echo "$as_me:12050: 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:11504: checking for an ANSI C-conforming const" >&5
+echo "$as_me:12055: 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 11510 "configure"
+#line 12061 "configure"
#include "confdefs.h"
int
@@ -11565,16 +12116,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11568: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12119: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11571: \$? = $ac_status" >&5
+ echo "$as_me:12122: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11574: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12125: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11577: \$? = $ac_status" >&5
+ echo "$as_me:12128: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_const=yes
else
@@ -11584,7 +12135,7 @@ ac_cv_c_const=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:11587: result: $ac_cv_c_const" >&5
+echo "$as_me:12138: result: $ac_cv_c_const" >&5
echo "${ECHO_T}$ac_cv_c_const" >&6
if test $ac_cv_c_const = no; then
@@ -11594,7 +12145,7 @@ EOF
fi
-echo "$as_me:11597: checking for inline" >&5
+echo "$as_me:12148: 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
@@ -11602,7 +12153,7 @@ else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat >conftest.$ac_ext <<_ACEOF
-#line 11605 "configure"
+#line 12156 "configure"
#include "confdefs.h"
#ifndef __cplusplus
static $ac_kw int static_foo () {return 0; }
@@ -11611,16 +12162,16 @@ $ac_kw int foo () {return 0; }
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12165: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11617: \$? = $ac_status" >&5
+ echo "$as_me:12168: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11620: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12171: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11623: \$? = $ac_status" >&5
+ echo "$as_me:12174: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_inline=$ac_kw; break
else
@@ -11631,7 +12182,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:11634: result: $ac_cv_c_inline" >&5
+echo "$as_me:12185: result: $ac_cv_c_inline" >&5
echo "${ECHO_T}$ac_cv_c_inline" >&6
case $ac_cv_c_inline in
inline | yes) ;;
@@ -11654,7 +12205,7 @@ if test "$ac_cv_c_inline" != no ; then
:
elif test "$GCC" = yes
then
- echo "$as_me:11657: checking if gcc supports options to tune inlining" >&5
+ echo "$as_me:12208: 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
@@ -11663,7 +12214,7 @@ else
cf_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
cat >conftest.$ac_ext <<_ACEOF
-#line 11666 "configure"
+#line 12217 "configure"
#include "confdefs.h"
inline int foo(void) { return 1; }
int
@@ -11675,16 +12226,16 @@ ${cf_cv_main_return:-return} foo()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11678: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12229: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11681: \$? = $ac_status" >&5
+ echo "$as_me:12232: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11684: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12235: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11687: \$? = $ac_status" >&5
+ echo "$as_me:12238: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_gcc_inline=yes
else
@@ -11696,7 +12247,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
CFLAGS=$cf_save_CFLAGS
fi
-echo "$as_me:11699: result: $cf_cv_gcc_inline" >&5
+echo "$as_me:12250: result: $cf_cv_gcc_inline" >&5
echo "${ECHO_T}$cf_cv_gcc_inline" >&6
if test "$cf_cv_gcc_inline" = yes ; then
@@ -11772,7 +12323,7 @@ fi
fi
fi
-echo "$as_me:11775: checking for signal global datatype" >&5
+echo "$as_me:12326: 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
@@ -11784,7 +12335,7 @@ else
"int"
do
cat >conftest.$ac_ext <<_ACEOF
-#line 11787 "configure"
+#line 12338 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -11807,16 +12358,16 @@ signal(SIGINT, handler);
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11810: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12361: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11813: \$? = $ac_status" >&5
+ echo "$as_me:12364: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11816: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12367: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11819: \$? = $ac_status" >&5
+ echo "$as_me:12370: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_sig_atomic_t=$cf_type
else
@@ -11830,7 +12381,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:11833: result: $cf_cv_sig_atomic_t" >&5
+echo "$as_me:12384: 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
@@ -11838,7 +12389,7 @@ EOF
if test $NCURSES_CHTYPE = auto ; then
-echo "$as_me:11841: checking for type of chtype" >&5
+echo "$as_me:12392: 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
@@ -11848,7 +12399,7 @@ else
cf_cv_typeof_chtype=long
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11851 "configure"
+#line 12402 "configure"
#include "confdefs.h"
#define WANT_BITS 31
@@ -11883,15 +12434,15 @@ int main()
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11886: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12437: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11889: \$? = $ac_status" >&5
+ echo "$as_me:12440: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:11891: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12442: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11894: \$? = $ac_status" >&5
+ echo "$as_me:12445: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_typeof_chtype=`cat cf_test.out`
else
@@ -11906,7 +12457,7 @@ fi
fi
-echo "$as_me:11909: result: $cf_cv_typeof_chtype" >&5
+echo "$as_me:12460: result: $cf_cv_typeof_chtype" >&5
echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
cat >>confdefs.h <<EOF
@@ -11918,14 +12469,14 @@ else
fi
test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
-echo "$as_me:11921: checking if unsigned literals are legal" >&5
+echo "$as_me:12472: 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 11928 "configure"
+#line 12479 "configure"
#include "confdefs.h"
int
@@ -11937,16 +12488,16 @@ long x = 1L + 1UL + 1U + 1
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11940: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12491: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11943: \$? = $ac_status" >&5
+ echo "$as_me:12494: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11946: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12497: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11949: \$? = $ac_status" >&5
+ echo "$as_me:12500: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_unsigned_literals=yes
else
@@ -11958,7 +12509,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:11961: result: $cf_cv_unsigned_literals" >&5
+echo "$as_me:12512: result: $cf_cv_unsigned_literals" >&5
echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
cf_cv_1UL="1"
@@ -11974,14 +12525,14 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
### Checks for external-data
-echo "$as_me:11977: checking if external errno is declared" >&5
+echo "$as_me:12528: 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 11984 "configure"
+#line 12535 "configure"
#include "confdefs.h"
#ifdef HAVE_STDLIB_H
@@ -11993,22 +12544,22 @@ else
int
main ()
{
-long x = (long) errno
+int x = (int) errno
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12002: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12005: \$? = $ac_status" >&5
+ echo "$as_me:12556: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12008: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12559: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12011: \$? = $ac_status" >&5
+ echo "$as_me:12562: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_dcl_errno=yes
else
@@ -12019,7 +12570,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:12022: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:12573: result: $cf_cv_dcl_errno" >&5
echo "${ECHO_T}$cf_cv_dcl_errno" >&6
if test "$cf_cv_dcl_errno" = no ; then
@@ -12034,14 +12585,14 @@ fi
# It's possible (for near-UNIX clones) that the data doesn't exist
-echo "$as_me:12037: checking if external errno exists" >&5
+echo "$as_me:12588: 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 12044 "configure"
+#line 12595 "configure"
#include "confdefs.h"
#undef errno
@@ -12056,16 +12607,16 @@ errno = 2
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12059: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12610: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12062: \$? = $ac_status" >&5
+ echo "$as_me:12613: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12065: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12616: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12068: \$? = $ac_status" >&5
+ echo "$as_me:12619: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_errno=yes
else
@@ -12076,7 +12627,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12079: result: $cf_cv_have_errno" >&5
+echo "$as_me:12630: result: $cf_cv_have_errno" >&5
echo "${ECHO_T}$cf_cv_have_errno" >&6
if test "$cf_cv_have_errno" = yes ; then
@@ -12089,7 +12640,7 @@ EOF
fi
-echo "$as_me:12092: checking if data-only library module links" >&5
+echo "$as_me:12643: 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
@@ -12097,20 +12648,20 @@ else
rm -f conftest.a
cat >conftest.$ac_ext <<EOF
-#line 12100 "configure"
+#line 12651 "configure"
int testdata[3] = { 123, 456, 789 };
EOF
- if { (eval echo "$as_me:12103: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:12654: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12106: \$? = $ac_status" >&5
+ echo "$as_me:12657: \$? = $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 12113 "configure"
+#line 12664 "configure"
int testfunc()
{
#if defined(NeXT)
@@ -12123,10 +12674,10 @@ int testfunc()
#endif
}
EOF
- if { (eval echo "$as_me:12126: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:12677: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12129: \$? = $ac_status" >&5
+ echo "$as_me:12680: \$? = $ac_status" >&5
(exit $ac_status); }; then
mv conftest.o func.o && \
( $AR $AR_OPTS conftest.a func.o ) 2>&5 1>/dev/null
@@ -12139,7 +12690,7 @@ EOF
cf_cv_link_dataonly=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12142 "configure"
+#line 12693 "configure"
#include "confdefs.h"
int main()
@@ -12150,15 +12701,15 @@ else
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12153: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12704: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12156: \$? = $ac_status" >&5
+ echo "$as_me:12707: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:12158: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12709: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12161: \$? = $ac_status" >&5
+ echo "$as_me:12712: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_link_dataonly=yes
else
@@ -12173,7 +12724,7 @@ fi
fi
-echo "$as_me:12176: result: $cf_cv_link_dataonly" >&5
+echo "$as_me:12727: result: $cf_cv_link_dataonly" >&5
echo "${ECHO_T}$cf_cv_link_dataonly" >&6
if test "$cf_cv_link_dataonly" = no ; then
@@ -12208,13 +12759,13 @@ vsnprintf \
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12211: checking for $ac_func" >&5
+echo "$as_me:12762: 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 12217 "configure"
+#line 12768 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -12245,16 +12796,16 @@ f = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12248: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12799: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12251: \$? = $ac_status" >&5
+ echo "$as_me:12802: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12254: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12805: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12257: \$? = $ac_status" >&5
+ echo "$as_me:12808: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -12264,7 +12815,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12267: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12818: 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
@@ -12276,14 +12827,14 @@ done
if test "$with_getcap" = "yes" ; then
-echo "$as_me:12279: checking for terminal-capability database functions" >&5
+echo "$as_me:12830: 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 12286 "configure"
+#line 12837 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -12303,16 +12854,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12306: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12857: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12309: \$? = $ac_status" >&5
+ echo "$as_me:12860: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12312: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12863: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12315: \$? = $ac_status" >&5
+ echo "$as_me:12866: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_cgetent=yes
else
@@ -12324,7 +12875,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12327: result: $cf_cv_cgetent" >&5
+echo "$as_me:12878: 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
@@ -12332,14 +12883,14 @@ EOF
fi
-echo "$as_me:12335: checking for isascii" >&5
+echo "$as_me:12886: 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 12342 "configure"
+#line 12893 "configure"
#include "confdefs.h"
#include <ctype.h>
int
@@ -12351,16 +12902,16 @@ int x = isascii(' ')
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12354: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12905: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12357: \$? = $ac_status" >&5
+ echo "$as_me:12908: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12360: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12911: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12363: \$? = $ac_status" >&5
+ echo "$as_me:12914: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_isascii=yes
else
@@ -12371,17 +12922,17 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12374: result: $cf_cv_have_isascii" >&5
+echo "$as_me:12925: 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:12381: checking whether sigaction needs _POSIX_SOURCE" >&5
+echo "$as_me:12932: 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 12384 "configure"
+#line 12935 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -12395,16 +12946,16 @@ struct sigaction act
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12398: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12949: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12401: \$? = $ac_status" >&5
+ echo "$as_me:12952: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12404: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12955: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12407: \$? = $ac_status" >&5
+ echo "$as_me:12958: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
sigact_bad=no
else
@@ -12412,7 +12963,7 @@ else
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 12415 "configure"
+#line 12966 "configure"
#include "confdefs.h"
#define _POSIX_SOURCE
@@ -12427,16 +12978,16 @@ struct sigaction act
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12430: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12981: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12433: \$? = $ac_status" >&5
+ echo "$as_me:12984: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12436: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12987: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12439: \$? = $ac_status" >&5
+ echo "$as_me:12990: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
sigact_bad=yes
cat >>confdefs.h <<\EOF
@@ -12451,11 +13002,11 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:12454: result: $sigact_bad" >&5
+echo "$as_me:13005: result: $sigact_bad" >&5
echo "${ECHO_T}$sigact_bad" >&6
fi
-echo "$as_me:12458: checking if nanosleep really works" >&5
+echo "$as_me:13009: 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
@@ -12465,7 +13016,7 @@ if test "$cross_compiling" = yes; then
cf_cv_func_nanosleep=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12468 "configure"
+#line 13019 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -12490,15 +13041,15 @@ int main() {
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12493: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13044: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12496: \$? = $ac_status" >&5
+ echo "$as_me:13047: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:12498: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13049: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12501: \$? = $ac_status" >&5
+ echo "$as_me:13052: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_func_nanosleep=yes
else
@@ -12510,7 +13061,7 @@ fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:12513: result: $cf_cv_func_nanosleep" >&5
+echo "$as_me:13064: result: $cf_cv_func_nanosleep" >&5
echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF
@@ -12524,23 +13075,23 @@ unistd.h \
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12527: checking for $ac_header" >&5
+echo "$as_me:13078: 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 12533 "configure"
+#line 13084 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:12537: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13088: \"$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:12543: \$? = $ac_status" >&5
+ echo "$as_me:13094: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12559,7 +13110,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:12562: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13113: 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
@@ -12574,23 +13125,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:12577: checking for $ac_header" >&5
+echo "$as_me:13128: 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 12583 "configure"
+#line 13134 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:12587: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:13138: \"$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:12593: \$? = $ac_status" >&5
+ echo "$as_me:13144: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12609,7 +13160,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:12612: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:13163: 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
@@ -12627,10 +13178,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
*) termios_bad=maybe ;;
esac
if test "$termios_bad" = maybe ; then
- echo "$as_me:12630: checking whether termios.h needs _POSIX_SOURCE" >&5
+ echo "$as_me:13181: 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 12633 "configure"
+#line 13184 "configure"
#include "confdefs.h"
#include <termios.h>
int
@@ -12642,16 +13193,16 @@ struct termios foo; int x = foo.c_iflag
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12645: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12648: \$? = $ac_status" >&5
+ echo "$as_me:13199: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12651: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13202: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12654: \$? = $ac_status" >&5
+ echo "$as_me:13205: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
termios_bad=no
else
@@ -12659,7 +13210,7 @@ else
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 12662 "configure"
+#line 13213 "configure"
#include "confdefs.h"
#define _POSIX_SOURCE
@@ -12673,16 +13224,16 @@ struct termios foo; int x = foo.c_iflag
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12676: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13227: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12679: \$? = $ac_status" >&5
+ echo "$as_me:13230: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12682: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13233: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12685: \$? = $ac_status" >&5
+ echo "$as_me:13236: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
termios_bad=unknown
else
@@ -12697,19 +13248,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:12700: result: $termios_bad" >&5
+ echo "$as_me:13251: result: $termios_bad" >&5
echo "${ECHO_T}$termios_bad" >&6
fi
fi
-echo "$as_me:12705: checking for tcgetattr" >&5
+echo "$as_me:13256: 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 12712 "configure"
+#line 13263 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -12737,16 +13288,16 @@ tcgetattr(1, &foo);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12740: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13291: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12743: \$? = $ac_status" >&5
+ echo "$as_me:13294: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12746: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13297: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12749: \$? = $ac_status" >&5
+ echo "$as_me:13300: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_tcgetattr=yes
else
@@ -12756,20 +13307,20 @@ cf_cv_have_tcgetattr=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12759: result: $cf_cv_have_tcgetattr" >&5
+echo "$as_me:13310: 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:12765: checking for vsscanf function or workaround" >&5
+echo "$as_me:13316: 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 12772 "configure"
+#line 13323 "configure"
#include "confdefs.h"
#include <stdarg.h>
@@ -12785,16 +13336,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12788: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13339: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12791: \$? = $ac_status" >&5
+ echo "$as_me:13342: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12794: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13345: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12797: \$? = $ac_status" >&5
+ echo "$as_me:13348: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_func_vsscanf=vsscanf
else
@@ -12802,7 +13353,7 @@ else
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 12805 "configure"
+#line 13356 "configure"
#include "confdefs.h"
#include <stdarg.h>
@@ -12824,16 +13375,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12827: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13378: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12830: \$? = $ac_status" >&5
+ echo "$as_me:13381: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12833: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13384: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12836: \$? = $ac_status" >&5
+ echo "$as_me:13387: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_func_vsscanf=vfscanf
else
@@ -12841,7 +13392,7 @@ else
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 12844 "configure"
+#line 13395 "configure"
#include "confdefs.h"
#include <stdarg.h>
@@ -12863,16 +13414,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12866: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13417: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12869: \$? = $ac_status" >&5
+ echo "$as_me:13420: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12872: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13423: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12875: \$? = $ac_status" >&5
+ echo "$as_me:13426: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_func_vsscanf=_doscan
else
@@ -12887,7 +13438,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:12890: result: $cf_cv_func_vsscanf" >&5
+echo "$as_me:13441: result: $cf_cv_func_vsscanf" >&5
echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
case $cf_cv_func_vsscanf in #(vi
@@ -12905,7 +13456,7 @@ EOF
;;
esac
-echo "$as_me:12908: checking for working mkstemp" >&5
+echo "$as_me:13459: 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
@@ -12913,13 +13464,13 @@ else
rm -f conftest*
if test "$cross_compiling" = yes; then
- echo "$as_me:12916: checking for mkstemp" >&5
+ echo "$as_me:13467: 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 12922 "configure"
+#line 13473 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mkstemp (); below. */
@@ -12950,16 +13501,16 @@ f = mkstemp;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12953: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13504: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12956: \$? = $ac_status" >&5
+ echo "$as_me:13507: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12959: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13510: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12962: \$? = $ac_status" >&5
+ echo "$as_me:13513: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_mkstemp=yes
else
@@ -12969,12 +13520,12 @@ ac_cv_func_mkstemp=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12972: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:13523: result: $ac_cv_func_mkstemp" >&5
echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12977 "configure"
+#line 13528 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -13012,15 +13563,15 @@ int main()
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13015: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13566: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13018: \$? = $ac_status" >&5
+ echo "$as_me:13569: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:13020: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13571: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13023: \$? = $ac_status" >&5
+ echo "$as_me:13574: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_func_mkstemp=yes
@@ -13035,7 +13586,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:13038: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:13589: 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
@@ -13053,21 +13604,21 @@ else
fi
if test "$cross_compiling" = yes ; then
- { echo "$as_me:13056: WARNING: cross compiling: assume setvbuf params not reversed" >&5
+ { echo "$as_me:13607: 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:13059: checking whether setvbuf arguments are reversed" >&5
+ echo "$as_me:13610: 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:13065: error: cannot run test program while cross compiling" >&5
+ { { echo "$as_me:13616: 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 13070 "configure"
+#line 13621 "configure"
#include "confdefs.h"
#include <stdio.h>
/* If setvbuf has the reversed format, exit 0. */
@@ -13084,15 +13635,15 @@ main ()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13087: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13638: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13090: \$? = $ac_status" >&5
+ echo "$as_me:13641: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:13092: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13643: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13095: \$? = $ac_status" >&5
+ echo "$as_me:13646: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_setvbuf_reversed=yes
else
@@ -13105,7 +13656,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:13108: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:13659: 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
@@ -13116,13 +13667,13 @@ EOF
fi
fi
-echo "$as_me:13119: checking return type of signal handlers" >&5
+echo "$as_me:13670: 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 13125 "configure"
+#line 13676 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -13144,16 +13695,16 @@ int i;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13147: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13698: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13150: \$? = $ac_status" >&5
+ echo "$as_me:13701: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13153: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13704: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13156: \$? = $ac_status" >&5
+ echo "$as_me:13707: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_signal=void
else
@@ -13163,21 +13714,21 @@ ac_cv_type_signal=int
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:13166: result: $ac_cv_type_signal" >&5
+echo "$as_me:13717: 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:13173: checking for type sigaction_t" >&5
+echo "$as_me:13724: 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 13180 "configure"
+#line 13731 "configure"
#include "confdefs.h"
#include <signal.h>
@@ -13190,16 +13741,16 @@ sigaction_t x
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13193: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13744: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13196: \$? = $ac_status" >&5
+ echo "$as_me:13747: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13199: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13750: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13202: \$? = $ac_status" >&5
+ echo "$as_me:13753: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_sigaction=yes
else
@@ -13210,13 +13761,13 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:13213: result: $cf_cv_type_sigaction" >&5
+echo "$as_me:13764: 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:13219: checking declaration of size-change" >&5
+echo "$as_me:13770: 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
@@ -13231,7 +13782,7 @@ do
CPPFLAGS="$cf_save_CPPFLAGS"
test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
cat >conftest.$ac_ext <<_ACEOF
-#line 13234 "configure"
+#line 13785 "configure"
#include "confdefs.h"
#include <sys/types.h>
#ifdef HAVE_TERMIOS_H
@@ -13275,16 +13826,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13278: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13829: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13281: \$? = $ac_status" >&5
+ echo "$as_me:13832: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13284: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13835: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13287: \$? = $ac_status" >&5
+ echo "$as_me:13838: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_sizechange=yes
else
@@ -13303,7 +13854,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:13306: result: $cf_cv_sizechange" >&5
+echo "$as_me:13857: result: $cf_cv_sizechange" >&5
echo "${ECHO_T}$cf_cv_sizechange" >&6
if test "$cf_cv_sizechange" != no ; then
cat >>confdefs.h <<\EOF
@@ -13320,13 +13871,13 @@ EOF
esac
fi
-echo "$as_me:13323: checking for memmove" >&5
+echo "$as_me:13874: 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 13329 "configure"
+#line 13880 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char memmove (); below. */
@@ -13357,16 +13908,16 @@ f = memmove;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13360: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13911: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13363: \$? = $ac_status" >&5
+ echo "$as_me:13914: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13366: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13917: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13369: \$? = $ac_status" >&5
+ echo "$as_me:13920: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_memmove=yes
else
@@ -13376,19 +13927,19 @@ ac_cv_func_memmove=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:13379: result: $ac_cv_func_memmove" >&5
+echo "$as_me:13930: 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:13385: checking for bcopy" >&5
+echo "$as_me:13936: 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 13391 "configure"
+#line 13942 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char bcopy (); below. */
@@ -13419,16 +13970,16 @@ f = bcopy;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13422: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13973: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13425: \$? = $ac_status" >&5
+ echo "$as_me:13976: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13428: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13979: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13431: \$? = $ac_status" >&5
+ echo "$as_me:13982: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_bcopy=yes
else
@@ -13438,11 +13989,11 @@ ac_cv_func_bcopy=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:13441: result: $ac_cv_func_bcopy" >&5
+echo "$as_me:13992: 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:13445: checking if bcopy does overlapping moves" >&5
+ echo "$as_me:13996: 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
@@ -13452,7 +14003,7 @@ else
cf_cv_good_bcopy=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 13455 "configure"
+#line 14006 "configure"
#include "confdefs.h"
int main() {
@@ -13466,15 +14017,15 @@ int main() {
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13469: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14020: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13472: \$? = $ac_status" >&5
+ echo "$as_me:14023: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:13474: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14025: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13477: \$? = $ac_status" >&5
+ echo "$as_me:14028: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_good_bcopy=yes
else
@@ -13487,7 +14038,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:13490: result: $cf_cv_good_bcopy" >&5
+echo "$as_me:14041: result: $cf_cv_good_bcopy" >&5
echo "${ECHO_T}$cf_cv_good_bcopy" >&6
else
@@ -13508,7 +14059,7 @@ EOF
fi
-echo "$as_me:13511: checking if poll really works" >&5
+echo "$as_me:14062: 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
@@ -13518,7 +14069,7 @@ if test "$cross_compiling" = yes; then
cf_cv_working_poll=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 13521 "configure"
+#line 14072 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -13539,15 +14090,15 @@ int main() {
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13542: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14093: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13545: \$? = $ac_status" >&5
+ echo "$as_me:14096: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:13547: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14098: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13550: \$? = $ac_status" >&5
+ echo "$as_me:14101: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_working_poll=yes
else
@@ -13559,7 +14110,7 @@ fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:13562: result: $cf_cv_working_poll" >&5
+echo "$as_me:14113: 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
@@ -13567,7 +14118,7 @@ EOF
# special check for test/ditto.c
-echo "$as_me:13570: checking for openpty in -lutil" >&5
+echo "$as_me:14121: checking for openpty in -lutil" >&5
echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
if test "${ac_cv_lib_util_openpty+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13575,7 +14126,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lutil $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 13578 "configure"
+#line 14129 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -13594,16 +14145,16 @@ openpty ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13597: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14148: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13600: \$? = $ac_status" >&5
+ echo "$as_me:14151: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13603: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14154: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13606: \$? = $ac_status" >&5
+ echo "$as_me:14157: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_util_openpty=yes
else
@@ -13614,7 +14165,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:13617: result: $ac_cv_lib_util_openpty" >&5
+echo "$as_me:14168: result: $ac_cv_lib_util_openpty" >&5
echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
if test $ac_cv_lib_util_openpty = yes; then
cf_cv_lib_util=yes
@@ -13622,7 +14173,7 @@ else
cf_cv_lib_util=no
fi
-echo "$as_me:13625: checking for openpty header" >&5
+echo "$as_me:14176: checking for openpty header" >&5
echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
if test "${cf_cv_func_openpty+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13633,7 +14184,7 @@ else
for cf_header in pty.h libutil.h util.h
do
cat >conftest.$ac_ext <<_ACEOF
-#line 13636 "configure"
+#line 14187 "configure"
#include "confdefs.h"
#include <$cf_header>
@@ -13650,16 +14201,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13653: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14204: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13656: \$? = $ac_status" >&5
+ echo "$as_me:14207: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13659: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14210: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13662: \$? = $ac_status" >&5
+ echo "$as_me:14213: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_func_openpty=$cf_header
@@ -13677,7 +14228,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS="$cf_save_LIBS"
fi
-echo "$as_me:13680: result: $cf_cv_func_openpty" >&5
+echo "$as_me:14231: result: $cf_cv_func_openpty" >&5
echo "${ECHO_T}$cf_cv_func_openpty" >&6
if test "$cf_cv_func_openpty" != no ; then
@@ -13729,7 +14280,7 @@ if test -n "$with_hashed_db/include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 13732 "configure"
+#line 14283 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -13741,16 +14292,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13744: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14295: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13747: \$? = $ac_status" >&5
+ echo "$as_me:14298: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13750: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14301: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13753: \$? = $ac_status" >&5
+ echo "$as_me:14304: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -13767,7 +14318,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me-configure}:13770: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:14321: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
@@ -13801,7 +14352,7 @@ if test -n "$with_hashed_db/lib" ; then
if test "$cf_have_libdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6
-echo "${as_me-configure}:13804: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:14355: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -13812,23 +14363,23 @@ fi
fi
esac
-echo "$as_me:13815: checking for db.h" >&5
+echo "$as_me:14366: 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 13821 "configure"
+#line 14372 "configure"
#include "confdefs.h"
#include <db.h>
_ACEOF
-if { (eval echo "$as_me:13825: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14376: \"$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:13831: \$? = $ac_status" >&5
+ echo "$as_me:14382: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -13847,11 +14398,11 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:13850: result: $ac_cv_header_db_h" >&5
+echo "$as_me:14401: 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:13854: checking for version of db" >&5
+echo "$as_me:14405: 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
@@ -13862,10 +14413,10 @@ cf_cv_hashed_db_version=unknown
for cf_db_version in 1 2 3 4 5
do
-echo "${as_me-configure}:13865: testing checking for db version $cf_db_version ..." 1>&5
+echo "${as_me-configure}:14416: testing checking for db version $cf_db_version ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 13868 "configure"
+#line 14419 "configure"
#include "confdefs.h"
$ac_includes_default
@@ -13895,16 +14446,16 @@ DBT *foo = 0
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13898: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14449: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13901: \$? = $ac_status" >&5
+ echo "$as_me:14452: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13904: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14455: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13907: \$? = $ac_status" >&5
+ echo "$as_me:14458: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_hashed_db_version=$cf_db_version
@@ -13918,33 +14469,33 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:13921: result: $cf_cv_hashed_db_version" >&5
+echo "$as_me:14472: 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:13925: error: Cannot determine version of db" >&5
+ { { echo "$as_me:14476: 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:13930: checking for db libraries" >&5
+echo "$as_me:14481: 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-$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 "${as_me-configure}:13944: testing checking for library "$cf_db_libs" ..." 1>&5
+echo "${as_me-configure}:14495: testing checking for library "$cf_db_libs" ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 13947 "configure"
+#line 14498 "configure"
#include "confdefs.h"
$ac_includes_default
@@ -13999,16 +14550,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14002: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14553: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14005: \$? = $ac_status" >&5
+ echo "$as_me:14556: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14008: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14559: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14011: \$? = $ac_status" >&5
+ echo "$as_me:14562: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
if test -n "$cf_db_libs" ; then
@@ -14028,11 +14579,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
done
fi
-echo "$as_me:14031: result: $cf_cv_hashed_db_libs" >&5
+echo "$as_me:14582: 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:14035: error: Cannot determine library for db" >&5
+ { { echo "$as_me:14586: 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
@@ -14042,7 +14593,7 @@ fi
else
- { { echo "$as_me:14045: error: Cannot find db.h" >&5
+ { { echo "$as_me:14596: error: Cannot find db.h" >&5
echo "$as_me: error: Cannot find db.h" >&2;}
{ (exit 1); exit 1; }; }
@@ -14057,7 +14608,7 @@ fi
# Just in case, check if the C compiler has a bool type.
-echo "$as_me:14060: checking if we should include stdbool.h" >&5
+echo "$as_me:14611: 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
@@ -14065,7 +14616,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
else
cat >conftest.$ac_ext <<_ACEOF
-#line 14068 "configure"
+#line 14619 "configure"
#include "confdefs.h"
int
@@ -14077,23 +14628,23 @@ bool foo = false
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14080: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14631: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:14083: \$? = $ac_status" >&5
+ echo "$as_me:14634: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:14086: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14637: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14089: \$? = $ac_status" >&5
+ echo "$as_me:14640: \$? = $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 14096 "configure"
+#line 14647 "configure"
#include "confdefs.h"
#ifndef __BEOS__
@@ -14109,16 +14660,16 @@ bool foo = false
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14112: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14663: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:14115: \$? = $ac_status" >&5
+ echo "$as_me:14666: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:14118: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14669: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14121: \$? = $ac_status" >&5
+ echo "$as_me:14672: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_header_stdbool_h=1
else
@@ -14132,13 +14683,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
if test "$cf_cv_header_stdbool_h" = 1
-then echo "$as_me:14135: result: yes" >&5
+then echo "$as_me:14686: result: yes" >&5
echo "${ECHO_T}yes" >&6
-else echo "$as_me:14137: result: no" >&5
+else echo "$as_me:14688: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:14141: checking for builtin bool type" >&5
+echo "$as_me:14692: 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
@@ -14146,7 +14697,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then
else
cat >conftest.$ac_ext <<_ACEOF
-#line 14149 "configure"
+#line 14700 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -14161,16 +14712,16 @@ bool x = false
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14164: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14715: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:14167: \$? = $ac_status" >&5
+ echo "$as_me:14718: \$? = $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:14721: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14173: \$? = $ac_status" >&5
+ echo "$as_me:14724: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_cc_bool_type=1
else
@@ -14183,9 +14734,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
if test "$cf_cv_cc_bool_type" = 1
-then echo "$as_me:14186: result: yes" >&5
+then echo "$as_me:14737: result: yes" >&5
echo "${ECHO_T}yes" >&6
-else echo "$as_me:14188: result: no" >&5
+else echo "$as_me:14739: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -14207,7 +14758,7 @@ os2*) #(vi
cf_stdcpp_libname=stdc++
;;
esac
-echo "$as_me:14210: checking for library $cf_stdcpp_libname" >&5
+echo "$as_me:14761: 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
@@ -14216,7 +14767,7 @@ else
cf_save="$LIBS"
LIBS="$LIBS -l$cf_stdcpp_libname"
cat >conftest.$ac_ext <<_ACEOF
-#line 14219 "configure"
+#line 14770 "configure"
#include "confdefs.h"
#include <strstream.h>
@@ -14232,16 +14783,16 @@ strstreambuf foo(buf, sizeof(buf))
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14235: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14786: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14238: \$? = $ac_status" >&5
+ echo "$as_me:14789: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14241: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14792: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14244: \$? = $ac_status" >&5
+ echo "$as_me:14795: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_libstdcpp=yes
else
@@ -14253,12 +14804,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS="$cf_save"
fi
-echo "$as_me:14256: result: $cf_cv_libstdcpp" >&5
+echo "$as_me:14807: 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:14261: checking whether $CXX understands -c and -o together" >&5
+ echo "$as_me:14812: 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
@@ -14274,15 +14825,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:14277: \"$ac_try\"") >&5
+if { (eval echo "$as_me:14828: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14280: \$? = $ac_status" >&5
+ echo "$as_me:14831: \$? = $ac_status" >&5
(exit $ac_status); } &&
- test -f conftest2.$ac_objext && { (eval echo "$as_me:14282: \"$ac_try\"") >&5
+ test -f conftest2.$ac_objext && { (eval echo "$as_me:14833: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14285: \$? = $ac_status" >&5
+ echo "$as_me:14836: \$? = $ac_status" >&5
(exit $ac_status); };
then
eval cf_cv_prog_CXX_c_o=yes
@@ -14293,10 +14844,10 @@ rm -f conftest*
fi
if test $cf_cv_prog_CXX_c_o = yes; then
- echo "$as_me:14296: result: yes" >&5
+ echo "$as_me:14847: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
- echo "$as_me:14299: result: no" >&5
+ echo "$as_me:14850: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -14316,12 +14867,12 @@ os2*) #(vi
;;
esac
if test "$GXX" = yes; then
- echo "$as_me:14319: checking for lib$cf_gpp_libname" >&5
+ echo "$as_me:14870: 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 14324 "configure"
+#line 14875 "configure"
#include "confdefs.h"
#include <$cf_gpp_libname/builtin.h>
@@ -14335,16 +14886,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14338: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14889: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14341: \$? = $ac_status" >&5
+ echo "$as_me:14892: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14344: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14895: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14347: \$? = $ac_status" >&5
+ echo "$as_me:14898: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cxx_library=yes
CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
@@ -14363,7 +14914,7 @@ else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 14366 "configure"
+#line 14917 "configure"
#include "confdefs.h"
#include <builtin.h>
@@ -14377,16 +14928,16 @@ two_arg_error_handler_t foo2 = lib_error_handler
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14380: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14931: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14383: \$? = $ac_status" >&5
+ echo "$as_me:14934: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14386: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14937: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14389: \$? = $ac_status" >&5
+ echo "$as_me:14940: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cxx_library=yes
CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
@@ -14403,7 +14954,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:14406: result: $cf_cxx_library" >&5
+ echo "$as_me:14957: result: $cf_cxx_library" >&5
echo "${ECHO_T}$cf_cxx_library" >&6
fi
@@ -14419,7 +14970,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:14422: checking how to run the C++ preprocessor" >&5
+echo "$as_me:14973: 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
@@ -14436,18 +14987,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 14439 "configure"
+#line 14990 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax error
_ACEOF
-if { (eval echo "$as_me:14444: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:14995: \"$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:14450: \$? = $ac_status" >&5
+ echo "$as_me:15001: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -14470,17 +15021,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 14473 "configure"
+#line 15024 "configure"
#include "confdefs.h"
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:14477: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15028: \"$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:14483: \$? = $ac_status" >&5
+ echo "$as_me:15034: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -14517,7 +15068,7 @@ fi
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
-echo "$as_me:14520: result: $CXXCPP" >&5
+echo "$as_me:15071: result: $CXXCPP" >&5
echo "${ECHO_T}$CXXCPP" >&6
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
@@ -14527,18 +15078,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 14530 "configure"
+#line 15081 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax error
_ACEOF
-if { (eval echo "$as_me:14535: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15086: \"$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:14541: \$? = $ac_status" >&5
+ echo "$as_me:15092: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -14561,17 +15112,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 14564 "configure"
+#line 15115 "configure"
#include "confdefs.h"
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:14568: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15119: \"$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:14574: \$? = $ac_status" >&5
+ echo "$as_me:15125: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -14599,7 +15150,7 @@ rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then
:
else
- { { echo "$as_me:14602: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ { { echo "$as_me:15153: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -14614,23 +15165,23 @@ ac_main_return=return
for ac_header in iostream typeinfo
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:14617: checking for $ac_header" >&5
+echo "$as_me:15168: 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 14623 "configure"
+#line 15174 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:14627: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15178: \"$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:14633: \$? = $ac_status" >&5
+ echo "$as_me:15184: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -14649,7 +15200,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:14652: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15203: 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
@@ -14659,7 +15210,56 @@ EOF
fi
done
-echo "$as_me:14662: checking if we should include stdbool.h" >&5
+ if test x"$ac_cv_header_iostream" = xyes ; then
+ echo "$as_me:15214: checking if iostream uses std-namespace" >&5
+echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+#line 15217 "configure"
+#include "confdefs.h"
+
+#include <iostream>
+using std::endl;
+using std::cerr;
+int
+main ()
+{
+
+cerr << "testing" << endl;
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:15234: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:15237: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:15240: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:15243: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_iostream_namespace=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_iostream_namespace=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ echo "$as_me:15252: result: $cf_iostream_namespace" >&5
+echo "${ECHO_T}$cf_iostream_namespace" >&6
+ if test "$cf_iostream_namespace" = yes ; then
+ cat >>confdefs.h <<\EOF
+#define IOSTREAM_NAMESPACE 1
+EOF
+
+ fi
+ fi
+
+echo "$as_me:15262: 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
@@ -14667,7 +15267,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then
else
cat >conftest.$ac_ext <<_ACEOF
-#line 14670 "configure"
+#line 15270 "configure"
#include "confdefs.h"
int
@@ -14679,23 +15279,23 @@ bool foo = false
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14682: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15282: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:14685: \$? = $ac_status" >&5
+ echo "$as_me:15285: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:14688: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15288: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14691: \$? = $ac_status" >&5
+ echo "$as_me:15291: \$? = $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 14698 "configure"
+#line 15298 "configure"
#include "confdefs.h"
#ifndef __BEOS__
@@ -14711,16 +15311,16 @@ bool foo = false
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14714: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15314: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:14717: \$? = $ac_status" >&5
+ echo "$as_me:15317: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:14720: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15320: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14723: \$? = $ac_status" >&5
+ echo "$as_me:15323: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_header_stdbool_h=1
else
@@ -14734,13 +15334,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
if test "$cf_cv_header_stdbool_h" = 1
-then echo "$as_me:14737: result: yes" >&5
+then echo "$as_me:15337: result: yes" >&5
echo "${ECHO_T}yes" >&6
-else echo "$as_me:14739: result: no" >&5
+else echo "$as_me:15339: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:14743: checking for builtin bool type" >&5
+echo "$as_me:15343: 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
@@ -14748,7 +15348,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then
else
cat >conftest.$ac_ext <<_ACEOF
-#line 14751 "configure"
+#line 15351 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -14763,16 +15363,16 @@ bool x = false
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14766: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15366: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:14769: \$? = $ac_status" >&5
+ echo "$as_me:15369: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:14772: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15372: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14775: \$? = $ac_status" >&5
+ echo "$as_me:15375: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_builtin_bool=1
else
@@ -14785,13 +15385,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
if test "$cf_cv_builtin_bool" = 1
-then echo "$as_me:14788: result: yes" >&5
+then echo "$as_me:15388: result: yes" >&5
echo "${ECHO_T}yes" >&6
-else echo "$as_me:14790: result: no" >&5
+else echo "$as_me:15390: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:14794: checking for size of bool" >&5
+echo "$as_me:15394: 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
@@ -14802,7 +15402,7 @@ else
cf_cv_type_of_bool=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 14805 "configure"
+#line 15405 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -14844,15 +15444,15 @@ main()
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14847: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15447: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14850: \$? = $ac_status" >&5
+ echo "$as_me:15450: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:14852: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15452: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14855: \$? = $ac_status" >&5
+ echo "$as_me:15455: \$? = $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
@@ -14870,18 +15470,18 @@ fi
fi
rm -f cf_test.out
-echo "$as_me:14873: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:15473: 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:14879: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ { echo "$as_me:15479: 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:14884: checking for special defines needed for etip.h" >&5
+echo "$as_me:15484: 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"
@@ -14893,7 +15493,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 14896 "configure"
+#line 15496 "configure"
#include "confdefs.h"
#include <etip.h.in>
@@ -14907,16 +15507,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14910: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15510: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:14913: \$? = $ac_status" >&5
+ echo "$as_me:15513: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:14916: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15516: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14919: \$? = $ac_status" >&5
+ echo "$as_me:15519: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$cf_math" && cat >>confdefs.h <<EOF
@@ -14937,12 +15537,12 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
done
done
-echo "$as_me:14940: result: $cf_result" >&5
+echo "$as_me:15540: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
CXXFLAGS="$cf_save_CXXFLAGS"
if test -n "$CXX"; then
-echo "$as_me:14945: checking if $CXX accepts parameter initialization" >&5
+echo "$as_me:15545: 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
@@ -14959,7 +15559,7 @@ ac_main_return=return
cf_cv_cpp_param_init=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 14962 "configure"
+#line 15562 "configure"
#include "confdefs.h"
class TEST {
@@ -14978,15 +15578,15 @@ void main() { }
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14981: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15581: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14984: \$? = $ac_status" >&5
+ echo "$as_me:15584: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:14986: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15586: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14989: \$? = $ac_status" >&5
+ echo "$as_me:15589: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_cpp_param_init=yes
else
@@ -15005,7 +15605,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
ac_main_return=return
fi
-echo "$as_me:15008: result: $cf_cv_cpp_param_init" >&5
+echo "$as_me:15608: 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
@@ -15014,7 +15614,7 @@ EOF
if test -n "$CXX"; then
-echo "$as_me:15017: checking if $CXX accepts static_cast" >&5
+echo "$as_me:15617: 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
@@ -15028,7 +15628,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
ac_main_return=return
cat >conftest.$ac_ext <<_ACEOF
-#line 15031 "configure"
+#line 15631 "configure"
#include "confdefs.h"
class NCursesPanel
@@ -15072,16 +15672,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15075: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15675: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:15078: \$? = $ac_status" >&5
+ echo "$as_me:15678: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:15081: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15681: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15084: \$? = $ac_status" >&5
+ echo "$as_me:15684: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_cpp_static_cast=yes
else
@@ -15099,7 +15699,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
ac_main_return=return
fi
-echo "$as_me:15102: result: $cf_cv_cpp_static_cast" >&5
+echo "$as_me:15702: result: $cf_cv_cpp_static_cast" >&5
echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
fi
@@ -15147,7 +15747,7 @@ else
else
if test "$cf_cv_header_stdbool_h" = 1 ; then
-echo "$as_me:15150: checking for size of bool" >&5
+echo "$as_me:15750: 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
@@ -15158,7 +15758,7 @@ else
cf_cv_type_of_bool=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 15161 "configure"
+#line 15761 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -15200,15 +15800,15 @@ main()
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15803: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:15206: \$? = $ac_status" >&5
+ echo "$as_me:15806: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:15208: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15808: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15211: \$? = $ac_status" >&5
+ echo "$as_me:15811: \$? = $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
@@ -15226,25 +15826,25 @@ fi
fi
rm -f cf_test.out
-echo "$as_me:15229: result: $cf_cv_type_of_bool" >&5
+echo "$as_me:15829: 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:15235: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ { echo "$as_me:15835: 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:15241: checking for fallback type of bool" >&5
+ echo "$as_me:15841: 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:15247: result: $cf_cv_type_of_bool" >&5
+ echo "$as_me:15847: result: $cf_cv_type_of_bool" >&5
echo "${ECHO_T}$cf_cv_type_of_bool" >&6
fi
fi
@@ -15273,7 +15873,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then
if test "$cf_with_ada" != "no" ; then
if test "$with_libtool" != "no"; then
- { echo "$as_me:15276: WARNING: libtool does not support Ada - disabling feature" >&5
+ { echo "$as_me:15876: 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
@@ -15283,7 +15883,7 @@ 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:15286: checking for $ac_word" >&5
+echo "$as_me:15886: 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
@@ -15298,7 +15898,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:15301: found $ac_dir/$ac_word" >&5
+echo "$as_me:15901: found $ac_dir/$ac_word" >&5
break
done
@@ -15307,10 +15907,10 @@ fi
fi
gnat_exists=$ac_cv_prog_gnat_exists
if test -n "$gnat_exists"; then
- echo "$as_me:15310: result: $gnat_exists" >&5
+ echo "$as_me:15910: result: $gnat_exists" >&5
echo "${ECHO_T}$gnat_exists" >&6
else
- echo "$as_me:15313: result: no" >&5
+ echo "$as_me:15913: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -15318,11 +15918,11 @@ if test "$ac_cv_prog_gnat_exists" = no; then
cf_ada_make=
else
-echo "$as_me:15321: checking for gnat version" >&5
+echo "$as_me:15921: 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:15325: result: $cf_gnat_version" >&5
+echo "$as_me:15925: result: $cf_gnat_version" >&5
echo "${ECHO_T}$cf_gnat_version" >&6
case $cf_gnat_version in
@@ -15345,7 +15945,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:15348: checking for $ac_word" >&5
+echo "$as_me:15948: 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
@@ -15360,7 +15960,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:15363: found $ac_dir/$ac_word" >&5
+echo "$as_me:15963: found $ac_dir/$ac_word" >&5
break
done
@@ -15369,10 +15969,10 @@ fi
fi
M4_exists=$ac_cv_prog_M4_exists
if test -n "$M4_exists"; then
- echo "$as_me:15372: result: $M4_exists" >&5
+ echo "$as_me:15972: result: $M4_exists" >&5
echo "${ECHO_T}$M4_exists" >&6
else
- echo "$as_me:15375: result: no" >&5
+ echo "$as_me:15975: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -15381,7 +15981,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:15384: checking if GNAT works" >&5
+ echo "$as_me:15984: checking if GNAT works" >&5
echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
rm -f conftest*
@@ -15409,14 +16009,14 @@ else
fi
rm -f conftest*
- echo "$as_me:15412: result: $cf_cv_prog_gnat_correct" >&5
+ echo "$as_me:16012: 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:15419: checking if GNAT pragma Unreferenced works" >&5
+ echo "$as_me:16019: checking if GNAT pragma Unreferenced works" >&5
echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
rm -f conftest*
@@ -15443,7 +16043,7 @@ else
fi
rm -f conftest*
- echo "$as_me:15446: result: $cf_cv_pragma_unreferenced" >&5
+ echo "$as_me:16046: 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).
@@ -15496,7 +16096,7 @@ case ".$withval" in #(vi
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:15499: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:16099: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -15538,7 +16138,7 @@ case ".$withval" in #(vi
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:15541: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:16141: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -15563,7 +16163,7 @@ fi
### chooses to split module lists into libraries.
###
### (see CF_LIB_RULES).
-echo "$as_me:15566: checking for library subsets" >&5
+echo "$as_me:16166: checking for library subsets" >&5
echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
LIB_SUBSETS=
@@ -15588,7 +16188,7 @@ 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:15591: result: $LIB_SUBSETS" >&5
+echo "$as_me:16191: result: $LIB_SUBSETS" >&5
echo "${ECHO_T}$LIB_SUBSETS" >&6
### Construct the list of include-directories to be generated
@@ -15626,7 +16226,7 @@ elif test "$includedir" != "/usr/include"; then
fi
### Build up pieces for makefile rules
-echo "$as_me:15629: checking default library suffix" >&5
+echo "$as_me:16229: checking default library suffix" >&5
echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
case $DFT_LWR_MODEL in
@@ -15637,44 +16237,62 @@ 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:15640: result: $DFT_ARG_SUFFIX" >&5
+echo "$as_me:16240: result: $DFT_ARG_SUFFIX" >&5
echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
-echo "$as_me:15643: checking default library-dependency suffix" >&5
+echo "$as_me:16243: checking default library-dependency suffix" >&5
echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
case $DFT_LWR_MODEL in
- libtool) DFT_DEP_SUFFIX='.la' ;;
- normal) DFT_DEP_SUFFIX='.a' ;;
- debug) DFT_DEP_SUFFIX='_g.a' ;;
- profile) DFT_DEP_SUFFIX='_p.a' ;;
+ libtool)
+ DFT_LIB_SUFFIX='.la'
+ DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ ;;
+ normal)
+ DFT_LIB_SUFFIX='.a'
+ DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ ;;
+ debug)
+ DFT_LIB_SUFFIX='_g.a'
+ DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ ;;
+ profile)
+ DFT_LIB_SUFFIX='_p.a'
+ DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ ;;
shared)
case $cf_cv_system_name in
- cygwin*) DFT_DEP_SUFFIX='.dll' ;;
- darwin*) DFT_DEP_SUFFIX='.dylib' ;;
+ cygwin*)
+ DFT_LIB_SUFFIX='.dll'
+ DFT_DEP_SUFFIX='.dll.a'
+ ;;
+ darwin*)
+ DFT_LIB_SUFFIX='.dylib'
+ DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ ;;
hpux*)
case $target in
- ia64*) DFT_DEP_SUFFIX='.so' ;;
- *) DFT_DEP_SUFFIX='.sl' ;;
+ ia64*)
+ DFT_LIB_SUFFIX='.so'
+ DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ ;;
+ *)
+ DFT_LIB_SUFFIX='.sl'
+ DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ ;;
esac
;;
- *) DFT_DEP_SUFFIX='.so' ;;
+ *) DFT_LIB_SUFFIX='.so'
+ DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX
+ ;;
esac
esac
+ test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
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:15674: result: $DFT_DEP_SUFFIX" >&5
+echo "$as_me:16292: result: $DFT_DEP_SUFFIX" >&5
echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
-echo "$as_me:15677: checking default object directory" >&5
+echo "$as_me:16295: checking default object directory" >&5
echo $ECHO_N "checking default object directory... $ECHO_C" >&6
case $DFT_LWR_MODEL in
@@ -15690,38 +16308,65 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
DFT_OBJ_SUBDIR='obj_s' ;;
esac
esac
-echo "$as_me:15693: result: $DFT_OBJ_SUBDIR" >&5
+echo "$as_me:16311: 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:15698: checking c++ library-dependency suffix" >&5
+echo "$as_me:16316: 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
else
case normal in
- libtool) CXX_LIB_SUFFIX='.la' ;;
- normal) CXX_LIB_SUFFIX='.a' ;;
- debug) CXX_LIB_SUFFIX='_g.a' ;;
- profile) CXX_LIB_SUFFIX='_p.a' ;;
+ libtool)
+ CXX_LIB_SUFFIX='.la'
+ CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ ;;
+ normal)
+ CXX_LIB_SUFFIX='.a'
+ CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ ;;
+ debug)
+ CXX_LIB_SUFFIX='_g.a'
+ CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ ;;
+ profile)
+ CXX_LIB_SUFFIX='_p.a'
+ CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ ;;
shared)
case $cf_cv_system_name in
- cygwin*) CXX_LIB_SUFFIX='.dll' ;;
- darwin*) CXX_LIB_SUFFIX='.dylib' ;;
+ cygwin*)
+ CXX_LIB_SUFFIX='.dll'
+ CXX_DEP_SUFFIX='.dll.a'
+ ;;
+ darwin*)
+ CXX_LIB_SUFFIX='.dylib'
+ CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ ;;
hpux*)
case $target in
- ia64*) CXX_LIB_SUFFIX='.so' ;;
- *) CXX_LIB_SUFFIX='.sl' ;;
+ ia64*)
+ CXX_LIB_SUFFIX='.so'
+ CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ ;;
+ *)
+ CXX_LIB_SUFFIX='.sl'
+ CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ ;;
esac
;;
- *) CXX_LIB_SUFFIX='.so' ;;
+ *) CXX_LIB_SUFFIX='.so'
+ CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX
+ ;;
esac
esac
test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
+ test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}"
fi
-echo "$as_me:15724: result: $CXX_LIB_SUFFIX" >&5
+echo "$as_me:16369: result: $CXX_LIB_SUFFIX" >&5
echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
fi
@@ -15798,7 +16443,11 @@ else
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}"
+ if test "$with_tic_depends" = yes ; then
+ TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}"
+ else
+ TICS_LIST="$SHLIB_LIST"
+ fi
TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
fi
@@ -15830,8 +16479,16 @@ case $DFT_LWR_MODEL in
normal|debug|profile)
if test "$GCC" = yes ; then
- LDFLAGS_STATIC=-static
- LDFLAGS_SHARED=-dynamic
+ case $cf_cv_system_name in #(
+ OS/2*|os2*|aix[45]*) #( vi
+ LDFLAGS_STATIC=
+ LDFLAGS_SHARED=
+ ;;
+ *) #( normally, except when broken
+ LDFLAGS_STATIC=-static
+ LDFLAGS_SHARED=-dynamic
+ ;;
+ esac
else
case $cf_cv_system_name in #(
aix[45]*) #( from ld manpage
@@ -15862,12 +16519,12 @@ fi
;;
esac
-echo "$as_me:15865: checking where we will install curses.h" >&5
+echo "$as_me:16522: 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:15870: result: $includedir" >&5
+echo "$as_me:16527: result: $includedir" >&5
echo "${ECHO_T}$includedir" >&6
### Resolve a conflict between normal and wide-curses by forcing applications
@@ -15875,7 +16532,7 @@ 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:15878: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+ { echo "$as_me:16535: 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
@@ -15891,7 +16548,7 @@ EOF
### Construct the list of subdirectories for which we'll customize makefiles
### with the appropriate compile-rules.
-echo "$as_me:15894: checking for src modules" >&5
+echo "$as_me:16551: checking for src modules" >&5
echo $ECHO_N "checking for src modules... $ECHO_C" >&6
# dependencies and linker-arguments for test-programs
@@ -15954,7 +16611,7 @@ EOF
fi
fi
done
-echo "$as_me:15957: result: $cf_cv_src_modules" >&5
+echo "$as_me:16614: result: $cf_cv_src_modules" >&5
echo "${ECHO_T}$cf_cv_src_modules" >&6
TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
@@ -16103,71 +16760,69 @@ 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:16106: checking for updated LDFLAGS" >&5
+echo "$as_me:16763: checking for updated LDFLAGS" >&5
echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
if test -n "$LDFLAGS" ; then
-echo "$as_me:16109: result: maybe" >&5
+echo "$as_me:16766: result: maybe" >&5
echo "${ECHO_T}maybe" >&6
test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6
-echo "${as_me-configure}:16113: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me-configure}:16770: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
-echo "${as_me-configure}:16117: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me-configure}:16774: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
case "$EXTRA_LDFLAGS" in #(vi
-Wl,-rpath,*) #(vi
- cf_rpath_hack="-Wl,-rpath,"
- ;;
+ cf_rpath_hack="-Wl,-rpath,"
+ ;;
-R\ *)
- cf_rpath_hack="-R "
- ;;
+ cf_rpath_hack="-R "
+ ;;
-R*)
- cf_rpath_hack="-R"
- ;;
+ cf_rpath_hack="-R"
+ ;;
*)
- cf_rpath_hack=
- ;;
+ 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}:16139: 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}:16150: 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
+ cf_rpath_dst=
+ for cf_rpath_src in $LDFLAGS
+ do
+ test -n "$verbose" && echo " Filtering $cf_rpath_src" 1>&6
+
+echo "${as_me-configure}:16796: 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}:16807: testing ...Filter $cf_rpath_tmp ..." 1>&5
+
+ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
+ ;;
+ esac
+ cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
+ done
+ LDFLAGS=$cf_rpath_dst
+ test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
-echo "${as_me-configure}:16162: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me-configure}:16817: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
- test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
+ test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
-echo "${as_me-configure}:16166: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me-configure}:16821: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
fi
else
-echo "$as_me:16170: result: no" >&5
+echo "$as_me:16825: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -16277,7 +16932,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:16280: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:16935: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
@@ -16453,7 +17108,7 @@ cat >>$CONFIG_STATUS <<\EOF
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:16456: error: ambiguous option: $1
+ { { echo "$as_me:17111: 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;}
@@ -16472,7 +17127,7 @@ Try \`$0 --help' for more information." >&2;}
ac_need_defaults=false;;
# This is an error.
- -*) { { echo "$as_me:16475: error: unrecognized option: $1
+ -*) { { echo "$as_me:17130: 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;}
@@ -16546,6 +17201,7 @@ 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"
cf_cv_rm_so_locs="$cf_cv_rm_so_locs"
+cf_cv_shared_soname='$cf_cv_shared_soname'
cf_cv_shlib_version="$cf_cv_shlib_version"
cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
cf_cv_system_name="$cf_cv_system_name"
@@ -16568,7 +17224,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:16571: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:17227: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
@@ -16770,10 +17426,11 @@ s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t
s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t
s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t
s,@NCURSES_CONST@,$NCURSES_CONST,;t t
-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,@NCURSES_SBOOL@,$NCURSES_SBOOL,;t t
+s,@NCURSES_XNAMES@,$NCURSES_XNAMES,;t t
+s,@PTHREAD@,$PTHREAD,;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
@@ -16950,7 +17607,7 @@ done; }
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:16953: creating $ac_file" >&5
+ { echo "$as_me:17610: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@@ -16968,7 +17625,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:16971: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:17628: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -16981,7 +17638,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:16984: error: cannot find input file: $f" >&5
+ { { echo "$as_me:17641: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -17047,7 +17704,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:17050: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:17707: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
@@ -17058,7 +17715,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:17061: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:17718: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -17071,7 +17728,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:17074: error: cannot find input file: $f" >&5
+ { { echo "$as_me:17731: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -17129,7 +17786,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:17132: $ac_file is unchanged" >&5
+ { echo "$as_me:17789: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -17191,13 +17848,20 @@ do
fi
done
- case $cf_cv_system_name in
- OS/2*) LIB_PREFIX='' ;;
- os2*) LIB_PREFIX='' ;;
- *) LIB_PREFIX='lib' ;;
+ case $cf_cv_system_name in #(vi
+ OS/2*|os2*) #(vi
+ LIB_PREFIX=''
+ ;;
+ *) LIB_PREFIX='lib'
+ ;;
esac
cf_prefix=$LIB_PREFIX
+if test $cf_cv_shlib_version = cygdll ; then
+ TINFO_NAME=$TINFO_ARG_SUFFIX
+ TINFO_SUFFIX=.dll
+fi
+
for cf_dir in $SRC_SUBDIRS
do
if test ! -d $srcdir/$cf_dir ; then
@@ -17210,24 +17874,51 @@ do
do
case $cf_item in
- libtool) cf_suffix='.la' ;;
- normal) cf_suffix='.a' ;;
- debug) cf_suffix='_g.a' ;;
- profile) cf_suffix='_p.a' ;;
+ libtool)
+ cf_suffix='.la'
+ cf_depsuf=$cf_suffix
+ ;;
+ normal)
+ cf_suffix='.a'
+ cf_depsuf=$cf_suffix
+ ;;
+ debug)
+ cf_suffix='_g.a'
+ cf_depsuf=$cf_suffix
+ ;;
+ profile)
+ cf_suffix='_p.a'
+ cf_depsuf=$cf_suffix
+ ;;
shared)
case $cf_cv_system_name in
- cygwin*) cf_suffix='.dll' ;;
- darwin*) cf_suffix='.dylib' ;;
+ cygwin*)
+ cf_suffix='.dll'
+ cf_depsuf='.dll.a'
+ ;;
+ darwin*)
+ cf_suffix='.dylib'
+ cf_depsuf=$cf_suffix
+ ;;
hpux*)
case $target in
- ia64*) cf_suffix='.so' ;;
- *) cf_suffix='.sl' ;;
+ ia64*)
+ cf_suffix='.so'
+ cf_depsuf=$cf_suffix
+ ;;
+ *)
+ cf_suffix='.sl'
+ cf_depsuf=$cf_suffix
+ ;;
esac
;;
- *) cf_suffix='.so' ;;
+ *) cf_suffix='.so'
+ cf_depsuf=$cf_suffix
+ ;;
esac
esac
test -n "$LIB_SUFFIX" && cf_suffix="${LIB_SUFFIX}${cf_suffix}"
+ test -n "$LIB_SUFFIX" && cf_depsuf="${LIB_SUFFIX}${cf_depsuf}"
if test $cf_item = shared ; then
if test "$cf_cv_do_symlinks" = yes ; then
@@ -17270,7 +17961,8 @@ 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
- LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}\${ABI_VERSION}.dll"
+ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
+ LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}${cf_cygsuf}"
continue
fi
fi
@@ -17280,24 +17972,28 @@ do
if test $cf_dir = ncurses ; then
cf_subsets="$LIB_SUBSETS"
cf_r_parts="$cf_subsets"
+ cf_liblist="$LIBS_TO_MAKE"
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
+ cf_item=
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`
+ cf_item=`echo $cf_liblist |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`
+ cf_item=`echo $cf_liblist |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g`
;;
*)
break
;;
esac
- LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
+ if test -n "$cf_item"; then
+ LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
+ fi
else
break
fi
@@ -17325,24 +18021,51 @@ do
cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
case $cf_item in
- libtool) cf_suffix='.la' ;;
- normal) cf_suffix='.a' ;;
- debug) cf_suffix='_g.a' ;;
- profile) cf_suffix='_p.a' ;;
+ libtool)
+ cf_suffix='.la'
+ cf_depsuf=$cf_suffix
+ ;;
+ normal)
+ cf_suffix='.a'
+ cf_depsuf=$cf_suffix
+ ;;
+ debug)
+ cf_suffix='_g.a'
+ cf_depsuf=$cf_suffix
+ ;;
+ profile)
+ cf_suffix='_p.a'
+ cf_depsuf=$cf_suffix
+ ;;
shared)
case $cf_cv_system_name in
- cygwin*) cf_suffix='.dll' ;;
- darwin*) cf_suffix='.dylib' ;;
+ cygwin*)
+ cf_suffix='.dll'
+ cf_depsuf='.dll.a'
+ ;;
+ darwin*)
+ cf_suffix='.dylib'
+ cf_depsuf=$cf_suffix
+ ;;
hpux*)
case $target in
- ia64*) cf_suffix='.so' ;;
- *) cf_suffix='.sl' ;;
+ ia64*)
+ cf_suffix='.so'
+ cf_depsuf=$cf_suffix
+ ;;
+ *)
+ cf_suffix='.sl'
+ cf_depsuf=$cf_suffix
+ ;;
esac
;;
- *) cf_suffix='.so' ;;
+ *) cf_suffix='.so'
+ cf_depsuf=$cf_suffix
+ ;;
esac
esac
test -n "$LIB_SUFFIX" && cf_suffix="${LIB_SUFFIX}${cf_suffix}"
+ test -n "$LIB_SUFFIX" && cf_depsuf="${LIB_SUFFIX}${cf_depsuf}"
case $cf_item in
libtool) cf_subdir='obj_lo' ;;
@@ -17363,22 +18086,21 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
if test $cf_dir = ncurses ; then
case $cf_subset in
*base*)
+ cf_libname=${cf_libname}$LIB_SUFFIX
;;
*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
+ else
+ cf_libname=${cf_libname}$LIB_SUFFIX
+ fi
+ 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
# These dependencies really are for development, not
diff --git a/configure.in b/configure.in
index 8fa5e4eaaa56..2b4422a439d2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
dnl***************************************************************************
-dnl Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
+dnl Copyright (c) 1998-2007,2008 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.433 2008/04/12 23:39:06 tom Exp $
+dnl $Id: configure.in,v 1.454 2008/10/18 14:53:32 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.433 $)
+AC_REVISION($Revision: 1.454 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@@ -361,12 +361,7 @@ 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)
+CF_ENABLE_RPATH
AC_MSG_CHECKING(if shared libraries should be relinked during install)
AC_ARG_ENABLE(relink,
[ --disable-relink relink shared libraries during install],
@@ -428,6 +423,8 @@ if test "$use_database" != no ; then
[ --with-hashed-db specify hashed-database library],,
[with_hashed_db=no])
AC_MSG_RESULT($with_hashed_db)
+else
+ with_hashed_db=no
fi
AC_MSG_CHECKING(for list of fallback descriptions)
@@ -504,12 +501,13 @@ 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.
+### when constructed using "big" strings. More than the C compiler, the awk
+### program is a limit on most vendor UNIX systems. Check that we can build.
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])
+ [with_big_strings=$enableval],
+ [CF_AWK_BIG_PRINTF(12000,with_big_strings)])
AC_MSG_RESULT($with_big_strings)
USE_BIG_STRINGS=0
@@ -681,10 +679,10 @@ if test "$with_widec" = yes ; then
CF_PREDEFINE(_XOPEN_SOURCE_EXTENDED)
# with_overwrite=no
NCURSES_CH_T=cchar_t
- AC_CHECK_FUNCS(putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc)
+ AC_CHECK_FUNCS(putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs)
if test "$ac_cv_func_putwc" != yes ; then
- CF_LIBUTF8
- if test "$cf_cv_libutf8" = yes ; then
+ CF_UTF8_LIB
+ if test "$cf_cv_utf8_lib" != no ; then
NCURSES_LIBUTF8=1
fi
fi
@@ -744,6 +742,18 @@ NCURSES_TPARM_VARARGS=0
test "$with_tparm_varargs" = yes && NCURSES_TPARM_VARARGS=1
AC_SUBST(NCURSES_TPARM_VARARGS)
+### use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
+if test "$with_ticlib" != no ; then
+AC_MSG_CHECKING(if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library)
+AC_ARG_ENABLE(tic-depends,
+ [ --disable-tic-depends link tic library without explicit dependency on ncurses library],
+ [with_tic_depends=$enableval],
+ [with_tic_depends=yes])
+AC_MSG_RESULT($with_tic_depends)
+else
+ with_tic_depends=no
+fi
+
### use option --with-bool to override bool's type
AC_MSG_CHECKING(for type of bool)
AC_ARG_WITH(bool,
@@ -836,6 +846,40 @@ if test "$with_ext_const" = yes ; then
fi
AC_SUBST(NCURSES_CONST)
+### use option --enable-ext-colors to turn on use of colors beyond 16.
+AC_MSG_CHECKING(if you want to use extended colors)
+AC_ARG_ENABLE(ext-colors,
+ [ --enable-ext-colors compile for 256-color support],
+ [with_ext_colors=$enableval],
+ [with_ext_colors=no])
+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_ERROR(This option applies only to wide-character library)
+ else
+ # cannot be ABI 5 since it changes sizeof(cchar_t)
+ CF_NCURSES_ABI_6
+ fi
+ NCURSES_EXT_COLORS=1
+ AC_DEFINE(NCURSES_EXT_COLORS)
+fi
+AC_SUBST(NCURSES_EXT_COLORS)
+
+### use option --enable-ext-mouse to modify coding to support 5-button mice
+AC_MSG_CHECKING(if you want to use extended mouse encoding)
+AC_ARG_ENABLE(ext-mouse,
+ [ --enable-ext-mouse compile for extended mouse-encoding],
+ [with_ext_mouse=$enableval],
+ [with_ext_mouse=no])
+AC_MSG_RESULT($with_ext_mouse)
+NCURSES_MOUSE_VERSION=1
+if test "$with_ext_mouse" = yes ; then
+ NCURSES_MOUSE_VERSION=2
+ CF_NCURSES_ABI_6
+fi
+AC_SUBST(NCURSES_MOUSE_VERSION)
+
AC_MSG_CHECKING(if you want \$NCURSES_NO_PADDING code)
AC_ARG_ENABLE(no-padding,
[ --enable-no-padding compile with $NCURSES_NO_PADDING code],
@@ -935,47 +979,35 @@ AC_ARG_ENABLE(colorfgbg,
AC_MSG_RESULT($with_colorfgbg)
test "$with_colorfgbg" = yes && AC_DEFINE(USE_COLORFGBG)
-### use option --enable-ext-colors to turn on use of colors beyond 16.
-AC_MSG_CHECKING(if you want to use experimental extended colors)
-AC_ARG_ENABLE(ext-colors,
- [ --enable-ext-colors compile for experimental 256-color support],
- [with_ext_colors=$enableval],
- [with_ext_colors=no])
-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_ERROR(This option applies only to wide-character library)
- else
- # cannot be ABI 5 since it changes sizeof(cchar_t)
- CF_NCURSES_ABI_6
- fi
- NCURSES_EXT_COLORS=1
- AC_DEFINE(NCURSES_EXT_COLORS)
+# This is still experimental (20080329), but should ultimately be moved to
+# the script-block --with-normal, etc.
+CF_WITH_PTHREAD
+
+AC_MSG_CHECKING(if you want to use weak-symbols for pthreads)
+AC_ARG_ENABLE(weak-symbols,
+ [ --enable-weak-symbols enable weak-symbols for pthreads],
+ [use_weak_symbols=$withval],
+ [use_weak_symbols=no])
+AC_MSG_RESULT($use_weak_symbols)
+if test "$use_weak_symbols" = yes ; then
+ CF_WEAK_SYMBOLS
+else
+ cf_cv_weak_symbols=no
fi
-AC_SUBST(NCURSES_EXT_COLORS)
-### use option --enable-ext-mouse to modify coding to support 5-button mice
-AC_MSG_CHECKING(if you want to use experimental extended mouse encoding)
-AC_ARG_ENABLE(ext-mouse,
- [ --enable-ext-mouse compile for experimental mouse-encoding],
- [with_ext_mouse=$enableval],
- [with_ext_mouse=no])
-AC_MSG_RESULT($with_ext_mouse)
-NCURSES_MOUSE_VERSION=1
-if test "$with_ext_mouse" = yes ; then
- NCURSES_MOUSE_VERSION=2
- CF_NCURSES_ABI_6
+if test $cf_cv_weak_symbols = yes ; then
+ AC_DEFINE(USE_WEAK_SYMBOLS)
fi
-AC_SUBST(NCURSES_MOUSE_VERSION)
-# This is still experimental (20080329), but should ultimately be moved to
-# the script-block --with-normal, etc.
-CF_WITH_PTHREAD
+PTHREAD=
if test "$with_pthread" = "yes" ; then
AC_DEFINE(USE_PTHREADS)
enable_reentrant=yes
+ if test $cf_cv_weak_symbols = yes ; then
+ PTHREAD=-lpthread
+ fi
fi
+AC_SUBST(PTHREAD)
# Reentrant code has to be opaque; there's little advantage to making ncurses
# opaque outside of that, so there is no --enable-opaque option. We can use
@@ -992,7 +1024,11 @@ if test "$with_reentrant" = yes ; then
cf_cv_enable_opaque="NCURSES_INTERNALS"
NCURSES_OPAQUE=1
NCURSES_SIZE_T=int
- LIB_SUFFIX="t${LIB_SUFFIX}"
+ if test $cf_cv_weak_symbols = yes ; then
+ CF_REMOVE_LIB(LIBS,$LIBS,pthread)
+ else
+ LIB_SUFFIX="t${LIB_SUFFIX}"
+ fi
AC_DEFINE(USE_REENTRANT)
CF_NCURSES_ABI_6
else
@@ -1297,6 +1333,20 @@ if test -n "$CXX" ; then
AC_CHECK_HEADERS(iostream typeinfo)
+ if test x"$ac_cv_header_iostream" = xyes ; then
+ AC_MSG_CHECKING(if iostream uses std-namespace)
+ AC_TRY_COMPILE([
+#include <iostream>
+using std::endl;
+using std::cerr;],[
+cerr << "testing" << endl;
+],[cf_iostream_namespace=yes],[cf_iostream_namespace=no])
+ AC_MSG_RESULT($cf_iostream_namespace)
+ if test "$cf_iostream_namespace" = yes ; then
+ AC_DEFINE(IOSTREAM_NAMESPACE)
+ fi
+ fi
+
CF_BOOL_DECL
CF_BOOL_SIZE
CF_ETIP_DEFINES
@@ -1527,16 +1577,7 @@ AC_SUBST(DFT_ARG_SUFFIX)dnl the string to append to "-lncurses" ("")
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
+CF_LIB_SUFFIX($DFT_LWR_MODEL,DFT_LIB_SUFFIX,DFT_DEP_SUFFIX)dnl
AC_SUBST(DFT_DEP_SUFFIX)dnl the corresponding library-suffix (".a")
AC_MSG_RESULT($DFT_DEP_SUFFIX)
@@ -1551,7 +1592,7 @@ AC_MSG_CHECKING(c++ library-dependency suffix)
if test "$with_libtool" != "no"; then
CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX
else
- CF_LIB_SUFFIX(normal,CXX_LIB_SUFFIX)dnl we normally make a static library
+ CF_LIB_SUFFIX(normal,CXX_LIB_SUFFIX,CXX_DEP_SUFFIX)dnl we normally make a static library
fi
AC_MSG_RESULT($CXX_LIB_SUFFIX)
AC_SUBST(CXX_LIB_SUFFIX)
@@ -1627,7 +1668,11 @@ else
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}"
+ if test "$with_tic_depends" = yes ; then
+ TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}"
+ else
+ TICS_LIST="$SHLIB_LIST"
+ fi
TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
fi
@@ -1771,6 +1816,7 @@ 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"
cf_cv_rm_so_locs="$cf_cv_rm_so_locs"
+cf_cv_shared_soname='$cf_cv_shared_soname'
cf_cv_shlib_version="$cf_cv_shlib_version"
cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
cf_cv_system_name="$cf_cv_system_name"
diff --git a/dist.mk b/dist.mk
index f4becd9bdfc6..551d773313f3 100644
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.641 2008/05/03 12:31:08 tom Exp $
+# $Id: dist.mk,v 1.671 2008/11/02 00:58:38 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -36,8 +36,8 @@ SHELL = /bin/sh
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 5
-NCURSES_MINOR = 6
-NCURSES_PATCH = 20080503
+NCURSES_MINOR = 7
+NCURSES_PATCH = 20081102
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
@@ -91,6 +91,11 @@ doc/hackguide.doc: doc/html/hackguide.html
#
# The distributed html files are formatted using
# configure --without-manpage-renames
+#
+# The edit_man.sed script is built as a side-effect of installing the manpages.
+# If that conflicts with the --without-manpage-renames, you can install those
+# in a different location using the --with-install-prefix option of the
+# configure script.
MANPROG = tbl | nroff -mandoc -rLL=65n -rLT=71n -Tascii
manhtml:
diff --git a/doc/html/announce.html b/doc/html/announce.html
index f9dae07e5d9a..234c703145a7 100644
--- a/doc/html/announce.html
+++ b/doc/html/announce.html
@@ -1,8 +1,8 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
<!--
- $Id: announce.html,v 1.51 2006/12/17 23:32:42 tom Exp $
+ $Id: announce.html,v 1.52 2008/11/02 01:05:08 tom Exp $
****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@@ -31,13 +31,13 @@
-->
<HTML>
<HEAD>
-<TITLE>Announcing ncurses 5.6</TITLE>
+<TITLE>Announcing ncurses 5.7</TITLE>
<link rev=made href="mailto:bug-ncurses@gnu.org">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</HEAD>
<BODY>
-<H1>Announcing ncurses 5.6</H1>
+<H1>Announcing ncurses 5.7</H1>
The ncurses (new curses) library is a free software emulation of
curses in System V Release 4.0, and more. It uses terminfo format,
@@ -69,185 +69,170 @@ the GNU distribution site
<H1>Release Notes</H1>
-This release is designed to be upward compatible from ncurses 5.0 through 5.5;
+This release is designed to be upward compatible from ncurses 5.0 through 5.6;
very few applications will require recompilation, depending on the platform.
-These are the highlights from the change-log since ncurses 5.5 release.
+These are the highlights from the change-log since ncurses 5.6 release.
<p>
Interface changes:
<ul>
<li>generate linkable stubs for some macros:
<br>
- getbegx, getbegy, getcurx, getcury, getmaxx, getmaxy, getparx,
- getpary, getpary,
- <br>
- and (for libncursesw)
- <br>
- wgetbkgrnd
+ getattrs
</ul>
New features and improvements:
<ul>
<li>library
<ul>
- <li>support hashed databases for the terminal descriptions.
- This uses the Berkeley database, has been tested for
- several versions on different platforms.
-
- <li>add <code>use_legacy_coding()</code> function to support
- lynx's font-switching feature.
-
- <li>add extension <code>nofilter()</code>, to cancel a prior
- <code>filter()</code> call.
-
- <li>add/install a package config script, e.g.,
- <code>ncurses5-config</code> or
- <code>ncursesw5-config</code>, according to
- configuration options.
-
- <li>provide ifdef for <code>NCURSES_NOMACROS</code> which
- suppresses most macro definitions from curses.h, i.e.,
- where a macro is defined to override a function to improve
- performance.
-
- <li>make ifdef's consistent in <code>curses.h</code> for the
- extended colors so the header file can be used for the
- normal curses library. The header file installed for
- extended colors is a variation of the wide-character
- configuration.
-
- <li>improve <code>tgetstr()</code> by making the return value
- point into the user's buffer, if provided.
-
- <li>add ifdef's allowing ncurses to be built with
- <code>tparm()</code> using either varargs (the existing
- status), or using a fixed-parameter list (to match X/Open).
-
- <li>widen the test for xterm <code>kmous</code> a little to
- <code>allow</code> for other
- strings than "\E[M", e.g., for <code>xterm-sco</code>
- functionality in xterm.
-
- <li>modify <code>wgetnstr()</code> to return
- <code>KEY_RESIZE</code> if a sigwinch occurs.
-
- <li>move prototypes for wide-character trace functions from
- curses.tail to curses.wide to avoid accidental reference to
- those if <code>_XOPEN_SOURCE_EXTENDED</code> is defined
- without ensuring that &lt;wchar.h&gt; is included.
-
- <li>change the way shared libraries (other than libtool) are
- installed. Rather than copying the build-tree's libraries,
- link the shared objects into the install directory. This
- makes the <code>--with-rpath</code> option work except with
- <code>$(DESTDIR)</code>.
-
- <li>several improvements for rendering in hpterm. These are
- only available if the library is configured using
- <code>--enable-xmc-glitch</code>.
-
- <li>Add <code>NCURSES_NO_HARD_TABS</code> and
- <code>NCURSES_NO_MAGIC_COOKIE</code> environment variables
- to allow runtime suppression of the related hard-tabs and
- xmc-glitch features.
+ <li>new flavor of the ncurses library provides rudimentary
+ support for POSIX threads. Several functions are
+ reentrant, but most require either a window-level or
+ screen-level mutex.<br>
+ (This is <em>API</em>-compatible,
+ but not <em>ABI</em>-compatible with the normal library).
+
+ <li>add <code>NCURSES_OPAQUE</code> symbol to curses.h, will
+ use to make structs opaque in selected configurations.
+
+ <li>add <code>NCURSES_EXT_FUNCS</code> and
+ <code>NCURSES_EXT_COLORS</code> symbols to curses.h to make
+ it simpler to tell if the extended functions and/or colors
+ are declared.
+
+ <li>add wresize() to C++ binding
+
+ <li>eliminate fixed-buffer vsprintf() calls in C++ binding.
+
+ <li>add several functions to C++ binding which wrap C functions
+ that pass a WINDOW* parameter.
+
+ <li>adapt mouse-handling code from menu library in form-library
+
+ <li>improve tracing for form library, showing created forms,
+ fields, etc.
+
+ <li>make $NCURSES_NO_PADDING feature work for termcap interface .
+
+ <li>add check to trace-file open, if the given name is a
+ directory, add ".log" to the name and try again.
+
+ <li>several new manpages: curs_legacy.3x, curs_memleaks.3x,
+ curs_opaque.3x and curs_threads.3x
</ul>
<li>programs:
<ul>
- <li>add new test programs: chgat.c, demo_altkeys.c,
- echochar.c, foldkeys.c, movewindow.c, redraw.c, (noting
- that existing test programs also were modified to test
- additional features).
-
- <li>modify tack to test extended capability function-key
- strings.
+ <li>modified three test-programs to demonstrate the threading
+ support in this version: ditto, rain, worm.
- <li>modify toe to access termcap data, e.g., via <code>cgetent()</code>
- functions, or as a text file if those are not available.
+ <li>several new test-programs: demo_panels, dots_mvcur,
+ inch_wide, inchs, key_name, key_names, savescreen,
+ savescreen.sh test_arrays, test_get_wstr, test_getstr,
+ test_instr, test_inwstr and test_opaque.
- <li>improve infocmp/tic <code>-f</code> option formatting.
+ <li>add <code>adacurses-config</code> to the Ada95 install.
- <li>add <code>toe -a</code> option, to show all databases.
- This uses new private interfaces in the ncurses library for
- iterating through the list of databases.
+ <li>modify tic <code>-f</code> option to format spaces as
+ <code>\s</code> to prevent them from being lost when that
+ is read back in unformatted strings.
- <li>modify <code>MKfallback.sh</code> to use
- <code>tic&nbsp;-x</code> when constructing fallback tables to
- allow extended capabilities to be retrieved from a fallback entry.
+ <li>The <code>tack</code> program is now distributed separately
+ from ncurses.
</ul>
<li>terminal database
<ul>
- <li>add terminfo entries for xfce terminal (xfce) and multi gnome terminal (mgt)
- <li>add nsterm-16color entry
- <li>updated mlterm terminfo entry
- <li>add kon, kon2 and jfbterm terminfo entry
- <li>remove invis capability from klone+sgr, mainly used by linux entry, since it does not really do this
- <li>add ka2, kb1, kb3, kc2 to vt220-keypad as an extension
- <li>add shifted up/down arrow codes to xterm-new as kind/kri strings
- <li>add hpterm-color terminfo entry
- <li>add 256color variants of terminfo entries for programs which are reported to implement this feature
- <li>correct order of use-clauses in rxvt-basic entry which made codes for f1-f4 vt100-style rather than vt220-style.
+ <li>added entries:
+ <ul>
+ <li><code>Eterm-256color</code>,
+ <code>Eterm-88color</code> and
+ <code>rxvt-88color</code>
+ <li><code>aterm</code>
+ <li><code>konsole-256color</code>
+ <li><code>mrxvt</code>
+ <li><code>screen.mlterm</code>
+ <li><code>screen.rxvt</code>
+ <li><code>teraterm4.59</code> is now the primary primary
+ teraterm entry, renamed original to
+ <code>teraterm2.3</code>
+ <li><code>9term</code> terminal
+ <li>Newbury Data entries
+ </ul>
+ <li>updated/improved entries:
+ <ul>
+ <li><code>gnome</code> to version 2.22.3
+ <li><code>h19</code>, <code>z100</code>
+ <li><code>konsole</code> to version 1.6.6
+ <li><code>mlterm</code>, <code>mlterm+pcfkeys</code>
+ <li><code>xterm</code>, and building-blocks for function-keys
+ to <a href="http://invisible-island.net/xterm/xterm.log.html#xterm_230">xterm patch #230</a>.
+ </ul>
</ul>
</ul>
Major bug fixes:
<ul>
- <li>correct a typo in configure <code>--with-bool</code> option for the
- case where <code>--without-cxx</code> is used.
+ <li>add logic to tic for cancelling strings in user-defined
+ capabilities
+ (this is <em>needed</em> for
+ current <code>konsole</code> terminfo entry).
+
+ <li>modify <code>mk-1st.awk</code> 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., <code>libncurses.so</code> by
+ <code>/bin/sh</code>.
+
+ <li>correct check for notimeout() in wgetch().
+
+ <li>fix a sign-extension bug in infocmp's repair_acsc() function.
- <li>move assignment from environment variable <code>ESCDELAY</code>
- from <code>initscr()</code> down to <code>newterm()</code> so the
- environment variable affects timeouts for terminals opened with
- newterm() as well.
+ <li>change winnstr() to stop at the end of the line.
- <li>modify <code>werase</code> to clear multicolumn characters that
- extend into a derived window.
+ <li>make Ada95 demo_panels() example work.
- <li>modify <code>wchgat()</code> to mark updated cells as changed so a
- refresh will repaint those cells.
+ <li>fix for adding a non-spacing character at the beginning of a line.
- <li>correct logic in <code>wadd_wch()</code> and
- <code>wecho_wch()</code>, which did not guard against passing the
- multi-column attribute into a call on <code>waddch()</code>, e.g.,
- using data returned by <code>win_wch()</code>
+ <li>fill in extended-color pair to make colors work
+ for wide-characters using extended-colors.
- <li>fix redrawing of windows other than <code>stdscr</code> using
- <code>wredrawln()</code> by touching the corresponding rows in
- <code>curscr</code>.
+ <li>improve refresh of window on top of multi-column characters,
+ taking into account split characters on left/right window
+ boundaries.
- <li>reduce memory leaks in repeated calls to <code>tgetent()</code> by
- remembering the last <code>TERMINAL*</code> value allocated to hold
- the corresponding data and freeing that if the
- <code>tgetent()</code> result buffer is the same as the previous
- call.
+ <li>modify <code>win_wchnstr()</code> to ensure that only a base cell
+ is returned for each multi-column character.
- <li>modify <code>read_termtype()</code> so the <code>term_names</code>
- data is always allocated as part of the <code>str_table</code>, a
- better fix for a memory leak.
+ <li>improve <code>waddch()</code> and <code>winsch()</code> handling of
+ EILSEQ from <code>mbrtowc()</code> by using <code>unctrl()</code>
+ to display illegal bytes rather than trying to append further bytes
+ to make up a valid sequence.
- <li>fix <code>wins_nwstr(),</code> which did not handle single-column
- non-8bit codes.
+ <li>restore <code>curs_set()</code> state after
+ <code>endwin()</code>/<code>refresh()</code>
- <li>modify <code>wbkgrnd()</code> to avoid clearing the
- <code>A_CHARTEXT</code> attribute bits since those record the state
- of multicolumn characters.
+ <li>modify <code>keyname()</code> to use "^X" form only if
+ <code>meta()</code> has been called, or if <code>keyname()</code>
+ is called without initializing curses, e.g., via
+ <code>initscr()</code> or <code>newterm()</code>.
- <li>improve <code>SIGWINCH</code> handling by postponing its effect
- during <code>newterm()</code>, etc., when allocating screens.
+ <li>modify <code>unctrl()</code> to check codes in 128-255 range versus
+ <code>isprint()</code>.
+ If they are not printable, and locale was set, use a "M-" or "~"
+ sequence.
- <li>remove 970913 feature for copying subwindows as they are moved in
- <code>mvwin()</code>.
+ <li>improve <code>resizeterm()</code> by moving ripped-off lines, and
+ repainting the soft-keys.
- <li>add checks in <code>waddchnstr()</code> and
- <code>wadd_wchnstr()</code> to stop copying when a null character
- is found.
+ <li>modify form library to accept control characters such as newline
+ in set_field_buffer(), which is compatible with Solaris.
- <li>add some checks to ensure current position is within scrolling
- region before scrolling on a new line.
+ <li>use <code>NCURSES_MOUSE_MASK()</code> in definition of
+ <code>BUTTON_RELEASE()</code>, etc., to make those work properly
+ with the <code>--enable-ext-mouse</code> configuration
- <li>add a workaround to ACS mapping to allow applications such as
- test/blue.c to use the "PC ROM" characters by masking them with
- A_ALTCHARSET. This worked up til 5.5, but was lost in the revision
- of legacy coding.
+ <li>correct some functions in Ada95 binding which were using return
+ value from C where none was returned.
+
+ <li>reviewed/fixed issues reported by Coverity and Klocwork tools.
</ul>
Portability:
@@ -257,110 +242,115 @@ Portability:
<li>new options:
<dl>
- <dt>--with-hashed-db
- <dd>Use Berkeley hashed database for storing terminfo data rather than storing
- each compiled entry in a separate binary file within a directory
- tree.
-
- <dt>--without-dlsym
- <dd>Do not use <code>dlsym()</code> to load GPM dynamically.
-
- <dt>--with-valgrind
- <dd>Simplify building for testing with valgrind.
-
- <dt>--enable-wgetch-events
- <dd>Compile with experimental wgetch-events code.
-
- <dt>--enable-signed-char
- <dd>Store booleans in "signed char" rather than "char".
+ <dt>--disable-big-strings
+ <dd>control whether static string tables are generated as single
+ large strings (to improve startup performance), or as array
+ of individual strings.
+
+ <dt>--disable-relink
+ <dd>control whether shared libraries are relinked (during install)
+ when rpath is enabled.
+
+ <dt>--disable-tic-depends
+ <dd>make explicit whether tic library depends on ncurses/ncursesw
+ library.
+
+ <dt>--enable-mixed-case
+ <dd>override the configure script's check if the filesystem
+ supports mixed-case filenames.
+ This allows one to control how the terminal database
+ maps to the filesystem.
+ For filesystems that do not support mixed-case, the library
+ uses generate 2-character (hexadecimal) codes for the
+ lower-level of the filesystem terminfo database
+
+ <dt>--enable-reentrant
+ <dd>builds a different flavor of the ncurses library (ncursest)
+ which improves reentrant use of the
+ library by reducing global and static variables
+ (see the "--with-pthread" option for the threaded support).
+
+ <dt>--enable-weak-symbols
+ <dd>use weak-symbols for linking to the POSIX thread library,
+ and use the same soname for the ncurses shared library
+ as the normal library (caveat: the ABI is for the threaded
+ library, which makes global data accessed via functions).
+
+ <dt>--with-pthread
+ <dd>build with the POSIX thread library (tested with AIX,
+ Linux, FreeBSD, OpenBSD, HPUX, IRIX64, Solaris, Tru64).
+
+ <dt>--with-ticlib
+ <dd>build/install the tic-support functions in a separate library
</dl>
<li>improved options:
<dl>
- <dt>--disable-largefile
- <dd>make the option work both ways.
-
- <dt>--with-gpm
- <dd>The option now accepts a parameter,
- i.e., the name of the dynamic GPM library to load via
- <code>dlopen()</code>
-
- <dt>--disable-symlinks
- <dd>The option now allows one to
- disable <code>symlink()</code> in <code>tic</code> even when
- <code>link()</code> does not work.
-
- </dl>
-
- </ul>
-
- <li>other configure/build issues: <ul> <li>remove special case for
- Darwin in <code>CF_XOPEN_SOURCE</code> configure macro.
+ <dt>--enable-ext-colors
+ <dd>requires the wide-character configuration.
- <li>add configure check to ensure that <code>SIGWINCH</code> is
- defined on platforms such as OS X which exclude that when
- <code>_XOPEN_SOURCE,</code> etc., are defined
+ <dt>--with-chtype
+ <dd>ignore option value "unsigned" is always added to
+ the type in curses.h; do the same for --with-mmask-t.
- <li>use ld's <code>-search_paths_first</code> option on Darwin
- to work around odd search rules on that platform.
+ <dt>--with-dmalloc
+ <dd>build-fix for redefinition of <code>strndup</code>.
- <li>improve ifdef's for <code>_POSIX_VDISABLE</code> in tset to
- work with Mac OS X.
-
- <li>modify configure script to ensure that if the C compiler is
- used rather than the loader in making shared libraries, the
- <code>$(CFLAGS)</code> variable is also used.
+ <dt>--with-hashed-db
+ <dd>accepts a parameter which is the install-prefix of a given
+ Berkeley Database.
- <li>use <code>${CC}</code> rather than <code>${LD}</code> in
- shared library rules for IRIX64, Solaris to help ensure
- that initialization sections are provided for extra linkage
- requirements, e.g., of C++ applications.
+ <dt>--with-hashed-db
+ <dd>the $LIBS environment variable overrides the search for the db
+ library.
- <li>improve some shared-library configure scripting for Linux,
- FreeBSD and NetBSD to make
- <code>--with-shlib-version</code> work.
+ <dt>--without-hashed-db
+ <dd>assumed when "--disable-database" is used.
- <li>split up dependency of <code>names.c</code> and
- <code>codes.c</code> in <code>ncurses/Makefile</code> to
- work with parallel make.
+ </dl>
- <li>modify <code>MKlib_gen.sh</code> to change
- preprocessor-expanded <code>_Bool</code> back to <code>bool</code>.
+ </ul>
- <li>modify <code>progs/Makefile.in</code> to make
- <code>tput&nbsp;init</code> work properly with cygwin,
- i.e., do not pass a <code>.exe</code> in the reference
- string used in check_aliases.
+ <li>other configure/build issues:
+ <ul>
+ <li>build-fixes for LynxOS
+ <li>modify shared-library rules to allow FreeBSD 3.x to use rpath.
+ <li>build-fix for FreeBSD "contemporary" TTY interface.
+ <li>build-fixes for AIX with libtool.
+ <li>build-fixes for Darwin and libtool.
+ <li>modify BeOS-specific ifdef's to build on Haiku.
+ <li>corrected gcc options for building shared libraries on Solaris
+ and IRIX64.
+ <li>change shared-library configuration for OpenBSD, make rpath work.
+ <li>build-fixes for using libutf8, e.g., on OpenBSD 3.7
+ <li>add "-e" option in ncurses/Makefile.in when generating source-files
+ to force earlier exit if the build environment fails unexpectedly.
+ <li>add support for shared libraries for QNX.
+ <li>change delimiter in <code>MKlib_gen.sh</code> from '%' to '@', to
+ avoid substitution by IBM xlc to '#' as part of its extensions to
+ digraphs.
</ul>
<li>library:
<ul>
- <li>ignore wide-acs line-drawing characters that
- <code>wcwidth()</code> claims are not one-column. This is
- a workaround for Solaris' broken locale support.
-
- <li>reduce name-pollution in <code>term.h</code> by removing
- <code>#define</code>'s for HAVE_xxx symbols.
-
- <li>fix <code>#ifdef</code> in <code>c++/internal.h</code> for
- QNX 6.1
+ <li>rewrite wrapper for <code>wcrtomb()</code>, making it work on
+ Solaris. This is used in the form library to determine the length
+ of the buffer needed by <code>field_buffer</code>.
+ <li>add/use configure script macro CF_SIG_ATOMIC_T, use the corresponding
+ type for data manipulated by signal handlers.
+ <li>set locale in misc/ncurses-config.in since it uses a range
+ <li>disable GPM mouse support when $TERM does not happen to contain
+ "linux", since Gpm_Open() no longer limits its assertion to terminals
+ that it might handle, e.g., within "screen" in xterm.
+ <li>reset mouse file-descriptor when unloading GPM library.
</ul>
- <li>test programs: <ul> <li>modify <code>test/configure</code> script
- to allow building test programs with PDCurses/X11.
-
- <li>modified test programs to allow some to work with NetBSD
- curses. Several do not because NetBSD curses implements a
- subset of X/Open curses, and also lacks much of SVr4
- additions. But it is enough for comparison.
-
- <li>improved <code>test/configure</code> to build test/ncurses
- on HPUX 11 using the vendor curses.
-
- <li>change configure script to produce
- <code>test/Makefile</code> from data file.
+ <li>test programs:
+ <ul>
+ <li>update test programs to build/work with various UNIX curses for
+ comparisons.
</ul>
</ul>
@@ -410,6 +400,8 @@ and <CODE>define_key()</CODE> allow
you to better control the use of function keys,
e.g., disabling the ncurses KEY_MOUSE,
or by defining more than one control sequence to map to a given key code.
+<LI>Support for 256-color terminals, such as modern xterm, when configured
+using the <code>--enable-ext-colors</code> option.
<LI>Support for 16-color terminals, such as aixterm and modern xterm.
<LI>Better cursor-movement optimization. The package now features a
cursor-local-movement computation more efficient than either BSD's
@@ -513,14 +505,10 @@ for similar applications on GNU/Linux.
<br>
<DT> pinfo
<DD> Lynx-like info browser.
-<A HREF="http://dione.ids.pl/~pborys/software/pinfo/">http://dione.ids.pl/~pborys/software/pinfo/</A>
+<A HREF="https://alioth.debian.org/projects/pinfo/">https://alioth.debian.org/projects/pinfo/</A>
<DT> tin
<DD> newsreader, supporting color, MIME
<A HREF="http://www.tin.org/">http://www.tin.org/</A>
-<DT> vh-1.6
-<DD> Volks-Hypertext browser for the Jargon File
-<br>
-<A HREF="http://www.debian.org/Packages/unstable/text/vh.html">http://www.debian.org/Packages/unstable/text/vh.html</A>
</DL>
as well as some that use ncurses for the terminfo support alone:
<DL>
diff --git a/form/form.priv.h b/form/form.priv.h
index e8617f1d5747..fea627d30d7d 100644
--- a/form/form.priv.h
+++ b/form/form.priv.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,2008 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 *
@@ -30,7 +30,7 @@
* Author: Juergen Pfeifer, 1995,1997 *
****************************************************************************/
-/* $Id: form.priv.h,v 0.26 2006/12/17 19:47:09 tom Exp $ */
+/* $Id: form.priv.h,v 0.27 2008/09/08 20:29:05 tom Exp $ */
#ifndef FORM_PRIV_H
#define FORM_PRIV_H 1
@@ -39,8 +39,6 @@
#include "mf_common.h"
#if USE_WIDEC_SUPPORT
-#include <wchar.h>
-
#if HAVE_WCTYPE_H
#include <wctype.h>
#endif
diff --git a/form/frm_def.c b/form/frm_def.c
index c2044a39dccd..e6897514ffdd 100644
--- a/form/frm_def.c
+++ b/form/frm_def.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2007,2008 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.22 2007/10/13 19:31:17 tom Exp $")
+MODULE_ID("$Id: frm_def.c,v 1.23 2008/08/04 00:07:55 tom Exp $")
/* this can't be readonly */
static FORM default_form =
@@ -234,8 +234,16 @@ Connect_Fields(FORM *form, FIELD **fields)
fields[j]->page = page_nr;
fld = Insert_Field_By_Position(fields[j], fld);
}
- form->page[page_nr].smin = fld->index;
- form->page[page_nr].smax = fld->sprev->index;
+ if (fld)
+ {
+ form->page[page_nr].smin = fld->index;
+ form->page[page_nr].smax = fld->sprev->index;
+ }
+ else
+ {
+ form->page[page_nr].smin = 0;
+ form->page[page_nr].smax = 0;
+ }
}
RETURN(E_OK);
}
diff --git a/form/frm_driver.c b/form/frm_driver.c
index 0c0912576dbb..94323ed27788 100644
--- a/form/frm_driver.c
+++ b/form/frm_driver.c
@@ -32,7 +32,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: frm_driver.c,v 1.86 2008/01/19 20:11:03 tom Exp $")
+MODULE_ID("$Id: frm_driver.c,v 1.88 2008/10/18 16:25:00 tom Exp $")
/*----------------------------------------------------------------------------
This is the core module of the form library. It contains the majority
@@ -4176,7 +4176,7 @@ form_driver(FORM *form, int c)
NULL /* Choice Request is generic */
};
size_t nMethods = (sizeof(Generic_Methods) / sizeof(Generic_Methods[0]));
- size_t method = ((BI->keycode & ID_Mask) >> ID_Shft) & 0xffff;
+ size_t method = (BI->keycode >> ID_Shft) & 0xffff; /* see ID_Mask */
if ((method >= nMethods) || !(BI->cmd))
res = E_SYSTEM_ERROR;
@@ -4333,15 +4333,6 @@ set_field_buffer(FIELD *field, int buffer, const char *value)
len = Buffer_Length(field);
- if (buffer == 0)
- {
- for (i = 0; (value[i] != '\0') && (i < len); ++i)
- {
- if (iscntrl(UChar(value[i])))
- RETURN(E_BAD_ARGUMENT);
- }
- }
-
if (Growable(field))
{
/* for a growable field we must assume zero terminated strings, because
@@ -4356,14 +4347,6 @@ set_field_buffer(FIELD *field, int buffer, const char *value)
* field->cols))))
RETURN(E_SYSTEM_ERROR);
- /* in this case we also have to check, whether or not the remaining
- characters in value are also printable for buffer 0. */
- if (buffer == 0)
- {
- for (i = len; i < vlen; i++)
- if (iscntrl(UChar(value[i])))
- RETURN(E_BAD_ARGUMENT);
- }
len = vlen;
}
}
@@ -4376,6 +4359,13 @@ set_field_buffer(FIELD *field, int buffer, const char *value)
* There should be a better way, but this handles nonspacing characters
* and other special cases that we really do not want to handle here.
*/
+#if NCURSES_EXT_FUNCS
+ if (wresize(field->working, field->drows, field->dcols) == ERR)
+#endif
+ {
+ delwin(field->working);
+ field->working = newpad(field->drows, field->dcols);
+ }
wclear(field->working);
mvwaddstr(field->working, 0, 0, value);
@@ -4385,7 +4375,12 @@ set_field_buffer(FIELD *field, int buffer, const char *value)
}
else
{
- mvwin_wchnstr(field->working, 0, 0, widevalue, (int)len);
+ for (i = 0; i < (unsigned)field->drows; ++i)
+ {
+ mvwin_wchnstr(field->working, i, 0,
+ widevalue + (i * field->dcols),
+ field->dcols);
+ }
for (i = 0; i < len; ++i)
{
if (CharEq(myZEROS, widevalue[i]))
diff --git a/form/frm_req_name.c b/form/frm_req_name.c
index e4d5c335d8ec..7ac9abe6e299 100644
--- a/form/frm_req_name.c
+++ b/form/frm_req_name.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2005,2008 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 *
@@ -37,7 +37,7 @@
#include "form.priv.h"
-MODULE_ID("$Id: frm_req_name.c,v 1.15 2005/04/16 16:59:27 tom Exp $")
+MODULE_ID("$Id: frm_req_name.c,v 1.16 2008/07/05 23:22:08 tom Exp $")
static const char *request_names[MAX_FORM_COMMAND - MIN_FORM_COMMAND + 1] =
{
@@ -154,7 +154,7 @@ form_request_by_name(const char *str)
strncpy(buf, str, sizeof(buf));
while ((i < sizeof(buf)) && (buf[i] != '\0'))
{
- buf[i] = toupper(buf[i]);
+ buf[i] = toupper(UChar(buf[i]));
i++;
}
diff --git a/include/MKterm.h.awk.in b/include/MKterm.h.awk.in
index 6f0fca33c7c8..5fc20529b11b 100644
--- a/include/MKterm.h.awk.in
+++ b/include/MKterm.h.awk.in
@@ -1,7 +1,7 @@
# vile:awkmode
BEGIN {
print "/****************************************************************************"
- print " * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *"
+ print " * Copyright (c) 1998-2007,2008 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 *"
@@ -34,7 +34,7 @@ BEGIN {
print "/* and: Thomas E. Dickey 1995-on */"
print "/****************************************************************************/"
print ""
- print "/* $Id: MKterm.h.awk.in,v 1.49 2007/08/18 11:44:26 tom Exp $ */"
+ print "/* $Id: MKterm.h.awk.in,v 1.50 2008/05/24 23:13:59 tom Exp $ */"
print ""
print "/*"
print "** term.h -- Definition of struct term"
@@ -228,9 +228,8 @@ END {
print " char * _termname; /* used for termname() */"
print "} TERMINAL;"
print ""
- print "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
- print ""
print "#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@"
+ print "NCURSES_WRAPPED_VAR(TERMINAL *, cur_term);"
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);"
@@ -241,6 +240,7 @@ END {
print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strcodes);"
print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strfnames);"
print ""
+ print "#define cur_term NCURSES_PUBLIC_VAR(cur_term())"
print "#define boolnames NCURSES_PUBLIC_VAR(boolnames())"
print "#define boolcodes NCURSES_PUBLIC_VAR(boolcodes())"
print "#define boolfnames NCURSES_PUBLIC_VAR(boolfnames())"
@@ -253,6 +253,8 @@ END {
print ""
print "#else"
print ""
+ print "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
+ print ""
print "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolnames[];"
print "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[];"
print "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolfnames[];"
diff --git a/include/capdefaults.c b/include/capdefaults.c
index 071f9e17cdbb..33f2fe8f0299 100644
--- a/include/capdefaults.c
+++ b/include/capdefaults.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2000 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2000,2008 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 *
@@ -29,9 +29,10 @@
/****************************************************************************
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
+ * and: Thomas E. Dickey 1996-on *
****************************************************************************/
-/* $Id: capdefaults.c,v 1.12 2000/01/02 02:34:56 tom Exp $ */
+/* $Id: capdefaults.c,v 1.13 2008/08/04 12:33:42 tom Exp $ */
/*
* Compute obsolete capabilities. The reason this is an include file is
@@ -44,9 +45,10 @@
*/
{
char *sp;
- int capval;
+ short capval;
-#define EXTRACT_DELAY(str) (sp = strchr(str, '*'), sp ? atoi(sp+1) : 0)
+#define EXTRACT_DELAY(str) \
+ (short) (sp = strchr(str, '*'), sp ? atoi(sp+1) : 0)
/* current (4.4BSD) capabilities marked obsolete */
if (VALID_STRING(carriage_return)
@@ -73,8 +75,8 @@
magic_cookie_glitch_ul = magic_cookie_glitch;
/* totally obsolete capabilities */
- linefeed_is_newline = VALID_STRING(newline)
- && (strcmp("\n", newline) == 0);
+ linefeed_is_newline = (char) (VALID_STRING(newline)
+ && (strcmp("\n", newline) == 0));
if (VALID_STRING(cursor_left)
&& (capval = EXTRACT_DELAY(cursor_left)))
backspace_delay = capval;
diff --git a/include/curses.h.in b/include/curses.h.in
index deb63e3d735e..53da9a564fe5 100644
--- a/include/curses.h.in
+++ b/include/curses.h.in
@@ -32,7 +32,7 @@
* and: Thomas E. Dickey 1996-on *
****************************************************************************/
-/* $Id: curses.h.in,v 1.186 2008/04/05 15:30:28 tom Exp $ */
+/* $Id: curses.h.in,v 1.187 2008/08/30 20:11:29 tom Exp $ */
#ifndef __NCURSES_H
#define __NCURSES_H
@@ -423,7 +423,8 @@ struct _win_st
*/
#if @NCURSES_EXT_FUNCS@
#ifdef NCURSES_WGETCH_EVENTS
-#if !defined(__BEOS__) /* Fix _nc_timed_wait() on BEOS... */
+#if !defined(__BEOS__) || defined(__HAIKU__)
+ /* Fix _nc_timed_wait() on BEOS... */
# define NCURSES_EVENT_VERSION 1
#endif /* !defined(__BEOS__) */