Changeset 08941f56
- Timestamp:
- Jun 28, 2008, 11:55:02 AM (16 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 16b6cf87
- Parents:
- 818cf09
- File:
-
- 1 moved
-
patches/ncurses-5.6-branch_update-3.patch (moved) (moved from patches/ncurses-5.6-branch_update-2.patch ) (1154 diffs)
Legend:
- Unmodified
- Added
- Removed
-
patches/ncurses-5.6-branch_update-3.patch
r818cf09 r08941f56 1 1 Submitted By: Jim Gifford (jim at linuxfromscratch dot org) 2 Date: 12-21-20072 Date: 06-18-2008 3 3 Initial Package Version: 5.6 4 4 Origin: Upstream 5 5 Upstream Status: Applied 6 6 Description: This is a branch update for NCurses-5.6, and should be 7 rechecked periodically. This patch covers up to 5.6-200 71215.7 rechecked periodically. This patch covers up to 5.6-20080614. 8 8 9 9 diff -Naur ncurses-5.6.orig/Ada95/gen/Makefile.in ncurses-5.6/Ada95/gen/Makefile.in 10 10 --- ncurses-5.6.orig/Ada95/gen/Makefile.in 2006-12-17 11:53:33.000000000 -0500 11 +++ ncurses-5.6/Ada95/gen/Makefile.in 200 7-12-21 00:02:35.000000000 -050011 +++ ncurses-5.6/Ada95/gen/Makefile.in 2008-06-18 06:49:44.000000000 -0400 12 12 @@ -1,5 +1,5 @@ 13 13 ############################################################################## … … 303 303 diff -Naur ncurses-5.6.orig/Ada95/gen/adacurses-config.in ncurses-5.6/Ada95/gen/adacurses-config.in 304 304 --- ncurses-5.6.orig/Ada95/gen/adacurses-config.in 1969-12-31 19:00:00.000000000 -0500 305 +++ ncurses-5.6/Ada95/gen/adacurses-config.in 200 7-12-21 00:02:35.000000000 -0500305 +++ ncurses-5.6/Ada95/gen/adacurses-config.in 2008-06-18 06:49:44.000000000 -0400 306 306 @@ -0,0 +1,35 @@ 307 307 +#! /bin/sh … … 342 342 diff -Naur ncurses-5.6.orig/Ada95/gen/gen.c ncurses-5.6/Ada95/gen/gen.c 343 343 --- ncurses-5.6.orig/Ada95/gen/gen.c 2005-01-22 12:03:48.000000000 -0500 344 +++ ncurses-5.6/Ada95/gen/gen.c 200 7-12-21 00:02:35.000000000 -0500344 +++ ncurses-5.6/Ada95/gen/gen.c 2008-06-18 06:49:44.000000000 -0400 345 345 @@ -1,5 +1,5 @@ 346 346 /**************************************************************************** … … 578 578 diff -Naur ncurses-5.6.orig/Ada95/gen/html.m4 ncurses-5.6/Ada95/gen/html.m4 579 579 --- ncurses-5.6.orig/Ada95/gen/html.m4 2006-04-22 19:16:44.000000000 -0400 580 +++ ncurses-5.6/Ada95/gen/html.m4 200 7-12-21 00:02:35.000000000 -0500580 +++ ncurses-5.6/Ada95/gen/html.m4 2008-06-18 06:49:44.000000000 -0400 581 581 @@ -1,5 +1,5 @@ 582 582 dnl*************************************************************************** … … 605 605 diff -Naur ncurses-5.6.orig/Ada95/gen/terminal_interface-curses-aux.ads.m4 ncurses-5.6/Ada95/gen/terminal_interface-curses-aux.ads.m4 606 606 --- ncurses-5.6.orig/Ada95/gen/terminal_interface-curses-aux.ads.m4 2003-10-25 11:39:18.000000000 -0400 607 +++ ncurses-5.6/Ada95/gen/terminal_interface-curses-aux.ads.m4 200 7-12-21 00:02:35.000000000 -0500607 +++ ncurses-5.6/Ada95/gen/terminal_interface-curses-aux.ads.m4 2008-06-18 06:49:44.000000000 -0400 608 608 @@ -1,6 +1,7 @@ 609 609 -- -*- ada -*- … … 626 626 diff -Naur ncurses-5.6.orig/Ada95/gen/terminal_interface-curses-menus.ads.m4 ncurses-5.6/Ada95/gen/terminal_interface-curses-menus.ads.m4 627 627 --- ncurses-5.6.orig/Ada95/gen/terminal_interface-curses-menus.ads.m4 2006-06-25 10:30:22.000000000 -0400 628 +++ ncurses-5.6/Ada95/gen/terminal_interface-curses-menus.ads.m4 200 7-12-21 00:02:35.000000000 -0500628 +++ ncurses-5.6/Ada95/gen/terminal_interface-curses-menus.ads.m4 2008-06-18 06:49:44.000000000 -0400 629 629 @@ -38,8 +38,8 @@ 630 630 ------------------------------------------------------------------------------ … … 649 649 diff -Naur ncurses-5.6.orig/Ada95/gen/terminal_interface-curses.adb.m4 ncurses-5.6/Ada95/gen/terminal_interface-curses.adb.m4 650 650 --- ncurses-5.6.orig/Ada95/gen/terminal_interface-curses.adb.m4 1969-12-31 19:00:00.000000000 -0500 651 +++ ncurses-5.6/Ada95/gen/terminal_interface-curses.adb.m4 200 7-12-21 00:02:35.000000000 -0500651 +++ ncurses-5.6/Ada95/gen/terminal_interface-curses.adb.m4 2008-06-18 06:49:44.000000000 -0400 652 652 @@ -0,0 +1,2501 @@ 653 653 +-- -*- ada -*- … … 3154 3154 diff -Naur ncurses-5.6.orig/Ada95/gen/terminal_interface-curses.ads.m4 ncurses-5.6/Ada95/gen/terminal_interface-curses.ads.m4 3155 3155 --- ncurses-5.6.orig/Ada95/gen/terminal_interface-curses.ads.m4 2006-06-25 10:30:22.000000000 -0400 3156 +++ ncurses-5.6/Ada95/gen/terminal_interface-curses.ads.m4 200 7-12-21 00:02:35.000000000 -05003156 +++ ncurses-5.6/Ada95/gen/terminal_interface-curses.ads.m4 2008-06-18 06:49:44.000000000 -0400 3157 3157 @@ -9,7 +9,7 @@ 3158 3158 -- S P E C -- … … 3231 3231 diff -Naur ncurses-5.6.orig/Ada95/samples/ncurses2-attr_test.adb ncurses-5.6/Ada95/samples/ncurses2-attr_test.adb 3232 3232 --- ncurses-5.6.orig/Ada95/samples/ncurses2-attr_test.adb 2006-06-25 10:24:40.000000000 -0400 3233 +++ ncurses-5.6/Ada95/samples/ncurses2-attr_test.adb 200 7-12-21 00:02:35.000000000 -05003233 +++ ncurses-5.6/Ada95/samples/ncurses2-attr_test.adb 2008-06-18 06:49:44.000000000 -0400 3234 3234 @@ -7,7 +7,7 @@ 3235 3235 -- B O D Y -- … … 3288 3288 diff -Naur ncurses-5.6.orig/Ada95/samples/ncurses2-m.adb ncurses-5.6/Ada95/samples/ncurses2-m.adb 3289 3289 --- ncurses-5.6.orig/Ada95/samples/ncurses2-m.adb 2006-06-25 10:24:40.000000000 -0400 3290 +++ ncurses-5.6/Ada95/samples/ncurses2-m.adb 200 7-12-21 00:02:35.000000000 -05003290 +++ ncurses-5.6/Ada95/samples/ncurses2-m.adb 2008-06-18 06:49:44.000000000 -0400 3291 3291 @@ -35,8 +35,8 @@ 3292 3292 ------------------------------------------------------------------------------ … … 3310 3310 diff -Naur ncurses-5.6.orig/Ada95/samples/rain.adb ncurses-5.6/Ada95/samples/rain.adb 3311 3311 --- ncurses-5.6.orig/Ada95/samples/rain.adb 2003-10-25 11:39:18.000000000 -0400 3312 +++ ncurses-5.6/Ada95/samples/rain.adb 200 7-12-21 00:02:35.000000000 -05003312 +++ ncurses-5.6/Ada95/samples/rain.adb 2008-06-18 06:49:44.000000000 -0400 3313 3313 @@ -36,7 +36,8 @@ 3314 3314 -- Author: Laurent Pautet <pautet@gnat.com> … … 3330 3330 diff -Naur ncurses-5.6.orig/Ada95/samples/sample.adb ncurses-5.6/Ada95/samples/sample.adb 3331 3331 --- ncurses-5.6.orig/Ada95/samples/sample.adb 2003-10-25 11:39:18.000000000 -0400 3332 +++ ncurses-5.6/Ada95/samples/sample.adb 200 7-12-21 00:02:35.000000000 -05003332 +++ ncurses-5.6/Ada95/samples/sample.adb 2008-06-18 06:49:44.000000000 -0400 3333 3333 @@ -35,7 +35,8 @@ 3334 3334 ------------------------------------------------------------------------------ … … 3351 3351 diff -Naur ncurses-5.6.orig/Ada95/src/Makefile.in ncurses-5.6/Ada95/src/Makefile.in 3352 3352 --- ncurses-5.6.orig/Ada95/src/Makefile.in 2004-08-21 17:29:50.000000000 -0400 3353 +++ ncurses-5.6/Ada95/src/Makefile.in 200 7-12-21 00:02:35.000000000 -05003353 +++ ncurses-5.6/Ada95/src/Makefile.in 2008-06-18 06:49:44.000000000 -0400 3354 3354 @@ -28,7 +28,7 @@ 3355 3355 # … … 5952 5952 diff -Naur ncurses-5.6.orig/INSTALL ncurses-5.6/INSTALL 5953 5953 --- ncurses-5.6.orig/INSTALL 2006-12-17 14:58:19.000000000 -0500 5954 +++ ncurses-5.6/INSTALL 200 7-12-21 00:02:35.000000000 -05005954 +++ ncurses-5.6/INSTALL 2008-06-18 06:49:49.000000000 -0400 5955 5955 @@ -25,7 +25,7 @@ 5956 5956 -- sale, use or other dealings in this Software without prior written -- … … 5958 5958 ------------------------------------------------------------------------------- 5959 5959 --- $Id: INSTALL,v 1.114 2006/12/17 19:58:19 tom Exp $ 5960 +-- $Id: INSTALL,v 1.12 2 2007/12/01 19:37:47tom Exp $5960 +-- $Id: INSTALL,v 1.124 2008/03/29 18:07:32 tom Exp $ 5961 5961 --------------------------------------------------------------------- 5962 5962 How to install Ncurses/Terminfo on your system 5963 5963 --------------------------------------------------------------------- 5964 @@ -304,6 +304,11 @@ 5964 @@ -149,6 +149,9 @@ 5965 recent implementation of libiconv. We have built this configuration on 5966 Linux using libiconv, sometimes requiring libutf8. 5967 5968 + If you configure using the --with-pthread option, a "t" is appended to 5969 + the library names (e.g., libncursest.a, libncursestw.a). 5970 + 5971 If you do not specify any models, the normal and debug libraries will be 5972 configured. Typing `configure' with no arguments is equivalent to: 5973 5974 @@ -304,6 +307,11 @@ 5965 5975 return deceptive results, so you may have to override the configure 5966 5976 script. Or you may be building tic for a smaller machine. … … 5974 5984 Use only built-in data. The ncurses libraries normally read terminfo 5975 5985 and termcap data from disk. You can configure ncurses to have a 5976 @@ -334,6 +3 39,16 @@5986 @@ -334,6 +342,16 @@ 5977 5987 For testing, compile-in code that frees memory that normally would not 5978 5988 be freed, to simplify analysis of memory-leaks. … … 5991 6001 The header files will ignore use of the _LP64 symbol to make chtype 5992 6002 and mmask_t types 32 bits (they may be long on 64-bit hosts, for 5993 @@ -358,6 +37 3,13 @@6003 @@ -358,6 +376,13 @@ 5994 6004 rather than the include directory. This makes it simpler to avoid 5995 6005 compile-time conflicts with other versions of curses.h … … 6005 6015 Compile with environment restriction, so certain environment variables 6006 6016 are not available when running as root, or via a setuid/setgid 6007 @@ -476,12 + 498,22@@6017 @@ -476,12 +501,23 @@ 6008 6018 may not be accurate, or that your stty settings have disabled the use 6009 6019 of tabs. … … 6023 6033 + --enable-reentrant 6024 6034 + Compile experimental configuration which improves reentrant use of the 6025 + library by reducing global and static variables. 6035 + library by reducing global and static variables. This option is also 6036 + set if --with-pthread is used. 6026 6037 + 6027 6038 --enable-rpath 6028 6039 Use rpath option when generating shared libraries, and (with some 6029 6040 restrictions) when linking the corresponding programs. This originally 6030 @@ -495,6 +5 27,9 @@6041 @@ -495,6 +531,9 @@ 6031 6042 environment variable, they do not work with setuid applications since 6032 6043 the LD_LIBRARY_PATH variable would be unset in that situation. … … 6038 6049 Compile with experimental safe-sprintf code. You may consider using 6039 6050 this if you are building ncurses for a system that has neither 6040 @@ -659,10 +69 4,16 @@6051 @@ -659,10 +698,16 @@ 6041 6052 6042 6053 See also --without-dlsym … … 6056 6067 If you use this option for configuring ncurses, tic will only be able 6057 6068 to write entries in the hashed database. infocmp can still read 6058 @@ -674,6 +71 5,12 @@6069 @@ -674,6 +719,12 @@ 6059 6070 You cannot have a directory containing both hashed-database and 6060 6071 filesystem-based terminfo entries. … … 6069 6080 6070 6081 --with-install-prefix=XXX 6071 @@ -833,6 +880,15 @@ 6082 @@ -769,6 +820,11 @@ 6083 Generate profile-libraries These are named by adding "_p" to the root, 6084 e.g., libncurses_p.a 6085 6086 + --with-pthread 6087 + Link with POSIX threads, set --enable-reentrant. The use_window() and 6088 + use_screen() functions will use mutex's, allowing rudimentary support 6089 + for multithreaded applications. 6090 + 6091 --with-rcs-ids 6092 Compile-in RCS identifiers. Most of the C files have an identifier. 6093 6094 @@ -833,6 +889,15 @@ 6072 6095 Specify a search-list of termcap files which will be compiled into the 6073 6096 ncurses library (default: /etc/termcap:/usr/share/misc/termcap) … … 6087 6110 diff -Naur ncurses-5.6.orig/MANIFEST ncurses-5.6/MANIFEST 6088 6111 --- ncurses-5.6.orig/MANIFEST 2006-11-25 21:21:05.000000000 -0500 6089 +++ ncurses-5.6/MANIFEST 200 7-12-21 00:02:35.000000000 -05006112 +++ ncurses-5.6/MANIFEST 2008-06-18 06:49:46.000000000 -0400 6090 6113 @@ -4,6 +4,7 @@ 6091 6114 ./Ada95/README … … 6123 6146 ./man/curs_overlay.3x 6124 6147 ./man/curs_pad.3x 6125 @@ -709,7 +712,8 @@ 6148 @@ -568,6 +571,7 @@ 6149 ./man/curs_termattrs.3x 6150 ./man/curs_termcap.3x 6151 ./man/curs_terminfo.3x 6152 +./man/curs_threads.3x 6153 ./man/curs_touch.3x 6154 ./man/curs_trace.3x 6155 ./man/curs_util.3x 6156 @@ -709,7 +713,8 @@ 6126 6157 ./mk-0th.awk 6127 6158 ./mk-1st.awk … … 6133 6164 ./ncurses/README 6134 6165 ./ncurses/README.IZ 6135 @@ -799, 6 +803,7@@6166 @@ -799,15 +804,19 @@ 6136 6167 ./ncurses/base/safe_sprintf.c 6137 6168 ./ncurses/base/sigaction.c … … 6141 6172 ./ncurses/base/vsscanf.c 6142 6173 ./ncurses/base/wresize.c 6143 @@ -808,6 +813,8 @@ 6174 ./ncurses/curses.priv.h 6175 ./ncurses/fifo_defs.h 6176 ./ncurses/llib-lncurses 6177 +./ncurses/llib-lncursest 6144 6178 ./ncurses/llib-lncursesw 6145 6179 ./ncurses/modules … … 6150 6184 ./ncurses/tinfo/MKkeys_list.sh 6151 6185 ./ncurses/tinfo/MKnames.awk 6152 @@ -824,6 +83 1,7 @@6186 @@ -824,6 +833,7 @@ 6153 6187 ./ncurses/tinfo/comp_scan.c 6154 6188 ./ncurses/tinfo/db_iterator.c … … 6158 6192 ./ncurses/tinfo/getenv_num.c 6159 6193 ./ncurses/tinfo/hashed_db.c 6160 @@ -856,6 +86 4,7 @@6194 @@ -856,6 +866,7 @@ 6161 6195 ./ncurses/tinfo/setbuf.c 6162 6196 ./ncurses/tinfo/strings.c … … 6166 6200 ./ncurses/trace/README 6167 6201 ./ncurses/trace/lib_trace.c 6168 @@ -891,6 +90 0,7 @@6202 @@ -891,6 +902,7 @@ 6169 6203 ./ncurses/widechar/lib_in_wchnstr.c 6170 6204 ./ncurses/widechar/lib_ins_wch.c … … 6174 6208 ./ncurses/widechar/lib_slk_wset.c 6175 6209 ./ncurses/widechar/lib_unget_wch.c 6176 @@ -934,29 +94 4,6 @@6210 @@ -934,29 +946,6 @@ 6177 6211 ./progs/toe.c 6178 6212 ./progs/tput.c … … 6204 6238 ./test/Makefile.in 6205 6239 ./test/README 6206 @@ -981,6 +9 68,7 @@6240 @@ -981,6 +970,7 @@ 6207 6241 ./test/demo_termcap.c 6208 6242 ./test/ditto.c … … 6212 6246 ./test/edit_field.c 6213 6247 ./test/edit_field.h 6214 @@ -992,8 +98 0,11 @@6248 @@ -992,8 +982,11 @@ 6215 6249 ./test/gdc.c 6216 6250 ./test/hanoi.c … … 6224 6258 ./test/knight.c 6225 6259 ./test/linux-color.dat 6226 @@ -1010,8 +100 1,15 @@6260 @@ -1010,8 +1003,15 @@ 6227 6261 ./test/rain.c 6228 6262 ./test/redraw.c … … 6242 6276 diff -Naur ncurses-5.6.orig/NEWS ncurses-5.6/NEWS 6243 6277 --- ncurses-5.6.orig/NEWS 2006-12-17 15:36:26.000000000 -0500 6244 +++ ncurses-5.6/NEWS 200 7-12-21 00:02:36.000000000 -05006278 +++ ncurses-5.6/NEWS 2008-06-18 06:49:52.000000000 -0400 6245 6279 @@ -1,5 +1,5 @@ 6246 6280 ------------------------------------------------------------------------------- 6247 6281 --- Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. -- 6248 +-- Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. --6282 +-- Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. -- 6249 6283 -- -- 6250 6284 -- Permission is hereby granted, free of charge, to any person obtaining a -- … … 6255 6289 ------------------------------------------------------------------------------- 6256 6290 --- $Id: NEWS,v 1.1056 2006/12/17 20:36:26 tom Exp $ 6257 +-- $Id: NEWS,v 1.1 187 2007/12/16 00:23:41tom Exp $6291 +-- $Id: NEWS,v 1.1245 2008/06/14 23:08:10 tom Exp $ 6258 6292 ------------------------------------------------------------------------------- 6259 6293 6260 6294 This is a log of changes that ncurses has gone through since Zeyd started 6261 @@ -45,9 +45, 508 @@6295 @@ -45,9 +45,688 @@ 6262 6296 Changes through 1.9.9e did not credit all contributions; 6263 6297 it is not possible to add this information. 6264 6298 6299 +20080614 6300 + + modify test/ditto.c to illustrate multi-threaded use_screen(). 6301 + + change CC_SHARED_OPTS from -KPIC to -xcode=pic32 for Solaris. 6302 + + add "-shared" option to MK_SHARED_LIB for gcc on Solaris (report 6303 + by Poor Yorick). 6304 + 6305 +20080607 6306 + + finish changes to wgetch(), making it switch as needed to the 6307 + window's actual screen when calling wrefresh() and wgetnstr(). That 6308 + allows wgetch() to get used concurrently in different threads with 6309 + some minor restrictions, e.g., the application should not delete a 6310 + window which is being used in a wgetch(). 6311 + + simplify mutex's, combining the window- and screen-mutex's. 6312 + 6313 +20080531 6314 + + modify wgetch() to use the screen which corresponds to its window 6315 + parameter rather than relying on SP; some dependent functions still 6316 + use SP internally. 6317 + + factor out most use of SP in lib_mouse.c, using parameter. 6318 + + add internal _nc_keyname(), replacing keyname() to associate with a 6319 + particular SCREEN rather than the global SP. 6320 + + add internal _nc_unctrl(), replacing unctrl() to associate with a 6321 + particular SCREEN rather than the global SP. 6322 + + add internal _nc_tracemouse(), replacing _tracemouse() to eliminate 6323 + its associated global buffer _nc_globals.tracemse_buf now in SCREEN. 6324 + + add internal _nc_tracechar(), replacing _tracechar() to use SCREEN in 6325 + preference to the global _nc_globals.tracechr_buf buffer. 6326 + 6327 +20080524 6328 + + modify _nc_keypad() to make it switch temporarily as needed to the 6329 + screen which must be updated. 6330 + + wrap cur_term variable to help make _nc_keymap() thread-safe, and 6331 + always set the screen's copy of this variable in set_curterm(). 6332 + + restore curs_set() state after endwin()/refresh() (report/patch 6333 + Miroslav Lichvar) 6334 + 6335 +20080517 6336 + + modify configure script to note that --enable-ext-colors and 6337 + --enable-ext-mouse are not experimental, but extensions from 6338 + the ncurses ABI 5. 6339 + + corrected manpage description of setcchar() (discussion with 6340 + Emanuele Giaquinta). 6341 + + fix for adding a non-spacing character at the beginning of a line 6342 + (report/patch by Miroslav Lichvar). 6343 + 6344 +20080503 6345 + + modify screen.* terminfo entries using new screen+fkeys to fix 6346 + overridden keys in screen.rxvt (Debian #478094) -TD 6347 + + modify internal interfaces to reduce wgetch()'s dependency on the 6348 + global SP. 6349 + + simplify some loops with macros each_screen(), each_window() and 6350 + each_ripoff(). 6351 + 6352 +20080426 6353 + + continue modifying test/ditto.c toward making it demonstrate 6354 + multithreaded use_screen(), using fifos to pass data between screens. 6355 + + fix typo in form.3x (report by Mike Gran). 6356 + 6357 +20080419 6358 + + add screen.rxvt terminfo entry -TD 6359 + + modify tic -f option to format spaces as \s to prevent them from 6360 + being lost when that is read back in unformatted strings. 6361 + + improve test/ditto.c, using a "talk"-style layout. 6362 + 6363 +20080412 6364 + + change test/ditto.c to use openpty() and xterm. 6365 + + add locks for copywin(), dupwin(), overlap(), overlay() on their 6366 + window parameters. 6367 + + add locks for initscr() and newterm() on updates to the SCREEN 6368 + pointer. 6369 + + finish table in curs_thread.3x manpage. 6370 + 6371 +20080405 6372 + + begin table in curs_thread.3x manpage describing the scope of data 6373 + used by each function (or symbol) for threading analysis. 6374 + + add null-pointer checks to setsyx() and getsyx() (prompted by 6375 + discussion by Martin v. Lowis and Jeroen Ruigrok van der Werven on 6376 + python-dev2 mailing list). 6377 + 6378 +20080329 6379 + + add null-pointer checks in set_term() and delscreen(). 6380 + + move _nc_windows into _nc_globals, since windows can be pads, which 6381 + are not associated with a particular screen. 6382 + + change use_screen() to pass the SCREEN* parameter rather than 6383 + stdscr to the callback function. 6384 + + force libtool to use tag for 'CC' in case it does not detect this, 6385 + e.g., on aix when using CC=powerpc-ibm-aix5.3.0.0-gcc 6386 + (report/patch by Michael Haubenwallner). 6387 + + override OBJEXT to "lo" when building with libtool, to work on 6388 + platforms such as AIX where libtool may use a different suffix for 6389 + the object files than ".o" (report/patch by Michael Haubenwallner). 6390 + + add configure --with-pthread option, for building with the POSIX 6391 + thread library. 6392 + 6393 +20080322 6394 + + fill in extended-color pair two more places in wbkgrndset() and 6395 + waddch_nosync() (prompted by Sedeno's patch). 6396 + + fill in extended-color pair in _nc_build_wch() to make colors work 6397 + for wide-characters using extended-colors (patch by Alejandro R 6398 + Sedeno). 6399 + + add x/X toggles to ncurses.c C color test to test/demo 6400 + wide-characters with extended-colors. 6401 + + add a/A toggles to ncurses.c c/C color tests. 6402 + + modify test/ditto.c to use use_screen(). 6403 + + finish modifying test/rain.c to demonstrate threads. 6404 + 6405 +20080308 6406 + + start modifying test/rain.c for threading demo. 6407 + + modify test/ncurses.c to make 'f' test accept the f/F/b/F/</> toggles 6408 + that the 'F' accepts. 6409 + + modify test/worm.c to show trail in reverse-video when other threads 6410 + are working concurrently. 6411 + + fix a deadlock from improper nesting of mutexes for windowlist and 6412 + window. 6413 + 6414 +20080301 6415 + + fixes from 20080223 resolved issue with mutexes; change to use 6416 + recursive mutexes to fix memory leak in delwin() as called from 6417 + _nc_free_and_exit(). 6418 + 6419 +20080223 6420 + + fix a size-difference in _nc_globals which caused hanging of mutex 6421 + lock/unlock when termlib was built separately. 6422 + 6423 +20080216 6424 + + avoid using nanosleep() in threaded configuration since that often 6425 + is implemented to suspend the entire process. 6426 + 6427 +20080209 6428 + + update test programs to build/work with various UNIX curses for 6429 + comparisons. This was to reinvestigate statement in X/Open curses 6430 + that insnstr and winsnstr perform wrapping. None of the Unix-branded 6431 + implementations do this, as noted in manpage (cf: 20040228). 6432 + 6433 +20080203 6434 + + modify _nc_setupscreen() to set the legacy-coding value the same 6435 + for both narrow/wide models. It had been set only for wide model, 6436 + but is needed to make unctrl() work with locale in the narrow model. 6437 + + improve waddch() and winsch() handling of EILSEQ from mbrtowc() by 6438 + using unctrl() to display illegal bytes rather than trying to append 6439 + further bytes to make up a valid sequence (reported by Andrey A 6440 + Chernov). 6441 + + modify unctrl() to check codes in 128-255 range versus isprint(). 6442 + If they are not printable, and locale was set, use a "M-" or "~" 6443 + sequence. 6444 + 6445 +20080126 6446 + + improve threading in test/worm.c (wrap refresh calls, and KEY_RESIZE 6447 + handling). Now it hangs in napms(), no matter whether nanosleep() 6448 + or poll() or select() are used on Linux. 6449 + 6450 +20080119 6451 + + fixes to build with --disable-ext-funcs 6452 + + add manpage for use_window and use_screen. 6453 + + add set_tabsize() and set_escdelay() functions. 6454 + 6455 +20080112 6456 + + remove recursive-mutex definitions, finish threading demo for worm.c 6457 + + remove a redundant adjustment of lines in resizeterm.c's 6458 + adjust_window() which caused occasional misadjustment of stdscr when 6459 + softkeys were used. 6460 + 6461 +20080105 6462 + + several improvements to terminfo entries based on xterm #230 -TD 6463 + + modify MKlib_gen.sh to handle keyname/key_name prototypes, so the 6464 + "link_test" builds properly. 6465 + + fix for toe command-line options -u/-U to ensure filename is given. 6466 + + fix allocation-size for command-line parsing in infocmp from 20070728 6467 + (report by Miroslav Lichvar) 6468 + + improve resizeterm() by moving ripped-off lines, and repainting the 6469 + soft-keys (report by Katarina Machalkova) 6470 + + add clarification in wclear's manpage noting that the screen will be 6471 + cleared even if a subwindow is cleared (prompted by Christer Enfors 6472 + question). 6473 + + change test/ncurses.c soft-key tests to work with KEY_RESIZE. 6474 + 6475 +20071222 6476 + + continue implementing support for threading demo by adding mutex 6477 + for delwin(). 6478 + 6265 6479 +20071215 6266 6480 + + add several functions to C++ binding which wrap C functions that … … 6769 6983 definitions in <wchar.h>. 6770 6984 + revert the va_copy() change from 20061202, since it was neither 6771 @@ -62,7 + 561,7 @@6985 @@ -62,7 +741,7 @@ 6772 6986 + modify configure --with-gpm option to allow it to accept a parameter, 6773 6987 i.e., the name of the dynamic GPM library to load via dlopen() … … 6778 6992 'return' in preference to 'exit()'. 6779 6993 6780 @@ -1524,7 +2 023,8 @@6994 @@ -1524,7 +2203,8 @@ 6781 6995 20031108 6782 6996 + add DJGPP to special case of DOS-style drive letters potentially … … 6788 7002 6789 7003 20031101 6790 @@ -1814,7 +2 314,7 @@7004 @@ -1814,7 +2494,7 @@ 6791 7005 "--srcdir" work (report by Warren L Dodge). 6792 7006 + correct missing definition of $(CC) in Ada95/gen/Makefile.in … … 6797 7011 6798 7012 20030503 6799 @@ -3449,7 + 3949,7 @@7013 @@ -3449,7 +4129,7 @@ 6800 7014 6801 7015 20000923 … … 6806 7020 <jhawk@MIT.EDU> (see NetBSD misc/11052)). 6807 7021 + using parameter check added to tic, corrected 27 typos in 6808 @@ -4266,7 +4 766,7 @@7022 @@ -4266,7 +4946,7 @@ 6809 7023 <bledp@voila.fr>)). 6810 7024 + change renaming of dft_fgbg.3x to use_default_colors.3ncurses in … … 6815 7029 + corrected scoansi terminfo entry by testing with scoterm and console. 6816 7030 + revert change from 990614 to terminal_interface-curses-forms.ads.m4, 6817 @@ -5309,7 +5 809,7 @@7031 @@ -5309,7 +5989,7 @@ 6818 7032 6819 7033 980321 … … 6826 7040 diff -Naur ncurses-5.6.orig/TO-DO ncurses-5.6/TO-DO 6827 7041 --- ncurses-5.6.orig/TO-DO 2006-10-28 15:49:16.000000000 -0400 6828 +++ ncurses-5.6/TO-DO 200 7-12-21 00:02:35.000000000 -05007042 +++ ncurses-5.6/TO-DO 2008-06-18 06:49:44.000000000 -0400 6829 7043 @@ -1,5 +1,5 @@ 6830 7044 ------------------------------------------------------------------------------- … … 6891 7105 diff -Naur ncurses-5.6.orig/aclocal.m4 ncurses-5.6/aclocal.m4 6892 7106 --- ncurses-5.6.orig/aclocal.m4 2006-12-17 11:12:38.000000000 -0500 6893 +++ ncurses-5.6/aclocal.m4 200 7-12-21 00:02:35.000000000 -05007107 +++ ncurses-5.6/aclocal.m4 2008-06-18 06:49:52.000000000 -0400 6894 7108 @@ -1,5 +1,5 @@ 6895 7109 dnl*************************************************************************** 6896 7110 -dnl Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 6897 +dnl Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *7111 +dnl Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 6898 7112 dnl * 6899 7113 dnl Permission is hereby granted, free of charge, to any person obtaining a * … … 6904 7118 dnl 6905 7119 -dnl $Id: aclocal.m4,v 1.407 2006/12/17 16:12:38 tom Exp $ 6906 +dnl $Id: aclocal.m4,v 1.44 2 2007/12/01 20:02:42tom Exp $7120 +dnl $Id: aclocal.m4,v 1.448 2008/06/14 19:12:45 tom Exp $ 6907 7121 dnl Macros used in NCURSES auto-configuration script. 6908 7122 dnl … … 6912 7126 ])dnl 6913 7127 dnl --------------------------------------------------------------------------- 6914 +dnl CF_ADD_INCDIR version: 8 updated: 2007/07/30 19:22:587128 +dnl CF_ADD_INCDIR version: 9 updated: 2008/02/09 13:15:34 6915 7129 +dnl ------------- 6916 7130 +dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it's … … 6954 7168 + 6955 7169 + if test "$cf_have_incdir" = no ; then 6956 + AC_VERBOSE(adding $cf_add_incdir to include-path)7170 + CF_VERBOSE(adding $cf_add_incdir to include-path) 6957 7171 + ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)" 6958 7172 + … … 6969 7183 +])dnl 6970 7184 +dnl --------------------------------------------------------------------------- 6971 +dnl CF_ADD_LIBDIR version: 5 updated: 2007/07/30 19:12:037185 +dnl CF_ADD_LIBDIR version: 6 updated: 2008/02/09 13:15:34 6972 7186 +dnl ------------- 6973 7187 +dnl Adds to the library-path … … 6997 7211 + fi 6998 7212 + if test "$cf_have_libdir" = no ; then 6999 + AC_VERBOSE(adding $cf_add_libdir to library-path)7213 + CF_VERBOSE(adding $cf_add_libdir to library-path) 7000 7214 + ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,[$]$2)" 7001 7215 + fi … … 7008 7222 dnl ---------------- 7009 7223 dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES' 7224 @@ -220,7 +313,7 @@ 7225 fi 7226 ])dnl 7227 dnl --------------------------------------------------------------------------- 7228 -dnl CF_ANSI_CC_REQD version: 3 updated: 1997/09/06 13:40:44 7229 +dnl CF_ANSI_CC_REQD version: 4 updated: 2008/03/23 14:48:54 7230 dnl --------------- 7231 dnl For programs that must use an ANSI compiler, obtain compiler options that 7232 dnl will make it recognize prototypes. We'll do preprocessor checks in other 7233 @@ -229,7 +322,7 @@ 7234 AC_DEFUN([CF_ANSI_CC_REQD], 7235 [AC_REQUIRE([CF_ANSI_CC_CHECK]) 7236 if test "$cf_cv_ansi_cc" = "no"; then 7237 - AC_ERROR( 7238 + AC_MSG_ERROR( 7239 [Your compiler does not appear to recognize prototypes. 7240 You have the following choices: 7241 a. adjust your compiler options 7242 @@ -521,7 +614,7 @@ 7243 test "$cf_cv_cgetent" = yes && AC_DEFINE(HAVE_BSD_CGETENT) 7244 ])dnl 7245 dnl --------------------------------------------------------------------------- 7246 -dnl CF_CHECK_CACHE version: 10 updated: 2004/05/23 13:03:31 7247 +dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59 7248 dnl -------------- 7249 dnl Check if we're accidentally using a cache from a different machine. 7250 dnl Derive the system name, as a check for reusing the autoconf cache. 7251 @@ -552,7 +645,7 @@ 7252 7253 if test ".$system_name" != ".$cf_cv_system_name" ; then 7254 AC_MSG_RESULT(Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)) 7255 - AC_ERROR("Please remove config.cache and try again.") 7256 + AC_MSG_ERROR("Please remove config.cache and try again.") 7257 fi 7258 ])dnl 7259 dnl --------------------------------------------------------------------------- 7010 7260 @@ -612,6 +705,50 @@ 7011 7261 … … 7171 7421 dnl --------------------------------------------------------------------------- 7172 7422 dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52 7173 @@ -1070,7 +1161,7 @@ 7423 @@ -967,6 +1058,34 @@ 7424 test "$cf_cv_func_nanosleep" = "yes" && AC_DEFINE(HAVE_NANOSLEEP) 7425 ]) 7426 dnl --------------------------------------------------------------------------- 7427 +dnl CF_FUNC_OPENPTY version: 2 updated: 2008/04/12 19:49:01 7428 +dnl --------------- 7429 +dnl Check for openpty() function, along with <pty.h> header. It may need the 7430 +dnl "util" library as well. 7431 +AC_DEFUN([CF_FUNC_OPENPTY], 7432 +[ 7433 +AC_CHECK_LIB(util,openpty,cf_cv_lib_util=yes,cf_cv_lib_util=no) 7434 +AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[ 7435 + cf_save_LIBS="$LIBS" 7436 + test $cf_cv_lib_util = yes && LIBS="-lutil $LIBS" 7437 + for cf_header in pty.h libutil.h util.h 7438 + do 7439 + AC_TRY_LINK([ 7440 +#include <$cf_header> 7441 +],[ 7442 + int x = openpty((int *)0, (int *)0, (char *)0, 7443 + (struct termios *)0, (struct winsize *)0); 7444 +],[ 7445 + cf_cv_func_openpty=$cf_header 7446 + break 7447 +],[ 7448 + cf_cv_func_openpty=no 7449 +]) 7450 + done 7451 + LIBS="$cf_save_LIBS" 7452 +]) 7453 +])dnl 7454 +dnl --------------------------------------------------------------------------- 7455 dnl CF_FUNC_POLL version: 4 updated: 2006/12/16 12:33:30 7456 dnl ------------ 7457 dnl See if the poll function really works. Some platforms have poll(), but 7458 @@ -1070,7 +1189,7 @@ 7174 7459 7175 7460 ])dnl … … 7180 7465 dnl Test for availability of useful gcc __attribute__ directives to quiet 7181 7466 dnl compiler warnings. Though useful, not all are supported -- and contrary 7182 @@ -1097,7 +1 188,7 @@7467 @@ -1097,7 +1216,7 @@ 7183 7468 then 7184 7469 AC_CHECKING([for $CC __attribute__ directives]) … … 7189 7474 #include "conftest.h" 7190 7475 #include "conftest.i" 7191 @@ -1159,7 +12 50,7 @@7476 @@ -1159,7 +1278,7 @@ 7192 7477 fi 7193 7478 ])dnl … … 7198 7483 dnl Check if the compiler supports useful warning options. There's a few that 7199 7484 dnl we don't use, simply because they're too noisy: 7200 @@ -1184,7 +1 275,7 @@7485 @@ -1184,7 +1303,7 @@ 7201 7486 CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) 7202 7487 … … 7207 7492 EOF 7208 7493 7209 @@ -1205,7 +1 296,7 @@7494 @@ -1205,7 +1324,7 @@ 7210 7495 AC_CHECKING([for $CC warning options]) 7211 7496 cf_save_CFLAGS="$CFLAGS" … … 7216 7501 wd1682 \ 7217 7502 wd1683 \ 7218 @@ -1561,11 +16 52,24 @@7503 @@ -1561,11 +1680,24 @@ 7219 7504 AC_SUBST(EXTRA_CXXFLAGS) 7220 7505 ])dnl … … 7242 7527 CF_HASHED_DB_VERSION 7243 7528 if test "$cf_cv_hashed_db_version" = unknown ; then 7244 @@ -1583,7 +1 687,7 @@7529 @@ -1583,7 +1715,7 @@ 7245 7530 ]) 7246 7531 ])dnl … … 7251 7536 dnl Given that we have the header and version for hashed database, find the 7252 7537 dnl library information. 7253 @@ -1591,7 +1 695,7 @@7538 @@ -1591,7 +1723,7 @@ 7254 7539 [ 7255 7540 AC_CACHE_CHECK(for db libraries, cf_cv_hashed_db_libs,[ … … 7260 7545 cf_save_libs="$LIBS" 7261 7546 if test -n "$cf_db_libs"; then 7262 @@ -1655,7 +17 59,7 @@7547 @@ -1655,7 +1787,7 @@ 7263 7548 ]) 7264 7549 ])dnl … … 7269 7554 dnl Given that we have the header file for hashed database, find the version 7270 7555 dnl information. 7271 @@ -1664,7 +17 68,7 @@7556 @@ -1664,7 +1796,7 @@ 7272 7557 AC_CACHE_CHECK(for version of db, cf_cv_hashed_db_version,[ 7273 7558 cf_cv_hashed_db_version=unknown … … 7278 7563 CF_MSG_LOG(checking for db version $cf_db_version) 7279 7564 AC_TRY_COMPILE([ 7280 @@ -1778,7 +1 882,7 @@7565 @@ -1778,7 +1910,7 @@ 7281 7566 test "$cf_cv_have_isascii" = yes && AC_DEFINE(HAVE_ISASCII) 7282 7567 ])dnl … … 7287 7572 dnl Add checks for large file support. 7288 7573 AC_DEFUN([CF_LARGEFILE],[ 7289 @@ -1796,6 +19 00,7 @@7574 @@ -1796,6 +1928,7 @@ 7290 7575 # the config.h 7291 7576 test "$ac_cv_sys_large_files" != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES " … … 7295 7580 AC_CACHE_CHECK(whether to use struct dirent64, cf_cv_struct_dirent64,[ 7296 7581 AC_TRY_COMPILE([ 7297 @@ -1816,6 +19 21,48 @@7582 @@ -1816,6 +1949,48 @@ 7298 7583 ]) 7299 7584 ]) … … 7344 7629 dnl ---------- 7345 7630 dnl Check for libutf8 7346 @@ -1852,11 + 1999,11 @@7631 @@ -1852,11 +2027,11 @@ 7347 7632 AC_SUBST(LIB_PREFIX) 7348 7633 ])dnl … … 7358 7643 dnl 7359 7644 dnl For shared libraries, make a list of symbolic links to construct when 7360 @@ -1875,7 +20 22,6 @@7645 @@ -1875,7 +2050,6 @@ 7361 7646 continue 7362 7647 elif test -f $srcdir/$cf_dir/modules; then … … 7366 7651 LIBS_TO_MAKE= 7367 7652 for cf_item in $cf_LIST_MODELS 7368 @@ -1922,9 +20 68,7 @@7653 @@ -1922,9 +2096,7 @@ 7369 7654 # use autodetected ${cf_prefix} for import lib and static lib, but 7370 7655 # use 'cyg' prefix for shared lib. … … 7377 7662 fi 7378 7663 fi 7379 @@ -1933,17 +2 077,34 @@7664 @@ -1933,17 +2105,34 @@ 7380 7665 7381 7666 if test $cf_dir = ncurses ; then … … 7418 7703 $cf_dir/Makefile >$cf_dir/Makefile.out 7419 7704 mv $cf_dir/Makefile.out $cf_dir/Makefile 7420 @@ -1968,13 +21 29,20 @@7705 @@ -1968,13 +2157,20 @@ 7421 7706 case $cf_subset in 7422 7707 *base*) … … 7441 7726 fi 7442 7727 7443 @@ -2015,8 +2 183,11 @@7728 @@ -2015,8 +2211,11 @@ 7444 7729 prefix=$cf_prefix \ 7445 7730 suffix=$cf_suffix \ … … 7453 7738 rmSoLocs=$cf_cv_rm_so_locs \ 7454 7739 ldconfig="$LDCONFIG" \ 7455 @@ -2103,8 +2 274,8 @@7740 @@ -2103,8 +2302,8 @@ 7456 7741 7457 7742 cat >> Makefile <<CF_EOF … … 7464 7749 7465 7750 install.man \\ 7466 @@ -2113,7 +2 284,7 @@7751 @@ -2113,7 +2312,7 @@ 7467 7752 7468 7753 distclean :: … … 7473 7758 CF_EOF 7474 7759 7475 @@ -2224,41 +2 395,10 @@7760 @@ -2224,41 +2423,10 @@ 7476 7761 fi 7477 7762 … … 7519 7804 7520 7805 if test -f $srcdir/$cf_dir/modules; then 7521 @@ -2776,7 +29 16,7 @@7806 @@ -2776,7 +2944,7 @@ 7522 7807 AC_MSG_RESULT($MANPAGE_TBL) 7523 7808 ])dnl … … 7528 7813 dnl Try to determine if the man-pages on the system are compressed, and if 7529 7814 dnl so, what format is used. Use this information to construct a script that 7530 @@ -2826,6 +29 66,7 @@7815 @@ -2826,6 +2994,7 @@ 7531 7816 esac 7532 7817 … … 7536 7821 cat >$cf_edit_man <<CF_EOF 7537 7822 #! /bin/sh 7538 @@ -2841,7 + 2982,7 @@7823 @@ -2841,7 +3010,7 @@ 7539 7824 NCURSES_OSPEED="$NCURSES_OSPEED" 7540 7825 TERMINFO="$TERMINFO" … … 7545 7830 INSTALL="$INSTALL" 7546 7831 INSTALL_DATA="$INSTALL_DATA" 7547 @@ -2889,6 +30 30,32 @@7832 @@ -2889,6 +3058,32 @@ 7548 7833 \$MKDIRS \$cf_subdir\$section 7549 7834 fi … … 7578 7863 cf_source=\`basename \$i\` 7579 7864 inalias=\$cf_source 7580 @@ -2901,7 +30 68,7 @@7865 @@ -2901,7 +3096,7 @@ 7581 7866 7582 7867 if test "$MANPAGE_ALIASES" != no ; then … … 7587 7872 fi 7588 7873 7589 @@ -2922,36 +3 089,13 @@7874 @@ -2922,36 +3117,13 @@ 7590 7875 cf_target="\$cf_source" 7591 7876 fi … … 7626 7911 if test -f $MANPAGE_RENAMES ; then 7627 7912 cat >>$cf_edit_man <<CF_EOF 7628 @@ -3012,6 +31 56,7 @@7913 @@ -3012,6 +3184,7 @@ 7629 7914 if test \$verb = installing ; then 7630 7915 echo \$verb \$cf_target … … 7634 7919 cd \$cf_subdir\${section} && ( 7635 7920 cf_source=\`echo \$cf_target |sed -e 's%^.*/\([[^/]][[^/]]*/[[^/]][[^/]]*$\)%\1%'\` 7636 @@ -3053,8 +3 198,11 @@7921 @@ -3053,8 +3226,11 @@ 7637 7922 ) 7638 7923 ) … … 7648 7933 cd \$cf_subdir\${section} && ( 7649 7934 for cf_alias in \$aliases 7650 @@ -3192,12 +33 40,12 @@7935 @@ -3192,12 +3368,12 @@ 7651 7936 fi 7652 7937 ])dnl … … 7663 7948 dnl --------------------------------------------------------------------------- 7664 7949 dnl CF_NCURSES_ABI_6 version: 1 updated: 2005/09/17 18:42:49 7665 @@ -3680,7 +3828,73 @@ 7950 @@ -3297,7 +3473,7 @@ 7951 AC_SUBST(PATHSEP) 7952 ])dnl 7953 dnl --------------------------------------------------------------------------- 7954 -dnl CF_PATH_SYNTAX version: 11 updated: 2006/09/02 08:55:46 7955 +dnl CF_PATH_SYNTAX version: 12 updated: 2008/03/23 14:45:59 7956 dnl -------------- 7957 dnl Check the argument to see that it looks like a pathname. Rewrite it if it 7958 dnl begins with one of the prefix/exec_prefix variables, and then again if the 7959 @@ -3329,7 +3505,7 @@ 7960 $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%` 7961 ;; 7962 *) 7963 - ifelse($2,,[AC_ERROR([expected a pathname, not \"[$]$1\"])],$2) 7964 + ifelse($2,,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2) 7965 ;; 7966 esac 7967 ])dnl 7968 @@ -3680,7 +3856,73 @@ 7666 7969 -e 's/-[[UD]]$3\(=[[^ ]]*\)\?[$]//g'` 7667 7970 ])dnl … … 7734 8037 +])dnl 7735 8038 +dnl --------------------------------------------------------------------------- 7736 +dnl CF_SHARED_OPTS version: 4 6 updated: 2007/02/24 18:58:098039 +dnl CF_SHARED_OPTS version: 48 updated: 2008/06/14 15:08:17 7737 8040 dnl -------------- 7738 8041 dnl -------------- 7739 8042 dnl Attempt to determine the appropriate CC/LD options for creating a shared 7740 @@ -3757,14 +3971,27 @@ 8043 @@ -3726,7 +3968,7 @@ 8044 cf_cv_shlib_version=$withval 8045 ;; 8046 *) 8047 - AC_ERROR([option value must be one of: rel, abi, auto or no]) 8048 + AC_MSG_ERROR([option value must be one of: rel, abi, auto or no]) 8049 ;; 8050 esac 8051 ],[cf_cv_shlib_version=auto]) 8052 @@ -3757,14 +3999,27 @@ 7741 8053 ;; 7742 8054 cygwin*) … … 7768 8080 cf_cv_shlib_version_infix=yes 7769 8081 AC_CACHE_CHECK([if ld -search_paths_first works], cf_cv_ldflags_search_paths_first, [ 7770 @@ -3818,11 +40 45,11 @@8082 @@ -3818,11 +4073,11 @@ 7771 8083 CF_SHARED_SONAME 7772 8084 MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,-lc -o $[@]' … … 7782 8094 MK_SHARED_LIB='${LD} -Bshareable -o $[@]' 7783 8095 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel 7784 @@ -4043,6 +4270,41 @@ 8096 @@ -3903,9 +4158,7 @@ 8097 ;; 8098 solaris2*) 8099 # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2 8100 - if test "$GCC" != yes; then 8101 - CC_SHARED_OPTS='-KPIC' 8102 - fi 8103 + # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3 8104 if test "$DFT_LWR_MODEL" = "shared" ; then 8105 LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}" 8106 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 8107 @@ -3915,7 +4168,12 @@ 8108 EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS" 8109 fi 8110 CF_SHARED_SONAME 8111 - MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $[@]' 8112 + if test "$GCC" != yes; then 8113 + CC_SHARED_OPTS='-xcode=pic32' 8114 + MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $[@]' 8115 + else 8116 + MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_shared_soname' -o $[@]' 8117 + fi 8118 ;; 8119 sysv5uw7*|unix_sv*) 8120 # tested with UnixWare 7.1.0 (gcc 2.95.2 and cc) 8121 @@ -4043,6 +4301,41 @@ 7785 8122 fi 7786 8123 ])dnl … … 7824 8161 dnl ------------- 7825 8162 dnl Check for definitions & structures needed for window size-changing 7826 @@ -4503,11 +47 65,12 @@8163 @@ -4503,11 +4796,12 @@ 7827 8164 $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 7828 8165 ])dnl … … 7838 8175 dnl --------------------------------------------------------------------------- 7839 8176 dnl CF_WCHAR_TYPE version: 2 updated: 2004/01/17 19:18:20 7840 @@ -4643,7 +4906,7 @@ 8177 @@ -4610,7 +4904,7 @@ 8178 fi 8179 ])dnl 8180 dnl --------------------------------------------------------------------------- 8181 -dnl CF_WITH_GPM version: 6 updated: 2006/12/17 11:12:09 8182 +dnl CF_WITH_GPM version: 7 updated: 2008/03/23 14:48:54 8183 dnl ----------- 8184 dnl 8185 dnl The option parameter (if neither yes/no) is assumed to be the name of 8186 @@ -4632,7 +4926,7 @@ 8187 AC_DEFINE(HAVE_LIBGPM) 8188 else 8189 AC_CHECK_LIB(gpm,Gpm_Open,[:],[ 8190 - AC_ERROR(Cannot link with GPM library) 8191 + AC_MSG_ERROR(Cannot link with GPM library) 8192 fi 8193 with_gpm=yes 8194 ]) 8195 @@ -4643,7 +4937,7 @@ 7841 8196 fi 7842 8197 ]) 7843 8198 dnl --------------------------------------------------------------------------- 7844 8199 -dnl CF_WITH_LIBTOOL version: 10 updated: 2006/10/14 15:23:15 7845 +dnl CF_WITH_LIBTOOL version: 1 8 updated: 2007/04/08 20:02:388200 +dnl CF_WITH_LIBTOOL version: 19 updated: 2008/03/29 15:46:43 7846 8201 dnl --------------- 7847 8202 dnl Provide a configure option to incorporate libtool. Define several useful 7848 8203 dnl symbols for the makefile rules. 7849 @@ -4692,7 +49 55,7 @@8204 @@ -4692,7 +4986,7 @@ 7850 8205 # doing: 7851 8206 LIB_CLEAN= … … 7856 8211 LIB_UNINSTALL= 7857 8212 7858 @@ -4718,12 + 4981,12 @@8213 @@ -4718,12 +5012,12 @@ 7859 8214 AC_MSG_ERROR(Cannot find libtool) 7860 8215 fi … … 7872 8227 LIB_UNINSTALL='${LIBTOOL} --mode=uninstall' 7873 8228 LIB_PREP=: 7874 @@ -4734,1 0 +4997,10@@8229 @@ -4734,16 +5028,17 @@ 7875 8230 # Save the version in a cache variable - this is not entirely a good 7876 8231 # thing, but the version string from libtool is very ugly, and for … … 7885 8240 7886 8241 # special hack to add --tag option for C++ compiler 7887 @@ -4758,6 +5021,7 @@ 8242 case $cf_cv_libtool_version in 8243 1.[[5-9]]*|[[2-9]]*) 8244 LIBTOOL_CXX="$LIBTOOL --tag=CXX" 8245 + LIBTOOL="$LIBTOOL --tag=CC" 8246 ;; 8247 *) 8248 LIBTOOL_CXX="$LIBTOOL" 8249 @@ -4758,6 +5053,7 @@ 7888 8250 7889 8251 AC_SUBST(LIBTOOL) … … 7893 8255 AC_SUBST(LIB_CREATE) 7894 8256 AC_SUBST(LIB_OBJECT) 7895 @@ -4772,7 +50 36,7 @@8257 @@ -4772,7 +5068,7 @@ 7896 8258 7897 8259 ])dnl … … 7902 8264 dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just 7903 8265 dnl defaulting to yes/no. 7904 @@ -4786,7 +50 50,9 @@8266 @@ -4786,7 +5082,9 @@ 7905 8267 AC_DEFUN([CF_WITH_PATH], 7906 8268 [AC_ARG_WITH($1,[$2 ](default: ifelse($4,,empty,$4)),, … … 7912 8274 AC_SUBST($3)dnl 7913 8275 ])dnl 7914 @@ -4896,7 +5162,7 @@ 8276 @@ -4833,6 +5131,32 @@ 8277 8278 ])dnl 8279 dnl --------------------------------------------------------------------------- 8280 +dnl CF_WITH_PTHREAD version: 1 updated: 2008/03/29 13:42:21 8281 +dnl --------------- 8282 +dnl Check for POSIX thread library. 8283 +AC_DEFUN([CF_WITH_PTHREAD], 8284 +[ 8285 +AC_MSG_CHECKING(if you want to link with the pthread library) 8286 +AC_ARG_WITH(pthread, 8287 + [ --with-pthread use POSIX thread library], 8288 + [with_pthread=$withval], 8289 + [with_pthread=no]) 8290 +AC_MSG_RESULT($with_pthread) 8291 + 8292 +if test "$with_pthread" != no ; then 8293 + AC_CHECK_HEADER(pthread.h,[ 8294 + AC_DEFINE(HAVE_PTHREADS_H) 8295 + AC_CHECK_LIB(pthread,pthread_create,[ 8296 + LIBS="-lpthread $LIBS" 8297 + AC_DEFINE(HAVE_LIBPTHREADS) 8298 + with_pthread=yes 8299 + ],[ 8300 + AC_MSG_ERROR(Cannot link with pthread library) 8301 + ]) 8302 + ]) 8303 +fi 8304 +]) 8305 +dnl --------------------------------------------------------------------------- 8306 dnl CF_WITH_REL_VERSION version: 1 updated: 2003/09/20 18:12:49 8307 dnl ------------------- 8308 dnl Allow library's release-version to be overridden. Generally this happens when a 8309 @@ -4896,7 +5220,7 @@ 7915 8310 [USE_VALGRIND]) 7916 8311 ])dnl … … 7921 8316 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, 7922 8317 dnl or adapt to the vendor's definitions to get equivalent functionality, 7923 @@ -4930,7 +5 196,7 @@8318 @@ -4930,7 +5254,7 @@ 7924 8319 irix[[56]].*) #(vi 7925 8320 CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" … … 7932 8327 diff -Naur ncurses-5.6.orig/c++/Makefile.in ncurses-5.6/c++/Makefile.in 7933 8328 --- ncurses-5.6.orig/c++/Makefile.in 2006-10-21 13:07:49.000000000 -0400 7934 +++ ncurses-5.6/c++/Makefile.in 200 7-12-21 00:02:35.000000000 -05008329 +++ ncurses-5.6/c++/Makefile.in 2008-06-18 06:49:44.000000000 -0400 7935 8330 @@ -1,6 +1,6 @@ 7936 8331 -# $Id: Makefile.in,v 1.78 2006/10/21 17:07:49 tom Exp $ … … 7994 8389 diff -Naur ncurses-5.6.orig/c++/README-first ncurses-5.6/c++/README-first 7995 8390 --- ncurses-5.6.orig/c++/README-first 2006-04-22 18:19:37.000000000 -0400 7996 +++ ncurses-5.6/c++/README-first 200 7-12-21 00:02:35.000000000 -05008391 +++ ncurses-5.6/c++/README-first 2008-06-18 06:49:44.000000000 -0400 7997 8392 @@ -1,5 +1,5 @@ 7998 8393 ------------------------------------------------------------------------------- … … 8077 8472 diff -Naur ncurses-5.6.orig/c++/cursesapp.cc ncurses-5.6/c++/cursesapp.cc 8078 8473 --- ncurses-5.6.orig/c++/cursesapp.cc 2005-04-03 08:25:23.000000000 -0400 8079 +++ ncurses-5.6/c++/cursesapp.cc 200 7-12-21 00:02:35.000000000 -05008474 +++ ncurses-5.6/c++/cursesapp.cc 2008-06-18 06:49:44.000000000 -0400 8080 8475 @@ -1,6 +1,6 @@ 8081 8476 // * this is for making emacs happy: -*-Mode: C++;-*- … … 8114 8509 diff -Naur ncurses-5.6.orig/c++/cursesmain.cc ncurses-5.6/c++/cursesmain.cc 8115 8510 --- ncurses-5.6.orig/c++/cursesmain.cc 2003-10-25 10:53:13.000000000 -0400 8116 +++ ncurses-5.6/c++/cursesmain.cc 200 7-12-21 00:02:35.000000000 -05008511 +++ ncurses-5.6/c++/cursesmain.cc 2008-06-18 06:49:44.000000000 -0400 8117 8512 @@ -1,6 +1,6 @@ 8118 8513 // * this is for making emacs happy: -*-Mode: C++;-*- … … 8178 8573 diff -Naur ncurses-5.6.orig/c++/cursesp.h ncurses-5.6/c++/cursesp.h 8179 8574 --- ncurses-5.6.orig/c++/cursesp.h 2005-08-13 14:09:21.000000000 -0400 8180 +++ ncurses-5.6/c++/cursesp.h 200 7-12-21 00:02:35.000000000 -05008575 +++ ncurses-5.6/c++/cursesp.h 2008-06-18 06:49:44.000000000 -0400 8181 8576 @@ -1,6 +1,6 @@ 8182 8577 // * This makes emacs happy -*-Mode: C++;-*- … … 8207 8602 diff -Naur ncurses-5.6.orig/c++/cursespad.cc ncurses-5.6/c++/cursespad.cc 8208 8603 --- ncurses-5.6.orig/c++/cursespad.cc 2005-07-23 16:51:23.000000000 -0400 8209 +++ ncurses-5.6/c++/cursespad.cc 200 7-12-21 00:02:35.000000000 -05008604 +++ ncurses-5.6/c++/cursespad.cc 2008-06-18 06:49:44.000000000 -0400 8210 8605 @@ -1,6 +1,6 @@ 8211 8606 // * this is for making emacs happy: -*-Mode: C++;-*- … … 8234 8629 diff -Naur ncurses-5.6.orig/c++/cursesw.cc ncurses-5.6/c++/cursesw.cc 8235 8630 --- ncurses-5.6.orig/c++/cursesw.cc 2005-08-13 14:12:17.000000000 -0400 8236 +++ ncurses-5.6/c++/cursesw.cc 200 7-12-21 00:02:36.000000000 -05008631 +++ ncurses-5.6/c++/cursesw.cc 2008-06-18 06:49:45.000000000 -0400 8237 8632 @@ -1,77 +1,83 @@ 8238 8633 // * this is for making emacs happy: -*-Mode: C++;-*- … … 8933 9328 diff -Naur ncurses-5.6.orig/c++/cursesw.h ncurses-5.6/c++/cursesw.h 8934 9329 --- ncurses-5.6.orig/c++/cursesw.h 2005-07-23 16:51:39.000000000 -0400 8935 +++ ncurses-5.6/c++/cursesw.h 200 7-12-21 00:02:36.000000000 -05008936 @@ -1,6 +1, 6@@9330 +++ ncurses-5.6/c++/cursesw.h 2008-06-18 06:49:46.000000000 -0400 9331 @@ -1,6 +1,7 @@ 8937 9332 // * This makes emacs happy -*-Mode: C++;-*- 9333 +// vile:cppmode 8938 9334 /**************************************************************************** 8939 9335 - * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. * 8940 + * Copyright (c) 1998-200 5,2007Free Software Foundation, Inc. *9336 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 8941 9337 * * 8942 9338 * Permission is hereby granted, free of charge, to any person obtaining a * 8943 9339 * copy of this software and associated documentation files (the * 8944 @@ -30,17 +3 0,10 @@9340 @@ -30,17 +31,10 @@ 8945 9341 #ifndef NCURSES_CURSESW_H_incl 8946 9342 #define NCURSES_CURSESW_H_incl 1 … … 8950 9346 -#include <stdarg.h> 8951 9347 -#include <stdio.h> 8952 +// $Id: cursesw.h,v 1.4 7 2007/12/16 00:21:05tom Exp $9348 +// $Id: cursesw.h,v 1.48 2008/01/19 21:09:10 tom Exp $ 8953 9349 8954 9350 #include <etip.h> … … 8961 9357 # include <curses.h> 8962 9358 } 8963 @@ -61,16 +5 4,17 @@9359 @@ -61,16 +55,17 @@ 8964 9360 #define addch UNDEF(addch) 8965 9361 #endif … … 8987 9383 8988 9384 #ifdef addstr 8989 @@ -79,28 +7 3,34 @@9385 @@ -79,28 +74,34 @@ 8990 9386 #define addstr UNDEF(addstr) 8991 9387 #endif … … 9032 9428 9033 9429 #ifdef border 9034 @@ -116,18 +11 6,11 @@9430 @@ -116,18 +117,11 @@ 9035 9431 #define box UNDEF(box) 9036 9432 #endif … … 9056 9452 9057 9453 #ifdef clear 9058 @@ -156,6 +1 49,18 @@9454 @@ -156,6 +150,18 @@ 9059 9455 #define clrtoeol UNDEF(clrtoeol) 9060 9456 #endif … … 9075 9471 inline int UNDEF(delch)() { return delch(); } 9076 9472 #undef delch 9077 @@ -168,12 +17 3,24 @@9473 @@ -168,12 +174,24 @@ 9078 9474 #define deleteln UNDEF(deleteln) 9079 9475 #endif … … 9100 9496 inline int UNDEF(flushok)(WINDOW* _win, bool _bf) { 9101 9497 return flushok(_win, _bf); } 9102 @@ -183,91 +20 0,34 @@9498 @@ -183,91 +201,34 @@ 9103 9499 #define _no_flushok 9104 9500 #endif … … 9212 9608 9213 9609 #ifdef getnstr 9214 @@ -276,6 +23 6,18 @@9610 @@ -276,6 +237,18 @@ 9215 9611 #define getnstr UNDEF(getnstr) 9216 9612 #endif … … 9231 9627 inline void UNDEF(getyx)(const WINDOW* win, int& y, int& x) { 9232 9628 getyx(win, y, x); } 9233 @@ -283,18 +25 5,6 @@9629 @@ -283,18 +256,6 @@ 9234 9630 #define getyx UNDEF(getyx) 9235 9631 #endif … … 9250 9646 inline int UNDEF(hline)(chtype ch, int n) { return hline(ch, n); } 9251 9647 #undef hline 9252 @@ -307,18 +26 7,62 @@9648 @@ -307,18 +268,62 @@ 9253 9649 #define inch UNDEF(inch) 9254 9650 #endif … … 9313 9709 inline int UNDEF(leaveok)(WINDOW* win, bool bf) { return leaveok(win, bf); } 9314 9710 #undef leaveok 9315 @@ -333,142 +33 7,127 @@9711 @@ -333,142 +338,127 @@ 9316 9712 #define move UNDEF(move) 9317 9713 #endif … … 9543 9939 9544 9940 #ifdef mvwchgat 9545 @@ -479,212 +46 8,275 @@9941 @@ -479,212 +469,275 @@ 9546 9942 #define mvwchgat UNDEF(mvwchgat) 9547 9943 #endif … … 9963 10359 9964 10360 /* 9965 @@ -705,11 +75 7,13 @@10361 @@ -705,11 +758,13 @@ 9966 10362 private: 9967 10363 static bool b_initialized; … … 9978 10374 static int setpalette(short fore, short back, short pair); 9979 10375 static int colorInitialized; 9980 @@ -743,7 +79 7,7 @@10376 @@ -743,7 +798,7 @@ 9981 10377 NCursesWindow(); 9982 10378 … … 9987 10383 NCursesWindow(int nlines, // number of lines 9988 10384 int ncols, // number of columns 9989 @@ -823,16 +87 7,22 @@10385 @@ -823,16 +878,22 @@ 9990 10386 int width() const { return maxx() + 1; } 9991 10387 // Number of columns in this window … … 10014 10410 10015 10411 short getcolor() const; 10016 @@ -867,6 +92 7,15 @@10412 @@ -867,6 +928,15 @@ 10017 10413 void getyx(int& y, int& x) const { ::getyx(w, y, x); } 10018 10414 // Get current position of the cursor … … 10030 10426 return ::mvcur(oldrow, oldcol, newrow, newcol); } 10031 10427 // Perform lowlevel cursor motion that takes effect immediately. 10032 @@ -909,6 +97 8,9 @@10428 @@ -909,6 +979,9 @@ 10033 10429 ; 10034 10430 #endif … … 10040 10436 // Move the cursor to the requested position and then perform a scanw 10041 10437 // from the window. 10042 @@ -918,6 +99 0,10 @@10438 @@ -918,6 +991,10 @@ 10043 10439 ; 10044 10440 #endif … … 10051 10447 // output 10052 10448 // ------------------------------------------------------------------------- 10053 @@ -939,7 +101 5,17 @@10449 @@ -939,7 +1016,17 @@ 10054 10450 10055 10451 int addstr(int y, int x, const char * str, int n=-1) { … … 10070 10466 10071 10467 int printw(const char* fmt, ...) 10072 @@ -958,6 +104 4,12 @@10468 @@ -958,6 +1045,12 @@ 10073 10469 ; 10074 10470 #endif … … 10083 10479 // Retrieve attributed character under the current cursor position. 10084 10480 10085 @@ -965,6 +105 7,16 @@10481 @@ -965,6 +1058,16 @@ 10086 10482 // Move cursor to requested position and then retrieve attributed character 10087 10483 // at this position. … … 10100 10496 // Insert attributed character into the window before current cursor 10101 10497 // position. 10102 @@ -1001,6 +110 3,9 @@10498 @@ -1001,6 +1104,9 @@ 10103 10499 int attrset(chtype at) { return ::wattrset(w, static_cast<int>(at)); } 10104 10500 // Set the window attributes; … … 10110 10506 return ::wcolor_set(w, color_pair_number, opts); } 10111 10507 // Set the window color attribute; 10112 @@ -1116,11 +122 1,13 @@10508 @@ -1116,11 +1222,13 @@ 10113 10509 // If bf is TRUE, use insert/delete line hardware support if possible. 10114 10510 // Otherwise do it in software. … … 10125 10521 // Mark the whole window as modified. 10126 10522 10127 @@ -1173,9 +128 0,13 @@10523 @@ -1173,9 +1281,13 @@ 10128 10524 // If called with bf=TRUE, any change in the window will cause an 10129 10525 // automatic immediate refresh() … … 10139 10535 // If called with bf=TRUE, keys may generate 8-Bit characters. Otherwise 10140 10536 // 7-Bit characters are generated. 10141 @@ -1220,6 +133 1,14 @@10537 @@ -1220,6 +1332,14 @@ 10142 10538 // sminrow,smincol. 10143 10539 … … 10145 10541 + // Extended functions 10146 10542 + // ------------------------------------------------------------------------- 10147 +#if def NCURSES_EXT_FUNCS10543 +#if defined(NCURSES_EXT_FUNCS) && (NCURSES_EXT_FUNCS != 0) 10148 10544 + int wresize(int newLines, int newColumns) { 10149 10545 + return ::wresize(w, newLines, newColumns); } … … 10156 10552 diff -Naur ncurses-5.6.orig/c++/demo.cc ncurses-5.6/c++/demo.cc 10157 10553 --- ncurses-5.6.orig/c++/demo.cc 2006-04-22 18:38:57.000000000 -0400 10158 +++ ncurses-5.6/c++/demo.cc 200 7-12-21 00:02:35.000000000 -050010554 +++ ncurses-5.6/c++/demo.cc 2008-06-18 06:49:44.000000000 -0400 10159 10555 @@ -1,6 +1,6 @@ 10160 10556 // * This makes emacs happy -*-Mode: C++;-*- … … 10457 10853 diff -Naur ncurses-5.6.orig/c++/edit_cfg.sh ncurses-5.6/c++/edit_cfg.sh 10458 10854 --- ncurses-5.6.orig/c++/edit_cfg.sh 2005-04-30 17:00:22.000000000 -0400 10459 +++ ncurses-5.6/c++/edit_cfg.sh 200 7-12-21 00:02:35.000000000 -050010855 +++ ncurses-5.6/c++/edit_cfg.sh 2008-06-18 06:49:44.000000000 -0400 10460 10856 @@ -1,7 +1,7 @@ 10461 10857 #!/bin/sh … … 10493 10889 diff -Naur ncurses-5.6.orig/c++/etip.h.in ncurses-5.6/c++/etip.h.in 10494 10890 --- ncurses-5.6.orig/c++/etip.h.in 2005-08-06 15:55:57.000000000 -0400 10495 +++ ncurses-5.6/c++/etip.h.in 200 7-12-21 00:02:35.000000000 -050010891 +++ ncurses-5.6/c++/etip.h.in 2008-06-18 06:49:44.000000000 -0400 10496 10892 @@ -1,6 +1,6 @@ 10497 10893 // * This makes emacs happy -*-Mode: C++;-*- … … 10592 10988 diff -Naur ncurses-5.6.orig/c++/headers ncurses-5.6/c++/headers 10593 10989 --- ncurses-5.6.orig/c++/headers 1998-02-11 07:13:40.000000000 -0500 10594 +++ ncurses-5.6/c++/headers 200 7-12-21 00:02:35.000000000 -050010990 +++ ncurses-5.6/c++/headers 2008-06-18 06:49:44.000000000 -0400 10595 10991 @@ -1,7 +1,7 @@ 10596 10992 # C++ headers … … 10610 11006 diff -Naur ncurses-5.6.orig/c++/internal.h ncurses-5.6/c++/internal.h 10611 11007 --- ncurses-5.6.orig/c++/internal.h 2006-09-30 17:59:57.000000000 -0400 10612 +++ ncurses-5.6/c++/internal.h 200 7-12-21 00:02:35.000000000 -050011008 +++ ncurses-5.6/c++/internal.h 2008-06-18 06:49:44.000000000 -0400 10613 11009 @@ -1,6 +1,6 @@ 10614 11010 // * This makes emacs happy -*-Mode: C++;-*- … … 10638 11034 diff -Naur ncurses-5.6.orig/c++/modules ncurses-5.6/c++/modules 10639 11035 --- ncurses-5.6.orig/c++/modules 1999-07-31 05:46:54.000000000 -0400 10640 +++ ncurses-5.6/c++/modules 200 7-12-21 00:02:35.000000000 -050011036 +++ ncurses-5.6/c++/modules 2008-06-18 06:49:44.000000000 -0400 10641 11037 @@ -1,7 +1,7 @@ 10642 11038 # Program modules … … 10666 11062 diff -Naur ncurses-5.6.orig/config.guess ncurses-5.6/config.guess 10667 11063 --- ncurses-5.6.orig/config.guess 2006-07-22 11:57:37.000000000 -0400 10668 +++ ncurses-5.6/config.guess 2007-12-21 00:02:35.000000000 -0500 10669 @@ -4,7 +4,7 @@ 10670 # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, 10671 # Inc. 11064 +++ ncurses-5.6/config.guess 2008-06-18 06:49:49.000000000 -0400 11065 @@ -1,10 +1,10 @@ 11066 #! /bin/sh 11067 # Attempt to guess a canonical system name. 11068 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 11069 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, 11070 -# Inc. 11071 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 11072 +# Free Software Foundation, Inc. 10672 11073 10673 11074 -timestamp='2006-07-02' 10674 +timestamp='200 7-05-17'11075 +timestamp='2008-03-12' 10675 11076 10676 11077 # This file is free software; you can redistribute it and/or modify it 10677 11078 # under the terms of the GNU General Public License as published by 11079 @@ -56,8 +56,8 @@ 11080 GNU config.guess ($timestamp) 11081 11082 Originally written by Per Bothner. 11083 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 11084 -Free Software Foundation, Inc. 11085 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 11086 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 11087 11088 This is free software; see the source for copying conditions. There is NO 11089 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 10678 11090 @@ -161,6 +161,7 @@ 10679 11091 arm*) machine=arm-unknown ;; … … 10684 11096 esac 10685 11097 # The Operating System including object format, if it has switched 11098 @@ -179,7 +180,7 @@ 11099 fi 11100 ;; 11101 *) 11102 - os=netbsd 11103 + os=netbsd 11104 ;; 11105 esac 11106 # The OS release 11107 @@ -218,11 +219,11 @@ 11108 exit ;; 11109 alpha:OSF1:*:*) 11110 case $UNAME_RELEASE in 11111 - *4.0) 11112 + *4.0) 11113 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` 11114 ;; 11115 - *5.*) 11116 - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` 11117 + *5.*) 11118 + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` 11119 ;; 11120 esac 11121 # According to Compaq, /usr/sbin/psrinfo has been available on 11122 @@ -294,7 +295,7 @@ 11123 echo s390-ibm-zvmoe 11124 exit ;; 11125 *:OS400:*:*) 11126 - echo powerpc-ibm-os400 11127 + echo powerpc-ibm-os400 11128 exit ;; 11129 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) 11130 echo arm-acorn-riscix${UNAME_RELEASE} 10686 11131 @@ -329,7 +330,7 @@ 10687 11132 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) … … 10689 11134 exit ;; 10690 11135 - i86pc:SunOS:5.*:*) 10691 + i86pc:SunOS:5.*:* | i x86xen:SunOS:5.*:*)11136 + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) 10692 11137 echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 10693 11138 exit ;; 10694 11139 sun4*:SunOS:6*:*) 10695 @@ -780,7 +781,7 @@ 11140 @@ -374,23 +375,23 @@ 11141 # MiNT. But MiNT is downward compatible to TOS, so this should 11142 # be no problem. 11143 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) 11144 - echo m68k-atari-mint${UNAME_RELEASE} 11145 + echo m68k-atari-mint${UNAME_RELEASE} 11146 exit ;; 11147 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) 11148 echo m68k-atari-mint${UNAME_RELEASE} 11149 - exit ;; 11150 + exit ;; 11151 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) 11152 - echo m68k-atari-mint${UNAME_RELEASE} 11153 + echo m68k-atari-mint${UNAME_RELEASE} 11154 exit ;; 11155 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) 11156 - echo m68k-milan-mint${UNAME_RELEASE} 11157 - exit ;; 11158 + echo m68k-milan-mint${UNAME_RELEASE} 11159 + exit ;; 11160 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) 11161 - echo m68k-hades-mint${UNAME_RELEASE} 11162 - exit ;; 11163 + echo m68k-hades-mint${UNAME_RELEASE} 11164 + exit ;; 11165 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) 11166 - echo m68k-unknown-mint${UNAME_RELEASE} 11167 - exit ;; 11168 + echo m68k-unknown-mint${UNAME_RELEASE} 11169 + exit ;; 11170 m68k:machten:*:*) 11171 echo m68k-apple-machten${UNAME_RELEASE} 11172 exit ;; 11173 @@ -460,8 +461,8 @@ 11174 echo m88k-motorola-sysv3 11175 exit ;; 11176 AViiON:dgux:*:*) 11177 - # DG/UX returns AViiON for all architectures 11178 - UNAME_PROCESSOR=`/usr/bin/uname -p` 11179 + # DG/UX returns AViiON for all architectures 11180 + UNAME_PROCESSOR=`/usr/bin/uname -p` 11181 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] 11182 then 11183 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ 11184 @@ -531,7 +532,7 @@ 11185 echo rs6000-ibm-aix3.2 11186 fi 11187 exit ;; 11188 - *:AIX:*:[45]) 11189 + *:AIX:*:[456]) 11190 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` 11191 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then 11192 IBM_ARCH=rs6000 11193 @@ -574,8 +575,8 @@ 11194 9000/[678][0-9][0-9]) 11195 if [ -x /usr/bin/getconf ]; then 11196 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` 11197 - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` 11198 - case "${sc_cpu_version}" in 11199 + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` 11200 + case "${sc_cpu_version}" in 11201 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 11202 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 11203 532) # CPU_PA_RISC2_0 11204 @@ -710,22 +711,22 @@ 11205 exit ;; 11206 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) 11207 echo c1-convex-bsd 11208 - exit ;; 11209 + exit ;; 11210 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) 11211 if getsysinfo -f scalar_acc 11212 then echo c32-convex-bsd 11213 else echo c2-convex-bsd 11214 fi 11215 - exit ;; 11216 + exit ;; 11217 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) 11218 echo c34-convex-bsd 11219 - exit ;; 11220 + exit ;; 11221 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) 11222 echo c38-convex-bsd 11223 - exit ;; 11224 + exit ;; 11225 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) 11226 echo c4-convex-bsd 11227 - exit ;; 11228 + exit ;; 11229 CRAY*Y-MP:*:*:*) 11230 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 11231 exit ;; 11232 @@ -749,14 +750,14 @@ 11233 exit ;; 11234 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) 11235 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 11236 - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 11237 - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` 11238 - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 11239 - exit ;; 11240 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 11241 + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` 11242 + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 11243 + exit ;; 11244 5000:UNIX_System_V:4.*:*) 11245 - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 11246 - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` 11247 - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 11248 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 11249 + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` 11250 + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 11251 exit ;; 11252 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) 11253 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} 11254 @@ -780,22 +781,28 @@ 10696 11255 i*:CYGWIN*:*) 10697 11256 echo ${UNAME_MACHINE}-pc-cygwin … … 10702 11261 exit ;; 10703 11262 i*:windows32*:*) 10704 @@ -790,12 +791,15 @@ 11263 - # uname -m includes "-pc" on this system. 11264 - echo ${UNAME_MACHINE}-mingw32 11265 + # uname -m includes "-pc" on this system. 11266 + echo ${UNAME_MACHINE}-mingw32 11267 exit ;; 10705 11268 i*:PW*:*) 10706 11269 echo ${UNAME_MACHINE}-pc-pw32 … … 10713 11276 - exit ;; 10714 11277 + *:Interix*:[3456]*) 10715 + 10716 + x86) 11278 + case ${UNAME_MACHINE} in 11279 + x86) 10717 11280 + echo i586-pc-interix${UNAME_RELEASE} 10718 11281 + exit ;; … … 10720 11283 + echo x86_64-unknown-interix${UNAME_RELEASE} 10721 11284 + exit ;; 11285 + IA64) 11286 + echo ia64-unknown-interix${UNAME_RELEASE} 11287 + exit ;; 10722 11288 + esac ;; 10723 11289 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) 10724 11290 echo i${UNAME_MACHINE}-pc-mks 10725 11291 exit ;; 10726 @@ -950,6 +954,9 @@ 11292 @@ -829,7 +836,13 @@ 11293 echo ${UNAME_MACHINE}-pc-minix 11294 exit ;; 11295 arm*:Linux:*:*) 11296 - echo ${UNAME_MACHINE}-unknown-linux-gnu 11297 + eval $set_cc_for_build 11298 + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null | grep -q __ARM_EABI__ 11299 + then 11300 + echo ${UNAME_MACHINE}-unknown-linux-gnu 11301 + else 11302 + echo ${UNAME_MACHINE}-unknown-linux-gnueabi 11303 + fi 11304 exit ;; 11305 avr32*:Linux:*:*) 11306 echo ${UNAME_MACHINE}-unknown-linux-gnu 11307 @@ -841,7 +854,7 @@ 11308 echo crisv32-axis-linux-gnu 11309 exit ;; 11310 frv:Linux:*:*) 11311 - echo frv-unknown-linux-gnu 11312 + echo frv-unknown-linux-gnu 11313 exit ;; 11314 ia64:Linux:*:*) 11315 echo ${UNAME_MACHINE}-unknown-linux-gnu 11316 @@ -869,10 +882,10 @@ 11317 #endif 11318 EOF 11319 eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' 11320 - /^CPU/{ 11321 - s: ::g 11322 - p 11323 - }'`" 11324 + /^CPU/{ 11325 + s: ::g 11326 + p 11327 + }'`" 11328 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } 11329 ;; 11330 mips64:Linux:*:*) 11331 @@ -892,15 +905,15 @@ 11332 #endif 11333 EOF 11334 eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' 11335 - /^CPU/{ 11336 - s: ::g 11337 - p 11338 - }'`" 11339 + /^CPU/{ 11340 + s: ::g 11341 + p 11342 + }'`" 11343 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } 11344 ;; 11345 or32:Linux:*:*) 11346 - echo or32-unknown-linux-gnu 11347 - exit ;; 11348 + echo or32-unknown-linux-gnu 11349 + exit ;; 11350 ppc:Linux:*:*) 11351 echo powerpc-unknown-linux-gnu 11352 exit ;; 11353 @@ -916,7 +929,7 @@ 11354 EV6) UNAME_MACHINE=alphaev6 ;; 11355 EV67) UNAME_MACHINE=alphaev67 ;; 11356 EV68*) UNAME_MACHINE=alphaev68 ;; 11357 - esac 11358 + esac 11359 objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null 11360 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi 11361 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} 11362 @@ -936,7 +949,7 @@ 11363 echo ${UNAME_MACHINE}-ibm-linux 11364 exit ;; 11365 sh64*:Linux:*:*) 11366 - echo ${UNAME_MACHINE}-unknown-linux-gnu 11367 + echo ${UNAME_MACHINE}-unknown-linux-gnu 11368 exit ;; 11369 sh*:Linux:*:*) 11370 echo ${UNAME_MACHINE}-unknown-linux-gnu 11371 @@ -950,6 +963,9 @@ 10727 11372 x86_64:Linux:*:*) 10728 11373 echo x86_64-unknown-linux-gnu 10729 11374 exit ;; 10730 + xtensa :Linux:*:*)10731 + echo xtensa-unknown-linux-gnu11375 + xtensa*:Linux:*:*) 11376 + echo ${UNAME_MACHINE}-unknown-linux-gnu 10732 11377 + exit ;; 10733 11378 i*86:Linux:*:*) 10734 11379 # The BFD linker knows what the default object file format is, so 10735 11380 # first see if it will tell us. cd to the root directory to prevent 10736 @@ -1208,6 +1215,15 @@ 11381 @@ -961,7 +977,7 @@ 11382 s/.*supported targets: *// 11383 s/ .*// 11384 p'` 11385 - case "$ld_supported_targets" in 11386 + case "$ld_supported_targets" in 11387 elf32-i386) 11388 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" 11389 ;; 11390 @@ -1003,10 +1019,10 @@ 11391 #endif 11392 EOF 11393 eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' 11394 - /^LIBC/{ 11395 - s: ::g 11396 - p 11397 - }'`" 11398 + /^LIBC/{ 11399 + s: ::g 11400 + p 11401 + }'`" 11402 test x"${LIBC}" != x && { 11403 echo "${UNAME_MACHINE}-pc-linux-${LIBC}" 11404 exit 11405 @@ -1020,11 +1036,11 @@ 11406 echo i386-sequent-sysv4 11407 exit ;; 11408 i*86:UNIX_SV:4.2MP:2.*) 11409 - # Unixware is an offshoot of SVR4, but it has its own version 11410 - # number series starting with 2... 11411 - # I am not positive that other SVR4 systems won't match this, 11412 + # Unixware is an offshoot of SVR4, but it has its own version 11413 + # number series starting with 2... 11414 + # I am not positive that other SVR4 systems won't match this, 11415 # I just have to hope. -- rms. 11416 - # Use sysv4.2uw... so that sysv4* matches it. 11417 + # Use sysv4.2uw... so that sysv4* matches it. 11418 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} 11419 exit ;; 11420 i*86:OS/2:*:*) 11421 @@ -1056,7 +1072,7 @@ 11422 fi 11423 exit ;; 11424 i*86:*:5:[678]*) 11425 - # UnixWare 7.x, OpenUNIX and OpenServer 6. 11426 + # UnixWare 7.x, OpenUNIX and OpenServer 6. 11427 case `/bin/uname -X | grep "^Machine"` in 11428 *486*) UNAME_MACHINE=i486 ;; 11429 *Pentium) UNAME_MACHINE=i586 ;; 11430 @@ -1084,10 +1100,10 @@ 11431 exit ;; 11432 pc:*:*:*) 11433 # Left here for compatibility: 11434 - # uname -m prints for DJGPP always 'pc', but it prints nothing about 11435 - # the processor, so we play safe by assuming i386. 11436 + # uname -m prints for DJGPP always 'pc', but it prints nothing about 11437 + # the processor, so we play safe by assuming i386. 11438 echo i386-pc-msdosdjgpp 11439 - exit ;; 11440 + exit ;; 11441 Intel:Mach:3*:*) 11442 echo i386-pc-mach3 11443 exit ;; 11444 @@ -1122,8 +1138,8 @@ 11445 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ 11446 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 11447 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) 11448 - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 11449 - && { echo i486-ncr-sysv4; exit; } ;; 11450 + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 11451 + && { echo i486-ncr-sysv4; exit; } ;; 11452 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) 11453 echo m68k-unknown-lynxos${UNAME_RELEASE} 11454 exit ;; 11455 @@ -1157,9 +1173,9 @@ 11456 fi 11457 exit ;; 11458 PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort 11459 - # says <Richard.M.Bartel@ccMail.Census.GOV> 11460 - echo i586-unisys-sysv4 11461 - exit ;; 11462 + # says <Richard.M.Bartel@ccMail.Census.GOV> 11463 + echo i586-unisys-sysv4 11464 + exit ;; 11465 *:UNIX_System_V:4*:FTX*) 11466 # From Gerald Hewes <hewes@openmarket.com>. 11467 # How about differentiating between stratus architectures? -djm 11468 @@ -1189,7 +1205,7 @@ 11469 else 11470 echo mips-unknown-sysv${UNAME_RELEASE} 11471 fi 11472 - exit ;; 11473 + exit ;; 11474 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. 11475 echo powerpc-be-beos 11476 exit ;; 11477 @@ -1199,6 +1215,9 @@ 11478 BePC:BeOS:*:*) # BeOS running on Intel PC compatible. 11479 echo i586-pc-beos 11480 exit ;; 11481 + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. 11482 + echo i586-pc-haiku 11483 + exit ;; 11484 SX-4:SUPER-UX:*:*) 11485 echo sx4-nec-superux${UNAME_RELEASE} 11486 exit ;; 11487 @@ -1208,6 +1227,15 @@ 10737 11488 SX-6:SUPER-UX:*:*) 10738 11489 echo sx6-nec-superux${UNAME_RELEASE} … … 10750 11501 echo powerpc-apple-rhapsody${UNAME_RELEASE} 10751 11502 exit ;; 11503 @@ -1224,8 +1252,8 @@ 11504 *:procnto*:*:* | *:QNX:[0123456789]*:*) 11505 UNAME_PROCESSOR=`uname -p` 11506 if test "$UNAME_PROCESSOR" = "x86"; then 11507 - UNAME_PROCESSOR=i386 11508 - UNAME_MACHINE=pc 11509 + UNAME_PROCESSOR=i386 11510 + UNAME_MACHINE=pc 11511 fi 11512 echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} 11513 exit ;; 11514 @@ -1277,13 +1305,13 @@ 11515 echo pdp10-unknown-its 11516 exit ;; 11517 SEI:*:*:SEIUX) 11518 - echo mips-sei-seiux${UNAME_RELEASE} 11519 + echo mips-sei-seiux${UNAME_RELEASE} 11520 exit ;; 11521 *:DragonFly:*:*) 11522 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` 11523 exit ;; 11524 *:*VMS:*:*) 11525 - UNAME_MACHINE=`(uname -p) 2>/dev/null` 11526 + UNAME_MACHINE=`(uname -p) 2>/dev/null` 11527 case "${UNAME_MACHINE}" in 11528 A*) echo alpha-dec-vms ; exit ;; 11529 I*) echo ia64-dec-vms ; exit ;; 11530 @@ -1458,9 +1486,9 @@ 11531 the operating system you are using. It is advised that you 11532 download the most up to date version of the config scripts from 11533 11534 - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess 11535 + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess 11536 and 11537 - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub 11538 + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub 11539 11540 If the version you run ($0) is already up to date, please 11541 send the following data and any information you think might be 10752 11542 diff -Naur ncurses-5.6.orig/config.sub ncurses-5.6/config.sub 10753 11543 --- ncurses-5.6.orig/config.sub 2006-08-14 12:00:00.000000000 -0400 10754 +++ ncurses-5.6/config.sub 2007-12-21 00:02:35.000000000 -0500 10755 @@ -4,7 +4,7 @@ 10756 # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, 10757 # Inc. 11544 +++ ncurses-5.6/config.sub 2008-06-18 06:49:49.000000000 -0400 11545 @@ -1,10 +1,10 @@ 11546 #! /bin/sh 11547 # Configuration validation subroutine script. 11548 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 11549 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, 11550 -# Inc. 11551 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 11552 +# Free Software Foundation, Inc. 10758 11553 10759 11554 -timestamp='2006-08-14' 10760 +timestamp='200 7-06-28'11555 +timestamp='2008-03-08' 10761 11556 10762 11557 # This file is (in principle) common to ALL GNU software. 10763 11558 # The presence of a machine in this file suggests that SOME GNU software 10764 @@ -245,12 +245,12 @@ 11559 @@ -72,8 +72,8 @@ 11560 version="\ 11561 GNU config.sub ($timestamp) 11562 11563 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 11564 -Free Software Foundation, Inc. 11565 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 11566 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 11567 11568 This is free software; see the source for copying conditions. There is NO 11569 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 11570 @@ -245,17 +245,19 @@ 10765 11571 | bfin \ 10766 11572 | c4x | clipper \ … … 10777 11583 | mips16 \ 10778 11584 | mips64 | mips64el \ 10779 @@ -276,6 +276,7 @@ 11585 - | mips64vr | mips64vrel \ 11586 + | mips64octeon | mips64octeonel \ 11587 | mips64orion | mips64orionel \ 11588 + | mips64r5900 | mips64r5900el \ 11589 + | mips64vr | mips64vrel \ 11590 | mips64vr4100 | mips64vr4100el \ 11591 | mips64vr4300 | mips64vr4300el \ 11592 | mips64vr5000 | mips64vr5000el \ 11593 @@ -276,6 +278,7 @@ 10780 11594 | pdp10 | pdp11 | pj | pjl \ 10781 11595 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ … … 10785 11599 | sh64 | sh64le \ 10786 11600 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ 10787 @@ -323,7 +324,7 @@ 11601 @@ -303,8 +306,8 @@ 11602 # because (1) that's what they normally are, and 11603 # (2) the word "unknown" tends to confuse beginning users. 11604 i*86 | x86_64) 11605 - basic_machine=$basic_machine-pc 11606 - ;; 11607 + basic_machine=$basic_machine-pc 11608 + ;; 11609 # Object if more than one company name word. 11610 *-*-*) 11611 echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 11612 @@ -323,19 +326,21 @@ 10788 11613 | clipper-* | craynv-* | cydra-* \ 10789 11614 | d10v-* | d30v-* | dlx-* \ … … 10794 11619 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ 10795 11620 | i*86-* | i860-* | i960-* | ia64-* \ 10796 @@ -474,8 +475,8 @@ 11621 | ip2k-* | iq2000-* \ 11622 - | m32c-* | m32r-* | m32rle-* \ 11623 + | m32c- | m32r-* | m32rle-* \ 11624 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ 11625 | m88110-* | m88k-* | maxq-* | mcore-* \ 11626 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ 11627 | mips16-* \ 11628 | mips64-* | mips64el-* \ 11629 - | mips64vr-* | mips64vrel-* \ 11630 + | mips64octeon-* | mips64octeonel-* \ 11631 | mips64orion-* | mips64orionel-* \ 11632 + | mips64r5900-* | mips64r5900el-* \ 11633 + | mips64vr-* | mips64vrel-* \ 11634 | mips64vr4100-* | mips64vr4100el-* \ 11635 | mips64vr4300-* | mips64vr4300el-* \ 11636 | mips64vr5000-* | mips64vr5000el-* \ 11637 @@ -363,15 +368,19 @@ 11638 | sparclite-* \ 11639 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ 11640 | tahoe-* | thumb-* \ 11641 - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ 11642 + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ 11643 | tron-* \ 11644 | v850-* | v850e-* | vax-* \ 11645 | we32k-* \ 11646 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ 11647 - | xstormy16-* | xtensa-* \ 11648 + | xstormy16-* | xtensa*-* \ 11649 | ymp-* \ 11650 | z8k-*) 11651 ;; 11652 + # Recognize the basic CPU types without company name, with glob match. 11653 + xtensa*) 11654 + basic_machine=$basic_machine-unknown 11655 + ;; 11656 # Recognize the various machine names and aliases which stand 11657 # for a CPU type and a company and sometimes even an OS. 11658 386bsd) 11659 @@ -388,7 +397,7 @@ 11660 basic_machine=a29k-amd 11661 os=-udi 11662 ;; 11663 - abacus) 11664 + abacus) 11665 basic_machine=abacus-unknown 11666 ;; 11667 adobe68k) 11668 @@ -442,6 +451,14 @@ 11669 basic_machine=ns32k-sequent 11670 os=-dynix 11671 ;; 11672 + blackfin) 11673 + basic_machine=bfin-unknown 11674 + os=-linux 11675 + ;; 11676 + blackfin-*) 11677 + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` 11678 + os=-linux 11679 + ;; 11680 c90) 11681 basic_machine=c90-cray 11682 os=-unicos 11683 @@ -474,8 +491,8 @@ 10797 11684 basic_machine=craynv-cray 10798 11685 os=-unicosmp … … 10805 11692 ;; 10806 11693 crds | unos) 10807 @@ -682,6 +683,10 @@ 11694 @@ -667,6 +684,14 @@ 11695 basic_machine=m68k-isi 11696 os=-sysv 11697 ;; 11698 + m68knommu) 11699 + basic_machine=m68k-unknown 11700 + os=-linux 11701 + ;; 11702 + m68knommu-*) 11703 + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` 11704 + os=-linux 11705 + ;; 11706 m88k-omron*) 11707 basic_machine=m88k-omron 11708 ;; 11709 @@ -682,6 +707,10 @@ 10808 11710 basic_machine=i386-pc 10809 11711 os=-mingw32 … … 10816 11718 basic_machine=m68000-convergent 10817 11719 ;; 10818 @@ -924,6 +929,9 @@ 11720 @@ -808,6 +837,14 @@ 11721 basic_machine=i860-intel 11722 os=-osf 11723 ;; 11724 + parisc) 11725 + basic_machine=hppa-unknown 11726 + os=-linux 11727 + ;; 11728 + parisc-*) 11729 + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` 11730 + os=-linux 11731 + ;; 11732 pbd) 11733 basic_machine=sparc-tti 11734 ;; 11735 @@ -924,6 +961,9 @@ 10819 11736 basic_machine=sh-hitachi 10820 11737 os=-hms … … 10826 11743 basic_machine=sh64-unknown 10827 11744 ;; 10828 @@ -1218,7 +1226,7 @@ 11745 @@ -1013,6 +1053,10 @@ 11746 basic_machine=tic6x-unknown 11747 os=-coff 11748 ;; 11749 + tile*) 11750 + basic_machine=tile-unknown 11751 + os=-linux-gnu 11752 + ;; 11753 tx39) 11754 basic_machine=mipstx39-unknown 11755 ;; 11756 @@ -1173,8 +1217,8 @@ 11757 if [ x"$os" != x"" ] 11758 then 11759 case $os in 11760 - # First match some system type aliases 11761 - # that might get confused with valid system types. 11762 + # First match some system type aliases 11763 + # that might get confused with valid system types. 11764 # -solaris* is a basic system type, with this one exception. 11765 -solaris1 | -solaris1.*) 11766 os=`echo $os | sed -e 's|solaris1|sunos4|'` 11767 @@ -1218,7 +1262,7 @@ 10829 11768 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ 10830 11769 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ … … 10835 11774 ;; 10836 11775 -qnx*) 10837 @@ -1370,6 +1378,9 @@ 11776 @@ -1257,7 +1301,7 @@ 11777 -opened*) 11778 os=-openedition 11779 ;; 11780 - -os400*) 11781 + -os400*) 11782 os=-os400 11783 ;; 11784 -wince*) 11785 @@ -1306,7 +1350,7 @@ 11786 -sinix*) 11787 os=-sysv4 11788 ;; 11789 - -tpf*) 11790 + -tpf*) 11791 os=-tpf 11792 ;; 11793 -triton*) 11794 @@ -1370,7 +1414,10 @@ 10838 11795 # system, and we'll never get to this point. 10839 11796 10840 11797 case $basic_machine in 10841 + score-*) 11798 - spu-*) 11799 + score-*) 10842 11800 + os=-elf 10843 11801 + ;; 10844 11802 + spu-*) 10845 11803 os=-elf 10846 11804 ;; 10847 @@ -1410,6 +1421,9 @@ 11805 *-acorn) 11806 @@ -1382,8 +1429,8 @@ 11807 arm*-semi) 11808 os=-aout 11809 ;; 11810 - c4x-* | tic4x-*) 11811 - os=-coff 11812 + c4x-* | tic4x-*) 11813 + os=-coff 11814 ;; 11815 # This must come before the *-dec entry. 11816 pdp10-*) 11817 @@ -1410,6 +1457,9 @@ 10848 11818 m68*-cisco) 10849 11819 os=-aout 10850 11820 ;; 10851 + 11821 + mep-*) 10852 11822 + os=-elf 10853 11823 + ;; … … 10855 11825 os=-elf 10856 11826 ;; 11827 @@ -1434,7 +1484,7 @@ 11828 *-ibm) 11829 os=-aix 11830 ;; 11831 - *-knuth) 11832 + *-knuth) 11833 os=-mmixware 11834 ;; 11835 *-wec) 10857 11836 diff -Naur ncurses-5.6.orig/configure ncurses-5.6/configure 10858 11837 --- ncurses-5.6.orig/configure 2006-12-17 11:33:38.000000000 -0500 10859 +++ ncurses-5.6/configure 200 7-12-21 00:02:35.000000000 -050010860 @@ -1, 5 +1,5@@11838 +++ ncurses-5.6/configure 2008-06-18 06:49:52.000000000 -0400 11839 @@ -1,7 +1,7 @@ 10861 11840 #! /bin/sh 10862 11841 -# From configure.in Revision: 1.383 . 10863 +# From configure.in Revision: 1.4 29.11842 +# From configure.in Revision: 1.434 . 10864 11843 # Guess values for system-dependent variables and create Makefiles. 10865 # Generated by Autoconf 2.52.20061216. 11844 -# Generated by Autoconf 2.52.20061216. 11845 +# Generated by Autoconf 2.52.20080325. 10866 11846 # 11847 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 11848 # Free Software Foundation, Inc. 10867 11849 @@ -699,6 +699,7 @@ 10868 11850 --without-ada suppress check for Ada95, don't build demo … … 10894 11876 --with-termpath=XXX specify list of termcap files (default: /etc/termcap:/usr/share/misc/termcap) 10895 11877 --enable-getcap fast termcap load, no xrefs to terminfo 10896 @@ -759,7 +763,7 @@ 11878 @@ -758,8 +762,10 @@ 11879 Extensions: 10897 11880 --disable-ext-funcs disable function-extensions 10898 11881 --enable-const compile with extra/non-standard const 11882 + --enable-ext-colors compile for 256-color support 11883 + --enable-ext-mouse compile for extended mouse-encoding 10899 11884 --enable-no-padding compile with $NCURSES_NO_PADDING code 10900 11885 - --enable-signed-char compile with SIGWINCH handler … … 10903 11888 --enable-tcap-names compile with user-definable terminal capabilities 10904 11889 Development Code: 10905 @@ -772,6 +776,7 @@ 11890 @@ -770,8 +776,8 @@ 11891 --disable-assumed-color do not assume anything about default-colors 11892 --disable-hashmap compile without hashmap scrolling-optimization 10906 11893 --enable-colorfgbg compile with $COLORFGBG code 10907 --enable-ext-colors compile for experimental 256-color support 10908 --enable-ext-mouse compile for experimental mouse-encoding 11894 - --enable-ext-colors compile for experimental 256-color support 11895 - --enable-ext-mouse compile for experimental mouse-encoding 11896 + --with-pthread use POSIX thread library 10909 11897 + --enable-reentrant compile with experimental reentrant code 10910 11898 --enable-safe-sprintf compile with experimental safe-sprintf code 10911 11899 --disable-scroll-hints compile without scroll-hints code 10912 11900 --enable-wgetch-events compile with experimental wgetch-events code 10913 @@ -986,7 +991,7 @@ 11901 @@ -862,7 +868,7 @@ 11902 running configure, to aid debugging if configure makes a mistake. 11903 11904 It was created by $as_me, which was 11905 -generated by GNU Autoconf 2.52.20061216. Invocation command line was 11906 +generated by GNU Autoconf 2.52.20080325. Invocation command line was 11907 11908 $ $0 $@ 11909 11910 @@ -986,7 +992,7 @@ 10914 11911 fi 10915 11912 for ac_site_file in $CONFIG_SITE; do 10916 11913 if test -r "$ac_site_file"; then 10917 11914 - { echo "$as_me:989: loading site script $ac_site_file" >&5 10918 + { echo "$as_me:99 4: loading site script $ac_site_file" >&511915 + { echo "$as_me:995: loading site script $ac_site_file" >&5 10919 11916 echo "$as_me: loading site script $ac_site_file" >&6;} 10920 11917 cat "$ac_site_file" >&5 10921 11918 . "$ac_site_file" 10922 @@ -997,7 +100 2,7 @@11919 @@ -997,7 +1003,7 @@ 10923 11920 # Some versions of bash will fail to source /dev/null (special 10924 11921 # files actually), so we avoid doing that. 10925 11922 if test -f "$cache_file"; then 10926 11923 - { echo "$as_me:1000: loading cache $cache_file" >&5 10927 + { echo "$as_me:100 5: loading cache $cache_file" >&511924 + { echo "$as_me:1006: loading cache $cache_file" >&5 10928 11925 echo "$as_me: loading cache $cache_file" >&6;} 10929 11926 case $cache_file in 10930 11927 [\\/]* | ?:[\\/]* ) . $cache_file;; 10931 @@ -1005,7 +101 0,7 @@11928 @@ -1005,7 +1011,7 @@ 10932 11929 esac 10933 11930 fi 10934 11931 else 10935 11932 - { echo "$as_me:1008: creating cache $cache_file" >&5 10936 + { echo "$as_me:101 3: creating cache $cache_file" >&511933 + { echo "$as_me:1014: creating cache $cache_file" >&5 10937 11934 echo "$as_me: creating cache $cache_file" >&6;} 10938 11935 >$cache_file 10939 11936 fi 10940 @@ -1021,21 +102 6,21 @@11937 @@ -1021,21 +1027,21 @@ 10941 11938 eval ac_new_val="\$ac_env_${ac_var}_value" 10942 11939 case $ac_old_set,$ac_new_set in 10943 11940 set,) 10944 11941 - { echo "$as_me:1024: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 10945 + { echo "$as_me:10 29: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&511942 + { echo "$as_me:1030: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 10946 11943 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} 10947 11944 ac_cache_corrupted=: ;; 10948 11945 ,set) 10949 11946 - { echo "$as_me:1028: error: \`$ac_var' was not set in the previous run" >&5 10950 + { echo "$as_me:103 3: error: \`$ac_var' was not set in the previous run" >&511947 + { echo "$as_me:1034: error: \`$ac_var' was not set in the previous run" >&5 10951 11948 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} 10952 11949 ac_cache_corrupted=: ;; … … 10955 11952 if test "x$ac_old_val" != "x$ac_new_val"; then 10956 11953 - { echo "$as_me:1034: error: \`$ac_var' has changed since the previous run:" >&5 10957 + { echo "$as_me:10 39: error: \`$ac_var' has changed since the previous run:" >&511954 + { echo "$as_me:1040: error: \`$ac_var' has changed since the previous run:" >&5 10958 11955 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} 10959 11956 - { echo "$as_me:1036: former value: $ac_old_val" >&5 10960 + { echo "$as_me:104 1: former value: $ac_old_val" >&511957 + { echo "$as_me:1042: former value: $ac_old_val" >&5 10961 11958 echo "$as_me: former value: $ac_old_val" >&2;} 10962 11959 - { echo "$as_me:1038: current value: $ac_new_val" >&5 10963 + { echo "$as_me:104 3: current value: $ac_new_val" >&511960 + { echo "$as_me:1044: current value: $ac_new_val" >&5 10964 11961 echo "$as_me: current value: $ac_new_val" >&2;} 10965 11962 ac_cache_corrupted=: 10966 11963 fi;; 10967 @@ -1054,9 +10 59,9 @@11964 @@ -1054,9 +1060,9 @@ 10968 11965 fi 10969 11966 done 10970 11967 if $ac_cache_corrupted; then 10971 11968 - { echo "$as_me:1057: error: changes in the environment can compromise the build" >&5 10972 + { echo "$as_me:106 2: error: changes in the environment can compromise the build" >&511969 + { echo "$as_me:1063: error: changes in the environment can compromise the build" >&5 10973 11970 echo "$as_me: error: changes in the environment can compromise the build" >&2;} 10974 11971 - { { echo "$as_me:1059: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 10975 + { { echo "$as_me:106 4: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&511972 + { { echo "$as_me:1065: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 10976 11973 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} 10977 11974 { (exit 1); exit 1; }; } 10978 11975 fi 10979 @@ -1077,10 +108 2,10 @@11976 @@ -1077,10 +1083,10 @@ 10980 11977 echo "#! $SHELL" >conftest.sh 10981 11978 echo "exit 0" >>conftest.sh 10982 11979 chmod +x conftest.sh 10983 11980 -if { (echo "$as_me:1080: PATH=\".;.\"; conftest.sh") >&5 10984 +if { (echo "$as_me:108 5: PATH=\".;.\"; conftest.sh") >&511981 +if { (echo "$as_me:1086: PATH=\".;.\"; conftest.sh") >&5 10985 11982 (PATH=".;."; conftest.sh) 2>&5 10986 11983 ac_status=$? 10987 11984 - echo "$as_me:1083: \$? = $ac_status" >&5 10988 + echo "$as_me:108 8: \$? = $ac_status" >&511985 + echo "$as_me:1089: \$? = $ac_status" >&5 10989 11986 (exit $ac_status); }; then 10990 11987 ac_path_separator=';' 10991 11988 else 10992 @@ -1093,7 +109 8,7 @@11989 @@ -1093,7 +1099,7 @@ 10993 11990 10994 11991 top_builddir=`pwd` 10995 11992 10996 11993 -echo "$as_me:1096: checking for egrep" >&5 10997 +echo "$as_me:110 1: checking for egrep" >&511994 +echo "$as_me:1102: checking for egrep" >&5 10998 11995 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 10999 11996 if test "${ac_cv_prog_egrep+set}" = set; then 11000 11997 echo $ECHO_N "(cached) $ECHO_C" >&6 11001 @@ -1103,11 +110 8,11 @@11998 @@ -1103,11 +1109,11 @@ 11002 11999 else ac_cv_prog_egrep='egrep' 11003 12000 fi 11004 12001 fi 11005 12002 -echo "$as_me:1106: result: $ac_cv_prog_egrep" >&5 11006 +echo "$as_me:111 1: result: $ac_cv_prog_egrep" >&512003 +echo "$as_me:1112: result: $ac_cv_prog_egrep" >&5 11007 12004 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 11008 12005 EGREP=$ac_cv_prog_egrep 11009 12006 11010 12007 -test -z "$EGREP" && { { echo "$as_me:1110: error: No egrep program found" >&5 11011 +test -z "$EGREP" && { { echo "$as_me:111 5: error: No egrep program found" >&512008 +test -z "$EGREP" && { { echo "$as_me:1116: error: No egrep program found" >&5 11012 12009 echo "$as_me: error: No egrep program found" >&2;} 11013 12010 { (exit 1); exit 1; }; } 11014 12011 11015 @@ -1117,7 +112 2,7 @@12012 @@ -1117,7 +1123,7 @@ 11016 12013 cf_cv_abi_version=${NCURSES_MAJOR} 11017 12014 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} 11018 12015 cf_cv_timestamp=`date` 11019 12016 -echo "$as_me:1120: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 11020 +echo "$as_me:112 5: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&512017 +echo "$as_me:1126: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 11021 12018 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 11022 12019 11023 12020 test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0 11024 @@ -1125,7 +113 0,7 @@12021 @@ -1125,7 +1131,7 @@ 11025 12022 # Check whether --with-rel-version or --without-rel-version was given. 11026 12023 if test "${with_rel_version+set}" = set; then 11027 12024 withval="$with_rel_version" 11028 12025 - { echo "$as_me:1128: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 11029 + { echo "$as_me:113 3: WARNING: overriding release version $cf_cv_rel_version to $withval" >&512026 + { echo "$as_me:1134: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 11030 12027 echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;} 11031 12028 cf_cv_rel_version=$withval 11032 12029 fi; 11033 @@ -1138,13 +114 3,13 @@12030 @@ -1138,13 +1144,13 @@ 11034 12031 [0-9]*) #(vi 11035 12032 ;; 11036 12033 *) 11037 12034 - { { echo "$as_me:1141: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 11038 + { { echo "$as_me:114 6: error: Release major-version is not a number: $NCURSES_MAJOR" >&512035 + { { echo "$as_me:1147: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 11039 12036 echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;} 11040 12037 { (exit 1); exit 1; }; } … … 11043 12040 else 11044 12041 - { { echo "$as_me:1147: error: Release major-version value is empty" >&5 11045 + { { echo "$as_me:115 2: error: Release major-version value is empty" >&512042 + { { echo "$as_me:1153: error: Release major-version value is empty" >&5 11046 12043 echo "$as_me: error: Release major-version value is empty" >&2;} 11047 12044 { (exit 1); exit 1; }; } 11048 12045 fi 11049 @@ -1154,13 +11 59,13 @@12046 @@ -1154,13 +1160,13 @@ 11050 12047 [0-9]*) #(vi 11051 12048 ;; 11052 12049 *) 11053 12050 - { { echo "$as_me:1157: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 11054 + { { echo "$as_me:116 2: error: Release minor-version is not a number: $NCURSES_MINOR" >&512051 + { { echo "$as_me:1163: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 11055 12052 echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;} 11056 12053 { (exit 1); exit 1; }; } … … 11059 12056 else 11060 12057 - { { echo "$as_me:1163: error: Release minor-version value is empty" >&5 11061 + { { echo "$as_me:116 8: error: Release minor-version value is empty" >&512058 + { { echo "$as_me:1169: error: Release minor-version value is empty" >&5 11062 12059 echo "$as_me: error: Release minor-version value is empty" >&2;} 11063 12060 { (exit 1); exit 1; }; } 11064 12061 fi 11065 @@ -1170,7 +117 5,7 @@12062 @@ -1170,7 +1176,7 @@ 11066 12063 # Check whether --with-abi-version or --without-abi-version was given. 11067 12064 if test "${with_abi_version+set}" = set; then 11068 12065 withval="$with_abi_version" 11069 12066 - { echo "$as_me:1173: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 11070 + { echo "$as_me:117 8: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&512067 + { echo "$as_me:1179: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 11071 12068 echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;} 11072 12069 cf_cv_abi_version=$withval 11073 12070 fi; 11074 @@ -1180,13 +118 5,13 @@12071 @@ -1180,13 +1186,13 @@ 11075 12072 [0-9]*) #(vi 11076 12073 ;; 11077 12074 *) 11078 12075 - { { echo "$as_me:1183: error: ABI version is not a number: $cf_cv_abi_version" >&5 11079 + { { echo "$as_me:118 8: error: ABI version is not a number: $cf_cv_abi_version" >&512076 + { { echo "$as_me:1189: error: ABI version is not a number: $cf_cv_abi_version" >&5 11080 12077 echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;} 11081 12078 { (exit 1); exit 1; }; } … … 11084 12081 else 11085 12082 - { { echo "$as_me:1189: error: ABI version value is empty" >&5 11086 + { { echo "$as_me:119 4: error: ABI version value is empty" >&512083 + { { echo "$as_me:1195: error: ABI version value is empty" >&5 11087 12084 echo "$as_me: error: ABI version value is empty" >&2;} 11088 12085 { (exit 1); exit 1; }; } 11089 12086 fi 11090 @@ -1208,7 +121 3,7 @@12087 @@ -1208,7 +1214,7 @@ 11091 12088 fi 11092 12089 done 11093 12090 if test -z "$ac_aux_dir"; then 11094 12091 - { { echo "$as_me:1211: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 11095 + { { echo "$as_me:121 6: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&512092 + { { echo "$as_me:1217: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 11096 12093 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} 11097 12094 { (exit 1); exit 1; }; } 11098 12095 fi 11099 @@ -1218,11 +122 3,11 @@12096 @@ -1218,11 +1224,11 @@ 11100 12097 11101 12098 # Make sure we can run config.sub. 11102 12099 $ac_config_sub sun4 >/dev/null 2>&1 || 11103 12100 - { { echo "$as_me:1221: error: cannot run $ac_config_sub" >&5 11104 + { { echo "$as_me:122 6: error: cannot run $ac_config_sub" >&512101 + { { echo "$as_me:1227: error: cannot run $ac_config_sub" >&5 11105 12102 echo "$as_me: error: cannot run $ac_config_sub" >&2;} 11106 12103 { (exit 1); exit 1; }; } 11107 12104 11108 12105 -echo "$as_me:1225: checking build system type" >&5 11109 +echo "$as_me:123 0: checking build system type" >&512106 +echo "$as_me:1231: checking build system type" >&5 11110 12107 echo $ECHO_N "checking build system type... $ECHO_C" >&6 11111 12108 if test "${ac_cv_build+set}" = set; then 11112 12109 echo $ECHO_N "(cached) $ECHO_C" >&6 11113 @@ -1231,23 +123 6,23 @@12110 @@ -1231,23 +1237,23 @@ 11114 12111 test -z "$ac_cv_build_alias" && 11115 12112 ac_cv_build_alias=`$ac_config_guess` 11116 12113 test -z "$ac_cv_build_alias" && 11117 12114 - { { echo "$as_me:1234: error: cannot guess build type; you must specify one" >&5 11118 + { { echo "$as_me:12 39: error: cannot guess build type; you must specify one" >&512115 + { { echo "$as_me:1240: error: cannot guess build type; you must specify one" >&5 11119 12116 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} 11120 12117 { (exit 1); exit 1; }; } 11121 12118 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || 11122 12119 - { { echo "$as_me:1238: error: $ac_config_sub $ac_cv_build_alias failed." >&5 11123 + { { echo "$as_me:124 3: error: $ac_config_sub $ac_cv_build_alias failed." >&512120 + { { echo "$as_me:1244: error: $ac_config_sub $ac_cv_build_alias failed." >&5 11124 12121 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} 11125 12122 { (exit 1); exit 1; }; } … … 11127 12124 fi 11128 12125 -echo "$as_me:1243: result: $ac_cv_build" >&5 11129 +echo "$as_me:124 8: result: $ac_cv_build" >&512126 +echo "$as_me:1249: result: $ac_cv_build" >&5 11130 12127 echo "${ECHO_T}$ac_cv_build" >&6 11131 12128 build=$ac_cv_build … … 11135 12132 11136 12133 -echo "$as_me:1250: checking host system type" >&5 11137 +echo "$as_me:125 5: checking host system type" >&512134 +echo "$as_me:1256: checking host system type" >&5 11138 12135 echo $ECHO_N "checking host system type... $ECHO_C" >&6 11139 12136 if test "${ac_cv_host+set}" = set; then 11140 12137 echo $ECHO_N "(cached) $ECHO_C" >&6 11141 @@ -1256,12 +126 1,12 @@12138 @@ -1256,12 +1262,12 @@ 11142 12139 test -z "$ac_cv_host_alias" && 11143 12140 ac_cv_host_alias=$ac_cv_build_alias 11144 12141 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || 11145 12142 - { { echo "$as_me:1259: error: $ac_config_sub $ac_cv_host_alias failed" >&5 11146 + { { echo "$as_me:126 4: error: $ac_config_sub $ac_cv_host_alias failed" >&512143 + { { echo "$as_me:1265: error: $ac_config_sub $ac_cv_host_alias failed" >&5 11147 12144 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} 11148 12145 { (exit 1); exit 1; }; } … … 11150 12147 fi 11151 12148 -echo "$as_me:1264: result: $ac_cv_host" >&5 11152 +echo "$as_me:12 69: result: $ac_cv_host" >&512149 +echo "$as_me:1270: result: $ac_cv_host" >&5 11153 12150 echo "${ECHO_T}$ac_cv_host" >&6 11154 12151 host=$ac_cv_host 11155 12152 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 11156 @@ -1269,7 +127 4,7 @@12153 @@ -1269,7 +1275,7 @@ 11157 12154 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 11158 12155 11159 12156 if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then 11160 12157 - echo "$as_me:1272: checking target system type" >&5 11161 + echo "$as_me:127 7: checking target system type" >&512158 + echo "$as_me:1278: checking target system type" >&5 11162 12159 echo $ECHO_N "checking target system type... $ECHO_C" >&6 11163 12160 if test "${ac_cv_target+set}" = set; then 11164 12161 echo $ECHO_N "(cached) $ECHO_C" >&6 11165 @@ -1278,12 +128 3,12 @@12162 @@ -1278,12 +1284,12 @@ 11166 12163 test "x$ac_cv_target_alias" = "x" && 11167 12164 ac_cv_target_alias=$ac_cv_host_alias 11168 12165 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || 11169 12166 - { { echo "$as_me:1281: error: $ac_config_sub $ac_cv_target_alias failed" >&5 11170 + { { echo "$as_me:128 6: error: $ac_config_sub $ac_cv_target_alias failed" >&512167 + { { echo "$as_me:1287: error: $ac_config_sub $ac_cv_target_alias failed" >&5 11171 12168 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} 11172 12169 { (exit 1); exit 1; }; } … … 11174 12171 fi 11175 12172 -echo "$as_me:1286: result: $ac_cv_target" >&5 11176 +echo "$as_me:129 1: result: $ac_cv_target" >&512173 +echo "$as_me:1292: result: $ac_cv_target" >&5 11177 12174 echo "${ECHO_T}$ac_cv_target" >&6 11178 12175 target=$ac_cv_target 11179 12176 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 11180 @@ -1314,13 +13 19,13 @@12177 @@ -1314,13 +1320,13 @@ 11181 12178 fi 11182 12179 11183 12180 test -z "$system_name" && system_name="$cf_cv_system_name" 11184 12181 -test -n "$cf_cv_system_name" && echo "$as_me:1317: result: Configuring for $cf_cv_system_name" >&5 11185 +test -n "$cf_cv_system_name" && echo "$as_me:132 2: result: Configuring for $cf_cv_system_name" >&512182 +test -n "$cf_cv_system_name" && echo "$as_me:1323: result: Configuring for $cf_cv_system_name" >&5 11186 12183 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 11187 12184 11188 12185 if test ".$system_name" != ".$cf_cv_system_name" ; then 11189 12186 - echo "$as_me:1321: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 11190 + echo "$as_me:132 6: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&512187 + echo "$as_me:1327: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 11191 12188 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 11192 12189 - { { echo "$as_me:1323: error: \"Please remove config.cache and try again.\"" >&5 11193 + { { echo "$as_me:132 8: error: \"Please remove config.cache and try again.\"" >&512190 + { { echo "$as_me:1329: error: \"Please remove config.cache and try again.\"" >&5 11194 12191 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} 11195 12192 { (exit 1); exit 1; }; } 11196 12193 fi 11197 @@ -1328,7 +133 3,7 @@12194 @@ -1328,7 +1334,7 @@ 11198 12195 # Check whether --with-system-type or --without-system-type was given. 11199 12196 if test "${with_system_type+set}" = set; then 11200 12197 withval="$with_system_type" 11201 12198 - { echo "$as_me:1331: WARNING: overriding system type to $withval" >&5 11202 + { echo "$as_me:133 6: WARNING: overriding system type to $withval" >&512199 + { echo "$as_me:1337: WARNING: overriding system type to $withval" >&5 11203 12200 echo "$as_me: WARNING: overriding system type to $withval" >&2;} 11204 12201 cf_cv_system_name=$withval 11205 12202 fi; 11206 @@ -1338,7 +134 3,7 @@12203 @@ -1338,7 +1344,7 @@ 11207 12204 11208 12205 ### Default install-location 11209 12206 11210 12207 -echo "$as_me:1341: checking for prefix" >&5 11211 +echo "$as_me:134 6: checking for prefix" >&512208 +echo "$as_me:1347: checking for prefix" >&5 11212 12209 echo $ECHO_N "checking for prefix... $ECHO_C" >&6 11213 12210 if test "x$prefix" = "xNONE" ; then 11214 12211 case "$cf_cv_system_name" in 11215 @@ -1350,11 +135 5,11 @@12212 @@ -1350,11 +1356,11 @@ 11216 12213 ;; 11217 12214 esac 11218 12215 fi 11219 12216 -echo "$as_me:1353: result: $prefix" >&5 11220 +echo "$as_me:135 8: result: $prefix" >&512217 +echo "$as_me:1359: result: $prefix" >&5 11221 12218 echo "${ECHO_T}$prefix" >&6 11222 12219 11223 12220 if test "x$prefix" = "xNONE" ; then 11224 12221 -echo "$as_me:1357: checking for default include-directory" >&5 11225 +echo "$as_me:136 2: checking for default include-directory" >&512222 +echo "$as_me:1363: checking for default include-directory" >&5 11226 12223 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6 11227 12224 test -n "$verbose" && echo 1>&6 11228 12225 for cf_symbol in \ 11229 @@ -1377,7 +138 2,7 @@12226 @@ -1377,7 +1383,7 @@ 11230 12227 fi 11231 12228 test -n "$verbose" && echo " tested $cf_dir" 1>&6 11232 12229 done 11233 12230 -echo "$as_me:1380: result: $includedir" >&5 11234 +echo "$as_me:138 5: result: $includedir" >&512231 +echo "$as_me:1386: result: $includedir" >&5 11235 12232 echo "${ECHO_T}$includedir" >&6 11236 12233 fi 11237 12234 11238 @@ -1391,7 +139 6,7 @@12235 @@ -1391,7 +1397,7 @@ 11239 12236 if test -n "$ac_tool_prefix"; then 11240 12237 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. 11241 12238 set dummy ${ac_tool_prefix}gcc; ac_word=$2 11242 12239 -echo "$as_me:1394: checking for $ac_word" >&5 11243 +echo "$as_me:1 399: checking for $ac_word" >&512240 +echo "$as_me:1400: checking for $ac_word" >&5 11244 12241 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 11245 12242 if test "${ac_cv_prog_CC+set}" = set; then 11246 12243 echo $ECHO_N "(cached) $ECHO_C" >&6 11247 @@ -1406,7 +141 1,7 @@12244 @@ -1406,7 +1412,7 @@ 11248 12245 test -z "$ac_dir" && ac_dir=. 11249 12246 $as_executable_p "$ac_dir/$ac_word" || continue 11250 12247 ac_cv_prog_CC="${ac_tool_prefix}gcc" 11251 12248 -echo "$as_me:1409: found $ac_dir/$ac_word" >&5 11252 +echo "$as_me:141 4: found $ac_dir/$ac_word" >&512249 +echo "$as_me:1415: found $ac_dir/$ac_word" >&5 11253 12250 break 11254 12251 done 11255 12252 11256 @@ -1414,10 +14 19,10 @@12253 @@ -1414,10 +1420,10 @@ 11257 12254 fi 11258 12255 CC=$ac_cv_prog_CC 11259 12256 if test -n "$CC"; then 11260 12257 - echo "$as_me:1417: result: $CC" >&5 11261 + echo "$as_me:142 2: result: $CC" >&512258 + echo "$as_me:1423: result: $CC" >&5 11262 12259 echo "${ECHO_T}$CC" >&6 11263 12260 else 11264 12261 - echo "$as_me:1420: result: no" >&5 11265 + echo "$as_me:142 5: result: no" >&512262 + echo "$as_me:1426: result: no" >&5 11266 12263 echo "${ECHO_T}no" >&6 11267 12264 fi 11268 12265 11269 @@ -1426,7 +143 1,7 @@12266 @@ -1426,7 +1432,7 @@ 11270 12267 ac_ct_CC=$CC 11271 12268 # Extract the first word of "gcc", so it can be a program name with args. 11272 12269 set dummy gcc; ac_word=$2 11273 12270 -echo "$as_me:1429: checking for $ac_word" >&5 11274 +echo "$as_me:143 4: checking for $ac_word" >&512271 +echo "$as_me:1435: checking for $ac_word" >&5 11275 12272 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 11276 12273 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then 11277 12274 echo $ECHO_N "(cached) $ECHO_C" >&6 11278 @@ -1441,7 +144 6,7 @@12275 @@ -1441,7 +1447,7 @@ 11279 12276 test -z "$ac_dir" && ac_dir=. 11280 12277 $as_executable_p "$ac_dir/$ac_word" || continue 11281 12278 ac_cv_prog_ac_ct_CC="gcc" 11282 12279 -echo "$as_me:1444: found $ac_dir/$ac_word" >&5 11283 +echo "$as_me:14 49: found $ac_dir/$ac_word" >&512280 +echo "$as_me:1450: found $ac_dir/$ac_word" >&5 11284 12281 break 11285 12282 done 11286 12283 11287 @@ -1449,10 +145 4,10 @@12284 @@ -1449,10 +1455,10 @@ 11288 12285 fi 11289 12286 ac_ct_CC=$ac_cv_prog_ac_ct_CC 11290 12287 if test -n "$ac_ct_CC"; then 11291 12288 - echo "$as_me:1452: result: $ac_ct_CC" >&5 11292 + echo "$as_me:145 7: result: $ac_ct_CC" >&512289 + echo "$as_me:1458: result: $ac_ct_CC" >&5 11293 12290 echo "${ECHO_T}$ac_ct_CC" >&6 11294 12291 else 11295 12292 - echo "$as_me:1455: result: no" >&5 11296 + echo "$as_me:146 0: result: no" >&512293 + echo "$as_me:1461: result: no" >&5 11297 12294 echo "${ECHO_T}no" >&6 11298 12295 fi 11299 12296 11300 @@ -1465,7 +147 0,7 @@12297 @@ -1465,7 +1471,7 @@ 11301 12298 if test -n "$ac_tool_prefix"; then 11302 12299 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. 11303 12300 set dummy ${ac_tool_prefix}cc; ac_word=$2 11304 12301 -echo "$as_me:1468: checking for $ac_word" >&5 11305 +echo "$as_me:147 3: checking for $ac_word" >&512302 +echo "$as_me:1474: checking for $ac_word" >&5 11306 12303 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 11307 12304 if test "${ac_cv_prog_CC+set}" = set; then 11308 12305 echo $ECHO_N "(cached) $ECHO_C" >&6 11309 @@ -1480,7 +148 5,7 @@12306 @@ -1480,7 +1486,7 @@ 11310 12307 test -z "$ac_dir" && ac_dir=. 11311 12308 $as_executable_p "$ac_dir/$ac_word" || continue 11312 12309 ac_cv_prog_CC="${ac_tool_prefix}cc" 11313 12310 -echo "$as_me:1483: found $ac_dir/$ac_word" >&5 11314 +echo "$as_me:148 8: found $ac_dir/$ac_word" >&512311 +echo "$as_me:1489: found $ac_dir/$ac_word" >&5 11315 12312 break 11316 12313 done 11317 12314 11318 @@ -1488,10 +149 3,10 @@12315 @@ -1488,10 +1494,10 @@ 11319 12316 fi 11320 12317 CC=$ac_cv_prog_CC 11321 12318 if test -n "$CC"; then 11322 12319 - echo "$as_me:1491: result: $CC" >&5 11323 + echo "$as_me:149 6: result: $CC" >&512320 + echo "$as_me:1497: result: $CC" >&5 11324 12321 echo "${ECHO_T}$CC" >&6 11325 12322 else 11326 12323 - echo "$as_me:1494: result: no" >&5 11327 + echo "$as_me:1 499: result: no" >&512324 + echo "$as_me:1500: result: no" >&5 11328 12325 echo "${ECHO_T}no" >&6 11329 12326 fi 11330 12327 11331 @@ -1500,7 +150 5,7 @@12328 @@ -1500,7 +1506,7 @@ 11332 12329 ac_ct_CC=$CC 11333 12330 # Extract the first word of "cc", so it can be a program name with args. 11334 12331 set dummy cc; ac_word=$2 11335 12332 -echo "$as_me:1503: checking for $ac_word" >&5 11336 +echo "$as_me:150 8: checking for $ac_word" >&512333 +echo "$as_me:1509: checking for $ac_word" >&5 11337 12334 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 11338 12335 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then 11339 12336 echo $ECHO_N "(cached) $ECHO_C" >&6 11340 @@ -1515,7 +152 0,7 @@12337 @@ -1515,7 +1521,7 @@ 11341 12338 test -z "$ac_dir" && ac_dir=. 11342 12339 $as_executable_p "$ac_dir/$ac_word" || continue 11343 12340 ac_cv_prog_ac_ct_CC="cc" 11344 12341 -echo "$as_me:1518: found $ac_dir/$ac_word" >&5 11345 +echo "$as_me:152 3: found $ac_dir/$ac_word" >&512342 +echo "$as_me:1524: found $ac_dir/$ac_word" >&5 11346 12343 break 11347 12344 done 11348 12345 11349 @@ -1523,10 +152 8,10 @@12346 @@ -1523,10 +1529,10 @@ 11350 12347 fi 11351 12348 ac_ct_CC=$ac_cv_prog_ac_ct_CC 11352 12349 if test -n "$ac_ct_CC"; then 11353 12350 - echo "$as_me:1526: result: $ac_ct_CC" >&5 11354 + echo "$as_me:153 1: result: $ac_ct_CC" >&512351 + echo "$as_me:1532: result: $ac_ct_CC" >&5 11355 12352 echo "${ECHO_T}$ac_ct_CC" >&6 11356 12353 else 11357 12354 - echo "$as_me:1529: result: no" >&5 11358 + echo "$as_me:153 4: result: no" >&512355 + echo "$as_me:1535: result: no" >&5 11359 12356 echo "${ECHO_T}no" >&6 11360 12357 fi 11361 12358 11362 @@ -1539,7 +154 4,7 @@12359 @@ -1539,7 +1545,7 @@ 11363 12360 if test -z "$CC"; then 11364 12361 # Extract the first word of "cc", so it can be a program name with args. 11365 12362 set dummy cc; ac_word=$2 11366 12363 -echo "$as_me:1542: checking for $ac_word" >&5 11367 +echo "$as_me:154 7: checking for $ac_word" >&512364 +echo "$as_me:1548: checking for $ac_word" >&5 11368 12365 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 11369 12366 if test "${ac_cv_prog_CC+set}" = set; then 11370 12367 echo $ECHO_N "(cached) $ECHO_C" >&6 11371 @@ -1559,7 +156 4,7 @@12368 @@ -1559,7 +1565,7 @@ 11372 12369 continue 11373 12370 fi 11374 12371 ac_cv_prog_CC="cc" 11375 12372 -echo "$as_me:1562: found $ac_dir/$ac_word" >&5 11376 +echo "$as_me:156 7: found $ac_dir/$ac_word" >&512373 +echo "$as_me:1568: found $ac_dir/$ac_word" >&5 11377 12374 break 11378 12375 done 11379 12376 11380 @@ -1581,10 +158 6,10 @@12377 @@ -1581,10 +1587,10 @@ 11381 12378 fi 11382 12379 CC=$ac_cv_prog_CC 11383 12380 if test -n "$CC"; then 11384 12381 - echo "$as_me:1584: result: $CC" >&5 11385 + echo "$as_me:15 89: result: $CC" >&512382 + echo "$as_me:1590: result: $CC" >&5 11386 12383 echo "${ECHO_T}$CC" >&6 11387 12384 else 11388 12385 - echo "$as_me:1587: result: no" >&5 11389 + echo "$as_me:159 2: result: no" >&512386 + echo "$as_me:1593: result: no" >&5 11390 12387 echo "${ECHO_T}no" >&6 11391 12388 fi 11392 12389 11393 @@ -1595,7 +160 0,7 @@12390 @@ -1595,7 +1601,7 @@ 11394 12391 do 11395 12392 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 11396 12393 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 11397 12394 -echo "$as_me:1598: checking for $ac_word" >&5 11398 +echo "$as_me:160 3: checking for $ac_word" >&512395 +echo "$as_me:1604: checking for $ac_word" >&5 11399 12396 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 11400 12397 if test "${ac_cv_prog_CC+set}" = set; then 11401 12398 echo $ECHO_N "(cached) $ECHO_C" >&6 11402 @@ -1610,7 +161 5,7 @@12399 @@ -1610,7 +1616,7 @@ 11403 12400 test -z "$ac_dir" && ac_dir=. 11404 12401 $as_executable_p "$ac_dir/$ac_word" || continue 11405 12402 ac_cv_prog_CC="$ac_tool_prefix$ac_prog" 11406 12403 -echo "$as_me:1613: found $ac_dir/$ac_word" >&5 11407 +echo "$as_me:161 8: found $ac_dir/$ac_word" >&512404 +echo "$as_me:1619: found $ac_dir/$ac_word" >&5 11408 12405 break 11409 12406 done 11410 12407 11411 @@ -1618,10 +162 3,10 @@12408 @@ -1618,10 +1624,10 @@ 11412 12409 fi 11413 12410 CC=$ac_cv_prog_CC 11414 12411 if test -n "$CC"; then 11415 12412 - echo "$as_me:1621: result: $CC" >&5 11416 + echo "$as_me:162 6: result: $CC" >&512413 + echo "$as_me:1627: result: $CC" >&5 11417 12414 echo "${ECHO_T}$CC" >&6 11418 12415 else 11419 12416 - echo "$as_me:1624: result: no" >&5 11420 + echo "$as_me:16 29: result: no" >&512417 + echo "$as_me:1630: result: no" >&5 11421 12418 echo "${ECHO_T}no" >&6 11422 12419 fi 11423 12420 11424 @@ -1634,7 +16 39,7 @@12421 @@ -1634,7 +1640,7 @@ 11425 12422 do 11426 12423 # Extract the first word of "$ac_prog", so it can be a program name with args. 11427 12424 set dummy $ac_prog; ac_word=$2 11428 12425 -echo "$as_me:1637: checking for $ac_word" >&5 11429 +echo "$as_me:164 2: checking for $ac_word" >&512426 +echo "$as_me:1643: checking for $ac_word" >&5 11430 12427 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 11431 12428 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then 11432 12429 echo $ECHO_N "(cached) $ECHO_C" >&6 11433 @@ -1649,7 +165 4,7 @@12430 @@ -1649,7 +1655,7 @@ 11434 12431 test -z "$ac_dir" && ac_dir=. 11435 12432 $as_executable_p "$ac_dir/$ac_word" || continue 11436 12433 ac_cv_prog_ac_ct_CC="$ac_prog" 11437 12434 -echo "$as_me:1652: found $ac_dir/$ac_word" >&5 11438 +echo "$as_me:165 7: found $ac_dir/$ac_word" >&512435 +echo "$as_me:1658: found $ac_dir/$ac_word" >&5 11439 12436 break 11440 12437 done 11441 12438 11442 @@ -1657,10 +166 2,10 @@12439 @@ -1657,10 +1663,10 @@ 11443 12440 fi 11444 12441 ac_ct_CC=$ac_cv_prog_ac_ct_CC 11445 12442 if test -n "$ac_ct_CC"; then 11446 12443 - echo "$as_me:1660: result: $ac_ct_CC" >&5 11447 + echo "$as_me:166 5: result: $ac_ct_CC" >&512444 + echo "$as_me:1666: result: $ac_ct_CC" >&5 11448 12445 echo "${ECHO_T}$ac_ct_CC" >&6 11449 12446 else 11450 12447 - echo "$as_me:1663: result: no" >&5 11451 + echo "$as_me:166 8: result: no" >&512448 + echo "$as_me:1669: result: no" >&5 11452 12449 echo "${ECHO_T}no" >&6 11453 12450 fi 11454 12451 11455 @@ -1672,32 +167 7,32 @@12452 @@ -1672,32 +1678,32 @@ 11456 12453 11457 12454 fi 11458 12455 11459 12456 -test -z "$CC" && { { echo "$as_me:1675: error: no acceptable cc found in \$PATH" >&5 11460 +test -z "$CC" && { { echo "$as_me:168 0: error: no acceptable cc found in \$PATH" >&512457 +test -z "$CC" && { { echo "$as_me:1681: error: no acceptable cc found in \$PATH" >&5 11461 12458 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} 11462 12459 { (exit 1); exit 1; }; } … … 11464 12461 # Provide some information about the compiler. 11465 12462 -echo "$as_me:1680:" \ 11466 +echo "$as_me:168 5:" \12463 +echo "$as_me:1686:" \ 11467 12464 "checking for C compiler version" >&5 11468 12465 ac_compiler=`set X $ac_compile; echo $2` 11469 12466 -{ (eval echo "$as_me:1683: \"$ac_compiler --version </dev/null >&5\"") >&5 11470 +{ (eval echo "$as_me:168 8: \"$ac_compiler --version </dev/null >&5\"") >&512467 +{ (eval echo "$as_me:1689: \"$ac_compiler --version </dev/null >&5\"") >&5 11471 12468 (eval $ac_compiler --version </dev/null >&5) 2>&5 11472 12469 ac_status=$? 11473 12470 - echo "$as_me:1686: \$? = $ac_status" >&5 11474 + echo "$as_me:169 1: \$? = $ac_status" >&512471 + echo "$as_me:1692: \$? = $ac_status" >&5 11475 12472 (exit $ac_status); } 11476 12473 -{ (eval echo "$as_me:1688: \"$ac_compiler -v </dev/null >&5\"") >&5 11477 +{ (eval echo "$as_me:169 3: \"$ac_compiler -v </dev/null >&5\"") >&512474 +{ (eval echo "$as_me:1694: \"$ac_compiler -v </dev/null >&5\"") >&5 11478 12475 (eval $ac_compiler -v </dev/null >&5) 2>&5 11479 12476 ac_status=$? 11480 12477 - echo "$as_me:1691: \$? = $ac_status" >&5 11481 + echo "$as_me:169 6: \$? = $ac_status" >&512478 + echo "$as_me:1697: \$? = $ac_status" >&5 11482 12479 (exit $ac_status); } 11483 12480 -{ (eval echo "$as_me:1693: \"$ac_compiler -V </dev/null >&5\"") >&5 11484 +{ (eval echo "$as_me:169 8: \"$ac_compiler -V </dev/null >&5\"") >&512481 +{ (eval echo "$as_me:1699: \"$ac_compiler -V </dev/null >&5\"") >&5 11485 12482 (eval $ac_compiler -V </dev/null >&5) 2>&5 11486 12483 ac_status=$? 11487 12484 - echo "$as_me:1696: \$? = $ac_status" >&5 11488 + echo "$as_me:170 1: \$? = $ac_status" >&512485 + echo "$as_me:1702: \$? = $ac_status" >&5 11489 12486 (exit $ac_status); } 11490 12487 11491 12488 cat >conftest.$ac_ext <<_ACEOF 11492 12489 -#line 1700 "configure" 11493 +#line 170 5"configure"12490 +#line 1706 "configure" 11494 12491 #include "confdefs.h" 11495 12492 11496 12493 int 11497 @@ -1713,13 +171 8,13 @@12494 @@ -1713,13 +1719,13 @@ 11498 12495 # Try to create an executable without -o first, disregard a.out. 11499 12496 # It will help us diagnose broken compilers, and finding out an intuition 11500 12497 # of exeext. 11501 12498 -echo "$as_me:1716: checking for C compiler default output" >&5 11502 +echo "$as_me:172 1: checking for C compiler default output" >&512499 +echo "$as_me:1722: checking for C compiler default output" >&5 11503 12500 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 11504 12501 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` 11505 12502 -if { (eval echo "$as_me:1719: \"$ac_link_default\"") >&5 11506 +if { (eval echo "$as_me:172 4: \"$ac_link_default\"") >&512503 +if { (eval echo "$as_me:1725: \"$ac_link_default\"") >&5 11507 12504 (eval $ac_link_default) 2>&5 11508 12505 ac_status=$? 11509 12506 - echo "$as_me:1722: \$? = $ac_status" >&5 11510 + echo "$as_me:172 7: \$? = $ac_status" >&512507 + echo "$as_me:1728: \$? = $ac_status" >&5 11511 12508 (exit $ac_status); }; then 11512 12509 # Find the output, starting from the most likely. This scheme is 11513 12510 # not robust to junk in `.', hence go to wildcards (a.*) only as a last 11514 @@ -1742,34 +174 7,34 @@12511 @@ -1742,34 +1748,34 @@ 11515 12512 else 11516 12513 echo "$as_me: failed program was:" >&5 11517 12514 cat conftest.$ac_ext >&5 11518 12515 -{ { echo "$as_me:1745: error: C compiler cannot create executables" >&5 11519 +{ { echo "$as_me:175 0: error: C compiler cannot create executables" >&512516 +{ { echo "$as_me:1751: error: C compiler cannot create executables" >&5 11520 12517 echo "$as_me: error: C compiler cannot create executables" >&2;} 11521 12518 { (exit 77); exit 77; }; } … … 11524 12521 ac_exeext=$ac_cv_exeext 11525 12522 -echo "$as_me:1751: result: $ac_file" >&5 11526 +echo "$as_me:175 6: result: $ac_file" >&512523 +echo "$as_me:1757: result: $ac_file" >&5 11527 12524 echo "${ECHO_T}$ac_file" >&6 11528 12525 … … 11530 12527 # the compiler is broken, or we cross compile. 11531 12528 -echo "$as_me:1756: checking whether the C compiler works" >&5 11532 +echo "$as_me:176 1: checking whether the C compiler works" >&512529 +echo "$as_me:1762: checking whether the C compiler works" >&5 11533 12530 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 11534 12531 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 … … 11537 12534 if { ac_try='./$ac_file' 11538 12535 - { (eval echo "$as_me:1762: \"$ac_try\"") >&5 11539 + { (eval echo "$as_me:176 7: \"$ac_try\"") >&512536 + { (eval echo "$as_me:1768: \"$ac_try\"") >&5 11540 12537 (eval $ac_try) 2>&5 11541 12538 ac_status=$? 11542 12539 - echo "$as_me:1765: \$? = $ac_status" >&5 11543 + echo "$as_me:177 0: \$? = $ac_status" >&512540 + echo "$as_me:1771: \$? = $ac_status" >&5 11544 12541 (exit $ac_status); }; }; then 11545 12542 cross_compiling=no … … 11549 12546 else 11550 12547 - { { echo "$as_me:1772: error: cannot run C compiled programs. 11551 + { { echo "$as_me:177 7: error: cannot run C compiled programs.12548 + { { echo "$as_me:1778: error: cannot run C compiled programs. 11552 12549 If you meant to cross compile, use \`--host'." >&5 11553 12550 echo "$as_me: error: cannot run C compiled programs. 11554 12551 If you meant to cross compile, use \`--host'." >&2;} 11555 @@ -1777,24 +178 2,24 @@12552 @@ -1777,24 +1783,24 @@ 11556 12553 fi 11557 12554 fi 11558 12555 fi 11559 12556 -echo "$as_me:1780: result: yes" >&5 11560 +echo "$as_me:178 5: result: yes" >&512557 +echo "$as_me:1786: result: yes" >&5 11561 12558 echo "${ECHO_T}yes" >&6 11562 12559 … … 11566 12563 # the compiler is broken, or we cross compile. 11567 12564 -echo "$as_me:1787: checking whether we are cross compiling" >&5 11568 +echo "$as_me:179 2: checking whether we are cross compiling" >&512565 +echo "$as_me:1793: checking whether we are cross compiling" >&5 11569 12566 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 11570 12567 -echo "$as_me:1789: result: $cross_compiling" >&5 11571 +echo "$as_me:179 4: result: $cross_compiling" >&512568 +echo "$as_me:1795: result: $cross_compiling" >&5 11572 12569 echo "${ECHO_T}$cross_compiling" >&6 11573 12570 11574 12571 -echo "$as_me:1792: checking for executable suffix" >&5 11575 +echo "$as_me:179 7: checking for executable suffix" >&512572 +echo "$as_me:1798: checking for executable suffix" >&5 11576 12573 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 11577 12574 -if { (eval echo "$as_me:1794: \"$ac_link\"") >&5 11578 +if { (eval echo "$as_me:1 799: \"$ac_link\"") >&512575 +if { (eval echo "$as_me:1800: \"$ac_link\"") >&5 11579 12576 (eval $ac_link) 2>&5 11580 12577 ac_status=$? 11581 12578 - echo "$as_me:1797: \$? = $ac_status" >&5 11582 + echo "$as_me:180 2: \$? = $ac_status" >&512579 + echo "$as_me:1803: \$? = $ac_status" >&5 11583 12580 (exit $ac_status); }; then 11584 12581 # If both `conftest.exe' and `conftest' are `present' (well, observable) 11585 12582 # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will 11586 @@ -1810,25 +181 5,25 @@12583 @@ -1810,25 +1816,25 @@ 11587 12584 esac 11588 12585 done 11589 12586 else 11590 12587 - { { echo "$as_me:1813: error: cannot compute EXEEXT: cannot compile and link" >&5 11591 + { { echo "$as_me:181 8: error: cannot compute EXEEXT: cannot compile and link" >&512588 + { { echo "$as_me:1819: error: cannot compute EXEEXT: cannot compile and link" >&5 11592 12589 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} 11593 12590 { (exit 1); exit 1; }; } … … 11596 12593 rm -f conftest$ac_cv_exeext 11597 12594 -echo "$as_me:1819: result: $ac_cv_exeext" >&5 11598 +echo "$as_me:182 4: result: $ac_cv_exeext" >&512595 +echo "$as_me:1825: result: $ac_cv_exeext" >&5 11599 12596 echo "${ECHO_T}$ac_cv_exeext" >&6 11600 12597 … … 11603 12600 ac_exeext=$EXEEXT 11604 12601 -echo "$as_me:1825: checking for object suffix" >&5 11605 +echo "$as_me:183 0: checking for object suffix" >&512602 +echo "$as_me:1831: checking for object suffix" >&5 11606 12603 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 11607 12604 if test "${ac_cv_objext+set}" = set; then … … 11610 12607 cat >conftest.$ac_ext <<_ACEOF 11611 12608 -#line 1831 "configure" 11612 +#line 183 6"configure"12609 +#line 1837 "configure" 11613 12610 #include "confdefs.h" 11614 12611 11615 12612 int 11616 @@ -1840,10 +184 5,10 @@12613 @@ -1840,10 +1846,10 @@ 11617 12614 } 11618 12615 _ACEOF 11619 12616 rm -f conftest.o conftest.obj 11620 12617 -if { (eval echo "$as_me:1843: \"$ac_compile\"") >&5 11621 +if { (eval echo "$as_me:184 8: \"$ac_compile\"") >&512618 +if { (eval echo "$as_me:1849: \"$ac_compile\"") >&5 11622 12619 (eval $ac_compile) 2>&5 11623 12620 ac_status=$? 11624 12621 - echo "$as_me:1846: \$? = $ac_status" >&5 11625 + echo "$as_me:185 1: \$? = $ac_status" >&512622 + echo "$as_me:1852: \$? = $ac_status" >&5 11626 12623 (exit $ac_status); }; then 11627 12624 for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do 11628 12625 case $ac_file in 11629 @@ -1855,24 +186 0,24 @@12626 @@ -1855,24 +1861,24 @@ 11630 12627 else 11631 12628 echo "$as_me: failed program was:" >&5 11632 12629 cat conftest.$ac_ext >&5 11633 12630 -{ { echo "$as_me:1858: error: cannot compute OBJEXT: cannot compile" >&5 11634 +{ { echo "$as_me:186 3: error: cannot compute OBJEXT: cannot compile" >&512631 +{ { echo "$as_me:1864: error: cannot compute OBJEXT: cannot compile" >&5 11635 12632 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} 11636 12633 { (exit 1); exit 1; }; } … … 11640 12637 fi 11641 12638 -echo "$as_me:1865: result: $ac_cv_objext" >&5 11642 +echo "$as_me:187 0: result: $ac_cv_objext" >&512639 +echo "$as_me:1871: result: $ac_cv_objext" >&5 11643 12640 echo "${ECHO_T}$ac_cv_objext" >&6 11644 12641 OBJEXT=$ac_cv_objext 11645 12642 ac_objext=$OBJEXT 11646 12643 -echo "$as_me:1869: checking whether we are using the GNU C compiler" >&5 11647 +echo "$as_me:187 4: checking whether we are using the GNU C compiler" >&512644 +echo "$as_me:1875: checking whether we are using the GNU C compiler" >&5 11648 12645 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 11649 12646 if test "${ac_cv_c_compiler_gnu+set}" = set; then … … 11652 12649 cat >conftest.$ac_ext <<_ACEOF 11653 12650 -#line 1875 "configure" 11654 +#line 188 0"configure"12651 +#line 1881 "configure" 11655 12652 #include "confdefs.h" 11656 12653 11657 12654 int 11658 @@ -1887,16 +189 2,16 @@12655 @@ -1887,16 +1893,16 @@ 11659 12656 } 11660 12657 _ACEOF 11661 12658 rm -f conftest.$ac_objext 11662 12659 -if { (eval echo "$as_me:1890: \"$ac_compile\"") >&5 11663 +if { (eval echo "$as_me:189 5: \"$ac_compile\"") >&512660 +if { (eval echo "$as_me:1896: \"$ac_compile\"") >&5 11664 12661 (eval $ac_compile) 2>&5 11665 12662 ac_status=$? 11666 12663 - echo "$as_me:1893: \$? = $ac_status" >&5 11667 + echo "$as_me:189 8: \$? = $ac_status" >&512664 + echo "$as_me:1899: \$? = $ac_status" >&5 11668 12665 (exit $ac_status); } && 11669 12666 { ac_try='test -s conftest.$ac_objext' 11670 12667 - { (eval echo "$as_me:1896: \"$ac_try\"") >&5 11671 + { (eval echo "$as_me:190 1: \"$ac_try\"") >&512668 + { (eval echo "$as_me:1902: \"$ac_try\"") >&5 11672 12669 (eval $ac_try) 2>&5 11673 12670 ac_status=$? 11674 12671 - echo "$as_me:1899: \$? = $ac_status" >&5 11675 + echo "$as_me:190 4: \$? = $ac_status" >&512672 + echo "$as_me:1905: \$? = $ac_status" >&5 11676 12673 (exit $ac_status); }; }; then 11677 12674 ac_compiler_gnu=yes 11678 12675 else 11679 @@ -1908,19 +191 3,19 @@12676 @@ -1908,19 +1914,19 @@ 11680 12677 ac_cv_c_compiler_gnu=$ac_compiler_gnu 11681 12678 11682 12679 fi 11683 12680 -echo "$as_me:1911: result: $ac_cv_c_compiler_gnu" >&5 11684 +echo "$as_me:191 6: result: $ac_cv_c_compiler_gnu" >&512681 +echo "$as_me:1917: result: $ac_cv_c_compiler_gnu" >&5 11685 12682 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 11686 12683 GCC=`test $ac_compiler_gnu = yes && echo yes` … … 11689 12686 CFLAGS="-g" 11690 12687 -echo "$as_me:1917: checking whether $CC accepts -g" >&5 11691 +echo "$as_me:192 2: checking whether $CC accepts -g" >&512688 +echo "$as_me:1923: checking whether $CC accepts -g" >&5 11692 12689 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 11693 12690 if test "${ac_cv_prog_cc_g+set}" = set; then … … 11696 12693 cat >conftest.$ac_ext <<_ACEOF 11697 12694 -#line 1923 "configure" 11698 +#line 192 8"configure"12695 +#line 1929 "configure" 11699 12696 #include "confdefs.h" 11700 12697 11701 12698 int 11702 @@ -1932,16 +193 7,16 @@12699 @@ -1932,16 +1938,16 @@ 11703 12700 } 11704 12701 _ACEOF 11705 12702 rm -f conftest.$ac_objext 11706 12703 -if { (eval echo "$as_me:1935: \"$ac_compile\"") >&5 11707 +if { (eval echo "$as_me:194 0: \"$ac_compile\"") >&512704 +if { (eval echo "$as_me:1941: \"$ac_compile\"") >&5 11708 12705 (eval $ac_compile) 2>&5 11709 12706 ac_status=$? 11710 12707 - echo "$as_me:1938: \$? = $ac_status" >&5 11711 + echo "$as_me:194 3: \$? = $ac_status" >&512708 + echo "$as_me:1944: \$? = $ac_status" >&5 11712 12709 (exit $ac_status); } && 11713 12710 { ac_try='test -s conftest.$ac_objext' 11714 12711 - { (eval echo "$as_me:1941: \"$ac_try\"") >&5 11715 + { (eval echo "$as_me:194 6: \"$ac_try\"") >&512712 + { (eval echo "$as_me:1947: \"$ac_try\"") >&5 11716 12713 (eval $ac_try) 2>&5 11717 12714 ac_status=$? 11718 12715 - echo "$as_me:1944: \$? = $ac_status" >&5 11719 + echo "$as_me:19 49: \$? = $ac_status" >&512716 + echo "$as_me:1950: \$? = $ac_status" >&5 11720 12717 (exit $ac_status); }; }; then 11721 12718 ac_cv_prog_cc_g=yes 11722 12719 else 11723 @@ -1951,7 +195 6,7 @@12720 @@ -1951,7 +1957,7 @@ 11724 12721 fi 11725 12722 rm -f conftest.$ac_objext conftest.$ac_ext 11726 12723 fi 11727 12724 -echo "$as_me:1954: result: $ac_cv_prog_cc_g" >&5 11728 +echo "$as_me:19 59: result: $ac_cv_prog_cc_g" >&512725 +echo "$as_me:1960: result: $ac_cv_prog_cc_g" >&5 11729 12726 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 11730 12727 if test "$ac_test_CFLAGS" = set; then 11731 12728 CFLAGS=$ac_save_CFLAGS 11732 @@ -1978,16 +198 3,16 @@12729 @@ -1978,16 +1984,16 @@ 11733 12730 #endif 11734 12731 _ACEOF 11735 12732 rm -f conftest.$ac_objext 11736 12733 -if { (eval echo "$as_me:1981: \"$ac_compile\"") >&5 11737 +if { (eval echo "$as_me:198 6: \"$ac_compile\"") >&512734 +if { (eval echo "$as_me:1987: \"$ac_compile\"") >&5 11738 12735 (eval $ac_compile) 2>&5 11739 12736 ac_status=$? 11740 12737 - echo "$as_me:1984: \$? = $ac_status" >&5 11741 + echo "$as_me:19 89: \$? = $ac_status" >&512738 + echo "$as_me:1990: \$? = $ac_status" >&5 11742 12739 (exit $ac_status); } && 11743 12740 { ac_try='test -s conftest.$ac_objext' 11744 12741 - { (eval echo "$as_me:1987: \"$ac_try\"") >&5 11745 + { (eval echo "$as_me:199 2: \"$ac_try\"") >&512742 + { (eval echo "$as_me:1993: \"$ac_try\"") >&5 11746 12743 (eval $ac_try) 2>&5 11747 12744 ac_status=$? 11748 12745 - echo "$as_me:1990: \$? = $ac_status" >&5 11749 + echo "$as_me:199 5: \$? = $ac_status" >&512746 + echo "$as_me:1996: \$? = $ac_status" >&5 11750 12747 (exit $ac_status); }; }; then 11751 12748 for ac_declaration in \ 11752 12749 ''\ 11753 @@ -1999,7 +200 4,7 @@12750 @@ -1999,7 +2005,7 @@ 11754 12751 'void exit (int);' 11755 12752 do 11756 12753 cat >conftest.$ac_ext <<_ACEOF 11757 12754 -#line 2002 "configure" 11758 +#line 200 7"configure"12755 +#line 2008 "configure" 11759 12756 #include "confdefs.h" 11760 12757 #include <stdlib.h> 11761 12758 $ac_declaration 11762 @@ -2012,16 +201 7,16 @@12759 @@ -2012,16 +2018,16 @@ 11763 12760 } 11764 12761 _ACEOF 11765 12762 rm -f conftest.$ac_objext 11766 12763 -if { (eval echo "$as_me:2015: \"$ac_compile\"") >&5 11767 +if { (eval echo "$as_me:202 0: \"$ac_compile\"") >&512764 +if { (eval echo "$as_me:2021: \"$ac_compile\"") >&5 11768 12765 (eval $ac_compile) 2>&5 11769 12766 ac_status=$? 11770 12767 - echo "$as_me:2018: \$? = $ac_status" >&5 11771 + echo "$as_me:202 3: \$? = $ac_status" >&512768 + echo "$as_me:2024: \$? = $ac_status" >&5 11772 12769 (exit $ac_status); } && 11773 12770 { ac_try='test -s conftest.$ac_objext' 11774 12771 - { (eval echo "$as_me:2021: \"$ac_try\"") >&5 11775 + { (eval echo "$as_me:202 6: \"$ac_try\"") >&512772 + { (eval echo "$as_me:2027: \"$ac_try\"") >&5 11776 12773 (eval $ac_try) 2>&5 11777 12774 ac_status=$? 11778 12775 - echo "$as_me:2024: \$? = $ac_status" >&5 11779 + echo "$as_me:20 29: \$? = $ac_status" >&512776 + echo "$as_me:2030: \$? = $ac_status" >&5 11780 12777 (exit $ac_status); }; }; then 11781 12778 : 11782 12779 else 11783 @@ -2031,7 +203 6,7 @@12780 @@ -2031,7 +2037,7 @@ 11784 12781 fi 11785 12782 rm -f conftest.$ac_objext conftest.$ac_ext 11786 12783 cat >conftest.$ac_ext <<_ACEOF 11787 12784 -#line 2034 "configure" 11788 +#line 20 39"configure"12785 +#line 2040 "configure" 11789 12786 #include "confdefs.h" 11790 12787 $ac_declaration 11791 12788 int 11792 @@ -2043,16 +204 8,16 @@12789 @@ -2043,16 +2049,16 @@ 11793 12790 } 11794 12791 _ACEOF 11795 12792 rm -f conftest.$ac_objext 11796 12793 -if { (eval echo "$as_me:2046: \"$ac_compile\"") >&5 11797 +if { (eval echo "$as_me:205 1: \"$ac_compile\"") >&512794 +if { (eval echo "$as_me:2052: \"$ac_compile\"") >&5 11798 12795 (eval $ac_compile) 2>&5 11799 12796 ac_status=$? 11800 12797 - echo "$as_me:2049: \$? = $ac_status" >&5 11801 + echo "$as_me:205 4: \$? = $ac_status" >&512798 + echo "$as_me:2055: \$? = $ac_status" >&5 11802 12799 (exit $ac_status); } && 11803 12800 { ac_try='test -s conftest.$ac_objext' 11804 12801 - { (eval echo "$as_me:2052: \"$ac_try\"") >&5 11805 + { (eval echo "$as_me:205 7: \"$ac_try\"") >&512802 + { (eval echo "$as_me:2058: \"$ac_try\"") >&5 11806 12803 (eval $ac_try) 2>&5 11807 12804 ac_status=$? 11808 12805 - echo "$as_me:2055: \$? = $ac_status" >&5 11809 + echo "$as_me:206 0: \$? = $ac_status" >&512806 + echo "$as_me:2061: \$? = $ac_status" >&5 11810 12807 (exit $ac_status); }; }; then 11811 12808 break 11812 12809 else 11813 @@ -2082,11 +208 7,11 @@12810 @@ -2082,11 +2088,11 @@ 11814 12811 11815 12812 GCC_VERSION=none 11816 12813 if test "$GCC" = yes ; then 11817 12814 - echo "$as_me:2085: checking version of $CC" >&5 11818 + echo "$as_me:209 0: checking version of $CC" >&512815 + echo "$as_me:2091: checking version of $CC" >&5 11819 12816 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 11820 12817 GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" 11821 12818 test -z "$GCC_VERSION" && GCC_VERSION=unknown 11822 12819 - echo "$as_me:2089: result: $GCC_VERSION" >&5 11823 + echo "$as_me:209 4: result: $GCC_VERSION" >&512820 + echo "$as_me:2095: result: $GCC_VERSION" >&5 11824 12821 echo "${ECHO_T}$GCC_VERSION" >&6 11825 12822 fi 11826 12823 11827 @@ -2096,7 +210 1,7 @@12824 @@ -2096,7 +2102,7 @@ 11828 12825 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 11829 12826 ac_compiler_gnu=$ac_cv_c_compiler_gnu 11830 12827 ac_main_return=return 11831 12828 -echo "$as_me:2099: checking how to run the C preprocessor" >&5 11832 +echo "$as_me:210 4: checking how to run the C preprocessor" >&512829 +echo "$as_me:2105: checking how to run the C preprocessor" >&5 11833 12830 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 11834 12831 # On Suns, sometimes $CPP names a directory. 11835 12832 if test -n "$CPP" && test -d "$CPP"; then 11836 @@ -2117,18 +212 2,18 @@12833 @@ -2117,18 +2123,18 @@ 11837 12834 # On the NeXT, cc -E runs the code through the compiler's parser, 11838 12835 # not just through cpp. "Syntax error" is here to catch this case. 11839 12836 cat >conftest.$ac_ext <<_ACEOF 11840 12837 -#line 2120 "configure" 11841 +#line 212 5"configure"12838 +#line 2126 "configure" 11842 12839 #include "confdefs.h" 11843 12840 #include <assert.h> … … 11845 12842 _ACEOF 11846 12843 -if { (eval echo "$as_me:2125: \"$ac_cpp conftest.$ac_ext\"") >&5 11847 +if { (eval echo "$as_me:213 0: \"$ac_cpp conftest.$ac_ext\"") >&512844 +if { (eval echo "$as_me:2131: \"$ac_cpp conftest.$ac_ext\"") >&5 11848 12845 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11849 12846 ac_status=$? … … 11852 12849 cat conftest.err >&5 11853 12850 - echo "$as_me:2131: \$? = $ac_status" >&5 11854 + echo "$as_me:213 6: \$? = $ac_status" >&512851 + echo "$as_me:2137: \$? = $ac_status" >&5 11855 12852 (exit $ac_status); } >/dev/null; then 11856 12853 if test -s conftest.err; then 11857 12854 ac_cpp_err=$ac_c_preproc_warn_flag 11858 @@ -2151,17 +215 6,17 @@12855 @@ -2151,17 +2157,17 @@ 11859 12856 # OK, works on sane cases. Now check whether non-existent headers 11860 12857 # can be detected and how. 11861 12858 cat >conftest.$ac_ext <<_ACEOF 11862 12859 -#line 2154 "configure" 11863 +#line 21 59"configure"12860 +#line 2160 "configure" 11864 12861 #include "confdefs.h" 11865 12862 #include <ac_nonexistent.h> 11866 12863 _ACEOF 11867 12864 -if { (eval echo "$as_me:2158: \"$ac_cpp conftest.$ac_ext\"") >&5 11868 +if { (eval echo "$as_me:216 3: \"$ac_cpp conftest.$ac_ext\"") >&512865 +if { (eval echo "$as_me:2164: \"$ac_cpp conftest.$ac_ext\"") >&5 11869 12866 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11870 12867 ac_status=$? … … 11873 12870 cat conftest.err >&5 11874 12871 - echo "$as_me:2164: \$? = $ac_status" >&5 11875 + echo "$as_me:21 69: \$? = $ac_status" >&512872 + echo "$as_me:2170: \$? = $ac_status" >&5 11876 12873 (exit $ac_status); } >/dev/null; then 11877 12874 if test -s conftest.err; then 11878 12875 ac_cpp_err=$ac_c_preproc_warn_flag 11879 @@ -2198,7 +220 3,7 @@12876 @@ -2198,7 +2204,7 @@ 11880 12877 else 11881 12878 ac_cv_prog_CPP=$CPP 11882 12879 fi 11883 12880 -echo "$as_me:2201: result: $CPP" >&5 11884 +echo "$as_me:220 6: result: $CPP" >&512881 +echo "$as_me:2207: result: $CPP" >&5 11885 12882 echo "${ECHO_T}$CPP" >&6 11886 12883 ac_preproc_ok=false 11887 12884 for ac_c_preproc_warn_flag in '' yes 11888 @@ -2208,18 +221 3,18 @@12885 @@ -2208,18 +2214,18 @@ 11889 12886 # On the NeXT, cc -E runs the code through the compiler's parser, 11890 12887 # not just through cpp. "Syntax error" is here to catch this case. 11891 12888 cat >conftest.$ac_ext <<_ACEOF 11892 12889 -#line 2211 "configure" 11893 +#line 221 6"configure"12890 +#line 2217 "configure" 11894 12891 #include "confdefs.h" 11895 12892 #include <assert.h> … … 11897 12894 _ACEOF 11898 12895 -if { (eval echo "$as_me:2216: \"$ac_cpp conftest.$ac_ext\"") >&5 11899 +if { (eval echo "$as_me:222 1: \"$ac_cpp conftest.$ac_ext\"") >&512896 +if { (eval echo "$as_me:2222: \"$ac_cpp conftest.$ac_ext\"") >&5 11900 12897 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11901 12898 ac_status=$? … … 11904 12901 cat conftest.err >&5 11905 12902 - echo "$as_me:2222: \$? = $ac_status" >&5 11906 + echo "$as_me:222 7: \$? = $ac_status" >&512903 + echo "$as_me:2228: \$? = $ac_status" >&5 11907 12904 (exit $ac_status); } >/dev/null; then 11908 12905 if test -s conftest.err; then 11909 12906 ac_cpp_err=$ac_c_preproc_warn_flag 11910 @@ -2242,17 +224 7,17 @@12907 @@ -2242,17 +2248,17 @@ 11911 12908 # OK, works on sane cases. Now check whether non-existent headers 11912 12909 # can be detected and how. 11913 12910 cat >conftest.$ac_ext <<_ACEOF 11914 12911 -#line 2245 "configure" 11915 +#line 225 0"configure"12912 +#line 2251 "configure" 11916 12913 #include "confdefs.h" 11917 12914 #include <ac_nonexistent.h> 11918 12915 _ACEOF 11919 12916 -if { (eval echo "$as_me:2249: \"$ac_cpp conftest.$ac_ext\"") >&5 11920 +if { (eval echo "$as_me:225 4: \"$ac_cpp conftest.$ac_ext\"") >&512917 +if { (eval echo "$as_me:2255: \"$ac_cpp conftest.$ac_ext\"") >&5 11921 12918 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 11922 12919 ac_status=$? … … 11925 12922 cat conftest.err >&5 11926 12923 - echo "$as_me:2255: \$? = $ac_status" >&5 11927 + echo "$as_me:226 0: \$? = $ac_status" >&512924 + echo "$as_me:2261: \$? = $ac_status" >&5 11928 12925 (exit $ac_status); } >/dev/null; then 11929 12926 if test -s conftest.err; then 11930 12927 ac_cpp_err=$ac_c_preproc_warn_flag 11931 @@ -2280,7 +228 5,7 @@12928 @@ -2280,7 +2286,7 @@ 11932 12929 if $ac_preproc_ok; then 11933 12930 : 11934 12931 else 11935 12932 - { { echo "$as_me:2283: error: C preprocessor \"$CPP\" fails sanity check" >&5 11936 + { { echo "$as_me:228 8: error: C preprocessor \"$CPP\" fails sanity check" >&512933 + { { echo "$as_me:2289: error: C preprocessor \"$CPP\" fails sanity check" >&5 11937 12934 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} 11938 12935 { (exit 1); exit 1; }; } 11939 12936 fi 11940 @@ -2293,14 +229 8,14 @@12937 @@ -2293,14 +2299,14 @@ 11941 12938 ac_main_return=return 11942 12939 11943 12940 if test $ac_cv_c_compiler_gnu = yes; then 11944 12941 - echo "$as_me:2296: checking whether $CC needs -traditional" >&5 11945 + echo "$as_me:230 1: checking whether $CC needs -traditional" >&512942 + echo "$as_me:2302: checking whether $CC needs -traditional" >&5 11946 12943 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 11947 12944 if test "${ac_cv_prog_gcc_traditional+set}" = set; then … … 11951 12948 cat >conftest.$ac_ext <<_ACEOF 11952 12949 -#line 2303 "configure" 11953 +#line 230 8"configure"12950 +#line 2309 "configure" 11954 12951 #include "confdefs.h" 11955 12952 #include <sgtty.h> 11956 12953 int Autoconf = TIOCGETP; 11957 @@ -2315,7 +232 0,7 @@12954 @@ -2315,7 +2321,7 @@ 11958 12955 11959 12956 if test $ac_cv_prog_gcc_traditional = no; then 11960 12957 cat >conftest.$ac_ext <<_ACEOF 11961 12958 -#line 2318 "configure" 11962 +#line 232 3"configure"12959 +#line 2324 "configure" 11963 12960 #include "confdefs.h" 11964 12961 #include <termio.h> 11965 12962 int Autoconf = TCGETA; 11966 @@ -2328,14 +233 3,14 @@12963 @@ -2328,14 +2334,14 @@ 11967 12964 11968 12965 fi 11969 12966 fi 11970 12967 -echo "$as_me:2331: result: $ac_cv_prog_gcc_traditional" >&5 11971 +echo "$as_me:233 6: result: $ac_cv_prog_gcc_traditional" >&512968 +echo "$as_me:2337: result: $ac_cv_prog_gcc_traditional" >&5 11972 12969 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 11973 12970 if test $ac_cv_prog_gcc_traditional = yes; then … … 11977 12974 11978 12975 -echo "$as_me:2338: checking whether $CC understands -c and -o together" >&5 11979 +echo "$as_me:234 3: checking whether $CC understands -c and -o together" >&512976 +echo "$as_me:2344: checking whether $CC understands -c and -o together" >&5 11980 12977 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6 11981 12978 if test "${cf_cv_prog_CC_c_o+set}" = set; then 11982 12979 echo $ECHO_N "(cached) $ECHO_C" >&6 11983 @@ -2351,15 +235 6,15 @@12980 @@ -2351,15 +2357,15 @@ 11984 12981 # We do the test twice because some compilers refuse to overwrite an 11985 12982 # existing .o file with -o, though they will create one. 11986 12983 ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' 11987 12984 -if { (eval echo "$as_me:2354: \"$ac_try\"") >&5 11988 +if { (eval echo "$as_me:23 59: \"$ac_try\"") >&512985 +if { (eval echo "$as_me:2360: \"$ac_try\"") >&5 11989 12986 (eval $ac_try) 2>&5 11990 12987 ac_status=$? 11991 12988 - echo "$as_me:2357: \$? = $ac_status" >&5 11992 + echo "$as_me:236 2: \$? = $ac_status" >&512989 + echo "$as_me:2363: \$? = $ac_status" >&5 11993 12990 (exit $ac_status); } && 11994 12991 - test -f conftest2.$ac_objext && { (eval echo "$as_me:2359: \"$ac_try\"") >&5 11995 + test -f conftest2.$ac_objext && { (eval echo "$as_me:236 4: \"$ac_try\"") >&512992 + test -f conftest2.$ac_objext && { (eval echo "$as_me:2365: \"$ac_try\"") >&5 11996 12993 (eval $ac_try) 2>&5 11997 12994 ac_status=$? 11998 12995 - echo "$as_me:2362: \$? = $ac_status" >&5 11999 + echo "$as_me:236 7: \$? = $ac_status" >&512996 + echo "$as_me:2368: \$? = $ac_status" >&5 12000 12997 (exit $ac_status); }; 12001 12998 then 12002 12999 eval cf_cv_prog_CC_c_o=yes 12003 @@ -2370,19 +237 5,19 @@13000 @@ -2370,19 +2376,19 @@ 12004 13001 12005 13002 fi 12006 13003 if test $cf_cv_prog_CC_c_o = yes; then 12007 13004 - echo "$as_me:2373: result: yes" >&5 12008 + echo "$as_me:237 8: result: yes" >&513005 + echo "$as_me:2379: result: yes" >&5 12009 13006 echo "${ECHO_T}yes" >&6 12010 13007 else 12011 13008 - echo "$as_me:2376: result: no" >&5 12012 + echo "$as_me:238 1: result: no" >&513009 + echo "$as_me:2382: result: no" >&5 12013 13010 echo "${ECHO_T}no" >&6 12014 13011 fi 12015 13012 12016 13013 -echo "$as_me:2380: checking for POSIXized ISC" >&5 12017 +echo "$as_me:238 5: checking for POSIXized ISC" >&513014 +echo "$as_me:2386: checking for POSIXized ISC" >&5 12018 13015 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6 12019 13016 if test -d /etc/conf/kconfig.d && … … 12021 13018 then 12022 13019 - echo "$as_me:2385: result: yes" >&5 12023 + echo "$as_me:239 0: result: yes" >&513020 + echo "$as_me:2391: result: yes" >&5 12024 13021 echo "${ECHO_T}yes" >&6 12025 13022 ISC=yes # If later tests want to check for ISC. 12026 13023 12027 @@ -2396,12 +240 1,12 @@13024 @@ -2396,12 +2402,12 @@ 12028 13025 CC="$CC -Xp" 12029 13026 fi 12030 13027 else 12031 13028 - echo "$as_me:2399: result: no" >&5 12032 + echo "$as_me:240 4: result: no" >&513029 + echo "$as_me:2405: result: no" >&5 12033 13030 echo "${ECHO_T}no" >&6 12034 13031 ISC= … … 12036 13033 12037 13034 -echo "$as_me:2404: checking for ${CC-cc} option to accept ANSI C" >&5 12038 +echo "$as_me:24 09: checking for ${CC-cc} option to accept ANSI C" >&513035 +echo "$as_me:2410: checking for ${CC-cc} option to accept ANSI C" >&5 12039 13036 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6 12040 13037 if test "${cf_cv_ansi_cc+set}" = set; then 12041 13038 echo $ECHO_N "(cached) $ECHO_C" >&6 12042 @@ -2495,7 +250 0,7 @@13039 @@ -2495,7 +2501,7 @@ 12043 13040 fi 12044 13041 12045 13042 cat >conftest.$ac_ext <<_ACEOF 12046 13043 -#line 2498 "configure" 12047 +#line 250 3"configure"13044 +#line 2504 "configure" 12048 13045 #include "confdefs.h" 12049 13046 12050 13047 #ifndef CC_HAS_PROTOS 12051 @@ -2516,16 +252 1,16 @@13048 @@ -2516,16 +2522,16 @@ 12052 13049 } 12053 13050 _ACEOF 12054 13051 rm -f conftest.$ac_objext 12055 13052 -if { (eval echo "$as_me:2519: \"$ac_compile\"") >&5 12056 +if { (eval echo "$as_me:252 4: \"$ac_compile\"") >&513053 +if { (eval echo "$as_me:2525: \"$ac_compile\"") >&5 12057 13054 (eval $ac_compile) 2>&5 12058 13055 ac_status=$? 12059 13056 - echo "$as_me:2522: \$? = $ac_status" >&5 12060 + echo "$as_me:252 7: \$? = $ac_status" >&513057 + echo "$as_me:2528: \$? = $ac_status" >&5 12061 13058 (exit $ac_status); } && 12062 13059 { ac_try='test -s conftest.$ac_objext' 12063 13060 - { (eval echo "$as_me:2525: \"$ac_try\"") >&5 12064 + { (eval echo "$as_me:253 0: \"$ac_try\"") >&513061 + { (eval echo "$as_me:2531: \"$ac_try\"") >&5 12065 13062 (eval $ac_try) 2>&5 12066 13063 ac_status=$? 12067 13064 - echo "$as_me:2528: \$? = $ac_status" >&5 12068 + echo "$as_me:253 3: \$? = $ac_status" >&513065 + echo "$as_me:2534: \$? = $ac_status" >&5 12069 13066 (exit $ac_status); }; }; then 12070 13067 cf_cv_ansi_cc="$cf_arg"; break 12071 13068 else 12072 @@ -2538,7 +254 3,7 @@13069 @@ -2538,7 +2544,7 @@ 12073 13070 CPPFLAGS="$cf_save_CPPFLAGS" 12074 13071 12075 13072 fi 12076 13073 -echo "$as_me:2541: result: $cf_cv_ansi_cc" >&5 12077 +echo "$as_me:254 6: result: $cf_cv_ansi_cc" >&513074 +echo "$as_me:2547: result: $cf_cv_ansi_cc" >&5 12078 13075 echo "${ECHO_T}$cf_cv_ansi_cc" >&6 12079 13076 12080 13077 if test "$cf_cv_ansi_cc" != "no"; then 12081 @@ -2621,7 +262 6,7 @@13078 @@ -2621,7 +2627,7 @@ 12082 13079 fi 12083 13080 12084 13081 if test "$cf_cv_ansi_cc" = "no"; then 12085 13082 - { { echo "$as_me:2624: error: Your compiler does not appear to recognize prototypes. 12086 + { { echo "$as_me:26 29: error: Your compiler does not appear to recognize prototypes.13083 + { { echo "$as_me:2630: error: Your compiler does not appear to recognize prototypes. 12087 13084 You have the following choices: 12088 13085 a. adjust your compiler options 12089 13086 b. get an up-to-date compiler 12090 @@ -2661,7 +266 6,7 @@13087 @@ -2661,7 +2667,7 @@ 12091 13088 *) LDPATH=$PATH:/sbin:/usr/sbin 12092 13089 # Extract the first word of "ldconfig", so it can be a program name with args. 12093 13090 set dummy ldconfig; ac_word=$2 12094 13091 -echo "$as_me:2664: checking for $ac_word" >&5 12095 +echo "$as_me:26 69: checking for $ac_word" >&513092 +echo "$as_me:2670: checking for $ac_word" >&5 12096 13093 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12097 13094 if test "${ac_cv_path_LDCONFIG+set}" = set; then 12098 13095 echo $ECHO_N "(cached) $ECHO_C" >&6 12099 @@ -2678,7 +268 3,7 @@13096 @@ -2678,7 +2684,7 @@ 12100 13097 test -z "$ac_dir" && ac_dir=. 12101 13098 if $as_executable_p "$ac_dir/$ac_word"; then 12102 13099 ac_cv_path_LDCONFIG="$ac_dir/$ac_word" 12103 13100 - echo "$as_me:2681: found $ac_dir/$ac_word" >&5 12104 + echo "$as_me:268 6: found $ac_dir/$ac_word" >&513101 + echo "$as_me:2687: found $ac_dir/$ac_word" >&5 12105 13102 break 12106 13103 fi 12107 13104 done 12108 @@ -2689,10 +269 4,10 @@13105 @@ -2689,10 +2695,10 @@ 12109 13106 LDCONFIG=$ac_cv_path_LDCONFIG 12110 13107 12111 13108 if test -n "$LDCONFIG"; then 12112 13109 - echo "$as_me:2692: result: $LDCONFIG" >&5 12113 + echo "$as_me:269 7: result: $LDCONFIG" >&513110 + echo "$as_me:2698: result: $LDCONFIG" >&5 12114 13111 echo "${ECHO_T}$LDCONFIG" >&6 12115 13112 else 12116 13113 - echo "$as_me:2695: result: no" >&5 12117 + echo "$as_me:270 0: result: no" >&513114 + echo "$as_me:2701: result: no" >&5 12118 13115 echo "${ECHO_T}no" >&6 12119 13116 fi 12120 13117 12121 @@ -2700,7 +270 5,7 @@13118 @@ -2700,7 +2706,7 @@ 12122 13119 esac 12123 13120 fi 12124 13121 12125 13122 -echo "$as_me:2703: checking if you want to ensure bool is consistent with C++" >&5 12126 +echo "$as_me:270 8: checking if you want to ensure bool is consistent with C++" >&513123 +echo "$as_me:2709: checking if you want to ensure bool is consistent with C++" >&5 12127 13124 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6 12128 13125 12129 13126 # Check whether --with-cxx or --without-cxx was given. 12130 @@ -2710,7 +271 5,7 @@13127 @@ -2710,7 +2716,7 @@ 12131 13128 else 12132 13129 cf_with_cxx=yes 12133 13130 fi; 12134 13131 -echo "$as_me:2713: result: $cf_with_cxx" >&5 12135 +echo "$as_me:271 8: result: $cf_with_cxx" >&513132 +echo "$as_me:2719: result: $cf_with_cxx" >&5 12136 13133 echo "${ECHO_T}$cf_with_cxx" >&6 12137 13134 if test "X$cf_with_cxx" = Xno ; then 12138 13135 CXX="" 12139 @@ -2728,7 +273 3,7 @@13136 @@ -2728,7 +2734,7 @@ 12140 13137 do 12141 13138 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 12142 13139 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 12143 13140 -echo "$as_me:2731: checking for $ac_word" >&5 12144 +echo "$as_me:273 6: checking for $ac_word" >&513141 +echo "$as_me:2737: checking for $ac_word" >&5 12145 13142 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12146 13143 if test "${ac_cv_prog_CXX+set}" = set; then 12147 13144 echo $ECHO_N "(cached) $ECHO_C" >&6 12148 @@ -2743,7 +274 8,7 @@13145 @@ -2743,7 +2749,7 @@ 12149 13146 test -z "$ac_dir" && ac_dir=. 12150 13147 $as_executable_p "$ac_dir/$ac_word" || continue 12151 13148 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" 12152 13149 -echo "$as_me:2746: found $ac_dir/$ac_word" >&5 12153 +echo "$as_me:275 1: found $ac_dir/$ac_word" >&513150 +echo "$as_me:2752: found $ac_dir/$ac_word" >&5 12154 13151 break 12155 13152 done 12156 13153 12157 @@ -2751,10 +275 6,10 @@13154 @@ -2751,10 +2757,10 @@ 12158 13155 fi 12159 13156 CXX=$ac_cv_prog_CXX 12160 13157 if test -n "$CXX"; then 12161 13158 - echo "$as_me:2754: result: $CXX" >&5 12162 + echo "$as_me:27 59: result: $CXX" >&513159 + echo "$as_me:2760: result: $CXX" >&5 12163 13160 echo "${ECHO_T}$CXX" >&6 12164 13161 else 12165 13162 - echo "$as_me:2757: result: no" >&5 12166 + echo "$as_me:276 2: result: no" >&513163 + echo "$as_me:2763: result: no" >&5 12167 13164 echo "${ECHO_T}no" >&6 12168 13165 fi 12169 13166 12170 @@ -2767,7 +277 2,7 @@13167 @@ -2767,7 +2773,7 @@ 12171 13168 do 12172 13169 # Extract the first word of "$ac_prog", so it can be a program name with args. 12173 13170 set dummy $ac_prog; ac_word=$2 12174 13171 -echo "$as_me:2770: checking for $ac_word" >&5 12175 +echo "$as_me:277 5: checking for $ac_word" >&513172 +echo "$as_me:2776: checking for $ac_word" >&5 12176 13173 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12177 13174 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then 12178 13175 echo $ECHO_N "(cached) $ECHO_C" >&6 12179 @@ -2782,7 +278 7,7 @@13176 @@ -2782,7 +2788,7 @@ 12180 13177 test -z "$ac_dir" && ac_dir=. 12181 13178 $as_executable_p "$ac_dir/$ac_word" || continue 12182 13179 ac_cv_prog_ac_ct_CXX="$ac_prog" 12183 13180 -echo "$as_me:2785: found $ac_dir/$ac_word" >&5 12184 +echo "$as_me:279 0: found $ac_dir/$ac_word" >&513181 +echo "$as_me:2791: found $ac_dir/$ac_word" >&5 12185 13182 break 12186 13183 done 12187 13184 12188 @@ -2790,10 +279 5,10 @@13185 @@ -2790,10 +2796,10 @@ 12189 13186 fi 12190 13187 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX 12191 13188 if test -n "$ac_ct_CXX"; then 12192 13189 - echo "$as_me:2793: result: $ac_ct_CXX" >&5 12193 + echo "$as_me:279 8: result: $ac_ct_CXX" >&513190 + echo "$as_me:2799: result: $ac_ct_CXX" >&5 12194 13191 echo "${ECHO_T}$ac_ct_CXX" >&6 12195 13192 else 12196 13193 - echo "$as_me:2796: result: no" >&5 12197 + echo "$as_me:280 1: result: no" >&513194 + echo "$as_me:2802: result: no" >&5 12198 13195 echo "${ECHO_T}no" >&6 12199 13196 fi 12200 13197 12201 @@ -2805,32 +281 0,32 @@13198 @@ -2805,32 +2811,32 @@ 12202 13199 fi 12203 13200 12204 13201 # Provide some information about the compiler. 12205 13202 -echo "$as_me:2808:" \ 12206 +echo "$as_me:281 3:" \13203 +echo "$as_me:2814:" \ 12207 13204 "checking for C++ compiler version" >&5 12208 13205 ac_compiler=`set X $ac_compile; echo $2` 12209 13206 -{ (eval echo "$as_me:2811: \"$ac_compiler --version </dev/null >&5\"") >&5 12210 +{ (eval echo "$as_me:281 6: \"$ac_compiler --version </dev/null >&5\"") >&513207 +{ (eval echo "$as_me:2817: \"$ac_compiler --version </dev/null >&5\"") >&5 12211 13208 (eval $ac_compiler --version </dev/null >&5) 2>&5 12212 13209 ac_status=$? 12213 13210 - echo "$as_me:2814: \$? = $ac_status" >&5 12214 + echo "$as_me:28 19: \$? = $ac_status" >&513211 + echo "$as_me:2820: \$? = $ac_status" >&5 12215 13212 (exit $ac_status); } 12216 13213 -{ (eval echo "$as_me:2816: \"$ac_compiler -v </dev/null >&5\"") >&5 12217 +{ (eval echo "$as_me:282 1: \"$ac_compiler -v </dev/null >&5\"") >&513214 +{ (eval echo "$as_me:2822: \"$ac_compiler -v </dev/null >&5\"") >&5 12218 13215 (eval $ac_compiler -v </dev/null >&5) 2>&5 12219 13216 ac_status=$? 12220 13217 - echo "$as_me:2819: \$? = $ac_status" >&5 12221 + echo "$as_me:282 4: \$? = $ac_status" >&513218 + echo "$as_me:2825: \$? = $ac_status" >&5 12222 13219 (exit $ac_status); } 12223 13220 -{ (eval echo "$as_me:2821: \"$ac_compiler -V </dev/null >&5\"") >&5 12224 +{ (eval echo "$as_me:282 6: \"$ac_compiler -V </dev/null >&5\"") >&513221 +{ (eval echo "$as_me:2827: \"$ac_compiler -V </dev/null >&5\"") >&5 12225 13222 (eval $ac_compiler -V </dev/null >&5) 2>&5 12226 13223 ac_status=$? 12227 13224 - echo "$as_me:2824: \$? = $ac_status" >&5 12228 + echo "$as_me:28 29: \$? = $ac_status" >&513225 + echo "$as_me:2830: \$? = $ac_status" >&5 12229 13226 (exit $ac_status); } 12230 13227 12231 13228 -echo "$as_me:2827: checking whether we are using the GNU C++ compiler" >&5 12232 +echo "$as_me:283 2: checking whether we are using the GNU C++ compiler" >&513229 +echo "$as_me:2833: checking whether we are using the GNU C++ compiler" >&5 12233 13230 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 12234 13231 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then … … 12237 13234 cat >conftest.$ac_ext <<_ACEOF 12238 13235 -#line 2833 "configure" 12239 +#line 283 8"configure"13236 +#line 2839 "configure" 12240 13237 #include "confdefs.h" 12241 13238 12242 13239 int 12243 @@ -2845,16 +285 0,16 @@13240 @@ -2845,16 +2851,16 @@ 12244 13241 } 12245 13242 _ACEOF 12246 13243 rm -f conftest.$ac_objext 12247 13244 -if { (eval echo "$as_me:2848: \"$ac_compile\"") >&5 12248 +if { (eval echo "$as_me:285 3: \"$ac_compile\"") >&513245 +if { (eval echo "$as_me:2854: \"$ac_compile\"") >&5 12249 13246 (eval $ac_compile) 2>&5 12250 13247 ac_status=$? 12251 13248 - echo "$as_me:2851: \$? = $ac_status" >&5 12252 + echo "$as_me:285 6: \$? = $ac_status" >&513249 + echo "$as_me:2857: \$? = $ac_status" >&5 12253 13250 (exit $ac_status); } && 12254 13251 { ac_try='test -s conftest.$ac_objext' 12255 13252 - { (eval echo "$as_me:2854: \"$ac_try\"") >&5 12256 + { (eval echo "$as_me:28 59: \"$ac_try\"") >&513253 + { (eval echo "$as_me:2860: \"$ac_try\"") >&5 12257 13254 (eval $ac_try) 2>&5 12258 13255 ac_status=$? 12259 13256 - echo "$as_me:2857: \$? = $ac_status" >&5 12260 + echo "$as_me:286 2: \$? = $ac_status" >&513257 + echo "$as_me:2863: \$? = $ac_status" >&5 12261 13258 (exit $ac_status); }; }; then 12262 13259 ac_compiler_gnu=yes 12263 13260 else 12264 @@ -2866,19 +287 1,19 @@13261 @@ -2866,19 +2872,19 @@ 12265 13262 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu 12266 13263 12267 13264 fi 12268 13265 -echo "$as_me:2869: result: $ac_cv_cxx_compiler_gnu" >&5 12269 +echo "$as_me:287 4: result: $ac_cv_cxx_compiler_gnu" >&513266 +echo "$as_me:2875: result: $ac_cv_cxx_compiler_gnu" >&5 12270 13267 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 12271 13268 GXX=`test $ac_compiler_gnu = yes && echo yes` … … 12274 13271 CXXFLAGS="-g" 12275 13272 -echo "$as_me:2875: checking whether $CXX accepts -g" >&5 12276 +echo "$as_me:288 0: checking whether $CXX accepts -g" >&513273 +echo "$as_me:2881: checking whether $CXX accepts -g" >&5 12277 13274 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 12278 13275 if test "${ac_cv_prog_cxx_g+set}" = set; then … … 12281 13278 cat >conftest.$ac_ext <<_ACEOF 12282 13279 -#line 2881 "configure" 12283 +#line 288 6"configure"13280 +#line 2887 "configure" 12284 13281 #include "confdefs.h" 12285 13282 12286 13283 int 12287 @@ -2890,16 +289 5,16 @@13284 @@ -2890,16 +2896,16 @@ 12288 13285 } 12289 13286 _ACEOF 12290 13287 rm -f conftest.$ac_objext 12291 13288 -if { (eval echo "$as_me:2893: \"$ac_compile\"") >&5 12292 +if { (eval echo "$as_me:289 8: \"$ac_compile\"") >&513289 +if { (eval echo "$as_me:2899: \"$ac_compile\"") >&5 12293 13290 (eval $ac_compile) 2>&5 12294 13291 ac_status=$? 12295 13292 - echo "$as_me:2896: \$? = $ac_status" >&5 12296 + echo "$as_me:290 1: \$? = $ac_status" >&513293 + echo "$as_me:2902: \$? = $ac_status" >&5 12297 13294 (exit $ac_status); } && 12298 13295 { ac_try='test -s conftest.$ac_objext' 12299 13296 - { (eval echo "$as_me:2899: \"$ac_try\"") >&5 12300 + { (eval echo "$as_me:290 4: \"$ac_try\"") >&513297 + { (eval echo "$as_me:2905: \"$ac_try\"") >&5 12301 13298 (eval $ac_try) 2>&5 12302 13299 ac_status=$? 12303 13300 - echo "$as_me:2902: \$? = $ac_status" >&5 12304 + echo "$as_me:290 7: \$? = $ac_status" >&513301 + echo "$as_me:2908: \$? = $ac_status" >&5 12305 13302 (exit $ac_status); }; }; then 12306 13303 ac_cv_prog_cxx_g=yes 12307 13304 else 12308 @@ -2909,7 +291 4,7 @@13305 @@ -2909,7 +2915,7 @@ 12309 13306 fi 12310 13307 rm -f conftest.$ac_objext conftest.$ac_ext 12311 13308 fi 12312 13309 -echo "$as_me:2912: result: $ac_cv_prog_cxx_g" >&5 12313 +echo "$as_me:291 7: result: $ac_cv_prog_cxx_g" >&513310 +echo "$as_me:2918: result: $ac_cv_prog_cxx_g" >&5 12314 13311 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 12315 13312 if test "$ac_test_CXXFLAGS" = set; then 12316 13313 CXXFLAGS=$ac_save_CXXFLAGS 12317 @@ -2936,7 +294 1,7 @@13314 @@ -2936,7 +2942,7 @@ 12318 13315 'void exit (int);' 12319 13316 do 12320 13317 cat >conftest.$ac_ext <<_ACEOF 12321 13318 -#line 2939 "configure" 12322 +#line 294 4"configure"13319 +#line 2945 "configure" 12323 13320 #include "confdefs.h" 12324 13321 #include <stdlib.h> 12325 13322 $ac_declaration 12326 @@ -2949,16 +295 4,16 @@13323 @@ -2949,16 +2955,16 @@ 12327 13324 } 12328 13325 _ACEOF 12329 13326 rm -f conftest.$ac_objext 12330 13327 -if { (eval echo "$as_me:2952: \"$ac_compile\"") >&5 12331 +if { (eval echo "$as_me:295 7: \"$ac_compile\"") >&513328 +if { (eval echo "$as_me:2958: \"$ac_compile\"") >&5 12332 13329 (eval $ac_compile) 2>&5 12333 13330 ac_status=$? 12334 13331 - echo "$as_me:2955: \$? = $ac_status" >&5 12335 + echo "$as_me:296 0: \$? = $ac_status" >&513332 + echo "$as_me:2961: \$? = $ac_status" >&5 12336 13333 (exit $ac_status); } && 12337 13334 { ac_try='test -s conftest.$ac_objext' 12338 13335 - { (eval echo "$as_me:2958: \"$ac_try\"") >&5 12339 + { (eval echo "$as_me:296 3: \"$ac_try\"") >&513336 + { (eval echo "$as_me:2964: \"$ac_try\"") >&5 12340 13337 (eval $ac_try) 2>&5 12341 13338 ac_status=$? 12342 13339 - echo "$as_me:2961: \$? = $ac_status" >&5 12343 + echo "$as_me:296 6: \$? = $ac_status" >&513340 + echo "$as_me:2967: \$? = $ac_status" >&5 12344 13341 (exit $ac_status); }; }; then 12345 13342 : 12346 13343 else 12347 @@ -2968,7 +297 3,7 @@13344 @@ -2968,7 +2974,7 @@ 12348 13345 fi 12349 13346 rm -f conftest.$ac_objext conftest.$ac_ext 12350 13347 cat >conftest.$ac_ext <<_ACEOF 12351 13348 -#line 2971 "configure" 12352 +#line 297 6"configure"13349 +#line 2977 "configure" 12353 13350 #include "confdefs.h" 12354 13351 $ac_declaration 12355 13352 int 12356 @@ -2980,16 +298 5,16 @@13353 @@ -2980,16 +2986,16 @@ 12357 13354 } 12358 13355 _ACEOF 12359 13356 rm -f conftest.$ac_objext 12360 13357 -if { (eval echo "$as_me:2983: \"$ac_compile\"") >&5 12361 +if { (eval echo "$as_me:298 8: \"$ac_compile\"") >&513358 +if { (eval echo "$as_me:2989: \"$ac_compile\"") >&5 12362 13359 (eval $ac_compile) 2>&5 12363 13360 ac_status=$? 12364 13361 - echo "$as_me:2986: \$? = $ac_status" >&5 12365 + echo "$as_me:299 1: \$? = $ac_status" >&513362 + echo "$as_me:2992: \$? = $ac_status" >&5 12366 13363 (exit $ac_status); } && 12367 13364 { ac_try='test -s conftest.$ac_objext' 12368 13365 - { (eval echo "$as_me:2989: \"$ac_try\"") >&5 12369 + { (eval echo "$as_me:299 4: \"$ac_try\"") >&513366 + { (eval echo "$as_me:2995: \"$ac_try\"") >&5 12370 13367 (eval $ac_try) 2>&5 12371 13368 ac_status=$? 12372 13369 - echo "$as_me:2992: \$? = $ac_status" >&5 12373 + echo "$as_me:299 7: \$? = $ac_status" >&513370 + echo "$as_me:2998: \$? = $ac_status" >&5 12374 13371 (exit $ac_status); }; }; then 12375 13372 break 12376 13373 else 12377 @@ -3016,7 +302 1,7 @@13374 @@ -3016,7 +3022,7 @@ 12378 13375 if test "$CXX" = "g++" ; then 12379 13376 # Extract the first word of "g++", so it can be a program name with args. 12380 13377 set dummy g++; ac_word=$2 12381 13378 -echo "$as_me:3019: checking for $ac_word" >&5 12382 +echo "$as_me:302 4: checking for $ac_word" >&513379 +echo "$as_me:3025: checking for $ac_word" >&5 12383 13380 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12384 13381 if test "${ac_cv_path_CXX+set}" = set; then 12385 13382 echo $ECHO_N "(cached) $ECHO_C" >&6 12386 @@ -3033,7 +303 8,7 @@13383 @@ -3033,7 +3039,7 @@ 12387 13384 test -z "$ac_dir" && ac_dir=. 12388 13385 if $as_executable_p "$ac_dir/$ac_word"; then 12389 13386 ac_cv_path_CXX="$ac_dir/$ac_word" 12390 13387 - echo "$as_me:3036: found $ac_dir/$ac_word" >&5 12391 + echo "$as_me:304 1: found $ac_dir/$ac_word" >&513388 + echo "$as_me:3042: found $ac_dir/$ac_word" >&5 12392 13389 break 12393 13390 fi 12394 13391 done 12395 @@ -3044,16 +30 49,16 @@13392 @@ -3044,16 +3050,16 @@ 12396 13393 CXX=$ac_cv_path_CXX 12397 13394 12398 13395 if test -n "$CXX"; then 12399 13396 - echo "$as_me:3047: result: $CXX" >&5 12400 + echo "$as_me:305 2: result: $CXX" >&513397 + echo "$as_me:3053: result: $CXX" >&5 12401 13398 echo "${ECHO_T}$CXX" >&6 12402 13399 else 12403 13400 - echo "$as_me:3050: result: no" >&5 12404 + echo "$as_me:305 5: result: no" >&513401 + echo "$as_me:3056: result: no" >&5 12405 13402 echo "${ECHO_T}no" >&6 12406 13403 fi … … 12409 13406 if test "$CXX" = "g++" ; then 12410 13407 - { echo "$as_me:3056: WARNING: ignoring hardcoded g++" >&5 12411 + { echo "$as_me:306 1: WARNING: ignoring hardcoded g++" >&513408 + { echo "$as_me:3062: WARNING: ignoring hardcoded g++" >&5 12412 13409 echo "$as_me: WARNING: ignoring hardcoded g++" >&2;} 12413 13410 cf_with_cxx=no; CXX=""; GXX=""; 12414 13411 fi 12415 @@ -3061,11 +306 6,11 @@13412 @@ -3061,11 +3067,11 @@ 12416 13413 12417 13414 GXX_VERSION=none 12418 13415 if test "$GXX" = yes; then 12419 13416 - echo "$as_me:3064: checking version of g++" >&5 12420 + echo "$as_me:30 69: checking version of g++" >&513417 + echo "$as_me:3070: checking version of g++" >&5 12421 13418 echo $ECHO_N "checking version of g++... $ECHO_C" >&6 12422 13419 GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" 12423 13420 test -z "$GXX_VERSION" && GXX_VERSION=unknown 12424 13421 - echo "$as_me:3068: result: $GXX_VERSION" >&5 12425 + echo "$as_me:307 3: result: $GXX_VERSION" >&513422 + echo "$as_me:3074: result: $GXX_VERSION" >&5 12426 13423 echo "${ECHO_T}$GXX_VERSION" >&6 12427 13424 fi 12428 13425 12429 @@ -3073,12 +307 8,12 @@13426 @@ -3073,12 +3079,12 @@ 12430 13427 1*|2.[0-6]*) 12431 13428 # GXX=""; CXX=""; ac_cv_prog_gxx=no 12432 13429 # cf_cxx_library=no 12433 13430 - { echo "$as_me:3076: WARNING: templates do not work" >&5 12434 + { echo "$as_me:308 1: WARNING: templates do not work" >&513431 + { echo "$as_me:3082: WARNING: templates do not work" >&5 12435 13432 echo "$as_me: WARNING: templates do not work" >&2;} 12436 13433 ;; … … 12438 13435 12439 13436 -echo "$as_me:3081: checking if you want to build C++ binding and demo" >&5 12440 +echo "$as_me:308 6: checking if you want to build C++ binding and demo" >&513437 +echo "$as_me:3087: checking if you want to build C++ binding and demo" >&5 12441 13438 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6 12442 13439 12443 13440 # Check whether --with-cxx-binding or --without-cxx-binding was given. 12444 @@ -3088,10 +309 3,10 @@13441 @@ -3088,10 +3094,10 @@ 12445 13442 else 12446 13443 cf_with_cxx_binding=$cf_with_cxx 12447 13444 fi; 12448 13445 -echo "$as_me:3091: result: $cf_with_cxx_binding" >&5 12449 +echo "$as_me:309 6: result: $cf_with_cxx_binding" >&513446 +echo "$as_me:3097: result: $cf_with_cxx_binding" >&5 12450 13447 echo "${ECHO_T}$cf_with_cxx_binding" >&6 12451 13448 12452 13449 -echo "$as_me:3094: checking if you want to build with Ada95" >&5 12453 +echo "$as_me:3 099: checking if you want to build with Ada95" >&513450 +echo "$as_me:3100: checking if you want to build with Ada95" >&5 12454 13451 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6 12455 13452 12456 13453 # Check whether --with-ada or --without-ada was given. 12457 @@ -3101,10 +310 6,10 @@13454 @@ -3101,10 +3107,10 @@ 12458 13455 else 12459 13456 cf_with_ada=yes 12460 13457 fi; 12461 13458 -echo "$as_me:3104: result: $cf_with_ada" >&5 12462 +echo "$as_me:31 09: result: $cf_with_ada" >&513459 +echo "$as_me:3110: result: $cf_with_ada" >&5 12463 13460 echo "${ECHO_T}$cf_with_ada" >&6 12464 13461 12465 13462 -echo "$as_me:3107: checking if you want to build programs such as tic" >&5 12466 +echo "$as_me:311 2: checking if you want to build programs such as tic" >&513463 +echo "$as_me:3113: checking if you want to build programs such as tic" >&5 12467 13464 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6 12468 13465 12469 13466 # Check whether --with-progs or --without-progs was given. 12470 @@ -3114,10 +31 19,10 @@13467 @@ -3114,10 +3120,10 @@ 12471 13468 else 12472 13469 cf_with_progs=yes 12473 13470 fi; 12474 13471 -echo "$as_me:3117: result: $cf_with_progs" >&5 12475 +echo "$as_me:312 2: result: $cf_with_progs" >&513472 +echo "$as_me:3123: result: $cf_with_progs" >&5 12476 13473 echo "${ECHO_T}$cf_with_progs" >&6 12477 13474 12478 13475 -echo "$as_me:3120: checking if you wish to install curses.h" >&5 12479 +echo "$as_me:312 5: checking if you wish to install curses.h" >&513476 +echo "$as_me:3126: checking if you wish to install curses.h" >&5 12480 13477 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6 12481 13478 12482 13479 # Check whether --with-curses-h or --without-curses-h was given. 12483 @@ -3127,7 +313 2,7 @@13480 @@ -3127,7 +3133,7 @@ 12484 13481 else 12485 13482 with_curses_h=yes 12486 13483 fi; 12487 13484 -echo "$as_me:3130: result: $with_curses_h" >&5 12488 +echo "$as_me:313 5: result: $with_curses_h" >&513485 +echo "$as_me:3136: result: $with_curses_h" >&5 12489 13486 echo "${ECHO_T}$with_curses_h" >&6 12490 13487 12491 13488 modules_to_build="ncurses" 12492 @@ -3153,7 +315 8,7 @@13489 @@ -3153,7 +3159,7 @@ 12493 13490 do 12494 13491 # Extract the first word of "$ac_prog", so it can be a program name with args. 12495 13492 set dummy $ac_prog; ac_word=$2 12496 13493 -echo "$as_me:3156: checking for $ac_word" >&5 12497 +echo "$as_me:316 1: checking for $ac_word" >&513494 +echo "$as_me:3162: checking for $ac_word" >&5 12498 13495 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12499 13496 if test "${ac_cv_prog_AWK+set}" = set; then 12500 13497 echo $ECHO_N "(cached) $ECHO_C" >&6 12501 @@ -3168,7 +317 3,7 @@13498 @@ -3168,7 +3174,7 @@ 12502 13499 test -z "$ac_dir" && ac_dir=. 12503 13500 $as_executable_p "$ac_dir/$ac_word" || continue 12504 13501 ac_cv_prog_AWK="$ac_prog" 12505 13502 -echo "$as_me:3171: found $ac_dir/$ac_word" >&5 12506 +echo "$as_me:317 6: found $ac_dir/$ac_word" >&513503 +echo "$as_me:3177: found $ac_dir/$ac_word" >&5 12507 13504 break 12508 13505 done 12509 13506 12510 @@ -3176,21 +318 1,21 @@13507 @@ -3176,21 +3182,21 @@ 12511 13508 fi 12512 13509 AWK=$ac_cv_prog_AWK 12513 13510 if test -n "$AWK"; then 12514 13511 - echo "$as_me:3179: result: $AWK" >&5 12515 + echo "$as_me:318 4: result: $AWK" >&513512 + echo "$as_me:3185: result: $AWK" >&5 12516 13513 echo "${ECHO_T}$AWK" >&6 12517 13514 else 12518 13515 - echo "$as_me:3182: result: no" >&5 12519 + echo "$as_me:318 7: result: no" >&513516 + echo "$as_me:3188: result: no" >&5 12520 13517 echo "${ECHO_T}no" >&6 12521 13518 fi … … 12525 13522 12526 13523 -test -z "$AWK" && { { echo "$as_me:3189: error: No awk program found" >&5 12527 +test -z "$AWK" && { { echo "$as_me:319 4: error: No awk program found" >&513524 +test -z "$AWK" && { { echo "$as_me:3195: error: No awk program found" >&5 12528 13525 echo "$as_me: error: No awk program found" >&2;} 12529 13526 { (exit 1); exit 1; }; } 12530 13527 12531 13528 -echo "$as_me:3193: checking for egrep" >&5 12532 +echo "$as_me:319 8: checking for egrep" >&513529 +echo "$as_me:3199: checking for egrep" >&5 12533 13530 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 12534 13531 if test "${ac_cv_prog_egrep+set}" = set; then 12535 13532 echo $ECHO_N "(cached) $ECHO_C" >&6 12536 @@ -3200,11 +320 5,11 @@13533 @@ -3200,11 +3206,11 @@ 12537 13534 else ac_cv_prog_egrep='egrep' 12538 13535 fi 12539 13536 fi 12540 13537 -echo "$as_me:3203: result: $ac_cv_prog_egrep" >&5 12541 +echo "$as_me:320 8: result: $ac_cv_prog_egrep" >&513538 +echo "$as_me:3209: result: $ac_cv_prog_egrep" >&5 12542 13539 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 12543 13540 EGREP=$ac_cv_prog_egrep 12544 13541 12545 13542 -test -z "$EGREP" && { { echo "$as_me:3207: error: No egrep program found" >&5 12546 +test -z "$EGREP" && { { echo "$as_me:321 2: error: No egrep program found" >&513543 +test -z "$EGREP" && { { echo "$as_me:3213: error: No egrep program found" >&5 12547 13544 echo "$as_me: error: No egrep program found" >&2;} 12548 13545 { (exit 1); exit 1; }; } 12549 13546 12550 @@ -3220,7 +322 5,7 @@13547 @@ -3220,7 +3226,7 @@ 12551 13548 # AFS /usr/afsws/bin/install, which mishandles nonexistent args 12552 13549 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" 12553 13550 # ./install, which can be erroneously created by make from ./install.sh. 12554 13551 -echo "$as_me:3223: checking for a BSD compatible install" >&5 12555 +echo "$as_me:322 8: checking for a BSD compatible install" >&513552 +echo "$as_me:3229: checking for a BSD compatible install" >&5 12556 13553 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 12557 13554 if test -z "$INSTALL"; then 12558 13555 if test "${ac_cv_path_install+set}" = set; then 12559 @@ -3269,7 +327 4,7 @@13556 @@ -3269,7 +3275,7 @@ 12560 13557 INSTALL=$ac_install_sh 12561 13558 fi 12562 13559 fi 12563 13560 -echo "$as_me:3272: result: $INSTALL" >&5 12564 +echo "$as_me:327 7: result: $INSTALL" >&513561 +echo "$as_me:3278: result: $INSTALL" >&5 12565 13562 echo "${ECHO_T}$INSTALL" >&6 12566 13563 12567 13564 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. 12568 @@ -3294,7 +3 299,7 @@13565 @@ -3294,7 +3300,7 @@ 12569 13566 do 12570 13567 # Extract the first word of "$ac_prog", so it can be a program name with args. 12571 13568 set dummy $ac_prog; ac_word=$2 12572 13569 -echo "$as_me:3297: checking for $ac_word" >&5 12573 +echo "$as_me:330 2: checking for $ac_word" >&513570 +echo "$as_me:3303: checking for $ac_word" >&5 12574 13571 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12575 13572 if test "${ac_cv_prog_LINT+set}" = set; then 12576 13573 echo $ECHO_N "(cached) $ECHO_C" >&6 12577 @@ -3309,7 +331 4,7 @@13574 @@ -3309,7 +3315,7 @@ 12578 13575 test -z "$ac_dir" && ac_dir=. 12579 13576 $as_executable_p "$ac_dir/$ac_word" || continue 12580 13577 ac_cv_prog_LINT="$ac_prog" 12581 13578 -echo "$as_me:3312: found $ac_dir/$ac_word" >&5 12582 +echo "$as_me:331 7: found $ac_dir/$ac_word" >&513579 +echo "$as_me:3318: found $ac_dir/$ac_word" >&5 12583 13580 break 12584 13581 done 12585 13582 12586 @@ -3317,57 +332 2,91 @@13583 @@ -3317,57 +3323,91 @@ 12587 13584 fi 12588 13585 LINT=$ac_cv_prog_LINT 12589 13586 if test -n "$LINT"; then 12590 13587 - echo "$as_me:3320: result: $LINT" >&5 12591 + echo "$as_me:332 5: result: $LINT" >&513588 + echo "$as_me:3326: result: $LINT" >&5 12592 13589 echo "${ECHO_T}$LINT" >&6 12593 13590 else 12594 13591 - echo "$as_me:3323: result: no" >&5 12595 + echo "$as_me:332 8: result: no" >&513592 + echo "$as_me:3329: result: no" >&5 12596 13593 echo "${ECHO_T}no" >&6 12597 13594 fi … … 12601 13598 12602 13599 -echo "$as_me:3330: checking whether ln -s works" >&5 12603 +echo "$as_me:333 5: checking whether ln -s works" >&513600 +echo "$as_me:3336: checking whether ln -s works" >&5 12604 13601 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 12605 13602 LN_S=$as_ln_s 12606 13603 if test "$LN_S" = "ln -s"; then 12607 13604 - echo "$as_me:3334: result: yes" >&5 12608 + echo "$as_me:33 39: result: yes" >&513605 + echo "$as_me:3340: result: yes" >&5 12609 13606 echo "${ECHO_T}yes" >&6 12610 13607 else 12611 13608 - echo "$as_me:3337: result: no, using $LN_S" >&5 12612 + echo "$as_me:334 2: result: no, using $LN_S" >&513609 + echo "$as_me:3343: result: no, using $LN_S" >&5 12613 13610 echo "${ECHO_T}no, using $LN_S" >&6 12614 13611 fi … … 12618 13615 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` 12619 13616 -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then 12620 +echo "$as_me:334 6: checking for long file names" >&513617 +echo "$as_me:3347: checking for long file names" >&5 12621 13618 +echo $ECHO_N "checking for long file names... $ECHO_C" >&6 12622 13619 +if test "${ac_cv_sys_long_file_names+set}" = set; then … … 12675 13672 -echo "${ECHO_T}no" >&6 12676 13673 - SET_MAKE="MAKE=${MAKE-make}" 12677 +echo "$as_me:338 5: result: $ac_cv_sys_long_file_names" >&513674 +echo "$as_me:3386: result: $ac_cv_sys_long_file_names" >&5 12678 13675 +echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 12679 13676 +if test $ac_cv_sys_long_file_names = yes; then … … 12686 13683 12687 13684 -echo "$as_me:3370: checking if filesystem supports mixed-case filenames" >&5 12688 +echo "$as_me:339 5: checking if we should assume mixed-case filenames" >&513685 +echo "$as_me:3396: checking if we should assume mixed-case filenames" >&5 12689 13686 +echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 12690 13687 + … … 12696 13693 + enable_mixedcase=auto 12697 13694 +fi; 12698 +echo "$as_me:340 5: result: $enable_mixedcase" >&513695 +echo "$as_me:3406: result: $enable_mixedcase" >&5 12699 13696 +echo "${ECHO_T}$enable_mixedcase" >&6 12700 13697 +if test "$enable_mixedcase" = "auto" ; then 12701 13698 + 12702 +echo "$as_me:34 09: checking if filesystem supports mixed-case filenames" >&513699 +echo "$as_me:3410: checking if filesystem supports mixed-case filenames" >&5 12703 13700 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 12704 13701 if test "${cf_cv_mixedcase+set}" = set; then 12705 13702 echo $ECHO_N "(cached) $ECHO_C" >&6 12706 @@ -3394,15 +343 3,55 @@13703 @@ -3394,15 +3434,55 @@ 12707 13704 fi 12708 13705 12709 13706 fi 12710 13707 -echo "$as_me:3397: result: $cf_cv_mixedcase" >&5 12711 +echo "$as_me:343 6: result: $cf_cv_mixedcase" >&513708 +echo "$as_me:3437: result: $cf_cv_mixedcase" >&5 12712 13709 echo "${ECHO_T}$cf_cv_mixedcase" >&6 12713 13710 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF … … 12726 13723 + 12727 13724 +# do this after mixed-case option (tags/TAGS is not as important as tic). 12728 +echo "$as_me:345 3: checking whether ${MAKE-make} sets \${MAKE}" >&513725 +echo "$as_me:3454: checking whether ${MAKE-make} sets \${MAKE}" >&5 12729 13726 +echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 12730 13727 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` … … 12746 13743 +fi 12747 13744 +if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then 12748 + echo "$as_me:347 3: result: yes" >&513745 + echo "$as_me:3474: result: yes" >&5 12749 13746 +echo "${ECHO_T}yes" >&6 12750 13747 + SET_MAKE= 12751 13748 +else 12752 + echo "$as_me:347 7: result: no" >&513749 + echo "$as_me:3478: result: no" >&5 12753 13750 +echo "${ECHO_T}no" >&6 12754 13751 + SET_MAKE="MAKE=${MAKE-make}" … … 12758 13755 set dummy ctags; ac_word=$2 12759 13756 -echo "$as_me:3405: checking for $ac_word" >&5 12760 +echo "$as_me:348 4: checking for $ac_word" >&513757 +echo "$as_me:3485: checking for $ac_word" >&5 12761 13758 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12762 13759 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then 12763 13760 echo $ECHO_N "(cached) $ECHO_C" >&6 12764 @@ -3417,7 +349 6,7 @@13761 @@ -3417,7 +3497,7 @@ 12765 13762 test -z "$ac_dir" && ac_dir=. 12766 13763 $as_executable_p "$ac_dir/$ac_word" || continue 12767 13764 ac_cv_prog_MAKE_LOWER_TAGS="yes" 12768 13765 -echo "$as_me:3420: found $ac_dir/$ac_word" >&5 12769 +echo "$as_me:3 499: found $ac_dir/$ac_word" >&513766 +echo "$as_me:3500: found $ac_dir/$ac_word" >&5 12770 13767 break 12771 13768 done 12772 13769 12773 @@ -3426,17 +350 5,17 @@13770 @@ -3426,17 +3506,17 @@ 12774 13771 fi 12775 13772 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS 12776 13773 if test -n "$MAKE_LOWER_TAGS"; then 12777 13774 - echo "$as_me:3429: result: $MAKE_LOWER_TAGS" >&5 12778 + echo "$as_me:350 8: result: $MAKE_LOWER_TAGS" >&513775 + echo "$as_me:3509: result: $MAKE_LOWER_TAGS" >&5 12779 13776 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 12780 13777 else 12781 13778 - echo "$as_me:3432: result: no" >&5 12782 + echo "$as_me:351 1: result: no" >&513779 + echo "$as_me:3512: result: no" >&5 12783 13780 echo "${ECHO_T}no" >&6 12784 13781 fi … … 12788 13785 set dummy etags; ac_word=$2 12789 13786 -echo "$as_me:3439: checking for $ac_word" >&5 12790 +echo "$as_me:351 8: checking for $ac_word" >&513787 +echo "$as_me:3519: checking for $ac_word" >&5 12791 13788 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12792 13789 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then 12793 13790 echo $ECHO_N "(cached) $ECHO_C" >&6 12794 @@ -3451,7 +353 0,7 @@13791 @@ -3451,7 +3531,7 @@ 12795 13792 test -z "$ac_dir" && ac_dir=. 12796 13793 $as_executable_p "$ac_dir/$ac_word" || continue 12797 13794 ac_cv_prog_MAKE_UPPER_TAGS="yes" 12798 13795 -echo "$as_me:3454: found $ac_dir/$ac_word" >&5 12799 +echo "$as_me:353 3: found $ac_dir/$ac_word" >&513796 +echo "$as_me:3534: found $ac_dir/$ac_word" >&5 12800 13797 break 12801 13798 done 12802 13799 12803 @@ -3460,10 +35 39,10 @@13800 @@ -3460,10 +3540,10 @@ 12804 13801 fi 12805 13802 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS 12806 13803 if test -n "$MAKE_UPPER_TAGS"; then 12807 13804 - echo "$as_me:3463: result: $MAKE_UPPER_TAGS" >&5 12808 + echo "$as_me:354 2: result: $MAKE_UPPER_TAGS" >&513805 + echo "$as_me:3543: result: $MAKE_UPPER_TAGS" >&5 12809 13806 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 12810 13807 else 12811 13808 - echo "$as_me:3466: result: no" >&5 12812 + echo "$as_me:354 5: result: no" >&513809 + echo "$as_me:3546: result: no" >&5 12813 13810 echo "${ECHO_T}no" >&6 12814 13811 fi 12815 13812 12816 @@ -3483,7 +356 2,7 @@13813 @@ -3483,7 +3563,7 @@ 12817 13814 MAKE_LOWER_TAGS="#" 12818 13815 fi 12819 13816 12820 13817 -echo "$as_me:3486: checking for makeflags variable" >&5 12821 +echo "$as_me:356 5: checking for makeflags variable" >&513818 +echo "$as_me:3566: checking for makeflags variable" >&5 12822 13819 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 12823 13820 if test "${cf_cv_makeflags+set}" = set; then 12824 13821 echo $ECHO_N "(cached) $ECHO_C" >&6 12825 @@ -3517,95 +359 6,13 @@13822 @@ -3517,95 +3597,13 @@ 12826 13823 rm -f cf_makeflags.tmp 12827 13824 12828 13825 fi 12829 13826 -echo "$as_me:3520: result: $cf_cv_makeflags" >&5 12830 +echo "$as_me:3 599: result: $cf_cv_makeflags" >&513827 +echo "$as_me:3600: result: $cf_cv_makeflags" >&5 12831 13828 echo "${ECHO_T}$cf_cv_makeflags" >&6 12832 13829 … … 12917 13914 set dummy ${ac_tool_prefix}ranlib; ac_word=$2 12918 13915 -echo "$as_me:3608: checking for $ac_word" >&5 12919 +echo "$as_me:360 5: checking for $ac_word" >&513916 +echo "$as_me:3606: checking for $ac_word" >&5 12920 13917 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12921 13918 if test "${ac_cv_prog_RANLIB+set}" = set; then 12922 13919 echo $ECHO_N "(cached) $ECHO_C" >&6 12923 @@ -3620,7 +361 7,7 @@13920 @@ -3620,7 +3618,7 @@ 12924 13921 test -z "$ac_dir" && ac_dir=. 12925 13922 $as_executable_p "$ac_dir/$ac_word" || continue 12926 13923 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" 12927 13924 -echo "$as_me:3623: found $ac_dir/$ac_word" >&5 12928 +echo "$as_me:362 0: found $ac_dir/$ac_word" >&513925 +echo "$as_me:3621: found $ac_dir/$ac_word" >&5 12929 13926 break 12930 13927 done 12931 13928 12932 @@ -3628,10 +362 5,10 @@13929 @@ -3628,10 +3626,10 @@ 12933 13930 fi 12934 13931 RANLIB=$ac_cv_prog_RANLIB 12935 13932 if test -n "$RANLIB"; then 12936 13933 - echo "$as_me:3631: result: $RANLIB" >&5 12937 + echo "$as_me:362 8: result: $RANLIB" >&513934 + echo "$as_me:3629: result: $RANLIB" >&5 12938 13935 echo "${ECHO_T}$RANLIB" >&6 12939 13936 else 12940 13937 - echo "$as_me:3634: result: no" >&5 12941 + echo "$as_me:363 1: result: no" >&513938 + echo "$as_me:3632: result: no" >&5 12942 13939 echo "${ECHO_T}no" >&6 12943 13940 fi 12944 13941 12945 @@ -3640,7 +363 7,7 @@13942 @@ -3640,7 +3638,7 @@ 12946 13943 ac_ct_RANLIB=$RANLIB 12947 13944 # Extract the first word of "ranlib", so it can be a program name with args. 12948 13945 set dummy ranlib; ac_word=$2 12949 13946 -echo "$as_me:3643: checking for $ac_word" >&5 12950 +echo "$as_me:364 0: checking for $ac_word" >&513947 +echo "$as_me:3641: checking for $ac_word" >&5 12951 13948 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12952 13949 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then 12953 13950 echo $ECHO_N "(cached) $ECHO_C" >&6 12954 @@ -3655,7 +365 2,7 @@13951 @@ -3655,7 +3653,7 @@ 12955 13952 test -z "$ac_dir" && ac_dir=. 12956 13953 $as_executable_p "$ac_dir/$ac_word" || continue 12957 13954 ac_cv_prog_ac_ct_RANLIB="ranlib" 12958 13955 -echo "$as_me:3658: found $ac_dir/$ac_word" >&5 12959 +echo "$as_me:365 5: found $ac_dir/$ac_word" >&513956 +echo "$as_me:3656: found $ac_dir/$ac_word" >&5 12960 13957 break 12961 13958 done 12962 13959 12963 @@ -3664,10 +366 1,10 @@13960 @@ -3664,10 +3662,10 @@ 12964 13961 fi 12965 13962 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB 12966 13963 if test -n "$ac_ct_RANLIB"; then 12967 13964 - echo "$as_me:3667: result: $ac_ct_RANLIB" >&5 12968 + echo "$as_me:366 4: result: $ac_ct_RANLIB" >&513965 + echo "$as_me:3665: result: $ac_ct_RANLIB" >&5 12969 13966 echo "${ECHO_T}$ac_ct_RANLIB" >&6 12970 13967 else 12971 13968 - echo "$as_me:3670: result: no" >&5 12972 + echo "$as_me:366 7: result: no" >&513969 + echo "$as_me:3668: result: no" >&5 12973 13970 echo "${ECHO_T}no" >&6 12974 13971 fi 12975 13972 12976 @@ -3679,7 +367 6,7 @@13973 @@ -3679,7 +3677,7 @@ 12977 13974 if test -n "$ac_tool_prefix"; then 12978 13975 # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. 12979 13976 set dummy ${ac_tool_prefix}ld; ac_word=$2 12980 13977 -echo "$as_me:3682: checking for $ac_word" >&5 12981 +echo "$as_me:36 79: checking for $ac_word" >&513978 +echo "$as_me:3680: checking for $ac_word" >&5 12982 13979 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 12983 13980 if test "${ac_cv_prog_LD+set}" = set; then 12984 13981 echo $ECHO_N "(cached) $ECHO_C" >&6 12985 @@ -3694,7 +369 1,7 @@13982 @@ -3694,7 +3692,7 @@ 12986 13983 test -z "$ac_dir" && ac_dir=. 12987 13984 $as_executable_p "$ac_dir/$ac_word" || continue 12988 13985 ac_cv_prog_LD="${ac_tool_prefix}ld" 12989 13986 -echo "$as_me:3697: found $ac_dir/$ac_word" >&5 12990 +echo "$as_me:369 4: found $ac_dir/$ac_word" >&513987 +echo "$as_me:3695: found $ac_dir/$ac_word" >&5 12991 13988 break 12992 13989 done 12993 13990 12994 @@ -3702,10 +3 699,10 @@13991 @@ -3702,10 +3700,10 @@ 12995 13992 fi 12996 13993 LD=$ac_cv_prog_LD 12997 13994 if test -n "$LD"; then 12998 13995 - echo "$as_me:3705: result: $LD" >&5 12999 + echo "$as_me:370 2: result: $LD" >&513996 + echo "$as_me:3703: result: $LD" >&5 13000 13997 echo "${ECHO_T}$LD" >&6 13001 13998 else 13002 13999 - echo "$as_me:3708: result: no" >&5 13003 + echo "$as_me:370 5: result: no" >&514000 + echo "$as_me:3706: result: no" >&5 13004 14001 echo "${ECHO_T}no" >&6 13005 14002 fi 13006 14003 13007 @@ -3714,7 +371 1,7 @@14004 @@ -3714,7 +3712,7 @@ 13008 14005 ac_ct_LD=$LD 13009 14006 # Extract the first word of "ld", so it can be a program name with args. 13010 14007 set dummy ld; ac_word=$2 13011 14008 -echo "$as_me:3717: checking for $ac_word" >&5 13012 +echo "$as_me:371 4: checking for $ac_word" >&514009 +echo "$as_me:3715: checking for $ac_word" >&5 13013 14010 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 13014 14011 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then 13015 14012 echo $ECHO_N "(cached) $ECHO_C" >&6 13016 @@ -3729,7 +372 6,7 @@14013 @@ -3729,7 +3727,7 @@ 13017 14014 test -z "$ac_dir" && ac_dir=. 13018 14015 $as_executable_p "$ac_dir/$ac_word" || continue 13019 14016 ac_cv_prog_ac_ct_LD="ld" 13020 14017 -echo "$as_me:3732: found $ac_dir/$ac_word" >&5 13021 +echo "$as_me:37 29: found $ac_dir/$ac_word" >&514018 +echo "$as_me:3730: found $ac_dir/$ac_word" >&5 13022 14019 break 13023 14020 done 13024 14021 13025 @@ -3738,10 +373 5,10 @@14022 @@ -3738,10 +3736,10 @@ 13026 14023 fi 13027 14024 ac_ct_LD=$ac_cv_prog_ac_ct_LD 13028 14025 if test -n "$ac_ct_LD"; then 13029 14026 - echo "$as_me:3741: result: $ac_ct_LD" >&5 13030 + echo "$as_me:373 8: result: $ac_ct_LD" >&514027 + echo "$as_me:3739: result: $ac_ct_LD" >&5 13031 14028 echo "${ECHO_T}$ac_ct_LD" >&6 13032 14029 else 13033 14030 - echo "$as_me:3744: result: no" >&5 13034 + echo "$as_me:374 1: result: no" >&514031 + echo "$as_me:3742: result: no" >&5 13035 14032 echo "${ECHO_T}no" >&6 13036 14033 fi 13037 14034 13038 @@ -3753,7 +375 0,7 @@14035 @@ -3753,7 +3751,7 @@ 13039 14036 if test -n "$ac_tool_prefix"; then 13040 14037 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 13041 14038 set dummy ${ac_tool_prefix}ar; ac_word=$2 13042 14039 -echo "$as_me:3756: checking for $ac_word" >&5 13043 +echo "$as_me:375 3: checking for $ac_word" >&514040 +echo "$as_me:3754: checking for $ac_word" >&5 13044 14041 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 13045 14042 if test "${ac_cv_prog_AR+set}" = set; then 13046 14043 echo $ECHO_N "(cached) $ECHO_C" >&6 13047 @@ -3768,7 +376 5,7 @@14044 @@ -3768,7 +3766,7 @@ 13048 14045 test -z "$ac_dir" && ac_dir=. 13049 14046 $as_executable_p "$ac_dir/$ac_word" || continue 13050 14047 ac_cv_prog_AR="${ac_tool_prefix}ar" 13051 14048 -echo "$as_me:3771: found $ac_dir/$ac_word" >&5 13052 +echo "$as_me:376 8: found $ac_dir/$ac_word" >&514049 +echo "$as_me:3769: found $ac_dir/$ac_word" >&5 13053 14050 break 13054 14051 done 13055 14052 13056 @@ -3776,10 +377 3,10 @@14053 @@ -3776,10 +3774,10 @@ 13057 14054 fi 13058 14055 AR=$ac_cv_prog_AR 13059 14056 if test -n "$AR"; then 13060 14057 - echo "$as_me:3779: result: $AR" >&5 13061 + echo "$as_me:377 6: result: $AR" >&514058 + echo "$as_me:3777: result: $AR" >&5 13062 14059 echo "${ECHO_T}$AR" >&6 13063 14060 else 13064 14061 - echo "$as_me:3782: result: no" >&5 13065 + echo "$as_me:37 79: result: no" >&514062 + echo "$as_me:3780: result: no" >&5 13066 14063 echo "${ECHO_T}no" >&6 13067 14064 fi 13068 14065 13069 @@ -3788,7 +378 5,7 @@14066 @@ -3788,7 +3786,7 @@ 13070 14067 ac_ct_AR=$AR 13071 14068 # Extract the first word of "ar", so it can be a program name with args. 13072 14069 set dummy ar; ac_word=$2 13073 14070 -echo "$as_me:3791: checking for $ac_word" >&5 13074 +echo "$as_me:378 8: checking for $ac_word" >&514071 +echo "$as_me:3789: checking for $ac_word" >&5 13075 14072 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 13076 14073 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then 13077 14074 echo $ECHO_N "(cached) $ECHO_C" >&6 13078 @@ -3803,7 +380 0,7 @@14075 @@ -3803,7 +3801,7 @@ 13079 14076 test -z "$ac_dir" && ac_dir=. 13080 14077 $as_executable_p "$ac_dir/$ac_word" || continue 13081 14078 ac_cv_prog_ac_ct_AR="ar" 13082 14079 -echo "$as_me:3806: found $ac_dir/$ac_word" >&5 13083 +echo "$as_me:380 3: found $ac_dir/$ac_word" >&514080 +echo "$as_me:3804: found $ac_dir/$ac_word" >&5 13084 14081 break 13085 14082 done 13086 14083 13087 @@ -3812,10 +38 09,10 @@14084 @@ -3812,10 +3810,10 @@ 13088 14085 fi 13089 14086 ac_ct_AR=$ac_cv_prog_ac_ct_AR 13090 14087 if test -n "$ac_ct_AR"; then 13091 14088 - echo "$as_me:3815: result: $ac_ct_AR" >&5 13092 + echo "$as_me:381 2: result: $ac_ct_AR" >&514089 + echo "$as_me:3813: result: $ac_ct_AR" >&5 13093 14090 echo "${ECHO_T}$ac_ct_AR" >&6 13094 14091 else 13095 14092 - echo "$as_me:3818: result: no" >&5 13096 + echo "$as_me:381 5: result: no" >&514093 + echo "$as_me:3816: result: no" >&5 13097 14094 echo "${ECHO_T}no" >&6 13098 14095 fi 13099 14096 13100 @@ -3828,7 +382 5,7 @@14097 @@ -3828,7 +3826,7 @@ 13101 14098 echo $ECHO_N "(cached) $ECHO_C" >&6 13102 14099 else 13103 14100 13104 14101 -echo "$as_me:3831: checking for archiver options (symbol AR_OPTS)" >&5 13105 +echo "$as_me:382 8: checking for archiver options (symbol AR_OPTS)" >&514102 +echo "$as_me:3829: checking for archiver options (symbol AR_OPTS)" >&5 13106 14103 echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6 13107 14104 13108 14105 if test -z "$AR_OPTS" ; then 13109 @@ -3837,12 +383 4,12 @@14106 @@ -3837,12 +3835,12 @@ 13110 14107 fi 13111 14108 13112 14109 cf_cv_subst_AR_OPTS=$AR_OPTS 13113 14110 -echo "$as_me:3840: result: $AR_OPTS" >&5 13114 +echo "$as_me:383 7: result: $AR_OPTS" >&514111 +echo "$as_me:3838: result: $AR_OPTS" >&5 13115 14112 echo "${ECHO_T}$AR_OPTS" >&6 13116 14113 … … 13118 14115 13119 14116 -echo "$as_me:3845: checking if you have specified an install-prefix" >&5 13120 +echo "$as_me:384 2: checking if you have specified an install-prefix" >&514117 +echo "$as_me:3843: checking if you have specified an install-prefix" >&5 13121 14118 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 13122 14119 13123 14120 # Check whether --with-install-prefix or --without-install-prefix was given. 13124 @@ -3855,7 +385 2,7 @@14121 @@ -3855,7 +3853,7 @@ 13125 14122 ;; 13126 14123 esac 13127 14124 fi; 13128 14125 -echo "$as_me:3858: result: $DESTDIR" >&5 13129 +echo "$as_me:385 5: result: $DESTDIR" >&514126 +echo "$as_me:3856: result: $DESTDIR" >&5 13130 14127 echo "${ECHO_T}$DESTDIR" >&6 13131 14128 13132 14129 ############################################################################### 13133 @@ -3883,7 +388 0,7 @@14130 @@ -3883,7 +3881,7 @@ 13134 14131 do 13135 14132 # Extract the first word of "$ac_prog", so it can be a program name with args. 13136 14133 set dummy $ac_prog; ac_word=$2 13137 14134 -echo "$as_me:3886: checking for $ac_word" >&5 13138 +echo "$as_me:388 3: checking for $ac_word" >&514135 +echo "$as_me:3884: checking for $ac_word" >&5 13139 14136 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 13140 14137 if test "${ac_cv_prog_BUILD_CC+set}" = set; then 13141 14138 echo $ECHO_N "(cached) $ECHO_C" >&6 13142 @@ -3898,7 +389 5,7 @@14139 @@ -3898,7 +3896,7 @@ 13143 14140 test -z "$ac_dir" && ac_dir=. 13144 14141 $as_executable_p "$ac_dir/$ac_word" || continue 13145 14142 ac_cv_prog_BUILD_CC="$ac_prog" 13146 14143 -echo "$as_me:3901: found $ac_dir/$ac_word" >&5 13147 +echo "$as_me:389 8: found $ac_dir/$ac_word" >&514144 +echo "$as_me:3899: found $ac_dir/$ac_word" >&5 13148 14145 break 13149 14146 done 13150 14147 13151 @@ -3906,10 +390 3,10 @@14148 @@ -3906,10 +3904,10 @@ 13152 14149 fi 13153 14150 BUILD_CC=$ac_cv_prog_BUILD_CC 13154 14151 if test -n "$BUILD_CC"; then 13155 14152 - echo "$as_me:3909: result: $BUILD_CC" >&5 13156 + echo "$as_me:390 6: result: $BUILD_CC" >&514153 + echo "$as_me:3907: result: $BUILD_CC" >&5 13157 14154 echo "${ECHO_T}$BUILD_CC" >&6 13158 14155 else 13159 14156 - echo "$as_me:3912: result: no" >&5 13160 + echo "$as_me:39 09: result: no" >&514157 + echo "$as_me:3910: result: no" >&5 13161 14158 echo "${ECHO_T}no" >&6 13162 14159 fi 13163 14160 13164 @@ -3917,12 +391 4,12 @@14161 @@ -3917,12 +3915,12 @@ 13165 14162 done 13166 14163 13167 14164 fi; 13168 14165 - echo "$as_me:3920: checking for native build C compiler" >&5 13169 + echo "$as_me:391 7: checking for native build C compiler" >&514166 + echo "$as_me:3918: checking for native build C compiler" >&5 13170 14167 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 13171 14168 - echo "$as_me:3922: result: $BUILD_CC" >&5 13172 + echo "$as_me:39 19: result: $BUILD_CC" >&514169 + echo "$as_me:3920: result: $BUILD_CC" >&5 13173 14170 echo "${ECHO_T}$BUILD_CC" >&6 13174 14171 13175 14172 - echo "$as_me:3925: checking for native build C preprocessor" >&5 13176 + echo "$as_me:392 2: checking for native build C preprocessor" >&514173 + echo "$as_me:3923: checking for native build C preprocessor" >&5 13177 14174 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 13178 14175 13179 14176 # Check whether --with-build-cpp or --without-build-cpp was given. 13180 @@ -3932,10 +39 29,10 @@14177 @@ -3932,10 +3930,10 @@ 13181 14178 else 13182 14179 BUILD_CPP='${BUILD_CC} -E' 13183 14180 fi; 13184 14181 - echo "$as_me:3935: result: $BUILD_CPP" >&5 13185 + echo "$as_me:393 2: result: $BUILD_CPP" >&514182 + echo "$as_me:3933: result: $BUILD_CPP" >&5 13186 14183 echo "${ECHO_T}$BUILD_CPP" >&6 13187 14184 13188 14185 - echo "$as_me:3938: checking for native build C flags" >&5 13189 + echo "$as_me:393 5: checking for native build C flags" >&514186 + echo "$as_me:3936: checking for native build C flags" >&5 13190 14187 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 13191 14188 13192 14189 # Check whether --with-build-cflags or --without-build-cflags was given. 13193 @@ -3943,10 +394 0,10 @@14190 @@ -3943,10 +3941,10 @@ 13194 14191 withval="$with_build_cflags" 13195 14192 BUILD_CFLAGS="$withval" 13196 14193 fi; 13197 14194 - echo "$as_me:3946: result: $BUILD_CFLAGS" >&5 13198 + echo "$as_me:394 3: result: $BUILD_CFLAGS" >&514195 + echo "$as_me:3944: result: $BUILD_CFLAGS" >&5 13199 14196 echo "${ECHO_T}$BUILD_CFLAGS" >&6 13200 14197 13201 14198 - echo "$as_me:3949: checking for native build C preprocessor-flags" >&5 13202 + echo "$as_me:394 6: checking for native build C preprocessor-flags" >&514199 + echo "$as_me:3947: checking for native build C preprocessor-flags" >&5 13203 14200 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 13204 14201 13205 14202 # Check whether --with-build-cppflags or --without-build-cppflags was given. 13206 @@ -3954,10 +395 1,10 @@14203 @@ -3954,10 +3952,10 @@ 13207 14204 withval="$with_build_cppflags" 13208 14205 BUILD_CPPFLAGS="$withval" 13209 14206 fi; 13210 14207 - echo "$as_me:3957: result: $BUILD_CPPFLAGS" >&5 13211 + echo "$as_me:395 4: result: $BUILD_CPPFLAGS" >&514208 + echo "$as_me:3955: result: $BUILD_CPPFLAGS" >&5 13212 14209 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 13213 14210 13214 14211 - echo "$as_me:3960: checking for native build linker-flags" >&5 13215 + echo "$as_me:395 7: checking for native build linker-flags" >&514212 + echo "$as_me:3958: checking for native build linker-flags" >&5 13216 14213 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 13217 14214 13218 14215 # Check whether --with-build-ldflags or --without-build-ldflags was given. 13219 @@ -3965,10 +396 2,10 @@14216 @@ -3965,10 +3963,10 @@ 13220 14217 withval="$with_build_ldflags" 13221 14218 BUILD_LDFLAGS="$withval" 13222 14219 fi; 13223 14220 - echo "$as_me:3968: result: $BUILD_LDFLAGS" >&5 13224 + echo "$as_me:396 5: result: $BUILD_LDFLAGS" >&514221 + echo "$as_me:3966: result: $BUILD_LDFLAGS" >&5 13225 14222 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 13226 14223 13227 14224 - echo "$as_me:3971: checking for native build linker-libraries" >&5 13228 + echo "$as_me:396 8: checking for native build linker-libraries" >&514225 + echo "$as_me:3969: checking for native build linker-libraries" >&5 13229 14226 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 13230 14227 13231 14228 # Check whether --with-build-libs or --without-build-libs was given. 13232 @@ -3976,7 +397 3,7 @@14229 @@ -3976,7 +3974,7 @@ 13233 14230 withval="$with_build_libs" 13234 14231 BUILD_LIBS="$withval" 13235 14232 fi; 13236 14233 - echo "$as_me:3979: result: $BUILD_LIBS" >&5 13237 + echo "$as_me:397 6: result: $BUILD_LIBS" >&514234 + echo "$as_me:3977: result: $BUILD_LIBS" >&5 13238 14235 echo "${ECHO_T}$BUILD_LIBS" >&6 13239 14236 13240 14237 # this assumes we're on Unix. 13241 @@ -3986,7 +398 3,7 @@14238 @@ -3986,7 +3984,7 @@ 13242 14239 : ${BUILD_CC:='${CC}'} 13243 14240 13244 14241 if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then 13245 14242 - { { echo "$as_me:3989: error: Cross-build requires two compilers. 13246 + { { echo "$as_me:398 6: error: Cross-build requires two compilers.14243 + { { echo "$as_me:3987: error: Cross-build requires two compilers. 13247 14244 Use --with-build-cc to specify the native compiler." >&5 13248 14245 echo "$as_me: error: Cross-build requires two compilers. 13249 14246 Use --with-build-cc to specify the native compiler." >&2;} 13250 @@ -4023,11 +402 0,11 @@14247 @@ -4023,11 +4021,11 @@ 13251 14248 # doing: 13252 14249 LIB_CLEAN= … … 13258 14255 13259 14256 -echo "$as_me:4030: checking if you want to build libraries with libtool" >&5 13260 +echo "$as_me:402 7: checking if you want to build libraries with libtool" >&514257 +echo "$as_me:4028: checking if you want to build libraries with libtool" >&5 13261 14258 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6 13262 14259 13263 14260 # Check whether --with-libtool or --without-libtool was given. 13264 @@ -4037,7 +403 4,7 @@14261 @@ -4037,7 +4035,7 @@ 13265 14262 else 13266 14263 with_libtool=no 13267 14264 fi; 13268 14265 -echo "$as_me:4040: result: $with_libtool" >&5 13269 +echo "$as_me:403 7: result: $with_libtool" >&514266 +echo "$as_me:4038: result: $with_libtool" >&5 13270 14267 echo "${ECHO_T}$with_libtool" >&6 13271 14268 if test "$with_libtool" != "no"; then 13272 14269 13273 @@ -4068,7 +406 5,7 @@14270 @@ -4068,7 +4066,7 @@ 13274 14271 with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` 13275 14272 ;; 13276 14273 *) 13277 14274 - { { echo "$as_me:4071: error: expected a pathname, not \"$with_libtool\"" >&5 13278 + { { echo "$as_me:406 8: error: expected a pathname, not \"$with_libtool\"" >&514275 + { { echo "$as_me:4069: error: expected a pathname, not \"$with_libtool\"" >&5 13279 14276 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} 13280 14277 { (exit 1); exit 1; }; } 13281 14278 ;; 13282 @@ -4078,7 +407 5,7 @@14279 @@ -4078,7 +4076,7 @@ 13283 14280 else 13284 14281 # Extract the first word of "libtool", so it can be a program name with args. 13285 14282 set dummy libtool; ac_word=$2 13286 14283 -echo "$as_me:4081: checking for $ac_word" >&5 13287 +echo "$as_me:407 8: checking for $ac_word" >&514284 +echo "$as_me:4079: checking for $ac_word" >&5 13288 14285 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 13289 14286 if test "${ac_cv_path_LIBTOOL+set}" = set; then 13290 14287 echo $ECHO_N "(cached) $ECHO_C" >&6 13291 @@ -4095,7 +409 2,7 @@14288 @@ -4095,7 +4093,7 @@ 13292 14289 test -z "$ac_dir" && ac_dir=. 13293 14290 if $as_executable_p "$ac_dir/$ac_word"; then 13294 14291 ac_cv_path_LIBTOOL="$ac_dir/$ac_word" 13295 14292 - echo "$as_me:4098: found $ac_dir/$ac_word" >&5 13296 + echo "$as_me:409 5: found $ac_dir/$ac_word" >&514293 + echo "$as_me:4096: found $ac_dir/$ac_word" >&5 13297 14294 break 13298 14295 fi 13299 14296 done 13300 @@ -4106,42 +410 3,42 @@14297 @@ -4106,42 +4104,42 @@ 13301 14298 LIBTOOL=$ac_cv_path_LIBTOOL 13302 14299 13303 14300 if test -n "$LIBTOOL"; then 13304 14301 - echo "$as_me:4109: result: $LIBTOOL" >&5 13305 + echo "$as_me:410 6: result: $LIBTOOL" >&514302 + echo "$as_me:4107: result: $LIBTOOL" >&5 13306 14303 echo "${ECHO_T}$LIBTOOL" >&6 13307 14304 else 13308 14305 - echo "$as_me:4112: result: no" >&5 13309 + echo "$as_me:41 09: result: no" >&514306 + echo "$as_me:4110: result: no" >&5 13310 14307 echo "${ECHO_T}no" >&6 13311 14308 fi … … 13314 14311 if test -z "$LIBTOOL" ; then 13315 14312 - { { echo "$as_me:4118: error: Cannot find libtool" >&5 13316 + { { echo "$as_me:411 5: error: Cannot find libtool" >&514313 + { { echo "$as_me:4116: error: Cannot find libtool" >&5 13317 14314 echo "$as_me: error: Cannot find libtool" >&2;} 13318 14315 { (exit 1); exit 1; }; } … … 13333 14330 # Show the version of libtool 13334 14331 - echo "$as_me:4133: checking version of libtool" >&5 13335 + echo "$as_me:413 0: checking version of libtool" >&514332 + echo "$as_me:4131: checking version of libtool" >&5 13336 14333 echo $ECHO_N "checking version of libtool... $ECHO_C" >&6 13337 14334 … … 13342 14339 - echo "$as_me:4140: result: $cf_cv_libtool_version" >&5 13343 14340 + 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.].*//'` 13344 + echo "$as_me:413 7: result: $cf_cv_libtool_version" >&514341 + echo "$as_me:4138: result: $cf_cv_libtool_version" >&5 13345 14342 echo "${ECHO_T}$cf_cv_libtool_version" >&6 13346 14343 if test -z "$cf_cv_libtool_version" ; then 13347 14344 - { { echo "$as_me:4143: error: This is not libtool" >&5 13348 14345 -echo "$as_me: error: This is not libtool" >&2;} 13349 + { { echo "$as_me:414 0: error: This is not GNU libtool" >&514346 + { { echo "$as_me:4141: error: This is not GNU libtool" >&5 13350 14347 +echo "$as_me: error: This is not GNU libtool" >&2;} 13351 14348 { (exit 1); exit 1; }; } 13352 14349 fi 13353 14350 13354 @@ -4167,7 +4164,7 @@ 14351 @@ -4149,6 +4147,7 @@ 14352 case $cf_cv_libtool_version in 14353 1.[5-9]*|[2-9]*) 14354 LIBTOOL_CXX="$LIBTOOL --tag=CXX" 14355 + LIBTOOL="$LIBTOOL --tag=CC" 14356 ;; 14357 *) 14358 LIBTOOL_CXX="$LIBTOOL" 14359 @@ -4167,7 +4166,7 @@ 13355 14360 13356 14361 else 13357 14362 13358 14363 -echo "$as_me:4170: checking if you want to build shared libraries" >&5 13359 +echo "$as_me:416 7: checking if you want to build shared libraries" >&514364 +echo "$as_me:4169: checking if you want to build shared libraries" >&5 13360 14365 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6 13361 14366 13362 14367 # Check whether --with-shared or --without-shared was given. 13363 @@ -4177,11 +417 4,11 @@14368 @@ -4177,11 +4176,11 @@ 13364 14369 else 13365 14370 with_shared=no 13366 14371 fi; 13367 14372 -echo "$as_me:4180: result: $with_shared" >&5 13368 +echo "$as_me:417 7: result: $with_shared" >&514373 +echo "$as_me:4179: result: $with_shared" >&5 13369 14374 echo "${ECHO_T}$with_shared" >&6 13370 14375 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" 13371 14376 13372 14377 -echo "$as_me:4184: checking if you want to build static libraries" >&5 13373 +echo "$as_me:418 1: checking if you want to build static libraries" >&514378 +echo "$as_me:4183: checking if you want to build static libraries" >&5 13374 14379 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6 13375 14380 13376 14381 # Check whether --with-normal or --without-normal was given. 13377 @@ -4191,11 +41 88,11 @@14382 @@ -4191,11 +4190,11 @@ 13378 14383 else 13379 14384 with_normal=yes 13380 14385 fi; 13381 14386 -echo "$as_me:4194: result: $with_normal" >&5 13382 +echo "$as_me:419 1: result: $with_normal" >&514387 +echo "$as_me:4193: result: $with_normal" >&5 13383 14388 echo "${ECHO_T}$with_normal" >&6 13384 14389 test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal" 13385 14390 13386 14391 -echo "$as_me:4198: checking if you want to build debug libraries" >&5 13387 +echo "$as_me:419 5: checking if you want to build debug libraries" >&514392 +echo "$as_me:4197: checking if you want to build debug libraries" >&5 13388 14393 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6 13389 14394 13390 14395 # Check whether --with-debug or --without-debug was given. 13391 @@ -4205,11 +420 2,11 @@14396 @@ -4205,11 +4204,11 @@ 13392 14397 else 13393 14398 with_debug=yes 13394 14399 fi; 13395 14400 -echo "$as_me:4208: result: $with_debug" >&5 13396 +echo "$as_me:420 5: result: $with_debug" >&514401 +echo "$as_me:4207: result: $with_debug" >&5 13397 14402 echo "${ECHO_T}$with_debug" >&6 13398 14403 test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug" 13399 14404 13400 14405 -echo "$as_me:4212: checking if you want to build profiling libraries" >&5 13401 +echo "$as_me:42 09: checking if you want to build profiling libraries" >&514406 +echo "$as_me:4211: checking if you want to build profiling libraries" >&5 13402 14407 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6 13403 14408 13404 14409 # Check whether --with-profile or --without-profile was given. 13405 @@ -4219,7 +421 6,7 @@14410 @@ -4219,7 +4218,7 @@ 13406 14411 else 13407 14412 with_profile=no 13408 14413 fi; 13409 14414 -echo "$as_me:4222: result: $with_profile" >&5 13410 +echo "$as_me:42 19: result: $with_profile" >&514415 +echo "$as_me:4221: result: $with_profile" >&5 13411 14416 echo "${ECHO_T}$with_profile" >&6 13412 14417 test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile" 13413 14418 13414 @@ -4227,23 +422 4,25 @@14419 @@ -4227,23 +4226,25 @@ 13415 14420 13416 14421 ############################################################################### 13417 14422 13418 14423 -echo "$as_me:4230: checking for specified models" >&5 13419 +echo "$as_me:422 7: checking for specified models" >&514424 +echo "$as_me:4229: checking for specified models" >&5 13420 14425 echo $ECHO_N "checking for specified models... $ECHO_C" >&6 13421 14426 test -z "$cf_list_models" && cf_list_models=normal 13422 14427 test "$with_libtool" != "no" && cf_list_models=libtool 13423 14428 -echo "$as_me:4234: result: $cf_list_models" >&5 13424 +echo "$as_me:423 1: result: $cf_list_models" >&514429 +echo "$as_me:4233: result: $cf_list_models" >&5 13425 14430 echo "${ECHO_T}$cf_list_models" >&6 13426 14431 … … 13428 14433 ### up test-applications. 13429 14434 -echo "$as_me:4239: checking for default model" >&5 13430 +echo "$as_me:423 6: checking for default model" >&514435 +echo "$as_me:4238: checking for default model" >&5 13431 14436 echo $ECHO_N "checking for default model... $ECHO_C" >&6 13432 14437 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` 13433 14438 -echo "$as_me:4242: result: $DFT_LWR_MODEL" >&5 13434 +echo "$as_me:42 39: result: $DFT_LWR_MODEL" >&514439 +echo "$as_me:4241: result: $DFT_LWR_MODEL" >&5 13435 14440 echo "${ECHO_T}$DFT_LWR_MODEL" >&6 13436 14441 … … 13442 14447 13443 14448 LIB_NAME=ncurses 13444 @@ -4264,7 +426 3,7 @@14449 @@ -4264,7 +4265,7 @@ 13445 14450 13446 14451 ############################################################################### 13447 14452 13448 14453 -echo "$as_me:4267: checking if you want to build a separate terminfo library" >&5 13449 +echo "$as_me:426 6: checking if you want to build a separate terminfo library" >&514454 +echo "$as_me:4268: checking if you want to build a separate terminfo library" >&5 13450 14455 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6 13451 14456 13452 14457 # Check whether --with-termlib or --without-termlib was given. 13453 @@ -4274,13 +427 3,26 @@14458 @@ -4274,13 +4275,26 @@ 13454 14459 else 13455 14460 with_termlib=no 13456 14461 fi; 13457 14462 -echo "$as_me:4277: result: $with_termlib" >&5 13458 +echo "$as_me:427 6: result: $with_termlib" >&514463 +echo "$as_me:4278: result: $with_termlib" >&5 13459 14464 echo "${ECHO_T}$with_termlib" >&6 13460 14465 13461 +echo "$as_me:42 79: checking if you want to build a separate tic library" >&514466 +echo "$as_me:4281: checking if you want to build a separate tic library" >&5 13462 14467 +echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6 13463 14468 + … … 13469 14474 + with_ticlib=no 13470 14475 +fi; 13471 +echo "$as_me:42 89: result: $with_ticlib" >&514476 +echo "$as_me:4291: result: $with_ticlib" >&5 13472 14477 +echo "${ECHO_T}$with_ticlib" >&6 13473 14478 + … … 13476 14481 13477 14482 -echo "$as_me:4283: checking if you want to link with the GPM mouse library" >&5 13478 +echo "$as_me:429 5: checking if you want to link with the GPM mouse library" >&514483 +echo "$as_me:4297: checking if you want to link with the GPM mouse library" >&5 13479 14484 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6 13480 14485 13481 14486 # Check whether --with-gpm or --without-gpm was given. 13482 @@ -4290,27 +430 2,27 @@14487 @@ -4290,27 +4304,27 @@ 13483 14488 else 13484 14489 with_gpm=maybe 13485 14490 fi; 13486 14491 -echo "$as_me:4293: result: $with_gpm" >&5 13487 +echo "$as_me:430 5: result: $with_gpm" >&514492 +echo "$as_me:4307: result: $with_gpm" >&5 13488 14493 echo "${ECHO_T}$with_gpm" >&6 13489 14494 13490 14495 if test "$with_gpm" != no ; then 13491 14496 - echo "$as_me:4297: checking for gpm.h" >&5 13492 + echo "$as_me:43 09: checking for gpm.h" >&514497 + echo "$as_me:4311: checking for gpm.h" >&5 13493 14498 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6 13494 14499 if test "${ac_cv_header_gpm_h+set}" = set; then … … 13497 14502 cat >conftest.$ac_ext <<_ACEOF 13498 14503 -#line 4303 "configure" 13499 +#line 431 5"configure"14504 +#line 4317 "configure" 13500 14505 #include "confdefs.h" 13501 14506 #include <gpm.h> 13502 14507 _ACEOF 13503 14508 -if { (eval echo "$as_me:4307: \"$ac_cpp conftest.$ac_ext\"") >&5 13504 +if { (eval echo "$as_me:43 19: \"$ac_cpp conftest.$ac_ext\"") >&514509 +if { (eval echo "$as_me:4321: \"$ac_cpp conftest.$ac_ext\"") >&5 13505 14510 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 13506 14511 ac_status=$? … … 13509 14514 cat conftest.err >&5 13510 14515 - echo "$as_me:4313: \$? = $ac_status" >&5 13511 + echo "$as_me:432 5: \$? = $ac_status" >&514516 + echo "$as_me:4327: \$? = $ac_status" >&5 13512 14517 (exit $ac_status); } >/dev/null; then 13513 14518 if test -s conftest.err; then 13514 14519 ac_cpp_err=$ac_c_preproc_warn_flag 13515 @@ -4329,7 +434 1,7 @@14520 @@ -4329,7 +4343,7 @@ 13516 14521 fi 13517 14522 rm -f conftest.err conftest.$ac_ext 13518 14523 fi 13519 14524 -echo "$as_me:4332: result: $ac_cv_header_gpm_h" >&5 13520 +echo "$as_me:434 4: result: $ac_cv_header_gpm_h" >&514525 +echo "$as_me:4346: result: $ac_cv_header_gpm_h" >&5 13521 14526 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6 13522 14527 if test $ac_cv_header_gpm_h = yes; then 13523 14528 13524 @@ -4340,12 +435 2,14 @@14529 @@ -4340,12 +4354,14 @@ 13525 14530 if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then 13526 14531 test -n "$verbose" && echo " assuming we really have GPM library" 1>&6 13527 14532 13528 +echo "${as_me-configure}:435 5: testing assuming we really have GPM library ..." 1>&514533 +echo "${as_me-configure}:4357: testing assuming we really have GPM library ..." 1>&5 13529 14534 + 13530 14535 cat >>confdefs.h <<\EOF … … 13534 14539 else 13535 14540 - echo "$as_me:4348: checking for Gpm_Open in -lgpm" >&5 13536 + echo "$as_me:436 2: checking for Gpm_Open in -lgpm" >&514541 + echo "$as_me:4364: checking for Gpm_Open in -lgpm" >&5 13537 14542 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 13538 14543 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then 13539 14544 echo $ECHO_N "(cached) $ECHO_C" >&6 13540 @@ -4353,7 +436 7,7 @@14545 @@ -4353,7 +4369,7 @@ 13541 14546 ac_check_lib_save_LIBS=$LIBS 13542 14547 LIBS="-lgpm $LIBS" 13543 14548 cat >conftest.$ac_ext <<_ACEOF 13544 14549 -#line 4356 "configure" 13545 +#line 437 0"configure"14550 +#line 4372 "configure" 13546 14551 #include "confdefs.h" 13547 14552 13548 14553 /* Override any gcc2 internal prototype to avoid an error. */ 13549 @@ -4372,16 +438 6,16 @@14554 @@ -4372,16 +4388,16 @@ 13550 14555 } 13551 14556 _ACEOF 13552 14557 rm -f conftest.$ac_objext conftest$ac_exeext 13553 14558 -if { (eval echo "$as_me:4375: \"$ac_link\"") >&5 13554 +if { (eval echo "$as_me:43 89: \"$ac_link\"") >&514559 +if { (eval echo "$as_me:4391: \"$ac_link\"") >&5 13555 14560 (eval $ac_link) 2>&5 13556 14561 ac_status=$? 13557 14562 - echo "$as_me:4378: \$? = $ac_status" >&5 13558 + echo "$as_me:439 2: \$? = $ac_status" >&514563 + echo "$as_me:4394: \$? = $ac_status" >&5 13559 14564 (exit $ac_status); } && 13560 14565 { ac_try='test -s conftest$ac_exeext' 13561 14566 - { (eval echo "$as_me:4381: \"$ac_try\"") >&5 13562 + { (eval echo "$as_me:439 5: \"$ac_try\"") >&514567 + { (eval echo "$as_me:4397: \"$ac_try\"") >&5 13563 14568 (eval $ac_try) 2>&5 13564 14569 ac_status=$? 13565 14570 - echo "$as_me:4384: \$? = $ac_status" >&5 13566 + echo "$as_me:4 398: \$? = $ac_status" >&514571 + echo "$as_me:4400: \$? = $ac_status" >&5 13567 14572 (exit $ac_status); }; }; then 13568 14573 ac_cv_lib_gpm_Gpm_Open=yes 13569 14574 else 13570 @@ -4392,13 +440 6,13 @@14575 @@ -4392,13 +4408,13 @@ 13571 14576 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 13572 14577 LIBS=$ac_check_lib_save_LIBS 13573 14578 fi 13574 14579 -echo "$as_me:4395: result: $ac_cv_lib_gpm_Gpm_Open" >&5 13575 +echo "$as_me:44 09: result: $ac_cv_lib_gpm_Gpm_Open" >&514580 +echo "$as_me:4411: result: $ac_cv_lib_gpm_Gpm_Open" >&5 13576 14581 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 13577 14582 if test $ac_cv_lib_gpm_Gpm_Open = yes; then … … 13580 14585 13581 14586 - { { echo "$as_me:4401: error: Cannot link with GPM library" >&5 13582 + { { echo "$as_me:441 5: error: Cannot link with GPM library" >&514587 + { { echo "$as_me:4417: error: Cannot link with GPM library" >&5 13583 14588 echo "$as_me: error: Cannot link with GPM library" >&2;} 13584 14589 { (exit 1); exit 1; }; } 13585 14590 fi 13586 @@ -4408,7 +442 2,7 @@14591 @@ -4408,7 +4424,7 @@ 13587 14592 13588 14593 else 13589 14594 13590 14595 - test "$with_gpm" != maybe && { echo "$as_me:4411: WARNING: Cannot find GPM header" >&5 13591 + test "$with_gpm" != maybe && { echo "$as_me:442 5: WARNING: Cannot find GPM header" >&514596 + test "$with_gpm" != maybe && { echo "$as_me:4427: WARNING: Cannot find GPM header" >&5 13592 14597 echo "$as_me: WARNING: Cannot find GPM header" >&2;} 13593 14598 with_gpm=no 13594 14599 13595 @@ -4417,7 +443 1,7 @@14600 @@ -4417,7 +4433,7 @@ 13596 14601 fi 13597 14602 13598 14603 if test "$with_gpm" != no ; then 13599 14604 - echo "$as_me:4420: checking if you want to load GPM dynamically" >&5 13600 + echo "$as_me:443 4: checking if you want to load GPM dynamically" >&514605 + echo "$as_me:4436: checking if you want to load GPM dynamically" >&5 13601 14606 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6 13602 14607 13603 14608 # Check whether --with-dlsym or --without-dlsym was given. 13604 @@ -4427,18 +444 1,18 @@14609 @@ -4427,18 +4443,18 @@ 13605 14610 else 13606 14611 with_dlsym=yes 13607 14612 fi; 13608 14613 - echo "$as_me:4430: result: $with_dlsym" >&5 13609 + echo "$as_me:444 4: result: $with_dlsym" >&514614 + echo "$as_me:4446: result: $with_dlsym" >&5 13610 14615 echo "${ECHO_T}$with_dlsym" >&6 13611 14616 if test "$with_dlsym" = yes ; then … … 13613 14618 cf_have_dlsym=no 13614 14619 -echo "$as_me:4435: checking for dlsym" >&5 13615 +echo "$as_me:44 49: checking for dlsym" >&514620 +echo "$as_me:4451: checking for dlsym" >&5 13616 14621 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6 13617 14622 if test "${ac_cv_func_dlsym+set}" = set; then … … 13620 14625 cat >conftest.$ac_ext <<_ACEOF 13621 14626 -#line 4441 "configure" 13622 +#line 445 5"configure"14627 +#line 4457 "configure" 13623 14628 #include "confdefs.h" 13624 14629 /* System header to define __stub macros and hopefully few prototypes, 13625 14630 which can conflict with char dlsym (); below. */ 13626 @@ -4469,16 +448 3,16 @@14631 @@ -4469,16 +4485,16 @@ 13627 14632 } 13628 14633 _ACEOF 13629 14634 rm -f conftest.$ac_objext conftest$ac_exeext 13630 14635 -if { (eval echo "$as_me:4472: \"$ac_link\"") >&5 13631 +if { (eval echo "$as_me:448 6: \"$ac_link\"") >&514636 +if { (eval echo "$as_me:4488: \"$ac_link\"") >&5 13632 14637 (eval $ac_link) 2>&5 13633 14638 ac_status=$? 13634 14639 - echo "$as_me:4475: \$? = $ac_status" >&5 13635 + echo "$as_me:44 89: \$? = $ac_status" >&514640 + echo "$as_me:4491: \$? = $ac_status" >&5 13636 14641 (exit $ac_status); } && 13637 14642 { ac_try='test -s conftest$ac_exeext' 13638 14643 - { (eval echo "$as_me:4478: \"$ac_try\"") >&5 13639 + { (eval echo "$as_me:449 2: \"$ac_try\"") >&514644 + { (eval echo "$as_me:4494: \"$ac_try\"") >&5 13640 14645 (eval $ac_try) 2>&5 13641 14646 ac_status=$? 13642 14647 - echo "$as_me:4481: \$? = $ac_status" >&5 13643 + echo "$as_me:449 5: \$? = $ac_status" >&514648 + echo "$as_me:4497: \$? = $ac_status" >&5 13644 14649 (exit $ac_status); }; }; then 13645 14650 ac_cv_func_dlsym=yes 13646 14651 else 13647 @@ -4488,14 +450 2,14 @@14652 @@ -4488,14 +4504,14 @@ 13648 14653 fi 13649 14654 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 13650 14655 fi 13651 14656 -echo "$as_me:4491: result: $ac_cv_func_dlsym" >&5 13652 +echo "$as_me:450 5: result: $ac_cv_func_dlsym" >&514657 +echo "$as_me:4507: result: $ac_cv_func_dlsym" >&5 13653 14658 echo "${ECHO_T}$ac_cv_func_dlsym" >&6 13654 14659 if test $ac_cv_func_dlsym = yes; then … … 13658 14663 cf_have_libdl=no 13659 14664 -echo "$as_me:4498: checking for dlsym in -ldl" >&5 13660 +echo "$as_me:451 2: checking for dlsym in -ldl" >&514665 +echo "$as_me:4514: checking for dlsym in -ldl" >&5 13661 14666 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 13662 14667 if test "${ac_cv_lib_dl_dlsym+set}" = set; then 13663 14668 echo $ECHO_N "(cached) $ECHO_C" >&6 13664 @@ -4503,7 +451 7,7 @@14669 @@ -4503,7 +4519,7 @@ 13665 14670 ac_check_lib_save_LIBS=$LIBS 13666 14671 LIBS="-ldl $LIBS" 13667 14672 cat >conftest.$ac_ext <<_ACEOF 13668 14673 -#line 4506 "configure" 13669 +#line 452 0"configure"14674 +#line 4522 "configure" 13670 14675 #include "confdefs.h" 13671 14676 13672 14677 /* Override any gcc2 internal prototype to avoid an error. */ 13673 @@ -4522,16 +453 6,16 @@14678 @@ -4522,16 +4538,16 @@ 13674 14679 } 13675 14680 _ACEOF 13676 14681 rm -f conftest.$ac_objext conftest$ac_exeext 13677 14682 -if { (eval echo "$as_me:4525: \"$ac_link\"") >&5 13678 +if { (eval echo "$as_me:45 39: \"$ac_link\"") >&514683 +if { (eval echo "$as_me:4541: \"$ac_link\"") >&5 13679 14684 (eval $ac_link) 2>&5 13680 14685 ac_status=$? 13681 14686 - echo "$as_me:4528: \$? = $ac_status" >&5 13682 + echo "$as_me:454 2: \$? = $ac_status" >&514687 + echo "$as_me:4544: \$? = $ac_status" >&5 13683 14688 (exit $ac_status); } && 13684 14689 { ac_try='test -s conftest$ac_exeext' 13685 14690 - { (eval echo "$as_me:4531: \"$ac_try\"") >&5 13686 + { (eval echo "$as_me:454 5: \"$ac_try\"") >&514691 + { (eval echo "$as_me:4547: \"$ac_try\"") >&5 13687 14692 (eval $ac_try) 2>&5 13688 14693 ac_status=$? 13689 14694 - echo "$as_me:4534: \$? = $ac_status" >&5 13690 + echo "$as_me:45 48: \$? = $ac_status" >&514695 + echo "$as_me:4550: \$? = $ac_status" >&5 13691 14696 (exit $ac_status); }; }; then 13692 14697 ac_cv_lib_dl_dlsym=yes 13693 14698 else 13694 @@ -4542,7 +455 6,7 @@14699 @@ -4542,7 +4558,7 @@ 13695 14700 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 13696 14701 LIBS=$ac_check_lib_save_LIBS 13697 14702 fi 13698 14703 -echo "$as_me:4545: result: $ac_cv_lib_dl_dlsym" >&5 13699 +echo "$as_me:45 59: result: $ac_cv_lib_dl_dlsym" >&514704 +echo "$as_me:4561: result: $ac_cv_lib_dl_dlsym" >&5 13700 14705 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 13701 14706 if test $ac_cv_lib_dl_dlsym = yes; then 13702 14707 13703 @@ -4555,10 +45 69,10 @@14708 @@ -4555,10 +4571,10 @@ 13704 14709 if test "$cf_have_dlsym" = yes ; then 13705 14710 test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS" 13706 14711 13707 14712 - echo "$as_me:4558: checking whether able to link to dl*() functions" >&5 13708 + echo "$as_me:457 2: checking whether able to link to dl*() functions" >&514713 + echo "$as_me:4574: checking whether able to link to dl*() functions" >&5 13709 14714 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6 13710 14715 cat >conftest.$ac_ext <<_ACEOF 13711 14716 -#line 4561 "configure" 13712 +#line 457 5"configure"14717 +#line 4577 "configure" 13713 14718 #include "confdefs.h" 13714 14719 #include <dlfcn.h> 13715 14720 int 13716 @@ -4576,16 +459 0,16 @@14721 @@ -4576,16 +4592,16 @@ 13717 14722 } 13718 14723 _ACEOF 13719 14724 rm -f conftest.$ac_objext conftest$ac_exeext 13720 14725 -if { (eval echo "$as_me:4579: \"$ac_link\"") >&5 13721 +if { (eval echo "$as_me:459 3: \"$ac_link\"") >&514726 +if { (eval echo "$as_me:4595: \"$ac_link\"") >&5 13722 14727 (eval $ac_link) 2>&5 13723 14728 ac_status=$? 13724 14729 - echo "$as_me:4582: \$? = $ac_status" >&5 13725 + echo "$as_me:459 6: \$? = $ac_status" >&514730 + echo "$as_me:4598: \$? = $ac_status" >&5 13726 14731 (exit $ac_status); } && 13727 14732 { ac_try='test -s conftest$ac_exeext' 13728 14733 - { (eval echo "$as_me:4585: \"$ac_try\"") >&5 13729 + { (eval echo "$as_me:4 599: \"$ac_try\"") >&514734 + { (eval echo "$as_me:4601: \"$ac_try\"") >&5 13730 14735 (eval $ac_try) 2>&5 13731 14736 ac_status=$? 13732 14737 - echo "$as_me:4588: \$? = $ac_status" >&5 13733 + echo "$as_me:460 2: \$? = $ac_status" >&514738 + echo "$as_me:4604: \$? = $ac_status" >&5 13734 14739 (exit $ac_status); }; }; then 13735 14740 13736 14741 cat >>confdefs.h <<\EOF 13737 @@ -4596,15 +461 0,15 @@14742 @@ -4596,15 +4612,15 @@ 13738 14743 echo "$as_me: failed program was:" >&5 13739 14744 cat conftest.$ac_ext >&5 13740 14745 13741 14746 - { { echo "$as_me:4599: error: Cannot link test program for libdl" >&5 13742 + { { echo "$as_me:461 3: error: Cannot link test program for libdl" >&514747 + { { echo "$as_me:4615: error: Cannot link test program for libdl" >&5 13743 14748 echo "$as_me: error: Cannot link test program for libdl" >&2;} 13744 14749 { (exit 1); exit 1; }; } … … 13746 14751 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 13747 14752 - echo "$as_me:4604: result: ok" >&5 13748 + echo "$as_me:46 18: result: ok" >&514753 + echo "$as_me:4620: result: ok" >&5 13749 14754 echo "${ECHO_T}ok" >&6 13750 14755 else 13751 14756 - { { echo "$as_me:4607: error: Cannot find dlsym function" >&5 13752 + { { echo "$as_me:462 1: error: Cannot find dlsym function" >&514757 + { { echo "$as_me:4623: error: Cannot find dlsym function" >&5 13753 14758 echo "$as_me: error: Cannot find dlsym function" >&2;} 13754 14759 { (exit 1); exit 1; }; } 13755 14760 fi 13756 @@ -4612,10 +462 6,12 @@14761 @@ -4612,10 +4628,12 @@ 13757 14762 if test "$with_gpm" != yes ; then 13758 14763 test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6 13759 14764 13760 +echo "${as_me-configure}:46 29: testing assuming soname for gpm is $with_gpm ..." 1>&514765 +echo "${as_me-configure}:4631: testing assuming soname for gpm is $with_gpm ..." 1>&5 13761 14766 + 13762 14767 cf_cv_gpm_soname="$with_gpm" … … 13764 14769 13765 14770 -echo "$as_me:4618: checking for soname of gpm library" >&5 13766 +echo "$as_me:463 4: checking for soname of gpm library" >&514771 +echo "$as_me:4636: checking for soname of gpm library" >&5 13767 14772 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6 13768 14773 if test "${cf_cv_gpm_soname+set}" = set; then 13769 14774 echo $ECHO_N "(cached) $ECHO_C" >&6 13770 @@ -4633,15 +46 49,15 @@14775 @@ -4633,15 +4651,15 @@ 13771 14776 CF_EOF 13772 14777 cf_save_LIBS="$LIBS" 13773 14778 LIBS="-lgpm $LIBS" 13774 14779 - if { (eval echo "$as_me:4636: \"$ac_compile\"") >&5 13775 + if { (eval echo "$as_me:465 2: \"$ac_compile\"") >&514780 + if { (eval echo "$as_me:4654: \"$ac_compile\"") >&5 13776 14781 (eval $ac_compile) 2>&5 13777 14782 ac_status=$? 13778 14783 - echo "$as_me:4639: \$? = $ac_status" >&5 13779 + echo "$as_me:465 5: \$? = $ac_status" >&514784 + echo "$as_me:4657: \$? = $ac_status" >&5 13780 14785 (exit $ac_status); } ; then 13781 14786 - if { (eval echo "$as_me:4641: \"$ac_link\"") >&5 13782 + if { (eval echo "$as_me:465 7: \"$ac_link\"") >&514787 + if { (eval echo "$as_me:4659: \"$ac_link\"") >&5 13783 14788 (eval $ac_link) 2>&5 13784 14789 ac_status=$? 13785 14790 - echo "$as_me:4644: \$? = $ac_status" >&5 13786 + echo "$as_me:466 0: \$? = $ac_status" >&514791 + echo "$as_me:4662: \$? = $ac_status" >&5 13787 14792 (exit $ac_status); } ; then 13788 14793 cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.` 13789 14794 test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown 13790 @@ -4652,7 +46 68,7 @@14795 @@ -4652,7 +4670,7 @@ 13791 14796 fi 13792 14797 13793 14798 fi 13794 14799 -echo "$as_me:4655: result: $cf_cv_gpm_soname" >&5 13795 +echo "$as_me:467 1: result: $cf_cv_gpm_soname" >&514800 +echo "$as_me:4673: result: $cf_cv_gpm_soname" >&5 13796 14801 echo "${ECHO_T}$cf_cv_gpm_soname" >&6 13797 14802 13798 14803 fi 13799 @@ -4668,7 +468 4,7 @@14804 @@ -4668,7 +4686,7 @@ 13800 14805 #define HAVE_LIBGPM 1 13801 14806 EOF 13802 14807 13803 14808 - echo "$as_me:4671: checking for Gpm_Wgetch in -lgpm" >&5 13804 +echo "$as_me:468 7: checking for Gpm_Wgetch in -lgpm" >&514809 +echo "$as_me:4689: checking for Gpm_Wgetch in -lgpm" >&5 13805 14810 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6 13806 14811 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then 13807 14812 echo $ECHO_N "(cached) $ECHO_C" >&6 13808 @@ -4676,7 +469 2,7 @@14813 @@ -4676,7 +4694,7 @@ 13809 14814 ac_check_lib_save_LIBS=$LIBS 13810 14815 LIBS="-lgpm $LIBS" 13811 14816 cat >conftest.$ac_ext <<_ACEOF 13812 14817 -#line 4679 "configure" 13813 +#line 469 5"configure"14818 +#line 4697 "configure" 13814 14819 #include "confdefs.h" 13815 14820 13816 14821 /* Override any gcc2 internal prototype to avoid an error. */ 13817 @@ -4695,16 +471 1,16 @@14822 @@ -4695,16 +4713,16 @@ 13818 14823 } 13819 14824 _ACEOF 13820 14825 rm -f conftest.$ac_objext conftest$ac_exeext 13821 14826 -if { (eval echo "$as_me:4698: \"$ac_link\"") >&5 13822 +if { (eval echo "$as_me:471 4: \"$ac_link\"") >&514827 +if { (eval echo "$as_me:4716: \"$ac_link\"") >&5 13823 14828 (eval $ac_link) 2>&5 13824 14829 ac_status=$? 13825 14830 - echo "$as_me:4701: \$? = $ac_status" >&5 13826 + echo "$as_me:471 7: \$? = $ac_status" >&514831 + echo "$as_me:4719: \$? = $ac_status" >&5 13827 14832 (exit $ac_status); } && 13828 14833 { ac_try='test -s conftest$ac_exeext' 13829 14834 - { (eval echo "$as_me:4704: \"$ac_try\"") >&5 13830 + { (eval echo "$as_me:472 0: \"$ac_try\"") >&514835 + { (eval echo "$as_me:4722: \"$ac_try\"") >&5 13831 14836 (eval $ac_try) 2>&5 13832 14837 ac_status=$? 13833 14838 - echo "$as_me:4707: \$? = $ac_status" >&5 13834 + echo "$as_me:472 3: \$? = $ac_status" >&514839 + echo "$as_me:4725: \$? = $ac_status" >&5 13835 14840 (exit $ac_status); }; }; then 13836 14841 ac_cv_lib_gpm_Gpm_Wgetch=yes 13837 14842 else 13838 @@ -4715,12 +473 1,61 @@14843 @@ -4715,12 +4733,61 @@ 13839 14844 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 13840 14845 LIBS=$ac_check_lib_save_LIBS 13841 14846 fi 13842 14847 -echo "$as_me:4718: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 13843 +echo "$as_me:473 4: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&514848 +echo "$as_me:4736: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 13844 14849 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6 13845 14850 if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then 13846 14851 13847 14852 - { echo "$as_me:4722: WARNING: GPM library is already linked with curses - read the FAQ" >&5 13848 +echo "$as_me:47 38: checking if GPM is weakly bound to curses library" >&514853 +echo "$as_me:4740: checking if GPM is weakly bound to curses library" >&5 13849 14854 +echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6 13850 14855 +if test "${cf_cv_check_gpm_wgetch+set}" = set; then … … 13870 14875 + # include it. 13871 14876 + LIBS="-static -lgpm -dynamic $LIBS" 13872 + if { (eval echo "$as_me:476 2: \"$ac_compile\"") >&514877 + if { (eval echo "$as_me:4764: \"$ac_compile\"") >&5 13873 14878 + (eval $ac_compile) 2>&5 13874 14879 + ac_status=$? 13875 + echo "$as_me:476 5: \$? = $ac_status" >&514880 + echo "$as_me:4767: \$? = $ac_status" >&5 13876 14881 + (exit $ac_status); } ; then 13877 + if { (eval echo "$as_me:476 7: \"$ac_link\"") >&514882 + if { (eval echo "$as_me:4769: \"$ac_link\"") >&5 13878 14883 + (eval $ac_link) 2>&5 13879 14884 + ac_status=$? 13880 + echo "$as_me:477 0: \$? = $ac_status" >&514885 + echo "$as_me:4772: \$? = $ac_status" >&5 13881 14886 + (exit $ac_status); } ; then 13882 14887 + cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'` … … 13890 14895 + 13891 14896 +fi 13892 +echo "$as_me:478 2: result: $cf_cv_check_gpm_wgetch" >&514897 +echo "$as_me:4784: result: $cf_cv_check_gpm_wgetch" >&5 13893 14898 +echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6 13894 14899 + 13895 14900 +if test "$cf_cv_check_gpm_wgetch" != yes ; then 13896 + { echo "$as_me:478 6: WARNING: GPM library is already linked with curses - read the FAQ" >&514901 + { echo "$as_me:4788: WARNING: GPM library is already linked with curses - read the FAQ" >&5 13897 14902 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;} 13898 14903 +fi … … 13900 14905 fi 13901 14906 13902 @@ -4728,7 +479 3,7 @@14907 @@ -4728,7 +4795,7 @@ 13903 14908 13904 14909 # not everyone has "test -c" 13905 14910 if test -c /dev/sysmouse 2>/dev/null ; then 13906 14911 -echo "$as_me:4731: checking if you want to use sysmouse" >&5 13907 +echo "$as_me:479 6: checking if you want to use sysmouse" >&514912 +echo "$as_me:4798: checking if you want to use sysmouse" >&5 13908 14913 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6 13909 14914 13910 14915 # Check whether --with-sysmouse or --without-sysmouse was given. 13911 @@ -4740,7 +480 5,7 @@14916 @@ -4740,7 +4807,7 @@ 13912 14917 fi; 13913 14918 if test "$cf_with_sysmouse" != no ; then 13914 14919 cat >conftest.$ac_ext <<_ACEOF 13915 14920 -#line 4743 "configure" 13916 +#line 48 08"configure"14921 +#line 4810 "configure" 13917 14922 #include "confdefs.h" 13918 14923 13919 14924 #include <osreldate.h> 13920 @@ -4763,16 +48 28,16 @@14925 @@ -4763,16 +4830,16 @@ 13921 14926 } 13922 14927 _ACEOF 13923 14928 rm -f conftest.$ac_objext 13924 14929 -if { (eval echo "$as_me:4766: \"$ac_compile\"") >&5 13925 +if { (eval echo "$as_me:483 1: \"$ac_compile\"") >&514930 +if { (eval echo "$as_me:4833: \"$ac_compile\"") >&5 13926 14931 (eval $ac_compile) 2>&5 13927 14932 ac_status=$? 13928 14933 - echo "$as_me:4769: \$? = $ac_status" >&5 13929 + echo "$as_me:483 4: \$? = $ac_status" >&514934 + echo "$as_me:4836: \$? = $ac_status" >&5 13930 14935 (exit $ac_status); } && 13931 14936 { ac_try='test -s conftest.$ac_objext' 13932 14937 - { (eval echo "$as_me:4772: \"$ac_try\"") >&5 13933 + { (eval echo "$as_me:483 7: \"$ac_try\"") >&514938 + { (eval echo "$as_me:4839: \"$ac_try\"") >&5 13934 14939 (eval $ac_try) 2>&5 13935 14940 ac_status=$? 13936 14941 - echo "$as_me:4775: \$? = $ac_status" >&5 13937 + echo "$as_me:484 0: \$? = $ac_status" >&514942 + echo "$as_me:4842: \$? = $ac_status" >&5 13938 14943 (exit $ac_status); }; }; then 13939 14944 cf_with_sysmouse=yes 13940 14945 else 13941 @@ -4782,7 +484 7,7 @@14946 @@ -4782,7 +4849,7 @@ 13942 14947 fi 13943 14948 rm -f conftest.$ac_objext conftest.$ac_ext 13944 14949 fi 13945 14950 -echo "$as_me:4785: result: $cf_with_sysmouse" >&5 13946 +echo "$as_me:485 0: result: $cf_with_sysmouse" >&514951 +echo "$as_me:4852: result: $cf_with_sysmouse" >&5 13947 14952 echo "${ECHO_T}$cf_with_sysmouse" >&6 13948 14953 test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF 13949 14954 #define USE_SYSMOUSE 1 13950 @@ -4800,7 +486 5,7 @@14955 @@ -4800,7 +4867,7 @@ 13951 14956 test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT='' 13952 14957 fi 13953 14958 13954 14959 -echo "$as_me:4803: checking for default loader flags" >&5 13955 +echo "$as_me:48 68: checking for default loader flags" >&514960 +echo "$as_me:4870: checking for default loader flags" >&5 13956 14961 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 13957 14962 case $DFT_LWR_MODEL in 13958 14963 libtool) LD_MODEL='' ;; 13959 @@ -4809,10 +487 4,12 @@14964 @@ -4809,10 +4876,12 @@ 13960 14965 profile) LD_MODEL='-pg';; 13961 14966 shared) LD_MODEL='' ;; 13962 14967 esac 13963 14968 -echo "$as_me:4812: result: $LD_MODEL" >&5 13964 +echo "$as_me:487 7: result: $LD_MODEL" >&514969 +echo "$as_me:4879: result: $LD_MODEL" >&5 13965 14970 echo "${ECHO_T}$LD_MODEL" >&6 13966 14971 … … 13968 14973 +case $DFT_LWR_MODEL in 13969 14974 +shared) 13970 +echo "$as_me:488 2: checking if rpath option should be used" >&514975 +echo "$as_me:4884: checking if rpath option should be used" >&5 13971 14976 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 13972 14977 13973 14978 # Check whether --enable-rpath or --disable-rpath was given. 13974 @@ -4822,8 +48 89,22 @@14979 @@ -4822,8 +4891,22 @@ 13975 14980 else 13976 14981 cf_cv_ld_rpath=no 13977 14982 fi; 13978 14983 -echo "$as_me:4825: result: $cf_cv_ld_rpath" >&5 13979 +echo "$as_me:489 2: result: $cf_cv_ld_rpath" >&514984 +echo "$as_me:4894: result: $cf_cv_ld_rpath" >&5 13980 14985 echo "${ECHO_T}$cf_cv_ld_rpath" >&6 13981 +echo "$as_me:489 4: checking if shared libraries should be relinked during install" >&514986 +echo "$as_me:4896: checking if shared libraries should be relinked during install" >&5 13982 14987 +echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6 13983 14988 + … … 13989 14994 + cf_cv_do_relink=yes 13990 14995 +fi; 13991 +echo "$as_me:490 4: result: $cf_cv_do_relink" >&514996 +echo "$as_me:4906: result: $cf_cv_do_relink" >&5 13992 14997 +echo "${ECHO_T}$cf_cv_do_relink" >&6 13993 14998 + ;; … … 13996 15001 LOCAL_LDFLAGS= 13997 15002 LOCAL_LDFLAGS2= 13998 @@ -4832,7 +491 3,7 @@15003 @@ -4832,7 +4915,7 @@ 13999 15004 14000 15005 cf_cv_do_symlinks=no 14001 15006 14002 15007 - echo "$as_me:4835: checking if release/abi version should be used for shared libs" >&5 14003 + echo "$as_me:491 6: checking if release/abi version should be used for shared libs" >&515008 + echo "$as_me:4918: checking if release/abi version should be used for shared libs" >&5 14004 15009 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 14005 15010 14006 15011 # Check whether --with-shlib-version or --without-shlib-version was given. 14007 @@ -4847,7 +49 28,7 @@15012 @@ -4847,7 +4930,7 @@ 14008 15013 cf_cv_shlib_version=$withval 14009 15014 ;; 14010 15015 *) 14011 15016 - { { echo "$as_me:4850: error: option value must be one of: rel, abi, auto or no" >&5 14012 + { { echo "$as_me:493 1: error: option value must be one of: rel, abi, auto or no" >&515017 + { { echo "$as_me:4933: error: option value must be one of: rel, abi, auto or no" >&5 14013 15018 echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} 14014 15019 { (exit 1); exit 1; }; } 14015 15020 ;; 14016 @@ -4856,7 +493 7,7 @@15021 @@ -4856,7 +4939,7 @@ 14017 15022 else 14018 15023 cf_cv_shlib_version=auto 14019 15024 fi; 14020 15025 - echo "$as_me:4859: result: $cf_cv_shlib_version" >&5 14021 + echo "$as_me:494 0: result: $cf_cv_shlib_version" >&515026 + echo "$as_me:4942: result: $cf_cv_shlib_version" >&5 14022 15027 echo "${ECHO_T}$cf_cv_shlib_version" >&6 14023 15028 14024 15029 cf_cv_rm_so_locs=no 14025 @@ -4865,14 +494 6,14 @@15030 @@ -4865,14 +4948,14 @@ 14026 15031 CC_SHARED_OPTS= 14027 15032 if test "$GCC" = yes 14028 15033 then 14029 15034 - echo "$as_me:4868: checking which $CC option to use" >&5 14030 + echo "$as_me:49 49: checking which $CC option to use" >&515035 + echo "$as_me:4951: checking which $CC option to use" >&5 14031 15036 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 14032 15037 cf_save_CFLAGS="$CFLAGS" … … 14036 15041 cat >conftest.$ac_ext <<_ACEOF 14037 15042 -#line 4875 "configure" 14038 +#line 495 6"configure"15043 +#line 4958 "configure" 14039 15044 #include "confdefs.h" 14040 15045 #include <stdio.h> 14041 15046 int 14042 @@ -4884,16 +496 5,16 @@15047 @@ -4884,16 +4967,16 @@ 14043 15048 } 14044 15049 _ACEOF 14045 15050 rm -f conftest.$ac_objext 14046 15051 -if { (eval echo "$as_me:4887: \"$ac_compile\"") >&5 14047 +if { (eval echo "$as_me:49 68: \"$ac_compile\"") >&515052 +if { (eval echo "$as_me:4970: \"$ac_compile\"") >&5 14048 15053 (eval $ac_compile) 2>&5 14049 15054 ac_status=$? 14050 15055 - echo "$as_me:4890: \$? = $ac_status" >&5 14051 + echo "$as_me:497 1: \$? = $ac_status" >&515056 + echo "$as_me:4973: \$? = $ac_status" >&5 14052 15057 (exit $ac_status); } && 14053 15058 { ac_try='test -s conftest.$ac_objext' 14054 15059 - { (eval echo "$as_me:4893: \"$ac_try\"") >&5 14055 + { (eval echo "$as_me:497 4: \"$ac_try\"") >&515060 + { (eval echo "$as_me:4976: \"$ac_try\"") >&5 14056 15061 (eval $ac_try) 2>&5 14057 15062 ac_status=$? 14058 15063 - echo "$as_me:4896: \$? = $ac_status" >&5 14059 + echo "$as_me:497 7: \$? = $ac_status" >&515064 + echo "$as_me:4979: \$? = $ac_status" >&5 14060 15065 (exit $ac_status); }; }; then 14061 15066 break 14062 15067 else 14063 @@ -4902,7 +498 3,7 @@15068 @@ -4902,7 +4985,7 @@ 14064 15069 fi 14065 15070 rm -f conftest.$ac_objext conftest.$ac_ext 14066 15071 done 14067 15072 - echo "$as_me:4905: result: $CC_SHARED_OPTS" >&5 14068 + echo "$as_me:498 6: result: $CC_SHARED_OPTS" >&515073 + echo "$as_me:4988: result: $CC_SHARED_OPTS" >&5 14069 15074 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 14070 15075 CFLAGS="$cf_save_CFLAGS" 14071 15076 fi 14072 @@ -4915,17 +499 6,30 @@15077 @@ -4915,17 +4998,30 @@ 14073 15078 ;; 14074 15079 cygwin*) … … 14100 15105 cf_cv_shlib_version_infix=yes 14101 15106 - echo "$as_me:4928: checking if ld -search_paths_first works" >&5 14102 + echo "$as_me:502 2: checking if ld -search_paths_first works" >&515107 + echo "$as_me:5024: checking if ld -search_paths_first works" >&5 14103 15108 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 14104 15109 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then 14105 15110 echo $ECHO_N "(cached) $ECHO_C" >&6 14106 @@ -4934,7 +50 28,7 @@15111 @@ -4934,7 +5030,7 @@ 14107 15112 cf_save_LDFLAGS=$LDFLAGS 14108 15113 LDFLAGS="$LDFLAGS -Wl,-search_paths_first" 14109 15114 cat >conftest.$ac_ext <<_ACEOF 14110 15115 -#line 4937 "configure" 14111 +#line 503 1"configure"15116 +#line 5033 "configure" 14112 15117 #include "confdefs.h" 14113 15118 14114 15119 int 14115 @@ -4946,16 +504 0,16 @@15120 @@ -4946,16 +5042,16 @@ 14116 15121 } 14117 15122 _ACEOF 14118 15123 rm -f conftest.$ac_objext conftest$ac_exeext 14119 15124 -if { (eval echo "$as_me:4949: \"$ac_link\"") >&5 14120 +if { (eval echo "$as_me:504 3: \"$ac_link\"") >&515125 +if { (eval echo "$as_me:5045: \"$ac_link\"") >&5 14121 15126 (eval $ac_link) 2>&5 14122 15127 ac_status=$? 14123 15128 - echo "$as_me:4952: \$? = $ac_status" >&5 14124 + echo "$as_me:504 6: \$? = $ac_status" >&515129 + echo "$as_me:5048: \$? = $ac_status" >&5 14125 15130 (exit $ac_status); } && 14126 15131 { ac_try='test -s conftest$ac_exeext' 14127 15132 - { (eval echo "$as_me:4955: \"$ac_try\"") >&5 14128 + { (eval echo "$as_me:50 49: \"$ac_try\"") >&515133 + { (eval echo "$as_me:5051: \"$ac_try\"") >&5 14129 15134 (eval $ac_try) 2>&5 14130 15135 ac_status=$? 14131 15136 - echo "$as_me:4958: \$? = $ac_status" >&5 14132 + echo "$as_me:505 2: \$? = $ac_status" >&515137 + echo "$as_me:5054: \$? = $ac_status" >&5 14133 15138 (exit $ac_status); }; }; then 14134 15139 cf_cv_ldflags_search_paths_first=yes 14135 15140 else 14136 @@ -4966,7 +506 0,7 @@15141 @@ -4966,7 +5062,7 @@ 14137 15142 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 14138 15143 LDFLAGS=$cf_save_LDFLAGS 14139 15144 fi 14140 15145 -echo "$as_me:4969: result: $cf_cv_ldflags_search_paths_first" >&5 14141 +echo "$as_me:506 3: result: $cf_cv_ldflags_search_paths_first" >&515146 +echo "$as_me:5065: result: $cf_cv_ldflags_search_paths_first" >&5 14142 15147 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 14143 15148 if test $cf_cv_ldflags_search_paths_first = yes; then 14144 15149 LDFLAGS="$LDFLAGS -Wl,-search_paths_first" 14145 @@ -5021,11 +511 5,11 @@15150 @@ -5021,11 +5117,11 @@ 14146 15151 14147 15152 MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,-lc -o $@' … … 14157 15162 MK_SHARED_LIB='${LD} -Bshareable -o $@' 14158 15163 test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel 14159 @@ -5162,7 +5256,7 @@ 15164 @@ -5120,9 +5216,7 @@ 15165 ;; 15166 solaris2*) 15167 # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2 15168 - if test "$GCC" != yes; then 15169 - CC_SHARED_OPTS='-KPIC' 15170 - fi 15171 + # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3 15172 if test "$DFT_LWR_MODEL" = "shared" ; then 15173 LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}" 15174 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" 15175 @@ -5139,7 +5233,12 @@ 15176 cf_shared_soname='`basename $@`' 15177 fi 15178 15179 - MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $@' 15180 + if test "$GCC" != yes; then 15181 + CC_SHARED_OPTS='-xcode=pic32' 15182 + MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $@' 15183 + else 15184 + MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_shared_soname' -o $@' 15185 + fi 15186 ;; 15187 sysv5uw7*|unix_sv*) 15188 # tested with UnixWare 7.1.0 (gcc 2.95.2 and cc) 15189 @@ -5162,7 +5261,7 @@ 14160 15190 test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes 14161 15191 ;; 14162 15192 *) 14163 15193 - { echo "$as_me:5165: WARNING: ignored --with-shlib-version" >&5 14164 + { echo "$as_me:52 59: WARNING: ignored --with-shlib-version" >&515194 + { echo "$as_me:5264: WARNING: ignored --with-shlib-version" >&5 14165 15195 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} 14166 15196 ;; 14167 15197 esac 14168 @@ -5170,12 +526 4,12 @@15198 @@ -5170,12 +5269,12 @@ 14169 15199 esac 14170 15200 14171 15201 if test -n "$cf_ld_rpath_opt" ; then 14172 15202 - echo "$as_me:5173: checking if we need a space after rpath option" >&5 14173 + echo "$as_me:52 67: checking if we need a space after rpath option" >&515203 + echo "$as_me:5272: checking if we need a space after rpath option" >&5 14174 15204 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 14175 15205 cf_save_LIBS="$LIBS" … … 14177 15207 cat >conftest.$ac_ext <<_ACEOF 14178 15208 -#line 5178 "configure" 14179 +#line 527 2"configure"15209 +#line 5277 "configure" 14180 15210 #include "confdefs.h" 14181 15211 14182 15212 int 14183 @@ -5187,16 +528 1,16 @@15213 @@ -5187,16 +5286,16 @@ 14184 15214 } 14185 15215 _ACEOF 14186 15216 rm -f conftest.$ac_objext conftest$ac_exeext 14187 15217 -if { (eval echo "$as_me:5190: \"$ac_link\"") >&5 14188 +if { (eval echo "$as_me:528 4: \"$ac_link\"") >&515218 +if { (eval echo "$as_me:5289: \"$ac_link\"") >&5 14189 15219 (eval $ac_link) 2>&5 14190 15220 ac_status=$? 14191 15221 - echo "$as_me:5193: \$? = $ac_status" >&5 14192 + echo "$as_me:52 87: \$? = $ac_status" >&515222 + echo "$as_me:5292: \$? = $ac_status" >&5 14193 15223 (exit $ac_status); } && 14194 15224 { ac_try='test -s conftest$ac_exeext' 14195 15225 - { (eval echo "$as_me:5196: \"$ac_try\"") >&5 14196 + { (eval echo "$as_me:529 0: \"$ac_try\"") >&515226 + { (eval echo "$as_me:5295: \"$ac_try\"") >&5 14197 15227 (eval $ac_try) 2>&5 14198 15228 ac_status=$? 14199 15229 - echo "$as_me:5199: \$? = $ac_status" >&5 14200 + echo "$as_me:529 3: \$? = $ac_status" >&515230 + echo "$as_me:5298: \$? = $ac_status" >&5 14201 15231 (exit $ac_status); }; }; then 14202 15232 cf_rpath_space=no 14203 15233 else 14204 @@ -5206,7 +530 0,7 @@15234 @@ -5206,7 +5305,7 @@ 14205 15235 fi 14206 15236 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 14207 15237 LIBS="$cf_save_LIBS" 14208 15238 - echo "$as_me:5209: result: $cf_rpath_space" >&5 14209 + echo "$as_me:530 3: result: $cf_rpath_space" >&515239 + echo "$as_me:5308: result: $cf_rpath_space" >&5 14210 15240 echo "${ECHO_T}$cf_rpath_space" >&6 14211 15241 test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt " 14212 15242 MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}" 14213 @@ -5215,7 +53 09,7 @@15243 @@ -5215,7 +5314,7 @@ 14214 15244 if test "$CC_SHARED_OPTS" = "unknown"; then 14215 15245 for model in $cf_list_models; do 14216 15246 if test "$model" = "shared"; then 14217 15247 - { { echo "$as_me:5218: error: Shared libraries are not supported in this version" >&5 14218 + { { echo "$as_me:531 2: error: Shared libraries are not supported in this version" >&515248 + { { echo "$as_me:5317: error: Shared libraries are not supported in this version" >&5 14219 15249 echo "$as_me: error: Shared libraries are not supported in this version" >&2;} 14220 15250 { (exit 1); exit 1; }; } 14221 15251 fi 14222 @@ -5225,7 +53 19,7 @@15252 @@ -5225,7 +5324,7 @@ 14223 15253 ############################################################################### 14224 15254 14225 15255 ### use option --disable-overwrite to leave out the link to -lcurses 14226 15256 -echo "$as_me:5228: checking if you wish to install ncurses overwriting curses" >&5 14227 +echo "$as_me:532 2: checking if you wish to install ncurses overwriting curses" >&515257 +echo "$as_me:5327: checking if you wish to install ncurses overwriting curses" >&5 14228 15258 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6 14229 15259 14230 15260 # Check whether --enable-overwrite or --disable-overwrite was given. 14231 @@ -5235,10 +53 29,10 @@15261 @@ -5235,10 +5334,10 @@ 14232 15262 else 14233 15263 if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi 14234 15264 fi; 14235 15265 -echo "$as_me:5238: result: $with_overwrite" >&5 14236 +echo "$as_me:533 2: result: $with_overwrite" >&515266 +echo "$as_me:5337: result: $with_overwrite" >&5 14237 15267 echo "${ECHO_T}$with_overwrite" >&6 14238 15268 14239 15269 -echo "$as_me:5241: checking if external terminfo-database is used" >&5 14240 +echo "$as_me:53 35: checking if external terminfo-database is used" >&515270 +echo "$as_me:5340: checking if external terminfo-database is used" >&5 14241 15271 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 14242 15272 14243 15273 # Check whether --enable-database or --disable-database was given. 14244 @@ -5248,7 +534 2,7 @@15274 @@ -5248,7 +5347,7 @@ 14245 15275 else 14246 15276 use_database=yes 14247 15277 fi; 14248 15278 -echo "$as_me:5251: result: $use_database" >&5 14249 +echo "$as_me:53 45: result: $use_database" >&515279 +echo "$as_me:5350: result: $use_database" >&5 14250 15280 echo "${ECHO_T}$use_database" >&6 14251 15281 14252 15282 case $host_os in #(vi 14253 @@ -5270,7 +536 4,7 @@15283 @@ -5270,7 +5369,7 @@ 14254 15284 #define USE_DATABASE 1 14255 15285 EOF 14256 15286 14257 15287 - echo "$as_me:5273: checking which terminfo source-file will be installed" >&5 14258 + echo "$as_me:53 67: checking which terminfo source-file will be installed" >&515288 + echo "$as_me:5372: checking which terminfo source-file will be installed" >&5 14259 15289 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6 14260 15290 14261 15291 # Check whether --enable-database or --disable-database was given. 14262 @@ -5278,10 +537 2,10 @@15292 @@ -5278,10 +5377,10 @@ 14263 15293 enableval="$enable_database" 14264 15294 TERMINFO_SRC=$withval 14265 15295 fi; 14266 15296 - echo "$as_me:5281: result: $TERMINFO_SRC" >&5 14267 + echo "$as_me:53 75: result: $TERMINFO_SRC" >&515297 + echo "$as_me:5380: result: $TERMINFO_SRC" >&5 14268 15298 echo "${ECHO_T}$TERMINFO_SRC" >&6 14269 15299 14270 15300 - echo "$as_me:5284: checking whether to use hashed database instead of directory/tree" >&5 14271 + echo "$as_me:53 78: checking whether to use hashed database instead of directory/tree" >&515301 + echo "$as_me:5383: checking whether to use hashed database instead of directory/tree" >&5 14272 15302 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6 14273 15303 14274 15304 # Check whether --with-hashed-db or --without-hashed-db was given. 14275 @@ -5291,11 +53 85,11 @@15305 @@ -5291,11 +5390,11 @@ 14276 15306 else 14277 15307 with_hashed_db=no 14278 15308 fi; 14279 15309 - echo "$as_me:5294: result: $with_hashed_db" >&5 14280 + echo "$as_me:53 88: result: $with_hashed_db" >&515310 + echo "$as_me:5393: result: $with_hashed_db" >&5 14281 15311 echo "${ECHO_T}$with_hashed_db" >&6 14282 15312 fi 14283 15313 14284 15314 -echo "$as_me:5298: checking for list of fallback descriptions" >&5 14285 +echo "$as_me:539 2: checking for list of fallback descriptions" >&515315 +echo "$as_me:5397: checking for list of fallback descriptions" >&5 14286 15316 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6 14287 15317 14288 15318 # Check whether --with-fallbacks or --without-fallbacks was given. 14289 @@ -5305,11 +5 399,11 @@15319 @@ -5305,11 +5404,11 @@ 14290 15320 else 14291 15321 with_fallback= 14292 15322 fi; 14293 15323 -echo "$as_me:5308: result: $with_fallback" >&5 14294 +echo "$as_me:540 2: result: $with_fallback" >&515324 +echo "$as_me:5407: result: $with_fallback" >&5 14295 15325 echo "${ECHO_T}$with_fallback" >&6 14296 15326 FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'` 14297 15327 14298 15328 -echo "$as_me:5312: checking if you want modern xterm or antique" >&5 14299 +echo "$as_me:54 06: checking if you want modern xterm or antique" >&515329 +echo "$as_me:5411: checking if you want modern xterm or antique" >&5 14300 15330 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6 14301 15331 14302 15332 # Check whether --with-xterm-new or --without-xterm-new was given. 14303 @@ -5323,7 +54 17,7 @@15333 @@ -5323,7 +5422,7 @@ 14304 15334 no) with_xterm_new=xterm-old;; 14305 15335 *) with_xterm_new=xterm-new;; 14306 15336 esac 14307 15337 -echo "$as_me:5326: result: $with_xterm_new" >&5 14308 +echo "$as_me:542 0: result: $with_xterm_new" >&515338 +echo "$as_me:5425: result: $with_xterm_new" >&5 14309 15339 echo "${ECHO_T}$with_xterm_new" >&6 14310 15340 WHICH_XTERM=$with_xterm_new 14311 15341 14312 @@ -5333,7 +54 27,7 @@15342 @@ -5333,7 +5432,7 @@ 14313 15343 MAKE_TERMINFO="#" 14314 15344 else 14315 15345 14316 15346 -echo "$as_me:5336: checking for list of terminfo directories" >&5 14317 +echo "$as_me:543 0: checking for list of terminfo directories" >&515347 +echo "$as_me:5435: checking for list of terminfo directories" >&5 14318 15348 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 14319 15349 14320 15350 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given. 14321 @@ -5373,7 +54 67,7 @@15351 @@ -5373,7 +5472,7 @@ 14322 15352 cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` 14323 15353 ;; 14324 15354 *) 14325 15355 - { { echo "$as_me:5376: error: expected a pathname, not \"$cf_src_path\"" >&5 14326 + { { echo "$as_me:547 0: error: expected a pathname, not \"$cf_src_path\"" >&515356 + { { echo "$as_me:5475: error: expected a pathname, not \"$cf_src_path\"" >&5 14327 15357 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} 14328 15358 { (exit 1); exit 1; }; } 14329 15359 ;; 14330 @@ -5386,13 +548 0,13 @@15360 @@ -5386,13 +5485,13 @@ 14331 15361 14332 15362 eval 'TERMINFO_DIRS="$cf_dst_path"' 14333 15363 14334 15364 -echo "$as_me:5389: result: $TERMINFO_DIRS" >&5 14335 +echo "$as_me:548 3: result: $TERMINFO_DIRS" >&515365 +echo "$as_me:5488: result: $TERMINFO_DIRS" >&5 14336 15366 echo "${ECHO_T}$TERMINFO_DIRS" >&6 14337 15367 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF … … 14340 15370 14341 15371 -echo "$as_me:5395: checking for default terminfo directory" >&5 14342 +echo "$as_me:54 89: checking for default terminfo directory" >&515372 +echo "$as_me:5494: checking for default terminfo directory" >&5 14343 15373 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6 14344 15374 14345 15375 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given. 14346 @@ -5401,7 +5 495,8 @@15376 @@ -5401,7 +5500,8 @@ 14347 15377 14348 15378 else … … 14354 15384 cf_path_syntax="$prefix" 14355 15385 else 14356 @@ -5427,15 +552 2,16 @@15386 @@ -5427,15 +5527,16 @@ 14357 15387 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 14358 15388 ;; 14359 15389 *) 14360 15390 - { { echo "$as_me:5430: error: expected a pathname, not \"$withval\"" >&5 14361 + { { echo "$as_me:55 25: error: expected a pathname, not \"$withval\"" >&515391 + { { echo "$as_me:5530: error: expected a pathname, not \"$withval\"" >&5 14362 15392 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 14363 15393 { (exit 1); exit 1; }; } … … 14369 15399 14370 15400 -echo "$as_me:5438: result: $TERMINFO" >&5 14371 +echo "$as_me:553 4: result: $TERMINFO" >&515401 +echo "$as_me:5539: result: $TERMINFO" >&5 14372 15402 echo "${ECHO_T}$TERMINFO" >&6 14373 15403 cat >>confdefs.h <<EOF 14374 15404 #define TERMINFO "$TERMINFO" 14375 @@ -5445,7 +554 1,7 @@15405 @@ -5445,7 +5546,7 @@ 14376 15406 14377 15407 ### use option --disable-big-core to make tic run on small machines 14378 15408 ### We need 4Mb, check if we can allocate 50% more than that. 14379 15409 -echo "$as_me:5448: checking if big-core option selected" >&5 14380 +echo "$as_me:554 4: checking if big-core option selected" >&515410 +echo "$as_me:5549: checking if big-core option selected" >&5 14381 15411 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6 14382 15412 14383 15413 # Check whether --enable-big-core or --disable-big-core was given. 14384 @@ -5457,7 +555 3,7 @@15414 @@ -5457,7 +5558,7 @@ 14385 15415 with_big_core=no 14386 15416 else 14387 15417 cat >conftest.$ac_ext <<_ACEOF 14388 15418 -#line 5460 "configure" 14389 +#line 55 56"configure"15419 +#line 5561 "configure" 14390 15420 #include "confdefs.h" 14391 15421 14392 15422 #include <stdlib.h> 14393 @@ -5471,15 +55 67,15 @@15423 @@ -5471,15 +5572,15 @@ 14394 15424 } 14395 15425 _ACEOF 14396 15426 rm -f conftest$ac_exeext 14397 15427 -if { (eval echo "$as_me:5474: \"$ac_link\"") >&5 14398 +if { (eval echo "$as_me:557 0: \"$ac_link\"") >&515428 +if { (eval echo "$as_me:5575: \"$ac_link\"") >&5 14399 15429 (eval $ac_link) 2>&5 14400 15430 ac_status=$? 14401 15431 - echo "$as_me:5477: \$? = $ac_status" >&5 14402 + echo "$as_me:557 3: \$? = $ac_status" >&515432 + echo "$as_me:5578: \$? = $ac_status" >&5 14403 15433 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 14404 15434 - { (eval echo "$as_me:5479: \"$ac_try\"") >&5 14405 + { (eval echo "$as_me:55 75: \"$ac_try\"") >&515435 + { (eval echo "$as_me:5580: \"$ac_try\"") >&5 14406 15436 (eval $ac_try) 2>&5 14407 15437 ac_status=$? 14408 15438 - echo "$as_me:5482: \$? = $ac_status" >&5 14409 + echo "$as_me:55 78: \$? = $ac_status" >&515439 + echo "$as_me:5583: \$? = $ac_status" >&5 14410 15440 (exit $ac_status); }; }; then 14411 15441 with_big_core=yes 14412 15442 else 14413 @@ -5491,14 +55 87,32 @@15443 @@ -5491,14 +5592,32 @@ 14414 15444 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 14415 15445 fi 14416 15446 fi; 14417 15447 -echo "$as_me:5494: result: $with_big_core" >&5 14418 +echo "$as_me:559 0: result: $with_big_core" >&515448 +echo "$as_me:5595: result: $with_big_core" >&5 14419 15449 echo "${ECHO_T}$with_big_core" >&6 14420 15450 test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF … … 14424 15454 +### ISO C only guarantees 512-char strings, we have tables which load faster 14425 15455 +### when constructed using "big" strings. 14426 +echo "$as_me:5 598: checking if big-strings option selected" >&515456 +echo "$as_me:5603: checking if big-strings option selected" >&5 14427 15457 +echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6 14428 15458 + … … 14434 15464 + with_big_strings=yes 14435 15465 +fi; 14436 +echo "$as_me:56 08: result: $with_big_strings" >&515466 +echo "$as_me:5613: result: $with_big_strings" >&5 14437 15467 +echo "${ECHO_T}$with_big_strings" >&6 14438 15468 + … … 14442 15472 ### use option --enable-termcap to compile in the termcap fallback support 14443 15473 -echo "$as_me:5501: checking if you want termcap-fallback support" >&5 14444 +echo "$as_me:56 15: checking if you want termcap-fallback support" >&515474 +echo "$as_me:5620: checking if you want termcap-fallback support" >&5 14445 15475 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6 14446 15476 14447 15477 # Check whether --enable-termcap or --disable-termcap was given. 14448 @@ -5508,13 +562 2,13 @@15478 @@ -5508,13 +5627,13 @@ 14449 15479 else 14450 15480 with_termcap=no 14451 15481 fi; 14452 15482 -echo "$as_me:5511: result: $with_termcap" >&5 14453 +echo "$as_me:56 25: result: $with_termcap" >&515483 +echo "$as_me:5630: result: $with_termcap" >&5 14454 15484 echo "${ECHO_T}$with_termcap" >&6 14455 15485 … … 14458 15488 if test -z "$with_fallback" ; then 14459 15489 - { { echo "$as_me:5517: error: You have disabled the database w/o specifying fallbacks" >&5 14460 + { { echo "$as_me:563 1: error: You have disabled the database w/o specifying fallbacks" >&515490 + { { echo "$as_me:5636: error: You have disabled the database w/o specifying fallbacks" >&5 14461 15491 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;} 14462 15492 { (exit 1); exit 1; }; } 14463 15493 fi 14464 @@ -5525,11 +56 39,17 @@15494 @@ -5525,11 +5644,17 @@ 14465 15495 14466 15496 else 14467 15497 14468 15498 +if test "$with_ticlib" != no ; then 14469 + { { echo "$as_me:564 3: error: Options --with-ticlib and --enable-termcap cannot be combined" >&515499 + { { echo "$as_me:5648: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 14470 15500 +echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;} 14471 15501 + { (exit 1); exit 1; }; } … … 14477 15507 14478 15508 -echo "$as_me:5532: checking for list of termcap files" >&5 14479 +echo "$as_me:565 2: checking for list of termcap files" >&515509 +echo "$as_me:5657: checking for list of termcap files" >&5 14480 15510 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6 14481 15511 14482 15512 # Check whether --with-termpath or --without-termpath was given. 14483 @@ -5569,7 +56 89,7 @@15513 @@ -5569,7 +5694,7 @@ 14484 15514 cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` 14485 15515 ;; 14486 15516 *) 14487 15517 - { { echo "$as_me:5572: error: expected a pathname, not \"$cf_src_path\"" >&5 14488 + { { echo "$as_me:569 2: error: expected a pathname, not \"$cf_src_path\"" >&515518 + { { echo "$as_me:5697: error: expected a pathname, not \"$cf_src_path\"" >&5 14489 15519 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} 14490 15520 { (exit 1); exit 1; }; } 14491 15521 ;; 14492 @@ -5582,14 +570 2,14 @@15522 @@ -5582,14 +5707,14 @@ 14493 15523 14494 15524 eval 'TERMPATH="$cf_dst_path"' 14495 15525 14496 15526 -echo "$as_me:5585: result: $TERMPATH" >&5 14497 +echo "$as_me:57 05: result: $TERMPATH" >&515527 +echo "$as_me:5710: result: $TERMPATH" >&5 14498 15528 echo "${ECHO_T}$TERMPATH" >&6 14499 15529 test -n "$TERMPATH" && cat >>confdefs.h <<EOF … … 14503 15533 ### use option --enable-getcap to use a hacked getcap for reading termcaps 14504 15534 -echo "$as_me:5592: checking if fast termcap-loader is needed" >&5 14505 +echo "$as_me:571 2: checking if fast termcap-loader is needed" >&515535 +echo "$as_me:5717: checking if fast termcap-loader is needed" >&5 14506 15536 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6 14507 15537 14508 15538 # Check whether --enable-getcap or --disable-getcap was given. 14509 @@ -5599,13 +57 19,13 @@15539 @@ -5599,13 +5724,13 @@ 14510 15540 else 14511 15541 with_getcap=no 14512 15542 fi; 14513 15543 -echo "$as_me:5602: result: $with_getcap" >&5 14514 +echo "$as_me:572 2: result: $with_getcap" >&515544 +echo "$as_me:5727: result: $with_getcap" >&5 14515 15545 echo "${ECHO_T}$with_getcap" >&6 14516 15546 test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF … … 14519 15549 14520 15550 -echo "$as_me:5608: checking if translated termcaps will be cached in ~/.terminfo" >&5 14521 +echo "$as_me:57 28: checking if translated termcaps will be cached in ~/.terminfo" >&515551 +echo "$as_me:5733: checking if translated termcaps will be cached in ~/.terminfo" >&5 14522 15552 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6 14523 15553 14524 15554 # Check whether --enable-getcap-cache or --disable-getcap-cache was given. 14525 @@ -5615,7 +57 35,7 @@15555 @@ -5615,7 +5740,7 @@ 14526 15556 else 14527 15557 with_getcap_cache=no 14528 15558 fi; 14529 15559 -echo "$as_me:5618: result: $with_getcap_cache" >&5 14530 +echo "$as_me:57 38: result: $with_getcap_cache" >&515560 +echo "$as_me:5743: result: $with_getcap_cache" >&5 14531 15561 echo "${ECHO_T}$with_getcap_cache" >&6 14532 15562 test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF 14533 15563 #define USE_GETCAP_CACHE 1 14534 @@ -5624,7 +574 4,7 @@15564 @@ -5624,7 +5749,7 @@ 14535 15565 fi 14536 15566 14537 15567 ### Use option --disable-home-terminfo to completely remove ~/.terminfo 14538 15568 -echo "$as_me:5627: checking if ~/.terminfo is wanted" >&5 14539 +echo "$as_me:57 47: checking if ~/.terminfo is wanted" >&515569 +echo "$as_me:5752: checking if ~/.terminfo is wanted" >&5 14540 15570 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6 14541 15571 14542 15572 # Check whether --enable-home-terminfo or --disable-home-terminfo was given. 14543 @@ -5634,13 +575 4,13 @@15573 @@ -5634,13 +5759,13 @@ 14544 15574 else 14545 15575 with_home_terminfo=yes 14546 15576 fi; 14547 15577 -echo "$as_me:5637: result: $with_home_terminfo" >&5 14548 +echo "$as_me:57 57: result: $with_home_terminfo" >&515578 +echo "$as_me:5762: result: $with_home_terminfo" >&5 14549 15579 echo "${ECHO_T}$with_home_terminfo" >&6 14550 15580 test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF … … 14553 15583 14554 15584 -echo "$as_me:5643: checking if you want to use restricted environment when running as root" >&5 14555 +echo "$as_me:576 3: checking if you want to use restricted environment when running as root" >&515585 +echo "$as_me:5768: checking if you want to use restricted environment when running as root" >&5 14556 15586 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6 14557 15587 14558 15588 # Check whether --enable-root-environ or --disable-root-environ was given. 14559 @@ -5650,7 +577 0,7 @@15589 @@ -5650,7 +5775,7 @@ 14560 15590 else 14561 15591 with_root_environ=yes 14562 15592 fi; 14563 15593 -echo "$as_me:5653: result: $with_root_environ" >&5 14564 +echo "$as_me:577 3: result: $with_root_environ" >&515594 +echo "$as_me:5778: result: $with_root_environ" >&5 14565 15595 echo "${ECHO_T}$with_root_environ" >&6 14566 15596 test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF 14567 15597 #define USE_ROOT_ENVIRON 1 14568 @@ -5664,13 +578 4,13 @@15598 @@ -5664,13 +5789,13 @@ 14569 15599 unlink 14570 15600 do 14571 15601 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 14572 15602 -echo "$as_me:5667: checking for $ac_func" >&5 14573 +echo "$as_me:57 87: checking for $ac_func" >&515603 +echo "$as_me:5792: checking for $ac_func" >&5 14574 15604 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 14575 15605 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 14578 15608 cat >conftest.$ac_ext <<_ACEOF 14579 15609 -#line 5673 "configure" 14580 +#line 579 3"configure"15610 +#line 5798 "configure" 14581 15611 #include "confdefs.h" 14582 15612 /* System header to define __stub macros and hopefully few prototypes, 14583 15613 which can conflict with char $ac_func (); below. */ 14584 @@ -5701,16 +582 1,16 @@15614 @@ -5701,16 +5826,16 @@ 14585 15615 } 14586 15616 _ACEOF 14587 15617 rm -f conftest.$ac_objext conftest$ac_exeext 14588 15618 -if { (eval echo "$as_me:5704: \"$ac_link\"") >&5 14589 +if { (eval echo "$as_me:582 4: \"$ac_link\"") >&515619 +if { (eval echo "$as_me:5829: \"$ac_link\"") >&5 14590 15620 (eval $ac_link) 2>&5 14591 15621 ac_status=$? 14592 15622 - echo "$as_me:5707: \$? = $ac_status" >&5 14593 + echo "$as_me:58 27: \$? = $ac_status" >&515623 + echo "$as_me:5832: \$? = $ac_status" >&5 14594 15624 (exit $ac_status); } && 14595 15625 { ac_try='test -s conftest$ac_exeext' 14596 15626 - { (eval echo "$as_me:5710: \"$ac_try\"") >&5 14597 + { (eval echo "$as_me:583 0: \"$ac_try\"") >&515627 + { (eval echo "$as_me:5835: \"$ac_try\"") >&5 14598 15628 (eval $ac_try) 2>&5 14599 15629 ac_status=$? 14600 15630 - echo "$as_me:5713: \$? = $ac_status" >&5 14601 + echo "$as_me:583 3: \$? = $ac_status" >&515631 + echo "$as_me:5838: \$? = $ac_status" >&5 14602 15632 (exit $ac_status); }; }; then 14603 15633 eval "$as_ac_var=yes" 14604 15634 else 14605 @@ -5720,7 +584 0,7 @@15635 @@ -5720,7 +5845,7 @@ 14606 15636 fi 14607 15637 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 14608 15638 fi 14609 15639 -echo "$as_me:5723: result: `eval echo '${'$as_ac_var'}'`" >&5 14610 +echo "$as_me:584 3: result: `eval echo '${'$as_ac_var'}'`" >&515640 +echo "$as_me:5848: result: `eval echo '${'$as_ac_var'}'`" >&5 14611 15641 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 14612 15642 if test `eval echo '${'$as_ac_var'}'` = yes; then 14613 15643 cat >>confdefs.h <<EOF 14614 @@ -5737,13 +58 57,13 @@15644 @@ -5737,13 +5862,13 @@ 14615 15645 symlink 14616 15646 do 14617 15647 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 14618 15648 -echo "$as_me:5740: checking for $ac_func" >&5 14619 +echo "$as_me:586 0: checking for $ac_func" >&515649 +echo "$as_me:5865: checking for $ac_func" >&5 14620 15650 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 14621 15651 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 14624 15654 cat >conftest.$ac_ext <<_ACEOF 14625 15655 -#line 5746 "configure" 14626 +#line 58 66"configure"15656 +#line 5871 "configure" 14627 15657 #include "confdefs.h" 14628 15658 /* System header to define __stub macros and hopefully few prototypes, 14629 15659 which can conflict with char $ac_func (); below. */ 14630 @@ -5774,16 +589 4,16 @@15660 @@ -5774,16 +5899,16 @@ 14631 15661 } 14632 15662 _ACEOF 14633 15663 rm -f conftest.$ac_objext conftest$ac_exeext 14634 15664 -if { (eval echo "$as_me:5777: \"$ac_link\"") >&5 14635 +if { (eval echo "$as_me:5 897: \"$ac_link\"") >&515665 +if { (eval echo "$as_me:5902: \"$ac_link\"") >&5 14636 15666 (eval $ac_link) 2>&5 14637 15667 ac_status=$? 14638 15668 - echo "$as_me:5780: \$? = $ac_status" >&5 14639 + echo "$as_me:590 0: \$? = $ac_status" >&515669 + echo "$as_me:5905: \$? = $ac_status" >&5 14640 15670 (exit $ac_status); } && 14641 15671 { ac_try='test -s conftest$ac_exeext' 14642 15672 - { (eval echo "$as_me:5783: \"$ac_try\"") >&5 14643 + { (eval echo "$as_me:590 3: \"$ac_try\"") >&515673 + { (eval echo "$as_me:5908: \"$ac_try\"") >&5 14644 15674 (eval $ac_try) 2>&5 14645 15675 ac_status=$? 14646 15676 - echo "$as_me:5786: \$? = $ac_status" >&5 14647 + echo "$as_me:59 06: \$? = $ac_status" >&515677 + echo "$as_me:5911: \$? = $ac_status" >&5 14648 15678 (exit $ac_status); }; }; then 14649 15679 eval "$as_ac_var=yes" 14650 15680 else 14651 @@ -5793,7 +591 3,7 @@15681 @@ -5793,7 +5918,7 @@ 14652 15682 fi 14653 15683 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 14654 15684 fi 14655 15685 -echo "$as_me:5796: result: `eval echo '${'$as_ac_var'}'`" >&5 14656 +echo "$as_me:59 16: result: `eval echo '${'$as_ac_var'}'`" >&515686 +echo "$as_me:5921: result: `eval echo '${'$as_ac_var'}'`" >&5 14657 15687 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 14658 15688 if test `eval echo '${'$as_ac_var'}'` = yes; then 14659 15689 cat >>confdefs.h <<EOF 14660 @@ -5804,7 +592 4,7 @@15690 @@ -5804,7 +5929,7 @@ 14661 15691 done 14662 15692 14663 15693 else 14664 15694 - echo "$as_me:5807: checking if link/symlink functions work" >&5 14665 + echo "$as_me:59 27: checking if link/symlink functions work" >&515695 + echo "$as_me:5932: checking if link/symlink functions work" >&5 14666 15696 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6 14667 15697 if test "${cf_cv_link_funcs+set}" = set; then 14668 15698 echo $ECHO_N "(cached) $ECHO_C" >&6 14669 @@ -5817,7 +59 37,7 @@15699 @@ -5817,7 +5942,7 @@ 14670 15700 eval 'ac_cv_func_'$cf_func'=error' 14671 15701 else 14672 15702 cat >conftest.$ac_ext <<_ACEOF 14673 15703 -#line 5820 "configure" 14674 +#line 594 0"configure"15704 +#line 5945 "configure" 14675 15705 #include "confdefs.h" 14676 15706 14677 15707 #include <sys/types.h> 14678 @@ -5847,15 +59 67,15 @@15708 @@ -5847,15 +5972,15 @@ 14679 15709 14680 15710 _ACEOF 14681 15711 rm -f conftest$ac_exeext 14682 15712 -if { (eval echo "$as_me:5850: \"$ac_link\"") >&5 14683 +if { (eval echo "$as_me:597 0: \"$ac_link\"") >&515713 +if { (eval echo "$as_me:5975: \"$ac_link\"") >&5 14684 15714 (eval $ac_link) 2>&5 14685 15715 ac_status=$? 14686 15716 - echo "$as_me:5853: \$? = $ac_status" >&5 14687 + echo "$as_me:597 3: \$? = $ac_status" >&515717 + echo "$as_me:5978: \$? = $ac_status" >&5 14688 15718 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 14689 15719 - { (eval echo "$as_me:5855: \"$ac_try\"") >&5 14690 + { (eval echo "$as_me:59 75: \"$ac_try\"") >&515720 + { (eval echo "$as_me:5980: \"$ac_try\"") >&5 14691 15721 (eval $ac_try) 2>&5 14692 15722 ac_status=$? 14693 15723 - echo "$as_me:5858: \$? = $ac_status" >&5 14694 + echo "$as_me:59 78: \$? = $ac_status" >&515724 + echo "$as_me:5983: \$? = $ac_status" >&5 14695 15725 (exit $ac_status); }; }; then 14696 15726 14697 15727 cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" 14698 @@ -5873,7 +599 3,7 @@15728 @@ -5873,7 +5998,7 @@ 14699 15729 test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no 14700 15730 14701 15731 fi 14702 15732 -echo "$as_me:5876: result: $cf_cv_link_funcs" >&5 14703 +echo "$as_me: 5996: result: $cf_cv_link_funcs" >&515733 +echo "$as_me:6001: result: $cf_cv_link_funcs" >&5 14704 15734 echo "${ECHO_T}$cf_cv_link_funcs" >&6 14705 15735 test "$ac_cv_func_link" = yes && cat >>confdefs.h <<\EOF 14706 15736 #define HAVE_LINK 1 14707 @@ -5891,7 +601 1,7 @@15737 @@ -5891,7 +6016,7 @@ 14708 15738 # soft links (symbolic links) are useful for some systems where hard links do 14709 15739 # not work, or to make it simpler to copy terminfo trees around. 14710 15740 if test "$ac_cv_func_symlink" = yes ; then 14711 15741 - echo "$as_me:5894: checking if tic should use symbolic links" >&5 14712 + echo "$as_me:601 4: checking if tic should use symbolic links" >&515742 + echo "$as_me:6019: checking if tic should use symbolic links" >&5 14713 15743 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6 14714 15744 14715 15745 # Check whether --enable-symlinks or --disable-symlinks was given. 14716 @@ -5901,21 +602 1,21 @@15746 @@ -5901,21 +6026,21 @@ 14717 15747 else 14718 15748 with_symlinks=no 14719 15749 fi; 14720 15750 - echo "$as_me:5904: result: $with_symlinks" >&5 14721 + echo "$as_me:602 4: result: $with_symlinks" >&515751 + echo "$as_me:6029: result: $with_symlinks" >&5 14722 15752 echo "${ECHO_T}$with_symlinks" >&6 14723 15753 fi … … 14727 15757 if test "$with_symlinks" = no ; then 14728 15758 - echo "$as_me:5911: checking if tic should use hard links" >&5 14729 + echo "$as_me:603 1: checking if tic should use hard links" >&515759 + echo "$as_me:6036: checking if tic should use hard links" >&5 14730 15760 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 14731 15761 if test "$ac_cv_func_link" = yes ; then … … 14735 15765 fi 14736 15766 - echo "$as_me:5918: result: $with_links" >&5 14737 + echo "$as_me:60 38: result: $with_links" >&515767 + echo "$as_me:6043: result: $with_links" >&5 14738 15768 echo "${ECHO_T}$with_links" >&6 14739 15769 fi 14740 15770 14741 @@ -5928,7 +60 48,7 @@15771 @@ -5928,7 +6053,7 @@ 14742 15772 EOF 14743 15773 14744 15774 ### use option --enable-broken-linker to force on use of broken-linker support 14745 15775 -echo "$as_me:5931: checking if you want broken-linker support code" >&5 14746 +echo "$as_me:605 1: checking if you want broken-linker support code" >&515776 +echo "$as_me:6056: checking if you want broken-linker support code" >&5 14747 15777 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 14748 15778 14749 15779 # Check whether --enable-broken_linker or --disable-broken_linker was given. 14750 @@ -5938,7 +60 58,7 @@15780 @@ -5938,7 +6063,7 @@ 14751 15781 else 14752 15782 with_broken_linker=${BROKEN_LINKER-no} 14753 15783 fi; 14754 15784 -echo "$as_me:5941: result: $with_broken_linker" >&5 14755 +echo "$as_me:606 1: result: $with_broken_linker" >&515785 +echo "$as_me:6066: result: $with_broken_linker" >&5 14756 15786 echo "${ECHO_T}$with_broken_linker" >&6 14757 15787 14758 15788 BROKEN_LINKER=0 14759 @@ -5958,12 +60 78,14 @@15789 @@ -5958,12 +6083,14 @@ 14760 15790 BROKEN_LINKER=1 14761 15791 test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 14762 15792 14763 +echo "${as_me-configure}:608 1: testing cygwin linker is broken anyway ..." 1>&515793 +echo "${as_me-configure}:6086: testing cygwin linker is broken anyway ..." 1>&5 14764 15794 + 14765 15795 ;; … … 14769 15799 ### use option --enable-bsdpad to have tputs process BSD-style prefix padding 14770 15800 -echo "$as_me:5966: checking if tputs should process BSD-style prefix padding" >&5 14771 +echo "$as_me:60 88: checking if tputs should process BSD-style prefix padding" >&515801 +echo "$as_me:6093: checking if tputs should process BSD-style prefix padding" >&5 14772 15802 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6 14773 15803 14774 15804 # Check whether --enable-bsdpad or --disable-bsdpad was given. 14775 @@ -5973,7 +6 095,7 @@15805 @@ -5973,7 +6100,7 @@ 14776 15806 else 14777 15807 with_bsdpad=no 14778 15808 fi; 14779 15809 -echo "$as_me:5976: result: $with_bsdpad" >&5 14780 +echo "$as_me:6 098: result: $with_bsdpad" >&515810 +echo "$as_me:6103: result: $with_bsdpad" >&5 14781 15811 echo "${ECHO_T}$with_bsdpad" >&6 14782 15812 test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF 14783 15813 #define BSD_TPUTS 1 14784 @@ -5990,7 +611 2,7 @@15814 @@ -5990,7 +6117,7 @@ 14785 15815 14786 15816 # Check to define _XOPEN_SOURCE "automatically" 14787 15817 14788 15818 -echo "$as_me:5993: checking if $CC -U and -D options work together" >&5 14789 +echo "$as_me:61 15: checking if $CC -U and -D options work together" >&515819 +echo "$as_me:6120: checking if $CC -U and -D options work together" >&5 14790 15820 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6 14791 15821 if test "${cf_cv_cc_u_d_options+set}" = set; then 14792 15822 echo $ECHO_N "(cached) $ECHO_C" >&6 14793 @@ -5999,7 +612 1,7 @@15823 @@ -5999,7 +6126,7 @@ 14794 15824 cf_save_CPPFLAGS="$CPPFLAGS" 14795 15825 CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS" 14796 15826 cat >conftest.$ac_ext <<_ACEOF 14797 15827 -#line 6002 "configure" 14798 +#line 612 4"configure"15828 +#line 6129 "configure" 14799 15829 #include "confdefs.h" 14800 15830 14801 15831 int 14802 @@ -6018,16 +614 0,16 @@15832 @@ -6018,16 +6145,16 @@ 14803 15833 } 14804 15834 _ACEOF 14805 15835 rm -f conftest.$ac_objext 14806 15836 -if { (eval echo "$as_me:6021: \"$ac_compile\"") >&5 14807 +if { (eval echo "$as_me:614 3: \"$ac_compile\"") >&515837 +if { (eval echo "$as_me:6148: \"$ac_compile\"") >&5 14808 15838 (eval $ac_compile) 2>&5 14809 15839 ac_status=$? 14810 15840 - echo "$as_me:6024: \$? = $ac_status" >&5 14811 + echo "$as_me:61 46: \$? = $ac_status" >&515841 + echo "$as_me:6151: \$? = $ac_status" >&5 14812 15842 (exit $ac_status); } && 14813 15843 { ac_try='test -s conftest.$ac_objext' 14814 15844 - { (eval echo "$as_me:6027: \"$ac_try\"") >&5 14815 + { (eval echo "$as_me:61 49: \"$ac_try\"") >&515845 + { (eval echo "$as_me:6154: \"$ac_try\"") >&5 14816 15846 (eval $ac_try) 2>&5 14817 15847 ac_status=$? 14818 15848 - echo "$as_me:6030: \$? = $ac_status" >&5 14819 + echo "$as_me:615 2: \$? = $ac_status" >&515849 + echo "$as_me:6157: \$? = $ac_status" >&5 14820 15850 (exit $ac_status); }; }; then 14821 15851 14822 15852 cf_cv_cc_u_d_options=yes 14823 @@ -6041,7 +616 3,7 @@15853 @@ -6041,7 +6168,7 @@ 14824 15854 CPPFLAGS="$cf_save_CPPFLAGS" 14825 15855 14826 15856 fi 14827 15857 -echo "$as_me:6044: result: $cf_cv_cc_u_d_options" >&5 14828 +echo "$as_me:61 66: result: $cf_cv_cc_u_d_options" >&515858 +echo "$as_me:6171: result: $cf_cv_cc_u_d_options" >&5 14829 15859 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6 14830 15860 14831 15861 cf_XOPEN_SOURCE=500 14832 @@ -6065,16 +61 87,16 @@15862 @@ -6065,16 +6192,16 @@ 14833 15863 irix[56].*) #(vi 14834 15864 CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" … … 14838 15868 14839 15869 -echo "$as_me:6070: checking if we must define _GNU_SOURCE" >&5 14840 +echo "$as_me:619 2: checking if we must define _GNU_SOURCE" >&515870 +echo "$as_me:6197: checking if we must define _GNU_SOURCE" >&5 14841 15871 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 14842 15872 if test "${cf_cv_gnu_source+set}" = set; then … … 14846 15876 cat >conftest.$ac_ext <<_ACEOF 14847 15877 -#line 6077 "configure" 14848 +#line 6 199"configure"15878 +#line 6204 "configure" 14849 15879 #include "confdefs.h" 14850 15880 #include <sys/types.h> 14851 15881 int 14852 @@ -6089,16 +621 1,16 @@15882 @@ -6089,16 +6216,16 @@ 14853 15883 } 14854 15884 _ACEOF 14855 15885 rm -f conftest.$ac_objext 14856 15886 -if { (eval echo "$as_me:6092: \"$ac_compile\"") >&5 14857 +if { (eval echo "$as_me:621 4: \"$ac_compile\"") >&515887 +if { (eval echo "$as_me:6219: \"$ac_compile\"") >&5 14858 15888 (eval $ac_compile) 2>&5 14859 15889 ac_status=$? 14860 15890 - echo "$as_me:6095: \$? = $ac_status" >&5 14861 + echo "$as_me:62 17: \$? = $ac_status" >&515891 + echo "$as_me:6222: \$? = $ac_status" >&5 14862 15892 (exit $ac_status); } && 14863 15893 { ac_try='test -s conftest.$ac_objext' 14864 15894 - { (eval echo "$as_me:6098: \"$ac_try\"") >&5 14865 + { (eval echo "$as_me:622 0: \"$ac_try\"") >&515895 + { (eval echo "$as_me:6225: \"$ac_try\"") >&5 14866 15896 (eval $ac_try) 2>&5 14867 15897 ac_status=$? 14868 15898 - echo "$as_me:6101: \$? = $ac_status" >&5 14869 + echo "$as_me:622 3: \$? = $ac_status" >&515899 + echo "$as_me:6228: \$? = $ac_status" >&5 14870 15900 (exit $ac_status); }; }; then 14871 15901 cf_cv_gnu_source=no 14872 15902 else 14873 @@ -6107,7 +62 29,7 @@15903 @@ -6107,7 +6234,7 @@ 14874 15904 cf_save="$CPPFLAGS" 14875 15905 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" 14876 15906 cat >conftest.$ac_ext <<_ACEOF 14877 15907 -#line 6110 "configure" 14878 +#line 623 2"configure"15908 +#line 6237 "configure" 14879 15909 #include "confdefs.h" 14880 15910 #include <sys/types.h> 14881 15911 int 14882 @@ -6122,16 +624 4,16 @@15912 @@ -6122,16 +6249,16 @@ 14883 15913 } 14884 15914 _ACEOF 14885 15915 rm -f conftest.$ac_objext 14886 15916 -if { (eval echo "$as_me:6125: \"$ac_compile\"") >&5 14887 +if { (eval echo "$as_me:62 47: \"$ac_compile\"") >&515917 +if { (eval echo "$as_me:6252: \"$ac_compile\"") >&5 14888 15918 (eval $ac_compile) 2>&5 14889 15919 ac_status=$? 14890 15920 - echo "$as_me:6128: \$? = $ac_status" >&5 14891 + echo "$as_me:625 0: \$? = $ac_status" >&515921 + echo "$as_me:6255: \$? = $ac_status" >&5 14892 15922 (exit $ac_status); } && 14893 15923 { ac_try='test -s conftest.$ac_objext' 14894 15924 - { (eval echo "$as_me:6131: \"$ac_try\"") >&5 14895 + { (eval echo "$as_me:625 3: \"$ac_try\"") >&515925 + { (eval echo "$as_me:6258: \"$ac_try\"") >&5 14896 15926 (eval $ac_try) 2>&5 14897 15927 ac_status=$? 14898 15928 - echo "$as_me:6134: \$? = $ac_status" >&5 14899 + echo "$as_me:62 56: \$? = $ac_status" >&515929 + echo "$as_me:6261: \$? = $ac_status" >&5 14900 15930 (exit $ac_status); }; }; then 14901 15931 cf_cv_gnu_source=no 14902 15932 else 14903 @@ -6146,7 +62 68,7 @@15933 @@ -6146,7 +6273,7 @@ 14904 15934 rm -f conftest.$ac_objext conftest.$ac_ext 14905 15935 14906 15936 fi 14907 15937 -echo "$as_me:6149: result: $cf_cv_gnu_source" >&5 14908 +echo "$as_me:627 1: result: $cf_cv_gnu_source" >&515938 +echo "$as_me:6276: result: $cf_cv_gnu_source" >&5 14909 15939 echo "${ECHO_T}$cf_cv_gnu_source" >&6 14910 15940 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" 14911 15941 14912 @@ -6173,14 +6 295,14 @@15942 @@ -6173,14 +6300,14 @@ 14913 15943 CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" 14914 15944 ;; 14915 15945 *) 14916 15946 - echo "$as_me:6176: checking if we should define _XOPEN_SOURCE" >&5 14917 + echo "$as_me:6 298: checking if we should define _XOPEN_SOURCE" >&515947 + echo "$as_me:6303: checking if we should define _XOPEN_SOURCE" >&5 14918 15948 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 14919 15949 if test "${cf_cv_xopen_source+set}" = set; then … … 14923 15953 cat >conftest.$ac_ext <<_ACEOF 14924 15954 -#line 6183 "configure" 14925 +#line 63 05"configure"15955 +#line 6310 "configure" 14926 15956 #include "confdefs.h" 14927 15957 #include <sys/types.h> 14928 15958 int 14929 @@ -6195,16 +63 17,16 @@15959 @@ -6195,16 +6322,16 @@ 14930 15960 } 14931 15961 _ACEOF 14932 15962 rm -f conftest.$ac_objext 14933 15963 -if { (eval echo "$as_me:6198: \"$ac_compile\"") >&5 14934 +if { (eval echo "$as_me:632 0: \"$ac_compile\"") >&515964 +if { (eval echo "$as_me:6325: \"$ac_compile\"") >&5 14935 15965 (eval $ac_compile) 2>&5 14936 15966 ac_status=$? 14937 15967 - echo "$as_me:6201: \$? = $ac_status" >&5 14938 + echo "$as_me:632 3: \$? = $ac_status" >&515968 + echo "$as_me:6328: \$? = $ac_status" >&5 14939 15969 (exit $ac_status); } && 14940 15970 { ac_try='test -s conftest.$ac_objext' 14941 15971 - { (eval echo "$as_me:6204: \"$ac_try\"") >&5 14942 + { (eval echo "$as_me:63 26: \"$ac_try\"") >&515972 + { (eval echo "$as_me:6331: \"$ac_try\"") >&5 14943 15973 (eval $ac_try) 2>&5 14944 15974 ac_status=$? 14945 15975 - echo "$as_me:6207: \$? = $ac_status" >&5 14946 + echo "$as_me:63 29: \$? = $ac_status" >&515976 + echo "$as_me:6334: \$? = $ac_status" >&5 14947 15977 (exit $ac_status); }; }; then 14948 15978 cf_cv_xopen_source=no 14949 15979 else 14950 @@ -6213,7 +63 35,7 @@15980 @@ -6213,7 +6340,7 @@ 14951 15981 cf_save="$CPPFLAGS" 14952 15982 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" 14953 15983 cat >conftest.$ac_ext <<_ACEOF 14954 15984 -#line 6216 "configure" 14955 +#line 63 38"configure"15985 +#line 6343 "configure" 14956 15986 #include "confdefs.h" 14957 15987 #include <sys/types.h> 14958 15988 int 14959 @@ -6228,16 +635 0,16 @@15989 @@ -6228,16 +6355,16 @@ 14960 15990 } 14961 15991 _ACEOF 14962 15992 rm -f conftest.$ac_objext 14963 15993 -if { (eval echo "$as_me:6231: \"$ac_compile\"") >&5 14964 +if { (eval echo "$as_me:635 3: \"$ac_compile\"") >&515994 +if { (eval echo "$as_me:6358: \"$ac_compile\"") >&5 14965 15995 (eval $ac_compile) 2>&5 14966 15996 ac_status=$? 14967 15997 - echo "$as_me:6234: \$? = $ac_status" >&5 14968 + echo "$as_me:63 56: \$? = $ac_status" >&515998 + echo "$as_me:6361: \$? = $ac_status" >&5 14969 15999 (exit $ac_status); } && 14970 16000 { ac_try='test -s conftest.$ac_objext' 14971 16001 - { (eval echo "$as_me:6237: \"$ac_try\"") >&5 14972 + { (eval echo "$as_me:63 59: \"$ac_try\"") >&516002 + { (eval echo "$as_me:6364: \"$ac_try\"") >&5 14973 16003 (eval $ac_try) 2>&5 14974 16004 ac_status=$? 14975 16005 - echo "$as_me:6240: \$? = $ac_status" >&5 14976 + echo "$as_me:636 2: \$? = $ac_status" >&516006 + echo "$as_me:6367: \$? = $ac_status" >&5 14977 16007 (exit $ac_status); }; }; then 14978 16008 cf_cv_xopen_source=no 14979 16009 else 14980 @@ -6252,7 +637 4,7 @@16010 @@ -6252,7 +6379,7 @@ 14981 16011 rm -f conftest.$ac_objext conftest.$ac_ext 14982 16012 14983 16013 fi 14984 16014 -echo "$as_me:6255: result: $cf_cv_xopen_source" >&5 14985 +echo "$as_me:63 77: result: $cf_cv_xopen_source" >&516015 +echo "$as_me:6382: result: $cf_cv_xopen_source" >&5 14986 16016 echo "${ECHO_T}$cf_cv_xopen_source" >&6 14987 16017 if test "$cf_cv_xopen_source" != no ; then 14988 16018 14989 @@ -6286,16 +64 08,16 @@16019 @@ -6286,16 +6413,16 @@ 14990 16020 sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ 14991 16021 -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'` 14992 16022 14993 16023 -echo "$as_me:6289: checking if we should define _POSIX_C_SOURCE" >&5 14994 +echo "$as_me:641 1: checking if we should define _POSIX_C_SOURCE" >&516024 +echo "$as_me:6416: checking if we should define _POSIX_C_SOURCE" >&5 14995 16025 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 14996 16026 if test "${cf_cv_posix_c_source+set}" = set; then … … 14999 16029 15000 16030 -echo "(line 6295) testing if the symbol is already defined go no further ..." 1>&5 15001 +echo "${as_me-configure}:64 17: testing if the symbol is already defined go no further ..." 1>&516031 +echo "${as_me-configure}:6422: testing if the symbol is already defined go no further ..." 1>&5 15002 16032 15003 16033 cat >conftest.$ac_ext <<_ACEOF 15004 16034 -#line 6298 "configure" 15005 +#line 642 0"configure"16035 +#line 6425 "configure" 15006 16036 #include "confdefs.h" 15007 16037 #include <sys/types.h> 15008 16038 int 15009 @@ -6310,16 +643 2,16 @@16039 @@ -6310,16 +6437,16 @@ 15010 16040 } 15011 16041 _ACEOF 15012 16042 rm -f conftest.$ac_objext 15013 16043 -if { (eval echo "$as_me:6313: \"$ac_compile\"") >&5 15014 +if { (eval echo "$as_me:64 35: \"$ac_compile\"") >&516044 +if { (eval echo "$as_me:6440: \"$ac_compile\"") >&5 15015 16045 (eval $ac_compile) 2>&5 15016 16046 ac_status=$? 15017 16047 - echo "$as_me:6316: \$? = $ac_status" >&5 15018 + echo "$as_me:64 38: \$? = $ac_status" >&516048 + echo "$as_me:6443: \$? = $ac_status" >&5 15019 16049 (exit $ac_status); } && 15020 16050 { ac_try='test -s conftest.$ac_objext' 15021 16051 - { (eval echo "$as_me:6319: \"$ac_try\"") >&5 15022 + { (eval echo "$as_me:644 1: \"$ac_try\"") >&516052 + { (eval echo "$as_me:6446: \"$ac_try\"") >&5 15023 16053 (eval $ac_try) 2>&5 15024 16054 ac_status=$? 15025 16055 - echo "$as_me:6322: \$? = $ac_status" >&5 15026 + echo "$as_me:644 4: \$? = $ac_status" >&516056 + echo "$as_me:6449: \$? = $ac_status" >&5 15027 16057 (exit $ac_status); }; }; then 15028 16058 cf_cv_posix_c_source=no 15029 16059 else 15030 @@ -6340,7 +646 2,7 @@16060 @@ -6340,7 +6467,7 @@ 15031 16061 esac 15032 16062 if test "$cf_want_posix_source" = yes ; then 15033 16063 cat >conftest.$ac_ext <<_ACEOF 15034 16064 -#line 6343 "configure" 15035 +#line 64 65"configure"16065 +#line 6470 "configure" 15036 16066 #include "confdefs.h" 15037 16067 #include <sys/types.h> 15038 16068 int 15039 @@ -6355,16 +64 77,16 @@16069 @@ -6355,16 +6482,16 @@ 15040 16070 } 15041 16071 _ACEOF 15042 16072 rm -f conftest.$ac_objext 15043 16073 -if { (eval echo "$as_me:6358: \"$ac_compile\"") >&5 15044 +if { (eval echo "$as_me:648 0: \"$ac_compile\"") >&516074 +if { (eval echo "$as_me:6485: \"$ac_compile\"") >&5 15045 16075 (eval $ac_compile) 2>&5 15046 16076 ac_status=$? 15047 16077 - echo "$as_me:6361: \$? = $ac_status" >&5 15048 + echo "$as_me:648 3: \$? = $ac_status" >&516078 + echo "$as_me:6488: \$? = $ac_status" >&5 15049 16079 (exit $ac_status); } && 15050 16080 { ac_try='test -s conftest.$ac_objext' 15051 16081 - { (eval echo "$as_me:6364: \"$ac_try\"") >&5 15052 + { (eval echo "$as_me:64 86: \"$ac_try\"") >&516082 + { (eval echo "$as_me:6491: \"$ac_try\"") >&5 15053 16083 (eval $ac_try) 2>&5 15054 16084 ac_status=$? 15055 16085 - echo "$as_me:6367: \$? = $ac_status" >&5 15056 + echo "$as_me:64 89: \$? = $ac_status" >&516086 + echo "$as_me:6494: \$? = $ac_status" >&5 15057 16087 (exit $ac_status); }; }; then 15058 16088 : 15059 16089 else 15060 @@ -6375,15 +6 497,15 @@16090 @@ -6375,15 +6502,15 @@ 15061 16091 rm -f conftest.$ac_objext conftest.$ac_ext 15062 16092 fi 15063 16093 15064 16094 -echo "(line 6378) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 15065 +echo "${as_me-configure}:650 0: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&516095 +echo "${as_me-configure}:6505: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 15066 16096 15067 16097 CFLAGS="$cf_trim_CFLAGS" … … 15069 16099 15070 16100 -echo "(line 6383) testing if the second compile does not leave our definition intact error ..." 1>&5 15071 +echo "${as_me-configure}:65 05: testing if the second compile does not leave our definition intact error ..." 1>&516101 +echo "${as_me-configure}:6510: testing if the second compile does not leave our definition intact error ..." 1>&5 15072 16102 15073 16103 cat >conftest.$ac_ext <<_ACEOF 15074 16104 -#line 6386 "configure" 15075 +#line 65 08"configure"16105 +#line 6513 "configure" 15076 16106 #include "confdefs.h" 15077 16107 #include <sys/types.h> 15078 16108 int 15079 @@ -6398,16 +652 0,16 @@16109 @@ -6398,16 +6525,16 @@ 15080 16110 } 15081 16111 _ACEOF 15082 16112 rm -f conftest.$ac_objext 15083 16113 -if { (eval echo "$as_me:6401: \"$ac_compile\"") >&5 15084 +if { (eval echo "$as_me:652 3: \"$ac_compile\"") >&516114 +if { (eval echo "$as_me:6528: \"$ac_compile\"") >&5 15085 16115 (eval $ac_compile) 2>&5 15086 16116 ac_status=$? 15087 16117 - echo "$as_me:6404: \$? = $ac_status" >&5 15088 + echo "$as_me:65 26: \$? = $ac_status" >&516118 + echo "$as_me:6531: \$? = $ac_status" >&5 15089 16119 (exit $ac_status); } && 15090 16120 { ac_try='test -s conftest.$ac_objext' 15091 16121 - { (eval echo "$as_me:6407: \"$ac_try\"") >&5 15092 + { (eval echo "$as_me:65 29: \"$ac_try\"") >&516122 + { (eval echo "$as_me:6534: \"$ac_try\"") >&5 15093 16123 (eval $ac_try) 2>&5 15094 16124 ac_status=$? 15095 16125 - echo "$as_me:6410: \$? = $ac_status" >&5 15096 + echo "$as_me:653 2: \$? = $ac_status" >&516126 + echo "$as_me:6537: \$? = $ac_status" >&5 15097 16127 (exit $ac_status); }; }; then 15098 16128 : 15099 16129 else 15100 @@ -6423,7 +65 45,7 @@16130 @@ -6423,7 +6550,7 @@ 15101 16131 rm -f conftest.$ac_objext conftest.$ac_ext 15102 16132 15103 16133 fi 15104 16134 -echo "$as_me:6426: result: $cf_cv_posix_c_source" >&5 15105 +echo "$as_me:65 48: result: $cf_cv_posix_c_source" >&516135 +echo "$as_me:6553: result: $cf_cv_posix_c_source" >&5 15106 16136 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 15107 16137 15108 16138 if test "$cf_cv_posix_c_source" != no ; then 15109 @@ -6442,14 +656 4,14 @@16139 @@ -6442,14 +6569,14 @@ 15110 16140 15111 16141 # Work around breakage on OS X 15112 16142 15113 16143 -echo "$as_me:6445: checking if SIGWINCH is defined" >&5 15114 +echo "$as_me:65 67: checking if SIGWINCH is defined" >&516144 +echo "$as_me:6572: checking if SIGWINCH is defined" >&5 15115 16145 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 15116 16146 if test "${cf_cv_define_sigwinch+set}" = set; then … … 15120 16150 cat >conftest.$ac_ext <<_ACEOF 15121 16151 -#line 6452 "configure" 15122 +#line 657 4"configure"16152 +#line 6579 "configure" 15123 16153 #include "confdefs.h" 15124 16154 15125 16155 #include <sys/types.h> 15126 @@ -6464,23 +65 86,23 @@16156 @@ -6464,23 +6591,23 @@ 15127 16157 } 15128 16158 _ACEOF 15129 16159 rm -f conftest.$ac_objext 15130 16160 -if { (eval echo "$as_me:6467: \"$ac_compile\"") >&5 15131 +if { (eval echo "$as_me:65 89: \"$ac_compile\"") >&516161 +if { (eval echo "$as_me:6594: \"$ac_compile\"") >&5 15132 16162 (eval $ac_compile) 2>&5 15133 16163 ac_status=$? 15134 16164 - echo "$as_me:6470: \$? = $ac_status" >&5 15135 + echo "$as_me:659 2: \$? = $ac_status" >&516165 + echo "$as_me:6597: \$? = $ac_status" >&5 15136 16166 (exit $ac_status); } && 15137 16167 { ac_try='test -s conftest.$ac_objext' 15138 16168 - { (eval echo "$as_me:6473: \"$ac_try\"") >&5 15139 + { (eval echo "$as_me:6 595: \"$ac_try\"") >&516169 + { (eval echo "$as_me:6600: \"$ac_try\"") >&5 15140 16170 (eval $ac_try) 2>&5 15141 16171 ac_status=$? 15142 16172 - echo "$as_me:6476: \$? = $ac_status" >&5 15143 + echo "$as_me:6 598: \$? = $ac_status" >&516173 + echo "$as_me:6603: \$? = $ac_status" >&5 15144 16174 (exit $ac_status); }; }; then 15145 16175 cf_cv_define_sigwinch=yes … … 15149 16179 cat >conftest.$ac_ext <<_ACEOF 15150 16180 -#line 6483 "configure" 15151 +#line 66 05"configure"16181 +#line 6610 "configure" 15152 16182 #include "confdefs.h" 15153 16183 15154 16184 #undef _XOPEN_SOURCE 15155 @@ -6498,16 +662 0,16 @@16185 @@ -6498,16 +6625,16 @@ 15156 16186 } 15157 16187 _ACEOF 15158 16188 rm -f conftest.$ac_objext 15159 16189 -if { (eval echo "$as_me:6501: \"$ac_compile\"") >&5 15160 +if { (eval echo "$as_me:662 3: \"$ac_compile\"") >&516190 +if { (eval echo "$as_me:6628: \"$ac_compile\"") >&5 15161 16191 (eval $ac_compile) 2>&5 15162 16192 ac_status=$? 15163 16193 - echo "$as_me:6504: \$? = $ac_status" >&5 15164 + echo "$as_me:66 26: \$? = $ac_status" >&516194 + echo "$as_me:6631: \$? = $ac_status" >&5 15165 16195 (exit $ac_status); } && 15166 16196 { ac_try='test -s conftest.$ac_objext' 15167 16197 - { (eval echo "$as_me:6507: \"$ac_try\"") >&5 15168 + { (eval echo "$as_me:66 29: \"$ac_try\"") >&516198 + { (eval echo "$as_me:6634: \"$ac_try\"") >&5 15169 16199 (eval $ac_try) 2>&5 15170 16200 ac_status=$? 15171 16201 - echo "$as_me:6510: \$? = $ac_status" >&5 15172 + echo "$as_me:663 2: \$? = $ac_status" >&516202 + echo "$as_me:6637: \$? = $ac_status" >&5 15173 16203 (exit $ac_status); }; }; then 15174 16204 cf_cv_define_sigwinch=maybe 15175 16205 else 15176 @@ -6521,11 +664 3,11 @@16206 @@ -6521,11 +6648,11 @@ 15177 16207 rm -f conftest.$ac_objext conftest.$ac_ext 15178 16208 15179 16209 fi 15180 16210 -echo "$as_me:6524: result: $cf_cv_define_sigwinch" >&5 15181 +echo "$as_me:66 46: result: $cf_cv_define_sigwinch" >&516211 +echo "$as_me:6651: result: $cf_cv_define_sigwinch" >&5 15182 16212 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 15183 16213 15184 16214 if test "$cf_cv_define_sigwinch" = maybe ; then 15185 16215 -echo "$as_me:6528: checking for actual SIGWINCH definition" >&5 15186 +echo "$as_me:665 0: checking for actual SIGWINCH definition" >&516216 +echo "$as_me:6655: checking for actual SIGWINCH definition" >&5 15187 16217 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 15188 16218 if test "${cf_cv_fixup_sigwinch+set}" = set; then 15189 16219 echo $ECHO_N "(cached) $ECHO_C" >&6 15190 @@ -6536,7 +66 58,7 @@16220 @@ -6536,7 +6663,7 @@ 15191 16221 while test $cf_sigwinch != 1 15192 16222 do 15193 16223 cat >conftest.$ac_ext <<_ACEOF 15194 16224 -#line 6539 "configure" 15195 +#line 666 1"configure"16225 +#line 6666 "configure" 15196 16226 #include "confdefs.h" 15197 16227 15198 16228 #undef _XOPEN_SOURCE 15199 @@ -6558,16 +668 0,16 @@16229 @@ -6558,16 +6685,16 @@ 15200 16230 } 15201 16231 _ACEOF 15202 16232 rm -f conftest.$ac_objext 15203 16233 -if { (eval echo "$as_me:6561: \"$ac_compile\"") >&5 15204 +if { (eval echo "$as_me:668 3: \"$ac_compile\"") >&516234 +if { (eval echo "$as_me:6688: \"$ac_compile\"") >&5 15205 16235 (eval $ac_compile) 2>&5 15206 16236 ac_status=$? 15207 16237 - echo "$as_me:6564: \$? = $ac_status" >&5 15208 + echo "$as_me:66 86: \$? = $ac_status" >&516238 + echo "$as_me:6691: \$? = $ac_status" >&5 15209 16239 (exit $ac_status); } && 15210 16240 { ac_try='test -s conftest.$ac_objext' 15211 16241 - { (eval echo "$as_me:6567: \"$ac_try\"") >&5 15212 + { (eval echo "$as_me:66 89: \"$ac_try\"") >&516242 + { (eval echo "$as_me:6694: \"$ac_try\"") >&5 15213 16243 (eval $ac_try) 2>&5 15214 16244 ac_status=$? 15215 16245 - echo "$as_me:6570: \$? = $ac_status" >&5 15216 + echo "$as_me:669 2: \$? = $ac_status" >&516246 + echo "$as_me:6697: \$? = $ac_status" >&5 15217 16247 (exit $ac_status); }; }; then 15218 16248 cf_cv_fixup_sigwinch=$cf_sigwinch 15219 16249 break 15220 @@ -6581,7 +670 3,7 @@16250 @@ -6581,7 +6708,7 @@ 15221 16251 done 15222 16252 15223 16253 fi 15224 16254 -echo "$as_me:6584: result: $cf_cv_fixup_sigwinch" >&5 15225 +echo "$as_me:67 06: result: $cf_cv_fixup_sigwinch" >&516255 +echo "$as_me:6711: result: $cf_cv_fixup_sigwinch" >&5 15226 16256 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 15227 16257 15228 16258 if test "$cf_cv_fixup_sigwinch" != unknown ; then 15229 @@ -6591,13 +671 3,13 @@16259 @@ -6591,13 +6718,13 @@ 15230 16260 15231 16261 # Checks for CODESET support. 15232 16262 15233 16263 - echo "$as_me:6594: checking for nl_langinfo and CODESET" >&5 15234 + echo "$as_me:67 16: checking for nl_langinfo and CODESET" >&516264 + echo "$as_me:6721: checking for nl_langinfo and CODESET" >&5 15235 16265 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 15236 16266 if test "${am_cv_langinfo_codeset+set}" = set; then … … 15239 16269 cat >conftest.$ac_ext <<_ACEOF 15240 16270 -#line 6600 "configure" 15241 +#line 672 2"configure"16271 +#line 6727 "configure" 15242 16272 #include "confdefs.h" 15243 16273 #include <langinfo.h> 15244 16274 int 15245 @@ -6609,16 +673 1,16 @@16275 @@ -6609,16 +6736,16 @@ 15246 16276 } 15247 16277 _ACEOF 15248 16278 rm -f conftest.$ac_objext conftest$ac_exeext 15249 16279 -if { (eval echo "$as_me:6612: \"$ac_link\"") >&5 15250 +if { (eval echo "$as_me:673 4: \"$ac_link\"") >&516280 +if { (eval echo "$as_me:6739: \"$ac_link\"") >&5 15251 16281 (eval $ac_link) 2>&5 15252 16282 ac_status=$? 15253 16283 - echo "$as_me:6615: \$? = $ac_status" >&5 15254 + echo "$as_me:67 37: \$? = $ac_status" >&516284 + echo "$as_me:6742: \$? = $ac_status" >&5 15255 16285 (exit $ac_status); } && 15256 16286 { ac_try='test -s conftest$ac_exeext' 15257 16287 - { (eval echo "$as_me:6618: \"$ac_try\"") >&5 15258 + { (eval echo "$as_me:674 0: \"$ac_try\"") >&516288 + { (eval echo "$as_me:6745: \"$ac_try\"") >&5 15259 16289 (eval $ac_try) 2>&5 15260 16290 ac_status=$? 15261 16291 - echo "$as_me:6621: \$? = $ac_status" >&5 15262 + echo "$as_me:674 3: \$? = $ac_status" >&516292 + echo "$as_me:6748: \$? = $ac_status" >&5 15263 16293 (exit $ac_status); }; }; then 15264 16294 am_cv_langinfo_codeset=yes 15265 16295 else 15266 @@ -6629,7 +675 1,7 @@16296 @@ -6629,7 +6756,7 @@ 15267 16297 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 15268 16298 15269 16299 fi 15270 16300 -echo "$as_me:6632: result: $am_cv_langinfo_codeset" >&5 15271 +echo "$as_me:675 4: result: $am_cv_langinfo_codeset" >&516301 +echo "$as_me:6759: result: $am_cv_langinfo_codeset" >&5 15272 16302 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 15273 16303 if test $am_cv_langinfo_codeset = yes; then 15274 16304 15275 @@ -6643,7 +67 65,7 @@16305 @@ -6643,7 +6770,7 @@ 15276 16306 NCURSES_OK_WCHAR_T= 15277 16307 NCURSES_OK_WINT_T= 15278 16308 15279 16309 -echo "$as_me:6646: checking if you want wide-character code" >&5 15280 +echo "$as_me:67 68: checking if you want wide-character code" >&516310 +echo "$as_me:6773: checking if you want wide-character code" >&5 15281 16311 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 15282 16312 15283 16313 # Check whether --enable-widec or --disable-widec was given. 15284 @@ -6653,7 +67 75,7 @@16314 @@ -6653,7 +6780,7 @@ 15285 16315 else 15286 16316 with_widec=no 15287 16317 fi; 15288 16318 -echo "$as_me:6656: result: $with_widec" >&5 15289 +echo "$as_me:67 78: result: $with_widec" >&516319 +echo "$as_me:6783: result: $with_widec" >&5 15290 16320 echo "${ECHO_T}$with_widec" >&6 15291 16321 if test "$with_widec" = yes ; then 15292 16322 LIB_SUFFIX="w${LIB_SUFFIX}" 15293 @@ -6661,10 +678 3,10 @@16323 @@ -6661,10 +6788,10 @@ 15294 16324 #define USE_WIDEC_SUPPORT 1 15295 16325 EOF 15296 16326 15297 16327 -echo "$as_me:6664: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 15298 +echo "$as_me:67 86: checking if we must define _XOPEN_SOURCE_EXTENDED" >&516328 +echo "$as_me:6791: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 15299 16329 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 15300 16330 cat >conftest.$ac_ext <<_ACEOF 15301 16331 -#line 6667 "configure" 15302 +#line 67 89"configure"16332 +#line 6794 "configure" 15303 16333 #include "confdefs.h" 15304 16334 #include <sys/types.h> 15305 16335 15306 @@ -6680,16 +680 2,16 @@16336 @@ -6680,16 +6807,16 @@ 15307 16337 } 15308 16338 _ACEOF 15309 16339 rm -f conftest.$ac_objext 15310 16340 -if { (eval echo "$as_me:6683: \"$ac_compile\"") >&5 15311 +if { (eval echo "$as_me:68 05: \"$ac_compile\"") >&516341 +if { (eval echo "$as_me:6810: \"$ac_compile\"") >&5 15312 16342 (eval $ac_compile) 2>&5 15313 16343 ac_status=$? 15314 16344 - echo "$as_me:6686: \$? = $ac_status" >&5 15315 + echo "$as_me:68 08: \$? = $ac_status" >&516345 + echo "$as_me:6813: \$? = $ac_status" >&5 15316 16346 (exit $ac_status); } && 15317 16347 { ac_try='test -s conftest.$ac_objext' 15318 16348 - { (eval echo "$as_me:6689: \"$ac_try\"") >&5 15319 + { (eval echo "$as_me:681 1: \"$ac_try\"") >&516349 + { (eval echo "$as_me:6816: \"$ac_try\"") >&5 15320 16350 (eval $ac_try) 2>&5 15321 16351 ac_status=$? 15322 16352 - echo "$as_me:6692: \$? = $ac_status" >&5 15323 + echo "$as_me:681 4: \$? = $ac_status" >&516353 + echo "$as_me:6819: \$? = $ac_status" >&5 15324 16354 (exit $ac_status); }; }; then 15325 16355 cf_result=no 15326 16356 else 15327 @@ -6698,16 +682 0,16 @@16357 @@ -6698,16 +6825,16 @@ 15328 16358 cf_result=yes 15329 16359 fi 15330 16360 rm -f conftest.$ac_objext conftest.$ac_ext 15331 16361 -echo "$as_me:6701: result: $cf_result" >&5 15332 +echo "$as_me:682 3: result: $cf_result" >&516362 +echo "$as_me:6828: result: $cf_result" >&5 15333 16363 echo "${ECHO_T}$cf_result" >&6 15334 16364 … … 15337 16367 elif test "x" != "x" ; then 15338 16368 - echo "$as_me:6707: checking checking for compatible value versus " >&5 15339 + echo "$as_me:68 29: checking checking for compatible value versus " >&516369 + echo "$as_me:6834: checking checking for compatible value versus " >&5 15340 16370 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6 15341 16371 cat >conftest.$ac_ext <<_ACEOF 15342 16372 -#line 6710 "configure" 15343 +#line 683 2"configure"16373 +#line 6837 "configure" 15344 16374 #include "confdefs.h" 15345 16375 #include <sys/types.h> 15346 16376 15347 @@ -6723,16 +68 45,16 @@16377 @@ -6723,16 +6850,16 @@ 15348 16378 } 15349 16379 _ACEOF 15350 16380 rm -f conftest.$ac_objext 15351 16381 -if { (eval echo "$as_me:6726: \"$ac_compile\"") >&5 15352 +if { (eval echo "$as_me:68 48: \"$ac_compile\"") >&516382 +if { (eval echo "$as_me:6853: \"$ac_compile\"") >&5 15353 16383 (eval $ac_compile) 2>&5 15354 16384 ac_status=$? 15355 16385 - echo "$as_me:6729: \$? = $ac_status" >&5 15356 + echo "$as_me:685 1: \$? = $ac_status" >&516386 + echo "$as_me:6856: \$? = $ac_status" >&5 15357 16387 (exit $ac_status); } && 15358 16388 { ac_try='test -s conftest.$ac_objext' 15359 16389 - { (eval echo "$as_me:6732: \"$ac_try\"") >&5 15360 + { (eval echo "$as_me:685 4: \"$ac_try\"") >&516390 + { (eval echo "$as_me:6859: \"$ac_try\"") >&5 15361 16391 (eval $ac_try) 2>&5 15362 16392 ac_status=$? 15363 16393 - echo "$as_me:6735: \$? = $ac_status" >&5 15364 + echo "$as_me:68 57: \$? = $ac_status" >&516394 + echo "$as_me:6862: \$? = $ac_status" >&5 15365 16395 (exit $ac_status); }; }; then 15366 16396 cf_result=yes 15367 16397 else 15368 @@ -6741,7 +686 3,7 @@16398 @@ -6741,7 +6868,7 @@ 15369 16399 cf_result=no 15370 16400 fi 15371 16401 rm -f conftest.$ac_objext conftest.$ac_ext 15372 16402 - echo "$as_me:6744: result: $cf_result" >&5 15373 + echo "$as_me:68 66: result: $cf_result" >&516403 + echo "$as_me:6871: result: $cf_result" >&5 15374 16404 echo "${ECHO_T}$cf_result" >&6 15375 16405 if test "$cf_result" = no ; then 15376 16406 # perhaps we can override it - try... 15377 @@ -6755,13 +68 77,13 @@16407 @@ -6755,13 +6882,13 @@ 15378 16408 for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc 15379 16409 do 15380 16410 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 15381 16411 -echo "$as_me:6758: checking for $ac_func" >&5 15382 +echo "$as_me:688 0: checking for $ac_func" >&516412 +echo "$as_me:6885: checking for $ac_func" >&5 15383 16413 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 15384 16414 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 15387 16417 cat >conftest.$ac_ext <<_ACEOF 15388 16418 -#line 6764 "configure" 15389 +#line 68 86"configure"16419 +#line 6891 "configure" 15390 16420 #include "confdefs.h" 15391 16421 /* System header to define __stub macros and hopefully few prototypes, 15392 16422 which can conflict with char $ac_func (); below. */ 15393 @@ -6792,16 +691 4,16 @@16423 @@ -6792,16 +6919,16 @@ 15394 16424 } 15395 16425 _ACEOF 15396 16426 rm -f conftest.$ac_objext conftest$ac_exeext 15397 16427 -if { (eval echo "$as_me:6795: \"$ac_link\"") >&5 15398 +if { (eval echo "$as_me:69 17: \"$ac_link\"") >&516428 +if { (eval echo "$as_me:6922: \"$ac_link\"") >&5 15399 16429 (eval $ac_link) 2>&5 15400 16430 ac_status=$? 15401 16431 - echo "$as_me:6798: \$? = $ac_status" >&5 15402 + echo "$as_me:692 0: \$? = $ac_status" >&516432 + echo "$as_me:6925: \$? = $ac_status" >&5 15403 16433 (exit $ac_status); } && 15404 16434 { ac_try='test -s conftest$ac_exeext' 15405 16435 - { (eval echo "$as_me:6801: \"$ac_try\"") >&5 15406 + { (eval echo "$as_me:692 3: \"$ac_try\"") >&516436 + { (eval echo "$as_me:6928: \"$ac_try\"") >&5 15407 16437 (eval $ac_try) 2>&5 15408 16438 ac_status=$? 15409 16439 - echo "$as_me:6804: \$? = $ac_status" >&5 15410 + echo "$as_me:69 26: \$? = $ac_status" >&516440 + echo "$as_me:6931: \$? = $ac_status" >&5 15411 16441 (exit $ac_status); }; }; then 15412 16442 eval "$as_ac_var=yes" 15413 16443 else 15414 @@ -6811,7 +693 3,7 @@16444 @@ -6811,7 +6938,7 @@ 15415 16445 fi 15416 16446 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 15417 16447 fi 15418 16448 -echo "$as_me:6814: result: `eval echo '${'$as_ac_var'}'`" >&5 15419 +echo "$as_me:69 36: result: `eval echo '${'$as_ac_var'}'`" >&516449 +echo "$as_me:6941: result: `eval echo '${'$as_ac_var'}'`" >&5 15420 16450 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 15421 16451 if test `eval echo '${'$as_ac_var'}'` = yes; then 15422 16452 cat >>confdefs.h <<EOF 15423 @@ -6823,7 +69 45,7 @@16453 @@ -6823,7 +6950,7 @@ 15424 16454 15425 16455 if test "$ac_cv_func_putwc" != yes ; then 15426 16456 15427 16457 -echo "$as_me:6826: checking for putwc in libutf8" >&5 15428 +echo "$as_me:69 48: checking for putwc in libutf8" >&516458 +echo "$as_me:6953: checking for putwc in libutf8" >&5 15429 16459 echo $ECHO_N "checking for putwc in libutf8... $ECHO_C" >&6 15430 16460 if test "${cf_cv_libutf8+set}" = set; then 15431 16461 echo $ECHO_N "(cached) $ECHO_C" >&6 15432 @@ -6832,7 +695 4,7 @@16462 @@ -6832,7 +6959,7 @@ 15433 16463 cf_save_LIBS="$LIBS" 15434 16464 LIBS="-lutf8 $LIBS" 15435 16465 cat >conftest.$ac_ext <<_ACEOF 15436 16466 -#line 6835 "configure" 15437 +#line 69 57"configure"16467 +#line 6962 "configure" 15438 16468 #include "confdefs.h" 15439 16469 15440 16470 #include <libutf8.h> 15441 @@ -6845,16 +69 67,16 @@16471 @@ -6845,16 +6972,16 @@ 15442 16472 } 15443 16473 _ACEOF 15444 16474 rm -f conftest.$ac_objext conftest$ac_exeext 15445 16475 -if { (eval echo "$as_me:6848: \"$ac_link\"") >&5 15446 +if { (eval echo "$as_me:697 0: \"$ac_link\"") >&516476 +if { (eval echo "$as_me:6975: \"$ac_link\"") >&5 15447 16477 (eval $ac_link) 2>&5 15448 16478 ac_status=$? 15449 16479 - echo "$as_me:6851: \$? = $ac_status" >&5 15450 + echo "$as_me:697 3: \$? = $ac_status" >&516480 + echo "$as_me:6978: \$? = $ac_status" >&5 15451 16481 (exit $ac_status); } && 15452 16482 { ac_try='test -s conftest$ac_exeext' 15453 16483 - { (eval echo "$as_me:6854: \"$ac_try\"") >&5 15454 + { (eval echo "$as_me:69 76: \"$ac_try\"") >&516484 + { (eval echo "$as_me:6981: \"$ac_try\"") >&5 15455 16485 (eval $ac_try) 2>&5 15456 16486 ac_status=$? 15457 16487 - echo "$as_me:6857: \$? = $ac_status" >&5 15458 + echo "$as_me:69 79: \$? = $ac_status" >&516488 + echo "$as_me:6984: \$? = $ac_status" >&5 15459 16489 (exit $ac_status); }; }; then 15460 16490 cf_cv_libutf8=yes 15461 16491 else 15462 @@ -6866,7 +69 88,7 @@16492 @@ -6866,7 +6993,7 @@ 15463 16493 LIBS="$cf_save_LIBS" 15464 16494 15465 16495 fi 15466 16496 -echo "$as_me:6869: result: $cf_cv_libutf8" >&5 15467 +echo "$as_me:699 1: result: $cf_cv_libutf8" >&516497 +echo "$as_me:6996: result: $cf_cv_libutf8" >&5 15468 16498 echo "${ECHO_T}$cf_cv_libutf8" >&6 15469 16499 15470 16500 if test "$cf_cv_libutf8" = yes ; then 15471 @@ -6883,14 +70 05,14 @@16501 @@ -6883,14 +7010,14 @@ 15472 16502 fi 15473 16503 15474 16504 # This is needed on Tru64 5.0 to declare mbstate_t 15475 16505 -echo "$as_me:6886: checking if we must include wchar.h to declare mbstate_t" >&5 15476 +echo "$as_me:70 08: checking if we must include wchar.h to declare mbstate_t" >&516506 +echo "$as_me:7013: checking if we must include wchar.h to declare mbstate_t" >&5 15477 16507 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 15478 16508 if test "${cf_cv_mbstate_t+set}" = set; then … … 15482 16512 cat >conftest.$ac_ext <<_ACEOF 15483 16513 -#line 6893 "configure" 15484 +#line 70 15"configure"16514 +#line 7020 "configure" 15485 16515 #include "confdefs.h" 15486 16516 15487 16517 #include <stdlib.h> 15488 @@ -6908,23 +703 0,23 @@16518 @@ -6908,23 +7035,23 @@ 15489 16519 } 15490 16520 _ACEOF 15491 16521 rm -f conftest.$ac_objext 15492 16522 -if { (eval echo "$as_me:6911: \"$ac_compile\"") >&5 15493 +if { (eval echo "$as_me:703 3: \"$ac_compile\"") >&516523 +if { (eval echo "$as_me:7038: \"$ac_compile\"") >&5 15494 16524 (eval $ac_compile) 2>&5 15495 16525 ac_status=$? 15496 16526 - echo "$as_me:6914: \$? = $ac_status" >&5 15497 + echo "$as_me:70 36: \$? = $ac_status" >&516527 + echo "$as_me:7041: \$? = $ac_status" >&5 15498 16528 (exit $ac_status); } && 15499 16529 { ac_try='test -s conftest.$ac_objext' 15500 16530 - { (eval echo "$as_me:6917: \"$ac_try\"") >&5 15501 + { (eval echo "$as_me:70 39: \"$ac_try\"") >&516531 + { (eval echo "$as_me:7044: \"$ac_try\"") >&5 15502 16532 (eval $ac_try) 2>&5 15503 16533 ac_status=$? 15504 16534 - echo "$as_me:6920: \$? = $ac_status" >&5 15505 + echo "$as_me:704 2: \$? = $ac_status" >&516535 + echo "$as_me:7047: \$? = $ac_status" >&5 15506 16536 (exit $ac_status); }; }; then 15507 16537 cf_cv_mbstate_t=no … … 15511 16541 cat >conftest.$ac_ext <<_ACEOF 15512 16542 -#line 6927 "configure" 15513 +#line 70 49"configure"16543 +#line 7054 "configure" 15514 16544 #include "confdefs.h" 15515 16545 15516 16546 #include <stdlib.h> 15517 @@ -6943,16 +70 65,16 @@16547 @@ -6943,16 +7070,16 @@ 15518 16548 } 15519 16549 _ACEOF 15520 16550 rm -f conftest.$ac_objext 15521 16551 -if { (eval echo "$as_me:6946: \"$ac_compile\"") >&5 15522 +if { (eval echo "$as_me:70 68: \"$ac_compile\"") >&516552 +if { (eval echo "$as_me:7073: \"$ac_compile\"") >&5 15523 16553 (eval $ac_compile) 2>&5 15524 16554 ac_status=$? 15525 16555 - echo "$as_me:6949: \$? = $ac_status" >&5 15526 + echo "$as_me:707 1: \$? = $ac_status" >&516556 + echo "$as_me:7076: \$? = $ac_status" >&5 15527 16557 (exit $ac_status); } && 15528 16558 { ac_try='test -s conftest.$ac_objext' 15529 16559 - { (eval echo "$as_me:6952: \"$ac_try\"") >&5 15530 + { (eval echo "$as_me:707 4: \"$ac_try\"") >&516560 + { (eval echo "$as_me:7079: \"$ac_try\"") >&5 15531 16561 (eval $ac_try) 2>&5 15532 16562 ac_status=$? 15533 16563 - echo "$as_me:6955: \$? = $ac_status" >&5 15534 + echo "$as_me:70 77: \$? = $ac_status" >&516564 + echo "$as_me:7082: \$? = $ac_status" >&5 15535 16565 (exit $ac_status); }; }; then 15536 16566 cf_cv_mbstate_t=yes 15537 16567 else 15538 @@ -6964,7 +70 86,7 @@16568 @@ -6964,7 +7091,7 @@ 15539 16569 fi 15540 16570 rm -f conftest.$ac_objext conftest.$ac_ext 15541 16571 fi 15542 16572 -echo "$as_me:6967: result: $cf_cv_mbstate_t" >&5 15543 +echo "$as_me:70 89: result: $cf_cv_mbstate_t" >&516573 +echo "$as_me:7094: result: $cf_cv_mbstate_t" >&5 15544 16574 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 15545 16575 15546 16576 if test "$cf_cv_mbstate_t" = yes ; then 15547 @@ -6981,14 +710 3,14 @@16577 @@ -6981,14 +7108,14 @@ 15548 16578 fi 15549 16579 15550 16580 # This is needed on Tru64 5.0 to declare wchar_t 15551 16581 -echo "$as_me:6984: checking if we must include wchar.h to declare wchar_t" >&5 15552 +echo "$as_me:71 06: checking if we must include wchar.h to declare wchar_t" >&516582 +echo "$as_me:7111: checking if we must include wchar.h to declare wchar_t" >&5 15553 16583 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 15554 16584 if test "${cf_cv_wchar_t+set}" = set; then … … 15558 16588 cat >conftest.$ac_ext <<_ACEOF 15559 16589 -#line 6991 "configure" 15560 +#line 711 3"configure"16590 +#line 7118 "configure" 15561 16591 #include "confdefs.h" 15562 16592 15563 16593 #include <stdlib.h> 15564 @@ -7006,23 +71 28,23 @@16594 @@ -7006,23 +7133,23 @@ 15565 16595 } 15566 16596 _ACEOF 15567 16597 rm -f conftest.$ac_objext 15568 16598 -if { (eval echo "$as_me:7009: \"$ac_compile\"") >&5 15569 +if { (eval echo "$as_me:713 1: \"$ac_compile\"") >&516599 +if { (eval echo "$as_me:7136: \"$ac_compile\"") >&5 15570 16600 (eval $ac_compile) 2>&5 15571 16601 ac_status=$? 15572 16602 - echo "$as_me:7012: \$? = $ac_status" >&5 15573 + echo "$as_me:713 4: \$? = $ac_status" >&516603 + echo "$as_me:7139: \$? = $ac_status" >&5 15574 16604 (exit $ac_status); } && 15575 16605 { ac_try='test -s conftest.$ac_objext' 15576 16606 - { (eval echo "$as_me:7015: \"$ac_try\"") >&5 15577 + { (eval echo "$as_me:71 37: \"$ac_try\"") >&516607 + { (eval echo "$as_me:7142: \"$ac_try\"") >&5 15578 16608 (eval $ac_try) 2>&5 15579 16609 ac_status=$? 15580 16610 - echo "$as_me:7018: \$? = $ac_status" >&5 15581 + echo "$as_me:714 0: \$? = $ac_status" >&516611 + echo "$as_me:7145: \$? = $ac_status" >&5 15582 16612 (exit $ac_status); }; }; then 15583 16613 cf_cv_wchar_t=no … … 15587 16617 cat >conftest.$ac_ext <<_ACEOF 15588 16618 -#line 7025 "configure" 15589 +#line 71 47"configure"16619 +#line 7152 "configure" 15590 16620 #include "confdefs.h" 15591 16621 15592 16622 #include <stdlib.h> 15593 @@ -7041,16 +716 3,16 @@16623 @@ -7041,16 +7168,16 @@ 15594 16624 } 15595 16625 _ACEOF 15596 16626 rm -f conftest.$ac_objext 15597 16627 -if { (eval echo "$as_me:7044: \"$ac_compile\"") >&5 15598 +if { (eval echo "$as_me:71 66: \"$ac_compile\"") >&516628 +if { (eval echo "$as_me:7171: \"$ac_compile\"") >&5 15599 16629 (eval $ac_compile) 2>&5 15600 16630 ac_status=$? 15601 16631 - echo "$as_me:7047: \$? = $ac_status" >&5 15602 + echo "$as_me:71 69: \$? = $ac_status" >&516632 + echo "$as_me:7174: \$? = $ac_status" >&5 15603 16633 (exit $ac_status); } && 15604 16634 { ac_try='test -s conftest.$ac_objext' 15605 16635 - { (eval echo "$as_me:7050: \"$ac_try\"") >&5 15606 + { (eval echo "$as_me:717 2: \"$ac_try\"") >&516636 + { (eval echo "$as_me:7177: \"$ac_try\"") >&5 15607 16637 (eval $ac_try) 2>&5 15608 16638 ac_status=$? 15609 16639 - echo "$as_me:7053: \$? = $ac_status" >&5 15610 + echo "$as_me:71 75: \$? = $ac_status" >&516640 + echo "$as_me:7180: \$? = $ac_status" >&5 15611 16641 (exit $ac_status); }; }; then 15612 16642 cf_cv_wchar_t=yes 15613 16643 else 15614 @@ -7062,7 +718 4,7 @@16644 @@ -7062,7 +7189,7 @@ 15615 16645 fi 15616 16646 rm -f conftest.$ac_objext conftest.$ac_ext 15617 16647 fi 15618 16648 -echo "$as_me:7065: result: $cf_cv_wchar_t" >&5 15619 +echo "$as_me:71 87: result: $cf_cv_wchar_t" >&516649 +echo "$as_me:7192: result: $cf_cv_wchar_t" >&5 15620 16650 echo "${ECHO_T}$cf_cv_wchar_t" >&6 15621 16651 15622 16652 if test "$cf_cv_wchar_t" = yes ; then 15623 @@ -7084,14 +72 06,14 @@16653 @@ -7084,14 +7211,14 @@ 15624 16654 fi 15625 16655 15626 16656 # This is needed on Tru64 5.0 to declare wint_t 15627 16657 -echo "$as_me:7087: checking if we must include wchar.h to declare wint_t" >&5 15628 +echo "$as_me:72 09: checking if we must include wchar.h to declare wint_t" >&516658 +echo "$as_me:7214: checking if we must include wchar.h to declare wint_t" >&5 15629 16659 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 15630 16660 if test "${cf_cv_wint_t+set}" = set; then … … 15634 16664 cat >conftest.$ac_ext <<_ACEOF 15635 16665 -#line 7094 "configure" 15636 +#line 72 16"configure"16666 +#line 7221 "configure" 15637 16667 #include "confdefs.h" 15638 16668 15639 16669 #include <stdlib.h> 15640 @@ -7109,23 +723 1,23 @@16670 @@ -7109,23 +7236,23 @@ 15641 16671 } 15642 16672 _ACEOF 15643 16673 rm -f conftest.$ac_objext 15644 16674 -if { (eval echo "$as_me:7112: \"$ac_compile\"") >&5 15645 +if { (eval echo "$as_me:723 4: \"$ac_compile\"") >&516675 +if { (eval echo "$as_me:7239: \"$ac_compile\"") >&5 15646 16676 (eval $ac_compile) 2>&5 15647 16677 ac_status=$? 15648 16678 - echo "$as_me:7115: \$? = $ac_status" >&5 15649 + echo "$as_me:72 37: \$? = $ac_status" >&516679 + echo "$as_me:7242: \$? = $ac_status" >&5 15650 16680 (exit $ac_status); } && 15651 16681 { ac_try='test -s conftest.$ac_objext' 15652 16682 - { (eval echo "$as_me:7118: \"$ac_try\"") >&5 15653 + { (eval echo "$as_me:724 0: \"$ac_try\"") >&516683 + { (eval echo "$as_me:7245: \"$ac_try\"") >&5 15654 16684 (eval $ac_try) 2>&5 15655 16685 ac_status=$? 15656 16686 - echo "$as_me:7121: \$? = $ac_status" >&5 15657 + echo "$as_me:724 3: \$? = $ac_status" >&516687 + echo "$as_me:7248: \$? = $ac_status" >&5 15658 16688 (exit $ac_status); }; }; then 15659 16689 cf_cv_wint_t=no … … 15663 16693 cat >conftest.$ac_ext <<_ACEOF 15664 16694 -#line 7128 "configure" 15665 +#line 725 0"configure"16695 +#line 7255 "configure" 15666 16696 #include "confdefs.h" 15667 16697 15668 16698 #include <stdlib.h> 15669 @@ -7144,16 +72 66,16 @@16699 @@ -7144,16 +7271,16 @@ 15670 16700 } 15671 16701 _ACEOF 15672 16702 rm -f conftest.$ac_objext 15673 16703 -if { (eval echo "$as_me:7147: \"$ac_compile\"") >&5 15674 +if { (eval echo "$as_me:72 69: \"$ac_compile\"") >&516704 +if { (eval echo "$as_me:7274: \"$ac_compile\"") >&5 15675 16705 (eval $ac_compile) 2>&5 15676 16706 ac_status=$? 15677 16707 - echo "$as_me:7150: \$? = $ac_status" >&5 15678 + echo "$as_me:727 2: \$? = $ac_status" >&516708 + echo "$as_me:7277: \$? = $ac_status" >&5 15679 16709 (exit $ac_status); } && 15680 16710 { ac_try='test -s conftest.$ac_objext' 15681 16711 - { (eval echo "$as_me:7153: \"$ac_try\"") >&5 15682 + { (eval echo "$as_me:72 75: \"$ac_try\"") >&516712 + { (eval echo "$as_me:7280: \"$ac_try\"") >&5 15683 16713 (eval $ac_try) 2>&5 15684 16714 ac_status=$? 15685 16715 - echo "$as_me:7156: \$? = $ac_status" >&5 15686 + echo "$as_me:72 78: \$? = $ac_status" >&516716 + echo "$as_me:7283: \$? = $ac_status" >&5 15687 16717 (exit $ac_status); }; }; then 15688 16718 cf_cv_wint_t=yes 15689 16719 else 15690 @@ -7165,7 +72 87,7 @@16720 @@ -7165,7 +7292,7 @@ 15691 16721 fi 15692 16722 rm -f conftest.$ac_objext conftest.$ac_ext 15693 16723 fi 15694 16724 -echo "$as_me:7168: result: $cf_cv_wint_t" >&5 15695 +echo "$as_me:729 0: result: $cf_cv_wint_t" >&516725 +echo "$as_me:7295: result: $cf_cv_wint_t" >&5 15696 16726 echo "${ECHO_T}$cf_cv_wint_t" >&6 15697 16727 15698 16728 if test "$cf_cv_wint_t" = yes ; then 15699 @@ -7204,7 +73 26,7 @@16729 @@ -7204,7 +7331,7 @@ 15700 16730 ;; 15701 16731 esac 15702 16732 15703 16733 -echo "$as_me:7207: checking whether to enable _LP64 definition in curses.h" >&5 15704 +echo "$as_me:73 29: checking whether to enable _LP64 definition in curses.h" >&516734 +echo "$as_me:7334: checking whether to enable _LP64 definition in curses.h" >&5 15705 16735 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6 15706 16736 15707 16737 # Check whether --enable-lp64 or --disable-lp64 was given. 15708 @@ -7214,7 +73 36,7 @@16738 @@ -7214,7 +7341,7 @@ 15709 16739 else 15710 16740 with_lp64=$default_with_lp64 15711 16741 fi; 15712 16742 -echo "$as_me:7217: result: $with_lp64" >&5 15713 +echo "$as_me:73 39: result: $with_lp64" >&516743 +echo "$as_me:7344: result: $with_lp64" >&5 15714 16744 echo "${ECHO_T}$with_lp64" >&6 15715 16745 15716 16746 if test "$with_lp64" = yes ; then 15717 @@ -7230,7 +735 2,7 @@16747 @@ -7230,7 +7357,7 @@ 15718 16748 fi; 15719 16749 if test "$enable_largefile" != no; then 15720 16750 15721 16751 - echo "$as_me:7233: checking for special C compiler options needed for large files" >&5 15722 + echo "$as_me:73 55: checking for special C compiler options needed for large files" >&516752 + echo "$as_me:7360: checking for special C compiler options needed for large files" >&5 15723 16753 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 15724 16754 if test "${ac_cv_sys_largefile_CC+set}" = set; then 15725 16755 echo $ECHO_N "(cached) $ECHO_C" >&6 15726 @@ -7242,7 +736 4,7 @@16756 @@ -7242,7 +7369,7 @@ 15727 16757 # IRIX 6.2 and later do not support large files by default, 15728 16758 # so use the C compiler's -n32 option if that helps. 15729 16759 cat >conftest.$ac_ext <<_ACEOF 15730 16760 -#line 7245 "configure" 15731 +#line 73 67"configure"16761 +#line 7372 "configure" 15732 16762 #include "confdefs.h" 15733 16763 #include <sys/types.h> 15734 16764 /* Check that off_t can represent 2**63 - 1 correctly. 15735 @@ -7262,16 +738 4,16 @@16765 @@ -7262,16 +7389,16 @@ 15736 16766 } 15737 16767 _ACEOF 15738 16768 rm -f conftest.$ac_objext 15739 16769 -if { (eval echo "$as_me:7265: \"$ac_compile\"") >&5 15740 +if { (eval echo "$as_me:73 87: \"$ac_compile\"") >&516770 +if { (eval echo "$as_me:7392: \"$ac_compile\"") >&5 15741 16771 (eval $ac_compile) 2>&5 15742 16772 ac_status=$? 15743 16773 - echo "$as_me:7268: \$? = $ac_status" >&5 15744 + echo "$as_me:739 0: \$? = $ac_status" >&516774 + echo "$as_me:7395: \$? = $ac_status" >&5 15745 16775 (exit $ac_status); } && 15746 16776 { ac_try='test -s conftest.$ac_objext' 15747 16777 - { (eval echo "$as_me:7271: \"$ac_try\"") >&5 15748 + { (eval echo "$as_me:739 3: \"$ac_try\"") >&516778 + { (eval echo "$as_me:7398: \"$ac_try\"") >&5 15749 16779 (eval $ac_try) 2>&5 15750 16780 ac_status=$? 15751 16781 - echo "$as_me:7274: \$? = $ac_status" >&5 15752 + echo "$as_me:7 396: \$? = $ac_status" >&516782 + echo "$as_me:7401: \$? = $ac_status" >&5 15753 16783 (exit $ac_status); }; }; then 15754 16784 break 15755 16785 else 15756 @@ -7281,16 +740 3,16 @@16786 @@ -7281,16 +7408,16 @@ 15757 16787 rm -f conftest.$ac_objext 15758 16788 CC="$CC -n32" 15759 16789 rm -f conftest.$ac_objext 15760 16790 -if { (eval echo "$as_me:7284: \"$ac_compile\"") >&5 15761 +if { (eval echo "$as_me:74 06: \"$ac_compile\"") >&516791 +if { (eval echo "$as_me:7411: \"$ac_compile\"") >&5 15762 16792 (eval $ac_compile) 2>&5 15763 16793 ac_status=$? 15764 16794 - echo "$as_me:7287: \$? = $ac_status" >&5 15765 + echo "$as_me:74 09: \$? = $ac_status" >&516795 + echo "$as_me:7414: \$? = $ac_status" >&5 15766 16796 (exit $ac_status); } && 15767 16797 { ac_try='test -s conftest.$ac_objext' 15768 16798 - { (eval echo "$as_me:7290: \"$ac_try\"") >&5 15769 + { (eval echo "$as_me:741 2: \"$ac_try\"") >&516799 + { (eval echo "$as_me:7417: \"$ac_try\"") >&5 15770 16800 (eval $ac_try) 2>&5 15771 16801 ac_status=$? 15772 16802 - echo "$as_me:7293: \$? = $ac_status" >&5 15773 + echo "$as_me:74 15: \$? = $ac_status" >&516803 + echo "$as_me:7420: \$? = $ac_status" >&5 15774 16804 (exit $ac_status); }; }; then 15775 16805 ac_cv_sys_largefile_CC=' -n32'; break 15776 16806 else 15777 @@ -7304,13 +74 26,13 @@16807 @@ -7304,13 +7431,13 @@ 15778 16808 rm -f conftest.$ac_ext 15779 16809 fi 15780 16810 fi 15781 16811 -echo "$as_me:7307: result: $ac_cv_sys_largefile_CC" >&5 15782 +echo "$as_me:74 29: result: $ac_cv_sys_largefile_CC" >&516812 +echo "$as_me:7434: result: $ac_cv_sys_largefile_CC" >&5 15783 16813 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 15784 16814 if test "$ac_cv_sys_largefile_CC" != no; then … … 15787 16817 15788 16818 - echo "$as_me:7313: checking for _FILE_OFFSET_BITS value needed for large files" >&5 15789 + echo "$as_me:74 35: checking for _FILE_OFFSET_BITS value needed for large files" >&516819 + echo "$as_me:7440: checking for _FILE_OFFSET_BITS value needed for large files" >&5 15790 16820 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 15791 16821 if test "${ac_cv_sys_file_offset_bits+set}" = set; then 15792 16822 echo $ECHO_N "(cached) $ECHO_C" >&6 15793 @@ -7318,7 +744 0,7 @@16823 @@ -7318,7 +7445,7 @@ 15794 16824 while :; do 15795 16825 ac_cv_sys_file_offset_bits=no 15796 16826 cat >conftest.$ac_ext <<_ACEOF 15797 16827 -#line 7321 "configure" 15798 +#line 744 3"configure"16828 +#line 7448 "configure" 15799 16829 #include "confdefs.h" 15800 16830 #include <sys/types.h> 15801 16831 /* Check that off_t can represent 2**63 - 1 correctly. 15802 @@ -7338,16 +746 0,16 @@16832 @@ -7338,16 +7465,16 @@ 15803 16833 } 15804 16834 _ACEOF 15805 16835 rm -f conftest.$ac_objext 15806 16836 -if { (eval echo "$as_me:7341: \"$ac_compile\"") >&5 15807 +if { (eval echo "$as_me:746 3: \"$ac_compile\"") >&516837 +if { (eval echo "$as_me:7468: \"$ac_compile\"") >&5 15808 16838 (eval $ac_compile) 2>&5 15809 16839 ac_status=$? 15810 16840 - echo "$as_me:7344: \$? = $ac_status" >&5 15811 + echo "$as_me:74 66: \$? = $ac_status" >&516841 + echo "$as_me:7471: \$? = $ac_status" >&5 15812 16842 (exit $ac_status); } && 15813 16843 { ac_try='test -s conftest.$ac_objext' 15814 16844 - { (eval echo "$as_me:7347: \"$ac_try\"") >&5 15815 + { (eval echo "$as_me:74 69: \"$ac_try\"") >&516845 + { (eval echo "$as_me:7474: \"$ac_try\"") >&5 15816 16846 (eval $ac_try) 2>&5 15817 16847 ac_status=$? 15818 16848 - echo "$as_me:7350: \$? = $ac_status" >&5 15819 + echo "$as_me:747 2: \$? = $ac_status" >&516849 + echo "$as_me:7477: \$? = $ac_status" >&5 15820 16850 (exit $ac_status); }; }; then 15821 16851 break 15822 16852 else 15823 @@ -7356,7 +74 78,7 @@16853 @@ -7356,7 +7483,7 @@ 15824 16854 fi 15825 16855 rm -f conftest.$ac_objext conftest.$ac_ext 15826 16856 cat >conftest.$ac_ext <<_ACEOF 15827 16857 -#line 7359 "configure" 15828 +#line 748 1"configure"16858 +#line 7486 "configure" 15829 16859 #include "confdefs.h" 15830 16860 #define _FILE_OFFSET_BITS 64 15831 16861 #include <sys/types.h> 15832 @@ -7377,16 +7 499,16 @@16862 @@ -7377,16 +7504,16 @@ 15833 16863 } 15834 16864 _ACEOF 15835 16865 rm -f conftest.$ac_objext 15836 16866 -if { (eval echo "$as_me:7380: \"$ac_compile\"") >&5 15837 +if { (eval echo "$as_me:750 2: \"$ac_compile\"") >&516867 +if { (eval echo "$as_me:7507: \"$ac_compile\"") >&5 15838 16868 (eval $ac_compile) 2>&5 15839 16869 ac_status=$? 15840 16870 - echo "$as_me:7383: \$? = $ac_status" >&5 15841 + echo "$as_me:75 05: \$? = $ac_status" >&516871 + echo "$as_me:7510: \$? = $ac_status" >&5 15842 16872 (exit $ac_status); } && 15843 16873 { ac_try='test -s conftest.$ac_objext' 15844 16874 - { (eval echo "$as_me:7386: \"$ac_try\"") >&5 15845 + { (eval echo "$as_me:75 08: \"$ac_try\"") >&516875 + { (eval echo "$as_me:7513: \"$ac_try\"") >&5 15846 16876 (eval $ac_try) 2>&5 15847 16877 ac_status=$? 15848 16878 - echo "$as_me:7389: \$? = $ac_status" >&5 15849 + echo "$as_me:751 1: \$? = $ac_status" >&516879 + echo "$as_me:7516: \$? = $ac_status" >&5 15850 16880 (exit $ac_status); }; }; then 15851 16881 ac_cv_sys_file_offset_bits=64; break 15852 16882 else 15853 @@ -7397,7 +75 19,7 @@16883 @@ -7397,7 +7524,7 @@ 15854 16884 break 15855 16885 done 15856 16886 fi 15857 16887 -echo "$as_me:7400: result: $ac_cv_sys_file_offset_bits" >&5 15858 +echo "$as_me:752 2: result: $ac_cv_sys_file_offset_bits" >&516888 +echo "$as_me:7527: result: $ac_cv_sys_file_offset_bits" >&5 15859 16889 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 15860 16890 if test "$ac_cv_sys_file_offset_bits" != no; then 15861 16891 15862 @@ -7407,7 +75 29,7 @@16892 @@ -7407,7 +7534,7 @@ 15863 16893 15864 16894 fi 15865 16895 rm -f conftest* 15866 16896 - echo "$as_me:7410: checking for _LARGE_FILES value needed for large files" >&5 15867 + echo "$as_me:753 2: checking for _LARGE_FILES value needed for large files" >&516897 + echo "$as_me:7537: checking for _LARGE_FILES value needed for large files" >&5 15868 16898 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 15869 16899 if test "${ac_cv_sys_large_files+set}" = set; then 15870 16900 echo $ECHO_N "(cached) $ECHO_C" >&6 15871 @@ -7415,7 +75 37,7 @@16901 @@ -7415,7 +7542,7 @@ 15872 16902 while :; do 15873 16903 ac_cv_sys_large_files=no 15874 16904 cat >conftest.$ac_ext <<_ACEOF 15875 16905 -#line 7418 "configure" 15876 +#line 754 0"configure"16906 +#line 7545 "configure" 15877 16907 #include "confdefs.h" 15878 16908 #include <sys/types.h> 15879 16909 /* Check that off_t can represent 2**63 - 1 correctly. 15880 @@ -7435,16 +75 57,16 @@16910 @@ -7435,16 +7562,16 @@ 15881 16911 } 15882 16912 _ACEOF 15883 16913 rm -f conftest.$ac_objext 15884 16914 -if { (eval echo "$as_me:7438: \"$ac_compile\"") >&5 15885 +if { (eval echo "$as_me:756 0: \"$ac_compile\"") >&516915 +if { (eval echo "$as_me:7565: \"$ac_compile\"") >&5 15886 16916 (eval $ac_compile) 2>&5 15887 16917 ac_status=$? 15888 16918 - echo "$as_me:7441: \$? = $ac_status" >&5 15889 + echo "$as_me:756 3: \$? = $ac_status" >&516919 + echo "$as_me:7568: \$? = $ac_status" >&5 15890 16920 (exit $ac_status); } && 15891 16921 { ac_try='test -s conftest.$ac_objext' 15892 16922 - { (eval echo "$as_me:7444: \"$ac_try\"") >&5 15893 + { (eval echo "$as_me:75 66: \"$ac_try\"") >&516923 + { (eval echo "$as_me:7571: \"$ac_try\"") >&5 15894 16924 (eval $ac_try) 2>&5 15895 16925 ac_status=$? 15896 16926 - echo "$as_me:7447: \$? = $ac_status" >&5 15897 + echo "$as_me:75 69: \$? = $ac_status" >&516927 + echo "$as_me:7574: \$? = $ac_status" >&5 15898 16928 (exit $ac_status); }; }; then 15899 16929 break 15900 16930 else 15901 @@ -7453,7 +75 75,7 @@16931 @@ -7453,7 +7580,7 @@ 15902 16932 fi 15903 16933 rm -f conftest.$ac_objext conftest.$ac_ext 15904 16934 cat >conftest.$ac_ext <<_ACEOF 15905 16935 -#line 7456 "configure" 15906 +#line 75 78"configure"16936 +#line 7583 "configure" 15907 16937 #include "confdefs.h" 15908 16938 #define _LARGE_FILES 1 15909 16939 #include <sys/types.h> 15910 @@ -7474,16 +7 596,16 @@16940 @@ -7474,16 +7601,16 @@ 15911 16941 } 15912 16942 _ACEOF 15913 16943 rm -f conftest.$ac_objext 15914 16944 -if { (eval echo "$as_me:7477: \"$ac_compile\"") >&5 15915 +if { (eval echo "$as_me:7 599: \"$ac_compile\"") >&516945 +if { (eval echo "$as_me:7604: \"$ac_compile\"") >&5 15916 16946 (eval $ac_compile) 2>&5 15917 16947 ac_status=$? 15918 16948 - echo "$as_me:7480: \$? = $ac_status" >&5 15919 + echo "$as_me:760 2: \$? = $ac_status" >&516949 + echo "$as_me:7607: \$? = $ac_status" >&5 15920 16950 (exit $ac_status); } && 15921 16951 { ac_try='test -s conftest.$ac_objext' 15922 16952 - { (eval echo "$as_me:7483: \"$ac_try\"") >&5 15923 + { (eval echo "$as_me:76 05: \"$ac_try\"") >&516953 + { (eval echo "$as_me:7610: \"$ac_try\"") >&5 15924 16954 (eval $ac_try) 2>&5 15925 16955 ac_status=$? 15926 16956 - echo "$as_me:7486: \$? = $ac_status" >&5 15927 + echo "$as_me:76 08: \$? = $ac_status" >&516957 + echo "$as_me:7613: \$? = $ac_status" >&5 15928 16958 (exit $ac_status); }; }; then 15929 16959 ac_cv_sys_large_files=1; break 15930 16960 else 15931 @@ -7494,7 +76 16,7 @@16961 @@ -7494,7 +7621,7 @@ 15932 16962 break 15933 16963 done 15934 16964 fi 15935 16965 -echo "$as_me:7497: result: $ac_cv_sys_large_files" >&5 15936 +echo "$as_me:76 19: result: $ac_cv_sys_large_files" >&516966 +echo "$as_me:7624: result: $ac_cv_sys_large_files" >&5 15937 16967 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 15938 16968 if test "$ac_cv_sys_large_files" != no; then 15939 16969 15940 @@ -7507,7 +76 29,7 @@16970 @@ -7507,7 +7634,7 @@ 15941 16971 fi 15942 16972 15943 16973 if test "$enable_largefile" != no ; then 15944 16974 - echo "$as_me:7510: checking for _LARGEFILE_SOURCE value needed for large files" >&5 15945 + echo "$as_me:763 2: checking for _LARGEFILE_SOURCE value needed for large files" >&516975 + echo "$as_me:7637: checking for _LARGEFILE_SOURCE value needed for large files" >&5 15946 16976 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 15947 16977 if test "${ac_cv_sys_largefile_source+set}" = set; then 15948 16978 echo $ECHO_N "(cached) $ECHO_C" >&6 15949 @@ -7515,7 +76 37,7 @@16979 @@ -7515,7 +7642,7 @@ 15950 16980 while :; do 15951 16981 ac_cv_sys_largefile_source=no 15952 16982 cat >conftest.$ac_ext <<_ACEOF 15953 16983 -#line 7518 "configure" 15954 +#line 764 0"configure"16984 +#line 7645 "configure" 15955 16985 #include "confdefs.h" 15956 16986 #include <stdio.h> 15957 16987 int 15958 @@ -7527,16 +76 49,16 @@16988 @@ -7527,16 +7654,16 @@ 15959 16989 } 15960 16990 _ACEOF 15961 16991 rm -f conftest.$ac_objext 15962 16992 -if { (eval echo "$as_me:7530: \"$ac_compile\"") >&5 15963 +if { (eval echo "$as_me:765 2: \"$ac_compile\"") >&516993 +if { (eval echo "$as_me:7657: \"$ac_compile\"") >&5 15964 16994 (eval $ac_compile) 2>&5 15965 16995 ac_status=$? 15966 16996 - echo "$as_me:7533: \$? = $ac_status" >&5 15967 + echo "$as_me:76 55: \$? = $ac_status" >&516997 + echo "$as_me:7660: \$? = $ac_status" >&5 15968 16998 (exit $ac_status); } && 15969 16999 { ac_try='test -s conftest.$ac_objext' 15970 17000 - { (eval echo "$as_me:7536: \"$ac_try\"") >&5 15971 + { (eval echo "$as_me:76 58: \"$ac_try\"") >&517001 + { (eval echo "$as_me:7663: \"$ac_try\"") >&5 15972 17002 (eval $ac_try) 2>&5 15973 17003 ac_status=$? 15974 17004 - echo "$as_me:7539: \$? = $ac_status" >&5 15975 + echo "$as_me:766 1: \$? = $ac_status" >&517005 + echo "$as_me:7666: \$? = $ac_status" >&5 15976 17006 (exit $ac_status); }; }; then 15977 17007 break 15978 17008 else 15979 @@ -7545,7 +76 67,7 @@17009 @@ -7545,7 +7672,7 @@ 15980 17010 fi 15981 17011 rm -f conftest.$ac_objext conftest.$ac_ext 15982 17012 cat >conftest.$ac_ext <<_ACEOF 15983 17013 -#line 7548 "configure" 15984 +#line 767 0"configure"17014 +#line 7675 "configure" 15985 17015 #include "confdefs.h" 15986 17016 #define _LARGEFILE_SOURCE 1 15987 17017 #include <stdio.h> 15988 @@ -7558,16 +768 0,16 @@17018 @@ -7558,16 +7685,16 @@ 15989 17019 } 15990 17020 _ACEOF 15991 17021 rm -f conftest.$ac_objext 15992 17022 -if { (eval echo "$as_me:7561: \"$ac_compile\"") >&5 15993 +if { (eval echo "$as_me:768 3: \"$ac_compile\"") >&517023 +if { (eval echo "$as_me:7688: \"$ac_compile\"") >&5 15994 17024 (eval $ac_compile) 2>&5 15995 17025 ac_status=$? 15996 17026 - echo "$as_me:7564: \$? = $ac_status" >&5 15997 + echo "$as_me:76 86: \$? = $ac_status" >&517027 + echo "$as_me:7691: \$? = $ac_status" >&5 15998 17028 (exit $ac_status); } && 15999 17029 { ac_try='test -s conftest.$ac_objext' 16000 17030 - { (eval echo "$as_me:7567: \"$ac_try\"") >&5 16001 + { (eval echo "$as_me:76 89: \"$ac_try\"") >&517031 + { (eval echo "$as_me:7694: \"$ac_try\"") >&5 16002 17032 (eval $ac_try) 2>&5 16003 17033 ac_status=$? 16004 17034 - echo "$as_me:7570: \$? = $ac_status" >&5 16005 + echo "$as_me:769 2: \$? = $ac_status" >&517035 + echo "$as_me:7697: \$? = $ac_status" >&5 16006 17036 (exit $ac_status); }; }; then 16007 17037 ac_cv_sys_largefile_source=1; break 16008 17038 else 16009 @@ -7578,7 +770 0,7 @@17039 @@ -7578,7 +7705,7 @@ 16010 17040 break 16011 17041 done 16012 17042 fi 16013 17043 -echo "$as_me:7581: result: $ac_cv_sys_largefile_source" >&5 16014 +echo "$as_me:770 3: result: $ac_cv_sys_largefile_source" >&517044 +echo "$as_me:7708: result: $ac_cv_sys_largefile_source" >&5 16015 17045 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 16016 17046 if test "$ac_cv_sys_largefile_source" != no; then 16017 17047 16018 @@ -7592,13 +771 4,13 @@17048 @@ -7592,13 +7719,13 @@ 16019 17049 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug 16020 17050 # in glibc 2.1.3, but that breaks too many other things. 16021 17051 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. 16022 17052 -echo "$as_me:7595: checking for fseeko" >&5 16023 +echo "$as_me:77 17: checking for fseeko" >&517053 +echo "$as_me:7722: checking for fseeko" >&5 16024 17054 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 16025 17055 if test "${ac_cv_func_fseeko+set}" = set; then … … 16028 17058 cat >conftest.$ac_ext <<_ACEOF 16029 17059 -#line 7601 "configure" 16030 +#line 772 3"configure"17060 +#line 7728 "configure" 16031 17061 #include "confdefs.h" 16032 17062 #include <stdio.h> 16033 17063 int 16034 @@ -7610,16 +773 2,16 @@17064 @@ -7610,16 +7737,16 @@ 16035 17065 } 16036 17066 _ACEOF 16037 17067 rm -f conftest.$ac_objext conftest$ac_exeext 16038 17068 -if { (eval echo "$as_me:7613: \"$ac_link\"") >&5 16039 +if { (eval echo "$as_me:77 35: \"$ac_link\"") >&517069 +if { (eval echo "$as_me:7740: \"$ac_link\"") >&5 16040 17070 (eval $ac_link) 2>&5 16041 17071 ac_status=$? 16042 17072 - echo "$as_me:7616: \$? = $ac_status" >&5 16043 + echo "$as_me:77 38: \$? = $ac_status" >&517073 + echo "$as_me:7743: \$? = $ac_status" >&5 16044 17074 (exit $ac_status); } && 16045 17075 { ac_try='test -s conftest$ac_exeext' 16046 17076 - { (eval echo "$as_me:7619: \"$ac_try\"") >&5 16047 + { (eval echo "$as_me:774 1: \"$ac_try\"") >&517077 + { (eval echo "$as_me:7746: \"$ac_try\"") >&5 16048 17078 (eval $ac_try) 2>&5 16049 17079 ac_status=$? 16050 17080 - echo "$as_me:7622: \$? = $ac_status" >&5 16051 + echo "$as_me:774 4: \$? = $ac_status" >&517081 + echo "$as_me:7749: \$? = $ac_status" >&5 16052 17082 (exit $ac_status); }; }; then 16053 17083 ac_cv_func_fseeko=yes 16054 17084 else 16055 @@ -7629,7 +775 1,7 @@17085 @@ -7629,7 +7756,7 @@ 16056 17086 fi 16057 17087 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 16058 17088 fi 16059 17089 -echo "$as_me:7632: result: $ac_cv_func_fseeko" >&5 16060 +echo "$as_me:775 4: result: $ac_cv_func_fseeko" >&517090 +echo "$as_me:7759: result: $ac_cv_func_fseeko" >&5 16061 17091 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 16062 17092 if test $ac_cv_func_fseeko = yes; then 16063 17093 16064 @@ -7648,15 +777 0,16 @@17094 @@ -7648,15 +7775,16 @@ 16065 17095 # the config.h 16066 17096 test "$ac_cv_sys_large_files" != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES " … … 16069 17099 16070 17100 - echo "$as_me:7652: checking whether to use struct dirent64" >&5 16071 + echo "$as_me:77 75: checking whether to use struct dirent64" >&517101 + echo "$as_me:7780: checking whether to use struct dirent64" >&5 16072 17102 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 16073 17103 if test "${cf_cv_struct_dirent64+set}" = set; then … … 16077 17107 cat >conftest.$ac_ext <<_ACEOF 16078 17108 -#line 7659 "configure" 16079 +#line 778 2"configure"17109 +#line 7787 "configure" 16080 17110 #include "confdefs.h" 16081 17111 16082 17112 #include <sys/types.h> 16083 @@ -7677,16 +780 0,16 @@17113 @@ -7677,16 +7805,16 @@ 16084 17114 } 16085 17115 _ACEOF 16086 17116 rm -f conftest.$ac_objext 16087 17117 -if { (eval echo "$as_me:7680: \"$ac_compile\"") >&5 16088 +if { (eval echo "$as_me:780 3: \"$ac_compile\"") >&517118 +if { (eval echo "$as_me:7808: \"$ac_compile\"") >&5 16089 17119 (eval $ac_compile) 2>&5 16090 17120 ac_status=$? 16091 17121 - echo "$as_me:7683: \$? = $ac_status" >&5 16092 + echo "$as_me:78 06: \$? = $ac_status" >&517122 + echo "$as_me:7811: \$? = $ac_status" >&5 16093 17123 (exit $ac_status); } && 16094 17124 { ac_try='test -s conftest.$ac_objext' 16095 17125 - { (eval echo "$as_me:7686: \"$ac_try\"") >&5 16096 + { (eval echo "$as_me:78 09: \"$ac_try\"") >&517126 + { (eval echo "$as_me:7814: \"$ac_try\"") >&5 16097 17127 (eval $ac_try) 2>&5 16098 17128 ac_status=$? 16099 17129 - echo "$as_me:7689: \$? = $ac_status" >&5 16100 + echo "$as_me:781 2: \$? = $ac_status" >&517130 + echo "$as_me:7817: \$? = $ac_status" >&5 16101 17131 (exit $ac_status); }; }; then 16102 17132 cf_cv_struct_dirent64=yes 16103 17133 else 16104 @@ -7697,7 +782 0,7 @@17134 @@ -7697,7 +7825,7 @@ 16105 17135 rm -f conftest.$ac_objext conftest.$ac_ext 16106 17136 16107 17137 fi 16108 17138 -echo "$as_me:7700: result: $cf_cv_struct_dirent64" >&5 16109 +echo "$as_me:782 3: result: $cf_cv_struct_dirent64" >&517139 +echo "$as_me:7828: result: $cf_cv_struct_dirent64" >&5 16110 17140 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 16111 17141 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF 16112 17142 #define HAVE_STRUCT_DIRENT64 1 16113 @@ -7706,7 +78 29,7 @@17143 @@ -7706,7 +7834,7 @@ 16114 17144 fi 16115 17145 16116 17146 ### use option --disable-tparm-varargs to make tparm() conform to X/Open 16117 17147 -echo "$as_me:7709: checking if you want tparm not to use X/Open fixed-parameter list" >&5 16118 +echo "$as_me:783 2: checking if you want tparm not to use X/Open fixed-parameter list" >&517148 +echo "$as_me:7837: checking if you want tparm not to use X/Open fixed-parameter list" >&5 16119 17149 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6 16120 17150 16121 17151 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given. 16122 @@ -7716,13 +78 39,13 @@17152 @@ -7716,13 +7844,13 @@ 16123 17153 else 16124 17154 with_tparm_varargs=yes 16125 17155 fi; 16126 17156 -echo "$as_me:7719: result: $with_tparm_varargs" >&5 16127 +echo "$as_me:784 2: result: $with_tparm_varargs" >&517157 +echo "$as_me:7847: result: $with_tparm_varargs" >&5 16128 17158 echo "${ECHO_T}$with_tparm_varargs" >&6 16129 17159 NCURSES_TPARM_VARARGS=0 … … 16132 17162 ### use option --with-bool to override bool's type 16133 17163 -echo "$as_me:7725: checking for type of bool" >&5 16134 +echo "$as_me:78 48: checking for type of bool" >&517164 +echo "$as_me:7853: checking for type of bool" >&5 16135 17165 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 16136 17166 16137 17167 # Check whether --with-bool or --without-bool was given. 16138 @@ -7732,10 +78 55,10 @@17168 @@ -7732,10 +7860,10 @@ 16139 17169 else 16140 17170 NCURSES_BOOL=auto 16141 17171 fi; 16142 17172 -echo "$as_me:7735: result: $NCURSES_BOOL" >&5 16143 +echo "$as_me:78 58: result: $NCURSES_BOOL" >&517173 +echo "$as_me:7863: result: $NCURSES_BOOL" >&5 16144 17174 echo "${ECHO_T}$NCURSES_BOOL" >&6 16145 17175 16146 17176 -echo "$as_me:7738: checking for alternate terminal capabilities file" >&5 16147 +echo "$as_me:786 1: checking for alternate terminal capabilities file" >&517177 +echo "$as_me:7866: checking for alternate terminal capabilities file" >&5 16148 17178 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6 16149 17179 16150 17180 # Check whether --with-caps or --without-caps was given. 16151 @@ -7746,11 +78 69,11 @@17181 @@ -7746,11 +7874,11 @@ 16152 17182 TERMINFO_CAPS=Caps 16153 17183 fi; 16154 17184 test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps 16155 17185 -echo "$as_me:7749: result: $TERMINFO_CAPS" >&5 16156 +echo "$as_me:787 2: result: $TERMINFO_CAPS" >&517186 +echo "$as_me:7877: result: $TERMINFO_CAPS" >&5 16157 17187 echo "${ECHO_T}$TERMINFO_CAPS" >&6 16158 17188 16159 17189 ### use option --with-chtype to override chtype's type 16160 17190 -echo "$as_me:7753: checking for type of chtype" >&5 16161 +echo "$as_me:78 76: checking for type of chtype" >&517191 +echo "$as_me:7881: checking for type of chtype" >&5 16162 17192 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 16163 17193 16164 17194 # Check whether --with-chtype or --without-chtype was given. 16165 @@ -7760,11 +788 3,11 @@17195 @@ -7760,11 +7888,11 @@ 16166 17196 else 16167 17197 NCURSES_CHTYPE=auto 16168 17198 fi; 16169 17199 -echo "$as_me:7763: result: $NCURSES_CHTYPE" >&5 16170 +echo "$as_me:78 86: result: $NCURSES_CHTYPE" >&517200 +echo "$as_me:7891: result: $NCURSES_CHTYPE" >&5 16171 17201 echo "${ECHO_T}$NCURSES_CHTYPE" >&6 16172 17202 16173 17203 ### use option --with-ospeed to override ospeed's type 16174 17204 -echo "$as_me:7767: checking for type of ospeed" >&5 16175 +echo "$as_me:789 0: checking for type of ospeed" >&517205 +echo "$as_me:7895: checking for type of ospeed" >&5 16176 17206 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6 16177 17207 16178 17208 # Check whether --with-ospeed or --without-ospeed was given. 16179 @@ -7774,11 +7 897,11 @@17209 @@ -7774,11 +7902,11 @@ 16180 17210 else 16181 17211 NCURSES_OSPEED=short 16182 17212 fi; 16183 17213 -echo "$as_me:7777: result: $NCURSES_OSPEED" >&5 16184 +echo "$as_me:790 0: result: $NCURSES_OSPEED" >&517214 +echo "$as_me:7905: result: $NCURSES_OSPEED" >&5 16185 17215 echo "${ECHO_T}$NCURSES_OSPEED" >&6 16186 17216 16187 17217 ### use option --with-mmask-t to override mmask_t's type 16188 17218 -echo "$as_me:7781: checking for type of mmask_t" >&5 16189 +echo "$as_me:790 4: checking for type of mmask_t" >&517219 +echo "$as_me:7909: checking for type of mmask_t" >&5 16190 17220 echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6 16191 17221 16192 17222 # Check whether --with-mmask-t or --without-mmask-t was given. 16193 @@ -7788,11 +791 1,11 @@17223 @@ -7788,11 +7916,11 @@ 16194 17224 else 16195 17225 NCURSES_MMASK_T=auto 16196 17226 fi; 16197 17227 -echo "$as_me:7791: result: $NCURSES_MMASK_T" >&5 16198 +echo "$as_me:791 4: result: $NCURSES_MMASK_T" >&517228 +echo "$as_me:7919: result: $NCURSES_MMASK_T" >&5 16199 17229 echo "${ECHO_T}$NCURSES_MMASK_T" >&6 16200 17230 16201 17231 ### Enable compiling-in rcs id's 16202 17232 -echo "$as_me:7795: checking if RCS identifiers should be compiled-in" >&5 16203 +echo "$as_me:79 18: checking if RCS identifiers should be compiled-in" >&517233 +echo "$as_me:7923: checking if RCS identifiers should be compiled-in" >&5 16204 17234 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 16205 17235 16206 17236 # Check whether --with-rcs-ids or --without-rcs-ids was given. 16207 @@ -7802,7 +79 25,7 @@17237 @@ -7802,7 +7930,7 @@ 16208 17238 else 16209 17239 with_rcs_ids=no 16210 17240 fi; 16211 17241 -echo "$as_me:7805: result: $with_rcs_ids" >&5 16212 +echo "$as_me:79 28: result: $with_rcs_ids" >&517242 +echo "$as_me:7933: result: $with_rcs_ids" >&5 16213 17243 echo "${ECHO_T}$with_rcs_ids" >&6 16214 17244 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF 16215 17245 #define USE_RCS_IDS 1 16216 @@ -7810,7 +793 3,7 @@17246 @@ -7810,7 +7938,7 @@ 16217 17247 16218 17248 ############################################################################### 16219 17249 16220 17250 -echo "$as_me:7813: checking format of man-pages" >&5 16221 +echo "$as_me:79 36: checking format of man-pages" >&517251 +echo "$as_me:7941: checking format of man-pages" >&5 16222 17252 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 16223 17253 16224 17254 # Check whether --with-manpage-format or --without-manpage-format was given. 16225 @@ -7899,14 +802 2,14 @@17255 @@ -7899,14 +8027,14 @@ 16226 17256 ;; 16227 17257 esac 16228 17258 16229 17259 -echo "$as_me:7902: result: $MANPAGE_FORMAT" >&5 16230 +echo "$as_me:80 25: result: $MANPAGE_FORMAT" >&517260 +echo "$as_me:8030: result: $MANPAGE_FORMAT" >&5 16231 17261 echo "${ECHO_T}$MANPAGE_FORMAT" >&6 16232 17262 if test -n "$cf_unknown" ; then 16233 17263 - { echo "$as_me:7905: WARNING: Unexpected manpage-format $cf_unknown" >&5 16234 + { echo "$as_me:80 28: WARNING: Unexpected manpage-format $cf_unknown" >&517264 + { echo "$as_me:8033: WARNING: Unexpected manpage-format $cf_unknown" >&5 16235 17265 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} 16236 17266 fi 16237 17267 16238 17268 -echo "$as_me:7909: checking for manpage renaming" >&5 16239 +echo "$as_me:803 2: checking for manpage renaming" >&517269 +echo "$as_me:8037: checking for manpage renaming" >&5 16240 17270 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 16241 17271 16242 17272 # Check whether --with-manpage-renames or --without-manpage-renames was given. 16243 @@ -7934,7 +80 57,7 @@17273 @@ -7934,7 +8062,7 @@ 16244 17274 if test -f $srcdir/man/$MANPAGE_RENAMES ; then 16245 17275 MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES 16246 17276 elif test ! -f $MANPAGE_RENAMES ; then 16247 17277 - { { echo "$as_me:7937: error: not a filename: $MANPAGE_RENAMES" >&5 16248 + { { echo "$as_me:806 0: error: not a filename: $MANPAGE_RENAMES" >&517278 + { { echo "$as_me:8065: error: not a filename: $MANPAGE_RENAMES" >&5 16249 17279 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} 16250 17280 { (exit 1); exit 1; }; } 16251 17281 fi 16252 @@ -7948,10 +807 1,10 @@17282 @@ -7948,10 +8076,10 @@ 16253 17283 fi 16254 17284 fi 16255 17285 16256 17286 -echo "$as_me:7951: result: $MANPAGE_RENAMES" >&5 16257 +echo "$as_me:807 4: result: $MANPAGE_RENAMES" >&517287 +echo "$as_me:8079: result: $MANPAGE_RENAMES" >&5 16258 17288 echo "${ECHO_T}$MANPAGE_RENAMES" >&6 16259 17289 16260 17290 -echo "$as_me:7954: checking if manpage aliases will be installed" >&5 16261 +echo "$as_me:80 77: checking if manpage aliases will be installed" >&517291 +echo "$as_me:8082: checking if manpage aliases will be installed" >&5 16262 17292 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 16263 17293 16264 17294 # Check whether --with-manpage-aliases or --without-manpage-aliases was given. 16265 @@ -7962,7 +80 85,7 @@17295 @@ -7962,7 +8090,7 @@ 16266 17296 MANPAGE_ALIASES=yes 16267 17297 fi; 16268 17298 16269 17299 -echo "$as_me:7965: result: $MANPAGE_ALIASES" >&5 16270 +echo "$as_me:80 88: result: $MANPAGE_ALIASES" >&517300 +echo "$as_me:8093: result: $MANPAGE_ALIASES" >&5 16271 17301 echo "${ECHO_T}$MANPAGE_ALIASES" >&6 16272 17302 16273 17303 if test "$LN_S" = "ln -s"; then 16274 @@ -7973,7 +8 096,7 @@17304 @@ -7973,7 +8101,7 @@ 16275 17305 16276 17306 MANPAGE_SYMLINKS=no 16277 17307 if test "$MANPAGE_ALIASES" = yes ; then 16278 17308 -echo "$as_me:7976: checking if manpage symlinks should be used" >&5 16279 +echo "$as_me:8 099: checking if manpage symlinks should be used" >&517309 +echo "$as_me:8104: checking if manpage symlinks should be used" >&5 16280 17310 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6 16281 17311 16282 17312 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given. 16283 @@ -7986,17 +81 09,17 @@17313 @@ -7986,17 +8114,17 @@ 16284 17314 16285 17315 if test "$$cf_use_symlinks" = no; then 16286 17316 if test "$MANPAGE_SYMLINKS" = yes ; then 16287 17317 - { echo "$as_me:7989: WARNING: cannot make symlinks" >&5 16288 + { echo "$as_me:811 2: WARNING: cannot make symlinks" >&517318 + { echo "$as_me:8117: WARNING: cannot make symlinks" >&5 16289 17319 echo "$as_me: WARNING: cannot make symlinks" >&2;} 16290 17320 MANPAGE_SYMLINKS=no … … 16293 17323 16294 17324 -echo "$as_me:7995: result: $MANPAGE_SYMLINKS" >&5 16295 +echo "$as_me:81 18: result: $MANPAGE_SYMLINKS" >&517325 +echo "$as_me:8123: result: $MANPAGE_SYMLINKS" >&5 16296 17326 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 16297 17327 fi 16298 17328 16299 17329 -echo "$as_me:7999: checking for manpage tbl" >&5 16300 +echo "$as_me:812 2: checking for manpage tbl" >&517330 +echo "$as_me:8127: checking for manpage tbl" >&5 16301 17331 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6 16302 17332 16303 17333 # Check whether --with-manpage-tbl or --without-manpage-tbl was given. 16304 @@ -8007,7 +813 0,7 @@17334 @@ -8007,7 +8135,7 @@ 16305 17335 MANPAGE_TBL=no 16306 17336 fi; 16307 17337 16308 17338 -echo "$as_me:8010: result: $MANPAGE_TBL" >&5 16309 +echo "$as_me:813 3: result: $MANPAGE_TBL" >&517339 +echo "$as_me:8138: result: $MANPAGE_TBL" >&5 16310 17340 echo "${ECHO_T}$MANPAGE_TBL" >&6 16311 17341 16312 17342 if test "$prefix" = "NONE" ; then 16313 @@ -8047,6 +817 0,7 @@17343 @@ -8047,6 +8175,7 @@ 16314 17344 esac 16315 17345 … … 16319 17349 cat >$cf_edit_man <<CF_EOF 16320 17350 #! /bin/sh 16321 @@ -8062,7 +81 86,7 @@17351 @@ -8062,7 +8191,7 @@ 16322 17352 NCURSES_OSPEED="$NCURSES_OSPEED" 16323 17353 TERMINFO="$TERMINFO" … … 16328 17358 INSTALL="$INSTALL" 16329 17359 INSTALL_DATA="$INSTALL_DATA" 16330 @@ -8110, 8 +8234,34@@17360 @@ -8110,6 +8239,32 @@ 16331 17361 \$MKDIRS \$cf_subdir\$section 16332 17362 fi 16333 17363 fi 16334 - aliases=16335 - cf_source=\`basename \$i\`16336 17364 + 16337 17365 + # replace variables in man page … … 16360 17388 + fi 16361 17389 + 16362 +aliases=16363 +cf_source=\`basename \$i\`17390 aliases= 17391 cf_source=\`basename \$i\` 16364 17392 inalias=\$cf_source 16365 test ! -f \$inalias && inalias="\$srcdir/\$inalias" 16366 if test ! -f \$inalias ; then 16367 @@ -8122,7 +8272,7 @@ 17393 @@ -8122,7 +8277,7 @@ 16368 17394 16369 17395 if test "$MANPAGE_ALIASES" != no ; then … … 16374 17400 fi 16375 17401 16376 @@ -8143,34 +829 3,13 @@17402 @@ -8143,34 +8298,13 @@ 16377 17403 cf_target="\$cf_source" 16378 17404 fi … … 16382 17408 - 16383 17409 - # replace variables in man page 16384 17410 - 16385 17411 - for cf_name in captoinfo clear infocmp infotocap tic toe tput 16386 17412 - do … … 16389 17415 -CF_EOF 16390 17416 - done 16391 - 17417 16392 17418 -cat >>$cf_edit_man <<CF_EOF 16393 17419 - sed -e "s,@DATADIR@,\$datadir," \\ … … 16411 17437 if test -f $MANPAGE_RENAMES ; then 16412 17438 cat >>$cf_edit_man <<CF_EOF 16413 @@ -8231,6 +836 0,7 @@17439 @@ -8231,6 +8365,7 @@ 16414 17440 if test \$verb = installing ; then 16415 17441 echo \$verb \$cf_target … … 16419 17445 cd \$cf_subdir\${section} && ( 16420 17446 cf_source=\`echo \$cf_target |sed -e 's%^.*/\([^/][^/]*/[^/][^/]*$\)%\1%'\` 16421 @@ -8272,8 +840 2,11 @@17447 @@ -8272,8 +8407,11 @@ 16422 17448 ) 16423 17449 ) … … 16433 17459 cd \$cf_subdir\${section} && ( 16434 17460 for cf_alias in \$aliases 16435 @@ -8308,7 +844 1,7 @@17461 @@ -8308,7 +8446,7 @@ 16436 17462 ############################################################################### 16437 17463 16438 17464 ### Note that some functions (such as const) are normally disabled anyway. 16439 17465 -echo "$as_me:8311: checking if you want to build with function extensions" >&5 16440 +echo "$as_me:844 4: checking if you want to build with function extensions" >&517466 +echo "$as_me:8449: checking if you want to build with function extensions" >&5 16441 17467 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 16442 17468 16443 17469 # Check whether --enable-ext-funcs or --disable-ext-funcs was given. 16444 @@ -8318,7 +845 1,7 @@17470 @@ -8318,7 +8456,7 @@ 16445 17471 else 16446 17472 with_ext_funcs=yes 16447 17473 fi; 16448 17474 -echo "$as_me:8321: result: $with_ext_funcs" >&5 16449 +echo "$as_me:845 4: result: $with_ext_funcs" >&517475 +echo "$as_me:8459: result: $with_ext_funcs" >&5 16450 17476 echo "${ECHO_T}$with_ext_funcs" >&6 16451 17477 if test "$with_ext_funcs" = yes ; then 16452 17478 NCURSES_EXT_FUNCS=1 16453 @@ -8355,7 +84 88,7 @@17479 @@ -8355,7 +8493,7 @@ 16454 17480 fi 16455 17481 16456 17482 ### use option --enable-const to turn on use of const beyond that in XSI. 16457 17483 -echo "$as_me:8358: checking for extended use of const keyword" >&5 16458 +echo "$as_me:849 1: checking for extended use of const keyword" >&517484 +echo "$as_me:8496: checking for extended use of const keyword" >&5 16459 17485 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 16460 17486 16461 17487 # Check whether --enable-const or --disable-const was given. 16462 @@ -8365,14 +8 498,14@@17488 @@ -8365,14 +8503,85 @@ 16463 17489 else 16464 17490 with_ext_const=no 16465 17491 fi; 16466 17492 -echo "$as_me:8368: result: $with_ext_const" >&5 16467 +echo "$as_me:850 1: result: $with_ext_const" >&517493 +echo "$as_me:8506: result: $with_ext_const" >&5 16468 17494 echo "${ECHO_T}$with_ext_const" >&6 16469 17495 NCURSES_CONST='/*nothing*/' … … 16473 17499 16474 17500 -echo "$as_me:8375: checking if you want \$NCURSES_NO_PADDING code" >&5 16475 +echo "$as_me:8508: checking if you want \$NCURSES_NO_PADDING code" >&5 17501 +### use option --enable-ext-colors to turn on use of colors beyond 16. 17502 +echo "$as_me:8514: checking if you want to use extended colors" >&5 17503 +echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 17504 + 17505 +# Check whether --enable-ext-colors or --disable-ext-colors was given. 17506 +if test "${enable_ext_colors+set}" = set; then 17507 + enableval="$enable_ext_colors" 17508 + with_ext_colors=$enableval 17509 +else 17510 + with_ext_colors=no 17511 +fi; 17512 +echo "$as_me:8524: result: $with_ext_colors" >&5 17513 +echo "${ECHO_T}$with_ext_colors" >&6 17514 +NCURSES_EXT_COLORS=0 17515 +if test "$with_ext_colors" = yes ; then 17516 + if test "$with_widec" != yes ; then 17517 + { { echo "$as_me:8529: error: This option applies only to wide-character library" >&5 17518 +echo "$as_me: error: This option applies only to wide-character library" >&2;} 17519 + { (exit 1); exit 1; }; } 17520 + else 17521 + # cannot be ABI 5 since it changes sizeof(cchar_t) 17522 + 17523 +if test "${with_abi_version+set}" != set; then 17524 + case $cf_cv_rel_version in 17525 + 5.*) 17526 + cf_cv_rel_version=6.0 17527 + cf_cv_abi_version=6 17528 + { echo "$as_me:8540: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 17529 +echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 17530 + ;; 17531 + esac 17532 +fi 17533 + 17534 + fi 17535 + NCURSES_EXT_COLORS=1 17536 + cat >>confdefs.h <<\EOF 17537 +#define NCURSES_EXT_COLORS 1 17538 +EOF 17539 + 17540 +fi 17541 + 17542 +### use option --enable-ext-mouse to modify coding to support 5-button mice 17543 +echo "$as_me:8555: checking if you want to use extended mouse encoding" >&5 17544 +echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 17545 + 17546 +# Check whether --enable-ext-mouse or --disable-ext-mouse was given. 17547 +if test "${enable_ext_mouse+set}" = set; then 17548 + enableval="$enable_ext_mouse" 17549 + with_ext_mouse=$enableval 17550 +else 17551 + with_ext_mouse=no 17552 +fi; 17553 +echo "$as_me:8565: result: $with_ext_mouse" >&5 17554 +echo "${ECHO_T}$with_ext_mouse" >&6 17555 +NCURSES_MOUSE_VERSION=1 17556 +if test "$with_ext_mouse" = yes ; then 17557 + NCURSES_MOUSE_VERSION=2 17558 + 17559 +if test "${with_abi_version+set}" != set; then 17560 + case $cf_cv_rel_version in 17561 + 5.*) 17562 + cf_cv_rel_version=6.0 17563 + cf_cv_abi_version=6 17564 + { echo "$as_me:8576: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 17565 +echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 17566 + ;; 17567 + esac 17568 +fi 17569 + 17570 +fi 17571 + 17572 +echo "$as_me:8584: checking if you want \$NCURSES_NO_PADDING code" >&5 16476 17573 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 16477 17574 16478 17575 # Check whether --enable-no-padding or --disable-no-padding was given. 16479 @@ -8382,19 +85 15,19 @@17576 @@ -8382,19 +8591,19 @@ 16480 17577 else 16481 17578 with_no_padding=$with_ext_funcs 16482 17579 fi; 16483 17580 -echo "$as_me:8385: result: $with_no_padding" >&5 16484 +echo "$as_me:85 18: result: $with_no_padding" >&517581 +echo "$as_me:8594: result: $with_no_padding" >&5 16485 17582 echo "${ECHO_T}$with_no_padding" >&6 16486 17583 test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF … … 16489 17586 16490 17587 -echo "$as_me:8391: checking for ANSI C header files" >&5 16491 +echo "$as_me:8 524: checking for ANSI C header files" >&517588 +echo "$as_me:8600: checking for ANSI C header files" >&5 16492 17589 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 16493 17590 if test "${ac_cv_header_stdc+set}" = set; then … … 16496 17593 cat >conftest.$ac_ext <<_ACEOF 16497 17594 -#line 8397 "configure" 16498 +#line 8 530"configure"17595 +#line 8606 "configure" 16499 17596 #include "confdefs.h" 16500 17597 #include <stdlib.h> 16501 17598 #include <stdarg.h> 16502 @@ -8402,13 +8 535,13 @@17599 @@ -8402,13 +8611,13 @@ 16503 17600 #include <float.h> 16504 17601 16505 17602 _ACEOF 16506 17603 -if { (eval echo "$as_me:8405: \"$ac_cpp conftest.$ac_ext\"") >&5 16507 +if { (eval echo "$as_me:8 538: \"$ac_cpp conftest.$ac_ext\"") >&517604 +if { (eval echo "$as_me:8614: \"$ac_cpp conftest.$ac_ext\"") >&5 16508 17605 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 16509 17606 ac_status=$? … … 16512 17609 cat conftest.err >&5 16513 17610 - echo "$as_me:8411: \$? = $ac_status" >&5 16514 + echo "$as_me:8 544: \$? = $ac_status" >&517611 + echo "$as_me:8620: \$? = $ac_status" >&5 16515 17612 (exit $ac_status); } >/dev/null; then 16516 17613 if test -s conftest.err; then 16517 17614 ac_cpp_err=$ac_c_preproc_warn_flag 16518 @@ -8430,7 +8 563,7 @@17615 @@ -8430,7 +8639,7 @@ 16519 17616 if test $ac_cv_header_stdc = yes; then 16520 17617 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 16521 17618 cat >conftest.$ac_ext <<_ACEOF 16522 17619 -#line 8433 "configure" 16523 +#line 8 566"configure"17620 +#line 8642 "configure" 16524 17621 #include "confdefs.h" 16525 17622 #include <string.h> 16526 17623 16527 @@ -8448,7 +8 581,7 @@17624 @@ -8448,7 +8657,7 @@ 16528 17625 if test $ac_cv_header_stdc = yes; then 16529 17626 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 16530 17627 cat >conftest.$ac_ext <<_ACEOF 16531 17628 -#line 8451 "configure" 16532 +#line 8 584"configure"17629 +#line 8660 "configure" 16533 17630 #include "confdefs.h" 16534 17631 #include <stdlib.h> 16535 17632 16536 @@ -8469,7 +86 02,7 @@17633 @@ -8469,7 +8678,7 @@ 16537 17634 : 16538 17635 else 16539 17636 cat >conftest.$ac_ext <<_ACEOF 16540 17637 -#line 8472 "configure" 16541 +#line 86 05"configure"17638 +#line 8681 "configure" 16542 17639 #include "confdefs.h" 16543 17640 #include <ctype.h> 16544 17641 #if ((' ' & 0x0FF) == 0x020) 16545 @@ -8495,15 +8 628,15 @@17642 @@ -8495,15 +8704,15 @@ 16546 17643 } 16547 17644 _ACEOF 16548 17645 rm -f conftest$ac_exeext 16549 17646 -if { (eval echo "$as_me:8498: \"$ac_link\"") >&5 16550 +if { (eval echo "$as_me:8 631: \"$ac_link\"") >&517647 +if { (eval echo "$as_me:8707: \"$ac_link\"") >&5 16551 17648 (eval $ac_link) 2>&5 16552 17649 ac_status=$? 16553 17650 - echo "$as_me:8501: \$? = $ac_status" >&5 16554 + echo "$as_me:8 634: \$? = $ac_status" >&517651 + echo "$as_me:8710: \$? = $ac_status" >&5 16555 17652 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 16556 17653 - { (eval echo "$as_me:8503: \"$ac_try\"") >&5 16557 + { (eval echo "$as_me:8 636: \"$ac_try\"") >&517654 + { (eval echo "$as_me:8712: \"$ac_try\"") >&5 16558 17655 (eval $ac_try) 2>&5 16559 17656 ac_status=$? 16560 17657 - echo "$as_me:8506: \$? = $ac_status" >&5 16561 + echo "$as_me:8 639: \$? = $ac_status" >&517658 + echo "$as_me:8715: \$? = $ac_status" >&5 16562 17659 (exit $ac_status); }; }; then 16563 17660 : 16564 17661 else 16565 @@ -8516,7 +8 649,7 @@17662 @@ -8516,7 +8725,7 @@ 16566 17663 fi 16567 17664 fi 16568 17665 fi 16569 17666 -echo "$as_me:8519: result: $ac_cv_header_stdc" >&5 16570 +echo "$as_me:8 652: result: $ac_cv_header_stdc" >&517667 +echo "$as_me:8728: result: $ac_cv_header_stdc" >&5 16571 17668 echo "${ECHO_T}$ac_cv_header_stdc" >&6 16572 17669 if test $ac_cv_header_stdc = yes; then 16573 17670 16574 @@ -8532,28 +8 665,28 @@17671 @@ -8532,28 +8741,28 @@ 16575 17672 inttypes.h stdint.h unistd.h 16576 17673 do 16577 17674 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 16578 17675 -echo "$as_me:8535: checking for $ac_header" >&5 16579 +echo "$as_me:8 668: checking for $ac_header" >&517676 +echo "$as_me:8744: checking for $ac_header" >&5 16580 17677 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 16581 17678 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 16584 17681 cat >conftest.$ac_ext <<_ACEOF 16585 17682 -#line 8541 "configure" 16586 +#line 8 674"configure"17683 +#line 8750 "configure" 16587 17684 #include "confdefs.h" 16588 17685 $ac_includes_default … … 16591 17688 rm -f conftest.$ac_objext 16592 17689 -if { (eval echo "$as_me:8547: \"$ac_compile\"") >&5 16593 +if { (eval echo "$as_me:8 680: \"$ac_compile\"") >&517690 +if { (eval echo "$as_me:8756: \"$ac_compile\"") >&5 16594 17691 (eval $ac_compile) 2>&5 16595 17692 ac_status=$? 16596 17693 - echo "$as_me:8550: \$? = $ac_status" >&5 16597 + echo "$as_me:8 683: \$? = $ac_status" >&517694 + echo "$as_me:8759: \$? = $ac_status" >&5 16598 17695 (exit $ac_status); } && 16599 17696 { ac_try='test -s conftest.$ac_objext' 16600 17697 - { (eval echo "$as_me:8553: \"$ac_try\"") >&5 16601 + { (eval echo "$as_me:8 686: \"$ac_try\"") >&517698 + { (eval echo "$as_me:8762: \"$ac_try\"") >&5 16602 17699 (eval $ac_try) 2>&5 16603 17700 ac_status=$? 16604 17701 - echo "$as_me:8556: \$? = $ac_status" >&5 16605 + echo "$as_me:8 689: \$? = $ac_status" >&517702 + echo "$as_me:8765: \$? = $ac_status" >&5 16606 17703 (exit $ac_status); }; }; then 16607 17704 eval "$as_ac_Header=yes" 16608 17705 else 16609 @@ -8563,7 +8 696,7 @@17706 @@ -8563,7 +8772,7 @@ 16610 17707 fi 16611 17708 rm -f conftest.$ac_objext conftest.$ac_ext 16612 17709 fi 16613 17710 -echo "$as_me:8566: result: `eval echo '${'$as_ac_Header'}'`" >&5 16614 +echo "$as_me:8 699: result: `eval echo '${'$as_ac_Header'}'`" >&517711 +echo "$as_me:8775: result: `eval echo '${'$as_ac_Header'}'`" >&5 16615 17712 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 16616 17713 if test `eval echo '${'$as_ac_Header'}'` = yes; then 16617 17714 cat >>confdefs.h <<EOF 16618 @@ -8573,13 +87 06,13 @@17715 @@ -8573,13 +8782,13 @@ 16619 17716 fi 16620 17717 done 16621 17718 16622 17719 -echo "$as_me:8576: checking for signed char" >&5 16623 +echo "$as_me:87 09: checking for signed char" >&517720 +echo "$as_me:8785: checking for signed char" >&5 16624 17721 echo $ECHO_N "checking for signed char... $ECHO_C" >&6 16625 17722 if test "${ac_cv_type_signed_char+set}" = set; then … … 16628 17725 cat >conftest.$ac_ext <<_ACEOF 16629 17726 -#line 8582 "configure" 16630 +#line 87 15"configure"17727 +#line 8791 "configure" 16631 17728 #include "confdefs.h" 16632 17729 $ac_includes_default 16633 17730 int 16634 @@ -8594,16 +8 727,16 @@17731 @@ -8594,16 +8803,16 @@ 16635 17732 } 16636 17733 _ACEOF 16637 17734 rm -f conftest.$ac_objext 16638 17735 -if { (eval echo "$as_me:8597: \"$ac_compile\"") >&5 16639 +if { (eval echo "$as_me:8 730: \"$ac_compile\"") >&517736 +if { (eval echo "$as_me:8806: \"$ac_compile\"") >&5 16640 17737 (eval $ac_compile) 2>&5 16641 17738 ac_status=$? 16642 17739 - echo "$as_me:8600: \$? = $ac_status" >&5 16643 + echo "$as_me:8 733: \$? = $ac_status" >&517740 + echo "$as_me:8809: \$? = $ac_status" >&5 16644 17741 (exit $ac_status); } && 16645 17742 { ac_try='test -s conftest.$ac_objext' 16646 17743 - { (eval echo "$as_me:8603: \"$ac_try\"") >&5 16647 + { (eval echo "$as_me:8 736: \"$ac_try\"") >&517744 + { (eval echo "$as_me:8812: \"$ac_try\"") >&5 16648 17745 (eval $ac_try) 2>&5 16649 17746 ac_status=$? 16650 17747 - echo "$as_me:8606: \$? = $ac_status" >&5 16651 + echo "$as_me:8 739: \$? = $ac_status" >&517748 + echo "$as_me:8815: \$? = $ac_status" >&5 16652 17749 (exit $ac_status); }; }; then 16653 17750 ac_cv_type_signed_char=yes 16654 17751 else 16655 @@ -8613,10 +8 746,10 @@17752 @@ -8613,10 +8822,10 @@ 16656 17753 fi 16657 17754 rm -f conftest.$ac_objext conftest.$ac_ext 16658 17755 fi 16659 17756 -echo "$as_me:8616: result: $ac_cv_type_signed_char" >&5 16660 +echo "$as_me:8 749: result: $ac_cv_type_signed_char" >&517757 +echo "$as_me:8825: result: $ac_cv_type_signed_char" >&5 16661 17758 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 16662 17759 16663 17760 -echo "$as_me:8619: checking size of signed char" >&5 16664 +echo "$as_me:8 752: checking size of signed char" >&517761 +echo "$as_me:8828: checking size of signed char" >&5 16665 17762 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 16666 17763 if test "${ac_cv_sizeof_signed_char+set}" = set; then 16667 17764 echo $ECHO_N "(cached) $ECHO_C" >&6 16668 @@ -8625,7 +8 758,7 @@17765 @@ -8625,7 +8834,7 @@ 16669 17766 if test "$cross_compiling" = yes; then 16670 17767 # Depending upon the size, compute the lo and hi bounds. 16671 17768 cat >conftest.$ac_ext <<_ACEOF 16672 17769 -#line 8628 "configure" 16673 +#line 8 761"configure"17770 +#line 8837 "configure" 16674 17771 #include "confdefs.h" 16675 17772 $ac_includes_default 16676 17773 int 16677 @@ -8637,21 +8 770,21 @@17774 @@ -8637,21 +8846,21 @@ 16678 17775 } 16679 17776 _ACEOF 16680 17777 rm -f conftest.$ac_objext 16681 17778 -if { (eval echo "$as_me:8640: \"$ac_compile\"") >&5 16682 +if { (eval echo "$as_me:8 773: \"$ac_compile\"") >&517779 +if { (eval echo "$as_me:8849: \"$ac_compile\"") >&5 16683 17780 (eval $ac_compile) 2>&5 16684 17781 ac_status=$? 16685 17782 - echo "$as_me:8643: \$? = $ac_status" >&5 16686 + echo "$as_me:8 776: \$? = $ac_status" >&517783 + echo "$as_me:8852: \$? = $ac_status" >&5 16687 17784 (exit $ac_status); } && 16688 17785 { ac_try='test -s conftest.$ac_objext' 16689 17786 - { (eval echo "$as_me:8646: \"$ac_try\"") >&5 16690 + { (eval echo "$as_me:8 779: \"$ac_try\"") >&517787 + { (eval echo "$as_me:8855: \"$ac_try\"") >&5 16691 17788 (eval $ac_try) 2>&5 16692 17789 ac_status=$? 16693 17790 - echo "$as_me:8649: \$? = $ac_status" >&5 16694 + echo "$as_me:8 782: \$? = $ac_status" >&517791 + echo "$as_me:8858: \$? = $ac_status" >&5 16695 17792 (exit $ac_status); }; }; then 16696 17793 ac_lo=0 ac_mid=0 … … 16698 17795 cat >conftest.$ac_ext <<_ACEOF 16699 17796 -#line 8654 "configure" 16700 +#line 8 787"configure"17797 +#line 8863 "configure" 16701 17798 #include "confdefs.h" 16702 17799 $ac_includes_default 16703 17800 int 16704 @@ -8663,16 +8 796,16 @@17801 @@ -8663,16 +8872,16 @@ 16705 17802 } 16706 17803 _ACEOF 16707 17804 rm -f conftest.$ac_objext 16708 17805 -if { (eval echo "$as_me:8666: \"$ac_compile\"") >&5 16709 +if { (eval echo "$as_me:8 799: \"$ac_compile\"") >&517806 +if { (eval echo "$as_me:8875: \"$ac_compile\"") >&5 16710 17807 (eval $ac_compile) 2>&5 16711 17808 ac_status=$? 16712 17809 - echo "$as_me:8669: \$? = $ac_status" >&5 16713 + echo "$as_me:88 02: \$? = $ac_status" >&517810 + echo "$as_me:8878: \$? = $ac_status" >&5 16714 17811 (exit $ac_status); } && 16715 17812 { ac_try='test -s conftest.$ac_objext' 16716 17813 - { (eval echo "$as_me:8672: \"$ac_try\"") >&5 16717 + { (eval echo "$as_me:88 05: \"$ac_try\"") >&517814 + { (eval echo "$as_me:8881: \"$ac_try\"") >&5 16718 17815 (eval $ac_try) 2>&5 16719 17816 ac_status=$? 16720 17817 - echo "$as_me:8675: \$? = $ac_status" >&5 16721 + echo "$as_me:88 08: \$? = $ac_status" >&517818 + echo "$as_me:8884: \$? = $ac_status" >&5 16722 17819 (exit $ac_status); }; }; then 16723 17820 ac_hi=$ac_mid; break 16724 17821 else 16725 @@ -8688,7 +88 21,7 @@17822 @@ -8688,7 +8897,7 @@ 16726 17823 ac_hi=-1 ac_mid=-1 16727 17824 while :; do 16728 17825 cat >conftest.$ac_ext <<_ACEOF 16729 17826 -#line 8691 "configure" 16730 +#line 8 824"configure"17827 +#line 8900 "configure" 16731 17828 #include "confdefs.h" 16732 17829 $ac_includes_default 16733 17830 int 16734 @@ -8700,16 +8 833,16 @@17831 @@ -8700,16 +8909,16 @@ 16735 17832 } 16736 17833 _ACEOF 16737 17834 rm -f conftest.$ac_objext 16738 17835 -if { (eval echo "$as_me:8703: \"$ac_compile\"") >&5 16739 +if { (eval echo "$as_me:8 836: \"$ac_compile\"") >&517836 +if { (eval echo "$as_me:8912: \"$ac_compile\"") >&5 16740 17837 (eval $ac_compile) 2>&5 16741 17838 ac_status=$? 16742 17839 - echo "$as_me:8706: \$? = $ac_status" >&5 16743 + echo "$as_me:8 839: \$? = $ac_status" >&517840 + echo "$as_me:8915: \$? = $ac_status" >&5 16744 17841 (exit $ac_status); } && 16745 17842 { ac_try='test -s conftest.$ac_objext' 16746 17843 - { (eval echo "$as_me:8709: \"$ac_try\"") >&5 16747 + { (eval echo "$as_me:8 842: \"$ac_try\"") >&517844 + { (eval echo "$as_me:8918: \"$ac_try\"") >&5 16748 17845 (eval $ac_try) 2>&5 16749 17846 ac_status=$? 16750 17847 - echo "$as_me:8712: \$? = $ac_status" >&5 16751 + echo "$as_me:8 845: \$? = $ac_status" >&517848 + echo "$as_me:8921: \$? = $ac_status" >&5 16752 17849 (exit $ac_status); }; }; then 16753 17850 ac_lo=$ac_mid; break 16754 17851 else 16755 @@ -8725,7 +8 858,7 @@17852 @@ -8725,7 +8934,7 @@ 16756 17853 while test "x$ac_lo" != "x$ac_hi"; do 16757 17854 ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 16758 17855 cat >conftest.$ac_ext <<_ACEOF 16759 17856 -#line 8728 "configure" 16760 +#line 8 861"configure"17857 +#line 8937 "configure" 16761 17858 #include "confdefs.h" 16762 17859 $ac_includes_default 16763 17860 int 16764 @@ -8737,16 +8 870,16 @@17861 @@ -8737,16 +8946,16 @@ 16765 17862 } 16766 17863 _ACEOF 16767 17864 rm -f conftest.$ac_objext 16768 17865 -if { (eval echo "$as_me:8740: \"$ac_compile\"") >&5 16769 +if { (eval echo "$as_me:8 873: \"$ac_compile\"") >&517866 +if { (eval echo "$as_me:8949: \"$ac_compile\"") >&5 16770 17867 (eval $ac_compile) 2>&5 16771 17868 ac_status=$? 16772 17869 - echo "$as_me:8743: \$? = $ac_status" >&5 16773 + echo "$as_me:8 876: \$? = $ac_status" >&517870 + echo "$as_me:8952: \$? = $ac_status" >&5 16774 17871 (exit $ac_status); } && 16775 17872 { ac_try='test -s conftest.$ac_objext' 16776 17873 - { (eval echo "$as_me:8746: \"$ac_try\"") >&5 16777 + { (eval echo "$as_me:8 879: \"$ac_try\"") >&517874 + { (eval echo "$as_me:8955: \"$ac_try\"") >&5 16778 17875 (eval $ac_try) 2>&5 16779 17876 ac_status=$? 16780 17877 - echo "$as_me:8749: \$? = $ac_status" >&5 16781 + echo "$as_me:8 882: \$? = $ac_status" >&517878 + echo "$as_me:8958: \$? = $ac_status" >&5 16782 17879 (exit $ac_status); }; }; then 16783 17880 ac_hi=$ac_mid 16784 17881 else 16785 @@ -8759,12 +8 892,12 @@17882 @@ -8759,12 +8968,12 @@ 16786 17883 ac_cv_sizeof_signed_char=$ac_lo 16787 17884 else 16788 17885 if test "$cross_compiling" = yes; then 16789 17886 - { { echo "$as_me:8762: error: cannot run test program while cross compiling" >&5 16790 + { { echo "$as_me:8 895: error: cannot run test program while cross compiling" >&517887 + { { echo "$as_me:8971: error: cannot run test program while cross compiling" >&5 16791 17888 echo "$as_me: error: cannot run test program while cross compiling" >&2;} 16792 17889 { (exit 1); exit 1; }; } … … 16794 17891 cat >conftest.$ac_ext <<_ACEOF 16795 17892 -#line 8767 "configure" 16796 +#line 89 00"configure"17893 +#line 8976 "configure" 16797 17894 #include "confdefs.h" 16798 17895 $ac_includes_default 16799 17896 int 16800 @@ -8780,15 +89 13,15 @@17897 @@ -8780,15 +8989,15 @@ 16801 17898 } 16802 17899 _ACEOF 16803 17900 rm -f conftest$ac_exeext 16804 17901 -if { (eval echo "$as_me:8783: \"$ac_link\"") >&5 16805 +if { (eval echo "$as_me:89 16: \"$ac_link\"") >&517902 +if { (eval echo "$as_me:8992: \"$ac_link\"") >&5 16806 17903 (eval $ac_link) 2>&5 16807 17904 ac_status=$? 16808 17905 - echo "$as_me:8786: \$? = $ac_status" >&5 16809 + echo "$as_me:89 19: \$? = $ac_status" >&517906 + echo "$as_me:8995: \$? = $ac_status" >&5 16810 17907 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 16811 17908 - { (eval echo "$as_me:8788: \"$ac_try\"") >&5 16812 + { (eval echo "$as_me:89 21: \"$ac_try\"") >&517909 + { (eval echo "$as_me:8997: \"$ac_try\"") >&5 16813 17910 (eval $ac_try) 2>&5 16814 17911 ac_status=$? 16815 17912 - echo "$as_me:8791: \$? = $ac_status" >&5 16816 + echo "$as_me: 8924: \$? = $ac_status" >&517913 + echo "$as_me:9000: \$? = $ac_status" >&5 16817 17914 (exit $ac_status); }; }; then 16818 17915 ac_cv_sizeof_signed_char=`cat conftest.val` 16819 17916 else 16820 @@ -8804,7 + 8937,7 @@17917 @@ -8804,7 +9013,7 @@ 16821 17918 ac_cv_sizeof_signed_char=0 16822 17919 fi 16823 17920 fi 16824 17921 -echo "$as_me:8807: result: $ac_cv_sizeof_signed_char" >&5 16825 +echo "$as_me: 8940: result: $ac_cv_sizeof_signed_char" >&517922 +echo "$as_me:9016: result: $ac_cv_sizeof_signed_char" >&5 16826 17923 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 16827 17924 cat >>confdefs.h <<EOF 16828 17925 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char 16829 @@ -8815,7 + 8948,7 @@17926 @@ -8815,7 +9024,7 @@ 16830 17927 else 16831 17928 NCURSES_SBOOL="char" 16832 17929 fi 16833 17930 -echo "$as_me:8818: checking if you want to use signed Boolean array in term.h" >&5 16834 +echo "$as_me: 8951: checking if you want to use signed Boolean array in term.h" >&517931 +echo "$as_me:9027: checking if you want to use signed Boolean array in term.h" >&5 16835 17932 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 16836 17933 16837 17934 # Check whether --enable-signed-char or --disable-signed-char was given. 16838 @@ -8825,12 + 8958,12 @@17935 @@ -8825,12 +9034,12 @@ 16839 17936 else 16840 17937 with_signed_char=no 16841 17938 fi; 16842 17939 -echo "$as_me:8828: result: $with_signed_char" >&5 16843 +echo "$as_me: 8961: result: $with_signed_char" >&517940 +echo "$as_me:9037: result: $with_signed_char" >&5 16844 17941 echo "${ECHO_T}$with_signed_char" >&6 16845 17942 test "$with_signed_char" != yes && NCURSES_SBOOL="char" … … 16847 17944 ### use option --enable-sigwinch to turn on use of SIGWINCH logic 16848 17945 -echo "$as_me:8833: checking if you want SIGWINCH handler" >&5 16849 +echo "$as_me: 8966: checking if you want SIGWINCH handler" >&517946 +echo "$as_me:9042: checking if you want SIGWINCH handler" >&5 16850 17947 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 16851 17948 16852 17949 # Check whether --enable-sigwinch or --disable-sigwinch was given. 16853 @@ -8840,14 + 8973,14 @@17950 @@ -8840,14 +9049,14 @@ 16854 17951 else 16855 17952 with_sigwinch=$with_ext_funcs 16856 17953 fi; 16857 17954 -echo "$as_me:8843: result: $with_sigwinch" >&5 16858 +echo "$as_me: 8976: result: $with_sigwinch" >&517955 +echo "$as_me:9052: result: $with_sigwinch" >&5 16859 17956 echo "${ECHO_T}$with_sigwinch" >&6 16860 17957 test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF … … 16864 17961 ### use option --enable-tcap-names to allow user to define new capabilities 16865 17962 -echo "$as_me:8850: checking if you want user-definable terminal capabilities like termcap" >&5 16866 +echo "$as_me: 8983: checking if you want user-definable terminal capabilities like termcap" >&517963 +echo "$as_me:9059: checking if you want user-definable terminal capabilities like termcap" >&5 16867 17964 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 16868 17965 16869 17966 # Check whether --enable-tcap-names or --disable-tcap-names was given. 16870 @@ -8857,7 + 8990,7 @@17967 @@ -8857,7 +9066,7 @@ 16871 17968 else 16872 17969 with_tcap_names=$with_ext_funcs 16873 17970 fi; 16874 17971 -echo "$as_me:8860: result: $with_tcap_names" >&5 16875 +echo "$as_me: 8993: result: $with_tcap_names" >&517972 +echo "$as_me:9069: result: $with_tcap_names" >&5 16876 17973 echo "${ECHO_T}$with_tcap_names" >&6 16877 17974 NCURSES_XNAMES=0 16878 17975 test "$with_tcap_names" = yes && NCURSES_XNAMES=1 16879 @@ -8865,7 + 8998,7 @@17976 @@ -8865,7 +9074,7 @@ 16880 17977 ############################################################################### 16881 17978 # These options are relatively safe to experiment with. 16882 17979 16883 17980 -echo "$as_me:8868: checking if you want all development code" >&5 16884 +echo "$as_me:90 01: checking if you want all development code" >&517981 +echo "$as_me:9077: checking if you want all development code" >&5 16885 17982 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 16886 17983 16887 17984 # Check whether --with-develop or --without-develop was given. 16888 @@ -8875,11 +90 08,11 @@17985 @@ -8875,11 +9084,11 @@ 16889 17986 else 16890 17987 with_develop=no 16891 17988 fi; 16892 17989 -echo "$as_me:8878: result: $with_develop" >&5 16893 +echo "$as_me:90 11: result: $with_develop" >&517990 +echo "$as_me:9087: result: $with_develop" >&5 16894 17991 echo "${ECHO_T}$with_develop" >&6 16895 17992 16896 17993 ### use option --enable-hard-tabs to turn on use of hard-tabs optimize 16897 17994 -echo "$as_me:8882: checking if you want hard-tabs code" >&5 16898 +echo "$as_me:90 15: checking if you want hard-tabs code" >&517995 +echo "$as_me:9091: checking if you want hard-tabs code" >&5 16899 17996 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 16900 17997 16901 17998 # Check whether --enable-hard-tabs or --disable-hard-tabs was given. 16902 @@ -8889,14 +90 22,14 @@17999 @@ -8889,14 +9098,14 @@ 16903 18000 else 16904 18001 enable_hard_tabs=$with_develop 16905 18002 fi; 16906 18003 -echo "$as_me:8892: result: $enable_hard_tabs" >&5 16907 +echo "$as_me:9 025: result: $enable_hard_tabs" >&518004 +echo "$as_me:9101: result: $enable_hard_tabs" >&5 16908 18005 echo "${ECHO_T}$enable_hard_tabs" >&6 16909 18006 test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF … … 16913 18010 ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize 16914 18011 -echo "$as_me:8899: checking if you want limited support for xmc" >&5 16915 +echo "$as_me:9 032: checking if you want limited support for xmc" >&518012 +echo "$as_me:9108: checking if you want limited support for xmc" >&5 16916 18013 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 16917 18014 16918 18015 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. 16919 @@ -8906,7 +9 039,7 @@18016 @@ -8906,7 +9115,7 @@ 16920 18017 else 16921 18018 enable_xmc_glitch=$with_develop 16922 18019 fi; 16923 18020 -echo "$as_me:8909: result: $enable_xmc_glitch" >&5 16924 +echo "$as_me:9 042: result: $enable_xmc_glitch" >&518021 +echo "$as_me:9118: result: $enable_xmc_glitch" >&5 16925 18022 echo "${ECHO_T}$enable_xmc_glitch" >&6 16926 18023 test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF 16927 18024 #define USE_XMC_SUPPORT 1 16928 @@ -8915,7 +9 048,7 @@18025 @@ -8915,7 +9124,7 @@ 16929 18026 ############################################################################### 16930 18027 # These are just experimental, probably should not be in a package: 16931 18028 16932 18029 -echo "$as_me:8918: checking if you do not want to assume colors are white-on-black" >&5 16933 +echo "$as_me:9 051: checking if you do not want to assume colors are white-on-black" >&518030 +echo "$as_me:9127: checking if you do not want to assume colors are white-on-black" >&5 16934 18031 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 16935 18032 16936 18033 # Check whether --enable-assumed-color or --disable-assumed-color was given. 16937 @@ -8925,14 +9 058,14 @@18034 @@ -8925,14 +9134,14 @@ 16938 18035 else 16939 18036 with_assumed_color=yes 16940 18037 fi; 16941 18038 -echo "$as_me:8928: result: $with_assumed_color" >&5 16942 +echo "$as_me:9 061: result: $with_assumed_color" >&518039 +echo "$as_me:9137: result: $with_assumed_color" >&5 16943 18040 echo "${ECHO_T}$with_assumed_color" >&6 16944 18041 test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF … … 16948 18045 ### use option --enable-hashmap to turn on use of hashmap scrolling logic 16949 18046 -echo "$as_me:8935: checking if you want hashmap scrolling-optimization code" >&5 16950 +echo "$as_me:9 068: checking if you want hashmap scrolling-optimization code" >&518047 +echo "$as_me:9144: checking if you want hashmap scrolling-optimization code" >&5 16951 18048 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 16952 18049 16953 18050 # Check whether --enable-hashmap or --disable-hashmap was given. 16954 @@ -8942,14 +9 075,14 @@18051 @@ -8942,14 +9151,14 @@ 16955 18052 else 16956 18053 with_hashmap=yes 16957 18054 fi; 16958 18055 -echo "$as_me:8945: result: $with_hashmap" >&5 16959 +echo "$as_me:9 078: result: $with_hashmap" >&518056 +echo "$as_me:9154: result: $with_hashmap" >&5 16960 18057 echo "${ECHO_T}$with_hashmap" >&6 16961 18058 test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF … … 16965 18062 ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment 16966 18063 -echo "$as_me:8952: checking if you want colorfgbg code" >&5 16967 +echo "$as_me:9 085: checking if you want colorfgbg code" >&518064 +echo "$as_me:9161: checking if you want colorfgbg code" >&5 16968 18065 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 16969 18066 16970 18067 # Check whether --enable-colorfgbg or --disable-colorfgbg was given. 16971 @@ -8959, 14 +9092,14@@18068 @@ -8959,83 +9168,195 @@ 16972 18069 else 16973 18070 with_colorfgbg=no 16974 18071 fi; 16975 18072 -echo "$as_me:8962: result: $with_colorfgbg" >&5 16976 +echo "$as_me:9 095: result: $with_colorfgbg" >&518073 +echo "$as_me:9171: result: $with_colorfgbg" >&5 16977 18074 echo "${ECHO_T}$with_colorfgbg" >&6 16978 18075 test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF … … 16980 18077 EOF 16981 18078 16982 18079 -### use option --enable-ext-colors to turn on use of colors beyond 16. 16983 18080 -echo "$as_me:8969: checking if you want to use experimental extended colors" >&5 16984 +echo "$as_me:9102: checking if you want to use experimental extended colors" >&5 16985 echo $ECHO_N "checking if you want to use experimental extended colors... $ECHO_C" >&6 16986 16987 # Check whether --enable-ext-colors or --disable-ext-colors was given. 16988 @@ -8976,13 +9109,14 @@ 16989 else 16990 with_ext_colors=no 16991 fi; 18081 -echo $ECHO_N "checking if you want to use experimental extended colors... $ECHO_C" >&6 18082 +# This is still experimental (20080329), but should ultimately be moved to 18083 +# the script-block --with-normal, etc. 18084 18085 -# Check whether --enable-ext-colors or --disable-ext-colors was given. 18086 -if test "${enable_ext_colors+set}" = set; then 18087 - enableval="$enable_ext_colors" 18088 - with_ext_colors=$enableval 18089 -else 18090 - with_ext_colors=no 18091 -fi; 16992 18092 -echo "$as_me:8979: result: $with_ext_colors" >&5 16993 +echo "$as_me:9112: result: $with_ext_colors" >&5 16994 echo "${ECHO_T}$with_ext_colors" >&6 16995 NCURSES_EXT_COLORS=0 16996 if test "$with_ext_colors" = yes ; then 16997 if test "$with_widec" != yes ; then 18093 -echo "${ECHO_T}$with_ext_colors" >&6 18094 -NCURSES_EXT_COLORS=0 18095 -if test "$with_ext_colors" = yes ; then 18096 - if test "$with_widec" != yes ; then 16998 18097 - { echo "$as_me:8984: WARNING: This option applies only to wide-character library" >&5 16999 18098 -echo "$as_me: WARNING: This option applies only to wide-character library" >&2;} 17000 + { { echo "$as_me:9117: error: This option applies only to wide-character library" >&5 17001 +echo "$as_me: error: This option applies only to wide-character library" >&2;} 18099 - else 18100 - # cannot be ABI 5 since it changes sizeof(cchar_t) 18101 +echo "$as_me:9180: checking if you want to link with the pthread library" >&5 18102 +echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 18103 18104 -if test "${with_abi_version+set}" != set; then 18105 - case $cf_cv_rel_version in 18106 - 5.*) 18107 - cf_cv_rel_version=6.0 18108 - cf_cv_abi_version=6 18109 - { echo "$as_me:8994: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 18110 -echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 18111 - ;; 18112 - esac 18113 +# Check whether --with-pthread or --without-pthread was given. 18114 +if test "${with_pthread+set}" = set; then 18115 + withval="$with_pthread" 18116 + with_pthread=$withval 18117 +else 18118 + with_pthread=no 18119 +fi; 18120 +echo "$as_me:9190: result: $with_pthread" >&5 18121 +echo "${ECHO_T}$with_pthread" >&6 18122 + 18123 +if test "$with_pthread" != no ; then 18124 + echo "$as_me:9194: checking for pthread.h" >&5 18125 +echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 18126 +if test "${ac_cv_header_pthread_h+set}" = set; then 18127 + echo $ECHO_N "(cached) $ECHO_C" >&6 18128 +else 18129 + cat >conftest.$ac_ext <<_ACEOF 18130 +#line 9200 "configure" 18131 +#include "confdefs.h" 18132 +#include <pthread.h> 18133 +_ACEOF 18134 +if { (eval echo "$as_me:9204: \"$ac_cpp conftest.$ac_ext\"") >&5 18135 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 18136 + ac_status=$? 18137 + egrep -v '^ *\+' conftest.er1 >conftest.err 18138 + rm -f conftest.er1 18139 + cat conftest.err >&5 18140 + echo "$as_me:9210: \$? = $ac_status" >&5 18141 + (exit $ac_status); } >/dev/null; then 18142 + if test -s conftest.err; then 18143 + ac_cpp_err=$ac_c_preproc_warn_flag 18144 + else 18145 + ac_cpp_err= 18146 + fi 18147 +else 18148 + ac_cpp_err=yes 18149 +fi 18150 +if test -z "$ac_cpp_err"; then 18151 + ac_cv_header_pthread_h=yes 18152 +else 18153 + echo "$as_me: failed program was:" >&5 18154 + cat conftest.$ac_ext >&5 18155 + ac_cv_header_pthread_h=no 18156 +fi 18157 +rm -f conftest.err conftest.$ac_ext 18158 fi 18159 +echo "$as_me:9229: result: $ac_cv_header_pthread_h" >&5 18160 +echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 18161 +if test $ac_cv_header_pthread_h = yes; then 18162 18163 - fi 18164 - NCURSES_EXT_COLORS=1 18165 - cat >>confdefs.h <<\EOF 18166 -#define NCURSES_EXT_COLORS 1 18167 + cat >>confdefs.h <<\EOF 18168 +#define HAVE_PTHREADS_H 1 18169 EOF 18170 18171 + echo "$as_me:9237: checking for pthread_create in -lpthread" >&5 18172 +echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 18173 +if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then 18174 + echo $ECHO_N "(cached) $ECHO_C" >&6 18175 +else 18176 + ac_check_lib_save_LIBS=$LIBS 18177 +LIBS="-lpthread $LIBS" 18178 +cat >conftest.$ac_ext <<_ACEOF 18179 +#line 9245 "configure" 18180 +#include "confdefs.h" 18181 + 18182 +/* Override any gcc2 internal prototype to avoid an error. */ 18183 +#ifdef __cplusplus 18184 +extern "C" 18185 +#endif 18186 +/* We use char because int might match the return type of a gcc2 18187 + builtin and then its argument prototype would still apply. */ 18188 +char pthread_create (); 18189 +int 18190 +main () 18191 +{ 18192 +pthread_create (); 18193 + ; 18194 + return 0; 18195 +} 18196 +_ACEOF 18197 +rm -f conftest.$ac_objext conftest$ac_exeext 18198 +if { (eval echo "$as_me:9264: \"$ac_link\"") >&5 18199 + (eval $ac_link) 2>&5 18200 + ac_status=$? 18201 + echo "$as_me:9267: \$? = $ac_status" >&5 18202 + (exit $ac_status); } && 18203 + { ac_try='test -s conftest$ac_exeext' 18204 + { (eval echo "$as_me:9270: \"$ac_try\"") >&5 18205 + (eval $ac_try) 2>&5 18206 + ac_status=$? 18207 + echo "$as_me:9273: \$? = $ac_status" >&5 18208 + (exit $ac_status); }; }; then 18209 + ac_cv_lib_pthread_pthread_create=yes 18210 +else 18211 + echo "$as_me: failed program was:" >&5 18212 +cat conftest.$ac_ext >&5 18213 +ac_cv_lib_pthread_pthread_create=no 18214 +fi 18215 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 18216 +LIBS=$ac_check_lib_save_LIBS 18217 fi 18218 +echo "$as_me:9284: result: $ac_cv_lib_pthread_pthread_create" >&5 18219 +echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 18220 +if test $ac_cv_lib_pthread_pthread_create = yes; then 18221 18222 -### use option --enable-ext-mouse to modify coding to support 5-button mice 18223 -echo "$as_me:9009: checking if you want to use experimental extended mouse encoding" >&5 18224 -echo $ECHO_N "checking if you want to use experimental extended mouse encoding... $ECHO_C" >&6 18225 + LIBS="-lpthread $LIBS" 18226 + cat >>confdefs.h <<\EOF 18227 +#define HAVE_LIBPTHREADS 1 18228 +EOF 18229 + 18230 + with_pthread=yes 18231 18232 -# Check whether --enable-ext-mouse or --disable-ext-mouse was given. 18233 -if test "${enable_ext_mouse+set}" = set; then 18234 - enableval="$enable_ext_mouse" 18235 - with_ext_mouse=$enableval 18236 else 18237 - with_ext_mouse=no 18238 -fi; 18239 -echo "$as_me:9019: result: $with_ext_mouse" >&5 18240 -echo "${ECHO_T}$with_ext_mouse" >&6 18241 -NCURSES_MOUSE_VERSION=1 18242 -if test "$with_ext_mouse" = yes ; then 18243 - NCURSES_MOUSE_VERSION=2 18244 + 18245 + { { echo "$as_me:9297: error: Cannot link with pthread library" >&5 18246 +echo "$as_me: error: Cannot link with pthread library" >&2;} 17002 18247 + { (exit 1); exit 1; }; } 17003 else 17004 # cannot be ABI 5 since it changes sizeof(cchar_t) 17005 17006 @@ -8991,7 +9125,7 @@ 17007 5.*) 17008 cf_cv_rel_version=6.0 17009 cf_cv_abi_version=6 17010 - { echo "$as_me:8994: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 17011 + { echo "$as_me:9128: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 17012 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 17013 ;; 17014 esac 17015 @@ -9006,7 +9140,7 @@ 17016 fi 17017 17018 ### use option --enable-ext-mouse to modify coding to support 5-button mice 17019 -echo "$as_me:9009: checking if you want to use experimental extended mouse encoding" >&5 17020 +echo "$as_me:9143: checking if you want to use experimental extended mouse encoding" >&5 17021 echo $ECHO_N "checking if you want to use experimental extended mouse encoding... $ECHO_C" >&6 17022 17023 # Check whether --enable-ext-mouse or --disable-ext-mouse was given. 17024 @@ -9016,7 +9150,7 @@ 17025 else 17026 with_ext_mouse=no 17027 fi; 17028 -echo "$as_me:9019: result: $with_ext_mouse" >&5 17029 +echo "$as_me:9153: result: $with_ext_mouse" >&5 17030 echo "${ECHO_T}$with_ext_mouse" >&6 17031 NCURSES_MOUSE_VERSION=1 17032 if test "$with_ext_mouse" = yes ; then 17033 @@ -9027,7 +9161,7 @@ 17034 5.*) 17035 cf_cv_rel_version=6.0 17036 cf_cv_abi_version=6 17037 - { echo "$as_me:9030: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 17038 + { echo "$as_me:9164: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 17039 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 17040 ;; 17041 esac 17042 @@ -9035,7 +9169,49 @@ 17043 17044 fi 17045 17046 -echo "$as_me:9038: checking if you want experimental safe-sprintf code" >&5 18248 + 18249 +fi 18250 + 18251 +fi 18252 + 18253 +fi 18254 + 18255 +if test "$with_pthread" = "yes" ; then 18256 + cat >>confdefs.h <<\EOF 18257 +#define USE_PTHREADS 1 18258 +EOF 18259 + 18260 + enable_reentrant=yes 18261 +fi 18262 + 17047 18263 +# Reentrant code has to be opaque; there's little advantage to making ncurses 17048 +# opaque outside of that, so there is no --enable-opaque option. 17049 +echo "$as_me:9174: checking if you want experimental reentrant code" >&5 18264 +# opaque outside of that, so there is no --enable-opaque option. We can use 18265 +# this option without --with-pthreads, but this will be always set for 18266 +# pthreads. 18267 +echo "$as_me:9319: checking if you want experimental reentrant code" >&5 17050 18268 +echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 17051 18269 + … … 17057 18275 + with_reentrant=no 17058 18276 +fi; 17059 +echo "$as_me:9 184: result: $with_reentrant" >&518277 +echo "$as_me:9329: result: $with_reentrant" >&5 17060 18278 +echo "${ECHO_T}$with_reentrant" >&6 17061 18279 +if test "$with_reentrant" = yes ; then … … 17068 18286 +#define USE_REENTRANT 1 17069 18287 +EOF 17070 + 17071 +if test "${with_abi_version+set}" != set; then 17072 + case $cf_cv_rel_version in 17073 + 5.*) 17074 + cf_cv_rel_version=6.0 17075 + cf_cv_abi_version=6 17076 + { echo "$as_me:9201: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 17077 +echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 17078 + ;; 17079 + esac 17080 +fi 17081 + 18288 18289 if test "${with_abi_version+set}" != set; then 18290 case $cf_cv_rel_version in 18291 5.*) 18292 cf_cv_rel_version=6.0 18293 cf_cv_abi_version=6 18294 - { echo "$as_me:9030: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 18295 + { echo "$as_me:9346: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 18296 echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} 18297 ;; 18298 esac 18299 fi 18300 17082 18301 +else 17083 18302 + cf_cv_enable_reentrant=0 … … 17085 18304 + NCURSES_OPAQUE=0 17086 18305 + NCURSES_SIZE_T=short 17087 +fi 17088 + 17089 +echo "$as_me:9214: checking if you want experimental safe-sprintf code" >&5 18306 fi 18307 18308 -echo "$as_me:9038: checking if you want experimental safe-sprintf code" >&5 18309 +echo "$as_me:9359: checking if you want experimental safe-sprintf code" >&5 17090 18310 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 17091 18311 17092 18312 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. 17093 @@ -9045,7 +9 221,7 @@18313 @@ -9045,7 +9366,7 @@ 17094 18314 else 17095 18315 with_safe_sprintf=no 17096 18316 fi; 17097 18317 -echo "$as_me:9048: result: $with_safe_sprintf" >&5 17098 +echo "$as_me:9 224: result: $with_safe_sprintf" >&518318 +echo "$as_me:9369: result: $with_safe_sprintf" >&5 17099 18319 echo "${ECHO_T}$with_safe_sprintf" >&6 17100 18320 test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF 17101 18321 #define USE_SAFE_SPRINTF 1 17102 @@ -9054,7 +9 230,7 @@18322 @@ -9054,7 +9375,7 @@ 17103 18323 ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic 17104 18324 # when hashmap is used scroll hints are useless 17105 18325 if test "$with_hashmap" = no ; then 17106 18326 -echo "$as_me:9057: checking if you want to experiment without scrolling-hints code" >&5 17107 +echo "$as_me:9 233: checking if you want to experiment without scrolling-hints code" >&518327 +echo "$as_me:9378: checking if you want to experiment without scrolling-hints code" >&5 17108 18328 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 17109 18329 17110 18330 # Check whether --enable-scroll-hints or --disable-scroll-hints was given. 17111 @@ -9064,7 +9 240,7 @@18331 @@ -9064,7 +9385,7 @@ 17112 18332 else 17113 18333 with_scroll_hints=yes 17114 18334 fi; 17115 18335 -echo "$as_me:9067: result: $with_scroll_hints" >&5 17116 +echo "$as_me:9 243: result: $with_scroll_hints" >&518336 +echo "$as_me:9388: result: $with_scroll_hints" >&5 17117 18337 echo "${ECHO_T}$with_scroll_hints" >&6 17118 18338 test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF 17119 18339 #define USE_SCROLL_HINTS 1 17120 @@ -9072,7 +9 248,7 @@18340 @@ -9072,7 +9393,7 @@ 17121 18341 17122 18342 fi 17123 18343 17124 18344 -echo "$as_me:9075: checking if you want experimental wgetch-events code" >&5 17125 +echo "$as_me:9 251: checking if you want experimental wgetch-events code" >&518345 +echo "$as_me:9396: checking if you want experimental wgetch-events code" >&5 17126 18346 echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6 17127 18347 17128 18348 # Check whether --enable-wgetch-events or --disable-wgetch-events was given. 17129 @@ -9082,7 +9 258,7 @@18349 @@ -9082,7 +9403,7 @@ 17130 18350 else 17131 18351 with_wgetch_events=no 17132 18352 fi; 17133 18353 -echo "$as_me:9085: result: $with_wgetch_events" >&5 17134 +echo "$as_me:9 261: result: $with_wgetch_events" >&518354 +echo "$as_me:9406: result: $with_wgetch_events" >&5 17135 18355 echo "${ECHO_T}$with_wgetch_events" >&6 17136 18356 test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF 17137 18357 #define NCURSES_WGETCH_EVENTS 1 17138 @@ -9091,7 +9 267,7 @@18358 @@ -9091,7 +9412,7 @@ 17139 18359 ############################################################################### 17140 18360 17141 18361 ### use option --disable-echo to suppress full display compiling commands 17142 18362 -echo "$as_me:9094: checking if you want to display full commands during build" >&5 17143 +echo "$as_me:9 270: checking if you want to display full commands during build" >&518363 +echo "$as_me:9415: checking if you want to display full commands during build" >&5 17144 18364 echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6 17145 18365 17146 18366 # Check whether --enable-echo or --disable-echo was given. 17147 @@ -9106,12 +9 282,13 @@18367 @@ -9106,12 +9427,13 @@ 17148 18368 else 17149 18369 ECHO_LINK='@ echo linking $@ ... ;' … … 17152 18372 fi 17153 18373 -echo "$as_me:9110: result: $with_echo" >&5 17154 +echo "$as_me:9 287: result: $with_echo" >&518374 +echo "$as_me:9432: result: $with_echo" >&5 17155 18375 echo "${ECHO_T}$with_echo" >&6 17156 18376 17157 18377 ### use option --enable-warnings to turn on all gcc warnings 17158 18378 -echo "$as_me:9114: checking if you want to see compiler warnings" >&5 17159 +echo "$as_me:9 291: checking if you want to see compiler warnings" >&518379 +echo "$as_me:9436: checking if you want to see compiler warnings" >&5 17160 18380 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 17161 18381 17162 18382 # Check whether --enable-warnings or --disable-warnings was given. 17163 @@ -9119,10 +9 296,10 @@18383 @@ -9119,10 +9441,10 @@ 17164 18384 enableval="$enable_warnings" 17165 18385 with_warnings=$enableval 17166 18386 fi; 17167 18387 -echo "$as_me:9122: result: $with_warnings" >&5 17168 +echo "$as_me:9 299: result: $with_warnings" >&518388 +echo "$as_me:9444: result: $with_warnings" >&5 17169 18389 echo "${ECHO_T}$with_warnings" >&6 17170 18390 … … 17174 18394 17175 18395 INTEL_COMPILER=no 17176 @@ -9130,12 +9 307,12 @@18396 @@ -9130,12 +9452,12 @@ 17177 18397 if test "$GCC" = yes ; then 17178 18398 case $host_os in 17179 18399 linux*|gnu*) 17180 18400 - echo "$as_me:9133: checking if this is really Intel C compiler" >&5 17181 + echo "$as_me:9 310: checking if this is really Intel C compiler" >&518401 + echo "$as_me:9455: checking if this is really Intel C compiler" >&5 17182 18402 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 17183 18403 cf_save_CFLAGS="$CFLAGS" … … 17185 18405 cat >conftest.$ac_ext <<_ACEOF 17186 18406 -#line 9138 "configure" 17187 +#line 9 315"configure"18407 +#line 9460 "configure" 17188 18408 #include "confdefs.h" 17189 18409 17190 18410 int 17191 @@ -9152,16 +9 329,16 @@18411 @@ -9152,16 +9474,16 @@ 17192 18412 } 17193 18413 _ACEOF 17194 18414 rm -f conftest.$ac_objext 17195 18415 -if { (eval echo "$as_me:9155: \"$ac_compile\"") >&5 17196 +if { (eval echo "$as_me:9 332: \"$ac_compile\"") >&518416 +if { (eval echo "$as_me:9477: \"$ac_compile\"") >&5 17197 18417 (eval $ac_compile) 2>&5 17198 18418 ac_status=$? 17199 18419 - echo "$as_me:9158: \$? = $ac_status" >&5 17200 + echo "$as_me:9 335: \$? = $ac_status" >&518420 + echo "$as_me:9480: \$? = $ac_status" >&5 17201 18421 (exit $ac_status); } && 17202 18422 { ac_try='test -s conftest.$ac_objext' 17203 18423 - { (eval echo "$as_me:9161: \"$ac_try\"") >&5 17204 + { (eval echo "$as_me:9 338: \"$ac_try\"") >&518424 + { (eval echo "$as_me:9483: \"$ac_try\"") >&5 17205 18425 (eval $ac_try) 2>&5 17206 18426 ac_status=$? 17207 18427 - echo "$as_me:9164: \$? = $ac_status" >&5 17208 + echo "$as_me:9 341: \$? = $ac_status" >&518428 + echo "$as_me:9486: \$? = $ac_status" >&5 17209 18429 (exit $ac_status); }; }; then 17210 18430 INTEL_COMPILER=yes 17211 18431 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" 17212 @@ -9172,14 +9 349,14 @@18432 @@ -9172,14 +9494,14 @@ 17213 18433 fi 17214 18434 rm -f conftest.$ac_objext conftest.$ac_ext 17215 18435 CFLAGS="$cf_save_CFLAGS" 17216 18436 - echo "$as_me:9175: result: $INTEL_COMPILER" >&5 17217 + echo "$as_me:9 352: result: $INTEL_COMPILER" >&518437 + echo "$as_me:9497: result: $INTEL_COMPILER" >&5 17218 18438 echo "${ECHO_T}$INTEL_COMPILER" >&6 17219 18439 ;; … … 17223 18443 cat > conftest.$ac_ext <<EOF 17224 18444 -#line 9182 "configure" 17225 +#line 9 359"${as_me-configure}"18445 +#line 9504 "${as_me-configure}" 17226 18446 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } 17227 18447 EOF 17228 18448 17229 @@ -9197,11 +9 374,11 @@18449 @@ -9197,11 +9519,11 @@ 17230 18450 # remark #981: operands are evaluated in unspecified order 17231 18451 # warning #269: invalid format string conversion 17232 18452 17233 18453 - { echo "$as_me:9200: checking for $CC warning options..." >&5 17234 + { echo "$as_me:9 377: checking for $CC warning options..." >&518454 + { echo "$as_me:9522: checking for $CC warning options..." >&5 17235 18455 echo "$as_me: checking for $CC warning options..." >&6;} 17236 18456 cf_save_CFLAGS="$CFLAGS" … … 17241 18461 wd1682 \ 17242 18462 wd1683 \ 17243 @@ -9214,12 +9 391,12 @@18463 @@ -9214,12 +9536,12 @@ 17244 18464 wd981 17245 18465 do 17246 18466 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" 17247 18467 - if { (eval echo "$as_me:9217: \"$ac_compile\"") >&5 17248 + if { (eval echo "$as_me:9 394: \"$ac_compile\"") >&518468 + if { (eval echo "$as_me:9539: \"$ac_compile\"") >&5 17249 18469 (eval $ac_compile) 2>&5 17250 18470 ac_status=$? 17251 18471 - echo "$as_me:9220: \$? = $ac_status" >&5 17252 + echo "$as_me:9 397: \$? = $ac_status" >&518472 + echo "$as_me:9542: \$? = $ac_status" >&5 17253 18473 (exit $ac_status); }; then 17254 18474 - test -n "$verbose" && echo "$as_me:9222: result: ... -$cf_opt" >&5 17255 + test -n "$verbose" && echo "$as_me:9 399: result: ... -$cf_opt" >&518475 + test -n "$verbose" && echo "$as_me:9544: result: ... -$cf_opt" >&5 17256 18476 echo "${ECHO_T}... -$cf_opt" >&6 17257 18477 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" 17258 18478 fi 17259 @@ -9228,7 +9 405,7 @@18479 @@ -9228,7 +9550,7 @@ 17260 18480 17261 18481 elif test "$GCC" = yes 17262 18482 then 17263 18483 - { echo "$as_me:9231: checking for $CC warning options..." >&5 17264 + { echo "$as_me:9 408: checking for $CC warning options..." >&518484 + { echo "$as_me:9553: checking for $CC warning options..." >&5 17265 18485 echo "$as_me: checking for $CC warning options..." >&6;} 17266 18486 cf_save_CFLAGS="$CFLAGS" 17267 18487 EXTRA_CFLAGS="-W -Wall" 17268 @@ -9245,15 +9 422,15 @@18488 @@ -9245,15 +9567,15 @@ 17269 18489 Wpointer-arith \ 17270 18490 Wshadow \ … … 17275 18495 CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" 17276 18496 - if { (eval echo "$as_me:9251: \"$ac_compile\"") >&5 17277 + if { (eval echo "$as_me:9 428: \"$ac_compile\"") >&518497 + if { (eval echo "$as_me:9573: \"$ac_compile\"") >&5 17278 18498 (eval $ac_compile) 2>&5 17279 18499 ac_status=$? 17280 18500 - echo "$as_me:9254: \$? = $ac_status" >&5 17281 + echo "$as_me:9 431: \$? = $ac_status" >&518501 + echo "$as_me:9576: \$? = $ac_status" >&5 17282 18502 (exit $ac_status); }; then 17283 18503 - test -n "$verbose" && echo "$as_me:9256: result: ... -$cf_opt" >&5 17284 + test -n "$verbose" && echo "$as_me:9 433: result: ... -$cf_opt" >&518504 + test -n "$verbose" && echo "$as_me:9578: result: ... -$cf_opt" >&5 17285 18505 echo "${ECHO_T}... -$cf_opt" >&6 17286 18506 case $cf_opt in #(vi 17287 18507 Wcast-qual) #(vi 17288 @@ -9264,6 +9 441,8 @@18508 @@ -9264,6 +9586,8 @@ 17289 18509 3.3*) 17290 18510 test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 17291 18511 17292 +echo "${as_me-configure}:9 444: testing feature is broken in gcc $GCC_VERSION ..." 1>&518512 +echo "${as_me-configure}:9589: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 17293 18513 + 17294 18514 continue;; 17295 18515 esac 17296 18516 ;; 17297 @@ -9282,12 +9 461,12 @@18517 @@ -9282,12 +9606,12 @@ 17298 18518 if test "$GCC" = yes ; then 17299 18519 case $host_os in 17300 18520 linux*|gnu*) 17301 18521 - echo "$as_me:9285: checking if this is really Intel C++ compiler" >&5 17302 + echo "$as_me:9 464: checking if this is really Intel C++ compiler" >&518522 + echo "$as_me:9609: checking if this is really Intel C++ compiler" >&5 17303 18523 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6 17304 18524 cf_save_CFLAGS="$CXXFLAGS" … … 17306 18526 cat >conftest.$ac_ext <<_ACEOF 17307 18527 -#line 9290 "configure" 17308 +#line 9 469"configure"18528 +#line 9614 "configure" 17309 18529 #include "confdefs.h" 17310 18530 17311 18531 int 17312 @@ -9304,16 +9 483,16 @@18532 @@ -9304,16 +9628,16 @@ 17313 18533 } 17314 18534 _ACEOF 17315 18535 rm -f conftest.$ac_objext 17316 18536 -if { (eval echo "$as_me:9307: \"$ac_compile\"") >&5 17317 +if { (eval echo "$as_me:9 486: \"$ac_compile\"") >&518537 +if { (eval echo "$as_me:9631: \"$ac_compile\"") >&5 17318 18538 (eval $ac_compile) 2>&5 17319 18539 ac_status=$? 17320 18540 - echo "$as_me:9310: \$? = $ac_status" >&5 17321 + echo "$as_me:9 489: \$? = $ac_status" >&518541 + echo "$as_me:9634: \$? = $ac_status" >&5 17322 18542 (exit $ac_status); } && 17323 18543 { ac_try='test -s conftest.$ac_objext' 17324 18544 - { (eval echo "$as_me:9313: \"$ac_try\"") >&5 17325 + { (eval echo "$as_me:9 492: \"$ac_try\"") >&518545 + { (eval echo "$as_me:9637: \"$ac_try\"") >&5 17326 18546 (eval $ac_try) 2>&5 17327 18547 ac_status=$? 17328 18548 - echo "$as_me:9316: \$? = $ac_status" >&5 17329 + echo "$as_me:9 495: \$? = $ac_status" >&518549 + echo "$as_me:9640: \$? = $ac_status" >&5 17330 18550 (exit $ac_status); }; }; then 17331 18551 INTEL_CPLUSPLUS=yes 17332 18552 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" 17333 @@ -9324,7 +9 503,7 @@18553 @@ -9324,7 +9648,7 @@ 17334 18554 fi 17335 18555 rm -f conftest.$ac_objext conftest.$ac_ext 17336 18556 CXXFLAGS="$cf_save_CFLAGS" 17337 18557 - echo "$as_me:9327: result: $INTEL_CPLUSPLUS" >&5 17338 + echo "$as_me:9 506: result: $INTEL_CPLUSPLUS" >&518558 + echo "$as_me:9651: result: $INTEL_CPLUSPLUS" >&5 17339 18559 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 17340 18560 ;; 17341 18561 esac 17342 @@ -9338,7 +9 517,7 @@18562 @@ -9338,7 +9662,7 @@ 17343 18563 ac_main_return=return 17344 18564 17345 18565 cat > conftest.$ac_ext <<EOF 17346 18566 -#line 9341 "configure" 17347 +#line 9 520"configure"18567 +#line 9665 "configure" 17348 18568 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } 17349 18569 EOF 17350 18570 17351 @@ -9356,7 +9 535,7 @@18571 @@ -9356,7 +9680,7 @@ 17352 18572 # remark #981: operands are evaluated in unspecified order 17353 18573 # warning #269: invalid format string conversion 17354 18574 17355 18575 - { echo "$as_me:9359: checking for $CC warning options..." >&5 17356 + { echo "$as_me:9 538: checking for $CC warning options..." >&518576 + { echo "$as_me:9683: checking for $CC warning options..." >&5 17357 18577 echo "$as_me: checking for $CC warning options..." >&6;} 17358 18578 cf_save_CXXFLAGS="$CXXFLAGS" 17359 18579 EXTRA_CXXFLAGS="-Wall" 17360 @@ -9373,12 +9 552,12 @@18580 @@ -9373,12 +9697,12 @@ 17361 18581 wd981 17362 18582 do 17363 18583 CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" 17364 18584 - if { (eval echo "$as_me:9376: \"$ac_compile\"") >&5 17365 + if { (eval echo "$as_me:9 555: \"$ac_compile\"") >&518585 + if { (eval echo "$as_me:9700: \"$ac_compile\"") >&5 17366 18586 (eval $ac_compile) 2>&5 17367 18587 ac_status=$? 17368 18588 - echo "$as_me:9379: \$? = $ac_status" >&5 17369 + echo "$as_me:9 558: \$? = $ac_status" >&518589 + echo "$as_me:9703: \$? = $ac_status" >&5 17370 18590 (exit $ac_status); }; then 17371 18591 - test -n "$verbose" && echo "$as_me:9381: result: ... -$cf_opt" >&5 17372 + test -n "$verbose" && echo "$as_me:9 560: result: ... -$cf_opt" >&518592 + test -n "$verbose" && echo "$as_me:9705: result: ... -$cf_opt" >&5 17373 18593 echo "${ECHO_T}... -$cf_opt" >&6 17374 18594 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" 17375 18595 fi 17376 @@ -9387,7 +9 566,7 @@18596 @@ -9387,7 +9711,7 @@ 17377 18597 17378 18598 elif test "$GXX" = yes 17379 18599 then 17380 18600 - { echo "$as_me:9390: checking for $CXX warning options..." >&5 17381 + { echo "$as_me:9 569: checking for $CXX warning options..." >&518601 + { echo "$as_me:9714: checking for $CXX warning options..." >&5 17382 18602 echo "$as_me: checking for $CXX warning options..." >&6;} 17383 18603 cf_save_CXXFLAGS="$CXXFLAGS" 17384 18604 EXTRA_CXXFLAGS="-W -Wall" 17385 @@ -9416,16 +9 595,16 @@18605 @@ -9416,16 +9740,16 @@ 17386 18606 Wundef $cf_gxx_extra_warnings Wno-unused 17387 18607 do 17388 18608 CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" 17389 18609 - if { (eval echo "$as_me:9419: \"$ac_compile\"") >&5 17390 + if { (eval echo "$as_me:9 598: \"$ac_compile\"") >&518610 + if { (eval echo "$as_me:9743: \"$ac_compile\"") >&5 17391 18611 (eval $ac_compile) 2>&5 17392 18612 ac_status=$? 17393 18613 - echo "$as_me:9422: \$? = $ac_status" >&5 17394 + echo "$as_me:9 601: \$? = $ac_status" >&518614 + echo "$as_me:9746: \$? = $ac_status" >&5 17395 18615 (exit $ac_status); }; then 17396 18616 - test -n "$verbose" && echo "$as_me:9424: result: ... -$cf_opt" >&5 17397 + test -n "$verbose" && echo "$as_me:9 603: result: ... -$cf_opt" >&518617 + test -n "$verbose" && echo "$as_me:9748: result: ... -$cf_opt" >&5 17398 18618 echo "${ECHO_T}... -$cf_opt" >&6 17399 18619 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" 17400 18620 else 17401 18621 - test -n "$verbose" && echo "$as_me:9428: result: ... no -$cf_opt" >&5 17402 + test -n "$verbose" && echo "$as_me:9 607: result: ... no -$cf_opt" >&518622 + test -n "$verbose" && echo "$as_me:9752: result: ... no -$cf_opt" >&5 17403 18623 echo "${ECHO_T}... no -$cf_opt" >&6 17404 18624 fi 17405 18625 done 17406 @@ -9461,10 +9 640,10 @@18626 @@ -9461,10 +9785,10 @@ 17407 18627 EOF 17408 18628 if test "$GCC" = yes 17409 18629 then 17410 18630 - { echo "$as_me:9464: checking for $CC __attribute__ directives..." >&5 17411 + { echo "$as_me:9 643: checking for $CC __attribute__ directives..." >&518631 + { echo "$as_me:9788: checking for $CC __attribute__ directives..." >&5 17412 18632 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} 17413 18633 cat > conftest.$ac_ext <<EOF 17414 18634 -#line 9467 "configure" 17415 +#line 9 646"${as_me-configure}"18635 +#line 9791 "${as_me-configure}" 17416 18636 #include "confdefs.h" 17417 18637 #include "conftest.h" 17418 18638 #include "conftest.i" 17419 @@ -9502,12 +9 681,12 @@18639 @@ -9502,12 +9826,12 @@ 17420 18640 EOF 17421 18641 ;; 17422 18642 esac 17423 18643 - if { (eval echo "$as_me:9505: \"$ac_compile\"") >&5 17424 + if { (eval echo "$as_me:9 684: \"$ac_compile\"") >&518644 + if { (eval echo "$as_me:9829: \"$ac_compile\"") >&5 17425 18645 (eval $ac_compile) 2>&5 17426 18646 ac_status=$? 17427 18647 - echo "$as_me:9508: \$? = $ac_status" >&5 17428 + echo "$as_me:9 687: \$? = $ac_status" >&518648 + echo "$as_me:9832: \$? = $ac_status" >&5 17429 18649 (exit $ac_status); }; then 17430 18650 - test -n "$verbose" && echo "$as_me:9510: result: ... $cf_attribute" >&5 17431 + test -n "$verbose" && echo "$as_me:9 689: result: ... $cf_attribute" >&518651 + test -n "$verbose" && echo "$as_me:9834: result: ... $cf_attribute" >&5 17432 18652 echo "${ECHO_T}... $cf_attribute" >&6 17433 18653 cat conftest.h >>confdefs.h 17434 18654 fi 17435 @@ -9519,7 +9 698,7 @@18655 @@ -9519,7 +9843,7 @@ 17436 18656 fi 17437 18657 17438 18658 ### use option --enable-assertions to turn on generation of assertion code 17439 18659 -echo "$as_me:9522: checking if you want to enable runtime assertions" >&5 17440 +echo "$as_me:9 701: checking if you want to enable runtime assertions" >&518660 +echo "$as_me:9846: checking if you want to enable runtime assertions" >&5 17441 18661 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 17442 18662 17443 18663 # Check whether --enable-assertions or --disable-assertions was given. 17444 @@ -9529,7 +9 708,7 @@18664 @@ -9529,7 +9853,7 @@ 17445 18665 else 17446 18666 with_assertions=no 17447 18667 fi; 17448 18668 -echo "$as_me:9532: result: $with_assertions" >&5 17449 +echo "$as_me:9 711: result: $with_assertions" >&518669 +echo "$as_me:9856: result: $with_assertions" >&5 17450 18670 echo "${ECHO_T}$with_assertions" >&6 17451 18671 if test -n "$GCC" 17452 18672 then 17453 @@ -9547,7 +9 726,7 @@18673 @@ -9547,7 +9871,7 @@ 17454 18674 17455 18675 ### use option --disable-leaks to suppress "permanent" leaks, for testing 17456 18676 17457 18677 -echo "$as_me:9550: checking if you want to use dmalloc for testing" >&5 17458 +echo "$as_me:9 729: checking if you want to use dmalloc for testing" >&518678 +echo "$as_me:9874: checking if you want to use dmalloc for testing" >&5 17459 18679 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 17460 18680 17461 18681 # Check whether --with-dmalloc or --without-dmalloc was given. 17462 @@ -9563,7 +9 742,7 @@18682 @@ -9563,7 +9887,7 @@ 17463 18683 else 17464 18684 with_dmalloc= 17465 18685 fi; 17466 18686 -echo "$as_me:9566: result: ${with_dmalloc:-no}" >&5 17467 +echo "$as_me:9 745: result: ${with_dmalloc:-no}" >&518687 +echo "$as_me:9890: result: ${with_dmalloc:-no}" >&5 17468 18688 echo "${ECHO_T}${with_dmalloc:-no}" >&6 17469 18689 17470 18690 case .$with_cflags in #(vi 17471 @@ -9647,23 +9 826,23 @@18691 @@ -9647,23 +9971,23 @@ 17472 18692 esac 17473 18693 17474 18694 if test "$with_dmalloc" = yes ; then 17475 18695 - echo "$as_me:9650: checking for dmalloc.h" >&5 17476 + echo "$as_me:9 829: checking for dmalloc.h" >&518696 + echo "$as_me:9974: checking for dmalloc.h" >&5 17477 18697 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 17478 18698 if test "${ac_cv_header_dmalloc_h+set}" = set; then … … 17481 18701 cat >conftest.$ac_ext <<_ACEOF 17482 18702 -#line 9656 "configure" 17483 +#line 9 835"configure"18703 +#line 9980 "configure" 17484 18704 #include "confdefs.h" 17485 18705 #include <dmalloc.h> 17486 18706 _ACEOF 17487 18707 -if { (eval echo "$as_me:9660: \"$ac_cpp conftest.$ac_ext\"") >&5 17488 +if { (eval echo "$as_me:9 839: \"$ac_cpp conftest.$ac_ext\"") >&518708 +if { (eval echo "$as_me:9984: \"$ac_cpp conftest.$ac_ext\"") >&5 17489 18709 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 17490 18710 ac_status=$? … … 17493 18713 cat conftest.err >&5 17494 18714 - echo "$as_me:9666: \$? = $ac_status" >&5 17495 + echo "$as_me:9 845: \$? = $ac_status" >&518715 + echo "$as_me:9990: \$? = $ac_status" >&5 17496 18716 (exit $ac_status); } >/dev/null; then 17497 18717 if test -s conftest.err; then 17498 18718 ac_cpp_err=$ac_c_preproc_warn_flag 17499 @@ -9682,11 + 9861,11 @@18719 @@ -9682,11 +10006,11 @@ 17500 18720 fi 17501 18721 rm -f conftest.err conftest.$ac_ext 17502 18722 fi 17503 18723 -echo "$as_me:9685: result: $ac_cv_header_dmalloc_h" >&5 17504 +echo "$as_me: 9864: result: $ac_cv_header_dmalloc_h" >&518724 +echo "$as_me:10009: result: $ac_cv_header_dmalloc_h" >&5 17505 18725 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 17506 18726 if test $ac_cv_header_dmalloc_h = yes; then 17507 18727 17508 18728 -echo "$as_me:9689: checking for dmalloc_debug in -ldmalloc" >&5 17509 +echo "$as_me: 9868: checking for dmalloc_debug in -ldmalloc" >&518729 +echo "$as_me:10013: checking for dmalloc_debug in -ldmalloc" >&5 17510 18730 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 17511 18731 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then 17512 18732 echo $ECHO_N "(cached) $ECHO_C" >&6 17513 @@ -9694,7 + 9873,7 @@18733 @@ -9694,7 +10018,7 @@ 17514 18734 ac_check_lib_save_LIBS=$LIBS 17515 18735 LIBS="-ldmalloc $LIBS" 17516 18736 cat >conftest.$ac_ext <<_ACEOF 17517 18737 -#line 9697 "configure" 17518 +#line 9876"configure"18738 +#line 10021 "configure" 17519 18739 #include "confdefs.h" 17520 18740 17521 18741 /* Override any gcc2 internal prototype to avoid an error. */ 17522 @@ -9713,16 + 9892,16 @@18742 @@ -9713,16 +10037,16 @@ 17523 18743 } 17524 18744 _ACEOF 17525 18745 rm -f conftest.$ac_objext conftest$ac_exeext 17526 18746 -if { (eval echo "$as_me:9716: \"$ac_link\"") >&5 17527 +if { (eval echo "$as_me: 9895: \"$ac_link\"") >&518747 +if { (eval echo "$as_me:10040: \"$ac_link\"") >&5 17528 18748 (eval $ac_link) 2>&5 17529 18749 ac_status=$? 17530 18750 - echo "$as_me:9719: \$? = $ac_status" >&5 17531 + echo "$as_me: 9898: \$? = $ac_status" >&518751 + echo "$as_me:10043: \$? = $ac_status" >&5 17532 18752 (exit $ac_status); } && 17533 18753 { ac_try='test -s conftest$ac_exeext' 17534 18754 - { (eval echo "$as_me:9722: \"$ac_try\"") >&5 17535 + { (eval echo "$as_me: 9901: \"$ac_try\"") >&518755 + { (eval echo "$as_me:10046: \"$ac_try\"") >&5 17536 18756 (eval $ac_try) 2>&5 17537 18757 ac_status=$? 17538 18758 - echo "$as_me:9725: \$? = $ac_status" >&5 17539 + echo "$as_me: 9904: \$? = $ac_status" >&518759 + echo "$as_me:10049: \$? = $ac_status" >&5 17540 18760 (exit $ac_status); }; }; then 17541 18761 ac_cv_lib_dmalloc_dmalloc_debug=yes 17542 18762 else 17543 @@ -9733,7 + 9912,7 @@18763 @@ -9733,7 +10057,7 @@ 17544 18764 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 17545 18765 LIBS=$ac_check_lib_save_LIBS 17546 18766 fi 17547 18767 -echo "$as_me:9736: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 17548 +echo "$as_me: 9915: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&518768 +echo "$as_me:10060: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 17549 18769 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 17550 18770 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then 17551 18771 cat >>confdefs.h <<EOF 17552 @@ -9748,7 + 9927,7 @@18772 @@ -9748,7 +10072,7 @@ 17553 18773 17554 18774 fi 17555 18775 17556 18776 -echo "$as_me:9751: checking if you want to use dbmalloc for testing" >&5 17557 +echo "$as_me: 9930: checking if you want to use dbmalloc for testing" >&518777 +echo "$as_me:10075: checking if you want to use dbmalloc for testing" >&5 17558 18778 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 17559 18779 17560 18780 # Check whether --with-dbmalloc or --without-dbmalloc was given. 17561 @@ -9764,7 + 9943,7 @@18781 @@ -9764,7 +10088,7 @@ 17562 18782 else 17563 18783 with_dbmalloc= 17564 18784 fi; 17565 18785 -echo "$as_me:9767: result: ${with_dbmalloc:-no}" >&5 17566 +echo "$as_me: 9946: result: ${with_dbmalloc:-no}" >&518786 +echo "$as_me:10091: result: ${with_dbmalloc:-no}" >&5 17567 18787 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 17568 18788 17569 18789 case .$with_cflags in #(vi 17570 @@ -9848,23 +10 027,23 @@18790 @@ -9848,23 +10172,23 @@ 17571 18791 esac 17572 18792 17573 18793 if test "$with_dbmalloc" = yes ; then 17574 18794 - echo "$as_me:9851: checking for dbmalloc.h" >&5 17575 + echo "$as_me:10 030: checking for dbmalloc.h" >&518795 + echo "$as_me:10175: checking for dbmalloc.h" >&5 17576 18796 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 17577 18797 if test "${ac_cv_header_dbmalloc_h+set}" = set; then … … 17580 18800 cat >conftest.$ac_ext <<_ACEOF 17581 18801 -#line 9857 "configure" 17582 +#line 10 036"configure"18802 +#line 10181 "configure" 17583 18803 #include "confdefs.h" 17584 18804 #include <dbmalloc.h> 17585 18805 _ACEOF 17586 18806 -if { (eval echo "$as_me:9861: \"$ac_cpp conftest.$ac_ext\"") >&5 17587 +if { (eval echo "$as_me:10 040: \"$ac_cpp conftest.$ac_ext\"") >&518807 +if { (eval echo "$as_me:10185: \"$ac_cpp conftest.$ac_ext\"") >&5 17588 18808 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 17589 18809 ac_status=$? … … 17592 18812 cat conftest.err >&5 17593 18813 - echo "$as_me:9867: \$? = $ac_status" >&5 17594 + echo "$as_me:10 046: \$? = $ac_status" >&518814 + echo "$as_me:10191: \$? = $ac_status" >&5 17595 18815 (exit $ac_status); } >/dev/null; then 17596 18816 if test -s conftest.err; then 17597 18817 ac_cpp_err=$ac_c_preproc_warn_flag 17598 @@ -9883,11 +10 062,11 @@18818 @@ -9883,11 +10207,11 @@ 17599 18819 fi 17600 18820 rm -f conftest.err conftest.$ac_ext 17601 18821 fi 17602 18822 -echo "$as_me:9886: result: $ac_cv_header_dbmalloc_h" >&5 17603 +echo "$as_me:10 065: result: $ac_cv_header_dbmalloc_h" >&518823 +echo "$as_me:10210: result: $ac_cv_header_dbmalloc_h" >&5 17604 18824 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 17605 18825 if test $ac_cv_header_dbmalloc_h = yes; then 17606 18826 17607 18827 -echo "$as_me:9890: checking for debug_malloc in -ldbmalloc" >&5 17608 +echo "$as_me:10 069: checking for debug_malloc in -ldbmalloc" >&518828 +echo "$as_me:10214: checking for debug_malloc in -ldbmalloc" >&5 17609 18829 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 17610 18830 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then 17611 18831 echo $ECHO_N "(cached) $ECHO_C" >&6 17612 @@ -9895,7 +10 074,7 @@18832 @@ -9895,7 +10219,7 @@ 17613 18833 ac_check_lib_save_LIBS=$LIBS 17614 18834 LIBS="-ldbmalloc $LIBS" 17615 18835 cat >conftest.$ac_ext <<_ACEOF 17616 18836 -#line 9898 "configure" 17617 +#line 10 077"configure"18837 +#line 10222 "configure" 17618 18838 #include "confdefs.h" 17619 18839 17620 18840 /* Override any gcc2 internal prototype to avoid an error. */ 17621 @@ -9914,16 +10 093,16 @@18841 @@ -9914,16 +10238,16 @@ 17622 18842 } 17623 18843 _ACEOF 17624 18844 rm -f conftest.$ac_objext conftest$ac_exeext 17625 18845 -if { (eval echo "$as_me:9917: \"$ac_link\"") >&5 17626 +if { (eval echo "$as_me:10 096: \"$ac_link\"") >&518846 +if { (eval echo "$as_me:10241: \"$ac_link\"") >&5 17627 18847 (eval $ac_link) 2>&5 17628 18848 ac_status=$? 17629 18849 - echo "$as_me:9920: \$? = $ac_status" >&5 17630 + echo "$as_me:10 099: \$? = $ac_status" >&518850 + echo "$as_me:10244: \$? = $ac_status" >&5 17631 18851 (exit $ac_status); } && 17632 18852 { ac_try='test -s conftest$ac_exeext' 17633 18853 - { (eval echo "$as_me:9923: \"$ac_try\"") >&5 17634 + { (eval echo "$as_me:10 102: \"$ac_try\"") >&518854 + { (eval echo "$as_me:10247: \"$ac_try\"") >&5 17635 18855 (eval $ac_try) 2>&5 17636 18856 ac_status=$? 17637 18857 - echo "$as_me:9926: \$? = $ac_status" >&5 17638 + echo "$as_me:10 105: \$? = $ac_status" >&518858 + echo "$as_me:10250: \$? = $ac_status" >&5 17639 18859 (exit $ac_status); }; }; then 17640 18860 ac_cv_lib_dbmalloc_debug_malloc=yes 17641 18861 else 17642 @@ -9934,7 +10 113,7 @@18862 @@ -9934,7 +10258,7 @@ 17643 18863 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 17644 18864 LIBS=$ac_check_lib_save_LIBS 17645 18865 fi 17646 18866 -echo "$as_me:9937: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 17647 +echo "$as_me:10 116: result: $ac_cv_lib_dbmalloc_debug_malloc" >&518867 +echo "$as_me:10261: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 17648 18868 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 17649 18869 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then 17650 18870 cat >>confdefs.h <<EOF 17651 @@ -9949,7 +10 128,7 @@18871 @@ -9949,7 +10273,7 @@ 17652 18872 17653 18873 fi 17654 18874 17655 18875 -echo "$as_me:9952: checking if you want to use valgrind for testing" >&5 17656 +echo "$as_me:10 131: checking if you want to use valgrind for testing" >&518876 +echo "$as_me:10276: checking if you want to use valgrind for testing" >&5 17657 18877 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 17658 18878 17659 18879 # Check whether --with-valgrind or --without-valgrind was given. 17660 @@ -9965,7 +10 144,7 @@18880 @@ -9965,7 +10289,7 @@ 17661 18881 else 17662 18882 with_valgrind= 17663 18883 fi; 17664 18884 -echo "$as_me:9968: result: ${with_valgrind:-no}" >&5 17665 +echo "$as_me:10 147: result: ${with_valgrind:-no}" >&518885 +echo "$as_me:10292: result: ${with_valgrind:-no}" >&5 17666 18886 echo "${ECHO_T}${with_valgrind:-no}" >&6 17667 18887 17668 18888 case .$with_cflags in #(vi 17669 @@ -10048,7 +10 227,7 @@18889 @@ -10048,7 +10372,7 @@ 17670 18890 ;; 17671 18891 esac 17672 18892 17673 18893 -echo "$as_me:10051: checking if you want to perform memory-leak testing" >&5 17674 +echo "$as_me:10 230: checking if you want to perform memory-leak testing" >&518894 +echo "$as_me:10375: checking if you want to perform memory-leak testing" >&5 17675 18895 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 17676 18896 17677 18897 # Check whether --enable-leaks or --disable-leaks was given. 17678 @@ -10058,7 +10 237,7 @@18898 @@ -10058,7 +10382,7 @@ 17679 18899 else 17680 18900 : ${with_no_leaks:=no} 17681 18901 fi; 17682 18902 -echo "$as_me:10061: result: $with_no_leaks" >&5 17683 +echo "$as_me:10 240: result: $with_no_leaks" >&518903 +echo "$as_me:10385: result: $with_no_leaks" >&5 17684 18904 echo "${ECHO_T}$with_no_leaks" >&6 17685 18905 17686 18906 if test "$with_no_leaks" = yes ; then 17687 @@ -10103,7 +10 282,7 @@18907 @@ -10103,7 +10427,7 @@ 17688 18908 ;; 17689 18909 esac 17690 18910 17691 18911 -echo "$as_me:10106: checking whether to add trace feature to all models" >&5 17692 +echo "$as_me:10 285: checking whether to add trace feature to all models" >&518912 +echo "$as_me:10430: checking whether to add trace feature to all models" >&5 17693 18913 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 17694 18914 17695 18915 # Check whether --with-trace or --without-trace was given. 17696 @@ -10113,7 +10 292,7 @@18916 @@ -10113,7 +10437,7 @@ 17697 18917 else 17698 18918 cf_with_trace=$cf_all_traces 17699 18919 fi; 17700 18920 -echo "$as_me:10116: result: $cf_with_trace" >&5 17701 +echo "$as_me:10 295: result: $cf_with_trace" >&518921 +echo "$as_me:10440: result: $cf_with_trace" >&5 17702 18922 echo "${ECHO_T}$cf_with_trace" >&6 17703 18923 17704 18924 if test "$cf_with_trace" = yes ; then 17705 @@ -10194,13 +10 373,13 @@18925 @@ -10194,13 +10518,13 @@ 17706 18926 fi 17707 18927 17708 18928 ### Checks for libraries. 17709 18929 -echo "$as_me:10197: checking for gettimeofday" >&5 17710 +echo "$as_me:10 376: checking for gettimeofday" >&518930 +echo "$as_me:10521: checking for gettimeofday" >&5 17711 18931 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 17712 18932 if test "${ac_cv_func_gettimeofday+set}" = set; then … … 17715 18935 cat >conftest.$ac_ext <<_ACEOF 17716 18936 -#line 10203 "configure" 17717 +#line 10 382"configure"18937 +#line 10527 "configure" 17718 18938 #include "confdefs.h" 17719 18939 /* System header to define __stub macros and hopefully few prototypes, 17720 18940 which can conflict with char gettimeofday (); below. */ 17721 @@ -10231,16 +10 410,16 @@18941 @@ -10231,16 +10555,16 @@ 17722 18942 } 17723 18943 _ACEOF 17724 18944 rm -f conftest.$ac_objext conftest$ac_exeext 17725 18945 -if { (eval echo "$as_me:10234: \"$ac_link\"") >&5 17726 +if { (eval echo "$as_me:10 413: \"$ac_link\"") >&518946 +if { (eval echo "$as_me:10558: \"$ac_link\"") >&5 17727 18947 (eval $ac_link) 2>&5 17728 18948 ac_status=$? 17729 18949 - echo "$as_me:10237: \$? = $ac_status" >&5 17730 + echo "$as_me:10 416: \$? = $ac_status" >&518950 + echo "$as_me:10561: \$? = $ac_status" >&5 17731 18951 (exit $ac_status); } && 17732 18952 { ac_try='test -s conftest$ac_exeext' 17733 18953 - { (eval echo "$as_me:10240: \"$ac_try\"") >&5 17734 + { (eval echo "$as_me:10 419: \"$ac_try\"") >&518954 + { (eval echo "$as_me:10564: \"$ac_try\"") >&5 17735 18955 (eval $ac_try) 2>&5 17736 18956 ac_status=$? 17737 18957 - echo "$as_me:10243: \$? = $ac_status" >&5 17738 + echo "$as_me:10 422: \$? = $ac_status" >&518958 + echo "$as_me:10567: \$? = $ac_status" >&5 17739 18959 (exit $ac_status); }; }; then 17740 18960 ac_cv_func_gettimeofday=yes 17741 18961 else 17742 @@ -10250,7 +10 429,7 @@18962 @@ -10250,7 +10574,7 @@ 17743 18963 fi 17744 18964 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 17745 18965 fi 17746 18966 -echo "$as_me:10253: result: $ac_cv_func_gettimeofday" >&5 17747 +echo "$as_me:10 432: result: $ac_cv_func_gettimeofday" >&518967 +echo "$as_me:10577: result: $ac_cv_func_gettimeofday" >&5 17748 18968 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 17749 18969 if test $ac_cv_func_gettimeofday = yes; then 17750 18970 cat >>confdefs.h <<\EOF 17751 @@ -10259,7 +10 438,7 @@18971 @@ -10259,7 +10583,7 @@ 17752 18972 17753 18973 else 17754 18974 17755 18975 -echo "$as_me:10262: checking for gettimeofday in -lbsd" >&5 17756 +echo "$as_me:10 441: checking for gettimeofday in -lbsd" >&518976 +echo "$as_me:10586: checking for gettimeofday in -lbsd" >&5 17757 18977 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 17758 18978 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then 17759 18979 echo $ECHO_N "(cached) $ECHO_C" >&6 17760 @@ -10267,7 +10 446,7 @@18980 @@ -10267,7 +10591,7 @@ 17761 18981 ac_check_lib_save_LIBS=$LIBS 17762 18982 LIBS="-lbsd $LIBS" 17763 18983 cat >conftest.$ac_ext <<_ACEOF 17764 18984 -#line 10270 "configure" 17765 +#line 10 449"configure"18985 +#line 10594 "configure" 17766 18986 #include "confdefs.h" 17767 18987 17768 18988 /* Override any gcc2 internal prototype to avoid an error. */ 17769 @@ -10286,16 +10 465,16 @@18989 @@ -10286,16 +10610,16 @@ 17770 18990 } 17771 18991 _ACEOF 17772 18992 rm -f conftest.$ac_objext conftest$ac_exeext 17773 18993 -if { (eval echo "$as_me:10289: \"$ac_link\"") >&5 17774 +if { (eval echo "$as_me:10 468: \"$ac_link\"") >&518994 +if { (eval echo "$as_me:10613: \"$ac_link\"") >&5 17775 18995 (eval $ac_link) 2>&5 17776 18996 ac_status=$? 17777 18997 - echo "$as_me:10292: \$? = $ac_status" >&5 17778 + echo "$as_me:10 471: \$? = $ac_status" >&518998 + echo "$as_me:10616: \$? = $ac_status" >&5 17779 18999 (exit $ac_status); } && 17780 19000 { ac_try='test -s conftest$ac_exeext' 17781 19001 - { (eval echo "$as_me:10295: \"$ac_try\"") >&5 17782 + { (eval echo "$as_me:10 474: \"$ac_try\"") >&519002 + { (eval echo "$as_me:10619: \"$ac_try\"") >&5 17783 19003 (eval $ac_try) 2>&5 17784 19004 ac_status=$? 17785 19005 - echo "$as_me:10298: \$? = $ac_status" >&5 17786 + echo "$as_me:10 477: \$? = $ac_status" >&519006 + echo "$as_me:10622: \$? = $ac_status" >&5 17787 19007 (exit $ac_status); }; }; then 17788 19008 ac_cv_lib_bsd_gettimeofday=yes 17789 19009 else 17790 @@ -10306,7 +10 485,7 @@19010 @@ -10306,7 +10630,7 @@ 17791 19011 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 17792 19012 LIBS=$ac_check_lib_save_LIBS 17793 19013 fi 17794 19014 -echo "$as_me:10309: result: $ac_cv_lib_bsd_gettimeofday" >&5 17795 +echo "$as_me:10 488: result: $ac_cv_lib_bsd_gettimeofday" >&519015 +echo "$as_me:10633: result: $ac_cv_lib_bsd_gettimeofday" >&5 17796 19016 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 17797 19017 if test $ac_cv_lib_bsd_gettimeofday = yes; then 17798 19018 cat >>confdefs.h <<\EOF 17799 @@ -10318,14 +10 497,14 @@19019 @@ -10318,14 +10642,14 @@ 17800 19020 17801 19021 fi 17802 19022 17803 19023 -echo "$as_me:10321: checking if -lm needed for math functions" >&5 17804 +echo "$as_me:10 500: checking if -lm needed for math functions" >&519024 +echo "$as_me:10645: checking if -lm needed for math functions" >&5 17805 19025 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 17806 19026 if test "${cf_cv_need_libm+set}" = set; then … … 17810 19030 cat >conftest.$ac_ext <<_ACEOF 17811 19031 -#line 10328 "configure" 17812 +#line 10 507"configure"19032 +#line 10652 "configure" 17813 19033 #include "confdefs.h" 17814 19034 17815 19035 #include <stdio.h> 17816 @@ -10340,16 +10 519,16 @@19036 @@ -10340,16 +10664,16 @@ 17817 19037 } 17818 19038 _ACEOF 17819 19039 rm -f conftest.$ac_objext conftest$ac_exeext 17820 19040 -if { (eval echo "$as_me:10343: \"$ac_link\"") >&5 17821 +if { (eval echo "$as_me:10 522: \"$ac_link\"") >&519041 +if { (eval echo "$as_me:10667: \"$ac_link\"") >&5 17822 19042 (eval $ac_link) 2>&5 17823 19043 ac_status=$? 17824 19044 - echo "$as_me:10346: \$? = $ac_status" >&5 17825 + echo "$as_me:10 525: \$? = $ac_status" >&519045 + echo "$as_me:10670: \$? = $ac_status" >&5 17826 19046 (exit $ac_status); } && 17827 19047 { ac_try='test -s conftest$ac_exeext' 17828 19048 - { (eval echo "$as_me:10349: \"$ac_try\"") >&5 17829 + { (eval echo "$as_me:10 528: \"$ac_try\"") >&519049 + { (eval echo "$as_me:10673: \"$ac_try\"") >&5 17830 19050 (eval $ac_try) 2>&5 17831 19051 ac_status=$? 17832 19052 - echo "$as_me:10352: \$? = $ac_status" >&5 17833 + echo "$as_me:10 531: \$? = $ac_status" >&519053 + echo "$as_me:10676: \$? = $ac_status" >&5 17834 19054 (exit $ac_status); }; }; then 17835 19055 cf_cv_need_libm=no 17836 19056 else 17837 @@ -10359,7 +10 538,7 @@19057 @@ -10359,7 +10683,7 @@ 17838 19058 fi 17839 19059 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 17840 19060 fi 17841 19061 -echo "$as_me:10362: result: $cf_cv_need_libm" >&5 17842 +echo "$as_me:10 541: result: $cf_cv_need_libm" >&519062 +echo "$as_me:10686: result: $cf_cv_need_libm" >&5 17843 19063 echo "${ECHO_T}$cf_cv_need_libm" >&6 17844 19064 if test "$cf_cv_need_libm" = yes 17845 19065 then 17846 @@ -10367,13 +10 546,13 @@19066 @@ -10367,13 +10691,13 @@ 17847 19067 fi 17848 19068 17849 19069 ### Checks for header files. 17850 19070 -echo "$as_me:10370: checking for ANSI C header files" >&5 17851 +echo "$as_me:10 549: checking for ANSI C header files" >&519071 +echo "$as_me:10694: checking for ANSI C header files" >&5 17852 19072 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 17853 19073 if test "${ac_cv_header_stdc+set}" = set; then … … 17856 19076 cat >conftest.$ac_ext <<_ACEOF 17857 19077 -#line 10376 "configure" 17858 +#line 10 555"configure"19078 +#line 10700 "configure" 17859 19079 #include "confdefs.h" 17860 19080 #include <stdlib.h> 17861 19081 #include <stdarg.h> 17862 @@ -10381,13 +10 560,13 @@19082 @@ -10381,13 +10705,13 @@ 17863 19083 #include <float.h> 17864 19084 17865 19085 _ACEOF 17866 19086 -if { (eval echo "$as_me:10384: \"$ac_cpp conftest.$ac_ext\"") >&5 17867 +if { (eval echo "$as_me:10 563: \"$ac_cpp conftest.$ac_ext\"") >&519087 +if { (eval echo "$as_me:10708: \"$ac_cpp conftest.$ac_ext\"") >&5 17868 19088 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 17869 19089 ac_status=$? … … 17872 19092 cat conftest.err >&5 17873 19093 - echo "$as_me:10390: \$? = $ac_status" >&5 17874 + echo "$as_me:10 569: \$? = $ac_status" >&519094 + echo "$as_me:10714: \$? = $ac_status" >&5 17875 19095 (exit $ac_status); } >/dev/null; then 17876 19096 if test -s conftest.err; then 17877 19097 ac_cpp_err=$ac_c_preproc_warn_flag 17878 @@ -10409,7 +10 588,7 @@19098 @@ -10409,7 +10733,7 @@ 17879 19099 if test $ac_cv_header_stdc = yes; then 17880 19100 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 17881 19101 cat >conftest.$ac_ext <<_ACEOF 17882 19102 -#line 10412 "configure" 17883 +#line 10 591"configure"19103 +#line 10736 "configure" 17884 19104 #include "confdefs.h" 17885 19105 #include <string.h> 17886 19106 17887 @@ -10427,7 +10 606,7 @@19107 @@ -10427,7 +10751,7 @@ 17888 19108 if test $ac_cv_header_stdc = yes; then 17889 19109 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 17890 19110 cat >conftest.$ac_ext <<_ACEOF 17891 19111 -#line 10430 "configure" 17892 +#line 10 609"configure"19112 +#line 10754 "configure" 17893 19113 #include "confdefs.h" 17894 19114 #include <stdlib.h> 17895 19115 17896 @@ -10448,7 +10 627,7 @@19116 @@ -10448,7 +10772,7 @@ 17897 19117 : 17898 19118 else 17899 19119 cat >conftest.$ac_ext <<_ACEOF 17900 19120 -#line 10451 "configure" 17901 +#line 10 630"configure"19121 +#line 10775 "configure" 17902 19122 #include "confdefs.h" 17903 19123 #include <ctype.h> 17904 19124 #if ((' ' & 0x0FF) == 0x020) 17905 @@ -10474,15 +10 653,15 @@19125 @@ -10474,15 +10798,15 @@ 17906 19126 } 17907 19127 _ACEOF 17908 19128 rm -f conftest$ac_exeext 17909 19129 -if { (eval echo "$as_me:10477: \"$ac_link\"") >&5 17910 +if { (eval echo "$as_me:10 656: \"$ac_link\"") >&519130 +if { (eval echo "$as_me:10801: \"$ac_link\"") >&5 17911 19131 (eval $ac_link) 2>&5 17912 19132 ac_status=$? 17913 19133 - echo "$as_me:10480: \$? = $ac_status" >&5 17914 + echo "$as_me:10 659: \$? = $ac_status" >&519134 + echo "$as_me:10804: \$? = $ac_status" >&5 17915 19135 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 17916 19136 - { (eval echo "$as_me:10482: \"$ac_try\"") >&5 17917 + { (eval echo "$as_me:10 661: \"$ac_try\"") >&519137 + { (eval echo "$as_me:10806: \"$ac_try\"") >&5 17918 19138 (eval $ac_try) 2>&5 17919 19139 ac_status=$? 17920 19140 - echo "$as_me:10485: \$? = $ac_status" >&5 17921 + echo "$as_me:10 664: \$? = $ac_status" >&519141 + echo "$as_me:10809: \$? = $ac_status" >&5 17922 19142 (exit $ac_status); }; }; then 17923 19143 : 17924 19144 else 17925 @@ -10495,7 +10 674,7 @@19145 @@ -10495,7 +10819,7 @@ 17926 19146 fi 17927 19147 fi 17928 19148 fi 17929 19149 -echo "$as_me:10498: result: $ac_cv_header_stdc" >&5 17930 +echo "$as_me:10 677: result: $ac_cv_header_stdc" >&519150 +echo "$as_me:10822: result: $ac_cv_header_stdc" >&5 17931 19151 echo "${ECHO_T}$ac_cv_header_stdc" >&6 17932 19152 if test $ac_cv_header_stdc = yes; then 17933 19153 17934 @@ -10508,13 +10 687,13 @@19154 @@ -10508,13 +10832,13 @@ 17935 19155 ac_header_dirent=no 17936 19156 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do 17937 19157 as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` 17938 19158 -echo "$as_me:10511: checking for $ac_hdr that defines DIR" >&5 17939 +echo "$as_me:10 690: checking for $ac_hdr that defines DIR" >&519159 +echo "$as_me:10835: checking for $ac_hdr that defines DIR" >&5 17940 19160 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 17941 19161 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 17944 19164 cat >conftest.$ac_ext <<_ACEOF 17945 19165 -#line 10517 "configure" 17946 +#line 10 696"configure"19166 +#line 10841 "configure" 17947 19167 #include "confdefs.h" 17948 19168 #include <sys/types.h> 17949 19169 #include <$ac_hdr> 17950 @@ -10529,16 +10 708,16 @@19170 @@ -10529,16 +10853,16 @@ 17951 19171 } 17952 19172 _ACEOF 17953 19173 rm -f conftest.$ac_objext 17954 19174 -if { (eval echo "$as_me:10532: \"$ac_compile\"") >&5 17955 +if { (eval echo "$as_me:10 711: \"$ac_compile\"") >&519175 +if { (eval echo "$as_me:10856: \"$ac_compile\"") >&5 17956 19176 (eval $ac_compile) 2>&5 17957 19177 ac_status=$? 17958 19178 - echo "$as_me:10535: \$? = $ac_status" >&5 17959 + echo "$as_me:10 714: \$? = $ac_status" >&519179 + echo "$as_me:10859: \$? = $ac_status" >&5 17960 19180 (exit $ac_status); } && 17961 19181 { ac_try='test -s conftest.$ac_objext' 17962 19182 - { (eval echo "$as_me:10538: \"$ac_try\"") >&5 17963 + { (eval echo "$as_me:10 717: \"$ac_try\"") >&519183 + { (eval echo "$as_me:10862: \"$ac_try\"") >&5 17964 19184 (eval $ac_try) 2>&5 17965 19185 ac_status=$? 17966 19186 - echo "$as_me:10541: \$? = $ac_status" >&5 17967 + echo "$as_me:10 720: \$? = $ac_status" >&519187 + echo "$as_me:10865: \$? = $ac_status" >&5 17968 19188 (exit $ac_status); }; }; then 17969 19189 eval "$as_ac_Header=yes" 17970 19190 else 17971 @@ -10548,7 +10 727,7 @@19191 @@ -10548,7 +10872,7 @@ 17972 19192 fi 17973 19193 rm -f conftest.$ac_objext conftest.$ac_ext 17974 19194 fi 17975 19195 -echo "$as_me:10551: result: `eval echo '${'$as_ac_Header'}'`" >&5 17976 +echo "$as_me:10 730: result: `eval echo '${'$as_ac_Header'}'`" >&519196 +echo "$as_me:10875: result: `eval echo '${'$as_ac_Header'}'`" >&5 17977 19197 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 17978 19198 if test `eval echo '${'$as_ac_Header'}'` = yes; then 17979 19199 cat >>confdefs.h <<EOF 17980 @@ -10561,7 +10 740,7 @@19200 @@ -10561,7 +10885,7 @@ 17981 19201 done 17982 19202 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. 17983 19203 if test $ac_header_dirent = dirent.h; then 17984 19204 - echo "$as_me:10564: checking for opendir in -ldir" >&5 17985 + echo "$as_me:10 743: checking for opendir in -ldir" >&519205 + echo "$as_me:10888: checking for opendir in -ldir" >&5 17986 19206 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 17987 19207 if test "${ac_cv_lib_dir_opendir+set}" = set; then 17988 19208 echo $ECHO_N "(cached) $ECHO_C" >&6 17989 @@ -10569,7 +10 748,7 @@19209 @@ -10569,7 +10893,7 @@ 17990 19210 ac_check_lib_save_LIBS=$LIBS 17991 19211 LIBS="-ldir $LIBS" 17992 19212 cat >conftest.$ac_ext <<_ACEOF 17993 19213 -#line 10572 "configure" 17994 +#line 10 751"configure"19214 +#line 10896 "configure" 17995 19215 #include "confdefs.h" 17996 19216 17997 19217 /* Override any gcc2 internal prototype to avoid an error. */ 17998 @@ -10588,16 +10 767,16 @@19218 @@ -10588,16 +10912,16 @@ 17999 19219 } 18000 19220 _ACEOF 18001 19221 rm -f conftest.$ac_objext conftest$ac_exeext 18002 19222 -if { (eval echo "$as_me:10591: \"$ac_link\"") >&5 18003 +if { (eval echo "$as_me:10 770: \"$ac_link\"") >&519223 +if { (eval echo "$as_me:10915: \"$ac_link\"") >&5 18004 19224 (eval $ac_link) 2>&5 18005 19225 ac_status=$? 18006 19226 - echo "$as_me:10594: \$? = $ac_status" >&5 18007 + echo "$as_me:10 773: \$? = $ac_status" >&519227 + echo "$as_me:10918: \$? = $ac_status" >&5 18008 19228 (exit $ac_status); } && 18009 19229 { ac_try='test -s conftest$ac_exeext' 18010 19230 - { (eval echo "$as_me:10597: \"$ac_try\"") >&5 18011 + { (eval echo "$as_me:10 776: \"$ac_try\"") >&519231 + { (eval echo "$as_me:10921: \"$ac_try\"") >&5 18012 19232 (eval $ac_try) 2>&5 18013 19233 ac_status=$? 18014 19234 - echo "$as_me:10600: \$? = $ac_status" >&5 18015 + echo "$as_me:10 779: \$? = $ac_status" >&519235 + echo "$as_me:10924: \$? = $ac_status" >&5 18016 19236 (exit $ac_status); }; }; then 18017 19237 ac_cv_lib_dir_opendir=yes 18018 19238 else 18019 @@ -10608,14 +10 787,14 @@19239 @@ -10608,14 +10932,14 @@ 18020 19240 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 18021 19241 LIBS=$ac_check_lib_save_LIBS 18022 19242 fi 18023 19243 -echo "$as_me:10611: result: $ac_cv_lib_dir_opendir" >&5 18024 +echo "$as_me:10 790: result: $ac_cv_lib_dir_opendir" >&519244 +echo "$as_me:10935: result: $ac_cv_lib_dir_opendir" >&5 18025 19245 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 18026 19246 if test $ac_cv_lib_dir_opendir = yes; then … … 18030 19250 else 18031 19251 - echo "$as_me:10618: checking for opendir in -lx" >&5 18032 + echo "$as_me:10 797: checking for opendir in -lx" >&519252 + echo "$as_me:10942: checking for opendir in -lx" >&5 18033 19253 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 18034 19254 if test "${ac_cv_lib_x_opendir+set}" = set; then 18035 19255 echo $ECHO_N "(cached) $ECHO_C" >&6 18036 @@ -10623,7 +10 802,7 @@19256 @@ -10623,7 +10947,7 @@ 18037 19257 ac_check_lib_save_LIBS=$LIBS 18038 19258 LIBS="-lx $LIBS" 18039 19259 cat >conftest.$ac_ext <<_ACEOF 18040 19260 -#line 10626 "configure" 18041 +#line 10 805"configure"19261 +#line 10950 "configure" 18042 19262 #include "confdefs.h" 18043 19263 18044 19264 /* Override any gcc2 internal prototype to avoid an error. */ 18045 @@ -10642,16 +10 821,16 @@19265 @@ -10642,16 +10966,16 @@ 18046 19266 } 18047 19267 _ACEOF 18048 19268 rm -f conftest.$ac_objext conftest$ac_exeext 18049 19269 -if { (eval echo "$as_me:10645: \"$ac_link\"") >&5 18050 +if { (eval echo "$as_me:10 824: \"$ac_link\"") >&519270 +if { (eval echo "$as_me:10969: \"$ac_link\"") >&5 18051 19271 (eval $ac_link) 2>&5 18052 19272 ac_status=$? 18053 19273 - echo "$as_me:10648: \$? = $ac_status" >&5 18054 + echo "$as_me:10 827: \$? = $ac_status" >&519274 + echo "$as_me:10972: \$? = $ac_status" >&5 18055 19275 (exit $ac_status); } && 18056 19276 { ac_try='test -s conftest$ac_exeext' 18057 19277 - { (eval echo "$as_me:10651: \"$ac_try\"") >&5 18058 + { (eval echo "$as_me:10 830: \"$ac_try\"") >&519278 + { (eval echo "$as_me:10975: \"$ac_try\"") >&5 18059 19279 (eval $ac_try) 2>&5 18060 19280 ac_status=$? 18061 19281 - echo "$as_me:10654: \$? = $ac_status" >&5 18062 + echo "$as_me:10 833: \$? = $ac_status" >&519282 + echo "$as_me:10978: \$? = $ac_status" >&5 18063 19283 (exit $ac_status); }; }; then 18064 19284 ac_cv_lib_x_opendir=yes 18065 19285 else 18066 @@ -10662,7 +10 841,7 @@19286 @@ -10662,7 +10986,7 @@ 18067 19287 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 18068 19288 LIBS=$ac_check_lib_save_LIBS 18069 19289 fi 18070 19290 -echo "$as_me:10665: result: $ac_cv_lib_x_opendir" >&5 18071 +echo "$as_me:10 844: result: $ac_cv_lib_x_opendir" >&519291 +echo "$as_me:10989: result: $ac_cv_lib_x_opendir" >&5 18072 19292 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 18073 19293 if test $ac_cv_lib_x_opendir = yes; then 18074 19294 LIBS="$LIBS -lx" 18075 @@ -10670,13 +10 849,13 @@19295 @@ -10670,13 +10994,13 @@ 18076 19296 18077 19297 fi 18078 19298 18079 19299 -echo "$as_me:10673: checking whether time.h and sys/time.h may both be included" >&5 18080 +echo "$as_me:10 852: checking whether time.h and sys/time.h may both be included" >&519300 +echo "$as_me:10997: checking whether time.h and sys/time.h may both be included" >&5 18081 19301 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 18082 19302 if test "${ac_cv_header_time+set}" = set; then … … 18085 19305 cat >conftest.$ac_ext <<_ACEOF 18086 19306 -#line 10679 "configure" 18087 +#line 1 0858"configure"19307 +#line 11003 "configure" 18088 19308 #include "confdefs.h" 18089 19309 #include <sys/types.h> 18090 19310 #include <sys/time.h> 18091 @@ -10692,16 +1 0871,16 @@19311 @@ -10692,16 +11016,16 @@ 18092 19312 } 18093 19313 _ACEOF 18094 19314 rm -f conftest.$ac_objext 18095 19315 -if { (eval echo "$as_me:10695: \"$ac_compile\"") >&5 18096 +if { (eval echo "$as_me:1 0874: \"$ac_compile\"") >&519316 +if { (eval echo "$as_me:11019: \"$ac_compile\"") >&5 18097 19317 (eval $ac_compile) 2>&5 18098 19318 ac_status=$? 18099 19319 - echo "$as_me:10698: \$? = $ac_status" >&5 18100 + echo "$as_me:1 0877: \$? = $ac_status" >&519320 + echo "$as_me:11022: \$? = $ac_status" >&5 18101 19321 (exit $ac_status); } && 18102 19322 { ac_try='test -s conftest.$ac_objext' 18103 19323 - { (eval echo "$as_me:10701: \"$ac_try\"") >&5 18104 + { (eval echo "$as_me:1 0880: \"$ac_try\"") >&519324 + { (eval echo "$as_me:11025: \"$ac_try\"") >&5 18105 19325 (eval $ac_try) 2>&5 18106 19326 ac_status=$? 18107 19327 - echo "$as_me:10704: \$? = $ac_status" >&5 18108 + echo "$as_me:1 0883: \$? = $ac_status" >&519328 + echo "$as_me:11028: \$? = $ac_status" >&5 18109 19329 (exit $ac_status); }; }; then 18110 19330 ac_cv_header_time=yes 18111 19331 else 18112 @@ -10711,7 +1 0890,7 @@19332 @@ -10711,7 +11035,7 @@ 18113 19333 fi 18114 19334 rm -f conftest.$ac_objext conftest.$ac_ext 18115 19335 fi 18116 19336 -echo "$as_me:10714: result: $ac_cv_header_time" >&5 18117 +echo "$as_me:1 0893: result: $ac_cv_header_time" >&519337 +echo "$as_me:11038: result: $ac_cv_header_time" >&5 18118 19338 echo "${ECHO_T}$ac_cv_header_time" >&6 18119 19339 if test $ac_cv_header_time = yes; then 18120 19340 18121 @@ -10721,14 +1 0900,14 @@19341 @@ -10721,14 +11045,14 @@ 18122 19342 18123 19343 fi 18124 19344 18125 19345 -echo "$as_me:10724: checking for regular-expression headers" >&5 18126 +echo "$as_me:1 0903: checking for regular-expression headers" >&519346 +echo "$as_me:11048: checking for regular-expression headers" >&5 18127 19347 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 18128 19348 if test "${cf_cv_regex+set}" = set; then … … 18132 19352 cat >conftest.$ac_ext <<_ACEOF 18133 19353 -#line 10731 "configure" 18134 +#line 1 0910"configure"19354 +#line 11055 "configure" 18135 19355 #include "confdefs.h" 18136 19356 #include <sys/types.h> 18137 19357 #include <regex.h> 18138 @@ -10746,16 +1 0925,16 @@19358 @@ -10746,16 +11070,16 @@ 18139 19359 } 18140 19360 _ACEOF 18141 19361 rm -f conftest.$ac_objext conftest$ac_exeext 18142 19362 -if { (eval echo "$as_me:10749: \"$ac_link\"") >&5 18143 +if { (eval echo "$as_me:1 0928: \"$ac_link\"") >&519363 +if { (eval echo "$as_me:11073: \"$ac_link\"") >&5 18144 19364 (eval $ac_link) 2>&5 18145 19365 ac_status=$? 18146 19366 - echo "$as_me:10752: \$? = $ac_status" >&5 18147 + echo "$as_me:1 0931: \$? = $ac_status" >&519367 + echo "$as_me:11076: \$? = $ac_status" >&5 18148 19368 (exit $ac_status); } && 18149 19369 { ac_try='test -s conftest$ac_exeext' 18150 19370 - { (eval echo "$as_me:10755: \"$ac_try\"") >&5 18151 + { (eval echo "$as_me:1 0934: \"$ac_try\"") >&519371 + { (eval echo "$as_me:11079: \"$ac_try\"") >&5 18152 19372 (eval $ac_try) 2>&5 18153 19373 ac_status=$? 18154 19374 - echo "$as_me:10758: \$? = $ac_status" >&5 18155 + echo "$as_me:1 0937: \$? = $ac_status" >&519375 + echo "$as_me:11082: \$? = $ac_status" >&5 18156 19376 (exit $ac_status); }; }; then 18157 19377 cf_cv_regex="regex.h" 18158 19378 else 18159 @@ -10763,7 +1 0942,7 @@19379 @@ -10763,7 +11087,7 @@ 18160 19380 cat conftest.$ac_ext >&5 18161 19381 18162 19382 cat >conftest.$ac_ext <<_ACEOF 18163 19383 -#line 10766 "configure" 18164 +#line 1 0945"configure"19384 +#line 11090 "configure" 18165 19385 #include "confdefs.h" 18166 19386 #include <regexp.h> 18167 19387 int 18168 @@ -10778,16 +1 0957,16 @@19388 @@ -10778,16 +11102,16 @@ 18169 19389 } 18170 19390 _ACEOF 18171 19391 rm -f conftest.$ac_objext conftest$ac_exeext 18172 19392 -if { (eval echo "$as_me:10781: \"$ac_link\"") >&5 18173 +if { (eval echo "$as_me:1 0960: \"$ac_link\"") >&519393 +if { (eval echo "$as_me:11105: \"$ac_link\"") >&5 18174 19394 (eval $ac_link) 2>&5 18175 19395 ac_status=$? 18176 19396 - echo "$as_me:10784: \$? = $ac_status" >&5 18177 + echo "$as_me:1 0963: \$? = $ac_status" >&519397 + echo "$as_me:11108: \$? = $ac_status" >&5 18178 19398 (exit $ac_status); } && 18179 19399 { ac_try='test -s conftest$ac_exeext' 18180 19400 - { (eval echo "$as_me:10787: \"$ac_try\"") >&5 18181 + { (eval echo "$as_me:1 0966: \"$ac_try\"") >&519401 + { (eval echo "$as_me:11111: \"$ac_try\"") >&5 18182 19402 (eval $ac_try) 2>&5 18183 19403 ac_status=$? 18184 19404 - echo "$as_me:10790: \$? = $ac_status" >&5 18185 + echo "$as_me:1 0969: \$? = $ac_status" >&519405 + echo "$as_me:11114: \$? = $ac_status" >&5 18186 19406 (exit $ac_status); }; }; then 18187 19407 cf_cv_regex="regexp.h" 18188 19408 else 18189 @@ -10797,7 +1 0976,7 @@19409 @@ -10797,7 +11121,7 @@ 18190 19410 cf_save_LIBS="$LIBS" 18191 19411 LIBS="-lgen $LIBS" 18192 19412 cat >conftest.$ac_ext <<_ACEOF 18193 19413 -#line 10800 "configure" 18194 +#line 1 0979"configure"19414 +#line 11124 "configure" 18195 19415 #include "confdefs.h" 18196 19416 #include <regexpr.h> 18197 19417 int 18198 @@ -10812,16 +1 0991,16 @@19418 @@ -10812,16 +11136,16 @@ 18199 19419 } 18200 19420 _ACEOF 18201 19421 rm -f conftest.$ac_objext conftest$ac_exeext 18202 19422 -if { (eval echo "$as_me:10815: \"$ac_link\"") >&5 18203 +if { (eval echo "$as_me:1 0994: \"$ac_link\"") >&519423 +if { (eval echo "$as_me:11139: \"$ac_link\"") >&5 18204 19424 (eval $ac_link) 2>&5 18205 19425 ac_status=$? 18206 19426 - echo "$as_me:10818: \$? = $ac_status" >&5 18207 + echo "$as_me:1 0997: \$? = $ac_status" >&519427 + echo "$as_me:11142: \$? = $ac_status" >&5 18208 19428 (exit $ac_status); } && 18209 19429 { ac_try='test -s conftest$ac_exeext' 18210 19430 - { (eval echo "$as_me:10821: \"$ac_try\"") >&5 18211 + { (eval echo "$as_me:11 000: \"$ac_try\"") >&519431 + { (eval echo "$as_me:11145: \"$ac_try\"") >&5 18212 19432 (eval $ac_try) 2>&5 18213 19433 ac_status=$? 18214 19434 - echo "$as_me:10824: \$? = $ac_status" >&5 18215 + echo "$as_me:11 003: \$? = $ac_status" >&519435 + echo "$as_me:11148: \$? = $ac_status" >&5 18216 19436 (exit $ac_status); }; }; then 18217 19437 cf_cv_regex="regexpr.h" 18218 19438 else 18219 @@ -10837,7 +11 016,7 @@19439 @@ -10837,7 +11161,7 @@ 18220 19440 18221 19441 fi 18222 19442 18223 19443 -echo "$as_me:10840: result: $cf_cv_regex" >&5 18224 +echo "$as_me:11 019: result: $cf_cv_regex" >&519444 +echo "$as_me:11164: result: $cf_cv_regex" >&5 18225 19445 echo "${ECHO_T}$cf_cv_regex" >&6 18226 19446 case $cf_cv_regex in 18227 19447 regex.h) cat >>confdefs.h <<\EOF 18228 @@ -10873,23 +11 052,23 @@19448 @@ -10873,23 +11197,23 @@ 18229 19449 18230 19450 do 18231 19451 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 18232 19452 -echo "$as_me:10876: checking for $ac_header" >&5 18233 +echo "$as_me:11 055: checking for $ac_header" >&519453 +echo "$as_me:11200: checking for $ac_header" >&5 18234 19454 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 18235 19455 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 18238 19458 cat >conftest.$ac_ext <<_ACEOF 18239 19459 -#line 10882 "configure" 18240 +#line 11 061"configure"19460 +#line 11206 "configure" 18241 19461 #include "confdefs.h" 18242 19462 #include <$ac_header> 18243 19463 _ACEOF 18244 19464 -if { (eval echo "$as_me:10886: \"$ac_cpp conftest.$ac_ext\"") >&5 18245 +if { (eval echo "$as_me:11 065: \"$ac_cpp conftest.$ac_ext\"") >&519465 +if { (eval echo "$as_me:11210: \"$ac_cpp conftest.$ac_ext\"") >&5 18246 19466 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 18247 19467 ac_status=$? … … 18250 19470 cat conftest.err >&5 18251 19471 - echo "$as_me:10892: \$? = $ac_status" >&5 18252 + echo "$as_me:11 071: \$? = $ac_status" >&519472 + echo "$as_me:11216: \$? = $ac_status" >&5 18253 19473 (exit $ac_status); } >/dev/null; then 18254 19474 if test -s conftest.err; then 18255 19475 ac_cpp_err=$ac_c_preproc_warn_flag 18256 @@ -10908,7 +11 087,7 @@19476 @@ -10908,7 +11232,7 @@ 18257 19477 fi 18258 19478 rm -f conftest.err conftest.$ac_ext 18259 19479 fi 18260 19480 -echo "$as_me:10911: result: `eval echo '${'$as_ac_Header'}'`" >&5 18261 +echo "$as_me:11 090: result: `eval echo '${'$as_ac_Header'}'`" >&519481 +echo "$as_me:11235: result: `eval echo '${'$as_ac_Header'}'`" >&5 18262 19482 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 18263 19483 if test `eval echo '${'$as_ac_Header'}'` = yes; then 18264 19484 cat >>confdefs.h <<EOF 18265 @@ -10922,7 +11 101,7 @@19485 @@ -10922,7 +11246,7 @@ 18266 19486 # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set 18267 19487 if test "$ISC" = yes ; then 18268 19488 18269 19489 -echo "$as_me:10925: checking for main in -lcposix" >&5 18270 +echo "$as_me:11 104: checking for main in -lcposix" >&519490 +echo "$as_me:11249: checking for main in -lcposix" >&5 18271 19491 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6 18272 19492 if test "${ac_cv_lib_cposix_main+set}" = set; then 18273 19493 echo $ECHO_N "(cached) $ECHO_C" >&6 18274 @@ -10930,7 +11 109,7 @@19494 @@ -10930,7 +11254,7 @@ 18275 19495 ac_check_lib_save_LIBS=$LIBS 18276 19496 LIBS="-lcposix $LIBS" 18277 19497 cat >conftest.$ac_ext <<_ACEOF 18278 19498 -#line 10933 "configure" 18279 +#line 11 112"configure"19499 +#line 11257 "configure" 18280 19500 #include "confdefs.h" 18281 19501 18282 19502 int 18283 @@ -10942,16 +11 121,16 @@19503 @@ -10942,16 +11266,16 @@ 18284 19504 } 18285 19505 _ACEOF 18286 19506 rm -f conftest.$ac_objext conftest$ac_exeext 18287 19507 -if { (eval echo "$as_me:10945: \"$ac_link\"") >&5 18288 +if { (eval echo "$as_me:11 124: \"$ac_link\"") >&519508 +if { (eval echo "$as_me:11269: \"$ac_link\"") >&5 18289 19509 (eval $ac_link) 2>&5 18290 19510 ac_status=$? 18291 19511 - echo "$as_me:10948: \$? = $ac_status" >&5 18292 + echo "$as_me:11 127: \$? = $ac_status" >&519512 + echo "$as_me:11272: \$? = $ac_status" >&5 18293 19513 (exit $ac_status); } && 18294 19514 { ac_try='test -s conftest$ac_exeext' 18295 19515 - { (eval echo "$as_me:10951: \"$ac_try\"") >&5 18296 + { (eval echo "$as_me:11 130: \"$ac_try\"") >&519516 + { (eval echo "$as_me:11275: \"$ac_try\"") >&5 18297 19517 (eval $ac_try) 2>&5 18298 19518 ac_status=$? 18299 19519 - echo "$as_me:10954: \$? = $ac_status" >&5 18300 + echo "$as_me:11 133: \$? = $ac_status" >&519520 + echo "$as_me:11278: \$? = $ac_status" >&5 18301 19521 (exit $ac_status); }; }; then 18302 19522 ac_cv_lib_cposix_main=yes 18303 19523 else 18304 @@ -10962,7 +11 141,7 @@19524 @@ -10962,7 +11286,7 @@ 18305 19525 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 18306 19526 LIBS=$ac_check_lib_save_LIBS 18307 19527 fi 18308 19528 -echo "$as_me:10965: result: $ac_cv_lib_cposix_main" >&5 18309 +echo "$as_me:11 144: result: $ac_cv_lib_cposix_main" >&519529 +echo "$as_me:11289: result: $ac_cv_lib_cposix_main" >&5 18310 19530 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6 18311 19531 if test $ac_cv_lib_cposix_main = yes; then 18312 19532 cat >>confdefs.h <<EOF 18313 @@ -10973,7 +11 152,7 @@19533 @@ -10973,7 +11297,7 @@ 18314 19534 18315 19535 fi 18316 19536 18317 19537 - echo "$as_me:10976: checking for bzero in -linet" >&5 18318 + echo "$as_me:11 155: checking for bzero in -linet" >&519538 + echo "$as_me:11300: checking for bzero in -linet" >&5 18319 19539 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6 18320 19540 if test "${ac_cv_lib_inet_bzero+set}" = set; then 18321 19541 echo $ECHO_N "(cached) $ECHO_C" >&6 18322 @@ -10981,7 +11 160,7 @@19542 @@ -10981,7 +11305,7 @@ 18323 19543 ac_check_lib_save_LIBS=$LIBS 18324 19544 LIBS="-linet $LIBS" 18325 19545 cat >conftest.$ac_ext <<_ACEOF 18326 19546 -#line 10984 "configure" 18327 +#line 11 163"configure"19547 +#line 11308 "configure" 18328 19548 #include "confdefs.h" 18329 19549 18330 19550 /* Override any gcc2 internal prototype to avoid an error. */ 18331 @@ -11000,16 +11 179,16 @@19551 @@ -11000,16 +11324,16 @@ 18332 19552 } 18333 19553 _ACEOF 18334 19554 rm -f conftest.$ac_objext conftest$ac_exeext 18335 19555 -if { (eval echo "$as_me:11003: \"$ac_link\"") >&5 18336 +if { (eval echo "$as_me:11 182: \"$ac_link\"") >&519556 +if { (eval echo "$as_me:11327: \"$ac_link\"") >&5 18337 19557 (eval $ac_link) 2>&5 18338 19558 ac_status=$? 18339 19559 - echo "$as_me:11006: \$? = $ac_status" >&5 18340 + echo "$as_me:11 185: \$? = $ac_status" >&519560 + echo "$as_me:11330: \$? = $ac_status" >&5 18341 19561 (exit $ac_status); } && 18342 19562 { ac_try='test -s conftest$ac_exeext' 18343 19563 - { (eval echo "$as_me:11009: \"$ac_try\"") >&5 18344 + { (eval echo "$as_me:11 188: \"$ac_try\"") >&519564 + { (eval echo "$as_me:11333: \"$ac_try\"") >&5 18345 19565 (eval $ac_try) 2>&5 18346 19566 ac_status=$? 18347 19567 - echo "$as_me:11012: \$? = $ac_status" >&5 18348 + echo "$as_me:11 191: \$? = $ac_status" >&519568 + echo "$as_me:11336: \$? = $ac_status" >&5 18349 19569 (exit $ac_status); }; }; then 18350 19570 ac_cv_lib_inet_bzero=yes 18351 19571 else 18352 @@ -11020,21 +11 199,21 @@19572 @@ -11020,21 +11344,21 @@ 18353 19573 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 18354 19574 LIBS=$ac_check_lib_save_LIBS 18355 19575 fi 18356 19576 -echo "$as_me:11023: result: $ac_cv_lib_inet_bzero" >&5 18357 +echo "$as_me:11 202: result: $ac_cv_lib_inet_bzero" >&519577 +echo "$as_me:11347: result: $ac_cv_lib_inet_bzero" >&5 18358 19578 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6 18359 19579 if test $ac_cv_lib_inet_bzero = yes; then … … 18363 19583 18364 19584 -echo "$as_me:11030: checking if sys/time.h works with sys/select.h" >&5 18365 +echo "$as_me:11 209: checking if sys/time.h works with sys/select.h" >&519585 +echo "$as_me:11354: checking if sys/time.h works with sys/select.h" >&5 18366 19586 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 18367 19587 if test "${cf_cv_sys_time_select+set}" = set; then … … 18371 19591 cat >conftest.$ac_ext <<_ACEOF 18372 19592 -#line 11037 "configure" 18373 +#line 11 216"configure"19593 +#line 11361 "configure" 18374 19594 #include "confdefs.h" 18375 19595 18376 19596 #include <sys/types.h> 18377 @@ -11054,16 +11 233,16 @@19597 @@ -11054,16 +11378,16 @@ 18378 19598 } 18379 19599 _ACEOF 18380 19600 rm -f conftest.$ac_objext 18381 19601 -if { (eval echo "$as_me:11057: \"$ac_compile\"") >&5 18382 +if { (eval echo "$as_me:11 236: \"$ac_compile\"") >&519602 +if { (eval echo "$as_me:11381: \"$ac_compile\"") >&5 18383 19603 (eval $ac_compile) 2>&5 18384 19604 ac_status=$? 18385 19605 - echo "$as_me:11060: \$? = $ac_status" >&5 18386 + echo "$as_me:11 239: \$? = $ac_status" >&519606 + echo "$as_me:11384: \$? = $ac_status" >&5 18387 19607 (exit $ac_status); } && 18388 19608 { ac_try='test -s conftest.$ac_objext' 18389 19609 - { (eval echo "$as_me:11063: \"$ac_try\"") >&5 18390 + { (eval echo "$as_me:11 242: \"$ac_try\"") >&519610 + { (eval echo "$as_me:11387: \"$ac_try\"") >&5 18391 19611 (eval $ac_try) 2>&5 18392 19612 ac_status=$? 18393 19613 - echo "$as_me:11066: \$? = $ac_status" >&5 18394 + echo "$as_me:11 245: \$? = $ac_status" >&519614 + echo "$as_me:11390: \$? = $ac_status" >&5 18395 19615 (exit $ac_status); }; }; then 18396 19616 cf_cv_sys_time_select=yes 18397 19617 else 18398 @@ -11075,7 +11 254,7 @@19618 @@ -11075,7 +11399,7 @@ 18399 19619 18400 19620 fi 18401 19621 18402 19622 -echo "$as_me:11078: result: $cf_cv_sys_time_select" >&5 18403 +echo "$as_me:11 257: result: $cf_cv_sys_time_select" >&519623 +echo "$as_me:11402: result: $cf_cv_sys_time_select" >&5 18404 19624 echo "${ECHO_T}$cf_cv_sys_time_select" >&6 18405 19625 test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF 18406 19626 #define HAVE_SYS_TIME_SELECT 1 18407 @@ -11089,7 +11 268,7 @@19627 @@ -11089,7 +11413,7 @@ 18408 19628 ac_compiler_gnu=$ac_cv_c_compiler_gnu 18409 19629 ac_main_return=return 18410 19630 18411 19631 -echo "$as_me:11092: checking for $CC option to accept ANSI C" >&5 18412 +echo "$as_me:11 271: checking for $CC option to accept ANSI C" >&519632 +echo "$as_me:11416: checking for $CC option to accept ANSI C" >&5 18413 19633 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 18414 19634 if test "${ac_cv_prog_cc_stdc+set}" = set; then 18415 19635 echo $ECHO_N "(cached) $ECHO_C" >&6 18416 @@ -11097,7 +11 276,7 @@19636 @@ -11097,7 +11421,7 @@ 18417 19637 ac_cv_prog_cc_stdc=no 18418 19638 ac_save_CC=$CC 18419 19639 cat >conftest.$ac_ext <<_ACEOF 18420 19640 -#line 11100 "configure" 18421 +#line 11 279"configure"19641 +#line 11424 "configure" 18422 19642 #include "confdefs.h" 18423 19643 #include <stdarg.h> 18424 19644 #include <stdio.h> 18425 @@ -11146,16 +11 325,16 @@19645 @@ -11146,16 +11470,16 @@ 18426 19646 do 18427 19647 CC="$ac_save_CC $ac_arg" 18428 19648 rm -f conftest.$ac_objext 18429 19649 -if { (eval echo "$as_me:11149: \"$ac_compile\"") >&5 18430 +if { (eval echo "$as_me:11 328: \"$ac_compile\"") >&519650 +if { (eval echo "$as_me:11473: \"$ac_compile\"") >&5 18431 19651 (eval $ac_compile) 2>&5 18432 19652 ac_status=$? 18433 19653 - echo "$as_me:11152: \$? = $ac_status" >&5 18434 + echo "$as_me:11 331: \$? = $ac_status" >&519654 + echo "$as_me:11476: \$? = $ac_status" >&5 18435 19655 (exit $ac_status); } && 18436 19656 { ac_try='test -s conftest.$ac_objext' 18437 19657 - { (eval echo "$as_me:11155: \"$ac_try\"") >&5 18438 + { (eval echo "$as_me:11 334: \"$ac_try\"") >&519658 + { (eval echo "$as_me:11479: \"$ac_try\"") >&5 18439 19659 (eval $ac_try) 2>&5 18440 19660 ac_status=$? 18441 19661 - echo "$as_me:11158: \$? = $ac_status" >&5 18442 + echo "$as_me:11 337: \$? = $ac_status" >&519662 + echo "$as_me:11482: \$? = $ac_status" >&5 18443 19663 (exit $ac_status); }; }; then 18444 19664 ac_cv_prog_cc_stdc=$ac_arg 18445 19665 break 18446 @@ -11172,21 +11 351,21 @@19666 @@ -11172,21 +11496,21 @@ 18447 19667 18448 19668 case "x$ac_cv_prog_cc_stdc" in 18449 19669 x|xno) 18450 19670 - echo "$as_me:11175: result: none needed" >&5 18451 + echo "$as_me:11 354: result: none needed" >&519671 + echo "$as_me:11499: result: none needed" >&5 18452 19672 echo "${ECHO_T}none needed" >&6 ;; 18453 19673 *) 18454 19674 - echo "$as_me:11178: result: $ac_cv_prog_cc_stdc" >&5 18455 + echo "$as_me:11 357: result: $ac_cv_prog_cc_stdc" >&519675 + echo "$as_me:11502: result: $ac_cv_prog_cc_stdc" >&5 18456 19676 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 18457 19677 CC="$CC $ac_cv_prog_cc_stdc" ;; … … 18459 19679 18460 19680 -echo "$as_me:11183: checking for an ANSI C-conforming const" >&5 18461 +echo "$as_me:11 362: checking for an ANSI C-conforming const" >&519681 +echo "$as_me:11507: checking for an ANSI C-conforming const" >&5 18462 19682 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 18463 19683 if test "${ac_cv_c_const+set}" = set; then … … 18466 19686 cat >conftest.$ac_ext <<_ACEOF 18467 19687 -#line 11189 "configure" 18468 +#line 11 368"configure"19688 +#line 11513 "configure" 18469 19689 #include "confdefs.h" 18470 19690 18471 19691 int 18472 @@ -11244,16 +11 423,16 @@19692 @@ -11244,16 +11568,16 @@ 18473 19693 } 18474 19694 _ACEOF 18475 19695 rm -f conftest.$ac_objext 18476 19696 -if { (eval echo "$as_me:11247: \"$ac_compile\"") >&5 18477 +if { (eval echo "$as_me:11 426: \"$ac_compile\"") >&519697 +if { (eval echo "$as_me:11571: \"$ac_compile\"") >&5 18478 19698 (eval $ac_compile) 2>&5 18479 19699 ac_status=$? 18480 19700 - echo "$as_me:11250: \$? = $ac_status" >&5 18481 + echo "$as_me:11 429: \$? = $ac_status" >&519701 + echo "$as_me:11574: \$? = $ac_status" >&5 18482 19702 (exit $ac_status); } && 18483 19703 { ac_try='test -s conftest.$ac_objext' 18484 19704 - { (eval echo "$as_me:11253: \"$ac_try\"") >&5 18485 + { (eval echo "$as_me:11 432: \"$ac_try\"") >&519705 + { (eval echo "$as_me:11577: \"$ac_try\"") >&5 18486 19706 (eval $ac_try) 2>&5 18487 19707 ac_status=$? 18488 19708 - echo "$as_me:11256: \$? = $ac_status" >&5 18489 + echo "$as_me:11 435: \$? = $ac_status" >&519709 + echo "$as_me:11580: \$? = $ac_status" >&5 18490 19710 (exit $ac_status); }; }; then 18491 19711 ac_cv_c_const=yes 18492 19712 else 18493 @@ -11263,7 +11 442,7 @@19713 @@ -11263,7 +11587,7 @@ 18494 19714 fi 18495 19715 rm -f conftest.$ac_objext conftest.$ac_ext 18496 19716 fi 18497 19717 -echo "$as_me:11266: result: $ac_cv_c_const" >&5 18498 +echo "$as_me:11 445: result: $ac_cv_c_const" >&519718 +echo "$as_me:11590: result: $ac_cv_c_const" >&5 18499 19719 echo "${ECHO_T}$ac_cv_c_const" >&6 18500 19720 if test $ac_cv_c_const = no; then 18501 19721 18502 @@ -11273,7 +11 452,7 @@19722 @@ -11273,7 +11597,7 @@ 18503 19723 18504 19724 fi 18505 19725 18506 19726 -echo "$as_me:11276: checking for inline" >&5 18507 +echo "$as_me:11 455: checking for inline" >&519727 +echo "$as_me:11600: checking for inline" >&5 18508 19728 echo $ECHO_N "checking for inline... $ECHO_C" >&6 18509 19729 if test "${ac_cv_c_inline+set}" = set; then 18510 19730 echo $ECHO_N "(cached) $ECHO_C" >&6 18511 @@ -11281,7 +11 460,7 @@19731 @@ -11281,7 +11605,7 @@ 18512 19732 ac_cv_c_inline=no 18513 19733 for ac_kw in inline __inline__ __inline; do 18514 19734 cat >conftest.$ac_ext <<_ACEOF 18515 19735 -#line 11284 "configure" 18516 +#line 11 463"configure"19736 +#line 11608 "configure" 18517 19737 #include "confdefs.h" 18518 19738 #ifndef __cplusplus 18519 19739 static $ac_kw int static_foo () {return 0; } 18520 @@ -11290,16 +11 469,16 @@19740 @@ -11290,16 +11614,16 @@ 18521 19741 18522 19742 _ACEOF 18523 19743 rm -f conftest.$ac_objext 18524 19744 -if { (eval echo "$as_me:11293: \"$ac_compile\"") >&5 18525 +if { (eval echo "$as_me:11 472: \"$ac_compile\"") >&519745 +if { (eval echo "$as_me:11617: \"$ac_compile\"") >&5 18526 19746 (eval $ac_compile) 2>&5 18527 19747 ac_status=$? 18528 19748 - echo "$as_me:11296: \$? = $ac_status" >&5 18529 + echo "$as_me:11 475: \$? = $ac_status" >&519749 + echo "$as_me:11620: \$? = $ac_status" >&5 18530 19750 (exit $ac_status); } && 18531 19751 { ac_try='test -s conftest.$ac_objext' 18532 19752 - { (eval echo "$as_me:11299: \"$ac_try\"") >&5 18533 + { (eval echo "$as_me:11 478: \"$ac_try\"") >&519753 + { (eval echo "$as_me:11623: \"$ac_try\"") >&5 18534 19754 (eval $ac_try) 2>&5 18535 19755 ac_status=$? 18536 19756 - echo "$as_me:11302: \$? = $ac_status" >&5 18537 + echo "$as_me:11 481: \$? = $ac_status" >&519757 + echo "$as_me:11626: \$? = $ac_status" >&5 18538 19758 (exit $ac_status); }; }; then 18539 19759 ac_cv_c_inline=$ac_kw; break 18540 19760 else 18541 @@ -11310,7 +11 489,7 @@19761 @@ -11310,7 +11634,7 @@ 18542 19762 done 18543 19763 18544 19764 fi 18545 19765 -echo "$as_me:11313: result: $ac_cv_c_inline" >&5 18546 +echo "$as_me:11 492: result: $ac_cv_c_inline" >&519766 +echo "$as_me:11637: result: $ac_cv_c_inline" >&5 18547 19767 echo "${ECHO_T}$ac_cv_c_inline" >&6 18548 19768 case $ac_cv_c_inline in 18549 19769 inline | yes) ;; 18550 @@ -11327, 16 +11506,197@@19770 @@ -11327,69 +11651,250 @@ 18551 19771 18552 19772 NCURSES_INLINE= … … 18555 19775 -#define CC_HAS_INLINE_FUNCS 1 18556 19776 -EOF 19777 - 19778 - NCURSES_INLINE=inline 19779 -fi 19780 - 19781 -if test $NCURSES_CHTYPE = auto ; then 19782 - 19783 -echo "$as_me:11339: checking for type of chtype" >&5 19784 -echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 19785 -if test "${cf_cv_typeof_chtype+set}" = set; then 18557 19786 + NCURSES_INLINE=inline 18558 19787 + if test "$INTEL_COMPILER" = yes … … 18561 19790 + elif test "$GCC" = yes 18562 19791 + then 18563 + echo "$as_me:11 515: checking if gcc supports options to tune inlining" >&519792 + echo "$as_me:11660: checking if gcc supports options to tune inlining" >&5 18564 19793 +echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6 18565 19794 +if test "${cf_cv_gcc_inline+set}" = set; then 18566 + echo $ECHO_N "(cached) $ECHO_C" >&6 18567 +else 18568 + 19795 echo $ECHO_N "(cached) $ECHO_C" >&6 19796 else 19797 19798 - if test "$cross_compiling" = yes; then 19799 - cf_cv_typeof_chtype=long 19800 -else 19801 - cat >conftest.$ac_ext <<_ACEOF 19802 -#line 11349 "configure" 18569 19803 + cf_save_CFLAGS=$CFLAGS 18570 19804 + CFLAGS="$CFLAGS --param max-inline-insns-single=1200" 18571 19805 + cat >conftest.$ac_ext <<_ACEOF 18572 +#line 11524 "configure" 18573 +#include "confdefs.h" 19806 +#line 11669 "configure" 19807 #include "confdefs.h" 19808 - 19809 -#define WANT_BITS 31 19810 -#include <stdio.h> 19811 -int main() 18574 19812 +inline int foo(void) { return 1; } 18575 19813 +int 18576 19814 +main () 18577 +{ 19815 { 19816 - FILE *fp = fopen("cf_test.out", "w"); 19817 - if (fp != 0) { 19818 - char *result = "long"; 19819 - if (sizeof(unsigned long) > sizeof(unsigned int)) { 19820 - int n; 19821 - unsigned int x, y; 19822 - for (n = 0; n < WANT_BITS; n++) { 19823 - x = (1 << n); 19824 - y = (x >> n); 19825 - if (y != 1 || x == 0) { 19826 - x = 0; 19827 - break; 19828 - } 19829 - } 19830 - /* 19831 - * If x is nonzero, an int is big enough for the bits 19832 - * that we want. 19833 - */ 19834 - result = (x != 0) ? "int" : "long"; 19835 - } 19836 - fputs(result, fp); 19837 - fclose(fp); 19838 - } 19839 - ${cf_cv_main_return:-return}(0); 18578 19840 +${cf_cv_main_return:-return} foo() 18579 19841 + ; … … 18582 19844 +_ACEOF 18583 19845 +rm -f conftest.$ac_objext 18584 +if { (eval echo "$as_me:11 536: \"$ac_compile\"") >&519846 +if { (eval echo "$as_me:11681: \"$ac_compile\"") >&5 18585 19847 + (eval $ac_compile) 2>&5 18586 19848 + ac_status=$? 18587 + echo "$as_me:11 539: \$? = $ac_status" >&519849 + echo "$as_me:11684: \$? = $ac_status" >&5 18588 19850 + (exit $ac_status); } && 18589 19851 + { ac_try='test -s conftest.$ac_objext' 18590 + { (eval echo "$as_me:11 542: \"$ac_try\"") >&519852 + { (eval echo "$as_me:11687: \"$ac_try\"") >&5 18591 19853 + (eval $ac_try) 2>&5 18592 19854 + ac_status=$? 18593 + echo "$as_me:11 545: \$? = $ac_status" >&519855 + echo "$as_me:11690: \$? = $ac_status" >&5 18594 19856 + (exit $ac_status); }; }; then 18595 19857 + cf_cv_gcc_inline=yes … … 18603 19865 + 18604 19866 +fi 18605 +echo "$as_me:11 557: result: $cf_cv_gcc_inline" >&519867 +echo "$as_me:11702: result: $cf_cv_gcc_inline" >&5 18606 19868 +echo "${ECHO_T}$cf_cv_gcc_inline" >&6 18607 19869 + if test "$cf_cv_gcc_inline" = yes ; then … … 18650 19912 +yes) 18651 19913 + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" 18652 18653 - NCURSES_INLINE=inline 19914 + 18654 19915 + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` 18655 19916 + … … 18680 19941 +fi 18681 19942 + 18682 +echo "$as_me:11 633: checking for signal global datatype" >&519943 +echo "$as_me:11778: checking for signal global datatype" >&5 18683 19944 +echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 18684 19945 +if test "${cf_cv_sig_atomic_t+set}" = set; then … … 18692 19953 + do 18693 19954 + cat >conftest.$ac_ext <<_ACEOF 18694 +#line 11 645"configure"19955 +#line 11790 "configure" 18695 19956 +#include "confdefs.h" 18696 19957 + … … 18715 19976 +_ACEOF 18716 19977 +rm -f conftest.$ac_objext 18717 +if { (eval echo "$as_me:11 668: \"$ac_compile\"") >&519978 +if { (eval echo "$as_me:11813: \"$ac_compile\"") >&5 18718 19979 + (eval $ac_compile) 2>&5 18719 19980 + ac_status=$? 18720 + echo "$as_me:11 671: \$? = $ac_status" >&519981 + echo "$as_me:11816: \$? = $ac_status" >&5 18721 19982 + (exit $ac_status); } && 18722 19983 + { ac_try='test -s conftest.$ac_objext' 18723 + { (eval echo "$as_me:11 674: \"$ac_try\"") >&519984 + { (eval echo "$as_me:11819: \"$ac_try\"") >&5 18724 19985 + (eval $ac_try) 2>&5 18725 19986 + ac_status=$? 18726 + echo "$as_me:11 677: \$? = $ac_status" >&519987 + echo "$as_me:11822: \$? = $ac_status" >&5 18727 19988 + (exit $ac_status); }; }; then 18728 19989 + cf_cv_sig_atomic_t=$cf_type … … 18731 19992 +cat conftest.$ac_ext >&5 18732 19993 +cf_cv_sig_atomic_t=no 18733 19994 +fi 18734 19995 +rm -f conftest.$ac_objext conftest.$ac_ext 18735 19996 + test "$cf_cv_sig_atomic_t" != no && break … … 18738 19999 +fi 18739 20000 + 18740 +echo "$as_me:11 691: result: $cf_cv_sig_atomic_t" >&520001 +echo "$as_me:11836: result: $cf_cv_sig_atomic_t" >&5 18741 20002 +echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 18742 20003 +test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF 18743 20004 +#define SIG_ATOMIC_T $cf_cv_sig_atomic_t 18744 20005 +EOF 18745 18746 if test $NCURSES_CHTYPE = auto ; then 18747 18748 -echo "$as_me:11339: checking for type of chtype" >&5 18749 +echo "$as_me:11699: checking for type of chtype" >&5 18750 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 18751 if test "${cf_cv_typeof_chtype+set}" = set; then 18752 echo $ECHO_N "(cached) $ECHO_C" >&6 18753 @@ -11346,7 +11706,7 @@ 18754 cf_cv_typeof_chtype=long 18755 else 18756 cat >conftest.$ac_ext <<_ACEOF 18757 -#line 11349 "configure" 18758 +#line 11709 "configure" 18759 #include "confdefs.h" 18760 18761 #define WANT_BITS 31 18762 @@ -11381,15 +11741,15 @@ 20006 + 20007 +if test $NCURSES_CHTYPE = auto ; then 20008 + 20009 +echo "$as_me:11844: checking for type of chtype" >&5 20010 +echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 20011 +if test "${cf_cv_typeof_chtype+set}" = set; then 20012 + echo $ECHO_N "(cached) $ECHO_C" >&6 20013 +else 20014 + 20015 + if test "$cross_compiling" = yes; then 20016 + cf_cv_typeof_chtype=long 20017 +else 20018 + cat >conftest.$ac_ext <<_ACEOF 20019 +#line 11854 "configure" 20020 +#include "confdefs.h" 20021 + 20022 +#define WANT_BITS 31 20023 +#include <stdio.h> 20024 +int main() 20025 +{ 20026 + FILE *fp = fopen("cf_test.out", "w"); 20027 + if (fp != 0) { 20028 + char *result = "long"; 20029 + if (sizeof(unsigned long) > sizeof(unsigned int)) { 20030 + int n; 20031 + unsigned int x, y; 20032 + for (n = 0; n < WANT_BITS; n++) { 20033 + x = (1 << n); 20034 + y = (x >> n); 20035 + if (y != 1 || x == 0) { 20036 + x = 0; 20037 + break; 20038 + } 20039 + } 20040 + /* 20041 + * If x is nonzero, an int is big enough for the bits 20042 + * that we want. 20043 + */ 20044 + result = (x != 0) ? "int" : "long"; 20045 + } 20046 + fputs(result, fp); 20047 + fclose(fp); 20048 + } 20049 + ${cf_cv_main_return:-return}(0); 20050 } 18763 20051 18764 20052 _ACEOF 18765 20053 rm -f conftest$ac_exeext 18766 20054 -if { (eval echo "$as_me:11384: \"$ac_link\"") >&5 18767 +if { (eval echo "$as_me:11 744: \"$ac_link\"") >&520055 +if { (eval echo "$as_me:11889: \"$ac_link\"") >&5 18768 20056 (eval $ac_link) 2>&5 18769 20057 ac_status=$? 18770 20058 - echo "$as_me:11387: \$? = $ac_status" >&5 18771 + echo "$as_me:11 747: \$? = $ac_status" >&520059 + echo "$as_me:11892: \$? = $ac_status" >&5 18772 20060 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 18773 20061 - { (eval echo "$as_me:11389: \"$ac_try\"") >&5 18774 + { (eval echo "$as_me:11 749: \"$ac_try\"") >&520062 + { (eval echo "$as_me:11894: \"$ac_try\"") >&5 18775 20063 (eval $ac_try) 2>&5 18776 20064 ac_status=$? 18777 20065 - echo "$as_me:11392: \$? = $ac_status" >&5 18778 + echo "$as_me:11 752: \$? = $ac_status" >&520066 + echo "$as_me:11897: \$? = $ac_status" >&5 18779 20067 (exit $ac_status); }; }; then 18780 20068 cf_cv_typeof_chtype=`cat cf_test.out` 18781 20069 else 18782 @@ -11404,7 +11 764,7 @@20070 @@ -11404,7 +11909,7 @@ 18783 20071 18784 20072 fi 18785 20073 18786 20074 -echo "$as_me:11407: result: $cf_cv_typeof_chtype" >&5 18787 +echo "$as_me:11 767: result: $cf_cv_typeof_chtype" >&520075 +echo "$as_me:11912: result: $cf_cv_typeof_chtype" >&5 18788 20076 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 18789 20077 18790 20078 cat >>confdefs.h <<EOF 18791 @@ -11414,15 +11 774,16 @@20079 @@ -11414,15 +11919,16 @@ 18792 20080 else 18793 20081 cf_cv_typeof_chtype=$NCURSES_CHTYPE … … 18796 20084 18797 20085 -echo "$as_me:11418: checking if unsigned literals are legal" >&5 18798 +echo "$as_me:11 779: checking if unsigned literals are legal" >&520086 +echo "$as_me:11924: checking if unsigned literals are legal" >&5 18799 20087 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 18800 20088 if test "${cf_cv_unsigned_literals+set}" = set; then … … 18804 20092 cat >conftest.$ac_ext <<_ACEOF 18805 20093 -#line 11425 "configure" 18806 +#line 11 786"configure"20094 +#line 11931 "configure" 18807 20095 #include "confdefs.h" 18808 20096 18809 20097 int 18810 @@ -11434,16 +11 795,16 @@20098 @@ -11434,16 +11940,16 @@ 18811 20099 } 18812 20100 _ACEOF 18813 20101 rm -f conftest.$ac_objext 18814 20102 -if { (eval echo "$as_me:11437: \"$ac_compile\"") >&5 18815 +if { (eval echo "$as_me:11 798: \"$ac_compile\"") >&520103 +if { (eval echo "$as_me:11943: \"$ac_compile\"") >&5 18816 20104 (eval $ac_compile) 2>&5 18817 20105 ac_status=$? 18818 20106 - echo "$as_me:11440: \$? = $ac_status" >&5 18819 + echo "$as_me:11 801: \$? = $ac_status" >&520107 + echo "$as_me:11946: \$? = $ac_status" >&5 18820 20108 (exit $ac_status); } && 18821 20109 { ac_try='test -s conftest.$ac_objext' 18822 20110 - { (eval echo "$as_me:11443: \"$ac_try\"") >&5 18823 + { (eval echo "$as_me:11 804: \"$ac_try\"") >&520111 + { (eval echo "$as_me:11949: \"$ac_try\"") >&5 18824 20112 (eval $ac_try) 2>&5 18825 20113 ac_status=$? 18826 20114 - echo "$as_me:11446: \$? = $ac_status" >&5 18827 + echo "$as_me:11 807: \$? = $ac_status" >&520115 + echo "$as_me:11952: \$? = $ac_status" >&5 18828 20116 (exit $ac_status); }; }; then 18829 20117 cf_cv_unsigned_literals=yes 18830 20118 else 18831 @@ -11455,29 +11 816,30 @@20119 @@ -11455,29 +11961,30 @@ 18832 20120 18833 20121 fi 18834 20122 18835 20123 -echo "$as_me:11458: result: $cf_cv_unsigned_literals" >&5 18836 +echo "$as_me:11 819: result: $cf_cv_unsigned_literals" >&520124 +echo "$as_me:11964: result: $cf_cv_unsigned_literals" >&5 18837 20125 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 18838 20126 … … 18853 20141 18854 20142 -echo "$as_me:11473: checking if external errno is declared" >&5 18855 +echo "$as_me:11 835: checking if external errno is declared" >&520143 +echo "$as_me:11980: checking if external errno is declared" >&5 18856 20144 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 18857 20145 if test "${cf_cv_dcl_errno+set}" = set; then … … 18861 20149 cat >conftest.$ac_ext <<_ACEOF 18862 20150 -#line 11480 "configure" 18863 +#line 11 842"configure"20151 +#line 11987 "configure" 18864 20152 #include "confdefs.h" 18865 20153 18866 20154 #ifdef HAVE_STDLIB_H 18867 @@ -11495,16 +1 1857,16 @@20155 @@ -11495,16 +12002,16 @@ 18868 20156 } 18869 20157 _ACEOF 18870 20158 rm -f conftest.$ac_objext 18871 20159 -if { (eval echo "$as_me:11498: \"$ac_compile\"") >&5 18872 +if { (eval echo "$as_me:1 1860: \"$ac_compile\"") >&520160 +if { (eval echo "$as_me:12005: \"$ac_compile\"") >&5 18873 20161 (eval $ac_compile) 2>&5 18874 20162 ac_status=$? 18875 20163 - echo "$as_me:11501: \$? = $ac_status" >&5 18876 + echo "$as_me:1 1863: \$? = $ac_status" >&520164 + echo "$as_me:12008: \$? = $ac_status" >&5 18877 20165 (exit $ac_status); } && 18878 20166 { ac_try='test -s conftest.$ac_objext' 18879 20167 - { (eval echo "$as_me:11504: \"$ac_try\"") >&5 18880 + { (eval echo "$as_me:1 1866: \"$ac_try\"") >&520168 + { (eval echo "$as_me:12011: \"$ac_try\"") >&5 18881 20169 (eval $ac_try) 2>&5 18882 20170 ac_status=$? 18883 20171 - echo "$as_me:11507: \$? = $ac_status" >&5 18884 + echo "$as_me:1 1869: \$? = $ac_status" >&520172 + echo "$as_me:12014: \$? = $ac_status" >&5 18885 20173 (exit $ac_status); }; }; then 18886 20174 cf_cv_dcl_errno=yes 18887 20175 else 18888 @@ -11515,7 +1 1877,7 @@20176 @@ -11515,7 +12022,7 @@ 18889 20177 rm -f conftest.$ac_objext conftest.$ac_ext 18890 20178 18891 20179 fi 18892 20180 -echo "$as_me:11518: result: $cf_cv_dcl_errno" >&5 18893 +echo "$as_me:1 1880: result: $cf_cv_dcl_errno" >&520181 +echo "$as_me:12025: result: $cf_cv_dcl_errno" >&5 18894 20182 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 18895 20183 18896 20184 if test "$cf_cv_dcl_errno" = no ; then 18897 @@ -11530,14 +1 1892,14 @@20185 @@ -11530,14 +12037,14 @@ 18898 20186 18899 20187 # It's possible (for near-UNIX clones) that the data doesn't exist 18900 20188 18901 20189 -echo "$as_me:11533: checking if external errno exists" >&5 18902 +echo "$as_me:1 1895: checking if external errno exists" >&520190 +echo "$as_me:12040: checking if external errno exists" >&5 18903 20191 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 18904 20192 if test "${cf_cv_have_errno+set}" = set; then … … 18908 20196 cat >conftest.$ac_ext <<_ACEOF 18909 20197 -#line 11540 "configure" 18910 +#line 1 1902"configure"20198 +#line 12047 "configure" 18911 20199 #include "confdefs.h" 18912 20200 18913 20201 #undef errno 18914 @@ -11552,16 +1 1914,16 @@20202 @@ -11552,16 +12059,16 @@ 18915 20203 } 18916 20204 _ACEOF 18917 20205 rm -f conftest.$ac_objext conftest$ac_exeext 18918 20206 -if { (eval echo "$as_me:11555: \"$ac_link\"") >&5 18919 +if { (eval echo "$as_me:1 1917: \"$ac_link\"") >&520207 +if { (eval echo "$as_me:12062: \"$ac_link\"") >&5 18920 20208 (eval $ac_link) 2>&5 18921 20209 ac_status=$? 18922 20210 - echo "$as_me:11558: \$? = $ac_status" >&5 18923 + echo "$as_me:1 1920: \$? = $ac_status" >&520211 + echo "$as_me:12065: \$? = $ac_status" >&5 18924 20212 (exit $ac_status); } && 18925 20213 { ac_try='test -s conftest$ac_exeext' 18926 20214 - { (eval echo "$as_me:11561: \"$ac_try\"") >&5 18927 + { (eval echo "$as_me:1 1923: \"$ac_try\"") >&520215 + { (eval echo "$as_me:12068: \"$ac_try\"") >&5 18928 20216 (eval $ac_try) 2>&5 18929 20217 ac_status=$? 18930 20218 - echo "$as_me:11564: \$? = $ac_status" >&5 18931 + echo "$as_me:1 1926: \$? = $ac_status" >&520219 + echo "$as_me:12071: \$? = $ac_status" >&5 18932 20220 (exit $ac_status); }; }; then 18933 20221 cf_cv_have_errno=yes 18934 20222 else 18935 @@ -11572,7 +1 1934,7 @@20223 @@ -11572,7 +12079,7 @@ 18936 20224 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 18937 20225 18938 20226 fi 18939 20227 -echo "$as_me:11575: result: $cf_cv_have_errno" >&5 18940 +echo "$as_me:1 1937: result: $cf_cv_have_errno" >&520228 +echo "$as_me:12082: result: $cf_cv_have_errno" >&5 18941 20229 echo "${ECHO_T}$cf_cv_have_errno" >&6 18942 20230 18943 20231 if test "$cf_cv_have_errno" = yes ; then 18944 @@ -11585,7 +1 1947,7 @@20232 @@ -11585,7 +12092,7 @@ 18945 20233 18946 20234 fi 18947 20235 18948 20236 -echo "$as_me:11588: checking if data-only library module links" >&5 18949 +echo "$as_me:1 1950: checking if data-only library module links" >&520237 +echo "$as_me:12095: checking if data-only library module links" >&5 18950 20238 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 18951 20239 if test "${cf_cv_link_dataonly+set}" = set; then 18952 20240 echo $ECHO_N "(cached) $ECHO_C" >&6 18953 @@ -11593,20 +1 1955,20 @@20241 @@ -11593,20 +12100,20 @@ 18954 20242 18955 20243 rm -f conftest.a 18956 20244 cat >conftest.$ac_ext <<EOF 18957 20245 -#line 11596 "configure" 18958 +#line 1 1958"configure"20246 +#line 12103 "configure" 18959 20247 int testdata[3] = { 123, 456, 789 }; 18960 20248 EOF 18961 20249 - if { (eval echo "$as_me:11599: \"$ac_compile\"") >&5 18962 + if { (eval echo "$as_me:1 1961: \"$ac_compile\"") >&520250 + if { (eval echo "$as_me:12106: \"$ac_compile\"") >&5 18963 20251 (eval $ac_compile) 2>&5 18964 20252 ac_status=$? 18965 20253 - echo "$as_me:11602: \$? = $ac_status" >&5 18966 + echo "$as_me:1 1964: \$? = $ac_status" >&520254 + echo "$as_me:12109: \$? = $ac_status" >&5 18967 20255 (exit $ac_status); } ; then 18968 20256 mv conftest.o data.o && \ … … 18972 20260 cat >conftest.$ac_ext <<EOF 18973 20261 -#line 11609 "configure" 18974 +#line 1 1971"configure"20262 +#line 12116 "configure" 18975 20263 int testfunc() 18976 20264 { 18977 20265 #if defined(NeXT) 18978 @@ -11619,10 +1 1981,10 @@20266 @@ -11619,10 +12126,10 @@ 18979 20267 #endif 18980 20268 } 18981 20269 EOF 18982 20270 - if { (eval echo "$as_me:11622: \"$ac_compile\"") >&5 18983 + if { (eval echo "$as_me:1 1984: \"$ac_compile\"") >&520271 + if { (eval echo "$as_me:12129: \"$ac_compile\"") >&5 18984 20272 (eval $ac_compile) 2>&5 18985 20273 ac_status=$? 18986 20274 - echo "$as_me:11625: \$? = $ac_status" >&5 18987 + echo "$as_me:1 1987: \$? = $ac_status" >&520275 + echo "$as_me:12132: \$? = $ac_status" >&5 18988 20276 (exit $ac_status); }; then 18989 20277 mv conftest.o func.o && \ 18990 20278 ( $AR $AR_OPTS conftest.a func.o ) 2>&5 1>/dev/null 18991 @@ -11635,7 +1 1997,7 @@20279 @@ -11635,7 +12142,7 @@ 18992 20280 cf_cv_link_dataonly=unknown 18993 20281 else 18994 20282 cat >conftest.$ac_ext <<_ACEOF 18995 20283 -#line 11638 "configure" 18996 +#line 12 000"configure"20284 +#line 12145 "configure" 18997 20285 #include "confdefs.h" 18998 20286 18999 20287 int main() 19000 @@ -11646,15 +12 008,15 @@20288 @@ -11646,15 +12153,15 @@ 19001 20289 19002 20290 _ACEOF 19003 20291 rm -f conftest$ac_exeext 19004 20292 -if { (eval echo "$as_me:11649: \"$ac_link\"") >&5 19005 +if { (eval echo "$as_me:12 011: \"$ac_link\"") >&520293 +if { (eval echo "$as_me:12156: \"$ac_link\"") >&5 19006 20294 (eval $ac_link) 2>&5 19007 20295 ac_status=$? 19008 20296 - echo "$as_me:11652: \$? = $ac_status" >&5 19009 + echo "$as_me:12 014: \$? = $ac_status" >&520297 + echo "$as_me:12159: \$? = $ac_status" >&5 19010 20298 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 19011 20299 - { (eval echo "$as_me:11654: \"$ac_try\"") >&5 19012 + { (eval echo "$as_me:12 016: \"$ac_try\"") >&520300 + { (eval echo "$as_me:12161: \"$ac_try\"") >&5 19013 20301 (eval $ac_try) 2>&5 19014 20302 ac_status=$? 19015 20303 - echo "$as_me:11657: \$? = $ac_status" >&5 19016 + echo "$as_me:12 019: \$? = $ac_status" >&520304 + echo "$as_me:12164: \$? = $ac_status" >&5 19017 20305 (exit $ac_status); }; }; then 19018 20306 cf_cv_link_dataonly=yes 19019 20307 else 19020 @@ -11669,7 +12 031,7 @@20308 @@ -11669,7 +12176,7 @@ 19021 20309 19022 20310 fi 19023 20311 19024 20312 -echo "$as_me:11672: result: $cf_cv_link_dataonly" >&5 19025 +echo "$as_me:12 034: result: $cf_cv_link_dataonly" >&520313 +echo "$as_me:12179: result: $cf_cv_link_dataonly" >&5 19026 20314 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 19027 20315 19028 20316 if test "$cf_cv_link_dataonly" = no ; then 19029 @@ -11704,13 +12 066,13 @@20317 @@ -11704,13 +12211,13 @@ 19030 20318 19031 20319 do 19032 20320 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 19033 20321 -echo "$as_me:11707: checking for $ac_func" >&5 19034 +echo "$as_me:12 069: checking for $ac_func" >&520322 +echo "$as_me:12214: checking for $ac_func" >&5 19035 20323 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 19036 20324 if eval "test \"\${$as_ac_var+set}\" = set"; then … … 19039 20327 cat >conftest.$ac_ext <<_ACEOF 19040 20328 -#line 11713 "configure" 19041 +#line 12 075"configure"20329 +#line 12220 "configure" 19042 20330 #include "confdefs.h" 19043 20331 /* System header to define __stub macros and hopefully few prototypes, 19044 20332 which can conflict with char $ac_func (); below. */ 19045 @@ -11741,16 +12 103,16 @@20333 @@ -11741,16 +12248,16 @@ 19046 20334 } 19047 20335 _ACEOF 19048 20336 rm -f conftest.$ac_objext conftest$ac_exeext 19049 20337 -if { (eval echo "$as_me:11744: \"$ac_link\"") >&5 19050 +if { (eval echo "$as_me:12 106: \"$ac_link\"") >&520338 +if { (eval echo "$as_me:12251: \"$ac_link\"") >&5 19051 20339 (eval $ac_link) 2>&5 19052 20340 ac_status=$? 19053 20341 - echo "$as_me:11747: \$? = $ac_status" >&5 19054 + echo "$as_me:12 109: \$? = $ac_status" >&520342 + echo "$as_me:12254: \$? = $ac_status" >&5 19055 20343 (exit $ac_status); } && 19056 20344 { ac_try='test -s conftest$ac_exeext' 19057 20345 - { (eval echo "$as_me:11750: \"$ac_try\"") >&5 19058 + { (eval echo "$as_me:12 112: \"$ac_try\"") >&520346 + { (eval echo "$as_me:12257: \"$ac_try\"") >&5 19059 20347 (eval $ac_try) 2>&5 19060 20348 ac_status=$? 19061 20349 - echo "$as_me:11753: \$? = $ac_status" >&5 19062 + echo "$as_me:12 115: \$? = $ac_status" >&520350 + echo "$as_me:12260: \$? = $ac_status" >&5 19063 20351 (exit $ac_status); }; }; then 19064 20352 eval "$as_ac_var=yes" 19065 20353 else 19066 @@ -11760,7 +12 122,7 @@20354 @@ -11760,7 +12267,7 @@ 19067 20355 fi 19068 20356 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 19069 20357 fi 19070 20358 -echo "$as_me:11763: result: `eval echo '${'$as_ac_var'}'`" >&5 19071 +echo "$as_me:12 125: result: `eval echo '${'$as_ac_var'}'`" >&520359 +echo "$as_me:12270: result: `eval echo '${'$as_ac_var'}'`" >&5 19072 20360 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 19073 20361 if test `eval echo '${'$as_ac_var'}'` = yes; then 19074 20362 cat >>confdefs.h <<EOF 19075 @@ -11772,14 +12 134,14 @@20363 @@ -11772,14 +12279,14 @@ 19076 20364 19077 20365 if test "$with_getcap" = "yes" ; then 19078 20366 19079 20367 -echo "$as_me:11775: checking for terminal-capability database functions" >&5 19080 +echo "$as_me:12 137: checking for terminal-capability database functions" >&520368 +echo "$as_me:12282: checking for terminal-capability database functions" >&5 19081 20369 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 19082 20370 if test "${cf_cv_cgetent+set}" = set; then … … 19086 20374 cat >conftest.$ac_ext <<_ACEOF 19087 20375 -#line 11782 "configure" 19088 +#line 12 144"configure"20376 +#line 12289 "configure" 19089 20377 #include "confdefs.h" 19090 20378 19091 20379 #include <stdlib.h> 19092 @@ -11799,16 +12 161,16 @@20380 @@ -11799,16 +12306,16 @@ 19093 20381 } 19094 20382 _ACEOF 19095 20383 rm -f conftest.$ac_objext conftest$ac_exeext 19096 20384 -if { (eval echo "$as_me:11802: \"$ac_link\"") >&5 19097 +if { (eval echo "$as_me:12 164: \"$ac_link\"") >&520385 +if { (eval echo "$as_me:12309: \"$ac_link\"") >&5 19098 20386 (eval $ac_link) 2>&5 19099 20387 ac_status=$? 19100 20388 - echo "$as_me:11805: \$? = $ac_status" >&5 19101 + echo "$as_me:12 167: \$? = $ac_status" >&520389 + echo "$as_me:12312: \$? = $ac_status" >&5 19102 20390 (exit $ac_status); } && 19103 20391 { ac_try='test -s conftest$ac_exeext' 19104 20392 - { (eval echo "$as_me:11808: \"$ac_try\"") >&5 19105 + { (eval echo "$as_me:12 170: \"$ac_try\"") >&520393 + { (eval echo "$as_me:12315: \"$ac_try\"") >&5 19106 20394 (eval $ac_try) 2>&5 19107 20395 ac_status=$? 19108 20396 - echo "$as_me:11811: \$? = $ac_status" >&5 19109 + echo "$as_me:12 173: \$? = $ac_status" >&520397 + echo "$as_me:12318: \$? = $ac_status" >&5 19110 20398 (exit $ac_status); }; }; then 19111 20399 cf_cv_cgetent=yes 19112 20400 else 19113 @@ -11820,7 +12 182,7 @@20401 @@ -11820,7 +12327,7 @@ 19114 20402 19115 20403 fi 19116 20404 19117 20405 -echo "$as_me:11823: result: $cf_cv_cgetent" >&5 19118 +echo "$as_me:12 185: result: $cf_cv_cgetent" >&520406 +echo "$as_me:12330: result: $cf_cv_cgetent" >&5 19119 20407 echo "${ECHO_T}$cf_cv_cgetent" >&6 19120 20408 test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF 19121 20409 #define HAVE_BSD_CGETENT 1 19122 @@ -11828,14 +12 190,14 @@20410 @@ -11828,14 +12335,14 @@ 19123 20411 19124 20412 fi 19125 20413 19126 20414 -echo "$as_me:11831: checking for isascii" >&5 19127 +echo "$as_me:12 193: checking for isascii" >&520415 +echo "$as_me:12338: checking for isascii" >&5 19128 20416 echo $ECHO_N "checking for isascii... $ECHO_C" >&6 19129 20417 if test "${cf_cv_have_isascii+set}" = set; then … … 19133 20421 cat >conftest.$ac_ext <<_ACEOF 19134 20422 -#line 11838 "configure" 19135 +#line 12 200"configure"20423 +#line 12345 "configure" 19136 20424 #include "confdefs.h" 19137 20425 #include <ctype.h> 19138 20426 int 19139 @@ -11847,16 +12 209,16 @@20427 @@ -11847,16 +12354,16 @@ 19140 20428 } 19141 20429 _ACEOF 19142 20430 rm -f conftest.$ac_objext conftest$ac_exeext 19143 20431 -if { (eval echo "$as_me:11850: \"$ac_link\"") >&5 19144 +if { (eval echo "$as_me:12 212: \"$ac_link\"") >&520432 +if { (eval echo "$as_me:12357: \"$ac_link\"") >&5 19145 20433 (eval $ac_link) 2>&5 19146 20434 ac_status=$? 19147 20435 - echo "$as_me:11853: \$? = $ac_status" >&5 19148 + echo "$as_me:12 215: \$? = $ac_status" >&520436 + echo "$as_me:12360: \$? = $ac_status" >&5 19149 20437 (exit $ac_status); } && 19150 20438 { ac_try='test -s conftest$ac_exeext' 19151 20439 - { (eval echo "$as_me:11856: \"$ac_try\"") >&5 19152 + { (eval echo "$as_me:12 218: \"$ac_try\"") >&520440 + { (eval echo "$as_me:12363: \"$ac_try\"") >&5 19153 20441 (eval $ac_try) 2>&5 19154 20442 ac_status=$? 19155 20443 - echo "$as_me:11859: \$? = $ac_status" >&5 19156 + echo "$as_me:12 221: \$? = $ac_status" >&520444 + echo "$as_me:12366: \$? = $ac_status" >&5 19157 20445 (exit $ac_status); }; }; then 19158 20446 cf_cv_have_isascii=yes 19159 20447 else 19160 @@ -11867,17 +12 229,17 @@20448 @@ -11867,17 +12374,17 @@ 19161 20449 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 19162 20450 19163 20451 fi 19164 20452 -echo "$as_me:11870: result: $cf_cv_have_isascii" >&5 19165 +echo "$as_me:12 232: result: $cf_cv_have_isascii" >&520453 +echo "$as_me:12377: result: $cf_cv_have_isascii" >&5 19166 20454 echo "${ECHO_T}$cf_cv_have_isascii" >&6 19167 20455 test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF … … 19171 20459 if test "$ac_cv_func_sigaction" = yes; then 19172 20460 -echo "$as_me:11877: checking whether sigaction needs _POSIX_SOURCE" >&5 19173 +echo "$as_me:12 239: checking whether sigaction needs _POSIX_SOURCE" >&520461 +echo "$as_me:12384: checking whether sigaction needs _POSIX_SOURCE" >&5 19174 20462 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 19175 20463 cat >conftest.$ac_ext <<_ACEOF 19176 20464 -#line 11880 "configure" 19177 +#line 12 242"configure"20465 +#line 12387 "configure" 19178 20466 #include "confdefs.h" 19179 20467 19180 20468 #include <sys/types.h> 19181 @@ -11891,16 +12 253,16 @@20469 @@ -11891,16 +12398,16 @@ 19182 20470 } 19183 20471 _ACEOF 19184 20472 rm -f conftest.$ac_objext 19185 20473 -if { (eval echo "$as_me:11894: \"$ac_compile\"") >&5 19186 +if { (eval echo "$as_me:12 256: \"$ac_compile\"") >&520474 +if { (eval echo "$as_me:12401: \"$ac_compile\"") >&5 19187 20475 (eval $ac_compile) 2>&5 19188 20476 ac_status=$? 19189 20477 - echo "$as_me:11897: \$? = $ac_status" >&5 19190 + echo "$as_me:12 259: \$? = $ac_status" >&520478 + echo "$as_me:12404: \$? = $ac_status" >&5 19191 20479 (exit $ac_status); } && 19192 20480 { ac_try='test -s conftest.$ac_objext' 19193 20481 - { (eval echo "$as_me:11900: \"$ac_try\"") >&5 19194 + { (eval echo "$as_me:12 262: \"$ac_try\"") >&520482 + { (eval echo "$as_me:12407: \"$ac_try\"") >&5 19195 20483 (eval $ac_try) 2>&5 19196 20484 ac_status=$? 19197 20485 - echo "$as_me:11903: \$? = $ac_status" >&5 19198 + echo "$as_me:12 265: \$? = $ac_status" >&520486 + echo "$as_me:12410: \$? = $ac_status" >&5 19199 20487 (exit $ac_status); }; }; then 19200 20488 sigact_bad=no 19201 20489 else 19202 @@ -11908,7 +12 270,7 @@20490 @@ -11908,7 +12415,7 @@ 19203 20491 cat conftest.$ac_ext >&5 19204 20492 19205 20493 cat >conftest.$ac_ext <<_ACEOF 19206 20494 -#line 11911 "configure" 19207 +#line 12 273"configure"20495 +#line 12418 "configure" 19208 20496 #include "confdefs.h" 19209 20497 19210 20498 #define _POSIX_SOURCE 19211 @@ -11923,16 +12 285,16 @@20499 @@ -11923,16 +12430,16 @@ 19212 20500 } 19213 20501 _ACEOF 19214 20502 rm -f conftest.$ac_objext 19215 20503 -if { (eval echo "$as_me:11926: \"$ac_compile\"") >&5 19216 +if { (eval echo "$as_me:12 288: \"$ac_compile\"") >&520504 +if { (eval echo "$as_me:12433: \"$ac_compile\"") >&5 19217 20505 (eval $ac_compile) 2>&5 19218 20506 ac_status=$? 19219 20507 - echo "$as_me:11929: \$? = $ac_status" >&5 19220 + echo "$as_me:12 291: \$? = $ac_status" >&520508 + echo "$as_me:12436: \$? = $ac_status" >&5 19221 20509 (exit $ac_status); } && 19222 20510 { ac_try='test -s conftest.$ac_objext' 19223 20511 - { (eval echo "$as_me:11932: \"$ac_try\"") >&5 19224 + { (eval echo "$as_me:12 294: \"$ac_try\"") >&520512 + { (eval echo "$as_me:12439: \"$ac_try\"") >&5 19225 20513 (eval $ac_try) 2>&5 19226 20514 ac_status=$? 19227 20515 - echo "$as_me:11935: \$? = $ac_status" >&5 19228 + echo "$as_me:12 297: \$? = $ac_status" >&520516 + echo "$as_me:12442: \$? = $ac_status" >&5 19229 20517 (exit $ac_status); }; }; then 19230 20518 sigact_bad=yes 19231 20519 cat >>confdefs.h <<\EOF 19232 @@ -11947,11 +12 309,11 @@20520 @@ -11947,11 +12454,11 @@ 19233 20521 rm -f conftest.$ac_objext conftest.$ac_ext 19234 20522 fi 19235 20523 rm -f conftest.$ac_objext conftest.$ac_ext 19236 20524 -echo "$as_me:11950: result: $sigact_bad" >&5 19237 +echo "$as_me:12 312: result: $sigact_bad" >&520525 +echo "$as_me:12457: result: $sigact_bad" >&5 19238 20526 echo "${ECHO_T}$sigact_bad" >&6 19239 20527 fi 19240 20528 19241 20529 -echo "$as_me:11954: checking if nanosleep really works" >&5 19242 +echo "$as_me:12 316: checking if nanosleep really works" >&520530 +echo "$as_me:12461: checking if nanosleep really works" >&5 19243 20531 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 19244 20532 if test "${cf_cv_func_nanosleep+set}" = set; then 19245 20533 echo $ECHO_N "(cached) $ECHO_C" >&6 19246 @@ -11961,7 +12 323,7 @@20534 @@ -11961,7 +12468,7 @@ 19247 20535 cf_cv_func_nanosleep=unknown 19248 20536 else 19249 20537 cat >conftest.$ac_ext <<_ACEOF 19250 20538 -#line 11964 "configure" 19251 +#line 12 326"configure"20539 +#line 12471 "configure" 19252 20540 #include "confdefs.h" 19253 20541 19254 20542 #include <stdio.h> 19255 @@ -11986,15 +12 348,15 @@20543 @@ -11986,15 +12493,15 @@ 19256 20544 19257 20545 _ACEOF 19258 20546 rm -f conftest$ac_exeext 19259 20547 -if { (eval echo "$as_me:11989: \"$ac_link\"") >&5 19260 +if { (eval echo "$as_me:12 351: \"$ac_link\"") >&520548 +if { (eval echo "$as_me:12496: \"$ac_link\"") >&5 19261 20549 (eval $ac_link) 2>&5 19262 20550 ac_status=$? 19263 20551 - echo "$as_me:11992: \$? = $ac_status" >&5 19264 + echo "$as_me:12 354: \$? = $ac_status" >&520552 + echo "$as_me:12499: \$? = $ac_status" >&5 19265 20553 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 19266 20554 - { (eval echo "$as_me:11994: \"$ac_try\"") >&5 19267 + { (eval echo "$as_me:12 356: \"$ac_try\"") >&520555 + { (eval echo "$as_me:12501: \"$ac_try\"") >&5 19268 20556 (eval $ac_try) 2>&5 19269 20557 ac_status=$? 19270 20558 - echo "$as_me:11997: \$? = $ac_status" >&5 19271 + echo "$as_me:12 359: \$? = $ac_status" >&520559 + echo "$as_me:12504: \$? = $ac_status" >&5 19272 20560 (exit $ac_status); }; }; then 19273 20561 cf_cv_func_nanosleep=yes 19274 20562 else 19275 @@ -12006,7 +12 368,7 @@20563 @@ -12006,7 +12513,7 @@ 19276 20564 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 19277 20565 fi 19278 20566 fi 19279 20567 -echo "$as_me:12009: result: $cf_cv_func_nanosleep" >&5 19280 +echo "$as_me:12 371: result: $cf_cv_func_nanosleep" >&520568 +echo "$as_me:12516: result: $cf_cv_func_nanosleep" >&5 19281 20569 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 19282 20570 19283 20571 test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF 19284 @@ -12020,23 +12 382,23 @@20572 @@ -12020,23 +12527,23 @@ 19285 20573 19286 20574 do 19287 20575 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 19288 20576 -echo "$as_me:12023: checking for $ac_header" >&5 19289 +echo "$as_me:12 385: checking for $ac_header" >&520577 +echo "$as_me:12530: checking for $ac_header" >&5 19290 20578 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 19291 20579 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 19294 20582 cat >conftest.$ac_ext <<_ACEOF 19295 20583 -#line 12029 "configure" 19296 +#line 12 391"configure"20584 +#line 12536 "configure" 19297 20585 #include "confdefs.h" 19298 20586 #include <$ac_header> 19299 20587 _ACEOF 19300 20588 -if { (eval echo "$as_me:12033: \"$ac_cpp conftest.$ac_ext\"") >&5 19301 +if { (eval echo "$as_me:12 395: \"$ac_cpp conftest.$ac_ext\"") >&520589 +if { (eval echo "$as_me:12540: \"$ac_cpp conftest.$ac_ext\"") >&5 19302 20590 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 19303 20591 ac_status=$? … … 19306 20594 cat conftest.err >&5 19307 20595 - echo "$as_me:12039: \$? = $ac_status" >&5 19308 + echo "$as_me:12 401: \$? = $ac_status" >&520596 + echo "$as_me:12546: \$? = $ac_status" >&5 19309 20597 (exit $ac_status); } >/dev/null; then 19310 20598 if test -s conftest.err; then 19311 20599 ac_cpp_err=$ac_c_preproc_warn_flag 19312 @@ -12055,7 +12 417,7 @@20600 @@ -12055,7 +12562,7 @@ 19313 20601 fi 19314 20602 rm -f conftest.err conftest.$ac_ext 19315 20603 fi 19316 20604 -echo "$as_me:12058: result: `eval echo '${'$as_ac_Header'}'`" >&5 19317 +echo "$as_me:12 420: result: `eval echo '${'$as_ac_Header'}'`" >&520605 +echo "$as_me:12565: result: `eval echo '${'$as_ac_Header'}'`" >&5 19318 20606 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 19319 20607 if test `eval echo '${'$as_ac_Header'}'` = yes; then 19320 20608 cat >>confdefs.h <<EOF 19321 @@ -12070,23 +12 432,23 @@20609 @@ -12070,23 +12577,23 @@ 19322 20610 for ac_header in sys/termio.h 19323 20611 do 19324 20612 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 19325 20613 -echo "$as_me:12073: checking for $ac_header" >&5 19326 +echo "$as_me:12 435: checking for $ac_header" >&520614 +echo "$as_me:12580: checking for $ac_header" >&5 19327 20615 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 19328 20616 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 19331 20619 cat >conftest.$ac_ext <<_ACEOF 19332 20620 -#line 12079 "configure" 19333 +#line 12 441"configure"20621 +#line 12586 "configure" 19334 20622 #include "confdefs.h" 19335 20623 #include <$ac_header> 19336 20624 _ACEOF 19337 20625 -if { (eval echo "$as_me:12083: \"$ac_cpp conftest.$ac_ext\"") >&5 19338 +if { (eval echo "$as_me:12 445: \"$ac_cpp conftest.$ac_ext\"") >&520626 +if { (eval echo "$as_me:12590: \"$ac_cpp conftest.$ac_ext\"") >&5 19339 20627 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 19340 20628 ac_status=$? … … 19343 20631 cat conftest.err >&5 19344 20632 - echo "$as_me:12089: \$? = $ac_status" >&5 19345 + echo "$as_me:12 451: \$? = $ac_status" >&520633 + echo "$as_me:12596: \$? = $ac_status" >&5 19346 20634 (exit $ac_status); } >/dev/null; then 19347 20635 if test -s conftest.err; then 19348 20636 ac_cpp_err=$ac_c_preproc_warn_flag 19349 @@ -12105,7 +12 467,7 @@20637 @@ -12105,7 +12612,7 @@ 19350 20638 fi 19351 20639 rm -f conftest.err conftest.$ac_ext 19352 20640 fi 19353 20641 -echo "$as_me:12108: result: `eval echo '${'$as_ac_Header'}'`" >&5 19354 +echo "$as_me:12 470: result: `eval echo '${'$as_ac_Header'}'`" >&520642 +echo "$as_me:12615: result: `eval echo '${'$as_ac_Header'}'`" >&5 19355 20643 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 19356 20644 if test `eval echo '${'$as_ac_Header'}'` = yes; then 19357 20645 cat >>confdefs.h <<EOF 19358 @@ -12123,10 +12 485,10 @@20646 @@ -12123,10 +12630,10 @@ 19359 20647 *) termios_bad=maybe ;; 19360 20648 esac 19361 20649 if test "$termios_bad" = maybe ; then 19362 20650 - echo "$as_me:12126: checking whether termios.h needs _POSIX_SOURCE" >&5 19363 + echo "$as_me:12 488: checking whether termios.h needs _POSIX_SOURCE" >&520651 + echo "$as_me:12633: checking whether termios.h needs _POSIX_SOURCE" >&5 19364 20652 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 19365 20653 cat >conftest.$ac_ext <<_ACEOF 19366 20654 -#line 12129 "configure" 19367 +#line 12 491"configure"20655 +#line 12636 "configure" 19368 20656 #include "confdefs.h" 19369 20657 #include <termios.h> 19370 20658 int 19371 @@ -12138,16 +12 500,16 @@20659 @@ -12138,16 +12645,16 @@ 19372 20660 } 19373 20661 _ACEOF 19374 20662 rm -f conftest.$ac_objext 19375 20663 -if { (eval echo "$as_me:12141: \"$ac_compile\"") >&5 19376 +if { (eval echo "$as_me:12 503: \"$ac_compile\"") >&520664 +if { (eval echo "$as_me:12648: \"$ac_compile\"") >&5 19377 20665 (eval $ac_compile) 2>&5 19378 20666 ac_status=$? 19379 20667 - echo "$as_me:12144: \$? = $ac_status" >&5 19380 + echo "$as_me:12 506: \$? = $ac_status" >&520668 + echo "$as_me:12651: \$? = $ac_status" >&5 19381 20669 (exit $ac_status); } && 19382 20670 { ac_try='test -s conftest.$ac_objext' 19383 20671 - { (eval echo "$as_me:12147: \"$ac_try\"") >&5 19384 + { (eval echo "$as_me:12 509: \"$ac_try\"") >&520672 + { (eval echo "$as_me:12654: \"$ac_try\"") >&5 19385 20673 (eval $ac_try) 2>&5 19386 20674 ac_status=$? 19387 20675 - echo "$as_me:12150: \$? = $ac_status" >&5 19388 + echo "$as_me:12 512: \$? = $ac_status" >&520676 + echo "$as_me:12657: \$? = $ac_status" >&5 19389 20677 (exit $ac_status); }; }; then 19390 20678 termios_bad=no 19391 20679 else 19392 @@ -12155,7 +12 517,7 @@20680 @@ -12155,7 +12662,7 @@ 19393 20681 cat conftest.$ac_ext >&5 19394 20682 19395 20683 cat >conftest.$ac_ext <<_ACEOF 19396 20684 -#line 12158 "configure" 19397 +#line 12 520"configure"20685 +#line 12665 "configure" 19398 20686 #include "confdefs.h" 19399 20687 19400 20688 #define _POSIX_SOURCE 19401 @@ -12169,16 +12 531,16 @@20689 @@ -12169,16 +12676,16 @@ 19402 20690 } 19403 20691 _ACEOF 19404 20692 rm -f conftest.$ac_objext 19405 20693 -if { (eval echo "$as_me:12172: \"$ac_compile\"") >&5 19406 +if { (eval echo "$as_me:12 534: \"$ac_compile\"") >&520694 +if { (eval echo "$as_me:12679: \"$ac_compile\"") >&5 19407 20695 (eval $ac_compile) 2>&5 19408 20696 ac_status=$? 19409 20697 - echo "$as_me:12175: \$? = $ac_status" >&5 19410 + echo "$as_me:12 537: \$? = $ac_status" >&520698 + echo "$as_me:12682: \$? = $ac_status" >&5 19411 20699 (exit $ac_status); } && 19412 20700 { ac_try='test -s conftest.$ac_objext' 19413 20701 - { (eval echo "$as_me:12178: \"$ac_try\"") >&5 19414 + { (eval echo "$as_me:12 540: \"$ac_try\"") >&520702 + { (eval echo "$as_me:12685: \"$ac_try\"") >&5 19415 20703 (eval $ac_try) 2>&5 19416 20704 ac_status=$? 19417 20705 - echo "$as_me:12181: \$? = $ac_status" >&5 19418 + echo "$as_me:12 543: \$? = $ac_status" >&520706 + echo "$as_me:12688: \$? = $ac_status" >&5 19419 20707 (exit $ac_status); }; }; then 19420 20708 termios_bad=unknown 19421 20709 else 19422 @@ -12193,19 +12 555,19 @@20710 @@ -12193,19 +12700,19 @@ 19423 20711 19424 20712 fi 19425 20713 rm -f conftest.$ac_objext conftest.$ac_ext 19426 20714 - echo "$as_me:12196: result: $termios_bad" >&5 19427 + echo "$as_me:12 558: result: $termios_bad" >&520715 + echo "$as_me:12703: result: $termios_bad" >&5 19428 20716 echo "${ECHO_T}$termios_bad" >&6 19429 20717 fi … … 19431 20719 19432 20720 -echo "$as_me:12201: checking for tcgetattr" >&5 19433 +echo "$as_me:12 563: checking for tcgetattr" >&520721 +echo "$as_me:12708: checking for tcgetattr" >&5 19434 20722 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 19435 20723 if test "${cf_cv_have_tcgetattr+set}" = set; then … … 19439 20727 cat >conftest.$ac_ext <<_ACEOF 19440 20728 -#line 12208 "configure" 19441 +#line 12 570"configure"20729 +#line 12715 "configure" 19442 20730 #include "confdefs.h" 19443 20731 19444 20732 #include <sys/types.h> 19445 @@ -12233,16 +12 595,16 @@20733 @@ -12233,16 +12740,16 @@ 19446 20734 } 19447 20735 _ACEOF 19448 20736 rm -f conftest.$ac_objext conftest$ac_exeext 19449 20737 -if { (eval echo "$as_me:12236: \"$ac_link\"") >&5 19450 +if { (eval echo "$as_me:12 598: \"$ac_link\"") >&520738 +if { (eval echo "$as_me:12743: \"$ac_link\"") >&5 19451 20739 (eval $ac_link) 2>&5 19452 20740 ac_status=$? 19453 20741 - echo "$as_me:12239: \$? = $ac_status" >&5 19454 + echo "$as_me:12 601: \$? = $ac_status" >&520742 + echo "$as_me:12746: \$? = $ac_status" >&5 19455 20743 (exit $ac_status); } && 19456 20744 { ac_try='test -s conftest$ac_exeext' 19457 20745 - { (eval echo "$as_me:12242: \"$ac_try\"") >&5 19458 + { (eval echo "$as_me:12 604: \"$ac_try\"") >&520746 + { (eval echo "$as_me:12749: \"$ac_try\"") >&5 19459 20747 (eval $ac_try) 2>&5 19460 20748 ac_status=$? 19461 20749 - echo "$as_me:12245: \$? = $ac_status" >&5 19462 + echo "$as_me:12 607: \$? = $ac_status" >&520750 + echo "$as_me:12752: \$? = $ac_status" >&5 19463 20751 (exit $ac_status); }; }; then 19464 20752 cf_cv_have_tcgetattr=yes 19465 20753 else 19466 @@ -12252,20 +12 614,20 @@20754 @@ -12252,20 +12759,20 @@ 19467 20755 fi 19468 20756 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 19469 20757 fi 19470 20758 -echo "$as_me:12255: result: $cf_cv_have_tcgetattr" >&5 19471 +echo "$as_me:12 617: result: $cf_cv_have_tcgetattr" >&520759 +echo "$as_me:12762: result: $cf_cv_have_tcgetattr" >&5 19472 20760 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 19473 20761 test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF … … 19476 20764 19477 20765 -echo "$as_me:12261: checking for vsscanf function or workaround" >&5 19478 +echo "$as_me:12 623: checking for vsscanf function or workaround" >&520766 +echo "$as_me:12768: checking for vsscanf function or workaround" >&5 19479 20767 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 19480 20768 if test "${cf_cv_func_vsscanf+set}" = set; then … … 19484 20772 cat >conftest.$ac_ext <<_ACEOF 19485 20773 -#line 12268 "configure" 19486 +#line 12 630"configure"20774 +#line 12775 "configure" 19487 20775 #include "confdefs.h" 19488 20776 19489 20777 #include <stdarg.h> 19490 @@ -12281,16 +12 643,16 @@20778 @@ -12281,16 +12788,16 @@ 19491 20779 } 19492 20780 _ACEOF 19493 20781 rm -f conftest.$ac_objext conftest$ac_exeext 19494 20782 -if { (eval echo "$as_me:12284: \"$ac_link\"") >&5 19495 +if { (eval echo "$as_me:12 646: \"$ac_link\"") >&520783 +if { (eval echo "$as_me:12791: \"$ac_link\"") >&5 19496 20784 (eval $ac_link) 2>&5 19497 20785 ac_status=$? 19498 20786 - echo "$as_me:12287: \$? = $ac_status" >&5 19499 + echo "$as_me:12 649: \$? = $ac_status" >&520787 + echo "$as_me:12794: \$? = $ac_status" >&5 19500 20788 (exit $ac_status); } && 19501 20789 { ac_try='test -s conftest$ac_exeext' 19502 20790 - { (eval echo "$as_me:12290: \"$ac_try\"") >&5 19503 + { (eval echo "$as_me:12 652: \"$ac_try\"") >&520791 + { (eval echo "$as_me:12797: \"$ac_try\"") >&5 19504 20792 (eval $ac_try) 2>&5 19505 20793 ac_status=$? 19506 20794 - echo "$as_me:12293: \$? = $ac_status" >&5 19507 + echo "$as_me:12 655: \$? = $ac_status" >&520795 + echo "$as_me:12800: \$? = $ac_status" >&5 19508 20796 (exit $ac_status); }; }; then 19509 20797 cf_cv_func_vsscanf=vsscanf 19510 20798 else 19511 @@ -12298,7 +12 660,7 @@20799 @@ -12298,7 +12805,7 @@ 19512 20800 cat conftest.$ac_ext >&5 19513 20801 19514 20802 cat >conftest.$ac_ext <<_ACEOF 19515 20803 -#line 12301 "configure" 19516 +#line 12 663"configure"20804 +#line 12808 "configure" 19517 20805 #include "confdefs.h" 19518 20806 19519 20807 #include <stdarg.h> 19520 @@ -12320,16 +12 682,16 @@20808 @@ -12320,16 +12827,16 @@ 19521 20809 } 19522 20810 _ACEOF 19523 20811 rm -f conftest.$ac_objext conftest$ac_exeext 19524 20812 -if { (eval echo "$as_me:12323: \"$ac_link\"") >&5 19525 +if { (eval echo "$as_me:12 685: \"$ac_link\"") >&520813 +if { (eval echo "$as_me:12830: \"$ac_link\"") >&5 19526 20814 (eval $ac_link) 2>&5 19527 20815 ac_status=$? 19528 20816 - echo "$as_me:12326: \$? = $ac_status" >&5 19529 + echo "$as_me:12 688: \$? = $ac_status" >&520817 + echo "$as_me:12833: \$? = $ac_status" >&5 19530 20818 (exit $ac_status); } && 19531 20819 { ac_try='test -s conftest$ac_exeext' 19532 20820 - { (eval echo "$as_me:12329: \"$ac_try\"") >&5 19533 + { (eval echo "$as_me:12 691: \"$ac_try\"") >&520821 + { (eval echo "$as_me:12836: \"$ac_try\"") >&5 19534 20822 (eval $ac_try) 2>&5 19535 20823 ac_status=$? 19536 20824 - echo "$as_me:12332: \$? = $ac_status" >&5 19537 + echo "$as_me:12 694: \$? = $ac_status" >&520825 + echo "$as_me:12839: \$? = $ac_status" >&5 19538 20826 (exit $ac_status); }; }; then 19539 20827 cf_cv_func_vsscanf=vfscanf 19540 20828 else 19541 @@ -12337,7 +12 699,7 @@20829 @@ -12337,7 +12844,7 @@ 19542 20830 cat conftest.$ac_ext >&5 19543 20831 19544 20832 cat >conftest.$ac_ext <<_ACEOF 19545 20833 -#line 12340 "configure" 19546 +#line 12 702"configure"20834 +#line 12847 "configure" 19547 20835 #include "confdefs.h" 19548 20836 19549 20837 #include <stdarg.h> 19550 @@ -12359,16 +12 721,16 @@20838 @@ -12359,16 +12866,16 @@ 19551 20839 } 19552 20840 _ACEOF 19553 20841 rm -f conftest.$ac_objext conftest$ac_exeext 19554 20842 -if { (eval echo "$as_me:12362: \"$ac_link\"") >&5 19555 +if { (eval echo "$as_me:12 724: \"$ac_link\"") >&520843 +if { (eval echo "$as_me:12869: \"$ac_link\"") >&5 19556 20844 (eval $ac_link) 2>&5 19557 20845 ac_status=$? 19558 20846 - echo "$as_me:12365: \$? = $ac_status" >&5 19559 + echo "$as_me:12 727: \$? = $ac_status" >&520847 + echo "$as_me:12872: \$? = $ac_status" >&5 19560 20848 (exit $ac_status); } && 19561 20849 { ac_try='test -s conftest$ac_exeext' 19562 20850 - { (eval echo "$as_me:12368: \"$ac_try\"") >&5 19563 + { (eval echo "$as_me:12 730: \"$ac_try\"") >&520851 + { (eval echo "$as_me:12875: \"$ac_try\"") >&5 19564 20852 (eval $ac_try) 2>&5 19565 20853 ac_status=$? 19566 20854 - echo "$as_me:12371: \$? = $ac_status" >&5 19567 + echo "$as_me:12 733: \$? = $ac_status" >&520855 + echo "$as_me:12878: \$? = $ac_status" >&5 19568 20856 (exit $ac_status); }; }; then 19569 20857 cf_cv_func_vsscanf=_doscan 19570 20858 else 19571 @@ -12383,7 +12 745,7 @@20859 @@ -12383,7 +12890,7 @@ 19572 20860 fi 19573 20861 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 19574 20862 fi 19575 20863 -echo "$as_me:12386: result: $cf_cv_func_vsscanf" >&5 19576 +echo "$as_me:12 748: result: $cf_cv_func_vsscanf" >&520864 +echo "$as_me:12893: result: $cf_cv_func_vsscanf" >&5 19577 20865 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 19578 20866 19579 20867 case $cf_cv_func_vsscanf in #(vi 19580 @@ -12401,7 +12 763,7 @@20868 @@ -12401,7 +12908,7 @@ 19581 20869 ;; 19582 20870 esac 19583 20871 19584 20872 -echo "$as_me:12404: checking for working mkstemp" >&5 19585 +echo "$as_me:12 766: checking for working mkstemp" >&520873 +echo "$as_me:12911: checking for working mkstemp" >&5 19586 20874 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 19587 20875 if test "${cf_cv_func_mkstemp+set}" = set; then 19588 20876 echo $ECHO_N "(cached) $ECHO_C" >&6 19589 @@ -12409,13 +12 771,13 @@20877 @@ -12409,13 +12916,13 @@ 19590 20878 19591 20879 rm -f conftest* 19592 20880 if test "$cross_compiling" = yes; then 19593 20881 - echo "$as_me:12412: checking for mkstemp" >&5 19594 + echo "$as_me:12 774: checking for mkstemp" >&520882 + echo "$as_me:12919: checking for mkstemp" >&5 19595 20883 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 19596 20884 if test "${ac_cv_func_mkstemp+set}" = set; then … … 19599 20887 cat >conftest.$ac_ext <<_ACEOF 19600 20888 -#line 12418 "configure" 19601 +#line 12 780"configure"20889 +#line 12925 "configure" 19602 20890 #include "confdefs.h" 19603 20891 /* System header to define __stub macros and hopefully few prototypes, 19604 20892 which can conflict with char mkstemp (); below. */ 19605 @@ -12446,16 +12 808,16 @@20893 @@ -12446,16 +12953,16 @@ 19606 20894 } 19607 20895 _ACEOF 19608 20896 rm -f conftest.$ac_objext conftest$ac_exeext 19609 20897 -if { (eval echo "$as_me:12449: \"$ac_link\"") >&5 19610 +if { (eval echo "$as_me:12 811: \"$ac_link\"") >&520898 +if { (eval echo "$as_me:12956: \"$ac_link\"") >&5 19611 20899 (eval $ac_link) 2>&5 19612 20900 ac_status=$? 19613 20901 - echo "$as_me:12452: \$? = $ac_status" >&5 19614 + echo "$as_me:12 814: \$? = $ac_status" >&520902 + echo "$as_me:12959: \$? = $ac_status" >&5 19615 20903 (exit $ac_status); } && 19616 20904 { ac_try='test -s conftest$ac_exeext' 19617 20905 - { (eval echo "$as_me:12455: \"$ac_try\"") >&5 19618 + { (eval echo "$as_me:12 817: \"$ac_try\"") >&520906 + { (eval echo "$as_me:12962: \"$ac_try\"") >&5 19619 20907 (eval $ac_try) 2>&5 19620 20908 ac_status=$? 19621 20909 - echo "$as_me:12458: \$? = $ac_status" >&5 19622 + echo "$as_me:12 820: \$? = $ac_status" >&520910 + echo "$as_me:12965: \$? = $ac_status" >&5 19623 20911 (exit $ac_status); }; }; then 19624 20912 ac_cv_func_mkstemp=yes 19625 20913 else 19626 @@ -12465,12 +12 827,12 @@20914 @@ -12465,12 +12972,12 @@ 19627 20915 fi 19628 20916 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 19629 20917 fi 19630 20918 -echo "$as_me:12468: result: $ac_cv_func_mkstemp" >&5 19631 +echo "$as_me:12 830: result: $ac_cv_func_mkstemp" >&520919 +echo "$as_me:12975: result: $ac_cv_func_mkstemp" >&5 19632 20920 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 19633 20921 … … 19635 20923 cat >conftest.$ac_ext <<_ACEOF 19636 20924 -#line 12473 "configure" 19637 +#line 12 835"configure"20925 +#line 12980 "configure" 19638 20926 #include "confdefs.h" 19639 20927 19640 20928 #include <sys/types.h> 19641 @@ -12508,15 +1 2870,15 @@20929 @@ -12508,15 +13015,15 @@ 19642 20930 19643 20931 _ACEOF 19644 20932 rm -f conftest$ac_exeext 19645 20933 -if { (eval echo "$as_me:12511: \"$ac_link\"") >&5 19646 +if { (eval echo "$as_me:1 2873: \"$ac_link\"") >&520934 +if { (eval echo "$as_me:13018: \"$ac_link\"") >&5 19647 20935 (eval $ac_link) 2>&5 19648 20936 ac_status=$? 19649 20937 - echo "$as_me:12514: \$? = $ac_status" >&5 19650 + echo "$as_me:1 2876: \$? = $ac_status" >&520938 + echo "$as_me:13021: \$? = $ac_status" >&5 19651 20939 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 19652 20940 - { (eval echo "$as_me:12516: \"$ac_try\"") >&5 19653 + { (eval echo "$as_me:1 2878: \"$ac_try\"") >&520941 + { (eval echo "$as_me:13023: \"$ac_try\"") >&5 19654 20942 (eval $ac_try) 2>&5 19655 20943 ac_status=$? 19656 20944 - echo "$as_me:12519: \$? = $ac_status" >&5 19657 + echo "$as_me:1 2881: \$? = $ac_status" >&520945 + echo "$as_me:13026: \$? = $ac_status" >&5 19658 20946 (exit $ac_status); }; }; then 19659 20947 cf_cv_func_mkstemp=yes 19660 20948 19661 @@ -12531,7 +1 2893,7 @@20949 @@ -12531,7 +13038,7 @@ 19662 20950 fi 19663 20951 19664 20952 fi 19665 20953 -echo "$as_me:12534: result: $cf_cv_func_mkstemp" >&5 19666 +echo "$as_me:1 2896: result: $cf_cv_func_mkstemp" >&520954 +echo "$as_me:13041: result: $cf_cv_func_mkstemp" >&5 19667 20955 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 19668 20956 if test "$cf_cv_func_mkstemp" = yes ; then 19669 20957 cat >>confdefs.h <<\EOF 19670 @@ -12549,21 +1 2911,21 @@20958 @@ -12549,21 +13056,21 @@ 19671 20959 fi 19672 20960 19673 20961 if test "$cross_compiling" = yes ; then 19674 20962 - { echo "$as_me:12552: WARNING: cross compiling: assume setvbuf params not reversed" >&5 19675 + { echo "$as_me:1 2914: WARNING: cross compiling: assume setvbuf params not reversed" >&520963 + { echo "$as_me:13059: WARNING: cross compiling: assume setvbuf params not reversed" >&5 19676 20964 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} 19677 20965 else 19678 20966 - echo "$as_me:12555: checking whether setvbuf arguments are reversed" >&5 19679 + echo "$as_me:1 2917: checking whether setvbuf arguments are reversed" >&520967 + echo "$as_me:13062: checking whether setvbuf arguments are reversed" >&5 19680 20968 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 19681 20969 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then … … 19684 20972 if test "$cross_compiling" = yes; then 19685 20973 - { { echo "$as_me:12561: error: cannot run test program while cross compiling" >&5 19686 + { { echo "$as_me:1 2923: error: cannot run test program while cross compiling" >&520974 + { { echo "$as_me:13068: error: cannot run test program while cross compiling" >&5 19687 20975 echo "$as_me: error: cannot run test program while cross compiling" >&2;} 19688 20976 { (exit 1); exit 1; }; } … … 19690 20978 cat >conftest.$ac_ext <<_ACEOF 19691 20979 -#line 12566 "configure" 19692 +#line 1 2928"configure"20980 +#line 13073 "configure" 19693 20981 #include "confdefs.h" 19694 20982 #include <stdio.h> 19695 20983 /* If setvbuf has the reversed format, exit 0. */ 19696 @@ -12580,15 +1 2942,15 @@20984 @@ -12580,15 +13087,15 @@ 19697 20985 } 19698 20986 _ACEOF 19699 20987 rm -f conftest$ac_exeext 19700 20988 -if { (eval echo "$as_me:12583: \"$ac_link\"") >&5 19701 +if { (eval echo "$as_me:1 2945: \"$ac_link\"") >&520989 +if { (eval echo "$as_me:13090: \"$ac_link\"") >&5 19702 20990 (eval $ac_link) 2>&5 19703 20991 ac_status=$? 19704 20992 - echo "$as_me:12586: \$? = $ac_status" >&5 19705 + echo "$as_me:1 2948: \$? = $ac_status" >&520993 + echo "$as_me:13093: \$? = $ac_status" >&5 19706 20994 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 19707 20995 - { (eval echo "$as_me:12588: \"$ac_try\"") >&5 19708 + { (eval echo "$as_me:1 2950: \"$ac_try\"") >&520996 + { (eval echo "$as_me:13095: \"$ac_try\"") >&5 19709 20997 (eval $ac_try) 2>&5 19710 20998 ac_status=$? 19711 20999 - echo "$as_me:12591: \$? = $ac_status" >&5 19712 + echo "$as_me:1 2953: \$? = $ac_status" >&521000 + echo "$as_me:13098: \$? = $ac_status" >&5 19713 21001 (exit $ac_status); }; }; then 19714 21002 ac_cv_func_setvbuf_reversed=yes 19715 21003 else 19716 @@ -12601,7 +1 2963,7 @@21004 @@ -12601,7 +13108,7 @@ 19717 21005 fi 19718 21006 rm -f core core.* *.core 19719 21007 fi 19720 21008 -echo "$as_me:12604: result: $ac_cv_func_setvbuf_reversed" >&5 19721 +echo "$as_me:1 2966: result: $ac_cv_func_setvbuf_reversed" >&521009 +echo "$as_me:13111: result: $ac_cv_func_setvbuf_reversed" >&5 19722 21010 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 19723 21011 if test $ac_cv_func_setvbuf_reversed = yes; then 19724 21012 19725 @@ -12612,13 +1 2974,13 @@21013 @@ -12612,13 +13119,13 @@ 19726 21014 fi 19727 21015 19728 21016 fi 19729 21017 -echo "$as_me:12615: checking return type of signal handlers" >&5 19730 +echo "$as_me:1 2977: checking return type of signal handlers" >&521018 +echo "$as_me:13122: checking return type of signal handlers" >&5 19731 21019 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 19732 21020 if test "${ac_cv_type_signal+set}" = set; then … … 19735 21023 cat >conftest.$ac_ext <<_ACEOF 19736 21024 -#line 12621 "configure" 19737 +#line 1 2983"configure"21025 +#line 13128 "configure" 19738 21026 #include "confdefs.h" 19739 21027 #include <sys/types.h> 19740 21028 #include <signal.h> 19741 @@ -12640,16 +13 002,16 @@21029 @@ -12640,16 +13147,16 @@ 19742 21030 } 19743 21031 _ACEOF 19744 21032 rm -f conftest.$ac_objext 19745 21033 -if { (eval echo "$as_me:12643: \"$ac_compile\"") >&5 19746 +if { (eval echo "$as_me:13 005: \"$ac_compile\"") >&521034 +if { (eval echo "$as_me:13150: \"$ac_compile\"") >&5 19747 21035 (eval $ac_compile) 2>&5 19748 21036 ac_status=$? 19749 21037 - echo "$as_me:12646: \$? = $ac_status" >&5 19750 + echo "$as_me:13 008: \$? = $ac_status" >&521038 + echo "$as_me:13153: \$? = $ac_status" >&5 19751 21039 (exit $ac_status); } && 19752 21040 { ac_try='test -s conftest.$ac_objext' 19753 21041 - { (eval echo "$as_me:12649: \"$ac_try\"") >&5 19754 + { (eval echo "$as_me:13 011: \"$ac_try\"") >&521042 + { (eval echo "$as_me:13156: \"$ac_try\"") >&5 19755 21043 (eval $ac_try) 2>&5 19756 21044 ac_status=$? 19757 21045 - echo "$as_me:12652: \$? = $ac_status" >&5 19758 + echo "$as_me:13 014: \$? = $ac_status" >&521046 + echo "$as_me:13159: \$? = $ac_status" >&5 19759 21047 (exit $ac_status); }; }; then 19760 21048 ac_cv_type_signal=void 19761 21049 else 19762 @@ -12659,21 +13 021,21 @@21050 @@ -12659,21 +13166,21 @@ 19763 21051 fi 19764 21052 rm -f conftest.$ac_objext conftest.$ac_ext 19765 21053 fi 19766 21054 -echo "$as_me:12662: result: $ac_cv_type_signal" >&5 19767 +echo "$as_me:13 024: result: $ac_cv_type_signal" >&521055 +echo "$as_me:13169: result: $ac_cv_type_signal" >&5 19768 21056 echo "${ECHO_T}$ac_cv_type_signal" >&6 19769 21057 … … 19773 21061 19774 21062 -echo "$as_me:12669: checking for type sigaction_t" >&5 19775 +echo "$as_me:13 031: checking for type sigaction_t" >&521063 +echo "$as_me:13176: checking for type sigaction_t" >&5 19776 21064 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 19777 21065 if test "${cf_cv_type_sigaction+set}" = set; then … … 19781 21069 cat >conftest.$ac_ext <<_ACEOF 19782 21070 -#line 12676 "configure" 19783 +#line 13 038"configure"21071 +#line 13183 "configure" 19784 21072 #include "confdefs.h" 19785 21073 19786 21074 #include <signal.h> 19787 @@ -12686,16 +13 048,16 @@21075 @@ -12686,16 +13193,16 @@ 19788 21076 } 19789 21077 _ACEOF 19790 21078 rm -f conftest.$ac_objext 19791 21079 -if { (eval echo "$as_me:12689: \"$ac_compile\"") >&5 19792 +if { (eval echo "$as_me:13 051: \"$ac_compile\"") >&521080 +if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5 19793 21081 (eval $ac_compile) 2>&5 19794 21082 ac_status=$? 19795 21083 - echo "$as_me:12692: \$? = $ac_status" >&5 19796 + echo "$as_me:13 054: \$? = $ac_status" >&521084 + echo "$as_me:13199: \$? = $ac_status" >&5 19797 21085 (exit $ac_status); } && 19798 21086 { ac_try='test -s conftest.$ac_objext' 19799 21087 - { (eval echo "$as_me:12695: \"$ac_try\"") >&5 19800 + { (eval echo "$as_me:13 057: \"$ac_try\"") >&521088 + { (eval echo "$as_me:13202: \"$ac_try\"") >&5 19801 21089 (eval $ac_try) 2>&5 19802 21090 ac_status=$? 19803 21091 - echo "$as_me:12698: \$? = $ac_status" >&5 19804 + echo "$as_me:13 060: \$? = $ac_status" >&521092 + echo "$as_me:13205: \$? = $ac_status" >&5 19805 21093 (exit $ac_status); }; }; then 19806 21094 cf_cv_type_sigaction=yes 19807 21095 else 19808 @@ -12706,13 +13 068,13 @@21096 @@ -12706,13 +13213,13 @@ 19809 21097 rm -f conftest.$ac_objext conftest.$ac_ext 19810 21098 fi 19811 21099 19812 21100 -echo "$as_me:12709: result: $cf_cv_type_sigaction" >&5 19813 +echo "$as_me:13 071: result: $cf_cv_type_sigaction" >&521101 +echo "$as_me:13216: result: $cf_cv_type_sigaction" >&5 19814 21102 echo "${ECHO_T}$cf_cv_type_sigaction" >&6 19815 21103 test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF … … 19818 21106 19819 21107 -echo "$as_me:12715: checking declaration of size-change" >&5 19820 +echo "$as_me:13 077: checking declaration of size-change" >&521108 +echo "$as_me:13222: checking declaration of size-change" >&5 19821 21109 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 19822 21110 if test "${cf_cv_sizechange+set}" = set; then 19823 21111 echo $ECHO_N "(cached) $ECHO_C" >&6 19824 @@ -12727,7 +13 089,7 @@21112 @@ -12727,7 +13234,7 @@ 19825 21113 CPPFLAGS="$cf_save_CPPFLAGS" 19826 21114 test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" 19827 21115 cat >conftest.$ac_ext <<_ACEOF 19828 21116 -#line 12730 "configure" 19829 +#line 13 092"configure"21117 +#line 13237 "configure" 19830 21118 #include "confdefs.h" 19831 21119 #include <sys/types.h> 19832 21120 #ifdef HAVE_TERMIOS_H 19833 @@ -12771,16 +13 133,16 @@21121 @@ -12771,16 +13278,16 @@ 19834 21122 } 19835 21123 _ACEOF 19836 21124 rm -f conftest.$ac_objext 19837 21125 -if { (eval echo "$as_me:12774: \"$ac_compile\"") >&5 19838 +if { (eval echo "$as_me:13 136: \"$ac_compile\"") >&521126 +if { (eval echo "$as_me:13281: \"$ac_compile\"") >&5 19839 21127 (eval $ac_compile) 2>&5 19840 21128 ac_status=$? 19841 21129 - echo "$as_me:12777: \$? = $ac_status" >&5 19842 + echo "$as_me:13 139: \$? = $ac_status" >&521130 + echo "$as_me:13284: \$? = $ac_status" >&5 19843 21131 (exit $ac_status); } && 19844 21132 { ac_try='test -s conftest.$ac_objext' 19845 21133 - { (eval echo "$as_me:12780: \"$ac_try\"") >&5 19846 + { (eval echo "$as_me:13 142: \"$ac_try\"") >&521134 + { (eval echo "$as_me:13287: \"$ac_try\"") >&5 19847 21135 (eval $ac_try) 2>&5 19848 21136 ac_status=$? 19849 21137 - echo "$as_me:12783: \$? = $ac_status" >&5 19850 + echo "$as_me:13 145: \$? = $ac_status" >&521138 + echo "$as_me:13290: \$? = $ac_status" >&5 19851 21139 (exit $ac_status); }; }; then 19852 21140 cf_cv_sizechange=yes 19853 21141 else 19854 @@ -12799,7 +13 161,7 @@21142 @@ -12799,7 +13306,7 @@ 19855 21143 done 19856 21144 19857 21145 fi 19858 21146 -echo "$as_me:12802: result: $cf_cv_sizechange" >&5 19859 +echo "$as_me:13 164: result: $cf_cv_sizechange" >&521147 +echo "$as_me:13309: result: $cf_cv_sizechange" >&5 19860 21148 echo "${ECHO_T}$cf_cv_sizechange" >&6 19861 21149 if test "$cf_cv_sizechange" != no ; then 19862 21150 cat >>confdefs.h <<\EOF 19863 @@ -12816,13 +13 178,13 @@21151 @@ -12816,13 +13323,13 @@ 19864 21152 esac 19865 21153 fi 19866 21154 19867 21155 -echo "$as_me:12819: checking for memmove" >&5 19868 +echo "$as_me:13 181: checking for memmove" >&521156 +echo "$as_me:13326: checking for memmove" >&5 19869 21157 echo $ECHO_N "checking for memmove... $ECHO_C" >&6 19870 21158 if test "${ac_cv_func_memmove+set}" = set; then … … 19873 21161 cat >conftest.$ac_ext <<_ACEOF 19874 21162 -#line 12825 "configure" 19875 +#line 13 187"configure"21163 +#line 13332 "configure" 19876 21164 #include "confdefs.h" 19877 21165 /* System header to define __stub macros and hopefully few prototypes, 19878 21166 which can conflict with char memmove (); below. */ 19879 @@ -12853,16 +13 215,16 @@21167 @@ -12853,16 +13360,16 @@ 19880 21168 } 19881 21169 _ACEOF 19882 21170 rm -f conftest.$ac_objext conftest$ac_exeext 19883 21171 -if { (eval echo "$as_me:12856: \"$ac_link\"") >&5 19884 +if { (eval echo "$as_me:13 218: \"$ac_link\"") >&521172 +if { (eval echo "$as_me:13363: \"$ac_link\"") >&5 19885 21173 (eval $ac_link) 2>&5 19886 21174 ac_status=$? 19887 21175 - echo "$as_me:12859: \$? = $ac_status" >&5 19888 + echo "$as_me:13 221: \$? = $ac_status" >&521176 + echo "$as_me:13366: \$? = $ac_status" >&5 19889 21177 (exit $ac_status); } && 19890 21178 { ac_try='test -s conftest$ac_exeext' 19891 21179 - { (eval echo "$as_me:12862: \"$ac_try\"") >&5 19892 + { (eval echo "$as_me:13 224: \"$ac_try\"") >&521180 + { (eval echo "$as_me:13369: \"$ac_try\"") >&5 19893 21181 (eval $ac_try) 2>&5 19894 21182 ac_status=$? 19895 21183 - echo "$as_me:12865: \$? = $ac_status" >&5 19896 + echo "$as_me:13 227: \$? = $ac_status" >&521184 + echo "$as_me:13372: \$? = $ac_status" >&5 19897 21185 (exit $ac_status); }; }; then 19898 21186 ac_cv_func_memmove=yes 19899 21187 else 19900 @@ -12872,19 +13 234,19 @@21188 @@ -12872,19 +13379,19 @@ 19901 21189 fi 19902 21190 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 19903 21191 fi 19904 21192 -echo "$as_me:12875: result: $ac_cv_func_memmove" >&5 19905 +echo "$as_me:13 237: result: $ac_cv_func_memmove" >&521193 +echo "$as_me:13382: result: $ac_cv_func_memmove" >&5 19906 21194 echo "${ECHO_T}$ac_cv_func_memmove" >&6 19907 21195 if test $ac_cv_func_memmove = yes; then … … 19910 21198 19911 21199 -echo "$as_me:12881: checking for bcopy" >&5 19912 +echo "$as_me:13 243: checking for bcopy" >&521200 +echo "$as_me:13388: checking for bcopy" >&5 19913 21201 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 19914 21202 if test "${ac_cv_func_bcopy+set}" = set; then … … 19917 21205 cat >conftest.$ac_ext <<_ACEOF 19918 21206 -#line 12887 "configure" 19919 +#line 13 249"configure"21207 +#line 13394 "configure" 19920 21208 #include "confdefs.h" 19921 21209 /* System header to define __stub macros and hopefully few prototypes, 19922 21210 which can conflict with char bcopy (); below. */ 19923 @@ -12915,16 +13 277,16 @@21211 @@ -12915,16 +13422,16 @@ 19924 21212 } 19925 21213 _ACEOF 19926 21214 rm -f conftest.$ac_objext conftest$ac_exeext 19927 21215 -if { (eval echo "$as_me:12918: \"$ac_link\"") >&5 19928 +if { (eval echo "$as_me:13 280: \"$ac_link\"") >&521216 +if { (eval echo "$as_me:13425: \"$ac_link\"") >&5 19929 21217 (eval $ac_link) 2>&5 19930 21218 ac_status=$? 19931 21219 - echo "$as_me:12921: \$? = $ac_status" >&5 19932 + echo "$as_me:13 283: \$? = $ac_status" >&521220 + echo "$as_me:13428: \$? = $ac_status" >&5 19933 21221 (exit $ac_status); } && 19934 21222 { ac_try='test -s conftest$ac_exeext' 19935 21223 - { (eval echo "$as_me:12924: \"$ac_try\"") >&5 19936 + { (eval echo "$as_me:13 286: \"$ac_try\"") >&521224 + { (eval echo "$as_me:13431: \"$ac_try\"") >&5 19937 21225 (eval $ac_try) 2>&5 19938 21226 ac_status=$? 19939 21227 - echo "$as_me:12927: \$? = $ac_status" >&5 19940 + echo "$as_me:13 289: \$? = $ac_status" >&521228 + echo "$as_me:13434: \$? = $ac_status" >&5 19941 21229 (exit $ac_status); }; }; then 19942 21230 ac_cv_func_bcopy=yes 19943 21231 else 19944 @@ -12934,11 +13 296,11 @@21232 @@ -12934,11 +13441,11 @@ 19945 21233 fi 19946 21234 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 19947 21235 fi 19948 21236 -echo "$as_me:12937: result: $ac_cv_func_bcopy" >&5 19949 +echo "$as_me:13 299: result: $ac_cv_func_bcopy" >&521237 +echo "$as_me:13444: result: $ac_cv_func_bcopy" >&5 19950 21238 echo "${ECHO_T}$ac_cv_func_bcopy" >&6 19951 21239 if test $ac_cv_func_bcopy = yes; then 19952 21240 19953 21241 - echo "$as_me:12941: checking if bcopy does overlapping moves" >&5 19954 + echo "$as_me:13 303: checking if bcopy does overlapping moves" >&521242 + echo "$as_me:13448: checking if bcopy does overlapping moves" >&5 19955 21243 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 19956 21244 if test "${cf_cv_good_bcopy+set}" = set; then 19957 21245 echo $ECHO_N "(cached) $ECHO_C" >&6 19958 @@ -12948,7 +13 310,7 @@21246 @@ -12948,7 +13455,7 @@ 19959 21247 cf_cv_good_bcopy=unknown 19960 21248 else 19961 21249 cat >conftest.$ac_ext <<_ACEOF 19962 21250 -#line 12951 "configure" 19963 +#line 13 313"configure"21251 +#line 13458 "configure" 19964 21252 #include "confdefs.h" 19965 21253 19966 21254 int main() { 19967 @@ -12962,15 +13 324,15 @@21255 @@ -12962,15 +13469,15 @@ 19968 21256 19969 21257 _ACEOF 19970 21258 rm -f conftest$ac_exeext 19971 21259 -if { (eval echo "$as_me:12965: \"$ac_link\"") >&5 19972 +if { (eval echo "$as_me:13 327: \"$ac_link\"") >&521260 +if { (eval echo "$as_me:13472: \"$ac_link\"") >&5 19973 21261 (eval $ac_link) 2>&5 19974 21262 ac_status=$? 19975 21263 - echo "$as_me:12968: \$? = $ac_status" >&5 19976 + echo "$as_me:13 330: \$? = $ac_status" >&521264 + echo "$as_me:13475: \$? = $ac_status" >&5 19977 21265 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 19978 21266 - { (eval echo "$as_me:12970: \"$ac_try\"") >&5 19979 + { (eval echo "$as_me:13 332: \"$ac_try\"") >&521267 + { (eval echo "$as_me:13477: \"$ac_try\"") >&5 19980 21268 (eval $ac_try) 2>&5 19981 21269 ac_status=$? 19982 21270 - echo "$as_me:12973: \$? = $ac_status" >&5 19983 + echo "$as_me:13 335: \$? = $ac_status" >&521271 + echo "$as_me:13480: \$? = $ac_status" >&5 19984 21272 (exit $ac_status); }; }; then 19985 21273 cf_cv_good_bcopy=yes 19986 21274 else 19987 @@ -12983,7 +13 345,7 @@21275 @@ -12983,7 +13490,7 @@ 19988 21276 fi 19989 21277 19990 21278 fi 19991 21279 -echo "$as_me:12986: result: $cf_cv_good_bcopy" >&5 19992 +echo "$as_me:13 348: result: $cf_cv_good_bcopy" >&521280 +echo "$as_me:13493: result: $cf_cv_good_bcopy" >&5 19993 21281 echo "${ECHO_T}$cf_cv_good_bcopy" >&6 19994 21282 19995 21283 else 19996 @@ -13004,7 +13 366,7 @@21284 @@ -13004,7 +13511,7 @@ 19997 21285 19998 21286 fi 19999 21287 20000 21288 -echo "$as_me:13007: checking if poll really works" >&5 20001 +echo "$as_me:13 369: checking if poll really works" >&521289 +echo "$as_me:13514: checking if poll really works" >&5 20002 21290 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 20003 21291 if test "${cf_cv_working_poll+set}" = set; then 20004 21292 echo $ECHO_N "(cached) $ECHO_C" >&6 20005 @@ -13014,7 +13 376,7 @@21293 @@ -13014,7 +13521,7 @@ 20006 21294 cf_cv_working_poll=unknown 20007 21295 else 20008 21296 cat >conftest.$ac_ext <<_ACEOF 20009 21297 -#line 13017 "configure" 20010 +#line 13 379"configure"21298 +#line 13524 "configure" 20011 21299 #include "confdefs.h" 20012 21300 20013 21301 #include <stdio.h> 20014 @@ -13035,15 +13 397,15 @@21302 @@ -13035,15 +13542,15 @@ 20015 21303 } 20016 21304 _ACEOF 20017 21305 rm -f conftest$ac_exeext 20018 21306 -if { (eval echo "$as_me:13038: \"$ac_link\"") >&5 20019 +if { (eval echo "$as_me:13 400: \"$ac_link\"") >&521307 +if { (eval echo "$as_me:13545: \"$ac_link\"") >&5 20020 21308 (eval $ac_link) 2>&5 20021 21309 ac_status=$? 20022 21310 - echo "$as_me:13041: \$? = $ac_status" >&5 20023 + echo "$as_me:13 403: \$? = $ac_status" >&521311 + echo "$as_me:13548: \$? = $ac_status" >&5 20024 21312 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 20025 21313 - { (eval echo "$as_me:13043: \"$ac_try\"") >&5 20026 + { (eval echo "$as_me:13 405: \"$ac_try\"") >&521314 + { (eval echo "$as_me:13550: \"$ac_try\"") >&5 20027 21315 (eval $ac_try) 2>&5 20028 21316 ac_status=$? 20029 21317 - echo "$as_me:13046: \$? = $ac_status" >&5 20030 + echo "$as_me:13 408: \$? = $ac_status" >&521318 + echo "$as_me:13553: \$? = $ac_status" >&5 20031 21319 (exit $ac_status); }; }; then 20032 21320 cf_cv_working_poll=yes 20033 21321 else 20034 @@ -13055, 7 +13417,7@@21322 @@ -13055,34 +13562,276 @@ 20035 21323 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 20036 21324 fi 20037 21325 fi 20038 21326 -echo "$as_me:13058: result: $cf_cv_working_poll" >&5 20039 +echo "$as_me:13 420: result: $cf_cv_working_poll" >&521327 +echo "$as_me:13565: result: $cf_cv_working_poll" >&5 20040 21328 echo "${ECHO_T}$cf_cv_working_poll" >&6 20041 21329 test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF 20042 21330 #define HAVE_WORKING_POLL 1 20043 @@ -13066,23 +13428,132 @@ 21331 EOF 21332 21333 +# special check for test/ditto.c 21334 + 21335 +echo "$as_me:13573: checking for openpty in -lutil" >&5 21336 +echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 21337 +if test "${ac_cv_lib_util_openpty+set}" = set; then 21338 + echo $ECHO_N "(cached) $ECHO_C" >&6 21339 +else 21340 + ac_check_lib_save_LIBS=$LIBS 21341 +LIBS="-lutil $LIBS" 21342 +cat >conftest.$ac_ext <<_ACEOF 21343 +#line 13581 "configure" 21344 +#include "confdefs.h" 21345 + 21346 +/* Override any gcc2 internal prototype to avoid an error. */ 21347 +#ifdef __cplusplus 21348 +extern "C" 21349 +#endif 21350 +/* We use char because int might match the return type of a gcc2 21351 + builtin and then its argument prototype would still apply. */ 21352 +char openpty (); 21353 +int 21354 +main () 21355 +{ 21356 +openpty (); 21357 + ; 21358 + return 0; 21359 +} 21360 +_ACEOF 21361 +rm -f conftest.$ac_objext conftest$ac_exeext 21362 +if { (eval echo "$as_me:13600: \"$ac_link\"") >&5 21363 + (eval $ac_link) 2>&5 21364 + ac_status=$? 21365 + echo "$as_me:13603: \$? = $ac_status" >&5 21366 + (exit $ac_status); } && 21367 + { ac_try='test -s conftest$ac_exeext' 21368 + { (eval echo "$as_me:13606: \"$ac_try\"") >&5 21369 + (eval $ac_try) 2>&5 21370 + ac_status=$? 21371 + echo "$as_me:13609: \$? = $ac_status" >&5 21372 + (exit $ac_status); }; }; then 21373 + ac_cv_lib_util_openpty=yes 21374 +else 21375 + echo "$as_me: failed program was:" >&5 21376 +cat conftest.$ac_ext >&5 21377 +ac_cv_lib_util_openpty=no 21378 +fi 21379 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 21380 +LIBS=$ac_check_lib_save_LIBS 21381 +fi 21382 +echo "$as_me:13620: result: $ac_cv_lib_util_openpty" >&5 21383 +echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 21384 +if test $ac_cv_lib_util_openpty = yes; then 21385 + cf_cv_lib_util=yes 21386 +else 21387 + cf_cv_lib_util=no 21388 +fi 21389 + 21390 +echo "$as_me:13628: checking for openpty header" >&5 21391 +echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 21392 +if test "${cf_cv_func_openpty+set}" = set; then 21393 + echo $ECHO_N "(cached) $ECHO_C" >&6 21394 +else 21395 + 21396 + cf_save_LIBS="$LIBS" 21397 + test $cf_cv_lib_util = yes && LIBS="-lutil $LIBS" 21398 + for cf_header in pty.h libutil.h util.h 21399 + do 21400 + cat >conftest.$ac_ext <<_ACEOF 21401 +#line 13639 "configure" 21402 +#include "confdefs.h" 21403 + 21404 +#include <$cf_header> 21405 + 21406 +int 21407 +main () 21408 +{ 21409 + 21410 + int x = openpty((int *)0, (int *)0, (char *)0, 21411 + (struct termios *)0, (struct winsize *)0); 21412 + 21413 + ; 21414 + return 0; 21415 +} 21416 +_ACEOF 21417 +rm -f conftest.$ac_objext conftest$ac_exeext 21418 +if { (eval echo "$as_me:13656: \"$ac_link\"") >&5 21419 + (eval $ac_link) 2>&5 21420 + ac_status=$? 21421 + echo "$as_me:13659: \$? = $ac_status" >&5 21422 + (exit $ac_status); } && 21423 + { ac_try='test -s conftest$ac_exeext' 21424 + { (eval echo "$as_me:13662: \"$ac_try\"") >&5 21425 + (eval $ac_try) 2>&5 21426 + ac_status=$? 21427 + echo "$as_me:13665: \$? = $ac_status" >&5 21428 + (exit $ac_status); }; }; then 21429 + 21430 + cf_cv_func_openpty=$cf_header 21431 + break 21432 + 21433 +else 21434 + echo "$as_me: failed program was:" >&5 21435 +cat conftest.$ac_ext >&5 21436 + 21437 + cf_cv_func_openpty=no 21438 + 21439 +fi 21440 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 21441 + done 21442 + LIBS="$cf_save_LIBS" 21443 + 21444 +fi 21445 +echo "$as_me:13683: result: $cf_cv_func_openpty" >&5 21446 +echo "${ECHO_T}$cf_cv_func_openpty" >&6 21447 + 21448 +if test "$cf_cv_func_openpty" != no ; then 21449 + cat >>confdefs.h <<EOF 21450 +#define USE_OPENPTY_HEADER <$cf_cv_func_openpty> 21451 +EOF 21452 + 21453 + cat >>confdefs.h <<\EOF 21454 +#define USE_XTERM_PTY 1 21455 +EOF 21456 + 21457 + if test "$cf_cv_lib_util" = yes ; then 21458 + TEST_LIBS="-lutil $TEST_LIBS" 21459 + fi 21460 +fi 21461 + 21462 if test "$with_hashed_db" != no ; then 21463 cat >>confdefs.h <<\EOF 20044 21464 #define USE_HASHED_DB 1 20045 21465 EOF … … 20076 21496 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 20077 21497 + cat >conftest.$ac_ext <<_ACEOF 20078 +#line 13 461"configure"21498 +#line 13735 "configure" 20079 21499 +#include "confdefs.h" 20080 21500 +#include <stdio.h> … … 20088 21508 +_ACEOF 20089 21509 +rm -f conftest.$ac_objext 20090 +if { (eval echo "$as_me:13 473: \"$ac_compile\"") >&521510 +if { (eval echo "$as_me:13747: \"$ac_compile\"") >&5 20091 21511 + (eval $ac_compile) 2>&5 20092 21512 + ac_status=$? 20093 + echo "$as_me:13 476: \$? = $ac_status" >&521513 + echo "$as_me:13750: \$? = $ac_status" >&5 20094 21514 + (exit $ac_status); } && 20095 21515 + { ac_try='test -s conftest.$ac_objext' 20096 + { (eval echo "$as_me:13 479: \"$ac_try\"") >&521516 + { (eval echo "$as_me:13753: \"$ac_try\"") >&5 20097 21517 + (eval $ac_try) 2>&5 20098 21518 + ac_status=$? 20099 + echo "$as_me:13 482: \$? = $ac_status" >&521519 + echo "$as_me:13756: \$? = $ac_status" >&5 20100 21520 + (exit $ac_status); }; }; then 20101 21521 + : … … 20112 21532 + 20113 21533 + if test "$cf_have_incdir" = no ; then 20114 + echo "$as_me:13497: result: adding $cf_add_incdir to include-path" >&5 20115 +echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6 21534 + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 21535 + 21536 +echo "${as_me-configure}:13773: testing adding $cf_add_incdir to include-path ..." 1>&5 21537 + 20116 21538 + CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 20117 21539 + … … 20144 21566 + fi 20145 21567 + if test "$cf_have_libdir" = no ; then 20146 + echo "$as_me:13529: result: adding $cf_add_libdir to library-path" >&5 20147 +echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6 21568 + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 21569 + 21570 +echo "${as_me-configure}:13807: testing adding $cf_add_libdir to library-path ..." 1>&5 21571 + 20148 21572 + LDFLAGS="-L$cf_add_libdir $LDFLAGS" 20149 21573 + fi … … 20155 21579 +esac 20156 21580 + 20157 +echo "$as_me:13 540: checking for db.h" >&521581 +echo "$as_me:13818: checking for db.h" >&5 20158 21582 echo $ECHO_N "checking for db.h... $ECHO_C" >&6 20159 21583 if test "${ac_cv_header_db_h+set}" = set; then … … 20162 21586 cat >conftest.$ac_ext <<_ACEOF 20163 21587 -#line 13075 "configure" 20164 +#line 13 546"configure"21588 +#line 13824 "configure" 20165 21589 #include "confdefs.h" 20166 21590 #include <db.h> 20167 21591 _ACEOF 20168 21592 -if { (eval echo "$as_me:13079: \"$ac_cpp conftest.$ac_ext\"") >&5 20169 +if { (eval echo "$as_me:13 550: \"$ac_cpp conftest.$ac_ext\"") >&521593 +if { (eval echo "$as_me:13828: \"$ac_cpp conftest.$ac_ext\"") >&5 20170 21594 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 20171 21595 ac_status=$? … … 20174 21598 cat conftest.err >&5 20175 21599 - echo "$as_me:13085: \$? = $ac_status" >&5 20176 + echo "$as_me:13 556: \$? = $ac_status" >&521600 + echo "$as_me:13834: \$? = $ac_status" >&5 20177 21601 (exit $ac_status); } >/dev/null; then 20178 21602 if test -s conftest.err; then 20179 21603 ac_cpp_err=$ac_c_preproc_warn_flag 20180 @@ -13101,11 +13 572,11 @@21604 @@ -13101,11 +13850,11 @@ 20181 21605 fi 20182 21606 rm -f conftest.err conftest.$ac_ext 20183 21607 fi 20184 21608 -echo "$as_me:13104: result: $ac_cv_header_db_h" >&5 20185 +echo "$as_me:13 575: result: $ac_cv_header_db_h" >&521609 +echo "$as_me:13853: result: $ac_cv_header_db_h" >&5 20186 21610 echo "${ECHO_T}$ac_cv_header_db_h" >&6 20187 21611 if test $ac_cv_header_db_h = yes; then 20188 21612 20189 21613 -echo "$as_me:13108: checking for version of db" >&5 20190 +echo "$as_me:13 579: checking for version of db" >&521614 +echo "$as_me:13857: checking for version of db" >&5 20191 21615 echo $ECHO_N "checking for version of db... $ECHO_C" >&6 20192 21616 if test "${cf_cv_hashed_db_version+set}" = set; then 20193 21617 echo $ECHO_N "(cached) $ECHO_C" >&6 20194 @@ -13113,13 +13 584,13 @@21618 @@ -13113,13 +13862,13 @@ 20195 21619 20196 21620 cf_cv_hashed_db_version=unknown … … 20201 21625 20202 21626 -echo "(line 13119) testing checking for db version $cf_db_version ..." 1>&5 20203 +echo "${as_me-configure}:13 590: testing checking for db version $cf_db_version ..." 1>&521627 +echo "${as_me-configure}:13868: testing checking for db version $cf_db_version ..." 1>&5 20204 21628 20205 21629 cat >conftest.$ac_ext <<_ACEOF 20206 21630 -#line 13122 "configure" 20207 +#line 13 593"configure"21631 +#line 13871 "configure" 20208 21632 #include "confdefs.h" 20209 21633 20210 21634 $ac_includes_default 20211 @@ -13149,16 +13 620,16 @@21635 @@ -13149,16 +13898,16 @@ 20212 21636 } 20213 21637 _ACEOF 20214 21638 rm -f conftest.$ac_objext 20215 21639 -if { (eval echo "$as_me:13152: \"$ac_compile\"") >&5 20216 +if { (eval echo "$as_me:13 623: \"$ac_compile\"") >&521640 +if { (eval echo "$as_me:13901: \"$ac_compile\"") >&5 20217 21641 (eval $ac_compile) 2>&5 20218 21642 ac_status=$? 20219 21643 - echo "$as_me:13155: \$? = $ac_status" >&5 20220 + echo "$as_me:13 626: \$? = $ac_status" >&521644 + echo "$as_me:13904: \$? = $ac_status" >&5 20221 21645 (exit $ac_status); } && 20222 21646 { ac_try='test -s conftest.$ac_objext' 20223 21647 - { (eval echo "$as_me:13158: \"$ac_try\"") >&5 20224 + { (eval echo "$as_me:13 629: \"$ac_try\"") >&521648 + { (eval echo "$as_me:13907: \"$ac_try\"") >&5 20225 21649 (eval $ac_try) 2>&5 20226 21650 ac_status=$? 20227 21651 - echo "$as_me:13161: \$? = $ac_status" >&5 20228 + echo "$as_me:13 632: \$? = $ac_status" >&521652 + echo "$as_me:13910: \$? = $ac_status" >&5 20229 21653 (exit $ac_status); }; }; then 20230 21654 20231 21655 cf_cv_hashed_db_version=$cf_db_version 20232 @@ -13172,33 +13 643,33 @@21656 @@ -13172,33 +13921,33 @@ 20233 21657 done 20234 21658 20235 21659 fi 20236 21660 -echo "$as_me:13175: result: $cf_cv_hashed_db_version" >&5 20237 +echo "$as_me:13 646: result: $cf_cv_hashed_db_version" >&521661 +echo "$as_me:13924: result: $cf_cv_hashed_db_version" >&5 20238 21662 echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 20239 21663 20240 21664 if test "$cf_cv_hashed_db_version" = unknown ; then 20241 21665 - { { echo "$as_me:13179: error: Cannot determine version of db" >&5 20242 + { { echo "$as_me:13 650: error: Cannot determine version of db" >&521666 + { { echo "$as_me:13928: error: Cannot determine version of db" >&5 20243 21667 echo "$as_me: error: Cannot determine version of db" >&2;} 20244 21668 { (exit 1); exit 1; }; } … … 20246 21670 20247 21671 -echo "$as_me:13184: checking for db libraries" >&5 20248 +echo "$as_me:13 655: checking for db libraries" >&521672 +echo "$as_me:13933: checking for db libraries" >&5 20249 21673 echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 20250 21674 if test "${cf_cv_hashed_db_libs+set}" = set; then … … 20262 21686 20263 21687 -echo "(line 13198) testing checking for library "$cf_db_libs" ..." 1>&5 20264 +echo "${as_me-configure}:13 669: testing checking for library "$cf_db_libs" ..." 1>&521688 +echo "${as_me-configure}:13947: testing checking for library "$cf_db_libs" ..." 1>&5 20265 21689 20266 21690 cat >conftest.$ac_ext <<_ACEOF 20267 21691 -#line 13201 "configure" 20268 +#line 13 672"configure"21692 +#line 13950 "configure" 20269 21693 #include "confdefs.h" 20270 21694 20271 21695 $ac_includes_default 20272 @@ -13253,16 +1 3724,16 @@21696 @@ -13253,16 +14002,16 @@ 20273 21697 } 20274 21698 _ACEOF 20275 21699 rm -f conftest.$ac_objext conftest$ac_exeext 20276 21700 -if { (eval echo "$as_me:13256: \"$ac_link\"") >&5 20277 +if { (eval echo "$as_me:1 3727: \"$ac_link\"") >&521701 +if { (eval echo "$as_me:14005: \"$ac_link\"") >&5 20278 21702 (eval $ac_link) 2>&5 20279 21703 ac_status=$? 20280 21704 - echo "$as_me:13259: \$? = $ac_status" >&5 20281 + echo "$as_me:1 3730: \$? = $ac_status" >&521705 + echo "$as_me:14008: \$? = $ac_status" >&5 20282 21706 (exit $ac_status); } && 20283 21707 { ac_try='test -s conftest$ac_exeext' 20284 21708 - { (eval echo "$as_me:13262: \"$ac_try\"") >&5 20285 + { (eval echo "$as_me:1 3733: \"$ac_try\"") >&521709 + { (eval echo "$as_me:14011: \"$ac_try\"") >&5 20286 21710 (eval $ac_try) 2>&5 20287 21711 ac_status=$? 20288 21712 - echo "$as_me:13265: \$? = $ac_status" >&5 20289 + echo "$as_me:1 3736: \$? = $ac_status" >&521713 + echo "$as_me:14014: \$? = $ac_status" >&5 20290 21714 (exit $ac_status); }; }; then 20291 21715 20292 21716 if test -n "$cf_db_libs" ; then 20293 @@ -13282,11 +1 3753,11 @@21717 @@ -13282,11 +14031,11 @@ 20294 21718 done 20295 21719 20296 21720 fi 20297 21721 -echo "$as_me:13285: result: $cf_cv_hashed_db_libs" >&5 20298 +echo "$as_me:1 3756: result: $cf_cv_hashed_db_libs" >&521722 +echo "$as_me:14034: result: $cf_cv_hashed_db_libs" >&5 20299 21723 echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 20300 21724 20301 21725 if test "$cf_cv_hashed_db_libs" = unknown ; then 20302 21726 - { { echo "$as_me:13289: error: Cannot determine library for db" >&5 20303 + { { echo "$as_me:1 3760: error: Cannot determine library for db" >&521727 + { { echo "$as_me:14038: error: Cannot determine library for db" >&5 20304 21728 echo "$as_me: error: Cannot determine library for db" >&2;} 20305 21729 { (exit 1); exit 1; }; } 20306 21730 elif test "$cf_cv_hashed_db_libs" != default ; then 20307 @@ -13296,7 +1 3767,7 @@21731 @@ -13296,7 +14045,7 @@ 20308 21732 20309 21733 else 20310 21734 20311 21735 - { { echo "$as_me:13299: error: Cannot find db.h" >&5 20312 + { { echo "$as_me:1 3770: error: Cannot find db.h" >&521736 + { { echo "$as_me:14048: error: Cannot find db.h" >&5 20313 21737 echo "$as_me: error: Cannot find db.h" >&2;} 20314 21738 { (exit 1); exit 1; }; } 20315 21739 20316 @@ -13311,7 +1 3782,7 @@21740 @@ -13311,7 +14060,7 @@ 20317 21741 20318 21742 # Just in case, check if the C compiler has a bool type. 20319 21743 20320 21744 -echo "$as_me:13314: checking if we should include stdbool.h" >&5 20321 +echo "$as_me:1 3785: checking if we should include stdbool.h" >&521745 +echo "$as_me:14063: checking if we should include stdbool.h" >&5 20322 21746 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 20323 21747 20324 21748 if test "${cf_cv_header_stdbool_h+set}" = set; then 20325 @@ -13319,7 +1 3790,7 @@21749 @@ -13319,7 +14068,7 @@ 20326 21750 else 20327 21751 20328 21752 cat >conftest.$ac_ext <<_ACEOF 20329 21753 -#line 13322 "configure" 20330 +#line 1 3793"configure"21754 +#line 14071 "configure" 20331 21755 #include "confdefs.h" 20332 21756 20333 21757 int 20334 @@ -13331,23 +1 3802,23 @@21758 @@ -13331,23 +14080,23 @@ 20335 21759 } 20336 21760 _ACEOF 20337 21761 rm -f conftest.$ac_objext 20338 21762 -if { (eval echo "$as_me:13334: \"$ac_compile\"") >&5 20339 +if { (eval echo "$as_me:1 3805: \"$ac_compile\"") >&521763 +if { (eval echo "$as_me:14083: \"$ac_compile\"") >&5 20340 21764 (eval $ac_compile) 2>&5 20341 21765 ac_status=$? 20342 21766 - echo "$as_me:13337: \$? = $ac_status" >&5 20343 + echo "$as_me:1 3808: \$? = $ac_status" >&521767 + echo "$as_me:14086: \$? = $ac_status" >&5 20344 21768 (exit $ac_status); } && 20345 21769 { ac_try='test -s conftest.$ac_objext' 20346 21770 - { (eval echo "$as_me:13340: \"$ac_try\"") >&5 20347 + { (eval echo "$as_me:1 3811: \"$ac_try\"") >&521771 + { (eval echo "$as_me:14089: \"$ac_try\"") >&5 20348 21772 (eval $ac_try) 2>&5 20349 21773 ac_status=$? 20350 21774 - echo "$as_me:13343: \$? = $ac_status" >&5 20351 + echo "$as_me:1 3814: \$? = $ac_status" >&521775 + echo "$as_me:14092: \$? = $ac_status" >&5 20352 21776 (exit $ac_status); }; }; then 20353 21777 cf_cv_header_stdbool_h=0 … … 20357 21781 cat >conftest.$ac_ext <<_ACEOF 20358 21782 -#line 13350 "configure" 20359 +#line 1 3821"configure"21783 +#line 14099 "configure" 20360 21784 #include "confdefs.h" 20361 21785 20362 21786 #ifndef __BEOS__ 20363 @@ -13363,16 +1 3834,16 @@21787 @@ -13363,16 +14112,16 @@ 20364 21788 } 20365 21789 _ACEOF 20366 21790 rm -f conftest.$ac_objext 20367 21791 -if { (eval echo "$as_me:13366: \"$ac_compile\"") >&5 20368 +if { (eval echo "$as_me:1 3837: \"$ac_compile\"") >&521792 +if { (eval echo "$as_me:14115: \"$ac_compile\"") >&5 20369 21793 (eval $ac_compile) 2>&5 20370 21794 ac_status=$? 20371 21795 - echo "$as_me:13369: \$? = $ac_status" >&5 20372 + echo "$as_me:1 3840: \$? = $ac_status" >&521796 + echo "$as_me:14118: \$? = $ac_status" >&5 20373 21797 (exit $ac_status); } && 20374 21798 { ac_try='test -s conftest.$ac_objext' 20375 21799 - { (eval echo "$as_me:13372: \"$ac_try\"") >&5 20376 + { (eval echo "$as_me:1 3843: \"$ac_try\"") >&521800 + { (eval echo "$as_me:14121: \"$ac_try\"") >&5 20377 21801 (eval $ac_try) 2>&5 20378 21802 ac_status=$? 20379 21803 - echo "$as_me:13375: \$? = $ac_status" >&5 20380 + echo "$as_me:1 3846: \$? = $ac_status" >&521804 + echo "$as_me:14124: \$? = $ac_status" >&5 20381 21805 (exit $ac_status); }; }; then 20382 21806 cf_cv_header_stdbool_h=1 20383 21807 else 20384 @@ -13386,13 +1 3857,13 @@21808 @@ -13386,13 +14135,13 @@ 20385 21809 fi 20386 21810 20387 21811 if test "$cf_cv_header_stdbool_h" = 1 20388 21812 -then echo "$as_me:13389: result: yes" >&5 20389 +then echo "$as_me:1 3860: result: yes" >&521813 +then echo "$as_me:14138: result: yes" >&5 20390 21814 echo "${ECHO_T}yes" >&6 20391 21815 -else echo "$as_me:13391: result: no" >&5 20392 +else echo "$as_me:1 3862: result: no" >&521816 +else echo "$as_me:14140: result: no" >&5 20393 21817 echo "${ECHO_T}no" >&6 20394 21818 fi 20395 21819 20396 21820 -echo "$as_me:13395: checking for builtin bool type" >&5 20397 +echo "$as_me:1 3866: checking for builtin bool type" >&521821 +echo "$as_me:14144: checking for builtin bool type" >&5 20398 21822 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 20399 21823 20400 21824 if test "${cf_cv_cc_bool_type+set}" = set; then 20401 @@ -13400,7 +1 3871,7 @@21825 @@ -13400,7 +14149,7 @@ 20402 21826 else 20403 21827 20404 21828 cat >conftest.$ac_ext <<_ACEOF 20405 21829 -#line 13403 "configure" 20406 +#line 1 3874"configure"21830 +#line 14152 "configure" 20407 21831 #include "confdefs.h" 20408 21832 20409 21833 #include <stdio.h> 20410 @@ -13415,16 +1 3886,16 @@21834 @@ -13415,16 +14164,16 @@ 20411 21835 } 20412 21836 _ACEOF 20413 21837 rm -f conftest.$ac_objext 20414 21838 -if { (eval echo "$as_me:13418: \"$ac_compile\"") >&5 20415 +if { (eval echo "$as_me:1 3889: \"$ac_compile\"") >&521839 +if { (eval echo "$as_me:14167: \"$ac_compile\"") >&5 20416 21840 (eval $ac_compile) 2>&5 20417 21841 ac_status=$? 20418 21842 - echo "$as_me:13421: \$? = $ac_status" >&5 20419 + echo "$as_me:1 3892: \$? = $ac_status" >&521843 + echo "$as_me:14170: \$? = $ac_status" >&5 20420 21844 (exit $ac_status); } && 20421 21845 { ac_try='test -s conftest.$ac_objext' 20422 21846 - { (eval echo "$as_me:13424: \"$ac_try\"") >&5 20423 + { (eval echo "$as_me:1 3895: \"$ac_try\"") >&521847 + { (eval echo "$as_me:14173: \"$ac_try\"") >&5 20424 21848 (eval $ac_try) 2>&5 20425 21849 ac_status=$? 20426 21850 - echo "$as_me:13427: \$? = $ac_status" >&5 20427 + echo "$as_me:1 3898: \$? = $ac_status" >&521851 + echo "$as_me:14176: \$? = $ac_status" >&5 20428 21852 (exit $ac_status); }; }; then 20429 21853 cf_cv_cc_bool_type=1 20430 21854 else 20431 @@ -13437,9 +1 3908,9 @@21855 @@ -13437,9 +14186,9 @@ 20432 21856 fi 20433 21857 20434 21858 if test "$cf_cv_cc_bool_type" = 1 20435 21859 -then echo "$as_me:13440: result: yes" >&5 20436 +then echo "$as_me:1 3911: result: yes" >&521860 +then echo "$as_me:14189: result: yes" >&5 20437 21861 echo "${ECHO_T}yes" >&6 20438 21862 -else echo "$as_me:13442: result: no" >&5 20439 +else echo "$as_me:1 3913: result: no" >&521863 +else echo "$as_me:14191: result: no" >&5 20440 21864 echo "${ECHO_T}no" >&6 20441 21865 fi 20442 21866 20443 @@ -13461,7 +1 3932,7 @@21867 @@ -13461,7 +14210,7 @@ 20444 21868 cf_stdcpp_libname=stdc++ 20445 21869 ;; 20446 21870 esac 20447 21871 -echo "$as_me:13464: checking for library $cf_stdcpp_libname" >&5 20448 +echo "$as_me:1 3935: checking for library $cf_stdcpp_libname" >&521872 +echo "$as_me:14213: checking for library $cf_stdcpp_libname" >&5 20449 21873 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 20450 21874 if test "${cf_cv_libstdcpp+set}" = set; then 20451 21875 echo $ECHO_N "(cached) $ECHO_C" >&6 20452 @@ -13470,7 +1 3941,7 @@21876 @@ -13470,7 +14219,7 @@ 20453 21877 cf_save="$LIBS" 20454 21878 LIBS="$LIBS -l$cf_stdcpp_libname" 20455 21879 cat >conftest.$ac_ext <<_ACEOF 20456 21880 -#line 13473 "configure" 20457 +#line 1 3944"configure"21881 +#line 14222 "configure" 20458 21882 #include "confdefs.h" 20459 21883 20460 21884 #include <strstream.h> 20461 @@ -13486,16 +1 3957,16 @@21885 @@ -13486,16 +14235,16 @@ 20462 21886 } 20463 21887 _ACEOF 20464 21888 rm -f conftest.$ac_objext conftest$ac_exeext 20465 21889 -if { (eval echo "$as_me:13489: \"$ac_link\"") >&5 20466 +if { (eval echo "$as_me:1 3960: \"$ac_link\"") >&521890 +if { (eval echo "$as_me:14238: \"$ac_link\"") >&5 20467 21891 (eval $ac_link) 2>&5 20468 21892 ac_status=$? 20469 21893 - echo "$as_me:13492: \$? = $ac_status" >&5 20470 + echo "$as_me:1 3963: \$? = $ac_status" >&521894 + echo "$as_me:14241: \$? = $ac_status" >&5 20471 21895 (exit $ac_status); } && 20472 21896 { ac_try='test -s conftest$ac_exeext' 20473 21897 - { (eval echo "$as_me:13495: \"$ac_try\"") >&5 20474 + { (eval echo "$as_me:1 3966: \"$ac_try\"") >&521898 + { (eval echo "$as_me:14244: \"$ac_try\"") >&5 20475 21899 (eval $ac_try) 2>&5 20476 21900 ac_status=$? 20477 21901 - echo "$as_me:13498: \$? = $ac_status" >&5 20478 + echo "$as_me:1 3969: \$? = $ac_status" >&521902 + echo "$as_me:14247: \$? = $ac_status" >&5 20479 21903 (exit $ac_status); }; }; then 20480 21904 cf_cv_libstdcpp=yes 20481 21905 else 20482 @@ -13507,12 +1 3978,12 @@21906 @@ -13507,12 +14256,12 @@ 20483 21907 LIBS="$cf_save" 20484 21908 20485 21909 fi 20486 21910 -echo "$as_me:13510: result: $cf_cv_libstdcpp" >&5 20487 +echo "$as_me:1 3981: result: $cf_cv_libstdcpp" >&521911 +echo "$as_me:14259: result: $cf_cv_libstdcpp" >&5 20488 21912 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 20489 21913 test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname" … … 20491 21915 20492 21916 - echo "$as_me:13515: checking whether $CXX understands -c and -o together" >&5 20493 + echo "$as_me:1 3986: checking whether $CXX understands -c and -o together" >&521917 + echo "$as_me:14264: checking whether $CXX understands -c and -o together" >&5 20494 21918 echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 20495 21919 if test "${cf_cv_prog_CXX_c_o+set}" = set; then 20496 21920 echo $ECHO_N "(cached) $ECHO_C" >&6 20497 @@ -13528,15 +1 3999,15 @@21921 @@ -13528,15 +14277,15 @@ 20498 21922 # We do the test twice because some compilers refuse to overwrite an 20499 21923 # existing .o file with -o, though they will create one. 20500 21924 ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5' 20501 21925 -if { (eval echo "$as_me:13531: \"$ac_try\"") >&5 20502 +if { (eval echo "$as_me:14 002: \"$ac_try\"") >&521926 +if { (eval echo "$as_me:14280: \"$ac_try\"") >&5 20503 21927 (eval $ac_try) 2>&5 20504 21928 ac_status=$? 20505 21929 - echo "$as_me:13534: \$? = $ac_status" >&5 20506 + echo "$as_me:14 005: \$? = $ac_status" >&521930 + echo "$as_me:14283: \$? = $ac_status" >&5 20507 21931 (exit $ac_status); } && 20508 21932 - test -f conftest2.$ac_objext && { (eval echo "$as_me:13536: \"$ac_try\"") >&5 20509 + test -f conftest2.$ac_objext && { (eval echo "$as_me:14 007: \"$ac_try\"") >&521933 + test -f conftest2.$ac_objext && { (eval echo "$as_me:14285: \"$ac_try\"") >&5 20510 21934 (eval $ac_try) 2>&5 20511 21935 ac_status=$? 20512 21936 - echo "$as_me:13539: \$? = $ac_status" >&5 20513 + echo "$as_me:14 010: \$? = $ac_status" >&521937 + echo "$as_me:14288: \$? = $ac_status" >&5 20514 21938 (exit $ac_status); }; 20515 21939 then 20516 21940 eval cf_cv_prog_CXX_c_o=yes 20517 @@ -13547,10 +14 018,10 @@21941 @@ -13547,10 +14296,10 @@ 20518 21942 20519 21943 fi 20520 21944 if test $cf_cv_prog_CXX_c_o = yes; then 20521 21945 - echo "$as_me:13550: result: yes" >&5 20522 + echo "$as_me:14 021: result: yes" >&521946 + echo "$as_me:14299: result: yes" >&5 20523 21947 echo "${ECHO_T}yes" >&6 20524 21948 else 20525 21949 - echo "$as_me:13553: result: no" >&5 20526 + echo "$as_me:14 024: result: no" >&521950 + echo "$as_me:14302: result: no" >&5 20527 21951 echo "${ECHO_T}no" >&6 20528 21952 fi 20529 21953 20530 @@ -13570,12 +14 041,12 @@21954 @@ -13570,12 +14319,12 @@ 20531 21955 ;; 20532 21956 esac 20533 21957 if test "$GXX" = yes; then 20534 21958 - echo "$as_me:13573: checking for lib$cf_gpp_libname" >&5 20535 + echo "$as_me:14 044: checking for lib$cf_gpp_libname" >&521959 + echo "$as_me:14322: checking for lib$cf_gpp_libname" >&5 20536 21960 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 20537 21961 cf_save="$LIBS" … … 20539 21963 cat >conftest.$ac_ext <<_ACEOF 20540 21964 -#line 13578 "configure" 20541 +#line 14 049"configure"21965 +#line 14327 "configure" 20542 21966 #include "confdefs.h" 20543 21967 20544 21968 #include <$cf_gpp_libname/builtin.h> 20545 @@ -13589,16 +14 060,16 @@21969 @@ -13589,16 +14338,16 @@ 20546 21970 } 20547 21971 _ACEOF 20548 21972 rm -f conftest.$ac_objext conftest$ac_exeext 20549 21973 -if { (eval echo "$as_me:13592: \"$ac_link\"") >&5 20550 +if { (eval echo "$as_me:14 063: \"$ac_link\"") >&521974 +if { (eval echo "$as_me:14341: \"$ac_link\"") >&5 20551 21975 (eval $ac_link) 2>&5 20552 21976 ac_status=$? 20553 21977 - echo "$as_me:13595: \$? = $ac_status" >&5 20554 + echo "$as_me:14 066: \$? = $ac_status" >&521978 + echo "$as_me:14344: \$? = $ac_status" >&5 20555 21979 (exit $ac_status); } && 20556 21980 { ac_try='test -s conftest$ac_exeext' 20557 21981 - { (eval echo "$as_me:13598: \"$ac_try\"") >&5 20558 + { (eval echo "$as_me:14 069: \"$ac_try\"") >&521982 + { (eval echo "$as_me:14347: \"$ac_try\"") >&5 20559 21983 (eval $ac_try) 2>&5 20560 21984 ac_status=$? 20561 21985 - echo "$as_me:13601: \$? = $ac_status" >&5 20562 + echo "$as_me:14 072: \$? = $ac_status" >&521986 + echo "$as_me:14350: \$? = $ac_status" >&5 20563 21987 (exit $ac_status); }; }; then 20564 21988 cf_cxx_library=yes 20565 21989 CXXLIBS="$CXXLIBS -l$cf_gpp_libname" 20566 @@ -13617,7 +14 088,7 @@21990 @@ -13617,7 +14366,7 @@ 20567 21991 echo "$as_me: failed program was:" >&5 20568 21992 cat conftest.$ac_ext >&5 20569 21993 cat >conftest.$ac_ext <<_ACEOF 20570 21994 -#line 13620 "configure" 20571 +#line 14 091"configure"21995 +#line 14369 "configure" 20572 21996 #include "confdefs.h" 20573 21997 20574 21998 #include <builtin.h> 20575 @@ -13631,16 +14 102,16 @@21999 @@ -13631,16 +14380,16 @@ 20576 22000 } 20577 22001 _ACEOF 20578 22002 rm -f conftest.$ac_objext conftest$ac_exeext 20579 22003 -if { (eval echo "$as_me:13634: \"$ac_link\"") >&5 20580 +if { (eval echo "$as_me:14 105: \"$ac_link\"") >&522004 +if { (eval echo "$as_me:14383: \"$ac_link\"") >&5 20581 22005 (eval $ac_link) 2>&5 20582 22006 ac_status=$? 20583 22007 - echo "$as_me:13637: \$? = $ac_status" >&5 20584 + echo "$as_me:14 108: \$? = $ac_status" >&522008 + echo "$as_me:14386: \$? = $ac_status" >&5 20585 22009 (exit $ac_status); } && 20586 22010 { ac_try='test -s conftest$ac_exeext' 20587 22011 - { (eval echo "$as_me:13640: \"$ac_try\"") >&5 20588 + { (eval echo "$as_me:14 111: \"$ac_try\"") >&522012 + { (eval echo "$as_me:14389: \"$ac_try\"") >&5 20589 22013 (eval $ac_try) 2>&5 20590 22014 ac_status=$? 20591 22015 - echo "$as_me:13643: \$? = $ac_status" >&5 20592 + echo "$as_me:14 114: \$? = $ac_status" >&522016 + echo "$as_me:14392: \$? = $ac_status" >&5 20593 22017 (exit $ac_status); }; }; then 20594 22018 cf_cxx_library=yes 20595 22019 CXXLIBS="$CXXLIBS -l$cf_gpp_libname" 20596 @@ -13657,7 +14 128,7 @@22020 @@ -13657,7 +14406,7 @@ 20597 22021 fi 20598 22022 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 20599 22023 LIBS="$cf_save" 20600 22024 - echo "$as_me:13660: result: $cf_cxx_library" >&5 20601 + echo "$as_me:14 131: result: $cf_cxx_library" >&522025 + echo "$as_me:14409: result: $cf_cxx_library" >&5 20602 22026 echo "${ECHO_T}$cf_cxx_library" >&6 20603 22027 fi 20604 22028 20605 @@ -13673,7 +14 144,7 @@22029 @@ -13673,7 +14422,7 @@ 20606 22030 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 20607 22031 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 20608 22032 ac_main_return=return 20609 22033 -echo "$as_me:13676: checking how to run the C++ preprocessor" >&5 20610 +echo "$as_me:14 147: checking how to run the C++ preprocessor" >&522034 +echo "$as_me:14425: checking how to run the C++ preprocessor" >&5 20611 22035 echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 20612 22036 if test -z "$CXXCPP"; then 20613 22037 if test "${ac_cv_prog_CXXCPP+set}" = set; then 20614 @@ -13690,18 +14 161,18 @@22038 @@ -13690,18 +14439,18 @@ 20615 22039 # On the NeXT, cc -E runs the code through the compiler's parser, 20616 22040 # not just through cpp. "Syntax error" is here to catch this case. 20617 22041 cat >conftest.$ac_ext <<_ACEOF 20618 22042 -#line 13693 "configure" 20619 +#line 14 164"configure"22043 +#line 14442 "configure" 20620 22044 #include "confdefs.h" 20621 22045 #include <assert.h> … … 20623 22047 _ACEOF 20624 22048 -if { (eval echo "$as_me:13698: \"$ac_cpp conftest.$ac_ext\"") >&5 20625 +if { (eval echo "$as_me:14 169: \"$ac_cpp conftest.$ac_ext\"") >&522049 +if { (eval echo "$as_me:14447: \"$ac_cpp conftest.$ac_ext\"") >&5 20626 22050 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 20627 22051 ac_status=$? … … 20630 22054 cat conftest.err >&5 20631 22055 - echo "$as_me:13704: \$? = $ac_status" >&5 20632 + echo "$as_me:14 175: \$? = $ac_status" >&522056 + echo "$as_me:14453: \$? = $ac_status" >&5 20633 22057 (exit $ac_status); } >/dev/null; then 20634 22058 if test -s conftest.err; then 20635 22059 ac_cpp_err=$ac_cxx_preproc_warn_flag 20636 @@ -13724,17 +14 195,17 @@22060 @@ -13724,17 +14473,17 @@ 20637 22061 # OK, works on sane cases. Now check whether non-existent headers 20638 22062 # can be detected and how. 20639 22063 cat >conftest.$ac_ext <<_ACEOF 20640 22064 -#line 13727 "configure" 20641 +#line 14 198"configure"22065 +#line 14476 "configure" 20642 22066 #include "confdefs.h" 20643 22067 #include <ac_nonexistent.h> 20644 22068 _ACEOF 20645 22069 -if { (eval echo "$as_me:13731: \"$ac_cpp conftest.$ac_ext\"") >&5 20646 +if { (eval echo "$as_me:14 202: \"$ac_cpp conftest.$ac_ext\"") >&522070 +if { (eval echo "$as_me:14480: \"$ac_cpp conftest.$ac_ext\"") >&5 20647 22071 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 20648 22072 ac_status=$? … … 20651 22075 cat conftest.err >&5 20652 22076 - echo "$as_me:13737: \$? = $ac_status" >&5 20653 + echo "$as_me:14 208: \$? = $ac_status" >&522077 + echo "$as_me:14486: \$? = $ac_status" >&5 20654 22078 (exit $ac_status); } >/dev/null; then 20655 22079 if test -s conftest.err; then 20656 22080 ac_cpp_err=$ac_cxx_preproc_warn_flag 20657 @@ -13771,7 +14 242,7 @@22081 @@ -13771,7 +14520,7 @@ 20658 22082 else 20659 22083 ac_cv_prog_CXXCPP=$CXXCPP 20660 22084 fi 20661 22085 -echo "$as_me:13774: result: $CXXCPP" >&5 20662 +echo "$as_me:14 245: result: $CXXCPP" >&522086 +echo "$as_me:14523: result: $CXXCPP" >&5 20663 22087 echo "${ECHO_T}$CXXCPP" >&6 20664 22088 ac_preproc_ok=false 20665 22089 for ac_cxx_preproc_warn_flag in '' yes 20666 @@ -13781,18 +14 252,18 @@22090 @@ -13781,18 +14530,18 @@ 20667 22091 # On the NeXT, cc -E runs the code through the compiler's parser, 20668 22092 # not just through cpp. "Syntax error" is here to catch this case. 20669 22093 cat >conftest.$ac_ext <<_ACEOF 20670 22094 -#line 13784 "configure" 20671 +#line 14 255"configure"22095 +#line 14533 "configure" 20672 22096 #include "confdefs.h" 20673 22097 #include <assert.h> … … 20675 22099 _ACEOF 20676 22100 -if { (eval echo "$as_me:13789: \"$ac_cpp conftest.$ac_ext\"") >&5 20677 +if { (eval echo "$as_me:14 260: \"$ac_cpp conftest.$ac_ext\"") >&522101 +if { (eval echo "$as_me:14538: \"$ac_cpp conftest.$ac_ext\"") >&5 20678 22102 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 20679 22103 ac_status=$? … … 20682 22106 cat conftest.err >&5 20683 22107 - echo "$as_me:13795: \$? = $ac_status" >&5 20684 + echo "$as_me:14 266: \$? = $ac_status" >&522108 + echo "$as_me:14544: \$? = $ac_status" >&5 20685 22109 (exit $ac_status); } >/dev/null; then 20686 22110 if test -s conftest.err; then 20687 22111 ac_cpp_err=$ac_cxx_preproc_warn_flag 20688 @@ -13815,17 +14 286,17 @@22112 @@ -13815,17 +14564,17 @@ 20689 22113 # OK, works on sane cases. Now check whether non-existent headers 20690 22114 # can be detected and how. 20691 22115 cat >conftest.$ac_ext <<_ACEOF 20692 22116 -#line 13818 "configure" 20693 +#line 14 289"configure"22117 +#line 14567 "configure" 20694 22118 #include "confdefs.h" 20695 22119 #include <ac_nonexistent.h> 20696 22120 _ACEOF 20697 22121 -if { (eval echo "$as_me:13822: \"$ac_cpp conftest.$ac_ext\"") >&5 20698 +if { (eval echo "$as_me:14 293: \"$ac_cpp conftest.$ac_ext\"") >&522122 +if { (eval echo "$as_me:14571: \"$ac_cpp conftest.$ac_ext\"") >&5 20699 22123 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 20700 22124 ac_status=$? … … 20703 22127 cat conftest.err >&5 20704 22128 - echo "$as_me:13828: \$? = $ac_status" >&5 20705 + echo "$as_me:14 299: \$? = $ac_status" >&522129 + echo "$as_me:14577: \$? = $ac_status" >&5 20706 22130 (exit $ac_status); } >/dev/null; then 20707 22131 if test -s conftest.err; then 20708 22132 ac_cpp_err=$ac_cxx_preproc_warn_flag 20709 @@ -13853,7 +14 324,7 @@22133 @@ -13853,7 +14602,7 @@ 20710 22134 if $ac_preproc_ok; then 20711 22135 : 20712 22136 else 20713 22137 - { { echo "$as_me:13856: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 20714 + { { echo "$as_me:14 327: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&522138 + { { echo "$as_me:14605: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 20715 22139 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} 20716 22140 { (exit 1); exit 1; }; } 20717 22141 fi 20718 @@ -13865,26 +14 336,26 @@22142 @@ -13865,26 +14614,26 @@ 20719 22143 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 20720 22144 ac_main_return=return … … 20725 22149 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 20726 22150 -echo "$as_me:13871: checking for $ac_header" >&5 20727 +echo "$as_me:14 342: checking for $ac_header" >&522151 +echo "$as_me:14620: checking for $ac_header" >&5 20728 22152 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 20729 22153 if eval "test \"\${$as_ac_Header+set}\" = set"; then … … 20732 22156 cat >conftest.$ac_ext <<_ACEOF 20733 22157 -#line 13877 "configure" 20734 +#line 14 348"configure"22158 +#line 14626 "configure" 20735 22159 #include "confdefs.h" 20736 22160 #include <$ac_header> 20737 22161 _ACEOF 20738 22162 -if { (eval echo "$as_me:13881: \"$ac_cpp conftest.$ac_ext\"") >&5 20739 +if { (eval echo "$as_me:14 352: \"$ac_cpp conftest.$ac_ext\"") >&522163 +if { (eval echo "$as_me:14630: \"$ac_cpp conftest.$ac_ext\"") >&5 20740 22164 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 20741 22165 ac_status=$? … … 20744 22168 cat conftest.err >&5 20745 22169 - echo "$as_me:13887: \$? = $ac_status" >&5 20746 + echo "$as_me:14 358: \$? = $ac_status" >&522170 + echo "$as_me:14636: \$? = $ac_status" >&5 20747 22171 (exit $ac_status); } >/dev/null; then 20748 22172 if test -s conftest.err; then 20749 22173 ac_cpp_err=$ac_cxx_preproc_warn_flag 20750 @@ -13903,7 +14 374,7 @@22174 @@ -13903,7 +14652,7 @@ 20751 22175 fi 20752 22176 rm -f conftest.err conftest.$ac_ext 20753 22177 fi 20754 22178 -echo "$as_me:13906: result: `eval echo '${'$as_ac_Header'}'`" >&5 20755 +echo "$as_me:14 377: result: `eval echo '${'$as_ac_Header'}'`" >&522179 +echo "$as_me:14655: result: `eval echo '${'$as_ac_Header'}'`" >&5 20756 22180 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 20757 22181 if test `eval echo '${'$as_ac_Header'}'` = yes; then 20758 22182 cat >>confdefs.h <<EOF 20759 @@ -13913,7 +14 384,7 @@22183 @@ -13913,7 +14662,7 @@ 20760 22184 fi 20761 22185 done 20762 22186 20763 22187 -echo "$as_me:13916: checking if we should include stdbool.h" >&5 20764 +echo "$as_me:14 387: checking if we should include stdbool.h" >&522188 +echo "$as_me:14665: checking if we should include stdbool.h" >&5 20765 22189 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 20766 22190 20767 22191 if test "${cf_cv_header_stdbool_h+set}" = set; then 20768 @@ -13921,7 +14 392,7 @@22192 @@ -13921,7 +14670,7 @@ 20769 22193 else 20770 22194 20771 22195 cat >conftest.$ac_ext <<_ACEOF 20772 22196 -#line 13924 "configure" 20773 +#line 14 395"configure"22197 +#line 14673 "configure" 20774 22198 #include "confdefs.h" 20775 22199 20776 22200 int 20777 @@ -13933,23 +14 404,23 @@22201 @@ -13933,23 +14682,23 @@ 20778 22202 } 20779 22203 _ACEOF 20780 22204 rm -f conftest.$ac_objext 20781 22205 -if { (eval echo "$as_me:13936: \"$ac_compile\"") >&5 20782 +if { (eval echo "$as_me:14 407: \"$ac_compile\"") >&522206 +if { (eval echo "$as_me:14685: \"$ac_compile\"") >&5 20783 22207 (eval $ac_compile) 2>&5 20784 22208 ac_status=$? 20785 22209 - echo "$as_me:13939: \$? = $ac_status" >&5 20786 + echo "$as_me:14 410: \$? = $ac_status" >&522210 + echo "$as_me:14688: \$? = $ac_status" >&5 20787 22211 (exit $ac_status); } && 20788 22212 { ac_try='test -s conftest.$ac_objext' 20789 22213 - { (eval echo "$as_me:13942: \"$ac_try\"") >&5 20790 + { (eval echo "$as_me:14 413: \"$ac_try\"") >&522214 + { (eval echo "$as_me:14691: \"$ac_try\"") >&5 20791 22215 (eval $ac_try) 2>&5 20792 22216 ac_status=$? 20793 22217 - echo "$as_me:13945: \$? = $ac_status" >&5 20794 + echo "$as_me:14 416: \$? = $ac_status" >&522218 + echo "$as_me:14694: \$? = $ac_status" >&5 20795 22219 (exit $ac_status); }; }; then 20796 22220 cf_cv_header_stdbool_h=0 … … 20800 22224 cat >conftest.$ac_ext <<_ACEOF 20801 22225 -#line 13952 "configure" 20802 +#line 14 423"configure"22226 +#line 14701 "configure" 20803 22227 #include "confdefs.h" 20804 22228 20805 22229 #ifndef __BEOS__ 20806 @@ -13965,16 +14 436,16 @@22230 @@ -13965,16 +14714,16 @@ 20807 22231 } 20808 22232 _ACEOF 20809 22233 rm -f conftest.$ac_objext 20810 22234 -if { (eval echo "$as_me:13968: \"$ac_compile\"") >&5 20811 +if { (eval echo "$as_me:14 439: \"$ac_compile\"") >&522235 +if { (eval echo "$as_me:14717: \"$ac_compile\"") >&5 20812 22236 (eval $ac_compile) 2>&5 20813 22237 ac_status=$? 20814 22238 - echo "$as_me:13971: \$? = $ac_status" >&5 20815 + echo "$as_me:14 442: \$? = $ac_status" >&522239 + echo "$as_me:14720: \$? = $ac_status" >&5 20816 22240 (exit $ac_status); } && 20817 22241 { ac_try='test -s conftest.$ac_objext' 20818 22242 - { (eval echo "$as_me:13974: \"$ac_try\"") >&5 20819 + { (eval echo "$as_me:14 445: \"$ac_try\"") >&522243 + { (eval echo "$as_me:14723: \"$ac_try\"") >&5 20820 22244 (eval $ac_try) 2>&5 20821 22245 ac_status=$? 20822 22246 - echo "$as_me:13977: \$? = $ac_status" >&5 20823 + echo "$as_me:14 448: \$? = $ac_status" >&522247 + echo "$as_me:14726: \$? = $ac_status" >&5 20824 22248 (exit $ac_status); }; }; then 20825 22249 cf_cv_header_stdbool_h=1 20826 22250 else 20827 @@ -13988,13 +14 459,13 @@22251 @@ -13988,13 +14737,13 @@ 20828 22252 fi 20829 22253 20830 22254 if test "$cf_cv_header_stdbool_h" = 1 20831 22255 -then echo "$as_me:13991: result: yes" >&5 20832 +then echo "$as_me:14 462: result: yes" >&522256 +then echo "$as_me:14740: result: yes" >&5 20833 22257 echo "${ECHO_T}yes" >&6 20834 22258 -else echo "$as_me:13993: result: no" >&5 20835 +else echo "$as_me:14 464: result: no" >&522259 +else echo "$as_me:14742: result: no" >&5 20836 22260 echo "${ECHO_T}no" >&6 20837 22261 fi 20838 22262 20839 22263 -echo "$as_me:13997: checking for builtin bool type" >&5 20840 +echo "$as_me:14 468: checking for builtin bool type" >&522264 +echo "$as_me:14746: checking for builtin bool type" >&5 20841 22265 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 20842 22266 20843 22267 if test "${cf_cv_builtin_bool+set}" = set; then 20844 @@ -14002,7 +14 473,7 @@22268 @@ -14002,7 +14751,7 @@ 20845 22269 else 20846 22270 20847 22271 cat >conftest.$ac_ext <<_ACEOF 20848 22272 -#line 14005 "configure" 20849 +#line 14 476"configure"22273 +#line 14754 "configure" 20850 22274 #include "confdefs.h" 20851 22275 20852 22276 #include <stdio.h> 20853 @@ -14017,16 +14 488,16 @@22277 @@ -14017,16 +14766,16 @@ 20854 22278 } 20855 22279 _ACEOF 20856 22280 rm -f conftest.$ac_objext 20857 22281 -if { (eval echo "$as_me:14020: \"$ac_compile\"") >&5 20858 +if { (eval echo "$as_me:14 491: \"$ac_compile\"") >&522282 +if { (eval echo "$as_me:14769: \"$ac_compile\"") >&5 20859 22283 (eval $ac_compile) 2>&5 20860 22284 ac_status=$? 20861 22285 - echo "$as_me:14023: \$? = $ac_status" >&5 20862 + echo "$as_me:14 494: \$? = $ac_status" >&522286 + echo "$as_me:14772: \$? = $ac_status" >&5 20863 22287 (exit $ac_status); } && 20864 22288 { ac_try='test -s conftest.$ac_objext' 20865 22289 - { (eval echo "$as_me:14026: \"$ac_try\"") >&5 20866 + { (eval echo "$as_me:14 497: \"$ac_try\"") >&522290 + { (eval echo "$as_me:14775: \"$ac_try\"") >&5 20867 22291 (eval $ac_try) 2>&5 20868 22292 ac_status=$? 20869 22293 - echo "$as_me:14029: \$? = $ac_status" >&5 20870 + echo "$as_me:14 500: \$? = $ac_status" >&522294 + echo "$as_me:14778: \$? = $ac_status" >&5 20871 22295 (exit $ac_status); }; }; then 20872 22296 cf_cv_builtin_bool=1 20873 22297 else 20874 @@ -14039,13 +14 510,13 @@22298 @@ -14039,13 +14788,13 @@ 20875 22299 fi 20876 22300 20877 22301 if test "$cf_cv_builtin_bool" = 1 20878 22302 -then echo "$as_me:14042: result: yes" >&5 20879 +then echo "$as_me:14 513: result: yes" >&522303 +then echo "$as_me:14791: result: yes" >&5 20880 22304 echo "${ECHO_T}yes" >&6 20881 22305 -else echo "$as_me:14044: result: no" >&5 20882 +else echo "$as_me:14 515: result: no" >&522306 +else echo "$as_me:14793: result: no" >&5 20883 22307 echo "${ECHO_T}no" >&6 20884 22308 fi 20885 22309 20886 22310 -echo "$as_me:14048: checking for size of bool" >&5 20887 +echo "$as_me:14 519: checking for size of bool" >&522311 +echo "$as_me:14797: checking for size of bool" >&5 20888 22312 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 20889 22313 if test "${cf_cv_type_of_bool+set}" = set; then 20890 22314 echo $ECHO_N "(cached) $ECHO_C" >&6 20891 @@ -14056,7 +14 527,7 @@22315 @@ -14056,7 +14805,7 @@ 20892 22316 cf_cv_type_of_bool=unknown 20893 22317 else 20894 22318 cat >conftest.$ac_ext <<_ACEOF 20895 22319 -#line 14059 "configure" 20896 +#line 14 530"configure"22320 +#line 14808 "configure" 20897 22321 #include "confdefs.h" 20898 22322 20899 22323 #include <stdlib.h> 20900 @@ -14098,15 +14 569,15 @@22324 @@ -14098,15 +14847,15 @@ 20901 22325 20902 22326 _ACEOF 20903 22327 rm -f conftest$ac_exeext 20904 22328 -if { (eval echo "$as_me:14101: \"$ac_link\"") >&5 20905 +if { (eval echo "$as_me:14 572: \"$ac_link\"") >&522329 +if { (eval echo "$as_me:14850: \"$ac_link\"") >&5 20906 22330 (eval $ac_link) 2>&5 20907 22331 ac_status=$? 20908 22332 - echo "$as_me:14104: \$? = $ac_status" >&5 20909 + echo "$as_me:14 575: \$? = $ac_status" >&522333 + echo "$as_me:14853: \$? = $ac_status" >&5 20910 22334 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 20911 22335 - { (eval echo "$as_me:14106: \"$ac_try\"") >&5 20912 + { (eval echo "$as_me:14 577: \"$ac_try\"") >&522336 + { (eval echo "$as_me:14855: \"$ac_try\"") >&5 20913 22337 (eval $ac_try) 2>&5 20914 22338 ac_status=$? 20915 22339 - echo "$as_me:14109: \$? = $ac_status" >&5 20916 + echo "$as_me:14 580: \$? = $ac_status" >&522340 + echo "$as_me:14858: \$? = $ac_status" >&5 20917 22341 (exit $ac_status); }; }; then 20918 22342 cf_cv_type_of_bool=`cat cf_test.out` 20919 22343 if test -z "$cf_cv_type_of_bool"; then 20920 @@ -14124,18 +14 595,18 @@22344 @@ -14124,18 +14873,18 @@ 20921 22345 fi 20922 22346 20923 22347 rm -f cf_test.out 20924 22348 -echo "$as_me:14127: result: $cf_cv_type_of_bool" >&5 20925 +echo "$as_me:14 598: result: $cf_cv_type_of_bool" >&522349 +echo "$as_me:14876: result: $cf_cv_type_of_bool" >&5 20926 22350 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 20927 22351 if test "$cf_cv_type_of_bool" = unknown ; then … … 20930 22354 esac 20931 22355 - { echo "$as_me:14133: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 20932 + { echo "$as_me:14 604: WARNING: Assuming $NCURSES_BOOL for type of bool" >&522356 + { echo "$as_me:14882: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 20933 22357 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} 20934 22358 cf_cv_type_of_bool=$NCURSES_BOOL … … 20936 22360 20937 22361 -echo "$as_me:14138: checking for special defines needed for etip.h" >&5 20938 +echo "$as_me:14 609: checking for special defines needed for etip.h" >&522362 +echo "$as_me:14887: checking for special defines needed for etip.h" >&5 20939 22363 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 20940 22364 cf_save_CXXFLAGS="$CXXFLAGS" 20941 22365 cf_result="none" 20942 @@ -14147,7 +14 618,7 @@22366 @@ -14147,7 +14896,7 @@ 20943 22367 test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" 20944 22368 test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" 20945 22369 cat >conftest.$ac_ext <<_ACEOF 20946 22370 -#line 14150 "configure" 20947 +#line 14 621"configure"22371 +#line 14899 "configure" 20948 22372 #include "confdefs.h" 20949 22373 20950 22374 #include <etip.h.in> 20951 @@ -14161,16 +14 632,16 @@22375 @@ -14161,16 +14910,16 @@ 20952 22376 } 20953 22377 _ACEOF 20954 22378 rm -f conftest.$ac_objext 20955 22379 -if { (eval echo "$as_me:14164: \"$ac_compile\"") >&5 20956 +if { (eval echo "$as_me:14 635: \"$ac_compile\"") >&522380 +if { (eval echo "$as_me:14913: \"$ac_compile\"") >&5 20957 22381 (eval $ac_compile) 2>&5 20958 22382 ac_status=$? 20959 22383 - echo "$as_me:14167: \$? = $ac_status" >&5 20960 + echo "$as_me:14 638: \$? = $ac_status" >&522384 + echo "$as_me:14916: \$? = $ac_status" >&5 20961 22385 (exit $ac_status); } && 20962 22386 { ac_try='test -s conftest.$ac_objext' 20963 22387 - { (eval echo "$as_me:14170: \"$ac_try\"") >&5 20964 + { (eval echo "$as_me:14 641: \"$ac_try\"") >&522388 + { (eval echo "$as_me:14919: \"$ac_try\"") >&5 20965 22389 (eval $ac_try) 2>&5 20966 22390 ac_status=$? 20967 22391 - echo "$as_me:14173: \$? = $ac_status" >&5 20968 + echo "$as_me:14 644: \$? = $ac_status" >&522392 + echo "$as_me:14922: \$? = $ac_status" >&5 20969 22393 (exit $ac_status); }; }; then 20970 22394 20971 22395 test -n "$cf_math" && cat >>confdefs.h <<EOF 20972 @@ -14191,12 +14 662,12 @@22396 @@ -14191,12 +14940,12 @@ 20973 22397 rm -f conftest.$ac_objext conftest.$ac_ext 20974 22398 done 20975 22399 done 20976 22400 -echo "$as_me:14194: result: $cf_result" >&5 20977 +echo "$as_me:14 665: result: $cf_result" >&522401 +echo "$as_me:14943: result: $cf_result" >&5 20978 22402 echo "${ECHO_T}$cf_result" >&6 20979 22403 CXXFLAGS="$cf_save_CXXFLAGS" … … 20981 22405 if test -n "$CXX"; then 20982 22406 -echo "$as_me:14199: checking if $CXX accepts parameter initialization" >&5 20983 +echo "$as_me:14 670: checking if $CXX accepts parameter initialization" >&522407 +echo "$as_me:14948: checking if $CXX accepts parameter initialization" >&5 20984 22408 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 20985 22409 if test "${cf_cv_cpp_param_init+set}" = set; then 20986 22410 echo $ECHO_N "(cached) $ECHO_C" >&6 20987 @@ -14213,7 +14 684,7 @@22411 @@ -14213,7 +14962,7 @@ 20988 22412 cf_cv_cpp_param_init=unknown 20989 22413 else 20990 22414 cat >conftest.$ac_ext <<_ACEOF 20991 22415 -#line 14216 "configure" 20992 +#line 14 687"configure"22416 +#line 14965 "configure" 20993 22417 #include "confdefs.h" 20994 22418 20995 22419 class TEST { 20996 @@ -14232,15 +14 703,15 @@22420 @@ -14232,15 +14981,15 @@ 20997 22421 20998 22422 _ACEOF 20999 22423 rm -f conftest$ac_exeext 21000 22424 -if { (eval echo "$as_me:14235: \"$ac_link\"") >&5 21001 +if { (eval echo "$as_me:14 706: \"$ac_link\"") >&522425 +if { (eval echo "$as_me:14984: \"$ac_link\"") >&5 21002 22426 (eval $ac_link) 2>&5 21003 22427 ac_status=$? 21004 22428 - echo "$as_me:14238: \$? = $ac_status" >&5 21005 + echo "$as_me:14 709: \$? = $ac_status" >&522429 + echo "$as_me:14987: \$? = $ac_status" >&5 21006 22430 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 21007 22431 - { (eval echo "$as_me:14240: \"$ac_try\"") >&5 21008 + { (eval echo "$as_me:14 711: \"$ac_try\"") >&522432 + { (eval echo "$as_me:14989: \"$ac_try\"") >&5 21009 22433 (eval $ac_try) 2>&5 21010 22434 ac_status=$? 21011 22435 - echo "$as_me:14243: \$? = $ac_status" >&5 21012 + echo "$as_me:14 714: \$? = $ac_status" >&522436 + echo "$as_me:14992: \$? = $ac_status" >&5 21013 22437 (exit $ac_status); }; }; then 21014 22438 cf_cv_cpp_param_init=yes 21015 22439 else 21016 @@ -14259,7 +1 4730,7 @@22440 @@ -14259,7 +15008,7 @@ 21017 22441 ac_main_return=return 21018 22442 21019 22443 fi 21020 22444 -echo "$as_me:14262: result: $cf_cv_cpp_param_init" >&5 21021 +echo "$as_me:1 4733: result: $cf_cv_cpp_param_init" >&522445 +echo "$as_me:15011: result: $cf_cv_cpp_param_init" >&5 21022 22446 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 21023 22447 fi 21024 22448 test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF 21025 @@ -14268,7 +1 4739,7 @@22449 @@ -14268,7 +15017,7 @@ 21026 22450 21027 22451 if test -n "$CXX"; then 21028 22452 21029 22453 -echo "$as_me:14271: checking if $CXX accepts static_cast" >&5 21030 +echo "$as_me:1 4742: checking if $CXX accepts static_cast" >&522454 +echo "$as_me:15020: checking if $CXX accepts static_cast" >&5 21031 22455 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 21032 22456 if test "${cf_cv_cpp_static_cast+set}" = set; then 21033 22457 echo $ECHO_N "(cached) $ECHO_C" >&6 21034 @@ -14282,7 +1 4753,7 @@22458 @@ -14282,7 +15031,7 @@ 21035 22459 ac_main_return=return 21036 22460 21037 22461 cat >conftest.$ac_ext <<_ACEOF 21038 22462 -#line 14285 "configure" 21039 +#line 1 4756"configure"22463 +#line 15034 "configure" 21040 22464 #include "confdefs.h" 21041 22465 21042 22466 class NCursesPanel 21043 @@ -14326,16 +1 4797,16 @@22467 @@ -14326,16 +15075,16 @@ 21044 22468 } 21045 22469 _ACEOF 21046 22470 rm -f conftest.$ac_objext 21047 22471 -if { (eval echo "$as_me:14329: \"$ac_compile\"") >&5 21048 +if { (eval echo "$as_me:1 4800: \"$ac_compile\"") >&522472 +if { (eval echo "$as_me:15078: \"$ac_compile\"") >&5 21049 22473 (eval $ac_compile) 2>&5 21050 22474 ac_status=$? 21051 22475 - echo "$as_me:14332: \$? = $ac_status" >&5 21052 + echo "$as_me:1 4803: \$? = $ac_status" >&522476 + echo "$as_me:15081: \$? = $ac_status" >&5 21053 22477 (exit $ac_status); } && 21054 22478 { ac_try='test -s conftest.$ac_objext' 21055 22479 - { (eval echo "$as_me:14335: \"$ac_try\"") >&5 21056 + { (eval echo "$as_me:1 4806: \"$ac_try\"") >&522480 + { (eval echo "$as_me:15084: \"$ac_try\"") >&5 21057 22481 (eval $ac_try) 2>&5 21058 22482 ac_status=$? 21059 22483 - echo "$as_me:14338: \$? = $ac_status" >&5 21060 + echo "$as_me:1 4809: \$? = $ac_status" >&522484 + echo "$as_me:15087: \$? = $ac_status" >&5 21061 22485 (exit $ac_status); }; }; then 21062 22486 cf_cv_cpp_static_cast=yes 21063 22487 else 21064 @@ -14353,7 +1 4824,7 @@22488 @@ -14353,7 +15102,7 @@ 21065 22489 ac_main_return=return 21066 22490 21067 22491 fi 21068 22492 -echo "$as_me:14356: result: $cf_cv_cpp_static_cast" >&5 21069 +echo "$as_me:1 4827: result: $cf_cv_cpp_static_cast" >&522493 +echo "$as_me:15105: result: $cf_cv_cpp_static_cast" >&5 21070 22494 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 21071 22495 21072 22496 fi 21073 @@ -14362,189 +1 4833,6 @@22497 @@ -14362,189 +15111,6 @@ 21074 22498 #define CPP_HAS_STATIC_CAST 1 21075 22499 EOF … … 21261 22685 CXX_AR_OPTS='$(AR_OPTS)' 21262 22686 case $cf_cv_system_name in #(vi 21263 @@ -14584,7 +1 4872,7 @@22687 @@ -14584,7 +15150,7 @@ 21264 22688 else 21265 22689 if test "$cf_cv_header_stdbool_h" = 1 ; then 21266 22690 21267 22691 -echo "$as_me:14587: checking for size of bool" >&5 21268 +echo "$as_me:1 4875: checking for size of bool" >&522692 +echo "$as_me:15153: checking for size of bool" >&5 21269 22693 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 21270 22694 if test "${cf_cv_type_of_bool+set}" = set; then 21271 22695 echo $ECHO_N "(cached) $ECHO_C" >&6 21272 @@ -14595,7 +1 4883,7 @@22696 @@ -14595,7 +15161,7 @@ 21273 22697 cf_cv_type_of_bool=unknown 21274 22698 else 21275 22699 cat >conftest.$ac_ext <<_ACEOF 21276 22700 -#line 14598 "configure" 21277 +#line 1 4886"configure"22701 +#line 15164 "configure" 21278 22702 #include "confdefs.h" 21279 22703 21280 22704 #include <stdlib.h> 21281 @@ -14637,15 +1 4925,15 @@22705 @@ -14637,15 +15203,15 @@ 21282 22706 21283 22707 _ACEOF 21284 22708 rm -f conftest$ac_exeext 21285 22709 -if { (eval echo "$as_me:14640: \"$ac_link\"") >&5 21286 +if { (eval echo "$as_me:1 4928: \"$ac_link\"") >&522710 +if { (eval echo "$as_me:15206: \"$ac_link\"") >&5 21287 22711 (eval $ac_link) 2>&5 21288 22712 ac_status=$? 21289 22713 - echo "$as_me:14643: \$? = $ac_status" >&5 21290 + echo "$as_me:1 4931: \$? = $ac_status" >&522714 + echo "$as_me:15209: \$? = $ac_status" >&5 21291 22715 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 21292 22716 - { (eval echo "$as_me:14645: \"$ac_try\"") >&5 21293 + { (eval echo "$as_me:1 4933: \"$ac_try\"") >&522717 + { (eval echo "$as_me:15211: \"$ac_try\"") >&5 21294 22718 (eval $ac_try) 2>&5 21295 22719 ac_status=$? 21296 22720 - echo "$as_me:14648: \$? = $ac_status" >&5 21297 + echo "$as_me:1 4936: \$? = $ac_status" >&522721 + echo "$as_me:15214: \$? = $ac_status" >&5 21298 22722 (exit $ac_status); }; }; then 21299 22723 cf_cv_type_of_bool=`cat cf_test.out` 21300 22724 if test -z "$cf_cv_type_of_bool"; then 21301 @@ -14663,25 +1 4951,25 @@22725 @@ -14663,25 +15229,25 @@ 21302 22726 fi 21303 22727 21304 22728 rm -f cf_test.out 21305 22729 -echo "$as_me:14666: result: $cf_cv_type_of_bool" >&5 21306 +echo "$as_me:1 4954: result: $cf_cv_type_of_bool" >&522730 +echo "$as_me:15232: result: $cf_cv_type_of_bool" >&5 21307 22731 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 21308 22732 if test "$cf_cv_type_of_bool" = unknown ; then … … 21311 22735 esac 21312 22736 - { echo "$as_me:14672: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 21313 + { echo "$as_me:1 4960: WARNING: Assuming $NCURSES_BOOL for type of bool" >&522737 + { echo "$as_me:15238: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 21314 22738 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} 21315 22739 cf_cv_type_of_bool=$NCURSES_BOOL … … 21318 22742 else 21319 22743 - echo "$as_me:14678: checking for fallback type of bool" >&5 21320 + echo "$as_me:1 4966: checking for fallback type of bool" >&522744 + echo "$as_me:15244: checking for fallback type of bool" >&5 21321 22745 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 21322 22746 case "$host_cpu" in #(vi … … 21325 22749 esac 21326 22750 - echo "$as_me:14684: result: $cf_cv_type_of_bool" >&5 21327 + echo "$as_me:1 4972: result: $cf_cv_type_of_bool" >&522751 + echo "$as_me:15250: result: $cf_cv_type_of_bool" >&5 21328 22752 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 21329 22753 fi 21330 22754 fi 21331 @@ -14707,11 +1 4995,20 @@22755 @@ -14707,11 +15273,20 @@ 21332 22756 fi 21333 22757 … … 21336 22760 +if test "$cf_with_ada" != "no" ; then 21337 22761 + if test "$with_libtool" != "no"; then 21338 + { echo "$as_me:15 001: WARNING: libtool does not support Ada - disabling feature" >&522762 + { echo "$as_me:15279: WARNING: libtool does not support Ada - disabling feature" >&5 21339 22763 +echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} 21340 22764 + cf_with_ada=no … … 21347 22771 set dummy $cf_ada_make; ac_word=$2 21348 22772 -echo "$as_me:14714: checking for $ac_word" >&5 21349 +echo "$as_me:15 011: checking for $ac_word" >&522773 +echo "$as_me:15289: checking for $ac_word" >&5 21350 22774 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 21351 22775 if test "${ac_cv_prog_gnat_exists+set}" = set; then 21352 22776 echo $ECHO_N "(cached) $ECHO_C" >&6 21353 @@ -14726,7 +15 023,7 @@22777 @@ -14726,7 +15301,7 @@ 21354 22778 test -z "$ac_dir" && ac_dir=. 21355 22779 $as_executable_p "$ac_dir/$ac_word" || continue 21356 22780 ac_cv_prog_gnat_exists="yes" 21357 22781 -echo "$as_me:14729: found $ac_dir/$ac_word" >&5 21358 +echo "$as_me:15 026: found $ac_dir/$ac_word" >&522782 +echo "$as_me:15304: found $ac_dir/$ac_word" >&5 21359 22783 break 21360 22784 done 21361 22785 21362 @@ -14735,10 +15 032,10 @@22786 @@ -14735,10 +15310,10 @@ 21363 22787 fi 21364 22788 gnat_exists=$ac_cv_prog_gnat_exists 21365 22789 if test -n "$gnat_exists"; then 21366 22790 - echo "$as_me:14738: result: $gnat_exists" >&5 21367 + echo "$as_me:15 035: result: $gnat_exists" >&522791 + echo "$as_me:15313: result: $gnat_exists" >&5 21368 22792 echo "${ECHO_T}$gnat_exists" >&6 21369 22793 else 21370 22794 - echo "$as_me:14741: result: no" >&5 21371 + echo "$as_me:15 038: result: no" >&522795 + echo "$as_me:15316: result: no" >&5 21372 22796 echo "${ECHO_T}no" >&6 21373 22797 fi 21374 22798 21375 @@ -14746,11 +15 043,11 @@22799 @@ -14746,11 +15321,11 @@ 21376 22800 cf_ada_make= 21377 22801 else 21378 22802 21379 22803 -echo "$as_me:14749: checking for gnat version" >&5 21380 +echo "$as_me:15 046: checking for gnat version" >&522804 +echo "$as_me:15324: checking for gnat version" >&5 21381 22805 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 21382 22806 cf_gnat_version=`${cf_ada_make-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\ 21383 22807 sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` 21384 22808 -echo "$as_me:14753: result: $cf_gnat_version" >&5 21385 +echo "$as_me:15 050: result: $cf_gnat_version" >&522809 +echo "$as_me:15328: result: $cf_gnat_version" >&5 21386 22810 echo "${ECHO_T}$cf_gnat_version" >&6 21387 22811 21388 22812 case $cf_gnat_version in 21389 @@ -14773,7 +15 070,7 @@22813 @@ -14773,7 +15348,7 @@ 21390 22814 21391 22815 # Extract the first word of "m4", so it can be a program name with args. 21392 22816 set dummy m4; ac_word=$2 21393 22817 -echo "$as_me:14776: checking for $ac_word" >&5 21394 +echo "$as_me:15 073: checking for $ac_word" >&522818 +echo "$as_me:15351: checking for $ac_word" >&5 21395 22819 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 21396 22820 if test "${ac_cv_prog_M4_exists+set}" = set; then 21397 22821 echo $ECHO_N "(cached) $ECHO_C" >&6 21398 @@ -14788,7 +15 085,7 @@22822 @@ -14788,7 +15363,7 @@ 21399 22823 test -z "$ac_dir" && ac_dir=. 21400 22824 $as_executable_p "$ac_dir/$ac_word" || continue 21401 22825 ac_cv_prog_M4_exists="yes" 21402 22826 -echo "$as_me:14791: found $ac_dir/$ac_word" >&5 21403 +echo "$as_me:15 088: found $ac_dir/$ac_word" >&522827 +echo "$as_me:15366: found $ac_dir/$ac_word" >&5 21404 22828 break 21405 22829 done 21406 22830 21407 @@ -14797,10 +15 094,10 @@22831 @@ -14797,10 +15372,10 @@ 21408 22832 fi 21409 22833 M4_exists=$ac_cv_prog_M4_exists 21410 22834 if test -n "$M4_exists"; then 21411 22835 - echo "$as_me:14800: result: $M4_exists" >&5 21412 + echo "$as_me:15 097: result: $M4_exists" >&522836 + echo "$as_me:15375: result: $M4_exists" >&5 21413 22837 echo "${ECHO_T}$M4_exists" >&6 21414 22838 else 21415 22839 - echo "$as_me:14803: result: no" >&5 21416 + echo "$as_me:15 100: result: no" >&522840 + echo "$as_me:15378: result: no" >&5 21417 22841 echo "${ECHO_T}no" >&6 21418 22842 fi 21419 22843 21420 @@ -14809,7 +15 106,7 @@22844 @@ -14809,7 +15384,7 @@ 21421 22845 echo Ada95 binding required program m4 not found. Ada95 binding disabled. 21422 22846 fi 21423 22847 if test "$cf_cv_prog_gnat_correct" = yes; then 21424 22848 - echo "$as_me:14812: checking if GNAT works" >&5 21425 + echo "$as_me:15 109: checking if GNAT works" >&522849 + echo "$as_me:15387: checking if GNAT works" >&5 21426 22850 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 21427 22851 21428 22852 rm -f conftest* 21429 @@ -14837,14 +15 134,14 @@22853 @@ -14837,14 +15412,14 @@ 21430 22854 fi 21431 22855 rm -f conftest* 21432 22856 21433 22857 - echo "$as_me:14840: result: $cf_cv_prog_gnat_correct" >&5 21434 + echo "$as_me:15 137: result: $cf_cv_prog_gnat_correct" >&522858 + echo "$as_me:15415: result: $cf_cv_prog_gnat_correct" >&5 21435 22859 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 21436 22860 fi … … 21440 22864 21441 22865 - echo "$as_me:14847: checking if GNAT pragma Unreferenced works" >&5 21442 + echo "$as_me:15 144: checking if GNAT pragma Unreferenced works" >&522866 + echo "$as_me:15422: checking if GNAT pragma Unreferenced works" >&5 21443 22867 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 21444 22868 21445 22869 rm -f conftest* 21446 @@ -14871,7 +15 168,7 @@22870 @@ -14871,7 +15446,7 @@ 21447 22871 fi 21448 22872 rm -f conftest* 21449 22873 21450 22874 - echo "$as_me:14874: result: $cf_cv_pragma_unreferenced" >&5 21451 + echo "$as_me:15 171: result: $cf_cv_pragma_unreferenced" >&522875 + echo "$as_me:15449: result: $cf_cv_pragma_unreferenced" >&5 21452 22876 echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6 21453 22877 21454 22878 # if the pragma is supported, use it (needed in the Trace code). 21455 @@ -14897,7 +15 194,8 @@22879 @@ -14897,7 +15472,8 @@ 21456 22880 21457 22881 else … … 21463 22887 cf_path_syntax="$prefix" 21464 22888 else 21465 @@ -14923,12 +15 221,13 @@22889 @@ -14923,12 +15499,13 @@ 21466 22890 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 21467 22891 ;; 21468 22892 *) 21469 22893 - { { echo "$as_me:14926: error: expected a pathname, not \"$withval\"" >&5 21470 + { { echo "$as_me:15 224: error: expected a pathname, not \"$withval\"" >&522894 + { { echo "$as_me:15502: error: expected a pathname, not \"$withval\"" >&5 21471 22895 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 21472 22896 { (exit 1); exit 1; }; } … … 21478 22902 21479 22903 # Check whether --with-ada-objects or --without-ada-objects was given. 21480 @@ -14937,7 +15 236,8 @@22904 @@ -14937,7 +15514,8 @@ 21481 22905 21482 22906 else … … 21488 22912 cf_path_syntax="$prefix" 21489 22913 else 21490 @@ -14963,34 +15 263,57 @@22914 @@ -14963,34 +15541,57 @@ 21491 22915 withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` 21492 22916 ;; 21493 22917 *) 21494 22918 - { { echo "$as_me:14966: error: expected a pathname, not \"$withval\"" >&5 21495 + { { echo "$as_me:15 266: error: expected a pathname, not \"$withval\"" >&522919 + { { echo "$as_me:15544: error: expected a pathname, not \"$withval\"" >&5 21496 22920 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} 21497 22921 { (exit 1); exit 1; }; } … … 21521 22945 +### 21522 22946 +### (see CF_LIB_RULES). 21523 +echo "$as_me:15 291: checking for library subsets" >&522947 +echo "$as_me:15569: checking for library subsets" >&5 21524 22948 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 21525 22949 +LIB_SUBSETS= … … 21551 22975 -echo "$as_me:14993: result: $LIB_SUBSETS" >&5 21552 22976 + 21553 +echo "$as_me:15 316: result: $LIB_SUBSETS" >&522977 +echo "$as_me:15594: result: $LIB_SUBSETS" >&5 21554 22978 echo "${ECHO_T}$LIB_SUBSETS" >&6 21555 22979 21556 22980 ### Construct the list of include-directories to be generated 21557 @@ -15028,7 +15 351,7 @@22981 @@ -15028,7 +15629,7 @@ 21558 22982 fi 21559 22983 21560 22984 ### Build up pieces for makefile rules 21561 22985 -echo "$as_me:15031: checking default library suffix" >&5 21562 +echo "$as_me:15 354: checking default library suffix" >&522986 +echo "$as_me:15632: checking default library suffix" >&5 21563 22987 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 21564 22988 21565 22989 case $DFT_LWR_MODEL in 21566 @@ -15039,10 +15 362,10 @@22990 @@ -15039,10 +15640,10 @@ 21567 22991 shared) DFT_ARG_SUFFIX='' ;; 21568 22992 esac 21569 22993 test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" 21570 22994 -echo "$as_me:15042: result: $DFT_ARG_SUFFIX" >&5 21571 +echo "$as_me:15 365: result: $DFT_ARG_SUFFIX" >&522995 +echo "$as_me:15643: result: $DFT_ARG_SUFFIX" >&5 21572 22996 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 21573 22997 21574 22998 -echo "$as_me:15045: checking default library-dependency suffix" >&5 21575 +echo "$as_me:15 368: checking default library-dependency suffix" >&522999 +echo "$as_me:15646: checking default library-dependency suffix" >&5 21576 23000 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 21577 23001 21578 23002 case $DFT_LWR_MODEL in 21579 @@ -15064,17 +15 387,19 @@23003 @@ -15064,17 +15665,19 @@ 21580 23004 esac 21581 23005 esac … … 21591 23015 fi 21592 23016 -echo "$as_me:15074: result: $DFT_DEP_SUFFIX" >&5 21593 +echo "$as_me:15 399: result: $DFT_DEP_SUFFIX" >&523017 +echo "$as_me:15677: result: $DFT_DEP_SUFFIX" >&5 21594 23018 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 21595 23019 21596 23020 -echo "$as_me:15077: checking default object directory" >&5 21597 +echo "$as_me:15 402: checking default object directory" >&523021 +echo "$as_me:15680: checking default object directory" >&5 21598 23022 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 21599 23023 21600 23024 case $DFT_LWR_MODEL in 21601 @@ -15090,12 +15 415,12 @@23025 @@ -15090,12 +15693,12 @@ 21602 23026 DFT_OBJ_SUBDIR='obj_s' ;; 21603 23027 esac 21604 23028 esac 21605 23029 -echo "$as_me:15093: result: $DFT_OBJ_SUBDIR" >&5 21606 +echo "$as_me:15 418: result: $DFT_OBJ_SUBDIR" >&523030 +echo "$as_me:15696: result: $DFT_OBJ_SUBDIR" >&5 21607 23031 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 21608 23032 … … 21610 23034 if test "$cf_with_cxx" = yes ; then 21611 23035 -echo "$as_me:15098: checking c++ library-dependency suffix" >&5 21612 +echo "$as_me:15 423: checking c++ library-dependency suffix" >&523036 +echo "$as_me:15701: checking c++ library-dependency suffix" >&5 21613 23037 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 21614 23038 if test "$with_libtool" != "no"; then 21615 23039 CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX 21616 @@ -15121,21 +15 446,60 @@23040 @@ -15121,21 +15724,60 @@ 21617 23041 esac 21618 23042 test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}" 21619 23043 fi 21620 23044 -echo "$as_me:15124: result: $CXX_LIB_SUFFIX" >&5 21621 +echo "$as_me:15 449: result: $CXX_LIB_SUFFIX" >&523045 +echo "$as_me:15727: result: $CXX_LIB_SUFFIX" >&5 21622 23046 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 21623 23047 … … 21677 23101 TINFO_DEP_SUFFIX="${TINFO_NAME}${DFT_DEP_SUFFIX}" 21678 23102 TINFO_LIB_SUFFIX="${TINFO_NAME}${LIB_SUFFIX}" 21679 @@ -15150,22 +15 514,81@@23103 @@ -15150,22 +15792,85 @@ 21680 23104 else 21681 23105 TEST_ARGS="-l${TINFO_ARG_SUFFIX}" … … 21709 23133 +TICS_LIST=`echo "$TICS_LIST" | sed -e 's/-ldl[ ]//g' -e 's/-ldl$//'` 21710 23134 + 23135 +fi 23136 + 23137 +if test "$DFT_LWR_MODEL" = "libtool"; then 23138 + OBJEXT=lo 21711 23139 +fi 21712 23140 + … … 21751 23179 +esac 21752 23180 + 21753 +echo "$as_me:15 586: checking where we will install curses.h" >&523181 +echo "$as_me:15868: checking where we will install curses.h" >&5 21754 23182 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 21755 23183 test "$with_overwrite" = no && \ … … 21757 23185 includedir='${prefix}/include/ncurses'${LIB_SUFFIX} 21758 23186 -echo "$as_me:15168: result: $includedir" >&5 21759 +echo "$as_me:15 591: result: $includedir" >&523187 +echo "$as_me:15873: result: $includedir" >&5 21760 23188 echo "${ECHO_T}$includedir" >&6 21761 23189 21762 23190 ### Resolve a conflict between normal and wide-curses by forcing applications 21763 @@ -15173,11 +15 596,14 @@23191 @@ -15173,11 +15878,14 @@ 21764 23192 if test "$with_overwrite" != no ; then 21765 23193 if test "$NCURSES_LIBUTF8" = 1 ; then 21766 23194 NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' 21767 23195 - { echo "$as_me:15176: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 21768 + { echo "$as_me:15 599: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&523196 + { echo "$as_me:15881: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 21769 23197 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} 21770 23198 fi … … 21777 23205 cat >>confdefs.h <<\EOF 21778 23206 #define HAVE_SLK_COLOR 1 21779 @@ -15186,7 +15 612,7 @@23207 @@ -15186,7 +15894,7 @@ 21780 23208 ### Construct the list of subdirectories for which we'll customize makefiles 21781 23209 ### with the appropriate compile-rules. 21782 23210 21783 23211 -echo "$as_me:15189: checking for src modules" >&5 21784 +echo "$as_me:15 615: checking for src modules" >&523212 +echo "$as_me:15897: checking for src modules" >&5 21785 23213 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 21786 23214 21787 23215 # dependencies and linker-arguments for test-programs 21788 @@ -15249,7 +15 675,7 @@23216 @@ -15249,7 +15957,7 @@ 21789 23217 fi 21790 23218 fi 21791 23219 done 21792 23220 -echo "$as_me:15252: result: $cf_cv_src_modules" >&5 21793 +echo "$as_me:15 678: result: $cf_cv_src_modules" >&523221 +echo "$as_me:15960: result: $cf_cv_src_modules" >&5 21794 23222 echo "${ECHO_T}$cf_cv_src_modules" >&6 21795 23223 21796 23224 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" 21797 @@ -15284,6 +15 710,10 @@23225 @@ -15284,6 +15992,10 @@ 21798 23226 21799 23227 fi … … 21806 23234 for cf_item in $cf_list_models 21807 23235 do 21808 @@ -15391,6 +1 5821,79 @@23236 @@ -15391,6 +16103,79 @@ 21809 23237 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" 21810 23238 fi … … 21813 23241 +if test "$DFT_LWR_MODEL" = "shared"; then 21814 23242 + 21815 +echo "$as_me:1 5827: checking for updated LDFLAGS" >&523243 +echo "$as_me:16109: checking for updated LDFLAGS" >&5 21816 23244 +echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 21817 23245 +if test -n "$LDFLAGS" ; then 21818 +echo "$as_me:1 5830: result: maybe" >&523246 +echo "$as_me:16112: result: maybe" >&5 21819 23247 +echo "${ECHO_T}maybe" >&6 21820 23248 +test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 21821 23249 + 21822 +echo "${as_me-configure}:1 5834: testing ...checking LDFLAGS $LDFLAGS ..." 1>&523250 +echo "${as_me-configure}:16116: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 21823 23251 + 21824 23252 +test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 21825 23253 + 21826 +echo "${as_me-configure}:1 5838: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&523254 +echo "${as_me-configure}:16120: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 21827 23255 + 21828 23256 +case "$EXTRA_LDFLAGS" in #(vi … … 21846 23274 + test -n "$verbose" && echo " Filtering $cf_rpath_src" 1>&6 21847 23275 + 21848 +echo "${as_me-configure}:1 5860: testing Filtering $cf_rpath_src ..." 1>&523276 +echo "${as_me-configure}:16142: testing Filtering $cf_rpath_src ..." 1>&5 21849 23277 + 21850 23278 + case $cf_rpath_src in #(vi … … 21857 23285 + test -n "$verbose" && echo " ...Filter $cf_rpath_tmp" 1>&6 21858 23286 + 21859 +echo "${as_me-configure}:1 5871: testing ...Filter $cf_rpath_tmp ..." 1>&523287 +echo "${as_me-configure}:16153: testing ...Filter $cf_rpath_tmp ..." 1>&5 21860 23288 + 21861 23289 + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" … … 21869 23297 + test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 21870 23298 + 21871 +echo "${as_me-configure}:1 5883: testing ...checked LDFLAGS $LDFLAGS ..." 1>&523299 +echo "${as_me-configure}:16165: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 21872 23300 + 21873 23301 + test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 21874 23302 + 21875 +echo "${as_me-configure}:1 5887: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&523303 +echo "${as_me-configure}:16169: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 21876 23304 + 21877 23305 +fi 21878 23306 +else 21879 +echo "$as_me:1 5891: result: no" >&523307 +echo "$as_me:16173: result: no" >&5 21880 23308 +echo "${ECHO_T}no" >&6 21881 23309 +fi … … 21886 23314 21887 23315 if test "$cf_cv_have_tcgetattr" = yes ; then 21888 @@ -15495,7 +1 5998,7 @@23316 @@ -15495,7 +16280,7 @@ 21889 23317 : ${CONFIG_STATUS=./config.status} 21890 23318 ac_clean_files_save=$ac_clean_files 21891 23319 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 21892 23320 -{ echo "$as_me:15498: creating $CONFIG_STATUS" >&5 21893 +{ echo "$as_me:16 001: creating $CONFIG_STATUS" >&523321 +{ echo "$as_me:16283: creating $CONFIG_STATUS" >&5 21894 23322 echo "$as_me: creating $CONFIG_STATUS" >&6;} 21895 23323 cat >$CONFIG_STATUS <<_ACEOF 21896 23324 #! $SHELL 21897 @@ -15671,7 +16174,7 @@ 23325 @@ -15627,7 +16412,7 @@ 23326 cat >>$CONFIG_STATUS <<EOF 23327 ac_cs_version="\\ 23328 config.status 23329 -configured by $0, generated by GNU Autoconf 2.52.20061216, 23330 +configured by $0, generated by GNU Autoconf 2.52.20080325, 23331 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" 23332 23333 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 23334 @@ -15671,7 +16456,7 @@ 21898 23335 echo "$ac_cs_version"; exit 0 ;; 21899 23336 --he | --h) 21900 23337 # Conflict between --help and --header 21901 23338 - { { echo "$as_me:15674: error: ambiguous option: $1 21902 + { { echo "$as_me:16 177: error: ambiguous option: $123339 + { { echo "$as_me:16459: error: ambiguous option: $1 21903 23340 Try \`$0 --help' for more information." >&5 21904 23341 echo "$as_me: error: ambiguous option: $1 21905 23342 Try \`$0 --help' for more information." >&2;} 21906 @@ -15690,7 +16 193,7 @@23343 @@ -15690,7 +16475,7 @@ 21907 23344 ac_need_defaults=false;; 21908 23345 21909 23346 # This is an error. 21910 23347 - -*) { { echo "$as_me:15693: error: unrecognized option: $1 21911 + -*) { { echo "$as_me:16 196: error: unrecognized option: $123348 + -*) { { echo "$as_me:16478: error: unrecognized option: $1 21912 23349 Try \`$0 --help' for more information." >&5 21913 23350 echo "$as_me: error: unrecognized option: $1 21914 23351 Try \`$0 --help' for more information." >&2;} 21915 @@ -15747,13 +16250,19 @@ 23352 @@ -15709,7 +16494,7 @@ 23353 ## Running config.status. ## 23354 ## ----------------------- ## 23355 23356 -This file was extended by $as_me 2.52.20061216, executed with 23357 +This file was extended by $as_me 2.52.20080325, executed with 23358 CONFIG_FILES = $CONFIG_FILES 23359 CONFIG_HEADERS = $CONFIG_HEADERS 23360 CONFIG_LINKS = $CONFIG_LINKS 23361 @@ -15747,13 +16532,19 @@ 21916 23362 TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX" 21917 23363 TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX" … … 21933 23379 cf_cv_prog_CXX_c_o=$cf_cv_prog_CXX_c_o 21934 23380 cf_cv_rel_version="$cf_cv_rel_version" 21935 @@ -15780,7 +16 289,7 @@23381 @@ -15780,7 +16571,7 @@ 21936 23382 "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; 21937 23383 "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; 21938 23384 "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; 21939 23385 - *) { { echo "$as_me:15783: error: invalid argument: $ac_config_target" >&5 21940 + *) { { echo "$as_me:16 292: error: invalid argument: $ac_config_target" >&523386 + *) { { echo "$as_me:16574: error: invalid argument: $ac_config_target" >&5 21941 23387 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} 21942 23388 { (exit 1); exit 1; }; };; 21943 23389 esac 21944 @@ -15928,6 +16 437,7 @@23390 @@ -15928,6 +16719,7 @@ 21945 23391 s,@cf_list_models@,$cf_list_models,;t t 21946 23392 s,@LIBTOOL@,$LIBTOOL,;t t … … 21950 23396 s,@LIB_OBJECT@,$LIB_OBJECT,;t t 21951 23397 s,@LIB_SUFFIX@,$LIB_SUFFIX,;t t 21952 @@ -15939,6 +16 449,7 @@23398 @@ -15939,6 +16731,7 @@ 21953 23399 s,@LIB_UNINSTALL@,$LIB_UNINSTALL,;t t 21954 23400 s,@DFT_LWR_MODEL@,$DFT_LWR_MODEL,;t t … … 21958 23404 s,@LIB_NAME@,$LIB_NAME,;t t 21959 23405 s,@LIB_PREFIX@,$LIB_PREFIX,;t t 21960 @@ -15961,6 +16 472,7 @@23406 @@ -15961,6 +16754,7 @@ 21961 23407 s,@TERMINFO_DIRS@,$TERMINFO_DIRS,;t t 21962 23408 s,@TERMINFO@,$TERMINFO,;t t … … 21966 23412 s,@BROKEN_LINKER@,$BROKEN_LINKER,;t t 21967 23413 s,@NCURSES_CH_T@,$NCURSES_CH_T,;t t 21968 @@ -15983,6 +16495,10 @@ 21969 s,@NCURSES_XNAMES@,$NCURSES_XNAMES,;t t 23414 @@ -15979,10 +16773,14 @@ 23415 s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t 23416 s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t 23417 s,@NCURSES_CONST@,$NCURSES_CONST,;t t 23418 -s,@NCURSES_SBOOL@,$NCURSES_SBOOL,;t t 23419 -s,@NCURSES_XNAMES@,$NCURSES_XNAMES,;t t 21970 23420 s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t 21971 23421 s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t 23422 +s,@NCURSES_SBOOL@,$NCURSES_SBOOL,;t t 23423 +s,@NCURSES_XNAMES@,$NCURSES_XNAMES,;t t 21972 23424 +s,@cf_cv_enable_reentrant@,$cf_cv_enable_reentrant,;t t 21973 23425 +s,@cf_cv_enable_opaque@,$cf_cv_enable_opaque,;t t … … 21977 23429 s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t 21978 23430 s,@EXTRA_CXXFLAGS@,$EXTRA_CXXFLAGS,;t t 21979 @@ -16015,14 +16531,22 @@ 23431 @@ -15993,6 +16791,7 @@ 23432 s,@cf_cv_1UL@,$cf_cv_1UL,;t t 23433 s,@cf_cv_typeof_mmask_t@,$cf_cv_typeof_mmask_t,;t t 23434 s,@HAVE_VSSCANF@,$HAVE_VSSCANF,;t t 23435 +s,@TEST_LIBS@,$TEST_LIBS,;t t 23436 s,@CXXCPP@,$CXXCPP,;t t 23437 s,@CXXLDFLAGS@,$CXXLDFLAGS,;t t 23438 s,@CXX_AR@,$CXX_AR,;t t 23439 @@ -16015,14 +16814,22 @@ 21980 23440 s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t 21981 23441 s,@DFT_OBJ_SUBDIR@,$DFT_OBJ_SUBDIR,;t t … … 22000 23460 s,@TEST_DEPS@,$TEST_DEPS,;t t 22001 23461 s,@TEST_ARG2@,$TEST_ARG2,;t t 22002 @@ -16146,7 +16 670,7 @@23462 @@ -16146,7 +16953,7 @@ 22003 23463 esac 22004 23464 22005 23465 if test x"$ac_file" != x-; then 22006 23466 - { echo "$as_me:16149: creating $ac_file" >&5 22007 + { echo "$as_me:16 673: creating $ac_file" >&523467 + { echo "$as_me:16956: creating $ac_file" >&5 22008 23468 echo "$as_me: creating $ac_file" >&6;} 22009 23469 rm -f "$ac_file" 22010 23470 fi 22011 @@ -16164,7 +16 688,7 @@23471 @@ -16164,7 +16971,7 @@ 22012 23472 -) echo $tmp/stdin ;; 22013 23473 [\\/$]*) 22014 23474 # Absolute (can't be DOS-style, as IFS=:) 22015 23475 - test -f "$f" || { { echo "$as_me:16167: error: cannot find input file: $f" >&5 22016 + test -f "$f" || { { echo "$as_me:16 691: error: cannot find input file: $f" >&523476 + test -f "$f" || { { echo "$as_me:16974: error: cannot find input file: $f" >&5 22017 23477 echo "$as_me: error: cannot find input file: $f" >&2;} 22018 23478 { (exit 1); exit 1; }; } 22019 23479 echo $f;; 22020 @@ -16177,7 +16 701,7 @@23480 @@ -16177,7 +16984,7 @@ 22021 23481 echo $srcdir/$f 22022 23482 else 22023 23483 # /dev/null tree 22024 23484 - { { echo "$as_me:16180: error: cannot find input file: $f" >&5 22025 + { { echo "$as_me:16 704: error: cannot find input file: $f" >&523485 + { { echo "$as_me:16987: error: cannot find input file: $f" >&5 22026 23486 echo "$as_me: error: cannot find input file: $f" >&2;} 22027 23487 { (exit 1); exit 1; }; } 22028 23488 fi;; 22029 @@ -16243,7 +1 6767,7 @@23489 @@ -16243,7 +17050,7 @@ 22030 23490 * ) ac_file_in=$ac_file.in ;; 22031 23491 esac 22032 23492 22033 23493 - test x"$ac_file" != x- && { echo "$as_me:16246: creating $ac_file" >&5 22034 + test x"$ac_file" != x- && { echo "$as_me:1 6770: creating $ac_file" >&523494 + test x"$ac_file" != x- && { echo "$as_me:17053: creating $ac_file" >&5 22035 23495 echo "$as_me: creating $ac_file" >&6;} 22036 23496 22037 23497 # First look for the input files in the build tree, otherwise in the 22038 @@ -16254,7 +1 6778,7 @@23498 @@ -16254,7 +17061,7 @@ 22039 23499 -) echo $tmp/stdin ;; 22040 23500 [\\/$]*) 22041 23501 # Absolute (can't be DOS-style, as IFS=:) 22042 23502 - test -f "$f" || { { echo "$as_me:16257: error: cannot find input file: $f" >&5 22043 + test -f "$f" || { { echo "$as_me:1 6781: error: cannot find input file: $f" >&523503 + test -f "$f" || { { echo "$as_me:17064: error: cannot find input file: $f" >&5 22044 23504 echo "$as_me: error: cannot find input file: $f" >&2;} 22045 23505 { (exit 1); exit 1; }; } 22046 23506 echo $f;; 22047 @@ -16267,7 +1 6791,7 @@23507 @@ -16267,7 +17074,7 @@ 22048 23508 echo $srcdir/$f 22049 23509 else 22050 23510 # /dev/null tree 22051 23511 - { { echo "$as_me:16270: error: cannot find input file: $f" >&5 22052 + { { echo "$as_me:1 6794: error: cannot find input file: $f" >&523512 + { { echo "$as_me:17077: error: cannot find input file: $f" >&5 22053 23513 echo "$as_me: error: cannot find input file: $f" >&2;} 22054 23514 { (exit 1); exit 1; }; } 22055 23515 fi;; 22056 @@ -16325,7 +1 6849,7 @@23516 @@ -16325,7 +17132,7 @@ 22057 23517 rm -f $tmp/in 22058 23518 if test x"$ac_file" != x-; then 22059 23519 if cmp -s $ac_file $tmp/config.h 2>/dev/null; then 22060 23520 - { echo "$as_me:16328: $ac_file is unchanged" >&5 22061 + { echo "$as_me:1 6852: $ac_file is unchanged" >&523521 + { echo "$as_me:17135: $ac_file is unchanged" >&5 22062 23522 echo "$as_me: $ac_file is unchanged" >&6;} 22063 23523 else 22064 23524 ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 22065 @@ -16400,7 +1 6924,6 @@23525 @@ -16400,7 +17207,6 @@ 22066 23526 continue 22067 23527 elif test -f $srcdir/$cf_dir/modules; then … … 22071 23531 LIBS_TO_MAKE= 22072 23532 for cf_item in $cf_LIST_MODELS 22073 @@ -16467,9 +1 6990,7 @@23533 @@ -16467,9 +17273,7 @@ 22074 23534 # use autodetected ${cf_prefix} for import lib and static lib, but 22075 23535 # use 'cyg' prefix for shared lib. … … 22082 23542 fi 22083 23543 fi 22084 @@ -16478,17 +1 6999,34 @@23544 @@ -16478,17 +17282,34 @@ 22085 23545 22086 23546 if test $cf_dir = ncurses ; then … … 22123 23583 $cf_dir/Makefile >$cf_dir/Makefile.out 22124 23584 mv $cf_dir/Makefile.out $cf_dir/Makefile 22125 @@ -16546,13 +17 084,20 @@23585 @@ -16546,13 +17367,20 @@ 22126 23586 case $cf_subset in 22127 23587 *base*) … … 22146 23606 fi 22147 23607 22148 @@ -16593,8 +17 138,11 @@23608 @@ -16593,8 +17421,11 @@ 22149 23609 prefix=$cf_prefix \ 22150 23610 suffix=$cf_suffix \ … … 22158 23618 rmSoLocs=$cf_cv_rm_so_locs \ 22159 23619 ldconfig="$LDCONFIG" \ 22160 @@ -16681,8 +17 229,8 @@23620 @@ -16681,8 +17512,8 @@ 22161 23621 22162 23622 cat >> Makefile <<CF_EOF … … 22169 23629 22170 23630 install.man \\ 22171 @@ -16691,7 +17 239,7 @@23631 @@ -16691,7 +17522,7 @@ 22172 23632 22173 23633 distclean :: … … 22178 23638 CF_EOF 22179 23639 22180 @@ -16795,41 +17 343,10 @@23640 @@ -16795,41 +17626,10 @@ 22181 23641 fi 22182 23642 … … 22226 23686 diff -Naur ncurses-5.6.orig/configure.in ncurses-5.6/configure.in 22227 23687 --- ncurses-5.6.orig/configure.in 2006-12-16 20:26:06.000000000 -0500 22228 +++ ncurses-5.6/configure.in 200 7-12-21 00:02:35.000000000 -050023688 +++ ncurses-5.6/configure.in 2008-06-18 06:49:50.000000000 -0400 22229 23689 @@ -1,5 +1,5 @@ 22230 23690 dnl*************************************************************************** … … 22239 23699 dnl 22240 23700 -dnl $Id: configure.in,v 1.383 2006/12/17 01:26:06 tom Exp $ 22241 +dnl $Id: configure.in,v 1.4 29 2007/11/24 22:42:43tom Exp $23701 +dnl $Id: configure.in,v 1.434 2008/05/17 19:50:19 tom Exp $ 22242 23702 dnl Process this file with autoconf to produce a configure script. 22243 23703 dnl … … 22247 23707 AC_PREREQ(2.13.20020210) 22248 23708 -AC_REVISION($Revision: 1.383 $) 22249 +AC_REVISION($Revision: 1.4 29$)23709 +AC_REVISION($Revision: 1.434 $) 22250 23710 AC_INIT(ncurses/base/lib_initscr.c) 22251 23711 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) … … 22381 23841 AC_ARG_ENABLE(tparm-varargs, 22382 23842 [ --disable-tparm-varargs compile tparm() without varargs interface], 22383 @@ -802,7 +852,7 @@ 23843 @@ -786,6 +836,40 @@ 23844 fi 23845 AC_SUBST(NCURSES_CONST) 23846 23847 +### use option --enable-ext-colors to turn on use of colors beyond 16. 23848 +AC_MSG_CHECKING(if you want to use extended colors) 23849 +AC_ARG_ENABLE(ext-colors, 23850 + [ --enable-ext-colors compile for 256-color support], 23851 + [with_ext_colors=$enableval], 23852 + [with_ext_colors=no]) 23853 +AC_MSG_RESULT($with_ext_colors) 23854 +NCURSES_EXT_COLORS=0 23855 +if test "$with_ext_colors" = yes ; then 23856 + if test "$with_widec" != yes ; then 23857 + AC_MSG_ERROR(This option applies only to wide-character library) 23858 + else 23859 + # cannot be ABI 5 since it changes sizeof(cchar_t) 23860 + CF_NCURSES_ABI_6 23861 + fi 23862 + NCURSES_EXT_COLORS=1 23863 + AC_DEFINE(NCURSES_EXT_COLORS) 23864 +fi 23865 +AC_SUBST(NCURSES_EXT_COLORS) 23866 + 23867 +### use option --enable-ext-mouse to modify coding to support 5-button mice 23868 +AC_MSG_CHECKING(if you want to use extended mouse encoding) 23869 +AC_ARG_ENABLE(ext-mouse, 23870 + [ --enable-ext-mouse compile for extended mouse-encoding], 23871 + [with_ext_mouse=$enableval], 23872 + [with_ext_mouse=no]) 23873 +AC_MSG_RESULT($with_ext_mouse) 23874 +NCURSES_MOUSE_VERSION=1 23875 +if test "$with_ext_mouse" = yes ; then 23876 + NCURSES_MOUSE_VERSION=2 23877 + CF_NCURSES_ABI_6 23878 +fi 23879 +AC_SUBST(NCURSES_MOUSE_VERSION) 23880 + 23881 AC_MSG_CHECKING(if you want \$NCURSES_NO_PADDING code) 23882 AC_ARG_ENABLE(no-padding, 23883 [ --enable-no-padding compile with $NCURSES_NO_PADDING code], 23884 @@ -802,7 +886,7 @@ 22384 23885 fi 22385 23886 AC_MSG_CHECKING(if you want to use signed Boolean array in term.h) … … 22390 23891 [with_signed_char=no]) 22391 23892 AC_MSG_RESULT($with_signed_char) 22392 @@ -895,7 +945,7 @@ 22393 NCURSES_EXT_COLORS=0 22394 if test "$with_ext_colors" = yes ; then 22395 if test "$with_widec" != yes ; then 23893 @@ -885,39 +969,42 @@ 23894 AC_MSG_RESULT($with_colorfgbg) 23895 test "$with_colorfgbg" = yes && AC_DEFINE(USE_COLORFGBG) 23896 23897 -### use option --enable-ext-colors to turn on use of colors beyond 16. 23898 -AC_MSG_CHECKING(if you want to use experimental extended colors) 23899 -AC_ARG_ENABLE(ext-colors, 23900 - [ --enable-ext-colors compile for experimental 256-color support], 23901 - [with_ext_colors=$enableval], 23902 - [with_ext_colors=no]) 23903 -AC_MSG_RESULT($with_ext_colors) 23904 -NCURSES_EXT_COLORS=0 23905 -if test "$with_ext_colors" = yes ; then 23906 - if test "$with_widec" != yes ; then 22396 23907 - AC_MSG_WARN(This option applies only to wide-character library) 22397 + AC_MSG_ERROR(This option applies only to wide-character library) 22398 else 22399 # cannot be ABI 5 since it changes sizeof(cchar_t) 22400 CF_NCURSES_ABI_6 22401 @@ -919,6 +969,33 @@ 22402 fi 22403 AC_SUBST(NCURSES_MOUSE_VERSION) 22404 23908 - else 23909 - # cannot be ABI 5 since it changes sizeof(cchar_t) 23910 - CF_NCURSES_ABI_6 23911 - fi 23912 - NCURSES_EXT_COLORS=1 23913 - AC_DEFINE(NCURSES_EXT_COLORS) 23914 -fi 23915 -AC_SUBST(NCURSES_EXT_COLORS) 23916 - 23917 -### use option --enable-ext-mouse to modify coding to support 5-button mice 23918 -AC_MSG_CHECKING(if you want to use experimental extended mouse encoding) 23919 -AC_ARG_ENABLE(ext-mouse, 23920 - [ --enable-ext-mouse compile for experimental mouse-encoding], 23921 - [with_ext_mouse=$enableval], 23922 - [with_ext_mouse=no]) 23923 -AC_MSG_RESULT($with_ext_mouse) 23924 -NCURSES_MOUSE_VERSION=1 23925 -if test "$with_ext_mouse" = yes ; then 23926 - NCURSES_MOUSE_VERSION=2 23927 +# This is still experimental (20080329), but should ultimately be moved to 23928 +# the script-block --with-normal, etc. 23929 +CF_WITH_PTHREAD 23930 +if test "$with_pthread" = "yes" ; then 23931 + AC_DEFINE(USE_PTHREADS) 23932 + enable_reentrant=yes 23933 +fi 23934 + 22405 23935 +# Reentrant code has to be opaque; there's little advantage to making ncurses 22406 +# opaque outside of that, so there is no --enable-opaque option. 23936 +# opaque outside of that, so there is no --enable-opaque option. We can use 23937 +# this option without --with-pthreads, but this will be always set for 23938 +# pthreads. 22407 23939 +AC_MSG_CHECKING(if you want experimental reentrant code) 22408 23940 +AC_ARG_ENABLE(reentrant, … … 22418 23950 + LIB_SUFFIX="t${LIB_SUFFIX}" 22419 23951 + AC_DEFINE(USE_REENTRANT) 22420 + CF_NCURSES_ABI_6 23952 CF_NCURSES_ABI_6 23953 -fi 23954 -AC_SUBST(NCURSES_MOUSE_VERSION) 22421 23955 +else 22422 23956 + cf_cv_enable_reentrant=0 … … 22429 23963 +AC_SUBST(NCURSES_OPAQUE) 22430 23964 +AC_SUBST(NCURSES_SIZE_T) 22431 + 23965 22432 23966 AC_MSG_CHECKING(if you want experimental safe-sprintf code) 22433 23967 AC_ARG_ENABLE(safe-sprintf, 22434 [ --enable-safe-sprintf compile with experimental safe-sprintf code], 22435 @@ -961,6 +1038,7 @@ 23968 @@ -961,6 +1048,7 @@ 22436 23969 else 22437 23970 ECHO_LINK='@ echo linking $@ ... ;' … … 22441 23974 AC_MSG_RESULT($with_echo) 22442 23975 AC_SUBST(ECHO_LINK) 22443 @@ -972,9 +10 50,9 @@23976 @@ -972,9 +1060,9 @@ 22444 23977 [with_warnings=$enableval]) 22445 23978 AC_MSG_RESULT($with_warnings) … … 22453 23986 CF_GXX_WARNINGS(Wno-unused) 22454 23987 fi 22455 @@ -1088,26 +11 66,21 @@23988 @@ -1088,26 +1176,21 @@ 22456 23989 ### checks for compiler characteristics 22457 23990 AC_LANG_C … … 22485 24018 22486 24019 if test $NCURSES_MMASK_T = auto ; then 22487 @@ -1115,6 +11 88,7 @@24020 @@ -1115,6 +1198,7 @@ 22488 24021 else 22489 24022 cf_cv_typeof_mmask_t=$NCURSES_MMASK_T … … 22493 24026 22494 24027 ### Checks for external-data 22495 @@ -1170,7 +1244,7 @@ 22496 24028 @@ -1168,9 +1252,20 @@ 24029 CF_FUNC_MEMMOVE 24030 CF_FUNC_POLL 24031 24032 +# special check for test/ditto.c 24033 +CF_FUNC_OPENPTY 24034 +if test "$cf_cv_func_openpty" != no ; then 24035 + AC_DEFINE_UNQUOTED(USE_OPENPTY_HEADER,<$cf_cv_func_openpty>) 24036 + AC_DEFINE(USE_XTERM_PTY) 24037 + if test "$cf_cv_lib_util" = yes ; then 24038 + TEST_LIBS="-lutil $TEST_LIBS" 24039 + fi 24040 +fi 24041 +AC_SUBST(TEST_LIBS) 24042 + 22497 24043 if test "$with_hashed_db" != no ; then 22498 24044 AC_DEFINE(USE_HASHED_DB) … … 22502 24048 22503 24049 dnl We'll do our own -g libraries, unless the user's overridden via $CFLAGS 22504 @@ -1200,14 +12 74,13 @@24050 @@ -1200,14 +1295,13 @@ 22505 24051 ;; 22506 24052 esac … … 22518 24064 CXX_AR='$(AR)' 22519 24065 CXX_AR_OPTS='$(AR_OPTS)' 22520 @@ -1284,9 +13 57,22 @@24066 @@ -1284,9 +1378,22 @@ 22521 24067 22522 24068 CF_HELP_MESSAGE(Ada95 Binding Options:) … … 22542 24088 cf_ada_make=gnatmake 22543 24089 AC_CHECK_PROG(gnat_exists, $cf_ada_make, yes, no) 22544 @@ -1369,22 +14 55,44 @@24090 @@ -1369,22 +1476,44 @@ 22545 24091 22546 24092 fi … … 22593 24139 22594 24140 ### Construct the list of include-directories to be generated 22595 @@ -1399,10 +15 07,12 @@24141 @@ -1399,10 +1528,12 @@ 22596 24142 22597 24143 AC_MSG_CHECKING(default library-dependency suffix) … … 22606 24152 esac 22607 24153 fi 22608 @@ -1426,16 +15 36,53 @@24154 @@ -1426,16 +1557,53 @@ 22609 24155 AC_SUBST(CXX_LIB_SUFFIX) 22610 24156 fi … … 22661 24207 TINFO_DEP_SUFFIX="${TINFO_NAME}${DFT_DEP_SUFFIX}" 22662 24208 TINFO_LIB_SUFFIX="${TINFO_NAME}${LIB_SUFFIX}" 22663 @@ -1450,21 +1 597,48@@24209 @@ -1450,21 +1618,52 @@ 22664 24210 else 22665 24211 TEST_ARGS="-l${TINFO_ARG_SUFFIX}" … … 22697 24243 +fi 22698 24244 + 24245 +if test "$DFT_LWR_MODEL" = "libtool"; then 24246 + OBJEXT=lo 24247 +fi 24248 + 22699 24249 # needed for Ada95 22700 24250 TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'` … … 22710 24260 test "$with_overwrite" = no && \ 22711 24261 test "x$includedir" = 'x${prefix}/include' && \ 22712 @@ -1481,9 +16 55,14 @@24262 @@ -1481,9 +1680,14 @@ 22713 24263 fi 22714 24264 … … 22725 24275 AC_DEFINE(HAVE_SLK_COLOR) 22726 24276 22727 @@ -1491,6 +16 70,11 @@24277 @@ -1491,6 +1695,11 @@ 22728 24278 ### with the appropriate compile-rules. 22729 24279 … … 22737 24287 22738 24288 AC_DEFINE_UNQUOTED(NCURSES_PATHSEP,'$PATHSEP') 22739 @@ -1500,6 +1 684,11 @@24289 @@ -1500,6 +1709,11 @@ 22740 24290 ### Now that we're done running tests, add the compiler-warnings, if any 22741 24291 CF_ADD_CFLAGS($EXTRA_CFLAGS) … … 22749 24299 CF_SUBST_IF(["$cf_cv_have_tcgetattr" = yes], HAVE_TCGETATTR, 1, 0) 22750 24300 CF_SUBST_IF(["$ac_cv_header_termio_h" = yes], HAVE_TERMIO_H, 1, 0) 22751 @@ -1540,13 +17 29,19 @@24301 @@ -1540,13 +1754,19 @@ 22752 24302 TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX" 22753 24303 TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX" … … 22771 24321 diff -Naur ncurses-5.6.orig/dist.mk ncurses-5.6/dist.mk 22772 24322 --- ncurses-5.6.orig/dist.mk 2006-12-17 14:58:35.000000000 -0500 22773 +++ ncurses-5.6/dist.mk 200 7-12-21 00:02:36.000000000 -050024323 +++ ncurses-5.6/dist.mk 2008-06-18 06:49:52.000000000 -0400 22774 24324 @@ -1,5 +1,5 @@ 22775 24325 ############################################################################## 22776 24326 -# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. # 22777 +# Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. #24327 +# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. # 22778 24328 # # 22779 24329 # Permission is hereby granted, free of charge, to any person obtaining a # … … 22784 24334 ############################################################################## 22785 24335 -# $Id: dist.mk,v 1.567 2006/12/17 19:58:35 tom Exp $ 22786 +# $Id: dist.mk,v 1.6 19 2007/12/15 22:01:55tom Exp $24336 +# $Id: dist.mk,v 1.646 2008/06/14 18:11:41 tom Exp $ 22787 24337 # Makefile for creating ncurses distributions. 22788 24338 # … … 22793 24343 NCURSES_MINOR = 6 22794 24344 -NCURSES_PATCH = 20061217 22795 +NCURSES_PATCH = 200 7121524345 +NCURSES_PATCH = 20080614 22796 24346 22797 24347 # We don't append the patch to the version, since this only applies to releases … … 22807 24357 diff -Naur ncurses-5.6.orig/doc/hackguide.doc ncurses-5.6/doc/hackguide.doc 22808 24358 --- ncurses-5.6.orig/doc/hackguide.doc 2005-12-24 10:44:52.000000000 -0500 22809 +++ ncurses-5.6/doc/hackguide.doc 200 7-12-21 00:02:35.000000000 -050024359 +++ ncurses-5.6/doc/hackguide.doc 2008-06-18 06:49:44.000000000 -0400 22810 24360 @@ -261,7 +261,7 @@ 22811 24361 lib_tracedmp.c lib_tracemse.c trace_buf.c … … 22819 24369 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/A.htm ncurses-5.6/doc/html/ada/funcs/A.htm 22820 24370 --- ncurses-5.6.orig/doc/html/ada/funcs/A.htm 2005-05-14 13:34:32.000000000 -0400 22821 +++ ncurses-5.6/doc/html/ada/funcs/A.htm 200 7-12-21 00:02:35.000000000 -050024371 +++ ncurses-5.6/doc/html/ada/funcs/A.htm 2008-06-18 06:49:44.000000000 -0400 22822 24372 @@ -4,6 +4,21 @@ 22823 24373 <H2>Functions - A</H2> … … 22844 24394 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/B.htm ncurses-5.6/doc/html/ada/funcs/B.htm 22845 24395 --- ncurses-5.6.orig/doc/html/ada/funcs/B.htm 2006-09-23 16:31:30.000000000 -0400 22846 +++ ncurses-5.6/doc/html/ada/funcs/B.htm 200 7-12-21 00:02:35.000000000 -050024396 +++ ncurses-5.6/doc/html/ada/funcs/B.htm 2008-06-18 06:49:44.000000000 -0400 22847 24397 @@ -4,8 +4,18 @@ 22848 24398 <H2>Functions - B</H2> … … 22868 24418 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/C.htm ncurses-5.6/doc/html/ada/funcs/C.htm 22869 24419 --- ncurses-5.6.orig/doc/html/ada/funcs/C.htm 2006-09-23 16:31:30.000000000 -0400 22870 +++ ncurses-5.6/doc/html/ada/funcs/C.htm 200 7-12-21 00:02:35.000000000 -050024420 +++ ncurses-5.6/doc/html/ada/funcs/C.htm 2008-06-18 06:49:44.000000000 -0400 22871 24421 @@ -4,24 +4,53 @@ 22872 24422 <H2>Functions - C</H2> … … 22935 24485 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/D.htm ncurses-5.6/doc/html/ada/funcs/D.htm 22936 24486 --- ncurses-5.6.orig/doc/html/ada/funcs/D.htm 2006-09-23 16:31:30.000000000 -0400 22937 +++ ncurses-5.6/doc/html/ada/funcs/D.htm 200 7-12-21 00:02:35.000000000 -050024487 +++ ncurses-5.6/doc/html/ada/funcs/D.htm 2008-06-18 06:49:44.000000000 -0400 22938 24488 @@ -4,19 +4,44 @@ 22939 24489 <H2>Functions - D</H2> … … 22991 24541 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/E.htm ncurses-5.6/doc/html/ada/funcs/E.htm 22992 24542 --- ncurses-5.6.orig/doc/html/ada/funcs/E.htm 2006-09-23 16:31:30.000000000 -0400 22993 +++ ncurses-5.6/doc/html/ada/funcs/E.htm 200 7-12-21 00:02:35.000000000 -050024543 +++ ncurses-5.6/doc/html/ada/funcs/E.htm 2008-06-18 06:49:44.000000000 -0400 22994 24544 @@ -4,7 +4,15 @@ 22995 24545 <H2>Functions - E</H2> … … 23013 24563 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/F.htm ncurses-5.6/doc/html/ada/funcs/F.htm 23014 24564 --- ncurses-5.6.orig/doc/html/ada/funcs/F.htm 2006-09-23 16:31:30.000000000 -0400 23015 +++ ncurses-5.6/doc/html/ada/funcs/F.htm 200 7-12-21 00:02:35.000000000 -050024565 +++ ncurses-5.6/doc/html/ada/funcs/F.htm 2008-06-18 06:49:44.000000000 -0400 23016 24566 @@ -4,10 +4,13 @@ 23017 24567 <H2>Functions - F</H2> … … 23068 24618 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/G.htm ncurses-5.6/doc/html/ada/funcs/G.htm 23069 24619 --- ncurses-5.6.orig/doc/html/ada/funcs/G.htm 2006-09-23 16:31:30.000000000 -0400 23070 +++ ncurses-5.6/doc/html/ada/funcs/G.htm 200 7-12-21 00:02:35.000000000 -050024620 +++ ncurses-5.6/doc/html/ada/funcs/G.htm 2008-06-18 06:49:44.000000000 -0400 23071 24621 @@ -8,26 +8,89 @@ 23072 24622 <LI><A HREF="../terminal_interface-curses-forms-field_types-user__ads.htm#ref_83_13" TARGET="main">Generic_Field_Check</A> … … 23162 24712 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/H.htm ncurses-5.6/doc/html/ada/funcs/H.htm 23163 24713 --- ncurses-5.6.orig/doc/html/ada/funcs/H.htm 2006-09-23 16:31:30.000000000 -0400 23164 +++ ncurses-5.6/doc/html/ada/funcs/H.htm 200 7-12-21 00:02:35.000000000 -050024714 +++ ncurses-5.6/doc/html/ada/funcs/H.htm 2008-06-18 06:49:44.000000000 -0400 23165 24715 @@ -4,11 +4,19 @@ 23166 24716 <H2>Functions - H</H2> … … 23190 24740 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/I.htm ncurses-5.6/doc/html/ada/funcs/I.htm 23191 24741 --- ncurses-5.6.orig/doc/html/ada/funcs/I.htm 2006-09-23 16:31:30.000000000 -0400 23192 +++ ncurses-5.6/doc/html/ada/funcs/I.htm 200 7-12-21 00:02:35.000000000 -050024742 +++ ncurses-5.6/doc/html/ada/funcs/I.htm 2008-06-18 06:49:44.000000000 -0400 23193 24743 @@ -4,19 +4,42 @@ 23194 24744 <H2>Functions - I</H2> … … 23244 24794 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/K.htm ncurses-5.6/doc/html/ada/funcs/K.htm 23245 24795 --- ncurses-5.6.orig/doc/html/ada/funcs/K.htm 2006-09-23 16:31:30.000000000 -0400 23246 +++ ncurses-5.6/doc/html/ada/funcs/K.htm 200 7-12-21 00:02:35.000000000 -050024796 +++ ncurses-5.6/doc/html/ada/funcs/K.htm 2008-06-18 06:49:44.000000000 -0400 23247 24797 @@ -4,8 +4,11 @@ 23248 24798 <H2>Functions - K</H2> … … 23263 24813 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/L.htm ncurses-5.6/doc/html/ada/funcs/L.htm 23264 24814 --- ncurses-5.6.orig/doc/html/ada/funcs/L.htm 2006-09-23 16:31:30.000000000 -0400 23265 +++ ncurses-5.6/doc/html/ada/funcs/L.htm 200 7-12-21 00:02:35.000000000 -050024815 +++ ncurses-5.6/doc/html/ada/funcs/L.htm 2008-06-18 06:49:44.000000000 -0400 23266 24816 @@ -4,12 +4,17 @@ 23267 24817 <H2>Functions - L</H2> … … 23287 24837 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/M.htm ncurses-5.6/doc/html/ada/funcs/M.htm 23288 24838 --- ncurses-5.6.orig/doc/html/ada/funcs/M.htm 2006-09-23 16:31:30.000000000 -0400 23289 +++ ncurses-5.6/doc/html/ada/funcs/M.htm 200 7-12-21 00:02:35.000000000 -050024839 +++ ncurses-5.6/doc/html/ada/funcs/M.htm 2008-06-18 06:49:44.000000000 -0400 23290 24840 @@ -4,6 +4,9 @@ 23291 24841 <H2>Functions - M</H2> … … 23334 24884 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/N.htm ncurses-5.6/doc/html/ada/funcs/N.htm 23335 24885 --- ncurses-5.6.orig/doc/html/ada/funcs/N.htm 2006-09-23 16:31:30.000000000 -0400 23336 +++ ncurses-5.6/doc/html/ada/funcs/N.htm 200 7-12-21 00:02:35.000000000 -050024886 +++ ncurses-5.6/doc/html/ada/funcs/N.htm 2008-06-18 06:49:44.000000000 -0400 23337 24887 @@ -4,24 +4,32 @@ 23338 24888 <H2>Functions - N</H2> … … 23381 24931 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/O.htm ncurses-5.6/doc/html/ada/funcs/O.htm 23382 24932 --- ncurses-5.6.orig/doc/html/ada/funcs/O.htm 2006-09-23 16:31:30.000000000 -0400 23383 +++ ncurses-5.6/doc/html/ada/funcs/O.htm 200 7-12-21 00:02:35.000000000 -050024933 +++ ncurses-5.6/doc/html/ada/funcs/O.htm 2008-06-18 06:49:44.000000000 -0400 23384 24934 @@ -5,6 +5,8 @@ 23385 24935 <A HREF="../funcs.htm" TARGET="_self">[index]</A> … … 23395 24945 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/P.htm ncurses-5.6/doc/html/ada/funcs/P.htm 23396 24946 --- ncurses-5.6.orig/doc/html/ada/funcs/P.htm 2006-09-23 16:31:30.000000000 -0400 23397 +++ ncurses-5.6/doc/html/ada/funcs/P.htm 200 7-12-21 00:02:35.000000000 -050024947 +++ ncurses-5.6/doc/html/ada/funcs/P.htm 2008-06-18 06:49:44.000000000 -0400 23398 24948 @@ -4,17 +4,33 @@ 23399 24949 <H2>Functions - P</H2> … … 23436 24986 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/Q.htm ncurses-5.6/doc/html/ada/funcs/Q.htm 23437 24987 --- ncurses-5.6.orig/doc/html/ada/funcs/Q.htm 2005-05-14 13:34:32.000000000 -0400 23438 +++ ncurses-5.6/doc/html/ada/funcs/Q.htm 200 7-12-21 00:02:35.000000000 -050024988 +++ ncurses-5.6/doc/html/ada/funcs/Q.htm 2008-06-18 06:49:44.000000000 -0400 23439 24989 @@ -4,5 +4,5 @@ 23440 24990 <H2>Functions - Q</H2> … … 23446 24996 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/R.htm ncurses-5.6/doc/html/ada/funcs/R.htm 23447 24997 --- ncurses-5.6.orig/doc/html/ada/funcs/R.htm 2006-09-23 16:31:30.000000000 -0400 23448 +++ ncurses-5.6/doc/html/ada/funcs/R.htm 200 7-12-21 00:02:35.000000000 -050024998 +++ ncurses-5.6/doc/html/ada/funcs/R.htm 2008-06-18 06:49:44.000000000 -0400 23449 24999 @@ -4,14 +4,36 @@ 23450 25000 <H2>Functions - R</H2> … … 23492 25042 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/S.htm ncurses-5.6/doc/html/ada/funcs/S.htm 23493 25043 --- ncurses-5.6.orig/doc/html/ada/funcs/S.htm 2006-09-23 16:31:30.000000000 -0400 23494 +++ ncurses-5.6/doc/html/ada/funcs/S.htm 200 7-12-21 00:02:35.000000000 -050025044 +++ ncurses-5.6/doc/html/ada/funcs/S.htm 2008-06-18 06:49:44.000000000 -0400 23495 25045 @@ -4,24 +4,51 @@ 23496 25046 <H2>Functions - S</H2> … … 23702 25252 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/T.htm ncurses-5.6/doc/html/ada/funcs/T.htm 23703 25253 --- ncurses-5.6.orig/doc/html/ada/funcs/T.htm 2006-09-23 16:31:30.000000000 -0400 23704 +++ ncurses-5.6/doc/html/ada/funcs/T.htm 200 7-12-21 00:02:35.000000000 -050025254 +++ ncurses-5.6/doc/html/ada/funcs/T.htm 2008-06-18 06:49:44.000000000 -0400 23705 25255 @@ -4,9 +4,12 @@ 23706 25256 <H2>Functions - T</H2> … … 23739 25289 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/U.htm ncurses-5.6/doc/html/ada/funcs/U.htm 23740 25290 --- ncurses-5.6.orig/doc/html/ada/funcs/U.htm 2006-09-23 16:31:30.000000000 -0400 23741 +++ ncurses-5.6/doc/html/ada/funcs/U.htm 200 7-12-21 00:02:35.000000000 -050025291 +++ ncurses-5.6/doc/html/ada/funcs/U.htm 2008-06-18 06:49:44.000000000 -0400 23742 25292 @@ -4,9 +4,20 @@ 23743 25293 <H2>Functions - U</H2> … … 23767 25317 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/V.htm ncurses-5.6/doc/html/ada/funcs/V.htm 23768 25318 --- ncurses-5.6.orig/doc/html/ada/funcs/V.htm 2005-05-14 13:34:32.000000000 -0400 23769 +++ ncurses-5.6/doc/html/ada/funcs/V.htm 200 7-12-21 00:02:35.000000000 -050025319 +++ ncurses-5.6/doc/html/ada/funcs/V.htm 2008-06-18 06:49:44.000000000 -0400 23770 25320 @@ -4,5 +4,8 @@ 23771 25321 <H2>Functions - V</H2> … … 23780 25330 diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/W.htm ncurses-5.6/doc/html/ada/funcs/W.htm 23781 25331 --- ncurses-5.6.orig/doc/html/ada/funcs/W.htm 2006-09-23 16:31:30.000000000 -0400 23782 +++ ncurses-5.6/doc/html/ada/funcs/W.htm 200 7-12-21 00:02:35.000000000 -050025332 +++ ncurses-5.6/doc/html/ada/funcs/W.htm 2008-06-18 06:49:44.000000000 -0400 23783 25333 @@ -4,50 +4,50 @@ 23784 25334 <H2>Functions - W</H2> … … 23879 25429 diff -Naur ncurses-5.6.orig/doc/html/ada/table.html ncurses-5.6/doc/html/ada/table.html 23880 25430 --- ncurses-5.6.orig/doc/html/ada/table.html 2000-12-02 18:38:22.000000000 -0500 23881 +++ ncurses-5.6/doc/html/ada/table.html 200 7-12-21 00:02:35.000000000 -050025431 +++ ncurses-5.6/doc/html/ada/table.html 2008-06-18 06:49:44.000000000 -0400 23882 25432 @@ -10,36 +10,38 @@ 23883 25433 <TABLE ALIGN=CENTER BORDER> … … 24326 25876 diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-aux__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-aux__ads.htm 24327 25877 --- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-aux__ads.htm 2006-09-23 16:31:30.000000000 -0400 24328 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-aux__ads.htm 200 7-12-21 00:02:35.000000000 -050025878 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-aux__ads.htm 2008-06-18 06:49:44.000000000 -0400 24329 25879 @@ -3,7 +3,6 @@ 24330 25880 <BODY> … … 24471 26021 diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm 24472 26022 --- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm 2006-09-23 16:31:31.000000000 -0400 24473 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm 200 7-12-21 00:02:35.000000000 -050026023 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm 2008-06-18 06:49:44.000000000 -0400 24474 26024 @@ -3,7 +3,6 @@ 24475 26025 <BODY> … … 24763 26313 diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-forms-field_user_data__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-forms-field_user_data__ads.htm 24764 26314 --- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-forms-field_user_data__ads.htm 2006-09-23 16:31:31.000000000 -0400 24765 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-forms-field_user_data__ads.htm 200 7-12-21 00:02:35.000000000 -050026315 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-forms-field_user_data__ads.htm 2008-06-18 06:49:44.000000000 -0400 24766 26316 @@ -3,7 +3,6 @@ 24767 26317 <BODY> … … 24817 26367 diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-forms-form_user_data__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-forms-form_user_data__ads.htm 24818 26368 --- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-forms-form_user_data__ads.htm 2006-09-23 16:31:31.000000000 -0400 24819 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-forms-form_user_data__ads.htm 200 7-12-21 00:02:35.000000000 -050026369 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-forms-form_user_data__ads.htm 2008-06-18 06:49:44.000000000 -0400 24820 26370 @@ -3,7 +3,6 @@ 24821 26371 <BODY> … … 24871 26421 diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-forms__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-forms__ads.htm 24872 26422 --- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-forms__ads.htm 2006-09-23 16:31:31.000000000 -0400 24873 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-forms__ads.htm 200 7-12-21 00:02:35.000000000 -050026423 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-forms__ads.htm 2008-06-18 06:49:44.000000000 -0400 24874 26424 @@ -3,7 +3,6 @@ 24875 26425 <BODY> … … 25966 27516 diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-menus-item_user_data__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-menus-item_user_data__ads.htm 25967 27517 --- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-menus-item_user_data__ads.htm 2006-09-23 16:31:31.000000000 -0400 25968 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-menus-item_user_data__ads.htm 200 7-12-21 00:02:35.000000000 -050027518 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-menus-item_user_data__ads.htm 2008-06-18 06:49:44.000000000 -0400 25969 27519 @@ -3,7 +3,6 @@ 25970 27520 <BODY> … … 26021 27571 diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-menus-menu_user_data__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-menus-menu_user_data__ads.htm 26022 27572 --- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-menus-menu_user_data__ads.htm 2006-09-23 16:31:31.000000000 -0400 26023 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-menus-menu_user_data__ads.htm 200 7-12-21 00:02:35.000000000 -050027573 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-menus-menu_user_data__ads.htm 2008-06-18 06:49:44.000000000 -0400 26024 27574 @@ -3,7 +3,6 @@ 26025 27575 <BODY> … … 26075 27625 diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-menus__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-menus__ads.htm 26076 27626 --- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-menus__ads.htm 2006-09-23 16:31:31.000000000 -0400 26077 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-menus__ads.htm 200 7-12-21 00:02:35.000000000 -050027627 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-menus__ads.htm 2008-06-18 06:49:44.000000000 -0400 26078 27628 @@ -3,7 +3,6 @@ 26079 27629 <BODY> … … 26979 28529 diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-mouse__adb.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-mouse__adb.htm 26980 28530 --- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-mouse__adb.htm 2006-09-23 16:31:31.000000000 -0400 26981 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-mouse__adb.htm 200 7-12-21 00:02:35.000000000 -050028531 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-mouse__adb.htm 2008-06-18 06:49:44.000000000 -0400 26982 28532 @@ -60,7 +60,7 @@ 26983 28533 <b>function</b> <FONT COLOR=red><A NAME="ref_55_16">Mouse_Avail</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>; … … 27028 28578 diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-mouse__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-mouse__ads.htm 27029 28579 --- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-mouse__ads.htm 2006-09-23 16:31:31.000000000 -0400 27030 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-mouse__ads.htm 200 7-12-21 00:02:35.000000000 -050028580 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-mouse__ads.htm 2008-06-18 06:49:44.000000000 -0400 27031 28581 @@ -3,7 +3,6 @@ 27032 28582 <BODY> … … 27320 28870 diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-panels-user_data__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-panels-user_data__ads.htm 27321 28871 --- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-panels-user_data__ads.htm 2006-09-23 16:31:31.000000000 -0400 27322 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-panels-user_data__ads.htm 200 7-12-21 00:02:35.000000000 -050028872 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-panels-user_data__ads.htm 2008-06-18 06:49:44.000000000 -0400 27323 28873 @@ -3,7 +3,6 @@ 27324 28874 <BODY> … … 27374 28924 diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-panels__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-panels__ads.htm 27375 28925 --- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-panels__ads.htm 2006-09-23 16:31:32.000000000 -0400 27376 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-panels__ads.htm 200 7-12-21 00:02:35.000000000 -050028926 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-panels__ads.htm 2008-06-18 06:49:44.000000000 -0400 27377 28927 @@ -3,7 +3,6 @@ 27378 28928 <BODY> … … 27528 29078 diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-terminfo__adb.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-terminfo__adb.htm 27529 29079 --- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-terminfo__adb.htm 2006-09-23 16:31:32.000000000 -0400 27530 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-terminfo__adb.htm 200 7-12-21 00:02:35.000000000 -050029080 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-terminfo__adb.htm 2008-06-18 06:49:44.000000000 -0400 27531 29081 @@ -71,13 +71,13 @@ 27532 29082 <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT> … … 27547 29097 diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-text_io-aux__adb.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-text_io-aux__adb.htm 27548 29098 --- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-text_io-aux__adb.htm 2006-09-23 16:31:32.000000000 -0400 27549 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-text_io-aux__adb.htm 200 7-12-21 00:02:35.000000000 -050029099 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-text_io-aux__adb.htm 2008-06-18 06:49:44.000000000 -0400 27550 29100 @@ -76,7 +76,7 @@ 27551 29101 <b>end</b> <b>if</b>; … … 27568 29118 diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-text_io__adb.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-text_io__adb.htm 27569 29119 --- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-text_io__adb.htm 2006-09-23 16:31:32.000000000 -0400 27570 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-text_io__adb.htm 200 7-12-21 00:02:35.000000000 -050029120 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-text_io__adb.htm 2008-06-18 06:49:44.000000000 -0400 27571 29121 @@ -58,7 +58,7 @@ 27572 29122 <b>is</b> … … 27699 29249 diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-trace__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-trace__ads.htm 27700 29250 --- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-trace__ads.htm 2006-09-23 16:31:32.000000000 -0400 27701 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-trace__ads.htm 200 7-12-21 00:02:35.000000000 -050029251 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses-trace__ads.htm 2008-06-18 06:49:44.000000000 -0400 27702 29252 @@ -3,7 +3,6 @@ 27703 29253 <BODY> … … 27810 29360 diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses__adb.htm ncurses-5.6/doc/html/ada/terminal_interface-curses__adb.htm 27811 29361 --- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses__adb.htm 2006-09-23 16:31:33.000000000 -0400 27812 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses__adb.htm 200 7-12-21 00:02:35.000000000 -050029362 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses__adb.htm 2008-06-18 06:49:44.000000000 -0400 27813 29363 @@ -12,7 +12,7 @@ 27814 29364 <FONT COLOR=green><EM>-- B O D Y --</EM></FONT> … … 31816 33366 diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses__ads.htm 31817 33367 --- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses__ads.htm 2006-09-23 16:31:33.000000000 -0400 31818 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses__ads.htm 200 7-12-21 00:02:35.000000000 -050033368 +++ ncurses-5.6/doc/html/ada/terminal_interface-curses__ads.htm 2008-06-18 06:49:44.000000000 -0400 31819 33369 @@ -3,7 +3,6 @@ 31820 33370 <BODY> … … 34641 36191 diff -Naur ncurses-5.6.orig/doc/html/man/captoinfo.1m.html ncurses-5.6/doc/html/man/captoinfo.1m.html 34642 36192 --- ncurses-5.6.orig/doc/html/man/captoinfo.1m.html 2006-12-16 17:51:21.000000000 -0500 34643 +++ ncurses-5.6/doc/html/man/captoinfo.1m.html 200 7-12-21 00:02:35.000000000 -050036193 +++ ncurses-5.6/doc/html/man/captoinfo.1m.html 2008-06-18 06:49:44.000000000 -0400 34644 36194 @@ -28,7 +28,7 @@ 34645 36195 * sale, use or other dealings in this Software without prior written * … … 34695 36245 diff -Naur ncurses-5.6.orig/doc/html/man/clear.1.html ncurses-5.6/doc/html/man/clear.1.html 34696 36246 --- ncurses-5.6.orig/doc/html/man/clear.1.html 2006-12-16 17:51:21.000000000 -0500 34697 +++ ncurses-5.6/doc/html/man/clear.1.html 200 7-12-21 00:02:35.000000000 -050036247 +++ ncurses-5.6/doc/html/man/clear.1.html 2008-06-18 06:49:44.000000000 -0400 34698 36248 @@ -27,7 +27,7 @@ 34699 36249 * sale, use or other dealings in this Software without prior written * … … 34716 36266 diff -Naur ncurses-5.6.orig/doc/html/man/curs_add_wch.3x.html ncurses-5.6/doc/html/man/curs_add_wch.3x.html 34717 36267 --- ncurses-5.6.orig/doc/html/man/curs_add_wch.3x.html 2006-12-16 17:51:22.000000000 -0500 34718 +++ ncurses-5.6/doc/html/man/curs_add_wch.3x.html 200 7-12-21 00:02:35.000000000 -050036268 +++ ncurses-5.6/doc/html/man/curs_add_wch.3x.html 2008-06-18 06:49:44.000000000 -0400 34719 36269 @@ -27,7 +27,7 @@ 34720 36270 * sale, use or other dealings in this Software without prior written * … … 34750 36300 diff -Naur ncurses-5.6.orig/doc/html/man/curs_addch.3x.html ncurses-5.6/doc/html/man/curs_addch.3x.html 34751 36301 --- ncurses-5.6.orig/doc/html/man/curs_addch.3x.html 2006-12-16 17:51:22.000000000 -0500 34752 +++ ncurses-5.6/doc/html/man/curs_addch.3x.html 200 7-12-21 00:02:35.000000000 -050036302 +++ ncurses-5.6/doc/html/man/curs_addch.3x.html 2008-06-18 06:49:44.000000000 -0400 34753 36303 @@ -28,7 +28,7 @@ 34754 36304 * sale, use or other dealings in this Software without prior written * … … 34771 36321 diff -Naur ncurses-5.6.orig/doc/html/man/curs_border.3x.html ncurses-5.6/doc/html/man/curs_border.3x.html 34772 36322 --- ncurses-5.6.orig/doc/html/man/curs_border.3x.html 2006-09-23 16:43:00.000000000 -0400 34773 +++ ncurses-5.6/doc/html/man/curs_border.3x.html 200 7-12-21 00:02:35.000000000 -050036323 +++ ncurses-5.6/doc/html/man/curs_border.3x.html 2008-06-18 06:49:44.000000000 -0400 34774 36324 @@ -1,7 +1,7 @@ 34775 36325 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> … … 34803 36353 diff -Naur ncurses-5.6.orig/doc/html/man/curs_extend.3x.html ncurses-5.6/doc/html/man/curs_extend.3x.html 34804 36354 --- ncurses-5.6.orig/doc/html/man/curs_extend.3x.html 2006-09-23 16:43:01.000000000 -0400 34805 +++ ncurses-5.6/doc/html/man/curs_extend.3x.html 200 7-12-21 00:02:35.000000000 -050036355 +++ ncurses-5.6/doc/html/man/curs_extend.3x.html 2008-06-18 06:49:44.000000000 -0400 34806 36356 @@ -28,7 +28,7 @@ 34807 36357 * authorization. * … … 34835 36385 diff -Naur ncurses-5.6.orig/doc/html/man/curs_getcchar.3x.html ncurses-5.6/doc/html/man/curs_getcchar.3x.html 34836 36386 --- ncurses-5.6.orig/doc/html/man/curs_getcchar.3x.html 2006-09-23 16:43:01.000000000 -0400 34837 +++ ncurses-5.6/doc/html/man/curs_getcchar.3x.html 200 7-12-21 00:02:35.000000000 -050036387 +++ ncurses-5.6/doc/html/man/curs_getcchar.3x.html 2008-06-18 06:49:44.000000000 -0400 34838 36388 @@ -27,7 +27,7 @@ 34839 36389 * sale, use or other dealings in this Software without prior written * … … 34858 36408 diff -Naur ncurses-5.6.orig/doc/html/man/curs_insstr.3x.html ncurses-5.6/doc/html/man/curs_insstr.3x.html 34859 36409 --- ncurses-5.6.orig/doc/html/man/curs_insstr.3x.html 2006-09-23 16:43:04.000000000 -0400 34860 +++ ncurses-5.6/doc/html/man/curs_insstr.3x.html 200 7-12-21 00:02:35.000000000 -050036410 +++ ncurses-5.6/doc/html/man/curs_insstr.3x.html 2008-06-18 06:49:44.000000000 -0400 34861 36411 @@ -27,7 +27,7 @@ 34862 36412 * sale, use or other dealings in this Software without prior written * … … 34879 36429 diff -Naur ncurses-5.6.orig/doc/html/man/curs_mouse.3x.html ncurses-5.6/doc/html/man/curs_mouse.3x.html 34880 36430 --- ncurses-5.6.orig/doc/html/man/curs_mouse.3x.html 2005-05-15 13:05:53.000000000 -0400 34881 +++ ncurses-5.6/doc/html/man/curs_mouse.3x.html 200 7-12-21 00:02:35.000000000 -050036431 +++ ncurses-5.6/doc/html/man/curs_mouse.3x.html 2008-06-18 06:49:44.000000000 -0400 34882 36432 @@ -2,7 +2,7 @@ 34883 36433 <!-- … … 35095 36645 diff -Naur ncurses-5.6.orig/doc/html/man/curs_printw.3x.html ncurses-5.6/doc/html/man/curs_printw.3x.html 35096 36646 --- ncurses-5.6.orig/doc/html/man/curs_printw.3x.html 2006-09-23 16:43:06.000000000 -0400 35097 +++ ncurses-5.6/doc/html/man/curs_printw.3x.html 200 7-12-21 00:02:35.000000000 -050036647 +++ ncurses-5.6/doc/html/man/curs_printw.3x.html 2008-06-18 06:49:44.000000000 -0400 35098 36648 @@ -27,7 +27,7 @@ 35099 36649 * sale, use or other dealings in this Software without prior written * … … 35131 36681 diff -Naur ncurses-5.6.orig/doc/html/man/curs_scanw.3x.html ncurses-5.6/doc/html/man/curs_scanw.3x.html 35132 36682 --- ncurses-5.6.orig/doc/html/man/curs_scanw.3x.html 2006-09-23 16:43:07.000000000 -0400 35133 +++ ncurses-5.6/doc/html/man/curs_scanw.3x.html 200 7-12-21 00:02:35.000000000 -050036683 +++ ncurses-5.6/doc/html/man/curs_scanw.3x.html 2008-06-18 06:49:44.000000000 -0400 35134 36684 @@ -27,7 +27,7 @@ 35135 36685 * sale, use or other dealings in this Software without prior written * … … 35161 36711 diff -Naur ncurses-5.6.orig/doc/html/man/curs_scr_dump.3x.html ncurses-5.6/doc/html/man/curs_scr_dump.3x.html 35162 36712 --- ncurses-5.6.orig/doc/html/man/curs_scr_dump.3x.html 2006-09-23 16:43:07.000000000 -0400 35163 +++ ncurses-5.6/doc/html/man/curs_scr_dump.3x.html 200 7-12-21 00:02:35.000000000 -050036713 +++ ncurses-5.6/doc/html/man/curs_scr_dump.3x.html 2008-06-18 06:49:44.000000000 -0400 35164 36714 @@ -27,7 +27,7 @@ 35165 36715 * sale, use or other dealings in this Software without prior written * … … 35182 36732 diff -Naur ncurses-5.6.orig/doc/html/man/curs_termcap.3x.html ncurses-5.6/doc/html/man/curs_termcap.3x.html 35183 36733 --- ncurses-5.6.orig/doc/html/man/curs_termcap.3x.html 2006-09-23 16:43:08.000000000 -0400 35184 +++ ncurses-5.6/doc/html/man/curs_termcap.3x.html 200 7-12-21 00:02:35.000000000 -050036734 +++ ncurses-5.6/doc/html/man/curs_termcap.3x.html 2008-06-18 06:49:44.000000000 -0400 35185 36735 @@ -27,7 +27,7 @@ 35186 36736 * sale, use or other dealings in this Software without prior written * … … 35203 36753 diff -Naur ncurses-5.6.orig/doc/html/man/curs_terminfo.3x.html ncurses-5.6/doc/html/man/curs_terminfo.3x.html 35204 36754 --- ncurses-5.6.orig/doc/html/man/curs_terminfo.3x.html 2006-12-16 17:51:32.000000000 -0500 35205 +++ ncurses-5.6/doc/html/man/curs_terminfo.3x.html 200 7-12-21 00:02:35.000000000 -050036755 +++ ncurses-5.6/doc/html/man/curs_terminfo.3x.html 2008-06-18 06:49:44.000000000 -0400 35206 36756 @@ -1,7 +1,7 @@ 35207 36757 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> … … 35242 36792 diff -Naur ncurses-5.6.orig/doc/html/man/curs_trace.3x.html ncurses-5.6/doc/html/man/curs_trace.3x.html 35243 36793 --- ncurses-5.6.orig/doc/html/man/curs_trace.3x.html 2005-05-15 13:05:56.000000000 -0400 35244 +++ ncurses-5.6/doc/html/man/curs_trace.3x.html 200 7-12-21 00:02:35.000000000 -050036794 +++ ncurses-5.6/doc/html/man/curs_trace.3x.html 2008-06-18 06:49:44.000000000 -0400 35245 36795 @@ -1,7 +1,7 @@ 35246 36796 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> … … 35272 36822 diff -Naur ncurses-5.6.orig/doc/html/man/curs_util.3x.html ncurses-5.6/doc/html/man/curs_util.3x.html 35273 36823 --- ncurses-5.6.orig/doc/html/man/curs_util.3x.html 2006-09-23 16:43:09.000000000 -0400 35274 +++ ncurses-5.6/doc/html/man/curs_util.3x.html 200 7-12-21 00:02:35.000000000 -050036824 +++ ncurses-5.6/doc/html/man/curs_util.3x.html 2008-06-18 06:49:44.000000000 -0400 35275 36825 @@ -1,7 +1,7 @@ 35276 36826 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> … … 35313 36863 diff -Naur ncurses-5.6.orig/doc/html/man/default_colors.3x.html ncurses-5.6/doc/html/man/default_colors.3x.html 35314 36864 --- ncurses-5.6.orig/doc/html/man/default_colors.3x.html 2006-09-23 16:43:09.000000000 -0400 35315 +++ ncurses-5.6/doc/html/man/default_colors.3x.html 200 7-12-21 00:02:35.000000000 -050036865 +++ ncurses-5.6/doc/html/man/default_colors.3x.html 2008-06-18 06:49:44.000000000 -0400 35316 36866 @@ -28,7 +28,7 @@ 35317 36867 * authorization. * … … 35334 36884 diff -Naur ncurses-5.6.orig/doc/html/man/form.3x.html ncurses-5.6/doc/html/man/form.3x.html 35335 36885 --- ncurses-5.6.orig/doc/html/man/form.3x.html 2006-12-16 17:51:33.000000000 -0500 35336 +++ ncurses-5.6/doc/html/man/form.3x.html 200 7-12-21 00:02:35.000000000 -050036886 +++ ncurses-5.6/doc/html/man/form.3x.html 2008-06-18 06:49:44.000000000 -0400 35337 36887 @@ -236,7 +236,7 @@ 35338 36888 … … 35346 36896 diff -Naur ncurses-5.6.orig/doc/html/man/form_field_new.3x.html ncurses-5.6/doc/html/man/form_field_new.3x.html 35347 36897 --- ncurses-5.6.orig/doc/html/man/form_field_new.3x.html 2006-12-16 17:51:35.000000000 -0500 35348 +++ ncurses-5.6/doc/html/man/form_field_new.3x.html 200 7-12-21 00:02:35.000000000 -050036898 +++ ncurses-5.6/doc/html/man/form_field_new.3x.html 2008-06-18 06:49:44.000000000 -0400 35349 36899 @@ -28,7 +28,7 @@ 35350 36900 * sale, use or other dealings in this Software without prior written * … … 35371 36921 diff -Naur ncurses-5.6.orig/doc/html/man/form_field_opts.3x.html ncurses-5.6/doc/html/man/form_field_opts.3x.html 35372 36922 --- ncurses-5.6.orig/doc/html/man/form_field_opts.3x.html 2006-12-16 17:51:36.000000000 -0500 35373 +++ ncurses-5.6/doc/html/man/form_field_opts.3x.html 200 7-12-21 00:02:35.000000000 -050036923 +++ ncurses-5.6/doc/html/man/form_field_opts.3x.html 2008-06-18 06:49:44.000000000 -0400 35374 36924 @@ -2,7 +2,7 @@ 35375 36925 <!-- … … 35407 36957 diff -Naur ncurses-5.6.orig/doc/html/man/form_field_validation.3x.html ncurses-5.6/doc/html/man/form_field_validation.3x.html 35408 36958 --- ncurses-5.6.orig/doc/html/man/form_field_validation.3x.html 2006-12-16 17:51:36.000000000 -0500 35409 +++ ncurses-5.6/doc/html/man/form_field_validation.3x.html 200 7-12-21 00:02:35.000000000 -050036959 +++ ncurses-5.6/doc/html/man/form_field_validation.3x.html 2008-06-18 06:49:44.000000000 -0400 35410 36960 @@ -27,7 +27,7 @@ 35411 36961 * sale, use or other dealings in this Software without prior written * … … 35446 36996 diff -Naur ncurses-5.6.orig/doc/html/man/form_hook.3x.html ncurses-5.6/doc/html/man/form_hook.3x.html 35447 36997 --- ncurses-5.6.orig/doc/html/man/form_hook.3x.html 2006-12-16 17:51:36.000000000 -0500 35448 +++ ncurses-5.6/doc/html/man/form_hook.3x.html 200 7-12-21 00:02:35.000000000 -050036998 +++ ncurses-5.6/doc/html/man/form_hook.3x.html 2008-06-18 06:49:44.000000000 -0400 35449 36999 @@ -2,7 +2,7 @@ 35450 37000 <!-- … … 35490 37040 diff -Naur ncurses-5.6.orig/doc/html/man/form_opts.3x.html ncurses-5.6/doc/html/man/form_opts.3x.html 35491 37041 --- ncurses-5.6.orig/doc/html/man/form_opts.3x.html 2006-12-16 17:51:37.000000000 -0500 35492 +++ ncurses-5.6/doc/html/man/form_opts.3x.html 200 7-12-21 00:02:35.000000000 -050037042 +++ ncurses-5.6/doc/html/man/form_opts.3x.html 2008-06-18 06:49:44.000000000 -0400 35493 37043 @@ -2,7 +2,7 @@ 35494 37044 <!-- … … 35526 37076 diff -Naur ncurses-5.6.orig/doc/html/man/index.html ncurses-5.6/doc/html/man/index.html 35527 37077 --- ncurses-5.6.orig/doc/html/man/index.html 2006-04-22 18:29:12.000000000 -0400 35528 +++ ncurses-5.6/doc/html/man/index.html 200 7-12-21 00:02:35.000000000 -050037078 +++ ncurses-5.6/doc/html/man/index.html 2008-06-18 06:49:44.000000000 -0400 35529 37079 @@ -1,6 +1,6 @@ 35530 37080 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN"> … … 35545 37095 diff -Naur ncurses-5.6.orig/doc/html/man/infocmp.1m.html ncurses-5.6/doc/html/man/infocmp.1m.html 35546 37096 --- ncurses-5.6.orig/doc/html/man/infocmp.1m.html 2006-12-16 17:51:38.000000000 -0500 35547 +++ ncurses-5.6/doc/html/man/infocmp.1m.html 200 7-12-21 00:02:35.000000000 -050037097 +++ ncurses-5.6/doc/html/man/infocmp.1m.html 2008-06-18 06:49:44.000000000 -0400 35548 37098 @@ -28,7 +28,7 @@ 35549 37099 * sale, use or other dealings in this Software without prior written * … … 35566 37116 diff -Naur ncurses-5.6.orig/doc/html/man/infotocap.1m.html ncurses-5.6/doc/html/man/infotocap.1m.html 35567 37117 --- ncurses-5.6.orig/doc/html/man/infotocap.1m.html 2006-12-16 17:51:38.000000000 -0500 35568 +++ ncurses-5.6/doc/html/man/infotocap.1m.html 200 7-12-21 00:02:35.000000000 -050037118 +++ ncurses-5.6/doc/html/man/infotocap.1m.html 2008-06-18 06:49:44.000000000 -0400 35569 37119 @@ -28,7 +28,7 @@ 35570 37120 * sale, use or other dealings in this Software without prior written * … … 35596 37146 diff -Naur ncurses-5.6.orig/doc/html/man/legacy_coding.3x.html ncurses-5.6/doc/html/man/legacy_coding.3x.html 35597 37147 --- ncurses-5.6.orig/doc/html/man/legacy_coding.3x.html 2006-09-23 16:43:15.000000000 -0400 35598 +++ ncurses-5.6/doc/html/man/legacy_coding.3x.html 200 7-12-21 00:02:35.000000000 -050037148 +++ ncurses-5.6/doc/html/man/legacy_coding.3x.html 2008-06-18 06:49:44.000000000 -0400 35599 37149 @@ -28,7 +28,7 @@ 35600 37150 * authorization. * … … 35653 37203 diff -Naur ncurses-5.6.orig/doc/html/man/menu.3x.html ncurses-5.6/doc/html/man/menu.3x.html 35654 37204 --- ncurses-5.6.orig/doc/html/man/menu.3x.html 2006-12-16 17:51:40.000000000 -0500 35655 +++ ncurses-5.6/doc/html/man/menu.3x.html 200 7-12-21 00:02:35.000000000 -050037205 +++ ncurses-5.6/doc/html/man/menu.3x.html 2008-06-18 06:49:44.000000000 -0400 35656 37206 @@ -226,7 +226,7 @@ 35657 37207 … … 35665 37215 diff -Naur ncurses-5.6.orig/doc/html/man/menu_hook.3x.html ncurses-5.6/doc/html/man/menu_hook.3x.html 35666 37216 --- ncurses-5.6.orig/doc/html/man/menu_hook.3x.html 2006-12-16 17:51:41.000000000 -0500 35667 +++ ncurses-5.6/doc/html/man/menu_hook.3x.html 200 7-12-21 00:02:35.000000000 -050037217 +++ ncurses-5.6/doc/html/man/menu_hook.3x.html 2008-06-18 06:49:44.000000000 -0400 35668 37218 @@ -2,7 +2,7 @@ 35669 37219 <!-- … … 35709 37259 diff -Naur ncurses-5.6.orig/doc/html/man/menu_opts.3x.html ncurses-5.6/doc/html/man/menu_opts.3x.html 35710 37260 --- ncurses-5.6.orig/doc/html/man/menu_opts.3x.html 2006-12-16 17:51:42.000000000 -0500 35711 +++ ncurses-5.6/doc/html/man/menu_opts.3x.html 200 7-12-21 00:02:35.000000000 -050037261 +++ ncurses-5.6/doc/html/man/menu_opts.3x.html 2008-06-18 06:49:44.000000000 -0400 35712 37262 @@ -2,7 +2,7 @@ 35713 37263 <!-- … … 35745 37295 diff -Naur ncurses-5.6.orig/doc/html/man/mitem_opts.3x.html ncurses-5.6/doc/html/man/mitem_opts.3x.html 35746 37296 --- ncurses-5.6.orig/doc/html/man/mitem_opts.3x.html 2006-12-16 17:51:44.000000000 -0500 35747 +++ ncurses-5.6/doc/html/man/mitem_opts.3x.html 200 7-12-21 00:02:35.000000000 -050037297 +++ ncurses-5.6/doc/html/man/mitem_opts.3x.html 2008-06-18 06:49:44.000000000 -0400 35748 37298 @@ -2,7 +2,7 @@ 35749 37299 <!-- … … 35781 37331 diff -Naur ncurses-5.6.orig/doc/html/man/ncurses.3x.html ncurses-5.6/doc/html/man/ncurses.3x.html 35782 37332 --- ncurses-5.6.orig/doc/html/man/ncurses.3x.html 2006-12-16 17:51:45.000000000 -0500 35783 +++ ncurses-5.6/doc/html/man/ncurses.3x.html 200 7-12-21 00:02:35.000000000 -050037333 +++ ncurses-5.6/doc/html/man/ncurses.3x.html 2008-06-18 06:49:44.000000000 -0400 35784 37334 @@ -28,7 +28,7 @@ 35785 37335 * sale, use or other dealings in this Software without prior written * … … 35815 37365 diff -Naur ncurses-5.6.orig/doc/html/man/panel.3x.html ncurses-5.6/doc/html/man/panel.3x.html 35816 37366 --- ncurses-5.6.orig/doc/html/man/panel.3x.html 2006-12-16 17:51:45.000000000 -0500 35817 +++ ncurses-5.6/doc/html/man/panel.3x.html 200 7-12-21 00:02:35.000000000 -050037367 +++ ncurses-5.6/doc/html/man/panel.3x.html 2008-06-18 06:49:44.000000000 -0400 35818 37368 @@ -213,7 +213,7 @@ 35819 37369 <H2>SEE ALSO</H2><PRE> … … 35827 37377 diff -Naur ncurses-5.6.orig/doc/html/man/term.5.html ncurses-5.6/doc/html/man/term.5.html 35828 37378 --- ncurses-5.6.orig/doc/html/man/term.5.html 2006-12-16 17:51:45.000000000 -0500 35829 +++ ncurses-5.6/doc/html/man/term.5.html 200 7-12-21 00:02:35.000000000 -050037379 +++ ncurses-5.6/doc/html/man/term.5.html 2008-06-18 06:49:44.000000000 -0400 35830 37380 @@ -27,20 +27,20 @@ 35831 37381 * sale, use or other dealings in this Software without prior written * … … 35873 37423 diff -Naur ncurses-5.6.orig/doc/html/man/term.7.html ncurses-5.6/doc/html/man/term.7.html 35874 37424 --- ncurses-5.6.orig/doc/html/man/term.7.html 2006-09-23 16:43:22.000000000 -0400 35875 +++ ncurses-5.6/doc/html/man/term.7.html 200 7-12-21 00:02:35.000000000 -050037425 +++ ncurses-5.6/doc/html/man/term.7.html 2008-06-18 06:49:44.000000000 -0400 35876 37426 @@ -27,20 +27,20 @@ 35877 37427 * sale, use or other dealings in this Software without prior written * … … 35919 37469 diff -Naur ncurses-5.6.orig/doc/html/man/terminfo.5.html ncurses-5.6/doc/html/man/terminfo.5.html 35920 37470 --- ncurses-5.6.orig/doc/html/man/terminfo.5.html 2006-12-16 17:51:46.000000000 -0500 35921 +++ ncurses-5.6/doc/html/man/terminfo.5.html 200 7-12-21 00:02:35.000000000 -050037471 +++ ncurses-5.6/doc/html/man/terminfo.5.html 2008-06-18 06:49:44.000000000 -0400 35922 37472 @@ -32,9 +32,9 @@ 35923 37473 * sale, use or other dealings in this Software without prior written * … … 36016 37566 diff -Naur ncurses-5.6.orig/doc/html/man/tic.1m.html ncurses-5.6/doc/html/man/tic.1m.html 36017 37567 --- ncurses-5.6.orig/doc/html/man/tic.1m.html 2006-12-16 17:51:46.000000000 -0500 36018 +++ ncurses-5.6/doc/html/man/tic.1m.html 200 7-12-21 00:02:35.000000000 -050037568 +++ ncurses-5.6/doc/html/man/tic.1m.html 2008-06-18 06:49:44.000000000 -0400 36019 37569 @@ -27,7 +27,7 @@ 36020 37570 * sale, use or other dealings in this Software without prior written * … … 36037 37587 diff -Naur ncurses-5.6.orig/doc/html/man/toe.1m.html ncurses-5.6/doc/html/man/toe.1m.html 36038 37588 --- ncurses-5.6.orig/doc/html/man/toe.1m.html 2006-12-16 17:51:47.000000000 -0500 36039 +++ ncurses-5.6/doc/html/man/toe.1m.html 200 7-12-21 00:02:35.000000000 -050037589 +++ ncurses-5.6/doc/html/man/toe.1m.html 2008-06-18 06:49:44.000000000 -0400 36040 37590 @@ -27,7 +27,7 @@ 36041 37591 * sale, use or other dealings in this Software without prior written * … … 36067 37617 diff -Naur ncurses-5.6.orig/doc/html/man/tput.1.html ncurses-5.6/doc/html/man/tput.1.html 36068 37618 --- ncurses-5.6.orig/doc/html/man/tput.1.html 2006-12-16 17:51:47.000000000 -0500 36069 +++ ncurses-5.6/doc/html/man/tput.1.html 200 7-12-21 00:02:35.000000000 -050037619 +++ ncurses-5.6/doc/html/man/tput.1.html 2008-06-18 06:49:44.000000000 -0400 36070 37620 @@ -28,7 +28,7 @@ 36071 37621 * sale, use or other dealings in this Software without prior written * … … 36106 37656 diff -Naur ncurses-5.6.orig/doc/html/man/tset.1.html ncurses-5.6/doc/html/man/tset.1.html 36107 37657 --- ncurses-5.6.orig/doc/html/man/tset.1.html 2006-12-16 17:51:47.000000000 -0500 36108 +++ ncurses-5.6/doc/html/man/tset.1.html 200 7-12-21 00:02:35.000000000 -050037658 +++ ncurses-5.6/doc/html/man/tset.1.html 2008-06-18 06:49:44.000000000 -0400 36109 37659 @@ -27,7 +27,7 @@ 36110 37660 * sale, use or other dealings in this Software without prior written * … … 36131 37681 diff -Naur ncurses-5.6.orig/doc/html/ncurses-intro.html ncurses-5.6/doc/html/ncurses-intro.html 36132 37682 --- ncurses-5.6.orig/doc/html/ncurses-intro.html 2005-12-24 10:47:05.000000000 -0500 36133 +++ ncurses-5.6/doc/html/ncurses-intro.html 200 7-12-21 00:02:35.000000000 -050037683 +++ ncurses-5.6/doc/html/ncurses-intro.html 2008-06-18 06:49:44.000000000 -0400 36134 37684 @@ -1,8 +1,8 @@ 36135 37685 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN"> … … 36207 37757 diff -Naur ncurses-5.6.orig/doc/ncurses-intro.doc ncurses-5.6/doc/ncurses-intro.doc 36208 37758 --- ncurses-5.6.orig/doc/ncurses-intro.doc 2005-12-24 10:48:44.000000000 -0500 36209 +++ ncurses-5.6/doc/ncurses-intro.doc 200 7-12-21 00:02:35.000000000 -050037759 +++ ncurses-5.6/doc/ncurses-intro.doc 2008-06-18 06:49:44.000000000 -0400 36210 37760 @@ -174,7 +174,7 @@ 36211 37761 The ncurses package was originated by Pavel Curtis. The original … … 36271 37821 diff -Naur ncurses-5.6.orig/form/Makefile.in ncurses-5.6/form/Makefile.in 36272 37822 --- ncurses-5.6.orig/form/Makefile.in 2006-10-14 16:40:36.000000000 -0400 36273 +++ ncurses-5.6/form/Makefile.in 200 7-12-21 00:02:35.000000000 -050037823 +++ ncurses-5.6/form/Makefile.in 2008-06-18 06:49:44.000000000 -0400 36274 37824 @@ -1,6 +1,6 @@ 36275 37825 -# $Id: Makefile.in,v 1.42 2006/10/14 20:40:36 tom Exp $ … … 36319 37869 diff -Naur ncurses-5.6.orig/form/fld_def.c ncurses-5.6/form/fld_def.c 36320 37870 --- ncurses-5.6.orig/form/fld_def.c 2005-04-16 13:31:17.000000000 -0400 36321 +++ ncurses-5.6/form/fld_def.c 200 7-12-21 00:02:35.000000000 -050037871 +++ ncurses-5.6/form/fld_def.c 2008-06-18 06:49:44.000000000 -0400 36322 37872 @@ -1,5 +1,5 @@ 36323 37873 /**************************************************************************** … … 36376 37926 diff -Naur ncurses-5.6.orig/form/fld_dup.c ncurses-5.6/form/fld_dup.c 36377 37927 --- ncurses-5.6.orig/form/fld_dup.c 2004-12-25 17:24:10.000000000 -0500 36378 +++ ncurses-5.6/form/fld_dup.c 200 7-12-21 00:02:35.000000000 -050037928 +++ ncurses-5.6/form/fld_dup.c 2008-06-18 06:49:44.000000000 -0400 36379 37929 @@ -1,5 +1,5 @@ 36380 37930 /**************************************************************************** … … 36406 37956 diff -Naur ncurses-5.6.orig/form/fld_ftlink.c ncurses-5.6/form/fld_ftlink.c 36407 37957 --- ncurses-5.6.orig/form/fld_ftlink.c 2004-12-25 17:24:10.000000000 -0500 36408 +++ ncurses-5.6/form/fld_ftlink.c 200 7-12-21 00:02:35.000000000 -050037958 +++ ncurses-5.6/form/fld_ftlink.c 2008-06-18 06:49:44.000000000 -0400 36409 37959 @@ -1,5 +1,5 @@ 36410 37960 /**************************************************************************** … … 36438 37988 diff -Naur ncurses-5.6.orig/form/fld_link.c ncurses-5.6/form/fld_link.c 36439 37989 --- ncurses-5.6.orig/form/fld_link.c 2004-12-25 17:24:10.000000000 -0500 36440 +++ ncurses-5.6/form/fld_link.c 200 7-12-21 00:02:36.000000000 -050037990 +++ ncurses-5.6/form/fld_link.c 2008-06-18 06:49:44.000000000 -0400 36441 37991 @@ -1,5 +1,5 @@ 36442 37992 /**************************************************************************** … … 36468 38018 diff -Naur ncurses-5.6.orig/form/fld_newftyp.c ncurses-5.6/form/fld_newftyp.c 36469 38019 --- ncurses-5.6.orig/form/fld_newftyp.c 2004-12-25 17:24:10.000000000 -0500 36470 +++ ncurses-5.6/form/fld_newftyp.c 200 7-12-21 00:02:36.000000000 -050038020 +++ ncurses-5.6/form/fld_newftyp.c 2008-06-18 06:49:44.000000000 -0400 36471 38021 @@ -1,5 +1,5 @@ 36472 38022 /**************************************************************************** … … 36500 38050 diff -Naur ncurses-5.6.orig/form/frm_def.c ncurses-5.6/form/frm_def.c 36501 38051 --- ncurses-5.6.orig/form/frm_def.c 2006-11-04 11:57:15.000000000 -0500 36502 +++ ncurses-5.6/form/frm_def.c 200 7-12-21 00:02:36.000000000 -050038052 +++ ncurses-5.6/form/frm_def.c 2008-06-18 06:49:44.000000000 -0400 36503 38053 @@ -1,5 +1,5 @@ 36504 38054 /**************************************************************************** … … 36544 38094 diff -Naur ncurses-5.6.orig/form/frm_driver.c ncurses-5.6/form/frm_driver.c 36545 38095 --- ncurses-5.6.orig/form/frm_driver.c 2006-11-04 13:45:35.000000000 -0500 36546 +++ ncurses-5.6/form/frm_driver.c 200 7-12-21 00:02:36.000000000 -050038096 +++ ncurses-5.6/form/frm_driver.c 2008-06-18 06:49:46.000000000 -0400 36547 38097 @@ -1,5 +1,5 @@ 36548 38098 /**************************************************************************** 36549 38099 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 36550 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *38100 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 36551 38101 * * 36552 38102 * Permission is hereby granted, free of charge, to any person obtaining a * … … 36557 38107 36558 38108 -MODULE_ID("$Id: frm_driver.c,v 1.76 2006/11/04 18:45:35 tom Exp $") 36559 +MODULE_ID("$Id: frm_driver.c,v 1.8 5 2007/11/24 21:32:53 tom Exp $")38109 +MODULE_ID("$Id: frm_driver.c,v 1.86 2008/01/19 20:11:03 tom Exp $") 36560 38110 36561 38111 /*---------------------------------------------------------------------------- … … 36589 38139 for (i = 0; i <= field->nbuf; i++) 36590 38140 { 38141 @@ -663,7 +676,7 @@ 38142 new_bp[new_buflen] = myZEROS; 38143 } 38144 38145 -#if USE_WIDEC_SUPPORT 38146 +#if USE_WIDEC_SUPPORT && NCURSES_EXT_FUNCS 38147 if (wresize(field->working, 1, Buffer_Length(field) + 1) == ERR) 38148 result = FALSE; 38149 #endif 36591 38150 @@ -724,6 +737,34 @@ 36592 38151 return (result); … … 36740 38299 diff -Naur ncurses-5.6.orig/form/fty_alnum.c ncurses-5.6/form/fty_alnum.c 36741 38300 --- ncurses-5.6.orig/form/fty_alnum.c 2006-04-22 17:33:05.000000000 -0400 36742 +++ ncurses-5.6/form/fty_alnum.c 200 7-12-21 00:02:36.000000000 -050038301 +++ ncurses-5.6/form/fty_alnum.c 2008-06-18 06:49:44.000000000 -0400 36743 38302 @@ -1,5 +1,5 @@ 36744 38303 /**************************************************************************** … … 36791 38350 diff -Naur ncurses-5.6.orig/form/fty_alpha.c ncurses-5.6/form/fty_alpha.c 36792 38351 --- ncurses-5.6.orig/form/fty_alpha.c 2006-04-22 17:33:05.000000000 -0400 36793 +++ ncurses-5.6/form/fty_alpha.c 200 7-12-21 00:02:36.000000000 -050038352 +++ ncurses-5.6/form/fty_alpha.c 2008-06-18 06:49:44.000000000 -0400 36794 38353 @@ -1,5 +1,5 @@ 36795 38354 /**************************************************************************** … … 36842 38401 diff -Naur ncurses-5.6.orig/form/fty_enum.c ncurses-5.6/form/fty_enum.c 36843 38402 --- ncurses-5.6.orig/form/fty_enum.c 2006-04-22 17:33:05.000000000 -0400 36844 +++ ncurses-5.6/form/fty_enum.c 200 7-12-21 00:02:36.000000000 -050038403 +++ ncurses-5.6/form/fty_enum.c 2008-06-18 06:49:44.000000000 -0400 36845 38404 @@ -1,5 +1,5 @@ 36846 38405 /**************************************************************************** … … 36894 38453 diff -Naur ncurses-5.6.orig/form/fty_int.c ncurses-5.6/form/fty_int.c 36895 38454 --- ncurses-5.6.orig/form/fty_int.c 2006-04-22 17:33:05.000000000 -0400 36896 +++ ncurses-5.6/form/fty_int.c 200 7-12-21 00:02:36.000000000 -050038455 +++ ncurses-5.6/form/fty_int.c 2008-06-18 06:49:44.000000000 -0400 36897 38456 @@ -1,5 +1,5 @@ 36898 38457 /**************************************************************************** … … 36941 38500 diff -Naur ncurses-5.6.orig/form/fty_num.c ncurses-5.6/form/fty_num.c 36942 38501 --- ncurses-5.6.orig/form/fty_num.c 2006-04-22 17:33:05.000000000 -0400 36943 +++ ncurses-5.6/form/fty_num.c 200 7-12-21 00:02:36.000000000 -050038502 +++ ncurses-5.6/form/fty_num.c 2008-06-18 06:49:44.000000000 -0400 36944 38503 @@ -1,5 +1,5 @@ 36945 38504 /**************************************************************************** … … 36988 38547 diff -Naur ncurses-5.6.orig/form/fty_regex.c ncurses-5.6/form/fty_regex.c 36989 38548 --- ncurses-5.6.orig/form/fty_regex.c 2006-04-22 17:33:05.000000000 -0400 36990 +++ ncurses-5.6/form/fty_regex.c 200 7-12-21 00:02:36.000000000 -050038549 +++ ncurses-5.6/form/fty_regex.c 2008-06-18 06:49:44.000000000 -0400 36991 38550 @@ -1,5 +1,5 @@ 36992 38551 /**************************************************************************** … … 37053 38612 diff -Naur ncurses-5.6.orig/form/headers ncurses-5.6/form/headers 37054 38613 --- ncurses-5.6.orig/form/headers 1998-02-11 07:13:43.000000000 -0500 37055 +++ ncurses-5.6/form/headers 200 7-12-21 00:02:36.000000000 -050038614 +++ ncurses-5.6/form/headers 2008-06-18 06:49:44.000000000 -0400 37056 38615 @@ -1,5 +1,5 @@ 37057 38616 ############################################################################## … … 37068 38627 diff -Naur ncurses-5.6.orig/form/modules ncurses-5.6/form/modules 37069 38628 --- ncurses-5.6.orig/form/modules 2004-12-25 18:29:22.000000000 -0500 37070 +++ ncurses-5.6/form/modules 200 7-12-21 00:02:36.000000000 -050038629 +++ ncurses-5.6/form/modules 2008-06-18 06:49:44.000000000 -0400 37071 38630 @@ -1,6 +1,6 @@ 37072 38631 -# $Id: modules,v 1.14 2004/12/25 23:29:22 tom Exp $ … … 37095 38654 diff -Naur ncurses-5.6.orig/include/MKterm.h.awk.in ncurses-5.6/include/MKterm.h.awk.in 37096 38655 --- ncurses-5.6.orig/include/MKterm.h.awk.in 2006-11-25 20:18:23.000000000 -0500 37097 +++ ncurses-5.6/include/MKterm.h.awk.in 200 7-12-21 00:02:36.000000000 -050038656 +++ ncurses-5.6/include/MKterm.h.awk.in 2008-06-18 06:49:51.000000000 -0400 37098 38657 @@ -1,6 +1,7 @@ 37099 38658 +# vile:awkmode … … 37101 38660 print "/****************************************************************************" 37102 38661 - print " * Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. *" 37103 + print " * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *"38662 + print " * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *" 37104 38663 print " * *" 37105 38664 print " * Permission is hereby granted, free of charge, to any person obtaining a *" … … 37110 38669 print "" 37111 38670 - print "/* $Id: MKterm.h.awk.in,v 1.47 2006/11/26 01:18:23 tom Exp $ */" 37112 + print "/* $Id: MKterm.h.awk.in,v 1. 49 2007/08/18 11:44:26tom Exp $ */"38671 + print "/* $Id: MKterm.h.awk.in,v 1.50 2008/05/24 23:13:59 tom Exp $ */" 37113 38672 print "" 37114 38673 print "/*" 37115 38674 print "** term.h -- Definition of struct term" 37116 @@ -229,26 +230,26 @@ 38675 @@ -227,31 +228,33 @@ 38676 print " char * _termname; /* used for termname() */" 38677 print "} TERMINAL;" 37117 38678 print "" 37118 37119 38679 - print "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;" 38680 - print "" 37120 38681 - print "#if BROKEN_LINKER" 37121 38682 - print "#define boolnames _nc_boolnames()" … … 37139 38700 - print "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strfnames (void);" 37140 38701 + print "#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@" 38702 + print "NCURSES_WRAPPED_VAR(TERMINAL *, cur_term);" 37141 38703 + print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolnames);" 37142 38704 + print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolcodes);" … … 37149 38711 + print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strfnames);" 37150 38712 + print "" 38713 + print "#define cur_term NCURSES_PUBLIC_VAR(cur_term())" 37151 38714 + print "#define boolnames NCURSES_PUBLIC_VAR(boolnames())" 37152 38715 + print "#define boolcodes NCURSES_PUBLIC_VAR(boolcodes())" … … 37161 38724 print "#else" 37162 38725 print "" 37163 @@ -291,10 +292,10 @@ 38726 + print "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;" 38727 + print "" 38728 print "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolnames[];" 38729 print "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[];" 38730 print "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolfnames[];" 38731 @@ -291,10 +294,10 @@ 37164 38732 print "extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *);" 37165 38733 print "" … … 37177 38745 diff -Naur ncurses-5.6.orig/include/curses.h.in ncurses-5.6/include/curses.h.in 37178 38746 --- ncurses-5.6.orig/include/curses.h.in 2006-11-25 20:14:54.000000000 -0500 37179 +++ ncurses-5.6/include/curses.h.in 200 7-12-21 00:02:36.000000000 -050038747 +++ ncurses-5.6/include/curses.h.in 2008-06-18 06:49:49.000000000 -0400 37180 38748 @@ -1,5 +1,5 @@ 37181 38749 /**************************************************************************** 37182 38750 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 37183 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *38751 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 37184 38752 * * 37185 38753 * Permission is hereby granted, free of charge, to any person obtaining a * … … 37190 38758 37191 38759 -/* $Id: curses.h.in,v 1.167 2006/11/26 01:14:54 tom Exp $ */ 37192 +/* $Id: curses.h.in,v 1.18 1 2007/11/18 00:32:03tom Exp $ */38760 +/* $Id: curses.h.in,v 1.186 2008/04/05 15:30:28 tom Exp $ */ 37193 38761 37194 38762 #ifndef __NCURSES_H … … 37352 38920 extern NCURSES_EXPORT(int) getcury (const WINDOW *); /* generated */ 37353 38921 extern NCURSES_EXPORT(int) getbegx (const WINDOW *); /* generated */ 37354 @@ -846,12 +818, 58@@38922 @@ -846,12 +818,60 @@ 37355 38923 extern NCURSES_EXPORT(int) getpary (const WINDOW *); /* generated */ 37356 38924 … … 37366 38934 + * These functions are extensions - not in X/Open Curses. 37367 38935 + */ 37368 +#undef NCURSES_EXT_FUNCS37369 38936 +#if @NCURSES_EXT_FUNCS@ 37370 38937 +#undef NCURSES_EXT_FUNCS 37371 38938 +#define NCURSES_EXT_FUNCS @NCURSES_PATCH@ 37372 +typedef int (*NCURSES_CALLBACK)(WINDOW *, void *); 38939 +typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *); 38940 +typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *); 37373 38941 +extern NCURSES_EXPORT(bool) is_term_resized (int, int); 37374 38942 +extern NCURSES_EXPORT(char *) keybound (int, int); … … 37380 38948 +extern NCURSES_EXPORT(int) resize_term (int, int); 37381 38949 +extern NCURSES_EXPORT(int) resizeterm (int, int); 38950 +extern NCURSES_EXPORT(int) set_escdelay (int); 38951 +extern NCURSES_EXPORT(int) set_tabsize (int); 37382 38952 +extern NCURSES_EXPORT(int) use_default_colors (void); 37383 38953 +extern NCURSES_EXPORT(int) use_extended_names (bool); 37384 38954 +extern NCURSES_EXPORT(int) use_legacy_coding (int); 37385 +extern NCURSES_EXPORT(int) use_screen (SCREEN *, NCURSES_ CALLBACK, void *);37386 +extern NCURSES_EXPORT(int) use_window (WINDOW *, NCURSES_ CALLBACK, void *);38955 +extern NCURSES_EXPORT(int) use_screen (SCREEN *, NCURSES_SCREEN_CB, void *); 38956 +extern NCURSES_EXPORT(int) use_window (WINDOW *, NCURSES_WINDOW_CB, void *); 37387 38957 +extern NCURSES_EXPORT(int) wresize (WINDOW *, int, int); 37388 38958 +extern NCURSES_EXPORT(void) nofilter(void); … … 37412 38982 37413 38983 #define NCURSES_ATTR_SHIFT 8 37414 @@ -892,11 +91 0,18@@38984 @@ -892,11 +912,22 @@ 37415 38985 #define getmaxyx(win,y,x) (y = getmaxy(win), x = getmaxx(win)) 37416 38986 #define getparyx(win,y,x) (y = getpary(win), x = getparx(win)) … … 37418 38988 -#define getsyx(y,x) do { if(newscr->_leaveok) (y)=(x)=-1; \ 37419 38989 - else getyx(newscr,(y),(x)); \ 37420 +#define getsyx(y,x) do { if (is_leaveok(newscr)) \ 37421 + (y) = (x) = -1; \ 37422 + else \ 37423 + getyx(newscr,(y), (x)); \ 38990 +#define getsyx(y,x) do { if (newscr) { \ 38991 + if (is_leaveok(newscr)) \ 38992 + (y) = (x) = -1; \ 38993 + else \ 38994 + getyx(newscr,(y), (x)); \ 38995 + } \ 37424 38996 } while(0) 37425 38997 -#define setsyx(y,x) do { if((y)==-1 && (x)==-1) newscr->_leaveok=TRUE; \ 37426 38998 - else {newscr->_leaveok=FALSE;wmove(newscr,(y),(x));} \ 37427 38999 + 37428 +#define setsyx(y,x) do { if ((y) == -1 && (x) == -1) \ 37429 + leaveok(newscr, TRUE); \ 37430 + else { \ 37431 + leaveok(newscr, FALSE); \ 37432 + wmove(newscr, (y), (x)); \ 39000 +#define setsyx(y,x) do { if (newscr) { \ 39001 + if ((y) == -1 && (x) == -1) \ 39002 + leaveok(newscr, TRUE); \ 39003 + else { \ 39004 + leaveok(newscr, FALSE); \ 39005 + wmove(newscr, (y), (x)); \ 39006 + } \ 37433 39007 + } \ 37434 39008 } while(0) 37435 39009 37436 39010 #ifndef NCURSES_NOMACROS 37437 @@ -918,15 +94 3,17 @@39011 @@ -918,15 +949,17 @@ 37438 39012 #define gettmode() 37439 39013 … … 37462 39036 #define wstandout(win) (wattrset(win,A_STANDOUT)) 37463 39037 #define wstandend(win) (wattrset(win,A_NORMAL)) 37464 @@ -934,12 +96 1,14 @@39038 @@ -934,12 +967,14 @@ 37465 39039 #define wattron(win,at) wattr_on(win, NCURSES_CAST(attr_t, at), NULL) 37466 39040 #define wattroff(win,at) wattr_off(win, NCURSES_CAST(attr_t, at), NULL) … … 37477 39051 #define scroll(win) wscrl(win,1) 37478 39052 37479 @@ -956,7 +9 85,10 @@39053 @@ -956,7 +991,10 @@ 37480 39054 #define winchstr(w, s) winchnstr(w, s, -1) 37481 39055 #define winsstr(w, s) winsnstr(w, s, -1) … … 37488 39062 #define waddchstr(win,str) waddchnstr(win,str,-1) 37489 39063 37490 @@ -1064, 11 +1096,14@@39064 @@ -1064,27 +1102,31 @@ 37491 39065 /* 37492 39066 * Some wide-character functions can be implemented without the extensions. … … 37503 39077 #define wattr_set(win,a,p,opts) ((win)->_attrs = ((a) & ~A_COLOR), \ 37504 39078 (win)->_color = (p), \ 37505 @@ -1082,9 +1117,10 @@ 37506 (void)((p) != 0 && (*(p) = PAIR_NUMBER((win)->_attrs))), \ 39079 OK) 39080 -#define wattr_get(win,a,p,opts) ((void)((a) != 0 && (*(a) = (win)->_attrs)), \ 39081 - (void)((p) != 0 && (*(p) = (win)->_color)), \ 39082 +#define wattr_get(win,a,p,opts) ((void)((a) != (void *)0 && (*(a) = (win)->_attrs)), \ 39083 + (void)((p) != (void *)0 && (*(p) = (win)->_color)), \ 39084 OK) 39085 #else 39086 #define wattr_set(win,a,p,opts) ((win)->_attrs = (((a) & ~A_COLOR) | COLOR_PAIR(p)), OK) 39087 -#define wattr_get(win,a,p,opts) ((void)((a) != 0 && (*(a) = (win)->_attrs)), \ 39088 - (void)((p) != 0 && (*(p) = PAIR_NUMBER((win)->_attrs))), \ 39089 +#define wattr_get(win,a,p,opts) ((void)((a) != (void *)0 && (*(a) = (win)->_attrs)), \ 39090 + (void)((p) != (void *)0 && (*(p) = PAIR_NUMBER((win)->_attrs))), \ 37507 39091 OK) 37508 39092 #endif … … 37515 39099 * use POSIX stdarg.h. The ncurses versions of vwprintw/vwscanw already 37516 39100 * use stdarg.h, so... 37517 @@ -1100,9 +11 36,76 @@39101 @@ -1100,9 +1142,76 @@ 37518 39102 NCURSES_EXPORT(int) vsscanf(const char *, const char *, va_list); 37519 39103 #endif … … 37594 39178 diff -Naur ncurses-5.6.orig/include/curses.tail ncurses-5.6/include/curses.tail 37595 39179 --- ncurses-5.6.orig/include/curses.tail 2006-05-27 12:28:29.000000000 -0400 37596 +++ ncurses-5.6/include/curses.tail 200 7-12-21 00:02:36.000000000 -050039180 +++ ncurses-5.6/include/curses.tail 2008-06-18 06:49:44.000000000 -0400 37597 39181 @@ -1,8 +1,9 @@ 37598 39182 +/* $Id: curses.tail,v 1.15 2007/03/10 17:51:24 tom Exp $ */ … … 37608 39192 diff -Naur ncurses-5.6.orig/include/curses.wide ncurses-5.6/include/curses.wide 37609 39193 --- ncurses-5.6.orig/include/curses.wide 2006-05-27 15:44:23.000000000 -0400 37610 +++ ncurses-5.6/include/curses.wide 200 7-12-21 00:02:36.000000000 -050039194 +++ ncurses-5.6/include/curses.wide 2008-06-18 06:49:44.000000000 -0400 37611 39195 @@ -1,11 +1,11 @@ 37612 39196 +/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */ … … 37640 39224 diff -Naur ncurses-5.6.orig/include/headers ncurses-5.6/include/headers 37641 39225 --- ncurses-5.6.orig/include/headers 2001-04-07 16:52:04.000000000 -0400 37642 +++ ncurses-5.6/include/headers 200 7-12-21 00:02:36.000000000 -050039226 +++ ncurses-5.6/include/headers 2008-06-18 06:49:44.000000000 -0400 37643 39227 @@ -1,5 +1,6 @@ 37644 39228 +# $Id: headers,v 1.9 2007/01/20 19:57:04 Miroslav.Lichvar Exp $ … … 37669 39253 diff -Naur ncurses-5.6.orig/include/nc_alloc.h ncurses-5.6/include/nc_alloc.h 37670 39254 --- ncurses-5.6.orig/include/nc_alloc.h 2005-01-15 19:27:35.000000000 -0500 37671 +++ ncurses-5.6/include/nc_alloc.h 200 7-12-21 00:02:36.000000000 -050039255 +++ ncurses-5.6/include/nc_alloc.h 2008-06-18 06:49:44.000000000 -0400 37672 39256 @@ -1,5 +1,5 @@ 37673 39257 /**************************************************************************** … … 37710 39294 diff -Naur ncurses-5.6.orig/include/ncurses_defs ncurses-5.6/include/ncurses_defs 37711 39295 --- ncurses-5.6.orig/include/ncurses_defs 2006-08-05 15:27:02.000000000 -0400 37712 +++ ncurses-5.6/include/ncurses_defs 200 7-12-21 00:02:36.000000000 -050039296 +++ ncurses-5.6/include/ncurses_defs 2008-06-18 06:49:47.000000000 -0400 37713 39297 @@ -1,6 +1,6 @@ 37714 39298 -# $Id: ncurses_defs,v 1.30 2006/08/05 19:27:02 tom Exp $ 37715 +# $Id: ncurses_defs,v 1.3 5 2007/10/06 21:18:16tom Exp $39299 +# $Id: ncurses_defs,v 1.38 2008/02/10 00:12:03 tom Exp $ 37716 39300 ############################################################################## 37717 39301 -# Copyright (c) 2000-2005,2006 Free Software Foundation, Inc. # 37718 +# Copyright (c) 2000-200 6,2007Free Software Foundation, Inc. #39302 +# Copyright (c) 2000-2007,2008 Free Software Foundation, Inc. # 37719 39303 # # 37720 39304 # Permission is hereby granted, free of charge, to any person obtaining a # … … 37731 39315 CURSES_WACS_ARRAY _nc_wacs 37732 39316 DECL_ERRNO 37733 @@ -68,6 +66,7 @@ 39317 @@ -48,6 +46,8 @@ 39318 HAVE_BSD_SIGNAL_H 39319 HAVE_BTOWC 39320 HAVE_BUILTIN_H 39321 +HAVE_CHGAT 1 39322 +HAVE_COLOR_SET 1 39323 HAVE_DIRENT_H 39324 HAVE_ERRNO 39325 HAVE_FCNTL_H 39326 @@ -60,6 +60,7 @@ 39327 HAVE_GETEUID 39328 HAVE_GETMAXX 1 39329 HAVE_GETNSTR 39330 +HAVE_GETPARX 1 39331 HAVE_GETOPT_H 39332 HAVE_GETTIMEOFDAY 39333 HAVE_GETTTYNAM 39334 @@ -68,6 +69,7 @@ 37734 39335 HAVE_GPP_BUILTIN_H 37735 39336 HAVE_GXX_BUILTIN_H … … 37739 39340 HAVE_ISSETUGID 37740 39341 HAVE_LANGINFO_CODESET 37741 @@ -159,6 +1 58,7 @@39342 @@ -159,6 +161,7 @@ 37742 39343 HAVE_WRESIZE 37743 39344 HAVE__DOSCAN … … 37747 39348 NCURSES_EXT_COLORS 37748 39349 NCURSES_EXT_FUNCS 37749 @@ -189,12 +1 89,10 @@39350 @@ -189,12 +192,10 @@ 37750 39351 USE_MY_MEMMOVE 37751 39352 USE_OK_BCOPY … … 37763 39364 diff -Naur ncurses-5.6.orig/include/ncurses_dll.h ncurses-5.6/include/ncurses_dll.h 37764 39365 --- ncurses-5.6.orig/include/ncurses_dll.h 2006-04-22 18:07:51.000000000 -0400 37765 +++ ncurses-5.6/include/ncurses_dll.h 200 7-12-21 00:02:36.000000000 -050039366 +++ ncurses-5.6/include/ncurses_dll.h 2008-06-18 06:49:44.000000000 -0400 37766 39367 @@ -1,5 +1,5 @@ 37767 39368 /**************************************************************************** … … 37794 39395 diff -Naur ncurses-5.6.orig/include/tic.h ncurses-5.6/include/tic.h 37795 39396 --- ncurses-5.6.orig/include/tic.h 2006-08-19 10:17:49.000000000 -0400 37796 +++ ncurses-5.6/include/tic.h 200 7-12-21 00:02:36.000000000 -050039397 +++ ncurses-5.6/include/tic.h 2008-06-18 06:49:44.000000000 -0400 37797 39398 @@ -1,5 +1,5 @@ 37798 39399 /**************************************************************************** … … 37870 39471 diff -Naur ncurses-5.6.orig/install-sh ncurses-5.6/install-sh 37871 39472 --- ncurses-5.6.orig/install-sh 2001-06-22 10:37:33.000000000 -0400 37872 +++ ncurses-5.6/install-sh 200 7-12-21 00:02:36.000000000 -050039473 +++ ncurses-5.6/install-sh 2008-06-18 06:49:44.000000000 -0400 37873 39474 @@ -1,19 +1,37 @@ 37874 39475 #! /bin/sh … … 38139 39740 diff -Naur ncurses-5.6.orig/man/Makefile.in ncurses-5.6/man/Makefile.in 38140 39741 --- ncurses-5.6.orig/man/Makefile.in 2005-07-16 13:26:45.000000000 -0400 38141 +++ ncurses-5.6/man/Makefile.in 200 7-12-21 00:02:36.000000000 -050039742 +++ ncurses-5.6/man/Makefile.in 2008-06-18 06:49:44.000000000 -0400 38142 39743 @@ -1,6 +1,6 @@ 38143 39744 -# $Id: Makefile.in,v 1.39 2005/07/16 17:26:45 tom Exp $ … … 38166 39767 diff -Naur ncurses-5.6.orig/man/captoinfo.1m ncurses-5.6/man/captoinfo.1m 38167 39768 --- ncurses-5.6.orig/man/captoinfo.1m 2006-05-13 11:14:01.000000000 -0400 38168 +++ ncurses-5.6/man/captoinfo.1m 200 7-12-21 00:02:36.000000000 -050039769 +++ ncurses-5.6/man/captoinfo.1m 2008-06-18 06:49:44.000000000 -0400 38169 39770 @@ -1,6 +1,6 @@ 38170 39771 '\" t … … 38241 39842 diff -Naur ncurses-5.6.orig/man/clear.1 ncurses-5.6/man/clear.1 38242 39843 --- ncurses-5.6.orig/man/clear.1 2006-07-01 17:55:09.000000000 -0400 38243 +++ ncurses-5.6/man/clear.1 200 7-12-21 00:02:36.000000000 -050039844 +++ ncurses-5.6/man/clear.1 2008-06-18 06:49:44.000000000 -0400 38244 39845 @@ -26,20 +26,20 @@ 38245 39846 .\" authorization. * … … 38271 39872 diff -Naur ncurses-5.6.orig/man/curs_add_wch.3x ncurses-5.6/man/curs_add_wch.3x 38272 39873 --- ncurses-5.6.orig/man/curs_add_wch.3x 2006-12-02 12:02:35.000000000 -0500 38273 +++ ncurses-5.6/man/curs_add_wch.3x 200 7-12-21 00:02:36.000000000 -050039874 +++ ncurses-5.6/man/curs_add_wch.3x 2008-06-18 06:49:44.000000000 -0400 38274 39875 @@ -26,7 +26,7 @@ 38275 39876 .\" authorization. * … … 38301 39902 diff -Naur ncurses-5.6.orig/man/curs_addch.3x ncurses-5.6/man/curs_addch.3x 38302 39903 --- ncurses-5.6.orig/man/curs_addch.3x 2006-12-02 12:02:22.000000000 -0500 38303 +++ ncurses-5.6/man/curs_addch.3x 200 7-12-21 00:02:36.000000000 -050039904 +++ ncurses-5.6/man/curs_addch.3x 2008-06-18 06:49:44.000000000 -0400 38304 39905 @@ -1,6 +1,6 @@ 38305 39906 '\" t … … 38339 39940 diff -Naur ncurses-5.6.orig/man/curs_attr.3x ncurses-5.6/man/curs_attr.3x 38340 39941 --- ncurses-5.6.orig/man/curs_attr.3x 2006-07-15 14:39:05.000000000 -0400 38341 +++ ncurses-5.6/man/curs_attr.3x 200 7-12-21 00:02:36.000000000 -050039942 +++ ncurses-5.6/man/curs_attr.3x 2008-06-18 06:49:44.000000000 -0400 38342 39943 @@ -1,6 +1,6 @@ 38343 39944 '\" t … … 38369 39970 diff -Naur ncurses-5.6.orig/man/curs_border.3x ncurses-5.6/man/curs_border.3x 38370 39971 --- ncurses-5.6.orig/man/curs_border.3x 2006-02-25 16:49:19.000000000 -0500 38371 +++ ncurses-5.6/man/curs_border.3x 200 7-12-21 00:02:36.000000000 -050039972 +++ ncurses-5.6/man/curs_border.3x 2008-06-18 06:49:44.000000000 -0400 38372 39973 @@ -1,5 +1,5 @@ 38373 39974 .\"*************************************************************************** … … 38398 39999 \fBint mvvline(int y, int x, chtype ch, int n);\fR 38399 40000 .br 40001 diff -Naur ncurses-5.6.orig/man/curs_clear.3x ncurses-5.6/man/curs_clear.3x 40002 --- ncurses-5.6.orig/man/curs_clear.3x 2005-10-01 15:34:43.000000000 -0400 40003 +++ ncurses-5.6/man/curs_clear.3x 2008-06-18 06:49:45.000000000 -0400 40004 @@ -1,5 +1,5 @@ 40005 .\"*************************************************************************** 40006 -.\" Copyright (c) 1998,2005 Free Software Foundation, Inc. * 40007 +.\" Copyright (c) 1998-2005,2007 Free Software Foundation, Inc. * 40008 .\" * 40009 .\" Permission is hereby granted, free of charge, to any person obtaining a * 40010 .\" copy of this software and associated documentation files (the * 40011 @@ -26,7 +26,7 @@ 40012 .\" authorization. * 40013 .\"*************************************************************************** 40014 .\" 40015 -.\" $Id: curs_clear.3x,v 1.10 2005/10/01 19:34:43 tom Exp $ 40016 +.\" $Id: curs_clear.3x,v 1.11 2007/12/29 15:58:38 tom Exp $ 40017 .TH curs_clear 3X "" 40018 .na 40019 .hy 0 40020 @@ -105,6 +105,12 @@ 40021 That fact is not documented in other implementations, 40022 and may not be true of implementations 40023 which were not derived from SVr4 source. 40024 +.PP 40025 +Not obvious from the description, 40026 +most implementations clear the screen after \fBwclear\fP 40027 +even for a subwindow or derived window. 40028 +If you do not want to clear the screen during the next \fBwrefresh\fP, 40029 +use \fBwerase\fP instead. 40030 .SH SEE ALSO 40031 \fBcurses\fR(3X), \fBcurs_outopts\fR(3X), \fBcurs_refresh\fR(3X) 40032 .\"# 38400 40033 diff -Naur ncurses-5.6.orig/man/curs_deleteln.3x ncurses-5.6/man/curs_deleteln.3x 38401 40034 --- ncurses-5.6.orig/man/curs_deleteln.3x 2006-02-25 16:49:19.000000000 -0500 38402 +++ ncurses-5.6/man/curs_deleteln.3x 200 7-12-21 00:02:36.000000000 -050040035 +++ ncurses-5.6/man/curs_deleteln.3x 2008-06-18 06:49:44.000000000 -0400 38403 40036 @@ -1,5 +1,5 @@ 38404 40037 .\"*************************************************************************** … … 38428 40061 diff -Naur ncurses-5.6.orig/man/curs_extend.3x ncurses-5.6/man/curs_extend.3x 38429 40062 --- ncurses-5.6.orig/man/curs_extend.3x 2006-02-25 16:04:43.000000000 -0500 38430 +++ ncurses-5.6/man/curs_extend.3x 200 7-12-21 00:02:36.000000000 -050040063 +++ ncurses-5.6/man/curs_extend.3x 2008-06-18 06:49:44.000000000 -0400 38431 40064 @@ -28,7 +28,7 @@ 38432 40065 .\" … … 38462 40095 diff -Naur ncurses-5.6.orig/man/curs_getcchar.3x ncurses-5.6/man/curs_getcchar.3x 38463 40096 --- ncurses-5.6.orig/man/curs_getcchar.3x 2006-07-15 18:51:07.000000000 -0400 38464 +++ ncurses-5.6/man/curs_getcchar.3x 2007-12-21 00:02:36.000000000 -0500 40097 +++ ncurses-5.6/man/curs_getcchar.3x 2008-06-18 06:49:50.000000000 -0400 40098 @@ -1,5 +1,5 @@ 40099 .\"*************************************************************************** 40100 -.\" Copyright (c) 2001-2003,2006 Free Software Foundation, Inc. * 40101 +.\" Copyright (c) 2001-2006,2008 Free Software Foundation, Inc. * 40102 .\" * 40103 .\" Permission is hereby granted, free of charge, to any person obtaining a * 40104 .\" copy of this software and associated documentation files (the * 38465 40105 @@ -26,7 +26,7 @@ 38466 40106 .\" authorization. * … … 38468 40108 .\" 38469 40109 -.\" $Id: curs_getcchar.3x,v 1.8 2006/07/15 22:51:07 wcmbrine Exp $ 38470 +.\" $Id: curs_getcchar.3x,v 1.1 0 2006/12/24 16:00:02tom Exp $40110 +.\" $Id: curs_getcchar.3x,v 1.11 2008/05/17 19:37:05 tom Exp $ 38471 40111 .TH curs_getcchar 3X "" 38472 40112 .SH NAME 38473 40113 \fBgetcchar\fP, 38474 @@ -132,10 +132,10 @@ 40114 @@ -106,9 +106,14 @@ 40115 - 40116 The wide-character string pointed to by \fIwch\fP. 40117 The string must be L'\\0' terminated, 40118 -contain at most one character with strictly positive width, 40119 -which must be the first, 40120 -and contain no characters of negative width. 40121 +contain at most one spacing character, 40122 +which must be the first. 40123 +.IP 40124 +Up to \fBCCHARW_MAX\fP-1 nonspacing characters may follow. 40125 +Additional nonspacing characters are ignored. 40126 +.IP 40127 +The string may contain a single control character instead. 40128 +In that case, no nonspacing characters are allowed. 40129 .SH NOTES 40130 .PP 40131 The \fIopts\fP argument is reserved for future use. 40132 @@ -132,10 +137,10 @@ 38475 40133 .SH SEE ALSO 38476 40134 .PP … … 38488 40146 diff -Naur ncurses-5.6.orig/man/curs_getyx.3x ncurses-5.6/man/curs_getyx.3x 38489 40147 --- ncurses-5.6.orig/man/curs_getyx.3x 2006-05-27 16:28:05.000000000 -0400 38490 +++ ncurses-5.6/man/curs_getyx.3x 200 7-12-21 00:02:36.000000000 -050040148 +++ ncurses-5.6/man/curs_getyx.3x 2008-06-18 06:49:44.000000000 -0400 38491 40149 @@ -1,5 +1,5 @@ 38492 40150 .\"*************************************************************************** … … 38545 40203 diff -Naur ncurses-5.6.orig/man/curs_insstr.3x ncurses-5.6/man/curs_insstr.3x 38546 40204 --- ncurses-5.6.orig/man/curs_insstr.3x 2006-02-25 16:49:19.000000000 -0500 38547 +++ ncurses-5.6/man/curs_insstr.3x 200 7-12-21 00:02:36.000000000 -050040205 +++ ncurses-5.6/man/curs_insstr.3x 2008-06-18 06:49:44.000000000 -0400 38548 40206 @@ -26,7 +26,7 @@ 38549 40207 .\" authorization. * … … 38566 40224 diff -Naur ncurses-5.6.orig/man/curs_legacy.3x ncurses-5.6/man/curs_legacy.3x 38567 40225 --- ncurses-5.6.orig/man/curs_legacy.3x 1969-12-31 19:00:00.000000000 -0500 38568 +++ ncurses-5.6/man/curs_legacy.3x 200 7-12-21 00:02:36.000000000 -050040226 +++ ncurses-5.6/man/curs_legacy.3x 2008-06-18 06:49:44.000000000 -0400 38569 40227 @@ -0,0 +1,93 @@ 38570 40228 +.\"*************************************************************************** … … 38663 40321 diff -Naur ncurses-5.6.orig/man/curs_mouse.3x ncurses-5.6/man/curs_mouse.3x 38664 40322 --- ncurses-5.6.orig/man/curs_mouse.3x 2005-05-15 12:18:19.000000000 -0400 38665 +++ ncurses-5.6/man/curs_mouse.3x 200 7-12-21 00:02:36.000000000 -050040323 +++ ncurses-5.6/man/curs_mouse.3x 2008-06-18 06:49:44.000000000 -0400 38666 40324 @@ -1,6 +1,6 @@ 38667 40325 '\" t … … 38768 40426 diff -Naur ncurses-5.6.orig/man/curs_opaque.3x ncurses-5.6/man/curs_opaque.3x 38769 40427 --- ncurses-5.6.orig/man/curs_opaque.3x 1969-12-31 19:00:00.000000000 -0500 38770 +++ ncurses-5.6/man/curs_opaque.3x 200 7-12-21 00:02:36.000000000 -050040428 +++ ncurses-5.6/man/curs_opaque.3x 2008-06-18 06:49:44.000000000 -0400 38771 40429 @@ -0,0 +1,133 @@ 38772 40430 +.\"*************************************************************************** … … 38905 40563 diff -Naur ncurses-5.6.orig/man/curs_outopts.3x ncurses-5.6/man/curs_outopts.3x 38906 40564 --- ncurses-5.6.orig/man/curs_outopts.3x 2005-05-15 12:18:32.000000000 -0400 38907 +++ ncurses-5.6/man/curs_outopts.3x 200 7-12-21 00:02:36.000000000 -050040565 +++ ncurses-5.6/man/curs_outopts.3x 2008-06-18 06:49:44.000000000 -0400 38908 40566 @@ -1,5 +1,5 @@ 38909 40567 .\"*************************************************************************** … … 38933 40591 diff -Naur ncurses-5.6.orig/man/curs_printw.3x ncurses-5.6/man/curs_printw.3x 38934 40592 --- ncurses-5.6.orig/man/curs_printw.3x 2006-02-25 16:49:19.000000000 -0500 38935 +++ ncurses-5.6/man/curs_printw.3x 200 7-12-21 00:02:36.000000000 -050040593 +++ ncurses-5.6/man/curs_printw.3x 2008-06-18 06:49:44.000000000 -0400 38936 40594 @@ -26,7 +26,7 @@ 38937 40595 .\" authorization. * … … 38969 40627 diff -Naur ncurses-5.6.orig/man/curs_scanw.3x ncurses-5.6/man/curs_scanw.3x 38970 40628 --- ncurses-5.6.orig/man/curs_scanw.3x 2006-02-25 16:42:22.000000000 -0500 38971 +++ ncurses-5.6/man/curs_scanw.3x 200 7-12-21 00:02:36.000000000 -050040629 +++ ncurses-5.6/man/curs_scanw.3x 2008-06-18 06:49:44.000000000 -0400 38972 40630 @@ -26,7 +26,7 @@ 38973 40631 .\" authorization. * … … 38999 40657 diff -Naur ncurses-5.6.orig/man/curs_scr_dump.3x ncurses-5.6/man/curs_scr_dump.3x 39000 40658 --- ncurses-5.6.orig/man/curs_scr_dump.3x 2006-02-25 16:49:19.000000000 -0500 39001 +++ ncurses-5.6/man/curs_scr_dump.3x 200 7-12-21 00:02:36.000000000 -050040659 +++ ncurses-5.6/man/curs_scr_dump.3x 2008-06-18 06:49:44.000000000 -0400 39002 40660 @@ -26,7 +26,7 @@ 39003 40661 .\" authorization. * … … 39020 40678 diff -Naur ncurses-5.6.orig/man/curs_slk.3x ncurses-5.6/man/curs_slk.3x 39021 40679 --- ncurses-5.6.orig/man/curs_slk.3x 2006-02-25 16:49:19.000000000 -0500 39022 +++ ncurses-5.6/man/curs_slk.3x 200 7-12-21 00:02:36.000000000 -050040680 +++ ncurses-5.6/man/curs_slk.3x 2008-06-18 06:49:44.000000000 -0400 39023 40681 @@ -1,5 +1,5 @@ 39024 40682 .\"*************************************************************************** … … 39048 40706 diff -Naur ncurses-5.6.orig/man/curs_termattrs.3x ncurses-5.6/man/curs_termattrs.3x 39049 40707 --- ncurses-5.6.orig/man/curs_termattrs.3x 2003-12-27 13:37:47.000000000 -0500 39050 +++ ncurses-5.6/man/curs_termattrs.3x 200 7-12-21 00:02:36.000000000 -050040708 +++ ncurses-5.6/man/curs_termattrs.3x 2008-06-18 06:49:44.000000000 -0400 39051 40709 @@ -1,5 +1,5 @@ 39052 40710 .\"*************************************************************************** … … 39076 40734 diff -Naur ncurses-5.6.orig/man/curs_termcap.3x ncurses-5.6/man/curs_termcap.3x 39077 40735 --- ncurses-5.6.orig/man/curs_termcap.3x 2006-02-25 16:50:01.000000000 -0500 39078 +++ ncurses-5.6/man/curs_termcap.3x 200 7-12-21 00:02:36.000000000 -050040736 +++ ncurses-5.6/man/curs_termcap.3x 2008-06-18 06:49:44.000000000 -0400 39079 40737 @@ -1,5 +1,5 @@ 39080 40738 .\"*************************************************************************** … … 39113 40771 diff -Naur ncurses-5.6.orig/man/curs_terminfo.3x ncurses-5.6/man/curs_terminfo.3x 39114 40772 --- ncurses-5.6.orig/man/curs_terminfo.3x 2006-11-04 16:50:03.000000000 -0500 39115 +++ ncurses-5.6/man/curs_terminfo.3x 200 7-12-21 00:02:36.000000000 -050040773 +++ ncurses-5.6/man/curs_terminfo.3x 2008-06-18 06:49:44.000000000 -0400 39116 40774 @@ -1,5 +1,5 @@ 39117 40775 .\"*************************************************************************** … … 39202 40860 .\"# The following sets edit modes for GNU EMACS 39203 40861 .\"# Local Variables: 40862 diff -Naur ncurses-5.6.orig/man/curs_threads.3x ncurses-5.6/man/curs_threads.3x 40863 --- ncurses-5.6.orig/man/curs_threads.3x 1969-12-31 19:00:00.000000000 -0500 40864 +++ ncurses-5.6/man/curs_threads.3x 2008-06-18 06:49:49.000000000 -0400 40865 @@ -0,0 +1,603 @@ 40866 +.\"*************************************************************************** 40867 +.\" Copyright (c) 2008 Free Software Foundation, Inc. * 40868 +.\" * 40869 +.\" Permission is hereby granted, free of charge, to any person obtaining a * 40870 +.\" copy of this software and associated documentation files (the * 40871 +.\" "Software"), to deal in the Software without restriction, including * 40872 +.\" without limitation the rights to use, copy, modify, merge, publish, * 40873 +.\" distribute, distribute with modifications, sublicense, and/or sell * 40874 +.\" copies of the Software, and to permit persons to whom the Software is * 40875 +.\" furnished to do so, subject to the following conditions: * 40876 +.\" * 40877 +.\" The above copyright notice and this permission notice shall be included * 40878 +.\" in all copies or substantial portions of the Software. * 40879 +.\" * 40880 +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * 40881 +.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * 40882 +.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * 40883 +.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * 40884 +.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * 40885 +.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * 40886 +.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 40887 +.\" * 40888 +.\" Except as contained in this notice, the name(s) of the above copyright * 40889 +.\" holders shall not be used in advertising or otherwise to promote the * 40890 +.\" sale, use or other dealings in this Software without prior written * 40891 +.\" authorization. * 40892 +.\"*************************************************************************** 40893 +.\" 40894 +.\" $Id: curs_threads.3x,v 1.12 2008/04/12 18:22:51 tom Exp $ 40895 +.TH curs_threads 3X "" 40896 +.na 40897 +.hy 0 40898 +.SH NAME 40899 +\fBuse_screen\fR, 40900 +\fBuse_window\fR - \fBcurses\fR thread support 40901 +.ad 40902 +.hy 40903 +.SH SYNOPSIS 40904 +\fB#include <curses.h>\fR 40905 +.sp 40906 +\fBtypedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);\fR 40907 +\fBtypedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);\fR 40908 +.br 40909 +\fBint set_escdelay(int size);\fR 40910 +.br 40911 +\fBint set_tabsize(int size);\fR 40912 +.br 40913 +\fBint use_screen(SCREEN *scr, NCURSES_WINDOW_CB func, void *data);\fR 40914 +.br 40915 +\fBint use_window(WINDOW *win, NCURSES_SCREEN_CB func, void *data);\fR 40916 +.br 40917 +.SH DESCRIPTION 40918 +This implementation can be configured to provide rudimentary support 40919 +for multi-threaded applications. 40920 +This makes a different set of libraries, e.g., \fIlibncursest\fP since 40921 +the binary interfaces are different. 40922 +.PP 40923 +Rather than modify the interfaces to pass a thread specifier to 40924 +each function, it adds a few functions which can be used in any 40925 +configuration which hide the mutex's needed to prevent concurrent 40926 +use of the global variables when configured for threading. 40927 +.PP 40928 +In addition to forcing access to members of the \fBWINDOW\fP structure 40929 +to be via functions (see \fBcurs_opaque\fP(3x)), 40930 +it makes functions of the common global variables, 40931 +e.g., 40932 +COLORS, 40933 +COLOR_PAIRS, 40934 +COLS, 40935 +ESCDELAY, 40936 +LINES, 40937 +TABSIZE 40938 +curscr, 40939 +newscr and 40940 +ttytype. 40941 +Those variables are maintained as read-only values, stored in the \fBSCREEN\fP 40942 +structure. 40943 +.PP 40944 +Even this is not enough to make a thread-safe application using curses. 40945 +A multi-threaded application would be expected to have threads updating 40946 +separate windows (within the same device), 40947 +or updating on separate screens (on different devices). 40948 +Also, a few of the global variables are considered writable by some 40949 +applications. 40950 +The functions described here address these special situations. 40951 +.PP 40952 +The ESCDELAY and TABSIZE global variables are modified by some applications. 40953 +To modify them in any configuration, 40954 +use the \fBset_escdelay\fP or \fBset_tabsize\fP functions. 40955 +Other global variables are not modifiable. 40956 +.PP 40957 +The \fBuse_window\fP and \fBuse_screen\fP functions provide coarse 40958 +granularity mutexes for their respective \fBWINDOW\fP and \fBSCREEN\fP 40959 +parameters, and call a user-supplied function, 40960 +passing it a \fIdata\fP parameter, 40961 +and returning the value from the user-supplied function to the application. 40962 +.\" *************************************************************************** 40963 +.SS USAGE 40964 +All of the ncurses library functions assume that the locale is not 40965 +altered during operation. 40966 +In addition, 40967 +they use data which is maintained within a hierarchy of scopes. 40968 +.RS 40969 +.TP 3 40970 +- 40971 +global data, e.g., used in the low-level terminfo or termcap interfaces. 40972 +.TP 3 40973 +- 40974 +terminal data, e.g., associated with a call to \fIset_curterm\fP. 40975 +The terminal data are initialized when screens are created. 40976 +.TP 3 40977 +- 40978 +screen data, e.g., associated with a call to \fInewterm\fP or \fIinitscr\fP. 40979 +.TP 3 40980 +- 40981 +window data, e.g., associated with a call to \fInewwin\fP or \fIsubwin\fP. 40982 +Windows are associated with screens. 40983 +Pads are not necessarily associated with a particular screen. 40984 +.IP 40985 +Most curses applications operate on one or more windows within a single screen. 40986 +.TP 3 40987 +- 40988 +reentrant, i.e., it uses only the data passed as parameters. 40989 +.RE 40990 +.PP 40991 +This table lists the scope of data used for each symbol in the 40992 +ncurses library when it is configured to support threading: 40993 +.TS 40994 +center tab(/); 40995 +l l 40996 +l l . 40997 +Symbol/Scope 40998 += 40999 +BC/global 41000 +COLORS/screen (readonly) 41001 +COLOR_PAIR/reentrant 41002 +COLOR_PAIRS/screen (readonly) 41003 +COLS/screen (readonly) 41004 +ESCDELAY/screen (readonly, see \fIset_escdelay\fP) 41005 +LINES/screen (readonly) 41006 +PAIR_NUMBER/reentrant 41007 +PC/global 41008 +SP/global 41009 +TABSIZE/screen (readonly) 41010 +UP/global 41011 +acs_map/screen (readonly) 41012 +add_wch/window (stdscr) 41013 +add_wchnstr/window (stdscr) 41014 +add_wchstr/window (stdscr) 41015 +addch/window (stdscr) 41016 +addchnstr/window (stdscr) 41017 +addchstr/window (stdscr) 41018 +addnstr/window (stdscr) 41019 +addnwstr/window (stdscr) 41020 +addstr/window (stdscr) 41021 +addwstr/window (stdscr) 41022 +assume_default_colors/screen 41023 +attr_get/window (stdscr) 41024 +attr_off/window (stdscr) 41025 +attr_on/window (stdscr) 41026 +attr_set/window (stdscr) 41027 +attroff/window (stdscr) 41028 +attron/window (stdscr) 41029 +attrset/window (stdscr) 41030 +baudrate/screen 41031 +beep/screen 41032 +bkgd/window (stdscr) 41033 +bkgdset/window (stdscr) 41034 +bkgrnd/window (stdscr) 41035 +bkgrndset/window (stdscr) 41036 +boolcodes/global (readonly) 41037 +boolfnames/global (readonly) 41038 +boolnames/global (readonly) 41039 +border/window (stdscr) 41040 +border_set/window (stdscr) 41041 +box/window (stdscr) 41042 +box_set/window (stdscr) 41043 +can_change_color/terminal 41044 +cbreak/screen 41045 +chgat/window (stdscr) 41046 +clear/window (stdscr) 41047 +clearok/window 41048 +clrtobot/window (stdscr) 41049 +clrtoeol/window (stdscr) 41050 +color_content/screen 41051 +color_set/window (stdscr) 41052 +copywin/window locks(source, target) 41053 +cur_term/terminal 41054 +curs_set/screen 41055 +curscr/screen (readonly) 41056 +curses_version/global (readonly) 41057 +def_prog_mode/terminal 41058 +def_shell_mode/terminal 41059 +define_key/screen 41060 +del_curterm/screen 41061 +delay_output/screen 41062 +delch/window (stdscr) 41063 +deleteln/window (stdscr) 41064 +delscreen/global locks(screenlist, screen) 41065 +delwin/global locks(windowlist) 41066 +derwin/screen 41067 +doupdate/screen 41068 +dupwin/screen locks(window) 41069 +echo/screen 41070 +echo_wchar/window (stdscr) 41071 +echochar/window (stdscr) 41072 +endwin/screen 41073 +erase/window (stdscr) 41074 +erasechar/window (stdscr) 41075 +erasewchar/window (stdscr) 41076 +filter/global 41077 +flash/terminal 41078 +flushinp/screen 41079 +get_wch/screen (input-operation) 41080 +get_wstr/screen (input-operation) 41081 +getattrs/window 41082 +getbegx/window 41083 +getbegy/window 41084 +getbkgd/window 41085 +getbkgrnd/window 41086 +getcchar/reentrant 41087 +getch/screen (input-operation) 41088 +getcurx/window 41089 +getcury/window 41090 +getmaxx/window 41091 +getmaxy/window 41092 +getmouse/screen (input-operation) 41093 +getn_wstr/screen (input-operation) 41094 +getnstr/screen (input-operation) 41095 +getparx/window 41096 +getpary/window 41097 +getstr/screen (input-operation) 41098 +getwin/screen (input-operation) 41099 +halfdelay/screen 41100 +has_colors/terminal 41101 +has_ic/terminal 41102 +has_il/terminal 41103 +has_key/screen 41104 +hline/window (stdscr) 41105 +hline_set/window (stdscr) 41106 +idcok/window 41107 +idlok/window 41108 +immedok/window 41109 +in_wch/window (stdscr) 41110 +in_wchnstr/window (stdscr) 41111 +in_wchstr/window (stdscr) 41112 +inch/window (stdscr) 41113 +inchnstr/window (stdscr) 41114 +inchstr/window (stdscr) 41115 +init_color/screen 41116 +init_pair/screen 41117 +initscr/global locks(screenlist) 41118 +innstr/window (stdscr) 41119 +innwstr/window (stdscr) 41120 +ins_nwstr/window (stdscr) 41121 +ins_wch/window (stdscr) 41122 +ins_wstr/window (stdscr) 41123 +insch/window (stdscr) 41124 +insdelln/window (stdscr) 41125 +insertln/window (stdscr) 41126 +insnstr/window (stdscr) 41127 +insstr/window (stdscr) 41128 +instr/window (stdscr) 41129 +intrflush/terminal 41130 +inwstr/window (stdscr) 41131 +is_cleared/window 41132 +is_idcok/window 41133 +is_idlok/window 41134 +is_immedok/window 41135 +is_keypad/window 41136 +is_leaveok/window 41137 +is_linetouched/window 41138 +is_nodelay/window 41139 +is_notimeout/window 41140 +is_scrollok/window 41141 +is_syncok/window 41142 +is_term_resized/terminal 41143 +is_wintouched/window 41144 +isendwin/screen 41145 +key_defined/screen 41146 +key_name/global (static data) 41147 +keybound/screen 41148 +keyname/global (static data) 41149 +keyok/screen 41150 +keypad/window 41151 +killchar/terminal 41152 +killwchar/terminal 41153 +leaveok/window 41154 +longname/screen 41155 +mcprint/terminal 41156 +meta/screen 41157 +mouse_trafo/window (stdscr) 41158 +mouseinterval/screen 41159 +mousemask/screen 41160 +move/window (stdscr) 41161 +mvadd_wch/window (stdscr) 41162 +mvadd_wchnstr/window (stdscr) 41163 +mvadd_wchstr/window (stdscr) 41164 +mvaddch/window (stdscr) 41165 +mvaddchnstr/window (stdscr) 41166 +mvaddchstr/window (stdscr) 41167 +mvaddnstr/window (stdscr) 41168 +mvaddnwstr/window (stdscr) 41169 +mvaddstr/window (stdscr) 41170 +mvaddwstr/window (stdscr) 41171 +mvchgat/window (stdscr) 41172 +mvcur/screen 41173 +mvdelch/window (stdscr) 41174 +mvderwin/window (stdscr) 41175 +mvget_wch/screen (input-operation) 41176 +mvget_wstr/screen (input-operation) 41177 +mvgetch/screen (input-operation) 41178 +mvgetn_wstr/screen (input-operation) 41179 +mvgetnstr/screen (input-operation) 41180 +mvgetstr/screen (input-operation) 41181 +mvhline/window (stdscr) 41182 +mvhline_set/window (stdscr) 41183 +mvin_wch/window (stdscr) 41184 +mvin_wchnstr/window (stdscr) 41185 +mvin_wchstr/window (stdscr) 41186 +mvinch/window (stdscr) 41187 +mvinchnstr/window (stdscr) 41188 +mvinchstr/window (stdscr) 41189 +mvinnstr/window (stdscr) 41190 +mvinnwstr/window (stdscr) 41191 +mvins_nwstr/window (stdscr) 41192 +mvins_wch/window (stdscr) 41193 +mvins_wstr/window (stdscr) 41194 +mvinsch/window (stdscr) 41195 +mvinsnstr/window (stdscr) 41196 +mvinsstr/window (stdscr) 41197 +mvinstr/window (stdscr) 41198 +mvinwstr/window (stdscr) 41199 +mvprintw/window (stdscr) 41200 +mvscanw/screen 41201 +mvvline/window (stdscr) 41202 +mvvline_set/window (stdscr) 41203 +mvwadd_wch/window 41204 +mvwadd_wchnstr/window 41205 +mvwadd_wchstr/window 41206 +mvwaddch/window 41207 +mvwaddchnstr/window 41208 +mvwaddchstr/window 41209 +mvwaddnstr/window 41210 +mvwaddnwstr/window 41211 +mvwaddstr/window 41212 +mvwaddwstr/window 41213 +mvwchgat/window 41214 +mvwdelch/window 41215 +mvwget_wch/screen (input-operation) 41216 +mvwget_wstr/screen (input-operation) 41217 +mvwgetch/screen (input-operation) 41218 +mvwgetn_wstr/screen (input-operation) 41219 +mvwgetnstr/screen (input-operation) 41220 +mvwgetstr/screen (input-operation) 41221 +mvwhline/window 41222 +mvwhline_set/window 41223 +mvwin/window 41224 +mvwin_wch/window 41225 +mvwin_wchnstr/window 41226 +mvwin_wchstr/window 41227 +mvwinch/window 41228 +mvwinchnstr/window 41229 +mvwinchstr/window 41230 +mvwinnstr/window 41231 +mvwinnwstr/window 41232 +mvwins_nwstr/window 41233 +mvwins_wch/window 41234 +mvwins_wstr/window 41235 +mvwinsch/window 41236 +mvwinsnstr/window 41237 +mvwinsstr/window 41238 +mvwinstr/window 41239 +mvwinwstr/window 41240 +mvwprintw/window 41241 +mvwscanw/screen 41242 +mvwvline/window 41243 +mvwvline_set/window 41244 +napms/reentrant 41245 +newpad/global locks(windowlist) 41246 +newscr/screen (readonly) 41247 +newterm/global locks(screenlist) 41248 +newwin/global locks(windowlist) 41249 +nl/screen 41250 +nocbreak/screen 41251 +nodelay/window 41252 +noecho/screen 41253 +nofilter/global 41254 +nonl/screen 41255 +noqiflush/terminal 41256 +noraw/screen 41257 +notimeout/window 41258 +numcodes/global (readonly) 41259 +numfnames/global (readonly) 41260 +numnames/global (readonly) 41261 +ospeed/global 41262 +overlay/window locks(source, target) 41263 +overwrite/window locks(source, target) 41264 +pair_content/screen 41265 +pecho_wchar/screen 41266 +pechochar/screen 41267 +pnoutrefresh/screen 41268 +prefresh/screen 41269 +printw/window 41270 +putp/global 41271 +putwin/window 41272 +qiflush/terminal 41273 +raw/screen 41274 +redrawwin/window 41275 +refresh/screen 41276 +reset_prog_mode/screen 41277 +reset_shell_mode/screen 41278 +resetty/terminal 41279 +resize_term/screen locks(windowlist) 41280 +resizeterm/screen 41281 +restartterm/screen 41282 +ripoffline/global (static data) 41283 +savetty/terminal 41284 +scanw/screen 41285 +scr_dump/screen 41286 +scr_init/screen 41287 +scr_restore/screen 41288 +scr_set/screen 41289 +scrl/window (stdscr) 41290 +scroll/window 41291 +scrollok/window 41292 +set_curterm/screen 41293 +set_escdelay/screen 41294 +set_tabsize/screen 41295 +set_term/global locks(screenlist, screen) 41296 +setcchar/reentrant 41297 +setscrreg/window (stdscr) 41298 +setupterm/global 41299 +slk_attr/screen 41300 +slk_attr_off/screen 41301 +slk_attr_on/screen 41302 +slk_attr_set/screen 41303 +slk_attroff/screen 41304 +slk_attron/screen 41305 +slk_attrset/screen 41306 +slk_clear/screen 41307 +slk_color/screen 41308 +slk_init/screen 41309 +slk_label/screen 41310 +slk_noutrefresh/screen 41311 +slk_refresh/screen 41312 +slk_restore/screen 41313 +slk_set/screen 41314 +slk_touch/screen 41315 +slk_wset/screen 41316 +standend/window 41317 +standout/window 41318 +start_color/screen 41319 +stdscr/screen (readonly) 41320 +strcodes/global (readonly) 41321 +strfnames/global (readonly) 41322 +strnames/global (readonly) 41323 +subpad/window 41324 +subwin/window 41325 +syncok/window 41326 +term_attrs/screen 41327 +termattrs/screen 41328 +termname/terminal 41329 +tgetent/global 41330 +tgetflag/global 41331 +tgetnum/global 41332 +tgetstr/global 41333 +tgoto/global 41334 +tigetflag/terminal 41335 +tigetnum/terminal 41336 +tigetstr/terminal 41337 +timeout/window (stdscr) 41338 +touchline/window 41339 +touchwin/window 41340 +tparm/global (static data) 41341 +tputs/screen 41342 +trace/global (static data) 41343 +ttytype/screen (readonly) 41344 +typeahead/screen 41345 +unctrl/screen 41346 +unget_wch/screen (input-operation) 41347 +ungetch/screen (input-operation) 41348 +ungetmouse/screen (input-operation) 41349 +untouchwin/window 41350 +use_default_colors/screen 41351 +use_env/global (static data) 41352 +use_extended_names/global (static data) 41353 +use_legacy_coding/screen 41354 +use_screen/global locks(screenlist, screen) 41355 +use_window/global locks(windowlist, window) 41356 +vid_attr/screen 41357 +vid_puts/screen 41358 +vidattr/screen 41359 +vidputs/screen 41360 +vline/window (stdscr) 41361 +vline_set/window (stdscr) 41362 +vw_printw/window 41363 +vw_scanw/screen 41364 +vwprintw/window 41365 +vwscanw/screen 41366 +wadd_wch/window 41367 +wadd_wchnstr/window 41368 +wadd_wchstr/window 41369 +waddch/window 41370 +waddchnstr/window 41371 +waddchstr/window 41372 +waddnstr/window 41373 +waddnwstr/window 41374 +waddstr/window 41375 +waddwstr/window 41376 +wattr_get/window 41377 +wattr_off/window 41378 +wattr_on/window 41379 +wattr_set/window 41380 +wattroff/window 41381 +wattron/window 41382 +wattrset/window 41383 +wbkgd/window 41384 +wbkgdset/window 41385 +wbkgrnd/window 41386 +wbkgrndset/window 41387 +wborder/window 41388 +wborder_set/window 41389 +wchgat/window 41390 +wclear/window 41391 +wclrtobot/window 41392 +wclrtoeol/window 41393 +wcolor_set/window 41394 +wcursyncup/screen (affects window plus parents) 41395 +wdelch/window 41396 +wdeleteln/window 41397 +wecho_wchar/window 41398 +wechochar/window 41399 +wenclose/window 41400 +werase/window 41401 +wget_wch/screen (input-operation) 41402 +wget_wstr/screen (input-operation) 41403 +wgetbkgrnd/window 41404 +wgetch/screen (input-operation) 41405 +wgetn_wstr/screen (input-operation) 41406 +wgetnstr/screen (input-operation) 41407 +wgetparent/window 41408 +wgetscrreg/window 41409 +wgetstr/screen (input-operation) 41410 +whline/window 41411 +whline_set/window 41412 +win_wch/window 41413 +win_wchnstr/window 41414 +win_wchstr/window 41415 +winch/window 41416 +winchnstr/window 41417 +winchstr/window 41418 +winnstr/window 41419 +winnwstr/window 41420 +wins_nwstr/window 41421 +wins_wch/window 41422 +wins_wstr/window 41423 +winsch/window 41424 +winsdelln/window 41425 +winsertln/window 41426 +winsnstr/window 41427 +winsstr/window 41428 +winstr/window 41429 +winwstr/window 41430 +wmouse_trafo/window 41431 +wmove/window 41432 +wnoutrefresh/screen 41433 +wprintw/window 41434 +wredrawln/window 41435 +wrefresh/screen 41436 +wresize/window locks(windowlist) 41437 +wscanw/screen 41438 +wscrl/window 41439 +wsetscrreg/window 41440 +wstandend/window 41441 +wstandout/window 41442 +wsyncdown/screen (affects window plus parents) 41443 +wsyncup/screen (affects window plus parents) 41444 +wtimeout/window 41445 +wtouchln/window 41446 +wunctrl/global (static data) 41447 +wvline/window 41448 +wvline_set/window 41449 +.TE 41450 +.\" *************************************************************************** 41451 +.SH RETURN VALUE 41452 +These functions all return TRUE or FALSE, except as noted. 41453 +.SH NOTES 41454 +Both a macro and a function are provided for each name. 41455 +.SH PORTABILITY 41456 +These routines are specific to ncurses. 41457 +They were not supported on Version 7, BSD or System V implementations. 41458 +It is recommended that any code depending on ncurses extensions 41459 +be conditioned using NCURSES_VERSION. 41460 +.SH SEE ALSO 41461 +\fBcurses\fR(3X), 41462 +\fBcurs_opaque\fR(3X) 41463 +.\"# 41464 +.\"# The following sets edit modes for GNU EMACS 41465 +.\"# Local Variables: 41466 +.\"# mode:nroff 41467 +.\"# fill-column:79 41468 +.\"# End: 39204 41469 diff -Naur ncurses-5.6.orig/man/curs_trace.3x ncurses-5.6/man/curs_trace.3x 39205 41470 --- ncurses-5.6.orig/man/curs_trace.3x 2005-05-15 13:02:54.000000000 -0400 39206 +++ ncurses-5.6/man/curs_trace.3x 200 7-12-21 00:02:36.000000000 -050041471 +++ ncurses-5.6/man/curs_trace.3x 2008-06-18 06:49:44.000000000 -0400 39207 41472 @@ -1,5 +1,5 @@ 39208 41473 .\"*************************************************************************** … … 39232 41497 diff -Naur ncurses-5.6.orig/man/curs_util.3x ncurses-5.6/man/curs_util.3x 39233 41498 --- ncurses-5.6.orig/man/curs_util.3x 2006-08-26 10:17:48.000000000 -0400 39234 +++ ncurses-5.6/man/curs_util.3x 200 7-12-21 00:02:36.000000000 -050041499 +++ ncurses-5.6/man/curs_util.3x 2008-06-18 06:49:44.000000000 -0400 39235 41500 @@ -1,5 +1,5 @@ 39236 41501 .\"*************************************************************************** … … 39331 41596 diff -Naur ncurses-5.6.orig/man/default_colors.3x ncurses-5.6/man/default_colors.3x 39332 41597 --- ncurses-5.6.orig/man/default_colors.3x 2006-02-25 16:49:19.000000000 -0500 39333 +++ ncurses-5.6/man/default_colors.3x 200 7-12-21 00:02:36.000000000 -050041598 +++ ncurses-5.6/man/default_colors.3x 2008-06-18 06:49:44.000000000 -0400 39334 41599 @@ -28,7 +28,7 @@ 39335 41600 .\" … … 39353 41618 The \fIuse_default_colors()\fP function was added to support \fIded\fP. 39354 41619 This is a full-screen application which uses curses to manage only part 41620 diff -Naur ncurses-5.6.orig/man/form.3x ncurses-5.6/man/form.3x 41621 --- ncurses-5.6.orig/man/form.3x 2006-11-04 13:50:09.000000000 -0500 41622 +++ ncurses-5.6/man/form.3x 2008-06-18 06:49:50.000000000 -0400 41623 @@ -1,6 +1,6 @@ 41624 '\" t 41625 .\"*************************************************************************** 41626 -.\" Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. * 41627 +.\" Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * 41628 .\" * 41629 .\" Permission is hereby granted, free of charge, to any person obtaining a * 41630 .\" copy of this software and associated documentation files (the * 41631 @@ -27,7 +27,7 @@ 41632 .\" authorization. * 41633 .\"*************************************************************************** 41634 .\" 41635 -.\" $Id: form.3x,v 1.20 2006/11/04 18:50:09 tom Exp $ 41636 +.\" $Id: form.3x,v 1.21 2008/04/26 17:11:52 tom Exp $ 41637 .TH form 3X "" 41638 .SH NAME 41639 \fBform\fR - curses extension for programming forms 41640 @@ -69,7 +69,7 @@ 41641 data_ahead \fBform_data\fR(3X) 41642 data_behind \fBform_data\fR(3X) 41643 dup_field \fBform_field_new\fR(3X) 41644 -dynamic_fieldinfo \fBform_field_info\fR(3X) 41645 +dynamic_field_info \fBform_field_info\fR(3X) 41646 field_arg \fBform_field_validation\fR(3X) 41647 field_back \fBform_field_attributes\fR(3X) 41648 field_buffer \fBform_field_buffer\fR(3X) 39355 41649 diff -Naur ncurses-5.6.orig/man/form_driver.3x ncurses-5.6/man/form_driver.3x 39356 41650 --- ncurses-5.6.orig/man/form_driver.3x 2006-11-04 13:51:00.000000000 -0500 39357 +++ ncurses-5.6/man/form_driver.3x 200 7-12-21 00:02:36.000000000 -050041651 +++ ncurses-5.6/man/form_driver.3x 2008-06-18 06:49:44.000000000 -0400 39358 41652 @@ -1,5 +1,5 @@ 39359 41653 .\"*************************************************************************** … … 39441 41735 diff -Naur ncurses-5.6.orig/man/form_field_new.3x ncurses-5.6/man/form_field_new.3x 39442 41736 --- ncurses-5.6.orig/man/form_field_new.3x 2006-11-04 12:12:00.000000000 -0500 39443 +++ ncurses-5.6/man/form_field_new.3x 200 7-12-21 00:02:36.000000000 -050041737 +++ ncurses-5.6/man/form_field_new.3x 2008-06-18 06:49:44.000000000 -0400 39444 41738 @@ -1,6 +1,6 @@ 39445 41739 '\" t … … 39472 41766 diff -Naur ncurses-5.6.orig/man/form_field_opts.3x ncurses-5.6/man/form_field_opts.3x 39473 41767 --- ncurses-5.6.orig/man/form_field_opts.3x 2006-11-04 12:12:00.000000000 -0500 39474 +++ ncurses-5.6/man/form_field_opts.3x 200 7-12-21 00:02:36.000000000 -050041768 +++ ncurses-5.6/man/form_field_opts.3x 2008-06-18 06:49:44.000000000 -0400 39475 41769 @@ -1,6 +1,6 @@ 39476 41770 '\" t … … 39509 41803 diff -Naur ncurses-5.6.orig/man/form_field_validation.3x ncurses-5.6/man/form_field_validation.3x 39510 41804 --- ncurses-5.6.orig/man/form_field_validation.3x 2006-11-04 12:14:19.000000000 -0500 39511 +++ ncurses-5.6/man/form_field_validation.3x 200 7-12-21 00:02:36.000000000 -050041805 +++ ncurses-5.6/man/form_field_validation.3x 2008-06-18 06:49:44.000000000 -0400 39512 41806 @@ -26,7 +26,7 @@ 39513 41807 .\" authorization. * … … 39530 41824 diff -Naur ncurses-5.6.orig/man/form_hook.3x ncurses-5.6/man/form_hook.3x 39531 41825 --- ncurses-5.6.orig/man/form_hook.3x 2006-11-04 12:12:00.000000000 -0500 39532 +++ ncurses-5.6/man/form_hook.3x 200 7-12-21 00:02:36.000000000 -050041826 +++ ncurses-5.6/man/form_hook.3x 2008-06-18 06:49:44.000000000 -0400 39533 41827 @@ -1,6 +1,6 @@ 39534 41828 '\" t … … 39579 41873 diff -Naur ncurses-5.6.orig/man/form_opts.3x ncurses-5.6/man/form_opts.3x 39580 41874 --- ncurses-5.6.orig/man/form_opts.3x 2006-11-04 12:12:00.000000000 -0500 39581 +++ ncurses-5.6/man/form_opts.3x 200 7-12-21 00:02:36.000000000 -050041875 +++ ncurses-5.6/man/form_opts.3x 2008-06-18 06:49:44.000000000 -0400 39582 41876 @@ -1,6 +1,6 @@ 39583 41877 '\" t … … 39616 41910 diff -Naur ncurses-5.6.orig/man/infocmp.1m ncurses-5.6/man/infocmp.1m 39617 41911 --- ncurses-5.6.orig/man/infocmp.1m 2006-05-13 11:14:01.000000000 -0400 39618 +++ ncurses-5.6/man/infocmp.1m 200 7-12-21 00:02:36.000000000 -050041912 +++ ncurses-5.6/man/infocmp.1m 2008-06-18 06:49:44.000000000 -0400 39619 41913 @@ -27,14 +27,14 @@ 39620 41914 .\" authorization. * … … 39726 42020 diff -Naur ncurses-5.6.orig/man/infotocap.1m ncurses-5.6/man/infotocap.1m 39727 42021 --- ncurses-5.6.orig/man/infotocap.1m 2006-05-13 11:35:45.000000000 -0400 39728 +++ ncurses-5.6/man/infotocap.1m 200 7-12-21 00:02:36.000000000 -050042022 +++ ncurses-5.6/man/infotocap.1m 2008-06-18 06:49:44.000000000 -0400 39729 42023 @@ -27,16 +27,16 @@ 39730 42024 .\" authorization. * … … 39768 42062 diff -Naur ncurses-5.6.orig/man/legacy_coding.3x ncurses-5.6/man/legacy_coding.3x 39769 42063 --- ncurses-5.6.orig/man/legacy_coding.3x 2006-02-25 16:50:01.000000000 -0500 39770 +++ ncurses-5.6/man/legacy_coding.3x 200 7-12-21 00:02:36.000000000 -050042064 +++ ncurses-5.6/man/legacy_coding.3x 2008-06-18 06:49:44.000000000 -0400 39771 42065 @@ -28,7 +28,7 @@ 39772 42066 .\" … … 39789 42083 diff -Naur ncurses-5.6.orig/man/man_db.renames ncurses-5.6/man/man_db.renames 39790 42084 --- ncurses-5.6.orig/man/man_db.renames 2006-05-13 19:47:25.000000000 -0400 39791 +++ ncurses-5.6/man/man_db.renames 200 7-12-21 00:02:36.000000000 -050042085 +++ ncurses-5.6/man/man_db.renames 2008-06-18 06:49:46.000000000 -0400 39792 42086 @@ -1,5 +1,5 @@ 39793 42087 ############################################################################## 39794 42088 -# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. # 39795 +# Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. #42089 +# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. # 39796 42090 # # 39797 42091 # Permission is hereby granted, free of charge, to any person obtaining a # … … 39802 42096 ############################################################################## 39803 42097 -# $Id: man_db.renames,v 0.36 2006/05/13 23:47:25 tom Exp $ 39804 +# $Id: man_db.renames,v 0. 39 2007/04/07 23:06:31tom Exp $42098 +# $Id: man_db.renames,v 0.40 2008/01/19 18:28:50 tom Exp $ 39805 42099 # Manual-page renamings for the man_db program 39806 42100 # … … 39817 42111 curs_overlay.3x overlay.3ncurses 39818 42112 curs_pad.3x pad.3ncurses 39819 @@ -159,12 +161,15 @@ 42113 @@ -82,6 +84,7 @@ 42114 curs_termattrs.3x termattrs.3ncurses 42115 curs_termcap.3x termcap.3ncurses 42116 curs_terminfo.3x terminfo.3ncurses 42117 +curs_threads.3x threads.3ncurses 42118 curs_touch.3x touch.3ncurses 42119 curs_trace.3x trace.3ncurses 42120 curs_util.3x util.3ncurses 42121 @@ -114,9 +117,9 @@ 42122 form_win.3x win.3form 42123 infocmp.1m infocmp.1 42124 infotocap.1m infotocap.1 42125 +key_defined.3x key_defined.3ncurses 42126 keybound.3x keybound.3ncurses 42127 keyok.3x keyok.3ncurses 42128 -key_defined.3x key_defined.3ncurses 42129 legacy_coding.3x legacy_coding.3ncurses 42130 menu.3x menu.3menu 42131 menu_attributes.3x attributes.3menu 42132 @@ -159,12 +162,15 @@ 39820 42133 vprintf.3s vprintf.3 39821 42134 wresize.3x wresize.3ncurses … … 39840 42153 +# 39841 42154 +# vile:cfgmode 42155 diff -Naur ncurses-5.6.orig/man/manlinks.sed ncurses-5.6/man/manlinks.sed 42156 --- ncurses-5.6.orig/man/manlinks.sed 2003-12-20 08:17:56.000000000 -0500 42157 +++ ncurses-5.6/man/manlinks.sed 2008-06-18 06:49:46.000000000 -0400 42158 @@ -1,6 +1,6 @@ 42159 -# $Id: manlinks.sed,v 1.12 2003/12/20 13:17:56 tom Exp $ 42160 +# $Id: manlinks.sed,v 1.13 2008/01/19 23:31:17 tom Exp $ 42161 ############################################################################## 42162 -# Copyright (c) 2000-2002,2003 Free Software Foundation, Inc. # 42163 +# Copyright (c) 2000-2003,2008 Free Software Foundation, Inc. # 42164 # # 42165 # Permission is hereby granted, free of charge, to any person obtaining a # 42166 # copy of this software and associated documentation files (the "Software"), # 42167 @@ -35,6 +35,7 @@ 42168 /\.\\"/d 42169 /^\.br/d 42170 /^\.sp/d 42171 +/typedef/d 42172 s/^\.IX// 42173 s/\\f.//g 42174 s/[:,]/ /g 39842 42175 diff -Naur ncurses-5.6.orig/man/menu_driver.3x ncurses-5.6/man/menu_driver.3x 39843 42176 --- ncurses-5.6.orig/man/menu_driver.3x 2006-11-04 12:13:50.000000000 -0500 39844 +++ ncurses-5.6/man/menu_driver.3x 200 7-12-21 00:02:36.000000000 -050042177 +++ ncurses-5.6/man/menu_driver.3x 2008-06-18 06:49:44.000000000 -0400 39845 42178 @@ -1,5 +1,5 @@ 39846 42179 .\"*************************************************************************** … … 39939 42272 diff -Naur ncurses-5.6.orig/man/menu_hook.3x ncurses-5.6/man/menu_hook.3x 39940 42273 --- ncurses-5.6.orig/man/menu_hook.3x 2006-11-04 12:12:00.000000000 -0500 39941 +++ ncurses-5.6/man/menu_hook.3x 200 7-12-21 00:02:36.000000000 -050042274 +++ ncurses-5.6/man/menu_hook.3x 2008-06-18 06:49:44.000000000 -0400 39942 42275 @@ -1,6 +1,6 @@ 39943 42276 '\" t … … 39988 42321 diff -Naur ncurses-5.6.orig/man/menu_opts.3x ncurses-5.6/man/menu_opts.3x 39989 42322 --- ncurses-5.6.orig/man/menu_opts.3x 2006-11-04 12:12:00.000000000 -0500 39990 +++ ncurses-5.6/man/menu_opts.3x 200 7-12-21 00:02:36.000000000 -050042323 +++ ncurses-5.6/man/menu_opts.3x 2008-06-18 06:49:44.000000000 -0400 39991 42324 @@ -1,6 +1,6 @@ 39992 42325 '\" t … … 40025 42358 diff -Naur ncurses-5.6.orig/man/mitem_opts.3x ncurses-5.6/man/mitem_opts.3x 40026 42359 --- ncurses-5.6.orig/man/mitem_opts.3x 2006-11-04 12:12:00.000000000 -0500 40027 +++ ncurses-5.6/man/mitem_opts.3x 200 7-12-21 00:02:36.000000000 -050042360 +++ ncurses-5.6/man/mitem_opts.3x 2008-06-18 06:49:44.000000000 -0400 40028 42361 @@ -1,6 +1,6 @@ 40029 42362 '\" t … … 40062 42395 diff -Naur ncurses-5.6.orig/man/ncurses.3x ncurses-5.6/man/ncurses.3x 40063 42396 --- ncurses-5.6.orig/man/ncurses.3x 2006-12-02 14:23:11.000000000 -0500 40064 +++ ncurses-5.6/man/ncurses.3x 200 7-12-21 00:02:36.000000000 -050042397 +++ ncurses-5.6/man/ncurses.3x 2008-06-18 06:49:44.000000000 -0400 40065 42398 @@ -1,6 +1,6 @@ 40066 42399 '\" t … … 40557 42890 diff -Naur ncurses-5.6.orig/man/panel.3x ncurses-5.6/man/panel.3x 40558 42891 --- ncurses-5.6.orig/man/panel.3x 2006-05-13 11:35:45.000000000 -0400 40559 +++ ncurses-5.6/man/panel.3x 200 7-12-21 00:02:36.000000000 -050042892 +++ ncurses-5.6/man/panel.3x 2008-06-18 06:49:44.000000000 -0400 40560 42893 @@ -1,5 +1,5 @@ 40561 42894 .\"*************************************************************************** … … 40662 42995 diff -Naur ncurses-5.6.orig/man/term.5 ncurses-5.6/man/term.5 40663 42996 --- ncurses-5.6.orig/man/term.5 2006-12-02 20:08:16.000000000 -0500 40664 +++ ncurses-5.6/man/term.5 200 7-12-21 00:02:36.000000000 -050042997 +++ ncurses-5.6/man/term.5 2008-06-18 06:49:44.000000000 -0400 40665 42998 @@ -26,8 +26,8 @@ 40666 42999 .\" authorization. * … … 40685 43018 diff -Naur ncurses-5.6.orig/man/term.7 ncurses-5.6/man/term.7 40686 43019 --- ncurses-5.6.orig/man/term.7 2006-02-25 16:47:06.000000000 -0500 40687 +++ ncurses-5.6/man/term.7 200 7-12-21 00:02:36.000000000 -050043020 +++ ncurses-5.6/man/term.7 2008-06-18 06:49:44.000000000 -0400 40688 43021 @@ -1,5 +1,5 @@ 40689 43022 .\"*************************************************************************** … … 40734 43067 diff -Naur ncurses-5.6.orig/man/terminfo.head ncurses-5.6/man/terminfo.head 40735 43068 --- ncurses-5.6.orig/man/terminfo.head 2006-05-13 11:35:45.000000000 -0400 40736 +++ ncurses-5.6/man/terminfo.head 200 7-12-21 00:02:36.000000000 -050043069 +++ ncurses-5.6/man/terminfo.head 2008-06-18 06:49:44.000000000 -0400 40737 43070 @@ -26,8 +26,8 @@ 40738 43071 .\" authorization. * … … 40776 43109 diff -Naur ncurses-5.6.orig/man/terminfo.tail ncurses-5.6/man/terminfo.tail 40777 43110 --- ncurses-5.6.orig/man/terminfo.tail 2006-04-01 17:47:01.000000000 -0500 40778 +++ ncurses-5.6/man/terminfo.tail 200 7-12-21 00:02:36.000000000 -050043111 +++ ncurses-5.6/man/terminfo.tail 2008-06-18 06:49:47.000000000 -0400 40779 43112 @@ -1,11 +1,11 @@ 40780 43113 -.\" $Id: terminfo.tail,v 1.44 2006/04/01 22:47:01 tom Exp $ 40781 +.\" $Id: terminfo.tail,v 1.4 8 2007/06/02 20:30:40tom Exp $43114 +.\" $Id: terminfo.tail,v 1.49 2008/02/16 20:57:43 tom Exp $ 40782 43115 .\" Beginning of terminfo.tail file 40783 43116 .\" This file is part of ncurses. … … 40801 43134 For example, to address the cursor, the 40802 43135 .B cup 40803 @@ -395,7 +395,7 @@ 43136 @@ -325,7 +325,9 @@ 43137 outputs `%' 43138 .TP 43139 %\fI[[\fP:\fI]flags][width[.precision]][\fPdoxXs\fI]\fP 43140 -as in \fBprintf\fP, flags are [-+#] and space 43141 +as in \fBprintf\fP, flags are [-+#] and space. 43142 +Use a `:' to allow the next character to be a `-' flag, 43143 +avoiding interpreting "%-" as an operator. 43144 .TP 43145 %c 43146 print pop() like %c in \fBprintf\fP 43147 @@ -395,7 +397,7 @@ 40804 43148 .IP 40805 43149 where c\di\u are conditions, b\di\u are bodies. … … 40810 43154 Some strings, e.g., \fBsgr\fP can be very complicated when written 40811 43155 on one line. 40812 @@ -993,7 +99 3,7 @@43156 @@ -993,7 +995,7 @@ 40813 43157 They are normally sent to the terminal, by the 40814 43158 .I init … … 40819 43163 They will be printed in the following order: 40820 43164 .RS 40821 @@ -1578,7 +15 78,7 @@43165 @@ -1578,7 +1580,7 @@ 40822 43166 * 40823 43167 and the termcap library (like the one in BSD/OS 1.1 and GNU) reads … … 40828 43172 * 40829 43173 and \fBtgetent()\fP is searching for a terminal type that either is the 40830 @@ -1599,19 +1 599,19 @@43174 @@ -1599,19 +1601,19 @@ 40831 43175 .PP 40832 43176 The "after tc expansion" length will have a similar effect to the … … 40851 43195 The -c (check) option also checks resolved (after tc 40852 43196 expansion) lengths. 40853 @@ -1688,7 +16 88,7 @@43197 @@ -1688,7 +1690,7 @@ 40854 43198 \fB@TIC@\fR(1M), 40855 43199 \fB@INFOCMP@\fR(1M), … … 40862 43206 diff -Naur ncurses-5.6.orig/man/tic.1m ncurses-5.6/man/tic.1m 40863 43207 --- ncurses-5.6.orig/man/tic.1m 2006-05-13 11:14:01.000000000 -0400 40864 +++ ncurses-5.6/man/tic.1m 200 7-12-21 00:02:36.000000000 -050043208 +++ ncurses-5.6/man/tic.1m 2008-06-18 06:49:44.000000000 -0400 40865 43209 @@ -26,8 +26,8 @@ 40866 43210 .\" authorization. * … … 40885 43229 diff -Naur ncurses-5.6.orig/man/toe.1m ncurses-5.6/man/toe.1m 40886 43230 --- ncurses-5.6.orig/man/toe.1m 2006-05-13 11:14:01.000000000 -0400 40887 +++ ncurses-5.6/man/toe.1m 2007-12-21 00:02:36.000000000 -0500 43231 +++ ncurses-5.6/man/toe.1m 2008-06-18 06:49:45.000000000 -0400 43232 @@ -1,5 +1,5 @@ 43233 .\"*************************************************************************** 43234 -.\" Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. * 43235 +.\" Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * 43236 .\" * 43237 .\" Permission is hereby granted, free of charge, to any person obtaining a * 43238 .\" copy of this software and associated documentation files (the * 40888 43239 @@ -26,8 +26,8 @@ 40889 43240 .\" authorization. * … … 40892 43243 -.\" $Id: toe.1m,v 1.18 2006/05/13 15:14:01 tom Exp $ 40893 43244 -.TH toe 1M "" 40894 +.\" $Id: toe.1m,v 1.2 0 2006/12/24 17:20:37tom Exp $43245 +.\" $Id: toe.1m,v 1.21 2008/01/05 20:57:16 tom Exp $ 40895 43246 +.TH @TOE@ 1M "" 40896 43247 .ds n 5 40897 43248 .ds d @TERMINFO@ 40898 43249 .SH NAME 40899 @@ -67,7 +67,7 @@ 43250 @@ -37,10 +37,14 @@ 43251 .br 43252 .SH DESCRIPTION 43253 .PP 43254 -With no options, \fBtoe\fR lists all available terminal types by primary name 43255 -with descriptions. File arguments specify the directories to be scanned; if no 43256 -such arguments are given, your default terminfo directory is scanned. If you 43257 -also specify the \fB-h\fR option, a directory header will be issued as each 43258 +With no options, 43259 +\fBtoe\fR lists all available terminal types by primary name 43260 +with descriptions. 43261 +File arguments specify the directories to be scanned; if no 43262 +such arguments are given, 43263 +your default terminfo directory is scanned. 43264 +If you also specify the \fB-h\fR option, 43265 +a directory header will be issued as each 43266 directory is entered. 43267 .PP 43268 There are other options intended for use by terminfo file maintainers: 43269 @@ -50,16 +54,25 @@ 43270 rather than only the first one that it finds. 43271 .TP 43272 \fB-u\fR \fIfile\fR 43273 -says to issue a report on dependencies in the given file. This report condenses 43274 -the `use' relation: each line consists of the primary name of a terminal that 43275 -has use capabilities, followed by a colon, followed by the 43276 +says to write a report to the standard output, 43277 +listing dependencies in the given terminfo/termcap source file. 43278 +The report condenses the `use' relation: 43279 +each line consists of the primary name of a terminal that 43280 +has use capabilities, 43281 +followed by a colon, 43282 +followed by the 43283 whitespace-separated primary names of all terminals which occur in those use 43284 -capabilities, followed by a newline 43285 +capabilities, 43286 +followed by a newline 43287 .TP 43288 \fB-U\fR \fIfile\fR 43289 -says to issue a report on reverse dependencies in the given file. This report 43290 -reverses the `use' relation: each line consists of the primary name of a 43291 -terminal that occurs in use capabilities, followed by a colon, followed by the 43292 +says to write a report to the standard output, 43293 +listing reverse dependencies in the given terminfo/termcap source file. 43294 +The report reverses the `use' relation: 43295 +each line consists of the primary name of a 43296 +terminal that occurs in use capabilities, 43297 +followed by a colon, 43298 +followed by the 43299 whitespace-separated primary names of all terminals which depend on it, 43300 followed by a newline. 43301 .TP 43302 @@ -67,10 +80,11 @@ 40900 43303 specifies that (verbose) output be written to standard error, 40901 43304 showing \fBtoe\fR's progress. … … 40905 43308 .TP 40906 43309 \fB-V\fR 40907 reports the version of ncurses which was used in this program, and exits. 43310 -reports the version of ncurses which was used in this program, and exits. 43311 +reports the version of ncurses which was used in this program, 43312 +and exits. 43313 .SH FILES 43314 .TP 5 43315 \fB\*d/?/*\fR 40908 43316 diff -Naur ncurses-5.6.orig/man/tput.1 ncurses-5.6/man/tput.1 40909 43317 --- ncurses-5.6.orig/man/tput.1 2006-05-13 11:14:01.000000000 -0400 40910 +++ ncurses-5.6/man/tput.1 200 7-12-21 00:02:36.000000000 -050043318 +++ ncurses-5.6/man/tput.1 2008-06-18 06:49:44.000000000 -0400 40911 43319 @@ -27,27 +27,27 @@ 40912 43320 .\" authorization. * … … 41107 43515 diff -Naur ncurses-5.6.orig/man/tset.1 ncurses-5.6/man/tset.1 41108 43516 --- ncurses-5.6.orig/man/tset.1 2006-07-29 07:34:07.000000000 -0400 41109 +++ ncurses-5.6/man/tset.1 200 7-12-21 00:02:36.000000000 -050043517 +++ ncurses-5.6/man/tset.1 2008-06-18 06:49:44.000000000 -0400 41110 43518 @@ -26,7 +26,7 @@ 41111 43519 .\" authorization. * … … 41128 43536 diff -Naur ncurses-5.6.orig/menu/Makefile.in ncurses-5.6/menu/Makefile.in 41129 43537 --- ncurses-5.6.orig/menu/Makefile.in 2006-10-14 16:40:36.000000000 -0400 41130 +++ ncurses-5.6/menu/Makefile.in 200 7-12-21 00:02:36.000000000 -050043538 +++ ncurses-5.6/menu/Makefile.in 2008-06-18 06:49:44.000000000 -0400 41131 43539 @@ -1,6 +1,6 @@ 41132 43540 -# $Id: Makefile.in,v 1.43 2006/10/14 20:40:36 tom Exp $ … … 41176 43584 diff -Naur ncurses-5.6.orig/menu/headers ncurses-5.6/menu/headers 41177 43585 --- ncurses-5.6.orig/menu/headers 1998-02-11 07:13:49.000000000 -0500 41178 +++ ncurses-5.6/menu/headers 200 7-12-21 00:02:36.000000000 -050043586 +++ ncurses-5.6/menu/headers 2008-06-18 06:49:44.000000000 -0400 41179 43587 @@ -1,5 +1,5 @@ 41180 43588 ############################################################################## … … 41191 43599 diff -Naur ncurses-5.6.orig/menu/menu.h ncurses-5.6/menu/menu.h 41192 43600 --- ncurses-5.6.orig/menu/menu.h 2003-11-08 15:48:24.000000000 -0500 41193 +++ ncurses-5.6/menu/menu.h 200 7-12-21 00:02:36.000000000 -050043601 +++ ncurses-5.6/menu/menu.h 2008-06-18 06:49:44.000000000 -0400 41194 43602 @@ -1,5 +1,5 @@ 41195 43603 /**************************************************************************** … … 41238 43646 diff -Naur ncurses-5.6.orig/menu/modules ncurses-5.6/menu/modules 41239 43647 --- ncurses-5.6.orig/menu/modules 2004-12-25 17:06:33.000000000 -0500 41240 +++ ncurses-5.6/menu/modules 200 7-12-21 00:02:36.000000000 -050043648 +++ ncurses-5.6/menu/modules 2008-06-18 06:49:44.000000000 -0400 41241 43649 @@ -1,6 +1,6 @@ 41242 43650 -# $Id: modules,v 1.16 2004/12/25 22:06:33 tom Exp $ … … 41265 43673 diff -Naur ncurses-5.6.orig/misc/Makefile.in ncurses-5.6/misc/Makefile.in 41266 43674 --- ncurses-5.6.orig/misc/Makefile.in 2006-10-21 09:28:03.000000000 -0400 41267 +++ ncurses-5.6/misc/Makefile.in 200 7-12-21 00:02:36.000000000 -050043675 +++ ncurses-5.6/misc/Makefile.in 2008-06-18 06:49:44.000000000 -0400 41268 43676 @@ -1,6 +1,6 @@ 41269 43677 -# $Id: Makefile.in,v 1.40 2006/10/21 13:28:03 tom Exp $ … … 41319 43727 diff -Naur ncurses-5.6.orig/misc/ncurses-config.in ncurses-5.6/misc/ncurses-config.in 41320 43728 --- ncurses-5.6.orig/misc/ncurses-config.in 2006-10-28 16:22:52.000000000 -0400 41321 +++ ncurses-5.6/misc/ncurses-config.in 200 7-12-21 00:02:36.000000000 -050043729 +++ ncurses-5.6/misc/ncurses-config.in 2008-06-18 06:49:44.000000000 -0400 41322 43730 @@ -1,7 +1,7 @@ 41323 43731 #!@SHELL@ … … 41344 43752 diff -Naur ncurses-5.6.orig/misc/shlib ncurses-5.6/misc/shlib 41345 43753 --- ncurses-5.6.orig/misc/shlib 2005-06-25 18:41:17.000000000 -0400 41346 +++ ncurses-5.6/misc/shlib 200 7-12-21 00:02:36.000000000 -050043754 +++ ncurses-5.6/misc/shlib 2008-06-18 06:49:44.000000000 -0400 41347 43755 @@ -29,7 +29,7 @@ 41348 43756 # … … 41364 43772 diff -Naur ncurses-5.6.orig/misc/terminfo.src ncurses-5.6/misc/terminfo.src 41365 43773 --- ncurses-5.6.orig/misc/terminfo.src 2006-10-07 13:52:03.000000000 -0400 41366 +++ ncurses-5.6/misc/terminfo.src 200 7-12-21 00:02:36.000000000 -050043774 +++ ncurses-5.6/misc/terminfo.src 2008-06-18 06:49:50.000000000 -0400 41367 43775 @@ -6,8 +6,8 @@ 41368 43776 # Report bugs and new terminal descriptions to … … 41371 43779 -# $Revision: 1.303 $ 41372 43780 -# $Date: 2006/10/07 17:52:03 $ 41373 +# $Revision: 1.3 18 $41374 +# $Date: 200 7/11/03 19:02:01 $43781 +# $Revision: 1.328 $ 43782 +# $Date: 2008/04/29 00:49:41 $ 41375 43783 # 41376 43784 # The original header is preserved below for reference. It is noted that there … … 41404 43812 # One of the keyboard selections is "VT100+". 41405 43813 # pterm (the X11 port) uses shifted F1-F10 as F11-F20 41406 @@ -3015,11 +3026,10 @@ 43814 @@ -3006,20 +3017,17 @@ 43815 cnorm=\E[?12l\E[?25h, cvvis=\E[?12;25h, indn=\E[%p1%dS, 43816 rin=\E[%p1%dT, use=xterm-xf86-v43, 43817 43818 -# This is the most common alias for xterm-new. 43819 xterm-xfree86|xterm terminal emulator (XFree86), 43820 - use=xterm-new, 43821 -# use=xterm-old, 43822 + use=xterm-xf86-v44, 43823 43824 # This version reflects the current xterm features. 41407 43825 xterm-new|modern xterm terminal emulator, 41408 43826 npc, … … 41420 43838 # 41421 43839 # This fragment describes as much of XFree86 xterm's "pc-style" function 41422 @@ -3060,25 +3070,30 @@ 43840 @@ -3038,7 +3046,16 @@ 43841 # The meta key may also be used as a modifier in this scheme, adding another 43842 # bit to the parameter. 43843 xterm+pcfkeys|fragment for PC-style fkeys, 43844 - use=xterm+pcf2, use=xterm+pcc2, 43845 + use=xterm+app, use=xterm+pcf2, use=xterm+pcc2, 43846 + use=xterm+pce2, 43847 +# 43848 +xterm+noapp|fragment with cursor keys in normal mode, 43849 + kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kend=\E[F, 43850 + khome=\E[H, 43851 + 43852 +xterm+app|fragment with cursor keys in application mode, 43853 + kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kend=\EOF, 43854 + khome=\EOH, 43855 # 43856 # The "PC-style" modifier scheme was introduced in xterm patch #94 (1999/3/27) 43857 # and revised in patch #167 (2002/8/24). Some other terminal emulators copied 43858 @@ -3060,25 +3077,41 @@ 41423 43859 # modifyCursorKeys resource. These fragments list the modified cursor-keys 41424 43860 # that might apply to xterm+pcfkeys with different values of that resource. 41425 43861 xterm+pcc3|fragment with modifyCursorKeys:3, 41426 43862 - kDN=\E[>1;2B, kDN5=\E[>1;5B, kDN6=\E[>1;6B, 43863 - kLFT5=\E[>1;5D, kLFT6=\E[>1;6D, kRIT5=\E[>1;5C, 43864 - kRIT6=\E[>1;6C, kUP=\E[>1;2A, kUP5=\E[>1;5A, 43865 - kUP6=\E[>1;6A, 41427 43866 + kLFT=\E[>1;2D, kRIT=\E[>1;2C, kind=\E[>1;2B, 41428 + kri=\E[>1;2A, kDN=\E[>1;2B, kDN5=\E[>1;5B, kDN6=\E[>1;6B, 41429 kLFT5=\E[>1;5D, kLFT6=\E[>1;6D, kRIT5=\E[>1;5C, 41430 kRIT6=\E[>1;6C, kUP=\E[>1;2A, kUP5=\E[>1;5A, 41431 kUP6=\E[>1;6A, 43867 + kri=\E[>1;2A, kDN=\E[>1;2B, kDN3=\E[>1;3B, kDN4=\E[>1;4B, 43868 + kDN5=\E[>1;5B, kDN6=\E[>1;6B, kDN7=\E[>1;7B, 43869 + kLFT3=\E[>1;3D, kLFT4=\E[>1;4D, kLFT5=\E[>1;5D, 43870 + kLFT6=\E[>1;6D, kLFT7=\E[>1;7D, kRIT3=\E[>1;3C, 43871 + kRIT4=\E[>1;4C, kRIT5=\E[>1;5C, kRIT6=\E[>1;6C, 43872 + kRIT7=\E[>1;7C, kUP=\E[>1;2A, kUP3=\E[>1;3A, 43873 + kUP4=\E[>1;4A, kUP5=\E[>1;5A, kUP6=\E[>1;6A, 43874 + kUP7=\E[>1;7A, 41432 43875 41433 43876 xterm+pcc2|fragment with modifyCursorKeys:2, 43877 - kDN=\E[1;2B, kDN5=\E[1;5B, kDN6=\E[1;6B, kLFT5=\E[1;5D, 43878 - kLFT6=\E[1;6D, kRIT5=\E[1;5C, kRIT6=\E[1;6C, kUP=\E[1;2A, 43879 - kUP5=\E[1;5A, kUP6=\E[1;6A, 41434 43880 + kLFT=\E[1;2D, kRIT=\E[1;2C, kind=\E[1;2B, kri=\E[1;2A, 41435 kDN=\E[1;2B, kDN5=\E[1;5B, kDN6=\E[1;6B, kLFT5=\E[1;5D, 41436 kLFT6=\E[1;6D, kRIT5=\E[1;5C, kRIT6=\E[1;6C, kUP=\E[1;2A, 41437 kUP5=\E[1;5A, kUP6=\E[1;6A, 43881 + kDN=\E[1;2B, kDN3=\E[1;3B, kDN4=\E[1;4B, kDN5=\E[1;5B, 43882 + kDN6=\E[1;6B, kDN7=\E[1;7B, kLFT3=\E[1;3D, kLFT4=\E[1;4D, 43883 + kLFT5=\E[1;5D, kLFT6=\E[1;6D, kLFT7=\E[1;7D, 43884 + kRIT3=\E[1;3C, kRIT4=\E[1;4C, kRIT5=\E[1;5C, 43885 + kRIT6=\E[1;6C, kRIT7=\E[1;7C, kUP=\E[1;2A, kUP3=\E[1;3A, 43886 + kUP4=\E[1;4A, kUP5=\E[1;5A, kUP6=\E[1;6A, kUP7=\E[1;7A, 41438 43887 41439 43888 xterm+pcc1|fragment with modifyCursorKeys:1, … … 41442 43891 - kUP5=\E[5A, kUP6=\E[6A, 41443 43892 + kLFT=\E[2D, kRIT=\E[2C, kind=\E[2B, kri=\E[2A, kDN=\E[2B, 41444 + kDN5=\E[5B, kDN6=\E[6B, kLFT5=\E[5D, kLFT6=\E[6D, 41445 + kRIT5=\E[5C, kRIT6=\E[6C, kUP=\E[2A, kUP5=\E[5A, 41446 + kUP6=\E[6A, 43893 + kDN3=\E[3B, kDN4=\E[4B, kDN5=\E[5B, kDN6=\E[6B, kDN7=\E[7B, 43894 + kLFT3=\E[3D, kLFT4=\E[4D, kLFT5=\E[5D, kLFT6=\E[6D, 43895 + kLFT7=\E[7D, kRIT3=\E[3C, kRIT4=\E[4C, kRIT5=\E[5C, 43896 + kRIT6=\E[6C, kRIT7=\E[7C, kUP=\E[2A, kUP3=\E[3A, 43897 + kUP4=\E[4A, kUP5=\E[5A, kUP6=\E[6A, kUP7=\E[7A, 41447 43898 41448 43899 xterm+pcc0|fragment with modifyCursorKeys:0, … … 41451 43902 - kUP5=\EO5A, kUP6=\EO6A, 41452 43903 + kLFT=\EO2D, kRIT=\EO2C, kind=\EO2B, kri=\EO2A, kDN=\EO2B, 41453 + kDN5=\EO5B, kDN6=\EO6B, kLFT5=\EO5D, kLFT6=\EO6D, 41454 + kRIT5=\EO5C, kRIT6=\EO6C, kUP=\EO2A, kUP5=\EO5A, 41455 + kUP6=\EO6A, 43904 + kDN3=\EO3B, kDN4=\EO4B, kDN5=\EO5B, kDN6=\EO6B, kDN7=\EO7B, 43905 + kLFT3=\EO3D, kLFT4=\EO4D, kLFT5=\EO5D, kLFT6=\EO6D, 43906 + kLFT7=\EO7D, kRIT3=\EO3C, kRIT4=\EO4C, kRIT5=\EO5C, 43907 + kRIT6=\EO6C, kRIT7=\EO7C, kUP=\EO2A, kUP3=\EO3A, 43908 + kUP4=\EO4A, kUP5=\EO5A, kUP6=\EO6A, kUP7=\EO7A, 41456 43909 + 41457 43910 # 41458 43911 # Here are corresponding fragments from xterm patch #216: 41459 43912 # 41460 @@ -3101,24 +31 16,37@@43913 @@ -3101,24 +3134,63 @@ 41461 43914 kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~, kf61=\EO4P, 41462 43915 kf62=\EO4Q, kf63=\EO4R, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, … … 41494 43947 + kf8=\E[19~, kf9=\E[20~, 41495 43948 +# 43949 +# Chunks from xterm #230: 43950 +xterm+pce2|fragment with modifyCursorKeys:2, 43951 + kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~, 43952 + kNXT=\E[6;2~, kPRV=\E[5;2~, kich1=\E[2~, knp=\E[6~, 43953 + kpp=\E[5~, kDC3=\E[3;3~, kDC4=\E[3;4~, kDC5=\E[3;5~, 43954 + kDC6=\E[3;6~, kDC7=\E[3;7~, kEND3=\E[1;3F, kEND4=\E[1;4F, 43955 + kEND5=\E[1;5F, kEND6=\E[1;6F, kEND7=\E[1;7F, 43956 + kHOM3=\E[1;3H, kHOM4=\E[1;4H, kHOM5=\E[1;5H, 43957 + kHOM6=\E[1;6H, kHOM7=\E[1;7H, kIC3=\E[2;3~, kIC4=\E[2;4~, 43958 + kIC5=\E[2;5~, kIC6=\E[2;6~, kIC7=\E[2;7~, kNXT3=\E[6;3~, 43959 + kNXT4=\E[6;4~, kNXT5=\E[6;5~, kNXT6=\E[6;6~, 43960 + kNXT7=\E[6;7~, kPRV3=\E[5;3~, kPRV4=\E[5;4~, 43961 + kPRV5=\E[5;5~, kPRV6=\E[5;6~, kPRV7=\E[5;7~, 43962 + use=xterm+edit, 43963 + 43964 +xterm+edit|fragment for 6-key editing-keypad, 43965 + kdch1=\E[3~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, 43966 + use=xterm+pc+edit, 43967 + 43968 +xterm+pc+edit|fragment for pc-style editing keypad, 43969 + kend=\E[4~, khome=\E[1~, 43970 + 43971 +xterm+vt+edit|fragment for vt220-style editing keypad, 43972 + kfnd=\E[1~, kslt=\E[4~, 43973 + 43974 +# 41496 43975 +# Those chunks use the new-style (the xterm oldFunctionKeys resource is false). 41497 43976 +# Alternatively, the same scheme with old-style function keys as in xterm-r6 … … 41508 43987 # This chunk is used for building the VT220/Sun/PC keyboard variants. 41509 43988 xterm-basic|modern xterm terminal emulator - common, 41510 @@ -3157,6 +3185,8 @@ 43989 @@ -3135,8 +3207,8 @@ 43990 flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, 43991 ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, 43992 ind=^J, invis=\E[8m, is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^H, 43993 - kdch1=\E[3~, kmous=\E[M, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, 43994 - meml=\El, memu=\Em, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, 43995 + kmous=\E[M, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, meml=\El, 43996 + memu=\Em, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, 43997 rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l, rmir=\E[4l, 43998 rmkx=\E[?1l\E>, rmm=\E[?1034l, rmso=\E[27m, rmul=\E[24m, 43999 rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7, 44000 @@ -3157,6 +3229,8 @@ 41511 44001 xterm-16color|xterm with 16 colors like aixterm, 41512 44002 use=ibm+16color, use=xterm-new, … … 41517 44007 ccc, 41518 44008 colors#256, pairs#32767, 41519 @@ -3165,6 +3 195,18 @@44009 @@ -3165,6 +3239,18 @@ 41520 44010 setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m, 41521 44011 setb@, setf@, … … 41536 44026 colors#88, pairs#7744, use=xterm+256color, 41537 44027 41538 @@ -3444,11 +3486,23 @@ 44028 @@ -3268,7 +3354,8 @@ 44029 kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf20=\E[34~, 44030 kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, 44031 khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~, 44032 - use=xterm-basic, use=vt220+keypad, 44033 + use=xterm+app, use=xterm+edit, use=xterm-basic, 44034 + use=vt220+keypad, 44035 44036 xterm-vt52|xterm emulating dec vt52, 44037 cols#80, it#8, lines#24, 44038 @@ -3279,11 +3366,11 @@ 44039 kcuf1=\EC, kcuu1=\EA, nel=^M^J, ri=\EI, rmacs=\EG, smacs=\EF, 44040 44041 xterm-noapp|xterm with cursor keys in normal mode, 44042 - kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, rmcup@, 44043 - rmkx=\E>, smcup@, smkx=\E=, use=xterm, 44044 + rmcup@, rmkx=\E>, smcup@, smkx=\E=, use=xterm+noapp, 44045 + use=xterm, 44046 44047 xterm-24|vs100|xterms|xterm terminal emulator (X Window System), 44048 - lines#24, use=xterm, 44049 + lines#24, use=xterm-old, 44050 44051 # This is xterm for ncurses. 44052 xterm|xterm terminal emulator (X Window System), 44053 @@ -3307,7 +3394,7 @@ 44054 # 44055 # xterm with bold instead of underline 44056 xterm-bold|xterm terminal emulator (X11R6 Window System) standout w/bold, 44057 - smso=\E[7m, smul=\E[1m, use=xterm, 44058 + smso=\E[7m, smul=\E[1m, use=xterm-old, 44059 # (kterm: this had extension capabilities ":KJ:TY=ascii:" -- esr) 44060 # (kterm should not invoke DEC Graphics as the alternate character set 44061 # -- Kenji Rikitake) 44062 @@ -3444,11 +3531,23 @@ 41539 44063 rs2=\E7\E[r\E8\E[m\E[?7h\E[!p\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?25h, 41540 44064 use=ansi+enq, use=xterm+pcc0, use=gnome-rh90, … … 41562 44086 # XFCE Terminal 0.2.5.4beta2 41563 44087 # 41564 @@ -3551,14 +36 05,29 @@44088 @@ -3551,14 +3650,29 @@ 41565 44089 konsole|KDE console window, 41566 44090 use=konsole-xf4x, … … 41597 44121 am, eslok, km, mc5i, mir, msgr, npc, xenl, 41598 44122 colors#8, cols#80, it#8, lines#24, pairs#64, 41599 @@ -3574,21 +36 43,29 @@44123 @@ -3574,21 +3688,29 @@ 41600 44124 ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS, 41601 44125 is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, … … 41638 44162 # From: Thomas Dickey <dickey@clark.net> 04 Oct 1997 41639 44163 # Updated: Oezguer Kesim <kesim@math.fu-berlin.de> 02 Nov 1997 41640 @@ -3607,7 +3 684,7 @@44164 @@ -3607,7 +3729,7 @@ 41641 44165 # 41642 44166 # rxvt is normally configured to look for "xterm" or "xterm-color" as $TERM. … … 41647 44171 # removed dch/dch1 because they are inconsistent with bce/ech -TD 41648 44172 # remove km as per tack test -TD 41649 @@ -3677,6 +37 54,7 @@44173 @@ -3677,6 +3799,7 @@ 41650 44174 # F18 ESC [ 32 ~ ESC [ 32 $ ESC [ 32 ^ ESC [ 32 @ 41651 44175 # F19 ESC [ 33 ~ ESC [ 33 $ ESC [ 33 ^ ESC [ 33 @ … … 41655 44179 # Up ESC [ A ESC [ a ESC O a ESC O A 41656 44180 # Down ESC [ B ESC [ b ESC O b ESC O B 41657 @@ -3704,10 +3 782,18 @@44181 @@ -3704,10 +3827,18 @@ 41658 44182 # XK_KP_8 8 ESC O x 41659 44183 # XK_KP_9 9 ESC O y … … 41675 44199 kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kel=\E[8\^, 41676 44200 kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~, 41677 @@ -3722,7 +38 08,10 @@44201 @@ -3722,7 +3853,10 @@ 41678 44202 kf41=\E[33\^, kf42=\E[34\^, kf43=\E[23@, kf44=\E[24@, 41679 44203 kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, … … 41687 44211 41688 44212 rxvt|rxvt terminal emulator (X Window System), 41689 @@ -3747,6 +38 36,13 @@44213 @@ -3747,6 +3881,13 @@ 41690 44214 rxvt-16color|xterm with 16 colors like aixterm, 41691 44215 ncv#32, use=ibm+16color, use=rxvt, … … 41701 44225 # 41702 44226 # Eterm 0.9.3 41703 @@ -15183,6 +15279,82 @@ 44227 @@ -4218,13 +4359,20 @@ 44228 # if the terminal is wide (132 cols or more)). If even this 44229 # entry cannot be found, "vt100" is used as a substitute. 44230 # 44231 +# Notwithstanding the manpage, screen uses its own notion of the termcap 44232 +# and some keys from "screen.<term>" are ignored. Here is an entry which 44233 +# covers those (tested with screen 4.00.02) -TD 44234 +screen+fkeys|function-keys according to screen, 44235 + kend=\E[4~, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kfnd@, 44236 + khome=\E[1~, kslt@, 44237 +# 44238 # Here are a few customized entries which are useful -TD 44239 # 44240 # Notes: 44241 # (a) screen does not support invis. 44242 # (b) screen's implementation of bw is incorrect according to tack. 44243 # (c) screen appears to hardcode the strings for khome/kend, making it 44244 -# necessary to override the "use=" clause's values. 44245 +# necessary to override the "use=" clause's values (screen+fkeys). 44246 # (d) screen sets $TERMCAP to a termcap-formatted copy of the 'screen' entry, 44247 # which is NOT the same as the terminfo screen.<term>. 44248 # (e) when screen finds one of these customized entries, it sets $TERM to 44249 @@ -4236,24 +4384,29 @@ 44250 # translation. They are suppressed here to show what is tested by tack. 44251 screen.xterm-xfree86|screen.xterm-new|screen customized for modern xterm, 44252 bce@, bw, 44253 - invis@, kIC@, kNXT@, kPRV@, kend=\E[4~, khome=\E[1~, meml@, 44254 - memu@, 44255 + invis@, kIC@, kNXT@, kPRV@, meml@, memu@, 44256 sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m, 44257 - use=xterm-new, 44258 + use=screen+fkeys, use=xterm-new, 44259 # xterm-r6 does not really support khome/kend unless it is propped up by 44260 # the translations resource. 44261 screen.xterm-r6|screen customized for X11R6 xterm, 44262 - bw, use=xterm-r6, 44263 + bw, use=screen+fkeys, use=xterm-r6, 44264 # Color applications running in screen and TeraTerm do not play well together 44265 # on Solaris because Sun's curses implementation gets confused. 44266 screen.teraterm|disable ncv in teraterm, 44267 ncv#127, 44268 acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376, 44269 - use=screen, 44270 + use=screen+fkeys, use=screen, 44271 +# Other terminals 44272 +screen.rxvt|screen in rxvt, 44273 + bw, 44274 + cvvis@, flash@, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, 44275 + kcuu1=\EOA, use=screen+fkeys, use=vt100+enq, 44276 + use=rxvt+pcfkeys, use=vt220+keypad, use=screen, 44277 # fix the backspace key 44278 screen.linux|screen in linux console, 44279 bw, 44280 - kbs=\177, kcbt@, use=screen, 44281 + kbs=\177, kcbt@, use=screen+fkeys, use=screen, 44282 44283 screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols, 44284 cols#132, use=screen, 44285 @@ -15183,6 +15336,82 @@ 41704 44286 sgr0=^O, smso=\E0Q\016, smul=\E0`\016, 41705 44287 vpa=\013%p1%{64}%+%c, … … 41784 44366 # 41785 44367 # These are official terminfo entries from within Perkin-Elmer. 41786 @@ -18147,19 +183 19,19 @@44368 @@ -18147,19 +18376,19 @@ 41787 44369 h19|heath|h19-b|heathkit|heath-19|z19|zenith|heathkit h19, 41788 44370 OTbs, am, eslok, hs, mir, msgr, … … 41814 44396 lines#60, 41815 44397 dl1=\EM, il1=\EL, use=h19, 41816 @@ -18285,14 +18 457,15 @@44398 @@ -18285,14 +18514,15 @@ 41817 44399 z100bw|h100bw|z110bw|z-100bw|h-100bw|heath/zenith z-100 pc, 41818 44400 OTbs, OTpt, mir, msgr, … … 41838 44420 dl1=\EM$<2*/>, il1=\EL$<2*/>, use=h19-b, 41839 44421 # From: <ucscc!B.fiatlux@ucbvax.berkeley.edu> 41840 @@ -20696,6 +20 869,99 @@44422 @@ -20696,6 +20926,99 @@ 41841 44423 # * Back off the xterm entry to use r6 as a base. 41842 44424 # 9.13.22 (Sat Nov 30 11:51:31 EST 1996): … … 41938 44520 # * Replaced minitel-2 entry. 41939 44521 # * Added MGR, ansi-nt. 41940 @@ -20748,6 +210 14,8 @@44522 @@ -20748,6 +21071,8 @@ 41941 44523 # * Incorporated att700 from the Boundless Technology FTP site. 41942 44524 # * Miscellaneous contact-address and Web-page updates. … … 41947 44529 # * add nxterm and xterm-color terminfo description (request by Cristian 41948 44530 # Gafton <gafton@redhat.com>). 41949 @@ -21309,6 +21 577,36@@44531 @@ -21309,6 +21634,51 @@ 41950 44532 # * add several GNU Screen variations with 16- and 256-colors, and 41951 44533 # status line (Alain Bench). … … 41981 44563 +# * correct acsc strings for h19 and z100 (Benjamin Sittler) 41982 44564 +# 44565 +# 2007-11-11 44566 +# * use xterm-xf86-v44 for "xterm-xfree86", reflecting changes to 44567 +# xterm starting with patch #216 -TD 44568 +# * make legacy xterm entries such as xterm-24 inherit from xterm-old, 44569 +# to match xterm #230 -TD 44570 +# * extend xterm+pccX entries to match xterm #230 -TD 44571 +# * add xterm+app, xterm+noapp, from xterm #230 -TD 44572 +# * add/use xterm+pce2 from xterm #230, in xterm+pcfkeys -TD 44573 +# 44574 +# 2008-04-19 44575 +# * add screen.rxvt -TD 44576 +# 44577 +# 2008-04-28 44578 +# * add screen+fkeys (prompted by Debian # 478094) -TD 44579 +# 41983 44580 # The following sets edit modes for GNU EMACS. 41984 44581 # Local Variables: … … 41986 44583 diff -Naur ncurses-5.6.orig/mk-1st.awk ncurses-5.6/mk-1st.awk 41987 44584 --- ncurses-5.6.orig/mk-1st.awk 2006-10-07 20:14:08.000000000 -0400 41988 +++ ncurses-5.6/mk-1st.awk 200 7-12-21 00:02:36.000000000 -050044585 +++ ncurses-5.6/mk-1st.awk 2008-06-18 06:49:44.000000000 -0400 41989 44586 @@ -1,6 +1,6 @@ 41990 44587 -# $Id: mk-1st.awk,v 1.68 2006/10/08 00:14:08 tom Exp $ … … 42253 44850 diff -Naur ncurses-5.6.orig/mk-hdr.awk ncurses-5.6/mk-hdr.awk 42254 44851 --- ncurses-5.6.orig/mk-hdr.awk 1969-12-31 19:00:00.000000000 -0500 42255 +++ ncurses-5.6/mk-hdr.awk 200 7-12-21 00:02:36.000000000 -050044852 +++ ncurses-5.6/mk-hdr.awk 2008-06-18 06:49:44.000000000 -0400 42256 44853 @@ -0,0 +1,107 @@ 42257 44854 +# $Id: mk-hdr.awk,v 1.2 2007/03/31 15:48:45 tom Exp $ … … 42364 44961 diff -Naur ncurses-5.6.orig/mkdirs.sh ncurses-5.6/mkdirs.sh 42365 44962 --- ncurses-5.6.orig/mkdirs.sh 1969-12-31 19:00:00.000000000 -0500 42366 +++ ncurses-5.6/mkdirs.sh 200 7-12-21 00:02:36.000000000 -050044963 +++ ncurses-5.6/mkdirs.sh 2008-06-18 06:49:44.000000000 -0400 42367 44964 @@ -0,0 +1,51 @@ 42368 44965 +#! /bin/sh … … 42461 45058 diff -Naur ncurses-5.6.orig/ncurses/Makefile.in ncurses-5.6/ncurses/Makefile.in 42462 45059 --- ncurses-5.6.orig/ncurses/Makefile.in 2006-10-14 15:08:11.000000000 -0400 42463 +++ ncurses-5.6/ncurses/Makefile.in 200 7-12-21 00:02:36.000000000 -050045060 +++ ncurses-5.6/ncurses/Makefile.in 2008-06-18 06:49:44.000000000 -0400 42464 45061 @@ -1,6 +1,6 @@ 42465 45062 -# $Id: Makefile.in,v 1.101 2006/10/14 19:08:11 tom Exp $ … … 42596 45193 diff -Naur ncurses-5.6.orig/ncurses/base/MKkeyname.awk ncurses-5.6/ncurses/base/MKkeyname.awk 42597 45194 --- ncurses-5.6.orig/ncurses/base/MKkeyname.awk 2006-05-20 13:35:30.000000000 -0400 42598 +++ ncurses-5.6/ncurses/base/MKkeyname.awk 200 7-12-21 00:02:36.000000000 -050045195 +++ ncurses-5.6/ncurses/base/MKkeyname.awk 2008-06-18 06:49:51.000000000 -0400 42599 45196 @@ -1,6 +1,6 @@ 42600 45197 -# $Id: MKkeyname.awk,v 1.30 2006/05/20 17:35:30 tom Exp $ 42601 +# $Id: MKkeyname.awk,v 1.3 8 2007/08/18 18:41:18 tom Exp $45198 +# $Id: MKkeyname.awk,v 1.39 2008/05/31 19:54:58 tom Exp $ 42602 45199 ############################################################################## 42603 45200 -# Copyright (c) 1999-2005,2006 Free Software Foundation, Inc. # 42604 +# Copyright (c) 1999-200 6,2007Free Software Foundation, Inc. #45201 +# Copyright (c) 1999-2007,2008 Free Software Foundation, Inc. # 42605 45202 # # 42606 45203 # Permission is hereby granted, free of charge, to any person obtaining a # 42607 45204 # copy of this software and associated documentation files (the "Software"), # 42608 @@ -33, 18 +33,39@@45205 @@ -33,20 +33,41 @@ 42609 45206 print "#include <tic.h>" 42610 45207 print "#include <term_entry.h>" … … 42648 45245 + print "#define MyTable _nc_globals.keyname_table" 42649 45246 print "" 42650 print "NCURSES_EXPORT(NCURSES_CONST char *) keyname (int c)" 45247 - print "NCURSES_EXPORT(NCURSES_CONST char *) keyname (int c)" 45248 + print "NCURSES_EXPORT(NCURSES_CONST char *) _nc_keyname (SCREEN *sp, int c)" 42651 45249 print "{" 45250 print " int i;" 45251 print " char name[20];" 42652 45252 @@ -56,21 +77,30 @@ 42653 45253 print " if (c == -1) {" … … 42688 45288 print " p = name;" 42689 45289 - print " if (cc >= 128) {" 42690 + print " if (cc >= 128 && ( SP == 0 || SP->_use_meta)) {"45290 + print " if (cc >= 128 && (sp == 0 || sp->_use_meta)) {" 42691 45291 print " strcpy(p, \"M-\");" 42692 45292 print " p += 2;" … … 42704 45304 print "#if NCURSES_EXT_FUNCS && NCURSES_XNAMES" 42705 45305 print " } else if (result == 0 && cur_term != 0) {" 42706 @@ -111,24 +141, 15@@45306 @@ -111,24 +141,20 @@ 42707 45307 print " return result;" 42708 45308 print "}" … … 42710 45310 - print "#if USE_WIDEC_SUPPORT" 42711 45311 - print "NCURSES_EXPORT(NCURSES_CONST char *) key_name (wchar_t c)" 42712 - print "{" 45312 + print "NCURSES_EXPORT(NCURSES_CONST char *) keyname (int c)" 45313 print "{" 42713 45314 - print " NCURSES_CONST char *result = keyname((int)c);" 42714 45315 - print " if (!strncmp(result, \"M-\", 2)) result = 0;" 42715 45316 - print " return result;" 42716 - print "}" 45317 + print "\treturn _nc_keyname(SP, c);" 45318 print "}" 42717 45319 - print "#endif" 42718 -print ""45320 print "" 42719 45321 print "#if NO_LEAKS" 42720 45322 print "void _nc_keyname_leaks(void)" … … 42734 45336 diff -Naur ncurses-5.6.orig/ncurses/base/MKlib_gen.sh ncurses-5.6/ncurses/base/MKlib_gen.sh 42735 45337 --- ncurses-5.6.orig/ncurses/base/MKlib_gen.sh 2006-07-01 17:25:39.000000000 -0400 42736 +++ ncurses-5.6/ncurses/base/MKlib_gen.sh 200 7-12-21 00:02:36.000000000 -050045338 +++ ncurses-5.6/ncurses/base/MKlib_gen.sh 2008-06-18 06:49:45.000000000 -0400 42737 45339 @@ -2,10 +2,10 @@ 42738 45340 # … … 42740 45342 # 42741 45343 -# ($Id: MKlib_gen.sh,v 1.27 2006/07/01 21:25:39 tom Exp $) 42742 +# ($Id: MKlib_gen.sh,v 1. 29 2007/08/18 13:17:14tom Exp $)45344 +# ($Id: MKlib_gen.sh,v 1.30 2008/01/05 23:21:10 tom Exp $) 42743 45345 # 42744 45346 ############################################################################## 42745 45347 -# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. # 42746 +# Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. #45348 +# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. # 42747 45349 # # 42748 45350 # Permission is hereby granted, free of charge, to any person obtaining a # … … 42770 45372 $preprocessor $TMP 2>/dev/null \ 42771 45373 | sed \ 45374 @@ -418,4 +422,5 @@ 45375 | sed \ 45376 -e 's/^.*T_CALLED.*returnCode( \([a-z].*) \));/ return \1;/' \ 45377 -e 's/^.*T_CALLED.*returnCode( \((wmove.*) \));/ return \1;/' \ 45378 + -e 's/gen_//' \ 45379 | sed -f $ED4 42772 45380 diff -Naur ncurses-5.6.orig/ncurses/base/MKunctrl.awk ncurses-5.6/ncurses/base/MKunctrl.awk 42773 45381 --- ncurses-5.6.orig/ncurses/base/MKunctrl.awk 2005-12-17 17:48:37.000000000 -0500 42774 +++ ncurses-5.6/ncurses/base/MKunctrl.awk 200 7-12-21 00:02:36.000000000 -050045382 +++ ncurses-5.6/ncurses/base/MKunctrl.awk 2008-06-18 06:49:51.000000000 -0400 42775 45383 @@ -1,6 +1,6 @@ 42776 45384 -# $Id: MKunctrl.awk,v 1.11 2005/12/17 22:48:37 tom Exp $ 42777 +# $Id: MKunctrl.awk,v 1. 14 2007/07/28 21:13:21 tom Exp $45385 +# $Id: MKunctrl.awk,v 1.22 2008/05/31 19:36:11 tom Exp $ 42778 45386 ############################################################################## 42779 45387 -# Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. # 42780 +# Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. #45388 +# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. # 42781 45389 # # 42782 45390 # Permission is hereby granted, free of charge, to any person obtaining a # 42783 45391 # copy of this software and associated documentation files (the "Software"), # 42784 @@ -42,63 +42,111 @@ 42785 print "NCURSES_EXPORT(NCURSES_CONST char *) unctrl (register chtype ch)" 45392 @@ -27,81 +27,164 @@ 45393 # authorization. # 45394 ############################################################################## 45395 # 45396 -# Author: Thomas E. Dickey <dickey@clark.net> 1997 45397 +# Author: Thomas E. Dickey (1997-on) 45398 # 45399 45400 BEGIN { 45401 print "/* generated by MKunctrl.awk */" 45402 print "" 45403 print "#include <curses.priv.h>" 45404 + print "#include <ctype.h>" 45405 + print "" 45406 + print "#if USE_WIDEC_SUPPORT" 45407 + print "#if HAVE_WCTYPE_H" 45408 + print "#include <wctype.h>" 45409 + print "#endif" 45410 + print "#endif" 45411 print "" 45412 print "#undef unctrl" 45413 print "" 45414 } 45415 END { 45416 - print "NCURSES_EXPORT(NCURSES_CONST char *) unctrl (register chtype ch)" 45417 + print "NCURSES_EXPORT(NCURSES_CONST char *) _nc_unctrl (SCREEN *sp, chtype ch)" 42786 45418 print "{" 42787 45419 … … 42818 45450 + part = sprintf("~\\%03o", ch - 64); 42819 45451 + offset = offset + 3; 45452 + } else if (ch == 255) { 45453 + part = "~?"; 45454 + offset = offset + 3; 45455 + } else if (ch >= 160) { 45456 + part = sprintf("M-\\%03o", ch - 128); 45457 + offset = offset + 4; 42820 45458 } else { 42821 45459 - printf "\"\\%03o\"", ch … … 42839 45477 42840 45478 print "" 42841 45479 - print "#if NCURSES_EXT_FUNCS" 42842 45480 - printf "static const char* const table2[] = {" 45481 - for ( ch = 128; ch < 160; ch++ ) { 42843 45482 + if (bigstrings) { 42844 + blob = blob "\n #if NCURSES_EXT_FUNCS"45483 + blob = blob "\n/* printable values in 128-255 range */" 42845 45484 + printf "static const short unctrl_c1[] = {" 42846 45485 + } else { 42847 45486 + printf "static const char* const unctrl_c1[] = {" 42848 45487 + } 42849 for ( ch = 128; ch < 160; ch++ ) {45488 + for ( ch = 128; ch < 256; ch++ ) { 42850 45489 gap = "," 42851 45490 - if ((ch % 8) == 0) … … 42867 45506 + gap = gap " " 42868 45507 + } else { 42869 + if (ch >= 128 && ch < 160) {45508 + if (ch >= 128) { 42870 45509 + printf "\"\\%03o\"", ch 42871 45510 + gap = gap " " … … 42884 45523 } 42885 45524 print "};" 42886 42887 + blob = blob "\"\n #endif /* NCURSES_EXT_FUNCS */\n"45525 - print "#endif /* NCURSES_EXT_FUNCS */" 45526 + blob = blob "\"\n" 42888 45527 42889 45528 print "" 45529 - print "\tint check = ChCharOf(ch);" 45530 - print "\tconst char *result;" 45531 - print "" 45532 - print "\tif (check >= 0 && check < (int)SIZEOF(table)) {" 45533 - print "#if NCURSES_EXT_FUNCS" 45534 - print "\t\tif ((SP != 0)" 45535 - print "\t\t && (SP->_legacy_coding > 1)" 45536 - print "\t\t && (check >= 128)" 45537 - print "\t\t && (check < 160))" 45538 - print "\t\t\tresult = table2[check - 128];" 45539 - print "\t\telse" 45540 - print "#endif /* NCURSES_EXT_FUNCS */" 45541 - print "\t\t\tresult = table[check];" 45542 - print "\t} else {" 45543 - print "\t\tresult = 0;" 45544 - print "\t}" 45545 - print "\treturn (NCURSES_CONST char *)result;" 45546 - print "}" 42890 45547 + if (bigstrings) { 42891 45548 + print "static const char unctrl_blob[] = "blob";" … … 42895 45552 + stringname = "unctrl" 42896 45553 + } 42897 print "\tint check = ChCharOf(ch);" 42898 print "\tconst char *result;" 42899 print "" 42900 - print "\tif (check >= 0 && check < (int)SIZEOF(table)) {" 42901 + print "\tif (check >= 0 && check < (int)SIZEOF(unctrl_table)) {" 42902 print "#if NCURSES_EXT_FUNCS" 42903 print "\t\tif ((SP != 0)" 42904 print "\t\t && (SP->_legacy_coding > 1)" 42905 print "\t\t && (check >= 128)" 42906 print "\t\t && (check < 160))" 42907 - print "\t\t\tresult = table2[check - 128];" 45554 + print "\tint check = ChCharOf(ch);" 45555 + print "\tconst char *result;" 45556 + print "" 45557 + print "\tif (check >= 0 && check < (int)SIZEOF(unctrl_table)) {" 45558 + print "#if NCURSES_EXT_FUNCS" 45559 + print "\t\tif ((sp != 0)" 45560 + print "\t\t && (sp->_legacy_coding > 1)" 45561 + print "\t\t && (check >= 128)" 45562 + print "\t\t && (check < 160))" 42908 45563 + printf "\t\t\tresult = %s_c1[check - 128];\n", stringname; 42909 print "\t\telse" 42910 print "#endif /* NCURSES_EXT_FUNCS */" 42911 - print "\t\t\tresult = table[check];" 45564 + print "\t\telse" 45565 + print "#if USE_WIDEC_SUPPORT" 45566 + print "\t\tif ((check >= 160)" 45567 + print "\t\t && (check < 256)" 45568 + print "\t\t && ((sp != 0)" 45569 + print "\t\t && ((sp->_legacy_coding > 0)" 45570 + print "\t\t || (sp->_legacy_coding == 0" 45571 + print "\t\t && (isprint(check) || iswprint(check))))))" 45572 + printf "\t\t\tresult = %s_c1[check - 128];\n", stringname; 45573 + print "\t\telse" 45574 + print "#else" 45575 + print "\t\tif ((check >= 160)" 45576 + print "\t\t && (check < 256)" 45577 + print "\t\t && ((sp != 0)" 45578 + print "\t\t && ((sp->_legacy_coding > 0)" 45579 + print "\t\t || (sp->_legacy_coding == 0" 45580 + print "\t\t && isprint(check)))))" 45581 + printf "\t\t\tresult = %s_c1[check - 128];\n", stringname; 45582 + print "\t\telse" 45583 + print "#endif /* USE_WIDEC_SUPPORT */" 45584 + print "#endif /* NCURSES_EXT_FUNCS */" 42912 45585 + printf "\t\t\tresult = %s_table[check];\n", stringname; 42913 print "\t} else {" 42914 print "\t\tresult = 0;" 42915 print "\t}" 45586 + print "\t} else {" 45587 + print "\t\tresult = 0;" 45588 + print "\t}" 45589 + print "\treturn (NCURSES_CONST char *)result;" 45590 + print "}" 45591 + print "" 45592 + print "NCURSES_EXPORT(NCURSES_CONST char *) unctrl (chtype ch)" 45593 + print "{" 45594 + print "\treturn _nc_unctrl(SP, ch);" 45595 + print "}" 45596 } 42916 45597 diff -Naur ncurses-5.6.orig/ncurses/base/define_key.c ncurses-5.6/ncurses/base/define_key.c 42917 45598 --- ncurses-5.6.orig/ncurses/base/define_key.c 2006-06-17 14:19:48.000000000 -0400 42918 +++ ncurses-5.6/ncurses/base/define_key.c 200 7-12-21 00:02:36.000000000 -050045599 +++ ncurses-5.6/ncurses/base/define_key.c 2008-06-18 06:49:44.000000000 -0400 42919 45600 @@ -32,7 +32,7 @@ 42920 45601 … … 42953 45634 diff -Naur ncurses-5.6.orig/ncurses/base/key_defined.c ncurses-5.6/ncurses/base/key_defined.c 42954 45635 --- ncurses-5.6.orig/ncurses/base/key_defined.c 2003-05-17 19:12:27.000000000 -0400 42955 +++ ncurses-5.6/ncurses/base/key_defined.c 200 7-12-21 00:02:36.000000000 -050045636 +++ ncurses-5.6/ncurses/base/key_defined.c 2008-06-18 06:49:44.000000000 -0400 42956 45637 @@ -1,5 +1,5 @@ 42957 45638 /**************************************************************************** … … 43009 45690 diff -Naur ncurses-5.6.orig/ncurses/base/keyok.c ncurses-5.6/ncurses/base/keyok.c 43010 45691 --- ncurses-5.6.orig/ncurses/base/keyok.c 2006-06-17 14:18:43.000000000 -0400 43011 +++ ncurses-5.6/ncurses/base/keyok.c 200 7-12-21 00:02:36.000000000 -050045692 +++ ncurses-5.6/ncurses/base/keyok.c 2008-06-18 06:49:44.000000000 -0400 43012 45693 @@ -27,12 +27,12 @@ 43013 45694 ****************************************************************************/ … … 43050 45731 } 43051 45732 } 45733 diff -Naur ncurses-5.6.orig/ncurses/base/lib_addch.c ncurses-5.6/ncurses/base/lib_addch.c 45734 --- ncurses-5.6.orig/ncurses/base/lib_addch.c 2006-10-14 16:31:19.000000000 -0400 45735 +++ ncurses-5.6/ncurses/base/lib_addch.c 2008-06-18 06:49:50.000000000 -0400 45736 @@ -1,5 +1,5 @@ 45737 /**************************************************************************** 45738 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 45739 + * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * 45740 * * 45741 * Permission is hereby granted, free of charge, to any person obtaining a * 45742 * copy of this software and associated documentation files (the * 45743 @@ -36,7 +36,7 @@ 45744 #include <curses.priv.h> 45745 #include <ctype.h> 45746 45747 -MODULE_ID("$Id: lib_addch.c,v 1.104 2006/10/14 20:31:19 tom Exp $") 45748 +MODULE_ID("$Id: lib_addch.c,v 1.112 2008/05/17 19:08:40 Miroslav.Lichvar Exp $") 45749 45750 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT); 45751 45752 @@ -217,19 +217,19 @@ 45753 buffer, 45754 WINDOW_EXT(win, addch_used), &state)) > 0) { 45755 attr_t attrs = AttrOf(CHDEREF(ch)); 45756 + if_EXT_COLORS(int pair = GetPair(CHDEREF(ch))); 45757 SetChar(CHDEREF(ch), result, attrs); 45758 + if_EXT_COLORS(SetPair(CHDEREF(ch), pair)); 45759 + WINDOW_EXT(win, addch_used) = 0; 45760 + } else if (len == -1) { 45761 + /* 45762 + * An error occurred. We could either discard everything, 45763 + * or assume that the error was in the previous input. 45764 + * Try the latter. 45765 + */ 45766 + TR(TRACE_VIRTPUT, ("Alert! mbrtowc returns error")); 45767 + /* handle this with unctrl() */ 45768 WINDOW_EXT(win, addch_used) = 0; 45769 - } else { 45770 - if (len == -1) { 45771 - /* 45772 - * An error occurred. We could either discard everything, 45773 - * or assume that the error was in the previous input. 45774 - * Try the latter. 45775 - */ 45776 - TR(TRACE_VIRTPUT, ("Alert! mbrtowc returns error")); 45777 - buffer[0] = CharOf(CHDEREF(ch)); 45778 - WINDOW_EXT(win, addch_used) = 1; 45779 - } 45780 } 45781 return len; 45782 } 45783 @@ -264,13 +264,16 @@ 45784 if (WINDOW_EXT(win, addch_used) != 0 || !Charable(ch)) { 45785 int len = _nc_build_wch(win, CHREF(ch)); 45786 45787 - if (len > 0) { 45788 + if (len >= -1) { 45789 + /* handle EILSEQ */ 45790 if (is8bits(CharOf(ch))) { 45791 const char *s = unctrl((chtype) CharOf(ch)); 45792 if (s[1] != 0) { 45793 return waddstr(win, s); 45794 } 45795 } 45796 + if (len == -1) 45797 + return waddch(win, ' '); 45798 } else { 45799 return OK; 45800 } 45801 @@ -287,12 +290,15 @@ 45802 int len = wcwidth(CharOf(ch)); 45803 int i; 45804 int j; 45805 + wchar_t *chars; 45806 45807 if (len == 0) { /* non-spacing */ 45808 if ((x > 0 && y >= 0) 45809 - || ((y = win->_cury - 1) >= 0 && 45810 - (x = win->_maxx) > 0)) { 45811 - wchar_t *chars = (win->_line[y].text[x - 1].chars); 45812 + || (win->_maxx >= 0 && win->_cury >= 1)) { 45813 + if (x > 0 && y >= 0) 45814 + chars = (win->_line[y].text[x - 1].chars); 45815 + else 45816 + chars = (win->_line[y - 1].text[win->_maxx].chars); 45817 for (i = 0; i < CCHARW_MAX; ++i) { 45818 if (chars[i] == 0) { 45819 TR(TRACE_VIRTPUT, 45820 @@ -473,6 +479,7 @@ 45821 while (*s) { 45822 NCURSES_CH_T sch; 45823 SetChar(sch, *s++, AttrOf(ch)); 45824 + if_EXT_COLORS(SetPair(sch, GetPair(ch))); 45825 if (waddch_literal(win, sch) == ERR) 45826 return ERR; 45827 } 43052 45828 diff -Naur ncurses-5.6.orig/ncurses/base/lib_addstr.c ncurses-5.6/ncurses/base/lib_addstr.c 43053 45829 --- ncurses-5.6.orig/ncurses/base/lib_addstr.c 2006-05-27 15:22:19.000000000 -0400 43054 +++ ncurses-5.6/ncurses/base/lib_addstr.c 200 7-12-21 00:02:36.000000000 -050045830 +++ ncurses-5.6/ncurses/base/lib_addstr.c 2008-06-18 06:49:44.000000000 -0400 43055 45831 @@ -1,5 +1,5 @@ 43056 45832 /**************************************************************************** … … 43108 45884 n = _nc_wchstrlen(astr); 43109 45885 } 45886 diff -Naur ncurses-5.6.orig/ncurses/base/lib_bkgd.c ncurses-5.6/ncurses/base/lib_bkgd.c 45887 --- ncurses-5.6.orig/ncurses/base/lib_bkgd.c 2006-05-27 15:20:11.000000000 -0400 45888 +++ ncurses-5.6/ncurses/base/lib_bkgd.c 2008-06-18 06:49:48.000000000 -0400 45889 @@ -1,5 +1,5 @@ 45890 /**************************************************************************** 45891 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 45892 + * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * 45893 * * 45894 * Permission is hereby granted, free of charge, to any person obtaining a * 45895 * copy of this software and associated documentation files (the * 45896 @@ -36,7 +36,7 @@ 45897 45898 #include <curses.priv.h> 45899 45900 -MODULE_ID("$Id: lib_bkgd.c,v 1.35 2006/05/27 19:20:11 tom Exp $") 45901 +MODULE_ID("$Id: lib_bkgd.c,v 1.36 2008/03/23 00:09:14 tom Exp $") 45902 45903 /* 45904 * Set the window's background information. 45905 @@ -70,7 +70,7 @@ 45906 45907 if (CharOf(CHDEREF(ch)) == L('\0')) { 45908 SetChar(win->_nc_bkgd, BLANK_TEXT, AttrOf(CHDEREF(ch))); 45909 - SetPair(win->_nc_bkgd, GetPair(CHDEREF(ch))); 45910 + if_EXT_COLORS(SetPair(win->_nc_bkgd, GetPair(CHDEREF(ch)))); 45911 } else { 45912 win->_nc_bkgd = CHDEREF(ch); 45913 } 43110 45914 diff -Naur ncurses-5.6.orig/ncurses/base/lib_color.c ncurses-5.6/ncurses/base/lib_color.c 43111 45915 --- ncurses-5.6.orig/ncurses/base/lib_color.c 2006-11-25 20:33:16.000000000 -0500 43112 +++ ncurses-5.6/ncurses/base/lib_color.c 200 7-12-21 00:02:36.000000000 -050045916 +++ ncurses-5.6/ncurses/base/lib_color.c 2008-06-18 06:49:44.000000000 -0400 43113 45917 @@ -1,5 +1,5 @@ 43114 45918 /**************************************************************************** … … 43226 46030 diff -Naur ncurses-5.6.orig/ncurses/base/lib_delwin.c ncurses-5.6/ncurses/base/lib_delwin.c 43227 46031 --- ncurses-5.6.orig/ncurses/base/lib_delwin.c 2001-08-25 20:40:20.000000000 -0400 43228 +++ ncurses-5.6/ncurses/base/lib_delwin.c 200 7-12-21 00:02:36.000000000 -050046032 +++ ncurses-5.6/ncurses/base/lib_delwin.c 2008-06-18 06:49:51.000000000 -0400 43229 46033 @@ -1,5 +1,5 @@ 43230 46034 /**************************************************************************** 43231 46035 - * Copyright (c) 1998,2000,2001 Free Software Foundation, Inc. * 43232 + * Copyright (c) 1998-200 1,2007Free Software Foundation, Inc. *46036 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 43233 46037 * * 43234 46038 * Permission is hereby granted, free of charge, to any person obtaining a * … … 43239 46043 43240 46044 -MODULE_ID("$Id: lib_delwin.c,v 1.13 2001/08/26 00:40:20 tom Exp $") 43241 +MODULE_ID("$Id: lib_delwin.c,v 1.1 4 2007/11/03 20:24:15tom Exp $")46045 +MODULE_ID("$Id: lib_delwin.c,v 1.17 2008/06/07 14:10:56 tom Exp $") 43242 46046 43243 46047 static bool 43244 46048 cannot_delete(WINDOW *win) 43245 @@ -63,16 +63,23 @@ 46049 @@ -48,7 +48,7 @@ 46050 WINDOWLIST *p; 46051 bool result = TRUE; 46052 46053 - for (p = _nc_windows; p != 0; p = p->next) { 46054 + for (each_window(p)) { 46055 if (&(p->win) == win) { 46056 result = FALSE; 46057 } else if ((p->win._flags & _SUBWIN) != 0 46058 @@ -63,16 +63,24 @@ 43246 46059 NCURSES_EXPORT(int) 43247 46060 delwin(WINDOW *win) … … 43251 46064 T((T_CALLED("delwin(%p)"), win)); 43252 46065 43253 + _nc_lock_global(windowlist); 43254 if (win == 0 46066 - if (win == 0 43255 46067 - || cannot_delete(win)) 43256 46068 - returnCode(ERR); … … 43260 46072 - else if (curscr != 0) 43261 46073 - touchwin(curscr); 43262 + || cannot_delete(win)) { 43263 + result = ERR; 43264 + } else { 43265 + 43266 + if (win->_flags & _SUBWIN) 43267 + touchwin(win->_parent); 43268 + else if (curscr != 0) 43269 + touchwin(curscr); 46074 + if (_nc_try_global(curses) == 0) { 46075 + if (win == 0 46076 + || cannot_delete(win)) { 46077 + result = ERR; 46078 + } else { 46079 + 46080 + if (win->_flags & _SUBWIN) 46081 + touchwin(win->_parent); 46082 + else if (curscr != 0) 46083 + touchwin(curscr); 43270 46084 43271 46085 - returnCode(_nc_freewin(win)); 43272 + result = _nc_freewin(win); 46086 + result = _nc_freewin(win); 46087 + } 46088 + _nc_unlock_global(curses); 43273 46089 + } 43274 + _nc_unlock_global(windowlist);43275 46090 + returnCode(result); 43276 46091 } 43277 46092 diff -Naur ncurses-5.6.orig/ncurses/base/lib_freeall.c ncurses-5.6/ncurses/base/lib_freeall.c 43278 46093 --- ncurses-5.6.orig/ncurses/base/lib_freeall.c 2006-12-02 17:36:43.000000000 -0500 43279 +++ ncurses-5.6/ncurses/base/lib_freeall.c 200 7-12-21 00:02:36.000000000 -050046094 +++ ncurses-5.6/ncurses/base/lib_freeall.c 2008-06-18 06:49:51.000000000 -0400 43280 46095 @@ -1,5 +1,5 @@ 43281 46096 /**************************************************************************** 43282 46097 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 43283 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *46098 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 43284 46099 * * 43285 46100 * Permission is hereby granted, free of charge, to any person obtaining a * … … 43299 46114 43300 46115 -MODULE_ID("$Id: lib_freeall.c,v 1.38 2006/12/02 22:36:43 tom Exp $") 43301 +MODULE_ID("$Id: lib_freeall.c,v 1.4 4 2007/06/02 19:40:25tom Exp $")46116 +MODULE_ID("$Id: lib_freeall.c,v 1.47 2008/06/07 13:58:29 tom Exp $") 43302 46117 43303 46118 /* 43304 46119 * Free all ncurses data. This is used for testing only (there's no practical 43305 @@ -50, 14 +50,14@@46120 @@ -50,23 +50,27 @@ 43306 46121 _nc_freeall(void) 43307 46122 { … … 43322 46137 #endif 43323 46138 if (SP != 0) { 43324 @@ -83,32 +83,23 @@ 46139 + _nc_lock_global(curses); 46140 + 46141 while (_nc_windows != 0) { 46142 + bool deleted = FALSE; 46143 + 46144 /* Delete only windows that're not a parent */ 46145 - for (p = _nc_windows; p != 0; p = p->next) { 46146 + for (each_window(p)) { 46147 bool found = FALSE; 46148 46149 - for (q = _nc_windows; q != 0; q = q->next) { 46150 + for (each_window(q)) { 46151 if ((p != q) 46152 && (q->win._flags & _SUBWIN) 46153 && (&(p->win) == q->win._parent)) { 46154 @@ -76,39 +80,38 @@ 46155 } 46156 46157 if (!found) { 46158 - delwin(&(p->win)); 46159 + if (delwin(&(p->win)) != ERR) 46160 + deleted = TRUE; 46161 break; 46162 } 46163 } 46164 + 46165 + /* 46166 + * Don't continue to loop if the list is trashed. 46167 + */ 46168 + if (!deleted) 46169 + break; 43325 46170 } 43326 46171 delscreen(SP); 46172 + _nc_unlock_global(curses); 43327 46173 } 43328 46174 -#if NO_LEAKS … … 43366 46212 diff -Naur ncurses-5.6.orig/ncurses/base/lib_getch.c ncurses-5.6/ncurses/base/lib_getch.c 43367 46213 --- ncurses-5.6.orig/ncurses/base/lib_getch.c 2006-03-04 15:06:09.000000000 -0500 43368 +++ ncurses-5.6/ncurses/base/lib_getch.c 200 7-12-21 00:02:36.000000000 -050046214 +++ ncurses-5.6/ncurses/base/lib_getch.c 2008-06-18 06:49:51.000000000 -0400 43369 46215 @@ -1,5 +1,5 @@ 43370 46216 /**************************************************************************** 43371 46217 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 43372 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *46218 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 43373 46219 * * 43374 46220 * Permission is hereby granted, free of charge, to any person obtaining a * 43375 46221 * copy of this software and associated documentation files (the * 43376 @@ -41,12 +41, 20@@46222 @@ -41,12 +41,47 @@ 43377 46223 43378 46224 #include <curses.priv.h> 43379 46225 43380 46226 -MODULE_ID("$Id: lib_getch.c,v 1.75 2006/03/04 20:06:09 tom Exp $") 43381 +MODULE_ID("$Id: lib_getch.c,v 1. 80 2007/09/29 20:39:34tom Exp $")46227 +MODULE_ID("$Id: lib_getch.c,v 1.95 2008/06/07 15:52:51 tom Exp $") 43382 46228 43383 46229 #include <fifo_defs.h> 43384 46230 43385 46231 +#if USE_REENTRANT 46232 +#define GetEscdelay(sp) (sp)->_ESCDELAY 43386 46233 +NCURSES_EXPORT(int) 43387 46234 +NCURSES_PUBLIC_VAR(ESCDELAY) (void) 43388 46235 +{ 43389 + return SP ? SP->_ESCDELAY: 1000;46236 + return SP ? GetEscdelay(SP) : 1000; 43390 46237 +} 43391 46238 +#else 46239 +#define GetEscdelay(sp) ESCDELAY 43392 46240 NCURSES_EXPORT_VAR(int) 43393 46241 ESCDELAY = 1000; /* max interval betw. chars in funkeys, in millisecs */ 43394 46242 +#endif 46243 + 46244 +#if NCURSES_EXT_FUNCS 46245 +NCURSES_EXPORT(int) 46246 +set_escdelay(int value) 46247 +{ 46248 + int code = OK; 46249 +#if USE_REENTRANT 46250 + if (SP) { 46251 + SP->_ESCDELAY = value; 46252 + } else { 46253 + code = ERR; 46254 + } 46255 +#else 46256 + ESCDELAY = value; 46257 +#endif 46258 + return code; 46259 +} 46260 +#endif 46261 + 46262 +static int 46263 +_nc_use_meta(WINDOW *win) 46264 +{ 46265 + SCREEN *sp = _nc_screen_of(win); 46266 + return (sp ? sp->_use_meta : 0); 46267 +} 43395 46268 43396 46269 #ifdef NCURSES_WGETCH_EVENTS 43397 46270 #define TWAIT_MASK 7 43398 @@ -104,8 +112,10 @@ 46271 @@ -58,20 +93,20 @@ 46272 * Check for mouse activity, returning nonzero if we find any. 46273 */ 46274 static int 46275 -check_mouse_activity(int delay EVENTLIST_2nd(_nc_eventlist * evl)) 46276 +check_mouse_activity(SCREEN *sp, int delay EVENTLIST_2nd(_nc_eventlist * evl)) 46277 { 46278 int rc; 46279 46280 #if USE_SYSMOUSE 46281 - if ((SP->_mouse_type == M_SYSMOUSE) 46282 - && (SP->_sysmouse_head < SP->_sysmouse_tail)) { 46283 + if ((sp->_mouse_type == M_SYSMOUSE) 46284 + && (sp->_sysmouse_head < sp->_sysmouse_tail)) { 46285 return 2; 46286 } 46287 #endif 46288 - rc = _nc_timed_wait(TWAIT_MASK, delay, (int *) 0 EVENTLIST_2nd(evl)); 46289 + rc = _nc_timed_wait(sp, TWAIT_MASK, delay, (int *) 0 EVENTLIST_2nd(evl)); 46290 #if USE_SYSMOUSE 46291 - if ((SP->_mouse_type == M_SYSMOUSE) 46292 - && (SP->_sysmouse_head < SP->_sysmouse_tail) 46293 + if ((sp->_mouse_type == M_SYSMOUSE) 46294 + && (sp->_sysmouse_head < sp->_sysmouse_tail) 46295 && (rc == 0) 46296 && (errno == EINTR)) { 46297 rc |= 2; 46298 @@ -81,9 +116,9 @@ 46299 } 46300 46301 static NCURSES_INLINE int 46302 -fifo_peek(void) 46303 +fifo_peek(SCREEN *sp) 46304 { 46305 - int ch = SP->_fifo[peek]; 46306 + int ch = sp->_fifo[peek]; 46307 TR(TRACE_IEVENT, ("peeking at %d", peek)); 46308 46309 p_inc(); 46310 @@ -91,11 +126,11 @@ 46311 } 46312 46313 static NCURSES_INLINE int 46314 -fifo_pull(void) 46315 +fifo_pull(SCREEN *sp) 46316 { 46317 int ch; 46318 - ch = SP->_fifo[head]; 46319 - TR(TRACE_IEVENT, ("pulling %s from %d", _tracechar(ch), head)); 46320 + ch = sp->_fifo[head]; 46321 + TR(TRACE_IEVENT, ("pulling %s from %d", _nc_tracechar(sp, ch), head)); 46322 46323 if (peek == head) { 46324 h_inc(); 46325 @@ -104,14 +139,16 @@ 43399 46326 h_inc(); 43400 46327 43401 46328 #ifdef TRACE 43402 46329 - if (_nc_tracing & TRACE_IEVENT) 46330 - _nc_fifo_dump(); 43403 46331 + if (USE_TRACEF(TRACE_IEVENT)) { 43404 _nc_fifo_dump();46332 + _nc_fifo_dump(sp); 43405 46333 + _nc_unlock_global(tracef); 43406 46334 + } … … 43408 46336 return ch; 43409 46337 } 43410 @@ -200,8 +210,10 @@ 46338 46339 static NCURSES_INLINE int 46340 -fifo_push(EVENTLIST_0th(_nc_eventlist * evl)) 46341 +fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl)) 46342 { 46343 int n; 46344 int ch = 0; 46345 @@ -129,47 +166,47 @@ 46346 #ifdef NCURSES_WGETCH_EVENTS 46347 if (evl 46348 #if USE_GPM_SUPPORT || USE_EMX_MOUSE || USE_SYSMOUSE 46349 - || (SP->_mouse_fd >= 0) 46350 + || (sp->_mouse_fd >= 0) 46351 #endif 46352 ) { 46353 - mask = check_mouse_activity(-1 EVENTLIST_2nd(evl)); 46354 + mask = check_mouse_activity(sp, -1 EVENTLIST_2nd(evl)); 46355 } else 46356 mask = 0; 46357 46358 if (mask & 4) { 46359 T(("fifo_push: ungetch KEY_EVENT")); 46360 - ungetch(KEY_EVENT); 46361 + _nc_ungetch(sp, KEY_EVENT); 46362 return KEY_EVENT; 46363 } 46364 #elif USE_GPM_SUPPORT || USE_EMX_MOUSE || USE_SYSMOUSE 46365 - if (SP->_mouse_fd >= 0) { 46366 - mask = check_mouse_activity(-1 EVENTLIST_2nd(evl)); 46367 + if (sp->_mouse_fd >= 0) { 46368 + mask = check_mouse_activity(sp, -1 EVENTLIST_2nd(evl)); 46369 } 46370 #endif 46371 46372 #if USE_GPM_SUPPORT || USE_EMX_MOUSE 46373 - if ((SP->_mouse_fd >= 0) && (mask & 2)) { 46374 - SP->_mouse_event(SP); 46375 + if ((sp->_mouse_fd >= 0) && (mask & 2)) { 46376 + sp->_mouse_event(sp); 46377 ch = KEY_MOUSE; 46378 n = 1; 46379 } else 46380 #endif 46381 #if USE_SYSMOUSE 46382 - if ((SP->_mouse_type == M_SYSMOUSE) 46383 - && (SP->_sysmouse_head < SP->_sysmouse_tail)) { 46384 - SP->_mouse_event(SP); 46385 + if ((sp->_mouse_type == M_SYSMOUSE) 46386 + && (sp->_sysmouse_head < sp->_sysmouse_tail)) { 46387 + sp->_mouse_event(sp); 46388 ch = KEY_MOUSE; 46389 n = 1; 46390 - } else if ((SP->_mouse_type == M_SYSMOUSE) 46391 + } else if ((sp->_mouse_type == M_SYSMOUSE) 46392 && (mask <= 0) && errno == EINTR) { 46393 - SP->_mouse_event(SP); 46394 + sp->_mouse_event(sp); 46395 ch = KEY_MOUSE; 46396 n = 1; 46397 } else 46398 #endif 46399 { /* Can block... */ 46400 unsigned char c2 = 0; 46401 - n = read(SP->_ifd, &c2, 1); 46402 + n = read(sp->_ifd, &c2, 1); 46403 ch = c2; 46404 } 46405 46406 @@ -188,37 +225,85 @@ 46407 #endif 46408 46409 if ((n == -1) || (n == 0)) { 46410 - TR(TRACE_IEVENT, ("read(%d,&ch,1)=%d, errno=%d", SP->_ifd, n, errno)); 46411 + TR(TRACE_IEVENT, ("read(%d,&ch,1)=%d, errno=%d", sp->_ifd, n, errno)); 46412 ch = ERR; 46413 } 46414 TR(TRACE_IEVENT, ("read %d characters", n)); 46415 46416 - SP->_fifo[tail] = ch; 46417 - SP->_fifohold = 0; 46418 + sp->_fifo[tail] = ch; 46419 + sp->_fifohold = 0; 46420 if (head == -1) 46421 head = peek = tail; 43411 46422 t_inc(); 43412 TR(TRACE_IEVENT, ("pushed %s at %d", _tracechar(ch), tail)); 46423 - TR(TRACE_IEVENT, ("pushed %s at %d", _tracechar(ch), tail)); 46424 + TR(TRACE_IEVENT, ("pushed %s at %d", _nc_tracechar(sp, ch), tail)); 43413 46425 #ifdef TRACE 43414 46426 - if (_nc_tracing & TRACE_IEVENT) 46427 - _nc_fifo_dump(); 43415 46428 + if (USE_TRACEF(TRACE_IEVENT)) { 43416 _nc_fifo_dump();46429 + _nc_fifo_dump(sp); 43417 46430 + _nc_unlock_global(tracef); 43418 46431 + } … … 43420 46433 return ch; 43421 46434 } 43422 @@ -234,15 +246,16 @@ 46435 46436 static NCURSES_INLINE void 46437 -fifo_clear(void) 46438 +fifo_clear(SCREEN *sp) 46439 { 46440 - memset(SP->_fifo, 0, sizeof(SP->_fifo)); 46441 + memset(sp->_fifo, 0, sizeof(sp->_fifo)); 46442 head = -1; 46443 tail = peek = 0; 46444 } 46445 46446 -static int kgetch(EVENTLIST_0th(_nc_eventlist * evl)); 46447 +static int kgetch(SCREEN *EVENTLIST_2nd(_nc_eventlist * evl)); 46448 + 46449 +static void 46450 +recur_wrefresh(WINDOW *win) 46451 +{ 46452 +#ifdef USE_PTHREADS 46453 + SCREEN *sp = _nc_screen_of(win); 46454 + if (sp != SP) { 46455 + SCREEN *save_SP; 46456 + 46457 + /* temporarily switch to the window's screen to check/refresh */ 46458 + _nc_lock_global(curses); 46459 + save_SP = SP; 46460 + SP = sp; 46461 + recur_wrefresh(win); 46462 + SP = save_SP; 46463 + _nc_unlock_global(curses); 46464 + } else 46465 +#endif 46466 + if ((is_wintouched(win) || (win->_flags & _HASMOVED)) 46467 + && !(win->_flags & _ISPAD)) { 46468 + wrefresh(win); 46469 + } 46470 +} 46471 + 46472 +static int 46473 +recur_wgetnstr(WINDOW *win, char *buf) 46474 +{ 46475 + SCREEN *sp = _nc_screen_of(win); 46476 + int rc; 46477 46478 -#define wgetch_should_refresh(win) (\ 46479 - (is_wintouched(win) || (win->_flags & _HASMOVED)) \ 46480 - && !(win->_flags & _ISPAD)) 46481 +#ifdef USE_PTHREADS 46482 + if (sp != SP) { 46483 + SCREEN *save_SP; 46484 + 46485 + /* temporarily switch to the window's screen to get cooked input */ 46486 + _nc_lock_global(curses); 46487 + save_SP = SP; 46488 + SP = sp; 46489 + rc = recur_wgetnstr(win, buf); 46490 + SP = save_SP; 46491 + _nc_unlock_global(curses); 46492 + } else 46493 +#endif 46494 + { 46495 + sp->_called_wgetch = TRUE; 46496 + rc = wgetnstr(win, buf, MAXCOLUMNS); 46497 + sp->_called_wgetch = FALSE; 46498 + } 46499 + return rc; 46500 +} 46501 46502 NCURSES_EXPORT(int) 46503 _nc_wgetch(WINDOW *win, 46504 @@ -226,6 +311,7 @@ 46505 int use_meta 46506 EVENTLIST_2nd(_nc_eventlist * evl)) 46507 { 46508 + SCREEN *sp; 46509 int ch; 46510 #ifdef NCURSES_WGETCH_EVENTS 46511 long event_delay = -1; 46512 @@ -234,15 +320,16 @@ 43423 46513 T((T_CALLED("_nc_wgetch(%p)"), win)); 43424 46514 43425 46515 *result = 0; 43426 46516 - if (win == 0 || SP == 0) 43427 + if (win == 0 || SP == 0) { 46517 + 46518 + sp = _nc_screen_of(win); 46519 + if (win == 0 || sp == 0) { 43428 46520 returnCode(ERR); 43429 46521 + } 43430 46522 43431 46523 if (cooked_key_in_fifo()) { 43432 43433 43434 43435 46524 - if (wgetch_should_refresh(win)) 46525 - wrefresh(win); 46526 - 46527 - *result = fifo_pull(); 43436 46528 - returnCode(OK); 46529 + recur_wrefresh(win); 46530 + *result = fifo_pull(sp); 43437 46531 + returnCode(*result >= KEY_MIN ? KEY_CODE_YES : OK); 43438 46532 } 43439 46533 #ifdef NCURSES_WGETCH_EVENTS 43440 46534 if (evl && (evl->count == 0)) 43441 @@ -281,12 +294,10 @@ 46535 @@ -256,53 +343,48 @@ 46536 * the first character to return it. 46537 */ 46538 if (head == -1 && 46539 - !SP->_notty && 46540 - !SP->_raw && 46541 - !SP->_cbreak && 46542 - !SP->_called_wgetch) { 46543 - char buf[MAXCOLUMNS], *sp; 46544 + !sp->_notty && 46545 + !sp->_raw && 46546 + !sp->_cbreak && 46547 + !sp->_called_wgetch) { 46548 + char buf[MAXCOLUMNS], *bufp; 46549 int rc; 46550 46551 TR(TRACE_IEVENT, ("filling queue in cooked mode")); 46552 46553 - SP->_called_wgetch = TRUE; 46554 - rc = wgetnstr(win, buf, MAXCOLUMNS); 46555 - SP->_called_wgetch = FALSE; 46556 + rc = recur_wgetnstr(win, buf); 46557 46558 /* ungetch in reverse order */ 46559 #ifdef NCURSES_WGETCH_EVENTS 46560 if (rc != KEY_EVENT) 46561 #endif 46562 - ungetch('\n'); 46563 - for (sp = buf + strlen(buf); sp > buf; sp--) 46564 - ungetch(sp[-1]); 46565 + _nc_ungetch(sp, '\n'); 46566 + for (bufp = buf + strlen(buf); bufp > buf; bufp--) 46567 + _nc_ungetch(sp, bufp[-1]); 46568 46569 #ifdef NCURSES_WGETCH_EVENTS 43442 46570 /* Return it first */ 43443 46571 if (rc == KEY_EVENT) { … … 43450 46578 - *result = fifo_pull(); 43451 46579 - returnCode(OK); 43452 + *result = fifo_pull( );46580 + *result = fifo_pull(sp); 43453 46581 + returnCode(*result >= KEY_MIN ? KEY_CODE_YES : OK); 43454 46582 } 43455 46583 43456 if (win->_use_keypad != SP->_keypad_on) 43457 @@ -318,7 +329,7 @@ 46584 - if (win->_use_keypad != SP->_keypad_on) 46585 - _nc_keypad(win->_use_keypad); 46586 + if (win->_use_keypad != sp->_keypad_on) 46587 + _nc_keypad(sp, win->_use_keypad); 46588 46589 - if (wgetch_should_refresh(win)) 46590 - wrefresh(win); 46591 + recur_wrefresh(win); 46592 46593 - if (!win->_notimeout && (win->_delay >= 0 || SP->_cbreak > 1)) { 46594 + if (!win->_notimeout && (win->_delay >= 0 || sp->_cbreak > 1)) { 46595 if (head == -1) { /* fifo is empty */ 46596 int delay; 46597 int rc; 46598 46599 TR(TRACE_IEVENT, ("timed delay in wgetch()")); 46600 - if (SP->_cbreak > 1) 46601 - delay = (SP->_cbreak - 1) * 100; 46602 + if (sp->_cbreak > 1) 46603 + delay = (sp->_cbreak - 1) * 100; 46604 else 46605 delay = win->_delay; 46606 46607 @@ -313,16 +395,17 @@ 46608 46609 TR(TRACE_IEVENT, ("delay is %d milliseconds", delay)); 46610 46611 - rc = check_mouse_activity(delay EVENTLIST_2nd(evl)); 46612 + rc = check_mouse_activity(sp, delay EVENTLIST_2nd(evl)); 46613 43458 46614 #ifdef NCURSES_WGETCH_EVENTS 43459 46615 if (rc & 4) { … … 43463 46619 } 43464 46620 #endif 43465 if (!rc) 43466 @@ -384,7 +395,7 @@ 46621 - if (!rc) 46622 + if (!rc) { 46623 returnCode(ERR); 46624 + } 46625 } 46626 /* else go on to read data available */ 46627 } 46628 @@ -343,23 +426,23 @@ 46629 int rc; 46630 46631 do { 46632 - ch = kgetch(EVENTLIST_1st(evl)); 46633 + ch = kgetch(sp EVENTLIST_2nd(evl)); 46634 if (ch == KEY_MOUSE) { 46635 ++runcount; 46636 - if (SP->_mouse_inline(SP)) 46637 + if (sp->_mouse_inline(sp)) 46638 break; 46639 } 46640 - if (SP->_maxclick < 0) 46641 + if (sp->_maxclick < 0) 46642 break; 46643 } while 46644 (ch == KEY_MOUSE 46645 - && (((rc = check_mouse_activity(SP->_maxclick 46646 + && (((rc = check_mouse_activity(sp, sp->_maxclick 46647 EVENTLIST_2nd(evl))) != 0 46648 && !(rc & 4)) 46649 - || !SP->_mouse_parse(runcount))); 46650 + || !sp->_mouse_parse(sp, runcount))); 46651 #ifdef NCURSES_WGETCH_EVENTS 46652 if ((rc & 4) && !ch == KEY_EVENT) { 46653 - ungetch(ch); 46654 + _nc_ungetch(sp, ch); 46655 ch = KEY_EVENT; 46656 } 46657 #endif 46658 @@ -367,28 +450,28 @@ 46659 #ifdef NCURSES_WGETCH_EVENTS 46660 /* mouse event sequence ended by an event, report event */ 46661 if (ch == KEY_EVENT) { 46662 - ungetch(KEY_MOUSE); /* FIXME This interrupts a gesture... */ 46663 + _nc_ungetch(sp, KEY_MOUSE); /* FIXME This interrupts a gesture... */ 46664 } else 46665 #endif 46666 { 46667 /* mouse event sequence ended by keystroke, store keystroke */ 46668 - ungetch(ch); 46669 + _nc_ungetch(sp, ch); 46670 ch = KEY_MOUSE; 46671 } 46672 } 46673 } else { 46674 if (head == -1) 46675 - fifo_push(EVENTLIST_1st(evl)); 46676 - ch = fifo_pull(); 46677 + fifo_push(sp EVENTLIST_2nd(evl)); 46678 + ch = fifo_pull(sp); 46679 } 43467 46680 43468 46681 if (ch == ERR) { 43469 46682 #if USE_SIZECHANGE 43470 46683 - if (SP->_sig_winch) { 43471 + if (_nc_handle_sigwinch(FALSE)) { 43472 _nc_update_screensize(); 46684 - _nc_update_screensize(); 46685 + if (_nc_handle_sigwinch(sp)) { 46686 + _nc_update_screensize(sp); 43473 46687 /* resizeterm can push KEY_RESIZE */ 43474 46688 if (cooked_key_in_fifo()) { 43475 @@ -493,7 +504,7 @@ 46689 - *result = fifo_pull(); 46690 + *result = fifo_pull(sp); 46691 returnCode(*result >= KEY_MIN ? KEY_CODE_YES : OK); 46692 } 46693 } 46694 @@ -414,7 +497,7 @@ 46695 * However, we provide the same visual result as Solaris, moving the 46696 * cursor to the left. 46697 */ 46698 - if (SP->_echo && !(win->_flags & _ISPAD)) { 46699 + if (sp->_echo && !(win->_flags & _ISPAD)) { 46700 chtype backup = (ch == KEY_BACKSPACE) ? '\b' : ch; 46701 if (backup < KEY_MIN) 46702 wechochar(win, backup); 46703 @@ -423,7 +506,7 @@ 46704 /* 46705 * Simulate ICRNL mode 46706 */ 46707 - if ((ch == '\r') && SP->_nl) 46708 + if ((ch == '\r') && sp->_nl) 46709 ch = '\n'; 46710 46711 /* Strip 8th-bit if so desired. We do this only for characters that 46712 @@ -435,7 +518,7 @@ 46713 if ((ch < KEY_MIN) && (ch & 0x80)) 46714 ch &= 0x7f; 46715 46716 - T(("wgetch returning : %s", _tracechar(ch))); 46717 + T(("wgetch returning : %s", _nc_tracechar(sp, ch))); 46718 46719 *result = ch; 46720 returnCode(ch >= KEY_MIN ? KEY_CODE_YES : OK); 46721 @@ -451,7 +534,7 @@ 46722 T((T_CALLED("wgetch_events(%p,%p)"), win, evl)); 46723 code = _nc_wgetch(win, 46724 &value, 46725 - SP->_use_meta 46726 + _nc_use_meta(win) 46727 EVENTLIST_2nd(evl)); 46728 if (code != ERR) 46729 code = value; 46730 @@ -468,7 +551,7 @@ 46731 T((T_CALLED("wgetch(%p)"), win)); 46732 code = _nc_wgetch(win, 46733 &value, 46734 - (SP ? SP->_use_meta : 0) 46735 + _nc_use_meta(win) 46736 EVENTLIST_2nd((_nc_eventlist *) 0)); 46737 if (code != ERR) 46738 code = value; 46739 @@ -491,21 +574,21 @@ 46740 */ 46741 43476 46742 static int 43477 kgetch(EVENTLIST_0th(_nc_eventlist * evl)) 46743 -kgetch(EVENTLIST_0th(_nc_eventlist * evl)) 46744 +kgetch(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl)) 43478 46745 { 43479 46746 - struct tries *ptr; 43480 46747 + TRIES *ptr; 43481 46748 int ch = 0; 43482 int timeleft = ESCDELAY; 46749 - int timeleft = ESCDELAY; 46750 + int timeleft = GetEscdelay(sp); 46751 46752 TR(TRACE_IEVENT, ("kgetch() called")); 46753 46754 - ptr = SP->_keytry; 46755 + ptr = sp->_keytry; 46756 46757 for (;;) { 46758 - if (cooked_key_in_fifo() && SP->_fifo[head] >= KEY_MIN) { 46759 + if (cooked_key_in_fifo() && sp->_fifo[head] >= KEY_MIN) { 46760 break; 46761 } else if (!raw_key_in_fifo()) { 46762 - ch = fifo_push(EVENTLIST_1st(evl)); 46763 + ch = fifo_push(sp EVENTLIST_2nd(evl)); 46764 if (ch == ERR) { 46765 peek = head; /* the keys stay uninterpreted */ 46766 return ERR; 46767 @@ -513,12 +596,12 @@ 46768 #ifdef NCURSES_WGETCH_EVENTS 46769 else if (ch == KEY_EVENT) { 46770 peek = head; /* the keys stay uninterpreted */ 46771 - return fifo_pull(); /* Remove KEY_EVENT from the queue */ 46772 + return fifo_pull(sp); /* Remove KEY_EVENT from the queue */ 46773 } 46774 #endif 46775 } 46776 46777 - ch = fifo_peek(); 46778 + ch = fifo_peek(sp); 46779 if (ch >= KEY_MIN) { 46780 /* If not first in queue, somebody put this key there on purpose in 46781 * emergency. Consider it higher priority than the unfinished 46782 @@ -530,7 +613,7 @@ 46783 return ch; 46784 } 46785 46786 - TR(TRACE_IEVENT, ("ch: %s", _tracechar((unsigned char) ch))); 46787 + TR(TRACE_IEVENT, ("ch: %s", _nc_tracechar(sp, (unsigned char) ch))); 46788 while ((ptr != NULL) && (ptr->ch != (unsigned char) ch)) 46789 ptr = ptr->sibling; 46790 46791 @@ -544,7 +627,7 @@ 46792 if (ptr->value != 0) { /* sequence terminated */ 46793 TR(TRACE_IEVENT, ("end of sequence")); 46794 if (peek == tail) 46795 - fifo_clear(); 46796 + fifo_clear(sp); 46797 else 46798 head = peek; 46799 return (ptr->value); 46800 @@ -556,7 +639,7 @@ 46801 int rc; 46802 46803 TR(TRACE_IEVENT, ("waiting for rest of sequence")); 46804 - rc = check_mouse_activity(timeleft EVENTLIST_2nd(evl)); 46805 + rc = check_mouse_activity(sp, timeleft EVENTLIST_2nd(evl)); 46806 #ifdef NCURSES_WGETCH_EVENTS 46807 if (rc & 4) { 46808 TR(TRACE_IEVENT, ("interrupted by a user event")); 46809 @@ -571,7 +654,7 @@ 46810 } 46811 } 46812 } 46813 - ch = fifo_pull(); 46814 + ch = fifo_pull(sp); 46815 peek = head; 46816 return ch; 46817 } 46818 diff -Naur ncurses-5.6.orig/ncurses/base/lib_getstr.c ncurses-5.6/ncurses/base/lib_getstr.c 46819 --- ncurses-5.6.orig/ncurses/base/lib_getstr.c 2006-01-11 19:33:52.000000000 -0500 46820 +++ ncurses-5.6/ncurses/base/lib_getstr.c 2008-06-18 06:49:51.000000000 -0400 46821 @@ -1,5 +1,5 @@ 46822 /**************************************************************************** 46823 - * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. * 46824 + * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * 46825 * * 46826 * Permission is hereby granted, free of charge, to any person obtaining a * 46827 * copy of this software and associated documentation files (the * 46828 @@ -41,7 +41,7 @@ 46829 #include <curses.priv.h> 46830 #include <term.h> 46831 46832 -MODULE_ID("$Id: lib_getstr.c,v 1.25 2006/01/12 00:33:52 tom Exp $") 46833 +MODULE_ID("$Id: lib_getstr.c,v 1.26 2008/05/31 22:05:15 tom Exp $") 46834 46835 /* 46836 * This wipes out the last character, no matter whether it was a tab, control 46837 @@ -75,6 +75,7 @@ 46838 int maxlen, 46839 EVENTLIST_1st(_nc_eventlist * evl)) 46840 { 46841 + SCREEN *sp = _nc_screen_of(win); 46842 TTY buf; 46843 bool oldnl, oldecho, oldraw, oldcbreak; 46844 char erasec; 46845 @@ -90,10 +91,10 @@ 46846 46847 _nc_get_tty_mode(&buf); 46848 46849 - oldnl = SP->_nl; 46850 - oldecho = SP->_echo; 46851 - oldraw = SP->_raw; 46852 - oldcbreak = SP->_cbreak; 46853 + oldnl = sp->_nl; 46854 + oldecho = sp->_echo; 46855 + oldraw = sp->_raw; 46856 + oldcbreak = sp->_cbreak; 46857 nl(); 46858 noecho(); 46859 noraw(); 46860 @@ -187,10 +188,10 @@ 46861 /* Restore with a single I/O call, to fix minor asymmetry between 46862 * raw/noraw, etc. 46863 */ 46864 - SP->_nl = oldnl; 46865 - SP->_echo = oldecho; 46866 - SP->_raw = oldraw; 46867 - SP->_cbreak = oldcbreak; 46868 + sp->_nl = oldnl; 46869 + sp->_echo = oldecho; 46870 + sp->_raw = oldraw; 46871 + sp->_cbreak = oldcbreak; 46872 46873 _nc_set_tty_mode(&buf); 43483 46874 43484 46875 diff -Naur ncurses-5.6.orig/ncurses/base/lib_initscr.c ncurses-5.6/ncurses/base/lib_initscr.c 43485 46876 --- ncurses-5.6.orig/ncurses/base/lib_initscr.c 2005-10-22 16:30:38.000000000 -0400 43486 +++ ncurses-5.6/ncurses/base/lib_initscr.c 200 7-12-21 00:02:36.000000000 -050046877 +++ ncurses-5.6/ncurses/base/lib_initscr.c 2008-06-18 06:49:51.000000000 -0400 43487 46878 @@ -1,5 +1,5 @@ 43488 46879 /**************************************************************************** 43489 46880 - * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. * 43490 + * Copyright (c) 1998-200 5,2007Free Software Foundation, Inc. *46881 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 43491 46882 * * 43492 46883 * Permission is hereby granted, free of charge, to any person obtaining a * 43493 46884 * copy of this software and associated documentation files (the * 43494 @@ -45,19 +45, 18@@46885 @@ -45,19 +45,22 @@ 43495 46886 #include <sys/termio.h> /* needed for ISC */ 43496 46887 #endif 43497 46888 43498 46889 -MODULE_ID("$Id: lib_initscr.c,v 1.34 2005/10/22 20:30:38 tom Exp $") 43499 +MODULE_ID("$Id: lib_initscr.c,v 1.3 5 2007/04/21 20:43:02 tom Exp $")46890 +MODULE_ID("$Id: lib_initscr.c,v 1.37 2008/06/07 14:00:12 tom Exp $") 43500 46891 43501 46892 NCURSES_EXPORT(WINDOW *) … … 43503 46894 { 43504 46895 - static bool initialized = FALSE; 46896 + WINDOW *result; 46897 + 43505 46898 NCURSES_CONST char *name; 43506 46899 43507 46900 START_TRACE(); 43508 46901 T((T_CALLED("initscr()"))); 46902 + 46903 + _nc_lock_global(curses); 43509 46904 /* Portable applications must not call initscr() more than once */ 43510 46905 - if (!initialized) { … … 43515 46910 if ((name = getenv("TERM")) == 0 43516 46911 || *name == '\0') 46912 @@ -87,5 +90,8 @@ 46913 /* def_shell_mode - done in newterm/_nc_setupscreen */ 46914 def_prog_mode(); 46915 } 46916 - returnWin(stdscr); 46917 + result = stdscr; 46918 + _nc_unlock_global(curses); 46919 + 46920 + returnWin(result); 46921 } 46922 diff -Naur ncurses-5.6.orig/ncurses/base/lib_insch.c ncurses-5.6/ncurses/base/lib_insch.c 46923 --- ncurses-5.6.orig/ncurses/base/lib_insch.c 2005-02-26 14:27:28.000000000 -0500 46924 +++ ncurses-5.6/ncurses/base/lib_insch.c 2008-06-18 06:49:46.000000000 -0400 46925 @@ -1,5 +1,5 @@ 46926 /**************************************************************************** 46927 - * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. * 46928 + * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. * 46929 * * 46930 * Permission is hereby granted, free of charge, to any person obtaining a * 46931 * copy of this software and associated documentation files (the * 46932 @@ -43,7 +43,7 @@ 46933 #include <curses.priv.h> 46934 #include <ctype.h> 46935 46936 -MODULE_ID("$Id: lib_insch.c,v 1.24 2005/02/26 19:27:28 tom Exp $") 46937 +MODULE_ID("$Id: lib_insch.c,v 1.25 2008/02/03 00:14:37 tom Exp $") 46938 46939 /* 46940 * Insert the given character, updating the current location to simplify 46941 @@ -95,7 +95,8 @@ 46942 } else if (is8bits(ChCharOf(ch)) && iscntrl(ChCharOf(ch))) { 46943 s = unctrl(ChCharOf(ch)); 46944 while (*s != '\0') { 46945 - if ((code = _nc_insert_ch(win, ChAttrOf(ch) | UChar(*s))) != OK) 46946 + code = _nc_insert_ch(win, ChAttrOf(ch) | UChar(*s)); 46947 + if (code != OK) 46948 break; 46949 ++s; 46950 } 46951 @@ -107,8 +108,23 @@ 46952 */ 46953 SetChar2(wch, ch); 46954 wch = _nc_render(win, wch); 46955 - if (_nc_build_wch(win, &wch) >= 0) 46956 + count = _nc_build_wch(win, &wch); 46957 + if (count > 0) { 46958 code = wins_wch(win, &wch); 46959 + } else if (count == -1) { 46960 + /* handle EILSEQ */ 46961 + if (is8bits(ch)) { 46962 + s = unctrl(ChCharOf(ch)); 46963 + while (*s != '\0') { 46964 + code = _nc_insert_ch(win, ChAttrOf(ch) | UChar(*s)); 46965 + if (code != OK) 46966 + break; 46967 + ++s; 46968 + } 46969 + } else { 46970 + code = ERR; 46971 + } 46972 + } 46973 } 46974 #endif 46975 break; 43517 46976 diff -Naur ncurses-5.6.orig/ncurses/base/lib_instr.c ncurses-5.6/ncurses/base/lib_instr.c 43518 46977 --- ncurses-5.6.orig/ncurses/base/lib_instr.c 2005-11-19 20:38:03.000000000 -0500 43519 +++ ncurses-5.6/ncurses/base/lib_instr.c 200 7-12-21 00:02:36.000000000 -050046978 +++ ncurses-5.6/ncurses/base/lib_instr.c 2008-06-18 06:49:44.000000000 -0400 43520 46979 @@ -1,5 +1,5 @@ 43521 46980 /**************************************************************************** … … 43556 47015 diff -Naur ncurses-5.6.orig/ncurses/base/lib_mouse.c ncurses-5.6/ncurses/base/lib_mouse.c 43557 47016 --- ncurses-5.6.orig/ncurses/base/lib_mouse.c 2006-11-25 17:30:28.000000000 -0500 43558 +++ ncurses-5.6/ncurses/base/lib_mouse.c 200 7-12-21 00:02:36.000000000 -050047017 +++ ncurses-5.6/ncurses/base/lib_mouse.c 2008-06-18 06:49:51.000000000 -0400 43559 47018 @@ -1,5 +1,5 @@ 43560 47019 /**************************************************************************** 43561 47020 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 43562 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *47021 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 43563 47022 * * 43564 47023 * Permission is hereby granted, free of charge, to any person obtaining a * … … 43569 47028 43570 47029 -MODULE_ID("$Id: lib_mouse.c,v 1.85 2006/11/25 22:30:28 tom Exp $") 43571 +MODULE_ID("$Id: lib_mouse.c,v 1. 88 2007/09/29 21:50:04tom Exp $")47030 +MODULE_ID("$Id: lib_mouse.c,v 1.94 2008/05/31 20:30:10 tom Exp $") 43572 47031 43573 47032 #include <term.h> 43574 47033 #include <tic.h> 43575 @@ -403,11 +403,11 @@ 47034 @@ -154,34 +154,34 @@ 47035 47036 #endif /* USE_GPM_SUPPORT */ 47037 47038 -static bool _nc_mouse_parse(int); 47039 +static bool _nc_mouse_parse(SCREEN *, int); 47040 static void _nc_mouse_resume(SCREEN *); 47041 static void _nc_mouse_wrap(SCREEN *); 47042 47043 /* maintain a circular list of mouse events */ 47044 47045 #undef NEXT 47046 -#define NEXT(ep) ((ep == SP->_mouse_events + EV_MAX - 1) \ 47047 - ? SP->_mouse_events \ 47048 +#define NEXT(ep) ((ep == sp->_mouse_events + EV_MAX - 1) \ 47049 + ? sp->_mouse_events \ 47050 : ep + 1) 47051 47052 #undef PREV 47053 -#define PREV(ep) ((ep == SP->_mouse_events) \ 47054 - ? SP->_mouse_events + EV_MAX - 1 \ 47055 +#define PREV(ep) ((ep == sp->_mouse_events) \ 47056 + ? sp->_mouse_events + EV_MAX - 1 \ 47057 : ep - 1) 47058 47059 #ifdef TRACE 47060 static void 47061 -_trace_slot(const char *tag) 47062 +_trace_slot(SCREEN *sp, const char *tag) 47063 { 47064 MEVENT *ep; 47065 47066 _tracef(tag); 47067 47068 - for (ep = SP->_mouse_events; ep < SP->_mouse_events + EV_MAX; ep++) 47069 + for (ep = sp->_mouse_events; ep < sp->_mouse_events + EV_MAX; ep++) 47070 _tracef("mouse event queue slot %ld = %s", 47071 - (long) (ep - SP->_mouse_events), 47072 - _tracemouse(ep)); 47073 + (long) (ep - sp->_mouse_events), 47074 + _nc_tracemouse(sp, ep)); 47075 } 47076 #endif 47077 47078 @@ -193,7 +193,7 @@ 47079 # define M_FD(sp) sp->_mouse_fd 47080 47081 static void 47082 -write_event(int down, int button, int x, int y) 47083 +write_event(SCREEN *sp, int down, int button, int x, int y) 47084 { 47085 char buf[6]; 47086 unsigned long ignore; 47087 @@ -202,12 +202,13 @@ 47088 buf[3] = ' ' + (button - 1) + (down ? 0 : 0x40); 47089 buf[4] = ' ' + x - LEFT_COL + 1; 47090 buf[5] = ' ' + y - TOP_ROW + 1; 47091 - DosWrite(SP->_emxmouse_wfd, buf, 6, &ignore); 47092 + DosWrite(sp->_emxmouse_wfd, buf, 6, &ignore); 47093 } 47094 47095 static void 47096 -mouse_server(unsigned long ignored GCC_UNUSED) 47097 +mouse_server(unsigned long param) 47098 { 47099 + SCREEN *sp = (SCREEN *) param; 47100 unsigned short fWait = MOU_WAIT; 47101 /* NOPTRRECT mourt = { 0,0,24,79 }; */ 47102 MOUEVENTINFO mouev; 47103 @@ -234,7 +235,7 @@ 47104 sprintf(err, "Error reading mouse queue, rc=%lu.\r\n", rc); 47105 break; 47106 } 47107 - if (!SP->_emxmouse_activated) 47108 + if (!sp->_emxmouse_activated) 47109 goto finish; 47110 47111 /* 47112 @@ -246,13 +247,13 @@ 47113 */ 47114 if ((mouev.fs ^ oldstate) & MOUSE_BN1_DOWN) 47115 write_event(mouev.fs & MOUSE_BN1_DOWN, 47116 - SP->_emxmouse_buttons[1], mouev.col, mouev.row); 47117 + sp->_emxmouse_buttons[1], mouev.col, mouev.row); 47118 if ((mouev.fs ^ oldstate) & MOUSE_BN2_DOWN) 47119 write_event(mouev.fs & MOUSE_BN2_DOWN, 47120 - SP->_emxmouse_buttons[3], mouev.col, mouev.row); 47121 + sp->_emxmouse_buttons[3], mouev.col, mouev.row); 47122 if ((mouev.fs ^ oldstate) & MOUSE_BN3_DOWN) 47123 write_event(mouev.fs & MOUSE_BN3_DOWN, 47124 - SP->_emxmouse_buttons[2], mouev.col, mouev.row); 47125 + sp->_emxmouse_buttons[2], mouev.col, mouev.row); 47126 47127 finish: 47128 oldstate = mouev.fs; 47129 @@ -271,81 +272,87 @@ 47130 47131 #if USE_SYSMOUSE 47132 static void 47133 -handle_sysmouse(int sig GCC_UNUSED) 47134 +sysmouse_server(SCREEN *sp) 47135 { 47136 struct mouse_info the_mouse; 47137 MEVENT *work; 47138 47139 the_mouse.operation = MOUSE_GETINFO; 47140 - if (SP != 0 47141 - && SP->_mouse_fd >= 0 47142 - && SP->_sysmouse_tail < FIFO_SIZE 47143 - && ioctl(SP->_mouse_fd, CONS_MOUSECTL, &the_mouse) != -1) { 47144 - 47145 - if (SP->_sysmouse_head > SP->_sysmouse_tail) { 47146 - SP->_sysmouse_tail = 0; 47147 - SP->_sysmouse_head = 0; 47148 + if (sp != 0 47149 + && sp->_mouse_fd >= 0 47150 + && sp->_sysmouse_tail < FIFO_SIZE 47151 + && ioctl(sp->_mouse_fd, CONS_MOUSECTL, &the_mouse) != -1) { 47152 + 47153 + if (sp->_sysmouse_head > sp->_sysmouse_tail) { 47154 + sp->_sysmouse_tail = 0; 47155 + sp->_sysmouse_head = 0; 47156 } 47157 - work = &(SP->_sysmouse_fifo[SP->_sysmouse_tail]); 47158 + work = &(sp->_sysmouse_fifo[sp->_sysmouse_tail]); 47159 memset(work, 0, sizeof(*work)); 47160 work->id = NORMAL_EVENT; /* there's only one mouse... */ 47161 47162 - SP->_sysmouse_old_buttons = SP->_sysmouse_new_buttons; 47163 - SP->_sysmouse_new_buttons = the_mouse.u.data.buttons & 0x7; 47164 + sp->_sysmouse_old_buttons = sp->_sysmouse_new_buttons; 47165 + sp->_sysmouse_new_buttons = the_mouse.u.data.buttons & 0x7; 47166 47167 - if (SP->_sysmouse_new_buttons) { 47168 - if (SP->_sysmouse_new_buttons & 1) 47169 + if (sp->_sysmouse_new_buttons) { 47170 + if (sp->_sysmouse_new_buttons & 1) 47171 work->bstate |= BUTTON1_PRESSED; 47172 - if (SP->_sysmouse_new_buttons & 2) 47173 + if (sp->_sysmouse_new_buttons & 2) 47174 work->bstate |= BUTTON2_PRESSED; 47175 - if (SP->_sysmouse_new_buttons & 4) 47176 + if (sp->_sysmouse_new_buttons & 4) 47177 work->bstate |= BUTTON3_PRESSED; 47178 } else { 47179 - if (SP->_sysmouse_old_buttons & 1) 47180 + if (sp->_sysmouse_old_buttons & 1) 47181 work->bstate |= BUTTON1_RELEASED; 47182 - if (SP->_sysmouse_old_buttons & 2) 47183 + if (sp->_sysmouse_old_buttons & 2) 47184 work->bstate |= BUTTON2_RELEASED; 47185 - if (SP->_sysmouse_old_buttons & 4) 47186 + if (sp->_sysmouse_old_buttons & 4) 47187 work->bstate |= BUTTON3_RELEASED; 47188 } 47189 47190 /* for cosmetic bug in syscons.c on FreeBSD 3.[34] */ 47191 the_mouse.operation = MOUSE_HIDE; 47192 - ioctl(SP->_mouse_fd, CONS_MOUSECTL, &the_mouse); 47193 + ioctl(sp->_mouse_fd, CONS_MOUSECTL, &the_mouse); 47194 the_mouse.operation = MOUSE_SHOW; 47195 - ioctl(SP->_mouse_fd, CONS_MOUSECTL, &the_mouse); 47196 + ioctl(sp->_mouse_fd, CONS_MOUSECTL, &the_mouse); 47197 47198 /* 47199 * We're only interested if the button is pressed or released. 47200 * FIXME: implement continuous event-tracking. 47201 */ 47202 - if (SP->_sysmouse_new_buttons != SP->_sysmouse_old_buttons) { 47203 - SP->_sysmouse_tail += 1; 47204 + if (sp->_sysmouse_new_buttons != sp->_sysmouse_old_buttons) { 47205 + sp->_sysmouse_tail += 1; 47206 } 47207 - work->x = the_mouse.u.data.x / SP->_sysmouse_char_width; 47208 - work->y = the_mouse.u.data.y / SP->_sysmouse_char_height; 47209 + work->x = the_mouse.u.data.x / sp->_sysmouse_char_width; 47210 + work->y = the_mouse.u.data.y / sp->_sysmouse_char_height; 47211 } 47212 } 47213 + 47214 +static void 47215 +handle_sysmouse(int sig GCC_UNUSED) 47216 +{ 47217 + sysmouse_server(SP); 47218 +} 47219 #endif /* USE_SYSMOUSE */ 47220 47221 static void 47222 -init_xterm_mouse(void) 47223 +init_xterm_mouse(SCREEN *sp) 47224 { 47225 - SP->_mouse_type = M_XTERM; 47226 - SP->_mouse_xtermcap = tigetstr("XM"); 47227 - if (!VALID_STRING(SP->_mouse_xtermcap)) 47228 - SP->_mouse_xtermcap = "\033[?1000%?%p1%{1}%=%th%el%;"; 47229 + sp->_mouse_type = M_XTERM; 47230 + sp->_mouse_xtermcap = tigetstr("XM"); 47231 + if (!VALID_STRING(sp->_mouse_xtermcap)) 47232 + sp->_mouse_xtermcap = "\033[?1000%?%p1%{1}%=%th%el%;"; 47233 } 47234 47235 static void 47236 -enable_xterm_mouse(int enable) 47237 +enable_xterm_mouse(SCREEN *sp, int enable) 47238 { 47239 #if USE_EMX_MOUSE 47240 - SP->_emxmouse_activated = enable; 47241 + sp->_emxmouse_activated = enable; 47242 #else 47243 - putp(TPARM_1(SP->_mouse_xtermcap, enable)); 47244 + putp(TPARM_1(sp->_mouse_xtermcap, enable)); 47245 #endif 47246 - SP->_mouse_active = enable; 47247 + sp->_mouse_active = enable; 47248 } 47249 47250 #if USE_GPM_SUPPORT 47251 @@ -366,19 +373,19 @@ 47252 } 47253 47254 static bool 47255 -enable_gpm_mouse(int enable) 47256 +enable_gpm_mouse(SCREEN *sp, int enable) 47257 { 47258 bool result; 47259 47260 T((T_CALLED("enable_gpm_mouse(%d)"), enable)); 47261 47262 - if (enable && !SP->_mouse_active) { 47263 + if (enable && !sp->_mouse_active) { 47264 /* GPM: initialize connection to gpm server */ 47265 - SP->_mouse_gpm_connect.eventMask = GPM_DOWN | GPM_UP; 47266 - SP->_mouse_gpm_connect.defaultMask = 47267 - ~(SP->_mouse_gpm_connect.eventMask | GPM_HARD); 47268 - SP->_mouse_gpm_connect.minMod = 0; 47269 - SP->_mouse_gpm_connect.maxMod = 47270 + sp->_mouse_gpm_connect.eventMask = GPM_DOWN | GPM_UP; 47271 + sp->_mouse_gpm_connect.defaultMask = 47272 + ~(sp->_mouse_gpm_connect.eventMask | GPM_HARD); 47273 + sp->_mouse_gpm_connect.minMod = 0; 47274 + sp->_mouse_gpm_connect.maxMod = 47275 (unsigned short) (~((1 << KG_SHIFT) | 47276 (1 << KG_SHIFTL) | 47277 (1 << KG_SHIFTR))); 47278 @@ -387,14 +394,14 @@ 47279 * The former is recognized by wscons (SunOS), and the latter by 47280 * xterm. Those will not show up in ncurses' traces. 47281 */ 47282 - result = (my_Gpm_Open(&SP->_mouse_gpm_connect, 0) >= 0); 47283 - SP->_mouse_active = result; 47284 + result = (my_Gpm_Open(&sp->_mouse_gpm_connect, 0) >= 0); 47285 + sp->_mouse_active = result; 47286 T(("GPM open %s", result ? "succeeded" : "failed")); 47287 } else { 47288 - if (!enable && SP->_mouse_active) { 47289 + if (!enable && sp->_mouse_active) { 47290 /* GPM: close connection to gpm server */ 47291 my_Gpm_Close(); 47292 - SP->_mouse_active = FALSE; 47293 + sp->_mouse_active = FALSE; 47294 T(("GPM closed")); 47295 } 47296 result = FALSE; 47297 @@ -403,17 +410,17 @@ 43576 47298 } 43577 47299 #endif /* USE_GPM_SUPPORT */ … … 43580 47302 + 43581 47303 static void 43582 initialize_mousetype(void) 47304 -initialize_mousetype(void) 47305 +initialize_mousetype(SCREEN *sp) 43583 47306 { 43584 47307 - static const char *xterm_kmous = "\033[M"; … … 43587 47310 43588 47311 /* Try gpm first, because gpm may be configured to run in xterm */ 43589 @@ -565,8 +565,8 @@ 43590 init_xterm_mouse(); 47312 #if USE_GPM_SUPPORT 47313 if (allow_gpm_mouse()) { 47314 - if (!SP->_mouse_gpm_loaded) { 47315 + if (!sp->_mouse_gpm_loaded) { 47316 #ifdef HAVE_LIBDL 47317 void *obj; 47318 47319 @@ -425,13 +432,13 @@ 47320 T(("GPM initialization failed: %s", dlerror())); 47321 dlclose(obj); 47322 } else { 47323 - SP->_mouse_gpm_found = TRUE; 47324 + sp->_mouse_gpm_found = TRUE; 47325 } 47326 } 47327 #else /* !HAVE_LIBDL */ 47328 - SP->_mouse_gpm_found = TRUE; 47329 + sp->_mouse_gpm_found = TRUE; 47330 #endif 47331 - SP->_mouse_gpm_loaded = TRUE; 47332 + sp->_mouse_gpm_loaded = TRUE; 47333 } 47334 47335 /* 47336 @@ -439,10 +446,10 @@ 47337 * maintain our notion of whether the mouse connection is active 47338 * without testing the file-descriptor. 47339 */ 47340 - if (SP->_mouse_gpm_found && enable_gpm_mouse(TRUE)) { 47341 - SP->_mouse_type = M_GPM; 47342 - SP->_mouse_fd = *(my_gpm_fd); 47343 - T(("GPM mouse_fd %d", SP->_mouse_fd)); 47344 + if (sp->_mouse_gpm_found && enable_gpm_mouse(sp, TRUE)) { 47345 + sp->_mouse_type = M_GPM; 47346 + sp->_mouse_fd = *(my_gpm_fd); 47347 + T(("GPM mouse_fd %d", sp->_mouse_fd)); 47348 returnVoid; 47349 } 47350 } 47351 @@ -450,7 +457,7 @@ 47352 47353 /* OS/2 VIO */ 47354 #if USE_EMX_MOUSE 47355 - if (!SP->_emxmouse_thread 47356 + if (!sp->_emxmouse_thread 47357 && strstr(cur_term->type.term_names, "xterm") == 0 47358 && key_mouse) { 47359 int handles[2]; 47360 @@ -461,32 +468,32 @@ 47361 } else { 47362 int rc; 47363 47364 - if (!SP->_emxmouse_buttons[0]) { 47365 + if (!sp->_emxmouse_buttons[0]) { 47366 char *s = getenv("MOUSE_BUTTONS_123"); 47367 47368 - SP->_emxmouse_buttons[0] = 1; 47369 + sp->_emxmouse_buttons[0] = 1; 47370 if (s && strlen(s) >= 3) { 47371 - SP->_emxmouse_buttons[1] = s[0] - '0'; 47372 - SP->_emxmouse_buttons[2] = s[1] - '0'; 47373 - SP->_emxmouse_buttons[3] = s[2] - '0'; 47374 + sp->_emxmouse_buttons[1] = s[0] - '0'; 47375 + sp->_emxmouse_buttons[2] = s[1] - '0'; 47376 + sp->_emxmouse_buttons[3] = s[2] - '0'; 47377 } else { 47378 - SP->_emxmouse_buttons[1] = 1; 47379 - SP->_emxmouse_buttons[2] = 3; 47380 - SP->_emxmouse_buttons[3] = 2; 47381 + sp->_emxmouse_buttons[1] = 1; 47382 + sp->_emxmouse_buttons[2] = 3; 47383 + sp->_emxmouse_buttons[3] = 2; 47384 } 47385 } 47386 - SP->_emxmouse_wfd = handles[1]; 47387 - M_FD(SP) = handles[0]; 47388 + sp->_emxmouse_wfd = handles[1]; 47389 + M_FD(sp) = handles[0]; 47390 /* Needed? */ 47391 setmode(handles[0], O_BINARY); 47392 setmode(handles[1], O_BINARY); 47393 /* Do not use CRT functions, we may single-threaded. */ 47394 - rc = DosCreateThread((unsigned long *) &SP->_emxmouse_thread, 47395 - mouse_server, 0, 0, 8192); 47396 + rc = DosCreateThread((unsigned long *) &sp->_emxmouse_thread, 47397 + mouse_server, sp, 0, 8192); 47398 if (rc) { 47399 printf("mouse thread error %d=%#x", rc, rc); 47400 } else { 47401 - SP->_mouse_type = M_XTERM; 47402 + sp->_mouse_type = M_XTERM; 47403 } 47404 returnVoid; 47405 } 47406 @@ -498,14 +505,14 @@ 47407 struct mouse_info the_mouse; 47408 char *the_device = 0; 47409 47410 - if (isatty(SP->_ifd)) 47411 - the_device = ttyname(SP->_ifd); 47412 + if (isatty(sp->_ifd)) 47413 + the_device = ttyname(sp->_ifd); 47414 if (the_device == 0) 47415 the_device = "/dev/tty"; 47416 47417 - SP->_mouse_fd = open(the_device, O_RDWR); 47418 + sp->_mouse_fd = open(the_device, O_RDWR); 47419 47420 - if (SP->_mouse_fd >= 0) { 47421 + if (sp->_mouse_fd >= 0) { 47422 /* 47423 * sysmouse does not have a usable user interface for obtaining 47424 * mouse events. The logical way to proceed (reading data on a 47425 @@ -522,10 +529,10 @@ 47426 the_mouse.operation = MOUSE_MODE; 47427 the_mouse.u.mode.mode = 0; 47428 the_mouse.u.mode.signal = SIGUSR2; 47429 - if (ioctl(SP->_mouse_fd, CONS_MOUSECTL, &the_mouse) != -1) { 47430 + if (ioctl(sp->_mouse_fd, CONS_MOUSECTL, &the_mouse) != -1) { 47431 signal(SIGUSR2, handle_sysmouse); 47432 the_mouse.operation = MOUSE_SHOW; 47433 - ioctl(SP->_mouse_fd, CONS_MOUSECTL, &the_mouse); 47434 + ioctl(sp->_mouse_fd, CONS_MOUSECTL, &the_mouse); 47435 47436 #if defined(FBIO_MODEINFO) || defined(CONS_MODEINFO) /* FreeBSD > 2.x */ 47437 { 47438 @@ -535,23 +542,23 @@ 47439 #endif /* FBIO_GETMODE */ 47440 video_info_t the_video; 47441 47442 - if (ioctl(SP->_mouse_fd, 47443 + if (ioctl(sp->_mouse_fd, 47444 FBIO_GETMODE, 47445 &the_video.vi_mode) != -1 47446 - && ioctl(SP->_mouse_fd, 47447 + && ioctl(sp->_mouse_fd, 47448 FBIO_MODEINFO, 47449 &the_video) != -1) { 47450 - SP->_sysmouse_char_width = the_video.vi_cwidth; 47451 - SP->_sysmouse_char_height = the_video.vi_cheight; 47452 + sp->_sysmouse_char_width = the_video.vi_cwidth; 47453 + sp->_sysmouse_char_height = the_video.vi_cheight; 47454 } 47455 } 47456 #endif /* defined(FBIO_MODEINFO) || defined(CONS_MODEINFO) */ 47457 47458 - if (SP->_sysmouse_char_width <= 0) 47459 - SP->_sysmouse_char_width = 8; 47460 - if (SP->_sysmouse_char_height <= 0) 47461 - SP->_sysmouse_char_height = 16; 47462 - SP->_mouse_type = M_SYSMOUSE; 47463 + if (sp->_sysmouse_char_width <= 0) 47464 + sp->_sysmouse_char_width = 8; 47465 + if (sp->_sysmouse_char_height <= 0) 47466 + sp->_sysmouse_char_height = 16; 47467 + sp->_mouse_type = M_SYSMOUSE; 47468 returnVoid; 47469 } 47470 } 47471 @@ -562,37 +569,37 @@ 47472 if (key_mouse != 0) { 47473 if (!strcmp(key_mouse, xterm_kmous) 47474 || strstr(cur_term->type.term_names, "xterm") != 0) { 47475 - init_xterm_mouse(); 47476 + init_xterm_mouse(sp); 43591 47477 } 43592 47478 } else if (strstr(cur_term->type.term_names, "xterm") != 0) { 43593 47479 - (void) _nc_add_to_try(&(SP->_keytry), xterm_kmous, KEY_MOUSE); 43594 47480 - init_xterm_mouse(); 43595 + if (_nc_add_to_try(&( SP->_keytry), xterm_kmous, KEY_MOUSE) == OK)43596 + init_xterm_mouse( );47481 + if (_nc_add_to_try(&(sp->_keytry), xterm_kmous, KEY_MOUSE) == OK) 47482 + init_xterm_mouse(sp); 43597 47483 } 43598 47484 returnVoid; 43599 47485 } 43600 @@ -985,12 +985,13 @@ 47486 47487 static bool 47488 -_nc_mouse_init(void) 47489 +_nc_mouse_init(SCREEN *sp) 47490 /* initialize the mouse */ 47491 { 47492 bool result = FALSE; 47493 int i; 47494 47495 - if (SP != 0) { 47496 - if (!SP->_mouse_initialized) { 47497 - SP->_mouse_initialized = TRUE; 47498 + if (sp != 0) { 47499 + if (!sp->_mouse_initialized) { 47500 + sp->_mouse_initialized = TRUE; 47501 47502 TR(MY_TRACE, ("_nc_mouse_init() called")); 47503 47504 - SP->_mouse_eventp = SP->_mouse_events; 47505 + sp->_mouse_eventp = sp->_mouse_events; 47506 for (i = 0; i < EV_MAX; i++) 47507 - SP->_mouse_events[i].id = INVALID_EVENT; 47508 + sp->_mouse_events[i].id = INVALID_EVENT; 47509 47510 - initialize_mousetype(); 47511 + initialize_mousetype(sp); 47512 47513 - T(("_nc_mouse_init() set mousetype to %d", SP->_mouse_type)); 47514 + T(("_nc_mouse_init() set mousetype to %d", sp->_mouse_type)); 47515 } 47516 - result = SP->_mouse_initialized; 47517 + result = sp->_mouse_initialized; 47518 } 47519 return result; 47520 } 47521 @@ -604,12 +611,12 @@ 47522 static bool 47523 _nc_mouse_event(SCREEN *sp GCC_UNUSED) 47524 { 47525 - MEVENT *eventp = SP->_mouse_eventp; 47526 + MEVENT *eventp = sp->_mouse_eventp; 47527 bool result = FALSE; 47528 47529 (void) eventp; 47530 47531 - switch (SP->_mouse_type) { 47532 + switch (sp->_mouse_type) { 47533 case M_XTERM: 47534 /* xterm: never have to query, mouse events are in the keyboard stream */ 47535 #if USE_EMX_MOUSE 47536 @@ -666,7 +673,7 @@ 47537 eventp->z = 0; 47538 47539 /* bump the next-free pointer into the circular list */ 47540 - SP->_mouse_eventp = eventp = NEXT(eventp); 47541 + sp->_mouse_eventp = eventp = NEXT(eventp); 47542 result = TRUE; 47543 } 47544 } 47545 @@ -675,22 +682,22 @@ 47546 47547 #if USE_SYSMOUSE 47548 case M_SYSMOUSE: 47549 - if (SP->_sysmouse_head < SP->_sysmouse_tail) { 47550 - *eventp = SP->_sysmouse_fifo[SP->_sysmouse_head]; 47551 + if (sp->_sysmouse_head < sp->_sysmouse_tail) { 47552 + *eventp = sp->_sysmouse_fifo[sp->_sysmouse_head]; 47553 47554 /* 47555 * Point the fifo-head to the next possible location. If there 47556 * are none, reset the indices. This may be interrupted by the 47557 * signal handler, doing essentially the same reset. 47558 */ 47559 - SP->_sysmouse_head += 1; 47560 - if (SP->_sysmouse_head == SP->_sysmouse_tail) { 47561 - SP->_sysmouse_tail = 0; 47562 - SP->_sysmouse_head = 0; 47563 + sp->_sysmouse_head += 1; 47564 + if (sp->_sysmouse_head == sp->_sysmouse_tail) { 47565 + sp->_sysmouse_tail = 0; 47566 + sp->_sysmouse_head = 0; 47567 } 47568 47569 /* bump the next-free pointer into the circular list */ 47570 - SP->_mouse_eventp = eventp = NEXT(eventp); 47571 + sp->_mouse_eventp = eventp = NEXT(eventp); 47572 result = TRUE; 47573 } 47574 break; 47575 @@ -709,11 +716,11 @@ 47576 { 47577 int b; 47578 bool result = FALSE; 47579 - MEVENT *eventp = SP->_mouse_eventp; 47580 + MEVENT *eventp = sp->_mouse_eventp; 47581 47582 TR(MY_TRACE, ("_nc_mouse_inline() called")); 47583 47584 - if (SP->_mouse_type == M_XTERM) { 47585 + if (sp->_mouse_type == M_XTERM) { 47586 unsigned char kbuf[4]; 47587 mmask_t prev; 47588 size_t grabbed; 47589 @@ -847,11 +854,11 @@ 47590 eventp->y = (kbuf[2] - ' ') - 1; 47591 TR(MY_TRACE, 47592 ("_nc_mouse_inline: primitive mouse-event %s has slot %ld", 47593 - _tracemouse(eventp), 47594 - (long) (eventp - SP->_mouse_events))); 47595 + _nc_tracemouse(sp, eventp), 47596 + (long) (eventp - sp->_mouse_events))); 47597 47598 /* bump the next-free pointer into the circular list */ 47599 - SP->_mouse_eventp = NEXT(eventp); 47600 + sp->_mouse_eventp = NEXT(eventp); 47601 #if 0 /* this return would be needed for QNX's mods to lib_getch.c */ 47602 return (TRUE); 47603 #endif 47604 @@ -861,36 +868,36 @@ 47605 } 47606 47607 static void 47608 -mouse_activate(bool on) 47609 +mouse_activate(SCREEN *sp, bool on) 47610 { 47611 - if (!on && !SP->_mouse_initialized) 47612 + if (!on && !sp->_mouse_initialized) 47613 return; 47614 47615 - if (!_nc_mouse_init()) 47616 + if (!_nc_mouse_init(sp)) 47617 return; 47618 47619 if (on) { 47620 47621 - switch (SP->_mouse_type) { 47622 + switch (sp->_mouse_type) { 47623 case M_XTERM: 47624 #if NCURSES_EXT_FUNCS 47625 keyok(KEY_MOUSE, on); 47626 #endif 47627 TPUTS_TRACE("xterm mouse initialization"); 47628 - enable_xterm_mouse(1); 47629 + enable_xterm_mouse(sp, 1); 47630 break; 47631 #if USE_GPM_SUPPORT 47632 case M_GPM: 47633 - if (enable_gpm_mouse(1)) { 47634 - SP->_mouse_fd = *(my_gpm_fd); 47635 - T(("GPM mouse_fd %d", SP->_mouse_fd)); 47636 + if (enable_gpm_mouse(sp, 1)) { 47637 + sp->_mouse_fd = *(my_gpm_fd); 47638 + T(("GPM mouse_fd %d", sp->_mouse_fd)); 47639 } 47640 break; 47641 #endif 47642 #if USE_SYSMOUSE 47643 case M_SYSMOUSE: 47644 signal(SIGUSR2, handle_sysmouse); 47645 - SP->_mouse_active = TRUE; 47646 + sp->_mouse_active = TRUE; 47647 break; 47648 #endif 47649 case M_NONE: 47650 @@ -899,27 +906,27 @@ 47651 /* Make runtime binding to cut down on object size of applications that 47652 * do not use the mouse (e.g., 'clear'). 47653 */ 47654 - SP->_mouse_event = _nc_mouse_event; 47655 - SP->_mouse_inline = _nc_mouse_inline; 47656 - SP->_mouse_parse = _nc_mouse_parse; 47657 - SP->_mouse_resume = _nc_mouse_resume; 47658 - SP->_mouse_wrap = _nc_mouse_wrap; 47659 + sp->_mouse_event = _nc_mouse_event; 47660 + sp->_mouse_inline = _nc_mouse_inline; 47661 + sp->_mouse_parse = _nc_mouse_parse; 47662 + sp->_mouse_resume = _nc_mouse_resume; 47663 + sp->_mouse_wrap = _nc_mouse_wrap; 47664 } else { 47665 47666 - switch (SP->_mouse_type) { 47667 + switch (sp->_mouse_type) { 47668 case M_XTERM: 47669 TPUTS_TRACE("xterm mouse deinitialization"); 47670 - enable_xterm_mouse(0); 47671 + enable_xterm_mouse(sp, 0); 47672 break; 47673 #if USE_GPM_SUPPORT 47674 case M_GPM: 47675 - enable_gpm_mouse(0); 47676 + enable_gpm_mouse(sp, 0); 47677 break; 47678 #endif 47679 #if USE_SYSMOUSE 47680 case M_SYSMOUSE: 47681 signal(SIGUSR2, SIG_IGN); 47682 - SP->_mouse_active = FALSE; 47683 + sp->_mouse_active = FALSE; 47684 break; 47685 #endif 47686 case M_NONE: 47687 @@ -936,10 +943,10 @@ 47688 **************************************************************************/ 47689 47690 static bool 47691 -_nc_mouse_parse(int runcount) 47692 +_nc_mouse_parse(SCREEN *sp, int runcount) 47693 /* parse a run of atomic mouse events into a gesture */ 47694 { 47695 - MEVENT *eventp = SP->_mouse_eventp; 47696 + MEVENT *eventp = sp->_mouse_eventp; 47697 MEVENT *ep, *runp, *next, *prev = PREV(eventp); 47698 int n; 47699 int b; 47700 @@ -971,10 +978,10 @@ 47701 if (runcount == 1) { 47702 TR(MY_TRACE, 47703 ("_nc_mouse_parse: returning simple mouse event %s at slot %ld", 47704 - _tracemouse(prev), 47705 - (long) (prev - SP->_mouse_events))); 47706 + _nc_tracemouse(sp, prev), 47707 + (long) (prev - sp->_mouse_events))); 47708 return (prev->id >= NORMAL_EVENT) 47709 - ? ((prev->bstate & SP->_mouse_mask) ? TRUE : FALSE) 47710 + ? ((prev->bstate & sp->_mouse_mask) ? TRUE : FALSE) 47711 : FALSE; 47712 } 47713 47714 @@ -985,12 +992,13 @@ 43601 47715 } 43602 47716 43603 47717 #ifdef TRACE 43604 47718 - if (_nc_tracing & TRACE_IEVENT) { 47719 - _trace_slot("before mouse press/release merge:"); 43605 47720 + if (USE_TRACEF(TRACE_IEVENT)) { 43606 _trace_slot("before mouse press/release merge:");47721 + _trace_slot(sp, "before mouse press/release merge:"); 43607 47722 _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d", 43608 (long) (runp - SP->_mouse_events), 43609 (long) ((eventp - SP->_mouse_events) + (EV_MAX - 1)) % EV_MAX, 47723 - (long) (runp - SP->_mouse_events), 47724 - (long) ((eventp - SP->_mouse_events) + (EV_MAX - 1)) % EV_MAX, 47725 + (long) (runp - sp->_mouse_events), 47726 + (long) ((eventp - sp->_mouse_events) + (EV_MAX - 1)) % EV_MAX, 43610 47727 runcount); 43611 47728 + _nc_unlock_global(tracef); … … 43613 47730 #endif /* TRACE */ 43614 47731 43615 @@ -1028,12 +1029,13 @@ 47732 @@ -1013,7 +1021,7 @@ 47733 #endif 47734 ) { 47735 for (b = 1; b <= MAX_BUTTONS; ++b) { 47736 - if ((SP->_mouse_mask & MASK_CLICK(b)) 47737 + if ((sp->_mouse_mask & MASK_CLICK(b)) 47738 && (ep->bstate & MASK_PRESS(b))) { 47739 ep->bstate &= ~MASK_PRESS(b); 47740 ep->bstate |= MASK_CLICK(b); 47741 @@ -1028,12 +1036,13 @@ 43616 47742 (merge); 43617 47743 43618 47744 #ifdef TRACE 43619 47745 - if (_nc_tracing & TRACE_IEVENT) { 47746 - _trace_slot("before mouse click merge:"); 43620 47747 + if (USE_TRACEF(TRACE_IEVENT)) { 43621 _trace_slot("before mouse click merge:");47748 + _trace_slot(sp, "before mouse click merge:"); 43622 47749 _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d", 43623 (long) (runp - SP->_mouse_events), 43624 (long) ((eventp - SP->_mouse_events) + (EV_MAX - 1)) % EV_MAX, 47750 - (long) (runp - SP->_mouse_events), 47751 - (long) ((eventp - SP->_mouse_events) + (EV_MAX - 1)) % EV_MAX, 47752 + (long) (runp - sp->_mouse_events), 47753 + (long) ((eventp - sp->_mouse_events) + (EV_MAX - 1)) % EV_MAX, 43625 47754 runcount); 43626 47755 + _nc_unlock_global(tracef); … … 43628 47757 #endif /* TRACE */ 43629 47758 43630 @@ -1099,12 +1101,13 @@ 47759 @@ -1069,7 +1078,7 @@ 47760 if ((ep->bstate & BUTTON_CLICKED) 47761 && (follower->bstate & BUTTON_CLICKED)) { 47762 for (b = 1; b <= MAX_BUTTONS; ++b) { 47763 - if ((SP->_mouse_mask & MASK_DOUBLE_CLICK(b)) 47764 + if ((sp->_mouse_mask & MASK_DOUBLE_CLICK(b)) 47765 && (follower->bstate & MASK_CLICK(b))) { 47766 follower->bstate &= ~MASK_CLICK(b); 47767 follower->bstate |= MASK_DOUBLE_CLICK(b); 47768 @@ -1084,7 +1093,7 @@ 47769 if ((ep->bstate & BUTTON_DOUBLE_CLICKED) 47770 && (follower->bstate & BUTTON_CLICKED)) { 47771 for (b = 1; b <= MAX_BUTTONS; ++b) { 47772 - if ((SP->_mouse_mask & MASK_TRIPLE_CLICK(b)) 47773 + if ((sp->_mouse_mask & MASK_TRIPLE_CLICK(b)) 47774 && (follower->bstate & MASK_CLICK(b))) { 47775 follower->bstate &= ~MASK_CLICK(b); 47776 follower->bstate |= MASK_TRIPLE_CLICK(b); 47777 @@ -1099,12 +1108,13 @@ 43631 47778 (merge); 43632 47779 43633 47780 #ifdef TRACE 43634 47781 - if (_nc_tracing & TRACE_IEVENT) { 47782 - _trace_slot("before mouse event queue compaction:"); 43635 47783 + if (USE_TRACEF(TRACE_IEVENT)) { 43636 _trace_slot("before mouse event queue compaction:");47784 + _trace_slot(sp, "before mouse event queue compaction:"); 43637 47785 _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d", 43638 (long) (runp - SP->_mouse_events), 43639 (long) ((eventp - SP->_mouse_events) + (EV_MAX - 1)) % EV_MAX, 47786 - (long) (runp - SP->_mouse_events), 47787 - (long) ((eventp - SP->_mouse_events) + (EV_MAX - 1)) % EV_MAX, 47788 + (long) (runp - sp->_mouse_events), 47789 + (long) ((eventp - sp->_mouse_events) + (EV_MAX - 1)) % EV_MAX, 43640 47790 runcount); 43641 47791 + _nc_unlock_global(tracef); … … 43643 47793 #endif /* TRACE */ 43644 47794 43645 @@ -1117,12 +1120,13 @@ 43646 SP->_mouse_eventp = eventp = prev; 47795 @@ -1113,23 +1123,24 @@ 47796 * don't match the current event mask. 47797 */ 47798 for (; runcount; prev = PREV(eventp), runcount--) 47799 - if (prev->id == INVALID_EVENT || !(prev->bstate & SP->_mouse_mask)) { 47800 - SP->_mouse_eventp = eventp = prev; 47801 + if (prev->id == INVALID_EVENT || !(prev->bstate & sp->_mouse_mask)) { 47802 + sp->_mouse_eventp = eventp = prev; 43647 47803 } 43648 47804 #ifdef TRACE 43649 47805 - if (_nc_tracing & TRACE_IEVENT) { 47806 - _trace_slot("after mouse event queue compaction:"); 43650 47807 + if (USE_TRACEF(TRACE_IEVENT)) { 43651 _trace_slot("after mouse event queue compaction:");47808 + _trace_slot(sp, "after mouse event queue compaction:"); 43652 47809 _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d", 43653 (long) (runp - SP->_mouse_events), 43654 (long) ((eventp - SP->_mouse_events) + (EV_MAX - 1)) % EV_MAX, 47810 - (long) (runp - SP->_mouse_events), 47811 - (long) ((eventp - SP->_mouse_events) + (EV_MAX - 1)) % EV_MAX, 47812 + (long) (runp - sp->_mouse_events), 47813 + (long) ((eventp - sp->_mouse_events) + (EV_MAX - 1)) % EV_MAX, 43655 47814 runcount); 43656 47815 + _nc_unlock_global(tracef); … … 43658 47817 for (ep = runp; ep != eventp; ep = NEXT(ep)) 43659 47818 if (ep->id != INVALID_EVENT) 47819 TR(MY_TRACE, 47820 ("_nc_mouse_parse: returning composite mouse event %s at slot %ld", 47821 - _tracemouse(ep), 47822 - (long) (ep - SP->_mouse_events))); 47823 + _nc_tracemouse(sp, ep), 47824 + (long) (ep - sp->_mouse_events))); 47825 #endif /* TRACE */ 47826 47827 /* after all this, do we have a valid event? */ 47828 @@ -1137,26 +1148,26 @@ 47829 } 47830 47831 static void 47832 -_nc_mouse_wrap(SCREEN *sp GCC_UNUSED) 47833 +_nc_mouse_wrap(SCREEN *sp) 47834 /* release mouse -- called by endwin() before shellout/exit */ 47835 { 47836 TR(MY_TRACE, ("_nc_mouse_wrap() called")); 47837 47838 - switch (SP->_mouse_type) { 47839 + switch (sp->_mouse_type) { 47840 case M_XTERM: 47841 - if (SP->_mouse_mask) 47842 - mouse_activate(FALSE); 47843 + if (sp->_mouse_mask) 47844 + mouse_activate(sp, FALSE); 47845 break; 47846 #if USE_GPM_SUPPORT 47847 /* GPM: pass all mouse events to next client */ 47848 case M_GPM: 47849 - if (SP->_mouse_mask) 47850 - mouse_activate(FALSE); 47851 + if (sp->_mouse_mask) 47852 + mouse_activate(sp, FALSE); 47853 break; 47854 #endif 47855 #if USE_SYSMOUSE 47856 case M_SYSMOUSE: 47857 - mouse_activate(FALSE); 47858 + mouse_activate(sp, FALSE); 47859 break; 47860 #endif 47861 case M_NONE: 47862 @@ -1165,29 +1176,29 @@ 47863 } 47864 47865 static void 47866 -_nc_mouse_resume(SCREEN *sp GCC_UNUSED) 47867 +_nc_mouse_resume(SCREEN *sp) 47868 /* re-connect to mouse -- called by doupdate() after shellout */ 47869 { 47870 TR(MY_TRACE, ("_nc_mouse_resume() called")); 47871 47872 - switch (SP->_mouse_type) { 47873 + switch (sp->_mouse_type) { 47874 case M_XTERM: 47875 /* xterm: re-enable reporting */ 47876 - if (SP->_mouse_mask) 47877 - mouse_activate(TRUE); 47878 + if (sp->_mouse_mask) 47879 + mouse_activate(sp, TRUE); 47880 break; 47881 47882 #if USE_GPM_SUPPORT 47883 case M_GPM: 47884 /* GPM: reclaim our event set */ 47885 - if (SP->_mouse_mask) 47886 - mouse_activate(TRUE); 47887 + if (sp->_mouse_mask) 47888 + mouse_activate(sp, TRUE); 47889 break; 47890 #endif 47891 47892 #if USE_SYSMOUSE 47893 case M_SYSMOUSE: 47894 - mouse_activate(TRUE); 47895 + mouse_activate(sp, TRUE); 47896 break; 47897 #endif 47898 case M_NONE: 47899 @@ -1201,14 +1212,13 @@ 47900 * 47901 **************************************************************************/ 47902 47903 -NCURSES_EXPORT(int) 47904 -getmouse(MEVENT * aevent) 47905 -/* grab a copy of the current mouse event */ 47906 +static int 47907 +_nc_getmouse(SCREEN *sp, MEVENT * aevent) 47908 { 47909 T((T_CALLED("getmouse(%p)"), aevent)); 47910 47911 - if ((aevent != 0) && (SP != 0) && (SP->_mouse_type != M_NONE)) { 47912 - MEVENT *eventp = SP->_mouse_eventp; 47913 + if ((aevent != 0) && (sp != 0) && (sp->_mouse_type != M_NONE)) { 47914 + MEVENT *eventp = sp->_mouse_eventp; 47915 /* compute the current-event pointer */ 47916 MEVENT *prev = PREV(eventp); 47917 47918 @@ -1216,8 +1226,8 @@ 47919 *aevent = *prev; 47920 47921 TR(TRACE_IEVENT, ("getmouse: returning event %s from slot %ld", 47922 - _tracemouse(prev), 47923 - (long) (prev - SP->_mouse_events))); 47924 + _nc_tracemouse(sp, prev), 47925 + (long) (prev - sp->_mouse_events))); 47926 47927 prev->id = INVALID_EVENT; /* so the queue slot becomes free */ 47928 returnCode(OK); 47929 @@ -1225,29 +1235,42 @@ 47930 returnCode(ERR); 47931 } 47932 47933 +/* grab a copy of the current mouse event */ 47934 NCURSES_EXPORT(int) 47935 -ungetmouse(MEVENT * aevent) 47936 -/* enqueue a synthesized mouse event to be seen by the next wgetch() */ 47937 +getmouse(MEVENT * aevent) 47938 +{ 47939 + return _nc_getmouse(SP, aevent); 47940 +} 47941 + 47942 +static int 47943 +_nc_ungetmouse(SCREEN *sp, MEVENT * aevent) 47944 { 47945 int result = ERR; 47946 47947 T((T_CALLED("ungetmouse(%p)"), aevent)); 47948 47949 - if (aevent != 0 && SP != 0) { 47950 - MEVENT *eventp = SP->_mouse_eventp; 47951 + if (aevent != 0 && sp != 0) { 47952 + MEVENT *eventp = sp->_mouse_eventp; 47953 47954 /* stick the given event in the next-free slot */ 47955 *eventp = *aevent; 47956 47957 /* bump the next-free pointer into the circular list */ 47958 - SP->_mouse_eventp = NEXT(eventp); 47959 + sp->_mouse_eventp = NEXT(eventp); 47960 47961 /* push back the notification event on the keyboard queue */ 47962 - result = ungetch(KEY_MOUSE); 47963 + result = _nc_ungetch(sp, KEY_MOUSE); 47964 } 47965 returnCode(result); 47966 } 47967 47968 +/* enqueue a synthesized mouse event to be seen by the next wgetch() */ 47969 +NCURSES_EXPORT(int) 47970 +ungetmouse(MEVENT * aevent) 47971 +{ 47972 + return _nc_ungetmouse(SP, aevent); 47973 +} 47974 + 47975 NCURSES_EXPORT(mmask_t) 47976 mousemask(mmask_t newmask, mmask_t * oldmask) 47977 /* set the mouse event mask */ 47978 @@ -1261,7 +1284,7 @@ 47979 *oldmask = SP->_mouse_mask; 47980 47981 if (newmask || SP->_mouse_initialized) { 47982 - _nc_mouse_init(); 47983 + _nc_mouse_init(SP); 47984 if (SP->_mouse_type != M_NONE) { 47985 result = newmask & 47986 (REPORT_MOUSE_POSITION 47987 @@ -1274,7 +1297,7 @@ 47988 | BUTTON_DOUBLE_CLICKED 47989 | BUTTON_TRIPLE_CLICKED); 47990 47991 - mouse_activate((bool) (result != 0)); 47992 + mouse_activate(SP, (bool) (result != 0)); 47993 47994 SP->_mouse_mask = result; 47995 } 43660 47996 diff -Naur ncurses-5.6.orig/ncurses/base/lib_newterm.c ncurses-5.6/ncurses/base/lib_newterm.c 43661 47997 --- ncurses-5.6.orig/ncurses/base/lib_newterm.c 2006-01-14 10:36:24.000000000 -0500 43662 +++ ncurses-5.6/ncurses/base/lib_newterm.c 200 7-12-21 00:02:36.000000000 -050047998 +++ ncurses-5.6/ncurses/base/lib_newterm.c 2008-06-18 06:49:51.000000000 -0400 43663 47999 @@ -1,5 +1,5 @@ 43664 48000 /**************************************************************************** 43665 48001 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 43666 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *48002 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 43667 48003 * * 43668 48004 * Permission is hereby granted, free of charge, to any person obtaining a * … … 43673 48009 43674 48010 -MODULE_ID("$Id: lib_newterm.c,v 1.64 2006/01/14 15:36:24 tom Exp $") 43675 +MODULE_ID("$Id: lib_newterm.c,v 1. 67 2007/04/21 20:47:32tom Exp $")48011 +MODULE_ID("$Id: lib_newterm.c,v 1.70 2008/06/07 14:00:23 tom Exp $") 43676 48012 43677 48013 #ifndef ONLCR /* Allows compilation under the QNX 4.2 OS */ … … 43702 48038 } 43703 48039 #endif 43704 @@ -132,13 +130,6 @@ 48040 @@ -125,31 +123,34 @@ 48041 { 48042 int value; 48043 int errret; 48044 - int slk_format = _nc_slk_format; 48045 SCREEN *current; 48046 SCREEN *result = 0; 48047 43705 48048 START_TRACE(); 43706 48049 T((T_CALLED("newterm(\"%s\",%p,%p)"), name, ofp, ifp)); … … 43713 48056 - } 43714 48057 - 48058 + _nc_lock_global(curses); 43715 48059 /* this loads the capability entry, then sets LINES and COLS */ 43716 if (setupterm(name, fileno(ofp), &errret) == ERR) { 43717 result = 0; 43718 @@ -149,7 +140,21 @@ 48060 - if (setupterm(name, fileno(ofp), &errret) == ERR) { 48061 - result = 0; 48062 - } else { 48063 + if (setupterm(name, fileno(ofp), &errret) != ERR) { 48064 + int slk_format = _nc_globals.slk_format; 48065 + 48066 /* 48067 * This actually allocates the screen structure, and saves the original 48068 * terminal settings. 43719 48069 */ 43720 48070 current = SP; … … 43724 48074 + /* allow user to set maximum escape delay from the environment */ 43725 48075 + if ((value = _nc_getenv_num("ESCDELAY")) >= 0) { 43726 +#if USE_REENTRANT 43727 + SP->_ESCDELAY = value; 43728 +#else 43729 + ESCDELAY = value; 43730 +#endif 48076 + set_escdelay(value); 43731 48077 + } 43732 48078 + … … 43739 48085 result = 0; 43740 48086 } else { 43741 @@ -211,6 +21 6,5@@48087 @@ -211,6 +212,6 @@ 43742 48088 result = SP; 43743 48089 } 43744 48090 } 43745 48091 - _nc_handle_sigwinch(1); 48092 + _nc_unlock_global(curses); 43746 48093 returnSP(result); 43747 48094 } 43748 48095 diff -Naur ncurses-5.6.orig/ncurses/base/lib_newwin.c ncurses-5.6/ncurses/base/lib_newwin.c 43749 48096 --- ncurses-5.6.orig/ncurses/base/lib_newwin.c 2006-10-14 16:31:19.000000000 -0400 43750 +++ ncurses-5.6/ncurses/base/lib_newwin.c 200 7-12-21 00:02:36.000000000 -050048097 +++ ncurses-5.6/ncurses/base/lib_newwin.c 2008-06-18 06:49:51.000000000 -0400 43751 48098 @@ -1,5 +1,5 @@ 43752 48099 /**************************************************************************** 43753 48100 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 43754 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *48101 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 43755 48102 * * 43756 48103 * Permission is hereby granted, free of charge, to any person obtaining a * 43757 48104 * copy of this software and associated documentation files (the * 43758 @@ -41,7 +41,7 @@ 48105 @@ -40,36 +40,39 @@ 48106 */ 43759 48107 43760 48108 #include <curses.priv.h> 48109 +#include <stddef.h> 43761 48110 43762 48111 -MODULE_ID("$Id: lib_newwin.c,v 1.38 2006/10/14 20:31:19 tom Exp $") 43763 +MODULE_ID("$Id: lib_newwin.c,v 1.41 2007/10/20 20:56:07 tom Exp $") 43764 43765 static WINDOW * 48112 +MODULE_ID("$Id: lib_newwin.c,v 1.52 2008/06/07 13:58:09 tom Exp $") 48113 48114 -static WINDOW * 48115 +#define window_is(name) ((sp)->_##name == win) 48116 + 48117 +#if USE_REENTRANT 48118 +#define remove_window(name) \ 48119 + sp->_##name = 0 48120 +#else 48121 +#define remove_window(name) \ 48122 + sp->_##name = 0; \ 48123 + if (win == name) \ 48124 + name = 0 48125 +#endif 48126 + 48127 +static void 43766 48128 remove_window_from_screen(WINDOW *win) 43767 @@ -52,16 +52,22 @@ 43768 SCREEN *sp = *scan; 43769 if (sp->_curscr == win) { 43770 sp->_curscr = 0; 43771 +#if !USE_REENTRANT 43772 if (win == curscr) 43773 curscr = 0; 43774 +#endif 43775 } else if (sp->_stdscr == win) { 43776 sp->_stdscr = 0; 43777 +#if !USE_REENTRANT 43778 if (win == stdscr) 43779 stdscr = 0; 43780 +#endif 43781 } else if (sp->_newscr == win) { 43782 sp->_newscr = 0; 43783 +#if !USE_REENTRANT 43784 if (win == newscr) 43785 newscr = 0; 43786 +#endif 43787 } else { 43788 scan = &(*scan)->_next_screen; 43789 continue; 43790 @@ -208,22 +214,31 @@ 48129 { 48130 - SCREEN **scan = &_nc_screen_chain; 48131 + SCREEN *sp; 48132 48133 - while (*scan) { 48134 - SCREEN *sp = *scan; 48135 - if (sp->_curscr == win) { 48136 - sp->_curscr = 0; 48137 - if (win == curscr) 48138 - curscr = 0; 48139 - } else if (sp->_stdscr == win) { 48140 - sp->_stdscr = 0; 48141 - if (win == stdscr) 48142 - stdscr = 0; 48143 - } else if (sp->_newscr == win) { 48144 - sp->_newscr = 0; 48145 - if (win == newscr) 48146 - newscr = 0; 48147 - } else { 48148 - scan = &(*scan)->_next_screen; 48149 - continue; 48150 + for (each_screen(sp)) { 48151 + if (window_is(curscr)) { 48152 + remove_window(curscr); 48153 + break; 48154 + } else if (window_is(stdscr)) { 48155 + remove_window(stdscr); 48156 + break; 48157 + } else if (window_is(newscr)) { 48158 + remove_window(newscr); 48159 + break; 48160 } 48161 - break; 48162 } 48163 - 48164 - return 0; 48165 } 48166 48167 NCURSES_EXPORT(int) 48168 @@ -79,29 +82,36 @@ 48169 int i; 48170 int result = ERR; 48171 48172 + T((T_CALLED("_nc_freewin(%p)"), win)); 48173 + 48174 if (win != 0) { 48175 - for (p = _nc_windows, q = 0; p != 0; q = p, p = p->next) { 48176 - if (&(p->win) == win) { 48177 - remove_window_from_screen(win); 48178 - if (q == 0) 48179 - _nc_windows = p->next; 48180 - else 48181 - q->next = p->next; 48182 - 48183 - if (!(win->_flags & _SUBWIN)) { 48184 - for (i = 0; i <= win->_maxy; i++) 48185 - FreeIfNeeded(win->_line[i].text); 48186 + if (_nc_try_global(curses) == 0) { 48187 + q = 0; 48188 + for (each_window(p)) { 48189 + if (&(p->win) == win) { 48190 + remove_window_from_screen(win); 48191 + if (q == 0) 48192 + _nc_windows = p->next; 48193 + else 48194 + q->next = p->next; 48195 + 48196 + if (!(win->_flags & _SUBWIN)) { 48197 + for (i = 0; i <= win->_maxy; i++) 48198 + FreeIfNeeded(win->_line[i].text); 48199 + } 48200 + free(win->_line); 48201 + free(p); 48202 + 48203 + result = OK; 48204 + T(("...deleted win=%p", win)); 48205 + break; 48206 } 48207 - free(win->_line); 48208 - free(p); 48209 - 48210 - result = OK; 48211 - T(("...deleted win=%p", win)); 48212 - break; 48213 + q = p; 48214 } 48215 + _nc_unlock_global(curses); 48216 } 48217 } 48218 - return result; 48219 + returnCode(result); 48220 } 48221 48222 NCURSES_EXPORT(WINDOW *) 48223 @@ -208,24 +218,26 @@ 43791 48224 WINDOW *win; 43792 48225 bool is_pad = (flags & _ISPAD); … … 43806 48239 - return 0; 43807 48240 + returnWin(0); 43808 +43809 +#ifdef USE_PTHREADS43810 + {43811 + pthread_mutexattr_t recattr;43812 + memset(&recattr, 0, sizeof(recattr));43813 + pthread_mutexattr_settype(&recattr, PTHREAD_MUTEX_RECURSIVE);43814 + pthread_mutex_init(&(wp->mutex_use_window), &recattr);43815 + }43816 +#endif43817 48241 43818 48242 win = &(wp->win); … … 43824 48248 } 43825 48249 48250 + _nc_lock_global(curses); 48251 + 43826 48252 win->_curx = 0; 43827 @@ -303,5 +318,5 @@ 48253 win->_cury = 0; 48254 win->_maxy = num_lines - 1; 48255 @@ -299,9 +311,28 @@ 48256 } 48257 48258 wp->next = _nc_windows; 48259 + wp->screen = SP; 48260 _nc_windows = wp; 43828 48261 43829 48262 T((T_CREATE("window %p"), win)); 43830 48263 43831 48264 - return (win); 48265 + _nc_unlock_global(curses); 43832 48266 + returnWin(win); 48267 +} 48268 + 48269 +/* 48270 + * wgetch() and other functions with a WINDOW* parameter may use a SCREEN* 48271 + * internally, and it is useful to allow those to be invoked without switching 48272 + * SCREEN's, e.g., for multi-threaded applications. 48273 + */ 48274 +NCURSES_EXPORT(SCREEN *) 48275 +_nc_screen_of(WINDOW *win) 48276 +{ 48277 + SCREEN *sp = 0; 48278 + 48279 + if (win != 0) { 48280 + WINDOWLIST *wp = (WINDOWLIST *) win; 48281 + sp = wp->screen; 48282 + } 48283 + return (sp); 43833 48284 } 43834 48285 diff -Naur ncurses-5.6.orig/ncurses/base/lib_overlay.c ncurses-5.6/ncurses/base/lib_overlay.c 43835 48286 --- ncurses-5.6.orig/ncurses/base/lib_overlay.c 2006-10-14 16:43:31.000000000 -0400 43836 +++ ncurses-5.6/ncurses/base/lib_overlay.c 200 7-12-21 00:02:36.000000000 -050048287 +++ ncurses-5.6/ncurses/base/lib_overlay.c 2008-06-18 06:49:51.000000000 -0400 43837 48288 @@ -1,5 +1,5 @@ 43838 48289 /**************************************************************************** 43839 48290 - * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. * 43840 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *48291 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 43841 48292 * * 43842 48293 * Permission is hereby granted, free of charge, to any person obtaining a * 43843 48294 * copy of this software and associated documentation files (the * 43844 @@ -40, 7 +40,7@@48295 @@ -40,46 +40,45 @@ 43845 48296 43846 48297 #include <curses.priv.h> 43847 48298 43848 48299 -MODULE_ID("$Id: lib_overlay.c,v 1.22 2006/10/14 20:43:31 tom Exp $") 43849 +MODULE_ID("$Id: lib_overlay.c,v 1.2 3 2007/04/07 17:13:52tom Exp $")48300 +MODULE_ID("$Id: lib_overlay.c,v 1.27 2008/06/07 23:30:34 tom Exp $") 43850 48301 43851 48302 static int 43852 43853 @@ -139,8 +139,8 @@ 48303 -overlap(const WINDOW *const s, WINDOW *const d, int const flag) 48304 +overlap(const WINDOW *const src, WINDOW *const dst, int const flag) 43854 48305 { 48306 + int rc = ERR; 48307 int sx1, sy1, sx2, sy2; 48308 int dx1, dy1, dx2, dy2; 48309 int sminrow, smincol; 48310 int dminrow, dmincol; 48311 int dmaxrow, dmaxcol; 48312 48313 - T((T_CALLED("overlap(%p,%p,%d)"), s, d, flag)); 48314 + T((T_CALLED("overlap(%p,%p,%d)"), src, dst, flag)); 48315 + 48316 + if (src != 0 && dst != 0) { 48317 + _nc_lock_global(curses); 48318 48319 - if (s == 0 || d == 0) { 48320 - returnCode(ERR); 48321 - } else { 48322 T(("src : begy %ld, begx %ld, maxy %ld, maxx %ld", 48323 - (long) s->_begy, 48324 - (long) s->_begx, 48325 - (long) s->_maxy, 48326 - (long) s->_maxx)); 48327 + (long) src->_begy, 48328 + (long) src->_begx, 48329 + (long) src->_maxy, 48330 + (long) src->_maxx)); 48331 T(("dst : begy %ld, begx %ld, maxy %ld, maxx %ld", 48332 - (long) d->_begy, 48333 - (long) d->_begx, 48334 - (long) d->_maxy, 48335 - (long) d->_maxx)); 48336 - 48337 - sx1 = s->_begx; 48338 - sy1 = s->_begy; 48339 - sx2 = sx1 + s->_maxx; 48340 - sy2 = sy1 + s->_maxy; 48341 - 48342 - dx1 = d->_begx; 48343 - dy1 = d->_begy; 48344 - dx2 = dx1 + d->_maxx; 48345 - dy2 = dy1 + d->_maxy; 48346 - 48347 - if (dx2 < sx1 || dx1 > sx2 || dy2 < sy1 || dy1 > sy2) { 48348 - returnCode(ERR); /* No intersection */ 48349 - } else { 48350 + (long) dst->_begy, 48351 + (long) dst->_begx, 48352 + (long) dst->_maxy, 48353 + (long) dst->_maxx)); 48354 + 48355 + sx1 = src->_begx; 48356 + sy1 = src->_begy; 48357 + sx2 = sx1 + src->_maxx; 48358 + sy2 = sy1 + src->_maxy; 48359 + 48360 + dx1 = dst->_begx; 48361 + dy1 = dst->_begy; 48362 + dx2 = dx1 + dst->_maxx; 48363 + dy2 = dy1 + dst->_maxy; 48364 + 48365 + if (dx2 >= sx1 && dx1 <= sx2 && dy2 >= sy1 && dy1 <= sy2) { 48366 sminrow = max(sy1, dy1) - sy1; 48367 smincol = max(sx1, dx1) - sx1; 48368 dminrow = max(sy1, dy1) - dy1; 48369 @@ -87,13 +86,15 @@ 48370 dmaxrow = min(sy2, dy2) - dy1; 48371 dmaxcol = min(sx2, dx2) - dx1; 48372 48373 - returnCode(copywin(s, d, 48374 - sminrow, smincol, 48375 - dminrow, dmincol, 48376 - dmaxrow, dmaxcol, 48377 - flag)); 48378 + rc = copywin(src, dst, 48379 + sminrow, smincol, 48380 + dminrow, dmincol, 48381 + dmaxrow, dmaxcol, 48382 + flag); 48383 } 48384 + _nc_unlock_global(curses); 48385 } 48386 + returnCode(rc); 48387 } 48388 48389 /* 48390 @@ -137,54 +138,69 @@ 48391 int dmaxrow, int dmaxcol, 48392 int over) 48393 { 48394 + int rc = ERR; 43855 48395 int sx, sy, dx, dy; 43856 48396 bool touched; … … 43862 48402 T((T_CALLED("copywin(%p, %p, %d, %d, %d, %d, %d, %d, %d)"), 43863 48403 src, dst, sminrow, smincol, dminrow, dmincol, dmaxrow, dmaxcol, over)); 43864 @@ -148,6 +148,9 @@ 43865 if (!src || !dst) 43866 returnCode(ERR); 43867 43868 + bk = AttrOf(dst->_nc_bkgd); 43869 + mask = ~(attr_t) ((bk & A_COLOR) ? A_COLOR : 0); 43870 + 43871 /* make sure rectangle exists in source */ 43872 if ((sminrow + dmaxrow - dminrow) > (src->_maxy + 1) || 43873 (smincol + dmaxcol - dmincol) > (src->_maxx + 1)) { 48404 48405 - if (!src || !dst) 48406 - returnCode(ERR); 48407 + if (src && dst) { 48408 + _nc_lock_global(curses); 48409 48410 - /* make sure rectangle exists in source */ 48411 - if ((sminrow + dmaxrow - dminrow) > (src->_maxy + 1) || 48412 - (smincol + dmaxcol - dmincol) > (src->_maxx + 1)) { 48413 - returnCode(ERR); 48414 - } 48415 + bk = AttrOf(dst->_nc_bkgd); 48416 + mask = ~(attr_t) ((bk & A_COLOR) ? A_COLOR : 0); 48417 48418 - T(("rectangle exists in source")); 48419 - 48420 - /* make sure rectangle fits in destination */ 48421 - if (dmaxrow > dst->_maxy || dmaxcol > dst->_maxx) { 48422 - returnCode(ERR); 48423 - } 48424 - 48425 - T(("rectangle fits in destination")); 48426 - 48427 - for (dy = dminrow, sy = sminrow; dy <= dmaxrow; sy++, dy++) { 48428 - touched = FALSE; 48429 - for (dx = dmincol, sx = smincol; dx <= dmaxcol; sx++, dx++) { 48430 - if (over) { 48431 - if ((CharOf(src->_line[sy].text[sx]) != L(' ')) && 48432 - (!CharEq(dst->_line[dy].text[dx], src->_line[sy].text[sx]))) { 48433 - dst->_line[dy].text[dx] = src->_line[sy].text[sx]; 48434 - SetAttr(dst->_line[dy].text[dx], 48435 - (AttrOf(src->_line[sy].text[sx]) & mask) | bk); 48436 - touched = TRUE; 48437 - } 48438 - } else { 48439 - if (!CharEq(dst->_line[dy].text[dx], src->_line[sy].text[sx])) { 48440 - dst->_line[dy].text[dx] = src->_line[sy].text[sx]; 48441 - touched = TRUE; 48442 + /* make sure rectangle exists in source */ 48443 + if ((sminrow + dmaxrow - dminrow) <= (src->_maxy + 1) && 48444 + (smincol + dmaxcol - dmincol) <= (src->_maxx + 1)) { 48445 + 48446 + T(("rectangle exists in source")); 48447 + 48448 + /* make sure rectangle fits in destination */ 48449 + if (dmaxrow <= dst->_maxy && dmaxcol <= dst->_maxx) { 48450 + 48451 + T(("rectangle fits in destination")); 48452 + 48453 + for (dy = dminrow, sy = sminrow; 48454 + dy <= dmaxrow; 48455 + sy++, dy++) { 48456 + 48457 + touched = FALSE; 48458 + for (dx = dmincol, sx = smincol; 48459 + dx <= dmaxcol; 48460 + sx++, dx++) { 48461 + if (over) { 48462 + if ((CharOf(src->_line[sy].text[sx]) != L(' ')) && 48463 + (!CharEq(dst->_line[dy].text[dx], 48464 + src->_line[sy].text[sx]))) { 48465 + dst->_line[dy].text[dx] = 48466 + src->_line[sy].text[sx]; 48467 + SetAttr(dst->_line[dy].text[dx], 48468 + ((AttrOf(src->_line[sy].text[sx]) & 48469 + mask) | bk)); 48470 + touched = TRUE; 48471 + } 48472 + } else { 48473 + if (!CharEq(dst->_line[dy].text[dx], 48474 + src->_line[sy].text[sx])) { 48475 + dst->_line[dy].text[dx] = 48476 + src->_line[sy].text[sx]; 48477 + touched = TRUE; 48478 + } 48479 + } 48480 + } 48481 + if (touched) { 48482 + touchline(dst, dminrow, (dmaxrow - dminrow + 1)); 48483 + } 48484 } 48485 + T(("finished copywin")); 48486 + rc = OK; 48487 } 48488 } 48489 - if (touched) { 48490 - touchline(dst, dminrow, (dmaxrow - dminrow + 1)); 48491 - } 48492 + _nc_unlock_global(curses); 48493 } 48494 - T(("finished copywin")); 48495 - returnCode(OK); 48496 + returnCode(rc); 48497 } 43874 48498 diff -Naur ncurses-5.6.orig/ncurses/base/lib_redrawln.c ncurses-5.6/ncurses/base/lib_redrawln.c 43875 48499 --- ncurses-5.6.orig/ncurses/base/lib_redrawln.c 2006-11-04 18:08:47.000000000 -0500 43876 +++ ncurses-5.6/ncurses/base/lib_redrawln.c 200 7-12-21 00:02:36.000000000 -050048500 +++ ncurses-5.6/ncurses/base/lib_redrawln.c 2008-06-18 06:49:44.000000000 -0400 43877 48501 @@ -1,5 +1,5 @@ 43878 48502 /**************************************************************************** … … 43915 48539 diff -Naur ncurses-5.6.orig/ncurses/base/lib_refresh.c ncurses-5.6/ncurses/base/lib_refresh.c 43916 48540 --- ncurses-5.6.orig/ncurses/base/lib_refresh.c 2006-05-27 15:21:19.000000000 -0400 43917 +++ ncurses-5.6/ncurses/base/lib_refresh.c 200 7-12-21 00:02:36.000000000 -050048541 +++ ncurses-5.6/ncurses/base/lib_refresh.c 2008-06-18 06:49:44.000000000 -0400 43918 48542 @@ -1,5 +1,5 @@ 43919 48543 /**************************************************************************** … … 44124 48748 diff -Naur ncurses-5.6.orig/ncurses/base/lib_restart.c ncurses-5.6/ncurses/base/lib_restart.c 44125 48749 --- ncurses-5.6.orig/ncurses/base/lib_restart.c 2006-01-14 10:58:23.000000000 -0500 44126 +++ ncurses-5.6/ncurses/base/lib_restart.c 200 7-12-21 00:02:36.000000000 -050048750 +++ ncurses-5.6/ncurses/base/lib_restart.c 2008-06-18 06:49:50.000000000 -0400 44127 48751 @@ -1,5 +1,5 @@ 44128 48752 /**************************************************************************** 44129 48753 - * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. * 44130 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *48754 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 44131 48755 * * 44132 48756 * Permission is hereby granted, free of charge, to any person obtaining a * … … 44137 48761 44138 48762 -MODULE_ID("$Id: lib_restart.c,v 1.6 2006/01/14 15:58:23 tom Exp $") 44139 +MODULE_ID("$Id: lib_restart.c,v 1. 8 2007/10/13 19:59:47tom Exp $")48763 +MODULE_ID("$Id: lib_restart.c,v 1.9 2008/05/03 22:43:52 tom Exp $") 44140 48764 44141 48765 NCURSES_EXPORT(int) … … 44162 48786 if (saveecho) 44163 48787 echo(); 44164 @@ -93,7 +92,8 @@ 48788 @@ -89,11 +88,12 @@ 48789 reset_prog_mode(); 48790 48791 #if USE_SIZECHANGE 48792 - _nc_update_screensize(); 48793 + _nc_update_screensize(SP); 44165 48794 #endif 44166 48795 … … 44174 48803 diff -Naur ncurses-5.6.orig/ncurses/base/lib_screen.c ncurses-5.6/ncurses/base/lib_screen.c 44175 48804 --- ncurses-5.6.orig/ncurses/base/lib_screen.c 2006-05-27 15:21:38.000000000 -0400 44176 +++ ncurses-5.6/ncurses/base/lib_screen.c 200 7-12-21 00:02:36.000000000 -050048805 +++ ncurses-5.6/ncurses/base/lib_screen.c 2008-06-18 06:49:44.000000000 -0400 44177 48806 @@ -1,5 +1,5 @@ 44178 48807 /**************************************************************************** … … 44229 48858 diff -Naur ncurses-5.6.orig/ncurses/base/lib_set_term.c ncurses-5.6/ncurses/base/lib_set_term.c 44230 48859 --- ncurses-5.6.orig/ncurses/base/lib_set_term.c 2006-05-20 10:58:02.000000000 -0400 44231 +++ ncurses-5.6/ncurses/base/lib_set_term.c 200 7-12-21 00:02:36.000000000 -050048860 +++ ncurses-5.6/ncurses/base/lib_set_term.c 2008-06-18 06:49:51.000000000 -0400 44232 48861 @@ -1,5 +1,5 @@ 44233 48862 /**************************************************************************** 44234 48863 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 44235 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *48864 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 44236 48865 * * 44237 48866 * Permission is hereby granted, free of charge, to any person obtaining a * 44238 48867 * copy of this software and associated documentation files (the * 44239 @@ -44, 7 +44,7@@48868 @@ -44,31 +44,50 @@ 44240 48869 #include <term.h> /* cur_term */ 44241 48870 #include <tic.h> 44242 48871 44243 48872 -MODULE_ID("$Id: lib_set_term.c,v 1.91 2006/05/20 14:58:02 tom Exp $") 44244 +MODULE_ID("$Id: lib_set_term.c,v 1.1 00 2007/09/08 21:23:43tom Exp $")48873 +MODULE_ID("$Id: lib_set_term.c,v 1.112 2008/06/07 22:29:07 tom Exp $") 44245 48874 44246 48875 NCURSES_EXPORT(SCREEN *) 44247 48876 set_term(SCREEN *screenp) 44248 @@ -53,22 +53,28 @@ 48877 { 48878 SCREEN *oldSP; 48879 + SCREEN *newSP; 44249 48880 44250 48881 T((T_CALLED("set_term(%p)"), screenp)); 44251 48882 44252 + _nc_lock_global( set_SP);48883 + _nc_lock_global(curses); 44253 48884 + 44254 48885 oldSP = SP; 44255 48886 _nc_set_screen(screenp); 44256 44257 set_curterm(SP->_term); 48887 + newSP = SP; 48888 48889 - set_curterm(SP->_term); 48890 - curscr = SP->_curscr; 48891 - newscr = SP->_newscr; 48892 - stdscr = SP->_stdscr; 48893 - COLORS = SP->_color_count; 48894 - COLOR_PAIRS = SP->_pair_count; 48895 + if (newSP != 0) { 48896 + set_curterm(newSP->_term); 44258 48897 +#if !USE_REENTRANT 44259 curscr =SP->_curscr;44260 newscr =SP->_newscr;44261 stdscr =SP->_stdscr;44262 COLORS =SP->_color_count;44263 COLOR_PAIRS =SP->_pair_count;48898 + curscr = newSP->_curscr; 48899 + newscr = newSP->_newscr; 48900 + stdscr = newSP->_stdscr; 48901 + COLORS = newSP->_color_count; 48902 + COLOR_PAIRS = newSP->_pair_count; 44264 48903 +#endif 44265 + 44266 + _nc_unlock_global(set_SP); 48904 + } else { 48905 + set_curterm(0); 48906 +#if !USE_REENTRANT 48907 + curscr = 0; 48908 + newscr = 0; 48909 + stdscr = 0; 48910 + COLORS = 0; 48911 + COLOR_PAIRS = 0; 48912 +#endif 48913 + } 48914 + 48915 + _nc_unlock_global(curses); 44267 48916 44268 48917 T((T_RETURN("%p"), oldSP)); … … 44276 48925 if (kt != 0) { 44277 48926 _nc_free_keytry(kt->child); 44278 @@ -88,6 +94,7 @@ 48927 @@ -77,95 +96,114 @@ 48928 } 48929 } 48930 48931 +static bool 48932 +delink_screen(SCREEN *sp) 48933 +{ 48934 + SCREEN *last = 0; 48935 + SCREEN *temp; 48936 + bool result = FALSE; 48937 + 48938 + for (each_screen(temp)) { 48939 + if (temp == sp) { 48940 + if (last) 48941 + last = sp->_next_screen; 48942 + else 48943 + _nc_screen_chain = sp->_next_screen; 48944 + result = TRUE; 48945 + break; 48946 + } 48947 + last = temp; 48948 + } 48949 + return result; 48950 +} 48951 + 48952 /* 48953 * Free the storage associated with the given SCREEN sp. 48954 */ 48955 NCURSES_EXPORT(void) 48956 delscreen(SCREEN *sp) 48957 { 48958 - SCREEN **scan = &_nc_screen_chain; 48959 int i; 44279 48960 44280 48961 T((T_CALLED("delscreen(%p)"), sp)); 44281 48962 44282 + _nc_lock_global(set_SP); 44283 while (*scan) { 44284 if (*scan == sp) { 44285 *scan = sp->_next_screen; 44286 @@ -152,20 +159,20 @@ 44287 * multiple references in different screens). 44288 */ 44289 if (sp == SP) { 48963 - while (*scan) { 48964 - if (*scan == sp) { 48965 - *scan = sp->_next_screen; 48966 - break; 48967 - } 48968 - scan = &(*scan)->_next_screen; 48969 - } 48970 + _nc_lock_global(curses); 48971 + if (delink_screen(sp)) { 48972 48973 - (void) _nc_freewin(sp->_curscr); 48974 - (void) _nc_freewin(sp->_newscr); 48975 - (void) _nc_freewin(sp->_stdscr); 48976 - 48977 - if (sp->_slk != 0) { 48978 - if (sp->_slk->ent != 0) { 48979 - for (i = 0; i < sp->_slk->labcnt; ++i) { 48980 - FreeIfNeeded(sp->_slk->ent[i].ent_text); 48981 - FreeIfNeeded(sp->_slk->ent[i].form_text); 48982 + (void) _nc_freewin(sp->_curscr); 48983 + (void) _nc_freewin(sp->_newscr); 48984 + (void) _nc_freewin(sp->_stdscr); 48985 + 48986 + if (sp->_slk != 0) { 48987 + if (sp->_slk->ent != 0) { 48988 + for (i = 0; i < sp->_slk->labcnt; ++i) { 48989 + FreeIfNeeded(sp->_slk->ent[i].ent_text); 48990 + FreeIfNeeded(sp->_slk->ent[i].form_text); 48991 + } 48992 + free(sp->_slk->ent); 48993 } 48994 - free(sp->_slk->ent); 48995 + free(sp->_slk); 48996 + sp->_slk = 0; 48997 } 48998 - free(sp->_slk); 48999 - sp->_slk = 0; 49000 - } 49001 49002 - _nc_free_keytry(sp->_keytry); 49003 - sp->_keytry = 0; 49004 + _nc_free_keytry(sp->_keytry); 49005 + sp->_keytry = 0; 49006 49007 - _nc_free_keytry(sp->_key_ok); 49008 - sp->_key_ok = 0; 49009 + _nc_free_keytry(sp->_key_ok); 49010 + sp->_key_ok = 0; 49011 49012 - FreeIfNeeded(sp->_current_attr); 49013 + FreeIfNeeded(sp->_current_attr); 49014 49015 - FreeIfNeeded(sp->_color_table); 49016 - FreeIfNeeded(sp->_color_pairs); 49017 + FreeIfNeeded(sp->_color_table); 49018 + FreeIfNeeded(sp->_color_pairs); 49019 49020 - FreeIfNeeded(sp->oldhash); 49021 - FreeIfNeeded(sp->newhash); 49022 - FreeIfNeeded(sp->hashtab); 49023 + FreeIfNeeded(sp->oldhash); 49024 + FreeIfNeeded(sp->newhash); 49025 + FreeIfNeeded(sp->hashtab); 49026 49027 - FreeIfNeeded(sp->_acs_map); 49028 - FreeIfNeeded(sp->_screen_acs_map); 49029 + FreeIfNeeded(sp->_acs_map); 49030 + FreeIfNeeded(sp->_screen_acs_map); 49031 49032 - del_curterm(sp->_term); 49033 +#if 0 49034 + /* FIXME - this should be a copy of the struct, not a pointer */ 49035 + del_curterm(sp->_term); 49036 +#endif 49037 49038 - /* 49039 - * If the associated output stream has been closed, we can discard the 49040 - * set-buffer. Limit the error check to EBADF, since fflush may fail 49041 - * for other reasons than trying to operate upon a closed stream. 49042 - */ 49043 - if (sp->_ofp != 0 49044 - && sp->_setbuf != 0 49045 - && fflush(sp->_ofp) != 0 49046 - && errno == EBADF) { 49047 - free(sp->_setbuf); 49048 - } 49049 + /* 49050 + * If the associated output stream has been closed, we can discard the 49051 + * set-buffer. Limit the error check to EBADF, since fflush may fail 49052 + * for other reasons than trying to operate upon a closed stream. 49053 + */ 49054 + if (sp->_ofp != 0 49055 + && sp->_setbuf != 0 49056 + && fflush(sp->_ofp) != 0 49057 + && errno == EBADF) { 49058 + free(sp->_setbuf); 49059 + } 49060 49061 - free(sp); 49062 + free(sp); 49063 49064 - /* 49065 - * If this was the current screen, reset everything that the 49066 - * application might try to use (except cur_term, which may have 49067 - * multiple references in different screens). 49068 - */ 49069 - if (sp == SP) { 49070 - curscr = 0; 49071 - newscr = 0; 49072 - stdscr = 0; 49073 - COLORS = 0; 49074 - COLOR_PAIRS = 0; 49075 - _nc_set_screen(0); 49076 + /* 49077 + * If this was the current screen, reset everything that the 49078 + * application might try to use (except cur_term, which may have 49079 + * multiple references in different screens). 49080 + */ 49081 + if (sp == SP) { 44290 49082 +#if !USE_REENTRANT 44291 44292 44293 44294 44295 49083 + curscr = 0; 49084 + newscr = 0; 49085 + stdscr = 0; 49086 + COLORS = 0; 49087 + COLOR_PAIRS = 0; 44296 49088 +#endif 44297 _nc_set_screen(0); 49089 + _nc_set_screen(0); 49090 + } 44298 49091 } 44299 + _nc_unlock_global( set_SP);49092 + _nc_unlock_global(curses); 44300 49093 + 44301 49094 returnVoid; … … 44309 49102 no_mouse_event(SCREEN *sp GCC_UNUSED) 44310 49103 { 44311 @@ - 214,17 +221,20@@49104 @@ -179,7 +217,7 @@ 44312 49105 } 44313 #endif 44314 44315 +#define ripoff_sp _nc_prescreen.rsp 44316 +#define ripoff_stack _nc_prescreen.rippedoff 44317 + 49106 49107 static bool 49108 -no_mouse_parse(int code GCC_UNUSED) 49109 +no_mouse_parse(SCREEN *sp GCC_UNUSED, int code GCC_UNUSED) 49110 { 49111 return TRUE; 49112 } 49113 @@ -216,15 +254,16 @@ 49114 44318 49115 /* OS-independent screen initializations */ 44319 49116 NCURSES_EXPORT(int) … … 44326 49123 int slk_format) 44327 49124 { 49125 + char *env; 44328 49126 int bottom_stolen = 0; 44329 49127 - int i; … … 44333 49131 T((T_CALLED("_nc_setupscreen(%d, %d, %p, %d, %d)"), 44334 49132 slines, scolumns, output, filtered, slk_format)); 44335 @@ -243,12 +2 53,20 @@49133 @@ -243,12 +282,20 @@ 44336 49134 if ((SP->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == 0) 44337 49135 returnCode(ERR); … … 44340 49138 + * We should always check the screensize, just in case. 44341 49139 + */ 44342 + _nc_get_screensize( &slines, &scolumns);49140 + _nc_get_screensize(SP, &slines, &scolumns); 44343 49141 + SET_LINES(slines); 44344 49142 + SET_COLS(scolumns); … … 44356 49154 cursor_down = parm_down_cursor = 0; 44357 49155 cursor_address = 0; 44358 @@ -258,18 + 276,6 @@49156 @@ -258,18 +305,6 @@ 44359 49157 cursor_home = carriage_return; 44360 49158 T(("filter screensize %dx%d", LINES, COLS)); … … 44375 49173 T(("setting output mode to binary")); 44376 49174 fflush(output); 44377 @@ -484, 6 +490,15 @@49175 @@ -484,37 +519,45 @@ 44378 49176 } 44379 49177 … … 44391 49189 #if USE_WIDEC_SUPPORT 44392 49190 _nc_init_wacs(); 44393 @@ -506,15 +521,17 @@ 49191 49192 SP->_screen_acs_fix = (_nc_unicode_locale() && _nc_locale_breaks_acs()); 49193 - { 49194 - char *env = _nc_get_locale(); 49195 - SP->_legacy_coding = ((env == 0) 49196 - || !strcmp(env, "C") 49197 - || !strcmp(env, "POSIX")); 49198 - } 49199 #endif 49200 + env = _nc_get_locale(); 49201 + SP->_legacy_coding = ((env == 0) 49202 + || !strcmp(env, "C") 49203 + || !strcmp(env, "POSIX")); 49204 + T(("legacy-coding %d", SP->_legacy_coding)); 49205 49206 _nc_idcok = TRUE; 49207 _nc_idlok = FALSE; 49208 49209 - _nc_windows = 0; /* no windows yet */ 49210 - 49211 SP->oldhash = 0; 44394 49212 SP->newhash = 0; 44395 49213 … … 44413 49231 SP->_resize = resizeterm; 44414 49232 #endif 44415 @@ -525,46 +5 42,63@@49233 @@ -525,46 +568,65 @@ 44416 49234 def_shell_mode(); 44417 49235 def_prog_mode(); … … 44431 49249 - if (SP->_rippedoff[i].w != 0) 44432 49250 - SP->_rippedoff[i].hook(SP->_rippedoff[i].w, scolumns); 49251 - else 44433 49252 + for (rop = ripoff_stack; 44434 49253 + rop != ripoff_sp && (rop - ripoff_stack) < N_RIPS; … … 44457 49276 + : 0), 44458 49277 + 0); 44459 + if (w) 49278 + if (w) { 49279 + rop->win = w; 44460 49280 + rop->hook(w, scolumns); 44461 else 49281 + } else { 44462 49282 returnCode(ERR); 44463 49283 - if (rsp->line < 0) 49284 + } 44464 49285 + if (rop->line < 0) 44465 49286 bottom_stolen += count; … … 44500 49321 _nc_ripoffline(int line, int (*init) (WINDOW *, int)) 44501 49322 { 44502 @@ -572,13 +6 06,14 @@49323 @@ -572,13 +634,14 @@ 44503 49324 44504 49325 if (line != 0) { … … 44520 49341 44521 49342 returnCode(OK); 49343 @@ -587,6 +650,7 @@ 49344 NCURSES_EXPORT(int) 49345 ripoffline(int line, int (*init) (WINDOW *, int)) 49346 { 49347 + START_TRACE(); 49348 T((T_CALLED("ripoffline(%d,%p)"), line, init)); 49349 49350 if (line == 0) 49351 diff -Naur ncurses-5.6.orig/ncurses/base/lib_slk.c ncurses-5.6/ncurses/base/lib_slk.c 49352 --- ncurses-5.6.orig/ncurses/base/lib_slk.c 2005-01-08 16:56:36.000000000 -0500 49353 +++ ncurses-5.6/ncurses/base/lib_slk.c 2008-06-18 06:49:51.000000000 -0400 49354 @@ -1,5 +1,5 @@ 49355 /**************************************************************************** 49356 - * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. * 49357 + * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. * 49358 * * 49359 * Permission is hereby granted, free of charge, to any person obtaining a * 49360 * copy of this software and associated documentation files (the * 49361 @@ -45,7 +45,7 @@ 49362 #include <ctype.h> 49363 #include <term.h> /* num_labels, label_*, plab_norm */ 49364 49365 -MODULE_ID("$Id: lib_slk.c,v 1.30 2005/01/08 21:56:36 tom Exp $") 49366 +MODULE_ID("$Id: lib_slk.c,v 1.33 2008/05/31 22:05:57 tom Exp $") 49367 49368 /* 49369 * We'd like to move these into the screen context structure, but cannot, 49370 @@ -56,19 +56,20 @@ 49371 49372 /* 49373 * Paint the info line for the PC style SLK emulation. 49374 - * 49375 */ 49376 static void 49377 slk_paint_info(WINDOW *win) 49378 { 49379 - if (win && SP->slk_format == 4) { 49380 + SCREEN *sp = _nc_screen_of(win); 49381 + 49382 + if (win && sp && (sp->slk_format == 4)) { 49383 int i; 49384 49385 mvwhline(win, 0, 0, 0, getmaxx(win)); 49386 wmove(win, 0, 0); 49387 49388 - for (i = 0; i < SP->_slk->maxlab; i++) { 49389 - mvwprintw(win, 0, SP->_slk->ent[i].ent_x, "F%d", i + 1); 49390 + for (i = 0; i < sp->_slk->maxlab; i++) { 49391 + mvwprintw(win, 0, sp->_slk->ent[i].ent_x, "F%d", i + 1); 49392 } 49393 } 49394 } 49395 @@ -119,12 +120,12 @@ 49396 49397 SP->_slk->maxlab = ((num_labels > 0) 49398 ? num_labels 49399 - : MAX_SKEY(_nc_slk_format)); 49400 + : MAX_SKEY(_nc_globals.slk_format)); 49401 SP->_slk->maxlen = ((num_labels > 0) 49402 ? label_width * label_height 49403 - : MAX_SKEY_LEN(_nc_slk_format)); 49404 - SP->_slk->labcnt = ((SP->_slk->maxlab < MAX_SKEY(_nc_slk_format)) 49405 - ? MAX_SKEY(_nc_slk_format) 49406 + : MAX_SKEY_LEN(_nc_globals.slk_format)); 49407 + SP->_slk->labcnt = ((SP->_slk->maxlab < MAX_SKEY(_nc_globals.slk_format)) 49408 + ? MAX_SKEY(_nc_globals.slk_format) 49409 : SP->_slk->maxlab); 49410 49411 if (SP->_slk->maxlen <= 0 49412 @@ -148,7 +149,7 @@ 49413 memset(SP->_slk->ent[i].form_text, ' ', max_length); 49414 SP->_slk->ent[i].visible = (i < SP->_slk->maxlab); 49415 } 49416 - if (_nc_slk_format >= 3) { /* PC style */ 49417 + if (_nc_globals.slk_format >= 3) { /* PC style */ 49418 int gap = (cols - 3 * (3 + 4 * max_length)) / 2; 49419 49420 if (gap < 1) 49421 @@ -161,7 +162,7 @@ 49422 } 49423 slk_paint_info(stwin); 49424 } else { 49425 - if (_nc_slk_format == 2) { /* 4-4 */ 49426 + if (_nc_globals.slk_format == 2) { /* 4-4 */ 49427 int gap = cols - (SP->_slk->maxlab * max_length) - 6; 49428 49429 if (gap < 1) 49430 @@ -172,7 +173,7 @@ 49431 x += (i == 3) ? gap : 1; 49432 } 49433 } else { 49434 - if (_nc_slk_format == 1) { /* 1 -> 3-2-3 */ 49435 + if (_nc_globals.slk_format == 1) { /* 1 -> 3-2-3 */ 49436 int gap = (cols - (SP->_slk->maxlab * max_length) - 5) 49437 / 2; 49438 49439 @@ -196,8 +197,8 @@ 49440 * per default no SLK keys and may call slk_init again to 49441 * define a new layout. (juergen 03-Mar-1999) 49442 */ 49443 - SP->slk_format = _nc_slk_format; 49444 - _nc_slk_format = 0; 49445 + SP->slk_format = _nc_globals.slk_format; 49446 + _nc_globals.slk_format = 0; 49447 returnCode(res); 49448 } 49449 49450 diff -Naur ncurses-5.6.orig/ncurses/base/lib_slkclear.c ncurses-5.6/ncurses/base/lib_slkclear.c 49451 --- ncurses-5.6.orig/ncurses/base/lib_slkclear.c 2006-05-27 15:21:19.000000000 -0400 49452 +++ ncurses-5.6/ncurses/base/lib_slkclear.c 2008-06-18 06:49:45.000000000 -0400 49453 @@ -1,5 +1,5 @@ 49454 /**************************************************************************** 49455 - * Copyright (c) 1998-2001,2006 Free Software Foundation, Inc. * 49456 + * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. * 49457 * * 49458 * Permission is hereby granted, free of charge, to any person obtaining a * 49459 * copy of this software and associated documentation files (the * 49460 @@ -29,6 +29,8 @@ 49461 /**************************************************************************** 49462 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 49463 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 49464 + * and: Juergen Pfeifer 1996-1999 * 49465 + * and: Thomas E. Dickey 1996-on * 49466 ****************************************************************************/ 49467 49468 /* 49469 @@ -38,24 +40,27 @@ 49470 */ 49471 #include <curses.priv.h> 49472 49473 -MODULE_ID("$Id: lib_slkclear.c,v 1.9 2006/05/27 19:21:19 tom Exp $") 49474 +MODULE_ID("$Id: lib_slkclear.c,v 1.10 2007/12/29 17:51:47 tom Exp $") 49475 49476 NCURSES_EXPORT(int) 49477 slk_clear(void) 49478 { 49479 + int rc = ERR; 49480 + 49481 T((T_CALLED("slk_clear()"))); 49482 49483 - if (SP == NULL || SP->_slk == NULL) 49484 - returnCode(ERR); 49485 - SP->_slk->hidden = TRUE; 49486 - /* For simulated SLK's it's looks much more natural to 49487 - inherit those attributes from the standard screen */ 49488 - SP->_slk->win->_nc_bkgd = stdscr->_nc_bkgd; 49489 - WINDOW_ATTRS(SP->_slk->win) = WINDOW_ATTRS(stdscr); 49490 - if (SP->_slk->win == stdscr) { 49491 - returnCode(OK); 49492 - } else { 49493 - werase(SP->_slk->win); 49494 - returnCode(wrefresh(SP->_slk->win)); 49495 + if (SP != NULL && SP->_slk != NULL) { 49496 + SP->_slk->hidden = TRUE; 49497 + /* For simulated SLK's it looks much more natural to 49498 + inherit those attributes from the standard screen */ 49499 + SP->_slk->win->_nc_bkgd = stdscr->_nc_bkgd; 49500 + WINDOW_ATTRS(SP->_slk->win) = WINDOW_ATTRS(stdscr); 49501 + if (SP->_slk->win == stdscr) { 49502 + rc = OK; 49503 + } else { 49504 + werase(SP->_slk->win); 49505 + rc = wrefresh(SP->_slk->win); 49506 + } 49507 } 49508 + returnCode(rc); 49509 } 44522 49510 diff -Naur ncurses-5.6.orig/ncurses/base/lib_slkinit.c ncurses-5.6/ncurses/base/lib_slkinit.c 44523 49511 --- ncurses-5.6.orig/ncurses/base/lib_slkinit.c 2000-12-09 21:43:27.000000000 -0500 44524 +++ ncurses-5.6/ncurses/base/lib_slkinit.c 200 7-12-21 00:02:36.000000000 -050049512 +++ ncurses-5.6/ncurses/base/lib_slkinit.c 2008-06-18 06:49:46.000000000 -0400 44525 49513 @@ -1,5 +1,5 @@ 44526 49514 /**************************************************************************** 44527 49515 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 44528 + * Copyright (c) 1998-200 0,2007Free Software Foundation, Inc. *49516 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 44529 49517 * * 44530 49518 * Permission is hereby granted, free of charge, to any person obtaining a * 44531 49519 * copy of this software and associated documentation files (the * 44532 @@ -38,14 +38,17 @@ 49520 @@ -29,6 +29,7 @@ 49521 /**************************************************************************** 49522 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 49523 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 49524 + * and: Thomas E. Dickey 1996-on * 49525 ****************************************************************************/ 49526 49527 /* 49528 @@ -38,14 +39,17 @@ 44533 49529 */ 44534 49530 #include <curses.priv.h> 44535 49531 44536 49532 -MODULE_ID("$Id: lib_slkinit.c,v 1.5 2000/12/10 02:43:27 tom Exp $") 44537 +MODULE_ID("$Id: lib_slkinit.c,v 1. 6 2007/05/12 18:14:21tom Exp $")49533 +MODULE_ID("$Id: lib_slkinit.c,v 1.7 2008/01/12 20:23:39 tom Exp $") 44538 49534 44539 49535 NCURSES_EXPORT(int) … … 44547 49543 - _nc_slk_format = 1 + format; 44548 49544 - returnCode(OK); 44549 + if (format >= 0 && format <= 3 && !_nc_ slk_format) {44550 + _nc_ slk_format = 1 + format;44551 + code = _nc_ripoffline(-SLK_LINES(_nc_ slk_format), _nc_slk_initialize);49545 + if (format >= 0 && format <= 3 && !_nc_globals.slk_format) { 49546 + _nc_globals.slk_format = 1 + format; 49547 + code = _nc_ripoffline(-SLK_LINES(_nc_globals.slk_format), _nc_slk_initialize); 44552 49548 + } 44553 49549 + returnCode(code); … … 44555 49551 diff -Naur ncurses-5.6.orig/ncurses/base/lib_slkset.c ncurses-5.6/ncurses/base/lib_slkset.c 44556 49552 --- ncurses-5.6.orig/ncurses/base/lib_slkset.c 2006-12-17 14:47:09.000000000 -0500 44557 +++ ncurses-5.6/ncurses/base/lib_slkset.c 200 7-12-21 00:02:36.000000000 -050049553 +++ ncurses-5.6/ncurses/base/lib_slkset.c 2008-06-18 06:49:44.000000000 -0400 44558 49554 @@ -1,5 +1,5 @@ 44559 49555 /**************************************************************************** … … 44594 49590 diff -Naur ncurses-5.6.orig/ncurses/base/lib_ungetch.c ncurses-5.6/ncurses/base/lib_ungetch.c 44595 49591 --- ncurses-5.6.orig/ncurses/base/lib_ungetch.c 2002-08-24 18:08:48.000000000 -0400 44596 +++ ncurses-5.6/ncurses/base/lib_ungetch.c 200 7-12-21 00:02:36.000000000 -050049592 +++ ncurses-5.6/ncurses/base/lib_ungetch.c 2008-06-18 06:49:51.000000000 -0400 44597 49593 @@ -1,5 +1,5 @@ 44598 49594 /**************************************************************************** 44599 49595 - * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc. * 44600 + * Copyright (c) 1998-200 2,2007Free Software Foundation, Inc. *49596 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 44601 49597 * * 44602 49598 * Permission is hereby granted, free of charge, to any person obtaining a * 44603 49599 * copy of this software and associated documentation files (the * 44604 @@ -40,7 +40,7 @@ 49600 @@ -29,6 +29,7 @@ 49601 /**************************************************************************** 49602 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 49603 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 49604 + * and: Thomas E. Dickey 1996-on * 49605 ****************************************************************************/ 49606 49607 /* 49608 @@ -40,40 +41,50 @@ 44605 49609 44606 49610 #include <curses.priv.h> 44607 49611 44608 49612 -MODULE_ID("$Id: lib_ungetch.c,v 1.8 2002/08/24 22:08:48 tom Exp $") 44609 +MODULE_ID("$Id: lib_ungetch.c,v 1. 9 2007/09/29 21:49:56tom Exp $")49613 +MODULE_ID("$Id: lib_ungetch.c,v 1.11 2008/05/31 16:44:54 tom Exp $") 44610 49614 44611 49615 #include <fifo_defs.h> 44612 49616 44613 @@ -72,8 +72,10 @@ 44614 SP->_fifo[head] = ch; 44615 T(("ungetch %s ok", _tracechar(ch))); 49617 #ifdef TRACE 49618 NCURSES_EXPORT(void) 49619 -_nc_fifo_dump(void) 49620 +_nc_fifo_dump(SCREEN *sp) 49621 { 49622 int i; 49623 T(("head = %d, tail = %d, peek = %d", head, tail, peek)); 49624 for (i = 0; i < 10; i++) 49625 - T(("char %d = %s", i, _tracechar(SP->_fifo[i]))); 49626 + T(("char %d = %s", i, _nc_tracechar(sp, sp->_fifo[i]))); 49627 } 49628 #endif /* TRACE */ 49629 49630 NCURSES_EXPORT(int) 49631 -ungetch(int ch) 49632 +_nc_ungetch(SCREEN *sp, int ch) 49633 { 49634 - T((T_CALLED("ungetch(%s)"), _tracechar(ch))); 49635 + int rc = ERR; 49636 49637 - if (tail == -1) 49638 - returnCode(ERR); 49639 - if (head == -1) { 49640 - head = 0; 49641 - t_inc() 49642 + if (tail != -1) { 49643 + if (head == -1) { 49644 + head = 0; 49645 + t_inc(); 49646 peek = tail; /* no raw keys */ 49647 - } else 49648 - h_dec(); 49649 + } else 49650 + h_dec(); 49651 49652 - SP->_fifo[head] = ch; 49653 - T(("ungetch %s ok", _tracechar(ch))); 49654 + sp->_fifo[head] = ch; 49655 + T(("ungetch %s ok", _nc_tracechar(sp, ch))); 44616 49656 #ifdef TRACE 44617 49657 - if (_nc_tracing & TRACE_IEVENT) 44618 + if (USE_TRACEF(TRACE_IEVENT)) { 44619 _nc_fifo_dump(); 44620 + _nc_unlock_global(tracef); 49658 - _nc_fifo_dump(); 49659 + if (USE_TRACEF(TRACE_IEVENT)) { 49660 + _nc_fifo_dump(sp); 49661 + _nc_unlock_global(tracef); 49662 + } 49663 #endif 49664 - returnCode(OK); 49665 + rc = OK; 44621 49666 + } 44622 #endif 44623 returnCode(OK); 49667 + return rc; 49668 +} 49669 + 49670 +NCURSES_EXPORT(int) 49671 +ungetch(int ch) 49672 +{ 49673 + T((T_CALLED("ungetch(%s)"), _nc_tracechar(SP, ch))); 49674 + returnCode(_nc_ungetch(SP, ch)); 44624 49675 } 44625 49676 diff -Naur ncurses-5.6.orig/ncurses/base/lib_window.c ncurses-5.6/ncurses/base/lib_window.c 44626 49677 --- ncurses-5.6.orig/ncurses/base/lib_window.c 2006-05-27 15:21:19.000000000 -0400 44627 +++ ncurses-5.6/ncurses/base/lib_window.c 200 7-12-21 00:02:36.000000000 -050049678 +++ ncurses-5.6/ncurses/base/lib_window.c 2008-06-18 06:49:51.000000000 -0400 44628 49679 @@ -1,5 +1,5 @@ 44629 49680 /**************************************************************************** 44630 49681 - * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. * 44631 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *49682 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 44632 49683 * * 44633 49684 * Permission is hereby granted, free of charge, to any person obtaining a * … … 44638 49689 44639 49690 -MODULE_ID("$Id: lib_window.c,v 1.22 2006/05/27 19:21:19 tom Exp $") 44640 +MODULE_ID("$Id: lib_window.c,v 1.2 3 2007/06/30 23:36:11tom Exp $")49691 +MODULE_ID("$Id: lib_window.c,v 1.25 2008/06/07 14:12:56 tom Exp $") 44641 49692 44642 49693 NCURSES_EXPORT(void) … … 44651 49702 left = 0; 44652 49703 if (right > win->_maxx) 49704 @@ -186,6 +186,7 @@ 49705 49706 if (win != 0) { 49707 49708 + _nc_lock_global(curses); 49709 if (win->_flags & _ISPAD) { 49710 nwin = newpad(win->_maxy + 1, 49711 win->_maxx + 1); 49712 @@ -243,6 +244,7 @@ 49713 nwin->_line[i].lastchar = win->_line[i].lastchar; 49714 } 49715 } 49716 + _nc_unlock_global(curses); 49717 } 49718 returnWin(nwin); 49719 } 44653 49720 diff -Naur ncurses-5.6.orig/ncurses/base/memmove.c ncurses-5.6/ncurses/base/memmove.c 44654 49721 --- ncurses-5.6.orig/ncurses/base/memmove.c 2000-12-09 21:43:28.000000000 -0500 44655 +++ ncurses-5.6/ncurses/base/memmove.c 200 7-12-21 00:02:36.000000000 -050049722 +++ ncurses-5.6/ncurses/base/memmove.c 2008-06-18 06:49:44.000000000 -0400 44656 49723 @@ -1,5 +1,5 @@ 44657 49724 /**************************************************************************** … … 44681 49748 diff -Naur ncurses-5.6.orig/ncurses/base/resizeterm.c ncurses-5.6/ncurses/base/resizeterm.c 44682 49749 --- ncurses-5.6.orig/ncurses/base/resizeterm.c 2006-10-14 16:43:31.000000000 -0400 44683 +++ ncurses-5.6/ncurses/base/resizeterm.c 200 7-12-21 00:02:36.000000000 -050049750 +++ ncurses-5.6/ncurses/base/resizeterm.c 2008-06-18 06:49:51.000000000 -0400 44684 49751 @@ -1,5 +1,5 @@ 44685 49752 /**************************************************************************** 44686 49753 - * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. * 44687 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *49754 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 44688 49755 * * 44689 49756 * Permission is hereby granted, free of charge, to any person obtaining a * … … 44694 49761 44695 49762 -MODULE_ID("$Id: resizeterm.c,v 1.18 2006/10/14 20:43:31 tom Exp $") 44696 +MODULE_ID("$Id: resizeterm.c,v 1. 23 2007/10/13 20:12:13tom Exp $")49763 +MODULE_ID("$Id: resizeterm.c,v 1.34 2008/06/07 13:58:40 tom Exp $") 44697 49764 44698 49765 #define stolen_lines (screen_lines - SP->_lines_avail) … … 44715 49782 #ifdef TRACE 44716 49783 static void 44717 @@ -121,10 +133,10 @@ 49784 @@ -54,9 +66,10 @@ 49785 { 49786 WINDOWLIST *wp; 49787 49788 + _nc_lock_global(curses); 49789 _tracef("%s resizing: %2d x %2d (%2d x %2d)", name, LINES, COLS, 49790 screen_lines, screen_columns); 49791 - for (wp = _nc_windows; wp != 0; wp = wp->next) { 49792 + for (each_window(wp)) { 49793 _tracef(" window %p is %2ld x %2ld at %2ld,%2ld", 49794 &(wp->win), 49795 (long) wp->win._maxy + 1, 49796 @@ -64,9 +77,14 @@ 49797 (long) wp->win._begy, 49798 (long) wp->win._begx); 49799 } 49800 + _nc_unlock_global(curses); 49801 } 49802 #endif 49803 49804 +/* 49805 + * Return true if the given dimensions do not match the internal terminal 49806 + * structure's size. 49807 + */ 49808 NCURSES_EXPORT(bool) 49809 is_term_resized(int ToLines, int ToCols) 49810 { 49811 @@ -78,6 +96,48 @@ 49812 } 49813 49814 /* 49815 + */ 49816 +static ripoff_t * 49817 +ripped_window(WINDOW *win) 49818 +{ 49819 + ripoff_t *result = 0; 49820 + ripoff_t *rop; 49821 + 49822 + if (win != 0) { 49823 + for (each_ripoff(rop)) { 49824 + if (rop->win == win && rop->line != 0) { 49825 + result = rop; 49826 + break; 49827 + } 49828 + } 49829 + } 49830 + return result; 49831 +} 49832 + 49833 +/* 49834 + * Returns the number of lines from the bottom for the beginning of a ripped 49835 + * off window. 49836 + */ 49837 +static int 49838 +ripped_bottom(WINDOW *win) 49839 +{ 49840 + int result = 0; 49841 + ripoff_t *rop; 49842 + 49843 + if (win != 0) { 49844 + for (each_ripoff(rop)) { 49845 + if (rop->line < 0) { 49846 + result -= rop->line; 49847 + if (rop->win == win) { 49848 + break; 49849 + } 49850 + } 49851 + } 49852 + } 49853 + return result; 49854 +} 49855 + 49856 +/* 49857 * Return the number of levels of child-windows under the current window. 49858 */ 49859 static int 49860 @@ -88,7 +148,7 @@ 49861 if (cmp != 0) { 49862 WINDOWLIST *wp; 49863 49864 - for (wp = _nc_windows; wp != 0; wp = wp->next) { 49865 + for (each_window(wp)) { 49866 WINDOW *tst = &(wp->win); 49867 if (tst->_parent == cmp) { 49868 depth = 1 + child_depth(tst); 49869 @@ -121,41 +181,53 @@ 44718 49870 * FIXME: must adjust position so it's within the parent! 44719 49871 */ … … 44727 49879 int myLines = win->_maxy + 1; 44728 49880 int myCols = win->_maxx + 1; 44729 44730 @@ -134,13 +146,13 @@ 44731 (long) getbegy(win), (long) getbegx(win))); 44732 44733 if (win->_begy >= bottom) { 49881 + ripoff_t *rop = ripped_window(win); 49882 49883 - T((T_CALLED("adjust_window(%p,%d,%d) currently %ldx%ld at %ld,%ld"), 49884 + T((T_CALLED("adjust_window(%p,%d,%d)%s depth %d/%d currently %ldx%ld at %ld,%ld"), 49885 win, ToLines, ToCols, 49886 + (rop != 0) ? " (rip)" : "", 49887 + parent_depth(win), 49888 + child_depth(win), 49889 (long) getmaxy(win), (long) getmaxx(win), 49890 - (long) getbegy(win), (long) getbegx(win))); 49891 + (long) getbegy(win) + win->_yoffset, (long) getbegx(win))); 49892 49893 - if (win->_begy >= bottom) { 44734 49894 - win->_begy += (ToLines - current_lines); 49895 + if (rop != 0 && rop->line < 0) { 49896 + /* 49897 + * If it is a ripped-off window at the bottom of the screen, simply 49898 + * move it to the same relative position. 49899 + */ 49900 + win->_begy = ToLines - ripped_bottom(win) - 0 - win->_yoffset; 49901 + } else if (win->_begy >= bottom) { 49902 + /* 49903 + * If it is below the bottom of the new screen, move up by the same 49904 + * amount that the screen shrank. 49905 + */ 44735 49906 + win->_begy += (ToLines - CurLines); 44736 49907 } else { 44737 49908 - if (myLines == current_lines - stolen 44738 49909 - && ToLines != current_lines) 44739 + if (myLines == CurLines - stolen44740 + && ToLines != CurLines) 49910 + if (myLines == (CurLines - stolen) 49911 + && ToLines != CurLines) { 44741 49912 myLines = ToLines - stolen; 44742 49913 - else if (myLines == current_lines 44743 49914 - && ToLines != current_lines) 44744 + else if (myLines == CurLines44745 + && ToLines != CurLines)49915 + } else if (myLines == CurLines 49916 + && ToLines != CurLines) { 44746 49917 myLines = ToLines; 49918 + } 44747 49919 } 44748 49920 44749 @@ -150,12 +162,12 @@ 49921 - if (myLines > ToLines) 49922 + if (myLines > ToLines) { 49923 myLines = ToLines; 49924 + } 49925 44750 49926 if (myCols > ToCols) 44751 49927 myCols = ToCols; … … 44753 49929 - if (myLines == current_lines 44754 49930 - && ToLines != current_lines) 44755 + if (myLines == CurLines 44756 + && ToLines != CurLines) 44757 myLines = ToLines; 44758 49931 - myLines = ToLines; 49932 - 44759 49933 - if (myCols == current_cols 44760 49934 - && ToCols != current_cols) … … 44764 49938 44765 49939 result = wresize(win, myLines, myCols); 44766 @@ -167,7 + 179,7 @@49940 @@ -167,7 +239,7 @@ 44767 49941 * children, decrease those to fit, then decrease the containing window, etc. 44768 49942 */ … … 44773 49947 bool found; 44774 49948 int depth = 0; 44775 @@ -185,7 +197,8 @@ 49949 @@ -179,13 +251,14 @@ 49950 found = FALSE; 49951 TR(TRACE_UPDATE, ("decreasing size of windows to %dx%d, depth=%d", 49952 ToLines, ToCols, depth)); 49953 - for (wp = _nc_windows; wp != 0; wp = wp->next) { 49954 + for (each_window(wp)) { 49955 WINDOW *win = &(wp->win); 49956 44776 49957 if (!(win->_flags & _ISPAD)) { 44777 49958 if (child_depth(win) == depth) { … … 44783 49964 } 44784 49965 } 44785 @@ -200,7 +2 13,7 @@49966 @@ -200,7 +273,7 @@ 44786 49967 * parent, increase those to fit, then increase the contained window, etc. 44787 49968 */ … … 44792 49973 bool found; 44793 49974 int depth = 0; 44794 @@ -218,7 +231,8 @@ 49975 @@ -212,13 +285,14 @@ 49976 found = FALSE; 49977 TR(TRACE_UPDATE, ("increasing size of windows to %dx%d, depth=%d", 49978 ToLines, ToCols, depth)); 49979 - for (wp = _nc_windows; wp != 0; wp = wp->next) { 49980 + for (each_window(wp)) { 49981 WINDOW *win = &(wp->win); 49982 44795 49983 if (!(win->_flags & _ISPAD)) { 44796 49984 if (parent_depth(win) == depth) { … … 44802 49990 } 44803 49991 } 44804 @@ -235,36 + 249,42@@49992 @@ -235,36 +309,45 @@ 44805 49993 NCURSES_EXPORT(int) 44806 49994 resize_term(int ToLines, int ToCols) … … 44818 50006 + returnCode(ERR); 44819 50007 + } 50008 + 50009 + _nc_lock_global(curses); 50010 + 44820 50011 + was_stolen = (screen_lines - SP->_lines_avail); 44821 50012 if (is_term_resized(ToLines, ToCols)) { … … 44857 50048 44858 50049 screen_lines = lines = ToLines; 44859 @@ -279,10 + 299,11 @@50050 @@ -279,10 +362,11 @@ 44860 50051 FreeAndNull(SP->newhash); 44861 50052 } … … 44872 50063 #endif 44873 50064 } 44874 @@ -291,8 +3 12,8@@50065 @@ -291,8 +375,10 @@ 44875 50066 * Always update LINES, to allow for call from lib_doupdate.c which 44876 50067 * needs to have the count adjusted by the stolen (ripped off) lines. … … 44880 50071 + SET_LINES(ToLines - was_stolen); 44881 50072 + SET_COLS(ToCols); 50073 + 50074 + _nc_unlock_global(curses); 44882 50075 44883 50076 returnCode(result); 44884 50077 } 44885 @@ -308,22 +3 29,25@@50078 @@ -308,22 +394,61 @@ 44886 50079 NCURSES_EXPORT(int) 44887 50080 resizeterm(int ToLines, int ToCols) … … 44900 50093 + result = OK; 44901 50094 + SP->_sig_winch = FALSE; 44902 + 50095 44903 50096 + if (is_term_resized(ToLines, ToCols)) { 44904 44905 50097 #if USE_SIGWINCH 44906 50098 - ungetch(KEY_RESIZE); /* so application can know this */ 44907 50099 - clearok(curscr, TRUE); /* screen contents are unknown */ 44908 + ungetch(KEY_RESIZE); /* so application can know this */ 50100 + ripoff_t *rop; 50101 + bool slk_visible = (SP != 0 50102 + && SP->_slk != 0 50103 + && !(SP->_slk->hidden)); 50104 + 50105 + if (slk_visible) { 50106 + slk_clear(); 50107 + } 50108 #endif 50109 + result = resize_term(ToLines, ToCols); 50110 + 50111 +#if USE_SIGWINCH 50112 + _nc_ungetch(SP, KEY_RESIZE); /* so application can know this */ 44909 50113 + clearok(curscr, TRUE); /* screen contents are unknown */ 44910 #endif 50114 + 50115 + /* ripped-off lines are a special case: if we did not lengthen 50116 + * them, we haven't moved them either. repaint them, too. 50117 + * 50118 + * for the rest - stdscr and other windows - the client has to 50119 + * decide which to repaint, since without panels, ncurses does 50120 + * not know which are really on top. 50121 + */ 50122 + for (each_ripoff(rop)) { 50123 + if (rop->win != stdscr 50124 + && rop->win != 0 50125 + && rop->line < 0) { 50126 + 50127 + if (rop->hook != _nc_slk_initialize) { 50128 + touchwin(rop->win); 50129 + wnoutrefresh(rop->win); 50130 + } 50131 + } 50132 + } 50133 + 50134 + /* soft-keys are a special case: we _know_ how to repaint them */ 50135 + if (slk_visible) { 50136 + slk_restore(); 50137 + slk_touch(); 44911 50138 44912 50139 - result = resize_term(ToLines, ToCols); 44913 + result = resize_term(ToLines, ToCols); 50140 + slk_refresh(); 50141 + } 50142 +#endif 44914 50143 + } 44915 50144 } … … 44918 50147 diff -Naur ncurses-5.6.orig/ncurses/base/safe_sprintf.c ncurses-5.6/ncurses/base/safe_sprintf.c 44919 50148 --- ncurses-5.6.orig/ncurses/base/safe_sprintf.c 2003-08-09 17:52:04.000000000 -0400 44920 +++ ncurses-5.6/ncurses/base/safe_sprintf.c 200 7-12-21 00:02:36.000000000 -050050149 +++ ncurses-5.6/ncurses/base/safe_sprintf.c 2008-06-18 06:49:44.000000000 -0400 44921 50150 @@ -1,5 +1,5 @@ 44922 50151 /**************************************************************************** … … 45021 50250 diff -Naur ncurses-5.6.orig/ncurses/base/tries.c ncurses-5.6/ncurses/base/tries.c 45022 50251 --- ncurses-5.6.orig/ncurses/base/tries.c 2005-11-26 15:09:18.000000000 -0500 45023 +++ ncurses-5.6/ncurses/base/tries.c 200 7-12-21 00:02:36.000000000 -050050252 +++ ncurses-5.6/ncurses/base/tries.c 2008-06-18 06:49:51.000000000 -0400 45024 50253 @@ -1,5 +1,5 @@ 45025 50254 /**************************************************************************** 45026 50255 - * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. * 45027 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *50256 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 45028 50257 * * 45029 50258 * Permission is hereby granted, free of charge, to any person obtaining a * … … 45034 50263 45035 50264 -MODULE_ID("$Id: tries.c,v 1.22 2005/11/26 20:09:18 tom Exp $") 45036 +MODULE_ID("$Id: tries.c,v 1.2 5 2007/09/29 20:37:13tom Exp $")50265 +MODULE_ID("$Id: tries.c,v 1.26 2008/05/31 16:54:22 tom Exp $") 45037 50266 45038 50267 /* … … 45058 50287 #ifdef TRACE 45059 50288 - if (len == 0 && _nc_tracing != 0) 50289 - _tracef("expand_key %s %s", _tracechar(code), _nc_visbuf(result)); 45060 50290 + if (len == 0 && USE_TRACEF(TRACE_MAXIMUM)) { 45061 _tracef("expand_key %s %s", _tracechar(code), _nc_visbuf(result));50291 + _tracef("expand_key %s %s", _nc_tracechar(SP, code), _nc_visbuf(result)); 45062 50292 + _nc_unlock_global(tracef); 45063 50293 + } … … 45103 50333 diff -Naur ncurses-5.6.orig/ncurses/base/use_window.c ncurses-5.6/ncurses/base/use_window.c 45104 50334 --- ncurses-5.6.orig/ncurses/base/use_window.c 1969-12-31 19:00:00.000000000 -0500 45105 +++ ncurses-5.6/ncurses/base/use_window.c 200 7-12-21 00:02:36.000000000 -050045106 @@ -0,0 +1, 80@@50335 +++ ncurses-5.6/ncurses/base/use_window.c 2008-06-18 06:49:51.000000000 -0400 50336 @@ -0,0 +1,48 @@ 45107 50337 +/**************************************************************************** 45108 + * Copyright (c) 2007 Free Software Foundation, Inc.*50338 + * Copyright (c) 2007,2008 Free Software Foundation, Inc. * 45109 50339 + * * 45110 50340 + * Permission is hereby granted, free of charge, to any person obtaining a * … … 45139 50369 +#include <curses.priv.h> 45140 50370 + 45141 +MODULE_ID("$Id: use_window.c,v 1.2 2007/10/20 19:57:55 tom Exp $") 45142 + 45143 +#ifdef USE_PTHREADS 45144 +NCURSES_EXPORT(void) 45145 +_nc_lock_window(WINDOW *win) 45146 +{ 45147 + WINDOWLIST *p; 45148 + 45149 + _nc_lock_global(windowlist); 45150 + for (p = _nc_windows; p != 0; p = p->next) { 45151 + if (&(p->win) == win) { 45152 + pthread_mutex_lock(&(p->mutex_use_window)); 45153 + break; 45154 + } 45155 + } 45156 + _nc_unlock_global(windowlist); 45157 +} 45158 + 45159 +NCURSES_EXPORT(void) 45160 +_nc_unlock_window(WINDOW *win) 45161 +{ 45162 + WINDOWLIST *p; 45163 + 45164 + _nc_lock_global(windowlist); 45165 + for (p = _nc_windows; p != 0; p = p->next) { 45166 + if (&(p->win) == win) { 45167 + pthread_mutex_unlock(&(p->mutex_use_window)); 45168 + break; 45169 + } 45170 + } 45171 + _nc_unlock_global(windowlist); 45172 +} 45173 +#endif 50371 +MODULE_ID("$Id: use_window.c,v 1.8 2008/06/07 14:13:46 tom Exp $") 45174 50372 + 45175 50373 +NCURSES_EXPORT(int) 45176 +use_window(WINDOW *win, NCURSES_ CALLBACKfunc, void *data)50374 +use_window(WINDOW *win, NCURSES_WINDOW_CB func, void *data) 45177 50375 +{ 45178 50376 + int code = OK; 45179 50377 + 45180 50378 + T((T_CALLED("use_window(%p,%p,%p)"), win, func, data)); 45181 + _nc_lock_ window(win);50379 + _nc_lock_global(curses); 45182 50380 + code = func(win, data); 45183 + _nc_unlock_ window(win);50381 + _nc_unlock_global(curses); 45184 50382 + 45185 50383 + returnCode(code); … … 45187 50385 diff -Naur ncurses-5.6.orig/ncurses/base/wresize.c ncurses-5.6/ncurses/base/wresize.c 45188 50386 --- ncurses-5.6.orig/ncurses/base/wresize.c 2006-10-14 16:43:31.000000000 -0400 45189 +++ ncurses-5.6/ncurses/base/wresize.c 200 7-12-21 00:02:36.000000000 -050050387 +++ ncurses-5.6/ncurses/base/wresize.c 2008-06-18 06:49:51.000000000 -0400 45190 50388 @@ -1,5 +1,5 @@ 45191 50389 /**************************************************************************** 45192 50390 - * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. * 45193 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *50391 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 45194 50392 * * 45195 50393 * Permission is hereby granted, free of charge, to any person obtaining a * … … 45200 50398 45201 50399 -MODULE_ID("$Id: wresize.c,v 1.24 2006/10/14 20:43:31 tom Exp $") 45202 +MODULE_ID("$Id: wresize.c,v 1.2 6 2007/09/29 20:37:13tom Exp $")50400 +MODULE_ID("$Id: wresize.c,v 1.29 2008/06/07 13:59:01 tom Exp $") 45203 50401 45204 50402 static int … … 45211 50409 return ERR; 45212 50410 } 45213 @@ -96,8 +96,10 @@ 50411 @@ -54,7 +54,9 @@ 50412 struct ldat *pline = cmp->_line; 50413 int row; 50414 50415 - for (wp = _nc_windows; wp != 0; wp = wp->next) { 50416 + _nc_lock_global(curses); 50417 + 50418 + for (each_window(wp)) { 50419 WINDOW *tst = &(wp->win); 50420 50421 if (tst->_parent == cmp) { 50422 @@ -75,6 +77,7 @@ 50423 repair_subwindows(tst); 50424 } 50425 } 50426 + _nc_unlock_global(curses); 50427 } 50428 50429 /* 50430 @@ -96,8 +99,10 @@ 45214 50431 (long) win->_begy, (long) win->_begx, 45215 50432 (long) win->_maxy, (long) win->_maxx, … … 45223 50440 #endif 45224 50441 45225 @@ -232,8 +23 4,10 @@50442 @@ -232,8 +237,10 @@ 45226 50443 (long) win->_begy, (long) win->_begx, 45227 50444 (long) win->_maxy, (long) win->_maxx, … … 45237 50454 diff -Naur ncurses-5.6.orig/ncurses/curses.priv.h ncurses-5.6/ncurses/curses.priv.h 45238 50455 --- ncurses-5.6.orig/ncurses/curses.priv.h 2006-12-09 19:55:14.000000000 -0500 45239 +++ ncurses-5.6/ncurses/curses.priv.h 200 7-12-21 00:02:36.000000000 -050050456 +++ ncurses-5.6/ncurses/curses.priv.h 2008-06-18 06:49:51.000000000 -0400 45240 50457 @@ -1,5 +1,5 @@ 45241 50458 /**************************************************************************** 45242 50459 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 45243 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *50460 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 45244 50461 * * 45245 50462 * Permission is hereby granted, free of charge, to any person obtaining a * … … 45250 50467 /* 45251 50468 - * $Id: curses.priv.h,v 1.314 2006/12/10 00:55:14 tom Exp $ 45252 + * $Id: curses.priv.h,v 1.3 51 2007/11/25 00:57:29 tom Exp $50469 + * $Id: curses.priv.h,v 1.383 2008/06/07 14:13:19 tom Exp $ 45253 50470 * 45254 50471 * curses.priv.h … … 45290 50507 #include <term.h> 45291 50508 #include <term_entry.h> 45292 @@ -284,6 +292, 38@@50509 @@ -284,6 +292,70 @@ 45293 50510 #define GET_SCREEN_PAIR(s) GetPair(SCREEN_ATTRS(s)) 45294 50511 #define SET_SCREEN_PAIR(s,p) SetPair(SCREEN_ATTRS(s), p) 45295 50512 45296 50513 +#if USE_REENTRANT 45297 +#define SET_LINES(value) SP->_LINES = value 45298 +#define SET_COLS(value) SP->_COLS = value 50514 +NCURSES_EXPORT(int *) _nc_ptr_Lines (void); 50515 +NCURSES_EXPORT(int *) _nc_ptr_Cols (void); 50516 +#define ptrLines() (SP ? &(SP->_LINES) : &(_nc_prescreen._LINES)) 50517 +#define ptrCols() (SP ? &(SP->_COLS) : &(_nc_prescreen._COLS)) 50518 +#define SET_LINES(value) *_nc_ptr_Lines() = value 50519 +#define SET_COLS(value) *_nc_ptr_Cols() = value 45299 50520 +#else 50521 +#define ptrLines() &LINES 50522 +#define ptrCols() &COLS 45300 50523 +#define SET_LINES(value) LINES = value 45301 50524 +#define SET_COLS(value) COLS = value 45302 50525 +#endif 45303 50526 + 50527 +#define TR_MUTEX(data) _tracef("%s@%d: me:%08lX COUNT:%2u/%2d/%6d/%2d/%s%9u: " #data, \ 50528 + __FILE__, __LINE__, \ 50529 + (unsigned long) (pthread_self()), \ 50530 + data.__data.__lock, \ 50531 + data.__data.__count, \ 50532 + data.__data.__owner, \ 50533 + data.__data.__kind, \ 50534 + (data.__data.__nusers > 5) ? " OOPS " : "", \ 50535 + data.__data.__nusers) 50536 +#define TR_GLOBAL_MUTEX(name) TR_MUTEX(_nc_globals.mutex_##name) 50537 + 45304 50538 +#ifdef USE_PTHREADS 50539 + 45305 50540 +#if USE_REENTRANT 45306 50541 +#include <pthread.h> 45307 +#define _nc_lock_global(name) pthread_mutex_lock(&_nc_globals.mutex_##name) 45308 +#define _nc_unlock_global(name) pthread_mutex_unlock(&_nc_globals.mutex_##name) 45309 + 45310 +extern NCURSES_EXPORT(void) _nc_lock_window(WINDOW *); 45311 +extern NCURSES_EXPORT(void) _nc_unlock_window(WINDOW *); 50542 +extern NCURSES_EXPORT(void) _nc_mutex_init(pthread_mutex_t *); 50543 +extern NCURSES_EXPORT(int) _nc_mutex_lock(pthread_mutex_t *); 50544 +extern NCURSES_EXPORT(int) _nc_mutex_trylock(pthread_mutex_t *); 50545 +extern NCURSES_EXPORT(int) _nc_mutex_unlock(pthread_mutex_t *); 50546 +#define _nc_lock_global(name) _nc_mutex_lock(&_nc_globals.mutex_##name) 50547 +#define _nc_try_global(name) _nc_mutex_trylock(&_nc_globals.mutex_##name) 50548 +#define _nc_unlock_global(name) _nc_mutex_unlock(&_nc_globals.mutex_##name) 45312 50549 + 45313 50550 +#else 45314 50551 +#error POSIX threads requires --enable-reentrant option 45315 50552 +#endif 50553 + 50554 +#if HAVE_NANOSLEEP 50555 +#undef HAVE_NANOSLEEP 50556 +#define HAVE_NANOSLEEP 0 /* nanosleep suspends all threads */ 50557 +#endif 50558 + 50559 +#else /* !USE_PTHREADS */ 50560 + 50561 +#define _nc_mutex_init(obj) /* nothing */ 50562 + 50563 +#define _nc_lock_global(name) /* nothing */ 50564 +#define _nc_try_global(name) 0 50565 +#define _nc_unlock_global(name) /* nothing */ 50566 + 50567 +#endif /* USE_PTHREADS */ 50568 + 50569 +#if HAVE_GETTIMEOFDAY 50570 +# define PRECISE_GETTIME 1 50571 +# define TimeType struct timeval 45316 50572 +#else 45317 +#define _nc_lock_global(name) /* nothing */ 45318 +#define _nc_unlock_global(name) /* nothing */ 45319 + 45320 +#define _nc_lock_window(name) TRUE 45321 +#define _nc_unlock_window(name) /* nothing */ 45322 + 50573 +# define PRECISE_GETTIME 0 50574 +# define TimeType time_t 45323 50575 +#endif 45324 +45325 +#define _nc_lock_screen(name) /* nothing */45326 +#define _nc_unlock_screen(name) /* nothing */45327 50576 + 45328 50577 /* 45329 50578 * Definitions for color pairs 45330 50579 */ 45331 @@ -366,7 +406,6 @@ 50580 @@ -364,9 +436,9 @@ 50581 #endif /* USE_TERMLIB */ 50582 45332 50583 typedef struct { 50584 + WINDOW *win; /* the window used in the hook */ 45333 50585 int line; /* lines to take, < 0 => from bottom*/ 45334 50586 int (*hook)(WINDOW *, int); /* callback for user */ … … 45337 50589 45338 50590 #if USE_GPM_SUPPORT 45339 @@ -393,6 +4 32,186@@50591 @@ -393,6 +465,188 @@ 45340 50592 #endif /* HAVE_LIBDL */ 45341 50593 #endif /* USE_GPM_SUPPORT */ … … 45435 50687 + char **keyname_table; 45436 50688 + 50689 + int slk_format; 50690 + 45437 50691 + char *safeprint_buf; 45438 50692 + size_t safeprint_used; … … 45441 50695 + int tgetent_index; 45442 50696 + long tgetent_sequence; 50697 + 50698 + WINDOWLIST *_nc_windowlist; 50699 +#define _nc_windows _nc_globals._nc_windowlist 45443 50700 + 45444 50701 +#if USE_HOME_TERMINFO … … 45468 50725 + size_t tracedmp_used; 45469 50726 + 45470 + char tracemse_buf[TRACEMSE_MAX];45471 +45472 50727 + unsigned char *tracetry_buf; 45473 50728 + size_t tracetry_used; 45474 50729 + 45475 +#ifndef USE_TERMLIB45476 50730 + char traceatr_color_buf[2][80]; 45477 50731 + int traceatr_color_sel; 45478 50732 + int traceatr_color_last; 45479 +#endif /* USE_TERMLIB */45480 50733 + 45481 50734 +#endif /* TRACE */ 45482 50735 + 45483 50736 +#ifdef USE_PTHREADS 45484 + pthread_mutex_t mutex_set_SP; 45485 + pthread_mutex_t mutex_use_screen; 45486 + pthread_mutex_t mutex_use_window; 45487 + pthread_mutex_t mutex_windowlist; 50737 + pthread_mutex_t mutex_curses; 45488 50738 + pthread_mutex_t mutex_tst_tracef; 45489 50739 + pthread_mutex_t mutex_tracef; … … 45497 50747 + 45498 50748 +/* 45499 + * Global data which isswept up into a SCREEN when one is created.50749 + * Global data which can be swept up into a SCREEN when one is created. 45500 50750 + * It may be modified before the next SCREEN is created. 45501 50751 + */ … … 45512 50762 + int _LINES; 45513 50763 + int _COLS; 50764 + TERMINAL *_cur_term; 45514 50765 +#ifdef TRACE 45515 50766 + long _outchars; … … 45519 50770 +} NCURSES_PRESCREEN; 45520 50771 + 50772 +#define ripoff_sp _nc_prescreen.rsp 50773 +#define ripoff_stack _nc_prescreen.rippedoff 50774 + 45521 50775 +extern NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen; 45522 50776 + … … 45524 50778 * The SCREEN structure. 45525 50779 */ 45526 @@ -405,20 +6 24,19 @@50780 @@ -405,20 +659,19 @@ 45527 50781 bool _buffered; /* setvbuf uses _setbuf data */ 45528 50782 int _checkfd; /* filedesc for typeahead check */ … … 45552 50806 bool _keypad_on; /* keypad mode is currently on */ 45553 50807 45554 @@ -597,12 +815,25 @@ 50808 @@ -532,7 +785,7 @@ 50809 int _maxclick; 50810 bool (*_mouse_event) (SCREEN *); 50811 bool (*_mouse_inline)(SCREEN *); 50812 - bool (*_mouse_parse) (int); 50813 + bool (*_mouse_parse) (SCREEN *, int); 50814 void (*_mouse_resume)(SCREEN *); 50815 void (*_mouse_wrap) (SCREEN *); 50816 int _mouse_fd; /* file-descriptor, if any */ 50817 @@ -583,12 +836,6 @@ 50818 * per screen basis. 50819 */ 50820 struct panelhook _panelHook; 50821 - /* 50822 - * Linked-list of all windows, to support '_nc_resizeall()' and 50823 - * '_nc_freeall()' 50824 - */ 50825 - WINDOWLIST *_nc_sp_windows; 50826 -#define _nc_windows SP->_nc_sp_windows 50827 50828 bool _sig_winch; 50829 SCREEN *_next_screen; 50830 @@ -597,12 +844,30 @@ 45555 50831 unsigned long *oldhash, *newhash; 45556 50832 HASHMAP *hashtab; … … 45571 50847 + int _COLS; 45572 50848 +#ifdef TRACE 45573 + int_outchars;50849 + long _outchars; 45574 50850 + const char *_tputs_trace; 45575 50851 +#endif 50852 +#endif 50853 + 50854 +#ifdef TRACE 50855 + char tracechr_buf[40]; 50856 + char tracemse_buf[TRACEMSE_MAX]; 45576 50857 +#endif 45577 50858 /* 45578 50859 * ncurses/ncursesw are the same up to this point. 45579 50860 */ 45580 @@ -615, 6 +846,7@@50861 @@ -615,10 +880,12 @@ 45581 50862 }; 45582 50863 … … 45585 50866 45586 50867 WINDOWLIST { 45587 WINDOW win; /* first, so WINDOW_EXT() works */ 45588 @@ -625,6 +857,9 @@ 45589 int addch_x; /* x-position for addch_work[] */ 45590 int addch_y; /* y-position for addch_work[] */ 45591 #endif 45592 +#ifdef USE_PTHREADS 45593 + pthread_mutex_t mutex_use_window; 45594 +#endif 45595 }; 45596 45597 #define WINDOW_EXT(win,field) (((WINDOWLIST *)(win))->field) 45598 @@ -691,11 +926,17 @@ 50868 - WINDOW win; /* first, so WINDOW_EXT() works */ 50869 + WINDOW win; /* first, so WINDOW_EXT() works */ 50870 WINDOWLIST *next; 50871 + SCREEN *screen; /* screen containing the window */ 50872 #ifdef _XOPEN_SOURCE_EXTENDED 50873 char addch_work[(MB_LEN_MAX * 9) + 1]; 50874 unsigned addch_used; /* number of bytes in addch_work[] */ 50875 @@ -691,11 +958,17 @@ 45599 50876 #endif 45600 50877 … … 45616 50893 #define ChCharOf(c) ((c) & (chtype)A_CHARTEXT) 45617 50894 #define ChAttrOf(c) ((c) & (chtype)A_ATTRIBUTES) 45618 @@ -705,7 +9 46,7 @@50895 @@ -705,7 +978,7 @@ 45619 50896 #endif 45620 50897 … … 45625 50902 #define init_mb(state) memset(&state, 0, sizeof(state)) 45626 50903 45627 @@ -718,12 +9 59,26 @@50904 @@ -718,12 +991,26 @@ 45628 50905 #define NulChar 0,0,0,0 /* FIXME: see CCHARW_MAX */ 45629 50906 #define CharOf(c) ((c).chars[0]) … … 45654 50931 NCURSES_CH_T *_cp = &ch; \ 45655 50932 memset(_cp, 0, sizeof(ch)); \ 45656 @@ -741,7 + 996,7 @@50933 @@ -741,7 +1028,7 @@ 45657 50934 #define PUTC(ch,b) do { if(!isWidecExt(ch)) { \ 45658 50935 if (Charable(ch)) { \ … … 45663 50940 PUTC_INIT; \ 45664 50941 for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) { \ 45665 @@ -757,11 +10 12,11 @@50942 @@ -757,11 +1044,11 @@ 45666 50943 } \ 45667 50944 fwrite(PUTC_buf, (unsigned) PUTC_n, 1, b); \ … … 45678 50955 45679 50956 /* 45680 @@ -887,6 +1142,12 @@ 50957 @@ -877,6 +1164,13 @@ 50958 #endif 50959 50960 /* 50961 + * Standardize/simplify common loops 50962 + */ 50963 +#define each_screen(p) p = _nc_screen_chain; p != 0; p = (p)->_next_screen 50964 +#define each_window(p) p = _nc_windows; p != 0; p = (p)->next 50965 +#define each_ripoff(p) p = ripoff_stack; (p - ripoff_stack) < N_RIPS; ++p 50966 + 50967 +/* 50968 * Prefixes for call/return points of library function traces. We use these to 50969 * instrument the public functions so that the traces can be easily transformed 50970 * into regression scripts. 50971 @@ -887,6 +1181,12 @@ 45681 50972 45682 50973 #ifdef TRACE … … 45691 50982 if ((_nc_tracing & TRACE_MAXIMUM) == 0) { \ 45692 50983 int t = _nc_getenv_num("NCURSES_TRACE"); \ 45693 @@ -894,9 +11 55,21 @@50984 @@ -894,9 +1194,21 @@ 45694 50985 trace((unsigned) t); \ 45695 50986 } … … 45715 51006 45716 51007 #define returnAttr(code) TRACE_RETURN(code,attr_t) 45717 @@ -927,8 +1200,19 @@ 51008 @@ -926,9 +1238,20 @@ 51009 extern NCURSES_EXPORT(int) _nc_retrace_int (int); 45718 51010 extern NCURSES_EXPORT(unsigned) _nc_retrace_unsigned (unsigned); 45719 51011 extern NCURSES_EXPORT(void *) _nc_retrace_void_ptr (void *); 45720 extern NCURSES_EXPORT(void) _nc_fifo_dump (void); 51012 -extern NCURSES_EXPORT(void) _nc_fifo_dump (void); 51013 +extern NCURSES_EXPORT(void) _nc_fifo_dump (SCREEN *); 45721 51014 + 45722 51015 +#if USE_REENTRANT … … 45735 51028 45736 51029 #if USE_WIDEC_SUPPORT 45737 @@ -1083,6 +1 367,21 @@51030 @@ -1083,6 +1406,21 @@ 45738 51031 extern NCURSES_EXPORT(wint_t) _nc_to_widechar(int); 45739 51032 #endif … … 45757 51050 #if USE_XMC_SUPPORT 45758 51051 extern NCURSES_EXPORT(void) _nc_do_xmc_glitch (attr_t); 45759 @@ -1141, 6 +1440,7@@51052 @@ -1141,14 +1479,18 @@ 45760 51053 extern NCURSES_EXPORT(int) _nc_unicode_locale(void); 45761 51054 extern NCURSES_EXPORT(int) _nc_locale_breaks_acs(void); 45762 51055 extern NCURSES_EXPORT(int) _nc_setupterm(NCURSES_CONST char *, int, int *, bool); 45763 +extern NCURSES_EXPORT(void) _nc_get_screensize( int *, int *);51056 +extern NCURSES_EXPORT(void) _nc_get_screensize(SCREEN *, int *, int *); 45764 51057 45765 51058 /* lib_tstp.c */ 45766 51059 #if USE_SIGWINCH 45767 @@ -1177,10 +1477,10 @@ 51060 -extern NCURSES_EXPORT(int) _nc_handle_sigwinch(int); 51061 +extern NCURSES_EXPORT(int) _nc_handle_sigwinch(SCREEN *); 51062 #else 51063 #define _nc_handle_sigwinch(a) /* nothing */ 51064 #endif 51065 51066 +/* lib_ungetch.c */ 51067 +extern NCURSES_EXPORT(int) _nc_ungetch (SCREEN *, int); 51068 + 51069 /* lib_wacs.c */ 51070 #if USE_WIDEC_SUPPORT 51071 extern NCURSES_EXPORT(void) _nc_init_wacs(void); 51072 @@ -1177,32 +1519,37 @@ 45768 51073 extern NCURSES_EXPORT(char *) _nc_printf_string (const char *, va_list); 45769 51074 … … 45779 51084 45780 51085 /* elsewhere ... */ 45781 extern NCURSES_EXPORT(ENTRY *) _nc_delink_entry(ENTRY *, TERMTYPE *); 45782 @@ -1210,13 +1510,16 @@ 51086 -extern NCURSES_EXPORT(ENTRY *) _nc_delink_entry(ENTRY *, TERMTYPE *); 51087 +extern NCURSES_EXPORT(ENTRY *) _nc_delink_entry (ENTRY *, TERMTYPE *); 51088 +extern NCURSES_EXPORT(NCURSES_CONST char *) _nc_keyname (SCREEN *, int); 51089 +extern NCURSES_EXPORT(NCURSES_CONST char *) _nc_unctrl (SCREEN *, chtype); 51090 +extern NCURSES_EXPORT(SCREEN *) _nc_screen_of (WINDOW *); 51091 extern NCURSES_EXPORT(WINDOW *) _nc_makenew (int, int, int, int, int); 51092 extern NCURSES_EXPORT(char *) _nc_trace_buf (int, size_t); 51093 extern NCURSES_EXPORT(char *) _nc_trace_bufcat (int, const char *); 51094 +extern NCURSES_EXPORT(char *) _nc_tracechar (SCREEN *, int); 51095 +extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *); 51096 extern NCURSES_EXPORT(int) _nc_access (const char *, int); 51097 extern NCURSES_EXPORT(int) _nc_baudrate (int); 51098 extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *); 51099 extern NCURSES_EXPORT(int) _nc_getenv_num (const char *); 51100 -extern NCURSES_EXPORT(int) _nc_keypad (bool); 51101 +extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, bool); 51102 extern NCURSES_EXPORT(int) _nc_ospeed (int); 51103 extern NCURSES_EXPORT(int) _nc_outch (int); 51104 extern NCURSES_EXPORT(int) _nc_read_termcap_entry (const char *const, TERMTYPE *const); 51105 extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, bool, int); 51106 -extern NCURSES_EXPORT(int) _nc_timed_wait(int, int, int * EVENTLIST_2nd(_nc_eventlist *)); 51107 +extern NCURSES_EXPORT(int) _nc_timed_wait (SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *)); 51108 extern NCURSES_EXPORT(void) _nc_do_color (short, short, bool, int (*)(int)); 51109 extern NCURSES_EXPORT(void) _nc_flush (void); 51110 -extern NCURSES_EXPORT(void) _nc_free_entry(ENTRY *, TERMTYPE *); 51111 +extern NCURSES_EXPORT(void) _nc_free_entry (ENTRY *, TERMTYPE *); 51112 extern NCURSES_EXPORT(void) _nc_freeall (void); 51113 extern NCURSES_EXPORT(void) _nc_hash_map (void); 51114 -extern NCURSES_EXPORT(void) _nc_init_keytry (void); 51115 +extern NCURSES_EXPORT(void) _nc_init_keytry (SCREEN *); 51116 extern NCURSES_EXPORT(void) _nc_keep_tic_dir (const char *); 51117 extern NCURSES_EXPORT(void) _nc_make_oldhash (int i); 51118 extern NCURSES_EXPORT(void) _nc_scroll_oldhash (int n, int top, int bot); 51119 @@ -1210,13 +1557,16 @@ 45783 51120 extern NCURSES_EXPORT(void) _nc_set_buffer (FILE *, bool); 45784 51121 extern NCURSES_EXPORT(void) _nc_signal_handler (bool); … … 45798 51135 #endif 45799 51136 45800 @@ -1227,1 1 +1530,7@@51137 @@ -1227,15 +1577,11 @@ 45801 51138 #endif 45802 51139 … … 45810 51147 45811 51148 #if USE_SIZECHANGE 51149 -extern NCURSES_EXPORT(void) _nc_update_screensize (void); 51150 +extern NCURSES_EXPORT(void) _nc_update_screensize (SCREEN *); 51151 #endif 51152 51153 #if HAVE_RESIZETERM 51154 @@ -1291,7 +1637,6 @@ 51155 #define screen_lines SP->_lines 51156 #define screen_columns SP->_columns 51157 51158 -extern NCURSES_EXPORT_VAR(int) _nc_slk_format; /* != 0 if slk_init() called */ 51159 extern NCURSES_EXPORT(int) _nc_slk_initialize (WINDOW *, int); 51160 51161 /* 51162 diff -Naur ncurses-5.6.orig/ncurses/fifo_defs.h ncurses-5.6/ncurses/fifo_defs.h 51163 --- ncurses-5.6.orig/ncurses/fifo_defs.h 2002-03-16 15:47:50.000000000 -0500 51164 +++ ncurses-5.6/ncurses/fifo_defs.h 2008-06-18 06:49:50.000000000 -0400 51165 @@ -34,21 +34,21 @@ 51166 /* 51167 * Common macros for lib_getch.c, lib_ungetch.c 51168 * 51169 - * $Id: fifo_defs.h,v 1.4 2002/03/16 20:47:50 tom Exp $ 51170 + * $Id: fifo_defs.h,v 1.5 2008/05/03 20:08:16 tom Exp $ 51171 */ 51172 51173 #ifndef FIFO_DEFS_H 51174 #define FIFO_DEFS_H 1 51175 51176 -#define head SP->_fifohead 51177 -#define tail SP->_fifotail 51178 +#define head sp->_fifohead 51179 +#define tail sp->_fifotail 51180 /* peek points to next uninterpreted character */ 51181 -#define peek SP->_fifopeek 51182 +#define peek sp->_fifopeek 51183 51184 #define h_inc() { head == FIFO_SIZE-1 ? head = 0 : head++; if (head == tail) head = -1, tail = 0;} 51185 #define h_dec() { head == 0 ? head = FIFO_SIZE-1 : head--; if (head == tail) tail = -1;} 51186 #define t_inc() { tail == FIFO_SIZE-1 ? tail = 0 : tail++; if (tail == head) tail = -1;} 51187 -#define t_dec() { tail == 0 ? tail = FIFO_SIZE-1 : tail--; if (head == tail) fifo_clear();} 51188 +#define t_dec() { tail == 0 ? tail = FIFO_SIZE-1 : tail--; if (head == tail) fifo_clear(sp);} 51189 #define p_inc() { peek == FIFO_SIZE-1 ? peek = 0 : peek++;} 51190 51191 #define cooked_key_in_fifo() ((head != -1) && (peek != head)) 45812 51192 diff -Naur ncurses-5.6.orig/ncurses/llib-lncurses ncurses-5.6/ncurses/llib-lncurses 45813 51193 --- ncurses-5.6.orig/ncurses/llib-lncurses 2006-10-28 18:20:51.000000000 -0400 45814 +++ ncurses-5.6/ncurses/llib-lncurses 200 7-12-21 00:02:36.000000000 -050051194 +++ ncurses-5.6/ncurses/llib-lncurses 2008-06-18 06:49:44.000000000 -0400 45815 51195 @@ -1,5 +1,5 @@ 45816 51196 /**************************************************************************** … … 46514 51894 46515 51895 #undef _nc_set_writedir 51896 diff -Naur ncurses-5.6.orig/ncurses/llib-lncursest ncurses-5.6/ncurses/llib-lncursest 51897 --- ncurses-5.6.orig/ncurses/llib-lncursest 1969-12-31 19:00:00.000000000 -0500 51898 +++ ncurses-5.6/ncurses/llib-lncursest 2008-06-18 06:49:51.000000000 -0400 51899 @@ -0,0 +1,3562 @@ 51900 +/**************************************************************************** 51901 + * Copyright (c) 2008 Free Software Foundation, Inc. * 51902 + * * 51903 + * Permission is hereby granted, free of charge, to any person obtaining a * 51904 + * copy of this software and associated documentation files (the * 51905 + * "Software"), to deal in the Software without restriction, including * 51906 + * without limitation the rights to use, copy, modify, merge, publish, * 51907 + * distribute, distribute with modifications, sublicense, and/or sell * 51908 + * copies of the Software, and to permit persons to whom the Software is * 51909 + * furnished to do so, subject to the following conditions: * 51910 + * * 51911 + * The above copyright notice and this permission notice shall be included * 51912 + * in all copies or substantial portions of the Software. * 51913 + * * 51914 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * 51915 + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * 51916 + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * 51917 + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * 51918 + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * 51919 + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * 51920 + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * 51921 + * * 51922 + * Except as contained in this notice, the name(s) of the above copyright * 51923 + * holders shall not be used in advertising or otherwise to promote the * 51924 + * sale, use or other dealings in this Software without prior written * 51925 + * authorization. * 51926 + ****************************************************************************/ 51927 + 51928 +/**************************************************************************** 51929 + * Author: Thomas E. Dickey 2008 * 51930 + ****************************************************************************/ 51931 +/* LINTLIBRARY */ 51932 + 51933 +/* ./tty/hardscroll.c */ 51934 + 51935 +#include <curses.priv.h> 51936 + 51937 +#undef _nc_oldnums 51938 +int *_nc_oldnums; 51939 + 51940 +#undef _nc_scroll_optimize 51941 +void _nc_scroll_optimize(void) 51942 + { /* void */ } 51943 + 51944 +#undef _nc_linedump 51945 +void _nc_linedump(void) 51946 + { /* void */ } 51947 + 51948 +/* ./tty/hashmap.c */ 51949 + 51950 +#include <term.h> 51951 + 51952 +#undef _nc_hash_map 51953 +void _nc_hash_map(void) 51954 + { /* void */ } 51955 + 51956 +#undef _nc_make_oldhash 51957 +void _nc_make_oldhash( 51958 + int i) 51959 + { /* void */ } 51960 + 51961 +#undef _nc_scroll_oldhash 51962 +void _nc_scroll_oldhash( 51963 + int n, 51964 + int top, 51965 + int bot) 51966 + { /* void */ } 51967 + 51968 +/* ./base/lib_addch.c */ 51969 + 51970 +#include <ctype.h> 51971 + 51972 +#undef _nc_render 51973 +chtype _nc_render( 51974 + WINDOW *win, 51975 + chtype ch) 51976 + { return(*(chtype *)0); } 51977 + 51978 +#undef _nc_waddch_nosync 51979 +int _nc_waddch_nosync( 51980 + WINDOW *win, 51981 + const chtype c) 51982 + { return(*(int *)0); } 51983 + 51984 +#undef waddch 51985 +int waddch( 51986 + WINDOW *win, 51987 + const chtype ch) 51988 + { return(*(int *)0); } 51989 + 51990 +#undef wechochar 51991 +int wechochar( 51992 + WINDOW *win, 51993 + const chtype ch) 51994 + { return(*(int *)0); } 51995 + 51996 +/* ./base/lib_addstr.c */ 51997 + 51998 +#undef waddnstr 51999 +int waddnstr( 52000 + WINDOW *win, 52001 + const char *astr, 52002 + int n) 52003 + { return(*(int *)0); } 52004 + 52005 +#undef waddchnstr 52006 +int waddchnstr( 52007 + WINDOW *win, 52008 + const chtype *astr, 52009 + int n) 52010 + { return(*(int *)0); } 52011 + 52012 +/* ./base/lib_beep.c */ 52013 + 52014 +#undef beep 52015 +int beep(void) 52016 + { return(*(int *)0); } 52017 + 52018 +/* ./base/lib_bkgd.c */ 52019 + 52020 +#undef wbkgdset 52021 +void wbkgdset( 52022 + WINDOW *win, 52023 + chtype ch) 52024 + { /* void */ } 52025 + 52026 +#undef wbkgd 52027 +int wbkgd( 52028 + WINDOW *win, 52029 + chtype ch) 52030 + { return(*(int *)0); } 52031 + 52032 +/* ./base/lib_box.c */ 52033 + 52034 +#undef wborder 52035 +int wborder( 52036 + WINDOW *win, 52037 + chtype ls, 52038 + chtype rs, 52039 + chtype ts, 52040 + chtype bs, 52041 + chtype tl, 52042 + chtype tr, 52043 + chtype bl, 52044 + chtype br) 52045 + { return(*(int *)0); } 52046 + 52047 +/* ./base/lib_chgat.c */ 52048 + 52049 +#undef wchgat 52050 +int wchgat( 52051 + WINDOW *win, 52052 + int n, 52053 + attr_t attr, 52054 + short color, 52055 + const void *opts) 52056 + { return(*(int *)0); } 52057 + 52058 +/* ./base/lib_clear.c */ 52059 + 52060 +#undef wclear 52061 +int wclear( 52062 + WINDOW *win) 52063 + { return(*(int *)0); } 52064 + 52065 +/* ./base/lib_clearok.c */ 52066 + 52067 +#undef clearok 52068 +int clearok( 52069 + WINDOW *win, 52070 + NCURSES_BOOL flag) 52071 + { return(*(int *)0); } 52072 + 52073 +/* ./base/lib_clrbot.c */ 52074 + 52075 +#undef wclrtobot 52076 +int wclrtobot( 52077 + WINDOW *win) 52078 + { return(*(int *)0); } 52079 + 52080 +/* ./base/lib_clreol.c */ 52081 + 52082 +#undef wclrtoeol 52083 +int wclrtoeol( 52084 + WINDOW *win) 52085 + { return(*(int *)0); } 52086 + 52087 +/* ./base/lib_color.c */ 52088 + 52089 +#include <tic.h> 52090 + 52091 +#undef _nc_COLOR_PAIRS 52092 +int _nc_COLOR_PAIRS(void) 52093 + { return(*(int *)0); } 52094 + 52095 +#undef _nc_COLORS 52096 +int _nc_COLORS(void) 52097 + { return(*(int *)0); } 52098 + 52099 +#undef _nc_reset_colors 52100 +NCURSES_BOOL _nc_reset_colors(void) 52101 + { return(*(NCURSES_BOOL *)0); } 52102 + 52103 +#undef start_color 52104 +int start_color(void) 52105 + { return(*(int *)0); } 52106 + 52107 +#undef init_pair 52108 +int init_pair( 52109 + short pair, 52110 + short f, 52111 + short b) 52112 + { return(*(int *)0); } 52113 + 52114 +#undef init_color 52115 +int init_color( 52116 + short color, 52117 + short r, 52118 + short g, 52119 + short b) 52120 + { return(*(int *)0); } 52121 + 52122 +#undef can_change_color 52123 +NCURSES_BOOL can_change_color(void) 52124 + { return(*(NCURSES_BOOL *)0); } 52125 + 52126 +#undef has_colors 52127 +NCURSES_BOOL has_colors(void) 52128 + { return(*(NCURSES_BOOL *)0); } 52129 + 52130 +#undef color_content 52131 +int color_content( 52132 + short color, 52133 + short *r, 52134 + short *g, 52135 + short *b) 52136 + { return(*(int *)0); } 52137 + 52138 +#undef pair_content 52139 +int pair_content( 52140 + short pair, 52141 + short *f, 52142 + short *b) 52143 + { return(*(int *)0); } 52144 + 52145 +#undef _nc_do_color 52146 +void _nc_do_color( 52147 + short old_pair, 52148 + short pair, 52149 + NCURSES_BOOL reverse, 52150 + int (*outc)( 52151 + int p1)) 52152 + { /* void */ } 52153 + 52154 +/* ./base/lib_colorset.c */ 52155 + 52156 +#undef wcolor_set 52157 +int wcolor_set( 52158 + WINDOW *win, 52159 + short color_pair_number, 52160 + void *opts) 52161 + { return(*(int *)0); } 52162 + 52163 +/* ./base/lib_delch.c */ 52164 + 52165 +#undef wdelch 52166 +int wdelch( 52167 + WINDOW *win) 52168 + { return(*(int *)0); } 52169 + 52170 +/* ./base/lib_delwin.c */ 52171 + 52172 +#undef delwin 52173 +int delwin( 52174 + WINDOW *win) 52175 + { return(*(int *)0); } 52176 + 52177 +/* ./base/lib_echo.c */ 52178 + 52179 +#undef echo 52180 +int echo(void) 52181 + { return(*(int *)0); } 52182 + 52183 +#undef noecho 52184 +int noecho(void) 52185 + { return(*(int *)0); } 52186 + 52187 +/* ./base/lib_endwin.c */ 52188 + 52189 +#undef endwin 52190 +int endwin(void) 52191 + { return(*(int *)0); } 52192 + 52193 +/* ./base/lib_erase.c */ 52194 + 52195 +#undef werase 52196 +int werase( 52197 + WINDOW *win) 52198 + { return(*(int *)0); } 52199 + 52200 +/* ./base/lib_flash.c */ 52201 + 52202 +#undef flash 52203 +int flash(void) 52204 + { return(*(int *)0); } 52205 + 52206 +/* ./lib_gen.c */ 52207 + 52208 +#undef addch 52209 +int addch( 52210 + const chtype z) 52211 + { return(*(int *)0); } 52212 + 52213 +#undef addchnstr 52214 +int addchnstr( 52215 + const chtype *a1, 52216 + int z) 52217 + { return(*(int *)0); } 52218 + 52219 +#undef addchstr 52220 +int addchstr( 52221 + const chtype *z) 52222 + { return(*(int *)0); } 52223 + 52224 +#undef addnstr 52225 +int addnstr( 52226 + const char *a1, 52227 + int z) 52228 + { return(*(int *)0); } 52229 + 52230 +#undef addstr 52231 +int addstr( 52232 + const char *z) 52233 + { return(*(int *)0); } 52234 + 52235 +#undef attroff 52236 +int attroff( 52237 + NCURSES_ATTR_T z) 52238 + { return(*(int *)0); } 52239 + 52240 +#undef attron 52241 +int attron( 52242 + NCURSES_ATTR_T z) 52243 + { return(*(int *)0); } 52244 + 52245 +#undef attrset 52246 +int attrset( 52247 + NCURSES_ATTR_T z) 52248 + { return(*(int *)0); } 52249 + 52250 +#undef attr_get 52251 +int attr_get( 52252 + attr_t *a1, 52253 + short *a2, 52254 + void *z) 52255 + { return(*(int *)0); } 52256 + 52257 +#undef attr_off 52258 +int attr_off( 52259 + attr_t a1, 52260 + void *z) 52261 + { return(*(int *)0); } 52262 + 52263 +#undef attr_on 52264 +int attr_on( 52265 + attr_t a1, 52266 + void *z) 52267 + { return(*(int *)0); } 52268 + 52269 +#undef attr_set 52270 +int attr_set( 52271 + attr_t a1, 52272 + short a2, 52273 + void *z) 52274 + { return(*(int *)0); } 52275 + 52276 +#undef bkgd 52277 +int bkgd( 52278 + chtype z) 52279 + { return(*(int *)0); } 52280 + 52281 +#undef bkgdset 52282 +void bkgdset( 52283 + chtype z) 52284 + { /* void */ } 52285 + 52286 +#undef border 52287 +int border( 52288 + chtype a1, 52289 + chtype a2, 52290 + chtype a3, 52291 + chtype a4, 52292 + chtype a5, 52293 + chtype a6, 52294 + chtype a7, 52295 + chtype z) 52296 + { return(*(int *)0); } 52297 + 52298 +#undef box 52299 +int box( 52300 + WINDOW *a1, 52301 + chtype a2, 52302 + chtype z) 52303 + { return(*(int *)0); } 52304 + 52305 +#undef chgat 52306 +int chgat( 52307 + int a1, 52308 + attr_t a2, 52309 + short a3, 52310 + const void *z) 52311 + { return(*(int *)0); } 52312 + 52313 +#undef clear 52314 +int clear(void) 52315 + { return(*(int *)0); } 52316 + 52317 +#undef clrtobot 52318 +int clrtobot(void) 52319 + { return(*(int *)0); } 52320 + 52321 +#undef clrtoeol 52322 +int clrtoeol(void) 52323 + { return(*(int *)0); } 52324 + 52325 +#undef color_set 52326 +int color_set( 52327 + short a1, 52328 + void *z) 52329 + { return(*(int *)0); } 52330 + 52331 +#undef COLOR_PAIR 52332 +int COLOR_PAIR( 52333 + int z) 52334 + { return(*(int *)0); } 52335 + 52336 +#undef delch 52337 +int delch(void) 52338 + { return(*(int *)0); } 52339 + 52340 +#undef deleteln 52341 +int deleteln(void) 52342 + { return(*(int *)0); } 52343 + 52344 +#undef echochar 52345 +int echochar( 52346 + const chtype z) 52347 + { return(*(int *)0); } 52348 + 52349 +#undef erase 52350 +int erase(void) 52351 + { return(*(int *)0); } 52352 + 52353 +#undef getbkgd 52354 +chtype getbkgd( 52355 + WINDOW *z) 52356 + { return(*(chtype *)0); } 52357 + 52358 +#undef getch 52359 +int getch(void) 52360 + { return(*(int *)0); } 52361 + 52362 +#undef getnstr 52363 +int getnstr( 52364 + char *a1, 52365 + int z) 52366 + { return(*(int *)0); } 52367 + 52368 +#undef getstr 52369 +int getstr( 52370 + char *z) 52371 + { return(*(int *)0); } 52372 + 52373 +#undef hline 52374 +int hline( 52375 + chtype a1, 52376 + int z) 52377 + { return(*(int *)0); } 52378 + 52379 +#undef inch 52380 +chtype inch(void) 52381 + { return(*(chtype *)0); } 52382 + 52383 +#undef inchnstr 52384 +int inchnstr( 52385 + chtype *a1, 52386 + int z) 52387 + { return(*(int *)0); } 52388 + 52389 +#undef inchstr 52390 +int inchstr( 52391 + chtype *z) 52392 + { return(*(int *)0); } 52393 + 52394 +#undef innstr 52395 +int innstr( 52396 + char *a1, 52397 + int z) 52398 + { return(*(int *)0); } 52399 + 52400 +#undef insch 52401 +int insch( 52402 + chtype z) 52403 + { return(*(int *)0); } 52404 + 52405 +#undef insdelln 52406 +int insdelln( 52407 + int z) 52408 + { return(*(int *)0); } 52409 + 52410 +#undef insertln 52411 +int insertln(void) 52412 + { return(*(int *)0); } 52413 + 52414 +#undef insnstr 52415 +int insnstr( 52416 + const char *a1, 52417 + int z) 52418 + { return(*(int *)0); } 52419 + 52420 +#undef insstr 52421 +int insstr( 52422 + const char *z) 52423 + { return(*(int *)0); } 52424 + 52425 +#undef instr 52426 +int instr( 52427 + char *z) 52428 + { return(*(int *)0); } 52429 + 52430 +#undef move 52431 +int move( 52432 + int a1, 52433 + int z) 52434 + { return(*(int *)0); } 52435 + 52436 +#undef mvaddch 52437 +int mvaddch( 52438 + int a1, 52439 + int a2, 52440 + const chtype z) 52441 + { return(*(int *)0); } 52442 + 52443 +#undef mvaddchnstr 52444 +int mvaddchnstr( 52445 + int a1, 52446 + int a2, 52447 + const chtype *a3, 52448 + int z) 52449 + { return(*(int *)0); } 52450 + 52451 +#undef mvaddchstr 52452 +int mvaddchstr( 52453 + int a1, 52454 + int a2, 52455 + const chtype *z) 52456 + { return(*(int *)0); } 52457 + 52458 +#undef mvaddnstr 52459 +int mvaddnstr( 52460 + int a1, 52461 + int a2, 52462 + const char *a3, 52463 + int z) 52464 + { return(*(int *)0); } 52465 + 52466 +#undef mvaddstr 52467 +int mvaddstr( 52468 + int a1, 52469 + int a2, 52470 + const char *z) 52471 + { return(*(int *)0); } 52472 + 52473 +#undef mvchgat 52474 +int mvchgat( 52475 + int a1, 52476 + int a2, 52477 + int a3, 52478 + attr_t a4, 52479 + short a5, 52480 + const void *z) 52481 + { return(*(int *)0); } 52482 + 52483 +#undef mvdelch 52484 +int mvdelch( 52485 + int a1, 52486 + int z) 52487 + { return(*(int *)0); } 52488 + 52489 +#undef mvgetch 52490 +int mvgetch( 52491 + int a1, 52492 + int z) 52493 + { return(*(int *)0); } 52494 + 52495 +#undef mvgetnstr 52496 +int mvgetnstr( 52497 + int a1, 52498 + int a2, 52499 + char *a3, 52500 + int z) 52501 + { return(*(int *)0); } 52502 + 52503 +#undef mvgetstr 52504 +int mvgetstr( 52505 + int a1, 52506 + int a2, 52507 + char *z) 52508 + { return(*(int *)0); } 52509 + 52510 +#undef mvhline 52511 +int mvhline( 52512 + int a1, 52513 + int a2, 52514 + chtype a3, 52515 + int z) 52516 + { return(*(int *)0); } 52517 + 52518 +#undef mvinch 52519 +chtype mvinch( 52520 + int a1, 52521 + int z) 52522 + { return(*(chtype *)0); } 52523 + 52524 +#undef mvinchnstr 52525 +int mvinchnstr( 52526 + int a1, 52527 + int a2, 52528 + chtype *a3, 52529 + int z) 52530 + { return(*(int *)0); } 52531 + 52532 +#undef mvinchstr 52533 +int mvinchstr( 52534 + int a1, 52535 + int a2, 52536 + chtype *z) 52537 + { return(*(int *)0); } 52538 + 52539 +#undef mvinnstr 52540 +int mvinnstr( 52541 + int a1, 52542 + int a2, 52543 + char *a3, 52544 + int z) 52545 + { return(*(int *)0); } 52546 + 52547 +#undef mvinsch 52548 +int mvinsch( 52549 + int a1, 52550 + int a2, 52551 + chtype z) 52552 + { return(*(int *)0); } 52553 + 52554 +#undef mvinsnstr 52555 +int mvinsnstr( 52556 + int a1, 52557 + int a2, 52558 + const char *a3, 52559 + int z) 52560 + { return(*(int *)0); } 52561 + 52562 +#undef mvinsstr 52563 +int mvinsstr( 52564 + int a1, 52565 + int a2, 52566 + const char *z) 52567 + { return(*(int *)0); } 52568 + 52569 +#undef mvinstr 52570 +int mvinstr( 52571 + int a1, 52572 + int a2, 52573 + char *z) 52574 + { return(*(int *)0); } 52575 + 52576 +#undef mvvline 52577 +int mvvline( 52578 + int a1, 52579 + int a2, 52580 + chtype a3, 52581 + int z) 52582 + { return(*(int *)0); } 52583 + 52584 +#undef mvwaddch 52585 +int mvwaddch( 52586 + WINDOW *a1, 52587 + int a2, 52588 + int a3, 52589 + const chtype z) 52590 + { return(*(int *)0); } 52591 + 52592 +#undef mvwaddchnstr 52593 +int mvwaddchnstr( 52594 + WINDOW *a1, 52595 + int a2, 52596 + int a3, 52597 + const chtype *a4, 52598 + int z) 52599 + { return(*(int *)0); } 52600 + 52601 +#undef mvwaddchstr 52602 +int mvwaddchstr( 52603 + WINDOW *a1, 52604 + int a2, 52605 + int a3, 52606 + const chtype *z) 52607 + { return(*(int *)0); } 52608 + 52609 +#undef mvwaddnstr 52610 +int mvwaddnstr( 52611 + WINDOW *a1, 52612 + int a2, 52613 + int a3, 52614 + const char *a4, 52615 + int z) 52616 + { return(*(int *)0); } 52617 + 52618 +#undef mvwaddstr 52619 +int mvwaddstr( 52620 + WINDOW *a1, 52621 + int a2, 52622 + int a3, 52623 + const char *z) 52624 + { return(*(int *)0); } 52625 + 52626 +#undef mvwchgat 52627 +int mvwchgat( 52628 + WINDOW *a1, 52629 + int a2, 52630 + int a3, 52631 + int a4, 52632 + attr_t a5, 52633 + short a6, 52634 + const void *z) 52635 + { return(*(int *)0); } 52636 + 52637 +#undef mvwdelch 52638 +int mvwdelch( 52639 + WINDOW *a1, 52640 + int a2, 52641 + int z) 52642 + { return(*(int *)0); } 52643 + 52644 +#undef mvwgetch 52645 +int mvwgetch( 52646 + WINDOW *a1, 52647 + int a2, 52648 + int z) 52649 + { return(*(int *)0); } 52650 + 52651 +#undef mvwgetnstr 52652 +int mvwgetnstr( 52653 + WINDOW *a1, 52654 + int a2, 52655 + int a3, 52656 + char *a4, 52657 + int z) 52658 + { return(*(int *)0); } 52659 + 52660 +#undef mvwgetstr 52661 +int mvwgetstr( 52662 + WINDOW *a1, 52663 + int a2, 52664 + int a3, 52665 + char *z) 52666 + { return(*(int *)0); } 52667 + 52668 +#undef mvwhline 52669 +int mvwhline( 52670 + WINDOW *a1, 52671 + int a2, 52672 + int a3, 52673 + chtype a4, 52674 + int z) 52675 + { return(*(int *)0); } 52676 + 52677 +#undef mvwinch 52678 +chtype mvwinch( 52679 + WINDOW *a1, 52680 + int a2, 52681 + int z) 52682 + { return(*(chtype *)0); } 52683 + 52684 +#undef mvwinchnstr 52685 +int mvwinchnstr( 52686 + WINDOW *a1, 52687 + int a2, 52688 + int a3, 52689 + chtype *a4, 52690 + int z) 52691 + { return(*(int *)0); } 52692 + 52693 +#undef mvwinchstr 52694 +int mvwinchstr( 52695 + WINDOW *a1, 52696 + int a2, 52697 + int a3, 52698 + chtype *z) 52699 + { return(*(int *)0); } 52700 + 52701 +#undef mvwinnstr 52702 +int mvwinnstr( 52703 + WINDOW *a1, 52704 + int a2, 52705 + int a3, 52706 + char *a4, 52707 + int z) 52708 + { return(*(int *)0); } 52709 + 52710 +#undef mvwinsch 52711 +int mvwinsch( 52712 + WINDOW *a1, 52713 + int a2, 52714 + int a3, 52715 + chtype z) 52716 + { return(*(int *)0); } 52717 + 52718 +#undef mvwinsnstr 52719 +int mvwinsnstr( 52720 + WINDOW *a1, 52721 + int a2, 52722 + int a3, 52723 + const char *a4, 52724 + int z) 52725 + { return(*(int *)0); } 52726 + 52727 +#undef mvwinsstr 52728 +int mvwinsstr( 52729 + WINDOW *a1, 52730 + int a2, 52731 + int a3, 52732 + const char *z) 52733 + { return(*(int *)0); } 52734 + 52735 +#undef mvwinstr 52736 +int mvwinstr( 52737 + WINDOW *a1, 52738 + int a2, 52739 + int a3, 52740 + char *z) 52741 + { return(*(int *)0); } 52742 + 52743 +#undef mvwvline 52744 +int mvwvline( 52745 + WINDOW *a1, 52746 + int a2, 52747 + int a3, 52748 + chtype a4, 52749 + int z) 52750 + { return(*(int *)0); } 52751 + 52752 +#undef PAIR_NUMBER 52753 +int PAIR_NUMBER( 52754 + int z) 52755 + { return(*(int *)0); } 52756 + 52757 +#undef redrawwin 52758 +int redrawwin( 52759 + WINDOW *z) 52760 + { return(*(int *)0); } 52761 + 52762 +#undef refresh 52763 +int refresh(void) 52764 + { return(*(int *)0); } 52765 + 52766 +#undef scrl 52767 +int scrl( 52768 + int z) 52769 + { return(*(int *)0); } 52770 + 52771 +#undef scroll 52772 +int scroll( 52773 + WINDOW *z) 52774 + { return(*(int *)0); } 52775 + 52776 +#undef setscrreg 52777 +int setscrreg( 52778 + int a1, 52779 + int z) 52780 + { return(*(int *)0); } 52781 + 52782 +#undef standout 52783 +int standout(void) 52784 + { return(*(int *)0); } 52785 + 52786 +#undef standend 52787 +int standend(void) 52788 + { return(*(int *)0); } 52789 + 52790 +#undef timeout 52791 +void timeout( 52792 + int z) 52793 + { /* void */ } 52794 + 52795 +#undef touchline 52796 +int touchline( 52797 + WINDOW *a1, 52798 + int a2, 52799 + int z) 52800 + { return(*(int *)0); } 52801 + 52802 +#undef touchwin 52803 +int touchwin( 52804 + WINDOW *z) 52805 + { return(*(int *)0); } 52806 + 52807 +#undef untouchwin 52808 +int untouchwin( 52809 + WINDOW *z) 52810 + { return(*(int *)0); } 52811 + 52812 +#undef vline 52813 +int vline( 52814 + chtype a1, 52815 + int z) 52816 + { return(*(int *)0); } 52817 + 52818 +#undef vw_printw 52819 +int vw_printw( 52820 + WINDOW *a1, 52821 + const char *a2, 52822 + va_list z) 52823 + { return(*(int *)0); } 52824 + 52825 +#undef vw_scanw 52826 +int vw_scanw( 52827 + WINDOW *a1, 52828 + const char *a2, 52829 + va_list z) 52830 + { return(*(int *)0); } 52831 + 52832 +#undef waddchstr 52833 +int waddchstr( 52834 + WINDOW *a1, 52835 + const chtype *z) 52836 + { return(*(int *)0); } 52837 + 52838 +#undef waddstr 52839 +int waddstr( 52840 + WINDOW *a1, 52841 + const char *z) 52842 + { return(*(int *)0); } 52843 + 52844 +#undef wattron 52845 +int wattron( 52846 + WINDOW *a1, 52847 + int z) 52848 + { return(*(int *)0); } 52849 + 52850 +#undef wattroff 52851 +int wattroff( 52852 + WINDOW *a1, 52853 + int z) 52854 + { return(*(int *)0); } 52855 + 52856 +#undef wattrset 52857 +int wattrset( 52858 + WINDOW *a1, 52859 + int z) 52860 + { return(*(int *)0); } 52861 + 52862 +#undef wattr_get 52863 +int wattr_get( 52864 + WINDOW *a1, 52865 + attr_t *a2, 52866 + short *a3, 52867 + void *z) 52868 + { return(*(int *)0); } 52869 + 52870 +#undef wattr_set 52871 +int wattr_set( 52872 + WINDOW *a1, 52873 + attr_t a2, 52874 + short a3, 52875 + void *z) 52876 + { return(*(int *)0); } 52877 + 52878 +#undef wdeleteln 52879 +int wdeleteln( 52880 + WINDOW *z) 52881 + { return(*(int *)0); } 52882 + 52883 +#undef wgetstr 52884 +int wgetstr( 52885 + WINDOW *a1, 52886 + char *z) 52887 + { return(*(int *)0); } 52888 + 52889 +#undef winchstr 52890 +int winchstr( 52891 + WINDOW *a1, 52892 + chtype *z) 52893 + { return(*(int *)0); } 52894 + 52895 +#undef winsertln 52896 +int winsertln( 52897 + WINDOW *z) 52898 + { return(*(int *)0); } 52899 + 52900 +#undef winsstr 52901 +int winsstr( 52902 + WINDOW *a1, 52903 + const char *z) 52904 + { return(*(int *)0); } 52905 + 52906 +#undef winstr 52907 +int winstr( 52908 + WINDOW *a1, 52909 + char *z) 52910 + { return(*(int *)0); } 52911 + 52912 +#undef wstandout 52913 +int wstandout( 52914 + WINDOW *z) 52915 + { return(*(int *)0); } 52916 + 52917 +#undef wstandend 52918 +int wstandend( 52919 + WINDOW *z) 52920 + { return(*(int *)0); } 52921 + 52922 +#undef getattrs 52923 +int getattrs( 52924 + const WINDOW *z) 52925 + { return(*(int *)0); } 52926 + 52927 +#undef getcurx 52928 +int getcurx( 52929 + const WINDOW *z) 52930 + { return(*(int *)0); } 52931 + 52932 +#undef getcury 52933 +int getcury( 52934 + const WINDOW *z) 52935 + { return(*(int *)0); } 52936 + 52937 +#undef getbegx 52938 +int getbegx( 52939 + const WINDOW *z) 52940 + { return(*(int *)0); } 52941 + 52942 +#undef getbegy 52943 +int getbegy( 52944 + const WINDOW *z) 52945 + { return(*(int *)0); } 52946 + 52947 +#undef getmaxx 52948 +int getmaxx( 52949 + const WINDOW *z) 52950 + { return(*(int *)0); } 52951 + 52952 +#undef getmaxy 52953 +int getmaxy( 52954 + const WINDOW *z) 52955 + { return(*(int *)0); } 52956 + 52957 +#undef getparx 52958 +int getparx( 52959 + const WINDOW *z) 52960 + { return(*(int *)0); } 52961 + 52962 +#undef getpary 52963 +int getpary( 52964 + const WINDOW *z) 52965 + { return(*(int *)0); } 52966 + 52967 +#undef wgetparent 52968 +WINDOW *wgetparent( 52969 + const WINDOW *z) 52970 + { return(*(WINDOW **)0); } 52971 + 52972 +#undef is_cleared 52973 +NCURSES_BOOL is_cleared( 52974 + const WINDOW *z) 52975 + { return(*(NCURSES_BOOL *)0); } 52976 + 52977 +#undef is_idcok 52978 +NCURSES_BOOL is_idcok( 52979 + const WINDOW *z) 52980 + { return(*(NCURSES_BOOL *)0); } 52981 + 52982 +#undef is_idlok 52983 +NCURSES_BOOL is_idlok( 52984 + const WINDOW *z) 52985 + { return(*(NCURSES_BOOL *)0); } 52986 + 52987 +#undef is_immedok 52988 +NCURSES_BOOL is_immedok( 52989 + const WINDOW *z) 52990 + { return(*(NCURSES_BOOL *)0); } 52991 + 52992 +#undef is_keypad 52993 +NCURSES_BOOL is_keypad( 52994 + const WINDOW *z) 52995 + { return(*(NCURSES_BOOL *)0); } 52996 + 52997 +#undef is_leaveok 52998 +NCURSES_BOOL is_leaveok( 52999 + const WINDOW *z) 53000 + { return(*(NCURSES_BOOL *)0); } 53001 + 53002 +#undef is_nodelay 53003 +NCURSES_BOOL is_nodelay( 53004 + const WINDOW *z) 53005 + { return(*(NCURSES_BOOL *)0); } 53006 + 53007 +#undef is_notimeout 53008 +NCURSES_BOOL is_notimeout( 53009 + const WINDOW *z) 53010 + { return(*(NCURSES_BOOL *)0); } 53011 + 53012 +#undef is_scrollok 53013 +NCURSES_BOOL is_scrollok( 53014 + const WINDOW *z) 53015 + { return(*(NCURSES_BOOL *)0); } 53016 + 53017 +#undef is_syncok 53018 +NCURSES_BOOL is_syncok( 53019 + const WINDOW *z) 53020 + { return(*(NCURSES_BOOL *)0); } 53021 + 53022 +#undef wgetscrreg 53023 +int wgetscrreg( 53024 + const WINDOW *a1, 53025 + int *a2, 53026 + int *z) 53027 + { return(*(int *)0); } 53028 + 53029 +#undef mouse_trafo 53030 +NCURSES_BOOL mouse_trafo( 53031 + int *a1, 53032 + int *a2, 53033 + NCURSES_BOOL z) 53034 + { return(*(NCURSES_BOOL *)0); } 53035 + 53036 +/* ./base/lib_getch.c */ 53037 + 53038 +#include <fifo_defs.h> 53039 + 53040 +#undef _nc_ESCDELAY 53041 +int _nc_ESCDELAY(void) 53042 + { return(*(int *)0); } 53043 + 53044 +#undef set_escdelay 53045 +int set_escdelay( 53046 + int value) 53047 + { return(*(int *)0); } 53048 + 53049 +#undef _nc_wgetch 53050 +int _nc_wgetch( 53051 + WINDOW *win, 53052 + unsigned long *result, 53053 + int use_meta, 53054 + _nc_eventlist *evl) 53055 + { return(*(int *)0); } 53056 + 53057 +#undef wgetch_events 53058 +int wgetch_events( 53059 + WINDOW *win, 53060 + _nc_eventlist *evl) 53061 + { return(*(int *)0); } 53062 + 53063 +#undef wgetch 53064 +int wgetch( 53065 + WINDOW *win) 53066 + { return(*(int *)0); } 53067 + 53068 +/* ./base/lib_getstr.c */ 53069 + 53070 +#undef wgetnstr_events 53071 +int wgetnstr_events( 53072 + WINDOW *win, 53073 + char *str, 53074 + int maxlen, 53075 + _nc_eventlist *evl) 53076 + { return(*(int *)0); } 53077 + 53078 +#undef wgetnstr 53079 +int wgetnstr( 53080 + WINDOW *win, 53081 + char *str, 53082 + int maxlen) 53083 + { return(*(int *)0); } 53084 + 53085 +/* ./base/lib_hline.c */ 53086 + 53087 +#undef whline 53088 +int whline( 53089 + WINDOW *win, 53090 + chtype ch, 53091 + int n) 53092 + { return(*(int *)0); } 53093 + 53094 +/* ./base/lib_immedok.c */ 53095 + 53096 +#undef immedok 53097 +void immedok( 53098 + WINDOW *win, 53099 + NCURSES_BOOL flag) 53100 + { /* void */ } 53101 + 53102 +/* ./base/lib_inchstr.c */ 53103 + 53104 +#undef winchnstr 53105 +int winchnstr( 53106 + WINDOW *win, 53107 + chtype *str, 53108 + int n) 53109 + { return(*(int *)0); } 53110 + 53111 +/* ./base/lib_initscr.c */ 53112 + 53113 +#undef initscr 53114 +WINDOW *initscr(void) 53115 + { return(*(WINDOW **)0); } 53116 + 53117 +/* ./base/lib_insch.c */ 53118 + 53119 +#undef _nc_insert_ch 53120 +int _nc_insert_ch( 53121 + WINDOW *win, 53122 + chtype ch) 53123 + { return(*(int *)0); } 53124 + 53125 +#undef winsch 53126 +int winsch( 53127 + WINDOW *win, 53128 + chtype c) 53129 + { return(*(int *)0); } 53130 + 53131 +/* ./base/lib_insdel.c */ 53132 + 53133 +#undef winsdelln 53134 +int winsdelln( 53135 + WINDOW *win, 53136 + int n) 53137 + { return(*(int *)0); } 53138 + 53139 +/* ./base/lib_insnstr.c */ 53140 + 53141 +#undef winsnstr 53142 +int winsnstr( 53143 + WINDOW *win, 53144 + const char *s, 53145 + int n) 53146 + { return(*(int *)0); } 53147 + 53148 +/* ./base/lib_instr.c */ 53149 + 53150 +#undef winnstr 53151 +int winnstr( 53152 + WINDOW *win, 53153 + char *str, 53154 + int n) 53155 + { return(*(int *)0); } 53156 + 53157 +/* ./base/lib_isendwin.c */ 53158 + 53159 +#undef isendwin 53160 +NCURSES_BOOL isendwin(void) 53161 + { return(*(NCURSES_BOOL *)0); } 53162 + 53163 +/* ./base/lib_leaveok.c */ 53164 + 53165 +#undef leaveok 53166 +int leaveok( 53167 + WINDOW *win, 53168 + NCURSES_BOOL flag) 53169 + { return(*(int *)0); } 53170 + 53171 +/* ./base/lib_mouse.c */ 53172 + 53173 +#undef getmouse 53174 +int getmouse( 53175 + MEVENT *aevent) 53176 + { return(*(int *)0); } 53177 + 53178 +#undef ungetmouse 53179 +int ungetmouse( 53180 + MEVENT *aevent) 53181 + { return(*(int *)0); } 53182 + 53183 +#undef mousemask 53184 +mmask_t mousemask( 53185 + mmask_t newmask, 53186 + mmask_t *oldmask) 53187 + { return(*(mmask_t *)0); } 53188 + 53189 +#undef wenclose 53190 +NCURSES_BOOL wenclose( 53191 + const WINDOW *win, 53192 + int y, 53193 + int x) 53194 + { return(*(NCURSES_BOOL *)0); } 53195 + 53196 +#undef mouseinterval 53197 +int mouseinterval( 53198 + int maxclick) 53199 + { return(*(int *)0); } 53200 + 53201 +#undef _nc_has_mouse 53202 +int _nc_has_mouse(void) 53203 + { return(*(int *)0); } 53204 + 53205 +#undef wmouse_trafo 53206 +NCURSES_BOOL wmouse_trafo( 53207 + const WINDOW *win, 53208 + int *pY, 53209 + int *pX, 53210 + NCURSES_BOOL to_screen) 53211 + { return(*(NCURSES_BOOL *)0); } 53212 + 53213 +/* ./base/lib_move.c */ 53214 + 53215 +#undef wmove 53216 +int wmove( 53217 + WINDOW *win, 53218 + int y, 53219 + int x) 53220 + { return(*(int *)0); } 53221 + 53222 +/* ./tty/lib_mvcur.c */ 53223 + 53224 +#undef _nc_msec_cost 53225 +int _nc_msec_cost( 53226 + const char *const cap, 53227 + int affcnt) 53228 + { return(*(int *)0); } 53229 + 53230 +#undef _nc_mvcur_resume 53231 +void _nc_mvcur_resume(void) 53232 + { /* void */ } 53233 + 53234 +#undef _nc_mvcur_init 53235 +void _nc_mvcur_init(void) 53236 + { /* void */ } 53237 + 53238 +#undef _nc_mvcur_wrap 53239 +void _nc_mvcur_wrap(void) 53240 + { /* void */ } 53241 + 53242 +#undef mvcur 53243 +int mvcur( 53244 + int yold, 53245 + int xold, 53246 + int ynew, 53247 + int xnew) 53248 + { return(*(int *)0); } 53249 + 53250 +#undef _nc_optimize_enable 53251 +int _nc_optimize_enable; 53252 + 53253 +/* ./base/lib_mvwin.c */ 53254 + 53255 +#undef mvwin 53256 +int mvwin( 53257 + WINDOW *win, 53258 + int by, 53259 + int bx) 53260 + { return(*(int *)0); } 53261 + 53262 +/* ./base/lib_newterm.c */ 53263 + 53264 +#undef filter 53265 +void filter(void) 53266 + { /* void */ } 53267 + 53268 +#undef nofilter 53269 +void nofilter(void) 53270 + { /* void */ } 53271 + 53272 +#undef newterm 53273 +SCREEN *newterm( 53274 + const char *name, 53275 + FILE *ofp, 53276 + FILE *ifp) 53277 + { return(*(SCREEN **)0); } 53278 + 53279 +/* ./base/lib_newwin.c */ 53280 + 53281 +#undef _nc_freewin 53282 +int _nc_freewin( 53283 + WINDOW *win) 53284 + { return(*(int *)0); } 53285 + 53286 +#undef newwin 53287 +WINDOW *newwin( 53288 + int num_lines, 53289 + int num_columns, 53290 + int begy, 53291 + int begx) 53292 + { return(*(WINDOW **)0); } 53293 + 53294 +#undef derwin 53295 +WINDOW *derwin( 53296 + WINDOW *orig, 53297 + int num_lines, 53298 + int num_columns, 53299 + int begy, 53300 + int begx) 53301 + { return(*(WINDOW **)0); } 53302 + 53303 +#undef subwin 53304 +WINDOW *subwin( 53305 + WINDOW *w, 53306 + int l, 53307 + int c, 53308 + int y, 53309 + int x) 53310 + { return(*(WINDOW **)0); } 53311 + 53312 +#undef _nc_makenew 53313 +WINDOW *_nc_makenew( 53314 + int num_lines, 53315 + int num_columns, 53316 + int begy, 53317 + int begx, 53318 + int flags) 53319 + { return(*(WINDOW **)0); } 53320 + 53321 +#undef _nc_screen_of 53322 +SCREEN *_nc_screen_of( 53323 + WINDOW *win) 53324 + { return(*(SCREEN **)0); } 53325 + 53326 +/* ./base/lib_nl.c */ 53327 + 53328 +#undef nl 53329 +int nl(void) 53330 + { return(*(int *)0); } 53331 + 53332 +#undef nonl 53333 +int nonl(void) 53334 + { return(*(int *)0); } 53335 + 53336 +/* ./base/lib_overlay.c */ 53337 + 53338 +#undef overlay 53339 +int overlay( 53340 + const WINDOW *win1, 53341 + WINDOW *win2) 53342 + { return(*(int *)0); } 53343 + 53344 +#undef overwrite 53345 +int overwrite( 53346 + const WINDOW *win1, 53347 + WINDOW *win2) 53348 + { return(*(int *)0); } 53349 + 53350 +#undef copywin 53351 +int copywin( 53352 + const WINDOW *src, 53353 + WINDOW *dst, 53354 + int sminrow, 53355 + int smincol, 53356 + int dminrow, 53357 + int dmincol, 53358 + int dmaxrow, 53359 + int dmaxcol, 53360 + int over) 53361 + { return(*(int *)0); } 53362 + 53363 +/* ./base/lib_pad.c */ 53364 + 53365 +#undef newpad 53366 +WINDOW *newpad( 53367 + int l, 53368 + int c) 53369 + { return(*(WINDOW **)0); } 53370 + 53371 +#undef subpad 53372 +WINDOW *subpad( 53373 + WINDOW *orig, 53374 + int l, 53375 + int c, 53376 + int begy, 53377 + int begx) 53378 + { return(*(WINDOW **)0); } 53379 + 53380 +#undef prefresh 53381 +int prefresh( 53382 + WINDOW *win, 53383 + int pminrow, 53384 + int pmincol, 53385 + int sminrow, 53386 + int smincol, 53387 + int smaxrow, 53388 + int smaxcol) 53389 + { return(*(int *)0); } 53390 + 53391 +#undef pnoutrefresh 53392 +int pnoutrefresh( 53393 + WINDOW *win, 53394 + int pminrow, 53395 + int pmincol, 53396 + int sminrow, 53397 + int smincol, 53398 + int smaxrow, 53399 + int smaxcol) 53400 + { return(*(int *)0); } 53401 + 53402 +#undef pechochar 53403 +int pechochar( 53404 + WINDOW *pad, 53405 + const chtype ch) 53406 + { return(*(int *)0); } 53407 + 53408 +/* ./base/lib_printw.c */ 53409 + 53410 +#undef printw 53411 +int printw( 53412 + const char *fmt, 53413 + ...) 53414 + { return(*(int *)0); } 53415 + 53416 +#undef wprintw 53417 +int wprintw( 53418 + WINDOW *win, 53419 + const char *fmt, 53420 + ...) 53421 + { return(*(int *)0); } 53422 + 53423 +#undef mvprintw 53424 +int mvprintw( 53425 + int y, 53426 + int x, 53427 + const char *fmt, 53428 + ...) 53429 + { return(*(int *)0); } 53430 + 53431 +#undef mvwprintw 53432 +int mvwprintw( 53433 + WINDOW *win, 53434 + int y, 53435 + int x, 53436 + const char *fmt, 53437 + ...) 53438 + { return(*(int *)0); } 53439 + 53440 +#undef vwprintw 53441 +int vwprintw( 53442 + WINDOW *win, 53443 + const char *fmt, 53444 + va_list argp) 53445 + { return(*(int *)0); } 53446 + 53447 +/* ./base/lib_redrawln.c */ 53448 + 53449 +#undef wredrawln 53450 +int wredrawln( 53451 + WINDOW *win, 53452 + int beg, 53453 + int num) 53454 + { return(*(int *)0); } 53455 + 53456 +/* ./base/lib_refresh.c */ 53457 + 53458 +#undef wrefresh 53459 +int wrefresh( 53460 + WINDOW *win) 53461 + { return(*(int *)0); } 53462 + 53463 +#undef wnoutrefresh 53464 +int wnoutrefresh( 53465 + WINDOW *win) 53466 + { return(*(int *)0); } 53467 + 53468 +/* ./base/lib_restart.c */ 53469 + 53470 +#undef restartterm 53471 +int restartterm( 53472 + const char *termp, 53473 + int filenum, 53474 + int *errret) 53475 + { return(*(int *)0); } 53476 + 53477 +/* ./base/lib_scanw.c */ 53478 + 53479 +#undef vwscanw 53480 +int vwscanw( 53481 + WINDOW *win, 53482 + const char *fmt, 53483 + va_list argp) 53484 + { return(*(int *)0); } 53485 + 53486 +#undef scanw 53487 +int scanw( 53488 + const char *fmt, 53489 + ...) 53490 + { return(*(int *)0); } 53491 + 53492 +#undef wscanw 53493 +int wscanw( 53494 + WINDOW *win, 53495 + const char *fmt, 53496 + ...) 53497 + { return(*(int *)0); } 53498 + 53499 +#undef mvscanw 53500 +int mvscanw( 53501 + int y, 53502 + int x, 53503 + const char *fmt, 53504 + ...) 53505 + { return(*(int *)0); } 53506 + 53507 +#undef mvwscanw 53508 +int mvwscanw( 53509 + WINDOW *win, 53510 + int y, 53511 + int x, 53512 + const char *fmt, 53513 + ...) 53514 + { return(*(int *)0); } 53515 + 53516 +/* ./base/lib_screen.c */ 53517 + 53518 +#undef getwin 53519 +WINDOW *getwin( 53520 + FILE *filep) 53521 + { return(*(WINDOW **)0); } 53522 + 53523 +#undef putwin 53524 +int putwin( 53525 + WINDOW *win, 53526 + FILE *filep) 53527 + { return(*(int *)0); } 53528 + 53529 +#undef scr_restore 53530 +int scr_restore( 53531 + const char *file) 53532 + { return(*(int *)0); } 53533 + 53534 +#undef scr_dump 53535 +int scr_dump( 53536 + const char *file) 53537 + { return(*(int *)0); } 53538 + 53539 +#undef scr_init 53540 +int scr_init( 53541 + const char *file) 53542 + { return(*(int *)0); } 53543 + 53544 +#undef scr_set 53545 +int scr_set( 53546 + const char *file) 53547 + { return(*(int *)0); } 53548 + 53549 +/* ./base/lib_scroll.c */ 53550 + 53551 +#undef _nc_scroll_window 53552 +void _nc_scroll_window( 53553 + WINDOW *win, 53554 + int const n, 53555 + int const top, 53556 + int const bottom, 53557 + chtype blank) 53558 + { /* void */ } 53559 + 53560 +#undef wscrl 53561 +int wscrl( 53562 + WINDOW *win, 53563 + int n) 53564 + { return(*(int *)0); } 53565 + 53566 +/* ./base/lib_scrollok.c */ 53567 + 53568 +#undef scrollok 53569 +int scrollok( 53570 + WINDOW *win, 53571 + NCURSES_BOOL flag) 53572 + { return(*(int *)0); } 53573 + 53574 +/* ./base/lib_scrreg.c */ 53575 + 53576 +#undef wsetscrreg 53577 +int wsetscrreg( 53578 + WINDOW *win, 53579 + int top, 53580 + int bottom) 53581 + { return(*(int *)0); } 53582 + 53583 +/* ./base/lib_set_term.c */ 53584 + 53585 +#undef set_term 53586 +SCREEN *set_term( 53587 + SCREEN *screenp) 53588 + { return(*(SCREEN **)0); } 53589 + 53590 +#undef delscreen 53591 +void delscreen( 53592 + SCREEN *sp) 53593 + { /* void */ } 53594 + 53595 +#undef _nc_setupscreen 53596 +int _nc_setupscreen( 53597 + int slines, 53598 + int scolumns, 53599 + FILE *output, 53600 + NCURSES_BOOL filtered, 53601 + int slk_format) 53602 + { return(*(int *)0); } 53603 + 53604 +#undef _nc_ripoffline 53605 +int _nc_ripoffline( 53606 + int line, 53607 + int (*init)( 53608 + WINDOW *p1, 53609 + int p2)) 53610 + { return(*(int *)0); } 53611 + 53612 +#undef ripoffline 53613 +int ripoffline( 53614 + int line, 53615 + int (*init)( 53616 + WINDOW *p1, 53617 + int p2)) 53618 + { return(*(int *)0); } 53619 + 53620 +/* ./base/lib_slk.c */ 53621 + 53622 +#undef _nc_slk_format 53623 +int _nc_slk_format; 53624 + 53625 +#undef _nc_slk_initialize 53626 +int _nc_slk_initialize( 53627 + WINDOW *stwin, 53628 + int cols) 53629 + { return(*(int *)0); } 53630 + 53631 +#undef slk_restore 53632 +int slk_restore(void) 53633 + { return(*(int *)0); } 53634 + 53635 +/* ./base/lib_slkatr_set.c */ 53636 + 53637 +#undef slk_attr_set 53638 +int slk_attr_set( 53639 + const attr_t attr, 53640 + short color_pair_number, 53641 + void *opts) 53642 + { return(*(int *)0); } 53643 + 53644 +/* ./base/lib_slkatrof.c */ 53645 + 53646 +#undef slk_attroff 53647 +int slk_attroff( 53648 + const chtype attr) 53649 + { return(*(int *)0); } 53650 + 53651 +/* ./base/lib_slkatron.c */ 53652 + 53653 +#undef slk_attron 53654 +int slk_attron( 53655 + const chtype attr) 53656 + { return(*(int *)0); } 53657 + 53658 +/* ./base/lib_slkatrset.c */ 53659 + 53660 +#undef slk_attrset 53661 +int slk_attrset( 53662 + const chtype attr) 53663 + { return(*(int *)0); } 53664 + 53665 +/* ./base/lib_slkattr.c */ 53666 + 53667 +#undef slk_attr 53668 +attr_t slk_attr(void) 53669 + { return(*(attr_t *)0); } 53670 + 53671 +/* ./base/lib_slkclear.c */ 53672 + 53673 +#undef slk_clear 53674 +int slk_clear(void) 53675 + { return(*(int *)0); } 53676 + 53677 +/* ./base/lib_slkcolor.c */ 53678 + 53679 +#undef slk_color 53680 +int slk_color( 53681 + short color_pair_number) 53682 + { return(*(int *)0); } 53683 + 53684 +/* ./base/lib_slkinit.c */ 53685 + 53686 +#undef slk_init 53687 +int slk_init( 53688 + int format) 53689 + { return(*(int *)0); } 53690 + 53691 +/* ./base/lib_slklab.c */ 53692 + 53693 +#undef slk_label 53694 +char *slk_label( 53695 + int n) 53696 + { return(*(char **)0); } 53697 + 53698 +/* ./base/lib_slkrefr.c */ 53699 + 53700 +#undef slk_noutrefresh 53701 +int slk_noutrefresh(void) 53702 + { return(*(int *)0); } 53703 + 53704 +#undef slk_refresh 53705 +int slk_refresh(void) 53706 + { return(*(int *)0); } 53707 + 53708 +/* ./base/lib_slkset.c */ 53709 + 53710 +#undef slk_set 53711 +int slk_set( 53712 + int i, 53713 + const char *astr, 53714 + int format) 53715 + { return(*(int *)0); } 53716 + 53717 +/* ./base/lib_slktouch.c */ 53718 + 53719 +#undef slk_touch 53720 +int slk_touch(void) 53721 + { return(*(int *)0); } 53722 + 53723 +/* ./base/lib_touch.c */ 53724 + 53725 +#undef is_linetouched 53726 +NCURSES_BOOL is_linetouched( 53727 + WINDOW *win, 53728 + int line) 53729 + { return(*(NCURSES_BOOL *)0); } 53730 + 53731 +#undef is_wintouched 53732 +NCURSES_BOOL is_wintouched( 53733 + WINDOW *win) 53734 + { return(*(NCURSES_BOOL *)0); } 53735 + 53736 +#undef wtouchln 53737 +int wtouchln( 53738 + WINDOW *win, 53739 + int y, 53740 + int n, 53741 + int changed) 53742 + { return(*(int *)0); } 53743 + 53744 +/* ./trace/lib_tracedmp.c */ 53745 + 53746 +#undef _tracedump 53747 +void _tracedump( 53748 + const char *name, 53749 + WINDOW *win) 53750 + { /* void */ } 53751 + 53752 +/* ./trace/lib_tracemse.c */ 53753 + 53754 +#undef _nc_tracemouse 53755 +char *_nc_tracemouse( 53756 + SCREEN *sp, 53757 + MEVENT const *ep) 53758 + { return(*(char **)0); } 53759 + 53760 +#undef _tracemouse 53761 +char *_tracemouse( 53762 + MEVENT const *ep) 53763 + { return(*(char **)0); } 53764 + 53765 +/* ./tty/lib_tstp.c */ 53766 + 53767 +#include <SigAction.h> 53768 + 53769 +#undef _nc_signal_handler 53770 +void _nc_signal_handler( 53771 + NCURSES_BOOL enable) 53772 + { /* void */ } 53773 + 53774 +/* ./base/lib_ungetch.c */ 53775 + 53776 +#undef _nc_fifo_dump 53777 +void _nc_fifo_dump( 53778 + SCREEN *sp) 53779 + { /* void */ } 53780 + 53781 +#undef _nc_ungetch 53782 +int _nc_ungetch( 53783 + SCREEN *sp, 53784 + int ch) 53785 + { return(*(int *)0); } 53786 + 53787 +#undef ungetch 53788 +int ungetch( 53789 + int ch) 53790 + { return(*(int *)0); } 53791 + 53792 +/* ./tty/lib_vidattr.c */ 53793 + 53794 +#undef vidputs 53795 +int vidputs( 53796 + chtype newmode, 53797 + int (*outc)( 53798 + int p1)) 53799 + { return(*(int *)0); } 53800 + 53801 +#undef vidattr 53802 +int vidattr( 53803 + chtype newmode) 53804 + { return(*(int *)0); } 53805 + 53806 +#undef termattrs 53807 +chtype termattrs(void) 53808 + { return(*(chtype *)0); } 53809 + 53810 +/* ./base/lib_vline.c */ 53811 + 53812 +#undef wvline 53813 +int wvline( 53814 + WINDOW *win, 53815 + chtype ch, 53816 + int n) 53817 + { return(*(int *)0); } 53818 + 53819 +/* ./base/lib_wattroff.c */ 53820 + 53821 +#undef wattr_off 53822 +int wattr_off( 53823 + WINDOW *win, 53824 + attr_t at, 53825 + void *opts) 53826 + { return(*(int *)0); } 53827 + 53828 +/* ./base/lib_wattron.c */ 53829 + 53830 +#undef wattr_on 53831 +int wattr_on( 53832 + WINDOW *win, 53833 + attr_t at, 53834 + void *opts) 53835 + { return(*(int *)0); } 53836 + 53837 +/* ./base/lib_winch.c */ 53838 + 53839 +#undef winch 53840 +chtype winch( 53841 + WINDOW *win) 53842 + { return(*(chtype *)0); } 53843 + 53844 +/* ./base/lib_window.c */ 53845 + 53846 +#undef _nc_synchook 53847 +void _nc_synchook( 53848 + WINDOW *win) 53849 + { /* void */ } 53850 + 53851 +#undef mvderwin 53852 +int mvderwin( 53853 + WINDOW *win, 53854 + int y, 53855 + int x) 53856 + { return(*(int *)0); } 53857 + 53858 +#undef syncok 53859 +int syncok( 53860 + WINDOW *win, 53861 + NCURSES_BOOL bf) 53862 + { return(*(int *)0); } 53863 + 53864 +#undef wsyncup 53865 +void wsyncup( 53866 + WINDOW *win) 53867 + { /* void */ } 53868 + 53869 +#undef wsyncdown 53870 +void wsyncdown( 53871 + WINDOW *win) 53872 + { /* void */ } 53873 + 53874 +#undef wcursyncup 53875 +void wcursyncup( 53876 + WINDOW *win) 53877 + { /* void */ } 53878 + 53879 +#undef dupwin 53880 +WINDOW *dupwin( 53881 + WINDOW *win) 53882 + { return(*(WINDOW **)0); } 53883 + 53884 +/* ./base/nc_panel.c */ 53885 + 53886 +#undef _nc_panelhook 53887 +struct panelhook *_nc_panelhook(void) 53888 + { return(*(struct panelhook **)0); } 53889 + 53890 +/* ./base/safe_sprintf.c */ 53891 + 53892 +#undef _nc_printf_string 53893 +char *_nc_printf_string( 53894 + const char *fmt, 53895 + va_list ap) 53896 + { return(*(char **)0); } 53897 + 53898 +/* ./tty/tty_update.c */ 53899 + 53900 +#include <sys/time.h> 53901 +#include <sys/times.h> 53902 + 53903 +#undef doupdate 53904 +int doupdate(void) 53905 + { return(*(int *)0); } 53906 + 53907 +#undef _nc_scrolln 53908 +int _nc_scrolln( 53909 + int n, 53910 + int top, 53911 + int bot, 53912 + int maxy) 53913 + { return(*(int *)0); } 53914 + 53915 +#undef _nc_screen_resume 53916 +void _nc_screen_resume(void) 53917 + { /* void */ } 53918 + 53919 +#undef _nc_screen_init 53920 +void _nc_screen_init(void) 53921 + { /* void */ } 53922 + 53923 +#undef _nc_screen_wrap 53924 +void _nc_screen_wrap(void) 53925 + { /* void */ } 53926 + 53927 +#undef _nc_do_xmc_glitch 53928 +void _nc_do_xmc_glitch( 53929 + attr_t previous) 53930 + { /* void */ } 53931 + 53932 +/* ./trace/varargs.c */ 53933 + 53934 +typedef enum { 53935 + atUnknown = 0, atInteger, atFloat, atPoint, atString 53936 +} ARGTYPE; 53937 + 53938 +#undef _nc_varargs 53939 +char *_nc_varargs( 53940 + const char *fmt, 53941 + va_list ap) 53942 + { return(*(char **)0); } 53943 + 53944 +/* ./base/memmove.c */ 53945 + 53946 +#undef _nc_memmove 53947 +void _nc_memmove(void) 53948 + { /* void */ } 53949 + 53950 +/* ./base/vsscanf.c */ 53951 + 53952 +#undef _nc_vsscanf 53953 +void _nc_vsscanf(void) 53954 + { /* void */ } 53955 + 53956 +/* ./base/lib_freeall.c */ 53957 + 53958 +#include <term_entry.h> 53959 + 53960 +#undef _nc_freeall 53961 +void _nc_freeall(void) 53962 + { /* void */ } 53963 + 53964 +#undef _nc_free_and_exit 53965 +void _nc_free_and_exit( 53966 + int code) 53967 + { /* void */ } 53968 + 53969 +/* ./expanded.c */ 53970 + 53971 +#undef _nc_expanded 53972 +void _nc_expanded(void) 53973 + { /* void */ } 53974 + 53975 +/* ./base/legacy_coding.c */ 53976 + 53977 +#undef use_legacy_coding 53978 +int use_legacy_coding( 53979 + int level) 53980 + { return(*(int *)0); } 53981 + 53982 +/* ./base/lib_dft_fgbg.c */ 53983 + 53984 +#undef use_default_colors 53985 +int use_default_colors(void) 53986 + { return(*(int *)0); } 53987 + 53988 +#undef assume_default_colors 53989 +int assume_default_colors( 53990 + int fg, 53991 + int bg) 53992 + { return(*(int *)0); } 53993 + 53994 +/* ./tinfo/lib_print.c */ 53995 + 53996 +#undef mcprint 53997 +int mcprint( 53998 + char *data, 53999 + int len) 54000 + { return(*(int *)0); } 54001 + 54002 +/* ./base/resizeterm.c */ 54003 + 54004 +#undef is_term_resized 54005 +NCURSES_BOOL is_term_resized( 54006 + int ToLines, 54007 + int ToCols) 54008 + { return(*(NCURSES_BOOL *)0); } 54009 + 54010 +#undef resize_term 54011 +int resize_term( 54012 + int ToLines, 54013 + int ToCols) 54014 + { return(*(int *)0); } 54015 + 54016 +#undef resizeterm 54017 +int resizeterm( 54018 + int ToLines, 54019 + int ToCols) 54020 + { return(*(int *)0); } 54021 + 54022 +/* ./trace/trace_xnames.c */ 54023 + 54024 +#undef _nc_trace_xnames 54025 +void _nc_trace_xnames( 54026 + TERMTYPE *tp) 54027 + { /* void */ } 54028 + 54029 +/* ./tinfo/use_screen.c */ 54030 + 54031 +#undef use_screen 54032 +int use_screen( 54033 + SCREEN *screen, 54034 + NCURSES_SCREEN_CB func, 54035 + void *data) 54036 + { return(*(int *)0); } 54037 + 54038 +/* ./base/use_window.c */ 54039 + 54040 +#undef use_window 54041 +int use_window( 54042 + WINDOW *win, 54043 + NCURSES_WINDOW_CB func, 54044 + void *data) 54045 + { return(*(int *)0); } 54046 + 54047 +/* ./base/wresize.c */ 54048 + 54049 +#undef wresize 54050 +int wresize( 54051 + WINDOW *win, 54052 + int ToLines, 54053 + int ToCols) 54054 + { return(*(int *)0); } 54055 + 54056 +/* ./tinfo/access.c */ 54057 + 54058 +#include <sys/stat.h> 54059 +#include <nc_alloc.h> 54060 + 54061 +#undef _nc_rootname 54062 +char *_nc_rootname( 54063 + char *path) 54064 + { return(*(char **)0); } 54065 + 54066 +#undef _nc_is_abs_path 54067 +NCURSES_BOOL _nc_is_abs_path( 54068 + const char *path) 54069 + { return(*(NCURSES_BOOL *)0); } 54070 + 54071 +#undef _nc_pathlast 54072 +unsigned _nc_pathlast( 54073 + const char *path) 54074 + { return(*(unsigned *)0); } 54075 + 54076 +#undef _nc_basename 54077 +char *_nc_basename( 54078 + char *path) 54079 + { return(*(char **)0); } 54080 + 54081 +#undef _nc_access 54082 +int _nc_access( 54083 + const char *path, 54084 + int mode) 54085 + { return(*(int *)0); } 54086 + 54087 +#undef _nc_is_dir_path 54088 +NCURSES_BOOL _nc_is_dir_path( 54089 + const char *path) 54090 + { return(*(NCURSES_BOOL *)0); } 54091 + 54092 +#undef _nc_is_file_path 54093 +NCURSES_BOOL _nc_is_file_path( 54094 + const char *path) 54095 + { return(*(NCURSES_BOOL *)0); } 54096 + 54097 +/* ./tinfo/add_tries.c */ 54098 + 54099 +#undef _nc_add_to_try 54100 +int _nc_add_to_try( 54101 + TRIES **tree, 54102 + const char *str, 54103 + unsigned code) 54104 + { return(*(int *)0); } 54105 + 54106 +/* ./tinfo/alloc_ttype.c */ 54107 + 54108 +#undef _nc_align_termtype 54109 +void _nc_align_termtype( 54110 + TERMTYPE *to, 54111 + TERMTYPE *from) 54112 + { /* void */ } 54113 + 54114 +#undef _nc_copy_termtype 54115 +void _nc_copy_termtype( 54116 + TERMTYPE *dst, 54117 + TERMTYPE *src) 54118 + { /* void */ } 54119 + 54120 +/* ./codes.c */ 54121 + 54122 +#undef _nc_boolcodes 54123 +const char *const *_nc_boolcodes(void) 54124 + { return(*(const char **)0); } 54125 + 54126 +#undef _nc_numcodes 54127 +const char *const *_nc_numcodes(void) 54128 + { return(*(const char **)0); } 54129 + 54130 +#undef _nc_strcodes 54131 +const char *const *_nc_strcodes(void) 54132 + { return(*(const char **)0); } 54133 + 54134 +#undef _nc_codes_leaks 54135 +void _nc_codes_leaks(void) 54136 + { /* void */ } 54137 + 54138 +/* ./tinfo/comp_error.c */ 54139 + 54140 +#undef _nc_suppress_warnings 54141 +NCURSES_BOOL _nc_suppress_warnings; 54142 +#undef _nc_curr_line 54143 +int _nc_curr_line; 54144 +#undef _nc_curr_col 54145 +int _nc_curr_col; 54146 + 54147 +#undef _nc_get_source 54148 +const char *_nc_get_source(void) 54149 + { return(*(const char **)0); } 54150 + 54151 +#undef _nc_set_source 54152 +void _nc_set_source( 54153 + const char *const name) 54154 + { /* void */ } 54155 + 54156 +#undef _nc_set_type 54157 +void _nc_set_type( 54158 + const char *const name) 54159 + { /* void */ } 54160 + 54161 +#undef _nc_get_type 54162 +void _nc_get_type( 54163 + char *name) 54164 + { /* void */ } 54165 + 54166 +#undef _nc_warning 54167 +void _nc_warning( 54168 + const char *const fmt, 54169 + ...) 54170 + { /* void */ } 54171 + 54172 +#undef _nc_err_abort 54173 +void _nc_err_abort( 54174 + const char *const fmt, 54175 + ...) 54176 + { /* void */ } 54177 + 54178 +#undef _nc_syserr_abort 54179 +void _nc_syserr_abort( 54180 + const char *const fmt, 54181 + ...) 54182 + { /* void */ } 54183 + 54184 +/* ./tinfo/db_iterator.c */ 54185 + 54186 +#undef _nc_tic_dir 54187 +const char *_nc_tic_dir( 54188 + const char *path) 54189 + { return(*(const char **)0); } 54190 + 54191 +#undef _nc_keep_tic_dir 54192 +void _nc_keep_tic_dir( 54193 + const char *path) 54194 + { /* void */ } 54195 + 54196 +#undef _nc_last_db 54197 +void _nc_last_db(void) 54198 + { /* void */ } 54199 + 54200 +#undef _nc_next_db 54201 +const char *_nc_next_db( 54202 + DBDIRS *state, 54203 + int *offset) 54204 + { return(*(const char **)0); } 54205 + 54206 +#undef _nc_first_db 54207 +void _nc_first_db( 54208 + DBDIRS *state, 54209 + int *offset) 54210 + { /* void */ } 54211 + 54212 +/* ./tinfo/doalloc.c */ 54213 + 54214 +#undef _nc_doalloc 54215 +void *_nc_doalloc( 54216 + void *oldp, 54217 + size_t amount) 54218 + { return(*(void **)0); } 54219 + 54220 +/* ./tinfo/entries.c */ 54221 + 54222 +#undef _nc_head 54223 +ENTRY *_nc_head; 54224 +#undef _nc_tail 54225 +ENTRY *_nc_tail; 54226 + 54227 +#undef _nc_free_entry 54228 +void _nc_free_entry( 54229 + ENTRY *headp, 54230 + TERMTYPE *tterm) 54231 + { /* void */ } 54232 + 54233 +#undef _nc_free_entries 54234 +void _nc_free_entries( 54235 + ENTRY *headp) 54236 + { /* void */ } 54237 + 54238 +#undef _nc_delink_entry 54239 +ENTRY *_nc_delink_entry( 54240 + ENTRY *headp, 54241 + TERMTYPE *tterm) 54242 + { return(*(ENTRY **)0); } 54243 + 54244 +#undef _nc_leaks_tinfo 54245 +void _nc_leaks_tinfo(void) 54246 + { /* void */ } 54247 + 54248 +#undef _nc_free_tinfo 54249 +void _nc_free_tinfo( 54250 + int code) 54251 + { /* void */ } 54252 + 54253 +/* ./fallback.c */ 54254 + 54255 +#undef _nc_fallback 54256 +const TERMTYPE *_nc_fallback( 54257 + const char *name) 54258 + { return(*(const TERMTYPE **)0); } 54259 + 54260 +/* ./tinfo/free_ttype.c */ 54261 + 54262 +#undef _nc_free_termtype 54263 +void _nc_free_termtype( 54264 + TERMTYPE *ptr) 54265 + { /* void */ } 54266 + 54267 +#undef _nc_user_definable 54268 +NCURSES_BOOL _nc_user_definable; 54269 + 54270 +#undef use_extended_names 54271 +int use_extended_names( 54272 + NCURSES_BOOL flag) 54273 + { return(*(int *)0); } 54274 + 54275 +/* ./tinfo/getenv_num.c */ 54276 + 54277 +#undef _nc_getenv_num 54278 +int _nc_getenv_num( 54279 + const char *name) 54280 + { return(*(int *)0); } 54281 + 54282 +/* ./tinfo/home_terminfo.c */ 54283 + 54284 +#undef _nc_home_terminfo 54285 +char *_nc_home_terminfo(void) 54286 + { return(*(char **)0); } 54287 + 54288 +/* ./tinfo/init_keytry.c */ 54289 + 54290 +#if 0 54291 + 54292 +#include <init_keytry.h> 54293 + 54294 +#undef _nc_tinfo_fkeys 54295 +const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0}; 54296 + 54297 +#endif 54298 + 54299 +#undef _nc_init_keytry 54300 +void _nc_init_keytry( 54301 + SCREEN *sp) 54302 + { /* void */ } 54303 + 54304 +/* ./tinfo/lib_acs.c */ 54305 + 54306 +#undef _nc_acs_map 54307 +chtype *_nc_acs_map(void) 54308 + { return(*(chtype **)0); } 54309 + 54310 +#undef _nc_init_acs 54311 +void _nc_init_acs(void) 54312 + { /* void */ } 54313 + 54314 +/* ./tinfo/lib_baudrate.c */ 54315 + 54316 +#include <termcap.h> 54317 + 54318 +struct speed { 54319 + int s; 54320 + int sp; 54321 +}; 54322 + 54323 +#undef _nc_baudrate 54324 +int _nc_baudrate( 54325 + int OSpeed) 54326 + { return(*(int *)0); } 54327 + 54328 +#undef _nc_ospeed 54329 +int _nc_ospeed( 54330 + int BaudRate) 54331 + { return(*(int *)0); } 54332 + 54333 +#undef baudrate 54334 +int baudrate(void) 54335 + { return(*(int *)0); } 54336 + 54337 +/* ./tinfo/lib_cur_term.c */ 54338 + 54339 +#undef _nc_cur_term 54340 +TERMINAL *_nc_cur_term(void) 54341 + { return(*(TERMINAL **)0); } 54342 + 54343 +#undef set_curterm 54344 +TERMINAL *set_curterm( 54345 + TERMINAL *termp) 54346 + { return(*(TERMINAL **)0); } 54347 + 54348 +#undef del_curterm 54349 +int del_curterm( 54350 + TERMINAL *termp) 54351 + { return(*(int *)0); } 54352 + 54353 +/* ./tinfo/lib_data.c */ 54354 + 54355 +#undef _nc_stdscr 54356 +WINDOW *_nc_stdscr(void) 54357 + { return(*(WINDOW **)0); } 54358 + 54359 +#undef _nc_curscr 54360 +WINDOW *_nc_curscr(void) 54361 + { return(*(WINDOW **)0); } 54362 + 54363 +#undef _nc_newscr 54364 +WINDOW *_nc_newscr(void) 54365 + { return(*(WINDOW **)0); } 54366 + 54367 +#undef _nc_screen_chain 54368 +SCREEN *_nc_screen_chain; 54369 +#undef SP 54370 +SCREEN *SP; 54371 +#undef _nc_globals 54372 +NCURSES_GLOBALS _nc_globals; 54373 +#undef _nc_prescreen 54374 +NCURSES_PRESCREEN _nc_prescreen; 54375 + 54376 +#undef _nc_mutex_init 54377 +void _nc_mutex_init( 54378 + pthread_mutex_t *obj) 54379 + { /* void */ } 54380 + 54381 +#undef _nc_mutex_lock 54382 +int _nc_mutex_lock( 54383 + pthread_mutex_t *obj) 54384 + { return(*(int *)0); } 54385 + 54386 +#undef _nc_mutex_trylock 54387 +int _nc_mutex_trylock( 54388 + pthread_mutex_t *obj) 54389 + { return(*(int *)0); } 54390 + 54391 +#undef _nc_mutex_unlock 54392 +int _nc_mutex_unlock( 54393 + pthread_mutex_t *obj) 54394 + { return(*(int *)0); } 54395 + 54396 +/* ./tinfo/lib_has_cap.c */ 54397 + 54398 +#undef has_ic 54399 +NCURSES_BOOL has_ic(void) 54400 + { return(*(NCURSES_BOOL *)0); } 54401 + 54402 +#undef has_il 54403 +NCURSES_BOOL has_il(void) 54404 + { return(*(NCURSES_BOOL *)0); } 54405 + 54406 +/* ./tinfo/lib_kernel.c */ 54407 + 54408 +#undef erasechar 54409 +char erasechar(void) 54410 + { return(*(char *)0); } 54411 + 54412 +#undef killchar 54413 +char killchar(void) 54414 + { return(*(char *)0); } 54415 + 54416 +#undef flushinp 54417 +int flushinp(void) 54418 + { return(*(int *)0); } 54419 + 54420 +/* ./lib_keyname.c */ 54421 + 54422 +struct kn { short offset; int code; }; 54423 + 54424 +#undef _nc_keyname 54425 +const char *_nc_keyname( 54426 + SCREEN *sp, 54427 + int c) 54428 + { return(*(const char **)0); } 54429 + 54430 +#undef keyname 54431 +const char *keyname( 54432 + int c) 54433 + { return(*(const char **)0); } 54434 + 54435 +#undef _nc_keyname_leaks 54436 +void _nc_keyname_leaks(void) 54437 + { /* void */ } 54438 + 54439 +/* ./tinfo/lib_longname.c */ 54440 + 54441 +#undef longname 54442 +char *longname(void) 54443 + { return(*(char **)0); } 54444 + 54445 +/* ./tinfo/lib_napms.c */ 54446 + 54447 +#undef napms 54448 +int napms( 54449 + int ms) 54450 + { return(*(int *)0); } 54451 + 54452 +/* ./tinfo/lib_options.c */ 54453 + 54454 +#undef idlok 54455 +int idlok( 54456 + WINDOW *win, 54457 + NCURSES_BOOL flag) 54458 + { return(*(int *)0); } 54459 + 54460 +#undef idcok 54461 +void idcok( 54462 + WINDOW *win, 54463 + NCURSES_BOOL flag) 54464 + { /* void */ } 54465 + 54466 +#undef halfdelay 54467 +int halfdelay( 54468 + int t) 54469 + { return(*(int *)0); } 54470 + 54471 +#undef nodelay 54472 +int nodelay( 54473 + WINDOW *win, 54474 + NCURSES_BOOL flag) 54475 + { return(*(int *)0); } 54476 + 54477 +#undef notimeout 54478 +int notimeout( 54479 + WINDOW *win, 54480 + NCURSES_BOOL f) 54481 + { return(*(int *)0); } 54482 + 54483 +#undef wtimeout 54484 +void wtimeout( 54485 + WINDOW *win, 54486 + int delay) 54487 + { /* void */ } 54488 + 54489 +#undef keypad 54490 +int keypad( 54491 + WINDOW *win, 54492 + NCURSES_BOOL flag) 54493 + { return(*(int *)0); } 54494 + 54495 +#undef meta 54496 +int meta( 54497 + WINDOW *win, 54498 + NCURSES_BOOL flag) 54499 + { return(*(int *)0); } 54500 + 54501 +#undef curs_set 54502 +int curs_set( 54503 + int vis) 54504 + { return(*(int *)0); } 54505 + 54506 +#undef typeahead 54507 +int typeahead( 54508 + int fd) 54509 + { return(*(int *)0); } 54510 + 54511 +#undef has_key 54512 +int has_key( 54513 + int keycode) 54514 + { return(*(int *)0); } 54515 + 54516 +#undef _nc_keypad 54517 +int _nc_keypad( 54518 + SCREEN *sp, 54519 + NCURSES_BOOL flag) 54520 + { return(*(int *)0); } 54521 + 54522 +/* ./tinfo/lib_raw.c */ 54523 + 54524 +#undef raw 54525 +int raw(void) 54526 + { return(*(int *)0); } 54527 + 54528 +#undef cbreak 54529 +int cbreak(void) 54530 + { return(*(int *)0); } 54531 + 54532 +#undef qiflush 54533 +void qiflush(void) 54534 + { /* void */ } 54535 + 54536 +#undef noraw 54537 +int noraw(void) 54538 + { return(*(int *)0); } 54539 + 54540 +#undef nocbreak 54541 +int nocbreak(void) 54542 + { return(*(int *)0); } 54543 + 54544 +#undef noqiflush 54545 +void noqiflush(void) 54546 + { /* void */ } 54547 + 54548 +#undef intrflush 54549 +int intrflush( 54550 + WINDOW *win, 54551 + NCURSES_BOOL flag) 54552 + { return(*(int *)0); } 54553 + 54554 +/* ./tinfo/lib_setup.c */ 54555 + 54556 +#include <locale.h> 54557 +#include <sys/ioctl.h> 54558 +#include <langinfo.h> 54559 + 54560 +#undef _nc_ttytype 54561 +char *_nc_ttytype(void) 54562 + { return(*(char **)0); } 54563 + 54564 +#undef _nc_ptr_Lines 54565 +int *_nc_ptr_Lines(void) 54566 + { return(*(int **)0); } 54567 + 54568 +#undef _nc_LINES 54569 +int _nc_LINES(void) 54570 + { return(*(int *)0); } 54571 + 54572 +#undef _nc_ptr_Cols 54573 +int *_nc_ptr_Cols(void) 54574 + { return(*(int **)0); } 54575 + 54576 +#undef _nc_COLS 54577 +int _nc_COLS(void) 54578 + { return(*(int *)0); } 54579 + 54580 +#undef _nc_TABSIZE 54581 +int _nc_TABSIZE(void) 54582 + { return(*(int *)0); } 54583 + 54584 +#undef set_tabsize 54585 +int set_tabsize( 54586 + int value) 54587 + { return(*(int *)0); } 54588 + 54589 +#undef _nc_handle_sigwinch 54590 +int _nc_handle_sigwinch( 54591 + SCREEN *sp) 54592 + { return(*(int *)0); } 54593 + 54594 +#undef use_env 54595 +void use_env( 54596 + NCURSES_BOOL f) 54597 + { /* void */ } 54598 + 54599 +#undef _nc_get_screensize 54600 +void _nc_get_screensize( 54601 + SCREEN *sp, 54602 + int *linep, 54603 + int *colp) 54604 + { /* void */ } 54605 + 54606 +#undef _nc_update_screensize 54607 +void _nc_update_screensize( 54608 + SCREEN *sp) 54609 + { /* void */ } 54610 + 54611 +#undef _nc_get_locale 54612 +char *_nc_get_locale(void) 54613 + { return(*(char **)0); } 54614 + 54615 +#undef _nc_unicode_locale 54616 +int _nc_unicode_locale(void) 54617 + { return(*(int *)0); } 54618 + 54619 +#undef _nc_locale_breaks_acs 54620 +int _nc_locale_breaks_acs(void) 54621 + { return(*(int *)0); } 54622 + 54623 +#undef _nc_setupterm 54624 +int _nc_setupterm( 54625 + const char *tname, 54626 + int Filedes, 54627 + int *errret, 54628 + NCURSES_BOOL reuse) 54629 + { return(*(int *)0); } 54630 + 54631 +#undef setupterm 54632 +int setupterm( 54633 + const char *tname, 54634 + int Filedes, 54635 + int *errret) 54636 + { return(*(int *)0); } 54637 + 54638 +/* ./tinfo/lib_termcap.c */ 54639 + 54640 +#undef UP 54641 +char *UP; 54642 +#undef BC 54643 +char *BC; 54644 + 54645 +#undef tgetent 54646 +int tgetent( 54647 + char *bufp, 54648 + const char *name) 54649 + { return(*(int *)0); } 54650 + 54651 +#if 0 54652 + 54653 +#include <capdefaults.c> 54654 + 54655 +#endif 54656 + 54657 +#undef tgetflag 54658 +int tgetflag( 54659 + const char *id) 54660 + { return(*(int *)0); } 54661 + 54662 +#undef tgetnum 54663 +int tgetnum( 54664 + const char *id) 54665 + { return(*(int *)0); } 54666 + 54667 +#undef tgetstr 54668 +char *tgetstr( 54669 + const char *id, 54670 + char **area) 54671 + { return(*(char **)0); } 54672 + 54673 +#undef _nc_tgetent_leaks 54674 +void _nc_tgetent_leaks(void) 54675 + { /* void */ } 54676 + 54677 +/* ./tinfo/lib_termname.c */ 54678 + 54679 +#undef termname 54680 +char *termname(void) 54681 + { return(*(char **)0); } 54682 + 54683 +/* ./tinfo/lib_tgoto.c */ 54684 + 54685 +#undef tgoto 54686 +char *tgoto( 54687 + const char *string, 54688 + int x, 54689 + int y) 54690 + { return(*(char **)0); } 54691 + 54692 +/* ./tinfo/lib_ti.c */ 54693 + 54694 +#undef tigetflag 54695 +int tigetflag( 54696 + const char *str) 54697 + { return(*(int *)0); } 54698 + 54699 +#undef tigetnum 54700 +int tigetnum( 54701 + const char *str) 54702 + { return(*(int *)0); } 54703 + 54704 +#undef tigetstr 54705 +char *tigetstr( 54706 + const char *str) 54707 + { return(*(char **)0); } 54708 + 54709 +/* ./tinfo/lib_tparm.c */ 54710 + 54711 +#undef _nc_tparm_err 54712 +int _nc_tparm_err; 54713 + 54714 +#undef _nc_free_tparm 54715 +void _nc_free_tparm(void) 54716 + { /* void */ } 54717 + 54718 +#undef _nc_tparm_analyze 54719 +int _nc_tparm_analyze( 54720 + const char *string, 54721 + char *p_is_s[9], 54722 + int *popcount) 54723 + { return(*(int *)0); } 54724 + 54725 +#undef tparm 54726 +char *tparm( 54727 + const char *string, 54728 + ...) 54729 + { return(*(char **)0); } 54730 + 54731 +/* ./tinfo/lib_tputs.c */ 54732 + 54733 +#undef PC 54734 +char PC; 54735 +#undef ospeed 54736 +NCURSES_OSPEED ospeed; 54737 +#undef _nc_nulls_sent 54738 +int _nc_nulls_sent; 54739 + 54740 +#undef delay_output 54741 +int delay_output( 54742 + int ms) 54743 + { return(*(int *)0); } 54744 + 54745 +#undef _nc_flush 54746 +void _nc_flush(void) 54747 + { /* void */ } 54748 + 54749 +#undef _nc_outch 54750 +int _nc_outch( 54751 + int ch) 54752 + { return(*(int *)0); } 54753 + 54754 +#undef putp 54755 +int putp( 54756 + const char *string) 54757 + { return(*(int *)0); } 54758 + 54759 +#undef tputs 54760 +int tputs( 54761 + const char *string, 54762 + int affcnt, 54763 + int (*outc)( 54764 + int p1)) 54765 + { return(*(int *)0); } 54766 + 54767 +/* ./trace/lib_trace.c */ 54768 + 54769 +#undef _nc_tracing 54770 +unsigned _nc_tracing; 54771 + 54772 +#undef _nc__nc_tputs_trace 54773 +const char *_nc__nc_tputs_trace(void) 54774 + { return(*(const char **)0); } 54775 + 54776 +#undef _nc__nc_outchars 54777 +long _nc__nc_outchars(void) 54778 + { return(*(long *)0); } 54779 + 54780 +#undef _nc_set_tputs_trace 54781 +void _nc_set_tputs_trace( 54782 + const char *s) 54783 + { /* void */ } 54784 + 54785 +#undef _nc_count_outchars 54786 +void _nc_count_outchars( 54787 + long increment) 54788 + { /* void */ } 54789 + 54790 +#undef trace 54791 +void trace( 54792 + const unsigned int tracelevel) 54793 + { /* void */ } 54794 + 54795 +#undef _tracef 54796 +void _tracef( 54797 + const char *fmt, 54798 + ...) 54799 + { /* void */ } 54800 + 54801 +#undef _nc_retrace_bool 54802 +NCURSES_BOOL _nc_retrace_bool( 54803 + NCURSES_BOOL code) 54804 + { return(*(NCURSES_BOOL *)0); } 54805 + 54806 +#undef _nc_retrace_int 54807 +int _nc_retrace_int( 54808 + int code) 54809 + { return(*(int *)0); } 54810 + 54811 +#undef _nc_retrace_unsigned 54812 +unsigned _nc_retrace_unsigned( 54813 + unsigned code) 54814 + { return(*(unsigned *)0); } 54815 + 54816 +#undef _nc_retrace_ptr 54817 +char *_nc_retrace_ptr( 54818 + char *code) 54819 + { return(*(char **)0); } 54820 + 54821 +#undef _nc_retrace_cptr 54822 +const char *_nc_retrace_cptr( 54823 + const char *code) 54824 + { return(*(const char **)0); } 54825 + 54826 +#undef _nc_retrace_cvoid_ptr 54827 +const void *_nc_retrace_cvoid_ptr( 54828 + const void *code) 54829 + { return(*(const void **)0); } 54830 + 54831 +#undef _nc_retrace_void_ptr 54832 +void *_nc_retrace_void_ptr( 54833 + void *code) 54834 + { return(*(void **)0); } 54835 + 54836 +#undef _nc_retrace_sp 54837 +SCREEN *_nc_retrace_sp( 54838 + SCREEN *code) 54839 + { return(*(SCREEN **)0); } 54840 + 54841 +#undef _nc_retrace_win 54842 +WINDOW *_nc_retrace_win( 54843 + WINDOW *code) 54844 + { return(*(WINDOW **)0); } 54845 + 54846 +#undef _nc_use_tracef 54847 +int _nc_use_tracef( 54848 + unsigned mask) 54849 + { return(*(int *)0); } 54850 + 54851 +#undef _nc_locked_tracef 54852 +void _nc_locked_tracef( 54853 + const char *fmt, 54854 + ...) 54855 + { /* void */ } 54856 + 54857 +/* ./trace/lib_traceatr.c */ 54858 + 54859 +#undef _traceattr2 54860 +char *_traceattr2( 54861 + int bufnum, 54862 + chtype newmode) 54863 + { return(*(char **)0); } 54864 + 54865 +#undef _traceattr 54866 +char *_traceattr( 54867 + attr_t newmode) 54868 + { return(*(char **)0); } 54869 + 54870 +#undef _nc_retrace_attr_t 54871 +attr_t _nc_retrace_attr_t( 54872 + attr_t code) 54873 + { return(*(attr_t *)0); } 54874 + 54875 +#undef _nc_altcharset_name 54876 +const char *_nc_altcharset_name( 54877 + attr_t attr, 54878 + chtype ch) 54879 + { return(*(const char **)0); } 54880 + 54881 +#undef _tracechtype2 54882 +char *_tracechtype2( 54883 + int bufnum, 54884 + chtype ch) 54885 + { return(*(char **)0); } 54886 + 54887 +#undef _tracechtype 54888 +char *_tracechtype( 54889 + chtype ch) 54890 + { return(*(char **)0); } 54891 + 54892 +#undef _nc_retrace_chtype 54893 +chtype _nc_retrace_chtype( 54894 + chtype code) 54895 + { return(*(chtype *)0); } 54896 + 54897 +/* ./trace/lib_tracebits.c */ 54898 + 54899 +typedef struct { 54900 + unsigned int val; 54901 + const char *name; 54902 +} BITNAMES; 54903 + 54904 +#undef _nc_trace_ttymode 54905 +char *_nc_trace_ttymode( 54906 + struct termios *tty) 54907 + { return(*(char **)0); } 54908 + 54909 +#undef _nc_tracebits 54910 +char *_nc_tracebits(void) 54911 + { return(*(char **)0); } 54912 + 54913 +/* ./trace/lib_tracechr.c */ 54914 + 54915 +#undef _nc_tracechar 54916 +char *_nc_tracechar( 54917 + SCREEN *sp, 54918 + int ch) 54919 + { return(*(char **)0); } 54920 + 54921 +#undef _tracechar 54922 +char *_tracechar( 54923 + int ch) 54924 + { return(*(char **)0); } 54925 + 54926 +/* ./tinfo/lib_ttyflags.c */ 54927 + 54928 +#undef _nc_get_tty_mode 54929 +int _nc_get_tty_mode( 54930 + struct termios *buf) 54931 + { return(*(int *)0); } 54932 + 54933 +#undef _nc_set_tty_mode 54934 +int _nc_set_tty_mode( 54935 + struct termios *buf) 54936 + { return(*(int *)0); } 54937 + 54938 +#undef def_shell_mode 54939 +int def_shell_mode(void) 54940 + { return(*(int *)0); } 54941 + 54942 +#undef def_prog_mode 54943 +int def_prog_mode(void) 54944 + { return(*(int *)0); } 54945 + 54946 +#undef reset_prog_mode 54947 +int reset_prog_mode(void) 54948 + { return(*(int *)0); } 54949 + 54950 +#undef reset_shell_mode 54951 +int reset_shell_mode(void) 54952 + { return(*(int *)0); } 54953 + 54954 +#undef savetty 54955 +int savetty(void) 54956 + { return(*(int *)0); } 54957 + 54958 +#undef resetty 54959 +int resetty(void) 54960 + { return(*(int *)0); } 54961 + 54962 +/* ./tty/lib_twait.c */ 54963 + 54964 +#undef _nc_eventlist_timeout 54965 +int _nc_eventlist_timeout( 54966 + _nc_eventlist *evl) 54967 + { return(*(int *)0); } 54968 + 54969 +#undef _nc_timed_wait 54970 +int _nc_timed_wait( 54971 + SCREEN *sp, 54972 + int mode, 54973 + int milliseconds, 54974 + int *timeleft, 54975 + _nc_eventlist *evl) 54976 + { return(*(int *)0); } 54977 + 54978 +/* ./tinfo/name_match.c */ 54979 + 54980 +#undef _nc_first_name 54981 +char *_nc_first_name( 54982 + const char *const sp) 54983 + { return(*(char **)0); } 54984 + 54985 +#undef _nc_name_match 54986 +int _nc_name_match( 54987 + const char *const namelst, 54988 + const char *const name, 54989 + const char *const delim) 54990 + { return(*(int *)0); } 54991 + 54992 +/* ./names.c */ 54993 + 54994 +#undef _nc_boolnames 54995 +const char *const *_nc_boolnames(void) 54996 + { return(*(const char **)0); } 54997 + 54998 +#undef _nc_boolfnames 54999 +const char *const *_nc_boolfnames(void) 55000 + { return(*(const char **)0); } 55001 + 55002 +#undef _nc_numnames 55003 +const char *const *_nc_numnames(void) 55004 + { return(*(const char **)0); } 55005 + 55006 +#undef _nc_numfnames 55007 +const char *const *_nc_numfnames(void) 55008 + { return(*(const char **)0); } 55009 + 55010 +#undef _nc_strnames 55011 +const char *const *_nc_strnames(void) 55012 + { return(*(const char **)0); } 55013 + 55014 +#undef _nc_strfnames 55015 +const char *const *_nc_strfnames(void) 55016 + { return(*(const char **)0); } 55017 + 55018 +#undef _nc_names_leaks 55019 +void _nc_names_leaks(void) 55020 + { /* void */ } 55021 + 55022 +/* ./tinfo/read_entry.c */ 55023 + 55024 +#include <hashed_db.h> 55025 + 55026 +#undef _nc_read_termtype 55027 +int _nc_read_termtype( 55028 + TERMTYPE *ptr, 55029 + char *buffer, 55030 + int limit) 55031 + { return(*(int *)0); } 55032 + 55033 +#undef _nc_read_file_entry 55034 +int _nc_read_file_entry( 55035 + const char *const filename, 55036 + TERMTYPE *ptr) 55037 + { return(*(int *)0); } 55038 + 55039 +#undef _nc_read_entry 55040 +int _nc_read_entry( 55041 + const char *const name, 55042 + char *const filename, 55043 + TERMTYPE *const tp) 55044 + { return(*(int *)0); } 55045 + 55046 +/* ./tinfo/read_termcap.c */ 55047 + 55048 +#include <sys/types.h> 55049 + 55050 +#undef _nc_read_termcap 55051 +void _nc_read_termcap(void) 55052 + { /* void */ } 55053 + 55054 +/* ./tinfo/setbuf.c */ 55055 + 55056 +#undef _nc_set_buffer 55057 +void _nc_set_buffer( 55058 + FILE *ofp, 55059 + NCURSES_BOOL buffered) 55060 + { /* void */ } 55061 + 55062 +/* ./tinfo/strings.c */ 55063 + 55064 +#undef _nc_str_init 55065 +string_desc *_nc_str_init( 55066 + string_desc *dst, 55067 + char *src, 55068 + size_t len) 55069 + { return(*(string_desc **)0); } 55070 + 55071 +#undef _nc_str_null 55072 +string_desc *_nc_str_null( 55073 + string_desc *dst, 55074 + size_t len) 55075 + { return(*(string_desc **)0); } 55076 + 55077 +#undef _nc_str_copy 55078 +string_desc *_nc_str_copy( 55079 + string_desc *dst, 55080 + string_desc *src) 55081 + { return(*(string_desc **)0); } 55082 + 55083 +#undef _nc_safe_strcat 55084 +NCURSES_BOOL _nc_safe_strcat( 55085 + string_desc *dst, 55086 + const char *src) 55087 + { return(*(NCURSES_BOOL *)0); } 55088 + 55089 +#undef _nc_safe_strcpy 55090 +NCURSES_BOOL _nc_safe_strcpy( 55091 + string_desc *dst, 55092 + const char *src) 55093 + { return(*(NCURSES_BOOL *)0); } 55094 + 55095 +/* ./trace/trace_buf.c */ 55096 + 55097 +#undef _nc_trace_buf 55098 +char *_nc_trace_buf( 55099 + int bufnum, 55100 + size_t want) 55101 + { return(*(char **)0); } 55102 + 55103 +#undef _nc_trace_bufcat 55104 +char *_nc_trace_bufcat( 55105 + int bufnum, 55106 + const char *value) 55107 + { return(*(char **)0); } 55108 + 55109 +/* ./trace/trace_tries.c */ 55110 + 55111 +#undef _nc_trace_tries 55112 +void _nc_trace_tries( 55113 + TRIES *tree) 55114 + { /* void */ } 55115 + 55116 +/* ./base/tries.c */ 55117 + 55118 +#undef _nc_expand_try 55119 +char *_nc_expand_try( 55120 + TRIES *tree, 55121 + unsigned code, 55122 + int *count, 55123 + size_t len) 55124 + { return(*(char **)0); } 55125 + 55126 +#undef _nc_remove_key 55127 +int _nc_remove_key( 55128 + TRIES **tree, 55129 + unsigned code) 55130 + { return(*(int *)0); } 55131 + 55132 +#undef _nc_remove_string 55133 +int _nc_remove_string( 55134 + TRIES **tree, 55135 + const char *string) 55136 + { return(*(int *)0); } 55137 + 55138 +/* ./tinfo/trim_sgr0.c */ 55139 + 55140 +#undef _nc_trim_sgr0 55141 +char *_nc_trim_sgr0( 55142 + TERMTYPE *tp) 55143 + { return(*(char **)0); } 55144 + 55145 +/* ./unctrl.c */ 55146 + 55147 +#undef _nc_unctrl 55148 +const char *_nc_unctrl( 55149 + SCREEN *sp, 55150 + chtype ch) 55151 + { return(*(const char **)0); } 55152 + 55153 +#undef unctrl 55154 +const char *unctrl( 55155 + chtype ch) 55156 + { return(*(const char **)0); } 55157 + 55158 +/* ./trace/visbuf.c */ 55159 + 55160 +#undef _nc_visbuf2 55161 +const char *_nc_visbuf2( 55162 + int bufnum, 55163 + const char *buf) 55164 + { return(*(const char **)0); } 55165 + 55166 +#undef _nc_visbuf 55167 +const char *_nc_visbuf( 55168 + const char *buf) 55169 + { return(*(const char **)0); } 55170 + 55171 +#undef _nc_visbufn 55172 +const char *_nc_visbufn( 55173 + const char *buf, 55174 + int len) 55175 + { return(*(const char **)0); } 55176 + 55177 +#undef _nc_viscbuf2 55178 +const char *_nc_viscbuf2( 55179 + int bufnum, 55180 + const chtype *buf, 55181 + int len) 55182 + { return(*(const char **)0); } 55183 + 55184 +#undef _nc_viscbuf 55185 +const char *_nc_viscbuf( 55186 + const chtype *buf, 55187 + int len) 55188 + { return(*(const char **)0); } 55189 + 55190 +/* ./tinfo/alloc_entry.c */ 55191 + 55192 +#undef _nc_init_entry 55193 +void _nc_init_entry( 55194 + TERMTYPE *const tp) 55195 + { /* void */ } 55196 + 55197 +#undef _nc_copy_entry 55198 +ENTRY *_nc_copy_entry( 55199 + ENTRY *oldp) 55200 + { return(*(ENTRY **)0); } 55201 + 55202 +#undef _nc_save_str 55203 +char *_nc_save_str( 55204 + const char *const string) 55205 + { return(*(char **)0); } 55206 + 55207 +#undef _nc_wrap_entry 55208 +void _nc_wrap_entry( 55209 + ENTRY *const ep, 55210 + NCURSES_BOOL copy_strings) 55211 + { /* void */ } 55212 + 55213 +#undef _nc_merge_entry 55214 +void _nc_merge_entry( 55215 + TERMTYPE *const to, 55216 + TERMTYPE *const from) 55217 + { /* void */ } 55218 + 55219 +#undef _nc_alloc_entry_leaks 55220 +void _nc_alloc_entry_leaks(void) 55221 + { /* void */ } 55222 + 55223 +/* ./tinfo/captoinfo.c */ 55224 + 55225 +#undef _nc_captoinfo 55226 +char *_nc_captoinfo( 55227 + const char *cap, 55228 + const char *s, 55229 + int const parameterized) 55230 + { return(*(char **)0); } 55231 + 55232 +#undef _nc_infotocap 55233 +char *_nc_infotocap( 55234 + const char *cap, 55235 + const char *str, 55236 + int const parameterized) 55237 + { return(*(char **)0); } 55238 + 55239 +#undef _nc_captoinfo_leaks 55240 +void _nc_captoinfo_leaks(void) 55241 + { /* void */ } 55242 + 55243 +/* ./comp_captab.c */ 55244 + 55245 +#include <hashsize.h> 55246 + 55247 +#undef _nc_get_table 55248 +const struct name_table_entry *_nc_get_table( 55249 + NCURSES_BOOL termcap) 55250 + { return(*(const struct name_table_entry **)0); } 55251 + 55252 +#undef _nc_get_hash_table 55253 +const short *_nc_get_hash_table( 55254 + NCURSES_BOOL termcap) 55255 + { return(*(const short **)0); } 55256 + 55257 +#undef _nc_get_alias_table 55258 +const struct alias *_nc_get_alias_table( 55259 + NCURSES_BOOL termcap) 55260 + { return(*(const struct alias **)0); } 55261 + 55262 +#undef _nc_comp_captab_leaks 55263 +void _nc_comp_captab_leaks(void) 55264 + { /* void */ } 55265 + 55266 +/* ./tinfo/comp_expand.c */ 55267 + 55268 +#undef _nc_tic_expand 55269 +char *_nc_tic_expand( 55270 + const char *srcp, 55271 + NCURSES_BOOL tic_format, 55272 + int numbers) 55273 + { return(*(char **)0); } 55274 + 55275 +/* ./tinfo/comp_hash.c */ 55276 + 55277 +#undef _nc_find_entry 55278 +struct name_table_entry const *_nc_find_entry( 55279 + const char *string, 55280 + const short *hash_table) 55281 + { return(*(struct name_table_entry const **)0); } 55282 + 55283 +#undef _nc_find_type_entry 55284 +struct name_table_entry const *_nc_find_type_entry( 55285 + const char *string, 55286 + int type, 55287 + const struct name_table_entry *table) 55288 + { return(*(struct name_table_entry const **)0); } 55289 + 55290 +/* ./tinfo/comp_parse.c */ 55291 + 55292 +#undef _nc_check_termtype2 55293 +void (*_nc_check_termtype2)( 55294 + TERMTYPE *p1, 55295 + NCURSES_BOOL p2); 55296 +#undef _nc_check_termtype 55297 +void (*_nc_check_termtype)( 55298 + TERMTYPE *p1); 55299 + 55300 +#undef _nc_entry_match 55301 +NCURSES_BOOL _nc_entry_match( 55302 + char *n1, 55303 + char *n2) 55304 + { return(*(NCURSES_BOOL *)0); } 55305 + 55306 +#undef _nc_read_entry_source 55307 +void _nc_read_entry_source( 55308 + FILE *fp, 55309 + char *buf, 55310 + int literal, 55311 + NCURSES_BOOL silent, 55312 + NCURSES_BOOL (*hook)( 55313 + ENTRY *p1)) 55314 + { /* void */ } 55315 + 55316 +#undef _nc_resolve_uses2 55317 +int _nc_resolve_uses2( 55318 + NCURSES_BOOL fullresolve, 55319 + NCURSES_BOOL literal) 55320 + { return(*(int *)0); } 55321 + 55322 +#undef _nc_resolve_uses 55323 +int _nc_resolve_uses( 55324 + NCURSES_BOOL fullresolve) 55325 + { return(*(int *)0); } 55326 + 55327 +#undef _nc_leaks_tic 55328 +void _nc_leaks_tic(void) 55329 + { /* void */ } 55330 + 55331 +#undef _nc_free_tic 55332 +void _nc_free_tic( 55333 + int code) 55334 + { /* void */ } 55335 + 55336 +/* ./tinfo/comp_scan.c */ 55337 + 55338 +#undef _nc_syntax 55339 +int _nc_syntax; 55340 +#undef _nc_curr_file_pos 55341 +long _nc_curr_file_pos; 55342 +#undef _nc_comment_start 55343 +long _nc_comment_start; 55344 +#undef _nc_comment_end 55345 +long _nc_comment_end; 55346 +#undef _nc_start_line 55347 +long _nc_start_line; 55348 +#undef _nc_curr_token 55349 +struct token _nc_curr_token; 55350 +#undef _nc_disable_period 55351 +NCURSES_BOOL _nc_disable_period; 55352 + 55353 +#undef _nc_reset_input 55354 +void _nc_reset_input( 55355 + FILE *fp, 55356 + char *buf) 55357 + { /* void */ } 55358 + 55359 +#undef _nc_get_token 55360 +int _nc_get_token( 55361 + NCURSES_BOOL silent) 55362 + { return(*(int *)0); } 55363 + 55364 +#undef _nc_trans_string 55365 +int _nc_trans_string( 55366 + char *ptr, 55367 + char *last) 55368 + { return(*(int *)0); } 55369 + 55370 +#undef _nc_push_token 55371 +void _nc_push_token( 55372 + int tokclass) 55373 + { /* void */ } 55374 + 55375 +#undef _nc_panic_mode 55376 +void _nc_panic_mode( 55377 + char ch) 55378 + { /* void */ } 55379 + 55380 +#undef _nc_comp_scan_leaks 55381 +void _nc_comp_scan_leaks(void) 55382 + { /* void */ } 55383 + 55384 +/* ./tinfo/parse_entry.c */ 55385 + 55386 +#undef _nc_parse_entry 55387 +int _nc_parse_entry( 55388 + struct entry *entryp, 55389 + int literal, 55390 + NCURSES_BOOL silent) 55391 + { return(*(int *)0); } 55392 + 55393 +#undef _nc_capcmp 55394 +int _nc_capcmp( 55395 + const char *s, 55396 + const char *t) 55397 + { return(*(int *)0); } 55398 + 55399 +typedef struct { 55400 + const char *from; 55401 + const char *to; 55402 +} assoc; 55403 + 55404 +/* ./tinfo/write_entry.c */ 55405 + 55406 +#undef _nc_set_writedir 55407 +void _nc_set_writedir( 55408 + char *dir) 55409 + { /* void */ } 55410 + 55411 +#undef _nc_write_entry 55412 +void _nc_write_entry( 55413 + TERMTYPE *const tp) 55414 + { /* void */ } 55415 + 55416 +#undef _nc_tic_written 55417 +int _nc_tic_written(void) 55418 + { return(*(int *)0); } 55419 + 55420 +/* ./base/define_key.c */ 55421 + 55422 +#undef define_key 55423 +int define_key( 55424 + const char *str, 55425 + int keycode) 55426 + { return(*(int *)0); } 55427 + 55428 +/* ./tinfo/hashed_db.c */ 55429 + 55430 +#undef _nc_hashed_db 55431 +void _nc_hashed_db(void) 55432 + { /* void */ } 55433 + 55434 +/* ./base/key_defined.c */ 55435 + 55436 +#undef key_defined 55437 +int key_defined( 55438 + const char *str) 55439 + { return(*(int *)0); } 55440 + 55441 +/* ./base/keybound.c */ 55442 + 55443 +#undef keybound 55444 +char *keybound( 55445 + int code, 55446 + int count) 55447 + { return(*(char **)0); } 55448 + 55449 +/* ./base/keyok.c */ 55450 + 55451 +#undef keyok 55452 +int keyok( 55453 + int c, 55454 + NCURSES_BOOL flag) 55455 + { return(*(int *)0); } 55456 + 55457 +/* ./base/version.c */ 55458 + 55459 +#undef curses_version 55460 +const char *curses_version(void) 55461 + { return(*(const char **)0); } 46516 55462 diff -Naur ncurses-5.6.orig/ncurses/llib-lncursesw ncurses-5.6/ncurses/llib-lncursesw 46517 55463 --- ncurses-5.6.orig/ncurses/llib-lncursesw 2006-12-17 12:37:36.000000000 -0500 46518 +++ ncurses-5.6/ncurses/llib-lncursesw 200 7-12-21 00:02:36.000000000 -050055464 +++ ncurses-5.6/ncurses/llib-lncursesw 2008-06-18 06:49:44.000000000 -0400 46519 55465 @@ -1066,6 +1066,11 @@ 46520 55466 WINDOW *z) … … 47259 56205 diff -Naur ncurses-5.6.orig/ncurses/modules ncurses-5.6/ncurses/modules 47260 56206 --- ncurses-5.6.orig/ncurses/modules 2006-08-12 10:19:44.000000000 -0400 47261 +++ ncurses-5.6/ncurses/modules 200 7-12-21 00:02:36.000000000 -050056207 +++ ncurses-5.6/ncurses/modules 2008-06-18 06:49:44.000000000 -0400 47262 56208 @@ -1,6 +1,6 @@ 47263 56209 -# $Id: modules,v 1.107 2006/08/12 14:19:44 tom Exp $ … … 47348 56294 diff -Naur ncurses-5.6.orig/ncurses/tinfo/MKcaptab.awk ncurses-5.6/ncurses/tinfo/MKcaptab.awk 47349 56295 --- ncurses-5.6.orig/ncurses/tinfo/MKcaptab.awk 2006-04-22 17:46:17.000000000 -0400 47350 +++ ncurses-5.6/ncurses/tinfo/MKcaptab.awk 200 7-12-21 00:02:36.000000000 -050056296 +++ ncurses-5.6/ncurses/tinfo/MKcaptab.awk 2008-06-18 06:49:44.000000000 -0400 47351 56297 @@ -1,6 +1,5 @@ 47352 56298 -#!/bin/sh … … 47497 56443 diff -Naur ncurses-5.6.orig/ncurses/tinfo/MKcaptab.sh ncurses-5.6/ncurses/tinfo/MKcaptab.sh 47498 56444 --- ncurses-5.6.orig/ncurses/tinfo/MKcaptab.sh 1969-12-31 19:00:00.000000000 -0500 47499 +++ ncurses-5.6/ncurses/tinfo/MKcaptab.sh 200 7-12-21 00:02:36.000000000 -050056445 +++ ncurses-5.6/ncurses/tinfo/MKcaptab.sh 2008-06-18 06:49:44.000000000 -0400 47500 56446 @@ -0,0 +1,149 @@ 47501 56447 +#!/bin/sh … … 47650 56596 diff -Naur ncurses-5.6.orig/ncurses/tinfo/MKcodes.awk ncurses-5.6/ncurses/tinfo/MKcodes.awk 47651 56597 --- ncurses-5.6.orig/ncurses/tinfo/MKcodes.awk 1969-12-31 19:00:00.000000000 -0500 47652 +++ ncurses-5.6/ncurses/tinfo/MKcodes.awk 200 7-12-21 00:02:36.000000000 -050056598 +++ ncurses-5.6/ncurses/tinfo/MKcodes.awk 2008-06-18 06:49:44.000000000 -0400 47653 56599 @@ -0,0 +1,161 @@ 47654 56600 +############################################################################## … … 47815 56761 diff -Naur ncurses-5.6.orig/ncurses/tinfo/MKnames.awk ncurses-5.6/ncurses/tinfo/MKnames.awk 47816 56762 --- ncurses-5.6.orig/ncurses/tinfo/MKnames.awk 2006-04-22 17:46:17.000000000 -0400 47817 +++ ncurses-5.6/ncurses/tinfo/MKnames.awk 200 7-12-21 00:02:36.000000000 -050056763 +++ ncurses-5.6/ncurses/tinfo/MKnames.awk 2008-06-18 06:49:44.000000000 -0400 47818 56764 @@ -1,5 +1,5 @@ 47819 56765 ############################################################################## … … 48068 57014 diff -Naur ncurses-5.6.orig/ncurses/tinfo/access.c ncurses-5.6/ncurses/tinfo/access.c 48069 57015 --- ncurses-5.6.orig/ncurses/tinfo/access.c 2006-08-05 13:18:14.000000000 -0400 48070 +++ ncurses-5.6/ncurses/tinfo/access.c 200 7-12-21 00:02:36.000000000 -050057016 +++ ncurses-5.6/ncurses/tinfo/access.c 2008-06-18 06:49:44.000000000 -0400 48071 57017 @@ -1,5 +1,5 @@ 48072 57018 /**************************************************************************** … … 48110 57056 diff -Naur ncurses-5.6.orig/ncurses/tinfo/add_tries.c ncurses-5.6/ncurses/tinfo/add_tries.c 48111 57057 --- ncurses-5.6.orig/ncurses/tinfo/add_tries.c 2005-11-19 20:32:48.000000000 -0500 48112 +++ ncurses-5.6/ncurses/tinfo/add_tries.c 200 7-12-21 00:02:36.000000000 -050057058 +++ ncurses-5.6/ncurses/tinfo/add_tries.c 2008-06-18 06:49:44.000000000 -0400 48113 57059 @@ -1,5 +1,5 @@ 48114 57060 /**************************************************************************** … … 48220 57166 diff -Naur ncurses-5.6.orig/ncurses/tinfo/comp_error.c ncurses-5.6/ncurses/tinfo/comp_error.c 48221 57167 --- ncurses-5.6.orig/ncurses/tinfo/comp_error.c 2005-11-26 10:28:47.000000000 -0500 48222 +++ ncurses-5.6/ncurses/tinfo/comp_error.c 200 7-12-21 00:02:36.000000000 -050057168 +++ ncurses-5.6/ncurses/tinfo/comp_error.c 2008-06-18 06:49:44.000000000 -0400 48223 57169 @@ -1,5 +1,5 @@ 48224 57170 /**************************************************************************** … … 48309 57255 diff -Naur ncurses-5.6.orig/ncurses/tinfo/comp_hash.c ncurses-5.6/ncurses/tinfo/comp_hash.c 48310 57256 --- ncurses-5.6.orig/ncurses/tinfo/comp_hash.c 2005-08-20 15:58:18.000000000 -0400 48311 +++ ncurses-5.6/ncurses/tinfo/comp_hash.c 200 7-12-21 00:02:36.000000000 -050057257 +++ ncurses-5.6/ncurses/tinfo/comp_hash.c 2008-06-18 06:49:44.000000000 -0400 48312 57258 @@ -1,5 +1,5 @@ 48313 57259 /**************************************************************************** … … 48500 57446 diff -Naur ncurses-5.6.orig/ncurses/tinfo/comp_parse.c ncurses-5.6/ncurses/tinfo/comp_parse.c 48501 57447 --- ncurses-5.6.orig/ncurses/tinfo/comp_parse.c 2006-07-08 14:55:14.000000000 -0400 48502 +++ ncurses-5.6/ncurses/tinfo/comp_parse.c 200 7-12-21 00:02:36.000000000 -050057448 +++ ncurses-5.6/ncurses/tinfo/comp_parse.c 2008-06-18 06:49:44.000000000 -0400 48503 57449 @@ -1,5 +1,5 @@ 48504 57450 /**************************************************************************** … … 48629 57575 diff -Naur ncurses-5.6.orig/ncurses/tinfo/db_iterator.c ncurses-5.6/ncurses/tinfo/db_iterator.c 48630 57576 --- ncurses-5.6.orig/ncurses/tinfo/db_iterator.c 2006-12-16 14:06:42.000000000 -0500 48631 +++ ncurses-5.6/ncurses/tinfo/db_iterator.c 200 7-12-21 00:02:36.000000000 -050057577 +++ ncurses-5.6/ncurses/tinfo/db_iterator.c 2008-06-18 06:49:44.000000000 -0400 48632 57578 @@ -1,5 +1,5 @@ 48633 57579 /**************************************************************************** … … 48763 57709 diff -Naur ncurses-5.6.orig/ncurses/tinfo/entries.c ncurses-5.6/ncurses/tinfo/entries.c 48764 57710 --- ncurses-5.6.orig/ncurses/tinfo/entries.c 1969-12-31 19:00:00.000000000 -0500 48765 +++ ncurses-5.6/ncurses/tinfo/entries.c 200 7-12-21 00:02:36.000000000 -050057711 +++ ncurses-5.6/ncurses/tinfo/entries.c 2008-06-18 06:49:44.000000000 -0400 48766 57712 @@ -0,0 +1,144 @@ 48767 57713 +/**************************************************************************** … … 48911 57857 diff -Naur ncurses-5.6.orig/ncurses/tinfo/home_terminfo.c ncurses-5.6/ncurses/tinfo/home_terminfo.c 48912 57858 --- ncurses-5.6.orig/ncurses/tinfo/home_terminfo.c 2005-07-02 15:43:38.000000000 -0400 48913 +++ ncurses-5.6/ncurses/tinfo/home_terminfo.c 200 7-12-21 00:02:36.000000000 -050057859 +++ ncurses-5.6/ncurses/tinfo/home_terminfo.c 2008-06-18 06:49:44.000000000 -0400 48914 57860 @@ -1,5 +1,5 @@ 48915 57861 /**************************************************************************** … … 48971 57917 diff -Naur ncurses-5.6.orig/ncurses/tinfo/init_keytry.c ncurses-5.6/ncurses/tinfo/init_keytry.c 48972 57918 --- ncurses-5.6.orig/ncurses/tinfo/init_keytry.c 2006-01-21 18:43:28.000000000 -0500 48973 +++ ncurses-5.6/ncurses/tinfo/init_keytry.c 2007-12-21 00:02:36.000000000 -0500 57919 +++ ncurses-5.6/ncurses/tinfo/init_keytry.c 2008-06-18 06:49:51.000000000 -0400 57920 @@ -1,5 +1,5 @@ 57921 /**************************************************************************** 57922 - * Copyright (c) 1999-2005,2006 Free Software Foundation, Inc. * 57923 + * Copyright (c) 1999-2006,2008 Free Software Foundation, Inc. * 57924 * * 57925 * Permission is hereby granted, free of charge, to any person obtaining a * 57926 * copy of this software and associated documentation files (the * 48974 57927 @@ -36,7 +36,7 @@ 48975 57928 … … 48977 57930 48978 57931 -MODULE_ID("$Id: init_keytry.c,v 1.8 2006/01/21 23:43:28 tom Exp $") 48979 +MODULE_ID("$Id: init_keytry.c,v 1.1 0 2007/04/29 22:57:50tom Exp $")57932 +MODULE_ID("$Id: init_keytry.c,v 1.12 2008/05/24 21:44:51 tom Exp $") 48980 57933 48981 57934 /* 48982 57935 ** _nc_init_keytry() 48983 @@ -56,7 +56,7 @@ 57936 @@ -45,6 +45,13 @@ 57937 ** 57938 */ 57939 57940 +/* 57941 + * Internal entrypoints use SCREEN* parameter to obtain capabilities rather 57942 + * than cur_term. 57943 + */ 57944 +#undef CUR 57945 +#define CUR (sp->_term)->type. 57946 + 57947 #if BROKEN_LINKER 57948 #undef _nc_tinfo_fkeys 57949 #endif 57950 @@ -56,7 +63,7 @@ 48984 57951 #endif*/ 48985 57952 … … 48990 57957 { 48991 57958 return _nc_tinfo_fkeys; 48992 @@ -76,9 +76,9 @@ 48993 if (SP != 0) { 57959 @@ -64,21 +71,21 @@ 57960 #endif 57961 57962 NCURSES_EXPORT(void) 57963 -_nc_init_keytry(void) 57964 +_nc_init_keytry(SCREEN *sp) 57965 { 57966 size_t n; 57967 57968 - /* The SP->_keytry value is initialized in newterm(), where the SP 57969 + /* The sp->_keytry value is initialized in newterm(), where the sp 57970 * structure is created, because we can not tell where keypad() or 57971 * mouse_activate() (which will call keyok()) are first called. 57972 */ 57973 57974 - if (SP != 0) { 57975 + if (sp != 0) { 48994 57976 for (n = 0; _nc_tinfo_fkeys[n].code; n++) { 48995 57977 if (_nc_tinfo_fkeys[n].offset < STRCOUNT) { … … 48997 57979 - CUR Strings[_nc_tinfo_fkeys[n].offset], 48998 57980 - _nc_tinfo_fkeys[n].code); 48999 + (void) _nc_add_to_try(&( SP->_keytry),57981 + (void) _nc_add_to_try(&(sp->_keytry), 49000 57982 + CUR Strings[_nc_tinfo_fkeys[n].offset], 49001 57983 + _nc_tinfo_fkeys[n].code); … … 49003 57985 } 49004 57986 #if NCURSES_XNAMES 49005 @@ -96,9 +96,9 @@ 57987 @@ -88,7 +95,7 @@ 57988 * names. 57989 */ 57990 { 57991 - TERMTYPE *tp = &(SP->_term->type); 57992 + TERMTYPE *tp = &(sp->_term->type); 57993 for (n = STRCOUNT; n < NUM_STRINGS(tp); ++n) { 57994 const char *name = ExtStrname(tp, n, strnames); 57995 char *value = tp->Strings[n]; 57996 @@ -96,15 +103,15 @@ 49006 57997 && *name == 'k' 49007 57998 && value != 0 … … 49010 58001 - value, 49011 58002 - n - STRCOUNT + KEY_MAX); 49012 + (void) _nc_add_to_try(&( SP->_keytry),58003 + (void) _nc_add_to_try(&(sp->_keytry), 49013 58004 + value, 49014 58005 + n - STRCOUNT + KEY_MAX); … … 49016 58007 } 49017 58008 } 58009 #endif 58010 #ifdef TRACE 58011 - _nc_trace_tries(SP->_keytry); 58012 + _nc_trace_tries(sp->_keytry); 58013 #endif 58014 } 58015 } 49018 58016 diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_acs.c ncurses-5.6/ncurses/tinfo/lib_acs.c 49019 58017 --- ncurses-5.6.orig/ncurses/tinfo/lib_acs.c 2006-01-07 16:27:15.000000000 -0500 49020 +++ ncurses-5.6/ncurses/tinfo/lib_acs.c 200 7-12-21 00:02:36.000000000 -050058018 +++ ncurses-5.6/ncurses/tinfo/lib_acs.c 2008-06-18 06:49:44.000000000 -0400 49021 58019 @@ -1,5 +1,5 @@ 49022 58020 /**************************************************************************** … … 49087 58085 diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_baudrate.c ncurses-5.6/ncurses/tinfo/lib_baudrate.c 49088 58086 --- ncurses-5.6.orig/ncurses/tinfo/lib_baudrate.c 2002-01-19 18:07:53.000000000 -0500 49089 +++ ncurses-5.6/ncurses/tinfo/lib_baudrate.c 200 7-12-21 00:02:36.000000000 -050058087 +++ ncurses-5.6/ncurses/tinfo/lib_baudrate.c 2008-06-18 06:49:44.000000000 -0400 49090 58088 @@ -1,5 +1,5 @@ 49091 58089 /**************************************************************************** … … 49169 58167 return (result); 49170 58168 } 58169 diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_cur_term.c ncurses-5.6/ncurses/tinfo/lib_cur_term.c 58170 --- ncurses-5.6.orig/ncurses/tinfo/lib_cur_term.c 2003-12-27 13:21:30.000000000 -0500 58171 +++ ncurses-5.6/ncurses/tinfo/lib_cur_term.c 2008-06-18 06:49:51.000000000 -0400 58172 @@ -1,5 +1,5 @@ 58173 /**************************************************************************** 58174 - * Copyright (c) 1998-2000,2003 Free Software Foundation, Inc. * 58175 + * Copyright (c) 1998-2003,2008 Free Software Foundation, Inc. * 58176 * * 58177 * Permission is hereby granted, free of charge, to any person obtaining a * 58178 * copy of this software and associated documentation files (the * 58179 @@ -40,21 +40,45 @@ 58180 #include <term_entry.h> /* TTY, cur_term */ 58181 #include <termcap.h> /* ospeed */ 58182 58183 -MODULE_ID("$Id: lib_cur_term.c,v 1.13 2003/12/27 18:21:30 tom Exp $") 58184 +MODULE_ID("$Id: lib_cur_term.c,v 1.16 2008/06/07 22:22:16 tom Exp $") 58185 58186 +#undef CUR 58187 +#define CUR termp->type. 58188 + 58189 +#if USE_REENTRANT 58190 +NCURSES_EXPORT(TERMINAL *) 58191 +NCURSES_PUBLIC_VAR(cur_term) (void) 58192 +{ 58193 + return (SP != 0 && SP->_term != 0) ? SP->_term : _nc_prescreen._cur_term; 58194 +} 58195 +#else 58196 NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0; 58197 +#endif 58198 58199 NCURSES_EXPORT(TERMINAL *) 58200 set_curterm(TERMINAL * termp) 58201 { 58202 - TERMINAL *oldterm = cur_term; 58203 + TERMINAL *oldterm; 58204 58205 T((T_CALLED("set_curterm(%p)"), termp)); 58206 58207 - if ((cur_term = termp) != 0) { 58208 - ospeed = _nc_ospeed(cur_term->_baudrate); 58209 - PC = (pad_char != NULL) ? pad_char[0] : 0; 58210 + _nc_lock_global(curses); 58211 + oldterm = cur_term; 58212 + if (SP) 58213 + SP->_term = termp; 58214 +#if USE_REENTRANT 58215 + _nc_prescreen._cur_term = termp; 58216 +#else 58217 + cur_term = termp; 58218 +#endif 58219 + if (termp != 0) { 58220 + ospeed = _nc_ospeed(termp->_baudrate); 58221 + if (termp->type.Strings) { 58222 + PC = (pad_char != NULL) ? pad_char[0] : 0; 58223 + } 58224 } 58225 + _nc_unlock_global(curses); 58226 + 58227 T((T_RETURN("%p"), oldterm)); 58228 return (oldterm); 58229 } 58230 @@ -62,15 +86,20 @@ 58231 NCURSES_EXPORT(int) 58232 del_curterm(TERMINAL * termp) 58233 { 58234 + int rc = ERR; 58235 + 58236 T((T_CALLED("del_curterm(%p)"), termp)); 58237 58238 + _nc_lock_global(curses); 58239 if (termp != 0) { 58240 _nc_free_termtype(&(termp->type)); 58241 FreeIfNeeded(termp->_termname); 58242 free(termp); 58243 if (termp == cur_term) 58244 - cur_term = 0; 58245 - returnCode(OK); 58246 + set_curterm(0); 58247 + rc = OK; 58248 } 58249 - returnCode(ERR); 58250 + _nc_unlock_global(curses); 58251 + 58252 + returnCode(rc); 58253 } 49171 58254 diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_data.c ncurses-5.6/ncurses/tinfo/lib_data.c 49172 58255 --- ncurses-5.6.orig/ncurses/tinfo/lib_data.c 2005-01-22 12:39:22.000000000 -0500 49173 +++ ncurses-5.6/ncurses/tinfo/lib_data.c 200 7-12-21 00:02:36.000000000 -050058256 +++ ncurses-5.6/ncurses/tinfo/lib_data.c 2008-06-18 06:49:51.000000000 -0400 49174 58257 @@ -1,5 +1,5 @@ 49175 58258 /**************************************************************************** 49176 58259 - * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. * 49177 + * Copyright (c) 1998-200 5,2007Free Software Foundation, Inc. *58260 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 49178 58261 * * 49179 58262 * Permission is hereby granted, free of charge, to any person obtaining a * … … 49184 58267 49185 58268 -MODULE_ID("$Id: lib_data.c,v 1.17 2005/01/22 17:39:22 tom Exp $") 49186 +MODULE_ID("$Id: lib_data.c,v 1. 34 2007/10/20 21:49:10tom Exp $")58269 +MODULE_ID("$Id: lib_data.c,v 1.48 2008/06/07 14:03:15 tom Exp $") 49187 58270 49188 58271 /* … … 49214 58297 NCURSES_EXPORT_VAR(SCREEN *) _nc_screen_chain = 0; 49215 58298 49216 @@ -87,3 +105,1 29@@58299 @@ -87,3 +105,183 @@ 49217 58300 #else 49218 58301 NCURSES_EXPORT_VAR(SCREEN *) SP = NULL; /* Some linkers require initialized data... */ … … 49222 58305 + 49223 58306 +#define TGETENT_0 { 0L, FALSE, NULL, NULL, NULL } 49224 +#define TGETENT_0s { TGETENT_0, TGETENT_0, TGETENT_0, TGETENT_0 } 58307 +#define TGETENT_0s { TGETENT_0, TGETENT_0, TGETENT_0, TGETENT_0 } 49225 58308 + 49226 58309 +NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = { … … 49244 58327 + NULL, /* keyname_table */ 49245 58328 + 58329 + 0, /* slk_format */ 58330 + 49246 58331 + NULL, /* safeprint_buf */ 49247 58332 + 0, /* safeprint_used */ … … 49250 58335 + 0, /* tgetent_index */ 49251 58336 + 0, /* tgetent_sequence */ 58337 + 58338 + 0, /* _nc_windowlist */ 49252 58339 + 49253 58340 +#if USE_HOME_TERMINFO … … 49277 58364 + 0, /* tracedmp_used */ 49278 58365 + 49279 + CHARS_0s, /* tracemse_buf */49280 +49281 58366 + NULL, /* tracetry_buf */ 49282 58367 + 0, /* tracetry_used */ 49283 58368 + 49284 +#ifndef USE_TERMLIB49285 58369 + { CHARS_0s, CHARS_0s }, /* traceatr_color_buf */ 49286 58370 + 0, /* traceatr_color_sel */ 49287 58371 + -1, /* traceatr_color_last */ 49288 +#endif /* USE_TERMLIB */49289 58372 + 49290 58373 +#endif /* TRACE */ 49291 58374 +#ifdef USE_PTHREADS 49292 + PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, /* mutex_set_SP */ 49293 + PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, /* mutex_use_screen */ 49294 + PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, /* mutex_use_window */ 49295 + PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, /* mutex_windowlist */ 58375 + PTHREAD_MUTEX_INITIALIZER, /* mutex_curses */ 49296 58376 + PTHREAD_MUTEX_INITIALIZER, /* mutex_tst_tracef */ 49297 58377 + PTHREAD_MUTEX_INITIALIZER, /* mutex_tracef */ … … 49304 58384 +#define NUM_VARS_0s { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } 49305 58385 + 49306 +#define RIPOFF_0 { 0,0 }58386 +#define RIPOFF_0 { 0,0,0 } 49307 58387 +#define RIPOFF_0s { RIPOFF_0 } 49308 58388 + … … 49337 58417 + 0, /* LINES */ 49338 58418 + 0, /* COLS */ 58419 + 0, /* cur_term */ 49339 58420 +#ifdef TRACE 49340 58421 + 0L, /* _outchars */ … … 49344 58425 +}; 49345 58426 +/* *INDENT-ON* */ 58427 + 58428 +/******************************************************************************/ 58429 +#ifdef USE_PTHREADS 58430 +static void 58431 +init_global_mutexes(void) 58432 +{ 58433 + static bool initialized = FALSE; 58434 + 58435 + if (!initialized) { 58436 + initialized = TRUE; 58437 + _nc_mutex_init(&_nc_globals.mutex_curses); 58438 + _nc_mutex_init(&_nc_globals.mutex_tst_tracef); 58439 + _nc_mutex_init(&_nc_globals.mutex_tracef); 58440 + } 58441 +} 58442 + 58443 +/* 58444 + * Use recursive mutexes if we have them - they're part of Unix98. 58445 + * For the cases where we do not, _nc_mutex_trylock() is used to avoid a 58446 + * deadlock, at the expense of memory leaks and unexpected failures that 58447 + * may not be handled by typical clients. 58448 + * 58449 + * FIXME - need configure check for PTHREAD_MUTEX_RECURSIVE, define it to 58450 + * PTHREAD_MUTEX_NORMAL if not supported. 58451 + */ 58452 +NCURSES_EXPORT(void) 58453 +_nc_mutex_init(pthread_mutex_t * obj) 58454 +{ 58455 + pthread_mutexattr_t recattr; 58456 + 58457 + memset(&recattr, 0, sizeof(recattr)); 58458 + pthread_mutexattr_settype(&recattr, PTHREAD_MUTEX_RECURSIVE); 58459 + pthread_mutex_init(obj, &recattr); 58460 +} 58461 + 58462 +NCURSES_EXPORT(int) 58463 +_nc_mutex_lock(pthread_mutex_t * obj) 58464 +{ 58465 + init_global_mutexes(); 58466 + return pthread_mutex_lock(obj); 58467 +} 58468 + 58469 +NCURSES_EXPORT(int) 58470 +_nc_mutex_trylock(pthread_mutex_t * obj) 58471 +{ 58472 + init_global_mutexes(); 58473 + return pthread_mutex_trylock(obj); 58474 +} 58475 + 58476 +NCURSES_EXPORT(int) 58477 +_nc_mutex_unlock(pthread_mutex_t * obj) 58478 +{ 58479 + init_global_mutexes(); 58480 + return pthread_mutex_unlock(obj); 58481 +} 58482 +#endif /* USE_PTHREADS */ 58483 diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_napms.c ncurses-5.6/ncurses/tinfo/lib_napms.c 58484 --- ncurses-5.6.orig/ncurses/tinfo/lib_napms.c 2005-04-03 09:58:14.000000000 -0400 58485 +++ ncurses-5.6/ncurses/tinfo/lib_napms.c 2008-06-18 06:49:50.000000000 -0400 58486 @@ -1,5 +1,5 @@ 58487 /**************************************************************************** 58488 - * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. * 58489 + * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. * 58490 * * 58491 * Permission is hereby granted, free of charge, to any person obtaining a * 58492 * copy of this software and associated documentation files (the * 58493 @@ -49,7 +49,7 @@ 58494 #endif 58495 #endif 58496 58497 -MODULE_ID("$Id: lib_napms.c,v 1.15 2005/04/03 13:58:14 tom Exp $") 58498 +MODULE_ID("$Id: lib_napms.c,v 1.17 2008/05/03 21:34:13 tom Exp $") 58499 58500 NCURSES_EXPORT(int) 58501 napms(int ms) 58502 @@ -67,7 +67,7 @@ 58503 } 58504 } 58505 #else 58506 - _nc_timed_wait(0, ms, (int *) 0 EVENTLIST_2nd(0)); 58507 + _nc_timed_wait(0, 0, ms, (int *) 0 EVENTLIST_2nd(0)); 58508 #endif 58509 58510 returnCode(OK); 49346 58511 diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_options.c ncurses-5.6/ncurses/tinfo/lib_options.c 49347 58512 --- ncurses-5.6.orig/ncurses/tinfo/lib_options.c 2006-03-04 14:28:25.000000000 -0500 49348 +++ ncurses-5.6/ncurses/tinfo/lib_options.c 2007-12-21 00:02:36.000000000 -0500 49349 @@ -43,7 +43,7 @@ 58513 +++ ncurses-5.6/ncurses/tinfo/lib_options.c 2008-06-18 06:49:51.000000000 -0400 58514 @@ -1,5 +1,5 @@ 58515 /**************************************************************************** 58516 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 58517 + * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * 58518 * * 58519 * Permission is hereby granted, free of charge, to any person obtaining a * 58520 * copy of this software and associated documentation files (the * 58521 @@ -43,7 +43,10 @@ 49350 58522 49351 58523 #include <term.h> 49352 58524 49353 58525 -MODULE_ID("$Id: lib_options.c,v 1.49 2006/03/04 19:28:25 tom Exp $") 49354 +MODULE_ID("$Id: lib_options.c,v 1.50 2006/12/30 16:03:27 tom Exp $") 58526 +MODULE_ID("$Id: lib_options.c,v 1.56 2008/06/07 14:01:46 tom Exp $") 58527 + 58528 +static int _nc_curs_set(SCREEN *, int); 58529 +static int _nc_meta(SCREEN *, bool); 49355 58530 49356 58531 NCURSES_EXPORT(int) 49357 58532 idlok(WINDOW *win, bool flag) 49358 @@ -220,7 +220,7 @@ 58533 @@ -126,7 +129,7 @@ 58534 58535 if (win) { 58536 win->_use_keypad = flag; 58537 - returnCode(_nc_keypad(flag)); 58538 + returnCode(_nc_keypad(SP, flag)); 58539 } else 58540 returnCode(ERR); 58541 } 58542 @@ -134,23 +137,11 @@ 58543 NCURSES_EXPORT(int) 58544 meta(WINDOW *win GCC_UNUSED, bool flag) 58545 { 58546 - int result = ERR; 58547 + int result; 58548 58549 /* Ok, we stay relaxed and don't signal an error if win is NULL */ 58550 T((T_CALLED("meta(%p,%d)"), win, flag)); 58551 - 58552 - if (SP != 0) { 58553 - SP->_use_meta = flag; 58554 - 58555 - if (flag && meta_on) { 58556 - TPUTS_TRACE("meta_on"); 58557 - putp(meta_on); 58558 - } else if (!flag && meta_off) { 58559 - TPUTS_TRACE("meta_off"); 58560 - putp(meta_off); 58561 - } 58562 - result = OK; 58563 - } 58564 + result = _nc_meta(SP, flag); 58565 returnCode(result); 58566 } 58567 58568 @@ -159,43 +150,10 @@ 58569 NCURSES_EXPORT(int) 58570 curs_set(int vis) 58571 { 58572 - int result = ERR; 58573 + int result; 58574 58575 T((T_CALLED("curs_set(%d)"), vis)); 58576 - if (SP != 0 && vis >= 0 && vis <= 2) { 58577 - int cursor = SP->_cursor; 58578 - 58579 - if (vis == cursor) { 58580 - result = cursor; 58581 - } else { 58582 - result = (cursor == -1 ? 1 : cursor); 58583 - switch (vis) { 58584 - case 2: 58585 - if (cursor_visible) { 58586 - TPUTS_TRACE("cursor_visible"); 58587 - putp(cursor_visible); 58588 - } else 58589 - result = ERR; 58590 - break; 58591 - case 1: 58592 - if (cursor_normal) { 58593 - TPUTS_TRACE("cursor_normal"); 58594 - putp(cursor_normal); 58595 - } else 58596 - result = ERR; 58597 - break; 58598 - case 0: 58599 - if (cursor_invisible) { 58600 - TPUTS_TRACE("cursor_invisible"); 58601 - putp(cursor_invisible); 58602 - } else 58603 - result = ERR; 58604 - break; 58605 - } 58606 - SP->_cursor = vis; 58607 - _nc_flush(); 58608 - } 58609 - } 58610 + result = _nc_curs_set(SP, vis); 58611 returnCode(result); 58612 } 58613 58614 @@ -220,7 +178,7 @@ 49359 58615 49360 58616 #if NCURSES_EXT_FUNCS 49361 58617 static int 49362 58618 -has_key_internal(int keycode, struct tries *tp) 49363 +has_key_internal(int keycode, TRIES * tp)58619 +has_key_internal(int keycode, TRIES * tp) 49364 58620 { 49365 58621 if (tp == 0) 49366 58622 return (FALSE); 58623 @@ -239,6 +197,35 @@ 58624 } 58625 #endif /* NCURSES_EXT_FUNCS */ 58626 58627 +/* 58628 + * Internal entrypoints use SCREEN* parameter to obtain capabilities rather 58629 + * than cur_term. 58630 + */ 58631 +#undef CUR 58632 +#define CUR (sp->_term)->type. 58633 + 58634 +static int 58635 +_nc_putp(const char *name GCC_UNUSED, const char *value) 58636 +{ 58637 + int rc = ERR; 58638 + 58639 + if (value) { 58640 + TPUTS_TRACE(name); 58641 + rc = putp(value); 58642 + } 58643 + return rc; 58644 +} 58645 + 58646 +static int 58647 +_nc_putp_flush(const char *name, const char *value) 58648 +{ 58649 + int rc = _nc_putp(name, value); 58650 + if (rc != ERR) { 58651 + _nc_flush(); 58652 + } 58653 + return rc; 58654 +} 58655 + 58656 /* Turn the keypad on/off 58657 * 58658 * Note: we flush the output because changing this mode causes some terminals 58659 @@ -247,24 +234,94 @@ 58660 * the terminal state _before_ switching modes. 58661 */ 58662 NCURSES_EXPORT(int) 58663 -_nc_keypad(bool flag) 58664 +_nc_keypad(SCREEN *sp, bool flag) 58665 { 58666 - if (flag && keypad_xmit) { 58667 - TPUTS_TRACE("keypad_xmit"); 58668 - putp(keypad_xmit); 58669 - _nc_flush(); 58670 - } else if (!flag && keypad_local) { 58671 - TPUTS_TRACE("keypad_local"); 58672 - putp(keypad_local); 58673 - _nc_flush(); 58674 + int rc = ERR; 58675 + 58676 + if (sp != 0) { 58677 +#ifdef USE_PTHREADS 58678 + /* 58679 + * We might have this situation in a multithreaded application that 58680 + * has wgetch() reading in more than one thread. putp() and below 58681 + * may use SP explicitly. 58682 + */ 58683 + if (sp != SP) { 58684 + SCREEN *save_sp; 58685 + 58686 + /* cannot use use_screen(), since that is not in tinfo library */ 58687 + _nc_lock_global(curses); 58688 + save_sp = SP; 58689 + SP = sp; 58690 + rc = _nc_keypad(sp, flag); 58691 + SP = save_sp; 58692 + _nc_unlock_global(curses); 58693 + } else 58694 +#endif 58695 + { 58696 + if (flag) { 58697 + (void) _nc_putp_flush("keypad_xmit", keypad_xmit); 58698 + } else if (!flag && keypad_local) { 58699 + (void) _nc_putp_flush("keypad_local", keypad_local); 58700 + } 58701 + 58702 + if (flag && !sp->_tried) { 58703 + _nc_init_keytry(sp); 58704 + sp->_tried = TRUE; 58705 + } 58706 + sp->_keypad_on = flag; 58707 + rc = OK; 58708 + } 58709 } 58710 + return (rc); 58711 +} 58712 + 58713 +static int 58714 +_nc_curs_set(SCREEN *sp, int vis) 58715 +{ 58716 + int result = ERR; 58717 + 58718 + T((T_CALLED("curs_set(%d)"), vis)); 58719 + if (sp != 0 && vis >= 0 && vis <= 2) { 58720 + int cursor = sp->_cursor; 58721 + 58722 + if (vis == cursor) { 58723 + result = cursor; 58724 + } else { 58725 + switch (vis) { 58726 + case 2: 58727 + result = _nc_putp_flush("cursor_visible", cursor_visible); 58728 + break; 58729 + case 1: 58730 + result = _nc_putp_flush("cursor_normal", cursor_normal); 58731 + break; 58732 + case 0: 58733 + result = _nc_putp_flush("cursor_invisible", cursor_invisible); 58734 + break; 58735 + } 58736 + if (result != ERR) 58737 + result = (cursor == -1 ? 1 : cursor); 58738 + sp->_cursor = vis; 58739 + } 58740 + } 58741 + returnCode(result); 58742 +} 58743 + 58744 +static int 58745 +_nc_meta(SCREEN *sp, bool flag) 58746 +{ 58747 + int result = ERR; 58748 + 58749 + /* Ok, we stay relaxed and don't signal an error if win is NULL */ 58750 58751 if (SP != 0) { 58752 - if (flag && !SP->_tried) { 58753 - _nc_init_keytry(); 58754 - SP->_tried = TRUE; 58755 + SP->_use_meta = flag; 58756 + 58757 + if (flag) { 58758 + _nc_putp("meta_on", meta_on); 58759 + } else { 58760 + _nc_putp("meta_off", meta_off); 58761 } 58762 - SP->_keypad_on = flag; 58763 + result = OK; 58764 } 58765 - return (OK); 58766 + return result; 58767 } 49367 58768 diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_raw.c ncurses-5.6/ncurses/tinfo/lib_raw.c 49368 58769 --- ncurses-5.6.orig/ncurses/tinfo/lib_raw.c 2002-07-06 18:00:45.000000000 -0400 49369 +++ ncurses-5.6/ncurses/tinfo/lib_raw.c 200 7-12-21 00:02:36.000000000 -050058770 +++ ncurses-5.6/ncurses/tinfo/lib_raw.c 2008-06-18 06:49:44.000000000 -0400 49370 58771 @@ -1,5 +1,5 @@ 49371 58772 /**************************************************************************** … … 49397 58798 diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_setup.c ncurses-5.6/ncurses/tinfo/lib_setup.c 49398 58799 --- ncurses-5.6.orig/ncurses/tinfo/lib_setup.c 2006-07-28 18:58:13.000000000 -0400 49399 +++ ncurses-5.6/ncurses/tinfo/lib_setup.c 200 7-12-21 00:02:36.000000000 -050058800 +++ ncurses-5.6/ncurses/tinfo/lib_setup.c 2008-06-18 06:49:51.000000000 -0400 49400 58801 @@ -1,5 +1,5 @@ 49401 58802 /**************************************************************************** 49402 58803 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 49403 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *58804 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 49404 58805 * * 49405 58806 * Permission is hereby granted, free of charge, to any person obtaining a * … … 49419 58820 49420 58821 -MODULE_ID("$Id: lib_setup.c,v 1.95 2006/07/28 22:58:13 tom Exp $") 49421 +MODULE_ID("$Id: lib_setup.c,v 1.10 0 2007/09/01 20:58:26tom Exp $")58822 +MODULE_ID("$Id: lib_setup.c,v 1.107 2008/06/07 22:22:58 tom Exp $") 49422 58823 49423 58824 /**************************************************************************** 49424 58825 * 49425 @@ -99,55 +99, 57@@58826 @@ -99,55 +99,84 @@ 49426 58827 # endif 49427 58828 #endif 49428 58829 58830 +/* 58831 + * Wrap global variables in this module. 58832 + */ 49429 58833 +#if USE_REENTRANT 49430 58834 +NCURSES_EXPORT(char *) … … 49434 58838 + return cur_term ? cur_term->type.term_names : empty; 49435 58839 +} 58840 +NCURSES_EXPORT(int *) 58841 +_nc_ptr_Lines(void) 58842 +{ 58843 + return ptrLines(); 58844 +} 49436 58845 +NCURSES_EXPORT(int) 49437 58846 +NCURSES_PUBLIC_VAR(LINES) (void) 49438 58847 +{ 49439 + return (SP ? SP->_LINES : _nc_prescreen._LINES); 58848 + return *_nc_ptr_Lines(); 58849 +} 58850 +NCURSES_EXPORT(int *) 58851 +_nc_ptr_Cols(void) 58852 +{ 58853 + return ptrCols(); 49440 58854 +} 49441 58855 +NCURSES_EXPORT(int) 49442 58856 +NCURSES_PUBLIC_VAR(COLS) (void) 49443 58857 +{ 49444 + return SP ? SP->_COLS : _nc_prescreen._COLS;58858 + return *_nc_ptr_Cols(); 49445 58859 +} 49446 58860 +NCURSES_EXPORT(int) … … 49454 58868 NCURSES_EXPORT_VAR(int) COLS = 0; 49455 58869 NCURSES_EXPORT_VAR(int) TABSIZE = 0; 49456 - 58870 +#endif 58871 49457 58872 -static int _use_env = TRUE; 58873 +#if NCURSES_EXT_FUNCS 58874 +NCURSES_EXPORT(int) 58875 +set_tabsize(int value) 58876 +{ 58877 + int code = OK; 58878 +#if USE_REENTRANT 58879 + if (SP) { 58880 + SP->_TABSIZE = value; 58881 + } else { 58882 + code = ERR; 58883 + } 58884 +#else 58885 + TABSIZE = value; 58886 +#endif 58887 + return code; 58888 +} 49458 58889 +#endif 49459 58890 … … 49465 58896 + */ 49466 58897 +NCURSES_EXPORT(int) 49467 +_nc_handle_sigwinch( int update)58898 +_nc_handle_sigwinch(SCREEN *sp) 49468 58899 { 49469 58900 - static int have_sigwinch = 0; /* initially no SIGWINCH's */ … … 49486 58917 - break; 49487 58918 - } 49488 + (void) update; /* no longer used */ 58919 + if (_nc_globals.have_sigwinch) { 58920 + _nc_globals.have_sigwinch = 0; 49489 58921 49490 58922 - /* … … 49500 58932 - } 49501 58933 - have_sigwinch = 0; 49502 + if (_nc_globals.have_sigwinch) { 49503 + _nc_globals.have_sigwinch = 0; 49504 + 49505 + scan = _nc_screen_chain; 49506 + while (scan) { 58934 + for (each_screen(scan)) { 49507 58935 + scan->_sig_winch = TRUE; 49508 + scan = scan->_next_screen;49509 58936 } 49510 58937 } … … 49513 58940 49514 58941 - return result; 49515 + return ( SP ? SP->_sig_winch : 0);58942 + return (sp ? sp->_sig_winch : 0); 49516 58943 } 49517 58944 49518 58945 #endif 49519 @@ -156,19 +1 58,20 @@58946 @@ -156,19 +185,20 @@ 49520 58947 use_env(bool f) 49521 58948 { … … 49527 58954 49528 58955 -static void 58956 -_nc_get_screensize(int *linep, int *colp) 49529 58957 +NCURSES_EXPORT(void) 49530 _nc_get_screensize(int *linep, int *colp)58958 +_nc_get_screensize(SCREEN *sp, int *linep, int *colp) 49531 58959 /* Obtain lines/columns values from the environment and/or terminfo entry */ 49532 58960 { … … 49542 58970 *colp = (int) columns; 49543 58971 } else { /* usually want to query LINES and COLUMNS from environment */ 49544 @@ -246,14 +249,20 @@ 58972 @@ -214,7 +244,7 @@ 58973 * environment variable. 58974 */ 58975 if (*linep <= 0) 58976 - *linep = (SP != 0 && SP->_filtered) ? 1 : WINSIZE_ROWS(size); 58977 + *linep = (sp != 0 && sp->_filtered) ? 1 : WINSIZE_ROWS(size); 58978 if (*colp <= 0) 58979 *colp = WINSIZE_COLS(size); 58980 } 58981 @@ -246,38 +276,44 @@ 49545 58982 lines = (short) (*linep); 49546 58983 columns = (short) (*colp); … … 49558 58995 + 49559 58996 +#if USE_REENTRANT 49560 + if ( SP!= 0)49561 + SP->_TABSIZE = my_tabsize;58997 + if (sp != 0) 58998 + sp->_TABSIZE = my_tabsize; 49562 58999 +#else 49563 59000 + TABSIZE = my_tabsize; … … 49566 59003 } 49567 59004 49568 @@ -536,8 +545,10 @@ 59005 #if USE_SIZECHANGE 59006 NCURSES_EXPORT(void) 59007 -_nc_update_screensize(void) 59008 +_nc_update_screensize(SCREEN *sp) 59009 { 59010 int old_lines = lines; 59011 int new_lines; 59012 int old_cols = columns; 59013 int new_cols; 59014 59015 - _nc_get_screensize(&new_lines, &new_cols); 59016 + _nc_get_screensize(sp, &new_lines, &new_cols); 59017 59018 /* 59019 * See is_term_resized() and resizeterm(). 59020 * We're doing it this way because those functions belong to the upper 59021 * ncurses library, while this resides in the lower terminfo library. 59022 */ 59023 - if (SP != 0 59024 - && SP->_resize != 0) { 59025 + if (sp != 0 59026 + && sp->_resize != 0) { 59027 if ((new_lines != old_lines) || (new_cols != old_cols)) 59028 - SP->_resize(new_lines, new_cols); 59029 - SP->_sig_winch = FALSE; 59030 + sp->_resize(new_lines, new_cols); 59031 + sp->_sig_winch = FALSE; 59032 } 59033 } 59034 #endif 59035 @@ -530,18 +566,19 @@ 59036 ret_error(status, "'%s': unknown terminal type.\n", tname); 59037 } 59038 } 59039 +#if !USE_REENTRANT 59040 + strncpy(ttytype, term_ptr->type.term_names, NAMESIZE - 1); 59041 + ttytype[NAMESIZE - 1] = '\0'; 59042 +#endif 59043 + 59044 + term_ptr->Filedes = Filedes; 59045 + term_ptr->_termname = strdup(tname); 59046 59047 set_curterm(term_ptr); 59048 49569 59049 if (command_character && getenv("CC")) 49570 59050 do_prototype(); 49571 59051 49572 +#if !USE_REENTRANT 49573 strncpy(ttytype, cur_term->type.term_names, NAMESIZE - 1); 49574 ttytype[NAMESIZE - 1] = '\0'; 49575 +#endif 49576 49577 cur_term->Filedes = Filedes; 49578 cur_term->_termname = strdup(tname); 49579 @@ -557,13 +568,16 @@ 59052 - strncpy(ttytype, cur_term->type.term_names, NAMESIZE - 1); 59053 - ttytype[NAMESIZE - 1] = '\0'; 59054 - 59055 - cur_term->Filedes = Filedes; 59056 - cur_term->_termname = strdup(tname); 59057 - 59058 /* 59059 * If an application calls setupterm() rather than initscr() or 59060 * newterm(), we will not have the def_prog_mode() call in 59061 @@ -557,13 +594,11 @@ 49580 59062 /* 49581 59063 * We should always check the screensize, just in case. 49582 59064 */ 49583 +#if USE_REENTRANT 49584 + _nc_get_screensize(SP ? &(SP->_LINES) : &(_nc_prescreen._LINES), 49585 + SP ? &(SP->_COLS) : &(_nc_prescreen._COLS)); 49586 +#else 49587 _nc_get_screensize(&LINES, &COLS); 49588 +#endif 59065 - _nc_get_screensize(&LINES, &COLS); 59066 + _nc_get_screensize(SP, ptrLines(), ptrCols()); 49589 59067 49590 59068 if (errret) … … 49598 59076 diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_termcap.c ncurses-5.6/ncurses/tinfo/lib_termcap.c 49599 59077 --- ncurses-5.6.orig/ncurses/tinfo/lib_termcap.c 2006-09-02 15:39:46.000000000 -0400 49600 +++ ncurses-5.6/ncurses/tinfo/lib_termcap.c 200 7-12-21 00:02:36.000000000 -050059078 +++ ncurses-5.6/ncurses/tinfo/lib_termcap.c 2008-06-18 06:49:44.000000000 -0400 49601 59079 @@ -1,5 +1,5 @@ 49602 59080 /**************************************************************************** … … 49730 59208 diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_tparm.c ncurses-5.6/ncurses/tinfo/lib_tparm.c 49731 59209 --- ncurses-5.6.orig/ncurses/tinfo/lib_tparm.c 2006-11-25 20:12:56.000000000 -0500 49732 +++ ncurses-5.6/ncurses/tinfo/lib_tparm.c 200 7-12-21 00:02:36.000000000 -050059210 +++ ncurses-5.6/ncurses/tinfo/lib_tparm.c 2008-06-18 06:49:44.000000000 -0400 49733 59211 @@ -1,5 +1,5 @@ 49734 59212 /**************************************************************************** … … 50082 59560 diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_tputs.c ncurses-5.6/ncurses/tinfo/lib_tputs.c 50083 59561 --- ncurses-5.6.orig/ncurses/tinfo/lib_tputs.c 2003-08-23 17:39:20.000000000 -0400 50084 +++ ncurses-5.6/ncurses/tinfo/lib_tputs.c 200 7-12-21 00:02:36.000000000 -050059562 +++ ncurses-5.6/ncurses/tinfo/lib_tputs.c 2008-06-18 06:49:44.000000000 -0400 50085 59563 @@ -1,5 +1,5 @@ 50086 59564 /**************************************************************************** … … 50137 59615 diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_ttyflags.c ncurses-5.6/ncurses/tinfo/lib_ttyflags.c 50138 59616 --- ncurses-5.6.orig/ncurses/tinfo/lib_ttyflags.c 2006-12-09 20:31:54.000000000 -0500 50139 +++ ncurses-5.6/ncurses/tinfo/lib_ttyflags.c 200 7-12-21 00:02:36.000000000 -050059617 +++ ncurses-5.6/ncurses/tinfo/lib_ttyflags.c 2008-06-18 06:49:50.000000000 -0400 50140 59618 @@ -1,5 +1,5 @@ 50141 59619 /**************************************************************************** 50142 59620 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 50143 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *59621 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 50144 59622 * * 50145 59623 * Permission is hereby granted, free of charge, to any person obtaining a * … … 50150 59628 50151 59629 -MODULE_ID("$Id: lib_ttyflags.c,v 1.13 2006/12/10 01:31:54 tom Exp $") 50152 +MODULE_ID("$Id: lib_ttyflags.c,v 1.1 5 2007/05/26 18:54:25tom Exp $")59630 +MODULE_ID("$Id: lib_ttyflags.c,v 1.16 2008/05/03 22:39:03 tom Exp $") 50153 59631 50154 59632 NCURSES_EXPORT(int) … … 50232 59710 } 50233 59711 59712 @@ -139,7 +147,7 @@ 59713 if (_nc_set_tty_mode(&cur_term->Nttyb) == OK) { 59714 if (SP) { 59715 if (SP->_keypad_on) 59716 - _nc_keypad(TRUE); 59717 + _nc_keypad(SP, TRUE); 59718 NC_BUFFERED(TRUE); 59719 } 59720 returnCode(OK); 59721 @@ -155,7 +163,7 @@ 59722 59723 if (cur_term != 0) { 59724 if (SP) { 59725 - _nc_keypad(FALSE); 59726 + _nc_keypad(SP, FALSE); 59727 _nc_flush(); 59728 NC_BUFFERED(FALSE); 59729 } 50234 59730 @@ -164,19 +172,33 @@ 50235 59731 returnCode(ERR); … … 50278 59774 diff -Naur ncurses-5.6.orig/ncurses/tinfo/make_keys.c ncurses-5.6/ncurses/tinfo/make_keys.c 50279 59775 --- ncurses-5.6.orig/ncurses/tinfo/make_keys.c 2005-08-20 15:58:18.000000000 -0400 50280 +++ ncurses-5.6/ncurses/tinfo/make_keys.c 200 7-12-21 00:02:36.000000000 -050059776 +++ ncurses-5.6/ncurses/tinfo/make_keys.c 2008-06-18 06:49:44.000000000 -0400 50281 59777 @@ -1,5 +1,5 @@ 50282 59778 /**************************************************************************** … … 50306 59802 diff -Naur ncurses-5.6.orig/ncurses/tinfo/name_match.c ncurses-5.6/ncurses/tinfo/name_match.c 50307 59803 --- ncurses-5.6.orig/ncurses/tinfo/name_match.c 2005-01-22 16:47:25.000000000 -0500 50308 +++ ncurses-5.6/ncurses/tinfo/name_match.c 200 7-12-21 00:02:36.000000000 -050059804 +++ ncurses-5.6/ncurses/tinfo/name_match.c 2008-06-18 06:49:44.000000000 -0400 50309 59805 @@ -1,5 +1,5 @@ 50310 59806 /**************************************************************************** … … 50366 59862 diff -Naur ncurses-5.6.orig/ncurses/tinfo/parse_entry.c ncurses-5.6/ncurses/tinfo/parse_entry.c 50367 59863 --- ncurses-5.6.orig/ncurses/tinfo/parse_entry.c 2006-06-17 13:57:50.000000000 -0400 50368 +++ ncurses-5.6/ncurses/tinfo/parse_entry.c 200 7-12-21 00:02:36.000000000 -050059864 +++ ncurses-5.6/ncurses/tinfo/parse_entry.c 2008-06-18 06:49:44.000000000 -0400 50369 59865 @@ -1,5 +1,5 @@ 50370 59866 /**************************************************************************** … … 50442 59938 diff -Naur ncurses-5.6.orig/ncurses/tinfo/read_entry.c ncurses-5.6/ncurses/tinfo/read_entry.c 50443 59939 --- ncurses-5.6.orig/ncurses/tinfo/read_entry.c 2006-08-19 11:58:50.000000000 -0400 50444 +++ ncurses-5.6/ncurses/tinfo/read_entry.c 200 7-12-21 00:02:36.000000000 -050059940 +++ ncurses-5.6/ncurses/tinfo/read_entry.c 2008-06-18 06:49:44.000000000 -0400 50445 59941 @@ -1,5 +1,5 @@ 50446 59942 /**************************************************************************** … … 50470 59966 diff -Naur ncurses-5.6.orig/ncurses/tinfo/setbuf.c ncurses-5.6/ncurses/tinfo/setbuf.c 50471 59967 --- ncurses-5.6.orig/ncurses/tinfo/setbuf.c 2003-11-15 18:55:34.000000000 -0500 50472 +++ ncurses-5.6/ncurses/tinfo/setbuf.c 200 7-12-21 00:02:36.000000000 -050059968 +++ ncurses-5.6/ncurses/tinfo/setbuf.c 2008-06-18 06:49:44.000000000 -0400 50473 59969 @@ -1,5 +1,5 @@ 50474 59970 /**************************************************************************** … … 50498 59994 diff -Naur ncurses-5.6.orig/ncurses/tinfo/strings.c ncurses-5.6/ncurses/tinfo/strings.c 50499 59995 --- ncurses-5.6.orig/ncurses/tinfo/strings.c 2003-08-16 19:46:00.000000000 -0400 50500 +++ ncurses-5.6/ncurses/tinfo/strings.c 200 7-12-21 00:02:36.000000000 -050059996 +++ ncurses-5.6/ncurses/tinfo/strings.c 2008-06-18 06:49:44.000000000 -0400 50501 59997 @@ -1,5 +1,5 @@ 50502 59998 /**************************************************************************** … … 50526 60022 diff -Naur ncurses-5.6.orig/ncurses/tinfo/trim_sgr0.c ncurses-5.6/ncurses/tinfo/trim_sgr0.c 50527 60023 --- ncurses-5.6.orig/ncurses/tinfo/trim_sgr0.c 2006-12-02 14:37:57.000000000 -0500 50528 +++ ncurses-5.6/ncurses/tinfo/trim_sgr0.c 200 7-12-21 00:02:36.000000000 -050060024 +++ ncurses-5.6/ncurses/tinfo/trim_sgr0.c 2008-06-18 06:49:44.000000000 -0400 50529 60025 @@ -1,5 +1,5 @@ 50530 60026 /**************************************************************************** … … 50566 60062 diff -Naur ncurses-5.6.orig/ncurses/tinfo/use_screen.c ncurses-5.6/ncurses/tinfo/use_screen.c 50567 60063 --- ncurses-5.6.orig/ncurses/tinfo/use_screen.c 1969-12-31 19:00:00.000000000 -0500 50568 +++ ncurses-5.6/ncurses/tinfo/use_screen.c 200 7-12-21 00:02:36.000000000 -050050569 @@ -0,0 +1, 60@@60064 +++ ncurses-5.6/ncurses/tinfo/use_screen.c 2008-06-18 06:49:51.000000000 -0400 60065 @@ -0,0 +1,58 @@ 50570 60066 +/**************************************************************************** 50571 + * Copyright (c) 2007 Free Software Foundation, Inc.*60067 + * Copyright (c) 2007,2008 Free Software Foundation, Inc. * 50572 60068 + * * 50573 60069 + * Permission is hereby granted, free of charge, to any person obtaining a * … … 50602 60098 +#include <curses.priv.h> 50603 60099 + 50604 +MODULE_ID("$Id: use_screen.c,v 1. 2 2007/09/08 21:46:48tom Exp $")60100 +MODULE_ID("$Id: use_screen.c,v 1.6 2008/06/07 19:16:56 tom Exp $") 50605 60101 + 50606 60102 +NCURSES_EXPORT(int) 50607 +use_screen(SCREEN *screen, NCURSES_ CALLBACKfunc, void *data)60103 +use_screen(SCREEN *screen, NCURSES_SCREEN_CB func, void *data) 50608 60104 +{ 50609 60105 + SCREEN *save_SP; … … 50616 60112 + * recurred through this point, return an error if so. 50617 60113 + */ 50618 + _nc_lock_global( use_screen);60114 + _nc_lock_global(curses); 50619 60115 + save_SP = SP; 50620 60116 + set_term(screen); 50621 60117 + 50622 + code = func(screen ->_stdscr, data);60118 + code = func(screen, data); 50623 60119 + 50624 60120 + set_term(save_SP); 50625 + _nc_unlock_global( use_screen);60121 + _nc_unlock_global(curses); 50626 60122 + returnCode(code); 50627 +50628 + return 0;50629 60123 +} 50630 60124 diff -Naur ncurses-5.6.orig/ncurses/tinfo/write_entry.c ncurses-5.6/ncurses/tinfo/write_entry.c 50631 60125 --- ncurses-5.6.orig/ncurses/tinfo/write_entry.c 2006-10-14 16:45:16.000000000 -0400 50632 +++ ncurses-5.6/ncurses/tinfo/write_entry.c 200 7-12-21 00:02:36.000000000 -050060126 +++ ncurses-5.6/ncurses/tinfo/write_entry.c 2008-06-18 06:49:44.000000000 -0400 50633 60127 @@ -1,5 +1,5 @@ 50634 60128 /**************************************************************************** … … 50716 60210 diff -Naur ncurses-5.6.orig/ncurses/trace/lib_trace.c ncurses-5.6/ncurses/trace/lib_trace.c 50717 60211 --- ncurses-5.6.orig/ncurses/trace/lib_trace.c 2006-08-19 08:05:25.000000000 -0400 50718 +++ ncurses-5.6/ncurses/trace/lib_trace.c 200 7-12-21 00:02:36.000000000 -050060212 +++ ncurses-5.6/ncurses/trace/lib_trace.c 2008-06-18 06:49:51.000000000 -0400 50719 60213 @@ -1,5 +1,5 @@ 50720 60214 /**************************************************************************** 50721 60215 - * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. * 50722 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *60216 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 50723 60217 * * 50724 60218 * Permission is hereby granted, free of charge, to any person obtaining a * … … 50729 60223 50730 60224 -MODULE_ID("$Id: lib_trace.c,v 1.59 2006/08/19 12:05:25 tom Exp $") 50731 +MODULE_ID("$Id: lib_trace.c,v 1.6 5 2007/09/29 21:47:46 tom Exp $")60225 +MODULE_ID("$Id: lib_trace.c,v 1.67 2008/06/07 20:49:56 tom Exp $") 50732 60226 50733 60227 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */ … … 50777 60271 - static bool been_here = FALSE; 50778 60272 - static char my_name[PATH_MAX]; 50779 - 60273 + if ((TraceFP == 0) && tracelevel) { 60274 + const char *mode = _nc_globals.init_trace ? "ab" : "wb"; 60275 50780 60276 - if ((tracefp == 0) && tracelevel) { 50781 60277 - const char *mode = been_here ? "ab" : "wb"; 50782 + if ((TraceFP == 0) && tracelevel) { 50783 + const char *mode = _nc_globals.init_trace ? "ab" : "wb"; 50784 60278 - 50785 60279 - if (*my_name == '\0') { 50786 60280 - if (getcwd(my_name, sizeof(my_name) - 10) == 0) { … … 50863 60357 doit &= (TRACE_CALLS | TRACE_CCALLS); 50864 60358 else 50865 @@ -134,25 +165, 34@@60359 @@ -134,25 +165,46 @@ 50866 60360 } 50867 60361 … … 50871 60365 + if (TraceFP == 0) 50872 60366 + TraceFP = stderr; 60367 +#ifdef USE_PTHREADS 60368 + /* 60369 + * TRACE_ICALLS is "really" needed to show normal use with threaded 60370 + * applications, since anything can be running during a napms(), 60371 + * making it appear in the hierarchical trace as it other functions 60372 + * are being called. 60373 + * 60374 + * Rather than add the complication of a per-thread stack, just 60375 + * show the thread-id in each line of the trace. 60376 + */ 60377 + fprintf(TraceFP, "%#lx:", (long) pthread_self()); 60378 +#endif 50873 60379 if (before || after) { 50874 60380 int n; … … 50909 60415 NCURSES_EXPORT(NCURSES_BOOL) 50910 60416 _nc_retrace_bool(NCURSES_BOOL code) 50911 @@ -224,4 +2 64,53 @@60417 @@ -224,4 +276,53 @@ 50912 60418 T((T_RETURN("%p"), code)); 50913 60419 return code; … … 50929 60435 + _nc_lock_global(tst_tracef); 50930 60436 + if (!_nc_globals.nested_tracef++) { 50931 + if ((result = (_nc_tracing & (mask))) != 0) { 60437 + if ((result = (_nc_tracing & (mask))) != 0 60438 + && _nc_try_global(tracef) == 0) { 50932 60439 + /* we will call _nc_locked_tracef(), no nesting so far */ 50933 + _nc_lock_global(tracef);50934 60440 + } else { 50935 60441 + /* we will not call _nc_locked_tracef() */ … … 50965 60471 diff -Naur ncurses-5.6.orig/ncurses/trace/lib_traceatr.c ncurses-5.6/ncurses/trace/lib_traceatr.c 50966 60472 --- ncurses-5.6.orig/ncurses/trace/lib_traceatr.c 2006-12-02 16:18:28.000000000 -0500 50967 +++ ncurses-5.6/ncurses/trace/lib_traceatr.c 200 7-12-21 00:02:36.000000000 -050060473 +++ ncurses-5.6/ncurses/trace/lib_traceatr.c 2008-06-18 06:49:51.000000000 -0400 50968 60474 @@ -1,5 +1,5 @@ 50969 60475 /**************************************************************************** 50970 60476 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 50971 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *60477 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 50972 60478 * * 50973 60479 * Permission is hereby granted, free of charge, to any person obtaining a * … … 50978 60484 50979 60485 -MODULE_ID("$Id: lib_traceatr.c,v 1.56 2006/12/02 21:18:28 tom Exp $") 50980 +MODULE_ID("$Id: lib_traceatr.c,v 1. 59 2007/06/09 17:22:10tom Exp $")60486 +MODULE_ID("$Id: lib_traceatr.c,v 1.60 2008/05/31 16:53:15 tom Exp $") 50981 60487 50982 60488 #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name)) … … 51062 60568 for (cp = acs_chars; cp[0] && cp[1]; cp += 2) { 51063 60569 if (ChCharOf(cp[1]) == ChCharOf(ch)) { 60570 @@ -249,7 +255,7 @@ 60571 if ((found = _nc_altcharset_name(ChAttrOf(ch), ch)) != 0) { 60572 (void) _nc_trace_bufcat(bufnum, found); 60573 } else 60574 - (void) _nc_trace_bufcat(bufnum, _tracechar((int)ChCharOf(ch))); 60575 + (void) _nc_trace_bufcat(bufnum, _nc_tracechar(SP, (int)ChCharOf(ch))); 60576 60577 if (ChAttrOf(ch) != A_NORMAL) { 60578 (void) _nc_trace_bufcat(bufnum, " | "); 60579 @@ -305,14 +311,14 @@ 60580 if (PUTC_n <= 0) { 60581 if (PUTC_ch != L'\0') { 60582 /* it could not be a multibyte sequence */ 60583 - (void) _nc_trace_bufcat(bufnum, _tracechar(UChar(ch->chars[PUTC_i]))); 60584 + (void) _nc_trace_bufcat(bufnum, _nc_tracechar(SP, UChar(ch->chars[PUTC_i]))); 60585 } 60586 break; 60587 } 60588 for (n = 0; n < PUTC_n; n++) { 60589 if (n) 60590 (void) _nc_trace_bufcat(bufnum, ", "); 60591 - (void) _nc_trace_bufcat(bufnum, _tracechar(UChar(PUTC_buf[n]))); 60592 + (void) _nc_trace_bufcat(bufnum, _nc_tracechar(SP, UChar(PUTC_buf[n]))); 60593 } 60594 } 60595 (void) _nc_trace_bufcat(bufnum, " }"); 51064 60596 diff -Naur ncurses-5.6.orig/ncurses/trace/lib_tracebits.c ncurses-5.6/ncurses/trace/lib_tracebits.c 51065 60597 --- ncurses-5.6.orig/ncurses/trace/lib_tracebits.c 2006-12-09 20:33:00.000000000 -0500 51066 +++ ncurses-5.6/ncurses/trace/lib_tracebits.c 200 7-12-21 00:02:36.000000000 -050060598 +++ ncurses-5.6/ncurses/trace/lib_tracebits.c 2008-06-18 06:49:44.000000000 -0400 51067 60599 @@ -1,5 +1,5 @@ 51068 60600 /**************************************************************************** … … 51125 60657 diff -Naur ncurses-5.6.orig/ncurses/trace/lib_tracechr.c ncurses-5.6/ncurses/trace/lib_tracechr.c 51126 60658 --- ncurses-5.6.orig/ncurses/trace/lib_tracechr.c 2005-04-16 12:55:46.000000000 -0400 51127 +++ ncurses-5.6/ncurses/trace/lib_tracechr.c 200 7-12-21 00:02:36.000000000 -050060659 +++ ncurses-5.6/ncurses/trace/lib_tracechr.c 2008-06-18 06:49:51.000000000 -0400 51128 60660 @@ -1,5 +1,5 @@ 51129 60661 /**************************************************************************** … … 51133 60665 * Permission is hereby granted, free of charge, to any person obtaining a * 51134 60666 * copy of this software and associated documentation files (the * 51135 @@ -39,34 +39, 35@@60667 @@ -39,34 +39,43 @@ 51136 60668 51137 60669 #include <ctype.h> 51138 60670 51139 60671 -MODULE_ID("$Id: lib_tracechr.c,v 1.12 2005/04/16 16:55:46 tom Exp $") 51140 +MODULE_ID("$Id: lib_tracechr.c,v 1.1 3 2007/04/21 23:16:37 tom Exp $")60672 +MODULE_ID("$Id: lib_tracechr.c,v 1.17 2008/05/31 19:57:47 tom Exp $") 51141 60673 51142 60674 #ifdef TRACE 51143 +#define MyBuffer _nc_globals.tracechr_buf51144 60675 + 51145 60676 NCURSES_EXPORT(char *) 51146 _tracechar(int ch) 60677 -_tracechar(int ch) 60678 +_nc_tracechar(SCREEN *sp, int ch) 51147 60679 { 51148 60680 - static char result[40]; 51149 60681 NCURSES_CONST char *name; 60682 + char *MyBuffer = ((sp != 0) 60683 + ? sp->tracechr_buf 60684 + : _nc_globals.tracechr_buf); 51150 60685 51151 60686 if (ch > KEY_MIN || ch < 0) { 51152 name = keyname(ch); 60687 - name = keyname(ch); 60688 + name = _nc_keyname(sp, ch); 51153 60689 if (name == 0 || *name == '\0') 51154 60690 name = "NULL"; … … 51164 60700 + (void) sprintf(MyBuffer, "%#03o", ch); 51165 60701 } else { 51166 name = unctrl((chtype) ch); 60702 - name = unctrl((chtype) ch); 60703 + name = _nc_unctrl(sp, (chtype) ch); 51167 60704 if (name == 0 || *name == 0) 51168 60705 name = "null"; /* shouldn't happen */ … … 51172 60709 - return (result); 51173 60710 + return (MyBuffer); 60711 +} 60712 + 60713 +NCURSES_EXPORT(char *) 60714 +_tracechar(int ch) 60715 +{ 60716 + return _nc_tracechar(SP, ch); 51174 60717 } 51175 60718 #else … … 51177 60720 diff -Naur ncurses-5.6.orig/ncurses/trace/lib_tracedmp.c ncurses-5.6/ncurses/trace/lib_tracedmp.c 51178 60721 --- ncurses-5.6.orig/ncurses/trace/lib_tracedmp.c 2006-10-14 16:43:31.000000000 -0400 51179 +++ ncurses-5.6/ncurses/trace/lib_tracedmp.c 200 7-12-21 00:02:36.000000000 -050060722 +++ ncurses-5.6/ncurses/trace/lib_tracedmp.c 2008-06-18 06:49:44.000000000 -0400 51180 60723 @@ -1,5 +1,5 @@ 51181 60724 /**************************************************************************** … … 51301 60844 diff -Naur ncurses-5.6.orig/ncurses/trace/lib_tracemse.c ncurses-5.6/ncurses/trace/lib_tracemse.c 51302 60845 --- ncurses-5.6.orig/ncurses/trace/lib_tracemse.c 2005-06-11 15:53:50.000000000 -0400 51303 +++ ncurses-5.6/ncurses/trace/lib_tracemse.c 200 7-12-21 00:02:36.000000000 -050060846 +++ ncurses-5.6/ncurses/trace/lib_tracemse.c 2008-06-18 06:49:51.000000000 -0400 51304 60847 @@ -1,5 +1,5 @@ 51305 60848 /**************************************************************************** 51306 60849 - * Copyright (c) 1998-2002,2005 Free Software Foundation, Inc. * 51307 + * Copyright (c) 1998-200 5,2007Free Software Foundation, Inc. *60850 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 51308 60851 * * 51309 60852 * Permission is hereby granted, free of charge, to any person obtaining a * … … 51314 60857 51315 60858 -MODULE_ID("$Id: lib_tracemse.c,v 1.12 2005/06/11 19:53:50 tom Exp $") 51316 +MODULE_ID("$Id: lib_tracemse.c,v 1.1 3 2007/04/21 21:23:00tom Exp $")60859 +MODULE_ID("$Id: lib_tracemse.c,v 1.14 2008/05/31 17:20:25 tom Exp $") 51317 60860 51318 60861 #ifdef TRACE 51319 60862 51320 +#define my_buffer _nc_globals.tracemse_buf60863 +#define my_buffer sp->tracemse_buf 51321 60864 + 51322 60865 NCURSES_EXPORT(char *) 51323 _tracemouse(MEVENT const *ep) 60866 -_tracemouse(MEVENT const *ep) 60867 +_nc_tracemouse(SCREEN *sp, MEVENT const *ep) 51324 60868 { 51325 60869 - /* … … 51345 60889 SHOW(BUTTON1_RELEASED, "release-1"); 51346 60890 SHOW(BUTTON1_PRESSED, "press-1"); 51347 @@ -115,10 +108,1 0@@60891 @@ -115,10 +108,16 @@ 51348 60892 51349 60893 #undef SHOW … … 51357 60901 + (void) strcat(my_buffer, "}"); 51358 60902 + return (my_buffer); 60903 +} 60904 + 60905 +NCURSES_EXPORT(char *) 60906 +_tracemouse(MEVENT const *ep) 60907 +{ 60908 + return _nc_tracemouse(SP, ep); 51359 60909 } 51360 60910 … … 51362 60912 diff -Naur ncurses-5.6.orig/ncurses/trace/trace_buf.c ncurses-5.6/ncurses/trace/trace_buf.c 51363 60913 --- ncurses-5.6.orig/ncurses/trace/trace_buf.c 2003-03-15 16:21:36.000000000 -0500 51364 +++ ncurses-5.6/ncurses/trace/trace_buf.c 200 7-12-21 00:02:36.000000000 -050060914 +++ ncurses-5.6/ncurses/trace/trace_buf.c 2008-06-18 06:49:44.000000000 -0400 51365 60915 @@ -1,5 +1,5 @@ 51366 60916 /**************************************************************************** … … 51437 60987 diff -Naur ncurses-5.6.orig/ncurses/trace/trace_tries.c ncurses-5.6/ncurses/trace/trace_tries.c 51438 60988 --- ncurses-5.6.orig/ncurses/trace/trace_tries.c 2001-10-20 18:42:51.000000000 -0400 51439 +++ ncurses-5.6/ncurses/trace/trace_tries.c 200 7-12-21 00:02:36.000000000 -050060989 +++ ncurses-5.6/ncurses/trace/trace_tries.c 2008-06-18 06:49:44.000000000 -0400 51440 60990 @@ -1,5 +1,5 @@ 51441 60991 /**************************************************************************** … … 51502 61052 diff -Naur ncurses-5.6.orig/ncurses/trace/varargs.c ncurses-5.6/ncurses/trace/varargs.c 51503 61053 --- ncurses-5.6.orig/ncurses/trace/varargs.c 2003-05-24 17:10:28.000000000 -0400 51504 +++ ncurses-5.6/ncurses/trace/varargs.c 200 7-12-21 00:02:36.000000000 -050061054 +++ ncurses-5.6/ncurses/trace/varargs.c 2008-06-18 06:49:44.000000000 -0400 51505 61055 @@ -1,5 +1,5 @@ 51506 61056 /**************************************************************************** … … 51583 61133 diff -Naur ncurses-5.6.orig/ncurses/trace/visbuf.c ncurses-5.6/ncurses/trace/visbuf.c 51584 61134 --- ncurses-5.6.orig/ncurses/trace/visbuf.c 2006-12-02 16:20:28.000000000 -0500 51585 +++ ncurses-5.6/ncurses/trace/visbuf.c 200 7-12-21 00:02:36.000000000 -050061135 +++ ncurses-5.6/ncurses/trace/visbuf.c 2008-06-18 06:49:44.000000000 -0400 51586 61136 @@ -1,5 +1,5 @@ 51587 61137 /**************************************************************************** … … 51664 61214 diff -Naur ncurses-5.6.orig/ncurses/tty/hardscroll.c ncurses-5.6/ncurses/tty/hardscroll.c 51665 61215 --- ncurses-5.6.orig/ncurses/tty/hardscroll.c 2001-01-13 19:17:28.000000000 -0500 51666 +++ ncurses-5.6/ncurses/tty/hardscroll.c 200 7-12-21 00:02:36.000000000 -050061216 +++ ncurses-5.6/ncurses/tty/hardscroll.c 2008-06-18 06:49:44.000000000 -0400 51667 61217 @@ -1,5 +1,5 @@ 51668 61218 /**************************************************************************** … … 51779 61329 diff -Naur ncurses-5.6.orig/ncurses/tty/hashmap.c ncurses-5.6/ncurses/tty/hashmap.c 51780 61330 --- ncurses-5.6.orig/ncurses/tty/hashmap.c 2006-03-11 14:33:49.000000000 -0500 51781 +++ ncurses-5.6/ncurses/tty/hashmap.c 200 7-12-21 00:02:36.000000000 -050061331 +++ ncurses-5.6/ncurses/tty/hashmap.c 2008-06-18 06:49:44.000000000 -0400 51782 61332 @@ -1,5 +1,5 @@ 51783 61333 /**************************************************************************** … … 51925 61475 diff -Naur ncurses-5.6.orig/ncurses/tty/lib_mvcur.c ncurses-5.6/ncurses/tty/lib_mvcur.c 51926 61476 --- ncurses-5.6.orig/ncurses/tty/lib_mvcur.c 2006-11-25 17:31:59.000000000 -0500 51927 +++ ncurses-5.6/ncurses/tty/lib_mvcur.c 200 7-12-21 00:02:36.000000000 -050061477 +++ ncurses-5.6/ncurses/tty/lib_mvcur.c 2008-06-18 06:49:51.000000000 -0400 51928 61478 @@ -1,5 +1,5 @@ 51929 61479 /**************************************************************************** 51930 61480 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 51931 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *61481 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 51932 61482 * * 51933 61483 * Permission is hereby granted, free of charge, to any person obtaining a * … … 51938 61488 51939 61489 -MODULE_ID("$Id: lib_mvcur.c,v 1.107 2006/11/25 22:31:59 tom Exp $") 51940 +MODULE_ID("$Id: lib_mvcur.c,v 1.11 0 2007/08/11 16:15:57 tomExp $")61490 +MODULE_ID("$Id: lib_mvcur.c,v 1.111 2008/05/24 14:36:54 Miroslav.Lichvar Exp $") 51941 61491 51942 61492 #define WANT_CHAR(y, x) SP->_newscr->_line[y].text[x] /* desired state */ 51943 61493 #define BAUDRATE cur_term->_baudrate /* bits per second */ 51944 @@ -959,6 +959,7 @@ 61494 @@ -426,8 +426,11 @@ 61495 mvcur(-1, -1, screen_lines - 1, 0); 61496 61497 /* set cursor to normal mode */ 61498 - if (SP->_cursor != -1) 61499 + if (SP->_cursor != -1) { 61500 + int cursor = SP->_cursor; 61501 curs_set(1); 61502 + SP->_cursor = cursor; 61503 + } 61504 61505 if (exit_ca_mode) { 61506 TPUTS_TRACE("exit_ca_mode"); 61507 @@ -959,6 +962,7 @@ 51945 61508 51946 61509 #include <tic.h> … … 51950 61513 NCURSES_EXPORT_VAR(const char *) _nc_progname = "mvcur"; 51951 61514 51952 @@ -1017,7 +10 18,7 @@61515 @@ -1017,7 +1021,7 @@ 51953 61516 int 51954 61517 main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) … … 51959 61522 _nc_setupscreen(lines, columns, stdout, FALSE, 0); 51960 61523 baudrate(); 51961 @@ -1088,7 +10 89,7 @@61524 @@ -1088,7 +1092,7 @@ 51962 61525 load_term(); 51963 61526 } else if (sscanf(buf, "d %s", capname) == 1) { … … 51968 61531 if (np == NULL) 51969 61532 (void) printf("No such capability as \"%s\"\n", capname); 51970 @@ -1116,7 +11 17,7 @@61533 @@ -1116,7 +1120,7 @@ 51971 61534 } 51972 61535 } else if (buf[0] == 'i') { … … 51979 61542 diff -Naur ncurses-5.6.orig/ncurses/tty/lib_tstp.c ncurses-5.6/ncurses/tty/lib_tstp.c 51980 61543 --- ncurses-5.6.orig/ncurses/tty/lib_tstp.c 2006-04-01 14:31:34.000000000 -0500 51981 +++ ncurses-5.6/ncurses/tty/lib_tstp.c 200 7-12-21 00:02:36.000000000 -050061544 +++ ncurses-5.6/ncurses/tty/lib_tstp.c 2008-06-18 06:49:50.000000000 -0400 51982 61545 @@ -1,5 +1,5 @@ 51983 61546 /**************************************************************************** 51984 61547 - * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. * 51985 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *61548 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 51986 61549 * * 51987 61550 * Permission is hereby granted, free of charge, to any person obtaining a * … … 51992 61555 51993 61556 -MODULE_ID("$Id: lib_tstp.c,v 1.32 2006/04/01 19:31:34 tom Exp $") 51994 +MODULE_ID("$Id: lib_tstp.c,v 1.3 6 2007/04/21 19:51:29tom Exp $")61557 +MODULE_ID("$Id: lib_tstp.c,v 1.37 2008/05/03 16:24:56 tom Exp $") 51995 61558 51996 61559 #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC) … … 52012 61575 || sig == SIGQUIT)) { 52013 61576 #if HAVE_SIGACTION || HAVE_SIGVEC 52014 @@ -277,7 +275,7 @@ 61577 @@ -254,19 +252,17 @@ 61578 if (signal(sig, SIG_IGN) != SIG_ERR) 61579 #endif 61580 { 61581 - SCREEN *scan = _nc_screen_chain; 61582 - while (scan) { 61583 - if (SP != 0 61584 - && SP->_ofp != 0 61585 - && isatty(fileno(SP->_ofp))) { 61586 - SP->_cleanup = TRUE; 61587 - SP->_outch = _nc_outch; 61588 + SCREEN *scan; 61589 + for (each_screen(scan)) { 61590 + if (scan->_ofp != 0 61591 + && isatty(fileno(scan->_ofp))) { 61592 + scan->_cleanup = TRUE; 61593 + scan->_outch = _nc_outch; 61594 } 61595 set_term(scan); 61596 endwin(); 61597 if (SP) 61598 SP->_endwin = FALSE; /* in case we have an atexit! */ 61599 - scan = scan->_next_screen; 61600 } 61601 } 61602 } 61603 @@ -277,7 +273,7 @@ 52015 61604 static void 52016 61605 sigwinch(int sig GCC_UNUSED) … … 52021 61610 #endif /* USE_SIGWINCH */ 52022 61611 52023 @@ -351,29 +34 9,27 @@61612 @@ -351,29 +347,27 @@ 52024 61613 NCURSES_EXPORT(void) 52025 61614 _nc_signal_handler(bool enable) … … 52062 61651 ignore_tstp = TRUE; 52063 61652 } 52064 @@ -381,14 +37 7,14 @@61653 @@ -381,14 +375,14 @@ 52065 61654 } 52066 61655 #endif /* !USE_SIGTSTP */ … … 52081 61670 diff -Naur ncurses-5.6.orig/ncurses/tty/lib_twait.c ncurses-5.6/ncurses/tty/lib_twait.c 52082 61671 --- ncurses-5.6.orig/ncurses/tty/lib_twait.c 2006-05-27 17:57:43.000000000 -0400 52083 +++ ncurses-5.6/ncurses/tty/lib_twait.c 200 7-12-21 00:02:36.000000000 -050061672 +++ ncurses-5.6/ncurses/tty/lib_twait.c 2008-06-18 06:49:51.000000000 -0400 52084 61673 @@ -1,5 +1,5 @@ 52085 61674 /**************************************************************************** 52086 61675 - * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. * 52087 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *61676 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 52088 61677 * * 52089 61678 * Permission is hereby granted, free of charge, to any person obtaining a * … … 52097 61686 52098 61687 /* 52099 @@ -61,38 +62, 42@@61688 @@ -61,38 +62,36 @@ 52100 61689 # endif 52101 61690 #endif 52102 61691 52103 61692 -MODULE_ID("$Id: lib_twait.c,v 1.51 2006/05/27 21:57:43 tom Exp $") 52104 +MODULE_ID("$Id: lib_twait.c,v 1.54 2007/08/11 16:32:48 tom Exp $") 52105 + 52106 +#if HAVE_GETTIMEOFDAY 52107 +# define PRECISE_GETTIME 1 52108 +# define TimeType struct timeval 52109 +#else 52110 +# define PRECISE_GETTIME 0 52111 +# define TimeType time_t 52112 +#endif 61693 +#undef CUR 61694 + 61695 +MODULE_ID("$Id: lib_twait.c,v 1.58 2008/05/24 15:08:01 tom Exp $") 52113 61696 52114 61697 static long … … 52155 61738 TR(TRACE_IEVENT, ("%s time: %ld msec", first ? "get" : "elapsed", res)); 52156 61739 return res; 52157 @@ -147,7 +152,8 @@ 61740 @@ -140,14 +139,16 @@ 61741 * descriptors. 61742 */ 61743 NCURSES_EXPORT(int) 61744 -_nc_timed_wait(int mode, 61745 +_nc_timed_wait(SCREEN *sp, 61746 + int mode, 61747 int milliseconds, 61748 int *timeleft 61749 EVENTLIST_2nd(_nc_eventlist * evl)) 52158 61750 { 52159 61751 int fd; … … 52165 61757 #ifdef NCURSES_WGETCH_EVENTS 52166 61758 int timeout_is_event = 0; 52167 @@ -160,7 +16 6,7 @@61759 @@ -160,7 +161,7 @@ 52168 61760 struct pollfd *fds = fd_list; 52169 61761 #elif defined(__BEOS__) … … 52174 61766 52175 61767 long starttime, returntime; 52176 @@ -180,10 +18 6,10 @@61768 @@ -180,10 +181,10 @@ 52177 61769 } 52178 61770 #endif … … 52187 61779 count = 0; 52188 61780 52189 @@ -362,7 +368,7 @@ 61781 @@ -201,12 +202,12 @@ 61782 #endif 61783 61784 if (mode & 1) { 61785 - fds[count].fd = SP->_ifd; 61786 + fds[count].fd = sp->_ifd; 61787 fds[count].events = POLLIN; 61788 count++; 61789 } 61790 if ((mode & 2) 61791 - && (fd = SP->_mouse_fd) >= 0) { 61792 + && (fd = sp->_mouse_fd) >= 0) { 61793 fds[count].fd = fd; 61794 fds[count].events = POLLIN; 61795 count++; 61796 @@ -309,11 +310,11 @@ 61797 FD_ZERO(&set); 61798 61799 if (mode & 1) { 61800 - FD_SET(SP->_ifd, &set); 61801 - count = SP->_ifd + 1; 61802 + FD_SET(sp->_ifd, &set); 61803 + count = sp->_ifd + 1; 61804 } 61805 if ((mode & 2) 61806 - && (fd = SP->_mouse_fd) >= 0) { 61807 + && (fd = sp->_mouse_fd) >= 0) { 61808 FD_SET(fd, &set); 61809 count = max(fd, count) + 1; 61810 } 61811 @@ -362,7 +363,7 @@ 52190 61812 52191 61813 #endif /* USE_FUNC_POLL, etc */ … … 52196 61818 if (milliseconds >= 0) 52197 61819 milliseconds -= (returntime - starttime); 61820 @@ -426,11 +427,11 @@ 61821 result = 1; /* redundant, but simple */ 61822 #elif HAVE_SELECT 61823 if ((mode & 2) 61824 - && (fd = SP->_mouse_fd) >= 0 61825 + && (fd = sp->_mouse_fd) >= 0 61826 && FD_ISSET(fd, &set)) 61827 result |= 2; 61828 if ((mode & 1) 61829 - && FD_ISSET(SP->_ifd, &set)) 61830 + && FD_ISSET(sp->_ifd, &set)) 61831 result |= 1; 61832 #endif 61833 } else 52198 61834 diff -Naur ncurses-5.6.orig/ncurses/tty/lib_vidattr.c ncurses-5.6/ncurses/tty/lib_vidattr.c 52199 61835 --- ncurses-5.6.orig/ncurses/tty/lib_vidattr.c 2006-01-21 18:39:40.000000000 -0500 52200 +++ ncurses-5.6/ncurses/tty/lib_vidattr.c 200 7-12-21 00:02:36.000000000 -050061836 +++ ncurses-5.6/ncurses/tty/lib_vidattr.c 2008-06-18 06:49:44.000000000 -0400 52201 61837 @@ -1,5 +1,5 @@ 52202 61838 /**************************************************************************** … … 52332 61968 diff -Naur ncurses-5.6.orig/ncurses/tty/tty_update.c ncurses-5.6/ncurses/tty/tty_update.c 52333 61969 --- ncurses-5.6.orig/ncurses/tty/tty_update.c 2006-11-25 17:33:21.000000000 -0500 52334 +++ ncurses-5.6/ncurses/tty/tty_update.c 200 7-12-21 00:02:36.000000000 -050061970 +++ ncurses-5.6/ncurses/tty/tty_update.c 2008-06-18 06:49:50.000000000 -0400 52335 61971 @@ -1,5 +1,5 @@ 52336 61972 /**************************************************************************** 52337 61973 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 52338 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *61974 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 52339 61975 * * 52340 61976 * Permission is hereby granted, free of charge, to any person obtaining a * … … 52345 61981 52346 61982 -MODULE_ID("$Id: tty_update.c,v 1.238 2006/11/25 22:33:21 tom Exp $") 52347 +MODULE_ID("$Id: tty_update.c,v 1.24 3 2007/10/13 20:03:32tom Exp $")61983 +MODULE_ID("$Id: tty_update.c,v 1.245 2008/05/03 22:43:04 tom Exp $") 52348 61984 52349 61985 /* … … 52383 62019 #if USE_SIZECHANGE 52384 62020 - if (SP->_endwin || SP->_sig_winch) { 52385 + if (SP->_endwin || _nc_handle_sigwinch( FALSE)) {62021 + if (SP->_endwin || _nc_handle_sigwinch(SP)) { 52386 62022 /* 52387 62023 * This is a transparent extension: XSI does not address it, 52388 62024 * and applications need not know that ncurses can do it. 62025 @@ -649,7 +654,7 @@ 62026 * (this can happen in an xterm, for example), and resize the 62027 * ncurses data structures accordingly. 62028 */ 62029 - _nc_update_screensize(); 62030 + _nc_update_screensize(SP); 62031 } 62032 #endif 62033 52389 62034 @@ -666,7 +671,7 @@ 52390 62035 } … … 52436 62081 diff -Naur ncurses-5.6.orig/ncurses/widechar/lib_cchar.c ncurses-5.6/ncurses/widechar/lib_cchar.c 52437 62082 --- ncurses-5.6.orig/ncurses/widechar/lib_cchar.c 2005-01-29 16:29:16.000000000 -0500 52438 +++ ncurses-5.6/ncurses/widechar/lib_cchar.c 200 7-12-21 00:02:36.000000000 -050062083 +++ ncurses-5.6/ncurses/widechar/lib_cchar.c 2008-06-18 06:49:44.000000000 -0400 52439 62084 @@ -1,5 +1,5 @@ 52440 62085 /**************************************************************************** … … 52467 62112 diff -Naur ncurses-5.6.orig/ncurses/widechar/lib_get_wch.c ncurses-5.6/ncurses/widechar/lib_get_wch.c 52468 62113 --- ncurses-5.6.orig/ncurses/widechar/lib_get_wch.c 2006-06-03 13:27:57.000000000 -0400 52469 +++ ncurses-5.6/ncurses/widechar/lib_get_wch.c 200 7-12-21 00:02:36.000000000 -050062114 +++ ncurses-5.6/ncurses/widechar/lib_get_wch.c 2008-06-18 06:49:51.000000000 -0400 52470 62115 @@ -1,5 +1,5 @@ 52471 62116 /**************************************************************************** 52472 62117 - * Copyright (c) 2002-2005,2006 Free Software Foundation, Inc. * 52473 + * Copyright (c) 2002-200 6,2007Free Software Foundation, Inc. *62118 + * Copyright (c) 2002-2007,2008 Free Software Foundation, Inc. * 52474 62119 * * 52475 62120 * Permission is hereby granted, free of charge, to any person obtaining a * … … 52480 62125 52481 62126 -MODULE_ID("$Id: lib_get_wch.c,v 1.13 2006/06/03 17:27:57 tom Exp $") 52482 +MODULE_ID("$Id: lib_get_wch.c,v 1.1 4 2007/05/12 19:03:16tom Exp $")62127 +MODULE_ID("$Id: lib_get_wch.c,v 1.16 2008/06/07 15:14:33 tom Exp $") 52483 62128 52484 62129 #if HAVE_MBTOWC && HAVE_MBLEN 52485 62130 #define reset_mbytes(state) mblen(NULL, 0), mbtowc(NULL, NULL, 0) 52486 @@ -77,7 +77,7 @@ 62131 @@ -60,6 +60,7 @@ 62132 NCURSES_EXPORT(int) 62133 wget_wch(WINDOW *win, wint_t *result) 62134 { 62135 + SCREEN *sp; 62136 int code; 62137 char buffer[(MB_LEN_MAX * 9) + 1]; /* allow some redundant shifts */ 62138 int status; 62139 @@ -76,44 +77,52 @@ 62140 * We can get a stream of single-byte characters and KEY_xxx codes from 52487 62141 * _nc_wgetch(), while we want to return a wide character or KEY_xxx code. 52488 62142 */ 52489 62143 - for (;;) { 52490 62144 - T(("reading %d of %d", count + 1, sizeof(buffer))); 52491 + T(("reading %d of %d", (int) count + 1, (int) sizeof(buffer))); 52492 code = _nc_wgetch(win, &value, TRUE EVENTLIST_2nd((_nc_eventlist *) 0)); 52493 if (code == ERR) { 52494 break; 62145 - code = _nc_wgetch(win, &value, TRUE EVENTLIST_2nd((_nc_eventlist *) 0)); 62146 - if (code == ERR) { 62147 - break; 62148 - } else if (code == KEY_CODE_YES) { 62149 - /* 62150 - * If we were processing an incomplete multibyte character, return 62151 - * an error since we have a KEY_xxx code which interrupts it. For 62152 - * some cases, we could improve this by writing a new version of 62153 - * lib_getch.c(!), but it is not clear whether the improvement 62154 - * would be worth the effort. 62155 - */ 62156 - if (count != 0) { 62157 - ungetch((int) value); 62158 + _nc_lock_global(curses); 62159 + sp = _nc_screen_of(win); 62160 + if (sp != 0) { 62161 + for (;;) { 62162 + T(("reading %d of %d", (int) count + 1, (int) sizeof(buffer))); 62163 + code = _nc_wgetch(win, &value, TRUE EVENTLIST_2nd((_nc_eventlist 62164 + *) 0)); 62165 + if (code == ERR) { 62166 + break; 62167 + } else if (code == KEY_CODE_YES) { 62168 + /* 62169 + * If we were processing an incomplete multibyte character, 62170 + * return an error since we have a KEY_xxx code which 62171 + * interrupts it. For some cases, we could improve this by 62172 + * writing a new version of lib_getch.c(!), but it is not clear 62173 + * whether the improvement would be worth the effort. 62174 + */ 62175 + if (count != 0) { 62176 + _nc_ungetch(sp, (int) value); 62177 + code = ERR; 62178 + } 62179 + break; 62180 + } else if (count + 1 >= sizeof(buffer)) { 62181 + _nc_ungetch(sp, (int) value); 62182 code = ERR; 62183 - } 62184 - break; 62185 - } else if (count + 1 >= sizeof(buffer)) { 62186 - ungetch((int) value); 62187 - code = ERR; 62188 - break; 62189 - } else { 62190 - buffer[count++] = UChar(value); 62191 - reset_mbytes(state); 62192 - status = count_mbytes(buffer, count, state); 62193 - if (status >= 0) { 62194 + break; 62195 + } else { 62196 + buffer[count++] = UChar(value); 62197 reset_mbytes(state); 62198 - if (check_mbytes(wch, buffer, count, state) != status) { 62199 - code = ERR; /* the two calls should match */ 62200 - ungetch((int) value); 62201 + status = count_mbytes(buffer, count, state); 62202 + if (status >= 0) { 62203 + reset_mbytes(state); 62204 + if (check_mbytes(wch, buffer, count, state) != status) { 62205 + code = ERR; /* the two calls should match */ 62206 + _nc_ungetch(sp, (int) value); 62207 + } 62208 + value = wch; 62209 + break; 62210 } 62211 - value = wch; 62212 - break; 62213 } 62214 } 62215 + } else { 62216 + code = ERR; 62217 } 62218 *result = value; 62219 + _nc_unlock_global(curses); 62220 T(("result %#lo", value)); 62221 returnCode(code); 62222 } 62223 diff -Naur ncurses-5.6.orig/ncurses/widechar/lib_get_wstr.c ncurses-5.6/ncurses/widechar/lib_get_wstr.c 62224 --- ncurses-5.6.orig/ncurses/widechar/lib_get_wstr.c 2004-10-16 17:55:36.000000000 -0400 62225 +++ ncurses-5.6/ncurses/widechar/lib_get_wstr.c 2008-06-18 06:49:51.000000000 -0400 62226 @@ -1,5 +1,5 @@ 62227 /**************************************************************************** 62228 - * Copyright (c) 2002-2003,2004 Free Software Foundation, Inc. * 62229 + * Copyright (c) 2002-2004,2008 Free Software Foundation, Inc. * 62230 * * 62231 * Permission is hereby granted, free of charge, to any person obtaining a * 62232 * copy of this software and associated documentation files (the * 62233 @@ -40,7 +40,7 @@ 62234 #include <curses.priv.h> 62235 #include <term.h> 62236 62237 -MODULE_ID("$Id: lib_get_wstr.c,v 1.8 2004/10/16 21:55:36 tom Exp $") 62238 +MODULE_ID("$Id: lib_get_wstr.c,v 1.9 2008/06/07 14:50:11 tom Exp $") 62239 62240 static int 62241 wadd_wint(WINDOW *win, wint_t *src) 62242 @@ -86,6 +86,7 @@ 62243 NCURSES_EXPORT(int) 62244 wgetn_wstr(WINDOW *win, wint_t *str, int maxlen) 62245 { 62246 + SCREEN *sp = _nc_screen_of(win); 62247 TTY buf; 62248 bool oldnl, oldecho, oldraw, oldcbreak; 62249 wint_t erasec; 62250 @@ -102,10 +103,10 @@ 62251 62252 _nc_get_tty_mode(&buf); 62253 62254 - oldnl = SP->_nl; 62255 - oldecho = SP->_echo; 62256 - oldraw = SP->_raw; 62257 - oldcbreak = SP->_cbreak; 62258 + oldnl = sp->_nl; 62259 + oldecho = sp->_echo; 62260 + oldraw = sp->_raw; 62261 + oldcbreak = sp->_cbreak; 62262 nl(); 62263 noecho(); 62264 noraw(); 62265 @@ -209,10 +210,10 @@ 62266 /* Restore with a single I/O call, to fix minor asymmetry between 62267 * raw/noraw, etc. 62268 */ 62269 - SP->_nl = oldnl; 62270 - SP->_echo = oldecho; 62271 - SP->_raw = oldraw; 62272 - SP->_cbreak = oldcbreak; 62273 + sp->_nl = oldnl; 62274 + sp->_echo = oldecho; 62275 + sp->_raw = oldraw; 62276 + sp->_cbreak = oldcbreak; 62277 62278 (void) _nc_set_tty_mode(&buf); 62279 52495 62280 diff -Naur ncurses-5.6.orig/ncurses/widechar/lib_in_wchnstr.c ncurses-5.6/ncurses/widechar/lib_in_wchnstr.c 52496 62281 --- ncurses-5.6.orig/ncurses/widechar/lib_in_wchnstr.c 2004-05-15 20:12:30.000000000 -0400 52497 +++ ncurses-5.6/ncurses/widechar/lib_in_wchnstr.c 200 7-12-21 00:02:36.000000000 -050062282 +++ ncurses-5.6/ncurses/widechar/lib_in_wchnstr.c 2008-06-18 06:49:44.000000000 -0400 52498 62283 @@ -1,5 +1,5 @@ 52499 62284 /**************************************************************************** … … 52557 62342 diff -Naur ncurses-5.6.orig/ncurses/widechar/lib_key_name.c ncurses-5.6/ncurses/widechar/lib_key_name.c 52558 62343 --- ncurses-5.6.orig/ncurses/widechar/lib_key_name.c 1969-12-31 19:00:00.000000000 -0500 52559 +++ ncurses-5.6/ncurses/widechar/lib_key_name.c 200 7-12-21 00:02:36.000000000 -050062344 +++ ncurses-5.6/ncurses/widechar/lib_key_name.c 2008-06-18 06:49:44.000000000 -0400 52560 62345 @@ -0,0 +1,62 @@ 52561 62346 +/**************************************************************************** … … 52623 62408 diff -Naur ncurses-5.6.orig/ncurses/widechar/lib_unget_wch.c ncurses-5.6/ncurses/widechar/lib_unget_wch.c 52624 62409 --- ncurses-5.6.orig/ncurses/widechar/lib_unget_wch.c 2004-12-04 20:21:31.000000000 -0500 52625 +++ ncurses-5.6/ncurses/widechar/lib_unget_wch.c 200 7-12-21 00:02:36.000000000 -050062410 +++ ncurses-5.6/ncurses/widechar/lib_unget_wch.c 2008-06-18 06:49:51.000000000 -0400 52626 62411 @@ -1,5 +1,5 @@ 52627 62412 /**************************************************************************** 52628 62413 - * Copyright (c) 2002-2003,2004 Free Software Foundation, Inc. * 52629 + * Copyright (c) 2002-200 4,2007Free Software Foundation, Inc. *62414 + * Copyright (c) 2002-2007,2008 Free Software Foundation, Inc. * 52630 62415 * * 52631 62416 * Permission is hereby granted, free of charge, to any person obtaining a * … … 52636 62421 52637 62422 -MODULE_ID("$Id: lib_unget_wch.c,v 1.7 2004/12/05 01:21:31 tom Exp $") 52638 +MODULE_ID("$Id: lib_unget_wch.c,v 1. 9 2007/11/25 00:57:00tom Exp $")62423 +MODULE_ID("$Id: lib_unget_wch.c,v 1.10 2008/06/07 14:50:37 tom Exp $") 52639 62424 52640 62425 -#ifdef linux … … 52669 62454 NCURSES_EXPORT(int) 52670 62455 unget_wch(const wchar_t wch) 62456 @@ -82,7 +86,7 @@ 62457 wcrtomb(string, wch, &state); 62458 62459 for (n = (int) (length - 1); n >= 0; --n) { 62460 - if (ungetch(string[n]) != OK) { 62461 + if (_nc_ungetch(SP, string[n]) != OK) { 62462 result = ERR; 62463 break; 62464 } 52671 62465 diff -Naur ncurses-5.6.orig/ncurses/widechar/lib_vid_attr.c ncurses-5.6/ncurses/widechar/lib_vid_attr.c 52672 62466 --- ncurses-5.6.orig/ncurses/widechar/lib_vid_attr.c 2006-11-25 19:26:00.000000000 -0500 52673 +++ ncurses-5.6/ncurses/widechar/lib_vid_attr.c 200 7-12-21 00:02:36.000000000 -050062467 +++ ncurses-5.6/ncurses/widechar/lib_vid_attr.c 2008-06-18 06:49:44.000000000 -0400 52674 62468 @@ -1,5 +1,5 @@ 52675 62469 /**************************************************************************** … … 52698 62492 diff -Naur ncurses-5.6.orig/ncurses/widechar/lib_wunctrl.c ncurses-5.6/ncurses/widechar/lib_wunctrl.c 52699 62493 --- ncurses-5.6.orig/ncurses/widechar/lib_wunctrl.c 2005-04-16 14:10:44.000000000 -0400 52700 +++ ncurses-5.6/ncurses/widechar/lib_wunctrl.c 200 7-12-21 00:02:36.000000000 -050062494 +++ ncurses-5.6/ncurses/widechar/lib_wunctrl.c 2008-06-18 06:49:44.000000000 -0400 52701 62495 @@ -1,5 +1,5 @@ 52702 62496 /**************************************************************************** … … 52738 62532 diff -Naur ncurses-5.6.orig/ncurses-5.6-20071201-patch.sh ncurses-5.6/ncurses-5.6-20071201-patch.sh 52739 62533 --- ncurses-5.6.orig/ncurses-5.6-20071201-patch.sh 1969-12-31 19:00:00.000000000 -0500 52740 +++ ncurses-5.6/ncurses-5.6-20071201-patch.sh 200 7-12-21 00:02:35.000000000 -050062534 +++ ncurses-5.6/ncurses-5.6-20071201-patch.sh 2008-06-18 06:49:44.000000000 -0400 52741 62535 @@ -0,0 +1,60468 @@ 52742 62536 +#!/bin/sh … … 113210 123004 diff -Naur ncurses-5.6.orig/panel/Makefile.in ncurses-5.6/panel/Makefile.in 113211 123005 --- ncurses-5.6.orig/panel/Makefile.in 2006-10-14 16:40:36.000000000 -0400 113212 +++ ncurses-5.6/panel/Makefile.in 200 7-12-21 00:02:36.000000000 -0500123006 +++ ncurses-5.6/panel/Makefile.in 2008-06-18 06:49:44.000000000 -0400 113213 123007 @@ -1,6 +1,6 @@ 113214 123008 -# $Id: Makefile.in,v 1.47 2006/10/14 20:40:36 tom Exp $ … … 113258 123052 diff -Naur ncurses-5.6.orig/panel/headers ncurses-5.6/panel/headers 113259 123053 --- ncurses-5.6.orig/panel/headers 1998-02-11 07:14:01.000000000 -0500 113260 +++ ncurses-5.6/panel/headers 200 7-12-21 00:02:36.000000000 -0500123054 +++ ncurses-5.6/panel/headers 2008-06-18 06:49:44.000000000 -0400 113261 123055 @@ -1,5 +1,5 @@ 113262 123056 ############################################################################## … … 113273 123067 diff -Naur ncurses-5.6.orig/panel/modules ncurses-5.6/panel/modules 113274 123068 --- ncurses-5.6.orig/panel/modules 1998-02-11 07:14:02.000000000 -0500 113275 +++ ncurses-5.6/panel/modules 200 7-12-21 00:02:36.000000000 -0500123069 +++ ncurses-5.6/panel/modules 2008-06-18 06:49:44.000000000 -0400 113276 123070 @@ -1,5 +1,6 @@ 113277 123071 +# $Id: modules,v 1.9 2006/12/24 00:53:17 tom Exp $ … … 113298 123092 diff -Naur ncurses-5.6.orig/progs/Makefile.in ncurses-5.6/progs/Makefile.in 113299 123093 --- ncurses-5.6.orig/progs/Makefile.in 2006-12-17 10:55:48.000000000 -0500 113300 +++ ncurses-5.6/progs/Makefile.in 200 7-12-21 00:02:36.000000000 -0500123094 +++ ncurses-5.6/progs/Makefile.in 2008-06-18 06:49:44.000000000 -0400 113301 123095 @@ -1,6 +1,6 @@ 113302 123096 -# $Id: Makefile.in,v 1.70 2006/12/17 15:55:48 tom Exp $ … … 113393 123187 diff -Naur ncurses-5.6.orig/progs/clear.c ncurses-5.6/progs/clear.c 113394 123188 --- ncurses-5.6.orig/progs/clear.c 2006-05-20 13:47:47.000000000 -0400 113395 +++ ncurses-5.6/progs/clear.c 200 7-12-21 00:02:36.000000000 -0500123189 +++ ncurses-5.6/progs/clear.c 2008-06-18 06:49:44.000000000 -0400 113396 123190 @@ -1,5 +1,5 @@ 113397 123191 /**************************************************************************** … … 113415 123209 diff -Naur ncurses-5.6.orig/progs/dump_entry.c ncurses-5.6/progs/dump_entry.c 113416 123210 --- ncurses-5.6.orig/progs/dump_entry.c 2006-09-30 16:18:15.000000000 -0400 113417 +++ ncurses-5.6/progs/dump_entry.c 200 7-12-21 00:02:36.000000000 -0500123211 +++ ncurses-5.6/progs/dump_entry.c 2008-06-18 06:49:50.000000000 -0400 113418 123212 @@ -1,5 +1,5 @@ 113419 123213 /**************************************************************************** 113420 123214 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 113421 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *123215 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 113422 123216 * * 113423 123217 * Permission is hereby granted, free of charge, to any person obtaining a * … … 113428 123222 113429 123223 -MODULE_ID("$Id: dump_entry.c,v 1.79 2006/09/30 20:18:15 tom Exp $") 113430 +MODULE_ID("$Id: dump_entry.c,v 1.8 1 2007/08/25 20:05:35tom Exp $")123224 +MODULE_ID("$Id: dump_entry.c,v 1.82 2008/04/19 22:27:04 tom Exp $") 113431 123225 113432 123226 #define INDENT 8 … … 113453 123247 break; 113454 123248 } 113455 @@ -788,11 +791,11 @@ 123249 @@ -536,6 +539,10 @@ 123250 params = FALSE; 123251 percent = FALSE; 123252 break; 123253 + case ' ': 123254 + strncpy_DYN(&tmpbuf, "\\s", 2); 123255 + ++src; 123256 + continue; 123257 default: 123258 percent = FALSE; 123259 break; 123260 @@ -788,11 +795,11 @@ 113456 123261 * Much more work should be done on this to support dumping termcaps. 113457 123262 */ … … 113467 123272 WRAP_CONCAT; 113468 123273 } 113469 @@ -1223,7 +12 26,7 @@123274 @@ -1223,7 +1230,7 @@ 113470 123275 bool fix_needed = FALSE; 113471 123276 … … 113476 123281 fix_needed = TRUE; 113477 123282 break; 113478 @@ -1235,7 +12 38,7 @@123283 @@ -1235,7 +1242,7 @@ 113479 123284 if (fix_needed) { 113480 123285 memset(mapped, 0, sizeof(mapped)); … … 113487 123292 diff -Naur ncurses-5.6.orig/progs/infocmp.c ncurses-5.6/progs/infocmp.c 113488 123293 --- ncurses-5.6.orig/progs/infocmp.c 2006-08-19 17:20:37.000000000 -0400 113489 +++ ncurses-5.6/progs/infocmp.c 200 7-12-21 00:02:36.000000000 -0500123294 +++ ncurses-5.6/progs/infocmp.c 2008-06-18 06:49:46.000000000 -0400 113490 123295 @@ -1,5 +1,5 @@ 113491 123296 /**************************************************************************** 113492 123297 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 113493 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *123298 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 113494 123299 * * 113495 123300 * Permission is hereby granted, free of charge, to any person obtaining a * … … 113507 123312 113508 123313 -MODULE_ID("$Id: infocmp.c,v 1.85 2006/08/19 21:20:37 tom Exp $") 113509 +MODULE_ID("$Id: infocmp.c,v 1.9 4 2007/11/17 23:34:26tom Exp $")123314 +MODULE_ID("$Id: infocmp.c,v 1.96 2008/01/19 21:08:07 tom Exp $") 113510 123315 113511 123316 #define L_CURL "{" … … 113574 123379 string_variable(ExtStrname(term, n, strnames)), buf); 113575 123380 } 113576 @@ -1237,7 +1239,8 @@ 123381 @@ -1213,6 +1215,8 @@ 123382 NUM_STRINGS(term) - STRCOUNT); 123383 123384 (void) printf("#endif /* NCURSES_XNAMES */\n"); 123385 +#else 123386 + (void) term; 123387 #endif /* NCURSES_XNAMES */ 123388 (void) printf("\t%s\n", R_CURL); 123389 } 123390 @@ -1237,7 +1241,8 @@ 113577 123391 113578 123392 if ((terminal = getenv("TERM")) == 0) { … … 113584 123398 } 113585 123399 return terminal; 113586 @@ -1252,10 +125 5,15 @@123400 @@ -1252,10 +1257,15 @@ 113587 123401 int 113588 123402 main(int argc, char *argv[]) … … 113602 123416 bool formatted = FALSE; 113603 123417 bool filecompare = FALSE; 113604 @@ -1270,9 +12 78,16 @@123418 @@ -1270,9 +1280,16 @@ 113605 123419 use_extended_names(FALSE); 113606 123420 #endif … … 113620 123434 case '1': 113621 123435 mwidth = 0; 113622 @@ -1373,7 +13 88,6 @@123436 @@ -1373,7 +1390,6 @@ 113623 123437 113624 123438 case 'r': … … 113628 123442 113629 123443 case 's': 113630 @@ -1387,7 +140 1,8 @@123444 @@ -1387,7 +1403,8 @@ 113631 123445 sortmode = S_TERMCAP; 113632 123446 else { … … 113638 123452 } 113639 123453 break; 113640 @@ -1435,6 +145 0,18 @@123454 @@ -1435,6 +1452,18 @@ 113641 123455 } 113642 123456 } 113643 123457 113644 + maxterms = (argc + 1- optind);123458 + maxterms = (argc + 2 - optind); 113645 123459 + tfile = typeMalloc(path, maxterms); 113646 123460 + tname = typeCalloc(char *, maxterms); … … 113657 123471 if (sortmode == S_DEFAULT) 113658 123472 sortmode = S_TERMINFO; 113659 @@ -1458,53 +148 5,56 @@123473 @@ -1458,53 +1487,56 @@ 113660 123474 /* grab the entries */ 113661 123475 termcount = 0; … … 113753 123567 113754 123568 #if NCURSES_XNAMES 113755 @@ -1542,7 +157 2,8 @@123569 @@ -1542,7 +1574,8 @@ 113756 123570 case C_DEFAULT: 113757 123571 if (itrace) … … 113763 123577 (void) printf("#\tReconstructed via infocmp from file: %s\n", 113764 123578 tfile[0]); 113765 @@ -1553,12 +158 4,12 @@123579 @@ -1553,12 +1586,12 @@ 113766 123580 NULL); 113767 123581 len = show_entry(); … … 113778 123592 compare_entry(compare_predicate, &entries->tterm, quiet); 113779 123593 break; 113780 @@ -1566,7 +159 7,8 @@123594 @@ -1566,7 +1599,8 @@ 113781 123595 case C_COMMON: 113782 123596 if (itrace) … … 113788 123602 compare_entry(compare_predicate, &entries->tterm, quiet); 113789 123603 break; 113790 @@ -1574,14 +160 6,15 @@123604 @@ -1574,14 +1608,15 @@ 113791 123605 case C_NAND: 113792 123606 if (itrace) … … 113806 123620 suppress_untranslatable, 113807 123621 limited, 113808 @@ -1592,7 +162 5,7 @@123622 @@ -1592,7 +1627,7 @@ 113809 123623 || outform == F_TCONVERR)); 113810 123624 len = show_entry(); … … 113815 123629 } 113816 123630 } 113817 @@ -1606,7 +16 39,11 @@123631 @@ -1606,7 +1641,11 @@ 113818 123632 else 113819 123633 file_comparison(argc - optind, argv + optind); … … 113829 123643 diff -Naur ncurses-5.6.orig/progs/modules ncurses-5.6/progs/modules 113830 123644 --- ncurses-5.6.orig/progs/modules 2005-09-24 20:54:22.000000000 -0400 113831 +++ ncurses-5.6/progs/modules 200 7-12-21 00:02:36.000000000 -0500123645 +++ ncurses-5.6/progs/modules 2008-06-18 06:49:44.000000000 -0400 113832 123646 @@ -1,7 +1,7 @@ 113833 123647 -# $Id: modules,v 1.12 2005/09/25 00:54:22 tom Exp $ … … 113857 123671 diff -Naur ncurses-5.6.orig/progs/progs.priv.h ncurses-5.6/progs/progs.priv.h 113858 123672 --- ncurses-5.6.orig/progs/progs.priv.h 2006-11-25 19:28:01.000000000 -0500 113859 +++ ncurses-5.6/progs/progs.priv.h 200 7-12-21 00:02:36.000000000 -0500123673 +++ ncurses-5.6/progs/progs.priv.h 2008-06-18 06:49:44.000000000 -0400 113860 123674 @@ -1,5 +1,5 @@ 113861 123675 /**************************************************************************** … … 113893 123707 diff -Naur ncurses-5.6.orig/progs/tic.c ncurses-5.6/progs/tic.c 113894 123708 --- ncurses-5.6.orig/progs/tic.c 2006-12-02 17:13:17.000000000 -0500 113895 +++ ncurses-5.6/progs/tic.c 200 7-12-21 00:02:36.000000000 -0500123709 +++ ncurses-5.6/progs/tic.c 2008-06-18 06:49:44.000000000 -0400 113896 123710 @@ -1,5 +1,5 @@ 113897 123711 /**************************************************************************** … … 114004 123818 diff -Naur ncurses-5.6.orig/progs/toe.c ncurses-5.6/progs/toe.c 114005 123819 --- ncurses-5.6.orig/progs/toe.c 2006-08-19 14:18:09.000000000 -0400 114006 +++ ncurses-5.6/progs/toe.c 200 7-12-21 00:02:36.000000000 -0500123820 +++ ncurses-5.6/progs/toe.c 2008-06-18 06:49:45.000000000 -0400 114007 123821 @@ -1,5 +1,5 @@ 114008 123822 /**************************************************************************** 114009 123823 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 114010 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *123824 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 114011 123825 * * 114012 123826 * Permission is hereby granted, free of charge, to any person obtaining a * … … 114023 123837 114024 123838 -MODULE_ID("$Id: toe.c,v 1.41 2006/08/19 18:18:09 tom Exp $") 114025 +MODULE_ID("$Id: toe.c,v 1.4 6 2007/10/13 22:26:38tom Exp $")123839 +MODULE_ID("$Id: toe.c,v 1.48 2008/01/05 20:41:26 tom Exp $") 114026 123840 114027 123841 #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, "..")) … … 114037 123851 #endif 114038 123852 114039 @@ -326,7 +323,7 @@ 123853 @@ -319,6 +316,7 @@ 123854 bool direct_dependencies = FALSE; 123855 bool invert_dependencies = FALSE; 123856 bool header = FALSE; 123857 + char *report_file = 0; 123858 int i; 123859 int code; 123860 int this_opt, last_opt = '?'; 123861 @@ -326,7 +324,7 @@ 114040 123862 114041 123863 _nc_progname = _nc_rootname(argv[0]); 114042 123864 114043 123865 - while ((this_opt = getopt(argc, argv, "0123456789ahuvUV")) != EOF) { 114044 + while ((this_opt = getopt(argc, argv, "0123456789ahu vUV")) != -1) {123866 + while ((this_opt = getopt(argc, argv, "0123456789ahu:vU:V")) != -1) { 114045 123867 /* handle optional parameter */ 114046 123868 if (isdigit(this_opt)) { 114047 123869 switch (last_opt) { 123870 @@ -352,12 +350,14 @@ 123871 break; 123872 case 'u': 123873 direct_dependencies = TRUE; 123874 + report_file = optarg; 123875 break; 123876 case 'v': 123877 v_opt = 1; 123878 break; 123879 case 'U': 123880 invert_dependencies = TRUE; 123881 + report_file = optarg; 123882 break; 123883 case 'V': 123884 puts(curses_version()); 123885 @@ -368,15 +368,15 @@ 123886 } 123887 set_trace_level(v_opt); 123888 123889 - if (direct_dependencies || invert_dependencies) { 123890 - if (freopen(argv[optind], "r", stdin) == 0) { 123891 + if (report_file != 0) { 123892 + if (freopen(report_file, "r", stdin) == 0) { 123893 (void) fflush(stdout); 123894 - fprintf(stderr, "%s: can't open %s\n", _nc_progname, argv[optind]); 123895 + fprintf(stderr, "%s: can't open %s\n", _nc_progname, report_file); 123896 ExitProgram(EXIT_FAILURE); 123897 } 123898 123899 /* parse entries out of the source file */ 123900 - _nc_set_source(argv[optind]); 123901 + _nc_set_source(report_file); 123902 _nc_read_entry_source(stdin, 0, FALSE, FALSE, NULLHOOK); 123903 } 123904 114048 123905 diff -Naur ncurses-5.6.orig/progs/tput.c ncurses-5.6/progs/tput.c 114049 123906 --- ncurses-5.6.orig/progs/tput.c 2006-11-25 19:27:47.000000000 -0500 114050 +++ ncurses-5.6/progs/tput.c 200 7-12-21 00:02:36.000000000 -0500123907 +++ ncurses-5.6/progs/tput.c 2008-06-18 06:49:44.000000000 -0400 114051 123908 @@ -1,5 +1,5 @@ 114052 123909 /**************************************************************************** … … 114092 123949 diff -Naur ncurses-5.6.orig/progs/tset.c ncurses-5.6/progs/tset.c 114093 123950 --- ncurses-5.6.orig/progs/tset.c 2006-09-16 13:51:10.000000000 -0400 114094 +++ ncurses-5.6/progs/tset.c 200 7-12-21 00:02:36.000000000 -0500123951 +++ ncurses-5.6/progs/tset.c 2008-06-18 06:49:44.000000000 -0400 114095 123952 @@ -1,5 +1,5 @@ 114096 123953 /**************************************************************************** … … 127250 137107 diff -Naur ncurses-5.6.orig/test/Makefile.in ncurses-5.6/test/Makefile.in 127251 137108 --- ncurses-5.6.orig/test/Makefile.in 2006-10-21 18:56:03.000000000 -0400 127252 +++ ncurses-5.6/test/Makefile.in 200 7-12-21 00:02:36.000000000 -0500137109 +++ ncurses-5.6/test/Makefile.in 2008-06-18 06:49:49.000000000 -0400 127253 137110 @@ -1,6 +1,6 @@ 127254 137111 -# $Id: Makefile.in,v 1.92 2006/10/21 22:56:03 tom Exp $ 127255 +# $Id: Makefile.in,v 1.9 7 2007/04/28 15:28:28tom Exp $137112 +# $Id: Makefile.in,v 1.98 2008/04/12 20:44:47 tom Exp $ 127256 137113 ############################################################################## 127257 137114 -# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. # 127258 +# Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. #137115 +# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. # 127259 137116 # # 127260 137117 # Permission is hereby granted, free of charge, to any person obtaining a # 127261 137118 # copy of this software and associated documentation files (the "Software"), # 127262 @@ -77,7 +77,7 @@ 137119 @@ -75,9 +75,10 @@ 137120 LOCAL_LIBDIR = @top_builddir@/lib 137121 LOCAL_LIBS = @TEST_DEPS@ 127263 137122 MATH_LIB = @MATH_LIB@ 137123 +TEST_LIBS = @TEST_LIBS@ 127264 137124 127265 137125 LD = @LD@ … … 127269 137129 LDFLAGS = @LD_MODEL@ @LOCAL_LDFLAGS@ @LDFLAGS@ 127270 137130 127271 @@ -87,16 +8 7,18 @@137131 @@ -87,16 +88,18 @@ 127272 137132 LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE) 127273 137133 LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@ … … 127277 137137 # use these for linking with all of the libraries 127278 137138 -LIBS_DEFAULT = @TEST_ARGS@ @LIBS@ $(MATH_LIB) 127279 +LIBS_DEFAULT = $(TEST_ARGS) @LIBS@ $( MATH_LIB)137139 +LIBS_DEFAULT = $(TEST_ARGS) @LIBS@ $(TEST_LIBS) $(MATH_LIB) 127280 137140 LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_DEFAULT) 127281 137141 127282 137142 # use these for linking with the (n)curses library 127283 137143 -LIBS_CURSES = `echo "@TEST_ARGS@ @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $(MATH_LIB) 127284 +LIBS_CURSES = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $( MATH_LIB)137144 +LIBS_CURSES = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $(TEST_LIBS) $(MATH_LIB) 127285 137145 LDFLAGS_CURSES = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES) 127286 137146 127287 137147 # use these for linking with the tinfo library if we have it, or curses library if not 127288 137148 -LIBS_TINFO = @TINFO_ARGS@ @LIBS@ $(MATH_LIB) 127289 +LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LIBS@ $( MATH_LIB)137149 +LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) $(MATH_LIB) 127290 137150 LDFLAGS_TINFO = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO) 127291 137151 … … 127293 137153 diff -Naur ncurses-5.6.orig/test/README ncurses-5.6/test/README 127294 137154 --- ncurses-5.6.orig/test/README 2006-11-04 20:10:56.000000000 -0500 127295 +++ ncurses-5.6/test/README 200 7-12-21 00:02:36.000000000 -0500137155 +++ ncurses-5.6/test/README 2008-06-18 06:49:49.000000000 -0400 127296 137156 @@ -1,5 +1,5 @@ 127297 137157 ------------------------------------------------------------------------------- … … 127306 137166 ------------------------------------------------------------------------------- 127307 137167 --- $Id: README,v 1.28 2006/11/05 01:10:56 tom Exp $ 127308 +-- $Id: README,v 1.3 5 2007/08/18 23:12:24 tom Exp $137168 +-- $Id: README,v 1.36 2008/04/05 16:24:14 tom Exp $ 127309 137169 ------------------------------------------------------------------------------- 127310 137170 … … 127332 137192 acs_map test: gdc ins_wide inserts knight movewindow ncurses newdemo testcurs 127333 137193 -add_wch test: ncurses 137194 -add_wchnstr test: ncurses 127334 137195 +add_wch test: demo_panels ncurses 127335 add_wchnstr test: ncurses 137196 +add_wchnstr - 127336 137197 add_wchstr test: view 127337 137198 -addch test: blue bs ditto echochar hashtest ncurses testaddch view worm 127338 +addch test: blue bs dittoechochar hashtest ncurses savescreen testaddch view worm137199 +addch test: blue bs echochar hashtest ncurses savescreen testaddch view worm 127339 137200 addchnstr - 127340 137201 addchstr - 127341 137202 addnstr - 127342 137203 -addnwstr - 127343 137204 -addstr test: blue bs cardfile gdc hanoi lrtest ncurses 127344 +addstr test: blue bs cardfile gdc hanoi lrtest ncurses savescreen 137205 +addnwstr test: ncurses 137206 +addstr test: blue bs cardfile ditto gdc hanoi lrtest ncurses savescreen 127345 137207 addwstr test: ncurses 127346 137208 assume_default_colors test: ncurses … … 127397 137259 -derwin test: cardfile chgat demo_forms demo_menus ins_wide inserts movewindow ncurses 127398 137260 -doupdate test: cardfile demo_menus edit_field ins_wide inserts knight movewindow ncurses redraw 127399 +delscreen test: d ots_mvcur137261 +delscreen test: ditto dots_mvcur 127400 137262 +delwin test: cardfile chgat demo_forms demo_menus demo_panels edit_field inch_wide inchs ins_wide inserts movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs 127401 137263 +derwin test: cardfile chgat demo_forms demo_menus inch_wide inchs ins_wide inserts movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque … … 127430 137292 -getmaxx test: chgat movewindow ncurses newdemo redraw testcurs 127431 137293 -getmaxy test: chgat demo_forms movewindow ncurses newdemo redraw testcurs 127432 +getch test: background blue bs chgat color_set demo_altkeys ditto filter firework firstlast foldkeys hanoi hashtest lrtest rain savescreen tclock testaddch testcurs view wormxmas137294 +getch test: background blue bs chgat color_set demo_altkeys ditto filter firework firstlast foldkeys hanoi hashtest lrtest savescreen tclock testaddch testcurs view xmas 127433 137295 +getcurx test: bs chgat demo_altkeys demo_defkey demo_panels foldkeys movewindow ncurses redraw savescreen test_get_wstr test_getstr testcurs 127434 137296 +getcury test: bs chgat demo_altkeys demo_defkey demo_panels edit_field foldkeys movewindow ncurses redraw savescreen testcurs … … 127496 137358 +is_idlok test: test_opaque 127497 137359 +is_immedok test: test_opaque 127498 +is_keypad test: ncursestest_opaque137360 +is_keypad test: test_opaque 127499 137361 +is_leaveok test: test_opaque 127500 137362 is_linetouched lib: form 127501 137363 +is_nodelay test: test_opaque 127502 137364 +is_notimeout test: test_opaque 127503 +is_scrollok test: ncursestest_opaque137365 +is_scrollok test: test_opaque 127504 137366 +is_syncok test: test_opaque 127505 137367 is_term_resized - … … 127526 137388 -move test: blue bs cardfile chgat demo_altkeys demo_menus echochar foldkeys gdc hanoi hashtest ins_wide inserts knight lrtest movewindow ncurses testscanw view worm xmas 127527 137389 +mousemask test: bs demo_forms demo_menus knight movewindow ncurses 127528 +move test: blue bs cardfile chgat demo_altkeys demo_menus echochar foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses savescreen test_get_wstr test_getstr test_instr test_inwstr testscanw view wormxmas137390 +move test: blue bs cardfile chgat demo_altkeys demo_menus echochar foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses savescreen test_get_wstr test_getstr test_instr test_inwstr testscanw view xmas 127529 137391 mvadd_wch test: ncurses 127530 137392 mvadd_wchnstr - … … 127642 137504 mvwvline_set - 127643 137505 -napms test: dots echochar firework gdc hanoi lrtest ncurses newdemo railroad rain tclock testcurs view worm xmas progs: tset 127644 +napms test: demo_panels d ots dots_mvcur echochar firework gdc hanoi lrtest ncurses railroad rain tclock test_opaque testcurs view worm xmas progs: tset137506 +napms test: demo_panels ditto dots dots_mvcur echochar firework gdc hanoi lrtest ncurses railroad rain tclock test_opaque testcurs view worm xmas progs: tset 127645 137507 newpad test: edit_field ncurses testcurs 127646 137508 newscr lib: ncurses … … 127653 137515 -nodelay test: firework gdc lrtest ncurses newdemo rain tclock view xmas 127654 137516 -noecho test: background bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus ditto firework firstlast foldkeys gdc hanoi hashtest ins_wide inserts knight lrtest movewindow ncurses rain redraw tclock testcurs view worm xmas 127655 +nodelay test: firework gdc lrtest ncurses newdemo rain tclock test_opaque viewxmas137517 +nodelay test: ditto firework gdc lrtest ncurses newdemo rain tclock test_opaque view worm xmas 127656 137518 +noecho test: background bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas 127657 137519 nofilter - … … 127684 137546 redrawwin test: redraw 127685 137547 -refresh test: blue bs demo_defkey demo_forms demo_keyok demo_menus ditto echochar filter firstlast gdc hanoi hashtest lrtest movewindow ncurses tclock testcurs view worm xmas 127686 +refresh test: blue bs demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto echochar filter firstlast gdc hanoi hashtest lrtest movewindow ncurses savescreen tclock testcurs view wormxmas137548 +refresh test: blue bs demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto echochar filter firstlast gdc hanoi hashtest lrtest movewindow ncurses savescreen tclock testcurs view xmas 127687 137549 reset_prog_mode test: filter ncurses 127688 137550 -reset_shell_mode test: bs filter … … 127691 137553 resize_term test: view 127692 137554 resizeterm lib: ncurses 127693 @@ -484,16 +495,1 6@@137555 @@ -484,16 +495,18 @@ 127694 137556 ripoffline test: demo_menus ncurses 127695 137557 savetty - … … 127709 137571 +scrollok test: demo_altkeys demo_defkey demo_keyok demo_panels ditto foldkeys hashtest knight ncurses redraw test_opaque testcurs testscanw view 127710 137572 set_curterm lib: ncurses 127711 137573 -set_term test: ditto 127712 137574 -setcchar test: ins_wide ncurses view 137575 +set_escdelay - 137576 +set_tabsize - 137577 +set_term lib: ncurses 127713 137578 +setcchar test: demo_panels ins_wide ncurses view 127714 137579 setscrreg test: view 127715 137580 setupterm test: dots progs: clear tput tset 127716 137581 slk_attr - 127717 @@ -515,14 +526,14 @@ 137582 @@ -507,22 +520,22 @@ 137583 slk_color test: ncurses 137584 slk_init test: ncurses 137585 slk_label test: ncurses 137586 -slk_noutrefresh test: ncurses 137587 +slk_noutrefresh - 137588 slk_refresh test: ncurses 137589 slk_restore test: ncurses 137590 slk_set test: ncurses 137591 -slk_touch test: ncurses 137592 +slk_touch lib: ncurses 127718 137593 slk_wset test: ncurses 127719 standend test: blue gdc ncurses worm 137594 -standend test: blue gdc ncurses worm 137595 +standend test: blue gdc ncurses 127720 137596 standout test: blue ncurses 127721 137597 -start_color test: background blue bs cardfile chgat color_set demo_forms demo_menus echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain tclock testaddch testcurs view worm xmas … … 127725 137601 -strnames test: foldkeys progs: dump_entry infocmp tic 127726 137602 +start_color test: background blue bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas 127727 +stdscr test: bs chgat demo_altkeys demo_forms demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view xmas137603 +stdscr test: bs chgat demo_altkeys demo_forms demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas 127728 137604 +strcodes test: test_arrays progs: dump_entry 127729 137605 +strfnames test: test_arrays progs: dump_entry … … 127736 137612 termattrs test: ncurses testcurs 127737 137613 termname test: testcurs 127738 @@ -534,11 +54 5,11 @@137614 @@ -534,11 +547,11 @@ 127739 137615 tigetflag progs: tput 127740 137616 tigetnum test: ncurses progs: tput … … 127752 137628 ttytype lib: ncurses 127753 137629 typeahead test: testcurs 127754 @@ -561,58 +572,60 @@ 137630 @@ -551,6 +564,8 @@ 137631 use_env progs: tput 137632 use_extended_names progs: infocmp tic 137633 use_legacy_coding - 137634 +use_screen test: ditto 137635 +use_window test: rain worm 137636 vid_attr - 137637 vid_puts - 137638 vidattr lib: ncurses 137639 @@ -561,58 +576,60 @@ 127755 137640 vw_scanw - 127756 137641 vwprintw test: movewindow … … 127761 137646 wadd_wchstr - 127762 137647 -waddch test: demo_forms firstlast knight ncurses 127763 +waddch test: demo_forms demo_panels firstlast inch_wide inchs knight ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque 137648 +waddch test: demo_forms demo_panels firstlast inch_wide inchs knight ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque worm 127764 137649 waddchnstr lib: ncurses 127765 137650 waddchstr - … … 127811 137696 -wgetnstr test: ncurses 127812 137697 -wgetstr - 127813 +wgetch test: cardfile chgat demo_defkey demo_keyok demo_menus demo_panels edit_field gdc inserts knight movewindow ncurses newdemo r edraw test_opaque testcurs137698 +wgetch test: cardfile chgat demo_defkey demo_keyok demo_menus demo_panels edit_field gdc inserts knight movewindow ncurses newdemo rain redraw test_opaque testcurs worm 127814 137699 +wgetn_wstr test: ncurses test_get_wstr 127815 137700 +wgetnstr test: ncurses test_getstr … … 127838 137723 wins_wch test: ins_wide 127839 137724 wins_wstr test: ins_wide 127840 @@ -621,42 +63 4,42 @@137725 @@ -621,42 +638,42 @@ 127841 137726 winsertln test: testcurs 127842 137727 winsnstr test: inserts … … 127851 137736 +winwstr test: test_inwstr 127852 137737 +wmouse_trafo lib: form 127853 +wmove test: chgat demo_altkeys demo_defkey demo_keyok demo_menus demo_panels firstlast foldkeys inch_wide inchs ins_wide inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs 137738 +wmove test: chgat demo_altkeys demo_defkey demo_keyok demo_menus demo_panels firstlast foldkeys inch_wide inchs ins_wide inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs worm 127854 137739 +wnoutrefresh test: demo_menus edit_field inch_wide inchs ins_wide inserts knight movewindow ncurses redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque 127855 137740 +wprintw test: chgat demo_defkey demo_forms demo_keyok demo_menus demo_panels edit_field inch_wide inchs ins_wide inserts knight movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs 127856 137741 wredrawln test: redraw 127857 137742 -wrefresh test: chgat demo_forms demo_keyok demo_menus edit_field firstlast knight lrtest movewindow ncurses newdemo redraw tclock testcurs view xmas 127858 +wrefresh test: chgat demo_forms demo_keyok demo_menus demo_panels edit_field firstlast knight lrtest movewindow ncurses newdemo redraw savescreen tclock testcurs view xmas137743 +wrefresh test: chgat demo_forms demo_keyok demo_menus demo_panels edit_field firstlast knight lrtest movewindow ncurses newdemo redraw savescreen tclock testcurs view worm xmas 127859 137744 wresize test: cardfile ncurses 127860 137745 wscanw test: testcurs … … 127909 137794 diff -Naur ncurses-5.6.orig/test/aclocal.m4 ncurses-5.6/test/aclocal.m4 127910 137795 --- ncurses-5.6.orig/test/aclocal.m4 2006-12-02 19:10:15.000000000 -0500 127911 +++ ncurses-5.6/test/aclocal.m4 2007-12-21 00:02:36.000000000 -0500 137796 +++ ncurses-5.6/test/aclocal.m4 2008-06-18 06:49:47.000000000 -0400 137797 @@ -1,5 +1,5 @@ 137798 dnl*************************************************************************** 137799 -dnl Copyright (c) 2003-2005,2006 Free Software Foundation, Inc. * 137800 +dnl Copyright (c) 2003-2007,2008 Free Software Foundation, Inc. * 137801 dnl * 137802 dnl Permission is hereby granted, free of charge, to any person obtaining a * 137803 dnl copy of this software and associated documentation files (the * 127912 137804 @@ -26,7 +26,7 @@ 127913 137805 dnl authorization. * … … 127915 137807 dnl 127916 137808 -dnl $Id: aclocal.m4,v 1.17 2006/12/03 00:10:15 tom Exp $ 127917 +dnl $Id: aclocal.m4,v 1. 19 2007/06/09 20:01:31tom Exp $137809 +dnl $Id: aclocal.m4,v 1.22 2008/02/09 18:22:17 tom Exp $ 127918 137810 dnl 127919 137811 dnl Author: Thomas E. Dickey 127920 137812 dnl 127921 @@ -230,6 +230,12 @@ 137813 @@ -122,42 +122,119 @@ 137814 137815 ])dnl 137816 dnl --------------------------------------------------------------------------- 137817 -dnl CF_ADD_INCDIR version: 4 updated: 2002/12/21 14:25:52 137818 +dnl CF_ADD_INCDIR version: 9 updated: 2008/02/09 13:15:34 137819 dnl ------------- 137820 dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it's 137821 dnl redundant. We don't normally need to add -I/usr/local/include for gcc, 137822 dnl but old versions (and some misinstalled ones) need that. To make things 137823 -dnl worse, gcc 3.x gives error messages if -I/usr/local/include is added to 137824 +dnl worse, gcc 3.x may give error messages if -I/usr/local/include is added to 137825 dnl the include-path). 137826 AC_DEFUN([CF_ADD_INCDIR], 137827 [ 137828 -for cf_add_incdir in $1 137829 -do 137830 - while true 137831 +if test -n "$1" ; then 137832 + for cf_add_incdir in $1 137833 + do 137834 + while test $cf_add_incdir != /usr/include 137835 do 137836 - case $cf_add_incdir in 137837 - /usr/include) # (vi 137838 - ;; 137839 - /usr/local/include) # (vi 137840 + if test -d $cf_add_incdir 137841 + then 137842 + cf_have_incdir=no 137843 + if test -n "$CFLAGS$CPPFLAGS" ; then 137844 + # a loop is needed to ensure we can add subdirs of existing dirs 137845 + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do 137846 + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then 137847 + cf_have_incdir=yes; break 137848 + fi 137849 + done 137850 + fi 137851 + 137852 + if test "$cf_have_incdir" = no ; then 137853 + if test "$cf_add_incdir" = /usr/local/include ; then 137854 if test "$GCC" = yes 137855 then 137856 - cf_save_CPPFLAGS="$CPPFLAGS" 137857 - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 137858 - AC_TRY_COMPILE([#include <stdio.h>], 137859 - [printf("Hello")], 137860 - [], 137861 - [CPPFLAGS="$cf_save_CPPFLAGS"]) 137862 + cf_save_CPPFLAGS=$CPPFLAGS 137863 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 137864 + AC_TRY_COMPILE([#include <stdio.h>], 137865 + [printf("Hello")], 137866 + [], 137867 + [cf_have_incdir=yes]) 137868 + CPPFLAGS=$cf_save_CPPFLAGS 137869 fi 137870 - ;; 137871 - *) # (vi 137872 - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 137873 - ;; 137874 - esac 137875 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 137876 - test "$cf_top_incdir" = "$cf_add_incdir" && break 137877 - cf_add_incdir="$cf_top_incdir" 137878 + fi 137879 + fi 137880 + 137881 + if test "$cf_have_incdir" = no ; then 137882 + CF_VERBOSE(adding $cf_add_incdir to include-path) 137883 + ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)" 137884 + 137885 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 137886 + test "$cf_top_incdir" = "$cf_add_incdir" && break 137887 + cf_add_incdir="$cf_top_incdir" 137888 + else 137889 + break 137890 + fi 137891 + fi 137892 done 137893 -done 137894 + done 137895 +fi 137896 +])dnl 137897 +dnl --------------------------------------------------------------------------- 137898 +dnl CF_ADD_LIBDIR version: 6 updated: 2008/02/09 13:15:34 137899 +dnl ------------- 137900 +dnl Adds to the library-path 137901 +dnl 137902 +dnl Some machines have trouble with multiple -L options. 137903 +dnl 137904 +dnl $1 is the (list of) directory(s) to add 137905 +dnl $2 is the optional name of the variable to update (default LDFLAGS) 137906 +dnl 137907 +AC_DEFUN([CF_ADD_LIBDIR], 137908 +[ 137909 +if test -n "$1" ; then 137910 + for cf_add_libdir in $1 137911 + do 137912 + if test $cf_add_libdir = /usr/lib ; then 137913 + : 137914 + elif test -d $cf_add_libdir 137915 + then 137916 + cf_have_libdir=no 137917 + if test -n "$LDFLAGS$LIBS" ; then 137918 + # a loop is needed to ensure we can add subdirs of existing dirs 137919 + for cf_test_libdir in $LDFLAGS $LIBS ; do 137920 + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then 137921 + cf_have_libdir=yes; break 137922 + fi 137923 + done 137924 + fi 137925 + if test "$cf_have_libdir" = no ; then 137926 + CF_VERBOSE(adding $cf_add_libdir to library-path) 137927 + ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,[$]$2)" 137928 + fi 137929 + fi 137930 + done 137931 +fi 137932 +])dnl 137933 +dnl --------------------------------------------------------------------------- 137934 +dnl CF_ADD_SUBDIR_PATH version: 2 updated: 2007/07/29 10:12:59 137935 +dnl ------------------ 137936 +dnl Append to a search-list for a nonstandard header/lib-file 137937 +dnl $1 = the variable to return as result 137938 +dnl $2 = the package name 137939 +dnl $3 = the subdirectory, e.g., bin, include or lib 137940 +dnl $4 = the directory under which we will test for subdirectories 137941 +dnl $5 = a directory that we do not want $4 to match 137942 +AC_DEFUN([CF_ADD_SUBDIR_PATH], 137943 +[ 137944 +test "$4" != "$5" && \ 137945 +test -d "$4" && \ 137946 +ifelse([$5],NONE,,[(test $5 = NONE || test -d $5) &&]) { 137947 + test -n "$verbose" && echo " ... testing for $3-directories under $4" 137948 + test -d $4/$3 && $1="[$]$1 $4/$3" 137949 + test -d $4/$3/$2 && $1="[$]$1 $4/$3/$2" 137950 + test -d $4/$3/$2/$3 && $1="[$]$1 $4/$3/$2/$3" 137951 + test -d $4/$2/$3 && $1="[$]$1 $4/$2/$3" 137952 + test -d $4/$2/$3/$2 && $1="[$]$1 $4/$2/$3/$2" 137953 +} 137954 ])dnl 137955 dnl --------------------------------------------------------------------------- 137956 dnl CF_ANSI_CC_CHECK version: 9 updated: 2001/12/30 17:53:34 137957 @@ -230,6 +307,12 @@ 127922 137958 fi 127923 137959 ])dnl … … 127932 137968 dnl ------------- 127933 137969 dnl Allow user to enable a normally-off option. 127934 @@ -537,6 +543,43 @@ 137970 @@ -383,6 +466,60 @@ 137971 CF_TERM_HEADER 137972 ])dnl 137973 dnl --------------------------------------------------------------------------- 137974 +dnl CF_CURSES_FUNCS version: 13 updated: 2007/04/28 09:15:55 137975 +dnl --------------- 137976 +dnl Curses-functions are a little complicated, since a lot of them are macros. 137977 +AC_DEFUN([CF_CURSES_FUNCS], 137978 +[ 137979 +AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl 137980 +AC_REQUIRE([CF_XOPEN_CURSES]) 137981 +AC_REQUIRE([CF_CURSES_TERM_H]) 137982 +for cf_func in $1 137983 +do 137984 + CF_UPPER(cf_tr_func,$cf_func) 137985 + AC_MSG_CHECKING(for ${cf_func}) 137986 + CF_MSG_LOG(${cf_func}) 137987 + AC_CACHE_VAL(cf_cv_func_$cf_func,[ 137988 + eval cf_result='$ac_cv_func_'$cf_func 137989 + if test ".$cf_result" != ".no"; then 137990 + AC_TRY_LINK([ 137991 +#ifdef HAVE_XCURSES 137992 +#include <xcurses.h> 137993 +char * XCursesProgramName = "test"; 137994 +#else 137995 +#include <${cf_cv_ncurses_header-curses.h}> 137996 +#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H) 137997 +#include <ncursesw/term.h> 137998 +#else 137999 +#if defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H) 138000 +#include <ncurses/term.h> 138001 +#else 138002 +#ifdef HAVE_TERM_H 138003 +#include <term.h> 138004 +#endif 138005 +#endif 138006 +#endif 138007 +#endif], 138008 + [ 138009 +#ifndef ${cf_func} 138010 +long foo = (long)(&${cf_func}); 138011 +${cf_cv_main_return-return}(foo == 0); 138012 +#endif 138013 + ], 138014 + [cf_result=yes], 138015 + [cf_result=no]) 138016 + fi 138017 + eval 'cf_cv_func_'$cf_func'=$cf_result' 138018 + ]) 138019 + # use the computed/retrieved cache-value: 138020 + eval 'cf_result=$cf_cv_func_'$cf_func 138021 + AC_MSG_RESULT($cf_result) 138022 + if test $cf_result != no; then 138023 + AC_DEFINE_UNQUOTED(HAVE_${cf_tr_func}) 138024 + fi 138025 +done 138026 +])dnl 138027 +dnl --------------------------------------------------------------------------- 138028 dnl CF_CURSES_HEADER version: 1 updated: 2005/12/31 13:28:25 138029 dnl ---------------- 138030 dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common 138031 @@ -412,7 +549,7 @@ 138032 AC_CHECK_HEADERS($cf_cv_ncurses_header) 138033 ])dnl 138034 dnl --------------------------------------------------------------------------- 138035 -dnl CF_CURSES_LIBS version: 24 updated: 2006/02/04 19:44:43 138036 +dnl CF_CURSES_LIBS version: 26 updated: 2007/07/29 10:32:40 138037 dnl -------------- 138038 dnl Look for the curses libraries. Older curses implementations may require 138039 dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. 138040 @@ -421,97 +558,139 @@ 138041 AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl 138042 AC_MSG_CHECKING(if we have identified curses libraries) 138043 AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], 138044 - [initscr(); tgoto("?", 0,0)], 138045 - cf_result=yes, 138046 - cf_result=no) 138047 + [initscr(); tgoto("?", 0,0)], 138048 + cf_result=yes, 138049 + cf_result=no) 138050 AC_MSG_RESULT($cf_result) 138051 138052 if test "$cf_result" = no ; then 138053 case $host_os in #(vi 138054 freebsd*) #(vi 138055 - AC_CHECK_LIB(mytinfo,tgoto,[LIBS="-lmytinfo $LIBS"]) 138056 - ;; 138057 + AC_CHECK_LIB(mytinfo,tgoto,[LIBS="-lmytinfo $LIBS"]) 138058 + ;; 138059 hpux10.*) #(vi 138060 - AC_CHECK_LIB(cur_colr,initscr,[ 138061 - LIBS="-lcur_colr $LIBS" 138062 - ac_cv_func_initscr=yes 138063 - ],[ 138064 - AC_CHECK_LIB(Hcurses,initscr,[ 138065 - # HP's header uses __HP_CURSES, but user claims _HP_CURSES. 138066 - LIBS="-lHcurses $LIBS" 138067 - CPPFLAGS="-D__HP_CURSES -D_HP_CURSES $CPPFLAGS" 138068 - ac_cv_func_initscr=yes 138069 - ])]) 138070 - ;; 138071 + AC_CHECK_LIB(cur_colr,initscr,[ 138072 + LIBS="-lcur_colr $LIBS" 138073 + ac_cv_func_initscr=yes 138074 + ],[ 138075 + AC_CHECK_LIB(Hcurses,initscr,[ 138076 + # HP's header uses __HP_CURSES, but user claims _HP_CURSES. 138077 + LIBS="-lHcurses $LIBS" 138078 + CPPFLAGS="-D__HP_CURSES -D_HP_CURSES $CPPFLAGS" 138079 + ac_cv_func_initscr=yes 138080 + ])]) 138081 + ;; 138082 linux*) # Suse Linux does not follow /usr/lib convention 138083 - LIBS="$LIBS -L/lib" 138084 - ;; 138085 + CF_ADD_LIBDIR(/lib) 138086 + ;; 138087 sunos3*|sunos4*) 138088 - test -d /usr/5lib && \ 138089 - LIBS="$LIBS -L/usr/5lib -lcurses -ltermcap" 138090 - ac_cv_func_initscr=yes 138091 - ;; 138092 + if test -d /usr/5lib ; then 138093 + CF_ADD_LIBDIR(/usr/5lib) 138094 + LIBS="$LIBS -lcurses -ltermcap" 138095 + fi 138096 + ac_cv_func_initscr=yes 138097 + ;; 138098 esac 138099 138100 if test ".$ac_cv_func_initscr" != .yes ; then 138101 - cf_save_LIBS="$LIBS" 138102 - cf_term_lib="" 138103 - cf_curs_lib="" 138104 - 138105 - if test ".${cf_cv_ncurses_version-no}" != .no 138106 - then 138107 - cf_check_list="ncurses curses cursesX" 138108 - else 138109 - cf_check_list="cursesX curses ncurses" 138110 - fi 138111 - 138112 - # Check for library containing tgoto. Do this before curses library 138113 - # because it may be needed to link the test-case for initscr. 138114 - AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[ 138115 - for cf_term_lib in $cf_check_list termcap termlib unknown 138116 - do 138117 - AC_CHECK_LIB($cf_term_lib,tgoto,[break]) 138118 - done 138119 - ]) 138120 - 138121 - # Check for library containing initscr 138122 - test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" 138123 - for cf_curs_lib in $cf_check_list xcurses jcurses unknown 138124 - do 138125 - AC_CHECK_LIB($cf_curs_lib,initscr,[break]) 138126 - done 138127 - test $cf_curs_lib = unknown && AC_ERROR(no curses library found) 138128 - 138129 - LIBS="-l$cf_curs_lib $cf_save_LIBS" 138130 - if test "$cf_term_lib" = unknown ; then 138131 - AC_MSG_CHECKING(if we can link with $cf_curs_lib library) 138132 - AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], 138133 - [initscr()], 138134 - [cf_result=yes], 138135 - [cf_result=no]) 138136 - AC_MSG_RESULT($cf_result) 138137 - test $cf_result = no && AC_ERROR(Cannot link curses library) 138138 - elif test "$cf_curs_lib" = "$cf_term_lib" ; then 138139 - : 138140 - elif test "$cf_term_lib" != predefined ; then 138141 - AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries) 138142 - AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], 138143 - [initscr(); tgoto((char *)0, 0, 0);], 138144 - [cf_result=no], 138145 - [ 138146 - LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" 138147 - AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], 138148 - [initscr()], 138149 - [cf_result=yes], 138150 - [cf_result=error]) 138151 - ]) 138152 - AC_MSG_RESULT($cf_result) 138153 - fi 138154 + cf_save_LIBS="$LIBS" 138155 + cf_term_lib="" 138156 + cf_curs_lib="" 138157 + 138158 + if test ".${cf_cv_ncurses_version-no}" != .no 138159 + then 138160 + cf_check_list="ncurses curses cursesX" 138161 + else 138162 + cf_check_list="cursesX curses ncurses" 138163 + fi 138164 + 138165 + # Check for library containing tgoto. Do this before curses library 138166 + # because it may be needed to link the test-case for initscr. 138167 + AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[ 138168 + for cf_term_lib in $cf_check_list termcap termlib unknown 138169 + do 138170 + AC_CHECK_LIB($cf_term_lib,tgoto,[break]) 138171 + done 138172 + ]) 138173 + 138174 + # Check for library containing initscr 138175 + test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" 138176 + for cf_curs_lib in $cf_check_list xcurses jcurses unknown 138177 + do 138178 + AC_CHECK_LIB($cf_curs_lib,initscr,[break]) 138179 + done 138180 + test $cf_curs_lib = unknown && AC_ERROR(no curses library found) 138181 + 138182 + LIBS="-l$cf_curs_lib $cf_save_LIBS" 138183 + if test "$cf_term_lib" = unknown ; then 138184 + AC_MSG_CHECKING(if we can link with $cf_curs_lib library) 138185 + AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], 138186 + [initscr()], 138187 + [cf_result=yes], 138188 + [cf_result=no]) 138189 + AC_MSG_RESULT($cf_result) 138190 + test $cf_result = no && AC_ERROR(Cannot link curses library) 138191 + elif test "$cf_curs_lib" = "$cf_term_lib" ; then 138192 + : 138193 + elif test "$cf_term_lib" != predefined ; then 138194 + AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries) 138195 + AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], 138196 + [initscr(); tgoto((char *)0, 0, 0);], 138197 + [cf_result=no], 138198 + [ 138199 + LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" 138200 + AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], 138201 + [initscr()], 138202 + [cf_result=yes], 138203 + [cf_result=error]) 138204 + ]) 138205 + AC_MSG_RESULT($cf_result) 138206 + fi 138207 fi 138208 fi 138209 138210 ])dnl 138211 dnl --------------------------------------------------------------------------- 138212 +dnl CF_CURSES_TERM_H version: 6 updated: 2003/11/06 19:59:57 138213 +dnl ---------------- 138214 +dnl SVr4 curses should have term.h as well (where it puts the definitions of 138215 +dnl the low-level interface). This may not be true in old/broken implementations, 138216 +dnl as well as in misconfigured systems (e.g., gcc configured for Solaris 2.4 138217 +dnl running with Solaris 2.5.1). 138218 +AC_DEFUN([CF_CURSES_TERM_H], 138219 +[ 138220 +AC_CACHE_CHECK(for term.h, cf_cv_term_header,[ 138221 + 138222 +AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl 138223 +# If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look 138224 +# for <term.h> if we do not find the variant. 138225 +for cf_header in \ 138226 + `echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \ 138227 + term.h 138228 +do 138229 + AC_TRY_COMPILE([ 138230 +#include <${cf_cv_ncurses_header-curses.h}> 138231 +#include <${cf_header}>], 138232 + [WINDOW *x], 138233 + [cf_cv_term_header=$cf_header 138234 + break], 138235 + [cf_cv_term_header=no]) 138236 +done 138237 +]) 138238 + 138239 +case $cf_cv_term_header in #(vi 138240 +term.h) #(vi 138241 + AC_DEFINE(HAVE_TERM_H) 138242 + ;; 138243 +ncurses/term.h) 138244 + AC_DEFINE(HAVE_NCURSES_TERM_H) 138245 + ;; 138246 +ncursesw/term.h) 138247 + AC_DEFINE(HAVE_NCURSESW_TERM_H) 138248 + ;; 138249 +esac 138250 +])dnl 138251 +dnl --------------------------------------------------------------------------- 138252 dnl CF_CURSES_WACS_MAP version: 3 updated: 2003/05/17 22:19:02 138253 dnl ------------------ 138254 dnl Check for likely values of wacs_map[]: 138255 @@ -537,6 +716,43 @@ 127935 138256 dnl "dirname" is not portable, so we fake it with a shell script. 127936 138257 AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl … … 127976 138297 dnl ------------------ 127977 138298 dnl Configure-option to enable gcc warnings 127978 @@ -606,7 + 649,7 @@138299 @@ -606,7 +822,7 @@ 127979 138300 ]) 127980 138301 ])dnl … … 127985 138306 dnl Solaris has a data item 'curses_version', which confuses AC_CHECK_FUNCS. 127986 138307 dnl It's a character string "SVR4", not documented. 127987 @@ -619,7 + 662,7 @@138308 @@ -619,7 +835,7 @@ 127988 138309 { 127989 138310 char temp[1024]; … … 127994 138315 ,[cf_cv_func_curses_version=yes] 127995 138316 ,[cf_cv_func_curses_version=no] 127996 @@ -1155,7 +1198,7 @@ 138317 @@ -628,7 +844,7 @@ 138318 test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION) 138319 ]) 138320 dnl --------------------------------------------------------------------------- 138321 -dnl CF_GCC_ATTRIBUTES version: 10 updated: 2005/05/28 13:16:28 138322 +dnl CF_GCC_ATTRIBUTES version: 11 updated: 2007/07/29 09:55:12 138323 dnl ----------------- 138324 dnl Test for availability of useful gcc __attribute__ directives to quiet 138325 dnl compiler warnings. Though useful, not all are supported -- and contrary 138326 @@ -655,7 +871,7 @@ 138327 then 138328 AC_CHECKING([for $CC __attribute__ directives]) 138329 cat > conftest.$ac_ext <<EOF 138330 -#line __oline__ "configure" 138331 +#line __oline__ "${as_me-configure}" 138332 #include "confdefs.h" 138333 #include "conftest.h" 138334 #include "conftest.i" 138335 @@ -717,7 +933,7 @@ 138336 fi 138337 ])dnl 138338 dnl --------------------------------------------------------------------------- 138339 -dnl CF_GCC_WARNINGS version: 20 updated: 2005/08/06 18:37:29 138340 +dnl CF_GCC_WARNINGS version: 22 updated: 2007/07/29 09:55:12 138341 dnl --------------- 138342 dnl Check if the compiler supports useful warning options. There's a few that 138343 dnl we don't use, simply because they're too noisy: 138344 @@ -742,7 +958,7 @@ 138345 CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) 138346 138347 cat > conftest.$ac_ext <<EOF 138348 -#line __oline__ "configure" 138349 +#line __oline__ "${as_me-configure}" 138350 int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; } 138351 EOF 138352 138353 @@ -763,7 +979,7 @@ 138354 AC_CHECKING([for $CC warning options]) 138355 cf_save_CFLAGS="$CFLAGS" 138356 EXTRA_CFLAGS="-Wall" 138357 - for cf_opt in $1 \ 138358 + for cf_opt in \ 138359 wd1419 \ 138360 wd1682 \ 138361 wd1683 \ 138362 @@ -930,15 +1146,15 @@ 138363 AC_DEFUN([CF_LIBRARY_PATH], 138364 [CF_SUBDIR_PATH($1,$2,lib)])dnl 138365 dnl --------------------------------------------------------------------------- 138366 -dnl CF_MSG_LOG version: 3 updated: 1997/09/07 14:05:52 138367 +dnl CF_MSG_LOG version: 4 updated: 2007/07/29 09:55:12 138368 dnl ---------- 138369 dnl Write a debug message to config.log, along with the line number in the 138370 dnl configure script. 138371 AC_DEFUN([CF_MSG_LOG],[ 138372 -echo "(line __oline__) testing $* ..." 1>&AC_FD_CC 138373 +echo "${as_me-configure}:__oline__: testing $* ..." 1>&AC_FD_CC 138374 ])dnl 138375 dnl --------------------------------------------------------------------------- 138376 -dnl CF_NCURSES_CC_CHECK version: 3 updated: 2003/01/12 18:59:28 138377 +dnl CF_NCURSES_CC_CHECK version: 4 updated: 2007/07/29 10:39:05 138378 dnl ------------------- 138379 dnl Check if we can compile with ncurses' header file 138380 dnl $1 is the cache variable to set 138381 @@ -967,11 +1183,11 @@ 138382 #endif 138383 #endif 138384 ] 138385 - ,[$1=$cf_header] 138386 + ,[$1=$2] 138387 ,[$1=no]) 138388 ])dnl 138389 dnl --------------------------------------------------------------------------- 138390 -dnl CF_NCURSES_CPPFLAGS version: 18 updated: 2005/12/31 13:26:39 138391 +dnl CF_NCURSES_CPPFLAGS version: 19 updated: 2007/07/29 13:35:20 138392 dnl ------------------- 138393 dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting 138394 dnl the CPPFLAGS variable so we can include its header. 138395 @@ -999,8 +1215,9 @@ 138396 cf_ncuhdr_root=ifelse($1,,ncurses,$1) 138397 138398 test -n "$cf_cv_curses_dir" && \ 138399 -test "$cf_cv_curses_dir" != "no" && \ 138400 -CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" 138401 +test "$cf_cv_curses_dir" != "no" && { \ 138402 + CF_ADD_INCDIR($cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root) 138403 +} 138404 138405 AC_CACHE_CHECK(for $cf_ncuhdr_root header in include-path, cf_cv_ncurses_h,[ 138406 cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" 138407 @@ -1087,7 +1304,7 @@ 138408 138409 ])dnl 138410 dnl --------------------------------------------------------------------------- 138411 -dnl CF_NCURSES_LIBS version: 12 updated: 2004/04/27 16:26:05 138412 +dnl CF_NCURSES_LIBS version: 13 updated: 2007/07/29 10:29:20 138413 dnl --------------- 138414 dnl Look for the ncurses library. This is a little complicated on Linux, 138415 dnl because it may be linked with the gpm (general purpose mouse) library. 138416 @@ -1127,7 +1344,8 @@ 138417 138418 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) 138419 then 138420 - LIBS="-L$cf_cv_curses_dir/lib -l$cf_nculib_root $LIBS" 138421 + CF_ADD_LIBDIR($cf_cv_curses_dir/lib) 138422 + LIBS="-l$cf_nculib_root $LIBS" 138423 else 138424 CF_FIND_LIBRARY($cf_nculib_root,$cf_nculib_root, 138425 [#include <${cf_cv_ncurses_header-curses.h}>], 138426 @@ -1155,7 +1373,7 @@ 127997 138427 AC_DEFINE_UNQUOTED($cf_nculib_ROOT) 127998 138428 ])dnl … … 128003 138433 dnl Check for the version of ncurses, to aid in reporting bugs, etc. 128004 138434 dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS. We don't use 128005 @@ -1186,7 +1 229,7 @@138435 @@ -1186,7 +1404,7 @@ 128006 138436 make an error 128007 138437 # endif … … 128012 138442 cf_cv_ncurses_version=`cat $cf_tempfile`],,[ 128013 138443 128014 @@ -1442, 6 +1485,41@@138444 @@ -1442,7 +1660,42 @@ 128015 138445 -e 's/-[[UD]]$3\(=[[^ ]]*\)\?[$]//g'` 128016 138446 ])dnl 128017 138447 dnl --------------------------------------------------------------------------- 138448 -dnl CF_SUBDIR_PATH version: 4 updated: 2006/11/18 17:13:19 128018 138449 +dnl CF_SIG_ATOMIC_T version: 2 updated: 2005/09/18 17:27:12 128019 138450 +dnl --------------- … … 128051 138482 +])dnl 128052 138483 +dnl --------------------------------------------------------------------------- 128053 dnl CF_SUBDIR_PATH version: 4 updated: 2006/11/18 17:13:19 138484 +dnl CF_SUBDIR_PATH version: 5 updated: 2007/07/29 09:55:12 128054 138485 dnl -------------- 128055 138486 dnl Construct a search-list for a nonstandard header/lib-file 128056 @@ -1630,7 +1708,7 @@ 138487 dnl $1 = the variable to return as result 138488 @@ -1451,59 +1704,11 @@ 138489 AC_DEFUN([CF_SUBDIR_PATH], 138490 [$1="" 138491 138492 -test -d "[$]HOME" && { 138493 - test -n "$verbose" && echo " ... testing $3-directories under [$]HOME" 138494 - test -d "[$]HOME/$3" && $1="[$]$1 [$]HOME/$3" 138495 - test -d "[$]HOME/$3/$2" && $1="[$]$1 [$]HOME/$3/$2" 138496 - test -d "[$]HOME/$3/$2/$3" && $1="[$]$1 [$]HOME/$3/$2/$3" 138497 -} 138498 - 138499 -# For other stuff under the home directory, it should be sufficient to put 138500 -# a symbolic link for $HOME/$2 to the actual package location: 138501 -test -d "[$]HOME/$2" && { 138502 - test -n "$verbose" && echo " ... testing $3-directories under [$]HOME/$2" 138503 - test -d "[$]HOME/$2/$3" && $1="[$]$1 [$]HOME/$2/$3" 138504 - test -d "[$]HOME/$2/$3/$2" && $1="[$]$1 [$]HOME/$2/$3/$2" 138505 -} 138506 - 138507 -test "$prefix" != /usr/local && \ 138508 -test -d /usr/local && { 138509 - test -n "$verbose" && echo " ... testing $3-directories under /usr/local" 138510 - test -d /usr/local/$3 && $1="[$]$1 /usr/local/$3" 138511 - test -d /usr/local/$3/$2 && $1="[$]$1 /usr/local/$3/$2" 138512 - test -d /usr/local/$3/$2/$3 && $1="[$]$1 /usr/local/$3/$2/$3" 138513 - test -d /usr/local/$2/$3 && $1="[$]$1 /usr/local/$2/$3" 138514 - test -d /usr/local/$2/$3/$2 && $1="[$]$1 /usr/local/$2/$3/$2" 138515 -} 138516 - 138517 -test "$prefix" != NONE && \ 138518 -test -d $prefix && { 138519 - test -n "$verbose" && echo " ... testing $3-directories under $prefix" 138520 - test -d $prefix/$3 && $1="[$]$1 $prefix/$3" 138521 - test -d $prefix/$3/$2 && $1="[$]$1 $prefix/$3/$2" 138522 - test -d $prefix/$3/$2/$3 && $1="[$]$1 $prefix/$3/$2/$3" 138523 - test -d $prefix/$2/$3 && $1="[$]$1 $prefix/$2/$3" 138524 - test -d $prefix/$2/$3/$2 && $1="[$]$1 $prefix/$2/$3/$2" 138525 -} 138526 - 138527 -test "$prefix" != /opt && \ 138528 -test -d /opt && { 138529 - test -n "$verbose" && echo " ... testing $3-directories under /opt" 138530 - test -d /opt/$3 && $1="[$]$1 /opt/$3" 138531 - test -d /opt/$3/$2 && $1="[$]$1 /opt/$3/$2" 138532 - test -d /opt/$3/$2/$3 && $1="[$]$1 /opt/$3/$2/$3" 138533 - test -d /opt/$2/$3 && $1="[$]$1 /opt/$2/$3" 138534 - test -d /opt/$2/$3/$2 && $1="[$]$1 /opt/$2/$3/$2" 138535 -} 138536 - 138537 -test "$prefix" != /usr && \ 138538 -test -d /usr && { 138539 - test -n "$verbose" && echo " ... testing $3-directories under /usr" 138540 - test -d /usr/$3 && $1="[$]$1 /usr/$3" 138541 - test -d /usr/$3/$2 && $1="[$]$1 /usr/$3/$2" 138542 - test -d /usr/$3/$2/$3 && $1="[$]$1 /usr/$3/$2/$3" 138543 - test -d /usr/$2/$3 && $1="[$]$1 /usr/$2/$3" 138544 -} 138545 +CF_ADD_SUBDIR_PATH($1,$2,$3,/usr,$prefix) 138546 +CF_ADD_SUBDIR_PATH($1,$2,$3,$prefix,NONE) 138547 +CF_ADD_SUBDIR_PATH($1,$2,$3,/usr/local,$prefix) 138548 +CF_ADD_SUBDIR_PATH($1,$2,$3,/opt,$prefix) 138549 +CF_ADD_SUBDIR_PATH($1,$2,$3,[$]HOME,$prefix) 138550 ])dnl 138551 dnl --------------------------------------------------------------------------- 138552 dnl CF_SYS_TIME_SELECT version: 4 updated: 2000/10/04 09:18:40 138553 @@ -1611,11 +1816,12 @@ 138554 fi 138555 ])dnl 138556 dnl --------------------------------------------------------------------------- 138557 -dnl CF_VERBOSE version: 2 updated: 1997/09/05 10:45:14 138558 +dnl CF_VERBOSE version: 3 updated: 2007/07/29 09:55:12 138559 dnl ---------- 138560 dnl Use AC_VERBOSE w/o the warnings 138561 AC_DEFUN([CF_VERBOSE], 138562 [test -n "$verbose" && echo " $1" 1>&AC_FD_MSG 138563 +CF_MSG_LOG([$1]) 138564 ])dnl 138565 dnl --------------------------------------------------------------------------- 138566 dnl CF_WITH_CURSES_DIR version: 2 updated: 2002/11/10 14:46:59 138567 @@ -1630,7 +1836,37 @@ 128057 138568 [cf_cv_curses_dir=no]) 128058 138569 ])dnl 128059 138570 dnl --------------------------------------------------------------------------- 128060 138571 -dnl CF_XOPEN_SOURCE version: 24 updated: 2006/04/02 16:41:09 138572 +dnl CF_XOPEN_CURSES version: 8 updated: 2003/11/07 19:47:46 138573 +dnl --------------- 138574 +dnl Test if we should define X/Open source for curses, needed on Digital Unix 138575 +dnl 4.x, to see the extended functions, but breaks on IRIX 6.x. 138576 +dnl 138577 +dnl The getbegyx() check is needed for HPUX, which omits legacy macros such 138578 +dnl as getbegy(). The latter is better design, but the former is standard. 138579 +AC_DEFUN([CF_XOPEN_CURSES], 138580 +[ 138581 +AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl 138582 +AC_CACHE_CHECK(if we must define _XOPEN_SOURCE_EXTENDED,cf_cv_need_xopen_extension,[ 138583 +AC_TRY_LINK([ 138584 +#include <stdlib.h> 138585 +#include <${cf_cv_ncurses_header-curses.h}>],[ 138586 + long x = winnstr(stdscr, "", 0); 138587 + int x1, y1; 138588 + getbegyx(stdscr, y1, x1)], 138589 + [cf_cv_need_xopen_extension=no], 138590 + [AC_TRY_LINK([ 138591 +#define _XOPEN_SOURCE_EXTENDED 138592 +#include <stdlib.h> 138593 +#include <${cf_cv_ncurses_header-curses.h}>],[ 138594 + long x = winnstr(stdscr, "", 0); 138595 + int x1, y1; 138596 + getbegyx(stdscr, y1, x1)], 138597 + [cf_cv_need_xopen_extension=yes], 138598 + [cf_cv_need_xopen_extension=unknown])])]) 138599 +test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" 138600 +])dnl 138601 +dnl --------------------------------------------------------------------------- 128061 138602 +dnl CF_XOPEN_SOURCE version: 25 updated: 2007/01/29 18:36:38 128062 138603 dnl --------------- 128063 138604 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, 128064 138605 dnl or adapt to the vendor's definitions to get equivalent functionality, 128065 @@ -1664,7 +1 742,7 @@138606 @@ -1664,7 +1900,7 @@ 128066 138607 irix[[56]].*) #(vi 128067 138608 CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" … … 128074 138615 diff -Naur ncurses-5.6.orig/test/bs.c ncurses-5.6/test/bs.c 128075 138616 --- ncurses-5.6.orig/test/bs.c 2006-05-20 11:38:52.000000000 -0400 128076 +++ ncurses-5.6/test/bs.c 200 7-12-21 00:02:36.000000000 -0500138617 +++ ncurses-5.6/test/bs.c 2008-06-18 06:49:44.000000000 -0400 128077 138618 @@ -1,5 +1,5 @@ 128078 138619 /**************************************************************************** … … 128102 138643 diff -Naur ncurses-5.6.orig/test/cardfile.c ncurses-5.6/test/cardfile.c 128103 138644 --- ncurses-5.6.orig/test/cardfile.c 2006-12-09 19:30:09.000000000 -0500 128104 +++ ncurses-5.6/test/cardfile.c 200 7-12-21 00:02:36.000000000 -0500138645 +++ ncurses-5.6/test/cardfile.c 2008-06-18 06:49:49.000000000 -0400 128105 138646 @@ -1,5 +1,5 @@ 128106 138647 /**************************************************************************** 128107 138648 - * Copyright (c) 1999-2004,2006 Free Software Foundation, Inc. * 128108 + * Copyright (c) 1999-200 6,2007Free Software Foundation, Inc. *138649 + * Copyright (c) 1999-2007,2008 Free Software Foundation, Inc. * 128109 138650 * * 128110 138651 * Permission is hereby granted, free of charge, to any person obtaining a * … … 128115 138656 * 128116 138657 - * $Id: cardfile.c,v 1.28 2006/12/10 00:30:09 tom Exp $ 128117 + * $Id: cardfile.c,v 1.3 2 2007/08/11 16:34:27tom Exp $138658 + * $Id: cardfile.c,v 1.33 2008/04/12 22:05:53 tom Exp $ 128118 138659 * 128119 138660 * File format: text beginning in column 1 is a title; other text is content. 128120 138661 */ 128121 @@ -71, 7 +71,7@@138662 @@ -71,9 +71,9 @@ 128122 138663 #if !HAVE_STRDUP 128123 138664 #define strdup my_strdup … … 128126 138667 +strdup(const char *s) 128127 138668 { 128128 char *p = (char *) malloc(strlen(s) + 1); 138669 - char *p = (char *) malloc(strlen(s) + 1); 138670 + char *p = typeMalloc(char, strlen(s) + 1); 128129 138671 if (p) 128130 @@ -136,13 +136,15 @@ 138672 strcpy(p, s); 138673 return (p); 138674 @@ -111,7 +111,7 @@ 138675 break; 138676 } 138677 138678 - card = (CARD *) calloc(1, sizeof(CARD)); 138679 + card = typeCalloc(CARD, 1); 138680 card->title = strdup(title); 138681 card->content = strdup(""); 138682 138683 @@ -135,14 +135,16 @@ 138684 if ((total = strlen(content)) != 0) { 128131 138685 if ((offset = strlen(card->content)) != 0) { 128132 138686 total += 1 + offset; 128133 138687 - card->content = (char *) realloc(card->content, total + 1); 128134 138688 - strcpy(card->content + offset++, " "); 138689 + card->content = typeRealloc(char, total + 1, card->content); 128135 138690 + if (card->content) 128136 138691 + strcpy(card->content + offset++, " "); … … 128138 138693 if (card->content != 0) 128139 138694 free(card->content); 128140 card->content = (char *) malloc(total + 1); 138695 - card->content = (char *) malloc(total + 1); 138696 + card->content = typeMalloc(char, total + 1); 128141 138697 } 128142 138698 - strcpy(card->content + offset, content); … … 128157 138713 128158 138714 case KEY_BACKSPACE: 138715 @@ -334,7 +336,7 @@ 138716 static FIELD ** 138717 make_fields(CARD * p, int form_high, int form_wide) 138718 { 138719 - FIELD **f = (FIELD **) calloc(3, sizeof(FIELD *)); 138720 + FIELD **f = typeCalloc(FIELD *, 3); 138721 138722 f[0] = new_field(1, form_wide, 0, 0, 0, 0); 138723 set_field_back(f[0], A_REVERSE); 128159 138724 @@ -568,7 +570,7 @@ 128160 138725 … … 128168 138733 diff -Naur ncurses-5.6.orig/test/chgat.c ncurses-5.6/test/chgat.c 128169 138734 --- ncurses-5.6.orig/test/chgat.c 2006-07-15 18:48:27.000000000 -0400 128170 +++ ncurses-5.6/test/chgat.c 200 7-12-21 00:02:36.000000000 -0500138735 +++ ncurses-5.6/test/chgat.c 2008-06-18 06:49:47.000000000 -0400 128171 138736 @@ -1,5 +1,5 @@ 128172 138737 /**************************************************************************** 128173 138738 - * Copyright (c) 2006 Free Software Foundation, Inc. * 128174 + * Copyright (c) 2006 ,2007 Free Software Foundation, Inc.*138739 + * Copyright (c) 2006-2007,2008 Free Software Foundation, Inc. * 128175 138740 * * 128176 138741 * Permission is hereby granted, free of charge, to any person obtaining a * 128177 138742 * copy of this software and associated documentation files (the * 128178 @@ -26, 7 +26,7@@138743 @@ -26,14 +26,14 @@ 128179 138744 * authorization. * 128180 138745 ****************************************************************************/ 128181 138746 /* 128182 138747 - * $Id: chgat.c,v 1.5 2006/07/15 22:48:27 tom Exp $ 128183 + * $Id: chgat.c,v 1. 7 2007/06/30 17:52:17tom Exp $138748 + * $Id: chgat.c,v 1.8 2008/02/09 23:19:13 tom Exp $ 128184 138749 * 128185 138750 * test-driver for chgat/wchgat/mvchgat/mvwchgat 128186 138751 */ 138752 138753 #include <test.priv.h> 138754 138755 -#ifdef HAVE_CHGAT 138756 +#if HAVE_CHGAT 138757 138758 #define SHOW(n) ((n) == ERR ? "ERR" : "OK") 138759 #define COLOR_DEFAULT (-1) 128187 138760 @@ -47,25 +47,26 @@ 128188 138761 typedef struct { … … 128253 138826 if (state < SIZEOF(table)) { 128254 138827 *attr = table[state].attr; 138828 diff -Naur ncurses-5.6.orig/test/color_set.c ncurses-5.6/test/color_set.c 138829 --- ncurses-5.6.orig/test/color_set.c 2006-06-03 12:40:10.000000000 -0400 138830 +++ ncurses-5.6/test/color_set.c 2008-06-18 06:49:47.000000000 -0400 138831 @@ -1,5 +1,5 @@ 138832 /**************************************************************************** 138833 - * Copyright (c) 2003-2004,2006 Free Software Foundation, Inc. * 138834 + * Copyright (c) 2003-2006,2008 Free Software Foundation, Inc. * 138835 * * 138836 * Permission is hereby granted, free of charge, to any person obtaining a * 138837 * copy of this software and associated documentation files (the * 138838 @@ -26,12 +26,12 @@ 138839 * authorization. * 138840 ****************************************************************************/ 138841 /* 138842 - * $Id: color_set.c,v 1.5 2006/06/03 16:40:10 tom Exp $ 138843 + * $Id: color_set.c,v 1.6 2008/02/10 00:18:01 tom Exp $ 138844 */ 138845 138846 #include <test.priv.h> 138847 138848 -#ifdef HAVE_COLOR_SET 138849 +#if HAVE_COLOR_SET 138850 138851 #define SHOW(n) ((n) == ERR ? "ERR" : "OK") 138852 128255 138853 diff -Naur ncurses-5.6.orig/test/configure ncurses-5.6/test/configure 128256 138854 --- ncurses-5.6.orig/test/configure 2006-12-02 19:10:59.000000000 -0500 128257 +++ ncurses-5.6/test/configure 200 7-12-21 00:02:36.000000000 -0500138855 +++ ncurses-5.6/test/configure 2008-06-18 06:49:47.000000000 -0400 128258 138856 @@ -183,6 +183,7 @@ 128259 138857 EOF … … 128783 139381 cat > conftest.$ac_ext <<EOF 128784 139382 -#line 1778 "configure" 128785 +#line 1610 " configure"139383 +#line 1610 "${as_me-configure}" 128786 139384 #include "confdefs.h" 128787 139385 #include "conftest.h" … … 128925 139523 128926 139524 -echo "(line 2074) testing if the symbol is already defined go no further ..." 1>&5 128927 +echo " (line 1906)testing if the symbol is already defined go no further ..." 1>&5139525 +echo "${as_me-configure}:1906: testing if the symbol is already defined go no further ..." 1>&5 128928 139526 128929 139527 cat > conftest.$ac_ext <<EOF … … 128965 139563 128966 139564 -echo "(line 2130) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 128967 +echo " (line 1962)testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5139565 +echo "${as_me-configure}:1962: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 128968 139566 128969 139567 CFLAGS="$cf_trim_CFLAGS" … … 128971 139569 128972 139570 -echo "(line 2135) testing if the second compile does not leave our definition intact error ..." 1>&5 128973 +echo " (line 1967)testing if the second compile does not leave our definition intact error ..." 1>&5139571 +echo "${as_me-configure}:1967: testing if the second compile does not leave our definition intact error ..." 1>&5 128974 139572 128975 139573 cat > conftest.$ac_ext <<EOF … … 128988 139586 else 128989 139587 echo "configure: failed program was:" >&5 128990 @@ -2178,6 +2010,3 47@@139588 @@ -2178,6 +2010,350 @@ 128991 139589 ;; 128992 139590 esac … … 129242 139840 + 129243 139841 +cat > conftest.$ac_ext <<EOF 129244 +#line 2264 " configure"139842 +#line 2264 "${as_me-configure}" 129245 139843 +int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } 129246 139844 +EOF … … 129264 139862 + cf_save_CFLAGS="$CFLAGS" 129265 139863 + EXTRA_CFLAGS="-Wall" 129266 + for cf_opt in 139864 + for cf_opt in \ 129267 139865 + wd1419 \ 129268 139866 + wd1682 \ … … 129317 139915 + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 129318 139916 + 139917 +echo "${as_me-configure}:2339: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 139918 + 139919 + 129319 139920 + continue;; 129320 139921 + esac … … 129336 139937 129337 139938 129338 @@ -2263,7 +243 6,7 @@139939 @@ -2263,7 +2439,7 @@ 129339 139940 129340 139941 129341 139942 echo $ac_n "checking for extra include directories""... $ac_c" 1>&6 129342 139943 -echo "configure:2267: checking for extra include directories" >&5 129343 +echo "configure:244 0: checking for extra include directories" >&5139944 +echo "configure:2443: checking for extra include directories" >&5 129344 139945 if eval "test \"`echo '$''{'cf_cv_curses_incdir'+set}'`\" = set"; then 129345 139946 echo $ac_n "(cached) $ac_c" 1>&6 129346 139947 else 129347 @@ -2288,7 +246 1,7 @@139948 @@ -2288,7 +2464,7 @@ 129348 139949 129349 139950 129350 139951 echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 129351 139952 -echo "configure:2292: checking if we have identified curses headers" >&5 129352 +echo "configure:246 5: checking if we have identified curses headers" >&5139953 +echo "configure:2468: checking if we have identified curses headers" >&5 129353 139954 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then 129354 139955 echo $ac_n "(cached) $ac_c" 1>&6 129355 139956 else 129356 @@ -2301,14 +247 4,14 @@139957 @@ -2301,14 +2477,14 @@ 129357 139958 ncurses/ncurses.h 129358 139959 do 129359 139960 cat > conftest.$ac_ext <<EOF 129360 139961 -#line 2305 "configure" 129361 +#line 24 78"configure"139962 +#line 2481 "configure" 129362 139963 #include "confdefs.h" 129363 139964 #include <${cf_header}> … … 129367 139968 EOF 129368 139969 -if { (eval echo configure:2312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 129369 +if { (eval echo configure:248 5: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then139970 +if { (eval echo configure:2488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 129370 139971 rm -rf conftest* 129371 139972 cf_cv_ncurses_header=$cf_header; break 129372 139973 else 129373 @@ -2331,17 +250 4,17 @@139974 @@ -2331,17 +2507,17 @@ 129374 139975 do 129375 139976 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 129376 139977 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 129377 139978 -echo "configure:2335: checking for $ac_hdr" >&5 129378 +echo "configure:25 08: checking for $ac_hdr" >&5139979 +echo "configure:2511: checking for $ac_hdr" >&5 129379 139980 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 129380 139981 echo $ac_n "(cached) $ac_c" 1>&6 … … 129382 139983 cat > conftest.$ac_ext <<EOF 129383 139984 -#line 2340 "configure" 129384 +#line 251 3"configure"139985 +#line 2516 "configure" 129385 139986 #include "confdefs.h" 129386 139987 #include <$ac_hdr> … … 129388 139989 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 129389 139990 -{ (eval echo configure:2345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 129390 +{ (eval echo configure:25 18: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }139991 +{ (eval echo configure:2521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 129391 139992 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 129392 139993 if test -z "$ac_err"; then 129393 139994 rm -rf conftest* 129394 @@ -2370,7 +254 3,7 @@139995 @@ -2370,7 +2546,7 @@ 129395 139996 129396 139997 129397 139998 echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 129398 139999 -echo "configure:2374: checking for terminfo header" >&5 129399 +echo "configure:25 47: checking for terminfo header" >&5140000 +echo "configure:2550: checking for terminfo header" >&5 129400 140001 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then 129401 140002 echo $ac_n "(cached) $ac_c" 1>&6 129402 140003 else 129403 @@ -2387,7 +256 0,7 @@140004 @@ -2387,7 +2563,7 @@ 129404 140005 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" 129405 140006 do 129406 140007 cat > conftest.$ac_ext <<EOF 129407 140008 -#line 2391 "configure" 129408 +#line 256 4"configure"140009 +#line 2567 "configure" 129409 140010 #include "confdefs.h" 129410 140011 #include <stdio.h> 129411 140012 #include <${cf_cv_ncurses_header-curses.h}> 129412 @@ -2397,7 +257 0,7 @@140013 @@ -2397,7 +2573,7 @@ 129413 140014 int x = auto_left_margin 129414 140015 ; return 0; } 129415 140016 EOF 129416 140017 -if { (eval echo configure:2401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 129417 +if { (eval echo configure:257 4: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then140018 +if { (eval echo configure:2577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 129418 140019 rm -rf conftest* 129419 140020 129420 140021 cf_cv_term_header="$cf_test" 129421 @@ -2446,7 +26 19,7 @@140022 @@ -2446,7 +2622,7 @@ 129422 140023 129423 140024 129424 140025 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 129425 140026 -echo "configure:2450: checking for ncurses version" >&5 129426 +echo "configure:262 3: checking for ncurses version" >&5140027 +echo "configure:2626: checking for ncurses version" >&5 129427 140028 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then 129428 140029 echo $ac_n "(cached) $ac_c" 1>&6 129429 140030 else 129430 @@ -2472,7 +264 5,7 @@140031 @@ -2472,7 +2648,7 @@ 129431 140032 #endif 129432 140033 EOF 129433 140034 cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" 129434 140035 - { (eval echo configure:2476: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 129435 + { (eval echo configure:26 49: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }140036 + { (eval echo configure:2652: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 129436 140037 if test -f conftest.out ; then 129437 140038 cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` 129438 140039 test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" 129439 @@ -2481,7 +265 4,7 @@140040 @@ -2481,7 +2657,7 @@ 129440 140041 129441 140042 else 129442 140043 cat > conftest.$ac_ext <<EOF 129443 140044 -#line 2485 "configure" 129444 +#line 26 58"configure"140045 +#line 2661 "configure" 129445 140046 #include "confdefs.h" 129446 140047 129447 140048 #include <${cf_cv_ncurses_header-curses.h}> 129448 @@ -2502,10 +267 5,10 @@140049 @@ -2502,10 +2678,10 @@ 129449 140050 make an error 129450 140051 # endif … … 129455 140056 EOF 129456 140057 -if { (eval echo configure:2509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 129457 +if { (eval echo configure:268 2: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null140058 +if { (eval echo configure:2685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 129458 140059 then 129459 140060 129460 140061 cf_cv_ncurses_version=`cat $cf_tempfile` 129461 @@ -2529,16 +270 2,16 @@140062 @@ -2529,16 +2705,16 @@ 129462 140063 129463 140064 129464 140065 echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6 129465 140066 -echo "configure:2533: checking if we have identified curses libraries" >&5 129466 +echo "configure:270 6: checking if we have identified curses libraries" >&5140067 +echo "configure:2709: checking if we have identified curses libraries" >&5 129467 140068 cat > conftest.$ac_ext <<EOF 129468 140069 -#line 2535 "configure" 129469 +#line 27 08"configure"140070 +#line 2711 "configure" 129470 140071 #include "confdefs.h" 129471 140072 #include <${cf_cv_ncurses_header-curses.h}> … … 129475 140076 EOF 129476 140077 -if { (eval echo configure:2542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129477 +if { (eval echo configure:271 5: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then140078 +if { (eval echo configure:2718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129478 140079 rm -rf conftest* 129479 140080 cf_result=yes 129480 140081 else 129481 @@ -2554,7 +2727,7 @@ 140082 @@ -2553,8 +2729,8 @@ 140083 if test "$cf_result" = no ; then 129482 140084 case $host_os in #(vi 129483 140085 freebsd*) #(vi 129484 140086 - echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 129485 140087 -echo "configure:2558: checking for tgoto in -lmytinfo" >&5 129486 +echo "configure:2731: checking for tgoto in -lmytinfo" >&5 140088 + echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 140089 +echo "configure:2734: checking for tgoto in -lmytinfo" >&5 129487 140090 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` 129488 140091 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 129489 140092 echo $ac_n "(cached) $ac_c" 1>&6 129490 @@ -2562,7 +273 5,7 @@140093 @@ -2562,7 +2738,7 @@ 129491 140094 ac_save_LIBS="$LIBS" 129492 140095 LIBS="-lmytinfo $LIBS" 129493 140096 cat > conftest.$ac_ext <<EOF 129494 140097 -#line 2566 "configure" 129495 +#line 27 39"configure"140098 +#line 2742 "configure" 129496 140099 #include "confdefs.h" 129497 140100 /* Override any gcc2 internal prototype to avoid an error. */ 129498 140101 /* We use char because int might match the return type of a gcc2 129499 @@ -2573,7 +274 6,7 @@140102 @@ -2573,7 +2749,7 @@ 129500 140103 tgoto() 129501 140104 ; return 0; } 129502 140105 EOF 129503 140106 -if { (eval echo configure:2577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129504 +if { (eval echo configure:275 0: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then140107 +if { (eval echo configure:2753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129505 140108 rm -rf conftest* 129506 140109 eval "ac_cv_lib_$ac_lib_var=yes" 129507 140110 else 129508 @@ -2596,7 +2769,7 @@ 129509 ;; 140111 @@ -2593,10 +2769,10 @@ 140112 echo "$ac_t""no" 1>&6 140113 fi 140114 140115 - ;; 140116 + ;; 129510 140117 hpux10.*) #(vi 129511 140118 - echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 129512 140119 -echo "configure:2600: checking for initscr in -lcur_colr" >&5 129513 +echo "configure:2773: checking for initscr in -lcur_colr" >&5 140120 + echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 140121 +echo "configure:2776: checking for initscr in -lcur_colr" >&5 129514 140122 ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'` 129515 140123 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 129516 140124 echo $ac_n "(cached) $ac_c" 1>&6 129517 @@ -2604,7 +27 77,7 @@140125 @@ -2604,7 +2780,7 @@ 129518 140126 ac_save_LIBS="$LIBS" 129519 140127 LIBS="-lcur_colr $LIBS" 129520 140128 cat > conftest.$ac_ext <<EOF 129521 140129 -#line 2608 "configure" 129522 +#line 278 1"configure"140130 +#line 2784 "configure" 129523 140131 #include "confdefs.h" 129524 140132 /* Override any gcc2 internal prototype to avoid an error. */ 129525 140133 /* We use char because int might match the return type of a gcc2 129526 @@ -2615,7 +27 88,7 @@140134 @@ -2615,7 +2791,7 @@ 129527 140135 initscr() 129528 140136 ; return 0; } 129529 140137 EOF 129530 140138 -if { (eval echo configure:2619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129531 +if { (eval echo configure:279 2: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then140139 +if { (eval echo configure:2795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129532 140140 rm -rf conftest* 129533 140141 eval "ac_cv_lib_$ac_lib_var=yes" 129534 140142 else 129535 @@ -2638,7 +2811,7 @@ 140143 @@ -2631,14 +2807,14 @@ 140144 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 140145 echo "$ac_t""yes" 1>&6 140146 140147 - LIBS="-lcur_colr $LIBS" 140148 - ac_cv_func_initscr=yes 140149 - 140150 + LIBS="-lcur_colr $LIBS" 140151 + ac_cv_func_initscr=yes 140152 + 140153 else 129536 140154 echo "$ac_t""no" 1>&6 129537 140155 129538 140156 - echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 129539 140157 -echo "configure:2642: checking for initscr in -lHcurses" >&5 129540 +echo "configure:2815: checking for initscr in -lHcurses" >&5 140158 + echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 140159 +echo "configure:2818: checking for initscr in -lHcurses" >&5 129541 140160 ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'` 129542 140161 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 129543 140162 echo $ac_n "(cached) $ac_c" 1>&6 129544 @@ -2646,7 +28 19,7 @@140163 @@ -2646,7 +2822,7 @@ 129545 140164 ac_save_LIBS="$LIBS" 129546 140165 LIBS="-lHcurses $LIBS" 129547 140166 cat > conftest.$ac_ext <<EOF 129548 140167 -#line 2650 "configure" 129549 +#line 282 3"configure"140168 +#line 2826 "configure" 129550 140169 #include "confdefs.h" 129551 140170 /* Override any gcc2 internal prototype to avoid an error. */ 129552 140171 /* We use char because int might match the return type of a gcc2 129553 @@ -2657,7 +283 0,7 @@140172 @@ -2657,7 +2833,7 @@ 129554 140173 initscr() 129555 140174 ; return 0; } 129556 140175 EOF 129557 140176 -if { (eval echo configure:2661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129558 +if { (eval echo configure:283 4: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then140177 +if { (eval echo configure:2837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129559 140178 rm -rf conftest* 129560 140179 eval "ac_cv_lib_$ac_lib_var=yes" 129561 140180 else 129562 @@ -2710,12 +2883,12 @@ 129563 # Check for library containing tgoto. Do this before curses library 129564 # because it may be needed to link the test-case for initscr. 129565 echo $ac_n "checking for tgoto""... $ac_c" 1>&6 140181 @@ -2673,49 +2849,107 @@ 140182 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 140183 echo "$ac_t""yes" 1>&6 140184 140185 - # HP's header uses __HP_CURSES, but user claims _HP_CURSES. 140186 - LIBS="-lHcurses $LIBS" 140187 - CPPFLAGS="-D__HP_CURSES -D_HP_CURSES $CPPFLAGS" 140188 - ac_cv_func_initscr=yes 140189 - 140190 + # HP's header uses __HP_CURSES, but user claims _HP_CURSES. 140191 + LIBS="-lHcurses $LIBS" 140192 + CPPFLAGS="-D__HP_CURSES -D_HP_CURSES $CPPFLAGS" 140193 + ac_cv_func_initscr=yes 140194 + 140195 else 140196 echo "$ac_t""no" 1>&6 140197 fi 140198 140199 fi 140200 140201 - ;; 140202 -linux*) # Suse Linux does not follow /usr/lib convention 140203 - LIBS="$LIBS -L/lib" 140204 - ;; 140205 + ;; 140206 +linux*) # Suse Linux does not follow /usr/lib convention 140207 + 140208 +if test -n "/lib" ; then 140209 + for cf_add_libdir in /lib 140210 + do 140211 + if test $cf_add_libdir = /usr/lib ; then 140212 + : 140213 + elif test -d $cf_add_libdir 140214 + then 140215 + cf_have_libdir=no 140216 + if test -n "$LDFLAGS$LIBS" ; then 140217 + # a loop is needed to ensure we can add subdirs of existing dirs 140218 + for cf_test_libdir in $LDFLAGS $LIBS ; do 140219 + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then 140220 + cf_have_libdir=yes; break 140221 + fi 140222 + done 140223 + fi 140224 + if test "$cf_have_libdir" = no ; then 140225 + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 140226 + 140227 +echo "${as_me-configure}:2886: testing adding $cf_add_libdir to library-path ..." 1>&5 140228 + 140229 + 140230 + LDFLAGS="-L$cf_add_libdir $LDFLAGS" 140231 + fi 140232 + fi 140233 + done 140234 +fi 140235 + 140236 + ;; 140237 sunos3*|sunos4*) 140238 - test -d /usr/5lib && \ 140239 - LIBS="$LIBS -L/usr/5lib -lcurses -ltermcap" 140240 - ac_cv_func_initscr=yes 140241 - ;; 140242 + if test -d /usr/5lib ; then 140243 + 140244 +if test -n "/usr/5lib" ; then 140245 + for cf_add_libdir in /usr/5lib 140246 + do 140247 + if test $cf_add_libdir = /usr/lib ; then 140248 + : 140249 + elif test -d $cf_add_libdir 140250 + then 140251 + cf_have_libdir=no 140252 + if test -n "$LDFLAGS$LIBS" ; then 140253 + # a loop is needed to ensure we can add subdirs of existing dirs 140254 + for cf_test_libdir in $LDFLAGS $LIBS ; do 140255 + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then 140256 + cf_have_libdir=yes; break 140257 + fi 140258 + done 140259 + fi 140260 + if test "$cf_have_libdir" = no ; then 140261 + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 140262 + 140263 +echo "${as_me-configure}:2918: testing adding $cf_add_libdir to library-path ..." 1>&5 140264 + 140265 + 140266 + LDFLAGS="-L$cf_add_libdir $LDFLAGS" 140267 + fi 140268 + fi 140269 + done 140270 +fi 140271 + 140272 + LIBS="$LIBS -lcurses -ltermcap" 140273 + fi 140274 + ac_cv_func_initscr=yes 140275 + ;; 140276 esac 140277 140278 if test ".$ac_cv_func_initscr" != .yes ; then 140279 - cf_save_LIBS="$LIBS" 140280 - cf_term_lib="" 140281 - cf_curs_lib="" 140282 - 140283 - if test ".${cf_cv_ncurses_version-no}" != .no 140284 - then 140285 - cf_check_list="ncurses curses cursesX" 140286 - else 140287 - cf_check_list="cursesX curses ncurses" 140288 - fi 140289 + cf_save_LIBS="$LIBS" 140290 + cf_term_lib="" 140291 + cf_curs_lib="" 140292 + 140293 + if test ".${cf_cv_ncurses_version-no}" != .no 140294 + then 140295 + cf_check_list="ncurses curses cursesX" 140296 + else 140297 + cf_check_list="cursesX curses ncurses" 140298 + fi 140299 140300 - # Check for library containing tgoto. Do this before curses library 140301 - # because it may be needed to link the test-case for initscr. 140302 - echo $ac_n "checking for tgoto""... $ac_c" 1>&6 129566 140303 -echo "configure:2714: checking for tgoto" >&5 129567 +echo "configure:2887: checking for tgoto" >&5 140304 + # Check for library containing tgoto. Do this before curses library 140305 + # because it may be needed to link the test-case for initscr. 140306 + echo $ac_n "checking for tgoto""... $ac_c" 1>&6 140307 +echo "configure:2948: checking for tgoto" >&5 129568 140308 if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then 129569 140309 echo $ac_n "(cached) $ac_c" 1>&6 … … 129571 140311 cat > conftest.$ac_ext <<EOF 129572 140312 -#line 2719 "configure" 129573 +#line 2 892"configure"140313 +#line 2953 "configure" 129574 140314 #include "confdefs.h" 129575 140315 /* System header to define __stub macros and hopefully few prototypes, 129576 140316 which can conflict with char tgoto(); below. */ 129577 @@ -2738,7 +29 11,7 @@140317 @@ -2738,7 +2972,7 @@ 129578 140318 129579 140319 ; return 0; } 129580 140320 EOF 129581 140321 -if { (eval echo configure:2742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129582 +if { (eval echo configure:29 15: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then140322 +if { (eval echo configure:2976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129583 140323 rm -rf conftest* 129584 140324 eval "ac_cv_func_tgoto=yes" 129585 140325 else 129586 @@ -2759,7 +2932,7 @@ 129587 for cf_term_lib in $cf_check_list termcap termlib unknown 129588 do 129589 echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 140326 @@ -2756,10 +2990,10 @@ 140327 else 140328 echo "$ac_t""no" 1>&6 140329 140330 - for cf_term_lib in $cf_check_list termcap termlib unknown 140331 - do 140332 - echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 129590 140333 -echo "configure:2763: checking for tgoto in -l$cf_term_lib" >&5 129591 +echo "configure:2936: checking for tgoto in -l$cf_term_lib" >&5 140334 + for cf_term_lib in $cf_check_list termcap termlib unknown 140335 + do 140336 + echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 140337 +echo "configure:2997: checking for tgoto in -l$cf_term_lib" >&5 129592 140338 ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'` 129593 140339 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 129594 140340 echo $ac_n "(cached) $ac_c" 1>&6 129595 @@ -2767,7 + 2940,7 @@140341 @@ -2767,7 +3001,7 @@ 129596 140342 ac_save_LIBS="$LIBS" 129597 140343 LIBS="-l$cf_term_lib $LIBS" 129598 140344 cat > conftest.$ac_ext <<EOF 129599 140345 -#line 2771 "configure" 129600 +#line 2944"configure"140346 +#line 3005 "configure" 129601 140347 #include "confdefs.h" 129602 140348 /* Override any gcc2 internal prototype to avoid an error. */ 129603 140349 /* We use char because int might match the return type of a gcc2 129604 @@ -2778,7 + 2951,7 @@140350 @@ -2778,7 +3012,7 @@ 129605 140351 tgoto() 129606 140352 ; return 0; } 129607 140353 EOF 129608 140354 -if { (eval echo configure:2782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129609 +if { (eval echo configure: 2955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then140355 +if { (eval echo configure:3016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129610 140356 rm -rf conftest* 129611 140357 eval "ac_cv_lib_$ac_lib_var=yes" 129612 140358 else 129613 @@ -2808,7 +2981,7 @@ 129614 for cf_curs_lib in $cf_check_list xcurses jcurses unknown 129615 do 129616 echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 140359 @@ -2798,17 +3032,17 @@ 140360 echo "$ac_t""no" 1>&6 140361 fi 140362 140363 - done 140364 - 140365 + done 140366 + 140367 fi 140368 140369 140370 - # Check for library containing initscr 140371 - test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" 140372 - for cf_curs_lib in $cf_check_list xcurses jcurses unknown 140373 - do 140374 - echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 129617 140375 -echo "configure:2812: checking for initscr in -l$cf_curs_lib" >&5 129618 +echo "configure:2985: checking for initscr in -l$cf_curs_lib" >&5 140376 + # Check for library containing initscr 140377 + test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" 140378 + for cf_curs_lib in $cf_check_list xcurses jcurses unknown 140379 + do 140380 + echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 140381 +echo "configure:3046: checking for initscr in -l$cf_curs_lib" >&5 129619 140382 ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'` 129620 140383 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 129621 140384 echo $ac_n "(cached) $ac_c" 1>&6 129622 @@ -2816,7 + 2989,7 @@140385 @@ -2816,7 +3050,7 @@ 129623 140386 ac_save_LIBS="$LIBS" 129624 140387 LIBS="-l$cf_curs_lib $LIBS" 129625 140388 cat > conftest.$ac_ext <<EOF 129626 140389 -#line 2820 "configure" 129627 +#line 2993"configure"140390 +#line 3054 "configure" 129628 140391 #include "confdefs.h" 129629 140392 /* Override any gcc2 internal prototype to avoid an error. */ 129630 140393 /* We use char because int might match the return type of a gcc2 129631 @@ -2827,7 +30 00,7 @@140394 @@ -2827,7 +3061,7 @@ 129632 140395 initscr() 129633 140396 ; return 0; } 129634 140397 EOF 129635 140398 -if { (eval echo configure:2831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129636 +if { (eval echo configure:30 04: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then140399 +if { (eval echo configure:3065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129637 140400 rm -rf conftest* 129638 140401 eval "ac_cv_lib_$ac_lib_var=yes" 129639 140402 else 129640 @@ -2853,16 +3026,16 @@ 129641 LIBS="-l$cf_curs_lib $cf_save_LIBS" 129642 if test "$cf_term_lib" = unknown ; then 129643 echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6 140403 @@ -2847,22 +3081,22 @@ 140404 echo "$ac_t""no" 1>&6 140405 fi 140406 140407 - done 140408 - test $cf_curs_lib = unknown && { echo "configure: error: no curses library found" 1>&2; exit 1; } 140409 + done 140410 + test $cf_curs_lib = unknown && { echo "configure: error: no curses library found" 1>&2; exit 1; } 140411 140412 - LIBS="-l$cf_curs_lib $cf_save_LIBS" 140413 - if test "$cf_term_lib" = unknown ; then 140414 - echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6 129644 140415 -echo "configure:2857: checking if we can link with $cf_curs_lib library" >&5 129645 +echo "configure:3030: checking if we can link with $cf_curs_lib library" >&5 129646 cat > conftest.$ac_ext <<EOF 140416 - cat > conftest.$ac_ext <<EOF 129647 140417 -#line 2859 "configure" 129648 +#line 3032 "configure" 140418 + LIBS="-l$cf_curs_lib $cf_save_LIBS" 140419 + if test "$cf_term_lib" = unknown ; then 140420 + echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6 140421 +echo "configure:3091: checking if we can link with $cf_curs_lib library" >&5 140422 + cat > conftest.$ac_ext <<EOF 140423 +#line 3093 "configure" 129649 140424 #include "confdefs.h" 129650 140425 #include <${cf_cv_ncurses_header-curses.h}> … … 129654 140429 EOF 129655 140430 -if { (eval echo configure:2866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129656 +if { (eval echo configure:3 039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then140431 +if { (eval echo configure:3100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129657 140432 rm -rf conftest* 129658 140433 cf_result=yes 129659 140434 else 129660 @@ -2878,16 +3051,16 @@ 129661 : 129662 elif test "$cf_term_lib" != predefined ; then 129663 echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6 140435 @@ -2872,22 +3106,22 @@ 140436 cf_result=no 140437 fi 140438 rm -f conftest* 140439 - echo "$ac_t""$cf_result" 1>&6 140440 - test $cf_result = no && { echo "configure: error: Cannot link curses library" 1>&2; exit 1; } 140441 - elif test "$cf_curs_lib" = "$cf_term_lib" ; then 140442 - : 140443 - elif test "$cf_term_lib" != predefined ; then 140444 - echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6 129664 140445 -echo "configure:2882: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 129665 +echo "configure:3055: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 129666 cat > conftest.$ac_ext <<EOF 140446 - cat > conftest.$ac_ext <<EOF 129667 140447 -#line 2884 "configure" 129668 +#line 3057 "configure" 140448 + echo "$ac_t""$cf_result" 1>&6 140449 + test $cf_result = no && { echo "configure: error: Cannot link curses library" 1>&2; exit 1; } 140450 + elif test "$cf_curs_lib" = "$cf_term_lib" ; then 140451 + : 140452 + elif test "$cf_term_lib" != predefined ; then 140453 + echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6 140454 +echo "configure:3116: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 140455 + cat > conftest.$ac_ext <<EOF 140456 +#line 3118 "configure" 129669 140457 #include "confdefs.h" 129670 140458 #include <${cf_cv_ncurses_header-curses.h}> … … 129674 140462 EOF 129675 140463 -if { (eval echo configure:2891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129676 +if { (eval echo configure:3 064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then140464 +if { (eval echo configure:3125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129677 140465 rm -rf conftest* 129678 140466 cf_result=no 129679 140467 else 129680 @@ -2897,14 +3070,14 @@ 140468 @@ -2895,16 +3129,16 @@ 140469 cat conftest.$ac_ext >&5 140470 rm -rf conftest* 129681 140471 129682 129683 140472 - LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" 140473 - cat > conftest.$ac_ext <<EOF 129684 140474 -#line 2901 "configure" 129685 +#line 3074 "configure" 140475 + LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" 140476 + cat > conftest.$ac_ext <<EOF 140477 +#line 3135 "configure" 129686 140478 #include "confdefs.h" 129687 140479 #include <${cf_cv_ncurses_header-curses.h}> … … 129691 140483 EOF 129692 140484 -if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129693 +if { (eval echo configure:3 081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then140485 +if { (eval echo configure:3142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129694 140486 rm -rf conftest* 129695 140487 cf_result=yes 129696 140488 else 129697 @@ -2934,7 +3107,7 @@ 129698 CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" 140489 @@ -2914,11 +3148,11 @@ 140490 cf_result=error 140491 fi 140492 rm -f conftest* 140493 - 140494 + 140495 fi 140496 rm -f conftest* 140497 - echo "$ac_t""$cf_result" 1>&6 140498 - fi 140499 + echo "$ac_t""$cf_result" 1>&6 140500 + fi 140501 fi 140502 fi 140503 140504 @@ -2930,11 +3164,76 @@ 140505 cf_ncuhdr_root=ncurses 140506 140507 test -n "$cf_cv_curses_dir" && \ 140508 -test "$cf_cv_curses_dir" != "no" && \ 140509 -CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" 140510 +test "$cf_cv_curses_dir" != "no" && { \ 140511 + 140512 +if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then 140513 + for cf_add_incdir in $cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root 140514 + do 140515 + while test $cf_add_incdir != /usr/include 140516 + do 140517 + if test -d $cf_add_incdir 140518 + then 140519 + cf_have_incdir=no 140520 + if test -n "$CFLAGS$CPPFLAGS" ; then 140521 + # a loop is needed to ensure we can add subdirs of existing dirs 140522 + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do 140523 + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then 140524 + cf_have_incdir=yes; break 140525 + fi 140526 + done 140527 + fi 140528 + 140529 + if test "$cf_have_incdir" = no ; then 140530 + if test "$cf_add_incdir" = /usr/local/include ; then 140531 + if test "$GCC" = yes 140532 + then 140533 + cf_save_CPPFLAGS=$CPPFLAGS 140534 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 140535 + cat > conftest.$ac_ext <<EOF 140536 +#line 3194 "configure" 140537 +#include "confdefs.h" 140538 +#include <stdio.h> 140539 +int main() { 140540 +printf("Hello") 140541 +; return 0; } 140542 +EOF 140543 +if { (eval echo configure:3201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 140544 + : 140545 +else 140546 + echo "configure: failed program was:" >&5 140547 + cat conftest.$ac_ext >&5 140548 + rm -rf conftest* 140549 + cf_have_incdir=yes 140550 +fi 140551 +rm -f conftest* 140552 + CPPFLAGS=$cf_save_CPPFLAGS 140553 + fi 140554 + fi 140555 + fi 140556 + 140557 + if test "$cf_have_incdir" = no ; then 140558 + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 140559 + 140560 +echo "${as_me-configure}:3218: testing adding $cf_add_incdir to include-path ..." 1>&5 140561 + 140562 + 140563 + CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 140564 + 140565 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 140566 + test "$cf_top_incdir" = "$cf_add_incdir" && break 140567 + cf_add_incdir="$cf_top_incdir" 140568 + else 140569 + break 140570 + fi 140571 + fi 140572 + done 140573 + done 140574 +fi 140575 + 140576 +} 129699 140577 129700 140578 echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 129701 140579 -echo "configure:2938: checking for $cf_ncuhdr_root header in include-path" >&5 129702 +echo "configure:3 111: checking for $cf_ncuhdr_root header in include-path" >&5140580 +echo "configure:3237: checking for $cf_ncuhdr_root header in include-path" >&5 129703 140581 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then 129704 140582 echo $ac_n "(cached) $ac_c" 1>&6 129705 140583 else 129706 @@ -2945,7 +3 118,7 @@140584 @@ -2945,7 +3244,7 @@ 129707 140585 do 129708 140586 129709 140587 cat > conftest.$ac_ext <<EOF 129710 140588 -#line 2949 "configure" 129711 +#line 3 122"configure"140589 +#line 3248 "configure" 129712 140590 #include "confdefs.h" 129713 140591 129714 140592 129715 @@ -2966,7 +3 139,7 @@140593 @@ -2966,7 +3265,7 @@ 129716 140594 129717 140595 ; return 0; } 129718 140596 EOF 129719 140597 -if { (eval echo configure:2970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 129720 +if { (eval echo configure:3 143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then140598 +if { (eval echo configure:3269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 129721 140599 rm -rf conftest* 129722 140600 cf_cv_ncurses_h=$cf_header 129723 140601 129724 @@ -2992,7 +3 165,7 @@140602 @@ -2992,7 +3291,7 @@ 129725 140603 else 129726 140604 129727 140605 echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 129728 140606 -echo "configure:2996: checking for $cf_ncuhdr_root include-path" >&5 129729 +echo "configure:3 169: checking for $cf_ncuhdr_root include-path" >&5140607 +echo "configure:3295: checking for $cf_ncuhdr_root include-path" >&5 129730 140608 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then 129731 140609 echo $ac_n "(cached) $ac_c" 1>&6 129732 140610 else 129733 @@ -3087,14 +3260,14 @@ 129734 cf_save_CPPFLAGS="$CPPFLAGS" 129735 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 129736 cat > conftest.$ac_ext <<EOF 140611 @@ -3000,34 +3299,23 @@ 140612 test -n "$verbose" && echo 140613 cf_search="" 140614 140615 -test -d "$HOME" && { 140616 - test -n "$verbose" && echo " ... testing include-directories under $HOME" 140617 - test -d "$HOME/include" && cf_search="$cf_search $HOME/include" 140618 - test -d "$HOME/include/$cf_ncuhdr_root" && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root" 140619 - test -d "$HOME/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include" 140620 -} 140621 140622 -# For other stuff under the home directory, it should be sufficient to put 140623 -# a symbolic link for $HOME/$cf_ncuhdr_root to the actual package location: 140624 -test -d "$HOME/$cf_ncuhdr_root" && { 140625 - test -n "$verbose" && echo " ... testing include-directories under $HOME/$cf_ncuhdr_root" 140626 - test -d "$HOME/$cf_ncuhdr_root/include" && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include" 140627 - test -d "$HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 140628 +test "/usr" != "$prefix" && \ 140629 +test -d "/usr" && \ 140630 +(test $prefix = NONE || test -d $prefix) && { 140631 + test -n "$verbose" && echo " ... testing for include-directories under /usr" 140632 + test -d /usr/include && cf_search="$cf_search /usr/include" 140633 + test -d /usr/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/include/$cf_ncuhdr_root" 140634 + test -d /usr/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include" 140635 + test -d /usr/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/$cf_ncuhdr_root/include" 140636 + test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 140637 } 140638 140639 -test "$prefix" != /usr/local && \ 140640 -test -d /usr/local && { 140641 - test -n "$verbose" && echo " ... testing include-directories under /usr/local" 140642 - test -d /usr/local/include && cf_search="$cf_search /usr/local/include" 140643 - test -d /usr/local/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root" 140644 - test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include" 140645 - test -d /usr/local/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include" 140646 - test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 140647 -} 140648 140649 -test "$prefix" != NONE && \ 140650 -test -d $prefix && { 140651 - test -n "$verbose" && echo " ... testing include-directories under $prefix" 140652 +test "$prefix" != "NONE" && \ 140653 +test -d "$prefix" && \ 140654 + { 140655 + test -n "$verbose" && echo " ... testing for include-directories under $prefix" 140656 test -d $prefix/include && cf_search="$cf_search $prefix/include" 140657 test -d $prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" 140658 test -d $prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" 140659 @@ -3035,25 +3323,43 @@ 140660 test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 140661 } 140662 140663 -test "$prefix" != /opt && \ 140664 -test -d /opt && { 140665 - test -n "$verbose" && echo " ... testing include-directories under /opt" 140666 - test -d /opt/include && cf_search="$cf_search /opt/include" 140667 - test -d /opt/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/include/$cf_ncuhdr_root" 140668 - test -d /opt/include/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include" 140669 - test -d /opt/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/$cf_ncuhdr_root/include" 140670 - test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 140671 + 140672 +test "/usr/local" != "$prefix" && \ 140673 +test -d "/usr/local" && \ 140674 +(test $prefix = NONE || test -d $prefix) && { 140675 + test -n "$verbose" && echo " ... testing for include-directories under /usr/local" 140676 + test -d /usr/local/include && cf_search="$cf_search /usr/local/include" 140677 + test -d /usr/local/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root" 140678 + test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include" 140679 + test -d /usr/local/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include" 140680 + test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 140681 +} 140682 + 140683 + 140684 +test "/opt" != "$prefix" && \ 140685 +test -d "/opt" && \ 140686 +(test $prefix = NONE || test -d $prefix) && { 140687 + test -n "$verbose" && echo " ... testing for include-directories under /opt" 140688 + test -d /opt/include && cf_search="$cf_search /opt/include" 140689 + test -d /opt/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/include/$cf_ncuhdr_root" 140690 + test -d /opt/include/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include" 140691 + test -d /opt/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/$cf_ncuhdr_root/include" 140692 + test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 140693 } 140694 140695 -test "$prefix" != /usr && \ 140696 -test -d /usr && { 140697 - test -n "$verbose" && echo " ... testing include-directories under /usr" 140698 - test -d /usr/include && cf_search="$cf_search /usr/include" 140699 - test -d /usr/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/include/$cf_ncuhdr_root" 140700 - test -d /usr/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include" 140701 - test -d /usr/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/$cf_ncuhdr_root/include" 140702 + 140703 +test "$HOME" != "$prefix" && \ 140704 +test -d "$HOME" && \ 140705 +(test $prefix = NONE || test -d $prefix) && { 140706 + test -n "$verbose" && echo " ... testing for include-directories under $HOME" 140707 + test -d $HOME/include && cf_search="$cf_search $HOME/include" 140708 + test -d $HOME/include/$cf_ncuhdr_root && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root" 140709 + test -d $HOME/include/$cf_ncuhdr_root/include && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include" 140710 + test -d $HOME/$cf_ncuhdr_root/include && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include" 140711 + test -d $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 140712 } 140713 140714 + 140715 test "$includedir" != NONE && \ 140716 test "$includedir" != "/usr/include" && \ 140717 test -d "$includedir" && { 140718 @@ -3074,46 +3380,69 @@ 140719 for cf_incdir in $cf_search 140720 do 140721 140722 -for cf_add_incdir in $cf_incdir 140723 -do 140724 - while true 140725 +if test -n "$cf_incdir" ; then 140726 + for cf_add_incdir in $cf_incdir 140727 + do 140728 + while test $cf_add_incdir != /usr/include 140729 do 140730 - case $cf_add_incdir in 140731 - /usr/include) # (vi 140732 - ;; 140733 - /usr/local/include) # (vi 140734 + if test -d $cf_add_incdir 140735 + then 140736 + cf_have_incdir=no 140737 + if test -n "$CFLAGS$CPPFLAGS" ; then 140738 + # a loop is needed to ensure we can add subdirs of existing dirs 140739 + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do 140740 + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then 140741 + cf_have_incdir=yes; break 140742 + fi 140743 + done 140744 + fi 140745 + 140746 + if test "$cf_have_incdir" = no ; then 140747 + if test "$cf_add_incdir" = /usr/local/include ; then 140748 if test "$GCC" = yes 140749 then 140750 - cf_save_CPPFLAGS="$CPPFLAGS" 140751 - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 140752 - cat > conftest.$ac_ext <<EOF 129737 140753 -#line 3091 "configure" 129738 +#line 3264 "configure" 140754 + cf_save_CPPFLAGS=$CPPFLAGS 140755 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 140756 + cat > conftest.$ac_ext <<EOF 140757 +#line 3408 "configure" 129739 140758 #include "confdefs.h" 129740 140759 #include <stdio.h> … … 129744 140763 EOF 129745 140764 -if { (eval echo configure:3098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 129746 +if { (eval echo configure:3 271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then140765 +if { (eval echo configure:3415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 129747 140766 : 129748 140767 else 129749 140768 echo "configure: failed program was:" >&5 129750 @@ -3121,7 +3294,7 @@ 140769 cat conftest.$ac_ext >&5 140770 rm -rf conftest* 140771 - CPPFLAGS="$cf_save_CPPFLAGS" 140772 + cf_have_incdir=yes 140773 fi 140774 rm -f conftest* 140775 + CPPFLAGS=$cf_save_CPPFLAGS 140776 fi 140777 - ;; 140778 - *) # (vi 140779 - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 140780 - ;; 140781 - esac 140782 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 140783 - test "$cf_top_incdir" = "$cf_add_incdir" && break 140784 - cf_add_incdir="$cf_top_incdir" 140785 + fi 140786 + fi 140787 + 140788 + if test "$cf_have_incdir" = no ; then 140789 + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 140790 + 140791 +echo "${as_me-configure}:3432: testing adding $cf_add_incdir to include-path ..." 1>&5 140792 + 140793 + 140794 + CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 140795 + 140796 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 140797 + test "$cf_top_incdir" = "$cf_add_incdir" && break 140798 + cf_add_incdir="$cf_top_incdir" 140799 + else 140800 + break 140801 + fi 140802 + fi 140803 done 140804 -done 140805 + done 140806 +fi 140807 140808 for cf_header in \ 140809 ncurses.h \ 140810 @@ -3121,7 +3450,7 @@ 129751 140811 do 129752 140812 129753 140813 cat > conftest.$ac_ext <<EOF 129754 140814 -#line 3125 "configure" 129755 +#line 3 298"configure"140815 +#line 3454 "configure" 129756 140816 #include "confdefs.h" 129757 140817 129758 140818 129759 @@ -3142,7 +3 315,7 @@140819 @@ -3142,7 +3471,7 @@ 129760 140820 129761 140821 ; return 0; } 129762 140822 EOF 129763 140823 -if { (eval echo configure:3146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 129764 +if { (eval echo configure:3 319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then140824 +if { (eval echo configure:3475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 129765 140825 rm -rf conftest* 129766 140826 cf_cv_ncurses_h2=$cf_header 129767 140827 129768 @@ -3189,14 +3362,14 @@ 129769 cf_save_CPPFLAGS="$CPPFLAGS" 129770 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 129771 cat > conftest.$ac_ext <<EOF 140828 @@ -3176,46 +3505,69 @@ 140829 cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header 140830 fi 140831 140832 -for cf_add_incdir in $cf_1st_incdir 140833 -do 140834 - while true 140835 +if test -n "$cf_1st_incdir" ; then 140836 + for cf_add_incdir in $cf_1st_incdir 140837 + do 140838 + while test $cf_add_incdir != /usr/include 140839 do 140840 - case $cf_add_incdir in 140841 - /usr/include) # (vi 140842 - ;; 140843 - /usr/local/include) # (vi 140844 + if test -d $cf_add_incdir 140845 + then 140846 + cf_have_incdir=no 140847 + if test -n "$CFLAGS$CPPFLAGS" ; then 140848 + # a loop is needed to ensure we can add subdirs of existing dirs 140849 + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do 140850 + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then 140851 + cf_have_incdir=yes; break 140852 + fi 140853 + done 140854 + fi 140855 + 140856 + if test "$cf_have_incdir" = no ; then 140857 + if test "$cf_add_incdir" = /usr/local/include ; then 140858 if test "$GCC" = yes 140859 then 140860 - cf_save_CPPFLAGS="$CPPFLAGS" 140861 - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 140862 - cat > conftest.$ac_ext <<EOF 129772 140863 -#line 3193 "configure" 129773 +#line 3366 "configure" 140864 + cf_save_CPPFLAGS=$CPPFLAGS 140865 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 140866 + cat > conftest.$ac_ext <<EOF 140867 +#line 3533 "configure" 129774 140868 #include "confdefs.h" 129775 140869 #include <stdio.h> … … 129779 140873 EOF 129780 140874 -if { (eval echo configure:3200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 129781 +if { (eval echo configure:3 373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then140875 +if { (eval echo configure:3540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 129782 140876 : 129783 140877 else 129784 140878 echo "configure: failed program was:" >&5 129785 @@ -3249,7 +3422,7 @@ 140879 cat conftest.$ac_ext >&5 140880 rm -rf conftest* 140881 - CPPFLAGS="$cf_save_CPPFLAGS" 140882 + cf_have_incdir=yes 140883 fi 140884 rm -f conftest* 140885 + CPPFLAGS=$cf_save_CPPFLAGS 140886 fi 140887 - ;; 140888 - *) # (vi 140889 - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 140890 - ;; 140891 - esac 140892 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 140893 - test "$cf_top_incdir" = "$cf_add_incdir" && break 140894 - cf_add_incdir="$cf_top_incdir" 140895 + fi 140896 + fi 140897 + 140898 + if test "$cf_have_incdir" = no ; then 140899 + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 140900 + 140901 +echo "${as_me-configure}:3557: testing adding $cf_add_incdir to include-path ..." 1>&5 140902 + 140903 + 140904 + CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 140905 + 140906 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 140907 + test "$cf_top_incdir" = "$cf_add_incdir" && break 140908 + cf_add_incdir="$cf_top_incdir" 140909 + else 140910 + break 140911 + fi 140912 + fi 140913 done 140914 -done 140915 + done 140916 +fi 140917 140918 140919 fi 140920 @@ -3249,7 +3601,7 @@ 129786 140921 129787 140922 129788 140923 echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 129789 140924 -echo "configure:3253: checking for terminfo header" >&5 129790 +echo "configure:3 426: checking for terminfo header" >&5140925 +echo "configure:3605: checking for terminfo header" >&5 129791 140926 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then 129792 140927 echo $ac_n "(cached) $ac_c" 1>&6 129793 140928 else 129794 @@ -3266,7 +3 439,7 @@140929 @@ -3266,7 +3618,7 @@ 129795 140930 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" 129796 140931 do 129797 140932 cat > conftest.$ac_ext <<EOF 129798 140933 -#line 3270 "configure" 129799 +#line 3 443"configure"140934 +#line 3622 "configure" 129800 140935 #include "confdefs.h" 129801 140936 #include <stdio.h> 129802 140937 #include <${cf_cv_ncurses_header-curses.h}> 129803 @@ -3276,7 +3 449,7 @@140938 @@ -3276,7 +3628,7 @@ 129804 140939 int x = auto_left_margin 129805 140940 ; return 0; } 129806 140941 EOF 129807 140942 -if { (eval echo configure:3280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 129808 +if { (eval echo configure:3 453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then140943 +if { (eval echo configure:3632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 129809 140944 rm -rf conftest* 129810 140945 129811 140946 cf_cv_term_header="$cf_test" 129812 @@ -3331,7 +3 504,7 @@140947 @@ -3331,7 +3683,7 @@ 129813 140948 129814 140949 129815 140950 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 129816 140951 -echo "configure:3335: checking for ncurses version" >&5 129817 +echo "configure:3 508: checking for ncurses version" >&5140952 +echo "configure:3687: checking for ncurses version" >&5 129818 140953 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then 129819 140954 echo $ac_n "(cached) $ac_c" 1>&6 129820 140955 else 129821 @@ -3357,7 +3 530,7 @@140956 @@ -3357,7 +3709,7 @@ 129822 140957 #endif 129823 140958 EOF 129824 140959 cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" 129825 140960 - { (eval echo configure:3361: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 129826 + { (eval echo configure:3 534: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }140961 + { (eval echo configure:3713: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 129827 140962 if test -f conftest.out ; then 129828 140963 cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` 129829 140964 test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" 129830 @@ -3366,7 +3 539,7 @@140965 @@ -3366,7 +3718,7 @@ 129831 140966 129832 140967 else 129833 140968 cat > conftest.$ac_ext <<EOF 129834 140969 -#line 3370 "configure" 129835 +#line 3 543"configure"140970 +#line 3722 "configure" 129836 140971 #include "confdefs.h" 129837 140972 129838 140973 #include <${cf_cv_ncurses_header-curses.h}> 129839 @@ -3387,10 +3 560,10 @@140974 @@ -3387,10 +3739,10 @@ 129840 140975 make an error 129841 140976 # endif … … 129846 140981 EOF 129847 140982 -if { (eval echo configure:3394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 129848 +if { (eval echo configure:3 567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null140983 +if { (eval echo configure:3746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 129849 140984 then 129850 140985 129851 140986 cf_cv_ncurses_version=`cat $cf_tempfile` 129852 @@ -3421,7 +3 594,7 @@140987 @@ -3421,7 +3773,7 @@ 129853 140988 cf_ncurses_LIBS="" 129854 140989 cf_ncurses_SAVE="$LIBS" 129855 140990 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 129856 140991 -echo "configure:3425: checking for Gpm_Open in -lgpm" >&5 129857 +echo "configure:3 598: checking for Gpm_Open in -lgpm" >&5140992 +echo "configure:3777: checking for Gpm_Open in -lgpm" >&5 129858 140993 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` 129859 140994 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 129860 140995 echo $ac_n "(cached) $ac_c" 1>&6 129861 @@ -3429,7 +3 602,7 @@140996 @@ -3429,7 +3781,7 @@ 129862 140997 ac_save_LIBS="$LIBS" 129863 140998 LIBS="-lgpm $LIBS" 129864 140999 cat > conftest.$ac_ext <<EOF 129865 141000 -#line 3433 "configure" 129866 +#line 3 606"configure"141001 +#line 3785 "configure" 129867 141002 #include "confdefs.h" 129868 141003 /* Override any gcc2 internal prototype to avoid an error. */ 129869 141004 /* We use char because int might match the return type of a gcc2 129870 @@ -3440,7 +3 613,7 @@141005 @@ -3440,7 +3792,7 @@ 129871 141006 Gpm_Open() 129872 141007 ; return 0; } 129873 141008 EOF 129874 141009 -if { (eval echo configure:3444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129875 +if { (eval echo configure:3 617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then141010 +if { (eval echo configure:3796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129876 141011 rm -rf conftest* 129877 141012 eval "ac_cv_lib_$ac_lib_var=yes" 129878 141013 else 129879 @@ -3456,7 +3 629,7 @@141014 @@ -3456,7 +3808,7 @@ 129880 141015 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 129881 141016 echo "$ac_t""yes" 1>&6 129882 141017 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 129883 141018 -echo "configure:3460: checking for initscr in -lgpm" >&5 129884 +echo "configure:3 633: checking for initscr in -lgpm" >&5141019 +echo "configure:3812: checking for initscr in -lgpm" >&5 129885 141020 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` 129886 141021 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 129887 141022 echo $ac_n "(cached) $ac_c" 1>&6 129888 @@ -3464,7 +3 637,7 @@141023 @@ -3464,7 +3816,7 @@ 129889 141024 ac_save_LIBS="$LIBS" 129890 141025 LIBS="-lgpm $LIBS" 129891 141026 cat > conftest.$ac_ext <<EOF 129892 141027 -#line 3468 "configure" 129893 +#line 3 641"configure"141028 +#line 3820 "configure" 129894 141029 #include "confdefs.h" 129895 141030 /* Override any gcc2 internal prototype to avoid an error. */ 129896 141031 /* We use char because int might match the return type of a gcc2 129897 @@ -3475,7 +3 648,7 @@141032 @@ -3475,7 +3827,7 @@ 129898 141033 initscr() 129899 141034 ; return 0; } 129900 141035 EOF 129901 141036 -if { (eval echo configure:3479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129902 +if { (eval echo configure:3 652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then141037 +if { (eval echo configure:3831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129903 141038 rm -rf conftest* 129904 141039 eval "ac_cv_lib_$ac_lib_var=yes" 129905 141040 else 129906 @@ -3507,7 +3 680,7 @@141041 @@ -3507,7 +3859,7 @@ 129907 141042 # version of ncurses (but it should do no harm, since it's static). 129908 141043 if test "$cf_nculib_root" = ncurses ; then 129909 141044 echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 129910 141045 -echo "configure:3511: checking for tgoto in -lmytinfo" >&5 129911 +echo "configure:3 684: checking for tgoto in -lmytinfo" >&5141046 +echo "configure:3863: checking for tgoto in -lmytinfo" >&5 129912 141047 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` 129913 141048 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 129914 141049 echo $ac_n "(cached) $ac_c" 1>&6 129915 @@ -3515,7 +3 688,7 @@141050 @@ -3515,7 +3867,7 @@ 129916 141051 ac_save_LIBS="$LIBS" 129917 141052 LIBS="-lmytinfo $LIBS" 129918 141053 cat > conftest.$ac_ext <<EOF 129919 141054 -#line 3519 "configure" 129920 +#line 3 692"configure"141055 +#line 3871 "configure" 129921 141056 #include "confdefs.h" 129922 141057 /* Override any gcc2 internal prototype to avoid an error. */ 129923 141058 /* We use char because int might match the return type of a gcc2 129924 @@ -3526,7 +3 699,7 @@141059 @@ -3526,7 +3878,7 @@ 129925 141060 tgoto() 129926 141061 ; return 0; } 129927 141062 EOF 129928 141063 -if { (eval echo configure:3530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129929 +if { (eval echo configure:3 703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then141064 +if { (eval echo configure:3882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129930 141065 rm -rf conftest* 129931 141066 eval "ac_cv_lib_$ac_lib_var=yes" 129932 141067 else 129933 @@ -3560,12 +3733,12 @@ 141068 @@ -3554,18 +3906,47 @@ 141069 141070 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) 141071 then 141072 - LIBS="-L$cf_cv_curses_dir/lib -l$cf_nculib_root $LIBS" 141073 + 141074 +if test -n "$cf_cv_curses_dir/lib" ; then 141075 + for cf_add_libdir in $cf_cv_curses_dir/lib 141076 + do 141077 + if test $cf_add_libdir = /usr/lib ; then 141078 + : 141079 + elif test -d $cf_add_libdir 141080 + then 141081 + cf_have_libdir=no 141082 + if test -n "$LDFLAGS$LIBS" ; then 141083 + # a loop is needed to ensure we can add subdirs of existing dirs 141084 + for cf_test_libdir in $LDFLAGS $LIBS ; do 141085 + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then 141086 + cf_have_libdir=yes; break 141087 + fi 141088 + done 141089 + fi 141090 + if test "$cf_have_libdir" = no ; then 141091 + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 141092 + 141093 +echo "${as_me-configure}:3930: testing adding $cf_add_libdir to library-path ..." 1>&5 141094 + 141095 + 141096 + LDFLAGS="-L$cf_add_libdir $LDFLAGS" 141097 + fi 141098 + fi 141099 + done 141100 +fi 141101 + 141102 + LIBS="-l$cf_nculib_root $LIBS" 141103 else 141104 129934 141105 eval 'cf_cv_have_lib_'$cf_nculib_root'=no' 129935 141106 cf_libdir="" 129936 141107 echo $ac_n "checking for initscr""... $ac_c" 1>&6 129937 141108 -echo "configure:3564: checking for initscr" >&5 129938 +echo "configure:3 737: checking for initscr" >&5141109 +echo "configure:3945: checking for initscr" >&5 129939 141110 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then 129940 141111 echo $ac_n "(cached) $ac_c" 1>&6 … … 129942 141113 cat > conftest.$ac_ext <<EOF 129943 141114 -#line 3569 "configure" 129944 +#line 3 742"configure"141115 +#line 3950 "configure" 129945 141116 #include "confdefs.h" 129946 141117 /* System header to define __stub macros and hopefully few prototypes, 129947 141118 which can conflict with char initscr(); below. */ 129948 @@ -3588,7 +3 761,7 @@141119 @@ -3588,7 +3969,7 @@ 129949 141120 129950 141121 ; return 0; } 129951 141122 EOF 129952 141123 -if { (eval echo configure:3592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129953 +if { (eval echo configure:3 765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then141124 +if { (eval echo configure:3973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129954 141125 rm -rf conftest* 129955 141126 eval "ac_cv_func_initscr=yes" 129956 141127 else 129957 @@ -3608,17 +3 781,17 @@141128 @@ -3608,17 +3989,17 @@ 129958 141129 129959 141130 cf_save_LIBS="$LIBS" 129960 141131 echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 129961 141132 -echo "configure:3612: checking for initscr in -l$cf_nculib_root" >&5 129962 +echo "configure:3 785: checking for initscr in -l$cf_nculib_root" >&5141133 +echo "configure:3993: checking for initscr in -l$cf_nculib_root" >&5 129963 141134 LIBS="-l$cf_nculib_root $LIBS" 129964 141135 cat > conftest.$ac_ext <<EOF 129965 141136 -#line 3615 "configure" 129966 +#line 3 788"configure"141137 +#line 3996 "configure" 129967 141138 #include "confdefs.h" 129968 141139 #include <${cf_cv_ncurses_header-curses.h}> … … 129972 141143 EOF 129973 141144 -if { (eval echo configure:3622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129974 +if { (eval echo configure: 3795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then141145 +if { (eval echo configure:4003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129975 141146 rm -rf conftest* 129976 141147 echo "$ac_t""yes" 1>&6 129977 141148 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' 129978 @@ -3687,17 +3860,17 @@ 141149 @@ -3630,34 +4011,23 @@ 141150 echo "$ac_t""no" 1>&6 141151 cf_search="" 141152 141153 -test -d "$HOME" && { 141154 - test -n "$verbose" && echo " ... testing lib-directories under $HOME" 141155 - test -d "$HOME/lib" && cf_search="$cf_search $HOME/lib" 141156 - test -d "$HOME/lib/$cf_nculib_root" && cf_search="$cf_search $HOME/lib/$cf_nculib_root" 141157 - test -d "$HOME/lib/$cf_nculib_root/lib" && cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib" 141158 -} 141159 141160 -# For other stuff under the home directory, it should be sufficient to put 141161 -# a symbolic link for $HOME/$cf_nculib_root to the actual package location: 141162 -test -d "$HOME/$cf_nculib_root" && { 141163 - test -n "$verbose" && echo " ... testing lib-directories under $HOME/$cf_nculib_root" 141164 - test -d "$HOME/$cf_nculib_root/lib" && cf_search="$cf_search $HOME/$cf_nculib_root/lib" 141165 - test -d "$HOME/$cf_nculib_root/lib/$cf_nculib_root" && cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root" 141166 +test "/usr" != "$prefix" && \ 141167 +test -d "/usr" && \ 141168 +(test $prefix = NONE || test -d $prefix) && { 141169 + test -n "$verbose" && echo " ... testing for lib-directories under /usr" 141170 + test -d /usr/lib && cf_search="$cf_search /usr/lib" 141171 + test -d /usr/lib/$cf_nculib_root && cf_search="$cf_search /usr/lib/$cf_nculib_root" 141172 + test -d /usr/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/lib/$cf_nculib_root/lib" 141173 + test -d /usr/$cf_nculib_root/lib && cf_search="$cf_search /usr/$cf_nculib_root/lib" 141174 + test -d /usr/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root" 141175 } 141176 141177 -test "$prefix" != /usr/local && \ 141178 -test -d /usr/local && { 141179 - test -n "$verbose" && echo " ... testing lib-directories under /usr/local" 141180 - test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" 141181 - test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root" 141182 - test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib" 141183 - test -d /usr/local/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/$cf_nculib_root/lib" 141184 - test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root" 141185 -} 141186 141187 -test "$prefix" != NONE && \ 141188 -test -d $prefix && { 141189 - test -n "$verbose" && echo " ... testing lib-directories under $prefix" 141190 +test "$prefix" != "NONE" && \ 141191 +test -d "$prefix" && \ 141192 + { 141193 + test -n "$verbose" && echo " ... testing for lib-directories under $prefix" 141194 test -d $prefix/lib && cf_search="$cf_search $prefix/lib" 141195 test -d $prefix/lib/$cf_nculib_root && cf_search="$cf_search $prefix/lib/$cf_nculib_root" 141196 test -d $prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib" 141197 @@ -3665,39 +4035,57 @@ 141198 test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" 141199 } 141200 141201 -test "$prefix" != /opt && \ 141202 -test -d /opt && { 141203 - test -n "$verbose" && echo " ... testing lib-directories under /opt" 141204 - test -d /opt/lib && cf_search="$cf_search /opt/lib" 141205 - test -d /opt/lib/$cf_nculib_root && cf_search="$cf_search /opt/lib/$cf_nculib_root" 141206 - test -d /opt/lib/$cf_nculib_root/lib && cf_search="$cf_search /opt/lib/$cf_nculib_root/lib" 141207 - test -d /opt/$cf_nculib_root/lib && cf_search="$cf_search /opt/$cf_nculib_root/lib" 141208 - test -d /opt/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root" 141209 + 141210 +test "/usr/local" != "$prefix" && \ 141211 +test -d "/usr/local" && \ 141212 +(test $prefix = NONE || test -d $prefix) && { 141213 + test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" 141214 + test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" 141215 + test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root" 141216 + test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib" 141217 + test -d /usr/local/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/$cf_nculib_root/lib" 141218 + test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root" 141219 +} 141220 + 141221 + 141222 +test "/opt" != "$prefix" && \ 141223 +test -d "/opt" && \ 141224 +(test $prefix = NONE || test -d $prefix) && { 141225 + test -n "$verbose" && echo " ... testing for lib-directories under /opt" 141226 + test -d /opt/lib && cf_search="$cf_search /opt/lib" 141227 + test -d /opt/lib/$cf_nculib_root && cf_search="$cf_search /opt/lib/$cf_nculib_root" 141228 + test -d /opt/lib/$cf_nculib_root/lib && cf_search="$cf_search /opt/lib/$cf_nculib_root/lib" 141229 + test -d /opt/$cf_nculib_root/lib && cf_search="$cf_search /opt/$cf_nculib_root/lib" 141230 + test -d /opt/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root" 141231 } 141232 141233 -test "$prefix" != /usr && \ 141234 -test -d /usr && { 141235 - test -n "$verbose" && echo " ... testing lib-directories under /usr" 141236 - test -d /usr/lib && cf_search="$cf_search /usr/lib" 141237 - test -d /usr/lib/$cf_nculib_root && cf_search="$cf_search /usr/lib/$cf_nculib_root" 141238 - test -d /usr/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/lib/$cf_nculib_root/lib" 141239 - test -d /usr/$cf_nculib_root/lib && cf_search="$cf_search /usr/$cf_nculib_root/lib" 141240 + 141241 +test "$HOME" != "$prefix" && \ 141242 +test -d "$HOME" && \ 141243 +(test $prefix = NONE || test -d $prefix) && { 141244 + test -n "$verbose" && echo " ... testing for lib-directories under $HOME" 141245 + test -d $HOME/lib && cf_search="$cf_search $HOME/lib" 141246 + test -d $HOME/lib/$cf_nculib_root && cf_search="$cf_search $HOME/lib/$cf_nculib_root" 141247 + test -d $HOME/lib/$cf_nculib_root/lib && cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib" 141248 + test -d $HOME/$cf_nculib_root/lib && cf_search="$cf_search $HOME/$cf_nculib_root/lib" 141249 + test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root" 141250 } 141251 141252 + 129979 141253 for cf_libdir in $cf_search 129980 141254 do 129981 141255 echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 129982 141256 -echo "configure:3691: checking for -l$cf_nculib_root in $cf_libdir" >&5 129983 +echo "configure: 3864: checking for -l$cf_nculib_root in $cf_libdir" >&5141257 +echo "configure:4079: checking for -l$cf_nculib_root in $cf_libdir" >&5 129984 141258 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" 129985 141259 cat > conftest.$ac_ext <<EOF 129986 141260 -#line 3694 "configure" 129987 +#line 3867"configure"141261 +#line 4082 "configure" 129988 141262 #include "confdefs.h" 129989 141263 #include <${cf_cv_ncurses_header-curses.h}> … … 129993 141267 EOF 129994 141268 -if { (eval echo configure:3701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129995 +if { (eval echo configure: 3874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then141269 +if { (eval echo configure:4089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129996 141270 rm -rf conftest* 129997 141271 echo "$ac_t""yes" 1>&6 129998 141272 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' 129999 @@ -3728,7 + 3901,7 @@141273 @@ -3728,7 +4116,7 @@ 130000 141274 130001 141275 if test -n "$cf_ncurses_LIBS" ; then 130002 141276 echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 130003 141277 -echo "configure:3732: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 130004 +echo "configure: 3905: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5141278 +echo "configure:4120: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 130005 141279 cf_ncurses_SAVE="$LIBS" 130006 141280 for p in $cf_ncurses_LIBS ; do 130007 141281 q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` 130008 @@ -3737,14 + 3910,14 @@141282 @@ -3737,14 +4125,14 @@ 130009 141283 fi 130010 141284 done 130011 141285 cat > conftest.$ac_ext <<EOF 130012 141286 -#line 3741 "configure" 130013 +#line 3914"configure"141287 +#line 4129 "configure" 130014 141288 #include "confdefs.h" 130015 141289 #include <${cf_cv_ncurses_header-curses.h}> … … 130019 141293 EOF 130020 141294 -if { (eval echo configure:3748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130021 +if { (eval echo configure: 3921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then141295 +if { (eval echo configure:4136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130022 141296 rm -rf conftest* 130023 141297 echo "$ac_t""yes" 1>&6 130024 141298 else 130025 @@ -3770,14 + 3943,14 @@141299 @@ -3770,14 +4158,14 @@ 130026 141300 cf_cv_libtype=w 130027 141301 130028 141302 echo $ac_n "checking for multibyte character support""... $ac_c" 1>&6 130029 141303 -echo "configure:3774: checking for multibyte character support" >&5 130030 +echo "configure: 3947: checking for multibyte character support" >&5141304 +echo "configure:4162: checking for multibyte character support" >&5 130031 141305 if eval "test \"`echo '$''{'cf_cv_utf8_lib'+set}'`\" = set"; then 130032 141306 echo $ac_n "(cached) $ac_c" 1>&6 … … 130036 141310 cat > conftest.$ac_ext <<EOF 130037 141311 -#line 3781 "configure" 130038 +#line 3954"configure"141312 +#line 4169 "configure" 130039 141313 #include "confdefs.h" 130040 141314 130041 141315 #include <stdlib.h> 130042 @@ -3785,7 + 3958,7 @@141316 @@ -3785,7 +4173,7 @@ 130043 141317 putwc(0,0); 130044 141318 ; return 0; } 130045 141319 EOF 130046 141320 -if { (eval echo configure:3789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130047 +if { (eval echo configure: 3962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then141321 +if { (eval echo configure:4177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130048 141322 rm -rf conftest* 130049 141323 cf_cv_utf8_lib=yes 130050 141324 else 130051 @@ -3794,7 + 3967,7 @@141325 @@ -3794,7 +4182,7 @@ 130052 141326 rm -rf conftest* 130053 141327 LIBS="-lutf8 $LIBS" 130054 141328 cat > conftest.$ac_ext <<EOF 130055 141329 -#line 3798 "configure" 130056 +#line 3971"configure"141330 +#line 4186 "configure" 130057 141331 #include "confdefs.h" 130058 141332 130059 141333 #include <libutf8.h> 130060 @@ -3802,7 + 3975,7 @@141334 @@ -3802,7 +4190,7 @@ 130061 141335 putwc(0,0); 130062 141336 ; return 0; } 130063 141337 EOF 130064 141338 -if { (eval echo configure:3806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130065 +if { (eval echo configure: 3979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then141339 +if { (eval echo configure:4194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130066 141340 rm -rf conftest* 130067 141341 cf_cv_utf8_lib=add-on 130068 141342 else 130069 @@ -3839,7 +4012,7 @@ 130070 CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" 141343 @@ -3835,11 +4223,76 @@ 141344 cf_ncuhdr_root=ncursesw 141345 141346 test -n "$cf_cv_curses_dir" && \ 141347 -test "$cf_cv_curses_dir" != "no" && \ 141348 -CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" 141349 +test "$cf_cv_curses_dir" != "no" && { \ 141350 + 141351 +if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then 141352 + for cf_add_incdir in $cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root 141353 + do 141354 + while test $cf_add_incdir != /usr/include 141355 + do 141356 + if test -d $cf_add_incdir 141357 + then 141358 + cf_have_incdir=no 141359 + if test -n "$CFLAGS$CPPFLAGS" ; then 141360 + # a loop is needed to ensure we can add subdirs of existing dirs 141361 + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do 141362 + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then 141363 + cf_have_incdir=yes; break 141364 + fi 141365 + done 141366 + fi 141367 + 141368 + if test "$cf_have_incdir" = no ; then 141369 + if test "$cf_add_incdir" = /usr/local/include ; then 141370 + if test "$GCC" = yes 141371 + then 141372 + cf_save_CPPFLAGS=$CPPFLAGS 141373 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 141374 + cat > conftest.$ac_ext <<EOF 141375 +#line 4253 "configure" 141376 +#include "confdefs.h" 141377 +#include <stdio.h> 141378 +int main() { 141379 +printf("Hello") 141380 +; return 0; } 141381 +EOF 141382 +if { (eval echo configure:4260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 141383 + : 141384 +else 141385 + echo "configure: failed program was:" >&5 141386 + cat conftest.$ac_ext >&5 141387 + rm -rf conftest* 141388 + cf_have_incdir=yes 141389 +fi 141390 +rm -f conftest* 141391 + CPPFLAGS=$cf_save_CPPFLAGS 141392 + fi 141393 + fi 141394 + fi 141395 + 141396 + if test "$cf_have_incdir" = no ; then 141397 + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 141398 + 141399 +echo "${as_me-configure}:4277: testing adding $cf_add_incdir to include-path ..." 1>&5 141400 + 141401 + 141402 + CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 141403 + 141404 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 141405 + test "$cf_top_incdir" = "$cf_add_incdir" && break 141406 + cf_add_incdir="$cf_top_incdir" 141407 + else 141408 + break 141409 + fi 141410 + fi 141411 + done 141412 + done 141413 +fi 141414 + 141415 +} 130071 141416 130072 141417 echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 130073 141418 -echo "configure:3843: checking for $cf_ncuhdr_root header in include-path" >&5 130074 +echo "configure:4 016: checking for $cf_ncuhdr_root header in include-path" >&5141419 +echo "configure:4296: checking for $cf_ncuhdr_root header in include-path" >&5 130075 141420 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then 130076 141421 echo $ac_n "(cached) $ac_c" 1>&6 130077 141422 else 130078 @@ -3850,7 +4 023,7 @@141423 @@ -3850,7 +4303,7 @@ 130079 141424 do 130080 141425 130081 141426 cat > conftest.$ac_ext <<EOF 130082 141427 -#line 3854 "configure" 130083 +#line 4 027 "configure"141428 +#line 4307 "configure" 130084 141429 #include "confdefs.h" 130085 141430 130086 141431 130087 @@ -3879,7 +4 052,7 @@141432 @@ -3879,7 +4332,7 @@ 130088 141433 130089 141434 ; return 0; } 130090 141435 EOF 130091 141436 -if { (eval echo configure:3883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 130092 +if { (eval echo configure:4 056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then141437 +if { (eval echo configure:4336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 130093 141438 rm -rf conftest* 130094 141439 cf_cv_ncurses_h=$cf_header 130095 141440 130096 @@ -3905,7 +4 078,7 @@141441 @@ -3905,7 +4358,7 @@ 130097 141442 else 130098 141443 130099 141444 echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 130100 141445 -echo "configure:3909: checking for $cf_ncuhdr_root include-path" >&5 130101 +echo "configure:4 082: checking for $cf_ncuhdr_root include-path" >&5141446 +echo "configure:4362: checking for $cf_ncuhdr_root include-path" >&5 130102 141447 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then 130103 141448 echo $ac_n "(cached) $ac_c" 1>&6 130104 141449 else 130105 @@ -4000,14 +4173,14 @@ 130106 cf_save_CPPFLAGS="$CPPFLAGS" 130107 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 130108 cat > conftest.$ac_ext <<EOF 141450 @@ -3913,34 +4366,23 @@ 141451 test -n "$verbose" && echo 141452 cf_search="" 141453 141454 -test -d "$HOME" && { 141455 - test -n "$verbose" && echo " ... testing include-directories under $HOME" 141456 - test -d "$HOME/include" && cf_search="$cf_search $HOME/include" 141457 - test -d "$HOME/include/$cf_ncuhdr_root" && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root" 141458 - test -d "$HOME/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include" 141459 -} 141460 141461 -# For other stuff under the home directory, it should be sufficient to put 141462 -# a symbolic link for $HOME/$cf_ncuhdr_root to the actual package location: 141463 -test -d "$HOME/$cf_ncuhdr_root" && { 141464 - test -n "$verbose" && echo " ... testing include-directories under $HOME/$cf_ncuhdr_root" 141465 - test -d "$HOME/$cf_ncuhdr_root/include" && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include" 141466 - test -d "$HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 141467 +test "/usr" != "$prefix" && \ 141468 +test -d "/usr" && \ 141469 +(test $prefix = NONE || test -d $prefix) && { 141470 + test -n "$verbose" && echo " ... testing for include-directories under /usr" 141471 + test -d /usr/include && cf_search="$cf_search /usr/include" 141472 + test -d /usr/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/include/$cf_ncuhdr_root" 141473 + test -d /usr/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include" 141474 + test -d /usr/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/$cf_ncuhdr_root/include" 141475 + test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 141476 } 141477 141478 -test "$prefix" != /usr/local && \ 141479 -test -d /usr/local && { 141480 - test -n "$verbose" && echo " ... testing include-directories under /usr/local" 141481 - test -d /usr/local/include && cf_search="$cf_search /usr/local/include" 141482 - test -d /usr/local/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root" 141483 - test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include" 141484 - test -d /usr/local/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include" 141485 - test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 141486 -} 141487 141488 -test "$prefix" != NONE && \ 141489 -test -d $prefix && { 141490 - test -n "$verbose" && echo " ... testing include-directories under $prefix" 141491 +test "$prefix" != "NONE" && \ 141492 +test -d "$prefix" && \ 141493 + { 141494 + test -n "$verbose" && echo " ... testing for include-directories under $prefix" 141495 test -d $prefix/include && cf_search="$cf_search $prefix/include" 141496 test -d $prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" 141497 test -d $prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" 141498 @@ -3948,25 +4390,43 @@ 141499 test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 141500 } 141501 141502 -test "$prefix" != /opt && \ 141503 -test -d /opt && { 141504 - test -n "$verbose" && echo " ... testing include-directories under /opt" 141505 - test -d /opt/include && cf_search="$cf_search /opt/include" 141506 - test -d /opt/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/include/$cf_ncuhdr_root" 141507 - test -d /opt/include/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include" 141508 - test -d /opt/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/$cf_ncuhdr_root/include" 141509 - test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 141510 + 141511 +test "/usr/local" != "$prefix" && \ 141512 +test -d "/usr/local" && \ 141513 +(test $prefix = NONE || test -d $prefix) && { 141514 + test -n "$verbose" && echo " ... testing for include-directories under /usr/local" 141515 + test -d /usr/local/include && cf_search="$cf_search /usr/local/include" 141516 + test -d /usr/local/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root" 141517 + test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include" 141518 + test -d /usr/local/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include" 141519 + test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 141520 +} 141521 + 141522 + 141523 +test "/opt" != "$prefix" && \ 141524 +test -d "/opt" && \ 141525 +(test $prefix = NONE || test -d $prefix) && { 141526 + test -n "$verbose" && echo " ... testing for include-directories under /opt" 141527 + test -d /opt/include && cf_search="$cf_search /opt/include" 141528 + test -d /opt/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/include/$cf_ncuhdr_root" 141529 + test -d /opt/include/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include" 141530 + test -d /opt/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/$cf_ncuhdr_root/include" 141531 + test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 141532 } 141533 141534 -test "$prefix" != /usr && \ 141535 -test -d /usr && { 141536 - test -n "$verbose" && echo " ... testing include-directories under /usr" 141537 - test -d /usr/include && cf_search="$cf_search /usr/include" 141538 - test -d /usr/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/include/$cf_ncuhdr_root" 141539 - test -d /usr/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include" 141540 - test -d /usr/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/$cf_ncuhdr_root/include" 141541 + 141542 +test "$HOME" != "$prefix" && \ 141543 +test -d "$HOME" && \ 141544 +(test $prefix = NONE || test -d $prefix) && { 141545 + test -n "$verbose" && echo " ... testing for include-directories under $HOME" 141546 + test -d $HOME/include && cf_search="$cf_search $HOME/include" 141547 + test -d $HOME/include/$cf_ncuhdr_root && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root" 141548 + test -d $HOME/include/$cf_ncuhdr_root/include && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include" 141549 + test -d $HOME/$cf_ncuhdr_root/include && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include" 141550 + test -d $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" 141551 } 141552 141553 + 141554 test "$includedir" != NONE && \ 141555 test "$includedir" != "/usr/include" && \ 141556 test -d "$includedir" && { 141557 @@ -3987,46 +4447,69 @@ 141558 for cf_incdir in $cf_search 141559 do 141560 141561 -for cf_add_incdir in $cf_incdir 141562 -do 141563 - while true 141564 +if test -n "$cf_incdir" ; then 141565 + for cf_add_incdir in $cf_incdir 141566 + do 141567 + while test $cf_add_incdir != /usr/include 141568 do 141569 - case $cf_add_incdir in 141570 - /usr/include) # (vi 141571 - ;; 141572 - /usr/local/include) # (vi 141573 + if test -d $cf_add_incdir 141574 + then 141575 + cf_have_incdir=no 141576 + if test -n "$CFLAGS$CPPFLAGS" ; then 141577 + # a loop is needed to ensure we can add subdirs of existing dirs 141578 + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do 141579 + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then 141580 + cf_have_incdir=yes; break 141581 + fi 141582 + done 141583 + fi 141584 + 141585 + if test "$cf_have_incdir" = no ; then 141586 + if test "$cf_add_incdir" = /usr/local/include ; then 141587 if test "$GCC" = yes 141588 then 141589 - cf_save_CPPFLAGS="$CPPFLAGS" 141590 - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 141591 - cat > conftest.$ac_ext <<EOF 130109 141592 -#line 4004 "configure" 130110 +#line 4177 "configure" 141593 + cf_save_CPPFLAGS=$CPPFLAGS 141594 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 141595 + cat > conftest.$ac_ext <<EOF 141596 +#line 4475 "configure" 130111 141597 #include "confdefs.h" 130112 141598 #include <stdio.h> … … 130116 141602 EOF 130117 141603 -if { (eval echo configure:4011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 130118 +if { (eval echo configure:4 184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then141604 +if { (eval echo configure:4482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 130119 141605 : 130120 141606 else 130121 141607 echo "configure: failed program was:" >&5 130122 @@ -4034,7 +4207,7 @@ 141608 cat conftest.$ac_ext >&5 141609 rm -rf conftest* 141610 - CPPFLAGS="$cf_save_CPPFLAGS" 141611 + cf_have_incdir=yes 141612 fi 141613 rm -f conftest* 141614 + CPPFLAGS=$cf_save_CPPFLAGS 141615 fi 141616 - ;; 141617 - *) # (vi 141618 - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 141619 - ;; 141620 - esac 141621 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 141622 - test "$cf_top_incdir" = "$cf_add_incdir" && break 141623 - cf_add_incdir="$cf_top_incdir" 141624 + fi 141625 + fi 141626 + 141627 + if test "$cf_have_incdir" = no ; then 141628 + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 141629 + 141630 +echo "${as_me-configure}:4499: testing adding $cf_add_incdir to include-path ..." 1>&5 141631 + 141632 + 141633 + CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 141634 + 141635 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 141636 + test "$cf_top_incdir" = "$cf_add_incdir" && break 141637 + cf_add_incdir="$cf_top_incdir" 141638 + else 141639 + break 141640 + fi 141641 + fi 141642 done 141643 -done 141644 + done 141645 +fi 141646 141647 for cf_header in \ 141648 ncurses.h \ 141649 @@ -4034,7 +4517,7 @@ 130123 141650 do 130124 141651 130125 141652 cat > conftest.$ac_ext <<EOF 130126 141653 -#line 4038 "configure" 130127 +#line 4 211 "configure"141654 +#line 4521 "configure" 130128 141655 #include "confdefs.h" 130129 141656 130130 141657 130131 @@ -4055,7 +4 228,7 @@141658 @@ -4055,7 +4538,7 @@ 130132 141659 130133 141660 ; return 0; } 130134 141661 EOF 130135 141662 -if { (eval echo configure:4059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 130136 +if { (eval echo configure:4 232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then141663 +if { (eval echo configure:4542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 130137 141664 rm -rf conftest* 130138 141665 cf_cv_ncurses_h2=$cf_header 130139 141666 130140 @@ -4102,14 +4275,14 @@ 130141 cf_save_CPPFLAGS="$CPPFLAGS" 130142 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 130143 cat > conftest.$ac_ext <<EOF 141667 @@ -4089,46 +4572,69 @@ 141668 cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header 141669 fi 141670 141671 -for cf_add_incdir in $cf_1st_incdir 141672 -do 141673 - while true 141674 +if test -n "$cf_1st_incdir" ; then 141675 + for cf_add_incdir in $cf_1st_incdir 141676 + do 141677 + while test $cf_add_incdir != /usr/include 141678 do 141679 - case $cf_add_incdir in 141680 - /usr/include) # (vi 141681 - ;; 141682 - /usr/local/include) # (vi 141683 + if test -d $cf_add_incdir 141684 + then 141685 + cf_have_incdir=no 141686 + if test -n "$CFLAGS$CPPFLAGS" ; then 141687 + # a loop is needed to ensure we can add subdirs of existing dirs 141688 + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do 141689 + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then 141690 + cf_have_incdir=yes; break 141691 + fi 141692 + done 141693 + fi 141694 + 141695 + if test "$cf_have_incdir" = no ; then 141696 + if test "$cf_add_incdir" = /usr/local/include ; then 141697 if test "$GCC" = yes 141698 then 141699 - cf_save_CPPFLAGS="$CPPFLAGS" 141700 - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 141701 - cat > conftest.$ac_ext <<EOF 130144 141702 -#line 4106 "configure" 130145 +#line 4279 "configure" 141703 + cf_save_CPPFLAGS=$CPPFLAGS 141704 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 141705 + cat > conftest.$ac_ext <<EOF 141706 +#line 4600 "configure" 130146 141707 #include "confdefs.h" 130147 141708 #include <stdio.h> … … 130151 141712 EOF 130152 141713 -if { (eval echo configure:4113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 130153 +if { (eval echo configure:4 286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then141714 +if { (eval echo configure:4607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 130154 141715 : 130155 141716 else 130156 141717 echo "configure: failed program was:" >&5 130157 @@ -4162,7 +4335,7 @@ 141718 cat conftest.$ac_ext >&5 141719 rm -rf conftest* 141720 - CPPFLAGS="$cf_save_CPPFLAGS" 141721 + cf_have_incdir=yes 141722 fi 141723 rm -f conftest* 141724 + CPPFLAGS=$cf_save_CPPFLAGS 141725 fi 141726 - ;; 141727 - *) # (vi 141728 - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" 141729 - ;; 141730 - esac 141731 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 141732 - test "$cf_top_incdir" = "$cf_add_incdir" && break 141733 - cf_add_incdir="$cf_top_incdir" 141734 + fi 141735 + fi 141736 + 141737 + if test "$cf_have_incdir" = no ; then 141738 + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 141739 + 141740 +echo "${as_me-configure}:4624: testing adding $cf_add_incdir to include-path ..." 1>&5 141741 + 141742 + 141743 + CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" 141744 + 141745 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` 141746 + test "$cf_top_incdir" = "$cf_add_incdir" && break 141747 + cf_add_incdir="$cf_top_incdir" 141748 + else 141749 + break 141750 + fi 141751 + fi 141752 done 141753 -done 141754 + done 141755 +fi 141756 141757 141758 fi 141759 @@ -4162,7 +4668,7 @@ 130158 141760 130159 141761 130160 141762 echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 130161 141763 -echo "configure:4166: checking for terminfo header" >&5 130162 +echo "configure:4 339: checking for terminfo header" >&5141764 +echo "configure:4672: checking for terminfo header" >&5 130163 141765 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then 130164 141766 echo $ac_n "(cached) $ac_c" 1>&6 130165 141767 else 130166 @@ -4179,7 +4 352,7 @@141768 @@ -4179,7 +4685,7 @@ 130167 141769 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" 130168 141770 do 130169 141771 cat > conftest.$ac_ext <<EOF 130170 141772 -#line 4183 "configure" 130171 +#line 4 356"configure"141773 +#line 4689 "configure" 130172 141774 #include "confdefs.h" 130173 141775 #include <stdio.h> 130174 141776 #include <${cf_cv_ncurses_header-curses.h}> 130175 @@ -4189,7 +4 362,7 @@141777 @@ -4189,7 +4695,7 @@ 130176 141778 int x = auto_left_margin 130177 141779 ; return 0; } 130178 141780 EOF 130179 141781 -if { (eval echo configure:4193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 130180 +if { (eval echo configure:4 366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then141782 +if { (eval echo configure:4699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 130181 141783 rm -rf conftest* 130182 141784 130183 141785 cf_cv_term_header="$cf_test" 130184 @@ -4244,7 +4 417,7 @@141786 @@ -4244,7 +4750,7 @@ 130185 141787 130186 141788 130187 141789 echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 130188 141790 -echo "configure:4248: checking for ncurses version" >&5 130189 +echo "configure:4 421: checking for ncurses version" >&5141791 +echo "configure:4754: checking for ncurses version" >&5 130190 141792 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then 130191 141793 echo $ac_n "(cached) $ac_c" 1>&6 130192 141794 else 130193 @@ -4270,7 +4 443,7 @@141795 @@ -4270,7 +4776,7 @@ 130194 141796 #endif 130195 141797 EOF 130196 141798 cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" 130197 141799 - { (eval echo configure:4274: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 130198 + { (eval echo configure:4 447: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }141800 + { (eval echo configure:4780: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } 130199 141801 if test -f conftest.out ; then 130200 141802 cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` 130201 141803 test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" 130202 @@ -4279,7 +4 452,7 @@141804 @@ -4279,7 +4785,7 @@ 130203 141805 130204 141806 else 130205 141807 cat > conftest.$ac_ext <<EOF 130206 141808 -#line 4283 "configure" 130207 +#line 4 456"configure"141809 +#line 4789 "configure" 130208 141810 #include "confdefs.h" 130209 141811 130210 141812 #include <${cf_cv_ncurses_header-curses.h}> 130211 @@ -4300,10 +4 473,10 @@141813 @@ -4300,10 +4806,10 @@ 130212 141814 make an error 130213 141815 # endif … … 130218 141820 EOF 130219 141821 -if { (eval echo configure:4307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 130220 +if { (eval echo configure:4 480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null141822 +if { (eval echo configure:4813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 130221 141823 then 130222 141824 130223 141825 cf_cv_ncurses_version=`cat $cf_tempfile` 130224 @@ -4334,7 +4 507,7 @@141826 @@ -4334,7 +4840,7 @@ 130225 141827 cf_ncurses_LIBS="" 130226 141828 cf_ncurses_SAVE="$LIBS" 130227 141829 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 130228 141830 -echo "configure:4338: checking for Gpm_Open in -lgpm" >&5 130229 +echo "configure:4 511: checking for Gpm_Open in -lgpm" >&5141831 +echo "configure:4844: checking for Gpm_Open in -lgpm" >&5 130230 141832 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` 130231 141833 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130232 141834 echo $ac_n "(cached) $ac_c" 1>&6 130233 @@ -4342,7 +4 515,7 @@141835 @@ -4342,7 +4848,7 @@ 130234 141836 ac_save_LIBS="$LIBS" 130235 141837 LIBS="-lgpm $LIBS" 130236 141838 cat > conftest.$ac_ext <<EOF 130237 141839 -#line 4346 "configure" 130238 +#line 4 519"configure"141840 +#line 4852 "configure" 130239 141841 #include "confdefs.h" 130240 141842 /* Override any gcc2 internal prototype to avoid an error. */ 130241 141843 /* We use char because int might match the return type of a gcc2 130242 @@ -4353,7 +4 526,7 @@141844 @@ -4353,7 +4859,7 @@ 130243 141845 Gpm_Open() 130244 141846 ; return 0; } 130245 141847 EOF 130246 141848 -if { (eval echo configure:4357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130247 +if { (eval echo configure:4 530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then141849 +if { (eval echo configure:4863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130248 141850 rm -rf conftest* 130249 141851 eval "ac_cv_lib_$ac_lib_var=yes" 130250 141852 else 130251 @@ -4369,7 +4 542,7 @@141853 @@ -4369,7 +4875,7 @@ 130252 141854 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 130253 141855 echo "$ac_t""yes" 1>&6 130254 141856 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 130255 141857 -echo "configure:4373: checking for initscr in -lgpm" >&5 130256 +echo "configure:4 546: checking for initscr in -lgpm" >&5141858 +echo "configure:4879: checking for initscr in -lgpm" >&5 130257 141859 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` 130258 141860 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130259 141861 echo $ac_n "(cached) $ac_c" 1>&6 130260 @@ -4377,7 +4 550,7 @@141862 @@ -4377,7 +4883,7 @@ 130261 141863 ac_save_LIBS="$LIBS" 130262 141864 LIBS="-lgpm $LIBS" 130263 141865 cat > conftest.$ac_ext <<EOF 130264 141866 -#line 4381 "configure" 130265 +#line 4 554"configure"141867 +#line 4887 "configure" 130266 141868 #include "confdefs.h" 130267 141869 /* Override any gcc2 internal prototype to avoid an error. */ 130268 141870 /* We use char because int might match the return type of a gcc2 130269 @@ -4388,7 +4 561,7 @@141871 @@ -4388,7 +4894,7 @@ 130270 141872 initscr() 130271 141873 ; return 0; } 130272 141874 EOF 130273 141875 -if { (eval echo configure:4392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130274 +if { (eval echo configure:4 565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then141876 +if { (eval echo configure:4898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130275 141877 rm -rf conftest* 130276 141878 eval "ac_cv_lib_$ac_lib_var=yes" 130277 141879 else 130278 @@ -4420,7 +4 593,7 @@141880 @@ -4420,7 +4926,7 @@ 130279 141881 # version of ncurses (but it should do no harm, since it's static). 130280 141882 if test "$cf_nculib_root" = ncurses ; then 130281 141883 echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 130282 141884 -echo "configure:4424: checking for tgoto in -lmytinfo" >&5 130283 +echo "configure:4 597: checking for tgoto in -lmytinfo" >&5141885 +echo "configure:4930: checking for tgoto in -lmytinfo" >&5 130284 141886 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` 130285 141887 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130286 141888 echo $ac_n "(cached) $ac_c" 1>&6 130287 @@ -4428,7 +4 601,7 @@141889 @@ -4428,7 +4934,7 @@ 130288 141890 ac_save_LIBS="$LIBS" 130289 141891 LIBS="-lmytinfo $LIBS" 130290 141892 cat > conftest.$ac_ext <<EOF 130291 141893 -#line 4432 "configure" 130292 +#line 4 605"configure"141894 +#line 4938 "configure" 130293 141895 #include "confdefs.h" 130294 141896 /* Override any gcc2 internal prototype to avoid an error. */ 130295 141897 /* We use char because int might match the return type of a gcc2 130296 @@ -4439,7 +4 612,7 @@141898 @@ -4439,7 +4945,7 @@ 130297 141899 tgoto() 130298 141900 ; return 0; } 130299 141901 EOF 130300 141902 -if { (eval echo configure:4443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130301 +if { (eval echo configure:4 616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then141903 +if { (eval echo configure:4949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130302 141904 rm -rf conftest* 130303 141905 eval "ac_cv_lib_$ac_lib_var=yes" 130304 141906 else 130305 @@ -4473,12 +4646,12 @@ 141907 @@ -4467,18 +4973,47 @@ 141908 141909 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) 141910 then 141911 - LIBS="-L$cf_cv_curses_dir/lib -l$cf_nculib_root $LIBS" 141912 + 141913 +if test -n "$cf_cv_curses_dir/lib" ; then 141914 + for cf_add_libdir in $cf_cv_curses_dir/lib 141915 + do 141916 + if test $cf_add_libdir = /usr/lib ; then 141917 + : 141918 + elif test -d $cf_add_libdir 141919 + then 141920 + cf_have_libdir=no 141921 + if test -n "$LDFLAGS$LIBS" ; then 141922 + # a loop is needed to ensure we can add subdirs of existing dirs 141923 + for cf_test_libdir in $LDFLAGS $LIBS ; do 141924 + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then 141925 + cf_have_libdir=yes; break 141926 + fi 141927 + done 141928 + fi 141929 + if test "$cf_have_libdir" = no ; then 141930 + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 141931 + 141932 +echo "${as_me-configure}:4997: testing adding $cf_add_libdir to library-path ..." 1>&5 141933 + 141934 + 141935 + LDFLAGS="-L$cf_add_libdir $LDFLAGS" 141936 + fi 141937 + fi 141938 + done 141939 +fi 141940 + 141941 + LIBS="-l$cf_nculib_root $LIBS" 141942 else 141943 130306 141944 eval 'cf_cv_have_lib_'$cf_nculib_root'=no' 130307 141945 cf_libdir="" 130308 141946 echo $ac_n "checking for initscr""... $ac_c" 1>&6 130309 141947 -echo "configure:4477: checking for initscr" >&5 130310 +echo "configure: 4650: checking for initscr" >&5141948 +echo "configure:5012: checking for initscr" >&5 130311 141949 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then 130312 141950 echo $ac_n "(cached) $ac_c" 1>&6 … … 130314 141952 cat > conftest.$ac_ext <<EOF 130315 141953 -#line 4482 "configure" 130316 +#line 4655"configure"141954 +#line 5017 "configure" 130317 141955 #include "confdefs.h" 130318 141956 /* System header to define __stub macros and hopefully few prototypes, 130319 141957 which can conflict with char initscr(); below. */ 130320 @@ -4501,7 + 4674,7 @@141958 @@ -4501,7 +5036,7 @@ 130321 141959 130322 141960 ; return 0; } 130323 141961 EOF 130324 141962 -if { (eval echo configure:4505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130325 +if { (eval echo configure: 4678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then141963 +if { (eval echo configure:5040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130326 141964 rm -rf conftest* 130327 141965 eval "ac_cv_func_initscr=yes" 130328 141966 else 130329 @@ -4521,17 + 4694,17 @@141967 @@ -4521,17 +5056,17 @@ 130330 141968 130331 141969 cf_save_LIBS="$LIBS" 130332 141970 echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 130333 141971 -echo "configure:4525: checking for initscr in -l$cf_nculib_root" >&5 130334 +echo "configure: 4698: checking for initscr in -l$cf_nculib_root" >&5141972 +echo "configure:5060: checking for initscr in -l$cf_nculib_root" >&5 130335 141973 LIBS="-l$cf_nculib_root $LIBS" 130336 141974 cat > conftest.$ac_ext <<EOF 130337 141975 -#line 4528 "configure" 130338 +#line 4701"configure"141976 +#line 5063 "configure" 130339 141977 #include "confdefs.h" 130340 141978 #include <${cf_cv_ncurses_header-curses.h}> … … 130344 141982 EOF 130345 141983 -if { (eval echo configure:4535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130346 +if { (eval echo configure: 4708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then141984 +if { (eval echo configure:5070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130347 141985 rm -rf conftest* 130348 141986 echo "$ac_t""yes" 1>&6 130349 141987 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' 130350 @@ -4600,17 +4773,17 @@ 141988 @@ -4543,34 +5078,23 @@ 141989 echo "$ac_t""no" 1>&6 141990 cf_search="" 141991 141992 -test -d "$HOME" && { 141993 - test -n "$verbose" && echo " ... testing lib-directories under $HOME" 141994 - test -d "$HOME/lib" && cf_search="$cf_search $HOME/lib" 141995 - test -d "$HOME/lib/$cf_nculib_root" && cf_search="$cf_search $HOME/lib/$cf_nculib_root" 141996 - test -d "$HOME/lib/$cf_nculib_root/lib" && cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib" 141997 -} 141998 141999 -# For other stuff under the home directory, it should be sufficient to put 142000 -# a symbolic link for $HOME/$cf_nculib_root to the actual package location: 142001 -test -d "$HOME/$cf_nculib_root" && { 142002 - test -n "$verbose" && echo " ... testing lib-directories under $HOME/$cf_nculib_root" 142003 - test -d "$HOME/$cf_nculib_root/lib" && cf_search="$cf_search $HOME/$cf_nculib_root/lib" 142004 - test -d "$HOME/$cf_nculib_root/lib/$cf_nculib_root" && cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root" 142005 +test "/usr" != "$prefix" && \ 142006 +test -d "/usr" && \ 142007 +(test $prefix = NONE || test -d $prefix) && { 142008 + test -n "$verbose" && echo " ... testing for lib-directories under /usr" 142009 + test -d /usr/lib && cf_search="$cf_search /usr/lib" 142010 + test -d /usr/lib/$cf_nculib_root && cf_search="$cf_search /usr/lib/$cf_nculib_root" 142011 + test -d /usr/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/lib/$cf_nculib_root/lib" 142012 + test -d /usr/$cf_nculib_root/lib && cf_search="$cf_search /usr/$cf_nculib_root/lib" 142013 + test -d /usr/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root" 142014 } 142015 142016 -test "$prefix" != /usr/local && \ 142017 -test -d /usr/local && { 142018 - test -n "$verbose" && echo " ... testing lib-directories under /usr/local" 142019 - test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" 142020 - test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root" 142021 - test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib" 142022 - test -d /usr/local/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/$cf_nculib_root/lib" 142023 - test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root" 142024 -} 142025 142026 -test "$prefix" != NONE && \ 142027 -test -d $prefix && { 142028 - test -n "$verbose" && echo " ... testing lib-directories under $prefix" 142029 +test "$prefix" != "NONE" && \ 142030 +test -d "$prefix" && \ 142031 + { 142032 + test -n "$verbose" && echo " ... testing for lib-directories under $prefix" 142033 test -d $prefix/lib && cf_search="$cf_search $prefix/lib" 142034 test -d $prefix/lib/$cf_nculib_root && cf_search="$cf_search $prefix/lib/$cf_nculib_root" 142035 test -d $prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib" 142036 @@ -4578,39 +5102,57 @@ 142037 test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" 142038 } 142039 142040 -test "$prefix" != /opt && \ 142041 -test -d /opt && { 142042 - test -n "$verbose" && echo " ... testing lib-directories under /opt" 142043 - test -d /opt/lib && cf_search="$cf_search /opt/lib" 142044 - test -d /opt/lib/$cf_nculib_root && cf_search="$cf_search /opt/lib/$cf_nculib_root" 142045 - test -d /opt/lib/$cf_nculib_root/lib && cf_search="$cf_search /opt/lib/$cf_nculib_root/lib" 142046 - test -d /opt/$cf_nculib_root/lib && cf_search="$cf_search /opt/$cf_nculib_root/lib" 142047 - test -d /opt/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root" 142048 + 142049 +test "/usr/local" != "$prefix" && \ 142050 +test -d "/usr/local" && \ 142051 +(test $prefix = NONE || test -d $prefix) && { 142052 + test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" 142053 + test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" 142054 + test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root" 142055 + test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib" 142056 + test -d /usr/local/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/$cf_nculib_root/lib" 142057 + test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root" 142058 +} 142059 + 142060 + 142061 +test "/opt" != "$prefix" && \ 142062 +test -d "/opt" && \ 142063 +(test $prefix = NONE || test -d $prefix) && { 142064 + test -n "$verbose" && echo " ... testing for lib-directories under /opt" 142065 + test -d /opt/lib && cf_search="$cf_search /opt/lib" 142066 + test -d /opt/lib/$cf_nculib_root && cf_search="$cf_search /opt/lib/$cf_nculib_root" 142067 + test -d /opt/lib/$cf_nculib_root/lib && cf_search="$cf_search /opt/lib/$cf_nculib_root/lib" 142068 + test -d /opt/$cf_nculib_root/lib && cf_search="$cf_search /opt/$cf_nculib_root/lib" 142069 + test -d /opt/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root" 142070 } 142071 142072 -test "$prefix" != /usr && \ 142073 -test -d /usr && { 142074 - test -n "$verbose" && echo " ... testing lib-directories under /usr" 142075 - test -d /usr/lib && cf_search="$cf_search /usr/lib" 142076 - test -d /usr/lib/$cf_nculib_root && cf_search="$cf_search /usr/lib/$cf_nculib_root" 142077 - test -d /usr/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/lib/$cf_nculib_root/lib" 142078 - test -d /usr/$cf_nculib_root/lib && cf_search="$cf_search /usr/$cf_nculib_root/lib" 142079 + 142080 +test "$HOME" != "$prefix" && \ 142081 +test -d "$HOME" && \ 142082 +(test $prefix = NONE || test -d $prefix) && { 142083 + test -n "$verbose" && echo " ... testing for lib-directories under $HOME" 142084 + test -d $HOME/lib && cf_search="$cf_search $HOME/lib" 142085 + test -d $HOME/lib/$cf_nculib_root && cf_search="$cf_search $HOME/lib/$cf_nculib_root" 142086 + test -d $HOME/lib/$cf_nculib_root/lib && cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib" 142087 + test -d $HOME/$cf_nculib_root/lib && cf_search="$cf_search $HOME/$cf_nculib_root/lib" 142088 + test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root" 142089 } 142090 142091 + 130351 142092 for cf_libdir in $cf_search 130352 142093 do 130353 142094 echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 130354 142095 -echo "configure:4604: checking for -l$cf_nculib_root in $cf_libdir" >&5 130355 +echo "configure: 4777: checking for -l$cf_nculib_root in $cf_libdir" >&5142096 +echo "configure:5146: checking for -l$cf_nculib_root in $cf_libdir" >&5 130356 142097 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" 130357 142098 cat > conftest.$ac_ext <<EOF 130358 142099 -#line 4607 "configure" 130359 +#line 4780"configure"142100 +#line 5149 "configure" 130360 142101 #include "confdefs.h" 130361 142102 #include <${cf_cv_ncurses_header-curses.h}> … … 130365 142106 EOF 130366 142107 -if { (eval echo configure:4614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130367 +if { (eval echo configure: 4787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142108 +if { (eval echo configure:5156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130368 142109 rm -rf conftest* 130369 142110 echo "$ac_t""yes" 1>&6 130370 142111 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' 130371 @@ -4641,7 + 4814,7 @@142112 @@ -4641,7 +5183,7 @@ 130372 142113 130373 142114 if test -n "$cf_ncurses_LIBS" ; then 130374 142115 echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 130375 142116 -echo "configure:4645: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 130376 +echo "configure: 4818: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5142117 +echo "configure:5187: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 130377 142118 cf_ncurses_SAVE="$LIBS" 130378 142119 for p in $cf_ncurses_LIBS ; do 130379 142120 q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` 130380 @@ -4650,14 + 4823,14 @@142121 @@ -4650,14 +5192,14 @@ 130381 142122 fi 130382 142123 done 130383 142124 cat > conftest.$ac_ext <<EOF 130384 142125 -#line 4654 "configure" 130385 +#line 4827"configure"142126 +#line 5196 "configure" 130386 142127 #include "confdefs.h" 130387 142128 #include <${cf_cv_ncurses_header-curses.h}> … … 130391 142132 EOF 130392 142133 -if { (eval echo configure:4661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130393 +if { (eval echo configure: 4834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142134 +if { (eval echo configure:5203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130394 142135 rm -rf conftest* 130395 142136 echo "$ac_t""yes" 1>&6 130396 142137 else 130397 @@ -4700,17 + 4873,17 @@142138 @@ -4700,17 +5242,17 @@ 130398 142139 case "`(uname -sr) 2>/dev/null`" in 130399 142140 "SunOS 5"*) 130400 142141 echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 130401 142142 -echo "configure:4704: checking whether -R must be followed by a space" >&5 130402 +echo "configure: 4877: checking whether -R must be followed by a space" >&5142143 +echo "configure:5246: checking whether -R must be followed by a space" >&5 130403 142144 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" 130404 142145 cat > conftest.$ac_ext <<EOF 130405 142146 -#line 4707 "configure" 130406 +#line 4880"configure"142147 +#line 5249 "configure" 130407 142148 #include "confdefs.h" 130408 142149 … … 130412 142153 EOF 130413 142154 -if { (eval echo configure:4714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130414 +if { (eval echo configure: 4887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142155 +if { (eval echo configure:5256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130415 142156 rm -rf conftest* 130416 142157 ac_R_nospace=yes 130417 142158 else 130418 @@ -4726,14 + 4899,14 @@142159 @@ -4726,14 +5268,14 @@ 130419 142160 else 130420 142161 LIBS="$ac_xsave_LIBS -R $x_libraries" 130421 142162 cat > conftest.$ac_ext <<EOF 130422 142163 -#line 4730 "configure" 130423 +#line 4903"configure"142164 +#line 5272 "configure" 130424 142165 #include "confdefs.h" 130425 142166 … … 130429 142170 EOF 130430 142171 -if { (eval echo configure:4737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130431 +if { (eval echo configure: 4910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142172 +if { (eval echo configure:5279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130432 142173 rm -rf conftest* 130433 142174 ac_R_space=yes 130434 142175 else 130435 @@ -4765,7 + 4938,7 @@142176 @@ -4765,7 +5307,7 @@ 130436 142177 # libraries were built with DECnet support. And karl@cs.umb.edu says 130437 142178 # the Alpha needs dnet_stub (dnet does not exist). 130438 142179 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 130439 142180 -echo "configure:4769: checking for dnet_ntoa in -ldnet" >&5 130440 +echo "configure: 4942: checking for dnet_ntoa in -ldnet" >&5142181 +echo "configure:5311: checking for dnet_ntoa in -ldnet" >&5 130441 142182 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` 130442 142183 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130443 142184 echo $ac_n "(cached) $ac_c" 1>&6 130444 @@ -4773,7 + 4946,7 @@142185 @@ -4773,7 +5315,7 @@ 130445 142186 ac_save_LIBS="$LIBS" 130446 142187 LIBS="-ldnet $LIBS" 130447 142188 cat > conftest.$ac_ext <<EOF 130448 142189 -#line 4777 "configure" 130449 +#line 4950"configure"142190 +#line 5319 "configure" 130450 142191 #include "confdefs.h" 130451 142192 /* Override any gcc2 internal prototype to avoid an error. */ 130452 142193 /* We use char because int might match the return type of a gcc2 130453 @@ -4784,7 + 4957,7 @@142194 @@ -4784,7 +5326,7 @@ 130454 142195 dnet_ntoa() 130455 142196 ; return 0; } 130456 142197 EOF 130457 142198 -if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130458 +if { (eval echo configure: 4961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142199 +if { (eval echo configure:5330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130459 142200 rm -rf conftest* 130460 142201 eval "ac_cv_lib_$ac_lib_var=yes" 130461 142202 else 130462 @@ -4806,7 + 4979,7 @@142203 @@ -4806,7 +5348,7 @@ 130463 142204 130464 142205 if test $ac_cv_lib_dnet_dnet_ntoa = no; then 130465 142206 echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 130466 142207 -echo "configure:4810: checking for dnet_ntoa in -ldnet_stub" >&5 130467 +echo "configure: 4983: checking for dnet_ntoa in -ldnet_stub" >&5142208 +echo "configure:5352: checking for dnet_ntoa in -ldnet_stub" >&5 130468 142209 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` 130469 142210 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130470 142211 echo $ac_n "(cached) $ac_c" 1>&6 130471 @@ -4814,7 + 4987,7 @@142212 @@ -4814,7 +5356,7 @@ 130472 142213 ac_save_LIBS="$LIBS" 130473 142214 LIBS="-ldnet_stub $LIBS" 130474 142215 cat > conftest.$ac_ext <<EOF 130475 142216 -#line 4818 "configure" 130476 +#line 4991"configure"142217 +#line 5360 "configure" 130477 142218 #include "confdefs.h" 130478 142219 /* Override any gcc2 internal prototype to avoid an error. */ 130479 142220 /* We use char because int might match the return type of a gcc2 130480 @@ -4825,7 + 4998,7 @@142221 @@ -4825,7 +5367,7 @@ 130481 142222 dnet_ntoa() 130482 142223 ; return 0; } 130483 142224 EOF 130484 142225 -if { (eval echo configure:4829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130485 +if { (eval echo configure:5 002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142226 +if { (eval echo configure:5371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130486 142227 rm -rf conftest* 130487 142228 eval "ac_cv_lib_$ac_lib_var=yes" 130488 142229 else 130489 @@ -4854,12 +5 027,12 @@142230 @@ -4854,12 +5396,12 @@ 130490 142231 # The nsl library prevents programs from opening the X display 130491 142232 # on Irix 5.2, according to dickey@clark.net. 130492 142233 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 130493 142234 -echo "configure:4858: checking for gethostbyname" >&5 130494 +echo "configure:5 031: checking for gethostbyname" >&5142235 +echo "configure:5400: checking for gethostbyname" >&5 130495 142236 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then 130496 142237 echo $ac_n "(cached) $ac_c" 1>&6 … … 130498 142239 cat > conftest.$ac_ext <<EOF 130499 142240 -#line 4863 "configure" 130500 +#line 5 036"configure"142241 +#line 5405 "configure" 130501 142242 #include "confdefs.h" 130502 142243 /* System header to define __stub macros and hopefully few prototypes, 130503 142244 which can conflict with char gethostbyname(); below. */ 130504 @@ -4882,7 +5 055,7 @@142245 @@ -4882,7 +5424,7 @@ 130505 142246 130506 142247 ; return 0; } 130507 142248 EOF 130508 142249 -if { (eval echo configure:4886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130509 +if { (eval echo configure:5 059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142250 +if { (eval echo configure:5428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130510 142251 rm -rf conftest* 130511 142252 eval "ac_cv_func_gethostbyname=yes" 130512 142253 else 130513 @@ -4903,7 +5 076,7 @@142254 @@ -4903,7 +5445,7 @@ 130514 142255 130515 142256 if test $ac_cv_func_gethostbyname = no; then 130516 142257 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 130517 142258 -echo "configure:4907: checking for gethostbyname in -lnsl" >&5 130518 +echo "configure:5 080: checking for gethostbyname in -lnsl" >&5142259 +echo "configure:5449: checking for gethostbyname in -lnsl" >&5 130519 142260 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` 130520 142261 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130521 142262 echo $ac_n "(cached) $ac_c" 1>&6 130522 @@ -4911,7 +5 084,7 @@142263 @@ -4911,7 +5453,7 @@ 130523 142264 ac_save_LIBS="$LIBS" 130524 142265 LIBS="-lnsl $LIBS" 130525 142266 cat > conftest.$ac_ext <<EOF 130526 142267 -#line 4915 "configure" 130527 +#line 5 088"configure"142268 +#line 5457 "configure" 130528 142269 #include "confdefs.h" 130529 142270 /* Override any gcc2 internal prototype to avoid an error. */ 130530 142271 /* We use char because int might match the return type of a gcc2 130531 @@ -4922,7 +5 095,7 @@142272 @@ -4922,7 +5464,7 @@ 130532 142273 gethostbyname() 130533 142274 ; return 0; } 130534 142275 EOF 130535 142276 -if { (eval echo configure:4926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130536 +if { (eval echo configure:5 099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142277 +if { (eval echo configure:5468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130537 142278 rm -rf conftest* 130538 142279 eval "ac_cv_lib_$ac_lib_var=yes" 130539 142280 else 130540 @@ -4952,12 +5 125,12 @@142281 @@ -4952,12 +5494,12 @@ 130541 142282 # -lsocket must be given before -lnsl if both are needed. 130542 142283 # We assume that if connect needs -lnsl, so does gethostbyname. 130543 142284 echo $ac_n "checking for connect""... $ac_c" 1>&6 130544 142285 -echo "configure:4956: checking for connect" >&5 130545 +echo "configure:5 129: checking for connect" >&5142286 +echo "configure:5498: checking for connect" >&5 130546 142287 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then 130547 142288 echo $ac_n "(cached) $ac_c" 1>&6 … … 130549 142290 cat > conftest.$ac_ext <<EOF 130550 142291 -#line 4961 "configure" 130551 +#line 5 134"configure"142292 +#line 5503 "configure" 130552 142293 #include "confdefs.h" 130553 142294 /* System header to define __stub macros and hopefully few prototypes, 130554 142295 which can conflict with char connect(); below. */ 130555 @@ -4980,7 +5 153,7 @@142296 @@ -4980,7 +5522,7 @@ 130556 142297 130557 142298 ; return 0; } 130558 142299 EOF 130559 142300 -if { (eval echo configure:4984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130560 +if { (eval echo configure:5 157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142301 +if { (eval echo configure:5526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130561 142302 rm -rf conftest* 130562 142303 eval "ac_cv_func_connect=yes" 130563 142304 else 130564 @@ -5001,7 +5 174,7 @@142305 @@ -5001,7 +5543,7 @@ 130565 142306 130566 142307 if test $ac_cv_func_connect = no; then 130567 142308 echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 130568 142309 -echo "configure:5005: checking for connect in -lsocket" >&5 130569 +echo "configure:5 178: checking for connect in -lsocket" >&5142310 +echo "configure:5547: checking for connect in -lsocket" >&5 130570 142311 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` 130571 142312 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130572 142313 echo $ac_n "(cached) $ac_c" 1>&6 130573 @@ -5009,7 +5 182,7 @@142314 @@ -5009,7 +5551,7 @@ 130574 142315 ac_save_LIBS="$LIBS" 130575 142316 LIBS="-lsocket $X_EXTRA_LIBS $LIBS" 130576 142317 cat > conftest.$ac_ext <<EOF 130577 142318 -#line 5013 "configure" 130578 +#line 5 186"configure"142319 +#line 5555 "configure" 130579 142320 #include "confdefs.h" 130580 142321 /* Override any gcc2 internal prototype to avoid an error. */ 130581 142322 /* We use char because int might match the return type of a gcc2 130582 @@ -5020,7 +5 193,7 @@142323 @@ -5020,7 +5562,7 @@ 130583 142324 connect() 130584 142325 ; return 0; } 130585 142326 EOF 130586 142327 -if { (eval echo configure:5024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130587 +if { (eval echo configure:5 197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142328 +if { (eval echo configure:5566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130588 142329 rm -rf conftest* 130589 142330 eval "ac_cv_lib_$ac_lib_var=yes" 130590 142331 else 130591 @@ -5044,12 +5 217,12 @@142332 @@ -5044,12 +5586,12 @@ 130592 142333 130593 142334 # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. 130594 142335 echo $ac_n "checking for remove""... $ac_c" 1>&6 130595 142336 -echo "configure:5048: checking for remove" >&5 130596 +echo "configure:5 221: checking for remove" >&5142337 +echo "configure:5590: checking for remove" >&5 130597 142338 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then 130598 142339 echo $ac_n "(cached) $ac_c" 1>&6 … … 130600 142341 cat > conftest.$ac_ext <<EOF 130601 142342 -#line 5053 "configure" 130602 +#line 5 226"configure"142343 +#line 5595 "configure" 130603 142344 #include "confdefs.h" 130604 142345 /* System header to define __stub macros and hopefully few prototypes, 130605 142346 which can conflict with char remove(); below. */ 130606 @@ -5072,7 +5 245,7 @@142347 @@ -5072,7 +5614,7 @@ 130607 142348 130608 142349 ; return 0; } 130609 142350 EOF 130610 142351 -if { (eval echo configure:5076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130611 +if { (eval echo configure:5 249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142352 +if { (eval echo configure:5618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130612 142353 rm -rf conftest* 130613 142354 eval "ac_cv_func_remove=yes" 130614 142355 else 130615 @@ -5093,7 +5 266,7 @@142356 @@ -5093,7 +5635,7 @@ 130616 142357 130617 142358 if test $ac_cv_func_remove = no; then 130618 142359 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 130619 142360 -echo "configure:5097: checking for remove in -lposix" >&5 130620 +echo "configure:5 270: checking for remove in -lposix" >&5142361 +echo "configure:5639: checking for remove in -lposix" >&5 130621 142362 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` 130622 142363 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130623 142364 echo $ac_n "(cached) $ac_c" 1>&6 130624 @@ -5101,7 +5 274,7 @@142365 @@ -5101,7 +5643,7 @@ 130625 142366 ac_save_LIBS="$LIBS" 130626 142367 LIBS="-lposix $LIBS" 130627 142368 cat > conftest.$ac_ext <<EOF 130628 142369 -#line 5105 "configure" 130629 +#line 5 278"configure"142370 +#line 5647 "configure" 130630 142371 #include "confdefs.h" 130631 142372 /* Override any gcc2 internal prototype to avoid an error. */ 130632 142373 /* We use char because int might match the return type of a gcc2 130633 @@ -5112,7 +5 285,7 @@142374 @@ -5112,7 +5654,7 @@ 130634 142375 remove() 130635 142376 ; return 0; } 130636 142377 EOF 130637 142378 -if { (eval echo configure:5116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130638 +if { (eval echo configure:5 289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142379 +if { (eval echo configure:5658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130639 142380 rm -rf conftest* 130640 142381 eval "ac_cv_lib_$ac_lib_var=yes" 130641 142382 else 130642 @@ -5136,12 +5 309,12 @@142383 @@ -5136,12 +5678,12 @@ 130643 142384 130644 142385 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. 130645 142386 echo $ac_n "checking for shmat""... $ac_c" 1>&6 130646 142387 -echo "configure:5140: checking for shmat" >&5 130647 +echo "configure:5 313: checking for shmat" >&5142388 +echo "configure:5682: checking for shmat" >&5 130648 142389 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then 130649 142390 echo $ac_n "(cached) $ac_c" 1>&6 … … 130651 142392 cat > conftest.$ac_ext <<EOF 130652 142393 -#line 5145 "configure" 130653 +#line 5 318"configure"142394 +#line 5687 "configure" 130654 142395 #include "confdefs.h" 130655 142396 /* System header to define __stub macros and hopefully few prototypes, 130656 142397 which can conflict with char shmat(); below. */ 130657 @@ -5164,7 +5 337,7 @@142398 @@ -5164,7 +5706,7 @@ 130658 142399 130659 142400 ; return 0; } 130660 142401 EOF 130661 142402 -if { (eval echo configure:5168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130662 +if { (eval echo configure:5 341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142403 +if { (eval echo configure:5710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130663 142404 rm -rf conftest* 130664 142405 eval "ac_cv_func_shmat=yes" 130665 142406 else 130666 @@ -5185,7 +5 358,7 @@142407 @@ -5185,7 +5727,7 @@ 130667 142408 130668 142409 if test $ac_cv_func_shmat = no; then 130669 142410 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 130670 142411 -echo "configure:5189: checking for shmat in -lipc" >&5 130671 +echo "configure:5 362: checking for shmat in -lipc" >&5142412 +echo "configure:5731: checking for shmat in -lipc" >&5 130672 142413 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` 130673 142414 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130674 142415 echo $ac_n "(cached) $ac_c" 1>&6 130675 @@ -5193,7 +5 366,7 @@142416 @@ -5193,7 +5735,7 @@ 130676 142417 ac_save_LIBS="$LIBS" 130677 142418 LIBS="-lipc $LIBS" 130678 142419 cat > conftest.$ac_ext <<EOF 130679 142420 -#line 5197 "configure" 130680 +#line 5 370"configure"142421 +#line 5739 "configure" 130681 142422 #include "confdefs.h" 130682 142423 /* Override any gcc2 internal prototype to avoid an error. */ 130683 142424 /* We use char because int might match the return type of a gcc2 130684 @@ -5204,7 +5 377,7 @@142425 @@ -5204,7 +5746,7 @@ 130685 142426 shmat() 130686 142427 ; return 0; } 130687 142428 EOF 130688 142429 -if { (eval echo configure:5208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130689 +if { (eval echo configure:5 381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142430 +if { (eval echo configure:5750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130690 142431 rm -rf conftest* 130691 142432 eval "ac_cv_lib_$ac_lib_var=yes" 130692 142433 else 130693 @@ -5237,7 +5 410,7 @@142434 @@ -5237,7 +5779,7 @@ 130694 142435 # libraries we check for below, so use a different variable. 130695 142436 # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. 130696 142437 echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 130697 142438 -echo "configure:5241: checking for IceConnectionNumber in -lICE" >&5 130698 +echo "configure:5 414: checking for IceConnectionNumber in -lICE" >&5142439 +echo "configure:5783: checking for IceConnectionNumber in -lICE" >&5 130699 142440 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` 130700 142441 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130701 142442 echo $ac_n "(cached) $ac_c" 1>&6 130702 @@ -5245,7 +5 418,7 @@142443 @@ -5245,7 +5787,7 @@ 130703 142444 ac_save_LIBS="$LIBS" 130704 142445 LIBS="-lICE $X_EXTRA_LIBS $LIBS" 130705 142446 cat > conftest.$ac_ext <<EOF 130706 142447 -#line 5249 "configure" 130707 +#line 5 422"configure"142448 +#line 5791 "configure" 130708 142449 #include "confdefs.h" 130709 142450 /* Override any gcc2 internal prototype to avoid an error. */ 130710 142451 /* We use char because int might match the return type of a gcc2 130711 @@ -5256,7 +5 429,7 @@142452 @@ -5256,7 +5798,7 @@ 130712 142453 IceConnectionNumber() 130713 142454 ; return 0; } 130714 142455 EOF 130715 142456 -if { (eval echo configure:5260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130716 +if { (eval echo configure:5 433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142457 +if { (eval echo configure:5802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130717 142458 rm -rf conftest* 130718 142459 eval "ac_cv_lib_$ac_lib_var=yes" 130719 142460 else 130720 @@ -5371,14 +5544,14 @@ 142461 @@ -5290,7 +5832,10 @@ 142462 142463 LDFLAGS="$X_LIBS $LDFLAGS" 142464 142465 -test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 142466 +test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 142467 + 142468 +echo "${as_me-configure}:5838: testing checking additions to CFLAGS ..." 1>&5 142469 + 142470 142471 cf_check_cflags="$CFLAGS" 142472 cf_check_cppflags="$CPPFLAGS" 142473 @@ -5351,18 +5896,27 @@ 142474 if test -n "$cf_new_cflags" ; then 142475 test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 142476 142477 +echo "${as_me-configure}:5900: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 142478 + 142479 + 142480 CFLAGS="$CFLAGS $cf_new_cflags" 142481 fi 142482 142483 if test -n "$cf_new_cppflags" ; then 142484 test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 142485 142486 +echo "${as_me-configure}:5909: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 142487 + 142488 + 142489 CPPFLAGS="$cf_new_cppflags $CPPFLAGS" 142490 fi 142491 142492 if test -n "$cf_new_extra_cppflags" ; then 142493 test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 142494 142495 +echo "${as_me-configure}:5918: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 142496 + 142497 + 142498 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" 142499 fi 142500 142501 @@ -5371,14 +5925,14 @@ 130721 142502 130722 142503 if test "$cf_check_cflags" != "$CFLAGS" ; then 130723 142504 cat > conftest.$ac_ext <<EOF 130724 142505 -#line 5375 "configure" 130725 +#line 5 548"configure"142506 +#line 5929 "configure" 130726 142507 #include "confdefs.h" 130727 142508 #include <stdio.h> … … 130731 142512 EOF 130732 142513 -if { (eval echo configure:5382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130733 +if { (eval echo configure:5 555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142514 +if { (eval echo configure:5936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130734 142515 : 130735 142516 else 130736 142517 echo "configure: failed program was:" >&5 130737 @@ -5397,12 +5570,12 @@ 142518 @@ -5386,9 +5940,15 @@ 142519 rm -rf conftest* 142520 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 142521 142522 +echo "${as_me-configure}:5944: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 142523 + 142524 + 142525 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then 142526 test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 142527 142528 +echo "${as_me-configure}:5950: testing but keeping change to \$CPPFLAGS ..." 1>&5 142529 + 142530 + 142531 fi 142532 CFLAGS="$cf_check_flags" 142533 fi 142534 @@ -5397,12 +5957,12 @@ 130738 142535 130739 142536 130740 142537 echo $ac_n "checking for XOpenDisplay""... $ac_c" 1>&6 130741 142538 -echo "configure:5401: checking for XOpenDisplay" >&5 130742 +echo "configure:5 574: checking for XOpenDisplay" >&5142539 +echo "configure:5961: checking for XOpenDisplay" >&5 130743 142540 if eval "test \"`echo '$''{'ac_cv_func_XOpenDisplay'+set}'`\" = set"; then 130744 142541 echo $ac_n "(cached) $ac_c" 1>&6 … … 130746 142543 cat > conftest.$ac_ext <<EOF 130747 142544 -#line 5406 "configure" 130748 +#line 5 579"configure"142545 +#line 5966 "configure" 130749 142546 #include "confdefs.h" 130750 142547 /* System header to define __stub macros and hopefully few prototypes, 130751 142548 which can conflict with char XOpenDisplay(); below. */ 130752 @@ -5425,7 +5 598,7 @@142549 @@ -5425,7 +5985,7 @@ 130753 142550 130754 142551 ; return 0; } 130755 142552 EOF 130756 142553 -if { (eval echo configure:5429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130757 +if { (eval echo configure:5 602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142554 +if { (eval echo configure:5989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130758 142555 rm -rf conftest* 130759 142556 eval "ac_cv_func_XOpenDisplay=yes" 130760 142557 else 130761 @@ -5444,7 + 5617,7 @@142558 @@ -5444,7 +6004,7 @@ 130762 142559 echo "$ac_t""no" 1>&6 130763 142560 130764 142561 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 130765 142562 -echo "configure:5448: checking for XOpenDisplay in -lX11" >&5 130766 +echo "configure: 5621: checking for XOpenDisplay in -lX11" >&5142563 +echo "configure:6008: checking for XOpenDisplay in -lX11" >&5 130767 142564 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` 130768 142565 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130769 142566 echo $ac_n "(cached) $ac_c" 1>&6 130770 @@ -5452,7 + 5625,7 @@142567 @@ -5452,7 +6012,7 @@ 130771 142568 ac_save_LIBS="$LIBS" 130772 142569 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" 130773 142570 cat > conftest.$ac_ext <<EOF 130774 142571 -#line 5456 "configure" 130775 +#line 5629"configure"142572 +#line 6016 "configure" 130776 142573 #include "confdefs.h" 130777 142574 /* Override any gcc2 internal prototype to avoid an error. */ 130778 142575 /* We use char because int might match the return type of a gcc2 130779 @@ -5463,7 + 5636,7 @@142576 @@ -5463,7 +6023,7 @@ 130780 142577 XOpenDisplay() 130781 142578 ; return 0; } 130782 142579 EOF 130783 142580 -if { (eval echo configure:5467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130784 +if { (eval echo configure: 5640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142581 +if { (eval echo configure:6027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130785 142582 rm -rf conftest* 130786 142583 eval "ac_cv_lib_$ac_lib_var=yes" 130787 142584 else 130788 @@ -5487,12 + 5660,12 @@142585 @@ -5487,12 +6047,12 @@ 130789 142586 130790 142587 130791 142588 echo $ac_n "checking for XtAppInitialize""... $ac_c" 1>&6 130792 142589 -echo "configure:5491: checking for XtAppInitialize" >&5 130793 +echo "configure: 5664: checking for XtAppInitialize" >&5142590 +echo "configure:6051: checking for XtAppInitialize" >&5 130794 142591 if eval "test \"`echo '$''{'ac_cv_func_XtAppInitialize'+set}'`\" = set"; then 130795 142592 echo $ac_n "(cached) $ac_c" 1>&6 … … 130797 142594 cat > conftest.$ac_ext <<EOF 130798 142595 -#line 5496 "configure" 130799 +#line 5669"configure"142596 +#line 6056 "configure" 130800 142597 #include "confdefs.h" 130801 142598 /* System header to define __stub macros and hopefully few prototypes, 130802 142599 which can conflict with char XtAppInitialize(); below. */ 130803 @@ -5515,7 + 5688,7 @@142600 @@ -5515,7 +6075,7 @@ 130804 142601 130805 142602 ; return 0; } 130806 142603 EOF 130807 142604 -if { (eval echo configure:5519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130808 +if { (eval echo configure: 5692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142605 +if { (eval echo configure:6079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130809 142606 rm -rf conftest* 130810 142607 eval "ac_cv_func_XtAppInitialize=yes" 130811 142608 else 130812 @@ -5534,7 + 5707,7 @@142609 @@ -5534,7 +6094,7 @@ 130813 142610 echo "$ac_t""no" 1>&6 130814 142611 130815 142612 echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 130816 142613 -echo "configure:5538: checking for XtAppInitialize in -lXt" >&5 130817 +echo "configure: 5711: checking for XtAppInitialize in -lXt" >&5142614 +echo "configure:6098: checking for XtAppInitialize in -lXt" >&5 130818 142615 ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'` 130819 142616 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130820 142617 echo $ac_n "(cached) $ac_c" 1>&6 130821 @@ -5542,7 + 5715,7 @@142618 @@ -5542,7 +6102,7 @@ 130822 142619 ac_save_LIBS="$LIBS" 130823 142620 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" 130824 142621 cat > conftest.$ac_ext <<EOF 130825 142622 -#line 5546 "configure" 130826 +#line 5719"configure"142623 +#line 6106 "configure" 130827 142624 #include "confdefs.h" 130828 142625 /* Override any gcc2 internal prototype to avoid an error. */ 130829 142626 /* We use char because int might match the return type of a gcc2 130830 @@ -5553,7 + 5726,7 @@142627 @@ -5553,7 +6113,7 @@ 130831 142628 XtAppInitialize() 130832 142629 ; return 0; } 130833 142630 EOF 130834 142631 -if { (eval echo configure:5557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130835 +if { (eval echo configure: 5730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142632 +if { (eval echo configure:6117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130836 142633 rm -rf conftest* 130837 142634 eval "ac_cv_lib_$ac_lib_var=yes" 130838 142635 else 130839 @@ -5591,7 + 5764,7 @@142636 @@ -5591,7 +6151,7 @@ 130840 142637 cf_x_athena=${cf_x_athena-Xaw} 130841 142638 130842 142639 echo $ac_n "checking if you want to link with Xaw 3d library""... $ac_c" 1>&6 130843 142640 -echo "configure:5595: checking if you want to link with Xaw 3d library" >&5 130844 +echo "configure: 5768: checking if you want to link with Xaw 3d library" >&5142641 +echo "configure:6155: checking if you want to link with Xaw 3d library" >&5 130845 142642 withval= 130846 142643 130847 142644 # Check whether --with-Xaw3d or --without-Xaw3d was given. 130848 @@ -5608,7 + 5781,7 @@142645 @@ -5608,7 +6168,7 @@ 130849 142646 fi 130850 142647 130851 142648 echo $ac_n "checking if you want to link with neXT Athena library""... $ac_c" 1>&6 130852 142649 -echo "configure:5612: checking if you want to link with neXT Athena library" >&5 130853 +echo "configure: 5785: checking if you want to link with neXT Athena library" >&5142650 +echo "configure:6172: checking if you want to link with neXT Athena library" >&5 130854 142651 withval= 130855 142652 130856 142653 # Check whether --with-neXtaw or --without-neXtaw was given. 130857 @@ -5625,7 + 5798,7 @@142654 @@ -5625,7 +6185,7 @@ 130858 142655 fi 130859 142656 130860 142657 echo $ac_n "checking if you want to link with Athena-Plus library""... $ac_c" 1>&6 130861 142658 -echo "configure:5629: checking if you want to link with Athena-Plus library" >&5 130862 +echo "configure: 5802: checking if you want to link with Athena-Plus library" >&5142659 +echo "configure:6189: checking if you want to link with Athena-Plus library" >&5 130863 142660 withval= 130864 142661 130865 142662 # Check whether --with-XawPlus or --without-XawPlus was given. 130866 @@ -5642,7 + 5815,7 @@142663 @@ -5642,7 +6202,7 @@ 130867 142664 fi 130868 142665 130869 142666 echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 130870 142667 -echo "configure:5646: checking for XextCreateExtension in -lXext" >&5 130871 +echo "configure: 5819: checking for XextCreateExtension in -lXext" >&5142668 +echo "configure:6206: checking for XextCreateExtension in -lXext" >&5 130872 142669 ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` 130873 142670 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130874 142671 echo $ac_n "(cached) $ac_c" 1>&6 130875 @@ -5650,7 + 5823,7 @@142672 @@ -5650,7 +6210,7 @@ 130876 142673 ac_save_LIBS="$LIBS" 130877 142674 LIBS="-lXext $LIBS" 130878 142675 cat > conftest.$ac_ext <<EOF 130879 142676 -#line 5654 "configure" 130880 +#line 5827"configure"142677 +#line 6214 "configure" 130881 142678 #include "confdefs.h" 130882 142679 /* Override any gcc2 internal prototype to avoid an error. */ 130883 142680 /* We use char because int might match the return type of a gcc2 130884 @@ -5661,7 + 5834,7 @@142681 @@ -5661,7 +6221,7 @@ 130885 142682 XextCreateExtension() 130886 142683 ; return 0; } 130887 142684 EOF 130888 142685 -if { (eval echo configure:5665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130889 +if { (eval echo configure: 5838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142686 +if { (eval echo configure:6225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130890 142687 rm -rf conftest* 130891 142688 eval "ac_cv_lib_$ac_lib_var=yes" 130892 142689 else 130893 @@ -5700,13 + 5873,13 @@142690 @@ -5700,13 +6260,13 @@ 130894 142691 if test $cf_path != default ; then 130895 142692 CPPFLAGS="-I$cf_path/include $cf_save" 130896 142693 echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6 130897 142694 -echo "configure:5704: checking for $cf_test in $cf_path" >&5 130898 +echo "configure: 5877: checking for $cf_test in $cf_path" >&5142695 +echo "configure:6264: checking for $cf_test in $cf_path" >&5 130899 142696 else 130900 142697 echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 130901 142698 -echo "configure:5707: checking for $cf_test" >&5 130902 +echo "configure: 5880: checking for $cf_test" >&5142699 +echo "configure:6267: checking for $cf_test" >&5 130903 142700 fi 130904 142701 cat > conftest.$ac_ext <<EOF 130905 142702 -#line 5710 "configure" 130906 +#line 5883"configure"142703 +#line 6270 "configure" 130907 142704 #include "confdefs.h" 130908 142705 130909 142706 #include <X11/Intrinsic.h> 130910 @@ -5715,7 + 5888,7 @@142707 @@ -5715,7 +6275,7 @@ 130911 142708 130912 142709 ; return 0; } 130913 142710 EOF 130914 142711 -if { (eval echo configure:5719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 130915 +if { (eval echo configure: 5892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then142712 +if { (eval echo configure:6279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 130916 142713 rm -rf conftest* 130917 142714 cf_result=yes 130918 142715 else 130919 @@ -5762,21 + 5935,21 @@142716 @@ -5762,21 +6322,21 @@ 130920 142717 if test $cf_path != default ; then 130921 142718 LIBS="-L$cf_path/lib $cf_lib $LIBS" 130922 142719 echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6 130923 142720 -echo "configure:5766: checking for $cf_lib in $cf_path" >&5 130924 +echo "configure: 5939: checking for $cf_lib in $cf_path" >&5142721 +echo "configure:6326: checking for $cf_lib in $cf_path" >&5 130925 142722 else 130926 142723 LIBS="$cf_lib $LIBS" 130927 142724 echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6 130928 142725 -echo "configure:5770: checking for $cf_test in $cf_lib" >&5 130929 +echo "configure: 5943: checking for $cf_test in $cf_lib" >&5142726 +echo "configure:6330: checking for $cf_test in $cf_lib" >&5 130930 142727 fi 130931 142728 cat > conftest.$ac_ext <<EOF 130932 142729 -#line 5773 "configure" 130933 +#line 5946"configure"142730 +#line 6333 "configure" 130934 142731 #include "confdefs.h" 130935 142732 … … 130939 142736 EOF 130940 142737 -if { (eval echo configure:5780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130941 +if { (eval echo configure: 5953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142738 +if { (eval echo configure:6340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130942 142739 rm -rf conftest* 130943 142740 cf_result=yes 130944 142741 else 130945 @@ -5817,7 + 5990,7 @@142742 @@ -5817,7 +6377,7 @@ 130946 142743 # Extract the first word of "$ac_prog", so it can be a program name with args. 130947 142744 set dummy $ac_prog; ac_word=$2 130948 142745 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 130949 142746 -echo "configure:5821: checking for $ac_word" >&5 130950 +echo "configure: 5994: checking for $ac_word" >&5142747 +echo "configure:6381: checking for $ac_word" >&5 130951 142748 if eval "test \"`echo '$''{'ac_cv_path_XCURSES_CONFIG'+set}'`\" = set"; then 130952 142749 echo $ac_n "(cached) $ac_c" 1>&6 130953 142750 else 130954 @@ -5946,14 +6119,14 @@ 142751 @@ -5867,6 +6427,9 @@ 142752 142753 test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 142754 142755 +echo "${as_me-configure}:6431: testing checking additions to CFLAGS ..." 1>&5 142756 + 142757 + 142758 cf_check_cflags="$CFLAGS" 142759 cf_check_cppflags="$CPPFLAGS" 142760 142761 @@ -5926,18 +6489,27 @@ 142762 if test -n "$cf_new_cflags" ; then 142763 test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 142764 142765 +echo "${as_me-configure}:6493: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 142766 + 142767 + 142768 CFLAGS="$CFLAGS $cf_new_cflags" 142769 fi 142770 142771 if test -n "$cf_new_cppflags" ; then 142772 test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 142773 142774 +echo "${as_me-configure}:6502: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 142775 + 142776 + 142777 CPPFLAGS="$cf_new_cppflags $CPPFLAGS" 142778 fi 142779 142780 if test -n "$cf_new_extra_cppflags" ; then 142781 test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 142782 142783 +echo "${as_me-configure}:6511: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 142784 + 142785 + 142786 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" 142787 fi 142788 142789 @@ -5946,14 +6518,14 @@ 130955 142790 130956 142791 if test "$cf_check_cflags" != "$CFLAGS" ; then 130957 142792 cat > conftest.$ac_ext <<EOF 130958 142793 -#line 5950 "configure" 130959 +#line 6 123"configure"142794 +#line 6522 "configure" 130960 142795 #include "confdefs.h" 130961 142796 #include <stdio.h> … … 130965 142800 EOF 130966 142801 -if { (eval echo configure:5957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130967 +if { (eval echo configure:6 130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142802 +if { (eval echo configure:6529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130968 142803 : 130969 142804 else 130970 142805 echo "configure: failed program was:" >&5 130971 @@ -5971,7 +6144,7 @@ 142806 @@ -5961,9 +6533,15 @@ 142807 rm -rf conftest* 142808 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 142809 142810 +echo "${as_me-configure}:6537: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 142811 + 142812 + 142813 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then 142814 test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 142815 142816 +echo "${as_me-configure}:6543: testing but keeping change to \$CPPFLAGS ..." 1>&5 142817 + 142818 + 142819 fi 142820 CFLAGS="$cf_check_flags" 142821 fi 142822 @@ -5971,7 +6549,7 @@ 130972 142823 fi 130973 142824 130974 142825 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 130975 142826 -echo "configure:5975: checking for XOpenDisplay in -lX11" >&5 130976 +echo "configure:6 148: checking for XOpenDisplay in -lX11" >&5142827 +echo "configure:6553: checking for XOpenDisplay in -lX11" >&5 130977 142828 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` 130978 142829 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130979 142830 echo $ac_n "(cached) $ac_c" 1>&6 130980 @@ -5979,7 +6 152,7 @@142831 @@ -5979,7 +6557,7 @@ 130981 142832 ac_save_LIBS="$LIBS" 130982 142833 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" 130983 142834 cat > conftest.$ac_ext <<EOF 130984 142835 -#line 5983 "configure" 130985 +#line 6 156"configure"142836 +#line 6561 "configure" 130986 142837 #include "confdefs.h" 130987 142838 /* Override any gcc2 internal prototype to avoid an error. */ 130988 142839 /* We use char because int might match the return type of a gcc2 130989 @@ -5990,7 +6 163,7 @@142840 @@ -5990,7 +6568,7 @@ 130990 142841 XOpenDisplay() 130991 142842 ; return 0; } 130992 142843 EOF 130993 142844 -if { (eval echo configure:5994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130994 +if { (eval echo configure:6 167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142845 +if { (eval echo configure:6572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130995 142846 rm -rf conftest* 130996 142847 eval "ac_cv_lib_$ac_lib_var=yes" 130997 142848 else 130998 @@ -6011,14 +6 184,14 @@142849 @@ -6011,14 +6589,14 @@ 130999 142850 fi 131000 142851 131001 142852 echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 131002 142853 -echo "configure:6015: checking for XCurses library" >&5 131003 +echo "configure:6 188: checking for XCurses library" >&5142854 +echo "configure:6593: checking for XCurses library" >&5 131004 142855 if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then 131005 142856 echo $ac_n "(cached) $ac_c" 1>&6 … … 131009 142860 cat > conftest.$ac_ext <<EOF 131010 142861 -#line 6022 "configure" 131011 +#line 6 195"configure"142862 +#line 6600 "configure" 131012 142863 #include "confdefs.h" 131013 142864 131014 142865 #include <xcurses.h> 131015 @@ -6028,7 +6 201,7 @@142866 @@ -6028,7 +6606,7 @@ 131016 142867 XCursesExit(); 131017 142868 ; return 0; } 131018 142869 EOF 131019 142870 -if { (eval echo configure:6032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131020 +if { (eval echo configure:6 205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142871 +if { (eval echo configure:6610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131021 142872 rm -rf conftest* 131022 142873 cf_cv_lib_XCurses=yes 131023 142874 else 131024 @@ -6073,7 +6 246,7 @@142875 @@ -6073,7 +6651,7 @@ 131025 142876 *) 131026 142877 # look for curses-related libraries 131027 142878 echo $ac_n "checking for new_panel in -lpanel$cf_cv_libtype""... $ac_c" 1>&6 131028 142879 -echo "configure:6077: checking for new_panel in -lpanel$cf_cv_libtype" >&5 131029 +echo "configure:6 250: checking for new_panel in -lpanel$cf_cv_libtype" >&5142880 +echo "configure:6655: checking for new_panel in -lpanel$cf_cv_libtype" >&5 131030 142881 ac_lib_var=`echo panel$cf_cv_libtype'_'new_panel | sed 'y%./+-%__p_%'` 131031 142882 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 131032 142883 echo $ac_n "(cached) $ac_c" 1>&6 131033 @@ -6081,7 +6 254,7 @@142884 @@ -6081,7 +6659,7 @@ 131034 142885 ac_save_LIBS="$LIBS" 131035 142886 LIBS="-lpanel$cf_cv_libtype $LIBS" 131036 142887 cat > conftest.$ac_ext <<EOF 131037 142888 -#line 6085 "configure" 131038 +#line 6 258"configure"142889 +#line 6663 "configure" 131039 142890 #include "confdefs.h" 131040 142891 /* Override any gcc2 internal prototype to avoid an error. */ 131041 142892 /* We use char because int might match the return type of a gcc2 131042 @@ -6092,7 +6 265,7 @@142893 @@ -6092,7 +6670,7 @@ 131043 142894 new_panel() 131044 142895 ; return 0; } 131045 142896 EOF 131046 142897 -if { (eval echo configure:6096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131047 +if { (eval echo configure:6 269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142898 +if { (eval echo configure:6674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131048 142899 rm -rf conftest* 131049 142900 eval "ac_cv_lib_$ac_lib_var=yes" 131050 142901 else 131051 @@ -6120,7 +6 293,7 @@142902 @@ -6120,7 +6698,7 @@ 131052 142903 fi 131053 142904 131054 142905 echo $ac_n "checking for menu_driver in -lmenu$cf_cv_libtype""... $ac_c" 1>&6 131055 142906 -echo "configure:6124: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 131056 +echo "configure:6 297: checking for menu_driver in -lmenu$cf_cv_libtype" >&5142907 +echo "configure:6702: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 131057 142908 ac_lib_var=`echo menu$cf_cv_libtype'_'menu_driver | sed 'y%./+-%__p_%'` 131058 142909 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 131059 142910 echo $ac_n "(cached) $ac_c" 1>&6 131060 @@ -6128,7 +6 301,7 @@142911 @@ -6128,7 +6706,7 @@ 131061 142912 ac_save_LIBS="$LIBS" 131062 142913 LIBS="-lmenu$cf_cv_libtype $LIBS" 131063 142914 cat > conftest.$ac_ext <<EOF 131064 142915 -#line 6132 "configure" 131065 +#line 6 305"configure"142916 +#line 6710 "configure" 131066 142917 #include "confdefs.h" 131067 142918 /* Override any gcc2 internal prototype to avoid an error. */ 131068 142919 /* We use char because int might match the return type of a gcc2 131069 @@ -6139,7 +6 312,7 @@142920 @@ -6139,7 +6717,7 @@ 131070 142921 menu_driver() 131071 142922 ; return 0; } 131072 142923 EOF 131073 142924 -if { (eval echo configure:6143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131074 +if { (eval echo configure:6 316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142925 +if { (eval echo configure:6721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131075 142926 rm -rf conftest* 131076 142927 eval "ac_cv_lib_$ac_lib_var=yes" 131077 142928 else 131078 @@ -6167,7 +6 340,7 @@142929 @@ -6167,7 +6745,7 @@ 131079 142930 fi 131080 142931 131081 142932 echo $ac_n "checking for form_driver in -lform$cf_cv_libtype""... $ac_c" 1>&6 131082 142933 -echo "configure:6171: checking for form_driver in -lform$cf_cv_libtype" >&5 131083 +echo "configure:6 344: checking for form_driver in -lform$cf_cv_libtype" >&5142934 +echo "configure:6749: checking for form_driver in -lform$cf_cv_libtype" >&5 131084 142935 ac_lib_var=`echo form$cf_cv_libtype'_'form_driver | sed 'y%./+-%__p_%'` 131085 142936 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 131086 142937 echo $ac_n "(cached) $ac_c" 1>&6 131087 @@ -6175,7 +6 348,7 @@142938 @@ -6175,7 +6753,7 @@ 131088 142939 ac_save_LIBS="$LIBS" 131089 142940 LIBS="-lform$cf_cv_libtype $LIBS" 131090 142941 cat > conftest.$ac_ext <<EOF 131091 142942 -#line 6179 "configure" 131092 +#line 6 352"configure"142943 +#line 6757 "configure" 131093 142944 #include "confdefs.h" 131094 142945 /* Override any gcc2 internal prototype to avoid an error. */ 131095 142946 /* We use char because int might match the return type of a gcc2 131096 @@ -6186,7 +6 359,7 @@142947 @@ -6186,7 +6764,7 @@ 131097 142948 form_driver() 131098 142949 ; return 0; } 131099 142950 EOF 131100 142951 -if { (eval echo configure:6190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131101 +if { (eval echo configure:6 363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then142952 +if { (eval echo configure:6768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131102 142953 rm -rf conftest* 131103 142954 eval "ac_cv_lib_$ac_lib_var=yes" 131104 142955 else 131105 @@ -6225,17 +6 398,17 @@142956 @@ -6225,17 +6803,17 @@ 131106 142957 do 131107 142958 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 131108 142959 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 131109 142960 -echo "configure:6229: checking for $ac_hdr" >&5 131110 +echo "configure:6 402: checking for $ac_hdr" >&5142961 +echo "configure:6807: checking for $ac_hdr" >&5 131111 142962 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 131112 142963 echo $ac_n "(cached) $ac_c" 1>&6 … … 131114 142965 cat > conftest.$ac_ext <<EOF 131115 142966 -#line 6234 "configure" 131116 +#line 6 407"configure"142967 +#line 6812 "configure" 131117 142968 #include "confdefs.h" 131118 142969 #include <$ac_hdr> … … 131120 142971 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 131121 142972 -{ (eval echo configure:6239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 131122 +{ (eval echo configure:6 412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }142973 +{ (eval echo configure:6817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 131123 142974 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 131124 142975 if test -z "$ac_err"; then 131125 142976 rm -rf conftest* 131126 @@ -6265,12 +6 438,12 @@142977 @@ -6265,12 +6843,12 @@ 131127 142978 esac 131128 142979 131129 142980 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 131130 142981 -echo "configure:6269: checking return type of signal handlers" >&5 131131 +echo "configure:6 442: checking return type of signal handlers" >&5142982 +echo "configure:6847: checking return type of signal handlers" >&5 131132 142983 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then 131133 142984 echo $ac_n "(cached) $ac_c" 1>&6 … … 131135 142986 cat > conftest.$ac_ext <<EOF 131136 142987 -#line 6274 "configure" 131137 +#line 6 447"configure"142988 +#line 6852 "configure" 131138 142989 #include "confdefs.h" 131139 142990 #include <sys/types.h> 131140 142991 #include <signal.h> 131141 @@ -6287,7 +6 460,7 @@142992 @@ -6287,7 +6865,7 @@ 131142 142993 int i; 131143 142994 ; return 0; } 131144 142995 EOF 131145 142996 -if { (eval echo configure:6291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 131146 +if { (eval echo configure:6 464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then142997 +if { (eval echo configure:6869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 131147 142998 rm -rf conftest* 131148 142999 ac_cv_type_signal=void 131149 143000 else 131150 @@ -6307,12 +6 480,12 @@143001 @@ -6307,12 +6885,12 @@ 131151 143002 131152 143003 131153 143004 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 131154 143005 -echo "configure:6311: checking for ANSI C header files" >&5 131155 +echo "configure:6 484: checking for ANSI C header files" >&5143006 +echo "configure:6889: checking for ANSI C header files" >&5 131156 143007 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then 131157 143008 echo $ac_n "(cached) $ac_c" 1>&6 … … 131159 143010 cat > conftest.$ac_ext <<EOF 131160 143011 -#line 6316 "configure" 131161 +#line 6 489"configure"143012 +#line 6894 "configure" 131162 143013 #include "confdefs.h" 131163 143014 #include <stdlib.h> 131164 143015 #include <stdarg.h> 131165 @@ -6320,7 +6 493,7 @@143016 @@ -6320,7 +6898,7 @@ 131166 143017 #include <float.h> 131167 143018 EOF 131168 143019 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 131169 143020 -{ (eval echo configure:6324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 131170 +{ (eval echo configure:6 497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }143021 +{ (eval echo configure:6902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 131171 143022 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 131172 143023 if test -z "$ac_err"; then 131173 143024 rm -rf conftest* 131174 @@ -6337,7 +6 510,7 @@143025 @@ -6337,7 +6915,7 @@ 131175 143026 if test $ac_cv_header_stdc = yes; then 131176 143027 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 131177 143028 cat > conftest.$ac_ext <<EOF 131178 143029 -#line 6341 "configure" 131179 +#line 6 514"configure"143030 +#line 6919 "configure" 131180 143031 #include "confdefs.h" 131181 143032 #include <string.h> 131182 143033 EOF 131183 @@ -6355,7 +6 528,7 @@143034 @@ -6355,7 +6933,7 @@ 131184 143035 if test $ac_cv_header_stdc = yes; then 131185 143036 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 131186 143037 cat > conftest.$ac_ext <<EOF 131187 143038 -#line 6359 "configure" 131188 +#line 6 532"configure"143039 +#line 6937 "configure" 131189 143040 #include "confdefs.h" 131190 143041 #include <stdlib.h> 131191 143042 EOF 131192 @@ -6376,7 +6 549,7 @@143043 @@ -6376,7 +6954,7 @@ 131193 143044 : 131194 143045 else 131195 143046 cat > conftest.$ac_ext <<EOF 131196 143047 -#line 6380 "configure" 131197 +#line 6 553"configure"143048 +#line 6958 "configure" 131198 143049 #include "confdefs.h" 131199 143050 #include <ctype.h> 131200 143051 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 131201 @@ -6387,7 +6 560,7 @@143052 @@ -6387,7 +6965,7 @@ 131202 143053 exit (0); } 131203 143054 131204 143055 EOF 131205 143056 -if { (eval echo configure:6391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 131206 +if { (eval echo configure:6 564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null143057 +if { (eval echo configure:6969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 131207 143058 then 131208 143059 : 131209 143060 else 131210 @@ -6411,12 +6 584,12 @@143061 @@ -6411,12 +6989,12 @@ 131211 143062 fi 131212 143063 131213 143064 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 131214 143065 -echo "configure:6415: checking whether time.h and sys/time.h may both be included" >&5 131215 +echo "configure:6 588: checking whether time.h and sys/time.h may both be included" >&5143066 +echo "configure:6993: checking whether time.h and sys/time.h may both be included" >&5 131216 143067 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then 131217 143068 echo $ac_n "(cached) $ac_c" 1>&6 … … 131219 143070 cat > conftest.$ac_ext <<EOF 131220 143071 -#line 6420 "configure" 131221 +#line 6 593"configure"143072 +#line 6998 "configure" 131222 143073 #include "confdefs.h" 131223 143074 #include <sys/types.h> 131224 143075 #include <sys/time.h> 131225 @@ -6425,7 + 6598,7 @@143076 @@ -6425,7 +7003,7 @@ 131226 143077 struct tm *tp; 131227 143078 ; return 0; } 131228 143079 EOF 131229 143080 -if { (eval echo configure:6429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 131230 +if { (eval echo configure: 6602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then143081 +if { (eval echo configure:7007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 131231 143082 rm -rf conftest* 131232 143083 ac_cv_header_time=yes 131233 143084 else 131234 @@ -6458,17 + 6631,17 @@143085 @@ -6458,17 +7036,17 @@ 131235 143086 do 131236 143087 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 131237 143088 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 131238 143089 -echo "configure:6462: checking for $ac_hdr" >&5 131239 +echo "configure: 6635: checking for $ac_hdr" >&5143090 +echo "configure:7040: checking for $ac_hdr" >&5 131240 143091 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 131241 143092 echo $ac_n "(cached) $ac_c" 1>&6 … … 131243 143094 cat > conftest.$ac_ext <<EOF 131244 143095 -#line 6467 "configure" 131245 +#line 6640"configure"143096 +#line 7045 "configure" 131246 143097 #include "confdefs.h" 131247 143098 #include <$ac_hdr> … … 131249 143100 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 131250 143101 -{ (eval echo configure:6472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 131251 +{ (eval echo configure: 6645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }143102 +{ (eval echo configure:7050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 131252 143103 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 131253 143104 if test -z "$ac_err"; then 131254 143105 rm -rf conftest* 131255 @@ -6529,12 +6702,12 @@ 143106 @@ -6496,45 +7074,17 @@ 143107 143108 143109 for ac_func in \ 143110 -chgat \ 143111 -color_set \ 143112 -filter \ 143113 -getbegx \ 143114 -getcurx \ 143115 -getmaxx \ 143116 -getnstr \ 143117 gettimeofday \ 143118 -getwin \ 143119 -mvvline \ 143120 -mvwvline \ 143121 -napms \ 143122 -putwin \ 143123 -resize_term \ 143124 -resizeterm \ 143125 -ripoffline \ 143126 -setupterm \ 143127 -slk_color \ 143128 -slk_init \ 143129 strdup \ 143130 -termattrs \ 143131 -tgetent \ 143132 -tigetnum \ 143133 -tigetstr \ 143134 -typeahead \ 143135 -use_default_colors \ 143136 -vsscanf \ 143137 -wchgat \ 143138 -winsstr \ 143139 -wresize \ 131256 143140 131257 143141 do 131258 143142 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 131259 143143 -echo "configure:6533: checking for $ac_func" >&5 131260 +echo "configure: 6706: checking for $ac_func" >&5143144 +echo "configure:7083: checking for $ac_func" >&5 131261 143145 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 131262 143146 echo $ac_n "(cached) $ac_c" 1>&6 … … 131264 143148 cat > conftest.$ac_ext <<EOF 131265 143149 -#line 6538 "configure" 131266 +#line 6711"configure"143150 +#line 7088 "configure" 131267 143151 #include "confdefs.h" 131268 143152 /* System header to define __stub macros and hopefully few prototypes, 131269 143153 which can conflict with char $ac_func(); below. */ 131270 @@ -6557,7 + 6730,7 @@143154 @@ -6557,7 +7107,7 @@ 131271 143155 131272 143156 ; return 0; } 131273 143157 EOF 131274 143158 -if { (eval echo configure:6561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131275 +if { (eval echo configure: 6734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then143159 +if { (eval echo configure:7111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131276 143160 rm -rf conftest* 131277 143161 eval "ac_cv_func_$ac_func=yes" 131278 143162 else 131279 @@ -6582,8 + 6755,14@@143163 @@ -6582,8 +7132,240 @@ 131280 143164 done 131281 143165 131282 143166 143167 + 143168 +echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 143169 +echo "configure:7138: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 143170 +if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then 143171 + echo $ac_n "(cached) $ac_c" 1>&6 143172 +else 143173 + 143174 +cat > conftest.$ac_ext <<EOF 143175 +#line 7144 "configure" 143176 +#include "confdefs.h" 143177 + 143178 +#include <stdlib.h> 143179 +#include <${cf_cv_ncurses_header-curses.h}> 143180 +int main() { 143181 + 143182 + long x = winnstr(stdscr, "", 0); 143183 + int x1, y1; 143184 + getbegyx(stdscr, y1, x1) 143185 +; return 0; } 143186 +EOF 143187 +if { (eval echo configure:7156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 143188 + rm -rf conftest* 143189 + cf_cv_need_xopen_extension=no 143190 +else 143191 + echo "configure: failed program was:" >&5 143192 + cat conftest.$ac_ext >&5 143193 + rm -rf conftest* 143194 + cat > conftest.$ac_ext <<EOF 143195 +#line 7164 "configure" 143196 +#include "confdefs.h" 143197 + 143198 +#define _XOPEN_SOURCE_EXTENDED 143199 +#include <stdlib.h> 143200 +#include <${cf_cv_ncurses_header-curses.h}> 143201 +int main() { 143202 + 143203 + long x = winnstr(stdscr, "", 0); 143204 + int x1, y1; 143205 + getbegyx(stdscr, y1, x1) 143206 +; return 0; } 143207 +EOF 143208 +if { (eval echo configure:7177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 143209 + rm -rf conftest* 143210 + cf_cv_need_xopen_extension=yes 143211 +else 143212 + echo "configure: failed program was:" >&5 143213 + cat conftest.$ac_ext >&5 143214 + rm -rf conftest* 143215 + cf_cv_need_xopen_extension=unknown 143216 +fi 143217 +rm -f conftest* 143218 +fi 143219 +rm -f conftest* 143220 +fi 143221 + 143222 +echo "$ac_t""$cf_cv_need_xopen_extension" 1>&6 143223 +test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" 143224 + 143225 + 143226 +echo $ac_n "checking for term.h""... $ac_c" 1>&6 143227 +echo "configure:7196: checking for term.h" >&5 143228 +if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then 143229 + echo $ac_n "(cached) $ac_c" 1>&6 143230 +else 143231 + 143232 + 143233 +# If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look 143234 +# for <term.h> if we do not find the variant. 143235 +for cf_header in \ 143236 + `echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \ 143237 + term.h 143238 +do 143239 + cat > conftest.$ac_ext <<EOF 143240 +#line 7209 "configure" 143241 +#include "confdefs.h" 143242 + 143243 +#include <${cf_cv_ncurses_header-curses.h}> 143244 +#include <${cf_header}> 143245 +int main() { 143246 +WINDOW *x 143247 +; return 0; } 143248 +EOF 143249 +if { (eval echo configure:7218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 143250 + rm -rf conftest* 143251 + cf_cv_term_header=$cf_header 143252 + break 143253 +else 143254 + echo "configure: failed program was:" >&5 143255 + cat conftest.$ac_ext >&5 143256 + rm -rf conftest* 143257 + cf_cv_term_header=no 143258 +fi 143259 +rm -f conftest* 143260 +done 143261 + 143262 +fi 143263 + 143264 +echo "$ac_t""$cf_cv_term_header" 1>&6 143265 + 143266 +case $cf_cv_term_header in #(vi 143267 +term.h) #(vi 143268 + cat >> confdefs.h <<\EOF 143269 +#define HAVE_TERM_H 1 143270 +EOF 143271 + 143272 + ;; 143273 +ncurses/term.h) 143274 + cat >> confdefs.h <<\EOF 143275 +#define HAVE_NCURSES_TERM_H 1 143276 +EOF 143277 + 143278 + ;; 143279 +ncursesw/term.h) 143280 + cat >> confdefs.h <<\EOF 143281 +#define HAVE_NCURSESW_TERM_H 1 143282 +EOF 143283 + 143284 + ;; 143285 +esac 143286 + 143287 + 143288 + 143289 + 143290 +for cf_func in \ 143291 +chgat \ 143292 +color_set \ 143293 +filter \ 143294 +getbegx \ 143295 +getcurx \ 143296 +getmaxx \ 143297 +getnstr \ 143298 +getparx \ 143299 +getwin \ 143300 +mvvline \ 143301 +mvwvline \ 143302 +napms \ 143303 +putwin \ 143304 +resize_term \ 143305 +resizeterm \ 143306 +ripoffline \ 143307 +setupterm \ 143308 +slk_color \ 143309 +slk_init \ 143310 +termattrs \ 143311 +tgetent \ 143312 +tigetnum \ 143313 +tigetstr \ 143314 +typeahead \ 143315 +use_default_colors \ 143316 +vsscanf \ 143317 +wchgat \ 143318 +winsstr \ 143319 +wresize \ 143320 + 143321 +do 143322 + 143323 +cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 143324 + 143325 + echo $ac_n "checking for ${cf_func}""... $ac_c" 1>&6 143326 +echo "configure:7295: checking for ${cf_func}" >&5 143327 + 143328 +echo "${as_me-configure}:7297: testing ${cf_func} ..." 1>&5 143329 + 143330 + if eval "test \"`echo '$''{'cf_cv_func_$cf_func'+set}'`\" = set"; then 143331 + echo $ac_n "(cached) $ac_c" 1>&6 143332 +else 143333 + 143334 + eval cf_result='$ac_cv_func_'$cf_func 143335 + if test ".$cf_result" != ".no"; then 143336 + cat > conftest.$ac_ext <<EOF 143337 +#line 7306 "configure" 143338 +#include "confdefs.h" 143339 + 143340 +#ifdef HAVE_XCURSES 143341 +#include <xcurses.h> 143342 +char * XCursesProgramName = "test"; 143343 +#else 143344 +#include <${cf_cv_ncurses_header-curses.h}> 143345 +#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H) 143346 +#include <ncursesw/term.h> 143347 +#else 143348 +#if defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H) 143349 +#include <ncurses/term.h> 143350 +#else 143351 +#ifdef HAVE_TERM_H 143352 +#include <term.h> 143353 +#endif 143354 +#endif 143355 +#endif 143356 +#endif 143357 +int main() { 143358 + 143359 +#ifndef ${cf_func} 143360 +long foo = (long)(&${cf_func}); 143361 +${cf_cv_main_return-return}(foo == 0); 143362 +#endif 143363 + 143364 +; return 0; } 143365 +EOF 143366 +if { (eval echo configure:7335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 143367 + rm -rf conftest* 143368 + cf_result=yes 143369 +else 143370 + echo "configure: failed program was:" >&5 143371 + cat conftest.$ac_ext >&5 143372 + rm -rf conftest* 143373 + cf_result=no 143374 +fi 143375 +rm -f conftest* 143376 + fi 143377 + eval 'cf_cv_func_'$cf_func'=$cf_result' 143378 + 143379 +fi 143380 + 143381 + # use the computed/retrieved cache-value: 143382 + eval 'cf_result=$cf_cv_func_'$cf_func 143383 + echo "$ac_t""$cf_result" 1>&6 143384 + if test $cf_result != no; then 143385 + cat >> confdefs.h <<EOF 143386 +#define HAVE_${cf_tr_func} 1 143387 +EOF 143388 + 143389 + fi 143390 +done 143391 + 143392 + 131283 143393 +echo $ac_n "checking for ncurses extended functions""... $ac_c" 1>&6 131284 +echo "configure: 6760: checking for ncurses extended functions" >&5143394 +echo "configure:7363: checking for ncurses extended functions" >&5 131285 143395 +if eval "test \"`echo '$''{'cf_cv_ncurses_ext_funcs'+set}'`\" = set"; then 131286 143396 + echo $ac_n "(cached) $ac_c" 1>&6 … … 131289 143399 cat > conftest.$ac_ext <<EOF 131290 143400 -#line 6587 "configure" 131291 +#line 6766"configure"143401 +#line 7369 "configure" 131292 143402 #include "confdefs.h" 131293 143403 131294 143404 #include <${cf_cv_ncurses_header-curses.h}> 131295 @@ -6601,30 + 6780,81 @@143405 @@ -6601,30 +7383,81 @@ 131296 143406 (void) use_default_colors (); 131297 143407 (void) use_extended_names (0); … … 131301 143411 EOF 131302 143412 -if { (eval echo configure:6608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131303 +if { (eval echo configure: 6786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then143413 +if { (eval echo configure:7389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131304 143414 rm -rf conftest* 131305 143415 - cat >> confdefs.h <<\EOF … … 131322 143432 + 131323 143433 +echo $ac_n "checking for wide-character functions""... $ac_c" 1>&6 131324 +echo "configure: 6806: checking for wide-character functions" >&5143434 +echo "configure:7409: checking for wide-character functions" >&5 131325 143435 +if eval "test \"`echo '$''{'cf_cv_widechar_funcs'+set}'`\" = set"; then 131326 143436 + echo $ac_n "(cached) $ac_c" 1>&6 … … 131328 143438 + 131329 143439 +cat > conftest.$ac_ext <<EOF 131330 +#line 6812"configure"143440 +#line 7415 "configure" 131331 143441 +#include "confdefs.h" 131332 143442 + … … 131340 143450 +; return 0; } 131341 143451 +EOF 131342 +if { (eval echo configure: 6824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then143452 +if { (eval echo configure:7427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131343 143453 + rm -rf conftest* 131344 143454 + cf_cv_widechar_funcs=yes … … 131369 143479 echo $ac_n "checking if sys/time.h works with sys/select.h""... $ac_c" 1>&6 131370 143480 -echo "configure:6622: checking if sys/time.h works with sys/select.h" >&5 131371 +echo "configure: 6852: checking if sys/time.h works with sys/select.h" >&5143481 +echo "configure:7455: checking if sys/time.h works with sys/select.h" >&5 131372 143482 if eval "test \"`echo '$''{'cf_cv_sys_time_select'+set}'`\" = set"; then 131373 143483 echo $ac_n "(cached) $ac_c" 1>&6 … … 131376 143486 cat > conftest.$ac_ext <<EOF 131377 143487 -#line 6628 "configure" 131378 +#line 6858"configure"143488 +#line 7461 "configure" 131379 143489 #include "confdefs.h" 131380 143490 131381 143491 #include <sys/types.h> 131382 @@ -6639,7 + 6869,7 @@143492 @@ -6639,7 +7472,7 @@ 131383 143493 131384 143494 ; return 0; } 131385 143495 EOF 131386 143496 -if { (eval echo configure:6643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 131387 +if { (eval echo configure: 6873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then143497 +if { (eval echo configure:7476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 131388 143498 rm -rf conftest* 131389 143499 cf_cv_sys_time_select=yes 131390 143500 else 131391 @@ -6660,7 + 6890,7 @@143501 @@ -6660,7 +7493,7 @@ 131392 143502 131393 143503 131394 143504 echo $ac_n "checking for function curses_version""... $ac_c" 1>&6 131395 143505 -echo "configure:6664: checking for function curses_version" >&5 131396 +echo "configure: 6894: checking for function curses_version" >&5143506 +echo "configure:7497: checking for function curses_version" >&5 131397 143507 if eval "test \"`echo '$''{'cf_cv_func_curses_version'+set}'`\" = set"; then 131398 143508 echo $ac_n "(cached) $ac_c" 1>&6 131399 143509 else 131400 @@ -6669,7 + 6899,7 @@143510 @@ -6669,7 +7502,7 @@ 131401 143511 cf_cv_func_curses_version=unknown 131402 143512 else 131403 143513 cat > conftest.$ac_ext <<EOF 131404 143514 -#line 6673 "configure" 131405 +#line 6903"configure"143515 +#line 7506 "configure" 131406 143516 #include "confdefs.h" 131407 143517 131408 143518 #include <${cf_cv_ncurses_header-curses.h}> 131409 @@ -6677,11 + 6907,11 @@143519 @@ -6677,11 +7510,11 @@ 131410 143520 { 131411 143521 char temp[1024]; … … 131417 143527 EOF 131418 143528 -if { (eval echo configure:6685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 131419 +if { (eval echo configure: 6915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null143529 +if { (eval echo configure:7518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 131420 143530 then 131421 143531 cf_cv_func_curses_version=yes 131422 143532 131423 @@ -6706,7 + 6936,7 @@143533 @@ -6706,7 +7539,7 @@ 131424 143534 131425 143535 131426 143536 echo $ac_n "checking for alternate character set array""... $ac_c" 1>&6 131427 143537 -echo "configure:6710: checking for alternate character set array" >&5 131428 +echo "configure: 6940: checking for alternate character set array" >&5143538 +echo "configure:7543: checking for alternate character set array" >&5 131429 143539 if eval "test \"`echo '$''{'cf_cv_curses_acs_map'+set}'`\" = set"; then 131430 143540 echo $ac_n "(cached) $ac_c" 1>&6 131431 143541 else 131432 @@ -6715,7 + 6945,7 @@143542 @@ -6715,7 +7548,7 @@ 131433 143543 for name in acs_map _acs_map __acs_map _nc_acs_map 131434 143544 do 131435 143545 cat > conftest.$ac_ext <<EOF 131436 143546 -#line 6719 "configure" 131437 +#line 6949"configure"143547 +#line 7552 "configure" 131438 143548 #include "confdefs.h" 131439 143549 131440 143550 #include <${cf_cv_ncurses_header-curses.h}> 131441 @@ -6726,7 + 6956,7 @@143551 @@ -6726,7 +7559,7 @@ 131442 143552 131443 143553 ; return 0; } 131444 143554 EOF 131445 143555 -if { (eval echo configure:6730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131446 +if { (eval echo configure: 6960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then143556 +if { (eval echo configure:7563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131447 143557 rm -rf conftest* 131448 143558 cf_cv_curses_acs_map=$name; break 131449 143559 else 131450 @@ -6747,7 + 6977,7 @@143560 @@ -6747,7 +7580,7 @@ 131451 143561 131452 143562 131453 143563 echo $ac_n "checking for wide alternate character set array""... $ac_c" 1>&6 131454 143564 -echo "configure:6751: checking for wide alternate character set array" >&5 131455 +echo "configure: 6981: checking for wide alternate character set array" >&5143565 +echo "configure:7584: checking for wide alternate character set array" >&5 131456 143566 if eval "test \"`echo '$''{'cf_cv_curses_wacs_map'+set}'`\" = set"; then 131457 143567 echo $ac_n "(cached) $ac_c" 1>&6 131458 143568 else 131459 @@ -6756,7 + 6986,7 @@143569 @@ -6756,7 +7589,7 @@ 131460 143570 for name in wacs_map _wacs_map __wacs_map _nc_wacs 131461 143571 do 131462 143572 cat > conftest.$ac_ext <<EOF 131463 143573 -#line 6760 "configure" 131464 +#line 6990"configure"143574 +#line 7593 "configure" 131465 143575 #include "confdefs.h" 131466 143576 131467 143577 #ifndef _XOPEN_SOURCE_EXTENDED 131468 @@ -6767,7 + 6997,7 @@143578 @@ -6767,7 +7600,7 @@ 131469 143579 $name['k'] = *WACS_PLUS 131470 143580 ; return 0; } 131471 143581 EOF 131472 143582 -if { (eval echo configure:6771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131473 +if { (eval echo configure:7 001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then143583 +if { (eval echo configure:7604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131474 143584 rm -rf conftest* 131475 143585 cf_cv_curses_wacs_map=$name 131476 143586 break 131477 @@ -6783,9 +7 013,9 @@143587 @@ -6783,9 +7616,9 @@ 131478 143588 131479 143589 131480 143590 echo $ac_n "checking for type attr_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6 131481 143591 -echo "configure:6787: checking for type attr_t in ${cf_cv_ncurses_header-curses.h}" >&5 131482 +echo "configure:7 017: checking for type attr_t in ${cf_cv_ncurses_header-curses.h}" >&5143592 +echo "configure:7620: checking for type attr_t in ${cf_cv_ncurses_header-curses.h}" >&5 131483 143593 cat > conftest.$ac_ext <<EOF 131484 143594 -#line 6789 "configure" 131485 +#line 7 019"configure"143595 +#line 7622 "configure" 131486 143596 #include "confdefs.h" 131487 143597 131488 143598 #ifndef _XOPEN_SOURCE_EXTENDED 131489 @@ -6798,7 +7 028,7 @@143599 @@ -6798,7 +7631,7 @@ 131490 143600 131491 143601 ; return 0; } 131492 143602 EOF 131493 143603 -if { (eval echo configure:6802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 131494 +if { (eval echo configure:7 032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then143604 +if { (eval echo configure:7635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 131495 143605 rm -rf conftest* 131496 143606 cf_result=yes 131497 143607 else 131498 @@ -6826,9 +7 056,9 @@143608 @@ -6826,9 +7659,9 @@ 131499 143609 131500 143610 131501 143611 echo $ac_n "checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6 131502 143612 -echo "configure:6830: checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}" >&5 131503 +echo "configure:7 060: checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}" >&5143613 +echo "configure:7663: checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}" >&5 131504 143614 cat > conftest.$ac_ext <<EOF 131505 143615 -#line 6832 "configure" 131506 +#line 7 062"configure"143616 +#line 7665 "configure" 131507 143617 #include "confdefs.h" 131508 143618 131509 143619 #ifndef _XOPEN_SOURCE_EXTENDED 131510 @@ -6841,7 +7 071,7 @@143620 @@ -6841,7 +7674,7 @@ 131511 143621 131512 143622 ; return 0; } 131513 143623 EOF 131514 143624 -if { (eval echo configure:6845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 131515 +if { (eval echo configure:7 075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then143625 +if { (eval echo configure:7678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 131516 143626 rm -rf conftest* 131517 143627 cf_result=yes 131518 143628 else 131519 @@ -7018,9 +7 248,9 @@143629 @@ -7018,9 +7851,9 @@ 131520 143630 s%@DFT_DEP_SUFFIX@%$DFT_DEP_SUFFIX%g 131521 143631 s%@DFT_OBJ_SUBDIR@%$DFT_OBJ_SUBDIR%g … … 131528 143638 s%@LD_SHARED_OPTS@%$LD_SHARED_OPTS%g 131529 143639 s%@LIBTOOL@%$LIBTOOL%g 131530 @@ -7040,6 +7 270,11 @@143640 @@ -7040,6 +7873,11 @@ 131531 143641 s%@EXEEXT@%$EXEEXT%g 131532 143642 s%@OBJEXT@%$OBJEXT%g … … 131540 143650 s%@X_CFLAGS@%$X_CFLAGS%g 131541 143651 s%@X_PRE_LIBS@%$X_PRE_LIBS%g 131542 @@ -7247,6 + 7482,7 @@143652 @@ -7247,6 +8085,7 @@ 131543 143653 # Extra initialization commands, if any 131544 143654 … … 131548 143658 EOF 131549 143659 cat >> $CONFIG_STATUS <<\EOF 131550 @@ -7258,7 + 7494,7 @@143660 @@ -7258,7 +8097,7 @@ 131551 143661 if test ! -d $srcdir/$cf_dir; then 131552 143662 continue … … 131559 143669 diff -Naur ncurses-5.6.orig/test/configure.in ncurses-5.6/test/configure.in 131560 143670 --- ncurses-5.6.orig/test/configure.in 2006-07-15 14:54:07.000000000 -0400 131561 +++ ncurses-5.6/test/configure.in 200 7-12-21 00:02:36.000000000 -0500143671 +++ ncurses-5.6/test/configure.in 2008-06-18 06:49:47.000000000 -0400 131562 143672 @@ -1,5 +1,5 @@ 131563 143673 dnl*************************************************************************** 131564 143674 -dnl Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. * 131565 +dnl Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *143675 +dnl Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 131566 143676 dnl * 131567 143677 dnl Permission is hereby granted, free of charge, to any person obtaining a * … … 131572 143682 dnl 131573 143683 -dnl $Id: configure.in,v 1.58 2006/07/15 18:54:07 tom Exp $ 131574 +dnl $Id: configure.in,v 1.6 3 2007/06/09 20:02:57tom Exp $143684 +dnl $Id: configure.in,v 1.65 2008/02/09 18:24:11 tom Exp $ 131575 143685 dnl This is a simple configuration-script for the ncurses test programs that 131576 143686 dnl allows the test-directory to be separately configured against a reference … … 131609 143719 CF_WITH_CURSES_DIR 131610 143720 131611 @@ -206,6 +210,7 @@ 143721 @@ -174,6 +178,11 @@ 143722 ) 143723 143724 AC_CHECK_FUNCS( \ 143725 +gettimeofday \ 143726 +strdup \ 143727 +) 143728 + 143729 +CF_CURSES_FUNCS( \ 143730 chgat \ 143731 color_set \ 143732 filter \ 143733 @@ -181,7 +190,7 @@ 143734 getcurx \ 143735 getmaxx \ 143736 getnstr \ 143737 -gettimeofday \ 143738 +getparx \ 143739 getwin \ 143740 mvvline \ 143741 mvwvline \ 143742 @@ -193,7 +202,6 @@ 143743 setupterm \ 143744 slk_color \ 143745 slk_init \ 143746 -strdup \ 143747 termattrs \ 143748 tgetent \ 143749 tigetnum \ 143750 @@ -206,6 +214,7 @@ 131612 143751 wresize \ 131613 143752 ) … … 131617 143756 #include <${cf_cv_ncurses_header-curses.h}>], 131618 143757 [ 131619 @@ -220,8 +22 5,28 @@143758 @@ -220,8 +229,28 @@ 131620 143759 (void) resizeterm (0, 0); 131621 143760 (void) use_default_colors (); … … 131648 143787 CF_SYS_TIME_SELECT 131649 143788 CF_FUNC_CURSES_VERSION 131650 @@ -236,7 +26 1,7 @@143789 @@ -236,7 +265,7 @@ 131651 143790 dnl --------------------------------------------------------------------------- 131652 143791 … … 131657 143796 131658 143797 # These rules are generated so we do not rely on suffix rules, which do not 131659 @@ -256,4 +28 1,5 @@143798 @@ -256,4 +285,5 @@ 131660 143799 done 131661 143800 ],[ … … 131663 143802 +ECHO_LD="$ECHO_LD" 131664 143803 ],cat) 143804 diff -Naur ncurses-5.6.orig/test/demo_altkeys.c ncurses-5.6/test/demo_altkeys.c 143805 --- ncurses-5.6.orig/test/demo_altkeys.c 2006-12-09 11:49:49.000000000 -0500 143806 +++ ncurses-5.6/test/demo_altkeys.c 2008-06-18 06:49:49.000000000 -0400 143807 @@ -1,5 +1,5 @@ 143808 /**************************************************************************** 143809 - * Copyright (c) 2005,2006 Free Software Foundation, Inc. * 143810 + * Copyright (c) 2005-2006,2008 Free Software Foundation, Inc. * 143811 * * 143812 * Permission is hereby granted, free of charge, to any person obtaining a * 143813 * copy of this software and associated documentation files (the * 143814 @@ -26,7 +26,7 @@ 143815 * authorization. * 143816 ****************************************************************************/ 143817 /* 143818 - * $Id: demo_altkeys.c,v 1.7 2006/12/09 16:49:49 tom Exp $ 143819 + * $Id: demo_altkeys.c,v 1.8 2008/04/12 22:06:22 tom Exp $ 143820 * 143821 * Demonstrate the define_key() function. 143822 * Thomas Dickey - 2005/10/22 143823 @@ -110,7 +110,7 @@ 143824 for (n = KEY_MIN; n < KEY_MAX; ++n) { 143825 char *value; 143826 if ((value = keybound(n, 0)) != 0) { 143827 - char *temp = malloc(strlen(value) + 2); 143828 + char *temp = typeMalloc(char, strlen(value) + 2); 143829 sprintf(temp, "\033%s", value); 143830 define_key(temp, n + MY_KEYS); 143831 free(temp); 131665 143832 diff -Naur ncurses-5.6.orig/test/demo_defkey.c ncurses-5.6/test/demo_defkey.c 131666 143833 --- ncurses-5.6.orig/test/demo_defkey.c 2006-04-01 14:08:03.000000000 -0500 131667 +++ ncurses-5.6/test/demo_defkey.c 200 7-12-21 00:02:36.000000000 -0500143834 +++ ncurses-5.6/test/demo_defkey.c 2008-06-18 06:49:49.000000000 -0400 131668 143835 @@ -1,5 +1,5 @@ 131669 143836 /**************************************************************************** 131670 143837 - * Copyright (c) 2002-2005,2006 Free Software Foundation, Inc. * 131671 + * Copyright (c) 2002-200 6,2007Free Software Foundation, Inc. *143838 + * Copyright (c) 2002-2007,2008 Free Software Foundation, Inc. * 131672 143839 * * 131673 143840 * Permission is hereby granted, free of charge, to any person obtaining a * … … 131678 143845 /* 131679 143846 - * $Id: demo_defkey.c,v 1.16 2006/04/01 19:08:03 tom Exp $ 131680 + * $Id: demo_defkey.c,v 1.1 7 2007/04/07 17:13:03tom Exp $143847 + * $Id: demo_defkey.c,v 1.18 2008/04/12 22:06:12 tom Exp $ 131681 143848 * 131682 143849 * Demonstrate the define_key() function. 131683 143850 * Thomas Dickey - 2002/11/23 143851 @@ -112,10 +112,10 @@ 143852 need += strlen(temp); 143853 } 143854 if (!pass) 143855 - result = (char *) calloc(need, 1); 143856 + result = typeCalloc(char, need); 143857 } 143858 } else { 143859 - result = (char *) calloc(1, 1); 143860 + result = typeCalloc(char, 1); 143861 } 143862 return result; 143863 } 131684 143864 @@ -143,13 +143,12 @@ 131685 143865 code_name); … … 131699 143879 diff -Naur ncurses-5.6.orig/test/demo_forms.c ncurses-5.6/test/demo_forms.c 131700 143880 --- ncurses-5.6.orig/test/demo_forms.c 2006-12-09 19:30:24.000000000 -0500 131701 +++ ncurses-5.6/test/demo_forms.c 200 7-12-21 00:02:36.000000000 -0500143881 +++ ncurses-5.6/test/demo_forms.c 2008-06-18 06:49:44.000000000 -0400 131702 143882 @@ -1,5 +1,5 @@ 131703 143883 /**************************************************************************** … … 131749 143929 diff -Naur ncurses-5.6.orig/test/demo_menus.c ncurses-5.6/test/demo_menus.c 131750 143930 --- ncurses-5.6.orig/test/demo_menus.c 2006-06-17 13:39:37.000000000 -0400 131751 +++ ncurses-5.6/test/demo_menus.c 200 7-12-21 00:02:36.000000000 -0500143931 +++ ncurses-5.6/test/demo_menus.c 2008-06-18 06:49:49.000000000 -0400 131752 143932 @@ -1,5 +1,5 @@ 131753 143933 /**************************************************************************** 131754 143934 - * Copyright (c) 2005,2006 Free Software Foundation, Inc. * 131755 + * Copyright (c) 2005-200 6,2007Free Software Foundation, Inc. *143935 + * Copyright (c) 2005-2007,2008 Free Software Foundation, Inc. * 131756 143936 * * 131757 143937 * Permission is hereby granted, free of charge, to any person obtaining a * … … 131762 143942 /* 131763 143943 - * $Id: demo_menus.c,v 1.20 2006/06/17 17:39:37 tom Exp $ 131764 + * $Id: demo_menus.c,v 1.2 1 2007/07/21 17:45:09tom Exp $143944 + * $Id: demo_menus.c,v 1.24 2008/04/12 22:03:33 tom Exp $ 131765 143945 * 131766 143946 * Demonstrate a variety of functions from the menu library. 131767 143947 * Thomas Dickey - 2005/4/9 143948 @@ -112,7 +112,7 @@ 143949 static char * 143950 strdup(char *s) 143951 { 143952 - char *p = (char *) malloc(strlen(s) + 1); 143953 + char *p = typeMalloc(char, strlen(s) + 1); 143954 if (p) 143955 strcpy(p, s); 143956 return (p); 143957 @@ -130,14 +130,14 @@ 143958 while ((c = wgetch(win)) == CTRL('T')) { 143959 if (_nc_tracing) { 143960 save_trace = _nc_tracing; 143961 - _tracef("TOGGLE-TRACING OFF"); 143962 + Trace(("TOGGLE-TRACING OFF")); 143963 _nc_tracing = 0; 143964 } else { 143965 _nc_tracing = save_trace; 143966 } 143967 trace(_nc_tracing); 143968 if (_nc_tracing) 143969 - _tracef("TOGGLE-TRACING ON"); 143970 + Trace(("TOGGLE-TRACING ON")); 143971 } 143972 #else 143973 c = wgetch(win); 143974 @@ -270,7 +270,7 @@ 143975 #if 0 143976 if (count > 0) { 143977 while (*ip) { 143978 - _tracef("freeing item %d:%d", ip - menu_items(m), count); 143979 + Trace(("freeing item %d:%d", ip - menu_items(m), count)); 143980 free_item(*ip++); 143981 } 143982 } 143983 @@ -291,7 +291,7 @@ 143984 static void 143985 build_file_menu(MenuNo number) 143986 { 143987 - static const char *labels[] = 143988 + static CONST_MENUS char *labels[] = 143989 { 143990 "Exit", 143991 (char *) 0 143992 @@ -299,7 +299,7 @@ 143993 static ITEM *items[SIZEOF(labels)]; 143994 143995 ITEM **ip = items; 143996 - const char **ap; 143997 + CONST_MENUS char **ap; 143998 143999 for (ap = labels; *ap; ap++) 144000 *ip++ = new_item(*ap, ""); 144001 @@ -319,7 +319,7 @@ 144002 static void 144003 build_select_menu(MenuNo number, char *filename) 144004 { 144005 - static const char *labels[] = 144006 + static CONST_MENUS char *labels[] = 144007 { 144008 "Lions", 144009 "Tigers", 144010 @@ -339,7 +339,7 @@ 144011 static ITEM **items; 144012 144013 ITEM **ip; 144014 - const char **ap = 0; 144015 + CONST_MENUS char **ap = 0; 144016 unsigned count = 0; 144017 144018 if (filename != 0) { 144019 @@ -349,10 +349,10 @@ 144020 && sb.st_size != 0) { 144021 unsigned size = sb.st_size; 144022 unsigned j, k; 144023 - char *blob = malloc(size + 1); 144024 - const char **list = (const char **) calloc(sizeof(*list), size + 1); 144025 + char *blob = typeMalloc(char, size + 1); 144026 + CONST_MENUS char **list = typeCalloc(CONST_MENUS char *, size + 1); 144027 144028 - items = (ITEM **) calloc(sizeof(ITEM *), size + 1); 144029 + items = typeCalloc(ITEM *, size + 1); 144030 if (blob != 0 && list != 0) { 144031 FILE *fp = fopen(filename, "r"); 144032 if (fp != 0) { 144033 @@ -383,7 +383,7 @@ 144034 } 144035 if (ap == 0) { 144036 count = SIZEOF(labels) - 1; 144037 - items = (ITEM **) calloc(count + 1, sizeof(*items)); 144038 + items = typeCalloc(ITEM *, count + 1); 144039 ap = labels; 144040 } 144041 144042 @@ -456,7 +456,7 @@ 144043 size_t need = 12; 144044 for (n = 0; t_tbl[n].name != 0; n++) 144045 need += strlen(t_tbl[n].name) + 2; 144046 - buf = (char *) malloc(need); 144047 + buf = typeMalloc(char, need); 144048 } 144049 sprintf(buf, "0x%02x = {", tlevel); 144050 if (tlevel == 0) { 144051 @@ -523,7 +523,7 @@ 144052 newtrace |= t_tbl[item_index(*ip)].mask; 144053 } 144054 trace(newtrace); 144055 - _tracef("trace level interactively set to %s", tracetrace(_nc_tracing)); 144056 + Trace(("trace level interactively set to %s", tracetrace(_nc_tracing))); 144057 144058 (void) mvprintw(LINES - 2, 0, 144059 "Trace level is %s\n", tracetrace(_nc_tracing)); 144060 @@ -569,7 +569,7 @@ 144061 static void 144062 build_menus(char *filename) 144063 { 144064 - static const char *labels[] = 144065 + static CONST_MENUS char *labels[] = 144066 { 144067 "File", 144068 "Select", 144069 @@ -581,7 +581,7 @@ 144070 static ITEM *items[SIZEOF(labels)]; 144071 144072 ITEM **ip = items; 144073 - const char **ap; 144074 + CONST_MENUS char **ap; 144075 144076 for (ap = labels; *ap; ap++) 144077 *ip++ = new_item(*ap, ""); 131768 144078 @@ -834,7 +834,7 @@ 131769 144079 … … 131777 144087 diff -Naur ncurses-5.6.orig/test/demo_panels.c ncurses-5.6/test/demo_panels.c 131778 144088 --- ncurses-5.6.orig/test/demo_panels.c 2006-04-01 14:08:03.000000000 -0500 131779 +++ ncurses-5.6/test/demo_panels.c 200 7-12-21 00:02:36.000000000 -0500144089 +++ ncurses-5.6/test/demo_panels.c 2008-06-18 06:49:49.000000000 -0400 131780 144090 @@ -1,5 +1,5 @@ 131781 144091 /**************************************************************************** 131782 144092 - * Copyright (c) 2003,2006 Free Software Foundation, Inc. * 131783 + * Copyright (c) 2007 Free Software Foundation, Inc.*144093 + * Copyright (c) 2007,2008 Free Software Foundation, Inc. * 131784 144094 * * 131785 144095 * Permission is hereby granted, free of charge, to any person obtaining a * … … 131790 144100 /* 131791 144101 - * $Id: demo_panels.c,v 1.2 2006/04/01 19:08:03 tom Exp $ 131792 + * $Id: demo_panels.c,v 1. 28 2007/08/11 16:34:49 tom Exp $144102 + * $Id: demo_panels.c,v 1.30 2008/04/12 21:59:49 tom Exp $ 131793 144103 * 131794 144104 * Demonstrate a variety of functions from the panel library. … … 131976 144286 + WINDOW *win; 131977 144287 + PANEL *pan = 0; 131978 + char *userdata = malloc(3);144288 + char *userdata = typeMalloc(char, 3); 131979 144289 + 131980 144290 + if ((win = newwin(rows, cols, tly, tlx)) != 0) { … … 132405 144715 + if (fgets(buffer, limit - 3, log_in) != 0) { 132406 144716 + length = strlen(buffer); 132407 + while (length > 0 && isspace( buffer[length - 1]))144717 + while (length > 0 && isspace(UChar(buffer[length - 1]))) 132408 144718 + buffer[--length] = '\0'; 132409 144719 + waddstr(win, buffer); … … 132581 144891 diff -Naur ncurses-5.6.orig/test/demo_termcap.c ncurses-5.6/test/demo_termcap.c 132582 144892 --- ncurses-5.6.orig/test/demo_termcap.c 2006-05-06 15:06:36.000000000 -0400 132583 +++ ncurses-5.6/test/demo_termcap.c 200 7-12-21 00:02:36.000000000 -0500144893 +++ ncurses-5.6/test/demo_termcap.c 2008-06-18 06:49:47.000000000 -0400 132584 144894 @@ -1,5 +1,5 @@ 132585 144895 /**************************************************************************** 132586 144896 - * Copyright (c) 2005,2006 Free Software Foundation, Inc. * 132587 + * Copyright (c) 2005-200 6,2007Free Software Foundation, Inc. *144897 + * Copyright (c) 2005-2007,2008 Free Software Foundation, Inc. * 132588 144898 * * 132589 144899 * Permission is hereby granted, free of charge, to any person obtaining a * … … 132594 144904 * 132595 144905 - * $Id: demo_termcap.c,v 1.5 2006/05/06 19:06:36 tom Exp $ 132596 + * $Id: demo_termcap.c,v 1. 6 2007/02/03 18:51:23tom Exp $144906 + * $Id: demo_termcap.c,v 1.7 2008/02/09 18:08:36 tom Exp $ 132597 144907 * 132598 144908 * A simple demo of the termcap interface. … … 132602 144912 132603 144913 #if HAVE_TGETENT 144914 @@ -115,7 +116,7 @@ 144915 } 144916 144917 static void 144918 -demo_termcap(const char *name) 144919 +demo_termcap(char *name) 144920 { 144921 char buffer[1024]; 144922 144923 @@ -152,11 +153,13 @@ 144924 } else if ((name = getenv("TERM")) != 0) { 144925 demo_termcap(name); 144926 } else { 144927 - demo_termcap("dumb"); 144928 + static char dumb[] = "dumb"; 144929 + demo_termcap(dumb); 144930 } 144931 144932 ExitProgram(EXIT_SUCCESS); 144933 } 144934 + 144935 #else 144936 int 144937 main(int argc GCC_UNUSED, 132604 144938 diff -Naur ncurses-5.6.orig/test/ditto.c ncurses-5.6/test/ditto.c 132605 144939 --- ncurses-5.6.orig/test/ditto.c 2005-04-16 12:35:49.000000000 -0400 132606 +++ ncurses-5.6/test/ditto.c 200 7-12-21 00:02:36.000000000 -0500144940 +++ ncurses-5.6/test/ditto.c 2008-06-18 06:49:52.000000000 -0400 132607 144941 @@ -1,5 +1,5 @@ 132608 144942 /**************************************************************************** 132609 144943 - * Copyright (c) 1998-2001,2005 Free Software Foundation, Inc. * 132610 + * Copyright (c) 1998-200 5,2007Free Software Foundation, Inc. *144944 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 132611 144945 * * 132612 144946 * Permission is hereby granted, free of charge, to any person obtaining a * 132613 144947 * copy of this software and associated documentation files (the * 132614 @@ -29,7 +29,7 @@ 144948 @@ -27,25 +27,78 @@ 144949 ****************************************************************************/ 144950 132615 144951 /* 132616 * Author: Thomas E. Dickey <dickey@clark.net> 1998 144952 - * Author: Thomas E. Dickey <dickey@clark.net> 1998 144953 + * Author: Thomas E. Dickey (1998-on) 132617 144954 * 132618 144955 - * $Id: ditto.c,v 1.5 2005/04/16 16:35:49 tom Exp $ 132619 + * $Id: ditto.c,v 1. 8 2007/09/01 21:10:38tom Exp $144956 + * $Id: ditto.c,v 1.30 2008/06/14 23:00:26 tom Exp $ 132620 144957 * 132621 144958 * The program illustrates how to set up multiple screens from a single 132622 * program. Invoke the program by specifying another terminal on the same 132623 @@ -72,19 +72,32 @@ 144959 - * program. Invoke the program by specifying another terminal on the same 144960 - * machine by specifying its device, e.g., 144961 + * program. 144962 + * 144963 + * If openpty() is supported, the command line parameters are titles for 144964 + * the windows showing each screen's data. 144965 + * 144966 + * If openpty() is not supported, you must invoke the program by specifying 144967 + * another terminal on the same machine by specifying its device, e.g., 144968 * ditto /dev/ttyp1 144969 */ 144970 #include <test.priv.h> 144971 #include <sys/stat.h> 144972 #include <errno.h> 144973 144974 +#ifdef USE_PTHREADS 144975 +#include <pthread.h> 144976 +#endif 144977 + 144978 +#ifdef USE_XTERM_PTY 144979 +#include USE_OPENPTY_HEADER 144980 +#endif 144981 + 144982 +#define MAX_FIFO 256 144983 + 144984 +#define THIS_FIFO(n) ((n) % MAX_FIFO) 144985 +#define NEXT_FIFO(n) THIS_FIFO((n) + 1) 144986 + 144987 +typedef struct { 144988 + unsigned long sequence; 144989 + int head; 144990 + int tail; 144991 + int data[MAX_FIFO]; 144992 +} FIFO; 144993 + 144994 +typedef struct { 144995 + unsigned long sequence; 144996 +} PEEK; 144997 + 144998 +/* 144999 + * Data "owned" for a single screen. Each screen is divided into windows that 145000 + * show the text read from each terminal. Input from a given screen will also 145001 + * be read into one window per screen. 145002 + */ 145003 typedef struct { 145004 FILE *input; 145005 FILE *output; 145006 - SCREEN *screen; 145007 + SCREEN *screen; /* this screen - curses internal data */ 145008 + int which1; /* this screen's index in DITTO[] array */ 145009 + int length; /* length of windows[] and peeks[] */ 145010 + char **titles; /* per-window titles */ 145011 + WINDOW **windows; /* display data from each screen */ 145012 + PEEK *peeks; /* indices for each screen's fifo */ 145013 + FIFO fifo; /* fifo for this screen */ 145014 +#ifdef USE_PTHREADS 145015 + pthread_t thread; 145016 +#endif 145017 } DITTO; 145018 145019 +/* 145020 + * Structure used to pass multiple parameters via the use_screen() 145021 + * single-parameter interface. 145022 + */ 145023 +typedef struct { 145024 + int source; /* which screen did character come from */ 145025 + int target; /* which screen is character going to */ 145026 + DITTO *ditto; /* data for all screens */ 145027 +} DDATA; 145028 + 145029 static void 145030 failed(const char *s) 145031 { 145032 @@ -60,10 +113,60 @@ 145033 ExitProgram(EXIT_FAILURE); 145034 } 145035 145036 +/* Add to the head of the fifo, checking for overflow. */ 145037 +static void 145038 +put_fifo(FIFO * fifo, int value) 145039 +{ 145040 + int next = NEXT_FIFO(fifo->head); 145041 + if (next == fifo->tail) 145042 + fifo->tail = NEXT_FIFO(fifo->tail); 145043 + fifo->data[next] = value; 145044 + fifo->head = next; 145045 + fifo->sequence += 1; 145046 +} 145047 + 145048 +/* Get data from the tail (oldest part) of the fifo, returning -1 if no data. 145049 + * Since each screen can peek into the fifo, we do not update the tail index, 145050 + * but modify the peek-index. 145051 + * 145052 + * FIXME - test/workaround for case where fifo gets more than a buffer 145053 + * ahead of peek. 145054 + */ 145055 +static int 145056 +peek_fifo(FIFO * fifo, PEEK * peek) 145057 +{ 145058 + int result = -1; 145059 + if (peek->sequence < fifo->sequence) { 145060 + peek->sequence += 1; 145061 + result = fifo->data[THIS_FIFO(peek->sequence)]; 145062 + } 145063 + return result; 145064 +} 145065 + 145066 static FILE * 145067 open_tty(char *path) 145068 { 145069 FILE *fp; 145070 +#ifdef USE_XTERM_PTY 145071 + int amaster; 145072 + int aslave; 145073 + char slave_name[1024]; 145074 + char s_option[1024]; 145075 + char *leaf; 145076 + 145077 + if (openpty(&amaster, &aslave, slave_name, 0, 0) != 0) 145078 + failed("openpty"); 145079 + if ((leaf = strrchr(slave_name, '/')) == 0) { 145080 + errno = EISDIR; 145081 + failed(slave_name); 145082 + } 145083 + sprintf(s_option, "-S%s/%d", slave_name, aslave); 145084 + if (fork()) { 145085 + execlp("xterm", "xterm", s_option, "-title", path, (char *) 0); 145086 + _exit(0); 145087 + } 145088 + fp = fdopen(amaster, "r+"); 145089 +#else 145090 struct stat sb; 145091 145092 if (stat(path, &sb) < 0) 145093 @@ -72,75 +175,243 @@ 132624 145094 errno = ENOTTY; 132625 145095 failed(path); … … 132630 145100 failed(path); 132631 145101 printf("opened %s\n", path); 145102 +#endif 132632 145103 return fp; 132633 145104 } 132634 145105 132635 145106 +static void 132636 +show_ditto(DITTO * data, int count, int which, int ch) 145107 +init_screen(SCREEN *sp GCC_UNUSED, void *arg) 145108 +{ 145109 + DITTO *target = (DITTO *) arg; 145110 + int high, wide; 145111 + int k; 145112 + 145113 + cbreak(); 145114 + noecho(); 145115 + scrollok(stdscr, TRUE); 145116 + box(stdscr, 0, 0); 145117 + 145118 + target->windows = typeCalloc(WINDOW *, target->length); 145119 + target->peeks = typeCalloc(PEEK, target->length); 145120 + 145121 + high = (LINES - 2) / target->length; 145122 + wide = (COLS - 2); 145123 + for (k = 0; k < target->length; ++k) { 145124 + WINDOW *outer = newwin(high, wide, 1 + (high * k), 1); 145125 + WINDOW *inner = derwin(outer, high - 2, wide - 2, 1, 1); 145126 + 145127 + box(outer, 0, 0); 145128 + mvwaddstr(outer, 0, 2, target->titles[k]); 145129 + wnoutrefresh(outer); 145130 + 145131 + scrollok(inner, TRUE); 145132 + keypad(inner, TRUE); 145133 +#ifndef USE_PTHREADS 145134 + nodelay(inner, TRUE); 145135 +#endif 145136 + 145137 + target->windows[k] = inner; 145138 + } 145139 + doupdate(); 145140 +} 145141 + 145142 +static void 145143 +open_screen(DITTO * target, char **source, int length, int which1) 145144 +{ 145145 + if (which1 != 0) { 145146 + target->input = 145147 + target->output = open_tty(source[which1]); 145148 + } else { 145149 + target->input = stdin; 145150 + target->output = stdout; 145151 + } 145152 + 145153 + target->which1 = which1; 145154 + target->titles = source; 145155 + target->length = length; 145156 + target->screen = newterm((char *) 0, /* assume $TERM is the same */ 145157 + target->output, 145158 + target->input); 145159 + 145160 + if (target->screen == 0) 145161 + failed("newterm"); 145162 + 145163 + (void) USING_SCREEN(target->screen, init_screen, target); 145164 +} 145165 + 145166 +static int 145167 +close_screen(SCREEN *sp GCC_UNUSED, void *arg GCC_UNUSED) 145168 +{ 145169 + (void) sp; 145170 + (void) arg; 145171 + return endwin(); 145172 +} 145173 + 145174 +/* 145175 + * Read data from the 'source' screen. 145176 + */ 145177 +static int 145178 +read_screen(SCREEN *sp GCC_UNUSED, void *arg) 145179 +{ 145180 + DDATA *data = (DDATA *) arg; 145181 + DITTO *ditto = &(data->ditto[data->source]); 145182 + WINDOW *win = ditto->windows[data->source]; 145183 + int ch = wgetch(win); 145184 + 145185 + if (ch > 0 && ch < 256) 145186 + put_fifo(&(ditto->fifo), ch); 145187 + else 145188 + ch = ERR; 145189 + 145190 + return ch; 145191 +} 145192 + 145193 +/* 145194 + * Write all of the data that's in fifos for the 'target' screen. 145195 + */ 145196 +static int 145197 +write_screen(SCREEN *sp GCC_UNUSED, void *arg GCC_UNUSED) 145198 +{ 145199 + DDATA *data = (DDATA *) arg; 145200 + DITTO *ditto = &(data->ditto[data->target]); 145201 + bool changed = FALSE; 145202 + int which; 145203 + 145204 + for (which = 0; which < ditto->length; ++which) { 145205 + WINDOW *win = ditto->windows[which]; 145206 + FIFO *fifo = &(data->ditto[which].fifo); 145207 + PEEK *peek = &(ditto->peeks[which]); 145208 + int ch; 145209 + 145210 + while ((ch = peek_fifo(fifo, peek)) > 0) { 145211 + changed = TRUE; 145212 + 145213 + waddch(win, ch); 145214 + wnoutrefresh(win); 145215 + } 145216 + } 145217 + 145218 + if (changed) 145219 + doupdate(); 145220 + return OK; 145221 +} 145222 + 145223 +static void 145224 +show_ditto(DITTO * data, int count, DDATA * ddata) 132637 145225 +{ 132638 145226 + int n; 132639 145227 + 132640 145228 + for (n = 0; n < count; n++) { 132641 + set_term(data[n].screen); 132642 + addch(UChar(ch)); 132643 + refresh(); 145229 + ddata->target = n; 145230 + USING_SCREEN(data[n].screen, write_screen, (void *) ddata); 132644 145231 + } 132645 + set_term(data[which].screen);132646 145232 +} 132647 145233 + 145234 +#ifdef USE_PTHREADS 145235 +static void * 145236 +handle_screen(void *arg) 145237 +{ 145238 + DDATA ddata; 145239 + int ch; 145240 + 145241 + memset(&ddata, 0, sizeof(ddata)); 145242 + ddata.ditto = (DITTO *) arg; 145243 + ddata.source = ddata.ditto->which1; 145244 + ddata.ditto -= ddata.source; /* -> base of array */ 145245 + 145246 + for (;;) { 145247 + ch = read_screen(ddata.ditto->screen, &ddata); 145248 + if (ch == CTRL('D')) { 145249 + int later = (ddata.source ? ddata.source : -1); 145250 + int j; 145251 + 145252 + for (j = ddata.ditto->length - 1; j > 0; --j) { 145253 + if (j != later) { 145254 + pthread_cancel(ddata.ditto[j].thread); 145255 + } 145256 + } 145257 + if (later > 0) { 145258 + pthread_cancel(ddata.ditto[later].thread); 145259 + } 145260 + break; 145261 + } 145262 + show_ditto(ddata.ditto, ddata.ditto->length, &ddata); 145263 + } 145264 + return NULL; 145265 +} 145266 +#endif 145267 + 132648 145268 int 132649 main(int argc GCC_UNUSED, 132650 char *argv[]GCC_UNUSED) 145269 -main(int argc GCC_UNUSED, 145270 - char *argv[]GCC_UNUSED) 145271 +main(int argc, char *argv[]) 132651 145272 { 132652 145273 int j; 132653 145274 - int active_tty = 0; 145275 DITTO *data; 145276 +#ifndef USE_PTHREADS 132654 145277 + int count; 132655 DITTO *data; 145278 +#endif 132656 145279 132657 145280 if (argc <= 1) 132658 @@ -105,7 +118,6 @@ 132659 * Set up the screens. 145281 usage(); 145282 145283 - if ((data = (DITTO *) calloc((unsigned) argc, sizeof(DITTO))) == 0) 145284 + if ((data = typeCalloc(DITTO, argc)) == 0) 145285 failed("calloc data"); 145286 145287 - data[0].input = stdin; 145288 - data[0].output = stdout; 145289 - for (j = 1; j < argc; j++) { 145290 - data[j].input = 145291 - data[j].output = open_tty(argv[j]); 145292 + for (j = 0; j < argc; j++) { 145293 + open_screen(&data[j], argv, argc, j); 145294 } 145295 145296 +#ifdef USE_PTHREADS 145297 /* 145298 - * If we got this far, we have open connection(s) to the terminal(s). 145299 - * Set up the screens. 145300 + * For multi-threaded operation, set up a reader for each of the screens. 145301 + * That uses blocking I/O rather than polling for input, so no calls to 145302 + * napms() are needed. 132660 145303 */ 132661 145304 for (j = 0; j < argc; j++) { 132662 145305 - active_tty++; 132663 data[j].screen = newterm((char *) 0, /* assume $TERM is the same */ 132664 data[j].output, 132665 data[j].input); 132666 @@ -114,25 +126,27 @@ 132667 cbreak(); 132668 noecho(); 132669 scrollok(stdscr, TRUE); 132670 + nodelay(stdscr, TRUE); 145306 - data[j].screen = newterm((char *) 0, /* assume $TERM is the same */ 145307 - data[j].output, 145308 - data[j].input); 145309 - if (data[j].screen == 0) 145310 - failed("newterm"); 145311 - cbreak(); 145312 - noecho(); 145313 - scrollok(stdscr, TRUE); 145314 + (void) pthread_create(&(data[j].thread), NULL, handle_screen, &data[j]); 132671 145315 } 132672 145316 - 145317 + pthread_join(data[1].thread, NULL); 145318 +#else 132673 145319 /* 132674 145320 * Loop, reading characters from any of the inputs and writing to all … … 132677 145323 - for (;;) { 132678 145324 + for (count = 0;; ++count) { 145325 + DDATA ddata; 132679 145326 int ch; 132680 145327 - set_term(data[0].screen); 145328 - ch = getch(); 145329 - if (ch == ERR) 145330 - continue; 145331 - if (ch == 4) 132681 145332 + int which = (count % argc); 132682 145333 + 132683 + set_term(data[which].screen);132684 145334 + napms(20); 132685 ch = getch(); 132686 - if (ch == ERR) 132687 + if (ch == ERR) {132688 + /* echochar('.'); */132689 continue;132690 - if (ch == 4) 132691 -break;145335 + 145336 + ddata.source = which; 145337 + ddata.ditto = data; 145338 + 145339 + ch = USING_SCREEN(data[which].screen, read_screen, &ddata); 145340 + if (ch == CTRL('D')) { 145341 break; 132692 145342 - for (j = 0; j < argc; j++) { 132693 145343 - set_term(data[j].screen); 132694 145344 - addch(UChar(ch)); 132695 145345 - refresh(); 145346 + } else if (ch != ERR) { 145347 + show_ditto(data, argc, &ddata); 132696 145348 } 132697 + if (ch == CTRL('D'))132698 + break;132699 + show_ditto(data, argc, which, ch);132700 145349 } 145350 +#endif 132701 145351 132702 145352 /* 145353 * Cleanup and exit 145354 */ 145355 for (j = argc - 1; j >= 0; j--) { 145356 - set_term(data[j].screen); 145357 - endwin(); 145358 + USING_SCREEN(data[j].screen, close_screen, 0); 145359 + fprintf(data[j].output, "**Closed\r\n"); 145360 + 145361 + /* 145362 + * Closing before a delscreen() helps ncurses determine that there 145363 + * is no valid output buffer, and can remove the setbuf() data. 145364 + */ 145365 + fflush(data[j].output); 145366 + fclose(data[j].output); 145367 + delscreen(data[j].screen); 145368 } 145369 ExitProgram(EXIT_SUCCESS); 145370 } 132703 145371 diff -Naur ncurses-5.6.orig/test/dots.c ncurses-5.6/test/dots.c 132704 145372 --- ncurses-5.6.orig/test/dots.c 2006-11-04 14:54:42.000000000 -0500 132705 +++ ncurses-5.6/test/dots.c 200 7-12-21 00:02:36.000000000 -0500145373 +++ ncurses-5.6/test/dots.c 2008-06-18 06:49:47.000000000 -0400 132706 145374 @@ -1,5 +1,5 @@ 132707 145375 /**************************************************************************** 132708 145376 - * Copyright (c) 1999-2005,2006 Free Software Foundation, Inc. * 132709 + * Copyright (c) 1999-200 6,2007Free Software Foundation, Inc. *145377 + * Copyright (c) 1999-2007,2008 Free Software Foundation, Inc. * 132710 145378 * * 132711 145379 * Permission is hereby granted, free of charge, to any person obtaining a * … … 132716 145384 * 132717 145385 - * $Id: dots.c,v 1.15 2006/11/04 19:54:42 tom Exp $ 132718 + * $Id: dots.c,v 1.1 6 2007/02/03 18:51:23tom Exp $145386 + * $Id: dots.c,v 1.17 2008/02/09 18:08:50 tom Exp $ 132719 145387 * 132720 145388 * A simple demo of the terminfo interface. … … 132724 145392 132725 145393 #if HAVE_SETUPTERM 145394 @@ -46,7 +47,7 @@ 145395 static time_t started; 145396 145397 static int 145398 -outc(int c) 145399 +outc(TPUTS_ARG c) 145400 { 145401 if (interrupted) { 145402 char tmp = c; 132726 145403 diff -Naur ncurses-5.6.orig/test/dots_mvcur.c ncurses-5.6/test/dots_mvcur.c 132727 145404 --- ncurses-5.6.orig/test/dots_mvcur.c 1969-12-31 19:00:00.000000000 -0500 132728 +++ ncurses-5.6/test/dots_mvcur.c 200 7-12-21 00:02:36.000000000 -0500145405 +++ ncurses-5.6/test/dots_mvcur.c 2008-06-18 06:49:47.000000000 -0400 132729 145406 @@ -0,0 +1,171 @@ 132730 145407 +/**************************************************************************** 132731 + * Copyright (c) 1999-200 6,2007Free Software Foundation, Inc. *145408 + * Copyright (c) 1999-2007,2008 Free Software Foundation, Inc. * 132732 145409 + * * 132733 145410 + * Permission is hereby granted, free of charge, to any person obtaining a * … … 132759 145436 + * Author: Thomas E. Dickey - 2007 132760 145437 + * 132761 + * $Id: dots_mvcur.c,v 1. 1 2007/06/02 20:01:32tom Exp $145438 + * $Id: dots_mvcur.c,v 1.2 2008/02/09 18:08:57 tom Exp $ 132762 145439 + * 132763 145440 + * A simple demo of the terminfo interface, and mvcur. … … 132777 145454 + 132778 145455 +static int 132779 +outc( intc)145456 +outc(TPUTS_ARG c) 132780 145457 +{ 132781 145458 + if (interrupted) { … … 132901 145578 diff -Naur ncurses-5.6.orig/test/echochar.c ncurses-5.6/test/echochar.c 132902 145579 --- ncurses-5.6.orig/test/echochar.c 2006-12-02 19:14:29.000000000 -0500 132903 +++ ncurses-5.6/test/echochar.c 200 7-12-21 00:02:36.000000000 -0500145580 +++ ncurses-5.6/test/echochar.c 2008-06-18 06:49:49.000000000 -0400 132904 145581 @@ -1,5 +1,5 @@ 132905 145582 /**************************************************************************** 132906 145583 - * Copyright (c) 2006 Free Software Foundation, Inc. * 132907 + * Copyright (c) 2006 ,2007 Free Software Foundation, Inc.*145584 + * Copyright (c) 2006-2007,2008 Free Software Foundation, Inc. * 132908 145585 * * 132909 145586 * Permission is hereby granted, free of charge, to any person obtaining a * … … 132914 145591 /* 132915 145592 - * $Id: echochar.c,v 1.3 2006/12/03 00:14:29 tom Exp $ 132916 + * $Id: echochar.c,v 1. 5 2007/07/21 17:41:55tom Exp $145593 + * $Id: echochar.c,v 1.6 2008/04/12 22:06:04 tom Exp $ 132917 145594 * 132918 145595 * Demonstrate the echochar function (compare to dots.c). … … 132932 145609 if (COLOR_PAIRS > 0) { 132933 145610 - my_pairs = calloc(COLOR_PAIRS, sizeof(*my_pairs)); 132934 + my_pairs = calloc((unsigned) COLOR_PAIRS, sizeof(*my_pairs));145611 + my_pairs = typeCalloc(char, COLOR_PAIRS); 132935 145612 } 132936 145613 use_colors = (my_pairs != 0); … … 132951 145628 diff -Naur ncurses-5.6.orig/test/gdc.c ncurses-5.6/test/gdc.c 132952 145629 --- ncurses-5.6.orig/test/gdc.c 2006-05-20 11:37:44.000000000 -0400 132953 +++ ncurses-5.6/test/gdc.c 200 7-12-21 00:02:36.000000000 -0500145630 +++ ncurses-5.6/test/gdc.c 2008-06-18 06:49:44.000000000 -0400 132954 145631 @@ -1,5 +1,5 @@ 132955 145632 /**************************************************************************** … … 132979 145656 diff -Naur ncurses-5.6.orig/test/hashtest.c ncurses-5.6/test/hashtest.c 132980 145657 --- ncurses-5.6.orig/test/hashtest.c 2006-05-20 12:02:16.000000000 -0400 132981 +++ ncurses-5.6/test/hashtest.c 200 7-12-21 00:02:36.000000000 -0500145658 +++ ncurses-5.6/test/hashtest.c 2008-06-18 06:49:47.000000000 -0400 132982 145659 @@ -1,5 +1,5 @@ 132983 145660 /**************************************************************************** 132984 145661 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 132985 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *145662 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 132986 145663 * * 132987 145664 * Permission is hereby granted, free of charge, to any person obtaining a * 132988 145665 * copy of this software and associated documentation files (the * 132989 @@ -30, 7 +30,7@@145666 @@ -30,17 +30,9 @@ 132990 145667 * 132991 145668 * Generate timing statistics for vertical-motion optimization. 132992 145669 * 132993 145670 - * $Id: hashtest.c,v 1.26 2006/05/20 16:02:16 tom Exp $ 132994 + * $Id: hashtest.c,v 1.2 7 2007/07/21 17:45:09tom Exp $145671 + * $Id: hashtest.c,v 1.28 2008/02/23 23:02:41 tom Exp $ 132995 145672 */ 132996 145673 132997 #ifdef TRACE 132998 @@ -190,7 +190,7 @@ 145674 -#ifdef TRACE 145675 -#define Trace(p) _tracef p 145676 -#define USE_TRACE 1 145677 -#else 145678 -#define Trace(p) /* nothing */ 145679 -#define USE_TRACE 0 145680 -#endif 145681 - 145682 #include <test.priv.h> 145683 145684 #define LO_CHAR ' ' 145685 @@ -190,7 +182,7 @@ 132999 145686 133000 145687 setlocale(LC_ALL, ""); … … 133007 145694 diff -Naur ncurses-5.6.orig/test/inch_wide.c ncurses-5.6/test/inch_wide.c 133008 145695 --- ncurses-5.6.orig/test/inch_wide.c 1969-12-31 19:00:00.000000000 -0500 133009 +++ ncurses-5.6/test/inch_wide.c 200 7-12-21 00:02:36.000000000 -0500145696 +++ ncurses-5.6/test/inch_wide.c 2008-06-18 06:49:44.000000000 -0400 133010 145697 @@ -0,0 +1,279 @@ 133011 145698 +/**************************************************************************** … … 133290 145977 diff -Naur ncurses-5.6.orig/test/inchs.c ncurses-5.6/test/inchs.c 133291 145978 --- ncurses-5.6.orig/test/inchs.c 1969-12-31 19:00:00.000000000 -0500 133292 +++ ncurses-5.6/test/inchs.c 200 7-12-21 00:02:36.000000000 -0500145979 +++ ncurses-5.6/test/inchs.c 2008-06-18 06:49:44.000000000 -0400 133293 145980 @@ -0,0 +1,272 @@ 133294 145981 +/**************************************************************************** … … 133566 146253 diff -Naur ncurses-5.6.orig/test/ins_wide.c ncurses-5.6/test/ins_wide.c 133567 146254 --- ncurses-5.6.orig/test/ins_wide.c 2006-04-01 14:08:03.000000000 -0500 133568 +++ ncurses-5.6/test/ins_wide.c 200 7-12-21 00:02:36.000000000 -0500146255 +++ ncurses-5.6/test/ins_wide.c 2008-06-18 06:49:44.000000000 -0400 133569 146256 @@ -1,5 +1,5 @@ 133570 146257 /**************************************************************************** … … 133630 146317 diff -Naur ncurses-5.6.orig/test/inserts.c ncurses-5.6/test/inserts.c 133631 146318 --- ncurses-5.6.orig/test/inserts.c 2006-10-14 16:43:46.000000000 -0400 133632 +++ ncurses-5.6/test/inserts.c 200 7-12-21 00:02:36.000000000 -0500146319 +++ ncurses-5.6/test/inserts.c 2008-06-18 06:49:44.000000000 -0400 133633 146320 @@ -1,5 +1,5 @@ 133634 146321 /**************************************************************************** … … 133694 146381 diff -Naur ncurses-5.6.orig/test/key_names.c ncurses-5.6/test/key_names.c 133695 146382 --- ncurses-5.6.orig/test/key_names.c 1969-12-31 19:00:00.000000000 -0500 133696 +++ ncurses-5.6/test/key_names.c 200 7-12-21 00:02:36.000000000 -0500146383 +++ ncurses-5.6/test/key_names.c 2008-06-18 06:49:47.000000000 -0400 133697 146384 @@ -0,0 +1,56 @@ 133698 146385 +/**************************************************************************** 133699 + * Copyright (c) 2007 Free Software Foundation, Inc.*146386 + * Copyright (c) 2007,2008 Free Software Foundation, Inc. * 133700 146387 + * * 133701 146388 + * Permission is hereby granted, free of charge, to any person obtaining a * … … 133724 146411 + ****************************************************************************/ 133725 146412 +/* 133726 + * $Id: key_names.c,v 1. 2 2007/06/09 22:32:34tom Exp $146413 + * $Id: key_names.c,v 1.3 2008/02/09 18:09:18 tom Exp $ 133727 146414 + */ 133728 146415 + … … 133737 146424 + 133738 146425 + setlocale(LC_ALL, ""); 133739 + for (n = -1; n < KEY_MAX + 512; n++) {146426 + for (n = KEY_MIN; n < KEY_MAX + 512; n++) { 133740 146427 + const char *result = key_name(n); 133741 146428 + if (result != 0) … … 133754 146441 diff -Naur ncurses-5.6.orig/test/mk-test.awk ncurses-5.6/test/mk-test.awk 133755 146442 --- ncurses-5.6.orig/test/mk-test.awk 2006-10-21 18:56:50.000000000 -0400 133756 +++ ncurses-5.6/test/mk-test.awk 200 7-12-21 00:02:36.000000000 -0500146443 +++ ncurses-5.6/test/mk-test.awk 2008-06-18 06:49:44.000000000 -0400 133757 146444 @@ -1,6 +1,6 @@ 133758 146445 -# $Id: mk-test.awk,v 1.4 2006/10/21 22:56:50 tom Exp $ … … 133781 146468 diff -Naur ncurses-5.6.orig/test/modules ncurses-5.6/test/modules 133782 146469 --- ncurses-5.6.orig/test/modules 2006-11-04 13:56:08.000000000 -0500 133783 +++ ncurses-5.6/test/modules 200 7-12-21 00:02:36.000000000 -0500146470 +++ ncurses-5.6/test/modules 2008-06-18 06:49:44.000000000 -0400 133784 146471 @@ -1,7 +1,6 @@ 133785 146472 -# Test-Program modules … … 133856 146543 diff -Naur ncurses-5.6.orig/test/movewindow.c ncurses-5.6/test/movewindow.c 133857 146544 --- ncurses-5.6.orig/test/movewindow.c 2006-06-17 13:43:22.000000000 -0400 133858 +++ ncurses-5.6/test/movewindow.c 200 7-12-21 00:02:36.000000000 -0500146545 +++ ncurses-5.6/test/movewindow.c 2008-06-18 06:49:49.000000000 -0400 133859 146546 @@ -1,5 +1,5 @@ 133860 146547 /**************************************************************************** 133861 146548 - * Copyright (c) 2006 Free Software Foundation, Inc. * 133862 + * Copyright (c) 2006 ,2007 Free Software Foundation, Inc.*146549 + * Copyright (c) 2006-2007,2008 Free Software Foundation, Inc. * 133863 146550 * * 133864 146551 * Permission is hereby granted, free of charge, to any person obtaining a * … … 133869 146556 /* 133870 146557 - * $Id: movewindow.c,v 1.19 2006/06/17 17:43:22 tom Exp $ 133871 + * $Id: movewindow.c,v 1.2 0 2007/01/06 23:28:53tom Exp $146558 + * $Id: movewindow.c,v 1.22 2008/04/12 22:01:41 tom Exp $ 133872 146559 * 133873 146560 * Demonstrate move functions for windows and derived windows from the curses 133874 146561 * library. 133875 @@ -63,14 +63,14 @@ 146562 @@ -47,6 +47,12 @@ 146563 #undef derwin 146564 #endif 146565 146566 +#ifdef NCURSES_VERSION 146567 +#define CONST_FMT const 146568 +#else 146569 +#define CONST_FMT /* nothing */ 146570 +#endif 146571 + 146572 #undef LINE_MAX 146573 146574 #define LINE_MIN 2 146575 @@ -63,14 +69,14 @@ 133876 146576 WINDOW *child; /* the actual value */ 133877 146577 } FRAME; … … 133879 146579 -static void head_line(char *fmt,...) GCC_PRINTFLIKE(1, 2); 133880 146580 -static void tail_line(char *fmt,...) GCC_PRINTFLIKE(1, 2); 133881 +static void head_line( constchar *fmt,...) GCC_PRINTFLIKE(1, 2);133882 +static void tail_line( constchar *fmt,...) GCC_PRINTFLIKE(1, 2);146581 +static void head_line(CONST_FMT char *fmt,...) GCC_PRINTFLIKE(1, 2); 146582 +static void tail_line(CONST_FMT char *fmt,...) GCC_PRINTFLIKE(1, 2); 133883 146583 133884 146584 static unsigned num_windows; … … 133887 146587 static void 133888 146588 -message(int lineno, char *fmt, va_list argp) 133889 +message(int lineno, constchar *fmt, va_list argp)146589 +message(int lineno, CONST_FMT char *fmt, va_list argp) 133890 146590 { 133891 146591 int y, x; 133892 146592 133893 @@ -93,7 +9 3,7 @@146593 @@ -93,7 +99,7 @@ 133894 146594 } 133895 146595 133896 146596 static void 133897 146597 -head_line(char *fmt,...) 133898 +head_line( constchar *fmt,...)146598 +head_line(CONST_FMT char *fmt,...) 133899 146599 { 133900 146600 va_list argp; 133901 146601 133902 @@ -103,7 +10 3,7 @@146602 @@ -103,7 +109,7 @@ 133903 146603 } 133904 146604 133905 146605 static void 133906 146606 -tail_line(char *fmt,...) 133907 +tail_line( constchar *fmt,...)146607 +tail_line(CONST_FMT char *fmt,...) 133908 146608 { 133909 146609 va_list argp; 133910 146610 133911 @@ -511,7 +511,7 @@ 146611 @@ -245,7 +251,7 @@ 146612 146613 keypad(child, TRUE); 146614 if (need > have) { 146615 - all_windows = (FRAME *) realloc(all_windows, need * sizeof(FRAME)); 146616 + all_windows = typeRealloc(FRAME, need, all_windows); 146617 } 146618 all_windows[num_windows].parent = parent; 146619 all_windows[num_windows].child = child; 146620 @@ -511,7 +517,7 @@ 133912 146621 /* *INDENT-OFF* */ 133913 146622 static struct { 133914 146623 int key; 133915 146624 - char * msg; 133916 + constchar * msg;146625 + CONST_FMT char * msg; 133917 146626 } help[] = { 133918 146627 { '?', "Show this screen" }, … … 133920 146629 diff -Naur ncurses-5.6.orig/test/ncurses.c ncurses-5.6/test/ncurses.c 133921 146630 --- ncurses-5.6.orig/test/ncurses.c 2006-12-09 19:13:15.000000000 -0500 133922 +++ ncurses-5.6/test/ncurses.c 200 7-12-21 00:02:36.000000000 -0500146631 +++ ncurses-5.6/test/ncurses.c 2008-06-18 06:49:49.000000000 -0400 133923 146632 @@ -1,5 +1,5 @@ 133924 146633 /**************************************************************************** 133925 146634 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 133926 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *146635 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 133927 146636 * * 133928 146637 * Permission is hereby granted, free of charge, to any person obtaining a * … … 133933 146642 133934 146643 -$Id: ncurses.c,v 1.280 2006/12/10 00:13:15 tom Exp $ 133935 +$Id: ncurses.c,v 1. 292 2007/07/21 17:41:55tom Exp $146644 +$Id: ncurses.c,v 1.313 2008/04/12 22:04:42 tom Exp $ 133936 146645 133937 146646 ***************************************************************************/ 133938 146647 133939 @@ -955,11 +955,11 @@ 146648 @@ -76,7 +76,7 @@ 146649 #define NCURSES_CONST_PARAM const void 146650 146651 #ifdef TRACE 146652 -static unsigned save_trace = TRACE_ORDINARY | TRACE_CALLS; 146653 +static unsigned save_trace = TRACE_ORDINARY | TRACE_ICALLS | TRACE_CALLS; 146654 extern unsigned _nc_tracing; 146655 #endif 146656 146657 @@ -118,6 +118,8 @@ 146658 146659 #endif 146660 146661 +#define ToggleAcs(temp,real) temp = ((temp == real) ? 0 : real) 146662 + 146663 #define P(string) printw("%s\n", string) 146664 146665 #define BLANK ' ' /* this is the background character */ 146666 @@ -170,7 +172,7 @@ 146667 { 146668 return ((c) == QUIT || (c) == ESCAPE); 146669 } 146670 -#define case_QUIT case QUIT: case ESCAPE 146671 +#define case_QUIT QUIT: case ESCAPE 146672 146673 /* Common function to allow ^T to toggle trace-mode in the middle of a test 146674 * so that trace-files can be made smaller. 146675 @@ -183,14 +185,14 @@ 146676 while ((c = wgetch(win)) == CTRL('T')) { 146677 if (_nc_tracing) { 146678 save_trace = _nc_tracing; 146679 - _tracef("TOGGLE-TRACING OFF"); 146680 + Trace(("TOGGLE-TRACING OFF")); 146681 _nc_tracing = 0; 146682 } else { 146683 _nc_tracing = save_trace; 146684 } 146685 trace(_nc_tracing); 146686 if (_nc_tracing) 146687 - _tracef("TOGGLE-TRACING ON"); 146688 + Trace(("TOGGLE-TRACING ON")); 146689 } 146690 #else 146691 c = wgetch(win); 146692 @@ -268,6 +270,42 @@ 146693 } 146694 146695 #if USE_WIDEC_SUPPORT 146696 +static wchar_t 146697 +fullwidth_of(int ch) 146698 +{ 146699 + return (ch + 0xff10 - '0'); 146700 +} 146701 + 146702 +static void 146703 +make_fullwidth_text(wchar_t *target, const char *source) 146704 +{ 146705 + int ch; 146706 + while ((ch = *source++) != 0) { 146707 + *target++ = fullwidth_of(ch); 146708 + } 146709 + *target = 0; 146710 +} 146711 + 146712 +static void 146713 +make_narrow_text(wchar_t *target, const char *source) 146714 +{ 146715 + int ch; 146716 + while ((ch = *source++) != 0) { 146717 + *target++ = ch; 146718 + } 146719 + *target = 0; 146720 +} 146721 + 146722 +static void 146723 +make_fullwidth_digit(cchar_t *target, int digit) 146724 +{ 146725 + wchar_t source[2]; 146726 + 146727 + source[0] = fullwidth_of(digit + '0'); 146728 + source[1] = 0; 146729 + setcchar(target, source, A_NORMAL, 0, 0); 146730 +} 146731 + 146732 static int 146733 wGet_wchar(WINDOW *win, wint_t *result) 146734 { 146735 @@ -276,14 +314,14 @@ 146736 while ((c = wget_wch(win, result)) == CTRL('T')) { 146737 if (_nc_tracing) { 146738 save_trace = _nc_tracing; 146739 - _tracef("TOGGLE-TRACING OFF"); 146740 + Trace(("TOGGLE-TRACING OFF")); 146741 _nc_tracing = 0; 146742 } else { 146743 _nc_tracing = save_trace; 146744 } 146745 trace(_nc_tracing); 146746 if (_nc_tracing) 146747 - _tracef("TOGGLE-TRACING ON"); 146748 + Trace(("TOGGLE-TRACING ON")); 146749 } 146750 #else 146751 c = wget_wch(win, result); 146752 @@ -599,15 +637,29 @@ 146753 146754 if (winstack == 0) { 146755 len_winstack = 20; 146756 - winstack = (WINSTACK *) malloc(len_winstack * sizeof(WINSTACK)); 146757 + winstack = typeMalloc(WINSTACK, len_winstack); 146758 } else if (need >= len_winstack) { 146759 len_winstack = need; 146760 - winstack = (WINSTACK *) realloc(winstack, len_winstack * sizeof(WINSTACK)); 146761 + winstack = typeRealloc(WINSTACK, len_winstack, winstack); 146762 } 146763 winstack[level].text = txt_win; 146764 winstack[level].frame = box_win; 146765 } 146766 146767 +#if USE_SOFTKEYS && (NCURSES_VERSION_PATCH < 20071229) && NCURSES_EXT_FUNCS 146768 +static void 146769 +slk_repaint(void) 146770 +{ 146771 + /* this chunk is now done in resize_term() */ 146772 + slk_touch(); 146773 + slk_clear(); 146774 + slk_noutrefresh(); 146775 +} 146776 + 146777 +#else 146778 +#define slk_repaint() /* nothing */ 146779 +#endif 146780 + 146781 /* 146782 * For wgetch_test(), we create pairs of windows - one for a box, one for text. 146783 * Resize both and paint the box in the parent. 146784 @@ -623,12 +675,7 @@ 146785 touchwin(stdscr); 146786 wnoutrefresh(stdscr); 146787 146788 -#if USE_SOFTKEYS 146789 - /* FIXME: this chunk should be done in resizeterm() */ 146790 - slk_touch(); 146791 - slk_clear(); 146792 - slk_noutrefresh(); 146793 -#endif 146794 + slk_repaint(); 146795 146796 for (n = 0; n < level; ++n) { 146797 wresize(winstack[n].frame, high, wide); 146798 @@ -829,6 +876,8 @@ 146799 getch_test(void) 146800 { 146801 int delay = begin_getch_test(); 146802 + 146803 + slk_restore(); 146804 wgetch_test(0, stdscr, delay); 146805 forget_boxes(); 146806 finish_getch_test(); 146807 @@ -836,10 +885,10 @@ 146808 146809 #if USE_WIDEC_SUPPORT 146810 /* 146811 - * For wgetch_test(), we create pairs of windows - one for a box, one for text. 146812 + * For wget_wch_test(), we create pairs of windows - one for a box, one for text. 146813 * Resize both and paint the box in the parent. 146814 */ 146815 -#ifdef KEY_RESIZE 146816 +#if defined(KEY_RESIZE) && HAVE_WRESIZE 146817 static void 146818 resize_wide_boxes(unsigned level, WINDOW *win) 146819 { 146820 @@ -851,12 +900,7 @@ 146821 touchwin(stdscr); 146822 wnoutrefresh(stdscr); 146823 146824 -#if USE_SOFTKEYS 146825 - /* FIXME: this chunk should be done in resizeterm() */ 146826 - slk_touch(); 146827 - slk_clear(); 146828 - slk_noutrefresh(); 146829 -#endif 146830 + slk_repaint(); 146831 146832 for (n = 0; n < level; ++n) { 146833 wresize(winstack[n].frame, high, wide); 146834 @@ -889,7 +933,7 @@ 146835 memset(&state, 0, sizeof(state)); 146836 if ((need = wcsrtombs(0, &tmp, 0, &state)) > 0) { 146837 unsigned have = need; 146838 - result = (char *) calloc(have + 1, 1); 146839 + result = typeCalloc(char, have + 1); 146840 tmp = src; 146841 if (wcsrtombs(result, &tmp, have, &state) != have) { 146842 free(result); 146843 @@ -955,11 +999,11 @@ 133940 146844 for (n = 0; (wchar_buf[n] = wint_buf[n]) != 0; ++n) ; 133941 146845 if ((temp = wcstos(wchar_buf)) != 0) { … … 133951 146855 } 133952 146856 wclrtoeol(win); 133953 @@ -3124,7 +3124,7 @@ 146857 @@ -1018,7 +1062,7 @@ 146858 } else 146859 #endif /* NCURSES_MOUSE_VERSION */ 146860 if (code == KEY_CODE_YES) { 146861 -#ifdef KEY_RESIZE 146862 +#if defined(KEY_RESIZE) && HAVE_WRESIZE 146863 if (c == KEY_RESIZE) { 146864 resize_wide_boxes(level, win); 146865 } 146866 @@ -1044,6 +1088,8 @@ 146867 get_wch_test(void) 146868 { 146869 int delay = begin_getch_test(); 146870 + 146871 + slk_restore(); 146872 wget_wch_test(0, stdscr, delay); 146873 forget_boxes(); 146874 finish_getch_test(); 146875 @@ -1302,7 +1348,7 @@ 146876 } 133954 146877 /* *INDENT-OFF* */ 133955 static struct { 133956 attr_t attr; 146878 static const struct { 146879 - attr_t attr; 146880 + chtype attr; 146881 NCURSES_CONST char * name; 146882 } attrs_to_test[] = { 146883 { A_STANDOUT, "STANDOUT" }, 146884 @@ -1368,7 +1414,7 @@ 146885 case '>': 146886 adjust_attr_string(1); 146887 break; 146888 - case_QUIT: 146889 + case case_QUIT: 146890 result = FALSE; 146891 break; 146892 default: 146893 @@ -1644,7 +1690,7 @@ 146894 case '>': 146895 wide_adjust_attr_string(1); 146896 break; 146897 - case_QUIT: 146898 + case case_QUIT: 146899 result = FALSE; 146900 break; 146901 default: 146902 @@ -1773,7 +1819,7 @@ 146903 } 146904 146905 static void 146906 -color_legend(WINDOW *helpwin) 146907 +color_legend(WINDOW *helpwin, bool wide) 146908 { 146909 int row = 1; 146910 int col = 1; 146911 @@ -1786,18 +1832,30 @@ 146912 mvwprintw(helpwin, row++, col, 146913 "longer than one screen. Control/N and Control/P can be used"); 146914 mvwprintw(helpwin, row++, col, 146915 - "in place up up/down arrow. Use pageup/pagedown to scroll a"); 146916 + "in place of up/down arrow. Use pageup/pagedown to scroll a"); 146917 mvwprintw(helpwin, row++, col, 146918 "full screen; control/B and control/F can be used here."); 146919 ++row; 146920 mvwprintw(helpwin, row++, col, 146921 "Toggles:"); 146922 mvwprintw(helpwin, row++, col, 146923 + " a/A toggle altcharset off/on"); 146924 + mvwprintw(helpwin, row++, col, 146925 " b/B toggle bold off/on"); 146926 mvwprintw(helpwin, row++, col, 146927 " n/N toggle text/number on/off"); 146928 mvwprintw(helpwin, row++, col, 146929 " w/W toggle width between 8/16 colors"); 146930 +#if USE_WIDEC_SUPPORT 146931 + if (wide) { 146932 + mvwprintw(helpwin, row++, col, 146933 + "Wide characters:"); 146934 + mvwprintw(helpwin, row++, col, 146935 + " x/X toggle text between ASCII and wide-character"); 146936 + } 146937 +#else 146938 + (void) wide; 146939 +#endif 146940 } 146941 146942 #define set_color_test(name, value) if (name != value) { name = value; base_row = 0; } 146943 @@ -1817,6 +1875,7 @@ 146944 char numbered[80]; 146945 const char *hello; 146946 bool done = FALSE; 146947 + bool opt_acsc = FALSE; 146948 bool opt_bold = FALSE; 146949 bool opt_wide = FALSE; 146950 bool opt_nums = FALSE; 146951 @@ -1868,6 +1927,8 @@ 146952 146953 init_pair(pair, fg, bg); 146954 attron((attr_t) COLOR_PAIR(pair)); 146955 + if (opt_acsc) 146956 + attron((attr_t) A_ALTCHARSET); 146957 if (opt_bold) 146958 attron((attr_t) A_BOLD); 146959 146960 @@ -1888,6 +1949,12 @@ 146961 } 146962 146963 switch (wGetchar(stdscr)) { 146964 + case 'a': 146965 + opt_acsc = FALSE; 146966 + break; 146967 + case 'A': 146968 + opt_acsc = TRUE; 146969 + break; 146970 case 'b': 146971 opt_bold = FALSE; 146972 break; 146973 @@ -1900,7 +1967,7 @@ 146974 case 'N': 146975 opt_nums = TRUE; 146976 break; 146977 - case_QUIT: 146978 + case case_QUIT: 146979 done = TRUE; 146980 continue; 146981 case 'w': 146982 @@ -1951,7 +2018,7 @@ 146983 case '?': 146984 if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) { 146985 box(helpwin, 0, 0); 146986 - color_legend(helpwin); 146987 + color_legend(helpwin, FALSE); 146988 wGetchar(helpwin); 146989 delwin(helpwin); 146990 } 146991 @@ -1983,9 +2050,12 @@ 146992 char numbered[80]; 146993 const char *hello; 146994 bool done = FALSE; 146995 + bool opt_acsc = FALSE; 146996 bool opt_bold = FALSE; 146997 bool opt_wide = FALSE; 146998 bool opt_nums = FALSE; 146999 + bool opt_xchr = FALSE; 147000 + wchar_t buffer[10]; 147001 WINDOW *helpwin; 147002 147003 while (!done) { 147004 @@ -2001,6 +2071,13 @@ 147005 hello = "Hello"; 147006 per_row = 8; 147007 } 147008 + if (opt_xchr) { 147009 + make_fullwidth_text(buffer, hello); 147010 + width *= 2; 147011 + per_row /= 2; 147012 + } else { 147013 + make_narrow_text(buffer, hello); 147014 + } 147015 147016 row_limit = (pairs_max + per_row - 1) / per_row; 147017 147018 @@ -2028,14 +2105,20 @@ 147019 if (row >= 0 && move(row, col) != ERR) { 147020 init_pair(pair, i % COLORS, i / COLORS); 147021 color_set(pair, NULL); 147022 + if (opt_acsc) 147023 + attr_on((attr_t) A_ALTCHARSET, NULL); 147024 if (opt_bold) 147025 attr_on((attr_t) A_BOLD, NULL); 147026 147027 if (opt_nums) { 147028 sprintf(numbered, "{%02X}", i); 147029 - hello = numbered; 147030 + if (opt_xchr) { 147031 + make_fullwidth_text(buffer, numbered); 147032 + } else { 147033 + make_narrow_text(buffer, numbered); 147034 + } 147035 } 147036 - printw("%-*.*s", width, width, hello); 147037 + addnwstr(buffer, width); 147038 attr_set(A_NORMAL, 0, NULL); 147039 147040 if ((i % per_row) == 0 && (i % COLORS) == 0) { 147041 @@ -2048,6 +2131,12 @@ 147042 } 147043 147044 switch (c = wGetchar(stdscr)) { 147045 + case 'a': 147046 + opt_acsc = FALSE; 147047 + break; 147048 + case 'A': 147049 + opt_acsc = TRUE; 147050 + break; 147051 case 'b': 147052 opt_bold = FALSE; 147053 break; 147054 @@ -2060,7 +2149,7 @@ 147055 case 'N': 147056 opt_nums = TRUE; 147057 break; 147058 - case_QUIT: 147059 + case case_QUIT: 147060 done = TRUE; 147061 continue; 147062 case 'w': 147063 @@ -2069,6 +2158,12 @@ 147064 case 'W': 147065 set_color_test(opt_wide, TRUE); 147066 break; 147067 + case 'x': 147068 + opt_xchr = FALSE; 147069 + break; 147070 + case 'X': 147071 + opt_xchr = TRUE; 147072 + break; 147073 case CTRL('p'): 147074 case KEY_UP: 147075 if (base_row <= 0) { 147076 @@ -2111,7 +2206,7 @@ 147077 case '?': 147078 if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) { 147079 box(helpwin, 0, 0); 147080 - color_legend(helpwin); 147081 + color_legend(helpwin, TRUE); 147082 wGetchar(helpwin); 147083 delwin(helpwin); 147084 } 147085 @@ -2328,7 +2423,7 @@ 147086 refresh(); 147087 break; 147088 147089 - case_QUIT: 147090 + case case_QUIT: 147091 break; 147092 147093 default: 147094 @@ -2498,7 +2593,7 @@ 147095 clrtobot(); 147096 break; 147097 147098 - case_QUIT: 147099 + case case_QUIT: 147100 goto done; 147101 147102 #if HAVE_SLK_COLOR 147103 @@ -2515,12 +2610,16 @@ 147104 } 147105 break; 147106 #endif 147107 +#if defined(NCURSES_VERSION) && defined(KEY_RESIZE) && HAVE_WRESIZE 147108 + case KEY_RESIZE: 147109 + wnoutrefresh(stdscr); 147110 + break; 147111 +#endif 147112 147113 default: 147114 beep(); 147115 } 147116 - } while 147117 - ((c = Getchar()) != EOF); 147118 + } while (!isQuit(c = Getchar())); 147119 147120 done: 147121 slk_clear(); 147122 @@ -2627,7 +2726,7 @@ 147123 clrtobot(); 147124 break; 147125 147126 - case_QUIT: 147127 + case case_QUIT: 147128 goto done; 147129 147130 case 'F': 147131 @@ -2642,12 +2741,15 @@ 147132 call_slk_color(fg, bg); 147133 } 147134 break; 147135 - 147136 +#if defined(NCURSES_VERSION) && defined(KEY_RESIZE) && HAVE_WRESIZE 147137 + case KEY_RESIZE: 147138 + wnoutrefresh(stdscr); 147139 + break; 147140 +#endif 147141 default: 147142 beep(); 147143 } 147144 - } while 147145 - ((c = Getchar()) != EOF); 147146 + } while (!isQuit(c = Getchar())); 147147 147148 done: 147149 slk_clear(); 147150 @@ -2662,12 +2764,89 @@ 147151 * Alternate character-set stuff 147152 * 147153 ****************************************************************************/ 147154 +/* *INDENT-OFF* */ 147155 +static struct { 147156 + chtype attr; 147157 + const char *name; 147158 +} attrs_to_cycle[] = { 147159 + { A_NORMAL, "normal" }, 147160 + { A_BOLD, "bold" }, 147161 + { A_REVERSE, "reverse" }, 147162 + { A_UNDERLINE, "underline" }, 147163 +}; 147164 +/* *INDENT-ON* */ 147165 + 147166 +static bool 147167 +cycle_attr(int ch, unsigned *at_code, chtype *attr) 147168 +{ 147169 + bool result = TRUE; 147170 + 147171 + switch (ch) { 147172 + case 'v': 147173 + if ((*at_code += 1) >= SIZEOF(attrs_to_cycle)) 147174 + *at_code = 0; 147175 + break; 147176 + case 'V': 147177 + if (*at_code == 1) 147178 + *at_code = SIZEOF(attrs_to_cycle) - 1; 147179 + else 147180 + *at_code -= 1; 147181 + break; 147182 + default: 147183 + result = FALSE; 147184 + break; 147185 + } 147186 + if (result) 147187 + *attr = attrs_to_cycle[*at_code].attr; 147188 + return result; 147189 +} 147190 + 147191 +static bool 147192 +cycle_colors(int ch, int *fg, int *bg, short *pair) 147193 +{ 147194 + bool result = FALSE; 147195 + 147196 + if (use_colors) { 147197 + result = TRUE; 147198 + switch (ch) { 147199 + case 'F': 147200 + if ((*fg -= 1) < 0) 147201 + *fg = COLORS - 1; 147202 + break; 147203 + case 'f': 147204 + if ((*fg += 1) >= COLORS) 147205 + *fg = 0; 147206 + break; 147207 + case 'B': 147208 + if ((*bg -= 1) < 0) 147209 + *bg = COLORS - 1; 147210 + break; 147211 + case 'b': 147212 + if ((*bg += 1) >= COLORS) 147213 + *bg = 0; 147214 + break; 147215 + default: 147216 + result = FALSE; 147217 + break; 147218 + } 147219 + if (result) { 147220 + *pair = (*fg != COLOR_BLACK || *bg != COLOR_BLACK); 147221 + if (*pair != 0) { 147222 + *pair = 1; 147223 + if (init_pair(*pair, *fg, *bg) == ERR) { 147224 + result = FALSE; 147225 + } 147226 + } 147227 + } 147228 + } 147229 + return result; 147230 +} 147231 147232 /* ISO 6429: codes 0x80 to 0x9f may be control characters that cause the 147233 * terminal to perform functions. The remaining codes can be graphic. 147234 */ 147235 static void 147236 -show_upper_chars(unsigned first) 147237 +show_upper_chars(unsigned first, int repeat, attr_t attr, short pair) 147238 { 147239 bool C1 = (first == 128); 147240 unsigned code; 147241 @@ -2682,27 +2861,33 @@ 147242 refresh(); 147243 147244 for (code = first; code <= last; code++) { 147245 + int count = repeat; 147246 int row = 2 + ((code - first) % 16); 147247 int col = ((code - first) / 16) * COLS / 2; 147248 char tmp[80]; 147249 sprintf(tmp, "%3u (0x%x)", code, code); 147250 mvprintw(row, col, "%*s: ", COLS / 4, tmp); 147251 - if (C1) 147252 - nodelay(stdscr, TRUE); 147253 - echochar(code); 147254 - if (C1) { 147255 - /* (yes, this _is_ crude) */ 147256 - while ((reply = Getchar()) != ERR) { 147257 - addch(UChar(reply)); 147258 - napms(10); 147259 + 147260 + do { 147261 + if (C1) 147262 + nodelay(stdscr, TRUE); 147263 + echochar(code | attr | COLOR_PAIR(pair)); 147264 + if (C1) { 147265 + /* (yes, this _is_ crude) */ 147266 + while ((reply = Getchar()) != ERR) { 147267 + addch(UChar(reply)); 147268 + napms(10); 147269 + } 147270 + nodelay(stdscr, FALSE); 147271 } 147272 - nodelay(stdscr, FALSE); 147273 - } 147274 + } while (--count > 0); 147275 } 147276 } 147277 147278 +#define PC_COLS 4 147279 + 147280 static void 147281 -show_pc_chars(void) 147282 +show_pc_chars(int repeat, attr_t attr, short pair) 147283 { 147284 unsigned code; 147285 147286 @@ -2713,35 +2898,41 @@ 147287 refresh(); 147288 147289 for (code = 0; code < 16; ++code) { 147290 - mvprintw(2, (int) code * 3 + 8, "%X", code); 147291 + mvprintw(2, (int) code * PC_COLS + 8, "%X", code); 147292 } 147293 for (code = 0; code < 256; code++) { 147294 + int count = repeat; 147295 int row = 3 + (code / 16) + (code >= 128); 147296 - int col = 8 + (code % 16) * 3; 147297 + int col = 8 + (code % 16) * PC_COLS; 147298 if ((code % 16) == 0) 147299 mvprintw(row, 0, "0x%02x:", code); 147300 move(row, col); 147301 - switch (code) { 147302 - case '\n': 147303 - case '\r': 147304 - case '\b': 147305 - case '\f': 147306 - case '\033': 147307 - case 0x9b: 147308 - /* 147309 - * Skip the ones that do not work. 147310 - */ 147311 - break; 147312 - default: 147313 - addch(code | A_ALTCHARSET); 147314 - break; 147315 - } 147316 + do { 147317 + switch (code) { 147318 + case '\n': 147319 + case '\r': 147320 + case '\b': 147321 + case '\f': 147322 + case '\033': 147323 + case 0x9b: 147324 + /* 147325 + * Skip the ones that do not work. 147326 + */ 147327 + break; 147328 + default: 147329 + addch(code | A_ALTCHARSET | attr | COLOR_PAIR(pair)); 147330 + break; 147331 + } 147332 + } while (--count > 0); 147333 } 147334 } 147335 147336 static void 147337 -show_box_chars(void) 147338 +show_box_chars(int repeat, attr_t attr, short pair) 147339 { 147340 + (void) repeat; 147341 + attr |= COLOR_PAIR(pair); 147342 + 147343 erase(); 147344 attron(A_BOLD); 147345 mvaddstr(0, 20, "Display of the ACS Line-Drawing Set"); 147346 @@ -2749,35 +2940,38 @@ 147347 refresh(); 147348 box(stdscr, 0, 0); 147349 /* *INDENT-OFF* */ 147350 - mvhline(LINES / 2, 0, ACS_HLINE, COLS); 147351 - mvvline(0, COLS / 2, ACS_VLINE, LINES); 147352 - mvaddch(0, COLS / 2, ACS_TTEE); 147353 - mvaddch(LINES / 2, COLS / 2, ACS_PLUS); 147354 - mvaddch(LINES - 1, COLS / 2, ACS_BTEE); 147355 - mvaddch(LINES / 2, 0, ACS_LTEE); 147356 - mvaddch(LINES / 2, COLS - 1, ACS_RTEE); 147357 + mvhline(LINES / 2, 0, ACS_HLINE | attr, COLS); 147358 + mvvline(0, COLS / 2, ACS_VLINE | attr, LINES); 147359 + mvaddch(0, COLS / 2, ACS_TTEE | attr); 147360 + mvaddch(LINES / 2, COLS / 2, ACS_PLUS | attr); 147361 + mvaddch(LINES - 1, COLS / 2, ACS_BTEE | attr); 147362 + mvaddch(LINES / 2, 0, ACS_LTEE | attr); 147363 + mvaddch(LINES / 2, COLS - 1, ACS_RTEE | attr); 147364 /* *INDENT-ON* */ 147365 147366 } 147367 147368 static int 147369 -show_1_acs(int n, const char *name, chtype code) 147370 +show_1_acs(int n, int repeat, const char *name, chtype code) 147371 { 147372 const int height = 16; 147373 int row = 2 + (n % height); 147374 int col = (n / height) * COLS / 2; 147375 + 147376 mvprintw(row, col, "%*s : ", COLS / 4, name); 147377 - addch(code); 147378 + do { 147379 + addch(code); 147380 + } while (--repeat > 0); 147381 return n + 1; 147382 } 147383 147384 static void 147385 -show_acs_chars(void) 147386 +show_acs_chars(int repeat, attr_t attr, short pair) 147387 /* display the ACS character set */ 147388 { 147389 int n; 147390 147391 -#define BOTH(name) #name, name 147392 +#define BOTH(name) #name, (name | attr | COLOR_PAIR(pair)) 147393 147394 erase(); 147395 attron(A_BOLD); 147396 @@ -2785,48 +2979,48 @@ 147397 attroff(A_BOLD); 147398 refresh(); 147399 147400 - n = show_1_acs(0, BOTH(ACS_ULCORNER)); 147401 - n = show_1_acs(n, BOTH(ACS_URCORNER)); 147402 - n = show_1_acs(n, BOTH(ACS_LLCORNER)); 147403 - n = show_1_acs(n, BOTH(ACS_LRCORNER)); 147404 - 147405 - n = show_1_acs(n, BOTH(ACS_LTEE)); 147406 - n = show_1_acs(n, BOTH(ACS_RTEE)); 147407 - n = show_1_acs(n, BOTH(ACS_TTEE)); 147408 - n = show_1_acs(n, BOTH(ACS_BTEE)); 147409 + n = show_1_acs(0, repeat, BOTH(ACS_ULCORNER)); 147410 + n = show_1_acs(n, repeat, BOTH(ACS_URCORNER)); 147411 + n = show_1_acs(n, repeat, BOTH(ACS_LLCORNER)); 147412 + n = show_1_acs(n, repeat, BOTH(ACS_LRCORNER)); 147413 + 147414 + n = show_1_acs(n, repeat, BOTH(ACS_LTEE)); 147415 + n = show_1_acs(n, repeat, BOTH(ACS_RTEE)); 147416 + n = show_1_acs(n, repeat, BOTH(ACS_TTEE)); 147417 + n = show_1_acs(n, repeat, BOTH(ACS_BTEE)); 147418 147419 - n = show_1_acs(n, BOTH(ACS_HLINE)); 147420 - n = show_1_acs(n, BOTH(ACS_VLINE)); 147421 + n = show_1_acs(n, repeat, BOTH(ACS_HLINE)); 147422 + n = show_1_acs(n, repeat, BOTH(ACS_VLINE)); 147423 147424 /* 147425 * HPUX's ACS definitions are broken here. Just give up. 147426 */ 147427 #if !(defined(__hpux) && !defined(NCURSES_VERSION)) 147428 - n = show_1_acs(n, BOTH(ACS_LARROW)); 147429 - n = show_1_acs(n, BOTH(ACS_RARROW)); 147430 - n = show_1_acs(n, BOTH(ACS_UARROW)); 147431 - n = show_1_acs(n, BOTH(ACS_DARROW)); 147432 - 147433 - n = show_1_acs(n, BOTH(ACS_BLOCK)); 147434 - n = show_1_acs(n, BOTH(ACS_BOARD)); 147435 - n = show_1_acs(n, BOTH(ACS_LANTERN)); 147436 - n = show_1_acs(n, BOTH(ACS_BULLET)); 147437 - n = show_1_acs(n, BOTH(ACS_CKBOARD)); 147438 - n = show_1_acs(n, BOTH(ACS_DEGREE)); 147439 - n = show_1_acs(n, BOTH(ACS_DIAMOND)); 147440 - n = show_1_acs(n, BOTH(ACS_PLMINUS)); 147441 - n = show_1_acs(n, BOTH(ACS_PLUS)); 147442 - 147443 - n = show_1_acs(n, BOTH(ACS_GEQUAL)); 147444 - n = show_1_acs(n, BOTH(ACS_NEQUAL)); 147445 - n = show_1_acs(n, BOTH(ACS_LEQUAL)); 147446 - 147447 - n = show_1_acs(n, BOTH(ACS_STERLING)); 147448 - n = show_1_acs(n, BOTH(ACS_PI)); 147449 - n = show_1_acs(n, BOTH(ACS_S1)); 147450 - n = show_1_acs(n, BOTH(ACS_S3)); 147451 - n = show_1_acs(n, BOTH(ACS_S7)); 147452 - n = show_1_acs(n, BOTH(ACS_S9)); 147453 + n = show_1_acs(n, repeat, BOTH(ACS_LARROW)); 147454 + n = show_1_acs(n, repeat, BOTH(ACS_RARROW)); 147455 + n = show_1_acs(n, repeat, BOTH(ACS_UARROW)); 147456 + n = show_1_acs(n, repeat, BOTH(ACS_DARROW)); 147457 + 147458 + n = show_1_acs(n, repeat, BOTH(ACS_BLOCK)); 147459 + n = show_1_acs(n, repeat, BOTH(ACS_BOARD)); 147460 + n = show_1_acs(n, repeat, BOTH(ACS_LANTERN)); 147461 + n = show_1_acs(n, repeat, BOTH(ACS_BULLET)); 147462 + n = show_1_acs(n, repeat, BOTH(ACS_CKBOARD)); 147463 + n = show_1_acs(n, repeat, BOTH(ACS_DEGREE)); 147464 + n = show_1_acs(n, repeat, BOTH(ACS_DIAMOND)); 147465 + n = show_1_acs(n, repeat, BOTH(ACS_PLMINUS)); 147466 + n = show_1_acs(n, repeat, BOTH(ACS_PLUS)); 147467 + 147468 + n = show_1_acs(n, repeat, BOTH(ACS_GEQUAL)); 147469 + n = show_1_acs(n, repeat, BOTH(ACS_NEQUAL)); 147470 + n = show_1_acs(n, repeat, BOTH(ACS_LEQUAL)); 147471 + 147472 + n = show_1_acs(n, repeat, BOTH(ACS_STERLING)); 147473 + n = show_1_acs(n, repeat, BOTH(ACS_PI)); 147474 + n = show_1_acs(n, repeat, BOTH(ACS_S1)); 147475 + n = show_1_acs(n, repeat, BOTH(ACS_S3)); 147476 + n = show_1_acs(n, repeat, BOTH(ACS_S7)); 147477 + n = show_1_acs(n, repeat, BOTH(ACS_S9)); 147478 #endif 147479 } 147480 147481 @@ -2838,6 +3032,14 @@ 147482 const char *pch_kludge = ((term != 0 && strstr(term, "linux")) 147483 ? "p=PC, " 147484 : ""); 147485 + chtype attr = A_NORMAL; 147486 + int digit = 0; 147487 + int repeat = 1; 147488 + int fg = COLOR_BLACK; 147489 + int bg = COLOR_BLACK; 147490 + unsigned at_code = 0; 147491 + short pair = 0; 147492 + void (*last_show_acs) (int, attr_t, short) = 0; 147493 147494 do { 147495 switch (c) { 147496 @@ -2845,29 +3047,77 @@ 147497 Repaint(); 147498 break; 147499 case 'a': 147500 - show_acs_chars(); 147501 + ToggleAcs(last_show_acs, show_acs_chars); 147502 + break; 147503 + case 'p': 147504 + if (*pch_kludge) 147505 + ToggleAcs(last_show_acs, show_pc_chars); 147506 + else 147507 + beep(); 147508 break; 147509 case 'x': 147510 - show_box_chars(); 147511 + ToggleAcs(last_show_acs, show_box_chars); 147512 break; 147513 case '0': 147514 case '1': 147515 case '2': 147516 case '3': 147517 - show_upper_chars((unsigned) ((c - '0') * 32 + 128)); 147518 + digit = (c - '0'); 147519 + last_show_acs = 0; 147520 break; 147521 - case 'p': 147522 - show_pc_chars(); 147523 + case '-': 147524 + if (digit > 0) { 147525 + --digit; 147526 + last_show_acs = 0; 147527 + } else { 147528 + beep(); 147529 + } 147530 + break; 147531 + case '+': 147532 + if (digit < 3) { 147533 + ++digit; 147534 + last_show_acs = 0; 147535 + } else { 147536 + beep(); 147537 + } 147538 + break; 147539 + case '>': 147540 + if (repeat < (COLS / 4)) 147541 + ++repeat; 147542 + break; 147543 + case '<': 147544 + if (repeat > 1) 147545 + --repeat; 147546 break; 147547 default: 147548 - beep(); 147549 + if (cycle_attr(c, &at_code, &attr) 147550 + || cycle_colors(c, &fg, &bg, &pair)) { 147551 + break; 147552 + } else { 147553 + beep(); 147554 + } 147555 break; 147556 } 147557 + if (last_show_acs != 0) 147558 + last_show_acs(repeat, attr, pair); 147559 + else 147560 + show_upper_chars(digit * 32 + 128, repeat, attr, pair); 147561 + 147562 mvprintw(LINES - 3, 0, 147563 "Note: ANSI terminals may not display C1 characters."); 147564 mvprintw(LINES - 2, 0, 147565 - "Select: a=ACS, x=box, %s0=C1, 1,2,3=GR characters, ESC=quit", 147566 + "Select: a=ACS, x=box, %s0=C1, 1-3,+/- non-ASCII, </> repeat, ESC=quit", 147567 pch_kludge); 147568 + if (use_colors) { 147569 + mvprintw(LINES - 1, 0, 147570 + "v/V, f/F, b/B cycle through video attributes (%s) and color %d/%d.", 147571 + attrs_to_cycle[at_code].name, 147572 + fg, bg); 147573 + } else { 147574 + mvprintw(LINES - 1, 0, 147575 + "v/V cycles through video attributes (%s).", 147576 + attrs_to_cycle[at_code].name); 147577 + } 147578 refresh(); 147579 } while (!isQuit(c = Getchar())); 147580 147581 @@ -2878,7 +3128,7 @@ 147582 147583 #if USE_WIDEC_SUPPORT 147584 static cchar_t * 147585 -merge_wide_attr(cchar_t *dst, cchar_t *src, attr_t attr, short pair) 147586 +merge_wide_attr(cchar_t *dst, const cchar_t *src, attr_t attr, short pair) 147587 { 147588 int count = getcchar(src, NULL, NULL, NULL, 0); 147589 wchar_t *wch = 0; 147590 @@ -2887,7 +3137,7 @@ 147591 147592 *dst = *src; 147593 if (count > 0) { 147594 - if ((wch = typeMalloc(wchar_t, count)) != 0) { 147595 + if ((wch = typeMalloc(wchar_t, count + 1)) != 0) { 147596 if (getcchar(src, wch, &ignore_attr, &ignore_pair, 0) != ERR) { 147597 attr |= (ignore_attr & A_ALTCHARSET); 147598 setcchar(dst, wch, attr, pair, 0); 147599 @@ -2950,20 +3200,23 @@ 147600 } 147601 147602 static int 147603 -show_1_wacs(int n, const char *name, const cchar_t *code) 147604 +show_1_wacs(int n, int repeat, const char *name, const cchar_t *code) 147605 { 147606 const int height = 16; 147607 int row = 2 + (n % height); 147608 int col = (n / height) * COLS / 2; 147609 + 147610 mvprintw(row, col, "%*s : ", COLS / 4, name); 147611 - add_wchnstr(code, 1); 147612 + while (repeat-- >= 0) { 147613 + add_wch(code); 147614 + } 147615 return n + 1; 147616 } 147617 147618 #define MERGE_ATTR(wch) merge_wide_attr(&temp, wch, attr, pair) 147619 147620 static void 147621 -show_wacs_chars(attr_t attr, short pair) 147622 +show_wacs_chars(int repeat, attr_t attr, short pair) 147623 /* display the wide-ACS character set */ 147624 { 147625 cchar_t temp; 147626 @@ -2979,45 +3232,45 @@ 147627 attroff(A_BOLD); 147628 refresh(); 147629 147630 - n = show_1_wacs(0, BOTH2(WACS_ULCORNER)); 147631 - n = show_1_wacs(n, BOTH2(WACS_URCORNER)); 147632 - n = show_1_wacs(n, BOTH2(WACS_LLCORNER)); 147633 - n = show_1_wacs(n, BOTH2(WACS_LRCORNER)); 147634 - 147635 - n = show_1_wacs(n, BOTH2(WACS_LTEE)); 147636 - n = show_1_wacs(n, BOTH2(WACS_RTEE)); 147637 - n = show_1_wacs(n, BOTH2(WACS_TTEE)); 147638 - n = show_1_wacs(n, BOTH2(WACS_BTEE)); 147639 - 147640 - n = show_1_wacs(n, BOTH2(WACS_HLINE)); 147641 - n = show_1_wacs(n, BOTH2(WACS_VLINE)); 147642 - 147643 - n = show_1_wacs(n, BOTH2(WACS_LARROW)); 147644 - n = show_1_wacs(n, BOTH2(WACS_RARROW)); 147645 - n = show_1_wacs(n, BOTH2(WACS_UARROW)); 147646 - n = show_1_wacs(n, BOTH2(WACS_DARROW)); 147647 - 147648 - n = show_1_wacs(n, BOTH2(WACS_BLOCK)); 147649 - n = show_1_wacs(n, BOTH2(WACS_BOARD)); 147650 - n = show_1_wacs(n, BOTH2(WACS_LANTERN)); 147651 - n = show_1_wacs(n, BOTH2(WACS_BULLET)); 147652 - n = show_1_wacs(n, BOTH2(WACS_CKBOARD)); 147653 - n = show_1_wacs(n, BOTH2(WACS_DEGREE)); 147654 - n = show_1_wacs(n, BOTH2(WACS_DIAMOND)); 147655 - n = show_1_wacs(n, BOTH2(WACS_PLMINUS)); 147656 - n = show_1_wacs(n, BOTH2(WACS_PLUS)); 147657 + n = show_1_wacs(0, repeat, BOTH2(WACS_ULCORNER)); 147658 + n = show_1_wacs(n, repeat, BOTH2(WACS_URCORNER)); 147659 + n = show_1_wacs(n, repeat, BOTH2(WACS_LLCORNER)); 147660 + n = show_1_wacs(n, repeat, BOTH2(WACS_LRCORNER)); 147661 + 147662 + n = show_1_wacs(n, repeat, BOTH2(WACS_LTEE)); 147663 + n = show_1_wacs(n, repeat, BOTH2(WACS_RTEE)); 147664 + n = show_1_wacs(n, repeat, BOTH2(WACS_TTEE)); 147665 + n = show_1_wacs(n, repeat, BOTH2(WACS_BTEE)); 147666 + 147667 + n = show_1_wacs(n, repeat, BOTH2(WACS_HLINE)); 147668 + n = show_1_wacs(n, repeat, BOTH2(WACS_VLINE)); 147669 + 147670 + n = show_1_wacs(n, repeat, BOTH2(WACS_LARROW)); 147671 + n = show_1_wacs(n, repeat, BOTH2(WACS_RARROW)); 147672 + n = show_1_wacs(n, repeat, BOTH2(WACS_UARROW)); 147673 + n = show_1_wacs(n, repeat, BOTH2(WACS_DARROW)); 147674 + 147675 + n = show_1_wacs(n, repeat, BOTH2(WACS_BLOCK)); 147676 + n = show_1_wacs(n, repeat, BOTH2(WACS_BOARD)); 147677 + n = show_1_wacs(n, repeat, BOTH2(WACS_LANTERN)); 147678 + n = show_1_wacs(n, repeat, BOTH2(WACS_BULLET)); 147679 + n = show_1_wacs(n, repeat, BOTH2(WACS_CKBOARD)); 147680 + n = show_1_wacs(n, repeat, BOTH2(WACS_DEGREE)); 147681 + n = show_1_wacs(n, repeat, BOTH2(WACS_DIAMOND)); 147682 + n = show_1_wacs(n, repeat, BOTH2(WACS_PLMINUS)); 147683 + n = show_1_wacs(n, repeat, BOTH2(WACS_PLUS)); 147684 147685 #ifdef CURSES_WACS_ARRAY 147686 - n = show_1_wacs(n, BOTH2(WACS_GEQUAL)); 147687 - n = show_1_wacs(n, BOTH2(WACS_NEQUAL)); 147688 - n = show_1_wacs(n, BOTH2(WACS_LEQUAL)); 147689 - 147690 - n = show_1_wacs(n, BOTH2(WACS_STERLING)); 147691 - n = show_1_wacs(n, BOTH2(WACS_PI)); 147692 - n = show_1_wacs(n, BOTH2(WACS_S1)); 147693 - n = show_1_wacs(n, BOTH2(WACS_S3)); 147694 - n = show_1_wacs(n, BOTH2(WACS_S7)); 147695 - n = show_1_wacs(n, BOTH2(WACS_S9)); 147696 + n = show_1_wacs(n, repeat, BOTH2(WACS_GEQUAL)); 147697 + n = show_1_wacs(n, repeat, BOTH2(WACS_NEQUAL)); 147698 + n = show_1_wacs(n, repeat, BOTH2(WACS_LEQUAL)); 147699 + 147700 + n = show_1_wacs(n, repeat, BOTH2(WACS_STERLING)); 147701 + n = show_1_wacs(n, repeat, BOTH2(WACS_PI)); 147702 + n = show_1_wacs(n, repeat, BOTH2(WACS_S1)); 147703 + n = show_1_wacs(n, repeat, BOTH2(WACS_S3)); 147704 + n = show_1_wacs(n, repeat, BOTH2(WACS_S7)); 147705 + n = show_1_wacs(n, repeat, BOTH2(WACS_S9)); 147706 #endif 147707 } 147708 147709 @@ -3026,10 +3279,11 @@ 147710 #define MERGE_ATTR(wch) merge_wide_attr(&temp, wch, attr, pair) 147711 147712 static void 147713 -show_wbox_chars(attr_t attr, short pair) 147714 +show_wbox_chars(int repeat, attr_t attr, short pair) 147715 { 147716 cchar_t temp; 147717 147718 + (void) repeat; 147719 erase(); 147720 attron(A_BOLD); 147721 mvaddstr(0, 20, "Display of the Wide-ACS Line-Drawing Set"); 147722 @@ -3071,10 +3325,11 @@ 147723 #define SHOW_UTF8(n, name, code) show_2_wacs(n, name, code, attr, pair) 147724 147725 static void 147726 -show_utf8_chars(attr_t attr, short pair) 147727 +show_utf8_chars(int repeat, attr_t attr, short pair) 147728 { 147729 int n; 147730 147731 + (void) repeat; 147732 erase(); 147733 attron(A_BOLD); 147734 mvaddstr(0, 20, "Display of the Wide-ACS Character Set"); 147735 @@ -3121,83 +3376,6 @@ 147736 /* *INDENT-ON* */ 147737 147738 } 147739 -/* *INDENT-OFF* */ 147740 -static struct { 147741 - attr_t attr; 133957 147742 - char *name; 133958 + const char *name; 133959 } attrs_to_cycle[] = { 133960 { A_NORMAL, "normal" }, 133961 { A_BOLD, "bold" }, 133962 @@ -3379,12 +3379,14 @@ 147743 -} attrs_to_cycle[] = { 147744 - { A_NORMAL, "normal" }, 147745 - { A_BOLD, "bold" }, 147746 - { A_REVERSE, "reverse" }, 147747 - { A_UNDERLINE, "underline" }, 147748 -}; 147749 -/* *INDENT-ON* */ 147750 - 147751 -static bool 147752 -cycle_attr(int ch, unsigned *at_code, chtype *attr) 147753 -{ 147754 - bool result = TRUE; 147755 - 147756 - switch (ch) { 147757 - case 'v': 147758 - if ((*at_code += 1) >= SIZEOF(attrs_to_cycle)) 147759 - *at_code = 0; 147760 - break; 147761 - case 'V': 147762 - if (*at_code == 1) 147763 - *at_code = SIZEOF(attrs_to_cycle) - 1; 147764 - else 147765 - *at_code -= 1; 147766 - break; 147767 - default: 147768 - result = FALSE; 147769 - break; 147770 - } 147771 - if (result) 147772 - *attr = attrs_to_cycle[*at_code].attr; 147773 - return result; 147774 -} 147775 - 147776 -static bool 147777 -cycle_colors(int ch, int *fg, int *bg, short *pair) 147778 -{ 147779 - bool result = FALSE; 147780 - 147781 - if (use_colors) { 147782 - result = TRUE; 147783 - switch (ch) { 147784 - case 'F': 147785 - if ((*fg -= 1) < 0) 147786 - *fg = COLORS - 1; 147787 - break; 147788 - case 'f': 147789 - if ((*fg += 1) >= COLORS) 147790 - *fg = 0; 147791 - break; 147792 - case 'B': 147793 - if ((*bg -= 1) < 0) 147794 - *bg = COLORS - 1; 147795 - break; 147796 - case 'b': 147797 - if ((*bg += 1) < 0) 147798 - *bg = 0; 147799 - break; 147800 - default: 147801 - result = FALSE; 147802 - break; 147803 - } 147804 - if (result) { 147805 - *pair = (*fg != COLOR_BLACK || *bg != COLOR_BLACK); 147806 - if (*pair != 0) { 147807 - *pair = 1; 147808 - if (init_pair(*pair, *fg, *bg) == ERR) { 147809 - result = FALSE; 147810 - } 147811 - } 147812 - } 147813 - } 147814 - return result; 147815 -} 147816 147817 /* display the wide-ACS character set */ 147818 static void 147819 @@ -3205,14 +3383,14 @@ 147820 { 147821 int c = 'a'; 147822 int digit = 0; 147823 - int repeat = 0; 147824 + int repeat = 1; 147825 int space = ' '; 147826 chtype attr = A_NORMAL; 147827 int fg = COLOR_BLACK; 147828 int bg = COLOR_BLACK; 147829 unsigned at_code = 0; 147830 short pair = 0; 147831 - void (*last_show_wacs) (attr_t, short) = 0; 147832 + void (*last_show_wacs) (int, attr_t, short) = 0; 147833 147834 do { 147835 switch (c) { 147836 @@ -3220,27 +3398,31 @@ 147837 Repaint(); 147838 break; 147839 case 'a': 147840 - last_show_wacs = show_wacs_chars; 147841 + ToggleAcs(last_show_wacs, show_wacs_chars); 147842 break; 147843 case 'x': 147844 - last_show_wacs = show_wbox_chars; 147845 + ToggleAcs(last_show_wacs, show_wbox_chars); 147846 break; 147847 case 'u': 147848 - last_show_wacs = show_utf8_chars; 147849 + ToggleAcs(last_show_wacs, show_utf8_chars); 147850 break; 147851 default: 147852 if (c < 256 && isdigit(c)) { 147853 digit = (c - '0'); 147854 + last_show_wacs = 0; 147855 } else if (c == '+') { 147856 ++digit; 147857 + last_show_wacs = 0; 147858 } else if (c == '-' && digit > 0) { 147859 --digit; 147860 + last_show_wacs = 0; 147861 } else if (c == '>' && repeat < (COLS / 4)) { 147862 ++repeat; 147863 - } else if (c == '<' && repeat > 0) { 147864 + } else if (c == '<' && repeat > 1) { 147865 --repeat; 147866 } else if (c == '_') { 147867 space = (space == ' ') ? '_' : ' '; 147868 + last_show_wacs = 0; 147869 } else if (cycle_attr(c, &at_code, &attr) 147870 || cycle_colors(c, &fg, &bg, &pair)) { 147871 if (last_show_wacs != 0) 147872 @@ -3249,12 +3431,12 @@ 147873 beep(); 147874 break; 147875 } 147876 - last_show_wacs = 0; 147877 - show_upper_widechars(digit * 32 + 128, repeat, space, attr, pair); 147878 break; 147879 } 147880 if (last_show_wacs != 0) 147881 - last_show_wacs(attr, pair); 147882 + last_show_wacs(repeat, attr, pair); 147883 + else 147884 + show_upper_widechars(digit * 32 + 128, repeat, space, attr, pair); 147885 147886 mvprintw(LINES - 3, 0, 147887 "Select: a WACS, x box, u UTF-8, 0-9,+/- non-ASCII, </> repeat, ESC=quit"); 147888 @@ -3379,12 +3561,17 @@ 133963 147889 WINDOW *wind; 133964 147890 }; … … 133968 147894 -#define scroll_active(win) (win)->_scroll 133969 147895 +#if defined(NCURSES_VERSION) 133970 +#if NCURSES_VERSION_PATCH < 20070331147896 +#if (NCURSES_VERSION_PATCH < 20070331) && NCURSES_EXT_FUNCS 133971 147897 +#define is_keypad(win) (win)->_use_keypad 133972 147898 +#define is_scrollok(win) (win)->_scroll 147899 +#elif !defined(is_keypad) 147900 +#define is_keypad(win) FALSE 147901 +#define is_scrollok(win) FALSE 133973 147902 +#endif 133974 147903 #else … … 133980 147909 133981 147910 /* We need to know if these flags are actually set, so don't look in FRAME. 133982 @@ -3395,14 +3 397,16 @@147911 @@ -3395,14 +3582,16 @@ 133983 147912 HaveKeypad(FRAME * curp) 133984 147913 { … … 133999 147928 134000 147929 static void 134001 @@ -3945,7 +3949,11 @@ 147930 @@ -3540,7 +3729,7 @@ 147931 case KEY_RIGHT: 147932 j++; 147933 break; 147934 - case_QUIT: 147935 + case case_QUIT: 147936 return ((pair *) 0); 147937 #ifdef NCURSES_MOUSE_VERSION 147938 case KEY_MOUSE: 147939 @@ -3665,7 +3854,7 @@ 147940 acs_and_scroll(void) 147941 /* Demonstrate windows */ 147942 { 147943 - int c, i; 147944 + int c; 147945 FRAME *current = (FRAME *) 0, *neww; 147946 WINDOW *usescr = stdscr; 147947 #if HAVE_PUTWIN && HAVE_GETWIN 147948 @@ -3683,7 +3872,7 @@ 147949 transient((FRAME *) 0, (char *) 0); 147950 switch (c) { 147951 case CTRL('C'): 147952 - neww = (FRAME *) calloc(1, sizeof(FRAME)); 147953 + neww = typeCalloc(FRAME, 1); 147954 if ((neww->wind = getwindow()) == (WINDOW *) 0) 147955 goto breakout; 147956 147957 @@ -3759,7 +3948,7 @@ 147958 if ((fp = fopen(DUMPFILE, "r")) == (FILE *) 0) { 147959 transient(current, "Can't open screen dump file"); 147960 } else { 147961 - neww = (FRAME *) calloc(1, sizeof(FRAME)); 147962 + neww = typeCalloc(FRAME, 1); 147963 147964 neww->next = current->next; 147965 neww->last = current; 147966 @@ -3778,7 +3967,7 @@ 147967 case CTRL('X'): /* resize window */ 147968 if (current) { 147969 pair *tmp, ul, lr; 147970 - int mx, my; 147971 + int i, mx, my; 147972 147973 move(0, 0); 147974 clrtoeol(); 147975 @@ -3945,7 +4134,11 @@ 134002 147976 { 134003 147977 wmove(stdscr, LINES - 1, 0); … … 134012 147986 134013 147987 /*+------------------------------------------------------------------------- 134014 @@ -3998,6 +4 006,17 @@147988 @@ -3998,6 +4191,17 @@ 134015 147989 fill_panel(win) 134016 147990 --------------------------------------------------------------------------*/ … … 134030 148004 { 134031 148005 WINDOW *win = panel_window(pan); 134032 @@ -4014,217 +4 033,214 @@148006 @@ -4014,217 +4218,204 @@ 134033 148007 waddch(win, UChar(num)); 134034 148008 } … … 134040 148014 static void 134041 148015 -demo_panels(void) 134042 + make_fullwidth_digit(cchar_t *target, int digit)148016 +init_wide_panel(void) 134043 148017 { 134044 148018 - int itmp; 134045 148019 - register int y, x; 134046 + wchar_t source[2]; 148020 + int digit; 148021 + cchar_t temp[10]; 134047 148022 134048 148023 - refresh(); 134049 + source[0] = digit + 0xff10; 134050 + source[1] = 0; 134051 + setcchar(target, source, A_NORMAL, 0, 0); 134052 +} 148024 + for (digit = 0; digit < 10; ++digit) 148025 + make_fullwidth_digit(&temp[digit], digit); 134053 148026 134054 148027 - for (y = 0; y < LINES - 1; y++) { … … 134108 148081 - saywhat("press any key to continue"); 134109 148082 - wait_a_while(nap_msec); 134110 +static void 134111 +init_wide_panel(void) 134112 +{ 134113 + int digit; 134114 + cchar_t temp[10]; 148083 + do { 148084 + int y, x; 148085 + getyx(stdscr, y, x); 148086 + digit = (y + x / 2) % 10; 148087 + } while (add_wch(&temp[digit]) != ERR); 148088 +} 134115 148089 134116 148090 - saywhat("h3 s1 s2 s4 s5; press any key to continue"); … … 134123 148097 - pflush(); 134124 148098 - wait_a_while(nap_msec); 134125 + for (digit = 0; digit < 10; ++digit)134126 + make_fullwidth_digit(&temp[digit], digit);134127 134128 - saywhat("s1; press any key to continue");134129 - show_panel(p1);134130 - pflush();134131 - wait_a_while(nap_msec);134132 + do {134133 + int y, x;134134 + getyx(stdscr, y, x);134135 + digit = (y + x / 2) % 10;134136 + } while (add_wch(&temp[digit]) != ERR);134137 +}134138 134139 - saywhat("s2; press any key to continue");134140 - show_panel(p2);134141 - pflush();134142 - wait_a_while(nap_msec);134143 148099 +static void 134144 148100 +fill_wide_panel(PANEL * pan) … … 134148 148104 + int y, x; 134149 148105 134150 - saywhat(" m2; press any key to continue");134151 - move_panel(p2, LINES / 3 + 1, COLS / 8);148106 - saywhat("s1; press any key to continue"); 148107 - show_panel(p1); 134152 148108 - pflush(); 134153 148109 - wait_a_while(nap_msec); … … 134165 148121 +#endif 134166 148122 134167 - saywhat("s 3;");134168 - show_panel(p 3);148123 - saywhat("s2; press any key to continue"); 148124 - show_panel(p2); 134169 148125 - pflush(); 134170 148126 - wait_a_while(nap_msec); 134171 148127 +#define MAX_PANELS 5 134172 148128 134173 - saywhat("m 3; press any key to continue");134174 - move_panel(p 3, LINES / 4 + 1, COLS / 15);148129 - saywhat("m2; press any key to continue"); 148130 - move_panel(p2, LINES / 3 + 1, COLS / 8); 134175 148131 - pflush(); 134176 148132 - wait_a_while(nap_msec); … … 134180 148136 + int which = cmd[1] - '0'; 134181 148137 134182 - saywhat(" b3; press any key to continue");134183 - bottom_panel(p3);148138 - saywhat("s3;"); 148139 - show_panel(p3); 134184 148140 - pflush(); 134185 148141 - wait_a_while(nap_msec); … … 134206 148162 +} 134207 148163 134208 - saywhat(" s4; press any key to continue");134209 - show_panel(p4);148164 - saywhat("m3; press any key to continue"); 148165 - move_panel(p3, LINES / 4 + 1, COLS / 15); 134210 148166 - pflush(); 134211 148167 - wait_a_while(nap_msec); … … 134217 148173 + PANEL *px[MAX_PANELS + 1]; 134218 148174 134219 - saywhat(" s5; press any key to continue");134220 - show_panel(p5);148175 - saywhat("b3; press any key to continue"); 148176 - bottom_panel(p3); 134221 148177 - pflush(); 134222 148178 - wait_a_while(nap_msec); … … 134224 148180 + refresh(); 134225 148181 134226 - saywhat(" t3; press any key to continue");134227 - top_panel(p3);148182 - saywhat("s4; press any key to continue"); 148183 - show_panel(p4); 134228 148184 - pflush(); 134229 148185 - wait_a_while(nap_msec); … … 134271 148227 + FillPanel(px[5]); 134272 148228 134273 - saywhat(" t1; press any key to continue");134274 - top_panel(p1);148229 - saywhat("s5; press any key to continue"); 148230 - show_panel(p5); 134275 148231 + hide_panel(px[4]); 134276 148232 + hide_panel(px[5]); … … 134279 148235 wait_a_while(nap_msec); 134280 148236 134281 - saywhat("t 2; press any key to continue");134282 - top_panel(p 2);148237 - saywhat("t3; press any key to continue"); 148238 - top_panel(p3); 134283 148239 + saywhat("h3 s1 s2 s4 s5"); 134284 148240 + move_panel(px[1], 0, 0); … … 134291 148247 wait_a_while(nap_msec); 134292 148248 134293 - saywhat("t3; press any key to continue"); 134294 - top_panel(p3); 148249 - saywhat("t1; press any key to continue"); 148250 - top_panel(p1); 148251 - pflush(); 148252 - wait_a_while(nap_msec); 134295 148253 + canned_panel(px, "s1"); 134296 148254 + canned_panel(px, "s2"); 134297 + 148255 148256 - saywhat("t2; press any key to continue"); 148257 - top_panel(p2); 134298 148258 + saywhat("m2"); 134299 148259 + move_panel(px[2], LINES / 3 + 1, COLS / 8); … … 134301 148261 wait_a_while(nap_msec); 134302 148262 148263 - saywhat("t3; press any key to continue"); 148264 - top_panel(p3); 148265 - pflush(); 148266 - wait_a_while(nap_msec); 148267 + canned_panel(px, "s3"); 148268 134303 148269 - saywhat("t4; press any key to continue"); 134304 148270 - top_panel(p4); 134305 + canned_panel(px, "s3");134306 +134307 148271 + saywhat("m3"); 134308 148272 + move_panel(px[3], LINES / 4 + 1, COLS / 15); … … 134350 148314 - saywhat("m4; press any key to continue"); 134351 148315 - move_panel(p4, LINES / 6, itmp * (COLS / 8)); 134352 - pflush(); 134353 - wait_a_while(nap_msec); 134354 - 148316 + saywhat("m4"); 148317 + move_panel(px[4], LINES / 6, itmp * (COLS / 8)); 148318 pflush(); 148319 wait_a_while(nap_msec); 148320 134355 148321 - saywhat("t5; press any key to continue"); 134356 148322 - top_panel(p5); … … 134385 148351 - saywhat("d4; press any key to continue"); 134386 148352 - rmpanel(p4); 134387 + saywhat("m4"); 134388 + move_panel(px[4], LINES / 6, itmp * (COLS / 8)); 134389 pflush(); 134390 wait_a_while(nap_msec); 134391 148353 - pflush(); 148354 - wait_a_while(nap_msec); 148355 - 134392 148356 - saywhat("d5; press any key to continue"); 134393 148357 - rmpanel(p5); … … 134408 148372 wait_a_while(nap_msec); 134409 148373 if (nap_msec == 1) 134410 @@ -5389,6 +5405,10 @@ 148374 @@ -4625,7 +4816,7 @@ 148375 c = KEY_DC; 148376 break; 148377 case ERR: /* FALLTHRU */ 148378 - case_QUIT: 148379 + case case_QUIT: 148380 count = 0; 148381 c = KEY_EXIT; 148382 break; 148383 @@ -4815,7 +5006,7 @@ 148384 } 148385 } 148386 148387 -static const char *animals[] = 148388 +static CONST_MENUS char *animals[] = 148389 { 148390 "Lions", 148391 "Tigers", 148392 @@ -4839,7 +5030,7 @@ 148393 MENU *m; 148394 ITEM *items[SIZEOF(animals)]; 148395 ITEM **ip = items; 148396 - const char **ap; 148397 + CONST_MENUS char **ap; 148398 int mrows, mcols, c; 148399 WINDOW *menuwin; 148400 148401 @@ -4934,7 +5125,7 @@ 148402 size_t need = 12; 148403 for (n = 0; t_tbl[n].name != 0; n++) 148404 need += strlen(t_tbl[n].name) + 2; 148405 - buf = (char *) malloc(need); 148406 + buf = typeMalloc(char, need); 148407 } 148408 sprintf(buf, "0x%02x = {", tlevel); 148409 if (tlevel == 0) { 148410 @@ -5045,7 +5236,7 @@ 148411 if (item_value(*ip)) 148412 newtrace |= t_tbl[item_index(*ip)].mask; 148413 trace(newtrace); 148414 - _tracef("trace level interactively set to %s", tracetrace(_nc_tracing)); 148415 + Trace(("trace level interactively set to %s", tracetrace(_nc_tracing))); 148416 148417 (void) mvprintw(LINES - 2, 0, 148418 "Trace level is %s\n", tracetrace(_nc_tracing)); 148419 @@ -5389,6 +5580,10 @@ 134411 148420 int finished = 0, c; 134412 148421 unsigned n = 0; … … 134419 148428 addstr("Defined edit/traversal keys: ^Q/ESC- exit form\n"); 134420 148429 addstr("^N -- go to next field ^P -- go to previous field\n"); 134421 @@ -5462,6 +5 482,10 @@148430 @@ -5462,6 +5657,10 @@ 134422 148431 free_fieldtype(fty_passwd); 134423 148432 noraw(); … … 134430 148439 #endif /* USE_LIBFORM */ 134431 148440 134432 @@ -5884,7 + 5908,13 @@148441 @@ -5884,7 +6083,13 @@ 134433 148442 134434 148443 #if USE_LIBPANEL … … 134439 148448 +#endif 134440 148449 + 134441 +#if USE_WIDEC_SUPPORT 148450 +#if USE_WIDEC_SUPPORT && USE_LIBPANEL 134442 148451 + case 'O': 134443 148452 + demo_panels(init_wide_panel, fill_wide_panel); … … 134445 148454 #endif 134446 148455 134447 @@ -6052,9 +6082,12 @@ 148456 @@ -5996,7 +6201,7 @@ 148457 wbkgd(win, A_REVERSE); 148458 werase(win); 148459 wmove(win, 0, 0); 148460 - wprintw(win, "footer: %d columns", cols); 148461 + wprintw(win, "footer: window %p, %d columns", win, cols); 148462 wnoutrefresh(win); 148463 return OK; 148464 } 148465 @@ -6007,7 +6212,7 @@ 148466 wbkgd(win, A_REVERSE); 148467 werase(win); 148468 wmove(win, 0, 0); 148469 - wprintw(win, "header: %d columns", cols); 148470 + wprintw(win, "header: window %p, %d columns", win, cols); 148471 wnoutrefresh(win); 148472 return OK; 148473 } 148474 @@ -6052,9 +6257,12 @@ 134448 148475 #endif 134449 148476 #if USE_LIBPANEL … … 134459 148486 (void) puts("r = exercise forms code"); 134460 148487 #endif 134461 @@ -6143,7 +6 176,7 @@148488 @@ -6143,7 +6351,7 @@ 134462 148489 134463 148490 setlocale(LC_ALL, ""); … … 134468 148495 #ifdef NCURSES_VERSION 134469 148496 case 'a': 148497 @@ -6246,7 +6454,7 @@ 148498 148499 if (can_change_color()) { 148500 short cp; 148501 - all_colors = (RGB_DATA *) malloc(max_colors * sizeof(RGB_DATA)); 148502 + all_colors = typeMalloc(RGB_DATA, max_colors); 148503 for (cp = 0; cp < max_colors; ++cp) { 148504 color_content(cp, 148505 &all_colors[cp].red, 148506 diff -Naur ncurses-5.6.orig/test/newdemo.c ncurses-5.6/test/newdemo.c 148507 --- ncurses-5.6.orig/test/newdemo.c 2006-12-02 19:15:28.000000000 -0500 148508 +++ ncurses-5.6/test/newdemo.c 2008-06-18 06:49:47.000000000 -0400 148509 @@ -2,7 +2,7 @@ 148510 * newdemo.c - A demo program using PDCurses. The program illustrate 148511 * the use of colours for text output. 148512 * 148513 - * $Id: newdemo.c,v 1.29 2006/12/03 00:15:28 tom Exp $ 148514 + * $Id: newdemo.c,v 1.30 2008/02/09 16:41:29 tom Exp $ 148515 */ 148516 148517 #include <test.priv.h> 148518 @@ -12,7 +12,7 @@ 148519 /* 148520 * The Australian map 148521 */ 148522 -static const char *AusMap[16] = 148523 +static CONST_MENUS char *AusMap[16] = 148524 { 148525 " A A ", 148526 " N.T. AAAAA AAAA ", 134470 148527 diff -Naur ncurses-5.6.orig/test/programs ncurses-5.6/test/programs 134471 148528 --- ncurses-5.6.orig/test/programs 2006-11-04 13:56:49.000000000 -0500 134472 +++ ncurses-5.6/test/programs 200 7-12-21 00:02:36.000000000 -0500148529 +++ ncurses-5.6/test/programs 2008-06-18 06:49:44.000000000 -0400 134473 148530 @@ -1,6 +1,6 @@ 134474 148531 -# $Id: programs,v 1.5 2006/11/04 18:56:49 tom Exp $ … … 134520 148577 diff -Naur ncurses-5.6.orig/test/railroad.c ncurses-5.6/test/railroad.c 134521 148578 --- ncurses-5.6.orig/test/railroad.c 2006-05-20 12:02:04.000000000 -0400 134522 +++ ncurses-5.6/test/railroad.c 200 7-12-21 00:02:36.000000000 -0500148579 +++ ncurses-5.6/test/railroad.c 2008-06-18 06:49:47.000000000 -0400 134523 148580 @@ -1,5 +1,5 @@ 134524 148581 /**************************************************************************** 134525 148582 - * Copyright (c) 2000-2005,2006 Free Software Foundation, Inc. * 134526 + * Copyright (c) 2000-200 6,2007Free Software Foundation, Inc. *148583 + * Copyright (c) 2000-2007,2008 Free Software Foundation, Inc. * 134527 148584 * * 134528 148585 * Permission is hereby granted, free of charge, to any person obtaining a * … … 134533 148590 * 134534 148591 - * $Id: railroad.c,v 1.14 2006/05/20 16:02:04 tom Exp $ 134535 + * $Id: railroad.c,v 1.1 5 2007/02/03 18:51:23 tom Exp $148592 + * $Id: railroad.c,v 1.16 2008/02/09 18:08:43 tom Exp $ 134536 148593 * 134537 148594 * A simple demo of the termcap interface. … … 134541 148598 134542 148599 #if HAVE_TGETENT 148600 @@ -55,7 +56,7 @@ 148601 static bool interrupted = FALSE; 148602 148603 static int 148604 -outc(int c) 148605 +outc(TPUTS_ARG c) 148606 { 148607 if (interrupted) { 148608 char tmp = c; 148609 diff -Naur ncurses-5.6.orig/test/rain.c ncurses-5.6/test/rain.c 148610 --- ncurses-5.6.orig/test/rain.c 2006-05-20 11:34:27.000000000 -0400 148611 +++ ncurses-5.6/test/rain.c 2008-06-18 06:49:51.000000000 -0400 148612 @@ -1,5 +1,5 @@ 148613 /**************************************************************************** 148614 - * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc. * 148615 + * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * 148616 * * 148617 * Permission is hereby granted, free of charge, to any person obtaining a * 148618 * copy of this software and associated documentation files (the * 148619 @@ -26,20 +26,78 @@ 148620 * authorization. * 148621 ****************************************************************************/ 148622 /* 148623 - * $Id: rain.c,v 1.22 2006/05/20 15:34:27 tom Exp $ 148624 + * $Id: rain.c,v 1.34 2008/05/24 23:34:34 tom Exp $ 148625 */ 148626 #include <test.priv.h> 148627 148628 /* rain 11/3/1980 EPS/CITHEP */ 148629 148630 -static float ranf(void); 148631 -static void onsig(int sig); 148632 +#ifdef USE_PTHREADS 148633 +#include <pthread.h> 148634 +#endif 148635 + 148636 +WANT_USE_WINDOW(); 148637 + 148638 +#define MAX_THREADS 10 148639 +#define MAX_DROP 5 148640 + 148641 +struct DATA; 148642 + 148643 +typedef void (*DrawPart) (struct DATA *); 148644 + 148645 +typedef struct DATA { 148646 + int y, x; 148647 +#ifdef USE_PTHREADS 148648 + DrawPart func; 148649 + int state; 148650 +#endif 148651 +} DATA; 148652 + 148653 +#ifdef USE_PTHREADS 148654 +pthread_cond_t cond_next_drop; 148655 +pthread_mutex_t mutex_next_drop; 148656 +static int used_threads; 148657 + 148658 +typedef struct { 148659 + pthread_t myself; 148660 + long counter; 148661 +} STATS; 148662 + 148663 +static STATS drop_threads[MAX_THREADS]; 148664 +#endif 148665 + 148666 +static void 148667 +onsig(int n GCC_UNUSED) 148668 +{ 148669 + curs_set(1); 148670 + endwin(); 148671 + ExitProgram(EXIT_FAILURE); 148672 +} 148673 + 148674 +static float 148675 +ranf(void) 148676 +{ 148677 + long r = (rand() & 077777); 148678 + return ((float) r / 32768.); 148679 +} 148680 + 148681 +static int 148682 +random_x(void) 148683 +{ 148684 + return (((float) (COLS - 4) * ranf()) + 2); 148685 +} 148686 + 148687 +static int 148688 +random_y(void) 148689 +{ 148690 + return (((float) (LINES - 4) * ranf()) + 2); 148691 +} 148692 148693 static int 148694 next_j(int j) 148695 { 148696 if (j == 0) 148697 - j = 4; 148698 + j = MAX_DROP - 1; 148699 else 148700 --j; 148701 if (has_colors()) { 148702 @@ -52,15 +110,193 @@ 148703 return j; 148704 } 148705 148706 +static void 148707 +part1(DATA * drop) 148708 +{ 148709 + mvaddch(drop->y, drop->x, '.'); 148710 +} 148711 + 148712 +static void 148713 +part2(DATA * drop) 148714 +{ 148715 + mvaddch(drop->y, drop->x, 'o'); 148716 +} 148717 + 148718 +static void 148719 +part3(DATA * drop) 148720 +{ 148721 + mvaddch(drop->y, drop->x, 'O'); 148722 +} 148723 + 148724 +static void 148725 +part4(DATA * drop) 148726 +{ 148727 + mvaddch(drop->y - 1, drop->x, '-'); 148728 + mvaddstr(drop->y, drop->x - 1, "|.|"); 148729 + mvaddch(drop->y + 1, drop->x, '-'); 148730 +} 148731 + 148732 +static void 148733 +part5(DATA * drop) 148734 +{ 148735 + mvaddch(drop->y - 2, drop->x, '-'); 148736 + mvaddstr(drop->y - 1, drop->x - 1, "/ \\"); 148737 + mvaddstr(drop->y, drop->x - 2, "| O |"); 148738 + mvaddstr(drop->y + 1, drop->x - 1, "\\ /"); 148739 + mvaddch(drop->y + 2, drop->x, '-'); 148740 +} 148741 + 148742 +static void 148743 +part6(DATA * drop) 148744 +{ 148745 + mvaddch(drop->y - 2, drop->x, ' '); 148746 + mvaddstr(drop->y - 1, drop->x - 1, " "); 148747 + mvaddstr(drop->y, drop->x - 2, " "); 148748 + mvaddstr(drop->y + 1, drop->x - 1, " "); 148749 + mvaddch(drop->y + 2, drop->x, ' '); 148750 +} 148751 + 148752 +#ifdef USE_PTHREADS 148753 +static void 148754 +napsome(void) 148755 +{ 148756 + napms(60); 148757 +} 148758 + 148759 +/* 148760 + * This runs inside the use_window() mutex. 148761 + */ 148762 +static int 148763 +really_draw(WINDOW *win, void *arg) 148764 +{ 148765 + DATA *data = (DATA *) arg; 148766 + 148767 + (void) win; 148768 + next_j(data->state); 148769 + data->func(data); 148770 + refresh(); 148771 + return OK; 148772 +} 148773 + 148774 +static void 148775 +draw_part(void (*func) (DATA *), int state, DATA * data) 148776 +{ 148777 + data->func = func; 148778 + data->state = state; 148779 + use_window(stdscr, really_draw, (void *) data); 148780 + napsome(); 148781 +} 148782 + 148783 +/* 148784 + * Tell the threads that one of them can start work on a new raindrop. 148785 + * They may all be busy if we're sending requests too rapidly. 148786 + */ 148787 +static int 148788 +put_next_drop(void) 148789 +{ 148790 + pthread_cond_signal(&cond_next_drop); 148791 + pthread_mutex_unlock(&mutex_next_drop); 148792 + 148793 + return 0; 148794 +} 148795 + 148796 +/* 148797 + * Wait until we're assigned the task of drawing a new raindrop. 148798 + */ 148799 +static int 148800 +get_next_drop(void) 148801 +{ 148802 + pthread_mutex_lock(&mutex_next_drop); 148803 + pthread_cond_wait(&cond_next_drop, &mutex_next_drop); 148804 + 148805 + return TRUE; 148806 +} 148807 + 148808 +static void * 148809 +draw_drop(void *arg) 148810 +{ 148811 + DATA mydata; 148812 + int mystats; 148813 + 148814 + /* 148815 + * Find myself in the list of threads so we can count the number of loops. 148816 + */ 148817 + for (mystats = 0; mystats < MAX_THREADS; ++mystats) { 148818 + if (drop_threads[mystats].myself == pthread_self()) 148819 + break; 148820 + } 148821 + 148822 + do { 148823 + if (mystats < MAX_THREADS) 148824 + drop_threads[mystats].counter++; 148825 + 148826 + /* 148827 + * Make a copy of caller's data. We're cheating for the cases after 148828 + * the first loop since we still have a pointer into the main thread 148829 + * to the data which it uses for setting up this thread (but it has 148830 + * been modified to use different coordinates). 148831 + */ 148832 + mydata = *(DATA *) arg; 148833 + 148834 + draw_part(part1, 0, &mydata); 148835 + draw_part(part2, 1, &mydata); 148836 + draw_part(part3, 2, &mydata); 148837 + draw_part(part4, 3, &mydata); 148838 + draw_part(part5, 4, &mydata); 148839 + draw_part(part6, 0, &mydata); 148840 + } while (get_next_drop()); 148841 + 148842 + return NULL; 148843 +} 148844 + 148845 +/* 148846 + * The description of pthread_create() is misleading, since it implies that 148847 + * threads will exit cleanly after their function returns. 148848 + * 148849 + * Since they do not (and the number of threads is limited by system 148850 + * resources), make a limited number of threads, and signal any that are 148851 + * waiting when we want a thread past that limit. 148852 + */ 148853 +static int 148854 +start_drop(DATA * data) 148855 +{ 148856 + int rc; 148857 + 148858 + if (!used_threads) { 148859 + /* mutex and condition for signalling thread */ 148860 + pthread_mutex_init(&mutex_next_drop, NULL); 148861 + pthread_cond_init(&cond_next_drop, NULL); 148862 + } 148863 + 148864 + if (used_threads < MAX_THREADS) { 148865 + rc = pthread_create(&(drop_threads[used_threads].myself), 148866 + NULL, 148867 + draw_drop, 148868 + data); 148869 + ++used_threads; 148870 + } else { 148871 + rc = put_next_drop(); 148872 + } 148873 + return rc; 148874 +} 148875 +#endif 148876 + 148877 +static int 148878 +get_input(void) 148879 +{ 148880 + return USING_WINDOW(stdscr, wgetch); 148881 +} 148882 + 148883 int 148884 -main( 148885 - int argc GCC_UNUSED, 148886 - char *argv[]GCC_UNUSED) 148887 -{ 148888 - int x, y, j; 148889 - static int xpos[5], ypos[5]; 148890 - float r; 148891 - float c; 148892 +main(int argc GCC_UNUSED, 148893 + char *argv[]GCC_UNUSED) 148894 +{ 148895 + bool done = FALSE; 148896 + DATA drop; 148897 +#ifndef USE_PTHREADS 148898 + DATA last[MAX_DROP]; 148899 +#endif 148900 + int j = 0; 148901 148902 setlocale(LC_ALL, ""); 148903 148904 @@ -82,52 +318,50 @@ 148905 curs_set(0); 148906 timeout(0); 148907 148908 - r = (float) (LINES - 4); 148909 - c = (float) (COLS - 4); 148910 - for (j = 5; --j >= 0;) { 148911 - xpos[j] = (int) (c * ranf()) + 2; 148912 - ypos[j] = (int) (r * ranf()) + 2; 148913 +#ifndef USE_PTHREADS 148914 + for (j = MAX_DROP; --j >= 0;) { 148915 + last[j].x = random_x(); 148916 + last[j].y = random_y(); 148917 } 148918 + j = 0; 148919 +#endif 148920 148921 - for (j = 0;;) { 148922 - x = (int) (c * ranf()) + 2; 148923 - y = (int) (r * ranf()) + 2; 148924 - 148925 - mvaddch(y, x, '.'); 148926 + while (!done) { 148927 + drop.x = random_x(); 148928 + drop.y = random_y(); 148929 + 148930 +#ifdef USE_PTHREADS 148931 + if (start_drop(&drop) != 0) { 148932 + beep(); 148933 + } 148934 +#else 148935 + /* 148936 + * The non-threaded code draws parts of each drop on each loop. 148937 + */ 148938 + part1(&drop); 148939 148940 - mvaddch(ypos[j], xpos[j], 'o'); 148941 + part2(&last[j]); 148942 148943 j = next_j(j); 148944 - mvaddch(ypos[j], xpos[j], 'O'); 148945 + part3(&last[j]); 148946 148947 j = next_j(j); 148948 - mvaddch(ypos[j] - 1, xpos[j], '-'); 148949 - mvaddstr(ypos[j], xpos[j] - 1, "|.|"); 148950 - mvaddch(ypos[j] + 1, xpos[j], '-'); 148951 + part4(&last[j]); 148952 148953 j = next_j(j); 148954 - mvaddch(ypos[j] - 2, xpos[j], '-'); 148955 - mvaddstr(ypos[j] - 1, xpos[j] - 1, "/ \\"); 148956 - mvaddstr(ypos[j], xpos[j] - 2, "| O |"); 148957 - mvaddstr(ypos[j] + 1, xpos[j] - 1, "\\ /"); 148958 - mvaddch(ypos[j] + 2, xpos[j], '-'); 148959 + part5(&last[j]); 148960 148961 j = next_j(j); 148962 - mvaddch(ypos[j] - 2, xpos[j], ' '); 148963 - mvaddstr(ypos[j] - 1, xpos[j] - 1, " "); 148964 - mvaddstr(ypos[j], xpos[j] - 2, " "); 148965 - mvaddstr(ypos[j] + 1, xpos[j] - 1, " "); 148966 - mvaddch(ypos[j] + 2, xpos[j], ' '); 148967 + part6(&last[j]); 148968 148969 - xpos[j] = x; 148970 - ypos[j] = y; 148971 + last[j] = drop; 148972 +#endif 148973 148974 - switch (getch()) { 148975 + switch (get_input()) { 148976 case ('q'): 148977 case ('Q'): 148978 - curs_set(1); 148979 - endwin(); 148980 - ExitProgram(EXIT_SUCCESS); 148981 + done = TRUE; 148982 + break; 148983 case 's': 148984 nodelay(stdscr, FALSE); 148985 break; 148986 @@ -136,26 +370,17 @@ 148987 break; 148988 #ifdef KEY_RESIZE 148989 case (KEY_RESIZE): 148990 - r = (float) (LINES - 4); 148991 - c = (float) (COLS - 4); 148992 break; 148993 #endif 148994 } 148995 napms(50); 148996 } 148997 -} 148998 - 148999 -static void 149000 -onsig(int n GCC_UNUSED) 149001 -{ 149002 curs_set(1); 149003 endwin(); 149004 - ExitProgram(EXIT_FAILURE); 149005 -} 149006 - 149007 -static float 149008 -ranf(void) 149009 -{ 149010 - long r = (rand() & 077777); 149011 - return ((float) r / 32768.); 149012 +#ifdef USE_PTHREADS 149013 + printf("Counts per thread:\n"); 149014 + for (j = 0; j < MAX_THREADS; ++j) 149015 + printf(" %d:%ld\n", j, drop_threads[j].counter); 149016 +#endif 149017 + ExitProgram(EXIT_SUCCESS); 149018 } 134543 149019 diff -Naur ncurses-5.6.orig/test/redraw.c ncurses-5.6/test/redraw.c 134544 149020 --- ncurses-5.6.orig/test/redraw.c 2006-11-04 18:20:27.000000000 -0500 134545 +++ ncurses-5.6/test/redraw.c 200 7-12-21 00:02:36.000000000 -0500149021 +++ ncurses-5.6/test/redraw.c 2008-06-18 06:49:44.000000000 -0400 134546 149022 @@ -1,5 +1,5 @@ 134547 149023 /**************************************************************************** … … 134571 149047 diff -Naur ncurses-5.6.orig/test/savescreen.c ncurses-5.6/test/savescreen.c 134572 149048 --- ncurses-5.6.orig/test/savescreen.c 2006-04-01 14:08:03.000000000 -0500 134573 +++ ncurses-5.6/test/savescreen.c 200 7-12-21 00:02:36.000000000 -0500149049 +++ ncurses-5.6/test/savescreen.c 2008-06-18 06:49:44.000000000 -0400 134574 149050 @@ -1,5 +1,5 @@ 134575 149051 /**************************************************************************** … … 134884 149360 diff -Naur ncurses-5.6.orig/test/savescreen.sh ncurses-5.6/test/savescreen.sh 134885 149361 --- ncurses-5.6.orig/test/savescreen.sh 1969-12-31 19:00:00.000000000 -0500 134886 +++ ncurses-5.6/test/savescreen.sh 200 7-12-21 00:02:36.000000000 -0500149362 +++ ncurses-5.6/test/savescreen.sh 2008-06-18 06:49:44.000000000 -0400 134887 149363 @@ -0,0 +1,55 @@ 134888 149364 +#!/bin/sh … … 134943 149419 diff -Naur ncurses-5.6.orig/test/test.priv.h ncurses-5.6/test/test.priv.h 134944 149420 --- ncurses-5.6.orig/test/test.priv.h 2006-07-15 14:27:24.000000000 -0400 134945 +++ ncurses-5.6/test/test.priv.h 200 7-12-21 00:02:36.000000000 -0500149421 +++ ncurses-5.6/test/test.priv.h 2008-06-18 06:49:49.000000000 -0400 134946 149422 @@ -1,5 +1,5 @@ 134947 149423 /**************************************************************************** 134948 149424 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 134949 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *149425 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 134950 149426 * * 134951 149427 * Permission is hereby granted, free of charge, to any person obtaining a * … … 134956 149432 ****************************************************************************/ 134957 149433 -/* $Id: test.priv.h,v 1.63 2006/07/15 18:27:24 tom Exp $ */ 134958 +/* $Id: test.priv.h,v 1. 68 2007/06/30 17:53:09tom Exp $ */149434 +/* $Id: test.priv.h,v 1.77 2008/04/12 19:25:48 tom Exp $ */ 134959 149435 134960 149436 #ifndef __TEST_PRIV_H 134961 149437 #define __TEST_PRIV_H 1 134962 @@ -309,7 +309,7 @@ 149438 @@ -59,6 +59,14 @@ 149439 #define HAVE_CURSES_VERSION 0 149440 #endif 149441 149442 +#ifndef HAVE_CHGAT 149443 +#define HAVE_CHGAT 0 149444 +#endif 149445 + 149446 +#ifndef HAVE_COLOR_SET 149447 +#define HAVE_COLOR_SET 0 149448 +#endif 149449 + 149450 #ifndef HAVE_FILTER 149451 #define HAVE_FILTER 0 149452 #endif 149453 @@ -83,6 +91,10 @@ 149454 #define HAVE_GETOPT_H 0 149455 #endif 149456 149457 +#ifndef HAVE_GETPARX 149458 +#define HAVE_GETPARX 0 149459 +#endif 149460 + 149461 #ifndef HAVE_GETWIN 149462 #define HAVE_GETWIN 0 149463 #endif 149464 @@ -235,9 +247,18 @@ 149465 #include <term.h> 149466 #endif 149467 149468 -#ifdef NCURSES_VERSION 149469 -#define HAVE_COLOR_SET 1 149470 -#define HAVE_CHGAT 1 149471 +/* 149472 + * Not all curses.h implementations include unctrl.h, 149473 + * Solaris 10 xpg4 for example. 149474 + */ 149475 +#if defined(NCURSES_VERSION) || defined(_XOPEN_CURSES) 149476 +#if defined(HAVE_NCURSESW_NCURSES_H) 149477 +#include <ncursesw/unctrl.h> 149478 +#elif defined(HAVE_NCURSES_NCURSES_H) 149479 +#include <ncurses/unctrl.h> 149480 +#else 149481 +#include <unctrl.h> 149482 +#endif 149483 #endif 149484 149485 #if HAVE_GETOPT_H 149486 @@ -308,8 +329,8 @@ 149487 #endif 134963 149488 134964 149489 #ifndef HAVE_TYPE_ATTR_T 134965 149490 -#if !USE_WIDEC_SUPPORT 134966 149491 -#define attr_t long 149492 +#if !USE_WIDEC_SUPPORT && !defined(attr_t) 134967 149493 +#define attr_t chtype 134968 149494 #endif 134969 149495 #endif 134970 149496 134971 @@ -320, 6 +320,10@@149497 @@ -320,13 +341,16 @@ 134972 149498 #define NCURSES_CH_T cchar_t 134973 149499 #endif … … 134980 149506 #define CCHARW_MAX 5 134981 149507 #endif 134982 @@ -404,6 +408,10 @@ 149508 149509 -#ifndef CTRL 149510 -#define CTRL(x) ((x) & 0x1f) 149511 -#endif 149512 +#undef CTRL 149513 +#define CTRL(x) ((x) & 0x1f) 149514 149515 #define QUIT CTRL('Q') 149516 #define ESCAPE CTRL('[') 149517 @@ -367,6 +391,21 @@ 149518 #define getmaxy(win) ((win)?((win)->_maxy + 1):ERR) 149519 #endif 149520 149521 +/* 149522 + * Solaris 10 xpg4: 149523 +#define __m_getparx(w) ((w)->_parent == (WINDOW *) 0 ? -1 \ 149524 + : (w)->_begx - (w)->_parent->_begx) 149525 + */ 149526 +#if !defined(getparx) && !HAVE_GETPARX 149527 +#ifdef __m_getparx 149528 +#define getparx(win) __m_getparx(win) 149529 +#define getpary(win) __m_getpary(win) 149530 +#else 149531 +#define getparx(win) ((win)?((win)->_parx + 1):ERR) 149532 +#define getpary(win) ((win)?((win)->_pary + 1):ERR) 149533 +#endif 149534 +#endif 149535 + 149536 #if !defined(mvwvline) && !HAVE_MVWVLINE 149537 #define mvwvline(w,y,x,ch,n) (move(y,x) == ERR ? ERR : wvline(w,ch,n)) 149538 #define mvwhline(w,y,x,ch,n) (move(y,x) == ERR ? ERR : whline(w,ch,n)) 149539 @@ -404,8 +443,13 @@ 134983 149540 134984 149541 #if defined(NCURSES_VERSION) && HAVE_NC_ALLOC_H … … 134990 149547 #else 134991 149548 #define typeMalloc(type,n) (type *) malloc((n) * sizeof(type)) 149549 +#define typeCalloc(type,elts) (type *) calloc((elts), sizeof(type)) 134992 149550 #define typeRealloc(type,n,p) (type *) realloc(p, (n) * sizeof(type)) 149551 #endif 149552 149553 @@ -451,4 +495,79 @@ 149554 signal(nsig, handler); \ 149555 } 149556 149557 +/* 149558 + * Workaround for clean(er) compile with Solaris's legacy curses. 149559 + * The same would be needed for HPUX 10.20 149560 + */ 149561 +#ifndef TPUTS_ARG 149562 +#if defined(sun) && !defined(_XOPEN_CURSES) && !defined(NCURSES_VERSION_PATCH) 149563 +#define TPUTS_ARG char 149564 +extern char *tgoto(char *, int, int); /* available, but not prototyped */ 149565 +#else 149566 +#define TPUTS_ARG int 149567 +#endif 149568 +#endif 149569 + 149570 +/* 149571 + * Workarounds for Solaris's X/Open curses 149572 + */ 149573 +#if defined(sun) && defined(_XOPEN_CURSES) && !defined(NCURSES_VERSION_PATCH) 149574 +#if !defined(KEY_MIN) && defined(__KEY_MIN) 149575 +#define KEY_MIN __KEY_MIN 149576 +#endif 149577 +#if !defined(KEY_MAX) && defined(__KEY_MIN) 149578 +#define KEY_MAX __KEY_MAX 149579 +#endif 149580 +#endif 149581 + 149582 +/* 149583 + * ncurses uses const in some places where X/Open does (or did) not allow. 149584 + */ 149585 +#ifdef NCURSES_VERSION 149586 +#define CONST_MENUS const 149587 +#else 149588 +#define CONST_MENUS /* nothing */ 149589 +#endif 149590 + 149591 +#ifndef HAVE_USE_WINDOW 149592 +#if !defined(NCURSES_VERSION_PATCH) || (NCURSES_VERSION_PATCH < 20070915) || !NCURSES_EXT_FUNCS 149593 +#define HAVE_USE_WINDOW 0 149594 +#else 149595 +#define HAVE_USE_WINDOW 1 149596 +#endif 149597 +#endif 149598 + 149599 +/* 149600 + * Simplify setting up demo of threading with these macros. 149601 + */ 149602 + 149603 +#if !HAVE_USE_WINDOW 149604 +typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *); 149605 +typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *); 149606 +#endif 149607 + 149608 +#if HAVE_USE_WINDOW 149609 +#define USING_WINDOW(w,func) use_window(w, (NCURSES_WINDOW_CB) func, w) 149610 +#define WANT_USE_WINDOW() extern void _nc_want_use_window(void) 149611 +#else 149612 +#define USING_WINDOW(w,func) func(w) 149613 +#define WANT_USE_WINDOW() extern void _nc_want_use_window(void) 149614 +#endif 149615 + 149616 +#if HAVE_USE_WINDOW 149617 +#define USING_SCREEN(s,func,data) use_screen(s, (NCURSES_SCREEN_CB) func, data) 149618 +#define WANT_USE_SCREEN() extern void _nc_want_use_screen(void) 149619 +#else 149620 +#define USING_SCREEN(s,func,data) func(data) 149621 +#define WANT_USE_SCREEN() extern void _nc_want_use_screen(void) 149622 +#endif 149623 + 149624 +#ifdef TRACE 149625 +#define Trace(p) _tracef p 149626 +#define USE_TRACE 1 149627 +#else 149628 +#define Trace(p) /* nothing */ 149629 +#define USE_TRACE 0 149630 +#endif 149631 + 149632 #endif /* __TEST_PRIV_H */ 134993 149633 diff -Naur ncurses-5.6.orig/test/test_arrays.c ncurses-5.6/test/test_arrays.c 134994 149634 --- ncurses-5.6.orig/test/test_arrays.c 1969-12-31 19:00:00.000000000 -0500 134995 +++ ncurses-5.6/test/test_arrays.c 200 7-12-21 00:02:36.000000000 -0500134996 @@ -0,0 +1, 79@@149635 +++ ncurses-5.6/test/test_arrays.c 2008-06-18 06:49:47.000000000 -0400 149636 @@ -0,0 +1,90 @@ 134997 149637 +/**************************************************************************** 134998 + * Copyright (c) 2007 Free Software Foundation, Inc.*149638 + * Copyright (c) 2007,2008 Free Software Foundation, Inc. * 134999 149639 + * * 135000 149640 + * Permission is hereby granted, free of charge, to any person obtaining a * … … 135023 149663 + ****************************************************************************/ 135024 149664 +/* 135025 + * $Id: test_arrays.c,v 1. 2 2007/09/01 20:11:57tom Exp $149665 + * $Id: test_arrays.c,v 1.3 2008/02/09 18:09:43 tom Exp $ 135026 149666 + * 135027 149667 + * Author: Thomas E Dickey … … 135044 149684 +#include <test.priv.h> 135045 149685 + 149686 +#if defined(NCURSES_VERSION) || !defined(_XOPEN_CURSES) 149687 + 135046 149688 +#define DUMP(name) dump_array(#name, name) 135047 149689 + … … 135074 149716 + ExitProgram(EXIT_SUCCESS); 135075 149717 +} 149718 + 149719 +#else 149720 +int 149721 +main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) 149722 +{ 149723 + printf("This program requires the terminfo arrays\n"); 149724 + ExitProgram(EXIT_FAILURE); 149725 +} 149726 +#endif 135076 149727 diff -Naur ncurses-5.6.orig/test/test_get_wstr.c ncurses-5.6/test/test_get_wstr.c 135077 149728 --- ncurses-5.6.orig/test/test_get_wstr.c 1969-12-31 19:00:00.000000000 -0500 135078 +++ ncurses-5.6/test/test_get_wstr.c 200 7-12-21 00:02:36.000000000 -0500149729 +++ ncurses-5.6/test/test_get_wstr.c 2008-06-18 06:49:44.000000000 -0400 135079 149730 @@ -0,0 +1,361 @@ 135080 149731 +/**************************************************************************** … … 135441 150092 diff -Naur ncurses-5.6.orig/test/test_getstr.c ncurses-5.6/test/test_getstr.c 135442 150093 --- ncurses-5.6.orig/test/test_getstr.c 1969-12-31 19:00:00.000000000 -0500 135443 +++ ncurses-5.6/test/test_getstr.c 200 7-12-21 00:02:36.000000000 -0500135444 @@ -0,0 +1,3 51@@150094 +++ ncurses-5.6/test/test_getstr.c 2008-06-18 06:49:47.000000000 -0400 150095 @@ -0,0 +1,363 @@ 135445 150096 +/**************************************************************************** 135446 + * Copyright (c) 2007 Free Software Foundation, Inc.*150097 + * Copyright (c) 2007,2008 Free Software Foundation, Inc. * 135447 150098 + * * 135448 150099 + * Permission is hereby granted, free of charge, to any person obtaining a * … … 135471 150122 + ****************************************************************************/ 135472 150123 +/* 135473 + * $Id: test_getstr.c,v 1. 7 2007/08/11 16:56:25 tom Exp $150124 + * $Id: test_getstr.c,v 1.8 2008/02/09 18:09:35 tom Exp $ 135474 150125 + * 135475 150126 + * Author: Thomas E Dickey … … 135488 150139 + 135489 150140 +#include <test.priv.h> 150141 + 150142 +#if HAVE_CHGAT 150143 +/* Solaris SVr4 curses lacks wchgat, mvgetnstr, mvwgetnstr */ 135490 150144 + 135491 150145 +#define BASE_Y 6 … … 135794 150448 + ExitProgram(EXIT_SUCCESS); 135795 150449 +} 150450 + 150451 +#else 150452 +int 150453 +main(void) 150454 +{ 150455 + printf("This program requires the curses chgat function\n"); 150456 + ExitProgram(EXIT_FAILURE); 150457 +} 150458 +#endif 135796 150459 diff -Naur ncurses-5.6.orig/test/test_instr.c ncurses-5.6/test/test_instr.c 135797 150460 --- ncurses-5.6.orig/test/test_instr.c 1969-12-31 19:00:00.000000000 -0500 135798 +++ ncurses-5.6/test/test_instr.c 200 7-12-21 00:02:36.000000000 -0500150461 +++ ncurses-5.6/test/test_instr.c 2008-06-18 06:49:44.000000000 -0400 135799 150462 @@ -0,0 +1,260 @@ 135800 150463 +/**************************************************************************** … … 136060 150723 diff -Naur ncurses-5.6.orig/test/test_inwstr.c ncurses-5.6/test/test_inwstr.c 136061 150724 --- ncurses-5.6.orig/test/test_inwstr.c 1969-12-31 19:00:00.000000000 -0500 136062 +++ ncurses-5.6/test/test_inwstr.c 200 7-12-21 00:02:36.000000000 -0500150725 +++ ncurses-5.6/test/test_inwstr.c 2008-06-18 06:49:44.000000000 -0400 136063 150726 @@ -0,0 +1,269 @@ 136064 150727 +/**************************************************************************** … … 136333 150996 diff -Naur ncurses-5.6.orig/test/test_opaque.c ncurses-5.6/test/test_opaque.c 136334 150997 --- ncurses-5.6.orig/test/test_opaque.c 1969-12-31 19:00:00.000000000 -0500 136335 +++ ncurses-5.6/test/test_opaque.c 200 7-12-21 00:02:36.000000000 -0500136336 @@ -0,0 +1,4 21@@150998 +++ ncurses-5.6/test/test_opaque.c 2008-06-18 06:49:49.000000000 -0400 150999 @@ -0,0 +1,474 @@ 136337 151000 +/**************************************************************************** 136338 + * Copyright (c) 2007 Free Software Foundation, Inc.*151001 + * Copyright (c) 2007,2008 Free Software Foundation, Inc. * 136339 151002 + * * 136340 151003 + * Permission is hereby granted, free of charge, to any person obtaining a * … … 136363 151026 + ****************************************************************************/ 136364 151027 +/* 136365 + * $Id: test_opaque.c,v 1. 4 2007/08/18 17:51:51tom Exp $151028 + * $Id: test_opaque.c,v 1.6 2008/04/05 18:03:57 tom Exp $ 136366 151029 + * 136367 151030 + * Author: Thomas E Dickey … … 136387 151050 +#define BASE_Y 6 136388 151051 +#define MAX_COLS 1024 151052 + 151053 +#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20080119) && NCURSES_EXT_FUNCS 136389 151054 + 136390 151055 +static bool … … 136658 151323 + case ' ': 136659 151324 + bool_funcs[active].func(txtwin, 136660 + 151325 + !bool_funcs[active].func(txtwin, -1)); 136661 151326 + break; 136662 151327 + default: … … 136729 151394 +} 136730 151395 + 151396 +static void 151397 +test_set_escdelay(void) 151398 +{ 151399 + set_escdelay((100 + ESCDELAY) / 2); 151400 +} 151401 + 151402 +static void 151403 +test_set_tabsize(void) 151404 +{ 151405 + int y0, x0; 151406 + int y, x; 151407 + int save_tabsize = TABSIZE; 151408 + bool done = FALSE; 151409 + 151410 + (void) cbreak(); /* take input chars one at a time, no wait for \n */ 151411 + (void) noecho(); /* don't echo input */ 151412 + 151413 + for (y = 0; y < LINES; ++y) { 151414 + set_tabsize(y + 1); 151415 + if (move(y, 0) == ERR) 151416 + break; 151417 + for (x = 0; x < COLS;) { 151418 + addch('\t'); 151419 + if (addch('*') == ERR) { 151420 + done = TRUE; 151421 + break; 151422 + } 151423 + getyx(stdscr, y0, x0); 151424 + if (y0 != y || x0 == x) { 151425 + done = TRUE; 151426 + break; 151427 + } 151428 + } 151429 + } 151430 + getch(); 151431 + erase(); 151432 + 151433 + set_tabsize(save_tabsize); 151434 +} 151435 + 136731 151436 +int 136732 151437 +main(int argc, char *argv[]) … … 136744 151449 + initscr(); 136745 151450 + 151451 + test_set_escdelay(); 151452 + test_set_tabsize(); 151453 + 136746 151454 + stsbox = derwin(stdscr, BASE_Y, COLS, 0, 0); 136747 151455 + box(stsbox, 0, 0); … … 136756 151464 + ExitProgram(EXIT_SUCCESS); 136757 151465 +} 151466 +#else 151467 +int 151468 +main(void) 151469 +{ 151470 + printf("This program requires the ncurses library\n"); 151471 + ExitProgram(EXIT_FAILURE); 151472 +} 151473 +#endif 151474 diff -Naur ncurses-5.6.orig/test/testcurs.c ncurses-5.6/test/testcurs.c 151475 --- ncurses-5.6.orig/test/testcurs.c 2005-12-31 15:23:09.000000000 -0500 151476 +++ ncurses-5.6/test/testcurs.c 2008-06-18 06:49:49.000000000 -0400 151477 @@ -7,7 +7,7 @@ 151478 * wrs(5/28/93) -- modified to be consistent (perform identically) with either 151479 * PDCurses or under Unix System V, R4 151480 * 151481 - * $Id: testcurs.c,v 1.37 2005/12/31 20:23:09 tom Exp $ 151482 + * $Id: testcurs.c,v 1.38 2008/04/12 22:00:27 tom Exp $ 151483 */ 151484 151485 #include <test.priv.h> 151486 @@ -51,7 +51,7 @@ 151487 static char * 151488 strdup(char *s) 151489 { 151490 - char *p = (char *) malloc(strlen(s) + 1); 151491 + char *p = typeMalloc(char, strlen(s) + 1); 151492 if (p) 151493 strcpy(p, s); 151494 return (p); 136758 151495 diff -Naur ncurses-5.6.orig/test/view.c ncurses-5.6/test/view.c 136759 151496 --- ncurses-5.6.orig/test/view.c 2006-05-20 11:37:03.000000000 -0400 136760 +++ ncurses-5.6/test/view.c 200 7-12-21 00:02:36.000000000 -0500151497 +++ ncurses-5.6/test/view.c 2008-06-18 06:49:46.000000000 -0400 136761 151498 @@ -1,5 +1,5 @@ 136762 151499 /**************************************************************************** 136763 151500 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 136764 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *151501 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 136765 151502 * * 136766 151503 * Permission is hereby granted, free of charge, to any person obtaining a * … … 136771 151508 * 136772 151509 - * $Id: view.c,v 1.64 2006/05/20 15:37:03 tom Exp $ 136773 + * $Id: view.c,v 1.6 6 2007/07/21 17:41:55tom Exp $151510 + * $Id: view.c,v 1.67 2008/01/19 21:01:21 tom Exp $ 136774 151511 */ 136775 151512 … … 136802 151539 136803 151540 case 'h': 151541 @@ -512,6 +512,7 @@ 151542 i = strlen(temp); 151543 sprintf(temp + i, "view %.*s", (int) (sizeof(temp) - 7 - i), fname); 151544 #else 151545 + (void) tag; 151546 sprintf(temp, "view %.*s", (int) sizeof(temp) - 7, fname); 151547 #endif 151548 move(0, 0); 136804 151549 diff -Naur ncurses-5.6.orig/test/worm.c ncurses-5.6/test/worm.c 136805 151550 --- ncurses-5.6.orig/test/worm.c 2006-07-01 18:57:24.000000000 -0400 136806 +++ ncurses-5.6/test/worm.c 200 7-12-21 00:02:36.000000000 -0500151551 +++ ncurses-5.6/test/worm.c 2008-06-18 06:49:48.000000000 -0400 136807 151552 @@ -1,5 +1,5 @@ 136808 151553 /**************************************************************************** 136809 151554 - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * 136810 + * Copyright (c) 1998-200 6,2007Free Software Foundation, Inc. *151555 + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 136811 151556 * * 136812 151557 * Permission is hereby granted, free of charge, to any person obtaining a * 136813 151558 * copy of this software and associated documentation files (the * 136814 @@ -61,11 +61, 15@@151559 @@ -61,11 +61,20 @@ 136815 151560 traces will be dumped. The program stops and waits for one character of 136816 151561 input at the beginning and end of the interval. 136817 151562 136818 151563 - $Id: worm.c,v 1.41 2006/07/01 22:57:24 tom Exp $ 136819 + $Id: worm.c,v 1. 49 2007/09/29 17:35:57tom Exp $151564 + $Id: worm.c,v 1.57 2008/03/02 01:43:35 tom Exp $ 136820 151565 */ 136821 151566 … … 136826 151571 +#endif 136827 151572 + 151573 +WANT_USE_WINDOW(); 151574 + 151575 +#define MAX_WORMS 40 151576 +#define MAX_LENGTH 1024 151577 + 136828 151578 static chtype flavor[] = 136829 151579 { 136830 151580 'O', '*', '#', '$', '%', '0', '@', 136831 @@ -77,17 +8 1,27@@151581 @@ -77,17 +86,32 @@ 136832 151582 { 136833 151583 -1, 0, 1, 1, 1, 0, -1, -1 … … 136849 151599 +} WORM; 136850 151600 + 136851 +static WORM worm[40]; 151601 +static unsigned long sequence = 0; 151602 +static bool quitting = FALSE; 151603 + 151604 +static WORM worm[MAX_WORMS]; 136852 151605 +static short **refs; 151606 +static int last_x, last_y; 136853 151607 136854 151608 static const char *field; … … 136856 151610 static chtype trail = ' '; 136857 151611 151612 +static unsigned pending; 136858 151613 #ifdef TRACE 136859 151614 -static int generation, trace_start, trace_end, singlestep; … … 136862 151617 /* *INDENT-OFF* */ 136863 151618 static const struct options { 136864 @@ -200,15 +214,147 @@ 151619 @@ -180,8 +204,7 @@ 151620 static void 151621 cleanup(void) 151622 { 151623 - standend(); 151624 - refresh(); 151625 + USING_WINDOW(stdscr, wrefresh); 151626 curs_set(1); 151627 endwin(); 151628 } 151629 @@ -200,17 +223,191 @@ 136865 151630 return ((float) r / 32768.); 136866 151631 } … … 136871 151636 + WORM *w = (WORM *) data; 136872 151637 + const struct options *op; 151638 + unsigned mask = ~(1 << (w - worm)); 151639 + chtype attrs = w->attrs | ((mask & pending) ? A_REVERSE : 0); 136873 151640 + 136874 151641 + int x; … … 136876 151643 + int h; 136877 151644 + 136878 + int bottom = LINES - 1;136879 + int last = COLS - 1;136880 +136881 151645 + bool done = FALSE; 136882 151646 + 136883 151647 + if ((x = w->xpos[h = w->head]) < 0) { 136884 + wmove(win, y = w->ypos[h] = bottom, x = w->xpos[h] = 0);136885 + waddch(win, w->attrs);151648 + wmove(win, y = w->ypos[h] = last_y, x = w->xpos[h] = 0); 151649 + waddch(win, attrs); 136886 151650 + refs[y][x]++; 136887 151651 + } else { … … 136889 151653 + } 136890 151654 + 136891 + if (x > last )136892 + x = last ;136893 + if (y > bottom)136894 + y = bottom;151655 + if (x > last_x) 151656 + x = last_x; 151657 + if (y > last_y) 151658 + y = last_y; 136895 151659 + 136896 151660 + if (++h == length) … … 136912 151676 + ? (y == 0 136913 151677 + ? upleft 136914 + : (y == bottom151678 + : (y == last_y 136915 151679 + ? lowleft 136916 151680 + : left)) 136917 + : (x == last 151681 + : (x == last_x 136918 151682 + ? (y == 0 136919 151683 + ? upright 136920 + : (y == bottom151684 + : (y == last_y 136921 151685 + ? lowright 136922 151686 + : right)) 136923 151687 + : (y == 0 136924 151688 + ? upper 136925 + : (y == bottom151689 + : (y == last_y 136926 151690 + ? lower 136927 151691 + : normal))))[w->orientation]; … … 136946 151710 + if (y < 0) 136947 151711 + y = 0; 136948 + waddch(win, w->attrs);151712 + waddch(win, attrs); 136949 151713 + 136950 151714 + w->ypos[h] = y; … … 136956 151720 +} 136957 151721 + 136958 +#if !defined(NCURSES_VERSION_PATCH) || (NCURSES_VERSION_PATCH < 20070915)136959 +static int136960 + use_window(WINDOW *win, int (*func) (WINDOW *, void *), void *data)151722 +#ifdef USE_PTHREADS 151723 +static bool 151724 +quit_worm(int bitnum) 136961 151725 +{ 136962 + return func(win, data); 151726 + pending |= (1 << bitnum); 151727 + napms(10); /* let the other thread(s) have a chance */ 151728 + pending &= ~(1 << bitnum); 151729 + return quitting; 136963 151730 +} 136964 +#endif 136965 + 136966 +#ifdef USE_PTHREADS 151731 + 136967 151732 +static void * 136968 151733 +start_worm(void *arg) 136969 151734 +{ 136970 + for (;;) { 136971 + napms(20); 136972 + use_window(stdscr, draw_worm, arg); 151735 + unsigned long compare = 0; 151736 + Trace(("start_worm")); 151737 + while (!quit_worm(((struct worm *) arg) - worm)) { 151738 + while (compare < sequence) { 151739 + ++compare; 151740 + use_window(stdscr, draw_worm, arg); 151741 + } 136973 151742 + } 151743 + Trace(("...start_worm (done)")); 136974 151744 + return NULL; 136975 151745 +} … … 137001 151771 +} 137002 151772 + 151773 +static int 151774 +get_input(void) 151775 +{ 151776 + int ch; 151777 + ch = USING_WINDOW(stdscr, wgetch); 151778 + return ch; 151779 +} 151780 + 151781 +#ifdef KEY_RESIZE 151782 +static int 151783 +update_refs(WINDOW *win) 151784 +{ 151785 + int x, y; 151786 + 151787 + (void) win; 151788 + if (last_x != COLS - 1) { 151789 + for (y = 0; y <= last_y; y++) { 151790 + refs[y] = typeRealloc(short, COLS, refs[y]); 151791 + for (x = last_x + 1; x < COLS; x++) 151792 + refs[y][x] = 0; 151793 + } 151794 + last_x = COLS - 1; 151795 + } 151796 + if (last_y != LINES - 1) { 151797 + for (y = LINES; y <= last_y; y++) 151798 + free(refs[y]); 151799 + refs = typeRealloc(short *, LINES, refs); 151800 + for (y = last_y + 1; y < LINES; y++) { 151801 + refs[y] = typeMalloc(short, COLS); 151802 + for (x = 0; x < COLS; x++) 151803 + refs[y][x] = 0; 151804 + } 151805 + last_y = LINES - 1; 151806 + } 151807 + return OK; 151808 +} 151809 +#endif 151810 + 137003 151811 int 137004 151812 main(int argc, char *argv[]) … … 137011 151819 - int h; 137012 151820 short *ip; 137013 151821 - int last, bottom; 137014 151822 bool done = FALSE; 137015 @@ -244,9 +390,6 @@ 151823 151824 setlocale(LC_ALL, ""); 151825 @@ -227,7 +424,7 @@ 151826 case 'l': 151827 if (++x == argc) 151828 goto usage; 151829 - if ((length = atoi(argv[x])) < 2 || length > 1024) { 151830 + if ((length = atoi(argv[x])) < 2 || length > MAX_LENGTH) { 151831 fprintf(stderr, "%s: Invalid length\n", *argv); 151832 ExitProgram(EXIT_FAILURE); 151833 } 151834 @@ -235,7 +432,7 @@ 151835 case 'n': 151836 if (++x == argc) 151837 goto usage; 151838 - if ((number = atoi(argv[x])) < 1 || number > 40) { 151839 + if ((number = atoi(argv[x])) < 1 || number > MAX_WORMS) { 151840 fprintf(stderr, "%s: Invalid number of worms\n", *argv); 151841 ExitProgram(EXIT_FAILURE); 151842 } 151843 @@ -244,9 +441,6 @@ 137016 151844 trail = '.'; 137017 151845 break; … … 137023 151851 trace_start = atoi(argv[++x]); 137024 151852 trace_end = atoi(argv[++x]); 137025 @@ -297,21 +440,24 @@ 151853 @@ -271,8 +465,8 @@ 151854 151855 curs_set(0); 151856 151857 - bottom = LINES - 1; 151858 - last = COLS - 1; 151859 + last_y = LINES - 1; 151860 + last_x = COLS - 1; 151861 151862 #ifdef A_COLOR 151863 if (has_colors()) { 151864 @@ -297,21 +491,24 @@ 137026 151865 } 137027 151866 #endif /* A_COLOR */ … … 137041 151880 /* if addressing the lower right corner doesn't work in your curses */ 137042 151881 - ref[bottom][last] = 1; 137043 + refs[ bottom][last] = 1;151882 + refs[last_y][last_x] = 1; 137044 151883 #endif /* BADCORNER */ 137045 151884 … … 137053 151892 fprintf(stderr, "%s: out of memory\n", *argv); 137054 151893 ExitProgram(EXIT_FAILURE); 137055 @@ -340,48 +486,43 @@ 151894 @@ -330,7 +527,7 @@ 151895 if (field) { 151896 const char *p; 151897 p = field; 151898 - for (y = bottom; --y >= 0;) { 151899 + for (y = last_y; --y >= 0;) { 151900 for (x = COLS; --x >= 0;) { 151901 addch((chtype) (*p++)); 151902 if (!*p) 151903 @@ -338,60 +535,40 @@ 151904 } 151905 } 137056 151906 } 137057 137058 151907 - napms(10); 151908 - refresh(); 137059 151909 -#ifndef TRACE 151910 + USING_WINDOW(stdscr, wrefresh); 137060 151911 nodelay(stdscr, TRUE); 137061 151912 -#endif … … 137071 151922 - getch(); 137072 151923 - } 137073 - 151924 + int ch; 151925 137074 151926 - if (singlestep && generation > trace_start && generation < trace_end) 137075 151927 - getch(); 137076 - 137077 - generation++; 137078 - } 137079 -#else 137080 int ch; 137081 137082 if ((ch = getch()) > 0) { 151928 + ++sequence; 151929 + if ((ch = get_input()) > 0) { 137083 151930 +#ifdef TRACE 137084 151931 + if (trace_start || trace_end) { 137085 151932 + if (generation == trace_start) { 137086 151933 + trace(TRACE_CALLS); 137087 + get ch();151934 + get_input(); 137088 151935 + } else if (generation == trace_end) { 137089 151936 + trace(0); 137090 + get ch();151937 + get_input(); 137091 151938 + } 137092 + 151939 151940 - generation++; 151941 - } 151942 -#else 151943 - int ch; 137093 151944 + generation++; 137094 151945 + } 137095 151946 +#endif 151947 151948 - if ((ch = getch()) > 0) { 137096 151949 #ifdef KEY_RESIZE 137097 151950 if (ch == KEY_RESIZE) { 137098 137099 151951 - if (last != COLS - 1) { 151952 - for (y = 0; y <= bottom; y++) { 137100 151953 - ref[y] = typeRealloc(short, COLS, ref[y]); 137101 + refs[y] = typeRealloc(short, COLS, refs[y]); 137102 for (x = last + 1; x < COLS; x++) 151954 - for (x = last + 1; x < COLS; x++) 137103 151955 - ref[y][x] = 0; 137104 + refs[y][x] = 0; 137105 } 137106 last = COLS - 1; 137107 } 137108 if (bottom != LINES - 1) { 137109 for (y = LINES; y <= bottom; y++) 151956 - } 151957 - last = COLS - 1; 151958 - } 151959 - if (bottom != LINES - 1) { 151960 - for (y = LINES; y <= bottom; y++) 137110 151961 - free(ref[y]); 137111 151962 - ref = typeRealloc(short *, LINES, ref); 137112 + free(refs[y]); 137113 + refs = typeRealloc(short *, LINES, refs); 137114 for (y = bottom + 1; y < LINES; y++) { 151963 - for (y = bottom + 1; y < LINES; y++) { 137115 151964 - ref[y] = typeMalloc(short, COLS); 137116 + refs[y] = typeMalloc(short, COLS); 137117 for (x = 0; x < COLS; x++) 151965 - for (x = 0; x < COLS; x++) 137118 151966 - ref[y][x] = 0; 137119 + refs[y][x] = 0; 137120 } 137121 bottom = LINES - 1; 137122 } 137123 @@ -400,55 +541,8 @@ 151967 - } 151968 - bottom = LINES - 1; 151969 - } 151970 + USING_WINDOW(stdscr, update_refs); 151971 } 151972 #endif 151973 + 151974 /* 151975 * Make it simple to put this into single-step mode, or resume 151976 * normal operation -T.Dickey 151977 */ 151978 if (ch == 'q') { 151979 + quitting = TRUE; 151980 done = TRUE; 151981 continue; 151982 } else if (ch == 's') { 151983 @@ -400,69 +577,32 @@ 137124 151984 nodelay(stdscr, TRUE); 137125 151985 } … … 137176 152036 + done = draw_all_worms(); 137177 152037 napms(10); 137178 refresh(); 152038 - refresh(); 152039 + USING_WINDOW(stdscr, wrefresh); 137179 152040 } 137180 @@ -456,9 +550,9 @@ 152041 152042 + Trace(("Cleanup")); 137181 152043 cleanup(); 137182 152044 #ifdef NO_LEAKS … … 137190 152052 free(w->xpos); 137191 152053 free(w->ypos); 152054 } 152055 #endif 152056 +#ifdef USE_PTHREADS 152057 + /* 152058 + * Do this just in case one of the threads did not really exit. 152059 + */ 152060 + Trace(("join all threads")); 152061 + for (n = 0; n < number; n++) { 152062 + pthread_join(worm[n].thread, NULL); 152063 + } 152064 +#endif 152065 ExitProgram(EXIT_SUCCESS); 152066 } 152067 diff -Naur ncurses-5.6.orig/test/xmas.c ncurses-5.6/test/xmas.c 152068 --- ncurses-5.6.orig/test/xmas.c 2006-05-20 11:35:47.000000000 -0400 152069 +++ ncurses-5.6/test/xmas.c 2008-06-18 06:49:49.000000000 -0400 152070 @@ -92,7 +92,7 @@ 152071 /******************************************************************************/ 152072 152073 /* 152074 - * $Id: xmas.c,v 1.22 2006/05/20 15:35:47 tom Exp $ 152075 + * $Id: xmas.c,v 1.23 2008/04/12 22:05:04 tom Exp $ 152076 */ 152077 #include <test.priv.h> 152078 152079 @@ -156,7 +156,7 @@ 152080 if (has_colors()) { 152081 int n = (color + 1); 152082 if (my_pairs == 0) 152083 - my_pairs = (bool *) calloc((unsigned) (COLORS + 1), sizeof(bool)); 152084 + my_pairs = typeCalloc(bool, COLORS + 1); 152085 if (!my_pairs[n]) { 152086 init_pair(n, color, my_bg); 152087 my_pairs[n] = TRUE;
Note:
See TracChangeset
for help on using the changeset viewer.
