Annotation of /trunk/ncurses/patches/ncurses-5.7-branch-update-20081213.patch
Parent Directory | Revision Log
Revision 714 -
(hide annotations)
(download)
Mon Dec 22 10:42:02 2008 UTC (15 years, 5 months ago) by niro
File size: 437920 byte(s)
Mon Dec 22 10:42:02 2008 UTC (15 years, 5 months ago) by niro
File size: 437920 byte(s)
added several ncurses patches
1 | niro | 714 | Submitted By: Jim Gifford (jim at linuxfromscratch dot org) |
2 | Date: 12-20-2008 | ||
3 | Initial Package Version: 5.7 | ||
4 | Origin: Upstream | ||
5 | Upstream Status: Applied | ||
6 | Description: This is a branch update for NCurses-5.7, and should be | ||
7 | rechecked periodically. This patch covers up to 5.7-20081213. | ||
8 | |||
9 | diff -Naur ncurses-5.7.orig/Ada95/samples/Makefile.in ncurses-5.7/Ada95/samples/Makefile.in | ||
10 | --- ncurses-5.7.orig/Ada95/samples/Makefile.in 2006-12-17 08:45:02.000000000 -0800 | ||
11 | +++ ncurses-5.7/Ada95/samples/Makefile.in 2008-12-20 14:47:10.000000000 -0800 | ||
12 | @@ -1,5 +1,5 @@ | ||
13 | ############################################################################## | ||
14 | -# Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. # | ||
15 | +# Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. # | ||
16 | # # | ||
17 | # Permission is hereby granted, free of charge, to any person obtaining a # | ||
18 | # copy of this software and associated documentation files (the "Software"), # | ||
19 | @@ -28,7 +28,7 @@ | ||
20 | # | ||
21 | # Author: Juergen Pfeifer, 1996 | ||
22 | # | ||
23 | -# $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
24 | +# $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
25 | # | ||
26 | .SUFFIXES: | ||
27 | |||
28 | @@ -145,7 +145,7 @@ | ||
29 | |||
30 | clean :: mostlyclean | ||
31 | rm -f *.o *.ali b_t*.* *.s $(PROGS) a.out core b_*_test.c *.xr[bs] \ | ||
32 | - explain.msg trace screendump | ||
33 | + explain.msg trace screendump b~*.ad[bs] | ||
34 | |||
35 | distclean :: clean | ||
36 | rm -f Makefile | ||
37 | diff -Naur ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb | ||
38 | --- ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb 2008-07-26 11:51:11.000000000 -0700 | ||
39 | +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 2008-12-20 14:47:10.000000000 -0800 | ||
40 | @@ -35,8 +35,8 @@ | ||
41 | ------------------------------------------------------------------------------ | ||
42 | -- Author: Juergen Pfeifer, 1996 | ||
43 | -- Version Control: | ||
44 | --- $Revision: 1.1 $ | ||
45 | --- $Date: 2008-12-22 10:40:11 $ | ||
46 | +-- $Revision: 1.1 $ | ||
47 | +-- $Date: 2008-12-22 10:40:11 $ | ||
48 | -- Binding Version 01.00 | ||
49 | ------------------------------------------------------------------------------ | ||
50 | with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux; | ||
51 | @@ -50,7 +50,7 @@ | ||
52 | function Has_Mouse return Boolean | ||
53 | is | ||
54 | function Mouse_Avail return C_Int; | ||
55 | - pragma Import (C, Mouse_Avail, "_nc_has_mouse"); | ||
56 | + pragma Import (C, Mouse_Avail, "has_mouse"); | ||
57 | begin | ||
58 | if Has_Key (Key_Mouse) or else Mouse_Avail /= 0 then | ||
59 | return True; | ||
60 | diff -Naur ncurses-5.7.orig/INSTALL ncurses-5.7/INSTALL | ||
61 | --- ncurses-5.7.orig/INSTALL 2008-11-02 13:13:51.000000000 -0800 | ||
62 | +++ ncurses-5.7/INSTALL 2008-12-20 14:47:08.000000000 -0800 | ||
63 | @@ -25,7 +25,7 @@ | ||
64 | -- sale, use or other dealings in this Software without prior written -- | ||
65 | -- authorization. -- | ||
66 | ------------------------------------------------------------------------------- | ||
67 | --- $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
68 | +-- $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
69 | --------------------------------------------------------------------- | ||
70 | How to install Ncurses/Terminfo on your system | ||
71 | --------------------------------------------------------------------- | ||
72 | @@ -975,6 +975,9 @@ | ||
73 | --without-dlsym | ||
74 | Do not use dlsym() to load GPM dynamically. | ||
75 | |||
76 | + --without-manpages | ||
77 | + Tell the configure script to suppress the install of ncurses' manpages. | ||
78 | + | ||
79 | --without-progs | ||
80 | Tell the configure script to suppress the build of ncurses' application | ||
81 | programs (e.g., tic). The test applications will still be built if you | ||
82 | diff -Naur ncurses-5.7.orig/MANIFEST ncurses-5.7/MANIFEST | ||
83 | --- ncurses-5.7.orig/MANIFEST 2008-10-25 16:47:24.000000000 -0700 | ||
84 | +++ ncurses-5.7/MANIFEST 2008-12-20 14:47:08.000000000 -0800 | ||
85 | @@ -640,6 +640,7 @@ | ||
86 | ./man/ncurses.3x | ||
87 | ./man/panel.3x | ||
88 | ./man/resizeterm.3x | ||
89 | +./man/tabs.1 | ||
90 | ./man/term.5 | ||
91 | ./man/term.7 | ||
92 | ./man/terminfo.head | ||
93 | @@ -947,6 +948,7 @@ | ||
94 | ./progs/infocmp.c | ||
95 | ./progs/modules | ||
96 | ./progs/progs.priv.h | ||
97 | +./progs/tabs.c | ||
98 | ./progs/tic.c | ||
99 | ./progs/toe.c | ||
100 | ./progs/tput.c | ||
101 | diff -Naur ncurses-5.7.orig/NEWS ncurses-5.7/NEWS | ||
102 | --- ncurses-5.7.orig/NEWS 2008-11-01 17:56:22.000000000 -0700 | ||
103 | +++ ncurses-5.7/NEWS 2008-12-20 14:47:16.000000000 -0800 | ||
104 | @@ -25,7 +25,7 @@ | ||
105 | -- sale, use or other dealings in this Software without prior written -- | ||
106 | -- authorization. -- | ||
107 | ------------------------------------------------------------------------------- | ||
108 | --- $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
109 | +-- $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
110 | ------------------------------------------------------------------------------- | ||
111 | |||
112 | This is a log of changes that ncurses has gone through since Zeyd started | ||
113 | @@ -45,6 +45,62 @@ | ||
114 | Changes through 1.9.9e did not credit all contributions; | ||
115 | it is not possible to add this information. | ||
116 | |||
117 | +20081213 | ||
118 | + + add check for failure to open hashed-database needed for db4.6 | ||
119 | + (GenToo #245370). | ||
120 | + + corrected --without-manpages option; previous change only suppressed | ||
121 | + the auxiliary rules install.man and uninstall.man | ||
122 | + + add case for FreeMINT to configure macro CF_XOPEN_SOURCE (patch from | ||
123 | + GenToo #250454). | ||
124 | + + fixes from NetBSD port at | ||
125 | + http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/devel/ncurses/patches | ||
126 | + patch-ac (build-fix for DragonFly) | ||
127 | + patch-ae (use INSTALL_SCRIPT for installing misc/ncurses*-config). | ||
128 | + + improve configure script macros CF_HEADER_PATH and CF_LIBRARY_PATH | ||
129 | + by adding CFLAGS, CPPFLAGS and LDFLAGS, LIBS values to the | ||
130 | + search-lists. | ||
131 | + + correct title string for keybound manpage (patch by Frederic Culot, | ||
132 | + OpenBSD documentation/6019), | ||
133 | + | ||
134 | +20081206 | ||
135 | + + move del_curterm() call from _nc_freeall() to _nc_leaks_tinfo() to | ||
136 | + work for progs/clear, progs/tabs, etc. | ||
137 | + + correct buffer-size after internal resizing of wide-character | ||
138 | + set_field_buffer(), broken in 20081018 changes (report by Mike Gran). | ||
139 | + + add "-i" option to test/filter.c to tell it to use initscr() rather | ||
140 | + than newterm(), to investigate report on comp.unix.programmer that | ||
141 | + ncurses would clear the screen in that case (it does not - the issue | ||
142 | + was xterm's alternate screen feature). | ||
143 | + + add check in mouse-driver to disable connection if GPM returns a | ||
144 | + zero, indicating that the connection is closed (Debian #506717, | ||
145 | + adapted from patch by Samuel Thibault). | ||
146 | + | ||
147 | +20081129 | ||
148 | + + improve a workaround in adding wide-characters, when a control | ||
149 | + character is found. The library (cf: 20040207) uses unctrl() to | ||
150 | + obtain a printable version of the control character, but was not | ||
151 | + passing color or video attributes. | ||
152 | + + improve test/ncurses.c 'a' test, using unctrl() more consistently to | ||
153 | + display meta-characters. | ||
154 | + + turn on _XOPEN_CURSES definition in curses.h | ||
155 | + + add eterm-color entry (report by Vincent Lefevre) -TD | ||
156 | + + correct use of key_name() in test/ncurses.c 'A' test, which only | ||
157 | + displays wide-characters, not key-codes since 20070612 (report by | ||
158 | + Ricardo Cantu). | ||
159 | + | ||
160 | +20081122 | ||
161 | + + change _nc_has_mouse() to has_mouse(), reflect its use in C++ and | ||
162 | + Ada95 (patch by Juergen Pfeifer). | ||
163 | + + document in TO-DO an issue with Cygwin's package for GNAT (report | ||
164 | + by Mike Dennison). | ||
165 | + + improve error-checking of command-line options in "tabs" program. | ||
166 | + | ||
167 | +20081115 | ||
168 | + + change several terminfo entries to make consistent use of ANSI | ||
169 | + clear-all-tabs -TD | ||
170 | + + add "tabs" program (prompted by Debian #502260). | ||
171 | + + add configure --without-manpages option (request by Mike Frysinger). | ||
172 | + | ||
173 | 20081102 5.7 release for upload to ftp.gnu.org | ||
174 | |||
175 | 20081025 | ||
176 | diff -Naur ncurses-5.7.orig/TO-DO ncurses-5.7/TO-DO | ||
177 | --- ncurses-5.7.orig/TO-DO 2008-10-11 12:22:27.000000000 -0700 | ||
178 | +++ ncurses-5.7/TO-DO 2008-12-20 14:47:12.000000000 -0800 | ||
179 | @@ -25,7 +25,7 @@ | ||
180 | -- sale, use or other dealings in this Software without prior written -- | ||
181 | -- authorization. -- | ||
182 | ------------------------------------------------------------------------------- | ||
183 | --- $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
184 | +-- $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
185 | ------------------------------------------------------------------------------- | ||
186 | |||
187 | SHORT-TERM TO-DO ITEMS: | ||
188 | @@ -45,7 +45,7 @@ | ||
189 | + Scrolling optimization has holes: for example, it forces repaints of the | ||
190 | screen between calls to refresh(). | ||
191 | |||
192 | -+ SVr4 uses slightly different rules for determining when softkeys are shown. | ||
193 | ++ SVr4 uses slightly different rules for determining when softkeys are shown. | ||
194 | For example, they are initially displayed (before the ncurses 'e' test | ||
195 | activates them), and a touchwin can apparently also force them to be | ||
196 | displayed. | ||
197 | @@ -58,7 +58,7 @@ | ||
198 | + The window classes defined in the c++ subdirectory need documentation. Some | ||
199 | C++ programmer could earn a lot of good karma by doing this... | ||
200 | |||
201 | -+ vid_attr() should support the set_a_attributes (sgr1) string, but does not. | ||
202 | ++ vid_attr() should support the set_a_attributes (sgr1) string, but does not. | ||
203 | There appear to be no terminals that require that functionality. | ||
204 | |||
205 | + the configure --disable-ext-funcs option does not work for Ada95 tree. | ||
206 | @@ -66,6 +66,24 @@ | ||
207 | + the --with-pthread configuration builds for Cygwin, but does not work | ||
208 | properly (test/worm.c shows all of the worms in the same location). | ||
209 | |||
210 | ++ the Ada95 tree requires a small fix to build on Cygwin, since the GNAT port | ||
211 | + to that platform provides an incomplete Interrupts.Names package. For | ||
212 | + instance (your gcc version may be different): | ||
213 | + /usr/lib/gcc/i686-pc-cygwin/3.4.4/adainclude/a-intnam.ads | ||
214 | + | ||
215 | + cut here... | ||
216 | +------------------------------------------------------------------------------- | ||
217 | +--- a-intnam.ads.orig 2003-10-21 13:41:51.000000000 +0000 | ||
218 | ++++ a-intnam.ads 2007-05-05 22:40:02.609375000 +0000 | ||
219 | +@@ -44,5 +44,6 @@ | ||
220 | + | ||
221 | + DUMMY_INTERRUPT_1 : constant Interrupt_ID := 1; | ||
222 | + DUMMY_INTERRUPT_2 : constant Interrupt_ID := 2; | ||
223 | ++ SIGINT : constant Interrupt_ID := 2; | ||
224 | + | ||
225 | + end Ada.Interrupts.Names; | ||
226 | +------------------------------------------------------------------------------- | ||
227 | + | ||
228 | + the --enable-rpath configure option builds for the corresponding platforms; | ||
229 | however combining it with --with-ticlib and --with-termlib does not always | ||
230 | produce libraries that can be run without setting environment variables. | ||
231 | @@ -122,7 +140,7 @@ | ||
232 | 2. DOS port | ||
233 | |||
234 | Only a few of the files in the library depend on the terminfo format. | ||
235 | -It should be possible to further kernelize the package, then rewrite | ||
236 | +It should be possible to further kernelize the package, then rewrite | ||
237 | a small number of core files to produce a functionally-compatible | ||
238 | port that would do updates to a memory-mapped screen area. The first | ||
239 | result of this would be a DOS port. | ||
240 | @@ -195,10 +213,10 @@ | ||
241 | move_insert, dest_tabs_magic_smso, transparent_underline, | ||
242 | needs_xon_xoff, hard_cursor. | ||
243 | Numerics: lines_of_memory, buttons. | ||
244 | - Strings: pkey_key, pkey_local, pkey_xmit, underline_char, | ||
245 | - enter_xon_mode, exit_xon_mode, xon_character, xoff_character, | ||
246 | + Strings: pkey_key, pkey_local, pkey_xmit, underline_char, | ||
247 | + enter_xon_mode, exit_xon_mode, xon_character, xoff_character, | ||
248 | display_clock, remove_clock, user[0-5], display_pc_char, | ||
249 | - enter_scancode_mode, exit_scancode_mode, pc_term_options, | ||
250 | + enter_scancode_mode, exit_scancode_mode, pc_term_options, | ||
251 | scancode_escape, alt_scancode_esc. | ||
252 | |||
253 | These are the potentially important ones for ncurses. Notes: | ||
254 | diff -Naur ncurses-5.7.orig/aclocal.m4 ncurses-5.7/aclocal.m4 | ||
255 | --- ncurses-5.7.orig/aclocal.m4 2008-10-25 15:15:32.000000000 -0700 | ||
256 | +++ ncurses-5.7/aclocal.m4 2008-12-20 14:47:16.000000000 -0800 | ||
257 | @@ -28,7 +28,7 @@ | ||
258 | dnl | ||
259 | dnl Author: Thomas E. Dickey 1995-on | ||
260 | dnl | ||
261 | -dnl $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
262 | +dnl $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
263 | dnl Macros used in NCURSES auto-configuration script. | ||
264 | dnl | ||
265 | dnl These macros are maintained separately from NCURSES. The copyright on | ||
266 | @@ -1998,11 +1998,31 @@ | ||
267 | ]) | ||
268 | ])dnl | ||
269 | dnl --------------------------------------------------------------------------- | ||
270 | -dnl CF_HEADER_PATH version: 8 updated: 2002/11/10 14:46:59 | ||
271 | +dnl CF_HEADER_PATH version: 9 updated: 2008/12/07 19:38:31 | ||
272 | dnl -------------- | ||
273 | -dnl Construct a search-list for a nonstandard header-file | ||
274 | +dnl Construct a search-list of directories for a nonstandard header-file | ||
275 | +dnl | ||
276 | +dnl Parameters | ||
277 | +dnl $1 = the variable to return as result | ||
278 | +dnl $2 = the package name | ||
279 | AC_DEFUN([CF_HEADER_PATH], | ||
280 | -[CF_SUBDIR_PATH($1,$2,include) | ||
281 | +[ | ||
282 | +cf_header_path_list="" | ||
283 | +if test -n "${CFLAGS}${CPPFLAGS}" ; then | ||
284 | + for cf_header_path in $CPPFLAGS $CFLAGS | ||
285 | + do | ||
286 | + case $cf_header_path in #(vi | ||
287 | + -I*) | ||
288 | + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` | ||
289 | + CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE) | ||
290 | + cf_header_path_list="$cf_header_path_list [$]$1" | ||
291 | + ;; | ||
292 | + esac | ||
293 | + done | ||
294 | +fi | ||
295 | + | ||
296 | +CF_SUBDIR_PATH($1,$2,include) | ||
297 | + | ||
298 | test "$includedir" != NONE && \ | ||
299 | test "$includedir" != "/usr/include" && \ | ||
300 | test -d "$includedir" && { | ||
301 | @@ -2017,6 +2037,7 @@ | ||
302 | test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2" | ||
303 | } | ||
304 | |||
305 | +$1="$cf_header_path_list [$]$1" | ||
306 | ])dnl | ||
307 | dnl --------------------------------------------------------------------------- | ||
308 | dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23 | ||
309 | @@ -2193,11 +2214,33 @@ | ||
310 | AC_SUBST(LDFLAGS_SHARED) | ||
311 | ]) | ||
312 | dnl --------------------------------------------------------------------------- | ||
313 | -dnl CF_LIBRARY_PATH version: 7 updated: 2002/11/10 14:46:59 | ||
314 | +dnl CF_LIBRARY_PATH version: 8 updated: 2008/12/07 19:38:31 | ||
315 | dnl --------------- | ||
316 | -dnl Construct a search-list for a nonstandard library-file | ||
317 | +dnl Construct a search-list of directories for a nonstandard library-file | ||
318 | +dnl | ||
319 | +dnl Parameters | ||
320 | +dnl $1 = the variable to return as result | ||
321 | +dnl $2 = the package name | ||
322 | AC_DEFUN([CF_LIBRARY_PATH], | ||
323 | -[CF_SUBDIR_PATH($1,$2,lib)])dnl | ||
324 | +[ | ||
325 | +cf_library_path_list="" | ||
326 | +if test -n "${LDFLAGS}${LIBS}" ; then | ||
327 | + for cf_library_path in $LDFLAGS $LIBS | ||
328 | + do | ||
329 | + case $cf_library_path in #(vi | ||
330 | + -L*) | ||
331 | + cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` | ||
332 | + CF_ADD_SUBDIR_PATH($1,$2,lib,$cf_library_path,NONE) | ||
333 | + cf_library_path_list="$cf_library_path_list [$]$1" | ||
334 | + ;; | ||
335 | + esac | ||
336 | + done | ||
337 | +fi | ||
338 | + | ||
339 | +CF_SUBDIR_PATH($1,$2,lib) | ||
340 | + | ||
341 | +$1="$cf_library_path_list [$]$1" | ||
342 | +])dnl | ||
343 | dnl --------------------------------------------------------------------------- | ||
344 | dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16 | ||
345 | dnl ------------- | ||
346 | @@ -2216,7 +2259,7 @@ | ||
347 | AC_SUBST(LIB_PREFIX) | ||
348 | ])dnl | ||
349 | dnl --------------------------------------------------------------------------- | ||
350 | -dnl CF_LIB_RULES version: 53 updated: 2008/09/20 19:51:59 | ||
351 | +dnl CF_LIB_RULES version: 55 updated: 2008/12/13 16:17:38 | ||
352 | dnl ------------ | ||
353 | dnl Append definitions and rules for the given models to the subdirectory | ||
354 | dnl Makefiles, and the recursion rule for the top-level Makefile. If the | ||
355 | @@ -2504,18 +2547,28 @@ | ||
356 | install.libs uninstall.libs \\ | ||
357 | install.data uninstall.data :: | ||
358 | $MAKE_TERMINFO cd misc && \${MAKE} \${CF_MFLAGS} \[$]@ | ||
359 | +CF_EOF | ||
360 | + | ||
361 | +if test "x$cf_with_manpages" = xyes; then | ||
362 | +cat >> Makefile <<CF_EOF | ||
363 | |||
364 | install.man \\ | ||
365 | uninstall.man :: | ||
366 | cd man && \${MAKE} \${CF_MFLAGS} \[$]@ | ||
367 | +CF_EOF | ||
368 | +fi | ||
369 | + | ||
370 | +cat >> Makefile <<CF_EOF | ||
371 | |||
372 | distclean :: | ||
373 | rm -f config.cache config.log config.status Makefile include/ncurses_cfg.h | ||
374 | rm -f headers.sh headers.sed mk_shared_lib.sh | ||
375 | + rm -f edit_man.* man_alias.* | ||
376 | rm -rf \${DIRS_TO_MAKE} | ||
377 | CF_EOF | ||
378 | |||
379 | # Special case: tack's manpage lives in its own directory. | ||
380 | +if test "x$cf_with_manpages" = xyes; then | ||
381 | if test -d tack ; then | ||
382 | if test -f $srcdir/$tack.h; then | ||
383 | cat >> Makefile <<CF_EOF | ||
384 | @@ -2526,6 +2579,7 @@ | ||
385 | CF_EOF | ||
386 | fi | ||
387 | fi | ||
388 | +fi | ||
389 | |||
390 | dnl If we're installing into a subdirectory of /usr/include, etc., we should | ||
391 | dnl prepend the subdirectory's name to the "#include" paths. It won't hurt | ||
392 | @@ -4003,7 +4057,7 @@ | ||
393 | esac | ||
394 | ])dnl | ||
395 | dnl --------------------------------------------------------------------------- | ||
396 | -dnl CF_PROG_LDCONFIG version: 1 updated: 2003/09/20 17:07:55 | ||
397 | +dnl CF_PROG_LDCONFIG version: 2 updated: 2008/12/13 14:08:40 | ||
398 | dnl ---------------- | ||
399 | dnl Check for ldconfig, needed to fixup shared libraries that would be built | ||
400 | dnl and then used in the install. | ||
401 | @@ -4012,7 +4066,7 @@ | ||
402 | LDCONFIG=: | ||
403 | else | ||
404 | case "$cf_cv_system_name" in #(vi | ||
405 | -freebsd*) #(vi | ||
406 | +dragonfly*|freebsd*) #(vi | ||
407 | test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R" | ||
408 | ;; | ||
409 | *) LDPATH=$PATH:/sbin:/usr/sbin | ||
410 | @@ -4642,7 +4696,7 @@ | ||
411 | fi | ||
412 | ])dnl | ||
413 | dnl --------------------------------------------------------------------------- | ||
414 | -dnl CF_SRC_MODULES version: 18 updated: 2005/05/28 12:58:54 | ||
415 | +dnl CF_SRC_MODULES version: 19 updated: 2008/12/13 16:10:19 | ||
416 | dnl -------------- | ||
417 | dnl For each parameter, test if the source-directory exists, and if it contains | ||
418 | dnl a 'modules' file. If so, add to the list $cf_cv_src_modules which we'll | ||
419 | @@ -4717,7 +4771,11 @@ | ||
420 | AC_SUBST(TEST_ARG2) | ||
421 | AC_SUBST(TEST_DEP2) | ||
422 | |||
423 | -SRC_SUBDIRS="man include" | ||
424 | +SRC_SUBDIRS= | ||
425 | +if test "x$cf_with_manpages" != xno ; then | ||
426 | + SRC_SUBDIRS="$SRC_SUBDIRS man" | ||
427 | +fi | ||
428 | +SRC_SUBDIRS="$SRC_SUBDIRS include" | ||
429 | for cf_dir in $cf_cv_src_modules | ||
430 | do | ||
431 | SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir" | ||
432 | @@ -5535,7 +5593,7 @@ | ||
433 | [USE_VALGRIND]) | ||
434 | ])dnl | ||
435 | dnl --------------------------------------------------------------------------- | ||
436 | -dnl CF_XOPEN_SOURCE version: 26 updated: 2008/07/27 11:26:57 | ||
437 | +dnl CF_XOPEN_SOURCE version: 27 updated: 2008/12/13 14:08:40 | ||
438 | dnl --------------- | ||
439 | dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, | ||
440 | dnl or adapt to the vendor's definitions to get equivalent functionality, | ||
441 | @@ -5569,7 +5627,7 @@ | ||
442 | irix[[56]].*) #(vi | ||
443 | CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" | ||
444 | ;; | ||
445 | -linux*|gnu*|k*bsd*-gnu) #(vi | ||
446 | +linux*|gnu*|mint*|k*bsd*-gnu) #(vi | ||
447 | CF_GNU_SOURCE | ||
448 | ;; | ||
449 | mirbsd*) #(vi | ||
450 | diff -Naur ncurses-5.7.orig/c++/cursesw.cc ncurses-5.7/c++/cursesw.cc | ||
451 | --- ncurses-5.7.orig/c++/cursesw.cc 2007-12-15 15:01:57.000000000 -0800 | ||
452 | +++ ncurses-5.7/c++/cursesw.cc 2008-12-20 14:47:10.000000000 -0800 | ||
453 | @@ -1,6 +1,6 @@ | ||
454 | // * this is for making emacs happy: -*-Mode: C++;-*- | ||
455 | /**************************************************************************** | ||
456 | - * Copyright (c) 2007 Free Software Foundation, Inc. * | ||
457 | + * Copyright (c) 2007,2008 Free Software Foundation, Inc. * | ||
458 | * * | ||
459 | * Permission is hereby granted, free of charge, to any person obtaining a * | ||
460 | * copy of this software and associated documentation files (the * | ||
461 | @@ -42,7 +42,7 @@ | ||
462 | #include "internal.h" | ||
463 | #include "cursesw.h" | ||
464 | |||
465 | -MODULE_ID("$Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $") | ||
466 | +MODULE_ID("$Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $") | ||
467 | |||
468 | #define COLORS_NEED_INITIALIZATION -1 | ||
469 | #define COLORS_NOT_INITIALIZED 0 | ||
470 | @@ -287,7 +287,6 @@ | ||
471 | { | ||
472 | initialize(); | ||
473 | w = win; | ||
474 | - assert((w->_maxx +1 ) == ncols); | ||
475 | } | ||
476 | |||
477 | int _nc_xx_ripoff_init(WINDOW *w, int ncols) | ||
478 | @@ -464,7 +463,7 @@ | ||
479 | #if HAVE_HAS_KEY | ||
480 | bool NCursesWindow::has_mouse() const | ||
481 | { | ||
482 | - return ((::has_key(KEY_MOUSE) || ::_nc_has_mouse()) | ||
483 | + return ((::has_key(KEY_MOUSE) || ::has_mouse()) | ||
484 | ? TRUE : FALSE); | ||
485 | } | ||
486 | #endif | ||
487 | diff -Naur ncurses-5.7.orig/configure ncurses-5.7/configure | ||
488 | --- ncurses-5.7.orig/configure 2008-10-25 17:04:38.000000000 -0700 | ||
489 | +++ ncurses-5.7/configure 2008-12-20 14:47:16.000000000 -0800 | ||
490 | @@ -1,5 +1,5 @@ | ||
491 | #! /bin/sh | ||
492 | -# From configure.in Revision: 1.454 . | ||
493 | +# From configure.in Revision: 1.456 . | ||
494 | # Guess values for system-dependent variables and create Makefiles. | ||
495 | # Generated by Autoconf 2.52.20080325. | ||
496 | # | ||
497 | @@ -697,6 +697,7 @@ | ||
498 | --without-cxx do not adjust ncurses bool to match C++ | ||
499 | --without-cxx-binding do not build C++ binding and demo | ||
500 | --without-ada suppress check for Ada95, don't build demo | ||
501 | + --without-manpages suppress install of manpages | ||
502 | --without-progs suppress build with programs (e.g., tic) | ||
503 | --without-curses-h install curses.h as ncurses.h only | ||
504 | --enable-mixed-case tic should assume mixed-case filenames | ||
505 | @@ -994,7 +995,7 @@ | ||
506 | fi | ||
507 | for ac_site_file in $CONFIG_SITE; do | ||
508 | if test -r "$ac_site_file"; then | ||
509 | - { echo "$as_me:997: loading site script $ac_site_file" >&5 | ||
510 | + { echo "$as_me:998: loading site script $ac_site_file" >&5 | ||
511 | echo "$as_me: loading site script $ac_site_file" >&6;} | ||
512 | cat "$ac_site_file" >&5 | ||
513 | . "$ac_site_file" | ||
514 | @@ -1005,7 +1006,7 @@ | ||
515 | # Some versions of bash will fail to source /dev/null (special | ||
516 | # files actually), so we avoid doing that. | ||
517 | if test -f "$cache_file"; then | ||
518 | - { echo "$as_me:1008: loading cache $cache_file" >&5 | ||
519 | + { echo "$as_me:1009: loading cache $cache_file" >&5 | ||
520 | echo "$as_me: loading cache $cache_file" >&6;} | ||
521 | case $cache_file in | ||
522 | [\\/]* | ?:[\\/]* ) . $cache_file;; | ||
523 | @@ -1013,7 +1014,7 @@ | ||
524 | esac | ||
525 | fi | ||
526 | else | ||
527 | - { echo "$as_me:1016: creating cache $cache_file" >&5 | ||
528 | + { echo "$as_me:1017: creating cache $cache_file" >&5 | ||
529 | echo "$as_me: creating cache $cache_file" >&6;} | ||
530 | >$cache_file | ||
531 | fi | ||
532 | @@ -1029,21 +1030,21 @@ | ||
533 | eval ac_new_val="\$ac_env_${ac_var}_value" | ||
534 | case $ac_old_set,$ac_new_set in | ||
535 | set,) | ||
536 | - { echo "$as_me:1032: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 | ||
537 | + { echo "$as_me:1033: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 | ||
538 | echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} | ||
539 | ac_cache_corrupted=: ;; | ||
540 | ,set) | ||
541 | - { echo "$as_me:1036: error: \`$ac_var' was not set in the previous run" >&5 | ||
542 | + { echo "$as_me:1037: error: \`$ac_var' was not set in the previous run" >&5 | ||
543 | echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} | ||
544 | ac_cache_corrupted=: ;; | ||
545 | ,);; | ||
546 | *) | ||
547 | if test "x$ac_old_val" != "x$ac_new_val"; then | ||
548 | - { echo "$as_me:1042: error: \`$ac_var' has changed since the previous run:" >&5 | ||
549 | + { echo "$as_me:1043: error: \`$ac_var' has changed since the previous run:" >&5 | ||
550 | echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} | ||
551 | - { echo "$as_me:1044: former value: $ac_old_val" >&5 | ||
552 | + { echo "$as_me:1045: former value: $ac_old_val" >&5 | ||
553 | echo "$as_me: former value: $ac_old_val" >&2;} | ||
554 | - { echo "$as_me:1046: current value: $ac_new_val" >&5 | ||
555 | + { echo "$as_me:1047: current value: $ac_new_val" >&5 | ||
556 | echo "$as_me: current value: $ac_new_val" >&2;} | ||
557 | ac_cache_corrupted=: | ||
558 | fi;; | ||
559 | @@ -1062,9 +1063,9 @@ | ||
560 | fi | ||
561 | done | ||
562 | if $ac_cache_corrupted; then | ||
563 | - { echo "$as_me:1065: error: changes in the environment can compromise the build" >&5 | ||
564 | + { echo "$as_me:1066: error: changes in the environment can compromise the build" >&5 | ||
565 | echo "$as_me: error: changes in the environment can compromise the build" >&2;} | ||
566 | - { { echo "$as_me:1067: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 | ||
567 | + { { echo "$as_me:1068: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 | ||
568 | echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} | ||
569 | { (exit 1); exit 1; }; } | ||
570 | fi | ||
571 | @@ -1085,10 +1086,10 @@ | ||
572 | echo "#! $SHELL" >conftest.sh | ||
573 | echo "exit 0" >>conftest.sh | ||
574 | chmod +x conftest.sh | ||
575 | -if { (echo "$as_me:1088: PATH=\".;.\"; conftest.sh") >&5 | ||
576 | +if { (echo "$as_me:1089: PATH=\".;.\"; conftest.sh") >&5 | ||
577 | (PATH=".;."; conftest.sh) 2>&5 | ||
578 | ac_status=$? | ||
579 | - echo "$as_me:1091: \$? = $ac_status" >&5 | ||
580 | + echo "$as_me:1092: \$? = $ac_status" >&5 | ||
581 | (exit $ac_status); }; then | ||
582 | ac_path_separator=';' | ||
583 | else | ||
584 | @@ -1101,7 +1102,7 @@ | ||
585 | |||
586 | top_builddir=`pwd` | ||
587 | |||
588 | -echo "$as_me:1104: checking for egrep" >&5 | ||
589 | +echo "$as_me:1105: checking for egrep" >&5 | ||
590 | echo $ECHO_N "checking for egrep... $ECHO_C" >&6 | ||
591 | if test "${ac_cv_prog_egrep+set}" = set; then | ||
592 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
593 | @@ -1111,11 +1112,11 @@ | ||
594 | else ac_cv_prog_egrep='egrep' | ||
595 | fi | ||
596 | fi | ||
597 | -echo "$as_me:1114: result: $ac_cv_prog_egrep" >&5 | ||
598 | +echo "$as_me:1115: result: $ac_cv_prog_egrep" >&5 | ||
599 | echo "${ECHO_T}$ac_cv_prog_egrep" >&6 | ||
600 | EGREP=$ac_cv_prog_egrep | ||
601 | |||
602 | -test -z "$EGREP" && { { echo "$as_me:1118: error: No egrep program found" >&5 | ||
603 | +test -z "$EGREP" && { { echo "$as_me:1119: error: No egrep program found" >&5 | ||
604 | echo "$as_me: error: No egrep program found" >&2;} | ||
605 | { (exit 1); exit 1; }; } | ||
606 | |||
607 | @@ -1125,7 +1126,7 @@ | ||
608 | cf_cv_abi_version=${NCURSES_MAJOR} | ||
609 | cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} | ||
610 | cf_cv_timestamp=`date` | ||
611 | -echo "$as_me:1128: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 | ||
612 | +echo "$as_me:1129: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 | ||
613 | echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 | ||
614 | |||
615 | test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0 | ||
616 | @@ -1133,7 +1134,7 @@ | ||
617 | # Check whether --with-rel-version or --without-rel-version was given. | ||
618 | if test "${with_rel_version+set}" = set; then | ||
619 | withval="$with_rel_version" | ||
620 | - { echo "$as_me:1136: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 | ||
621 | + { echo "$as_me:1137: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 | ||
622 | echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;} | ||
623 | cf_cv_rel_version=$withval | ||
624 | fi; | ||
625 | @@ -1146,13 +1147,13 @@ | ||
626 | [0-9]*) #(vi | ||
627 | ;; | ||
628 | *) | ||
629 | - { { echo "$as_me:1149: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 | ||
630 | + { { echo "$as_me:1150: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 | ||
631 | echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;} | ||
632 | { (exit 1); exit 1; }; } | ||
633 | ;; | ||
634 | esac | ||
635 | else | ||
636 | - { { echo "$as_me:1155: error: Release major-version value is empty" >&5 | ||
637 | + { { echo "$as_me:1156: error: Release major-version value is empty" >&5 | ||
638 | echo "$as_me: error: Release major-version value is empty" >&2;} | ||
639 | { (exit 1); exit 1; }; } | ||
640 | fi | ||
641 | @@ -1162,13 +1163,13 @@ | ||
642 | [0-9]*) #(vi | ||
643 | ;; | ||
644 | *) | ||
645 | - { { echo "$as_me:1165: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 | ||
646 | + { { echo "$as_me:1166: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 | ||
647 | echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;} | ||
648 | { (exit 1); exit 1; }; } | ||
649 | ;; | ||
650 | esac | ||
651 | else | ||
652 | - { { echo "$as_me:1171: error: Release minor-version value is empty" >&5 | ||
653 | + { { echo "$as_me:1172: error: Release minor-version value is empty" >&5 | ||
654 | echo "$as_me: error: Release minor-version value is empty" >&2;} | ||
655 | { (exit 1); exit 1; }; } | ||
656 | fi | ||
657 | @@ -1178,7 +1179,7 @@ | ||
658 | # Check whether --with-abi-version or --without-abi-version was given. | ||
659 | if test "${with_abi_version+set}" = set; then | ||
660 | withval="$with_abi_version" | ||
661 | - { echo "$as_me:1181: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 | ||
662 | + { echo "$as_me:1182: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 | ||
663 | echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;} | ||
664 | cf_cv_abi_version=$withval | ||
665 | fi; | ||
666 | @@ -1188,13 +1189,13 @@ | ||
667 | [0-9]*) #(vi | ||
668 | ;; | ||
669 | *) | ||
670 | - { { echo "$as_me:1191: error: ABI version is not a number: $cf_cv_abi_version" >&5 | ||
671 | + { { echo "$as_me:1192: error: ABI version is not a number: $cf_cv_abi_version" >&5 | ||
672 | echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;} | ||
673 | { (exit 1); exit 1; }; } | ||
674 | ;; | ||
675 | esac | ||
676 | else | ||
677 | - { { echo "$as_me:1197: error: ABI version value is empty" >&5 | ||
678 | + { { echo "$as_me:1198: error: ABI version value is empty" >&5 | ||
679 | echo "$as_me: error: ABI version value is empty" >&2;} | ||
680 | { (exit 1); exit 1; }; } | ||
681 | fi | ||
682 | @@ -1216,7 +1217,7 @@ | ||
683 | fi | ||
684 | done | ||
685 | if test -z "$ac_aux_dir"; then | ||
686 | - { { echo "$as_me:1219: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 | ||
687 | + { { echo "$as_me:1220: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 | ||
688 | echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} | ||
689 | { (exit 1); exit 1; }; } | ||
690 | fi | ||
691 | @@ -1226,11 +1227,11 @@ | ||
692 | |||
693 | # Make sure we can run config.sub. | ||
694 | $ac_config_sub sun4 >/dev/null 2>&1 || | ||
695 | - { { echo "$as_me:1229: error: cannot run $ac_config_sub" >&5 | ||
696 | + { { echo "$as_me:1230: error: cannot run $ac_config_sub" >&5 | ||
697 | echo "$as_me: error: cannot run $ac_config_sub" >&2;} | ||
698 | { (exit 1); exit 1; }; } | ||
699 | |||
700 | -echo "$as_me:1233: checking build system type" >&5 | ||
701 | +echo "$as_me:1234: checking build system type" >&5 | ||
702 | echo $ECHO_N "checking build system type... $ECHO_C" >&6 | ||
703 | if test "${ac_cv_build+set}" = set; then | ||
704 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
705 | @@ -1239,23 +1240,23 @@ | ||
706 | test -z "$ac_cv_build_alias" && | ||
707 | ac_cv_build_alias=`$ac_config_guess` | ||
708 | test -z "$ac_cv_build_alias" && | ||
709 | - { { echo "$as_me:1242: error: cannot guess build type; you must specify one" >&5 | ||
710 | + { { echo "$as_me:1243: error: cannot guess build type; you must specify one" >&5 | ||
711 | echo "$as_me: error: cannot guess build type; you must specify one" >&2;} | ||
712 | { (exit 1); exit 1; }; } | ||
713 | ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || | ||
714 | - { { echo "$as_me:1246: error: $ac_config_sub $ac_cv_build_alias failed." >&5 | ||
715 | + { { echo "$as_me:1247: error: $ac_config_sub $ac_cv_build_alias failed." >&5 | ||
716 | echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} | ||
717 | { (exit 1); exit 1; }; } | ||
718 | |||
719 | fi | ||
720 | -echo "$as_me:1251: result: $ac_cv_build" >&5 | ||
721 | +echo "$as_me:1252: result: $ac_cv_build" >&5 | ||
722 | echo "${ECHO_T}$ac_cv_build" >&6 | ||
723 | build=$ac_cv_build | ||
724 | build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | ||
725 | build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` | ||
726 | build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | ||
727 | |||
728 | -echo "$as_me:1258: checking host system type" >&5 | ||
729 | +echo "$as_me:1259: checking host system type" >&5 | ||
730 | echo $ECHO_N "checking host system type... $ECHO_C" >&6 | ||
731 | if test "${ac_cv_host+set}" = set; then | ||
732 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
733 | @@ -1264,12 +1265,12 @@ | ||
734 | test -z "$ac_cv_host_alias" && | ||
735 | ac_cv_host_alias=$ac_cv_build_alias | ||
736 | ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || | ||
737 | - { { echo "$as_me:1267: error: $ac_config_sub $ac_cv_host_alias failed" >&5 | ||
738 | + { { echo "$as_me:1268: error: $ac_config_sub $ac_cv_host_alias failed" >&5 | ||
739 | echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} | ||
740 | { (exit 1); exit 1; }; } | ||
741 | |||
742 | fi | ||
743 | -echo "$as_me:1272: result: $ac_cv_host" >&5 | ||
744 | +echo "$as_me:1273: result: $ac_cv_host" >&5 | ||
745 | echo "${ECHO_T}$ac_cv_host" >&6 | ||
746 | host=$ac_cv_host | ||
747 | host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | ||
748 | @@ -1277,7 +1278,7 @@ | ||
749 | host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | ||
750 | |||
751 | if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then | ||
752 | - echo "$as_me:1280: checking target system type" >&5 | ||
753 | + echo "$as_me:1281: checking target system type" >&5 | ||
754 | echo $ECHO_N "checking target system type... $ECHO_C" >&6 | ||
755 | if test "${ac_cv_target+set}" = set; then | ||
756 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
757 | @@ -1286,12 +1287,12 @@ | ||
758 | test "x$ac_cv_target_alias" = "x" && | ||
759 | ac_cv_target_alias=$ac_cv_host_alias | ||
760 | ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || | ||
761 | - { { echo "$as_me:1289: error: $ac_config_sub $ac_cv_target_alias failed" >&5 | ||
762 | + { { echo "$as_me:1290: error: $ac_config_sub $ac_cv_target_alias failed" >&5 | ||
763 | echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} | ||
764 | { (exit 1); exit 1; }; } | ||
765 | |||
766 | fi | ||
767 | -echo "$as_me:1294: result: $ac_cv_target" >&5 | ||
768 | +echo "$as_me:1295: result: $ac_cv_target" >&5 | ||
769 | echo "${ECHO_T}$ac_cv_target" >&6 | ||
770 | target=$ac_cv_target | ||
771 | target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | ||
772 | @@ -1322,13 +1323,13 @@ | ||
773 | fi | ||
774 | |||
775 | test -z "$system_name" && system_name="$cf_cv_system_name" | ||
776 | -test -n "$cf_cv_system_name" && echo "$as_me:1325: result: Configuring for $cf_cv_system_name" >&5 | ||
777 | +test -n "$cf_cv_system_name" && echo "$as_me:1326: result: Configuring for $cf_cv_system_name" >&5 | ||
778 | echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 | ||
779 | |||
780 | if test ".$system_name" != ".$cf_cv_system_name" ; then | ||
781 | - echo "$as_me:1329: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 | ||
782 | + echo "$as_me:1330: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 | ||
783 | echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 | ||
784 | - { { echo "$as_me:1331: error: \"Please remove config.cache and try again.\"" >&5 | ||
785 | + { { echo "$as_me:1332: error: \"Please remove config.cache and try again.\"" >&5 | ||
786 | echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} | ||
787 | { (exit 1); exit 1; }; } | ||
788 | fi | ||
789 | @@ -1336,7 +1337,7 @@ | ||
790 | # Check whether --with-system-type or --without-system-type was given. | ||
791 | if test "${with_system_type+set}" = set; then | ||
792 | withval="$with_system_type" | ||
793 | - { echo "$as_me:1339: WARNING: overriding system type to $withval" >&5 | ||
794 | + { echo "$as_me:1340: WARNING: overriding system type to $withval" >&5 | ||
795 | echo "$as_me: WARNING: overriding system type to $withval" >&2;} | ||
796 | cf_cv_system_name=$withval | ||
797 | fi; | ||
798 | @@ -1346,7 +1347,7 @@ | ||
799 | |||
800 | ### Default install-location | ||
801 | |||
802 | -echo "$as_me:1349: checking for prefix" >&5 | ||
803 | +echo "$as_me:1350: checking for prefix" >&5 | ||
804 | echo $ECHO_N "checking for prefix... $ECHO_C" >&6 | ||
805 | if test "x$prefix" = "xNONE" ; then | ||
806 | case "$cf_cv_system_name" in | ||
807 | @@ -1358,11 +1359,11 @@ | ||
808 | ;; | ||
809 | esac | ||
810 | fi | ||
811 | -echo "$as_me:1361: result: $prefix" >&5 | ||
812 | +echo "$as_me:1362: result: $prefix" >&5 | ||
813 | echo "${ECHO_T}$prefix" >&6 | ||
814 | |||
815 | if test "x$prefix" = "xNONE" ; then | ||
816 | -echo "$as_me:1365: checking for default include-directory" >&5 | ||
817 | +echo "$as_me:1366: checking for default include-directory" >&5 | ||
818 | echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6 | ||
819 | test -n "$verbose" && echo 1>&6 | ||
820 | for cf_symbol in \ | ||
821 | @@ -1385,7 +1386,7 @@ | ||
822 | fi | ||
823 | test -n "$verbose" && echo " tested $cf_dir" 1>&6 | ||
824 | done | ||
825 | -echo "$as_me:1388: result: $includedir" >&5 | ||
826 | +echo "$as_me:1389: result: $includedir" >&5 | ||
827 | echo "${ECHO_T}$includedir" >&6 | ||
828 | fi | ||
829 | |||
830 | @@ -1399,7 +1400,7 @@ | ||
831 | if test -n "$ac_tool_prefix"; then | ||
832 | # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. | ||
833 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 | ||
834 | -echo "$as_me:1402: checking for $ac_word" >&5 | ||
835 | +echo "$as_me:1403: checking for $ac_word" >&5 | ||
836 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
837 | if test "${ac_cv_prog_CC+set}" = set; then | ||
838 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
839 | @@ -1414,7 +1415,7 @@ | ||
840 | test -z "$ac_dir" && ac_dir=. | ||
841 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
842 | ac_cv_prog_CC="${ac_tool_prefix}gcc" | ||
843 | -echo "$as_me:1417: found $ac_dir/$ac_word" >&5 | ||
844 | +echo "$as_me:1418: found $ac_dir/$ac_word" >&5 | ||
845 | break | ||
846 | done | ||
847 | |||
848 | @@ -1422,10 +1423,10 @@ | ||
849 | fi | ||
850 | CC=$ac_cv_prog_CC | ||
851 | if test -n "$CC"; then | ||
852 | - echo "$as_me:1425: result: $CC" >&5 | ||
853 | + echo "$as_me:1426: result: $CC" >&5 | ||
854 | echo "${ECHO_T}$CC" >&6 | ||
855 | else | ||
856 | - echo "$as_me:1428: result: no" >&5 | ||
857 | + echo "$as_me:1429: result: no" >&5 | ||
858 | echo "${ECHO_T}no" >&6 | ||
859 | fi | ||
860 | |||
861 | @@ -1434,7 +1435,7 @@ | ||
862 | ac_ct_CC=$CC | ||
863 | # Extract the first word of "gcc", so it can be a program name with args. | ||
864 | set dummy gcc; ac_word=$2 | ||
865 | -echo "$as_me:1437: checking for $ac_word" >&5 | ||
866 | +echo "$as_me:1438: checking for $ac_word" >&5 | ||
867 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
868 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | ||
869 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
870 | @@ -1449,7 +1450,7 @@ | ||
871 | test -z "$ac_dir" && ac_dir=. | ||
872 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
873 | ac_cv_prog_ac_ct_CC="gcc" | ||
874 | -echo "$as_me:1452: found $ac_dir/$ac_word" >&5 | ||
875 | +echo "$as_me:1453: found $ac_dir/$ac_word" >&5 | ||
876 | break | ||
877 | done | ||
878 | |||
879 | @@ -1457,10 +1458,10 @@ | ||
880 | fi | ||
881 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | ||
882 | if test -n "$ac_ct_CC"; then | ||
883 | - echo "$as_me:1460: result: $ac_ct_CC" >&5 | ||
884 | + echo "$as_me:1461: result: $ac_ct_CC" >&5 | ||
885 | echo "${ECHO_T}$ac_ct_CC" >&6 | ||
886 | else | ||
887 | - echo "$as_me:1463: result: no" >&5 | ||
888 | + echo "$as_me:1464: result: no" >&5 | ||
889 | echo "${ECHO_T}no" >&6 | ||
890 | fi | ||
891 | |||
892 | @@ -1473,7 +1474,7 @@ | ||
893 | if test -n "$ac_tool_prefix"; then | ||
894 | # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. | ||
895 | set dummy ${ac_tool_prefix}cc; ac_word=$2 | ||
896 | -echo "$as_me:1476: checking for $ac_word" >&5 | ||
897 | +echo "$as_me:1477: checking for $ac_word" >&5 | ||
898 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
899 | if test "${ac_cv_prog_CC+set}" = set; then | ||
900 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
901 | @@ -1488,7 +1489,7 @@ | ||
902 | test -z "$ac_dir" && ac_dir=. | ||
903 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
904 | ac_cv_prog_CC="${ac_tool_prefix}cc" | ||
905 | -echo "$as_me:1491: found $ac_dir/$ac_word" >&5 | ||
906 | +echo "$as_me:1492: found $ac_dir/$ac_word" >&5 | ||
907 | break | ||
908 | done | ||
909 | |||
910 | @@ -1496,10 +1497,10 @@ | ||
911 | fi | ||
912 | CC=$ac_cv_prog_CC | ||
913 | if test -n "$CC"; then | ||
914 | - echo "$as_me:1499: result: $CC" >&5 | ||
915 | + echo "$as_me:1500: result: $CC" >&5 | ||
916 | echo "${ECHO_T}$CC" >&6 | ||
917 | else | ||
918 | - echo "$as_me:1502: result: no" >&5 | ||
919 | + echo "$as_me:1503: result: no" >&5 | ||
920 | echo "${ECHO_T}no" >&6 | ||
921 | fi | ||
922 | |||
923 | @@ -1508,7 +1509,7 @@ | ||
924 | ac_ct_CC=$CC | ||
925 | # Extract the first word of "cc", so it can be a program name with args. | ||
926 | set dummy cc; ac_word=$2 | ||
927 | -echo "$as_me:1511: checking for $ac_word" >&5 | ||
928 | +echo "$as_me:1512: checking for $ac_word" >&5 | ||
929 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
930 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | ||
931 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
932 | @@ -1523,7 +1524,7 @@ | ||
933 | test -z "$ac_dir" && ac_dir=. | ||
934 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
935 | ac_cv_prog_ac_ct_CC="cc" | ||
936 | -echo "$as_me:1526: found $ac_dir/$ac_word" >&5 | ||
937 | +echo "$as_me:1527: found $ac_dir/$ac_word" >&5 | ||
938 | break | ||
939 | done | ||
940 | |||
941 | @@ -1531,10 +1532,10 @@ | ||
942 | fi | ||
943 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | ||
944 | if test -n "$ac_ct_CC"; then | ||
945 | - echo "$as_me:1534: result: $ac_ct_CC" >&5 | ||
946 | + echo "$as_me:1535: result: $ac_ct_CC" >&5 | ||
947 | echo "${ECHO_T}$ac_ct_CC" >&6 | ||
948 | else | ||
949 | - echo "$as_me:1537: result: no" >&5 | ||
950 | + echo "$as_me:1538: result: no" >&5 | ||
951 | echo "${ECHO_T}no" >&6 | ||
952 | fi | ||
953 | |||
954 | @@ -1547,7 +1548,7 @@ | ||
955 | if test -z "$CC"; then | ||
956 | # Extract the first word of "cc", so it can be a program name with args. | ||
957 | set dummy cc; ac_word=$2 | ||
958 | -echo "$as_me:1550: checking for $ac_word" >&5 | ||
959 | +echo "$as_me:1551: checking for $ac_word" >&5 | ||
960 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
961 | if test "${ac_cv_prog_CC+set}" = set; then | ||
962 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
963 | @@ -1567,7 +1568,7 @@ | ||
964 | continue | ||
965 | fi | ||
966 | ac_cv_prog_CC="cc" | ||
967 | -echo "$as_me:1570: found $ac_dir/$ac_word" >&5 | ||
968 | +echo "$as_me:1571: found $ac_dir/$ac_word" >&5 | ||
969 | break | ||
970 | done | ||
971 | |||
972 | @@ -1589,10 +1590,10 @@ | ||
973 | fi | ||
974 | CC=$ac_cv_prog_CC | ||
975 | if test -n "$CC"; then | ||
976 | - echo "$as_me:1592: result: $CC" >&5 | ||
977 | + echo "$as_me:1593: result: $CC" >&5 | ||
978 | echo "${ECHO_T}$CC" >&6 | ||
979 | else | ||
980 | - echo "$as_me:1595: result: no" >&5 | ||
981 | + echo "$as_me:1596: result: no" >&5 | ||
982 | echo "${ECHO_T}no" >&6 | ||
983 | fi | ||
984 | |||
985 | @@ -1603,7 +1604,7 @@ | ||
986 | do | ||
987 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
988 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
989 | -echo "$as_me:1606: checking for $ac_word" >&5 | ||
990 | +echo "$as_me:1607: checking for $ac_word" >&5 | ||
991 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
992 | if test "${ac_cv_prog_CC+set}" = set; then | ||
993 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
994 | @@ -1618,7 +1619,7 @@ | ||
995 | test -z "$ac_dir" && ac_dir=. | ||
996 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
997 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" | ||
998 | -echo "$as_me:1621: found $ac_dir/$ac_word" >&5 | ||
999 | +echo "$as_me:1622: found $ac_dir/$ac_word" >&5 | ||
1000 | break | ||
1001 | done | ||
1002 | |||
1003 | @@ -1626,10 +1627,10 @@ | ||
1004 | fi | ||
1005 | CC=$ac_cv_prog_CC | ||
1006 | if test -n "$CC"; then | ||
1007 | - echo "$as_me:1629: result: $CC" >&5 | ||
1008 | + echo "$as_me:1630: result: $CC" >&5 | ||
1009 | echo "${ECHO_T}$CC" >&6 | ||
1010 | else | ||
1011 | - echo "$as_me:1632: result: no" >&5 | ||
1012 | + echo "$as_me:1633: result: no" >&5 | ||
1013 | echo "${ECHO_T}no" >&6 | ||
1014 | fi | ||
1015 | |||
1016 | @@ -1642,7 +1643,7 @@ | ||
1017 | do | ||
1018 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
1019 | set dummy $ac_prog; ac_word=$2 | ||
1020 | -echo "$as_me:1645: checking for $ac_word" >&5 | ||
1021 | +echo "$as_me:1646: checking for $ac_word" >&5 | ||
1022 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
1023 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | ||
1024 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1025 | @@ -1657,7 +1658,7 @@ | ||
1026 | test -z "$ac_dir" && ac_dir=. | ||
1027 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
1028 | ac_cv_prog_ac_ct_CC="$ac_prog" | ||
1029 | -echo "$as_me:1660: found $ac_dir/$ac_word" >&5 | ||
1030 | +echo "$as_me:1661: found $ac_dir/$ac_word" >&5 | ||
1031 | break | ||
1032 | done | ||
1033 | |||
1034 | @@ -1665,10 +1666,10 @@ | ||
1035 | fi | ||
1036 | ac_ct_CC=$ac_cv_prog_ac_ct_CC | ||
1037 | if test -n "$ac_ct_CC"; then | ||
1038 | - echo "$as_me:1668: result: $ac_ct_CC" >&5 | ||
1039 | + echo "$as_me:1669: result: $ac_ct_CC" >&5 | ||
1040 | echo "${ECHO_T}$ac_ct_CC" >&6 | ||
1041 | else | ||
1042 | - echo "$as_me:1671: result: no" >&5 | ||
1043 | + echo "$as_me:1672: result: no" >&5 | ||
1044 | echo "${ECHO_T}no" >&6 | ||
1045 | fi | ||
1046 | |||
1047 | @@ -1680,32 +1681,32 @@ | ||
1048 | |||
1049 | fi | ||
1050 | |||
1051 | -test -z "$CC" && { { echo "$as_me:1683: error: no acceptable cc found in \$PATH" >&5 | ||
1052 | +test -z "$CC" && { { echo "$as_me:1684: error: no acceptable cc found in \$PATH" >&5 | ||
1053 | echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} | ||
1054 | { (exit 1); exit 1; }; } | ||
1055 | |||
1056 | # Provide some information about the compiler. | ||
1057 | -echo "$as_me:1688:" \ | ||
1058 | +echo "$as_me:1689:" \ | ||
1059 | "checking for C compiler version" >&5 | ||
1060 | ac_compiler=`set X $ac_compile; echo $2` | ||
1061 | -{ (eval echo "$as_me:1691: \"$ac_compiler --version </dev/null >&5\"") >&5 | ||
1062 | +{ (eval echo "$as_me:1692: \"$ac_compiler --version </dev/null >&5\"") >&5 | ||
1063 | (eval $ac_compiler --version </dev/null >&5) 2>&5 | ||
1064 | ac_status=$? | ||
1065 | - echo "$as_me:1694: \$? = $ac_status" >&5 | ||
1066 | + echo "$as_me:1695: \$? = $ac_status" >&5 | ||
1067 | (exit $ac_status); } | ||
1068 | -{ (eval echo "$as_me:1696: \"$ac_compiler -v </dev/null >&5\"") >&5 | ||
1069 | +{ (eval echo "$as_me:1697: \"$ac_compiler -v </dev/null >&5\"") >&5 | ||
1070 | (eval $ac_compiler -v </dev/null >&5) 2>&5 | ||
1071 | ac_status=$? | ||
1072 | - echo "$as_me:1699: \$? = $ac_status" >&5 | ||
1073 | + echo "$as_me:1700: \$? = $ac_status" >&5 | ||
1074 | (exit $ac_status); } | ||
1075 | -{ (eval echo "$as_me:1701: \"$ac_compiler -V </dev/null >&5\"") >&5 | ||
1076 | +{ (eval echo "$as_me:1702: \"$ac_compiler -V </dev/null >&5\"") >&5 | ||
1077 | (eval $ac_compiler -V </dev/null >&5) 2>&5 | ||
1078 | ac_status=$? | ||
1079 | - echo "$as_me:1704: \$? = $ac_status" >&5 | ||
1080 | + echo "$as_me:1705: \$? = $ac_status" >&5 | ||
1081 | (exit $ac_status); } | ||
1082 | |||
1083 | cat >conftest.$ac_ext <<_ACEOF | ||
1084 | -#line 1708 "configure" | ||
1085 | +#line 1709 "configure" | ||
1086 | #include "confdefs.h" | ||
1087 | |||
1088 | int | ||
1089 | @@ -1721,13 +1722,13 @@ | ||
1090 | # Try to create an executable without -o first, disregard a.out. | ||
1091 | # It will help us diagnose broken compilers, and finding out an intuition | ||
1092 | # of exeext. | ||
1093 | -echo "$as_me:1724: checking for C compiler default output" >&5 | ||
1094 | +echo "$as_me:1725: checking for C compiler default output" >&5 | ||
1095 | echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 | ||
1096 | ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` | ||
1097 | -if { (eval echo "$as_me:1727: \"$ac_link_default\"") >&5 | ||
1098 | +if { (eval echo "$as_me:1728: \"$ac_link_default\"") >&5 | ||
1099 | (eval $ac_link_default) 2>&5 | ||
1100 | ac_status=$? | ||
1101 | - echo "$as_me:1730: \$? = $ac_status" >&5 | ||
1102 | + echo "$as_me:1731: \$? = $ac_status" >&5 | ||
1103 | (exit $ac_status); }; then | ||
1104 | # Find the output, starting from the most likely. This scheme is | ||
1105 | # not robust to junk in `.', hence go to wildcards (a.*) only as a last | ||
1106 | @@ -1750,34 +1751,34 @@ | ||
1107 | else | ||
1108 | echo "$as_me: failed program was:" >&5 | ||
1109 | cat conftest.$ac_ext >&5 | ||
1110 | -{ { echo "$as_me:1753: error: C compiler cannot create executables" >&5 | ||
1111 | +{ { echo "$as_me:1754: error: C compiler cannot create executables" >&5 | ||
1112 | echo "$as_me: error: C compiler cannot create executables" >&2;} | ||
1113 | { (exit 77); exit 77; }; } | ||
1114 | fi | ||
1115 | |||
1116 | ac_exeext=$ac_cv_exeext | ||
1117 | -echo "$as_me:1759: result: $ac_file" >&5 | ||
1118 | +echo "$as_me:1760: result: $ac_file" >&5 | ||
1119 | echo "${ECHO_T}$ac_file" >&6 | ||
1120 | |||
1121 | # Check the compiler produces executables we can run. If not, either | ||
1122 | # the compiler is broken, or we cross compile. | ||
1123 | -echo "$as_me:1764: checking whether the C compiler works" >&5 | ||
1124 | +echo "$as_me:1765: checking whether the C compiler works" >&5 | ||
1125 | echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 | ||
1126 | # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 | ||
1127 | # If not cross compiling, check that we can run a simple program. | ||
1128 | if test "$cross_compiling" != yes; then | ||
1129 | if { ac_try='./$ac_file' | ||
1130 | - { (eval echo "$as_me:1770: \"$ac_try\"") >&5 | ||
1131 | + { (eval echo "$as_me:1771: \"$ac_try\"") >&5 | ||
1132 | (eval $ac_try) 2>&5 | ||
1133 | ac_status=$? | ||
1134 | - echo "$as_me:1773: \$? = $ac_status" >&5 | ||
1135 | + echo "$as_me:1774: \$? = $ac_status" >&5 | ||
1136 | (exit $ac_status); }; }; then | ||
1137 | cross_compiling=no | ||
1138 | else | ||
1139 | if test "$cross_compiling" = maybe; then | ||
1140 | cross_compiling=yes | ||
1141 | else | ||
1142 | - { { echo "$as_me:1780: error: cannot run C compiled programs. | ||
1143 | + { { echo "$as_me:1781: error: cannot run C compiled programs. | ||
1144 | If you meant to cross compile, use \`--host'." >&5 | ||
1145 | echo "$as_me: error: cannot run C compiled programs. | ||
1146 | If you meant to cross compile, use \`--host'." >&2;} | ||
1147 | @@ -1785,24 +1786,24 @@ | ||
1148 | fi | ||
1149 | fi | ||
1150 | fi | ||
1151 | -echo "$as_me:1788: result: yes" >&5 | ||
1152 | +echo "$as_me:1789: result: yes" >&5 | ||
1153 | echo "${ECHO_T}yes" >&6 | ||
1154 | |||
1155 | rm -f a.out a.exe conftest$ac_cv_exeext | ||
1156 | ac_clean_files=$ac_clean_files_save | ||
1157 | # Check the compiler produces executables we can run. If not, either | ||
1158 | # the compiler is broken, or we cross compile. | ||
1159 | -echo "$as_me:1795: checking whether we are cross compiling" >&5 | ||
1160 | +echo "$as_me:1796: checking whether we are cross compiling" >&5 | ||
1161 | echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 | ||
1162 | -echo "$as_me:1797: result: $cross_compiling" >&5 | ||
1163 | +echo "$as_me:1798: result: $cross_compiling" >&5 | ||
1164 | echo "${ECHO_T}$cross_compiling" >&6 | ||
1165 | |||
1166 | -echo "$as_me:1800: checking for executable suffix" >&5 | ||
1167 | +echo "$as_me:1801: checking for executable suffix" >&5 | ||
1168 | echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 | ||
1169 | -if { (eval echo "$as_me:1802: \"$ac_link\"") >&5 | ||
1170 | +if { (eval echo "$as_me:1803: \"$ac_link\"") >&5 | ||
1171 | (eval $ac_link) 2>&5 | ||
1172 | ac_status=$? | ||
1173 | - echo "$as_me:1805: \$? = $ac_status" >&5 | ||
1174 | + echo "$as_me:1806: \$? = $ac_status" >&5 | ||
1175 | (exit $ac_status); }; then | ||
1176 | # If both `conftest.exe' and `conftest' are `present' (well, observable) | ||
1177 | # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will | ||
1178 | @@ -1818,25 +1819,25 @@ | ||
1179 | esac | ||
1180 | done | ||
1181 | else | ||
1182 | - { { echo "$as_me:1821: error: cannot compute EXEEXT: cannot compile and link" >&5 | ||
1183 | + { { echo "$as_me:1822: error: cannot compute EXEEXT: cannot compile and link" >&5 | ||
1184 | echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} | ||
1185 | { (exit 1); exit 1; }; } | ||
1186 | fi | ||
1187 | |||
1188 | rm -f conftest$ac_cv_exeext | ||
1189 | -echo "$as_me:1827: result: $ac_cv_exeext" >&5 | ||
1190 | +echo "$as_me:1828: result: $ac_cv_exeext" >&5 | ||
1191 | echo "${ECHO_T}$ac_cv_exeext" >&6 | ||
1192 | |||
1193 | rm -f conftest.$ac_ext | ||
1194 | EXEEXT=$ac_cv_exeext | ||
1195 | ac_exeext=$EXEEXT | ||
1196 | -echo "$as_me:1833: checking for object suffix" >&5 | ||
1197 | +echo "$as_me:1834: checking for object suffix" >&5 | ||
1198 | echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 | ||
1199 | if test "${ac_cv_objext+set}" = set; then | ||
1200 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1201 | else | ||
1202 | cat >conftest.$ac_ext <<_ACEOF | ||
1203 | -#line 1839 "configure" | ||
1204 | +#line 1840 "configure" | ||
1205 | #include "confdefs.h" | ||
1206 | |||
1207 | int | ||
1208 | @@ -1848,10 +1849,10 @@ | ||
1209 | } | ||
1210 | _ACEOF | ||
1211 | rm -f conftest.o conftest.obj | ||
1212 | -if { (eval echo "$as_me:1851: \"$ac_compile\"") >&5 | ||
1213 | +if { (eval echo "$as_me:1852: \"$ac_compile\"") >&5 | ||
1214 | (eval $ac_compile) 2>&5 | ||
1215 | ac_status=$? | ||
1216 | - echo "$as_me:1854: \$? = $ac_status" >&5 | ||
1217 | + echo "$as_me:1855: \$? = $ac_status" >&5 | ||
1218 | (exit $ac_status); }; then | ||
1219 | for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do | ||
1220 | case $ac_file in | ||
1221 | @@ -1863,24 +1864,24 @@ | ||
1222 | else | ||
1223 | echo "$as_me: failed program was:" >&5 | ||
1224 | cat conftest.$ac_ext >&5 | ||
1225 | -{ { echo "$as_me:1866: error: cannot compute OBJEXT: cannot compile" >&5 | ||
1226 | +{ { echo "$as_me:1867: error: cannot compute OBJEXT: cannot compile" >&5 | ||
1227 | echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} | ||
1228 | { (exit 1); exit 1; }; } | ||
1229 | fi | ||
1230 | |||
1231 | rm -f conftest.$ac_cv_objext conftest.$ac_ext | ||
1232 | fi | ||
1233 | -echo "$as_me:1873: result: $ac_cv_objext" >&5 | ||
1234 | +echo "$as_me:1874: result: $ac_cv_objext" >&5 | ||
1235 | echo "${ECHO_T}$ac_cv_objext" >&6 | ||
1236 | OBJEXT=$ac_cv_objext | ||
1237 | ac_objext=$OBJEXT | ||
1238 | -echo "$as_me:1877: checking whether we are using the GNU C compiler" >&5 | ||
1239 | +echo "$as_me:1878: checking whether we are using the GNU C compiler" >&5 | ||
1240 | echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 | ||
1241 | if test "${ac_cv_c_compiler_gnu+set}" = set; then | ||
1242 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1243 | else | ||
1244 | cat >conftest.$ac_ext <<_ACEOF | ||
1245 | -#line 1883 "configure" | ||
1246 | +#line 1884 "configure" | ||
1247 | #include "confdefs.h" | ||
1248 | |||
1249 | int | ||
1250 | @@ -1895,16 +1896,16 @@ | ||
1251 | } | ||
1252 | _ACEOF | ||
1253 | rm -f conftest.$ac_objext | ||
1254 | -if { (eval echo "$as_me:1898: \"$ac_compile\"") >&5 | ||
1255 | +if { (eval echo "$as_me:1899: \"$ac_compile\"") >&5 | ||
1256 | (eval $ac_compile) 2>&5 | ||
1257 | ac_status=$? | ||
1258 | - echo "$as_me:1901: \$? = $ac_status" >&5 | ||
1259 | + echo "$as_me:1902: \$? = $ac_status" >&5 | ||
1260 | (exit $ac_status); } && | ||
1261 | { ac_try='test -s conftest.$ac_objext' | ||
1262 | - { (eval echo "$as_me:1904: \"$ac_try\"") >&5 | ||
1263 | + { (eval echo "$as_me:1905: \"$ac_try\"") >&5 | ||
1264 | (eval $ac_try) 2>&5 | ||
1265 | ac_status=$? | ||
1266 | - echo "$as_me:1907: \$? = $ac_status" >&5 | ||
1267 | + echo "$as_me:1908: \$? = $ac_status" >&5 | ||
1268 | (exit $ac_status); }; }; then | ||
1269 | ac_compiler_gnu=yes | ||
1270 | else | ||
1271 | @@ -1916,19 +1917,19 @@ | ||
1272 | ac_cv_c_compiler_gnu=$ac_compiler_gnu | ||
1273 | |||
1274 | fi | ||
1275 | -echo "$as_me:1919: result: $ac_cv_c_compiler_gnu" >&5 | ||
1276 | +echo "$as_me:1920: result: $ac_cv_c_compiler_gnu" >&5 | ||
1277 | echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 | ||
1278 | GCC=`test $ac_compiler_gnu = yes && echo yes` | ||
1279 | ac_test_CFLAGS=${CFLAGS+set} | ||
1280 | ac_save_CFLAGS=$CFLAGS | ||
1281 | CFLAGS="-g" | ||
1282 | -echo "$as_me:1925: checking whether $CC accepts -g" >&5 | ||
1283 | +echo "$as_me:1926: checking whether $CC accepts -g" >&5 | ||
1284 | echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 | ||
1285 | if test "${ac_cv_prog_cc_g+set}" = set; then | ||
1286 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1287 | else | ||
1288 | cat >conftest.$ac_ext <<_ACEOF | ||
1289 | -#line 1931 "configure" | ||
1290 | +#line 1932 "configure" | ||
1291 | #include "confdefs.h" | ||
1292 | |||
1293 | int | ||
1294 | @@ -1940,16 +1941,16 @@ | ||
1295 | } | ||
1296 | _ACEOF | ||
1297 | rm -f conftest.$ac_objext | ||
1298 | -if { (eval echo "$as_me:1943: \"$ac_compile\"") >&5 | ||
1299 | +if { (eval echo "$as_me:1944: \"$ac_compile\"") >&5 | ||
1300 | (eval $ac_compile) 2>&5 | ||
1301 | ac_status=$? | ||
1302 | - echo "$as_me:1946: \$? = $ac_status" >&5 | ||
1303 | + echo "$as_me:1947: \$? = $ac_status" >&5 | ||
1304 | (exit $ac_status); } && | ||
1305 | { ac_try='test -s conftest.$ac_objext' | ||
1306 | - { (eval echo "$as_me:1949: \"$ac_try\"") >&5 | ||
1307 | + { (eval echo "$as_me:1950: \"$ac_try\"") >&5 | ||
1308 | (eval $ac_try) 2>&5 | ||
1309 | ac_status=$? | ||
1310 | - echo "$as_me:1952: \$? = $ac_status" >&5 | ||
1311 | + echo "$as_me:1953: \$? = $ac_status" >&5 | ||
1312 | (exit $ac_status); }; }; then | ||
1313 | ac_cv_prog_cc_g=yes | ||
1314 | else | ||
1315 | @@ -1959,7 +1960,7 @@ | ||
1316 | fi | ||
1317 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
1318 | fi | ||
1319 | -echo "$as_me:1962: result: $ac_cv_prog_cc_g" >&5 | ||
1320 | +echo "$as_me:1963: result: $ac_cv_prog_cc_g" >&5 | ||
1321 | echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 | ||
1322 | if test "$ac_test_CFLAGS" = set; then | ||
1323 | CFLAGS=$ac_save_CFLAGS | ||
1324 | @@ -1986,16 +1987,16 @@ | ||
1325 | #endif | ||
1326 | _ACEOF | ||
1327 | rm -f conftest.$ac_objext | ||
1328 | -if { (eval echo "$as_me:1989: \"$ac_compile\"") >&5 | ||
1329 | +if { (eval echo "$as_me:1990: \"$ac_compile\"") >&5 | ||
1330 | (eval $ac_compile) 2>&5 | ||
1331 | ac_status=$? | ||
1332 | - echo "$as_me:1992: \$? = $ac_status" >&5 | ||
1333 | + echo "$as_me:1993: \$? = $ac_status" >&5 | ||
1334 | (exit $ac_status); } && | ||
1335 | { ac_try='test -s conftest.$ac_objext' | ||
1336 | - { (eval echo "$as_me:1995: \"$ac_try\"") >&5 | ||
1337 | + { (eval echo "$as_me:1996: \"$ac_try\"") >&5 | ||
1338 | (eval $ac_try) 2>&5 | ||
1339 | ac_status=$? | ||
1340 | - echo "$as_me:1998: \$? = $ac_status" >&5 | ||
1341 | + echo "$as_me:1999: \$? = $ac_status" >&5 | ||
1342 | (exit $ac_status); }; }; then | ||
1343 | for ac_declaration in \ | ||
1344 | ''\ | ||
1345 | @@ -2007,7 +2008,7 @@ | ||
1346 | 'void exit (int);' | ||
1347 | do | ||
1348 | cat >conftest.$ac_ext <<_ACEOF | ||
1349 | -#line 2010 "configure" | ||
1350 | +#line 2011 "configure" | ||
1351 | #include "confdefs.h" | ||
1352 | #include <stdlib.h> | ||
1353 | $ac_declaration | ||
1354 | @@ -2020,16 +2021,16 @@ | ||
1355 | } | ||
1356 | _ACEOF | ||
1357 | rm -f conftest.$ac_objext | ||
1358 | -if { (eval echo "$as_me:2023: \"$ac_compile\"") >&5 | ||
1359 | +if { (eval echo "$as_me:2024: \"$ac_compile\"") >&5 | ||
1360 | (eval $ac_compile) 2>&5 | ||
1361 | ac_status=$? | ||
1362 | - echo "$as_me:2026: \$? = $ac_status" >&5 | ||
1363 | + echo "$as_me:2027: \$? = $ac_status" >&5 | ||
1364 | (exit $ac_status); } && | ||
1365 | { ac_try='test -s conftest.$ac_objext' | ||
1366 | - { (eval echo "$as_me:2029: \"$ac_try\"") >&5 | ||
1367 | + { (eval echo "$as_me:2030: \"$ac_try\"") >&5 | ||
1368 | (eval $ac_try) 2>&5 | ||
1369 | ac_status=$? | ||
1370 | - echo "$as_me:2032: \$? = $ac_status" >&5 | ||
1371 | + echo "$as_me:2033: \$? = $ac_status" >&5 | ||
1372 | (exit $ac_status); }; }; then | ||
1373 | : | ||
1374 | else | ||
1375 | @@ -2039,7 +2040,7 @@ | ||
1376 | fi | ||
1377 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
1378 | cat >conftest.$ac_ext <<_ACEOF | ||
1379 | -#line 2042 "configure" | ||
1380 | +#line 2043 "configure" | ||
1381 | #include "confdefs.h" | ||
1382 | $ac_declaration | ||
1383 | int | ||
1384 | @@ -2051,16 +2052,16 @@ | ||
1385 | } | ||
1386 | _ACEOF | ||
1387 | rm -f conftest.$ac_objext | ||
1388 | -if { (eval echo "$as_me:2054: \"$ac_compile\"") >&5 | ||
1389 | +if { (eval echo "$as_me:2055: \"$ac_compile\"") >&5 | ||
1390 | (eval $ac_compile) 2>&5 | ||
1391 | ac_status=$? | ||
1392 | - echo "$as_me:2057: \$? = $ac_status" >&5 | ||
1393 | + echo "$as_me:2058: \$? = $ac_status" >&5 | ||
1394 | (exit $ac_status); } && | ||
1395 | { ac_try='test -s conftest.$ac_objext' | ||
1396 | - { (eval echo "$as_me:2060: \"$ac_try\"") >&5 | ||
1397 | + { (eval echo "$as_me:2061: \"$ac_try\"") >&5 | ||
1398 | (eval $ac_try) 2>&5 | ||
1399 | ac_status=$? | ||
1400 | - echo "$as_me:2063: \$? = $ac_status" >&5 | ||
1401 | + echo "$as_me:2064: \$? = $ac_status" >&5 | ||
1402 | (exit $ac_status); }; }; then | ||
1403 | break | ||
1404 | else | ||
1405 | @@ -2090,11 +2091,11 @@ | ||
1406 | |||
1407 | GCC_VERSION=none | ||
1408 | if test "$GCC" = yes ; then | ||
1409 | - echo "$as_me:2093: checking version of $CC" >&5 | ||
1410 | + echo "$as_me:2094: checking version of $CC" >&5 | ||
1411 | echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 | ||
1412 | GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" | ||
1413 | test -z "$GCC_VERSION" && GCC_VERSION=unknown | ||
1414 | - echo "$as_me:2097: result: $GCC_VERSION" >&5 | ||
1415 | + echo "$as_me:2098: result: $GCC_VERSION" >&5 | ||
1416 | echo "${ECHO_T}$GCC_VERSION" >&6 | ||
1417 | fi | ||
1418 | |||
1419 | @@ -2104,7 +2105,7 @@ | ||
1420 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
1421 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
1422 | ac_main_return=return | ||
1423 | -echo "$as_me:2107: checking how to run the C preprocessor" >&5 | ||
1424 | +echo "$as_me:2108: checking how to run the C preprocessor" >&5 | ||
1425 | echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 | ||
1426 | # On Suns, sometimes $CPP names a directory. | ||
1427 | if test -n "$CPP" && test -d "$CPP"; then | ||
1428 | @@ -2125,18 +2126,18 @@ | ||
1429 | # On the NeXT, cc -E runs the code through the compiler's parser, | ||
1430 | # not just through cpp. "Syntax error" is here to catch this case. | ||
1431 | cat >conftest.$ac_ext <<_ACEOF | ||
1432 | -#line 2128 "configure" | ||
1433 | +#line 2129 "configure" | ||
1434 | #include "confdefs.h" | ||
1435 | #include <assert.h> | ||
1436 | Syntax error | ||
1437 | _ACEOF | ||
1438 | -if { (eval echo "$as_me:2133: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
1439 | +if { (eval echo "$as_me:2134: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
1440 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
1441 | ac_status=$? | ||
1442 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
1443 | rm -f conftest.er1 | ||
1444 | cat conftest.err >&5 | ||
1445 | - echo "$as_me:2139: \$? = $ac_status" >&5 | ||
1446 | + echo "$as_me:2140: \$? = $ac_status" >&5 | ||
1447 | (exit $ac_status); } >/dev/null; then | ||
1448 | if test -s conftest.err; then | ||
1449 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
1450 | @@ -2159,17 +2160,17 @@ | ||
1451 | # OK, works on sane cases. Now check whether non-existent headers | ||
1452 | # can be detected and how. | ||
1453 | cat >conftest.$ac_ext <<_ACEOF | ||
1454 | -#line 2162 "configure" | ||
1455 | +#line 2163 "configure" | ||
1456 | #include "confdefs.h" | ||
1457 | #include <ac_nonexistent.h> | ||
1458 | _ACEOF | ||
1459 | -if { (eval echo "$as_me:2166: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
1460 | +if { (eval echo "$as_me:2167: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
1461 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
1462 | ac_status=$? | ||
1463 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
1464 | rm -f conftest.er1 | ||
1465 | cat conftest.err >&5 | ||
1466 | - echo "$as_me:2172: \$? = $ac_status" >&5 | ||
1467 | + echo "$as_me:2173: \$? = $ac_status" >&5 | ||
1468 | (exit $ac_status); } >/dev/null; then | ||
1469 | if test -s conftest.err; then | ||
1470 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
1471 | @@ -2206,7 +2207,7 @@ | ||
1472 | else | ||
1473 | ac_cv_prog_CPP=$CPP | ||
1474 | fi | ||
1475 | -echo "$as_me:2209: result: $CPP" >&5 | ||
1476 | +echo "$as_me:2210: result: $CPP" >&5 | ||
1477 | echo "${ECHO_T}$CPP" >&6 | ||
1478 | ac_preproc_ok=false | ||
1479 | for ac_c_preproc_warn_flag in '' yes | ||
1480 | @@ -2216,18 +2217,18 @@ | ||
1481 | # On the NeXT, cc -E runs the code through the compiler's parser, | ||
1482 | # not just through cpp. "Syntax error" is here to catch this case. | ||
1483 | cat >conftest.$ac_ext <<_ACEOF | ||
1484 | -#line 2219 "configure" | ||
1485 | +#line 2220 "configure" | ||
1486 | #include "confdefs.h" | ||
1487 | #include <assert.h> | ||
1488 | Syntax error | ||
1489 | _ACEOF | ||
1490 | -if { (eval echo "$as_me:2224: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
1491 | +if { (eval echo "$as_me:2225: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
1492 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
1493 | ac_status=$? | ||
1494 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
1495 | rm -f conftest.er1 | ||
1496 | cat conftest.err >&5 | ||
1497 | - echo "$as_me:2230: \$? = $ac_status" >&5 | ||
1498 | + echo "$as_me:2231: \$? = $ac_status" >&5 | ||
1499 | (exit $ac_status); } >/dev/null; then | ||
1500 | if test -s conftest.err; then | ||
1501 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
1502 | @@ -2250,17 +2251,17 @@ | ||
1503 | # OK, works on sane cases. Now check whether non-existent headers | ||
1504 | # can be detected and how. | ||
1505 | cat >conftest.$ac_ext <<_ACEOF | ||
1506 | -#line 2253 "configure" | ||
1507 | +#line 2254 "configure" | ||
1508 | #include "confdefs.h" | ||
1509 | #include <ac_nonexistent.h> | ||
1510 | _ACEOF | ||
1511 | -if { (eval echo "$as_me:2257: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
1512 | +if { (eval echo "$as_me:2258: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
1513 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
1514 | ac_status=$? | ||
1515 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
1516 | rm -f conftest.er1 | ||
1517 | cat conftest.err >&5 | ||
1518 | - echo "$as_me:2263: \$? = $ac_status" >&5 | ||
1519 | + echo "$as_me:2264: \$? = $ac_status" >&5 | ||
1520 | (exit $ac_status); } >/dev/null; then | ||
1521 | if test -s conftest.err; then | ||
1522 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
1523 | @@ -2288,7 +2289,7 @@ | ||
1524 | if $ac_preproc_ok; then | ||
1525 | : | ||
1526 | else | ||
1527 | - { { echo "$as_me:2291: error: C preprocessor \"$CPP\" fails sanity check" >&5 | ||
1528 | + { { echo "$as_me:2292: error: C preprocessor \"$CPP\" fails sanity check" >&5 | ||
1529 | echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} | ||
1530 | { (exit 1); exit 1; }; } | ||
1531 | fi | ||
1532 | @@ -2301,14 +2302,14 @@ | ||
1533 | ac_main_return=return | ||
1534 | |||
1535 | if test $ac_cv_c_compiler_gnu = yes; then | ||
1536 | - echo "$as_me:2304: checking whether $CC needs -traditional" >&5 | ||
1537 | + echo "$as_me:2305: checking whether $CC needs -traditional" >&5 | ||
1538 | echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 | ||
1539 | if test "${ac_cv_prog_gcc_traditional+set}" = set; then | ||
1540 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1541 | else | ||
1542 | ac_pattern="Autoconf.*'x'" | ||
1543 | cat >conftest.$ac_ext <<_ACEOF | ||
1544 | -#line 2311 "configure" | ||
1545 | +#line 2312 "configure" | ||
1546 | #include "confdefs.h" | ||
1547 | #include <sgtty.h> | ||
1548 | int Autoconf = TIOCGETP; | ||
1549 | @@ -2323,7 +2324,7 @@ | ||
1550 | |||
1551 | if test $ac_cv_prog_gcc_traditional = no; then | ||
1552 | cat >conftest.$ac_ext <<_ACEOF | ||
1553 | -#line 2326 "configure" | ||
1554 | +#line 2327 "configure" | ||
1555 | #include "confdefs.h" | ||
1556 | #include <termio.h> | ||
1557 | int Autoconf = TCGETA; | ||
1558 | @@ -2336,14 +2337,14 @@ | ||
1559 | |||
1560 | fi | ||
1561 | fi | ||
1562 | -echo "$as_me:2339: result: $ac_cv_prog_gcc_traditional" >&5 | ||
1563 | +echo "$as_me:2340: result: $ac_cv_prog_gcc_traditional" >&5 | ||
1564 | echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 | ||
1565 | if test $ac_cv_prog_gcc_traditional = yes; then | ||
1566 | CC="$CC -traditional" | ||
1567 | fi | ||
1568 | fi | ||
1569 | |||
1570 | -echo "$as_me:2346: checking whether $CC understands -c and -o together" >&5 | ||
1571 | +echo "$as_me:2347: checking whether $CC understands -c and -o together" >&5 | ||
1572 | echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6 | ||
1573 | if test "${cf_cv_prog_CC_c_o+set}" = set; then | ||
1574 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1575 | @@ -2359,15 +2360,15 @@ | ||
1576 | # We do the test twice because some compilers refuse to overwrite an | ||
1577 | # existing .o file with -o, though they will create one. | ||
1578 | ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' | ||
1579 | -if { (eval echo "$as_me:2362: \"$ac_try\"") >&5 | ||
1580 | +if { (eval echo "$as_me:2363: \"$ac_try\"") >&5 | ||
1581 | (eval $ac_try) 2>&5 | ||
1582 | ac_status=$? | ||
1583 | - echo "$as_me:2365: \$? = $ac_status" >&5 | ||
1584 | + echo "$as_me:2366: \$? = $ac_status" >&5 | ||
1585 | (exit $ac_status); } && | ||
1586 | - test -f conftest2.$ac_objext && { (eval echo "$as_me:2367: \"$ac_try\"") >&5 | ||
1587 | + test -f conftest2.$ac_objext && { (eval echo "$as_me:2368: \"$ac_try\"") >&5 | ||
1588 | (eval $ac_try) 2>&5 | ||
1589 | ac_status=$? | ||
1590 | - echo "$as_me:2370: \$? = $ac_status" >&5 | ||
1591 | + echo "$as_me:2371: \$? = $ac_status" >&5 | ||
1592 | (exit $ac_status); }; | ||
1593 | then | ||
1594 | eval cf_cv_prog_CC_c_o=yes | ||
1595 | @@ -2378,19 +2379,19 @@ | ||
1596 | |||
1597 | fi | ||
1598 | if test $cf_cv_prog_CC_c_o = yes; then | ||
1599 | - echo "$as_me:2381: result: yes" >&5 | ||
1600 | + echo "$as_me:2382: result: yes" >&5 | ||
1601 | echo "${ECHO_T}yes" >&6 | ||
1602 | else | ||
1603 | - echo "$as_me:2384: result: no" >&5 | ||
1604 | + echo "$as_me:2385: result: no" >&5 | ||
1605 | echo "${ECHO_T}no" >&6 | ||
1606 | fi | ||
1607 | |||
1608 | -echo "$as_me:2388: checking for POSIXized ISC" >&5 | ||
1609 | +echo "$as_me:2389: checking for POSIXized ISC" >&5 | ||
1610 | echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6 | ||
1611 | if test -d /etc/conf/kconfig.d && | ||
1612 | grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 | ||
1613 | then | ||
1614 | - echo "$as_me:2393: result: yes" >&5 | ||
1615 | + echo "$as_me:2394: result: yes" >&5 | ||
1616 | echo "${ECHO_T}yes" >&6 | ||
1617 | ISC=yes # If later tests want to check for ISC. | ||
1618 | |||
1619 | @@ -2404,12 +2405,12 @@ | ||
1620 | CC="$CC -Xp" | ||
1621 | fi | ||
1622 | else | ||
1623 | - echo "$as_me:2407: result: no" >&5 | ||
1624 | + echo "$as_me:2408: result: no" >&5 | ||
1625 | echo "${ECHO_T}no" >&6 | ||
1626 | ISC= | ||
1627 | fi | ||
1628 | |||
1629 | -echo "$as_me:2412: checking for ${CC-cc} option to accept ANSI C" >&5 | ||
1630 | +echo "$as_me:2413: checking for ${CC-cc} option to accept ANSI C" >&5 | ||
1631 | echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6 | ||
1632 | if test "${cf_cv_ansi_cc+set}" = set; then | ||
1633 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1634 | @@ -2503,7 +2504,7 @@ | ||
1635 | fi | ||
1636 | |||
1637 | cat >conftest.$ac_ext <<_ACEOF | ||
1638 | -#line 2506 "configure" | ||
1639 | +#line 2507 "configure" | ||
1640 | #include "confdefs.h" | ||
1641 | |||
1642 | #ifndef CC_HAS_PROTOS | ||
1643 | @@ -2524,16 +2525,16 @@ | ||
1644 | } | ||
1645 | _ACEOF | ||
1646 | rm -f conftest.$ac_objext | ||
1647 | -if { (eval echo "$as_me:2527: \"$ac_compile\"") >&5 | ||
1648 | +if { (eval echo "$as_me:2528: \"$ac_compile\"") >&5 | ||
1649 | (eval $ac_compile) 2>&5 | ||
1650 | ac_status=$? | ||
1651 | - echo "$as_me:2530: \$? = $ac_status" >&5 | ||
1652 | + echo "$as_me:2531: \$? = $ac_status" >&5 | ||
1653 | (exit $ac_status); } && | ||
1654 | { ac_try='test -s conftest.$ac_objext' | ||
1655 | - { (eval echo "$as_me:2533: \"$ac_try\"") >&5 | ||
1656 | + { (eval echo "$as_me:2534: \"$ac_try\"") >&5 | ||
1657 | (eval $ac_try) 2>&5 | ||
1658 | ac_status=$? | ||
1659 | - echo "$as_me:2536: \$? = $ac_status" >&5 | ||
1660 | + echo "$as_me:2537: \$? = $ac_status" >&5 | ||
1661 | (exit $ac_status); }; }; then | ||
1662 | cf_cv_ansi_cc="$cf_arg"; break | ||
1663 | else | ||
1664 | @@ -2546,7 +2547,7 @@ | ||
1665 | CPPFLAGS="$cf_save_CPPFLAGS" | ||
1666 | |||
1667 | fi | ||
1668 | -echo "$as_me:2549: result: $cf_cv_ansi_cc" >&5 | ||
1669 | +echo "$as_me:2550: result: $cf_cv_ansi_cc" >&5 | ||
1670 | echo "${ECHO_T}$cf_cv_ansi_cc" >&6 | ||
1671 | |||
1672 | if test "$cf_cv_ansi_cc" != "no"; then | ||
1673 | @@ -2629,7 +2630,7 @@ | ||
1674 | fi | ||
1675 | |||
1676 | if test "$cf_cv_ansi_cc" = "no"; then | ||
1677 | - { { echo "$as_me:2632: error: Your compiler does not appear to recognize prototypes. | ||
1678 | + { { echo "$as_me:2633: error: Your compiler does not appear to recognize prototypes. | ||
1679 | You have the following choices: | ||
1680 | a. adjust your compiler options | ||
1681 | b. get an up-to-date compiler | ||
1682 | @@ -2663,13 +2664,13 @@ | ||
1683 | LDCONFIG=: | ||
1684 | else | ||
1685 | case "$cf_cv_system_name" in #(vi | ||
1686 | -freebsd*) #(vi | ||
1687 | +dragonfly*|freebsd*) #(vi | ||
1688 | test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R" | ||
1689 | ;; | ||
1690 | *) LDPATH=$PATH:/sbin:/usr/sbin | ||
1691 | # Extract the first word of "ldconfig", so it can be a program name with args. | ||
1692 | set dummy ldconfig; ac_word=$2 | ||
1693 | -echo "$as_me:2672: checking for $ac_word" >&5 | ||
1694 | +echo "$as_me:2673: checking for $ac_word" >&5 | ||
1695 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
1696 | if test "${ac_cv_path_LDCONFIG+set}" = set; then | ||
1697 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1698 | @@ -2686,7 +2687,7 @@ | ||
1699 | test -z "$ac_dir" && ac_dir=. | ||
1700 | if $as_executable_p "$ac_dir/$ac_word"; then | ||
1701 | ac_cv_path_LDCONFIG="$ac_dir/$ac_word" | ||
1702 | - echo "$as_me:2689: found $ac_dir/$ac_word" >&5 | ||
1703 | + echo "$as_me:2690: found $ac_dir/$ac_word" >&5 | ||
1704 | break | ||
1705 | fi | ||
1706 | done | ||
1707 | @@ -2697,10 +2698,10 @@ | ||
1708 | LDCONFIG=$ac_cv_path_LDCONFIG | ||
1709 | |||
1710 | if test -n "$LDCONFIG"; then | ||
1711 | - echo "$as_me:2700: result: $LDCONFIG" >&5 | ||
1712 | + echo "$as_me:2701: result: $LDCONFIG" >&5 | ||
1713 | echo "${ECHO_T}$LDCONFIG" >&6 | ||
1714 | else | ||
1715 | - echo "$as_me:2703: result: no" >&5 | ||
1716 | + echo "$as_me:2704: result: no" >&5 | ||
1717 | echo "${ECHO_T}no" >&6 | ||
1718 | fi | ||
1719 | |||
1720 | @@ -2708,7 +2709,7 @@ | ||
1721 | esac | ||
1722 | fi | ||
1723 | |||
1724 | -echo "$as_me:2711: checking if you want to ensure bool is consistent with C++" >&5 | ||
1725 | +echo "$as_me:2712: checking if you want to ensure bool is consistent with C++" >&5 | ||
1726 | echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6 | ||
1727 | |||
1728 | # Check whether --with-cxx or --without-cxx was given. | ||
1729 | @@ -2718,7 +2719,7 @@ | ||
1730 | else | ||
1731 | cf_with_cxx=yes | ||
1732 | fi; | ||
1733 | -echo "$as_me:2721: result: $cf_with_cxx" >&5 | ||
1734 | +echo "$as_me:2722: result: $cf_with_cxx" >&5 | ||
1735 | echo "${ECHO_T}$cf_with_cxx" >&6 | ||
1736 | if test "X$cf_with_cxx" = Xno ; then | ||
1737 | CXX="" | ||
1738 | @@ -2736,7 +2737,7 @@ | ||
1739 | do | ||
1740 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | ||
1741 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | ||
1742 | -echo "$as_me:2739: checking for $ac_word" >&5 | ||
1743 | +echo "$as_me:2740: checking for $ac_word" >&5 | ||
1744 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
1745 | if test "${ac_cv_prog_CXX+set}" = set; then | ||
1746 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1747 | @@ -2751,7 +2752,7 @@ | ||
1748 | test -z "$ac_dir" && ac_dir=. | ||
1749 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
1750 | ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" | ||
1751 | -echo "$as_me:2754: found $ac_dir/$ac_word" >&5 | ||
1752 | +echo "$as_me:2755: found $ac_dir/$ac_word" >&5 | ||
1753 | break | ||
1754 | done | ||
1755 | |||
1756 | @@ -2759,10 +2760,10 @@ | ||
1757 | fi | ||
1758 | CXX=$ac_cv_prog_CXX | ||
1759 | if test -n "$CXX"; then | ||
1760 | - echo "$as_me:2762: result: $CXX" >&5 | ||
1761 | + echo "$as_me:2763: result: $CXX" >&5 | ||
1762 | echo "${ECHO_T}$CXX" >&6 | ||
1763 | else | ||
1764 | - echo "$as_me:2765: result: no" >&5 | ||
1765 | + echo "$as_me:2766: result: no" >&5 | ||
1766 | echo "${ECHO_T}no" >&6 | ||
1767 | fi | ||
1768 | |||
1769 | @@ -2775,7 +2776,7 @@ | ||
1770 | do | ||
1771 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
1772 | set dummy $ac_prog; ac_word=$2 | ||
1773 | -echo "$as_me:2778: checking for $ac_word" >&5 | ||
1774 | +echo "$as_me:2779: checking for $ac_word" >&5 | ||
1775 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
1776 | if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then | ||
1777 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1778 | @@ -2790,7 +2791,7 @@ | ||
1779 | test -z "$ac_dir" && ac_dir=. | ||
1780 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
1781 | ac_cv_prog_ac_ct_CXX="$ac_prog" | ||
1782 | -echo "$as_me:2793: found $ac_dir/$ac_word" >&5 | ||
1783 | +echo "$as_me:2794: found $ac_dir/$ac_word" >&5 | ||
1784 | break | ||
1785 | done | ||
1786 | |||
1787 | @@ -2798,10 +2799,10 @@ | ||
1788 | fi | ||
1789 | ac_ct_CXX=$ac_cv_prog_ac_ct_CXX | ||
1790 | if test -n "$ac_ct_CXX"; then | ||
1791 | - echo "$as_me:2801: result: $ac_ct_CXX" >&5 | ||
1792 | + echo "$as_me:2802: result: $ac_ct_CXX" >&5 | ||
1793 | echo "${ECHO_T}$ac_ct_CXX" >&6 | ||
1794 | else | ||
1795 | - echo "$as_me:2804: result: no" >&5 | ||
1796 | + echo "$as_me:2805: result: no" >&5 | ||
1797 | echo "${ECHO_T}no" >&6 | ||
1798 | fi | ||
1799 | |||
1800 | @@ -2813,32 +2814,32 @@ | ||
1801 | fi | ||
1802 | |||
1803 | # Provide some information about the compiler. | ||
1804 | -echo "$as_me:2816:" \ | ||
1805 | +echo "$as_me:2817:" \ | ||
1806 | "checking for C++ compiler version" >&5 | ||
1807 | ac_compiler=`set X $ac_compile; echo $2` | ||
1808 | -{ (eval echo "$as_me:2819: \"$ac_compiler --version </dev/null >&5\"") >&5 | ||
1809 | +{ (eval echo "$as_me:2820: \"$ac_compiler --version </dev/null >&5\"") >&5 | ||
1810 | (eval $ac_compiler --version </dev/null >&5) 2>&5 | ||
1811 | ac_status=$? | ||
1812 | - echo "$as_me:2822: \$? = $ac_status" >&5 | ||
1813 | + echo "$as_me:2823: \$? = $ac_status" >&5 | ||
1814 | (exit $ac_status); } | ||
1815 | -{ (eval echo "$as_me:2824: \"$ac_compiler -v </dev/null >&5\"") >&5 | ||
1816 | +{ (eval echo "$as_me:2825: \"$ac_compiler -v </dev/null >&5\"") >&5 | ||
1817 | (eval $ac_compiler -v </dev/null >&5) 2>&5 | ||
1818 | ac_status=$? | ||
1819 | - echo "$as_me:2827: \$? = $ac_status" >&5 | ||
1820 | + echo "$as_me:2828: \$? = $ac_status" >&5 | ||
1821 | (exit $ac_status); } | ||
1822 | -{ (eval echo "$as_me:2829: \"$ac_compiler -V </dev/null >&5\"") >&5 | ||
1823 | +{ (eval echo "$as_me:2830: \"$ac_compiler -V </dev/null >&5\"") >&5 | ||
1824 | (eval $ac_compiler -V </dev/null >&5) 2>&5 | ||
1825 | ac_status=$? | ||
1826 | - echo "$as_me:2832: \$? = $ac_status" >&5 | ||
1827 | + echo "$as_me:2833: \$? = $ac_status" >&5 | ||
1828 | (exit $ac_status); } | ||
1829 | |||
1830 | -echo "$as_me:2835: checking whether we are using the GNU C++ compiler" >&5 | ||
1831 | +echo "$as_me:2836: checking whether we are using the GNU C++ compiler" >&5 | ||
1832 | echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 | ||
1833 | if test "${ac_cv_cxx_compiler_gnu+set}" = set; then | ||
1834 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1835 | else | ||
1836 | cat >conftest.$ac_ext <<_ACEOF | ||
1837 | -#line 2841 "configure" | ||
1838 | +#line 2842 "configure" | ||
1839 | #include "confdefs.h" | ||
1840 | |||
1841 | int | ||
1842 | @@ -2853,16 +2854,16 @@ | ||
1843 | } | ||
1844 | _ACEOF | ||
1845 | rm -f conftest.$ac_objext | ||
1846 | -if { (eval echo "$as_me:2856: \"$ac_compile\"") >&5 | ||
1847 | +if { (eval echo "$as_me:2857: \"$ac_compile\"") >&5 | ||
1848 | (eval $ac_compile) 2>&5 | ||
1849 | ac_status=$? | ||
1850 | - echo "$as_me:2859: \$? = $ac_status" >&5 | ||
1851 | + echo "$as_me:2860: \$? = $ac_status" >&5 | ||
1852 | (exit $ac_status); } && | ||
1853 | { ac_try='test -s conftest.$ac_objext' | ||
1854 | - { (eval echo "$as_me:2862: \"$ac_try\"") >&5 | ||
1855 | + { (eval echo "$as_me:2863: \"$ac_try\"") >&5 | ||
1856 | (eval $ac_try) 2>&5 | ||
1857 | ac_status=$? | ||
1858 | - echo "$as_me:2865: \$? = $ac_status" >&5 | ||
1859 | + echo "$as_me:2866: \$? = $ac_status" >&5 | ||
1860 | (exit $ac_status); }; }; then | ||
1861 | ac_compiler_gnu=yes | ||
1862 | else | ||
1863 | @@ -2874,19 +2875,19 @@ | ||
1864 | ac_cv_cxx_compiler_gnu=$ac_compiler_gnu | ||
1865 | |||
1866 | fi | ||
1867 | -echo "$as_me:2877: result: $ac_cv_cxx_compiler_gnu" >&5 | ||
1868 | +echo "$as_me:2878: result: $ac_cv_cxx_compiler_gnu" >&5 | ||
1869 | echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 | ||
1870 | GXX=`test $ac_compiler_gnu = yes && echo yes` | ||
1871 | ac_test_CXXFLAGS=${CXXFLAGS+set} | ||
1872 | ac_save_CXXFLAGS=$CXXFLAGS | ||
1873 | CXXFLAGS="-g" | ||
1874 | -echo "$as_me:2883: checking whether $CXX accepts -g" >&5 | ||
1875 | +echo "$as_me:2884: checking whether $CXX accepts -g" >&5 | ||
1876 | echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 | ||
1877 | if test "${ac_cv_prog_cxx_g+set}" = set; then | ||
1878 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1879 | else | ||
1880 | cat >conftest.$ac_ext <<_ACEOF | ||
1881 | -#line 2889 "configure" | ||
1882 | +#line 2890 "configure" | ||
1883 | #include "confdefs.h" | ||
1884 | |||
1885 | int | ||
1886 | @@ -2898,16 +2899,16 @@ | ||
1887 | } | ||
1888 | _ACEOF | ||
1889 | rm -f conftest.$ac_objext | ||
1890 | -if { (eval echo "$as_me:2901: \"$ac_compile\"") >&5 | ||
1891 | +if { (eval echo "$as_me:2902: \"$ac_compile\"") >&5 | ||
1892 | (eval $ac_compile) 2>&5 | ||
1893 | ac_status=$? | ||
1894 | - echo "$as_me:2904: \$? = $ac_status" >&5 | ||
1895 | + echo "$as_me:2905: \$? = $ac_status" >&5 | ||
1896 | (exit $ac_status); } && | ||
1897 | { ac_try='test -s conftest.$ac_objext' | ||
1898 | - { (eval echo "$as_me:2907: \"$ac_try\"") >&5 | ||
1899 | + { (eval echo "$as_me:2908: \"$ac_try\"") >&5 | ||
1900 | (eval $ac_try) 2>&5 | ||
1901 | ac_status=$? | ||
1902 | - echo "$as_me:2910: \$? = $ac_status" >&5 | ||
1903 | + echo "$as_me:2911: \$? = $ac_status" >&5 | ||
1904 | (exit $ac_status); }; }; then | ||
1905 | ac_cv_prog_cxx_g=yes | ||
1906 | else | ||
1907 | @@ -2917,7 +2918,7 @@ | ||
1908 | fi | ||
1909 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
1910 | fi | ||
1911 | -echo "$as_me:2920: result: $ac_cv_prog_cxx_g" >&5 | ||
1912 | +echo "$as_me:2921: result: $ac_cv_prog_cxx_g" >&5 | ||
1913 | echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 | ||
1914 | if test "$ac_test_CXXFLAGS" = set; then | ||
1915 | CXXFLAGS=$ac_save_CXXFLAGS | ||
1916 | @@ -2944,7 +2945,7 @@ | ||
1917 | 'void exit (int);' | ||
1918 | do | ||
1919 | cat >conftest.$ac_ext <<_ACEOF | ||
1920 | -#line 2947 "configure" | ||
1921 | +#line 2948 "configure" | ||
1922 | #include "confdefs.h" | ||
1923 | #include <stdlib.h> | ||
1924 | $ac_declaration | ||
1925 | @@ -2957,16 +2958,16 @@ | ||
1926 | } | ||
1927 | _ACEOF | ||
1928 | rm -f conftest.$ac_objext | ||
1929 | -if { (eval echo "$as_me:2960: \"$ac_compile\"") >&5 | ||
1930 | +if { (eval echo "$as_me:2961: \"$ac_compile\"") >&5 | ||
1931 | (eval $ac_compile) 2>&5 | ||
1932 | ac_status=$? | ||
1933 | - echo "$as_me:2963: \$? = $ac_status" >&5 | ||
1934 | + echo "$as_me:2964: \$? = $ac_status" >&5 | ||
1935 | (exit $ac_status); } && | ||
1936 | { ac_try='test -s conftest.$ac_objext' | ||
1937 | - { (eval echo "$as_me:2966: \"$ac_try\"") >&5 | ||
1938 | + { (eval echo "$as_me:2967: \"$ac_try\"") >&5 | ||
1939 | (eval $ac_try) 2>&5 | ||
1940 | ac_status=$? | ||
1941 | - echo "$as_me:2969: \$? = $ac_status" >&5 | ||
1942 | + echo "$as_me:2970: \$? = $ac_status" >&5 | ||
1943 | (exit $ac_status); }; }; then | ||
1944 | : | ||
1945 | else | ||
1946 | @@ -2976,7 +2977,7 @@ | ||
1947 | fi | ||
1948 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
1949 | cat >conftest.$ac_ext <<_ACEOF | ||
1950 | -#line 2979 "configure" | ||
1951 | +#line 2980 "configure" | ||
1952 | #include "confdefs.h" | ||
1953 | $ac_declaration | ||
1954 | int | ||
1955 | @@ -2988,16 +2989,16 @@ | ||
1956 | } | ||
1957 | _ACEOF | ||
1958 | rm -f conftest.$ac_objext | ||
1959 | -if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5 | ||
1960 | +if { (eval echo "$as_me:2992: \"$ac_compile\"") >&5 | ||
1961 | (eval $ac_compile) 2>&5 | ||
1962 | ac_status=$? | ||
1963 | - echo "$as_me:2994: \$? = $ac_status" >&5 | ||
1964 | + echo "$as_me:2995: \$? = $ac_status" >&5 | ||
1965 | (exit $ac_status); } && | ||
1966 | { ac_try='test -s conftest.$ac_objext' | ||
1967 | - { (eval echo "$as_me:2997: \"$ac_try\"") >&5 | ||
1968 | + { (eval echo "$as_me:2998: \"$ac_try\"") >&5 | ||
1969 | (eval $ac_try) 2>&5 | ||
1970 | ac_status=$? | ||
1971 | - echo "$as_me:3000: \$? = $ac_status" >&5 | ||
1972 | + echo "$as_me:3001: \$? = $ac_status" >&5 | ||
1973 | (exit $ac_status); }; }; then | ||
1974 | break | ||
1975 | else | ||
1976 | @@ -3024,7 +3025,7 @@ | ||
1977 | if test "$CXX" = "g++" ; then | ||
1978 | # Extract the first word of "g++", so it can be a program name with args. | ||
1979 | set dummy g++; ac_word=$2 | ||
1980 | -echo "$as_me:3027: checking for $ac_word" >&5 | ||
1981 | +echo "$as_me:3028: checking for $ac_word" >&5 | ||
1982 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
1983 | if test "${ac_cv_path_CXX+set}" = set; then | ||
1984 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
1985 | @@ -3041,7 +3042,7 @@ | ||
1986 | test -z "$ac_dir" && ac_dir=. | ||
1987 | if $as_executable_p "$ac_dir/$ac_word"; then | ||
1988 | ac_cv_path_CXX="$ac_dir/$ac_word" | ||
1989 | - echo "$as_me:3044: found $ac_dir/$ac_word" >&5 | ||
1990 | + echo "$as_me:3045: found $ac_dir/$ac_word" >&5 | ||
1991 | break | ||
1992 | fi | ||
1993 | done | ||
1994 | @@ -3052,16 +3053,16 @@ | ||
1995 | CXX=$ac_cv_path_CXX | ||
1996 | |||
1997 | if test -n "$CXX"; then | ||
1998 | - echo "$as_me:3055: result: $CXX" >&5 | ||
1999 | + echo "$as_me:3056: result: $CXX" >&5 | ||
2000 | echo "${ECHO_T}$CXX" >&6 | ||
2001 | else | ||
2002 | - echo "$as_me:3058: result: no" >&5 | ||
2003 | + echo "$as_me:3059: result: no" >&5 | ||
2004 | echo "${ECHO_T}no" >&6 | ||
2005 | fi | ||
2006 | |||
2007 | fi | ||
2008 | if test "$CXX" = "g++" ; then | ||
2009 | - { echo "$as_me:3064: WARNING: ignoring hardcoded g++" >&5 | ||
2010 | + { echo "$as_me:3065: WARNING: ignoring hardcoded g++" >&5 | ||
2011 | echo "$as_me: WARNING: ignoring hardcoded g++" >&2;} | ||
2012 | cf_with_cxx=no; CXX=""; GXX=""; | ||
2013 | fi | ||
2014 | @@ -3069,11 +3070,11 @@ | ||
2015 | |||
2016 | GXX_VERSION=none | ||
2017 | if test "$GXX" = yes; then | ||
2018 | - echo "$as_me:3072: checking version of g++" >&5 | ||
2019 | + echo "$as_me:3073: checking version of g++" >&5 | ||
2020 | echo $ECHO_N "checking version of g++... $ECHO_C" >&6 | ||
2021 | GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" | ||
2022 | test -z "$GXX_VERSION" && GXX_VERSION=unknown | ||
2023 | - echo "$as_me:3076: result: $GXX_VERSION" >&5 | ||
2024 | + echo "$as_me:3077: result: $GXX_VERSION" >&5 | ||
2025 | echo "${ECHO_T}$GXX_VERSION" >&6 | ||
2026 | fi | ||
2027 | |||
2028 | @@ -3081,12 +3082,12 @@ | ||
2029 | 1*|2.[0-6]*) | ||
2030 | # GXX=""; CXX=""; ac_cv_prog_gxx=no | ||
2031 | # cf_cxx_library=no | ||
2032 | - { echo "$as_me:3084: WARNING: templates do not work" >&5 | ||
2033 | + { echo "$as_me:3085: WARNING: templates do not work" >&5 | ||
2034 | echo "$as_me: WARNING: templates do not work" >&2;} | ||
2035 | ;; | ||
2036 | esac | ||
2037 | |||
2038 | -echo "$as_me:3089: checking if you want to build C++ binding and demo" >&5 | ||
2039 | +echo "$as_me:3090: checking if you want to build C++ binding and demo" >&5 | ||
2040 | echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6 | ||
2041 | |||
2042 | # Check whether --with-cxx-binding or --without-cxx-binding was given. | ||
2043 | @@ -3096,10 +3097,10 @@ | ||
2044 | else | ||
2045 | cf_with_cxx_binding=$cf_with_cxx | ||
2046 | fi; | ||
2047 | -echo "$as_me:3099: result: $cf_with_cxx_binding" >&5 | ||
2048 | +echo "$as_me:3100: result: $cf_with_cxx_binding" >&5 | ||
2049 | echo "${ECHO_T}$cf_with_cxx_binding" >&6 | ||
2050 | |||
2051 | -echo "$as_me:3102: checking if you want to build with Ada95" >&5 | ||
2052 | +echo "$as_me:3103: checking if you want to build with Ada95" >&5 | ||
2053 | echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6 | ||
2054 | |||
2055 | # Check whether --with-ada or --without-ada was given. | ||
2056 | @@ -3109,10 +3110,23 @@ | ||
2057 | else | ||
2058 | cf_with_ada=yes | ||
2059 | fi; | ||
2060 | -echo "$as_me:3112: result: $cf_with_ada" >&5 | ||
2061 | +echo "$as_me:3113: result: $cf_with_ada" >&5 | ||
2062 | echo "${ECHO_T}$cf_with_ada" >&6 | ||
2063 | |||
2064 | -echo "$as_me:3115: checking if you want to build programs such as tic" >&5 | ||
2065 | +echo "$as_me:3116: checking if you want to install manpages" >&5 | ||
2066 | +echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6 | ||
2067 | + | ||
2068 | +# Check whether --with-manpages or --without-manpages was given. | ||
2069 | +if test "${with_manpages+set}" = set; then | ||
2070 | + withval="$with_manpages" | ||
2071 | + cf_with_manpages=$withval | ||
2072 | +else | ||
2073 | + cf_with_manpages=yes | ||
2074 | +fi; | ||
2075 | +echo "$as_me:3126: result: $cf_with_manpages" >&5 | ||
2076 | +echo "${ECHO_T}$cf_with_manpages" >&6 | ||
2077 | + | ||
2078 | +echo "$as_me:3129: checking if you want to build programs such as tic" >&5 | ||
2079 | echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6 | ||
2080 | |||
2081 | # Check whether --with-progs or --without-progs was given. | ||
2082 | @@ -3122,10 +3136,10 @@ | ||
2083 | else | ||
2084 | cf_with_progs=yes | ||
2085 | fi; | ||
2086 | -echo "$as_me:3125: result: $cf_with_progs" >&5 | ||
2087 | +echo "$as_me:3139: result: $cf_with_progs" >&5 | ||
2088 | echo "${ECHO_T}$cf_with_progs" >&6 | ||
2089 | |||
2090 | -echo "$as_me:3128: checking if you wish to install curses.h" >&5 | ||
2091 | +echo "$as_me:3142: checking if you wish to install curses.h" >&5 | ||
2092 | echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6 | ||
2093 | |||
2094 | # Check whether --with-curses-h or --without-curses-h was given. | ||
2095 | @@ -3135,7 +3149,7 @@ | ||
2096 | else | ||
2097 | with_curses_h=yes | ||
2098 | fi; | ||
2099 | -echo "$as_me:3138: result: $with_curses_h" >&5 | ||
2100 | +echo "$as_me:3152: result: $with_curses_h" >&5 | ||
2101 | echo "${ECHO_T}$with_curses_h" >&6 | ||
2102 | |||
2103 | modules_to_build="ncurses" | ||
2104 | @@ -3161,7 +3175,7 @@ | ||
2105 | do | ||
2106 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
2107 | set dummy $ac_prog; ac_word=$2 | ||
2108 | -echo "$as_me:3164: checking for $ac_word" >&5 | ||
2109 | +echo "$as_me:3178: checking for $ac_word" >&5 | ||
2110 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2111 | if test "${ac_cv_prog_AWK+set}" = set; then | ||
2112 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2113 | @@ -3176,7 +3190,7 @@ | ||
2114 | test -z "$ac_dir" && ac_dir=. | ||
2115 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
2116 | ac_cv_prog_AWK="$ac_prog" | ||
2117 | -echo "$as_me:3179: found $ac_dir/$ac_word" >&5 | ||
2118 | +echo "$as_me:3193: found $ac_dir/$ac_word" >&5 | ||
2119 | break | ||
2120 | done | ||
2121 | |||
2122 | @@ -3184,21 +3198,21 @@ | ||
2123 | fi | ||
2124 | AWK=$ac_cv_prog_AWK | ||
2125 | if test -n "$AWK"; then | ||
2126 | - echo "$as_me:3187: result: $AWK" >&5 | ||
2127 | + echo "$as_me:3201: result: $AWK" >&5 | ||
2128 | echo "${ECHO_T}$AWK" >&6 | ||
2129 | else | ||
2130 | - echo "$as_me:3190: result: no" >&5 | ||
2131 | + echo "$as_me:3204: result: no" >&5 | ||
2132 | echo "${ECHO_T}no" >&6 | ||
2133 | fi | ||
2134 | |||
2135 | test -n "$AWK" && break | ||
2136 | done | ||
2137 | |||
2138 | -test -z "$AWK" && { { echo "$as_me:3197: error: No awk program found" >&5 | ||
2139 | +test -z "$AWK" && { { echo "$as_me:3211: error: No awk program found" >&5 | ||
2140 | echo "$as_me: error: No awk program found" >&2;} | ||
2141 | { (exit 1); exit 1; }; } | ||
2142 | |||
2143 | -echo "$as_me:3201: checking for egrep" >&5 | ||
2144 | +echo "$as_me:3215: checking for egrep" >&5 | ||
2145 | echo $ECHO_N "checking for egrep... $ECHO_C" >&6 | ||
2146 | if test "${ac_cv_prog_egrep+set}" = set; then | ||
2147 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2148 | @@ -3208,11 +3222,11 @@ | ||
2149 | else ac_cv_prog_egrep='egrep' | ||
2150 | fi | ||
2151 | fi | ||
2152 | -echo "$as_me:3211: result: $ac_cv_prog_egrep" >&5 | ||
2153 | +echo "$as_me:3225: result: $ac_cv_prog_egrep" >&5 | ||
2154 | echo "${ECHO_T}$ac_cv_prog_egrep" >&6 | ||
2155 | EGREP=$ac_cv_prog_egrep | ||
2156 | |||
2157 | -test -z "$EGREP" && { { echo "$as_me:3215: error: No egrep program found" >&5 | ||
2158 | +test -z "$EGREP" && { { echo "$as_me:3229: error: No egrep program found" >&5 | ||
2159 | echo "$as_me: error: No egrep program found" >&2;} | ||
2160 | { (exit 1); exit 1; }; } | ||
2161 | |||
2162 | @@ -3228,7 +3242,7 @@ | ||
2163 | # AFS /usr/afsws/bin/install, which mishandles nonexistent args | ||
2164 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | ||
2165 | # ./install, which can be erroneously created by make from ./install.sh. | ||
2166 | -echo "$as_me:3231: checking for a BSD compatible install" >&5 | ||
2167 | +echo "$as_me:3245: checking for a BSD compatible install" >&5 | ||
2168 | echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 | ||
2169 | if test -z "$INSTALL"; then | ||
2170 | if test "${ac_cv_path_install+set}" = set; then | ||
2171 | @@ -3277,7 +3291,7 @@ | ||
2172 | INSTALL=$ac_install_sh | ||
2173 | fi | ||
2174 | fi | ||
2175 | -echo "$as_me:3280: result: $INSTALL" >&5 | ||
2176 | +echo "$as_me:3294: result: $INSTALL" >&5 | ||
2177 | echo "${ECHO_T}$INSTALL" >&6 | ||
2178 | |||
2179 | # Use test -z because SunOS4 sh mishandles braces in ${var-val}. | ||
2180 | @@ -3302,7 +3316,7 @@ | ||
2181 | do | ||
2182 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
2183 | set dummy $ac_prog; ac_word=$2 | ||
2184 | -echo "$as_me:3305: checking for $ac_word" >&5 | ||
2185 | +echo "$as_me:3319: checking for $ac_word" >&5 | ||
2186 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2187 | if test "${ac_cv_prog_LINT+set}" = set; then | ||
2188 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2189 | @@ -3317,7 +3331,7 @@ | ||
2190 | test -z "$ac_dir" && ac_dir=. | ||
2191 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
2192 | ac_cv_prog_LINT="$ac_prog" | ||
2193 | -echo "$as_me:3320: found $ac_dir/$ac_word" >&5 | ||
2194 | +echo "$as_me:3334: found $ac_dir/$ac_word" >&5 | ||
2195 | break | ||
2196 | done | ||
2197 | |||
2198 | @@ -3325,28 +3339,28 @@ | ||
2199 | fi | ||
2200 | LINT=$ac_cv_prog_LINT | ||
2201 | if test -n "$LINT"; then | ||
2202 | - echo "$as_me:3328: result: $LINT" >&5 | ||
2203 | + echo "$as_me:3342: result: $LINT" >&5 | ||
2204 | echo "${ECHO_T}$LINT" >&6 | ||
2205 | else | ||
2206 | - echo "$as_me:3331: result: no" >&5 | ||
2207 | + echo "$as_me:3345: result: no" >&5 | ||
2208 | echo "${ECHO_T}no" >&6 | ||
2209 | fi | ||
2210 | |||
2211 | test -n "$LINT" && break | ||
2212 | done | ||
2213 | |||
2214 | -echo "$as_me:3338: checking whether ln -s works" >&5 | ||
2215 | +echo "$as_me:3352: checking whether ln -s works" >&5 | ||
2216 | echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 | ||
2217 | LN_S=$as_ln_s | ||
2218 | if test "$LN_S" = "ln -s"; then | ||
2219 | - echo "$as_me:3342: result: yes" >&5 | ||
2220 | + echo "$as_me:3356: result: yes" >&5 | ||
2221 | echo "${ECHO_T}yes" >&6 | ||
2222 | else | ||
2223 | - echo "$as_me:3345: result: no, using $LN_S" >&5 | ||
2224 | + echo "$as_me:3359: result: no, using $LN_S" >&5 | ||
2225 | echo "${ECHO_T}no, using $LN_S" >&6 | ||
2226 | fi | ||
2227 | |||
2228 | -echo "$as_me:3349: checking for long file names" >&5 | ||
2229 | +echo "$as_me:3363: checking for long file names" >&5 | ||
2230 | echo $ECHO_N "checking for long file names... $ECHO_C" >&6 | ||
2231 | if test "${ac_cv_sys_long_file_names+set}" = set; then | ||
2232 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2233 | @@ -3385,7 +3399,7 @@ | ||
2234 | rm -rf $ac_xdir 2>/dev/null | ||
2235 | done | ||
2236 | fi | ||
2237 | -echo "$as_me:3388: result: $ac_cv_sys_long_file_names" >&5 | ||
2238 | +echo "$as_me:3402: result: $ac_cv_sys_long_file_names" >&5 | ||
2239 | echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 | ||
2240 | if test $ac_cv_sys_long_file_names = yes; then | ||
2241 | |||
2242 | @@ -3395,7 +3409,7 @@ | ||
2243 | |||
2244 | fi | ||
2245 | |||
2246 | -echo "$as_me:3398: checking if we should assume mixed-case filenames" >&5 | ||
2247 | +echo "$as_me:3412: checking if we should assume mixed-case filenames" >&5 | ||
2248 | echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 | ||
2249 | |||
2250 | # Check whether --enable-mixed-case or --disable-mixed-case was given. | ||
2251 | @@ -3405,11 +3419,11 @@ | ||
2252 | else | ||
2253 | enable_mixedcase=auto | ||
2254 | fi; | ||
2255 | -echo "$as_me:3408: result: $enable_mixedcase" >&5 | ||
2256 | +echo "$as_me:3422: result: $enable_mixedcase" >&5 | ||
2257 | echo "${ECHO_T}$enable_mixedcase" >&6 | ||
2258 | if test "$enable_mixedcase" = "auto" ; then | ||
2259 | |||
2260 | -echo "$as_me:3412: checking if filesystem supports mixed-case filenames" >&5 | ||
2261 | +echo "$as_me:3426: checking if filesystem supports mixed-case filenames" >&5 | ||
2262 | echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 | ||
2263 | if test "${cf_cv_mixedcase+set}" = set; then | ||
2264 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2265 | @@ -3436,7 +3450,7 @@ | ||
2266 | fi | ||
2267 | |||
2268 | fi | ||
2269 | -echo "$as_me:3439: result: $cf_cv_mixedcase" >&5 | ||
2270 | +echo "$as_me:3453: result: $cf_cv_mixedcase" >&5 | ||
2271 | echo "${ECHO_T}$cf_cv_mixedcase" >&6 | ||
2272 | test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF | ||
2273 | #define MIXEDCASE_FILENAMES 1 | ||
2274 | @@ -3453,7 +3467,7 @@ | ||
2275 | fi | ||
2276 | |||
2277 | # do this after mixed-case option (tags/TAGS is not as important as tic). | ||
2278 | -echo "$as_me:3456: checking whether ${MAKE-make} sets \${MAKE}" >&5 | ||
2279 | +echo "$as_me:3470: checking whether ${MAKE-make} sets \${MAKE}" >&5 | ||
2280 | echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 | ||
2281 | set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` | ||
2282 | if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then | ||
2283 | @@ -3473,18 +3487,18 @@ | ||
2284 | rm -f conftest.make | ||
2285 | fi | ||
2286 | if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then | ||
2287 | - echo "$as_me:3476: result: yes" >&5 | ||
2288 | + echo "$as_me:3490: result: yes" >&5 | ||
2289 | echo "${ECHO_T}yes" >&6 | ||
2290 | SET_MAKE= | ||
2291 | else | ||
2292 | - echo "$as_me:3480: result: no" >&5 | ||
2293 | + echo "$as_me:3494: result: no" >&5 | ||
2294 | echo "${ECHO_T}no" >&6 | ||
2295 | SET_MAKE="MAKE=${MAKE-make}" | ||
2296 | fi | ||
2297 | |||
2298 | # Extract the first word of "ctags", so it can be a program name with args. | ||
2299 | set dummy ctags; ac_word=$2 | ||
2300 | -echo "$as_me:3487: checking for $ac_word" >&5 | ||
2301 | +echo "$as_me:3501: checking for $ac_word" >&5 | ||
2302 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2303 | if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then | ||
2304 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2305 | @@ -3499,7 +3513,7 @@ | ||
2306 | test -z "$ac_dir" && ac_dir=. | ||
2307 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
2308 | ac_cv_prog_MAKE_LOWER_TAGS="yes" | ||
2309 | -echo "$as_me:3502: found $ac_dir/$ac_word" >&5 | ||
2310 | +echo "$as_me:3516: found $ac_dir/$ac_word" >&5 | ||
2311 | break | ||
2312 | done | ||
2313 | |||
2314 | @@ -3508,17 +3522,17 @@ | ||
2315 | fi | ||
2316 | MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS | ||
2317 | if test -n "$MAKE_LOWER_TAGS"; then | ||
2318 | - echo "$as_me:3511: result: $MAKE_LOWER_TAGS" >&5 | ||
2319 | + echo "$as_me:3525: result: $MAKE_LOWER_TAGS" >&5 | ||
2320 | echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 | ||
2321 | else | ||
2322 | - echo "$as_me:3514: result: no" >&5 | ||
2323 | + echo "$as_me:3528: result: no" >&5 | ||
2324 | echo "${ECHO_T}no" >&6 | ||
2325 | fi | ||
2326 | |||
2327 | if test "$cf_cv_mixedcase" = yes ; then | ||
2328 | # Extract the first word of "etags", so it can be a program name with args. | ||
2329 | set dummy etags; ac_word=$2 | ||
2330 | -echo "$as_me:3521: checking for $ac_word" >&5 | ||
2331 | +echo "$as_me:3535: checking for $ac_word" >&5 | ||
2332 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2333 | if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then | ||
2334 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2335 | @@ -3533,7 +3547,7 @@ | ||
2336 | test -z "$ac_dir" && ac_dir=. | ||
2337 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
2338 | ac_cv_prog_MAKE_UPPER_TAGS="yes" | ||
2339 | -echo "$as_me:3536: found $ac_dir/$ac_word" >&5 | ||
2340 | +echo "$as_me:3550: found $ac_dir/$ac_word" >&5 | ||
2341 | break | ||
2342 | done | ||
2343 | |||
2344 | @@ -3542,10 +3556,10 @@ | ||
2345 | fi | ||
2346 | MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS | ||
2347 | if test -n "$MAKE_UPPER_TAGS"; then | ||
2348 | - echo "$as_me:3545: result: $MAKE_UPPER_TAGS" >&5 | ||
2349 | + echo "$as_me:3559: result: $MAKE_UPPER_TAGS" >&5 | ||
2350 | echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 | ||
2351 | else | ||
2352 | - echo "$as_me:3548: result: no" >&5 | ||
2353 | + echo "$as_me:3562: result: no" >&5 | ||
2354 | echo "${ECHO_T}no" >&6 | ||
2355 | fi | ||
2356 | |||
2357 | @@ -3565,7 +3579,7 @@ | ||
2358 | MAKE_LOWER_TAGS="#" | ||
2359 | fi | ||
2360 | |||
2361 | -echo "$as_me:3568: checking for makeflags variable" >&5 | ||
2362 | +echo "$as_me:3582: checking for makeflags variable" >&5 | ||
2363 | echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 | ||
2364 | if test "${cf_cv_makeflags+set}" = set; then | ||
2365 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2366 | @@ -3599,13 +3613,13 @@ | ||
2367 | rm -f cf_makeflags.tmp | ||
2368 | |||
2369 | fi | ||
2370 | -echo "$as_me:3602: result: $cf_cv_makeflags" >&5 | ||
2371 | +echo "$as_me:3616: result: $cf_cv_makeflags" >&5 | ||
2372 | echo "${ECHO_T}$cf_cv_makeflags" >&6 | ||
2373 | |||
2374 | if test -n "$ac_tool_prefix"; then | ||
2375 | # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. | ||
2376 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 | ||
2377 | -echo "$as_me:3608: checking for $ac_word" >&5 | ||
2378 | +echo "$as_me:3622: checking for $ac_word" >&5 | ||
2379 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2380 | if test "${ac_cv_prog_RANLIB+set}" = set; then | ||
2381 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2382 | @@ -3620,7 +3634,7 @@ | ||
2383 | test -z "$ac_dir" && ac_dir=. | ||
2384 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
2385 | ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" | ||
2386 | -echo "$as_me:3623: found $ac_dir/$ac_word" >&5 | ||
2387 | +echo "$as_me:3637: found $ac_dir/$ac_word" >&5 | ||
2388 | break | ||
2389 | done | ||
2390 | |||
2391 | @@ -3628,10 +3642,10 @@ | ||
2392 | fi | ||
2393 | RANLIB=$ac_cv_prog_RANLIB | ||
2394 | if test -n "$RANLIB"; then | ||
2395 | - echo "$as_me:3631: result: $RANLIB" >&5 | ||
2396 | + echo "$as_me:3645: result: $RANLIB" >&5 | ||
2397 | echo "${ECHO_T}$RANLIB" >&6 | ||
2398 | else | ||
2399 | - echo "$as_me:3634: result: no" >&5 | ||
2400 | + echo "$as_me:3648: result: no" >&5 | ||
2401 | echo "${ECHO_T}no" >&6 | ||
2402 | fi | ||
2403 | |||
2404 | @@ -3640,7 +3654,7 @@ | ||
2405 | ac_ct_RANLIB=$RANLIB | ||
2406 | # Extract the first word of "ranlib", so it can be a program name with args. | ||
2407 | set dummy ranlib; ac_word=$2 | ||
2408 | -echo "$as_me:3643: checking for $ac_word" >&5 | ||
2409 | +echo "$as_me:3657: checking for $ac_word" >&5 | ||
2410 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2411 | if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then | ||
2412 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2413 | @@ -3655,7 +3669,7 @@ | ||
2414 | test -z "$ac_dir" && ac_dir=. | ||
2415 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
2416 | ac_cv_prog_ac_ct_RANLIB="ranlib" | ||
2417 | -echo "$as_me:3658: found $ac_dir/$ac_word" >&5 | ||
2418 | +echo "$as_me:3672: found $ac_dir/$ac_word" >&5 | ||
2419 | break | ||
2420 | done | ||
2421 | |||
2422 | @@ -3664,10 +3678,10 @@ | ||
2423 | fi | ||
2424 | ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB | ||
2425 | if test -n "$ac_ct_RANLIB"; then | ||
2426 | - echo "$as_me:3667: result: $ac_ct_RANLIB" >&5 | ||
2427 | + echo "$as_me:3681: result: $ac_ct_RANLIB" >&5 | ||
2428 | echo "${ECHO_T}$ac_ct_RANLIB" >&6 | ||
2429 | else | ||
2430 | - echo "$as_me:3670: result: no" >&5 | ||
2431 | + echo "$as_me:3684: result: no" >&5 | ||
2432 | echo "${ECHO_T}no" >&6 | ||
2433 | fi | ||
2434 | |||
2435 | @@ -3679,7 +3693,7 @@ | ||
2436 | if test -n "$ac_tool_prefix"; then | ||
2437 | # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. | ||
2438 | set dummy ${ac_tool_prefix}ld; ac_word=$2 | ||
2439 | -echo "$as_me:3682: checking for $ac_word" >&5 | ||
2440 | +echo "$as_me:3696: checking for $ac_word" >&5 | ||
2441 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2442 | if test "${ac_cv_prog_LD+set}" = set; then | ||
2443 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2444 | @@ -3694,7 +3708,7 @@ | ||
2445 | test -z "$ac_dir" && ac_dir=. | ||
2446 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
2447 | ac_cv_prog_LD="${ac_tool_prefix}ld" | ||
2448 | -echo "$as_me:3697: found $ac_dir/$ac_word" >&5 | ||
2449 | +echo "$as_me:3711: found $ac_dir/$ac_word" >&5 | ||
2450 | break | ||
2451 | done | ||
2452 | |||
2453 | @@ -3702,10 +3716,10 @@ | ||
2454 | fi | ||
2455 | LD=$ac_cv_prog_LD | ||
2456 | if test -n "$LD"; then | ||
2457 | - echo "$as_me:3705: result: $LD" >&5 | ||
2458 | + echo "$as_me:3719: result: $LD" >&5 | ||
2459 | echo "${ECHO_T}$LD" >&6 | ||
2460 | else | ||
2461 | - echo "$as_me:3708: result: no" >&5 | ||
2462 | + echo "$as_me:3722: result: no" >&5 | ||
2463 | echo "${ECHO_T}no" >&6 | ||
2464 | fi | ||
2465 | |||
2466 | @@ -3714,7 +3728,7 @@ | ||
2467 | ac_ct_LD=$LD | ||
2468 | # Extract the first word of "ld", so it can be a program name with args. | ||
2469 | set dummy ld; ac_word=$2 | ||
2470 | -echo "$as_me:3717: checking for $ac_word" >&5 | ||
2471 | +echo "$as_me:3731: checking for $ac_word" >&5 | ||
2472 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2473 | if test "${ac_cv_prog_ac_ct_LD+set}" = set; then | ||
2474 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2475 | @@ -3729,7 +3743,7 @@ | ||
2476 | test -z "$ac_dir" && ac_dir=. | ||
2477 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
2478 | ac_cv_prog_ac_ct_LD="ld" | ||
2479 | -echo "$as_me:3732: found $ac_dir/$ac_word" >&5 | ||
2480 | +echo "$as_me:3746: found $ac_dir/$ac_word" >&5 | ||
2481 | break | ||
2482 | done | ||
2483 | |||
2484 | @@ -3738,10 +3752,10 @@ | ||
2485 | fi | ||
2486 | ac_ct_LD=$ac_cv_prog_ac_ct_LD | ||
2487 | if test -n "$ac_ct_LD"; then | ||
2488 | - echo "$as_me:3741: result: $ac_ct_LD" >&5 | ||
2489 | + echo "$as_me:3755: result: $ac_ct_LD" >&5 | ||
2490 | echo "${ECHO_T}$ac_ct_LD" >&6 | ||
2491 | else | ||
2492 | - echo "$as_me:3744: result: no" >&5 | ||
2493 | + echo "$as_me:3758: result: no" >&5 | ||
2494 | echo "${ECHO_T}no" >&6 | ||
2495 | fi | ||
2496 | |||
2497 | @@ -3753,7 +3767,7 @@ | ||
2498 | if test -n "$ac_tool_prefix"; then | ||
2499 | # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | ||
2500 | set dummy ${ac_tool_prefix}ar; ac_word=$2 | ||
2501 | -echo "$as_me:3756: checking for $ac_word" >&5 | ||
2502 | +echo "$as_me:3770: checking for $ac_word" >&5 | ||
2503 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2504 | if test "${ac_cv_prog_AR+set}" = set; then | ||
2505 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2506 | @@ -3768,7 +3782,7 @@ | ||
2507 | test -z "$ac_dir" && ac_dir=. | ||
2508 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
2509 | ac_cv_prog_AR="${ac_tool_prefix}ar" | ||
2510 | -echo "$as_me:3771: found $ac_dir/$ac_word" >&5 | ||
2511 | +echo "$as_me:3785: found $ac_dir/$ac_word" >&5 | ||
2512 | break | ||
2513 | done | ||
2514 | |||
2515 | @@ -3776,10 +3790,10 @@ | ||
2516 | fi | ||
2517 | AR=$ac_cv_prog_AR | ||
2518 | if test -n "$AR"; then | ||
2519 | - echo "$as_me:3779: result: $AR" >&5 | ||
2520 | + echo "$as_me:3793: result: $AR" >&5 | ||
2521 | echo "${ECHO_T}$AR" >&6 | ||
2522 | else | ||
2523 | - echo "$as_me:3782: result: no" >&5 | ||
2524 | + echo "$as_me:3796: result: no" >&5 | ||
2525 | echo "${ECHO_T}no" >&6 | ||
2526 | fi | ||
2527 | |||
2528 | @@ -3788,7 +3802,7 @@ | ||
2529 | ac_ct_AR=$AR | ||
2530 | # Extract the first word of "ar", so it can be a program name with args. | ||
2531 | set dummy ar; ac_word=$2 | ||
2532 | -echo "$as_me:3791: checking for $ac_word" >&5 | ||
2533 | +echo "$as_me:3805: checking for $ac_word" >&5 | ||
2534 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2535 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then | ||
2536 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2537 | @@ -3803,7 +3817,7 @@ | ||
2538 | test -z "$ac_dir" && ac_dir=. | ||
2539 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
2540 | ac_cv_prog_ac_ct_AR="ar" | ||
2541 | -echo "$as_me:3806: found $ac_dir/$ac_word" >&5 | ||
2542 | +echo "$as_me:3820: found $ac_dir/$ac_word" >&5 | ||
2543 | break | ||
2544 | done | ||
2545 | |||
2546 | @@ -3812,10 +3826,10 @@ | ||
2547 | fi | ||
2548 | ac_ct_AR=$ac_cv_prog_ac_ct_AR | ||
2549 | if test -n "$ac_ct_AR"; then | ||
2550 | - echo "$as_me:3815: result: $ac_ct_AR" >&5 | ||
2551 | + echo "$as_me:3829: result: $ac_ct_AR" >&5 | ||
2552 | echo "${ECHO_T}$ac_ct_AR" >&6 | ||
2553 | else | ||
2554 | - echo "$as_me:3818: result: no" >&5 | ||
2555 | + echo "$as_me:3832: result: no" >&5 | ||
2556 | echo "${ECHO_T}no" >&6 | ||
2557 | fi | ||
2558 | |||
2559 | @@ -3828,7 +3842,7 @@ | ||
2560 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2561 | else | ||
2562 | |||
2563 | -echo "$as_me:3831: checking for archiver options (symbol AR_OPTS)" >&5 | ||
2564 | +echo "$as_me:3845: checking for archiver options (symbol AR_OPTS)" >&5 | ||
2565 | echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6 | ||
2566 | |||
2567 | if test -z "$AR_OPTS" ; then | ||
2568 | @@ -3837,12 +3851,12 @@ | ||
2569 | fi | ||
2570 | |||
2571 | cf_cv_subst_AR_OPTS=$AR_OPTS | ||
2572 | -echo "$as_me:3840: result: $AR_OPTS" >&5 | ||
2573 | +echo "$as_me:3854: result: $AR_OPTS" >&5 | ||
2574 | echo "${ECHO_T}$AR_OPTS" >&6 | ||
2575 | |||
2576 | fi | ||
2577 | |||
2578 | -echo "$as_me:3845: checking if you have specified an install-prefix" >&5 | ||
2579 | +echo "$as_me:3859: checking if you have specified an install-prefix" >&5 | ||
2580 | echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 | ||
2581 | |||
2582 | # Check whether --with-install-prefix or --without-install-prefix was given. | ||
2583 | @@ -3855,7 +3869,7 @@ | ||
2584 | ;; | ||
2585 | esac | ||
2586 | fi; | ||
2587 | -echo "$as_me:3858: result: $DESTDIR" >&5 | ||
2588 | +echo "$as_me:3872: result: $DESTDIR" >&5 | ||
2589 | echo "${ECHO_T}$DESTDIR" >&6 | ||
2590 | |||
2591 | ############################################################################### | ||
2592 | @@ -3883,7 +3897,7 @@ | ||
2593 | do | ||
2594 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
2595 | set dummy $ac_prog; ac_word=$2 | ||
2596 | -echo "$as_me:3886: checking for $ac_word" >&5 | ||
2597 | +echo "$as_me:3900: checking for $ac_word" >&5 | ||
2598 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2599 | if test "${ac_cv_prog_BUILD_CC+set}" = set; then | ||
2600 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2601 | @@ -3898,7 +3912,7 @@ | ||
2602 | test -z "$ac_dir" && ac_dir=. | ||
2603 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
2604 | ac_cv_prog_BUILD_CC="$ac_prog" | ||
2605 | -echo "$as_me:3901: found $ac_dir/$ac_word" >&5 | ||
2606 | +echo "$as_me:3915: found $ac_dir/$ac_word" >&5 | ||
2607 | break | ||
2608 | done | ||
2609 | |||
2610 | @@ -3906,10 +3920,10 @@ | ||
2611 | fi | ||
2612 | BUILD_CC=$ac_cv_prog_BUILD_CC | ||
2613 | if test -n "$BUILD_CC"; then | ||
2614 | - echo "$as_me:3909: result: $BUILD_CC" >&5 | ||
2615 | + echo "$as_me:3923: result: $BUILD_CC" >&5 | ||
2616 | echo "${ECHO_T}$BUILD_CC" >&6 | ||
2617 | else | ||
2618 | - echo "$as_me:3912: result: no" >&5 | ||
2619 | + echo "$as_me:3926: result: no" >&5 | ||
2620 | echo "${ECHO_T}no" >&6 | ||
2621 | fi | ||
2622 | |||
2623 | @@ -3917,12 +3931,12 @@ | ||
2624 | done | ||
2625 | |||
2626 | fi; | ||
2627 | - echo "$as_me:3920: checking for native build C compiler" >&5 | ||
2628 | + echo "$as_me:3934: checking for native build C compiler" >&5 | ||
2629 | echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 | ||
2630 | - echo "$as_me:3922: result: $BUILD_CC" >&5 | ||
2631 | + echo "$as_me:3936: result: $BUILD_CC" >&5 | ||
2632 | echo "${ECHO_T}$BUILD_CC" >&6 | ||
2633 | |||
2634 | - echo "$as_me:3925: checking for native build C preprocessor" >&5 | ||
2635 | + echo "$as_me:3939: checking for native build C preprocessor" >&5 | ||
2636 | echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 | ||
2637 | |||
2638 | # Check whether --with-build-cpp or --without-build-cpp was given. | ||
2639 | @@ -3932,10 +3946,10 @@ | ||
2640 | else | ||
2641 | BUILD_CPP='${BUILD_CC} -E' | ||
2642 | fi; | ||
2643 | - echo "$as_me:3935: result: $BUILD_CPP" >&5 | ||
2644 | + echo "$as_me:3949: result: $BUILD_CPP" >&5 | ||
2645 | echo "${ECHO_T}$BUILD_CPP" >&6 | ||
2646 | |||
2647 | - echo "$as_me:3938: checking for native build C flags" >&5 | ||
2648 | + echo "$as_me:3952: checking for native build C flags" >&5 | ||
2649 | echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 | ||
2650 | |||
2651 | # Check whether --with-build-cflags or --without-build-cflags was given. | ||
2652 | @@ -3943,10 +3957,10 @@ | ||
2653 | withval="$with_build_cflags" | ||
2654 | BUILD_CFLAGS="$withval" | ||
2655 | fi; | ||
2656 | - echo "$as_me:3946: result: $BUILD_CFLAGS" >&5 | ||
2657 | + echo "$as_me:3960: result: $BUILD_CFLAGS" >&5 | ||
2658 | echo "${ECHO_T}$BUILD_CFLAGS" >&6 | ||
2659 | |||
2660 | - echo "$as_me:3949: checking for native build C preprocessor-flags" >&5 | ||
2661 | + echo "$as_me:3963: checking for native build C preprocessor-flags" >&5 | ||
2662 | echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 | ||
2663 | |||
2664 | # Check whether --with-build-cppflags or --without-build-cppflags was given. | ||
2665 | @@ -3954,10 +3968,10 @@ | ||
2666 | withval="$with_build_cppflags" | ||
2667 | BUILD_CPPFLAGS="$withval" | ||
2668 | fi; | ||
2669 | - echo "$as_me:3957: result: $BUILD_CPPFLAGS" >&5 | ||
2670 | + echo "$as_me:3971: result: $BUILD_CPPFLAGS" >&5 | ||
2671 | echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 | ||
2672 | |||
2673 | - echo "$as_me:3960: checking for native build linker-flags" >&5 | ||
2674 | + echo "$as_me:3974: checking for native build linker-flags" >&5 | ||
2675 | echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 | ||
2676 | |||
2677 | # Check whether --with-build-ldflags or --without-build-ldflags was given. | ||
2678 | @@ -3965,10 +3979,10 @@ | ||
2679 | withval="$with_build_ldflags" | ||
2680 | BUILD_LDFLAGS="$withval" | ||
2681 | fi; | ||
2682 | - echo "$as_me:3968: result: $BUILD_LDFLAGS" >&5 | ||
2683 | + echo "$as_me:3982: result: $BUILD_LDFLAGS" >&5 | ||
2684 | echo "${ECHO_T}$BUILD_LDFLAGS" >&6 | ||
2685 | |||
2686 | - echo "$as_me:3971: checking for native build linker-libraries" >&5 | ||
2687 | + echo "$as_me:3985: checking for native build linker-libraries" >&5 | ||
2688 | echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 | ||
2689 | |||
2690 | # Check whether --with-build-libs or --without-build-libs was given. | ||
2691 | @@ -3976,7 +3990,7 @@ | ||
2692 | withval="$with_build_libs" | ||
2693 | BUILD_LIBS="$withval" | ||
2694 | fi; | ||
2695 | - echo "$as_me:3979: result: $BUILD_LIBS" >&5 | ||
2696 | + echo "$as_me:3993: result: $BUILD_LIBS" >&5 | ||
2697 | echo "${ECHO_T}$BUILD_LIBS" >&6 | ||
2698 | |||
2699 | # this assumes we're on Unix. | ||
2700 | @@ -3986,7 +4000,7 @@ | ||
2701 | : ${BUILD_CC:='${CC}'} | ||
2702 | |||
2703 | if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then | ||
2704 | - { { echo "$as_me:3989: error: Cross-build requires two compilers. | ||
2705 | + { { echo "$as_me:4003: error: Cross-build requires two compilers. | ||
2706 | Use --with-build-cc to specify the native compiler." >&5 | ||
2707 | echo "$as_me: error: Cross-build requires two compilers. | ||
2708 | Use --with-build-cc to specify the native compiler." >&2;} | ||
2709 | @@ -4027,7 +4041,7 @@ | ||
2710 | LIB_INSTALL= | ||
2711 | LIB_UNINSTALL= | ||
2712 | |||
2713 | -echo "$as_me:4030: checking if you want to build libraries with libtool" >&5 | ||
2714 | +echo "$as_me:4044: checking if you want to build libraries with libtool" >&5 | ||
2715 | echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6 | ||
2716 | |||
2717 | # Check whether --with-libtool or --without-libtool was given. | ||
2718 | @@ -4037,7 +4051,7 @@ | ||
2719 | else | ||
2720 | with_libtool=no | ||
2721 | fi; | ||
2722 | -echo "$as_me:4040: result: $with_libtool" >&5 | ||
2723 | +echo "$as_me:4054: result: $with_libtool" >&5 | ||
2724 | echo "${ECHO_T}$with_libtool" >&6 | ||
2725 | if test "$with_libtool" != "no"; then | ||
2726 | |||
2727 | @@ -4068,7 +4082,7 @@ | ||
2728 | with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` | ||
2729 | ;; | ||
2730 | *) | ||
2731 | - { { echo "$as_me:4071: error: expected a pathname, not \"$with_libtool\"" >&5 | ||
2732 | + { { echo "$as_me:4085: error: expected a pathname, not \"$with_libtool\"" >&5 | ||
2733 | echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} | ||
2734 | { (exit 1); exit 1; }; } | ||
2735 | ;; | ||
2736 | @@ -4078,7 +4092,7 @@ | ||
2737 | else | ||
2738 | # Extract the first word of "libtool", so it can be a program name with args. | ||
2739 | set dummy libtool; ac_word=$2 | ||
2740 | -echo "$as_me:4081: checking for $ac_word" >&5 | ||
2741 | +echo "$as_me:4095: checking for $ac_word" >&5 | ||
2742 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
2743 | if test "${ac_cv_path_LIBTOOL+set}" = set; then | ||
2744 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2745 | @@ -4095,7 +4109,7 @@ | ||
2746 | test -z "$ac_dir" && ac_dir=. | ||
2747 | if $as_executable_p "$ac_dir/$ac_word"; then | ||
2748 | ac_cv_path_LIBTOOL="$ac_dir/$ac_word" | ||
2749 | - echo "$as_me:4098: found $ac_dir/$ac_word" >&5 | ||
2750 | + echo "$as_me:4112: found $ac_dir/$ac_word" >&5 | ||
2751 | break | ||
2752 | fi | ||
2753 | done | ||
2754 | @@ -4106,16 +4120,16 @@ | ||
2755 | LIBTOOL=$ac_cv_path_LIBTOOL | ||
2756 | |||
2757 | if test -n "$LIBTOOL"; then | ||
2758 | - echo "$as_me:4109: result: $LIBTOOL" >&5 | ||
2759 | + echo "$as_me:4123: result: $LIBTOOL" >&5 | ||
2760 | echo "${ECHO_T}$LIBTOOL" >&6 | ||
2761 | else | ||
2762 | - echo "$as_me:4112: result: no" >&5 | ||
2763 | + echo "$as_me:4126: result: no" >&5 | ||
2764 | echo "${ECHO_T}no" >&6 | ||
2765 | fi | ||
2766 | |||
2767 | fi | ||
2768 | if test -z "$LIBTOOL" ; then | ||
2769 | - { { echo "$as_me:4118: error: Cannot find libtool" >&5 | ||
2770 | + { { echo "$as_me:4132: error: Cannot find libtool" >&5 | ||
2771 | echo "$as_me: error: Cannot find libtool" >&2;} | ||
2772 | { (exit 1); exit 1; }; } | ||
2773 | fi | ||
2774 | @@ -4130,17 +4144,17 @@ | ||
2775 | LIB_PREP=: | ||
2776 | |||
2777 | # Show the version of libtool | ||
2778 | - echo "$as_me:4133: checking version of libtool" >&5 | ||
2779 | + echo "$as_me:4147: checking version of libtool" >&5 | ||
2780 | echo $ECHO_N "checking version of libtool... $ECHO_C" >&6 | ||
2781 | |||
2782 | # Save the version in a cache variable - this is not entirely a good | ||
2783 | # thing, but the version string from libtool is very ugly, and for | ||
2784 | # bug reports it might be useful to have the original string. | ||
2785 | 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.].*//'` | ||
2786 | - echo "$as_me:4140: result: $cf_cv_libtool_version" >&5 | ||
2787 | + echo "$as_me:4154: result: $cf_cv_libtool_version" >&5 | ||
2788 | echo "${ECHO_T}$cf_cv_libtool_version" >&6 | ||
2789 | if test -z "$cf_cv_libtool_version" ; then | ||
2790 | - { { echo "$as_me:4143: error: This is not GNU libtool" >&5 | ||
2791 | + { { echo "$as_me:4157: error: This is not GNU libtool" >&5 | ||
2792 | echo "$as_me: error: This is not GNU libtool" >&2;} | ||
2793 | { (exit 1); exit 1; }; } | ||
2794 | fi | ||
2795 | @@ -4168,7 +4182,7 @@ | ||
2796 | |||
2797 | else | ||
2798 | |||
2799 | -echo "$as_me:4171: checking if you want to build shared libraries" >&5 | ||
2800 | +echo "$as_me:4185: checking if you want to build shared libraries" >&5 | ||
2801 | echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6 | ||
2802 | |||
2803 | # Check whether --with-shared or --without-shared was given. | ||
2804 | @@ -4178,11 +4192,11 @@ | ||
2805 | else | ||
2806 | with_shared=no | ||
2807 | fi; | ||
2808 | -echo "$as_me:4181: result: $with_shared" >&5 | ||
2809 | +echo "$as_me:4195: result: $with_shared" >&5 | ||
2810 | echo "${ECHO_T}$with_shared" >&6 | ||
2811 | test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" | ||
2812 | |||
2813 | -echo "$as_me:4185: checking if you want to build static libraries" >&5 | ||
2814 | +echo "$as_me:4199: checking if you want to build static libraries" >&5 | ||
2815 | echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6 | ||
2816 | |||
2817 | # Check whether --with-normal or --without-normal was given. | ||
2818 | @@ -4192,11 +4206,11 @@ | ||
2819 | else | ||
2820 | with_normal=yes | ||
2821 | fi; | ||
2822 | -echo "$as_me:4195: result: $with_normal" >&5 | ||
2823 | +echo "$as_me:4209: result: $with_normal" >&5 | ||
2824 | echo "${ECHO_T}$with_normal" >&6 | ||
2825 | test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal" | ||
2826 | |||
2827 | -echo "$as_me:4199: checking if you want to build debug libraries" >&5 | ||
2828 | +echo "$as_me:4213: checking if you want to build debug libraries" >&5 | ||
2829 | echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6 | ||
2830 | |||
2831 | # Check whether --with-debug or --without-debug was given. | ||
2832 | @@ -4206,11 +4220,11 @@ | ||
2833 | else | ||
2834 | with_debug=yes | ||
2835 | fi; | ||
2836 | -echo "$as_me:4209: result: $with_debug" >&5 | ||
2837 | +echo "$as_me:4223: result: $with_debug" >&5 | ||
2838 | echo "${ECHO_T}$with_debug" >&6 | ||
2839 | test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug" | ||
2840 | |||
2841 | -echo "$as_me:4213: checking if you want to build profiling libraries" >&5 | ||
2842 | +echo "$as_me:4227: checking if you want to build profiling libraries" >&5 | ||
2843 | echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6 | ||
2844 | |||
2845 | # Check whether --with-profile or --without-profile was given. | ||
2846 | @@ -4220,7 +4234,7 @@ | ||
2847 | else | ||
2848 | with_profile=no | ||
2849 | fi; | ||
2850 | -echo "$as_me:4223: result: $with_profile" >&5 | ||
2851 | +echo "$as_me:4237: result: $with_profile" >&5 | ||
2852 | echo "${ECHO_T}$with_profile" >&6 | ||
2853 | test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile" | ||
2854 | |||
2855 | @@ -4228,19 +4242,19 @@ | ||
2856 | |||
2857 | ############################################################################### | ||
2858 | |||
2859 | -echo "$as_me:4231: checking for specified models" >&5 | ||
2860 | +echo "$as_me:4245: checking for specified models" >&5 | ||
2861 | echo $ECHO_N "checking for specified models... $ECHO_C" >&6 | ||
2862 | test -z "$cf_list_models" && cf_list_models=normal | ||
2863 | test "$with_libtool" != "no" && cf_list_models=libtool | ||
2864 | -echo "$as_me:4235: result: $cf_list_models" >&5 | ||
2865 | +echo "$as_me:4249: result: $cf_list_models" >&5 | ||
2866 | echo "${ECHO_T}$cf_list_models" >&6 | ||
2867 | |||
2868 | ### Use the first model as the default, and save its suffix for use in building | ||
2869 | ### up test-applications. | ||
2870 | -echo "$as_me:4240: checking for default model" >&5 | ||
2871 | +echo "$as_me:4254: checking for default model" >&5 | ||
2872 | echo $ECHO_N "checking for default model... $ECHO_C" >&6 | ||
2873 | DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` | ||
2874 | -echo "$as_me:4243: result: $DFT_LWR_MODEL" >&5 | ||
2875 | +echo "$as_me:4257: result: $DFT_LWR_MODEL" >&5 | ||
2876 | echo "${ECHO_T}$DFT_LWR_MODEL" >&6 | ||
2877 | |||
2878 | DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` | ||
2879 | @@ -4269,7 +4283,7 @@ | ||
2880 | |||
2881 | ############################################################################### | ||
2882 | |||
2883 | -echo "$as_me:4272: checking if you want to build a separate terminfo library" >&5 | ||
2884 | +echo "$as_me:4286: checking if you want to build a separate terminfo library" >&5 | ||
2885 | echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6 | ||
2886 | |||
2887 | # Check whether --with-termlib or --without-termlib was given. | ||
2888 | @@ -4279,10 +4293,10 @@ | ||
2889 | else | ||
2890 | with_termlib=no | ||
2891 | fi; | ||
2892 | -echo "$as_me:4282: result: $with_termlib" >&5 | ||
2893 | +echo "$as_me:4296: result: $with_termlib" >&5 | ||
2894 | echo "${ECHO_T}$with_termlib" >&6 | ||
2895 | |||
2896 | -echo "$as_me:4285: checking if you want to build a separate tic library" >&5 | ||
2897 | +echo "$as_me:4299: checking if you want to build a separate tic library" >&5 | ||
2898 | echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6 | ||
2899 | |||
2900 | # Check whether --with-ticlib or --without-ticlib was given. | ||
2901 | @@ -4292,13 +4306,13 @@ | ||
2902 | else | ||
2903 | with_ticlib=no | ||
2904 | fi; | ||
2905 | -echo "$as_me:4295: result: $with_ticlib" >&5 | ||
2906 | +echo "$as_me:4309: result: $with_ticlib" >&5 | ||
2907 | echo "${ECHO_T}$with_ticlib" >&6 | ||
2908 | |||
2909 | ### Checks for special libraries, must be done up-front. | ||
2910 | SHLIB_LIST="" | ||
2911 | |||
2912 | -echo "$as_me:4301: checking if you want to link with the GPM mouse library" >&5 | ||
2913 | +echo "$as_me:4315: checking if you want to link with the GPM mouse library" >&5 | ||
2914 | echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6 | ||
2915 | |||
2916 | # Check whether --with-gpm or --without-gpm was given. | ||
2917 | @@ -4308,27 +4322,27 @@ | ||
2918 | else | ||
2919 | with_gpm=maybe | ||
2920 | fi; | ||
2921 | -echo "$as_me:4311: result: $with_gpm" >&5 | ||
2922 | +echo "$as_me:4325: result: $with_gpm" >&5 | ||
2923 | echo "${ECHO_T}$with_gpm" >&6 | ||
2924 | |||
2925 | if test "$with_gpm" != no ; then | ||
2926 | - echo "$as_me:4315: checking for gpm.h" >&5 | ||
2927 | + echo "$as_me:4329: checking for gpm.h" >&5 | ||
2928 | echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6 | ||
2929 | if test "${ac_cv_header_gpm_h+set}" = set; then | ||
2930 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2931 | else | ||
2932 | cat >conftest.$ac_ext <<_ACEOF | ||
2933 | -#line 4321 "configure" | ||
2934 | +#line 4335 "configure" | ||
2935 | #include "confdefs.h" | ||
2936 | #include <gpm.h> | ||
2937 | _ACEOF | ||
2938 | -if { (eval echo "$as_me:4325: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
2939 | +if { (eval echo "$as_me:4339: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
2940 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
2941 | ac_status=$? | ||
2942 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
2943 | rm -f conftest.er1 | ||
2944 | cat conftest.err >&5 | ||
2945 | - echo "$as_me:4331: \$? = $ac_status" >&5 | ||
2946 | + echo "$as_me:4345: \$? = $ac_status" >&5 | ||
2947 | (exit $ac_status); } >/dev/null; then | ||
2948 | if test -s conftest.err; then | ||
2949 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
2950 | @@ -4347,7 +4361,7 @@ | ||
2951 | fi | ||
2952 | rm -f conftest.err conftest.$ac_ext | ||
2953 | fi | ||
2954 | -echo "$as_me:4350: result: $ac_cv_header_gpm_h" >&5 | ||
2955 | +echo "$as_me:4364: result: $ac_cv_header_gpm_h" >&5 | ||
2956 | echo "${ECHO_T}$ac_cv_header_gpm_h" >&6 | ||
2957 | if test $ac_cv_header_gpm_h = yes; then | ||
2958 | |||
2959 | @@ -4358,14 +4372,14 @@ | ||
2960 | if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then | ||
2961 | test -n "$verbose" && echo " assuming we really have GPM library" 1>&6 | ||
2962 | |||
2963 | -echo "${as_me-configure}:4361: testing assuming we really have GPM library ..." 1>&5 | ||
2964 | +echo "${as_me-configure}:4375: testing assuming we really have GPM library ..." 1>&5 | ||
2965 | |||
2966 | cat >>confdefs.h <<\EOF | ||
2967 | #define HAVE_LIBGPM 1 | ||
2968 | EOF | ||
2969 | |||
2970 | else | ||
2971 | - echo "$as_me:4368: checking for Gpm_Open in -lgpm" >&5 | ||
2972 | + echo "$as_me:4382: checking for Gpm_Open in -lgpm" >&5 | ||
2973 | echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 | ||
2974 | if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then | ||
2975 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
2976 | @@ -4373,7 +4387,7 @@ | ||
2977 | ac_check_lib_save_LIBS=$LIBS | ||
2978 | LIBS="-lgpm $LIBS" | ||
2979 | cat >conftest.$ac_ext <<_ACEOF | ||
2980 | -#line 4376 "configure" | ||
2981 | +#line 4390 "configure" | ||
2982 | #include "confdefs.h" | ||
2983 | |||
2984 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
2985 | @@ -4392,16 +4406,16 @@ | ||
2986 | } | ||
2987 | _ACEOF | ||
2988 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
2989 | -if { (eval echo "$as_me:4395: \"$ac_link\"") >&5 | ||
2990 | +if { (eval echo "$as_me:4409: \"$ac_link\"") >&5 | ||
2991 | (eval $ac_link) 2>&5 | ||
2992 | ac_status=$? | ||
2993 | - echo "$as_me:4398: \$? = $ac_status" >&5 | ||
2994 | + echo "$as_me:4412: \$? = $ac_status" >&5 | ||
2995 | (exit $ac_status); } && | ||
2996 | { ac_try='test -s conftest$ac_exeext' | ||
2997 | - { (eval echo "$as_me:4401: \"$ac_try\"") >&5 | ||
2998 | + { (eval echo "$as_me:4415: \"$ac_try\"") >&5 | ||
2999 | (eval $ac_try) 2>&5 | ||
3000 | ac_status=$? | ||
3001 | - echo "$as_me:4404: \$? = $ac_status" >&5 | ||
3002 | + echo "$as_me:4418: \$? = $ac_status" >&5 | ||
3003 | (exit $ac_status); }; }; then | ||
3004 | ac_cv_lib_gpm_Gpm_Open=yes | ||
3005 | else | ||
3006 | @@ -4412,13 +4426,13 @@ | ||
3007 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3008 | LIBS=$ac_check_lib_save_LIBS | ||
3009 | fi | ||
3010 | -echo "$as_me:4415: result: $ac_cv_lib_gpm_Gpm_Open" >&5 | ||
3011 | +echo "$as_me:4429: result: $ac_cv_lib_gpm_Gpm_Open" >&5 | ||
3012 | echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 | ||
3013 | if test $ac_cv_lib_gpm_Gpm_Open = yes; then | ||
3014 | : | ||
3015 | else | ||
3016 | |||
3017 | - { { echo "$as_me:4421: error: Cannot link with GPM library" >&5 | ||
3018 | + { { echo "$as_me:4435: error: Cannot link with GPM library" >&5 | ||
3019 | echo "$as_me: error: Cannot link with GPM library" >&2;} | ||
3020 | { (exit 1); exit 1; }; } | ||
3021 | fi | ||
3022 | @@ -4428,7 +4442,7 @@ | ||
3023 | |||
3024 | else | ||
3025 | |||
3026 | - test "$with_gpm" != maybe && { echo "$as_me:4431: WARNING: Cannot find GPM header" >&5 | ||
3027 | + test "$with_gpm" != maybe && { echo "$as_me:4445: WARNING: Cannot find GPM header" >&5 | ||
3028 | echo "$as_me: WARNING: Cannot find GPM header" >&2;} | ||
3029 | with_gpm=no | ||
3030 | |||
3031 | @@ -4437,7 +4451,7 @@ | ||
3032 | fi | ||
3033 | |||
3034 | if test "$with_gpm" != no ; then | ||
3035 | - echo "$as_me:4440: checking if you want to load GPM dynamically" >&5 | ||
3036 | + echo "$as_me:4454: checking if you want to load GPM dynamically" >&5 | ||
3037 | echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6 | ||
3038 | |||
3039 | # Check whether --with-dlsym or --without-dlsym was given. | ||
3040 | @@ -4447,18 +4461,18 @@ | ||
3041 | else | ||
3042 | with_dlsym=yes | ||
3043 | fi; | ||
3044 | - echo "$as_me:4450: result: $with_dlsym" >&5 | ||
3045 | + echo "$as_me:4464: result: $with_dlsym" >&5 | ||
3046 | echo "${ECHO_T}$with_dlsym" >&6 | ||
3047 | if test "$with_dlsym" = yes ; then | ||
3048 | |||
3049 | cf_have_dlsym=no | ||
3050 | -echo "$as_me:4455: checking for dlsym" >&5 | ||
3051 | +echo "$as_me:4469: checking for dlsym" >&5 | ||
3052 | echo $ECHO_N "checking for dlsym... $ECHO_C" >&6 | ||
3053 | if test "${ac_cv_func_dlsym+set}" = set; then | ||
3054 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3055 | else | ||
3056 | cat >conftest.$ac_ext <<_ACEOF | ||
3057 | -#line 4461 "configure" | ||
3058 | +#line 4475 "configure" | ||
3059 | #include "confdefs.h" | ||
3060 | /* System header to define __stub macros and hopefully few prototypes, | ||
3061 | which can conflict with char dlsym (); below. */ | ||
3062 | @@ -4489,16 +4503,16 @@ | ||
3063 | } | ||
3064 | _ACEOF | ||
3065 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3066 | -if { (eval echo "$as_me:4492: \"$ac_link\"") >&5 | ||
3067 | +if { (eval echo "$as_me:4506: \"$ac_link\"") >&5 | ||
3068 | (eval $ac_link) 2>&5 | ||
3069 | ac_status=$? | ||
3070 | - echo "$as_me:4495: \$? = $ac_status" >&5 | ||
3071 | + echo "$as_me:4509: \$? = $ac_status" >&5 | ||
3072 | (exit $ac_status); } && | ||
3073 | { ac_try='test -s conftest$ac_exeext' | ||
3074 | - { (eval echo "$as_me:4498: \"$ac_try\"") >&5 | ||
3075 | + { (eval echo "$as_me:4512: \"$ac_try\"") >&5 | ||
3076 | (eval $ac_try) 2>&5 | ||
3077 | ac_status=$? | ||
3078 | - echo "$as_me:4501: \$? = $ac_status" >&5 | ||
3079 | + echo "$as_me:4515: \$? = $ac_status" >&5 | ||
3080 | (exit $ac_status); }; }; then | ||
3081 | ac_cv_func_dlsym=yes | ||
3082 | else | ||
3083 | @@ -4508,14 +4522,14 @@ | ||
3084 | fi | ||
3085 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3086 | fi | ||
3087 | -echo "$as_me:4511: result: $ac_cv_func_dlsym" >&5 | ||
3088 | +echo "$as_me:4525: result: $ac_cv_func_dlsym" >&5 | ||
3089 | echo "${ECHO_T}$ac_cv_func_dlsym" >&6 | ||
3090 | if test $ac_cv_func_dlsym = yes; then | ||
3091 | cf_have_dlsym=yes | ||
3092 | else | ||
3093 | |||
3094 | cf_have_libdl=no | ||
3095 | -echo "$as_me:4518: checking for dlsym in -ldl" >&5 | ||
3096 | +echo "$as_me:4532: checking for dlsym in -ldl" >&5 | ||
3097 | echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 | ||
3098 | if test "${ac_cv_lib_dl_dlsym+set}" = set; then | ||
3099 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3100 | @@ -4523,7 +4537,7 @@ | ||
3101 | ac_check_lib_save_LIBS=$LIBS | ||
3102 | LIBS="-ldl $LIBS" | ||
3103 | cat >conftest.$ac_ext <<_ACEOF | ||
3104 | -#line 4526 "configure" | ||
3105 | +#line 4540 "configure" | ||
3106 | #include "confdefs.h" | ||
3107 | |||
3108 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3109 | @@ -4542,16 +4556,16 @@ | ||
3110 | } | ||
3111 | _ACEOF | ||
3112 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3113 | -if { (eval echo "$as_me:4545: \"$ac_link\"") >&5 | ||
3114 | +if { (eval echo "$as_me:4559: \"$ac_link\"") >&5 | ||
3115 | (eval $ac_link) 2>&5 | ||
3116 | ac_status=$? | ||
3117 | - echo "$as_me:4548: \$? = $ac_status" >&5 | ||
3118 | + echo "$as_me:4562: \$? = $ac_status" >&5 | ||
3119 | (exit $ac_status); } && | ||
3120 | { ac_try='test -s conftest$ac_exeext' | ||
3121 | - { (eval echo "$as_me:4551: \"$ac_try\"") >&5 | ||
3122 | + { (eval echo "$as_me:4565: \"$ac_try\"") >&5 | ||
3123 | (eval $ac_try) 2>&5 | ||
3124 | ac_status=$? | ||
3125 | - echo "$as_me:4554: \$? = $ac_status" >&5 | ||
3126 | + echo "$as_me:4568: \$? = $ac_status" >&5 | ||
3127 | (exit $ac_status); }; }; then | ||
3128 | ac_cv_lib_dl_dlsym=yes | ||
3129 | else | ||
3130 | @@ -4562,7 +4576,7 @@ | ||
3131 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3132 | LIBS=$ac_check_lib_save_LIBS | ||
3133 | fi | ||
3134 | -echo "$as_me:4565: result: $ac_cv_lib_dl_dlsym" >&5 | ||
3135 | +echo "$as_me:4579: result: $ac_cv_lib_dl_dlsym" >&5 | ||
3136 | echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 | ||
3137 | if test $ac_cv_lib_dl_dlsym = yes; then | ||
3138 | |||
3139 | @@ -4575,10 +4589,10 @@ | ||
3140 | if test "$cf_have_dlsym" = yes ; then | ||
3141 | test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS" | ||
3142 | |||
3143 | - echo "$as_me:4578: checking whether able to link to dl*() functions" >&5 | ||
3144 | + echo "$as_me:4592: checking whether able to link to dl*() functions" >&5 | ||
3145 | echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6 | ||
3146 | cat >conftest.$ac_ext <<_ACEOF | ||
3147 | -#line 4581 "configure" | ||
3148 | +#line 4595 "configure" | ||
3149 | #include "confdefs.h" | ||
3150 | #include <dlfcn.h> | ||
3151 | int | ||
3152 | @@ -4596,16 +4610,16 @@ | ||
3153 | } | ||
3154 | _ACEOF | ||
3155 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3156 | -if { (eval echo "$as_me:4599: \"$ac_link\"") >&5 | ||
3157 | +if { (eval echo "$as_me:4613: \"$ac_link\"") >&5 | ||
3158 | (eval $ac_link) 2>&5 | ||
3159 | ac_status=$? | ||
3160 | - echo "$as_me:4602: \$? = $ac_status" >&5 | ||
3161 | + echo "$as_me:4616: \$? = $ac_status" >&5 | ||
3162 | (exit $ac_status); } && | ||
3163 | { ac_try='test -s conftest$ac_exeext' | ||
3164 | - { (eval echo "$as_me:4605: \"$ac_try\"") >&5 | ||
3165 | + { (eval echo "$as_me:4619: \"$ac_try\"") >&5 | ||
3166 | (eval $ac_try) 2>&5 | ||
3167 | ac_status=$? | ||
3168 | - echo "$as_me:4608: \$? = $ac_status" >&5 | ||
3169 | + echo "$as_me:4622: \$? = $ac_status" >&5 | ||
3170 | (exit $ac_status); }; }; then | ||
3171 | |||
3172 | cat >>confdefs.h <<\EOF | ||
3173 | @@ -4616,15 +4630,15 @@ | ||
3174 | echo "$as_me: failed program was:" >&5 | ||
3175 | cat conftest.$ac_ext >&5 | ||
3176 | |||
3177 | - { { echo "$as_me:4619: error: Cannot link test program for libdl" >&5 | ||
3178 | + { { echo "$as_me:4633: error: Cannot link test program for libdl" >&5 | ||
3179 | echo "$as_me: error: Cannot link test program for libdl" >&2;} | ||
3180 | { (exit 1); exit 1; }; } | ||
3181 | fi | ||
3182 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3183 | - echo "$as_me:4624: result: ok" >&5 | ||
3184 | + echo "$as_me:4638: result: ok" >&5 | ||
3185 | echo "${ECHO_T}ok" >&6 | ||
3186 | else | ||
3187 | - { { echo "$as_me:4627: error: Cannot find dlsym function" >&5 | ||
3188 | + { { echo "$as_me:4641: error: Cannot find dlsym function" >&5 | ||
3189 | echo "$as_me: error: Cannot find dlsym function" >&2;} | ||
3190 | { (exit 1); exit 1; }; } | ||
3191 | fi | ||
3192 | @@ -4632,12 +4646,12 @@ | ||
3193 | if test "$with_gpm" != yes ; then | ||
3194 | test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6 | ||
3195 | |||
3196 | -echo "${as_me-configure}:4635: testing assuming soname for gpm is $with_gpm ..." 1>&5 | ||
3197 | +echo "${as_me-configure}:4649: testing assuming soname for gpm is $with_gpm ..." 1>&5 | ||
3198 | |||
3199 | cf_cv_gpm_soname="$with_gpm" | ||
3200 | else | ||
3201 | |||
3202 | -echo "$as_me:4640: checking for soname of gpm library" >&5 | ||
3203 | +echo "$as_me:4654: checking for soname of gpm library" >&5 | ||
3204 | echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6 | ||
3205 | if test "${cf_cv_gpm_soname+set}" = set; then | ||
3206 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3207 | @@ -4655,15 +4669,15 @@ | ||
3208 | CF_EOF | ||
3209 | cf_save_LIBS="$LIBS" | ||
3210 | LIBS="-lgpm $LIBS" | ||
3211 | - if { (eval echo "$as_me:4658: \"$ac_compile\"") >&5 | ||
3212 | + if { (eval echo "$as_me:4672: \"$ac_compile\"") >&5 | ||
3213 | (eval $ac_compile) 2>&5 | ||
3214 | ac_status=$? | ||
3215 | - echo "$as_me:4661: \$? = $ac_status" >&5 | ||
3216 | + echo "$as_me:4675: \$? = $ac_status" >&5 | ||
3217 | (exit $ac_status); } ; then | ||
3218 | - if { (eval echo "$as_me:4663: \"$ac_link\"") >&5 | ||
3219 | + if { (eval echo "$as_me:4677: \"$ac_link\"") >&5 | ||
3220 | (eval $ac_link) 2>&5 | ||
3221 | ac_status=$? | ||
3222 | - echo "$as_me:4666: \$? = $ac_status" >&5 | ||
3223 | + echo "$as_me:4680: \$? = $ac_status" >&5 | ||
3224 | (exit $ac_status); } ; then | ||
3225 | cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.` | ||
3226 | test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown | ||
3227 | @@ -4674,7 +4688,7 @@ | ||
3228 | fi | ||
3229 | |||
3230 | fi | ||
3231 | -echo "$as_me:4677: result: $cf_cv_gpm_soname" >&5 | ||
3232 | +echo "$as_me:4691: result: $cf_cv_gpm_soname" >&5 | ||
3233 | echo "${ECHO_T}$cf_cv_gpm_soname" >&6 | ||
3234 | |||
3235 | fi | ||
3236 | @@ -4690,7 +4704,7 @@ | ||
3237 | #define HAVE_LIBGPM 1 | ||
3238 | EOF | ||
3239 | |||
3240 | -echo "$as_me:4693: checking for Gpm_Wgetch in -lgpm" >&5 | ||
3241 | +echo "$as_me:4707: checking for Gpm_Wgetch in -lgpm" >&5 | ||
3242 | echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6 | ||
3243 | if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then | ||
3244 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3245 | @@ -4698,7 +4712,7 @@ | ||
3246 | ac_check_lib_save_LIBS=$LIBS | ||
3247 | LIBS="-lgpm $LIBS" | ||
3248 | cat >conftest.$ac_ext <<_ACEOF | ||
3249 | -#line 4701 "configure" | ||
3250 | +#line 4715 "configure" | ||
3251 | #include "confdefs.h" | ||
3252 | |||
3253 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3254 | @@ -4717,16 +4731,16 @@ | ||
3255 | } | ||
3256 | _ACEOF | ||
3257 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3258 | -if { (eval echo "$as_me:4720: \"$ac_link\"") >&5 | ||
3259 | +if { (eval echo "$as_me:4734: \"$ac_link\"") >&5 | ||
3260 | (eval $ac_link) 2>&5 | ||
3261 | ac_status=$? | ||
3262 | - echo "$as_me:4723: \$? = $ac_status" >&5 | ||
3263 | + echo "$as_me:4737: \$? = $ac_status" >&5 | ||
3264 | (exit $ac_status); } && | ||
3265 | { ac_try='test -s conftest$ac_exeext' | ||
3266 | - { (eval echo "$as_me:4726: \"$ac_try\"") >&5 | ||
3267 | + { (eval echo "$as_me:4740: \"$ac_try\"") >&5 | ||
3268 | (eval $ac_try) 2>&5 | ||
3269 | ac_status=$? | ||
3270 | - echo "$as_me:4729: \$? = $ac_status" >&5 | ||
3271 | + echo "$as_me:4743: \$? = $ac_status" >&5 | ||
3272 | (exit $ac_status); }; }; then | ||
3273 | ac_cv_lib_gpm_Gpm_Wgetch=yes | ||
3274 | else | ||
3275 | @@ -4737,11 +4751,11 @@ | ||
3276 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3277 | LIBS=$ac_check_lib_save_LIBS | ||
3278 | fi | ||
3279 | -echo "$as_me:4740: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 | ||
3280 | +echo "$as_me:4754: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 | ||
3281 | echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6 | ||
3282 | if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then | ||
3283 | |||
3284 | -echo "$as_me:4744: checking if GPM is weakly bound to curses library" >&5 | ||
3285 | +echo "$as_me:4758: checking if GPM is weakly bound to curses library" >&5 | ||
3286 | echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6 | ||
3287 | if test "${cf_cv_check_gpm_wgetch+set}" = set; then | ||
3288 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3289 | @@ -4765,15 +4779,15 @@ | ||
3290 | # to rely on the static library, noting that some packagers may not | ||
3291 | # include it. | ||
3292 | LIBS="-static -lgpm -dynamic $LIBS" | ||
3293 | - if { (eval echo "$as_me:4768: \"$ac_compile\"") >&5 | ||
3294 | + if { (eval echo "$as_me:4782: \"$ac_compile\"") >&5 | ||
3295 | (eval $ac_compile) 2>&5 | ||
3296 | ac_status=$? | ||
3297 | - echo "$as_me:4771: \$? = $ac_status" >&5 | ||
3298 | + echo "$as_me:4785: \$? = $ac_status" >&5 | ||
3299 | (exit $ac_status); } ; then | ||
3300 | - if { (eval echo "$as_me:4773: \"$ac_link\"") >&5 | ||
3301 | + if { (eval echo "$as_me:4787: \"$ac_link\"") >&5 | ||
3302 | (eval $ac_link) 2>&5 | ||
3303 | ac_status=$? | ||
3304 | - echo "$as_me:4776: \$? = $ac_status" >&5 | ||
3305 | + echo "$as_me:4790: \$? = $ac_status" >&5 | ||
3306 | (exit $ac_status); } ; then | ||
3307 | cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'` | ||
3308 | test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes | ||
3309 | @@ -4785,11 +4799,11 @@ | ||
3310 | fi | ||
3311 | |||
3312 | fi | ||
3313 | -echo "$as_me:4788: result: $cf_cv_check_gpm_wgetch" >&5 | ||
3314 | +echo "$as_me:4802: result: $cf_cv_check_gpm_wgetch" >&5 | ||
3315 | echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6 | ||
3316 | |||
3317 | if test "$cf_cv_check_gpm_wgetch" != yes ; then | ||
3318 | - { echo "$as_me:4792: WARNING: GPM library is already linked with curses - read the FAQ" >&5 | ||
3319 | + { echo "$as_me:4806: WARNING: GPM library is already linked with curses - read the FAQ" >&5 | ||
3320 | echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;} | ||
3321 | fi | ||
3322 | |||
3323 | @@ -4799,7 +4813,7 @@ | ||
3324 | |||
3325 | # not everyone has "test -c" | ||
3326 | if test -c /dev/sysmouse 2>/dev/null ; then | ||
3327 | -echo "$as_me:4802: checking if you want to use sysmouse" >&5 | ||
3328 | +echo "$as_me:4816: checking if you want to use sysmouse" >&5 | ||
3329 | echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6 | ||
3330 | |||
3331 | # Check whether --with-sysmouse or --without-sysmouse was given. | ||
3332 | @@ -4811,7 +4825,7 @@ | ||
3333 | fi; | ||
3334 | if test "$cf_with_sysmouse" != no ; then | ||
3335 | cat >conftest.$ac_ext <<_ACEOF | ||
3336 | -#line 4814 "configure" | ||
3337 | +#line 4828 "configure" | ||
3338 | #include "confdefs.h" | ||
3339 | |||
3340 | #include <osreldate.h> | ||
3341 | @@ -4834,16 +4848,16 @@ | ||
3342 | } | ||
3343 | _ACEOF | ||
3344 | rm -f conftest.$ac_objext | ||
3345 | -if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5 | ||
3346 | +if { (eval echo "$as_me:4851: \"$ac_compile\"") >&5 | ||
3347 | (eval $ac_compile) 2>&5 | ||
3348 | ac_status=$? | ||
3349 | - echo "$as_me:4840: \$? = $ac_status" >&5 | ||
3350 | + echo "$as_me:4854: \$? = $ac_status" >&5 | ||
3351 | (exit $ac_status); } && | ||
3352 | { ac_try='test -s conftest.$ac_objext' | ||
3353 | - { (eval echo "$as_me:4843: \"$ac_try\"") >&5 | ||
3354 | + { (eval echo "$as_me:4857: \"$ac_try\"") >&5 | ||
3355 | (eval $ac_try) 2>&5 | ||
3356 | ac_status=$? | ||
3357 | - echo "$as_me:4846: \$? = $ac_status" >&5 | ||
3358 | + echo "$as_me:4860: \$? = $ac_status" >&5 | ||
3359 | (exit $ac_status); }; }; then | ||
3360 | cf_with_sysmouse=yes | ||
3361 | else | ||
3362 | @@ -4853,7 +4867,7 @@ | ||
3363 | fi | ||
3364 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
3365 | fi | ||
3366 | -echo "$as_me:4856: result: $cf_with_sysmouse" >&5 | ||
3367 | +echo "$as_me:4870: result: $cf_with_sysmouse" >&5 | ||
3368 | echo "${ECHO_T}$cf_with_sysmouse" >&6 | ||
3369 | test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF | ||
3370 | #define USE_SYSMOUSE 1 | ||
3371 | @@ -4871,7 +4885,7 @@ | ||
3372 | test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT='' | ||
3373 | fi | ||
3374 | |||
3375 | -echo "$as_me:4874: checking for default loader flags" >&5 | ||
3376 | +echo "$as_me:4888: checking for default loader flags" >&5 | ||
3377 | echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 | ||
3378 | case $DFT_LWR_MODEL in | ||
3379 | libtool) LD_MODEL='' ;; | ||
3380 | @@ -4880,13 +4894,13 @@ | ||
3381 | profile) LD_MODEL='-pg';; | ||
3382 | shared) LD_MODEL='' ;; | ||
3383 | esac | ||
3384 | -echo "$as_me:4883: result: $LD_MODEL" >&5 | ||
3385 | +echo "$as_me:4897: result: $LD_MODEL" >&5 | ||
3386 | echo "${ECHO_T}$LD_MODEL" >&6 | ||
3387 | |||
3388 | case $DFT_LWR_MODEL in | ||
3389 | shared) | ||
3390 | |||
3391 | -echo "$as_me:4889: checking if rpath option should be used" >&5 | ||
3392 | +echo "$as_me:4903: checking if rpath option should be used" >&5 | ||
3393 | echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 | ||
3394 | |||
3395 | # Check whether --enable-rpath or --disable-rpath was given. | ||
3396 | @@ -4896,10 +4910,10 @@ | ||
3397 | else | ||
3398 | cf_cv_ld_rpath=no | ||
3399 | fi; | ||
3400 | -echo "$as_me:4899: result: $cf_cv_ld_rpath" >&5 | ||
3401 | +echo "$as_me:4913: result: $cf_cv_ld_rpath" >&5 | ||
3402 | echo "${ECHO_T}$cf_cv_ld_rpath" >&6 | ||
3403 | |||
3404 | -echo "$as_me:4902: checking if shared libraries should be relinked during install" >&5 | ||
3405 | +echo "$as_me:4916: checking if shared libraries should be relinked during install" >&5 | ||
3406 | echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6 | ||
3407 | |||
3408 | # Check whether --enable-relink or --disable-relink was given. | ||
3409 | @@ -4909,7 +4923,7 @@ | ||
3410 | else | ||
3411 | cf_cv_do_relink=yes | ||
3412 | fi; | ||
3413 | -echo "$as_me:4912: result: $cf_cv_do_relink" >&5 | ||
3414 | +echo "$as_me:4926: result: $cf_cv_do_relink" >&5 | ||
3415 | echo "${ECHO_T}$cf_cv_do_relink" >&6 | ||
3416 | ;; | ||
3417 | esac | ||
3418 | @@ -4921,7 +4935,7 @@ | ||
3419 | |||
3420 | cf_cv_do_symlinks=no | ||
3421 | |||
3422 | - echo "$as_me:4924: checking if release/abi version should be used for shared libs" >&5 | ||
3423 | + echo "$as_me:4938: checking if release/abi version should be used for shared libs" >&5 | ||
3424 | echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 | ||
3425 | |||
3426 | # Check whether --with-shlib-version or --without-shlib-version was given. | ||
3427 | @@ -4936,7 +4950,7 @@ | ||
3428 | cf_cv_shlib_version=$withval | ||
3429 | ;; | ||
3430 | *) | ||
3431 | - { { echo "$as_me:4939: error: option value must be one of: rel, abi, auto or no" >&5 | ||
3432 | + { { echo "$as_me:4953: error: option value must be one of: rel, abi, auto or no" >&5 | ||
3433 | echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} | ||
3434 | { (exit 1); exit 1; }; } | ||
3435 | ;; | ||
3436 | @@ -4945,7 +4959,7 @@ | ||
3437 | else | ||
3438 | cf_cv_shlib_version=auto | ||
3439 | fi; | ||
3440 | - echo "$as_me:4948: result: $cf_cv_shlib_version" >&5 | ||
3441 | + echo "$as_me:4962: result: $cf_cv_shlib_version" >&5 | ||
3442 | echo "${ECHO_T}$cf_cv_shlib_version" >&6 | ||
3443 | |||
3444 | cf_cv_rm_so_locs=no | ||
3445 | @@ -4954,14 +4968,14 @@ | ||
3446 | CC_SHARED_OPTS= | ||
3447 | if test "$GCC" = yes | ||
3448 | then | ||
3449 | - echo "$as_me:4957: checking which $CC option to use" >&5 | ||
3450 | + echo "$as_me:4971: checking which $CC option to use" >&5 | ||
3451 | echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 | ||
3452 | cf_save_CFLAGS="$CFLAGS" | ||
3453 | for CC_SHARED_OPTS in -fPIC -fpic '' | ||
3454 | do | ||
3455 | CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" | ||
3456 | cat >conftest.$ac_ext <<_ACEOF | ||
3457 | -#line 4964 "configure" | ||
3458 | +#line 4978 "configure" | ||
3459 | #include "confdefs.h" | ||
3460 | #include <stdio.h> | ||
3461 | int | ||
3462 | @@ -4973,16 +4987,16 @@ | ||
3463 | } | ||
3464 | _ACEOF | ||
3465 | rm -f conftest.$ac_objext | ||
3466 | -if { (eval echo "$as_me:4976: \"$ac_compile\"") >&5 | ||
3467 | +if { (eval echo "$as_me:4990: \"$ac_compile\"") >&5 | ||
3468 | (eval $ac_compile) 2>&5 | ||
3469 | ac_status=$? | ||
3470 | - echo "$as_me:4979: \$? = $ac_status" >&5 | ||
3471 | + echo "$as_me:4993: \$? = $ac_status" >&5 | ||
3472 | (exit $ac_status); } && | ||
3473 | { ac_try='test -s conftest.$ac_objext' | ||
3474 | - { (eval echo "$as_me:4982: \"$ac_try\"") >&5 | ||
3475 | + { (eval echo "$as_me:4996: \"$ac_try\"") >&5 | ||
3476 | (eval $ac_try) 2>&5 | ||
3477 | ac_status=$? | ||
3478 | - echo "$as_me:4985: \$? = $ac_status" >&5 | ||
3479 | + echo "$as_me:4999: \$? = $ac_status" >&5 | ||
3480 | (exit $ac_status); }; }; then | ||
3481 | break | ||
3482 | else | ||
3483 | @@ -4991,7 +5005,7 @@ | ||
3484 | fi | ||
3485 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
3486 | done | ||
3487 | - echo "$as_me:4994: result: $CC_SHARED_OPTS" >&5 | ||
3488 | + echo "$as_me:5008: result: $CC_SHARED_OPTS" >&5 | ||
3489 | echo "${ECHO_T}$CC_SHARED_OPTS" >&6 | ||
3490 | CFLAGS="$cf_save_CFLAGS" | ||
3491 | fi | ||
3492 | @@ -5027,7 +5041,7 @@ | ||
3493 | MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' | ||
3494 | test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi | ||
3495 | cf_cv_shlib_version_infix=yes | ||
3496 | - echo "$as_me:5030: checking if ld -search_paths_first works" >&5 | ||
3497 | + echo "$as_me:5044: checking if ld -search_paths_first works" >&5 | ||
3498 | echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 | ||
3499 | if test "${cf_cv_ldflags_search_paths_first+set}" = set; then | ||
3500 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3501 | @@ -5036,7 +5050,7 @@ | ||
3502 | cf_save_LDFLAGS=$LDFLAGS | ||
3503 | LDFLAGS="$LDFLAGS -Wl,-search_paths_first" | ||
3504 | cat >conftest.$ac_ext <<_ACEOF | ||
3505 | -#line 5039 "configure" | ||
3506 | +#line 5053 "configure" | ||
3507 | #include "confdefs.h" | ||
3508 | |||
3509 | int | ||
3510 | @@ -5048,16 +5062,16 @@ | ||
3511 | } | ||
3512 | _ACEOF | ||
3513 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3514 | -if { (eval echo "$as_me:5051: \"$ac_link\"") >&5 | ||
3515 | +if { (eval echo "$as_me:5065: \"$ac_link\"") >&5 | ||
3516 | (eval $ac_link) 2>&5 | ||
3517 | ac_status=$? | ||
3518 | - echo "$as_me:5054: \$? = $ac_status" >&5 | ||
3519 | + echo "$as_me:5068: \$? = $ac_status" >&5 | ||
3520 | (exit $ac_status); } && | ||
3521 | { ac_try='test -s conftest$ac_exeext' | ||
3522 | - { (eval echo "$as_me:5057: \"$ac_try\"") >&5 | ||
3523 | + { (eval echo "$as_me:5071: \"$ac_try\"") >&5 | ||
3524 | (eval $ac_try) 2>&5 | ||
3525 | ac_status=$? | ||
3526 | - echo "$as_me:5060: \$? = $ac_status" >&5 | ||
3527 | + echo "$as_me:5074: \$? = $ac_status" >&5 | ||
3528 | (exit $ac_status); }; }; then | ||
3529 | cf_cv_ldflags_search_paths_first=yes | ||
3530 | else | ||
3531 | @@ -5068,7 +5082,7 @@ | ||
3532 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3533 | LDFLAGS=$cf_save_LDFLAGS | ||
3534 | fi | ||
3535 | -echo "$as_me:5071: result: $cf_cv_ldflags_search_paths_first" >&5 | ||
3536 | +echo "$as_me:5085: result: $cf_cv_ldflags_search_paths_first" >&5 | ||
3537 | echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 | ||
3538 | if test $cf_cv_ldflags_search_paths_first = yes; then | ||
3539 | LDFLAGS="$LDFLAGS -Wl,-search_paths_first" | ||
3540 | @@ -5285,7 +5299,7 @@ | ||
3541 | test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes | ||
3542 | ;; | ||
3543 | *) | ||
3544 | - { echo "$as_me:5288: WARNING: ignored --with-shlib-version" >&5 | ||
3545 | + { echo "$as_me:5302: WARNING: ignored --with-shlib-version" >&5 | ||
3546 | echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} | ||
3547 | ;; | ||
3548 | esac | ||
3549 | @@ -5293,12 +5307,12 @@ | ||
3550 | esac | ||
3551 | |||
3552 | if test -n "$cf_ld_rpath_opt" ; then | ||
3553 | - echo "$as_me:5296: checking if we need a space after rpath option" >&5 | ||
3554 | + echo "$as_me:5310: checking if we need a space after rpath option" >&5 | ||
3555 | echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 | ||
3556 | cf_save_LIBS="$LIBS" | ||
3557 | LIBS="$LIBS ${cf_ld_rpath_opt}$libdir" | ||
3558 | cat >conftest.$ac_ext <<_ACEOF | ||
3559 | -#line 5301 "configure" | ||
3560 | +#line 5315 "configure" | ||
3561 | #include "confdefs.h" | ||
3562 | |||
3563 | int | ||
3564 | @@ -5310,16 +5324,16 @@ | ||
3565 | } | ||
3566 | _ACEOF | ||
3567 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3568 | -if { (eval echo "$as_me:5313: \"$ac_link\"") >&5 | ||
3569 | +if { (eval echo "$as_me:5327: \"$ac_link\"") >&5 | ||
3570 | (eval $ac_link) 2>&5 | ||
3571 | ac_status=$? | ||
3572 | - echo "$as_me:5316: \$? = $ac_status" >&5 | ||
3573 | + echo "$as_me:5330: \$? = $ac_status" >&5 | ||
3574 | (exit $ac_status); } && | ||
3575 | { ac_try='test -s conftest$ac_exeext' | ||
3576 | - { (eval echo "$as_me:5319: \"$ac_try\"") >&5 | ||
3577 | + { (eval echo "$as_me:5333: \"$ac_try\"") >&5 | ||
3578 | (eval $ac_try) 2>&5 | ||
3579 | ac_status=$? | ||
3580 | - echo "$as_me:5322: \$? = $ac_status" >&5 | ||
3581 | + echo "$as_me:5336: \$? = $ac_status" >&5 | ||
3582 | (exit $ac_status); }; }; then | ||
3583 | cf_rpath_space=no | ||
3584 | else | ||
3585 | @@ -5329,7 +5343,7 @@ | ||
3586 | fi | ||
3587 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3588 | LIBS="$cf_save_LIBS" | ||
3589 | - echo "$as_me:5332: result: $cf_rpath_space" >&5 | ||
3590 | + echo "$as_me:5346: result: $cf_rpath_space" >&5 | ||
3591 | echo "${ECHO_T}$cf_rpath_space" >&6 | ||
3592 | test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt " | ||
3593 | MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}" | ||
3594 | @@ -5338,7 +5352,7 @@ | ||
3595 | if test "$CC_SHARED_OPTS" = "unknown"; then | ||
3596 | for model in $cf_list_models; do | ||
3597 | if test "$model" = "shared"; then | ||
3598 | - { { echo "$as_me:5341: error: Shared libraries are not supported in this version" >&5 | ||
3599 | + { { echo "$as_me:5355: error: Shared libraries are not supported in this version" >&5 | ||
3600 | echo "$as_me: error: Shared libraries are not supported in this version" >&2;} | ||
3601 | { (exit 1); exit 1; }; } | ||
3602 | fi | ||
3603 | @@ -5348,7 +5362,7 @@ | ||
3604 | ############################################################################### | ||
3605 | |||
3606 | ### use option --disable-overwrite to leave out the link to -lcurses | ||
3607 | -echo "$as_me:5351: checking if you wish to install ncurses overwriting curses" >&5 | ||
3608 | +echo "$as_me:5365: checking if you wish to install ncurses overwriting curses" >&5 | ||
3609 | echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6 | ||
3610 | |||
3611 | # Check whether --enable-overwrite or --disable-overwrite was given. | ||
3612 | @@ -5358,10 +5372,10 @@ | ||
3613 | else | ||
3614 | if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi | ||
3615 | fi; | ||
3616 | -echo "$as_me:5361: result: $with_overwrite" >&5 | ||
3617 | +echo "$as_me:5375: result: $with_overwrite" >&5 | ||
3618 | echo "${ECHO_T}$with_overwrite" >&6 | ||
3619 | |||
3620 | -echo "$as_me:5364: checking if external terminfo-database is used" >&5 | ||
3621 | +echo "$as_me:5378: checking if external terminfo-database is used" >&5 | ||
3622 | echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 | ||
3623 | |||
3624 | # Check whether --enable-database or --disable-database was given. | ||
3625 | @@ -5371,7 +5385,7 @@ | ||
3626 | else | ||
3627 | use_database=yes | ||
3628 | fi; | ||
3629 | -echo "$as_me:5374: result: $use_database" >&5 | ||
3630 | +echo "$as_me:5388: result: $use_database" >&5 | ||
3631 | echo "${ECHO_T}$use_database" >&6 | ||
3632 | |||
3633 | case $host_os in #(vi | ||
3634 | @@ -5393,7 +5407,7 @@ | ||
3635 | #define USE_DATABASE 1 | ||
3636 | EOF | ||
3637 | |||
3638 | - echo "$as_me:5396: checking which terminfo source-file will be installed" >&5 | ||
3639 | + echo "$as_me:5410: checking which terminfo source-file will be installed" >&5 | ||
3640 | echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6 | ||
3641 | |||
3642 | # Check whether --enable-database or --disable-database was given. | ||
3643 | @@ -5401,10 +5415,10 @@ | ||
3644 | enableval="$enable_database" | ||
3645 | TERMINFO_SRC=$withval | ||
3646 | fi; | ||
3647 | - echo "$as_me:5404: result: $TERMINFO_SRC" >&5 | ||
3648 | + echo "$as_me:5418: result: $TERMINFO_SRC" >&5 | ||
3649 | echo "${ECHO_T}$TERMINFO_SRC" >&6 | ||
3650 | |||
3651 | - echo "$as_me:5407: checking whether to use hashed database instead of directory/tree" >&5 | ||
3652 | + echo "$as_me:5421: checking whether to use hashed database instead of directory/tree" >&5 | ||
3653 | echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6 | ||
3654 | |||
3655 | # Check whether --with-hashed-db or --without-hashed-db was given. | ||
3656 | @@ -5414,13 +5428,13 @@ | ||
3657 | else | ||
3658 | with_hashed_db=no | ||
3659 | fi; | ||
3660 | - echo "$as_me:5417: result: $with_hashed_db" >&5 | ||
3661 | + echo "$as_me:5431: result: $with_hashed_db" >&5 | ||
3662 | echo "${ECHO_T}$with_hashed_db" >&6 | ||
3663 | else | ||
3664 | with_hashed_db=no | ||
3665 | fi | ||
3666 | |||
3667 | -echo "$as_me:5423: checking for list of fallback descriptions" >&5 | ||
3668 | +echo "$as_me:5437: checking for list of fallback descriptions" >&5 | ||
3669 | echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6 | ||
3670 | |||
3671 | # Check whether --with-fallbacks or --without-fallbacks was given. | ||
3672 | @@ -5430,11 +5444,11 @@ | ||
3673 | else | ||
3674 | with_fallback= | ||
3675 | fi; | ||
3676 | -echo "$as_me:5433: result: $with_fallback" >&5 | ||
3677 | +echo "$as_me:5447: result: $with_fallback" >&5 | ||
3678 | echo "${ECHO_T}$with_fallback" >&6 | ||
3679 | FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'` | ||
3680 | |||
3681 | -echo "$as_me:5437: checking if you want modern xterm or antique" >&5 | ||
3682 | +echo "$as_me:5451: checking if you want modern xterm or antique" >&5 | ||
3683 | echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6 | ||
3684 | |||
3685 | # Check whether --with-xterm-new or --without-xterm-new was given. | ||
3686 | @@ -5448,7 +5462,7 @@ | ||
3687 | no) with_xterm_new=xterm-old;; | ||
3688 | *) with_xterm_new=xterm-new;; | ||
3689 | esac | ||
3690 | -echo "$as_me:5451: result: $with_xterm_new" >&5 | ||
3691 | +echo "$as_me:5465: result: $with_xterm_new" >&5 | ||
3692 | echo "${ECHO_T}$with_xterm_new" >&6 | ||
3693 | WHICH_XTERM=$with_xterm_new | ||
3694 | |||
3695 | @@ -5458,7 +5472,7 @@ | ||
3696 | MAKE_TERMINFO="#" | ||
3697 | else | ||
3698 | |||
3699 | -echo "$as_me:5461: checking for list of terminfo directories" >&5 | ||
3700 | +echo "$as_me:5475: checking for list of terminfo directories" >&5 | ||
3701 | echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 | ||
3702 | |||
3703 | # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given. | ||
3704 | @@ -5498,7 +5512,7 @@ | ||
3705 | cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` | ||
3706 | ;; | ||
3707 | *) | ||
3708 | - { { echo "$as_me:5501: error: expected a pathname, not \"$cf_src_path\"" >&5 | ||
3709 | + { { echo "$as_me:5515: error: expected a pathname, not \"$cf_src_path\"" >&5 | ||
3710 | echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} | ||
3711 | { (exit 1); exit 1; }; } | ||
3712 | ;; | ||
3713 | @@ -5511,13 +5525,13 @@ | ||
3714 | |||
3715 | eval 'TERMINFO_DIRS="$cf_dst_path"' | ||
3716 | |||
3717 | -echo "$as_me:5514: result: $TERMINFO_DIRS" >&5 | ||
3718 | +echo "$as_me:5528: result: $TERMINFO_DIRS" >&5 | ||
3719 | echo "${ECHO_T}$TERMINFO_DIRS" >&6 | ||
3720 | test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF | ||
3721 | #define TERMINFO_DIRS "$TERMINFO_DIRS" | ||
3722 | EOF | ||
3723 | |||
3724 | -echo "$as_me:5520: checking for default terminfo directory" >&5 | ||
3725 | +echo "$as_me:5534: checking for default terminfo directory" >&5 | ||
3726 | echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6 | ||
3727 | |||
3728 | # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given. | ||
3729 | @@ -5553,7 +5567,7 @@ | ||
3730 | withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` | ||
3731 | ;; | ||
3732 | *) | ||
3733 | - { { echo "$as_me:5556: error: expected a pathname, not \"$withval\"" >&5 | ||
3734 | + { { echo "$as_me:5570: error: expected a pathname, not \"$withval\"" >&5 | ||
3735 | echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} | ||
3736 | { (exit 1); exit 1; }; } | ||
3737 | ;; | ||
3738 | @@ -5562,7 +5576,7 @@ | ||
3739 | fi | ||
3740 | TERMINFO="$withval" | ||
3741 | |||
3742 | -echo "$as_me:5565: result: $TERMINFO" >&5 | ||
3743 | +echo "$as_me:5579: result: $TERMINFO" >&5 | ||
3744 | echo "${ECHO_T}$TERMINFO" >&6 | ||
3745 | cat >>confdefs.h <<EOF | ||
3746 | #define TERMINFO "$TERMINFO" | ||
3747 | @@ -5572,7 +5586,7 @@ | ||
3748 | |||
3749 | ### use option --disable-big-core to make tic run on small machines | ||
3750 | ### We need 4Mb, check if we can allocate 50% more than that. | ||
3751 | -echo "$as_me:5575: checking if big-core option selected" >&5 | ||
3752 | +echo "$as_me:5589: checking if big-core option selected" >&5 | ||
3753 | echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6 | ||
3754 | |||
3755 | # Check whether --enable-big-core or --disable-big-core was given. | ||
3756 | @@ -5584,7 +5598,7 @@ | ||
3757 | with_big_core=no | ||
3758 | else | ||
3759 | cat >conftest.$ac_ext <<_ACEOF | ||
3760 | -#line 5587 "configure" | ||
3761 | +#line 5601 "configure" | ||
3762 | #include "confdefs.h" | ||
3763 | |||
3764 | #include <stdlib.h> | ||
3765 | @@ -5598,15 +5612,15 @@ | ||
3766 | } | ||
3767 | _ACEOF | ||
3768 | rm -f conftest$ac_exeext | ||
3769 | -if { (eval echo "$as_me:5601: \"$ac_link\"") >&5 | ||
3770 | +if { (eval echo "$as_me:5615: \"$ac_link\"") >&5 | ||
3771 | (eval $ac_link) 2>&5 | ||
3772 | ac_status=$? | ||
3773 | - echo "$as_me:5604: \$? = $ac_status" >&5 | ||
3774 | + echo "$as_me:5618: \$? = $ac_status" >&5 | ||
3775 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
3776 | - { (eval echo "$as_me:5606: \"$ac_try\"") >&5 | ||
3777 | + { (eval echo "$as_me:5620: \"$ac_try\"") >&5 | ||
3778 | (eval $ac_try) 2>&5 | ||
3779 | ac_status=$? | ||
3780 | - echo "$as_me:5609: \$? = $ac_status" >&5 | ||
3781 | + echo "$as_me:5623: \$? = $ac_status" >&5 | ||
3782 | (exit $ac_status); }; }; then | ||
3783 | with_big_core=yes | ||
3784 | else | ||
3785 | @@ -5618,7 +5632,7 @@ | ||
3786 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
3787 | fi | ||
3788 | fi; | ||
3789 | -echo "$as_me:5621: result: $with_big_core" >&5 | ||
3790 | +echo "$as_me:5635: result: $with_big_core" >&5 | ||
3791 | echo "${ECHO_T}$with_big_core" >&6 | ||
3792 | test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF | ||
3793 | #define HAVE_BIG_CORE 1 | ||
3794 | @@ -5627,7 +5641,7 @@ | ||
3795 | ### ISO C only guarantees 512-char strings, we have tables which load faster | ||
3796 | ### when constructed using "big" strings. More than the C compiler, the awk | ||
3797 | ### program is a limit on most vendor UNIX systems. Check that we can build. | ||
3798 | -echo "$as_me:5630: checking if big-strings option selected" >&5 | ||
3799 | +echo "$as_me:5644: checking if big-strings option selected" >&5 | ||
3800 | echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6 | ||
3801 | |||
3802 | # Check whether --enable-big-strings or --disable-big-strings was given. | ||
3803 | @@ -5651,14 +5665,14 @@ | ||
3804 | esac | ||
3805 | |||
3806 | fi; | ||
3807 | -echo "$as_me:5654: result: $with_big_strings" >&5 | ||
3808 | +echo "$as_me:5668: result: $with_big_strings" >&5 | ||
3809 | echo "${ECHO_T}$with_big_strings" >&6 | ||
3810 | |||
3811 | USE_BIG_STRINGS=0 | ||
3812 | test "$with_big_strings" = "yes" && USE_BIG_STRINGS=1 | ||
3813 | |||
3814 | ### use option --enable-termcap to compile in the termcap fallback support | ||
3815 | -echo "$as_me:5661: checking if you want termcap-fallback support" >&5 | ||
3816 | +echo "$as_me:5675: checking if you want termcap-fallback support" >&5 | ||
3817 | echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6 | ||
3818 | |||
3819 | # Check whether --enable-termcap or --disable-termcap was given. | ||
3820 | @@ -5668,13 +5682,13 @@ | ||
3821 | else | ||
3822 | with_termcap=no | ||
3823 | fi; | ||
3824 | -echo "$as_me:5671: result: $with_termcap" >&5 | ||
3825 | +echo "$as_me:5685: result: $with_termcap" >&5 | ||
3826 | echo "${ECHO_T}$with_termcap" >&6 | ||
3827 | |||
3828 | if test "$with_termcap" != "yes" ; then | ||
3829 | if test "$use_database" = no ; then | ||
3830 | if test -z "$with_fallback" ; then | ||
3831 | - { { echo "$as_me:5677: error: You have disabled the database w/o specifying fallbacks" >&5 | ||
3832 | + { { echo "$as_me:5691: error: You have disabled the database w/o specifying fallbacks" >&5 | ||
3833 | echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;} | ||
3834 | { (exit 1); exit 1; }; } | ||
3835 | fi | ||
3836 | @@ -5686,7 +5700,7 @@ | ||
3837 | else | ||
3838 | |||
3839 | if test "$with_ticlib" != no ; then | ||
3840 | - { { echo "$as_me:5689: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 | ||
3841 | + { { echo "$as_me:5703: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 | ||
3842 | echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;} | ||
3843 | { (exit 1); exit 1; }; } | ||
3844 | fi | ||
3845 | @@ -5695,7 +5709,7 @@ | ||
3846 | #define USE_TERMCAP 1 | ||
3847 | EOF | ||
3848 | |||
3849 | -echo "$as_me:5698: checking for list of termcap files" >&5 | ||
3850 | +echo "$as_me:5712: checking for list of termcap files" >&5 | ||
3851 | echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6 | ||
3852 | |||
3853 | # Check whether --with-termpath or --without-termpath was given. | ||
3854 | @@ -5735,7 +5749,7 @@ | ||
3855 | cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` | ||
3856 | ;; | ||
3857 | *) | ||
3858 | - { { echo "$as_me:5738: error: expected a pathname, not \"$cf_src_path\"" >&5 | ||
3859 | + { { echo "$as_me:5752: error: expected a pathname, not \"$cf_src_path\"" >&5 | ||
3860 | echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} | ||
3861 | { (exit 1); exit 1; }; } | ||
3862 | ;; | ||
3863 | @@ -5748,14 +5762,14 @@ | ||
3864 | |||
3865 | eval 'TERMPATH="$cf_dst_path"' | ||
3866 | |||
3867 | -echo "$as_me:5751: result: $TERMPATH" >&5 | ||
3868 | +echo "$as_me:5765: result: $TERMPATH" >&5 | ||
3869 | echo "${ECHO_T}$TERMPATH" >&6 | ||
3870 | test -n "$TERMPATH" && cat >>confdefs.h <<EOF | ||
3871 | #define TERMPATH "$TERMPATH" | ||
3872 | EOF | ||
3873 | |||
3874 | ### use option --enable-getcap to use a hacked getcap for reading termcaps | ||
3875 | -echo "$as_me:5758: checking if fast termcap-loader is needed" >&5 | ||
3876 | +echo "$as_me:5772: checking if fast termcap-loader is needed" >&5 | ||
3877 | echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6 | ||
3878 | |||
3879 | # Check whether --enable-getcap or --disable-getcap was given. | ||
3880 | @@ -5765,13 +5779,13 @@ | ||
3881 | else | ||
3882 | with_getcap=no | ||
3883 | fi; | ||
3884 | -echo "$as_me:5768: result: $with_getcap" >&5 | ||
3885 | +echo "$as_me:5782: result: $with_getcap" >&5 | ||
3886 | echo "${ECHO_T}$with_getcap" >&6 | ||
3887 | test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF | ||
3888 | #define USE_GETCAP 1 | ||
3889 | EOF | ||
3890 | |||
3891 | -echo "$as_me:5774: checking if translated termcaps will be cached in ~/.terminfo" >&5 | ||
3892 | +echo "$as_me:5788: checking if translated termcaps will be cached in ~/.terminfo" >&5 | ||
3893 | echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6 | ||
3894 | |||
3895 | # Check whether --enable-getcap-cache or --disable-getcap-cache was given. | ||
3896 | @@ -5781,7 +5795,7 @@ | ||
3897 | else | ||
3898 | with_getcap_cache=no | ||
3899 | fi; | ||
3900 | -echo "$as_me:5784: result: $with_getcap_cache" >&5 | ||
3901 | +echo "$as_me:5798: result: $with_getcap_cache" >&5 | ||
3902 | echo "${ECHO_T}$with_getcap_cache" >&6 | ||
3903 | test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF | ||
3904 | #define USE_GETCAP_CACHE 1 | ||
3905 | @@ -5790,7 +5804,7 @@ | ||
3906 | fi | ||
3907 | |||
3908 | ### Use option --disable-home-terminfo to completely remove ~/.terminfo | ||
3909 | -echo "$as_me:5793: checking if ~/.terminfo is wanted" >&5 | ||
3910 | +echo "$as_me:5807: checking if ~/.terminfo is wanted" >&5 | ||
3911 | echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6 | ||
3912 | |||
3913 | # Check whether --enable-home-terminfo or --disable-home-terminfo was given. | ||
3914 | @@ -5800,13 +5814,13 @@ | ||
3915 | else | ||
3916 | with_home_terminfo=yes | ||
3917 | fi; | ||
3918 | -echo "$as_me:5803: result: $with_home_terminfo" >&5 | ||
3919 | +echo "$as_me:5817: result: $with_home_terminfo" >&5 | ||
3920 | echo "${ECHO_T}$with_home_terminfo" >&6 | ||
3921 | test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF | ||
3922 | #define USE_HOME_TERMINFO 1 | ||
3923 | EOF | ||
3924 | |||
3925 | -echo "$as_me:5809: checking if you want to use restricted environment when running as root" >&5 | ||
3926 | +echo "$as_me:5823: checking if you want to use restricted environment when running as root" >&5 | ||
3927 | echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6 | ||
3928 | |||
3929 | # Check whether --enable-root-environ or --disable-root-environ was given. | ||
3930 | @@ -5816,7 +5830,7 @@ | ||
3931 | else | ||
3932 | with_root_environ=yes | ||
3933 | fi; | ||
3934 | -echo "$as_me:5819: result: $with_root_environ" >&5 | ||
3935 | +echo "$as_me:5833: result: $with_root_environ" >&5 | ||
3936 | echo "${ECHO_T}$with_root_environ" >&6 | ||
3937 | test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF | ||
3938 | #define USE_ROOT_ENVIRON 1 | ||
3939 | @@ -5830,13 +5844,13 @@ | ||
3940 | unlink | ||
3941 | do | ||
3942 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
3943 | -echo "$as_me:5833: checking for $ac_func" >&5 | ||
3944 | +echo "$as_me:5847: checking for $ac_func" >&5 | ||
3945 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | ||
3946 | if eval "test \"\${$as_ac_var+set}\" = set"; then | ||
3947 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3948 | else | ||
3949 | cat >conftest.$ac_ext <<_ACEOF | ||
3950 | -#line 5839 "configure" | ||
3951 | +#line 5853 "configure" | ||
3952 | #include "confdefs.h" | ||
3953 | /* System header to define __stub macros and hopefully few prototypes, | ||
3954 | which can conflict with char $ac_func (); below. */ | ||
3955 | @@ -5867,16 +5881,16 @@ | ||
3956 | } | ||
3957 | _ACEOF | ||
3958 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
3959 | -if { (eval echo "$as_me:5870: \"$ac_link\"") >&5 | ||
3960 | +if { (eval echo "$as_me:5884: \"$ac_link\"") >&5 | ||
3961 | (eval $ac_link) 2>&5 | ||
3962 | ac_status=$? | ||
3963 | - echo "$as_me:5873: \$? = $ac_status" >&5 | ||
3964 | + echo "$as_me:5887: \$? = $ac_status" >&5 | ||
3965 | (exit $ac_status); } && | ||
3966 | { ac_try='test -s conftest$ac_exeext' | ||
3967 | - { (eval echo "$as_me:5876: \"$ac_try\"") >&5 | ||
3968 | + { (eval echo "$as_me:5890: \"$ac_try\"") >&5 | ||
3969 | (eval $ac_try) 2>&5 | ||
3970 | ac_status=$? | ||
3971 | - echo "$as_me:5879: \$? = $ac_status" >&5 | ||
3972 | + echo "$as_me:5893: \$? = $ac_status" >&5 | ||
3973 | (exit $ac_status); }; }; then | ||
3974 | eval "$as_ac_var=yes" | ||
3975 | else | ||
3976 | @@ -5886,7 +5900,7 @@ | ||
3977 | fi | ||
3978 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
3979 | fi | ||
3980 | -echo "$as_me:5889: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
3981 | +echo "$as_me:5903: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
3982 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
3983 | if test `eval echo '${'$as_ac_var'}'` = yes; then | ||
3984 | cat >>confdefs.h <<EOF | ||
3985 | @@ -5903,13 +5917,13 @@ | ||
3986 | symlink | ||
3987 | do | ||
3988 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
3989 | -echo "$as_me:5906: checking for $ac_func" >&5 | ||
3990 | +echo "$as_me:5920: checking for $ac_func" >&5 | ||
3991 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | ||
3992 | if eval "test \"\${$as_ac_var+set}\" = set"; then | ||
3993 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
3994 | else | ||
3995 | cat >conftest.$ac_ext <<_ACEOF | ||
3996 | -#line 5912 "configure" | ||
3997 | +#line 5926 "configure" | ||
3998 | #include "confdefs.h" | ||
3999 | /* System header to define __stub macros and hopefully few prototypes, | ||
4000 | which can conflict with char $ac_func (); below. */ | ||
4001 | @@ -5940,16 +5954,16 @@ | ||
4002 | } | ||
4003 | _ACEOF | ||
4004 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
4005 | -if { (eval echo "$as_me:5943: \"$ac_link\"") >&5 | ||
4006 | +if { (eval echo "$as_me:5957: \"$ac_link\"") >&5 | ||
4007 | (eval $ac_link) 2>&5 | ||
4008 | ac_status=$? | ||
4009 | - echo "$as_me:5946: \$? = $ac_status" >&5 | ||
4010 | + echo "$as_me:5960: \$? = $ac_status" >&5 | ||
4011 | (exit $ac_status); } && | ||
4012 | { ac_try='test -s conftest$ac_exeext' | ||
4013 | - { (eval echo "$as_me:5949: \"$ac_try\"") >&5 | ||
4014 | + { (eval echo "$as_me:5963: \"$ac_try\"") >&5 | ||
4015 | (eval $ac_try) 2>&5 | ||
4016 | ac_status=$? | ||
4017 | - echo "$as_me:5952: \$? = $ac_status" >&5 | ||
4018 | + echo "$as_me:5966: \$? = $ac_status" >&5 | ||
4019 | (exit $ac_status); }; }; then | ||
4020 | eval "$as_ac_var=yes" | ||
4021 | else | ||
4022 | @@ -5959,7 +5973,7 @@ | ||
4023 | fi | ||
4024 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
4025 | fi | ||
4026 | -echo "$as_me:5962: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
4027 | +echo "$as_me:5976: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
4028 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
4029 | if test `eval echo '${'$as_ac_var'}'` = yes; then | ||
4030 | cat >>confdefs.h <<EOF | ||
4031 | @@ -5970,7 +5984,7 @@ | ||
4032 | done | ||
4033 | |||
4034 | else | ||
4035 | - echo "$as_me:5973: checking if link/symlink functions work" >&5 | ||
4036 | + echo "$as_me:5987: checking if link/symlink functions work" >&5 | ||
4037 | echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6 | ||
4038 | if test "${cf_cv_link_funcs+set}" = set; then | ||
4039 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4040 | @@ -5983,7 +5997,7 @@ | ||
4041 | eval 'ac_cv_func_'$cf_func'=error' | ||
4042 | else | ||
4043 | cat >conftest.$ac_ext <<_ACEOF | ||
4044 | -#line 5986 "configure" | ||
4045 | +#line 6000 "configure" | ||
4046 | #include "confdefs.h" | ||
4047 | |||
4048 | #include <sys/types.h> | ||
4049 | @@ -6013,15 +6027,15 @@ | ||
4050 | |||
4051 | _ACEOF | ||
4052 | rm -f conftest$ac_exeext | ||
4053 | -if { (eval echo "$as_me:6016: \"$ac_link\"") >&5 | ||
4054 | +if { (eval echo "$as_me:6030: \"$ac_link\"") >&5 | ||
4055 | (eval $ac_link) 2>&5 | ||
4056 | ac_status=$? | ||
4057 | - echo "$as_me:6019: \$? = $ac_status" >&5 | ||
4058 | + echo "$as_me:6033: \$? = $ac_status" >&5 | ||
4059 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
4060 | - { (eval echo "$as_me:6021: \"$ac_try\"") >&5 | ||
4061 | + { (eval echo "$as_me:6035: \"$ac_try\"") >&5 | ||
4062 | (eval $ac_try) 2>&5 | ||
4063 | ac_status=$? | ||
4064 | - echo "$as_me:6024: \$? = $ac_status" >&5 | ||
4065 | + echo "$as_me:6038: \$? = $ac_status" >&5 | ||
4066 | (exit $ac_status); }; }; then | ||
4067 | |||
4068 | cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" | ||
4069 | @@ -6039,7 +6053,7 @@ | ||
4070 | test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no | ||
4071 | |||
4072 | fi | ||
4073 | -echo "$as_me:6042: result: $cf_cv_link_funcs" >&5 | ||
4074 | +echo "$as_me:6056: result: $cf_cv_link_funcs" >&5 | ||
4075 | echo "${ECHO_T}$cf_cv_link_funcs" >&6 | ||
4076 | test "$ac_cv_func_link" = yes && cat >>confdefs.h <<\EOF | ||
4077 | #define HAVE_LINK 1 | ||
4078 | @@ -6057,7 +6071,7 @@ | ||
4079 | # soft links (symbolic links) are useful for some systems where hard links do | ||
4080 | # not work, or to make it simpler to copy terminfo trees around. | ||
4081 | if test "$ac_cv_func_symlink" = yes ; then | ||
4082 | - echo "$as_me:6060: checking if tic should use symbolic links" >&5 | ||
4083 | + echo "$as_me:6074: checking if tic should use symbolic links" >&5 | ||
4084 | echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6 | ||
4085 | |||
4086 | # Check whether --enable-symlinks or --disable-symlinks was given. | ||
4087 | @@ -6067,21 +6081,21 @@ | ||
4088 | else | ||
4089 | with_symlinks=no | ||
4090 | fi; | ||
4091 | - echo "$as_me:6070: result: $with_symlinks" >&5 | ||
4092 | + echo "$as_me:6084: result: $with_symlinks" >&5 | ||
4093 | echo "${ECHO_T}$with_symlinks" >&6 | ||
4094 | fi | ||
4095 | |||
4096 | # If we have hard links and did not choose to use soft links instead, there is | ||
4097 | # no reason to make this choice optional - use the hard links. | ||
4098 | if test "$with_symlinks" = no ; then | ||
4099 | - echo "$as_me:6077: checking if tic should use hard links" >&5 | ||
4100 | + echo "$as_me:6091: checking if tic should use hard links" >&5 | ||
4101 | echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 | ||
4102 | if test "$ac_cv_func_link" = yes ; then | ||
4103 | with_links=yes | ||
4104 | else | ||
4105 | with_links=no | ||
4106 | fi | ||
4107 | - echo "$as_me:6084: result: $with_links" >&5 | ||
4108 | + echo "$as_me:6098: result: $with_links" >&5 | ||
4109 | echo "${ECHO_T}$with_links" >&6 | ||
4110 | fi | ||
4111 | |||
4112 | @@ -6094,7 +6108,7 @@ | ||
4113 | EOF | ||
4114 | |||
4115 | ### use option --enable-broken-linker to force on use of broken-linker support | ||
4116 | -echo "$as_me:6097: checking if you want broken-linker support code" >&5 | ||
4117 | +echo "$as_me:6111: checking if you want broken-linker support code" >&5 | ||
4118 | echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 | ||
4119 | |||
4120 | # Check whether --enable-broken_linker or --disable-broken_linker was given. | ||
4121 | @@ -6104,7 +6118,7 @@ | ||
4122 | else | ||
4123 | with_broken_linker=${BROKEN_LINKER-no} | ||
4124 | fi; | ||
4125 | -echo "$as_me:6107: result: $with_broken_linker" >&5 | ||
4126 | +echo "$as_me:6121: result: $with_broken_linker" >&5 | ||
4127 | echo "${ECHO_T}$with_broken_linker" >&6 | ||
4128 | |||
4129 | BROKEN_LINKER=0 | ||
4130 | @@ -6124,14 +6138,14 @@ | ||
4131 | BROKEN_LINKER=1 | ||
4132 | test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 | ||
4133 | |||
4134 | -echo "${as_me-configure}:6127: testing cygwin linker is broken anyway ..." 1>&5 | ||
4135 | +echo "${as_me-configure}:6141: testing cygwin linker is broken anyway ..." 1>&5 | ||
4136 | |||
4137 | ;; | ||
4138 | esac | ||
4139 | fi | ||
4140 | |||
4141 | ### use option --enable-bsdpad to have tputs process BSD-style prefix padding | ||
4142 | -echo "$as_me:6134: checking if tputs should process BSD-style prefix padding" >&5 | ||
4143 | +echo "$as_me:6148: checking if tputs should process BSD-style prefix padding" >&5 | ||
4144 | echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6 | ||
4145 | |||
4146 | # Check whether --enable-bsdpad or --disable-bsdpad was given. | ||
4147 | @@ -6141,7 +6155,7 @@ | ||
4148 | else | ||
4149 | with_bsdpad=no | ||
4150 | fi; | ||
4151 | -echo "$as_me:6144: result: $with_bsdpad" >&5 | ||
4152 | +echo "$as_me:6158: result: $with_bsdpad" >&5 | ||
4153 | echo "${ECHO_T}$with_bsdpad" >&6 | ||
4154 | test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF | ||
4155 | #define BSD_TPUTS 1 | ||
4156 | @@ -6158,7 +6172,7 @@ | ||
4157 | |||
4158 | # Check to define _XOPEN_SOURCE "automatically" | ||
4159 | |||
4160 | -echo "$as_me:6161: checking if $CC -U and -D options work together" >&5 | ||
4161 | +echo "$as_me:6175: checking if $CC -U and -D options work together" >&5 | ||
4162 | echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6 | ||
4163 | if test "${cf_cv_cc_u_d_options+set}" = set; then | ||
4164 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4165 | @@ -6167,7 +6181,7 @@ | ||
4166 | cf_save_CPPFLAGS="$CPPFLAGS" | ||
4167 | CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS" | ||
4168 | cat >conftest.$ac_ext <<_ACEOF | ||
4169 | -#line 6170 "configure" | ||
4170 | +#line 6184 "configure" | ||
4171 | #include "confdefs.h" | ||
4172 | |||
4173 | int | ||
4174 | @@ -6186,16 +6200,16 @@ | ||
4175 | } | ||
4176 | _ACEOF | ||
4177 | rm -f conftest.$ac_objext | ||
4178 | -if { (eval echo "$as_me:6189: \"$ac_compile\"") >&5 | ||
4179 | +if { (eval echo "$as_me:6203: \"$ac_compile\"") >&5 | ||
4180 | (eval $ac_compile) 2>&5 | ||
4181 | ac_status=$? | ||
4182 | - echo "$as_me:6192: \$? = $ac_status" >&5 | ||
4183 | + echo "$as_me:6206: \$? = $ac_status" >&5 | ||
4184 | (exit $ac_status); } && | ||
4185 | { ac_try='test -s conftest.$ac_objext' | ||
4186 | - { (eval echo "$as_me:6195: \"$ac_try\"") >&5 | ||
4187 | + { (eval echo "$as_me:6209: \"$ac_try\"") >&5 | ||
4188 | (eval $ac_try) 2>&5 | ||
4189 | ac_status=$? | ||
4190 | - echo "$as_me:6198: \$? = $ac_status" >&5 | ||
4191 | + echo "$as_me:6212: \$? = $ac_status" >&5 | ||
4192 | (exit $ac_status); }; }; then | ||
4193 | |||
4194 | cf_cv_cc_u_d_options=yes | ||
4195 | @@ -6209,7 +6223,7 @@ | ||
4196 | CPPFLAGS="$cf_save_CPPFLAGS" | ||
4197 | |||
4198 | fi | ||
4199 | -echo "$as_me:6212: result: $cf_cv_cc_u_d_options" >&5 | ||
4200 | +echo "$as_me:6226: result: $cf_cv_cc_u_d_options" >&5 | ||
4201 | echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6 | ||
4202 | |||
4203 | cf_XOPEN_SOURCE=500 | ||
4204 | @@ -6233,16 +6247,16 @@ | ||
4205 | irix[56].*) #(vi | ||
4206 | CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" | ||
4207 | ;; | ||
4208 | -linux*|gnu*|k*bsd*-gnu) #(vi | ||
4209 | +linux*|gnu*|mint*|k*bsd*-gnu) #(vi | ||
4210 | |||
4211 | -echo "$as_me:6238: checking if we must define _GNU_SOURCE" >&5 | ||
4212 | +echo "$as_me:6252: checking if we must define _GNU_SOURCE" >&5 | ||
4213 | echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 | ||
4214 | if test "${cf_cv_gnu_source+set}" = set; then | ||
4215 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4216 | else | ||
4217 | |||
4218 | cat >conftest.$ac_ext <<_ACEOF | ||
4219 | -#line 6245 "configure" | ||
4220 | +#line 6259 "configure" | ||
4221 | #include "confdefs.h" | ||
4222 | #include <sys/types.h> | ||
4223 | int | ||
4224 | @@ -6257,16 +6271,16 @@ | ||
4225 | } | ||
4226 | _ACEOF | ||
4227 | rm -f conftest.$ac_objext | ||
4228 | -if { (eval echo "$as_me:6260: \"$ac_compile\"") >&5 | ||
4229 | +if { (eval echo "$as_me:6274: \"$ac_compile\"") >&5 | ||
4230 | (eval $ac_compile) 2>&5 | ||
4231 | ac_status=$? | ||
4232 | - echo "$as_me:6263: \$? = $ac_status" >&5 | ||
4233 | + echo "$as_me:6277: \$? = $ac_status" >&5 | ||
4234 | (exit $ac_status); } && | ||
4235 | { ac_try='test -s conftest.$ac_objext' | ||
4236 | - { (eval echo "$as_me:6266: \"$ac_try\"") >&5 | ||
4237 | + { (eval echo "$as_me:6280: \"$ac_try\"") >&5 | ||
4238 | (eval $ac_try) 2>&5 | ||
4239 | ac_status=$? | ||
4240 | - echo "$as_me:6269: \$? = $ac_status" >&5 | ||
4241 | + echo "$as_me:6283: \$? = $ac_status" >&5 | ||
4242 | (exit $ac_status); }; }; then | ||
4243 | cf_cv_gnu_source=no | ||
4244 | else | ||
4245 | @@ -6275,7 +6289,7 @@ | ||
4246 | cf_save="$CPPFLAGS" | ||
4247 | CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" | ||
4248 | cat >conftest.$ac_ext <<_ACEOF | ||
4249 | -#line 6278 "configure" | ||
4250 | +#line 6292 "configure" | ||
4251 | #include "confdefs.h" | ||
4252 | #include <sys/types.h> | ||
4253 | int | ||
4254 | @@ -6290,16 +6304,16 @@ | ||
4255 | } | ||
4256 | _ACEOF | ||
4257 | rm -f conftest.$ac_objext | ||
4258 | -if { (eval echo "$as_me:6293: \"$ac_compile\"") >&5 | ||
4259 | +if { (eval echo "$as_me:6307: \"$ac_compile\"") >&5 | ||
4260 | (eval $ac_compile) 2>&5 | ||
4261 | ac_status=$? | ||
4262 | - echo "$as_me:6296: \$? = $ac_status" >&5 | ||
4263 | + echo "$as_me:6310: \$? = $ac_status" >&5 | ||
4264 | (exit $ac_status); } && | ||
4265 | { ac_try='test -s conftest.$ac_objext' | ||
4266 | - { (eval echo "$as_me:6299: \"$ac_try\"") >&5 | ||
4267 | + { (eval echo "$as_me:6313: \"$ac_try\"") >&5 | ||
4268 | (eval $ac_try) 2>&5 | ||
4269 | ac_status=$? | ||
4270 | - echo "$as_me:6302: \$? = $ac_status" >&5 | ||
4271 | + echo "$as_me:6316: \$? = $ac_status" >&5 | ||
4272 | (exit $ac_status); }; }; then | ||
4273 | cf_cv_gnu_source=no | ||
4274 | else | ||
4275 | @@ -6314,7 +6328,7 @@ | ||
4276 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
4277 | |||
4278 | fi | ||
4279 | -echo "$as_me:6317: result: $cf_cv_gnu_source" >&5 | ||
4280 | +echo "$as_me:6331: result: $cf_cv_gnu_source" >&5 | ||
4281 | echo "${ECHO_T}$cf_cv_gnu_source" >&6 | ||
4282 | test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" | ||
4283 | |||
4284 | @@ -6341,14 +6355,14 @@ | ||
4285 | CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" | ||
4286 | ;; | ||
4287 | *) | ||
4288 | - echo "$as_me:6344: checking if we should define _XOPEN_SOURCE" >&5 | ||
4289 | + echo "$as_me:6358: checking if we should define _XOPEN_SOURCE" >&5 | ||
4290 | echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 | ||
4291 | if test "${cf_cv_xopen_source+set}" = set; then | ||
4292 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4293 | else | ||
4294 | |||
4295 | cat >conftest.$ac_ext <<_ACEOF | ||
4296 | -#line 6351 "configure" | ||
4297 | +#line 6365 "configure" | ||
4298 | #include "confdefs.h" | ||
4299 | #include <sys/types.h> | ||
4300 | int | ||
4301 | @@ -6363,16 +6377,16 @@ | ||
4302 | } | ||
4303 | _ACEOF | ||
4304 | rm -f conftest.$ac_objext | ||
4305 | -if { (eval echo "$as_me:6366: \"$ac_compile\"") >&5 | ||
4306 | +if { (eval echo "$as_me:6380: \"$ac_compile\"") >&5 | ||
4307 | (eval $ac_compile) 2>&5 | ||
4308 | ac_status=$? | ||
4309 | - echo "$as_me:6369: \$? = $ac_status" >&5 | ||
4310 | + echo "$as_me:6383: \$? = $ac_status" >&5 | ||
4311 | (exit $ac_status); } && | ||
4312 | { ac_try='test -s conftest.$ac_objext' | ||
4313 | - { (eval echo "$as_me:6372: \"$ac_try\"") >&5 | ||
4314 | + { (eval echo "$as_me:6386: \"$ac_try\"") >&5 | ||
4315 | (eval $ac_try) 2>&5 | ||
4316 | ac_status=$? | ||
4317 | - echo "$as_me:6375: \$? = $ac_status" >&5 | ||
4318 | + echo "$as_me:6389: \$? = $ac_status" >&5 | ||
4319 | (exit $ac_status); }; }; then | ||
4320 | cf_cv_xopen_source=no | ||
4321 | else | ||
4322 | @@ -6381,7 +6395,7 @@ | ||
4323 | cf_save="$CPPFLAGS" | ||
4324 | CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" | ||
4325 | cat >conftest.$ac_ext <<_ACEOF | ||
4326 | -#line 6384 "configure" | ||
4327 | +#line 6398 "configure" | ||
4328 | #include "confdefs.h" | ||
4329 | #include <sys/types.h> | ||
4330 | int | ||
4331 | @@ -6396,16 +6410,16 @@ | ||
4332 | } | ||
4333 | _ACEOF | ||
4334 | rm -f conftest.$ac_objext | ||
4335 | -if { (eval echo "$as_me:6399: \"$ac_compile\"") >&5 | ||
4336 | +if { (eval echo "$as_me:6413: \"$ac_compile\"") >&5 | ||
4337 | (eval $ac_compile) 2>&5 | ||
4338 | ac_status=$? | ||
4339 | - echo "$as_me:6402: \$? = $ac_status" >&5 | ||
4340 | + echo "$as_me:6416: \$? = $ac_status" >&5 | ||
4341 | (exit $ac_status); } && | ||
4342 | { ac_try='test -s conftest.$ac_objext' | ||
4343 | - { (eval echo "$as_me:6405: \"$ac_try\"") >&5 | ||
4344 | + { (eval echo "$as_me:6419: \"$ac_try\"") >&5 | ||
4345 | (eval $ac_try) 2>&5 | ||
4346 | ac_status=$? | ||
4347 | - echo "$as_me:6408: \$? = $ac_status" >&5 | ||
4348 | + echo "$as_me:6422: \$? = $ac_status" >&5 | ||
4349 | (exit $ac_status); }; }; then | ||
4350 | cf_cv_xopen_source=no | ||
4351 | else | ||
4352 | @@ -6420,7 +6434,7 @@ | ||
4353 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
4354 | |||
4355 | fi | ||
4356 | -echo "$as_me:6423: result: $cf_cv_xopen_source" >&5 | ||
4357 | +echo "$as_me:6437: result: $cf_cv_xopen_source" >&5 | ||
4358 | echo "${ECHO_T}$cf_cv_xopen_source" >&6 | ||
4359 | if test "$cf_cv_xopen_source" != no ; then | ||
4360 | |||
4361 | @@ -6454,16 +6468,16 @@ | ||
4362 | sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ | ||
4363 | -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'` | ||
4364 | |||
4365 | -echo "$as_me:6457: checking if we should define _POSIX_C_SOURCE" >&5 | ||
4366 | +echo "$as_me:6471: checking if we should define _POSIX_C_SOURCE" >&5 | ||
4367 | echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 | ||
4368 | if test "${cf_cv_posix_c_source+set}" = set; then | ||
4369 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4370 | else | ||
4371 | |||
4372 | -echo "${as_me-configure}:6463: testing if the symbol is already defined go no further ..." 1>&5 | ||
4373 | +echo "${as_me-configure}:6477: testing if the symbol is already defined go no further ..." 1>&5 | ||
4374 | |||
4375 | cat >conftest.$ac_ext <<_ACEOF | ||
4376 | -#line 6466 "configure" | ||
4377 | +#line 6480 "configure" | ||
4378 | #include "confdefs.h" | ||
4379 | #include <sys/types.h> | ||
4380 | int | ||
4381 | @@ -6478,16 +6492,16 @@ | ||
4382 | } | ||
4383 | _ACEOF | ||
4384 | rm -f conftest.$ac_objext | ||
4385 | -if { (eval echo "$as_me:6481: \"$ac_compile\"") >&5 | ||
4386 | +if { (eval echo "$as_me:6495: \"$ac_compile\"") >&5 | ||
4387 | (eval $ac_compile) 2>&5 | ||
4388 | ac_status=$? | ||
4389 | - echo "$as_me:6484: \$? = $ac_status" >&5 | ||
4390 | + echo "$as_me:6498: \$? = $ac_status" >&5 | ||
4391 | (exit $ac_status); } && | ||
4392 | { ac_try='test -s conftest.$ac_objext' | ||
4393 | - { (eval echo "$as_me:6487: \"$ac_try\"") >&5 | ||
4394 | + { (eval echo "$as_me:6501: \"$ac_try\"") >&5 | ||
4395 | (eval $ac_try) 2>&5 | ||
4396 | ac_status=$? | ||
4397 | - echo "$as_me:6490: \$? = $ac_status" >&5 | ||
4398 | + echo "$as_me:6504: \$? = $ac_status" >&5 | ||
4399 | (exit $ac_status); }; }; then | ||
4400 | cf_cv_posix_c_source=no | ||
4401 | else | ||
4402 | @@ -6508,7 +6522,7 @@ | ||
4403 | esac | ||
4404 | if test "$cf_want_posix_source" = yes ; then | ||
4405 | cat >conftest.$ac_ext <<_ACEOF | ||
4406 | -#line 6511 "configure" | ||
4407 | +#line 6525 "configure" | ||
4408 | #include "confdefs.h" | ||
4409 | #include <sys/types.h> | ||
4410 | int | ||
4411 | @@ -6523,16 +6537,16 @@ | ||
4412 | } | ||
4413 | _ACEOF | ||
4414 | rm -f conftest.$ac_objext | ||
4415 | -if { (eval echo "$as_me:6526: \"$ac_compile\"") >&5 | ||
4416 | +if { (eval echo "$as_me:6540: \"$ac_compile\"") >&5 | ||
4417 | (eval $ac_compile) 2>&5 | ||
4418 | ac_status=$? | ||
4419 | - echo "$as_me:6529: \$? = $ac_status" >&5 | ||
4420 | + echo "$as_me:6543: \$? = $ac_status" >&5 | ||
4421 | (exit $ac_status); } && | ||
4422 | { ac_try='test -s conftest.$ac_objext' | ||
4423 | - { (eval echo "$as_me:6532: \"$ac_try\"") >&5 | ||
4424 | + { (eval echo "$as_me:6546: \"$ac_try\"") >&5 | ||
4425 | (eval $ac_try) 2>&5 | ||
4426 | ac_status=$? | ||
4427 | - echo "$as_me:6535: \$? = $ac_status" >&5 | ||
4428 | + echo "$as_me:6549: \$? = $ac_status" >&5 | ||
4429 | (exit $ac_status); }; }; then | ||
4430 | : | ||
4431 | else | ||
4432 | @@ -6543,15 +6557,15 @@ | ||
4433 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
4434 | fi | ||
4435 | |||
4436 | -echo "${as_me-configure}:6546: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 | ||
4437 | +echo "${as_me-configure}:6560: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 | ||
4438 | |||
4439 | CFLAGS="$cf_trim_CFLAGS" | ||
4440 | CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" | ||
4441 | |||
4442 | -echo "${as_me-configure}:6551: testing if the second compile does not leave our definition intact error ..." 1>&5 | ||
4443 | +echo "${as_me-configure}:6565: testing if the second compile does not leave our definition intact error ..." 1>&5 | ||
4444 | |||
4445 | cat >conftest.$ac_ext <<_ACEOF | ||
4446 | -#line 6554 "configure" | ||
4447 | +#line 6568 "configure" | ||
4448 | #include "confdefs.h" | ||
4449 | #include <sys/types.h> | ||
4450 | int | ||
4451 | @@ -6566,16 +6580,16 @@ | ||
4452 | } | ||
4453 | _ACEOF | ||
4454 | rm -f conftest.$ac_objext | ||
4455 | -if { (eval echo "$as_me:6569: \"$ac_compile\"") >&5 | ||
4456 | +if { (eval echo "$as_me:6583: \"$ac_compile\"") >&5 | ||
4457 | (eval $ac_compile) 2>&5 | ||
4458 | ac_status=$? | ||
4459 | - echo "$as_me:6572: \$? = $ac_status" >&5 | ||
4460 | + echo "$as_me:6586: \$? = $ac_status" >&5 | ||
4461 | (exit $ac_status); } && | ||
4462 | { ac_try='test -s conftest.$ac_objext' | ||
4463 | - { (eval echo "$as_me:6575: \"$ac_try\"") >&5 | ||
4464 | + { (eval echo "$as_me:6589: \"$ac_try\"") >&5 | ||
4465 | (eval $ac_try) 2>&5 | ||
4466 | ac_status=$? | ||
4467 | - echo "$as_me:6578: \$? = $ac_status" >&5 | ||
4468 | + echo "$as_me:6592: \$? = $ac_status" >&5 | ||
4469 | (exit $ac_status); }; }; then | ||
4470 | : | ||
4471 | else | ||
4472 | @@ -6591,7 +6605,7 @@ | ||
4473 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
4474 | |||
4475 | fi | ||
4476 | -echo "$as_me:6594: result: $cf_cv_posix_c_source" >&5 | ||
4477 | +echo "$as_me:6608: result: $cf_cv_posix_c_source" >&5 | ||
4478 | echo "${ECHO_T}$cf_cv_posix_c_source" >&6 | ||
4479 | |||
4480 | if test "$cf_cv_posix_c_source" != no ; then | ||
4481 | @@ -6610,14 +6624,14 @@ | ||
4482 | |||
4483 | # Work around breakage on OS X | ||
4484 | |||
4485 | -echo "$as_me:6613: checking if SIGWINCH is defined" >&5 | ||
4486 | +echo "$as_me:6627: checking if SIGWINCH is defined" >&5 | ||
4487 | echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 | ||
4488 | if test "${cf_cv_define_sigwinch+set}" = set; then | ||
4489 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4490 | else | ||
4491 | |||
4492 | cat >conftest.$ac_ext <<_ACEOF | ||
4493 | -#line 6620 "configure" | ||
4494 | +#line 6634 "configure" | ||
4495 | #include "confdefs.h" | ||
4496 | |||
4497 | #include <sys/types.h> | ||
4498 | @@ -6632,23 +6646,23 @@ | ||
4499 | } | ||
4500 | _ACEOF | ||
4501 | rm -f conftest.$ac_objext | ||
4502 | -if { (eval echo "$as_me:6635: \"$ac_compile\"") >&5 | ||
4503 | +if { (eval echo "$as_me:6649: \"$ac_compile\"") >&5 | ||
4504 | (eval $ac_compile) 2>&5 | ||
4505 | ac_status=$? | ||
4506 | - echo "$as_me:6638: \$? = $ac_status" >&5 | ||
4507 | + echo "$as_me:6652: \$? = $ac_status" >&5 | ||
4508 | (exit $ac_status); } && | ||
4509 | { ac_try='test -s conftest.$ac_objext' | ||
4510 | - { (eval echo "$as_me:6641: \"$ac_try\"") >&5 | ||
4511 | + { (eval echo "$as_me:6655: \"$ac_try\"") >&5 | ||
4512 | (eval $ac_try) 2>&5 | ||
4513 | ac_status=$? | ||
4514 | - echo "$as_me:6644: \$? = $ac_status" >&5 | ||
4515 | + echo "$as_me:6658: \$? = $ac_status" >&5 | ||
4516 | (exit $ac_status); }; }; then | ||
4517 | cf_cv_define_sigwinch=yes | ||
4518 | else | ||
4519 | echo "$as_me: failed program was:" >&5 | ||
4520 | cat conftest.$ac_ext >&5 | ||
4521 | cat >conftest.$ac_ext <<_ACEOF | ||
4522 | -#line 6651 "configure" | ||
4523 | +#line 6665 "configure" | ||
4524 | #include "confdefs.h" | ||
4525 | |||
4526 | #undef _XOPEN_SOURCE | ||
4527 | @@ -6666,16 +6680,16 @@ | ||
4528 | } | ||
4529 | _ACEOF | ||
4530 | rm -f conftest.$ac_objext | ||
4531 | -if { (eval echo "$as_me:6669: \"$ac_compile\"") >&5 | ||
4532 | +if { (eval echo "$as_me:6683: \"$ac_compile\"") >&5 | ||
4533 | (eval $ac_compile) 2>&5 | ||
4534 | ac_status=$? | ||
4535 | - echo "$as_me:6672: \$? = $ac_status" >&5 | ||
4536 | + echo "$as_me:6686: \$? = $ac_status" >&5 | ||
4537 | (exit $ac_status); } && | ||
4538 | { ac_try='test -s conftest.$ac_objext' | ||
4539 | - { (eval echo "$as_me:6675: \"$ac_try\"") >&5 | ||
4540 | + { (eval echo "$as_me:6689: \"$ac_try\"") >&5 | ||
4541 | (eval $ac_try) 2>&5 | ||
4542 | ac_status=$? | ||
4543 | - echo "$as_me:6678: \$? = $ac_status" >&5 | ||
4544 | + echo "$as_me:6692: \$? = $ac_status" >&5 | ||
4545 | (exit $ac_status); }; }; then | ||
4546 | cf_cv_define_sigwinch=maybe | ||
4547 | else | ||
4548 | @@ -6689,11 +6703,11 @@ | ||
4549 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
4550 | |||
4551 | fi | ||
4552 | -echo "$as_me:6692: result: $cf_cv_define_sigwinch" >&5 | ||
4553 | +echo "$as_me:6706: result: $cf_cv_define_sigwinch" >&5 | ||
4554 | echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 | ||
4555 | |||
4556 | if test "$cf_cv_define_sigwinch" = maybe ; then | ||
4557 | -echo "$as_me:6696: checking for actual SIGWINCH definition" >&5 | ||
4558 | +echo "$as_me:6710: checking for actual SIGWINCH definition" >&5 | ||
4559 | echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 | ||
4560 | if test "${cf_cv_fixup_sigwinch+set}" = set; then | ||
4561 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4562 | @@ -6704,7 +6718,7 @@ | ||
4563 | while test $cf_sigwinch != 1 | ||
4564 | do | ||
4565 | cat >conftest.$ac_ext <<_ACEOF | ||
4566 | -#line 6707 "configure" | ||
4567 | +#line 6721 "configure" | ||
4568 | #include "confdefs.h" | ||
4569 | |||
4570 | #undef _XOPEN_SOURCE | ||
4571 | @@ -6726,16 +6740,16 @@ | ||
4572 | } | ||
4573 | _ACEOF | ||
4574 | rm -f conftest.$ac_objext | ||
4575 | -if { (eval echo "$as_me:6729: \"$ac_compile\"") >&5 | ||
4576 | +if { (eval echo "$as_me:6743: \"$ac_compile\"") >&5 | ||
4577 | (eval $ac_compile) 2>&5 | ||
4578 | ac_status=$? | ||
4579 | - echo "$as_me:6732: \$? = $ac_status" >&5 | ||
4580 | + echo "$as_me:6746: \$? = $ac_status" >&5 | ||
4581 | (exit $ac_status); } && | ||
4582 | { ac_try='test -s conftest.$ac_objext' | ||
4583 | - { (eval echo "$as_me:6735: \"$ac_try\"") >&5 | ||
4584 | + { (eval echo "$as_me:6749: \"$ac_try\"") >&5 | ||
4585 | (eval $ac_try) 2>&5 | ||
4586 | ac_status=$? | ||
4587 | - echo "$as_me:6738: \$? = $ac_status" >&5 | ||
4588 | + echo "$as_me:6752: \$? = $ac_status" >&5 | ||
4589 | (exit $ac_status); }; }; then | ||
4590 | cf_cv_fixup_sigwinch=$cf_sigwinch | ||
4591 | break | ||
4592 | @@ -6749,7 +6763,7 @@ | ||
4593 | done | ||
4594 | |||
4595 | fi | ||
4596 | -echo "$as_me:6752: result: $cf_cv_fixup_sigwinch" >&5 | ||
4597 | +echo "$as_me:6766: result: $cf_cv_fixup_sigwinch" >&5 | ||
4598 | echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 | ||
4599 | |||
4600 | if test "$cf_cv_fixup_sigwinch" != unknown ; then | ||
4601 | @@ -6759,13 +6773,13 @@ | ||
4602 | |||
4603 | # Checks for CODESET support. | ||
4604 | |||
4605 | - echo "$as_me:6762: checking for nl_langinfo and CODESET" >&5 | ||
4606 | + echo "$as_me:6776: checking for nl_langinfo and CODESET" >&5 | ||
4607 | echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 | ||
4608 | if test "${am_cv_langinfo_codeset+set}" = set; then | ||
4609 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4610 | else | ||
4611 | cat >conftest.$ac_ext <<_ACEOF | ||
4612 | -#line 6768 "configure" | ||
4613 | +#line 6782 "configure" | ||
4614 | #include "confdefs.h" | ||
4615 | #include <langinfo.h> | ||
4616 | int | ||
4617 | @@ -6777,16 +6791,16 @@ | ||
4618 | } | ||
4619 | _ACEOF | ||
4620 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
4621 | -if { (eval echo "$as_me:6780: \"$ac_link\"") >&5 | ||
4622 | +if { (eval echo "$as_me:6794: \"$ac_link\"") >&5 | ||
4623 | (eval $ac_link) 2>&5 | ||
4624 | ac_status=$? | ||
4625 | - echo "$as_me:6783: \$? = $ac_status" >&5 | ||
4626 | + echo "$as_me:6797: \$? = $ac_status" >&5 | ||
4627 | (exit $ac_status); } && | ||
4628 | { ac_try='test -s conftest$ac_exeext' | ||
4629 | - { (eval echo "$as_me:6786: \"$ac_try\"") >&5 | ||
4630 | + { (eval echo "$as_me:6800: \"$ac_try\"") >&5 | ||
4631 | (eval $ac_try) 2>&5 | ||
4632 | ac_status=$? | ||
4633 | - echo "$as_me:6789: \$? = $ac_status" >&5 | ||
4634 | + echo "$as_me:6803: \$? = $ac_status" >&5 | ||
4635 | (exit $ac_status); }; }; then | ||
4636 | am_cv_langinfo_codeset=yes | ||
4637 | else | ||
4638 | @@ -6797,7 +6811,7 @@ | ||
4639 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
4640 | |||
4641 | fi | ||
4642 | -echo "$as_me:6800: result: $am_cv_langinfo_codeset" >&5 | ||
4643 | +echo "$as_me:6814: result: $am_cv_langinfo_codeset" >&5 | ||
4644 | echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 | ||
4645 | if test $am_cv_langinfo_codeset = yes; then | ||
4646 | |||
4647 | @@ -6811,7 +6825,7 @@ | ||
4648 | NCURSES_OK_WCHAR_T= | ||
4649 | NCURSES_OK_WINT_T= | ||
4650 | |||
4651 | -echo "$as_me:6814: checking if you want wide-character code" >&5 | ||
4652 | +echo "$as_me:6828: checking if you want wide-character code" >&5 | ||
4653 | echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 | ||
4654 | |||
4655 | # Check whether --enable-widec or --disable-widec was given. | ||
4656 | @@ -6821,7 +6835,7 @@ | ||
4657 | else | ||
4658 | with_widec=no | ||
4659 | fi; | ||
4660 | -echo "$as_me:6824: result: $with_widec" >&5 | ||
4661 | +echo "$as_me:6838: result: $with_widec" >&5 | ||
4662 | echo "${ECHO_T}$with_widec" >&6 | ||
4663 | if test "$with_widec" = yes ; then | ||
4664 | LIB_SUFFIX="w${LIB_SUFFIX}" | ||
4665 | @@ -6829,10 +6843,10 @@ | ||
4666 | #define USE_WIDEC_SUPPORT 1 | ||
4667 | EOF | ||
4668 | |||
4669 | -echo "$as_me:6832: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 | ||
4670 | +echo "$as_me:6846: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 | ||
4671 | echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 | ||
4672 | cat >conftest.$ac_ext <<_ACEOF | ||
4673 | -#line 6835 "configure" | ||
4674 | +#line 6849 "configure" | ||
4675 | #include "confdefs.h" | ||
4676 | #include <sys/types.h> | ||
4677 | |||
4678 | @@ -6848,16 +6862,16 @@ | ||
4679 | } | ||
4680 | _ACEOF | ||
4681 | rm -f conftest.$ac_objext | ||
4682 | -if { (eval echo "$as_me:6851: \"$ac_compile\"") >&5 | ||
4683 | +if { (eval echo "$as_me:6865: \"$ac_compile\"") >&5 | ||
4684 | (eval $ac_compile) 2>&5 | ||
4685 | ac_status=$? | ||
4686 | - echo "$as_me:6854: \$? = $ac_status" >&5 | ||
4687 | + echo "$as_me:6868: \$? = $ac_status" >&5 | ||
4688 | (exit $ac_status); } && | ||
4689 | { ac_try='test -s conftest.$ac_objext' | ||
4690 | - { (eval echo "$as_me:6857: \"$ac_try\"") >&5 | ||
4691 | + { (eval echo "$as_me:6871: \"$ac_try\"") >&5 | ||
4692 | (eval $ac_try) 2>&5 | ||
4693 | ac_status=$? | ||
4694 | - echo "$as_me:6860: \$? = $ac_status" >&5 | ||
4695 | + echo "$as_me:6874: \$? = $ac_status" >&5 | ||
4696 | (exit $ac_status); }; }; then | ||
4697 | cf_result=no | ||
4698 | else | ||
4699 | @@ -6866,16 +6880,16 @@ | ||
4700 | cf_result=yes | ||
4701 | fi | ||
4702 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
4703 | -echo "$as_me:6869: result: $cf_result" >&5 | ||
4704 | +echo "$as_me:6883: result: $cf_result" >&5 | ||
4705 | echo "${ECHO_T}$cf_result" >&6 | ||
4706 | |||
4707 | if test "$cf_result" = yes ; then | ||
4708 | CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" | ||
4709 | elif test "x" != "x" ; then | ||
4710 | - echo "$as_me:6875: checking checking for compatible value versus " >&5 | ||
4711 | + echo "$as_me:6889: checking checking for compatible value versus " >&5 | ||
4712 | echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6 | ||
4713 | cat >conftest.$ac_ext <<_ACEOF | ||
4714 | -#line 6878 "configure" | ||
4715 | +#line 6892 "configure" | ||
4716 | #include "confdefs.h" | ||
4717 | #include <sys/types.h> | ||
4718 | |||
4719 | @@ -6891,16 +6905,16 @@ | ||
4720 | } | ||
4721 | _ACEOF | ||
4722 | rm -f conftest.$ac_objext | ||
4723 | -if { (eval echo "$as_me:6894: \"$ac_compile\"") >&5 | ||
4724 | +if { (eval echo "$as_me:6908: \"$ac_compile\"") >&5 | ||
4725 | (eval $ac_compile) 2>&5 | ||
4726 | ac_status=$? | ||
4727 | - echo "$as_me:6897: \$? = $ac_status" >&5 | ||
4728 | + echo "$as_me:6911: \$? = $ac_status" >&5 | ||
4729 | (exit $ac_status); } && | ||
4730 | { ac_try='test -s conftest.$ac_objext' | ||
4731 | - { (eval echo "$as_me:6900: \"$ac_try\"") >&5 | ||
4732 | + { (eval echo "$as_me:6914: \"$ac_try\"") >&5 | ||
4733 | (eval $ac_try) 2>&5 | ||
4734 | ac_status=$? | ||
4735 | - echo "$as_me:6903: \$? = $ac_status" >&5 | ||
4736 | + echo "$as_me:6917: \$? = $ac_status" >&5 | ||
4737 | (exit $ac_status); }; }; then | ||
4738 | cf_result=yes | ||
4739 | else | ||
4740 | @@ -6909,7 +6923,7 @@ | ||
4741 | cf_result=no | ||
4742 | fi | ||
4743 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
4744 | - echo "$as_me:6912: result: $cf_result" >&5 | ||
4745 | + echo "$as_me:6926: result: $cf_result" >&5 | ||
4746 | echo "${ECHO_T}$cf_result" >&6 | ||
4747 | if test "$cf_result" = no ; then | ||
4748 | # perhaps we can override it - try... | ||
4749 | @@ -6923,13 +6937,13 @@ | ||
4750 | for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs | ||
4751 | do | ||
4752 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
4753 | -echo "$as_me:6926: checking for $ac_func" >&5 | ||
4754 | +echo "$as_me:6940: checking for $ac_func" >&5 | ||
4755 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | ||
4756 | if eval "test \"\${$as_ac_var+set}\" = set"; then | ||
4757 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4758 | else | ||
4759 | cat >conftest.$ac_ext <<_ACEOF | ||
4760 | -#line 6932 "configure" | ||
4761 | +#line 6946 "configure" | ||
4762 | #include "confdefs.h" | ||
4763 | /* System header to define __stub macros and hopefully few prototypes, | ||
4764 | which can conflict with char $ac_func (); below. */ | ||
4765 | @@ -6960,16 +6974,16 @@ | ||
4766 | } | ||
4767 | _ACEOF | ||
4768 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
4769 | -if { (eval echo "$as_me:6963: \"$ac_link\"") >&5 | ||
4770 | +if { (eval echo "$as_me:6977: \"$ac_link\"") >&5 | ||
4771 | (eval $ac_link) 2>&5 | ||
4772 | ac_status=$? | ||
4773 | - echo "$as_me:6966: \$? = $ac_status" >&5 | ||
4774 | + echo "$as_me:6980: \$? = $ac_status" >&5 | ||
4775 | (exit $ac_status); } && | ||
4776 | { ac_try='test -s conftest$ac_exeext' | ||
4777 | - { (eval echo "$as_me:6969: \"$ac_try\"") >&5 | ||
4778 | + { (eval echo "$as_me:6983: \"$ac_try\"") >&5 | ||
4779 | (eval $ac_try) 2>&5 | ||
4780 | ac_status=$? | ||
4781 | - echo "$as_me:6972: \$? = $ac_status" >&5 | ||
4782 | + echo "$as_me:6986: \$? = $ac_status" >&5 | ||
4783 | (exit $ac_status); }; }; then | ||
4784 | eval "$as_ac_var=yes" | ||
4785 | else | ||
4786 | @@ -6979,7 +6993,7 @@ | ||
4787 | fi | ||
4788 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
4789 | fi | ||
4790 | -echo "$as_me:6982: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
4791 | +echo "$as_me:6996: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
4792 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
4793 | if test `eval echo '${'$as_ac_var'}'` = yes; then | ||
4794 | cat >>confdefs.h <<EOF | ||
4795 | @@ -6991,7 +7005,7 @@ | ||
4796 | |||
4797 | if test "$ac_cv_func_putwc" != yes ; then | ||
4798 | |||
4799 | -echo "$as_me:6994: checking for multibyte character support" >&5 | ||
4800 | +echo "$as_me:7008: checking for multibyte character support" >&5 | ||
4801 | echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 | ||
4802 | if test "${cf_cv_utf8_lib+set}" = set; then | ||
4803 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
4804 | @@ -6999,7 +7013,7 @@ | ||
4805 | |||
4806 | cf_save_LIBS="$LIBS" | ||
4807 | cat >conftest.$ac_ext <<_ACEOF | ||
4808 | -#line 7002 "configure" | ||
4809 | +#line 7016 "configure" | ||
4810 | #include "confdefs.h" | ||
4811 | |||
4812 | #include <stdlib.h> | ||
4813 | @@ -7012,16 +7026,16 @@ | ||
4814 | } | ||
4815 | _ACEOF | ||
4816 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
4817 | -if { (eval echo "$as_me:7015: \"$ac_link\"") >&5 | ||
4818 | +if { (eval echo "$as_me:7029: \"$ac_link\"") >&5 | ||
4819 | (eval $ac_link) 2>&5 | ||
4820 | ac_status=$? | ||
4821 | - echo "$as_me:7018: \$? = $ac_status" >&5 | ||
4822 | + echo "$as_me:7032: \$? = $ac_status" >&5 | ||
4823 | (exit $ac_status); } && | ||
4824 | { ac_try='test -s conftest$ac_exeext' | ||
4825 | - { (eval echo "$as_me:7021: \"$ac_try\"") >&5 | ||
4826 | + { (eval echo "$as_me:7035: \"$ac_try\"") >&5 | ||
4827 | (eval $ac_try) 2>&5 | ||
4828 | ac_status=$? | ||
4829 | - echo "$as_me:7024: \$? = $ac_status" >&5 | ||
4830 | + echo "$as_me:7038: \$? = $ac_status" >&5 | ||
4831 | (exit $ac_status); }; }; then | ||
4832 | cf_cv_utf8_lib=yes | ||
4833 | else | ||
4834 | @@ -7033,10 +7047,10 @@ | ||
4835 | cf_cv_header_path_utf8= | ||
4836 | cf_cv_library_path_utf8= | ||
4837 | |||
4838 | -echo "${as_me-configure}:7036: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 | ||
4839 | +echo "${as_me-configure}:7050: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 | ||
4840 | |||
4841 | cat >conftest.$ac_ext <<_ACEOF | ||
4842 | -#line 7039 "configure" | ||
4843 | +#line 7053 "configure" | ||
4844 | #include "confdefs.h" | ||
4845 | |||
4846 | #include <libutf8.h> | ||
4847 | @@ -7049,16 +7063,16 @@ | ||
4848 | } | ||
4849 | _ACEOF | ||
4850 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
4851 | -if { (eval echo "$as_me:7052: \"$ac_link\"") >&5 | ||
4852 | +if { (eval echo "$as_me:7066: \"$ac_link\"") >&5 | ||
4853 | (eval $ac_link) 2>&5 | ||
4854 | ac_status=$? | ||
4855 | - echo "$as_me:7055: \$? = $ac_status" >&5 | ||
4856 | + echo "$as_me:7069: \$? = $ac_status" >&5 | ||
4857 | (exit $ac_status); } && | ||
4858 | { ac_try='test -s conftest$ac_exeext' | ||
4859 | - { (eval echo "$as_me:7058: \"$ac_try\"") >&5 | ||
4860 | + { (eval echo "$as_me:7072: \"$ac_try\"") >&5 | ||
4861 | (eval $ac_try) 2>&5 | ||
4862 | ac_status=$? | ||
4863 | - echo "$as_me:7061: \$? = $ac_status" >&5 | ||
4864 | + echo "$as_me:7075: \$? = $ac_status" >&5 | ||
4865 | (exit $ac_status); }; }; then | ||
4866 | cf_cv_find_linkage_utf8=yes | ||
4867 | else | ||
4868 | @@ -7067,12 +7081,37 @@ | ||
4869 | |||
4870 | cf_cv_find_linkage_utf8=no | ||
4871 | |||
4872 | -echo "${as_me-configure}:7070: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 | ||
4873 | +echo "${as_me-configure}:7084: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 | ||
4874 | |||
4875 | cf_save_CPPFLAGS="$CPPFLAGS" | ||
4876 | cf_test_CPPFLAGS="$CPPFLAGS" | ||
4877 | |||
4878 | - cf_search="" | ||
4879 | +cf_header_path_list="" | ||
4880 | +if test -n "${CFLAGS}${CPPFLAGS}" ; then | ||
4881 | + for cf_header_path in $CPPFLAGS $CFLAGS | ||
4882 | + do | ||
4883 | + case $cf_header_path in #(vi | ||
4884 | + -I*) | ||
4885 | + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` | ||
4886 | + | ||
4887 | +test "$cf_header_path" != "NONE" && \ | ||
4888 | +test -d "$cf_header_path" && \ | ||
4889 | + { | ||
4890 | + test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" | ||
4891 | + test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" | ||
4892 | + test -d $cf_header_path/include/utf8 && cf_search="$cf_search $cf_header_path/include/utf8" | ||
4893 | + test -d $cf_header_path/include/utf8/include && cf_search="$cf_search $cf_header_path/include/utf8/include" | ||
4894 | + test -d $cf_header_path/utf8/include && cf_search="$cf_search $cf_header_path/utf8/include" | ||
4895 | + test -d $cf_header_path/utf8/include/utf8 && cf_search="$cf_search $cf_header_path/utf8/include/utf8" | ||
4896 | +} | ||
4897 | + | ||
4898 | + cf_header_path_list="$cf_header_path_list $cf_search" | ||
4899 | + ;; | ||
4900 | + esac | ||
4901 | + done | ||
4902 | +fi | ||
4903 | + | ||
4904 | +cf_search="" | ||
4905 | |||
4906 | test "/usr" != "$prefix" && \ | ||
4907 | test -d "/usr" && \ | ||
4908 | @@ -7143,16 +7182,18 @@ | ||
4909 | test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8" | ||
4910 | } | ||
4911 | |||
4912 | +cf_search="$cf_header_path_list $cf_search" | ||
4913 | + | ||
4914 | for cf_cv_header_path_utf8 in $cf_search | ||
4915 | do | ||
4916 | if test -d $cf_cv_header_path_utf8 ; then | ||
4917 | test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 | ||
4918 | |||
4919 | -echo "${as_me-configure}:7151: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 | ||
4920 | +echo "${as_me-configure}:7192: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 | ||
4921 | |||
4922 | CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" | ||
4923 | cat >conftest.$ac_ext <<_ACEOF | ||
4924 | -#line 7155 "configure" | ||
4925 | +#line 7196 "configure" | ||
4926 | #include "confdefs.h" | ||
4927 | |||
4928 | #include <libutf8.h> | ||
4929 | @@ -7165,21 +7206,21 @@ | ||
4930 | } | ||
4931 | _ACEOF | ||
4932 | rm -f conftest.$ac_objext | ||
4933 | -if { (eval echo "$as_me:7168: \"$ac_compile\"") >&5 | ||
4934 | +if { (eval echo "$as_me:7209: \"$ac_compile\"") >&5 | ||
4935 | (eval $ac_compile) 2>&5 | ||
4936 | ac_status=$? | ||
4937 | - echo "$as_me:7171: \$? = $ac_status" >&5 | ||
4938 | + echo "$as_me:7212: \$? = $ac_status" >&5 | ||
4939 | (exit $ac_status); } && | ||
4940 | { ac_try='test -s conftest.$ac_objext' | ||
4941 | - { (eval echo "$as_me:7174: \"$ac_try\"") >&5 | ||
4942 | + { (eval echo "$as_me:7215: \"$ac_try\"") >&5 | ||
4943 | (eval $ac_try) 2>&5 | ||
4944 | ac_status=$? | ||
4945 | - echo "$as_me:7177: \$? = $ac_status" >&5 | ||
4946 | + echo "$as_me:7218: \$? = $ac_status" >&5 | ||
4947 | (exit $ac_status); }; }; then | ||
4948 | |||
4949 | test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 | ||
4950 | |||
4951 | -echo "${as_me-configure}:7182: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 | ||
4952 | +echo "${as_me-configure}:7223: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 | ||
4953 | |||
4954 | cf_cv_find_linkage_utf8=maybe | ||
4955 | cf_test_CPPFLAGS="$CPPFLAGS" | ||
4956 | @@ -7197,13 +7238,39 @@ | ||
4957 | |||
4958 | if test "$cf_cv_find_linkage_utf8" = maybe ; then | ||
4959 | |||
4960 | -echo "${as_me-configure}:7200: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 | ||
4961 | +echo "${as_me-configure}:7241: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 | ||
4962 | |||
4963 | cf_save_LIBS="$LIBS" | ||
4964 | cf_save_LDFLAGS="$LDFLAGS" | ||
4965 | |||
4966 | if test "$cf_cv_find_linkage_utf8" != yes ; then | ||
4967 | - cf_search="" | ||
4968 | + | ||
4969 | +cf_library_path_list="" | ||
4970 | +if test -n "${LDFLAGS}${LIBS}" ; then | ||
4971 | + for cf_library_path in $LDFLAGS $LIBS | ||
4972 | + do | ||
4973 | + case $cf_library_path in #(vi | ||
4974 | + -L*) | ||
4975 | + cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` | ||
4976 | + | ||
4977 | +test "$cf_library_path" != "NONE" && \ | ||
4978 | +test -d "$cf_library_path" && \ | ||
4979 | + { | ||
4980 | + test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" | ||
4981 | + test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" | ||
4982 | + test -d $cf_library_path/lib/utf8 && cf_search="$cf_search $cf_library_path/lib/utf8" | ||
4983 | + test -d $cf_library_path/lib/utf8/lib && cf_search="$cf_search $cf_library_path/lib/utf8/lib" | ||
4984 | + test -d $cf_library_path/utf8/lib && cf_search="$cf_search $cf_library_path/utf8/lib" | ||
4985 | + test -d $cf_library_path/utf8/lib/utf8 && cf_search="$cf_search $cf_library_path/utf8/lib/utf8" | ||
4986 | +} | ||
4987 | + | ||
4988 | + cf_library_path_list="$cf_library_path_list $cf_search" | ||
4989 | + ;; | ||
4990 | + esac | ||
4991 | + done | ||
4992 | +fi | ||
4993 | + | ||
4994 | +cf_search="" | ||
4995 | |||
4996 | test "/usr" != "$prefix" && \ | ||
4997 | test -d "/usr" && \ | ||
4998 | @@ -7260,18 +7327,20 @@ | ||
4999 | test -d $HOME/utf8/lib/utf8 && cf_search="$cf_search $HOME/utf8/lib/utf8" | ||
5000 | } | ||
5001 | |||
5002 | +cf_search="$cf_library_path_list $cf_search" | ||
5003 | + | ||
5004 | for cf_cv_library_path_utf8 in $cf_search | ||
5005 | do | ||
5006 | if test -d $cf_cv_library_path_utf8 ; then | ||
5007 | test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 | ||
5008 | |||
5009 | -echo "${as_me-configure}:7268: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 | ||
5010 | +echo "${as_me-configure}:7337: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 | ||
5011 | |||
5012 | CPPFLAGS="$cf_test_CPPFLAGS" | ||
5013 | LIBS="-lutf8 $cf_save_LIBS" | ||
5014 | LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" | ||
5015 | cat >conftest.$ac_ext <<_ACEOF | ||
5016 | -#line 7274 "configure" | ||
5017 | +#line 7343 "configure" | ||
5018 | #include "confdefs.h" | ||
5019 | |||
5020 | #include <libutf8.h> | ||
5021 | @@ -7284,21 +7353,21 @@ | ||
5022 | } | ||
5023 | _ACEOF | ||
5024 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
5025 | -if { (eval echo "$as_me:7287: \"$ac_link\"") >&5 | ||
5026 | +if { (eval echo "$as_me:7356: \"$ac_link\"") >&5 | ||
5027 | (eval $ac_link) 2>&5 | ||
5028 | ac_status=$? | ||
5029 | - echo "$as_me:7290: \$? = $ac_status" >&5 | ||
5030 | + echo "$as_me:7359: \$? = $ac_status" >&5 | ||
5031 | (exit $ac_status); } && | ||
5032 | { ac_try='test -s conftest$ac_exeext' | ||
5033 | - { (eval echo "$as_me:7293: \"$ac_try\"") >&5 | ||
5034 | + { (eval echo "$as_me:7362: \"$ac_try\"") >&5 | ||
5035 | (eval $ac_try) 2>&5 | ||
5036 | ac_status=$? | ||
5037 | - echo "$as_me:7296: \$? = $ac_status" >&5 | ||
5038 | + echo "$as_me:7365: \$? = $ac_status" >&5 | ||
5039 | (exit $ac_status); }; }; then | ||
5040 | |||
5041 | test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 | ||
5042 | |||
5043 | -echo "${as_me-configure}:7301: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 | ||
5044 | +echo "${as_me-configure}:7370: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 | ||
5045 | |||
5046 | cf_cv_find_linkage_utf8=yes | ||
5047 | cf_cv_library_file_utf8="-lutf8" | ||
5048 | @@ -7336,7 +7405,7 @@ | ||
5049 | fi | ||
5050 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
5051 | fi | ||
5052 | -echo "$as_me:7339: result: $cf_cv_utf8_lib" >&5 | ||
5053 | +echo "$as_me:7408: result: $cf_cv_utf8_lib" >&5 | ||
5054 | echo "${ECHO_T}$cf_cv_utf8_lib" >&6 | ||
5055 | |||
5056 | # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between | ||
5057 | @@ -7370,7 +7439,7 @@ | ||
5058 | cf_save_CPPFLAGS=$CPPFLAGS | ||
5059 | CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" | ||
5060 | cat >conftest.$ac_ext <<_ACEOF | ||
5061 | -#line 7373 "configure" | ||
5062 | +#line 7442 "configure" | ||
5063 | #include "confdefs.h" | ||
5064 | #include <stdio.h> | ||
5065 | int | ||
5066 | @@ -7382,16 +7451,16 @@ | ||
5067 | } | ||
5068 | _ACEOF | ||
5069 | rm -f conftest.$ac_objext | ||
5070 | -if { (eval echo "$as_me:7385: \"$ac_compile\"") >&5 | ||
5071 | +if { (eval echo "$as_me:7454: \"$ac_compile\"") >&5 | ||
5072 | (eval $ac_compile) 2>&5 | ||
5073 | ac_status=$? | ||
5074 | - echo "$as_me:7388: \$? = $ac_status" >&5 | ||
5075 | + echo "$as_me:7457: \$? = $ac_status" >&5 | ||
5076 | (exit $ac_status); } && | ||
5077 | { ac_try='test -s conftest.$ac_objext' | ||
5078 | - { (eval echo "$as_me:7391: \"$ac_try\"") >&5 | ||
5079 | + { (eval echo "$as_me:7460: \"$ac_try\"") >&5 | ||
5080 | (eval $ac_try) 2>&5 | ||
5081 | ac_status=$? | ||
5082 | - echo "$as_me:7394: \$? = $ac_status" >&5 | ||
5083 | + echo "$as_me:7463: \$? = $ac_status" >&5 | ||
5084 | (exit $ac_status); }; }; then | ||
5085 | : | ||
5086 | else | ||
5087 | @@ -7408,7 +7477,7 @@ | ||
5088 | if test "$cf_have_incdir" = no ; then | ||
5089 | test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 | ||
5090 | |||
5091 | -echo "${as_me-configure}:7411: testing adding $cf_add_incdir to include-path ..." 1>&5 | ||
5092 | +echo "${as_me-configure}:7480: testing adding $cf_add_incdir to include-path ..." 1>&5 | ||
5093 | |||
5094 | CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" | ||
5095 | |||
5096 | @@ -7442,7 +7511,7 @@ | ||
5097 | if test "$cf_have_libdir" = no ; then | ||
5098 | test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 | ||
5099 | |||
5100 | -echo "${as_me-configure}:7445: testing adding $cf_add_libdir to library-path ..." 1>&5 | ||
5101 | +echo "${as_me-configure}:7514: testing adding $cf_add_libdir to library-path ..." 1>&5 | ||
5102 | |||
5103 | LDFLAGS="-L$cf_add_libdir $LDFLAGS" | ||
5104 | fi | ||
5105 | @@ -7459,14 +7528,14 @@ | ||
5106 | fi | ||
5107 | |||
5108 | # This is needed on Tru64 5.0 to declare mbstate_t | ||
5109 | -echo "$as_me:7462: checking if we must include wchar.h to declare mbstate_t" >&5 | ||
5110 | +echo "$as_me:7531: checking if we must include wchar.h to declare mbstate_t" >&5 | ||
5111 | echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 | ||
5112 | if test "${cf_cv_mbstate_t+set}" = set; then | ||
5113 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5114 | else | ||
5115 | |||
5116 | cat >conftest.$ac_ext <<_ACEOF | ||
5117 | -#line 7469 "configure" | ||
5118 | +#line 7538 "configure" | ||
5119 | #include "confdefs.h" | ||
5120 | |||
5121 | #include <stdlib.h> | ||
5122 | @@ -7484,23 +7553,23 @@ | ||
5123 | } | ||
5124 | _ACEOF | ||
5125 | rm -f conftest.$ac_objext | ||
5126 | -if { (eval echo "$as_me:7487: \"$ac_compile\"") >&5 | ||
5127 | +if { (eval echo "$as_me:7556: \"$ac_compile\"") >&5 | ||
5128 | (eval $ac_compile) 2>&5 | ||
5129 | ac_status=$? | ||
5130 | - echo "$as_me:7490: \$? = $ac_status" >&5 | ||
5131 | + echo "$as_me:7559: \$? = $ac_status" >&5 | ||
5132 | (exit $ac_status); } && | ||
5133 | { ac_try='test -s conftest.$ac_objext' | ||
5134 | - { (eval echo "$as_me:7493: \"$ac_try\"") >&5 | ||
5135 | + { (eval echo "$as_me:7562: \"$ac_try\"") >&5 | ||
5136 | (eval $ac_try) 2>&5 | ||
5137 | ac_status=$? | ||
5138 | - echo "$as_me:7496: \$? = $ac_status" >&5 | ||
5139 | + echo "$as_me:7565: \$? = $ac_status" >&5 | ||
5140 | (exit $ac_status); }; }; then | ||
5141 | cf_cv_mbstate_t=no | ||
5142 | else | ||
5143 | echo "$as_me: failed program was:" >&5 | ||
5144 | cat conftest.$ac_ext >&5 | ||
5145 | cat >conftest.$ac_ext <<_ACEOF | ||
5146 | -#line 7503 "configure" | ||
5147 | +#line 7572 "configure" | ||
5148 | #include "confdefs.h" | ||
5149 | |||
5150 | #include <stdlib.h> | ||
5151 | @@ -7519,16 +7588,16 @@ | ||
5152 | } | ||
5153 | _ACEOF | ||
5154 | rm -f conftest.$ac_objext | ||
5155 | -if { (eval echo "$as_me:7522: \"$ac_compile\"") >&5 | ||
5156 | +if { (eval echo "$as_me:7591: \"$ac_compile\"") >&5 | ||
5157 | (eval $ac_compile) 2>&5 | ||
5158 | ac_status=$? | ||
5159 | - echo "$as_me:7525: \$? = $ac_status" >&5 | ||
5160 | + echo "$as_me:7594: \$? = $ac_status" >&5 | ||
5161 | (exit $ac_status); } && | ||
5162 | { ac_try='test -s conftest.$ac_objext' | ||
5163 | - { (eval echo "$as_me:7528: \"$ac_try\"") >&5 | ||
5164 | + { (eval echo "$as_me:7597: \"$ac_try\"") >&5 | ||
5165 | (eval $ac_try) 2>&5 | ||
5166 | ac_status=$? | ||
5167 | - echo "$as_me:7531: \$? = $ac_status" >&5 | ||
5168 | + echo "$as_me:7600: \$? = $ac_status" >&5 | ||
5169 | (exit $ac_status); }; }; then | ||
5170 | cf_cv_mbstate_t=yes | ||
5171 | else | ||
5172 | @@ -7540,7 +7609,7 @@ | ||
5173 | fi | ||
5174 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
5175 | fi | ||
5176 | -echo "$as_me:7543: result: $cf_cv_mbstate_t" >&5 | ||
5177 | +echo "$as_me:7612: result: $cf_cv_mbstate_t" >&5 | ||
5178 | echo "${ECHO_T}$cf_cv_mbstate_t" >&6 | ||
5179 | |||
5180 | if test "$cf_cv_mbstate_t" = yes ; then | ||
5181 | @@ -7557,14 +7626,14 @@ | ||
5182 | fi | ||
5183 | |||
5184 | # This is needed on Tru64 5.0 to declare wchar_t | ||
5185 | -echo "$as_me:7560: checking if we must include wchar.h to declare wchar_t" >&5 | ||
5186 | +echo "$as_me:7629: checking if we must include wchar.h to declare wchar_t" >&5 | ||
5187 | echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 | ||
5188 | if test "${cf_cv_wchar_t+set}" = set; then | ||
5189 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5190 | else | ||
5191 | |||
5192 | cat >conftest.$ac_ext <<_ACEOF | ||
5193 | -#line 7567 "configure" | ||
5194 | +#line 7636 "configure" | ||
5195 | #include "confdefs.h" | ||
5196 | |||
5197 | #include <stdlib.h> | ||
5198 | @@ -7582,23 +7651,23 @@ | ||
5199 | } | ||
5200 | _ACEOF | ||
5201 | rm -f conftest.$ac_objext | ||
5202 | -if { (eval echo "$as_me:7585: \"$ac_compile\"") >&5 | ||
5203 | +if { (eval echo "$as_me:7654: \"$ac_compile\"") >&5 | ||
5204 | (eval $ac_compile) 2>&5 | ||
5205 | ac_status=$? | ||
5206 | - echo "$as_me:7588: \$? = $ac_status" >&5 | ||
5207 | + echo "$as_me:7657: \$? = $ac_status" >&5 | ||
5208 | (exit $ac_status); } && | ||
5209 | { ac_try='test -s conftest.$ac_objext' | ||
5210 | - { (eval echo "$as_me:7591: \"$ac_try\"") >&5 | ||
5211 | + { (eval echo "$as_me:7660: \"$ac_try\"") >&5 | ||
5212 | (eval $ac_try) 2>&5 | ||
5213 | ac_status=$? | ||
5214 | - echo "$as_me:7594: \$? = $ac_status" >&5 | ||
5215 | + echo "$as_me:7663: \$? = $ac_status" >&5 | ||
5216 | (exit $ac_status); }; }; then | ||
5217 | cf_cv_wchar_t=no | ||
5218 | else | ||
5219 | echo "$as_me: failed program was:" >&5 | ||
5220 | cat conftest.$ac_ext >&5 | ||
5221 | cat >conftest.$ac_ext <<_ACEOF | ||
5222 | -#line 7601 "configure" | ||
5223 | +#line 7670 "configure" | ||
5224 | #include "confdefs.h" | ||
5225 | |||
5226 | #include <stdlib.h> | ||
5227 | @@ -7617,16 +7686,16 @@ | ||
5228 | } | ||
5229 | _ACEOF | ||
5230 | rm -f conftest.$ac_objext | ||
5231 | -if { (eval echo "$as_me:7620: \"$ac_compile\"") >&5 | ||
5232 | +if { (eval echo "$as_me:7689: \"$ac_compile\"") >&5 | ||
5233 | (eval $ac_compile) 2>&5 | ||
5234 | ac_status=$? | ||
5235 | - echo "$as_me:7623: \$? = $ac_status" >&5 | ||
5236 | + echo "$as_me:7692: \$? = $ac_status" >&5 | ||
5237 | (exit $ac_status); } && | ||
5238 | { ac_try='test -s conftest.$ac_objext' | ||
5239 | - { (eval echo "$as_me:7626: \"$ac_try\"") >&5 | ||
5240 | + { (eval echo "$as_me:7695: \"$ac_try\"") >&5 | ||
5241 | (eval $ac_try) 2>&5 | ||
5242 | ac_status=$? | ||
5243 | - echo "$as_me:7629: \$? = $ac_status" >&5 | ||
5244 | + echo "$as_me:7698: \$? = $ac_status" >&5 | ||
5245 | (exit $ac_status); }; }; then | ||
5246 | cf_cv_wchar_t=yes | ||
5247 | else | ||
5248 | @@ -7638,7 +7707,7 @@ | ||
5249 | fi | ||
5250 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
5251 | fi | ||
5252 | -echo "$as_me:7641: result: $cf_cv_wchar_t" >&5 | ||
5253 | +echo "$as_me:7710: result: $cf_cv_wchar_t" >&5 | ||
5254 | echo "${ECHO_T}$cf_cv_wchar_t" >&6 | ||
5255 | |||
5256 | if test "$cf_cv_wchar_t" = yes ; then | ||
5257 | @@ -7660,14 +7729,14 @@ | ||
5258 | fi | ||
5259 | |||
5260 | # This is needed on Tru64 5.0 to declare wint_t | ||
5261 | -echo "$as_me:7663: checking if we must include wchar.h to declare wint_t" >&5 | ||
5262 | +echo "$as_me:7732: checking if we must include wchar.h to declare wint_t" >&5 | ||
5263 | echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 | ||
5264 | if test "${cf_cv_wint_t+set}" = set; then | ||
5265 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5266 | else | ||
5267 | |||
5268 | cat >conftest.$ac_ext <<_ACEOF | ||
5269 | -#line 7670 "configure" | ||
5270 | +#line 7739 "configure" | ||
5271 | #include "confdefs.h" | ||
5272 | |||
5273 | #include <stdlib.h> | ||
5274 | @@ -7685,23 +7754,23 @@ | ||
5275 | } | ||
5276 | _ACEOF | ||
5277 | rm -f conftest.$ac_objext | ||
5278 | -if { (eval echo "$as_me:7688: \"$ac_compile\"") >&5 | ||
5279 | +if { (eval echo "$as_me:7757: \"$ac_compile\"") >&5 | ||
5280 | (eval $ac_compile) 2>&5 | ||
5281 | ac_status=$? | ||
5282 | - echo "$as_me:7691: \$? = $ac_status" >&5 | ||
5283 | + echo "$as_me:7760: \$? = $ac_status" >&5 | ||
5284 | (exit $ac_status); } && | ||
5285 | { ac_try='test -s conftest.$ac_objext' | ||
5286 | - { (eval echo "$as_me:7694: \"$ac_try\"") >&5 | ||
5287 | + { (eval echo "$as_me:7763: \"$ac_try\"") >&5 | ||
5288 | (eval $ac_try) 2>&5 | ||
5289 | ac_status=$? | ||
5290 | - echo "$as_me:7697: \$? = $ac_status" >&5 | ||
5291 | + echo "$as_me:7766: \$? = $ac_status" >&5 | ||
5292 | (exit $ac_status); }; }; then | ||
5293 | cf_cv_wint_t=no | ||
5294 | else | ||
5295 | echo "$as_me: failed program was:" >&5 | ||
5296 | cat conftest.$ac_ext >&5 | ||
5297 | cat >conftest.$ac_ext <<_ACEOF | ||
5298 | -#line 7704 "configure" | ||
5299 | +#line 7773 "configure" | ||
5300 | #include "confdefs.h" | ||
5301 | |||
5302 | #include <stdlib.h> | ||
5303 | @@ -7720,16 +7789,16 @@ | ||
5304 | } | ||
5305 | _ACEOF | ||
5306 | rm -f conftest.$ac_objext | ||
5307 | -if { (eval echo "$as_me:7723: \"$ac_compile\"") >&5 | ||
5308 | +if { (eval echo "$as_me:7792: \"$ac_compile\"") >&5 | ||
5309 | (eval $ac_compile) 2>&5 | ||
5310 | ac_status=$? | ||
5311 | - echo "$as_me:7726: \$? = $ac_status" >&5 | ||
5312 | + echo "$as_me:7795: \$? = $ac_status" >&5 | ||
5313 | (exit $ac_status); } && | ||
5314 | { ac_try='test -s conftest.$ac_objext' | ||
5315 | - { (eval echo "$as_me:7729: \"$ac_try\"") >&5 | ||
5316 | + { (eval echo "$as_me:7798: \"$ac_try\"") >&5 | ||
5317 | (eval $ac_try) 2>&5 | ||
5318 | ac_status=$? | ||
5319 | - echo "$as_me:7732: \$? = $ac_status" >&5 | ||
5320 | + echo "$as_me:7801: \$? = $ac_status" >&5 | ||
5321 | (exit $ac_status); }; }; then | ||
5322 | cf_cv_wint_t=yes | ||
5323 | else | ||
5324 | @@ -7741,7 +7810,7 @@ | ||
5325 | fi | ||
5326 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
5327 | fi | ||
5328 | -echo "$as_me:7744: result: $cf_cv_wint_t" >&5 | ||
5329 | +echo "$as_me:7813: result: $cf_cv_wint_t" >&5 | ||
5330 | echo "${ECHO_T}$cf_cv_wint_t" >&6 | ||
5331 | |||
5332 | if test "$cf_cv_wint_t" = yes ; then | ||
5333 | @@ -7780,7 +7849,7 @@ | ||
5334 | ;; | ||
5335 | esac | ||
5336 | |||
5337 | -echo "$as_me:7783: checking whether to enable _LP64 definition in curses.h" >&5 | ||
5338 | +echo "$as_me:7852: checking whether to enable _LP64 definition in curses.h" >&5 | ||
5339 | echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6 | ||
5340 | |||
5341 | # Check whether --enable-lp64 or --disable-lp64 was given. | ||
5342 | @@ -7790,7 +7859,7 @@ | ||
5343 | else | ||
5344 | with_lp64=$default_with_lp64 | ||
5345 | fi; | ||
5346 | -echo "$as_me:7793: result: $with_lp64" >&5 | ||
5347 | +echo "$as_me:7862: result: $with_lp64" >&5 | ||
5348 | echo "${ECHO_T}$with_lp64" >&6 | ||
5349 | |||
5350 | if test "$with_lp64" = yes ; then | ||
5351 | @@ -7806,7 +7875,7 @@ | ||
5352 | fi; | ||
5353 | if test "$enable_largefile" != no; then | ||
5354 | |||
5355 | - echo "$as_me:7809: checking for special C compiler options needed for large files" >&5 | ||
5356 | + echo "$as_me:7878: checking for special C compiler options needed for large files" >&5 | ||
5357 | echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 | ||
5358 | if test "${ac_cv_sys_largefile_CC+set}" = set; then | ||
5359 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5360 | @@ -7818,7 +7887,7 @@ | ||
5361 | # IRIX 6.2 and later do not support large files by default, | ||
5362 | # so use the C compiler's -n32 option if that helps. | ||
5363 | cat >conftest.$ac_ext <<_ACEOF | ||
5364 | -#line 7821 "configure" | ||
5365 | +#line 7890 "configure" | ||
5366 | #include "confdefs.h" | ||
5367 | #include <sys/types.h> | ||
5368 | /* Check that off_t can represent 2**63 - 1 correctly. | ||
5369 | @@ -7838,16 +7907,16 @@ | ||
5370 | } | ||
5371 | _ACEOF | ||
5372 | rm -f conftest.$ac_objext | ||
5373 | -if { (eval echo "$as_me:7841: \"$ac_compile\"") >&5 | ||
5374 | +if { (eval echo "$as_me:7910: \"$ac_compile\"") >&5 | ||
5375 | (eval $ac_compile) 2>&5 | ||
5376 | ac_status=$? | ||
5377 | - echo "$as_me:7844: \$? = $ac_status" >&5 | ||
5378 | + echo "$as_me:7913: \$? = $ac_status" >&5 | ||
5379 | (exit $ac_status); } && | ||
5380 | { ac_try='test -s conftest.$ac_objext' | ||
5381 | - { (eval echo "$as_me:7847: \"$ac_try\"") >&5 | ||
5382 | + { (eval echo "$as_me:7916: \"$ac_try\"") >&5 | ||
5383 | (eval $ac_try) 2>&5 | ||
5384 | ac_status=$? | ||
5385 | - echo "$as_me:7850: \$? = $ac_status" >&5 | ||
5386 | + echo "$as_me:7919: \$? = $ac_status" >&5 | ||
5387 | (exit $ac_status); }; }; then | ||
5388 | break | ||
5389 | else | ||
5390 | @@ -7857,16 +7926,16 @@ | ||
5391 | rm -f conftest.$ac_objext | ||
5392 | CC="$CC -n32" | ||
5393 | rm -f conftest.$ac_objext | ||
5394 | -if { (eval echo "$as_me:7860: \"$ac_compile\"") >&5 | ||
5395 | +if { (eval echo "$as_me:7929: \"$ac_compile\"") >&5 | ||
5396 | (eval $ac_compile) 2>&5 | ||
5397 | ac_status=$? | ||
5398 | - echo "$as_me:7863: \$? = $ac_status" >&5 | ||
5399 | + echo "$as_me:7932: \$? = $ac_status" >&5 | ||
5400 | (exit $ac_status); } && | ||
5401 | { ac_try='test -s conftest.$ac_objext' | ||
5402 | - { (eval echo "$as_me:7866: \"$ac_try\"") >&5 | ||
5403 | + { (eval echo "$as_me:7935: \"$ac_try\"") >&5 | ||
5404 | (eval $ac_try) 2>&5 | ||
5405 | ac_status=$? | ||
5406 | - echo "$as_me:7869: \$? = $ac_status" >&5 | ||
5407 | + echo "$as_me:7938: \$? = $ac_status" >&5 | ||
5408 | (exit $ac_status); }; }; then | ||
5409 | ac_cv_sys_largefile_CC=' -n32'; break | ||
5410 | else | ||
5411 | @@ -7880,13 +7949,13 @@ | ||
5412 | rm -f conftest.$ac_ext | ||
5413 | fi | ||
5414 | fi | ||
5415 | -echo "$as_me:7883: result: $ac_cv_sys_largefile_CC" >&5 | ||
5416 | +echo "$as_me:7952: result: $ac_cv_sys_largefile_CC" >&5 | ||
5417 | echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 | ||
5418 | if test "$ac_cv_sys_largefile_CC" != no; then | ||
5419 | CC=$CC$ac_cv_sys_largefile_CC | ||
5420 | fi | ||
5421 | |||
5422 | - echo "$as_me:7889: checking for _FILE_OFFSET_BITS value needed for large files" >&5 | ||
5423 | + echo "$as_me:7958: checking for _FILE_OFFSET_BITS value needed for large files" >&5 | ||
5424 | echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 | ||
5425 | if test "${ac_cv_sys_file_offset_bits+set}" = set; then | ||
5426 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5427 | @@ -7894,7 +7963,7 @@ | ||
5428 | while :; do | ||
5429 | ac_cv_sys_file_offset_bits=no | ||
5430 | cat >conftest.$ac_ext <<_ACEOF | ||
5431 | -#line 7897 "configure" | ||
5432 | +#line 7966 "configure" | ||
5433 | #include "confdefs.h" | ||
5434 | #include <sys/types.h> | ||
5435 | /* Check that off_t can represent 2**63 - 1 correctly. | ||
5436 | @@ -7914,16 +7983,16 @@ | ||
5437 | } | ||
5438 | _ACEOF | ||
5439 | rm -f conftest.$ac_objext | ||
5440 | -if { (eval echo "$as_me:7917: \"$ac_compile\"") >&5 | ||
5441 | +if { (eval echo "$as_me:7986: \"$ac_compile\"") >&5 | ||
5442 | (eval $ac_compile) 2>&5 | ||
5443 | ac_status=$? | ||
5444 | - echo "$as_me:7920: \$? = $ac_status" >&5 | ||
5445 | + echo "$as_me:7989: \$? = $ac_status" >&5 | ||
5446 | (exit $ac_status); } && | ||
5447 | { ac_try='test -s conftest.$ac_objext' | ||
5448 | - { (eval echo "$as_me:7923: \"$ac_try\"") >&5 | ||
5449 | + { (eval echo "$as_me:7992: \"$ac_try\"") >&5 | ||
5450 | (eval $ac_try) 2>&5 | ||
5451 | ac_status=$? | ||
5452 | - echo "$as_me:7926: \$? = $ac_status" >&5 | ||
5453 | + echo "$as_me:7995: \$? = $ac_status" >&5 | ||
5454 | (exit $ac_status); }; }; then | ||
5455 | break | ||
5456 | else | ||
5457 | @@ -7932,7 +8001,7 @@ | ||
5458 | fi | ||
5459 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
5460 | cat >conftest.$ac_ext <<_ACEOF | ||
5461 | -#line 7935 "configure" | ||
5462 | +#line 8004 "configure" | ||
5463 | #include "confdefs.h" | ||
5464 | #define _FILE_OFFSET_BITS 64 | ||
5465 | #include <sys/types.h> | ||
5466 | @@ -7953,16 +8022,16 @@ | ||
5467 | } | ||
5468 | _ACEOF | ||
5469 | rm -f conftest.$ac_objext | ||
5470 | -if { (eval echo "$as_me:7956: \"$ac_compile\"") >&5 | ||
5471 | +if { (eval echo "$as_me:8025: \"$ac_compile\"") >&5 | ||
5472 | (eval $ac_compile) 2>&5 | ||
5473 | ac_status=$? | ||
5474 | - echo "$as_me:7959: \$? = $ac_status" >&5 | ||
5475 | + echo "$as_me:8028: \$? = $ac_status" >&5 | ||
5476 | (exit $ac_status); } && | ||
5477 | { ac_try='test -s conftest.$ac_objext' | ||
5478 | - { (eval echo "$as_me:7962: \"$ac_try\"") >&5 | ||
5479 | + { (eval echo "$as_me:8031: \"$ac_try\"") >&5 | ||
5480 | (eval $ac_try) 2>&5 | ||
5481 | ac_status=$? | ||
5482 | - echo "$as_me:7965: \$? = $ac_status" >&5 | ||
5483 | + echo "$as_me:8034: \$? = $ac_status" >&5 | ||
5484 | (exit $ac_status); }; }; then | ||
5485 | ac_cv_sys_file_offset_bits=64; break | ||
5486 | else | ||
5487 | @@ -7973,7 +8042,7 @@ | ||
5488 | break | ||
5489 | done | ||
5490 | fi | ||
5491 | -echo "$as_me:7976: result: $ac_cv_sys_file_offset_bits" >&5 | ||
5492 | +echo "$as_me:8045: result: $ac_cv_sys_file_offset_bits" >&5 | ||
5493 | echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 | ||
5494 | if test "$ac_cv_sys_file_offset_bits" != no; then | ||
5495 | |||
5496 | @@ -7983,7 +8052,7 @@ | ||
5497 | |||
5498 | fi | ||
5499 | rm -f conftest* | ||
5500 | - echo "$as_me:7986: checking for _LARGE_FILES value needed for large files" >&5 | ||
5501 | + echo "$as_me:8055: checking for _LARGE_FILES value needed for large files" >&5 | ||
5502 | echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 | ||
5503 | if test "${ac_cv_sys_large_files+set}" = set; then | ||
5504 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5505 | @@ -7991,7 +8060,7 @@ | ||
5506 | while :; do | ||
5507 | ac_cv_sys_large_files=no | ||
5508 | cat >conftest.$ac_ext <<_ACEOF | ||
5509 | -#line 7994 "configure" | ||
5510 | +#line 8063 "configure" | ||
5511 | #include "confdefs.h" | ||
5512 | #include <sys/types.h> | ||
5513 | /* Check that off_t can represent 2**63 - 1 correctly. | ||
5514 | @@ -8011,16 +8080,16 @@ | ||
5515 | } | ||
5516 | _ACEOF | ||
5517 | rm -f conftest.$ac_objext | ||
5518 | -if { (eval echo "$as_me:8014: \"$ac_compile\"") >&5 | ||
5519 | +if { (eval echo "$as_me:8083: \"$ac_compile\"") >&5 | ||
5520 | (eval $ac_compile) 2>&5 | ||
5521 | ac_status=$? | ||
5522 | - echo "$as_me:8017: \$? = $ac_status" >&5 | ||
5523 | + echo "$as_me:8086: \$? = $ac_status" >&5 | ||
5524 | (exit $ac_status); } && | ||
5525 | { ac_try='test -s conftest.$ac_objext' | ||
5526 | - { (eval echo "$as_me:8020: \"$ac_try\"") >&5 | ||
5527 | + { (eval echo "$as_me:8089: \"$ac_try\"") >&5 | ||
5528 | (eval $ac_try) 2>&5 | ||
5529 | ac_status=$? | ||
5530 | - echo "$as_me:8023: \$? = $ac_status" >&5 | ||
5531 | + echo "$as_me:8092: \$? = $ac_status" >&5 | ||
5532 | (exit $ac_status); }; }; then | ||
5533 | break | ||
5534 | else | ||
5535 | @@ -8029,7 +8098,7 @@ | ||
5536 | fi | ||
5537 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
5538 | cat >conftest.$ac_ext <<_ACEOF | ||
5539 | -#line 8032 "configure" | ||
5540 | +#line 8101 "configure" | ||
5541 | #include "confdefs.h" | ||
5542 | #define _LARGE_FILES 1 | ||
5543 | #include <sys/types.h> | ||
5544 | @@ -8050,16 +8119,16 @@ | ||
5545 | } | ||
5546 | _ACEOF | ||
5547 | rm -f conftest.$ac_objext | ||
5548 | -if { (eval echo "$as_me:8053: \"$ac_compile\"") >&5 | ||
5549 | +if { (eval echo "$as_me:8122: \"$ac_compile\"") >&5 | ||
5550 | (eval $ac_compile) 2>&5 | ||
5551 | ac_status=$? | ||
5552 | - echo "$as_me:8056: \$? = $ac_status" >&5 | ||
5553 | + echo "$as_me:8125: \$? = $ac_status" >&5 | ||
5554 | (exit $ac_status); } && | ||
5555 | { ac_try='test -s conftest.$ac_objext' | ||
5556 | - { (eval echo "$as_me:8059: \"$ac_try\"") >&5 | ||
5557 | + { (eval echo "$as_me:8128: \"$ac_try\"") >&5 | ||
5558 | (eval $ac_try) 2>&5 | ||
5559 | ac_status=$? | ||
5560 | - echo "$as_me:8062: \$? = $ac_status" >&5 | ||
5561 | + echo "$as_me:8131: \$? = $ac_status" >&5 | ||
5562 | (exit $ac_status); }; }; then | ||
5563 | ac_cv_sys_large_files=1; break | ||
5564 | else | ||
5565 | @@ -8070,7 +8139,7 @@ | ||
5566 | break | ||
5567 | done | ||
5568 | fi | ||
5569 | -echo "$as_me:8073: result: $ac_cv_sys_large_files" >&5 | ||
5570 | +echo "$as_me:8142: result: $ac_cv_sys_large_files" >&5 | ||
5571 | echo "${ECHO_T}$ac_cv_sys_large_files" >&6 | ||
5572 | if test "$ac_cv_sys_large_files" != no; then | ||
5573 | |||
5574 | @@ -8083,7 +8152,7 @@ | ||
5575 | fi | ||
5576 | |||
5577 | if test "$enable_largefile" != no ; then | ||
5578 | - echo "$as_me:8086: checking for _LARGEFILE_SOURCE value needed for large files" >&5 | ||
5579 | + echo "$as_me:8155: checking for _LARGEFILE_SOURCE value needed for large files" >&5 | ||
5580 | echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 | ||
5581 | if test "${ac_cv_sys_largefile_source+set}" = set; then | ||
5582 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5583 | @@ -8091,7 +8160,7 @@ | ||
5584 | while :; do | ||
5585 | ac_cv_sys_largefile_source=no | ||
5586 | cat >conftest.$ac_ext <<_ACEOF | ||
5587 | -#line 8094 "configure" | ||
5588 | +#line 8163 "configure" | ||
5589 | #include "confdefs.h" | ||
5590 | #include <stdio.h> | ||
5591 | int | ||
5592 | @@ -8103,16 +8172,16 @@ | ||
5593 | } | ||
5594 | _ACEOF | ||
5595 | rm -f conftest.$ac_objext | ||
5596 | -if { (eval echo "$as_me:8106: \"$ac_compile\"") >&5 | ||
5597 | +if { (eval echo "$as_me:8175: \"$ac_compile\"") >&5 | ||
5598 | (eval $ac_compile) 2>&5 | ||
5599 | ac_status=$? | ||
5600 | - echo "$as_me:8109: \$? = $ac_status" >&5 | ||
5601 | + echo "$as_me:8178: \$? = $ac_status" >&5 | ||
5602 | (exit $ac_status); } && | ||
5603 | { ac_try='test -s conftest.$ac_objext' | ||
5604 | - { (eval echo "$as_me:8112: \"$ac_try\"") >&5 | ||
5605 | + { (eval echo "$as_me:8181: \"$ac_try\"") >&5 | ||
5606 | (eval $ac_try) 2>&5 | ||
5607 | ac_status=$? | ||
5608 | - echo "$as_me:8115: \$? = $ac_status" >&5 | ||
5609 | + echo "$as_me:8184: \$? = $ac_status" >&5 | ||
5610 | (exit $ac_status); }; }; then | ||
5611 | break | ||
5612 | else | ||
5613 | @@ -8121,7 +8190,7 @@ | ||
5614 | fi | ||
5615 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
5616 | cat >conftest.$ac_ext <<_ACEOF | ||
5617 | -#line 8124 "configure" | ||
5618 | +#line 8193 "configure" | ||
5619 | #include "confdefs.h" | ||
5620 | #define _LARGEFILE_SOURCE 1 | ||
5621 | #include <stdio.h> | ||
5622 | @@ -8134,16 +8203,16 @@ | ||
5623 | } | ||
5624 | _ACEOF | ||
5625 | rm -f conftest.$ac_objext | ||
5626 | -if { (eval echo "$as_me:8137: \"$ac_compile\"") >&5 | ||
5627 | +if { (eval echo "$as_me:8206: \"$ac_compile\"") >&5 | ||
5628 | (eval $ac_compile) 2>&5 | ||
5629 | ac_status=$? | ||
5630 | - echo "$as_me:8140: \$? = $ac_status" >&5 | ||
5631 | + echo "$as_me:8209: \$? = $ac_status" >&5 | ||
5632 | (exit $ac_status); } && | ||
5633 | { ac_try='test -s conftest.$ac_objext' | ||
5634 | - { (eval echo "$as_me:8143: \"$ac_try\"") >&5 | ||
5635 | + { (eval echo "$as_me:8212: \"$ac_try\"") >&5 | ||
5636 | (eval $ac_try) 2>&5 | ||
5637 | ac_status=$? | ||
5638 | - echo "$as_me:8146: \$? = $ac_status" >&5 | ||
5639 | + echo "$as_me:8215: \$? = $ac_status" >&5 | ||
5640 | (exit $ac_status); }; }; then | ||
5641 | ac_cv_sys_largefile_source=1; break | ||
5642 | else | ||
5643 | @@ -8154,7 +8223,7 @@ | ||
5644 | break | ||
5645 | done | ||
5646 | fi | ||
5647 | -echo "$as_me:8157: result: $ac_cv_sys_largefile_source" >&5 | ||
5648 | +echo "$as_me:8226: result: $ac_cv_sys_largefile_source" >&5 | ||
5649 | echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 | ||
5650 | if test "$ac_cv_sys_largefile_source" != no; then | ||
5651 | |||
5652 | @@ -8168,13 +8237,13 @@ | ||
5653 | # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug | ||
5654 | # in glibc 2.1.3, but that breaks too many other things. | ||
5655 | # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. | ||
5656 | -echo "$as_me:8171: checking for fseeko" >&5 | ||
5657 | +echo "$as_me:8240: checking for fseeko" >&5 | ||
5658 | echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 | ||
5659 | if test "${ac_cv_func_fseeko+set}" = set; then | ||
5660 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5661 | else | ||
5662 | cat >conftest.$ac_ext <<_ACEOF | ||
5663 | -#line 8177 "configure" | ||
5664 | +#line 8246 "configure" | ||
5665 | #include "confdefs.h" | ||
5666 | #include <stdio.h> | ||
5667 | int | ||
5668 | @@ -8186,16 +8255,16 @@ | ||
5669 | } | ||
5670 | _ACEOF | ||
5671 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
5672 | -if { (eval echo "$as_me:8189: \"$ac_link\"") >&5 | ||
5673 | +if { (eval echo "$as_me:8258: \"$ac_link\"") >&5 | ||
5674 | (eval $ac_link) 2>&5 | ||
5675 | ac_status=$? | ||
5676 | - echo "$as_me:8192: \$? = $ac_status" >&5 | ||
5677 | + echo "$as_me:8261: \$? = $ac_status" >&5 | ||
5678 | (exit $ac_status); } && | ||
5679 | { ac_try='test -s conftest$ac_exeext' | ||
5680 | - { (eval echo "$as_me:8195: \"$ac_try\"") >&5 | ||
5681 | + { (eval echo "$as_me:8264: \"$ac_try\"") >&5 | ||
5682 | (eval $ac_try) 2>&5 | ||
5683 | ac_status=$? | ||
5684 | - echo "$as_me:8198: \$? = $ac_status" >&5 | ||
5685 | + echo "$as_me:8267: \$? = $ac_status" >&5 | ||
5686 | (exit $ac_status); }; }; then | ||
5687 | ac_cv_func_fseeko=yes | ||
5688 | else | ||
5689 | @@ -8205,7 +8274,7 @@ | ||
5690 | fi | ||
5691 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
5692 | fi | ||
5693 | -echo "$as_me:8208: result: $ac_cv_func_fseeko" >&5 | ||
5694 | +echo "$as_me:8277: result: $ac_cv_func_fseeko" >&5 | ||
5695 | echo "${ECHO_T}$ac_cv_func_fseeko" >&6 | ||
5696 | if test $ac_cv_func_fseeko = yes; then | ||
5697 | |||
5698 | @@ -8226,14 +8295,14 @@ | ||
5699 | test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE " | ||
5700 | test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits " | ||
5701 | |||
5702 | - echo "$as_me:8229: checking whether to use struct dirent64" >&5 | ||
5703 | + echo "$as_me:8298: checking whether to use struct dirent64" >&5 | ||
5704 | echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 | ||
5705 | if test "${cf_cv_struct_dirent64+set}" = set; then | ||
5706 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
5707 | else | ||
5708 | |||
5709 | cat >conftest.$ac_ext <<_ACEOF | ||
5710 | -#line 8236 "configure" | ||
5711 | +#line 8305 "configure" | ||
5712 | #include "confdefs.h" | ||
5713 | |||
5714 | #include <sys/types.h> | ||
5715 | @@ -8254,16 +8323,16 @@ | ||
5716 | } | ||
5717 | _ACEOF | ||
5718 | rm -f conftest.$ac_objext | ||
5719 | -if { (eval echo "$as_me:8257: \"$ac_compile\"") >&5 | ||
5720 | +if { (eval echo "$as_me:8326: \"$ac_compile\"") >&5 | ||
5721 | (eval $ac_compile) 2>&5 | ||
5722 | ac_status=$? | ||
5723 | - echo "$as_me:8260: \$? = $ac_status" >&5 | ||
5724 | + echo "$as_me:8329: \$? = $ac_status" >&5 | ||
5725 | (exit $ac_status); } && | ||
5726 | { ac_try='test -s conftest.$ac_objext' | ||
5727 | - { (eval echo "$as_me:8263: \"$ac_try\"") >&5 | ||
5728 | + { (eval echo "$as_me:8332: \"$ac_try\"") >&5 | ||
5729 | (eval $ac_try) 2>&5 | ||
5730 | ac_status=$? | ||
5731 | - echo "$as_me:8266: \$? = $ac_status" >&5 | ||
5732 | + echo "$as_me:8335: \$? = $ac_status" >&5 | ||
5733 | (exit $ac_status); }; }; then | ||
5734 | cf_cv_struct_dirent64=yes | ||
5735 | else | ||
5736 | @@ -8274,7 +8343,7 @@ | ||
5737 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
5738 | |||
5739 | fi | ||
5740 | -echo "$as_me:8277: result: $cf_cv_struct_dirent64" >&5 | ||
5741 | +echo "$as_me:8346: result: $cf_cv_struct_dirent64" >&5 | ||
5742 | echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 | ||
5743 | test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF | ||
5744 | #define HAVE_STRUCT_DIRENT64 1 | ||
5745 | @@ -8283,7 +8352,7 @@ | ||
5746 | fi | ||
5747 | |||
5748 | ### use option --disable-tparm-varargs to make tparm() conform to X/Open | ||
5749 | -echo "$as_me:8286: checking if you want tparm not to use X/Open fixed-parameter list" >&5 | ||
5750 | +echo "$as_me:8355: checking if you want tparm not to use X/Open fixed-parameter list" >&5 | ||
5751 | echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6 | ||
5752 | |||
5753 | # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given. | ||
5754 | @@ -8293,14 +8362,14 @@ | ||
5755 | else | ||
5756 | with_tparm_varargs=yes | ||
5757 | fi; | ||
5758 | -echo "$as_me:8296: result: $with_tparm_varargs" >&5 | ||
5759 | +echo "$as_me:8365: result: $with_tparm_varargs" >&5 | ||
5760 | echo "${ECHO_T}$with_tparm_varargs" >&6 | ||
5761 | NCURSES_TPARM_VARARGS=0 | ||
5762 | test "$with_tparm_varargs" = yes && NCURSES_TPARM_VARARGS=1 | ||
5763 | |||
5764 | ### use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw | ||
5765 | if test "$with_ticlib" != no ; then | ||
5766 | -echo "$as_me:8303: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 | ||
5767 | +echo "$as_me:8372: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 | ||
5768 | echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6 | ||
5769 | |||
5770 | # Check whether --enable-tic-depends or --disable-tic-depends was given. | ||
5771 | @@ -8310,14 +8379,14 @@ | ||
5772 | else | ||
5773 | with_tic_depends=yes | ||
5774 | fi; | ||
5775 | -echo "$as_me:8313: result: $with_tic_depends" >&5 | ||
5776 | +echo "$as_me:8382: result: $with_tic_depends" >&5 | ||
5777 | echo "${ECHO_T}$with_tic_depends" >&6 | ||
5778 | else | ||
5779 | with_tic_depends=no | ||
5780 | fi | ||
5781 | |||
5782 | ### use option --with-bool to override bool's type | ||
5783 | -echo "$as_me:8320: checking for type of bool" >&5 | ||
5784 | +echo "$as_me:8389: checking for type of bool" >&5 | ||
5785 | echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 | ||
5786 | |||
5787 | # Check whether --with-bool or --without-bool was given. | ||
5788 | @@ -8327,10 +8396,10 @@ | ||
5789 | else | ||
5790 | NCURSES_BOOL=auto | ||
5791 | fi; | ||
5792 | -echo "$as_me:8330: result: $NCURSES_BOOL" >&5 | ||
5793 | +echo "$as_me:8399: result: $NCURSES_BOOL" >&5 | ||
5794 | echo "${ECHO_T}$NCURSES_BOOL" >&6 | ||
5795 | |||
5796 | -echo "$as_me:8333: checking for alternate terminal capabilities file" >&5 | ||
5797 | +echo "$as_me:8402: checking for alternate terminal capabilities file" >&5 | ||
5798 | echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6 | ||
5799 | |||
5800 | # Check whether --with-caps or --without-caps was given. | ||
5801 | @@ -8341,11 +8410,11 @@ | ||
5802 | TERMINFO_CAPS=Caps | ||
5803 | fi; | ||
5804 | test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps | ||
5805 | -echo "$as_me:8344: result: $TERMINFO_CAPS" >&5 | ||
5806 | +echo "$as_me:8413: result: $TERMINFO_CAPS" >&5 | ||
5807 | echo "${ECHO_T}$TERMINFO_CAPS" >&6 | ||
5808 | |||
5809 | ### use option --with-chtype to override chtype's type | ||
5810 | -echo "$as_me:8348: checking for type of chtype" >&5 | ||
5811 | +echo "$as_me:8417: checking for type of chtype" >&5 | ||
5812 | echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 | ||
5813 | |||
5814 | # Check whether --with-chtype or --without-chtype was given. | ||
5815 | @@ -8355,11 +8424,11 @@ | ||
5816 | else | ||
5817 | NCURSES_CHTYPE=auto | ||
5818 | fi; | ||
5819 | -echo "$as_me:8358: result: $NCURSES_CHTYPE" >&5 | ||
5820 | +echo "$as_me:8427: result: $NCURSES_CHTYPE" >&5 | ||
5821 | echo "${ECHO_T}$NCURSES_CHTYPE" >&6 | ||
5822 | |||
5823 | ### use option --with-ospeed to override ospeed's type | ||
5824 | -echo "$as_me:8362: checking for type of ospeed" >&5 | ||
5825 | +echo "$as_me:8431: checking for type of ospeed" >&5 | ||
5826 | echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6 | ||
5827 | |||
5828 | # Check whether --with-ospeed or --without-ospeed was given. | ||
5829 | @@ -8369,11 +8438,11 @@ | ||
5830 | else | ||
5831 | NCURSES_OSPEED=short | ||
5832 | fi; | ||
5833 | -echo "$as_me:8372: result: $NCURSES_OSPEED" >&5 | ||
5834 | +echo "$as_me:8441: result: $NCURSES_OSPEED" >&5 | ||
5835 | echo "${ECHO_T}$NCURSES_OSPEED" >&6 | ||
5836 | |||
5837 | ### use option --with-mmask-t to override mmask_t's type | ||
5838 | -echo "$as_me:8376: checking for type of mmask_t" >&5 | ||
5839 | +echo "$as_me:8445: checking for type of mmask_t" >&5 | ||
5840 | echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6 | ||
5841 | |||
5842 | # Check whether --with-mmask-t or --without-mmask-t was given. | ||
5843 | @@ -8383,11 +8452,11 @@ | ||
5844 | else | ||
5845 | NCURSES_MMASK_T=auto | ||
5846 | fi; | ||
5847 | -echo "$as_me:8386: result: $NCURSES_MMASK_T" >&5 | ||
5848 | +echo "$as_me:8455: result: $NCURSES_MMASK_T" >&5 | ||
5849 | echo "${ECHO_T}$NCURSES_MMASK_T" >&6 | ||
5850 | |||
5851 | ### Enable compiling-in rcs id's | ||
5852 | -echo "$as_me:8390: checking if RCS identifiers should be compiled-in" >&5 | ||
5853 | +echo "$as_me:8459: checking if RCS identifiers should be compiled-in" >&5 | ||
5854 | echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 | ||
5855 | |||
5856 | # Check whether --with-rcs-ids or --without-rcs-ids was given. | ||
5857 | @@ -8397,7 +8466,7 @@ | ||
5858 | else | ||
5859 | with_rcs_ids=no | ||
5860 | fi; | ||
5861 | -echo "$as_me:8400: result: $with_rcs_ids" >&5 | ||
5862 | +echo "$as_me:8469: result: $with_rcs_ids" >&5 | ||
5863 | echo "${ECHO_T}$with_rcs_ids" >&6 | ||
5864 | test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF | ||
5865 | #define USE_RCS_IDS 1 | ||
5866 | @@ -8405,7 +8474,7 @@ | ||
5867 | |||
5868 | ############################################################################### | ||
5869 | |||
5870 | -echo "$as_me:8408: checking format of man-pages" >&5 | ||
5871 | +echo "$as_me:8477: checking format of man-pages" >&5 | ||
5872 | echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 | ||
5873 | |||
5874 | # Check whether --with-manpage-format or --without-manpage-format was given. | ||
5875 | @@ -8494,14 +8563,14 @@ | ||
5876 | ;; | ||
5877 | esac | ||
5878 | |||
5879 | -echo "$as_me:8497: result: $MANPAGE_FORMAT" >&5 | ||
5880 | +echo "$as_me:8566: result: $MANPAGE_FORMAT" >&5 | ||
5881 | echo "${ECHO_T}$MANPAGE_FORMAT" >&6 | ||
5882 | if test -n "$cf_unknown" ; then | ||
5883 | - { echo "$as_me:8500: WARNING: Unexpected manpage-format $cf_unknown" >&5 | ||
5884 | + { echo "$as_me:8569: WARNING: Unexpected manpage-format $cf_unknown" >&5 | ||
5885 | echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} | ||
5886 | fi | ||
5887 | |||
5888 | -echo "$as_me:8504: checking for manpage renaming" >&5 | ||
5889 | +echo "$as_me:8573: checking for manpage renaming" >&5 | ||
5890 | echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 | ||
5891 | |||
5892 | # Check whether --with-manpage-renames or --without-manpage-renames was given. | ||
5893 | @@ -8529,7 +8598,7 @@ | ||
5894 | if test -f $srcdir/man/$MANPAGE_RENAMES ; then | ||
5895 | MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES | ||
5896 | elif test ! -f $MANPAGE_RENAMES ; then | ||
5897 | - { { echo "$as_me:8532: error: not a filename: $MANPAGE_RENAMES" >&5 | ||
5898 | + { { echo "$as_me:8601: error: not a filename: $MANPAGE_RENAMES" >&5 | ||
5899 | echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} | ||
5900 | { (exit 1); exit 1; }; } | ||
5901 | fi | ||
5902 | @@ -8543,10 +8612,10 @@ | ||
5903 | fi | ||
5904 | fi | ||
5905 | |||
5906 | -echo "$as_me:8546: result: $MANPAGE_RENAMES" >&5 | ||
5907 | +echo "$as_me:8615: result: $MANPAGE_RENAMES" >&5 | ||
5908 | echo "${ECHO_T}$MANPAGE_RENAMES" >&6 | ||
5909 | |||
5910 | -echo "$as_me:8549: checking if manpage aliases will be installed" >&5 | ||
5911 | +echo "$as_me:8618: checking if manpage aliases will be installed" >&5 | ||
5912 | echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 | ||
5913 | |||
5914 | # Check whether --with-manpage-aliases or --without-manpage-aliases was given. | ||
5915 | @@ -8557,7 +8626,7 @@ | ||
5916 | MANPAGE_ALIASES=yes | ||
5917 | fi; | ||
5918 | |||
5919 | -echo "$as_me:8560: result: $MANPAGE_ALIASES" >&5 | ||
5920 | +echo "$as_me:8629: result: $MANPAGE_ALIASES" >&5 | ||
5921 | echo "${ECHO_T}$MANPAGE_ALIASES" >&6 | ||
5922 | |||
5923 | if test "$LN_S" = "ln -s"; then | ||
5924 | @@ -8568,7 +8637,7 @@ | ||
5925 | |||
5926 | MANPAGE_SYMLINKS=no | ||
5927 | if test "$MANPAGE_ALIASES" = yes ; then | ||
5928 | -echo "$as_me:8571: checking if manpage symlinks should be used" >&5 | ||
5929 | +echo "$as_me:8640: checking if manpage symlinks should be used" >&5 | ||
5930 | echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6 | ||
5931 | |||
5932 | # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given. | ||
5933 | @@ -8581,17 +8650,17 @@ | ||
5934 | |||
5935 | if test "$$cf_use_symlinks" = no; then | ||
5936 | if test "$MANPAGE_SYMLINKS" = yes ; then | ||
5937 | - { echo "$as_me:8584: WARNING: cannot make symlinks" >&5 | ||
5938 | + { echo "$as_me:8653: WARNING: cannot make symlinks" >&5 | ||
5939 | echo "$as_me: WARNING: cannot make symlinks" >&2;} | ||
5940 | MANPAGE_SYMLINKS=no | ||
5941 | fi | ||
5942 | fi | ||
5943 | |||
5944 | -echo "$as_me:8590: result: $MANPAGE_SYMLINKS" >&5 | ||
5945 | +echo "$as_me:8659: result: $MANPAGE_SYMLINKS" >&5 | ||
5946 | echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 | ||
5947 | fi | ||
5948 | |||
5949 | -echo "$as_me:8594: checking for manpage tbl" >&5 | ||
5950 | +echo "$as_me:8663: checking for manpage tbl" >&5 | ||
5951 | echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6 | ||
5952 | |||
5953 | # Check whether --with-manpage-tbl or --without-manpage-tbl was given. | ||
5954 | @@ -8602,7 +8671,7 @@ | ||
5955 | MANPAGE_TBL=no | ||
5956 | fi; | ||
5957 | |||
5958 | -echo "$as_me:8605: result: $MANPAGE_TBL" >&5 | ||
5959 | +echo "$as_me:8674: result: $MANPAGE_TBL" >&5 | ||
5960 | echo "${ECHO_T}$MANPAGE_TBL" >&6 | ||
5961 | |||
5962 | if test "$prefix" = "NONE" ; then | ||
5963 | @@ -8718,7 +8787,7 @@ | ||
5964 | s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g | ||
5965 | CF_EOF | ||
5966 | |||
5967 | - for cf_name in captoinfo clear infocmp infotocap tic toe tput | ||
5968 | + for cf_name in captoinfo clear infocmp infotocap tabs tic toe tput tset | ||
5969 | do | ||
5970 | cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` | ||
5971 | cf_name=`echo $cf_name|sed "$program_transform_name"` | ||
5972 | @@ -8913,7 +8982,7 @@ | ||
5973 | ############################################################################### | ||
5974 | |||
5975 | ### Note that some functions (such as const) are normally disabled anyway. | ||
5976 | -echo "$as_me:8916: checking if you want to build with function extensions" >&5 | ||
5977 | +echo "$as_me:8985: checking if you want to build with function extensions" >&5 | ||
5978 | echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 | ||
5979 | |||
5980 | # Check whether --enable-ext-funcs or --disable-ext-funcs was given. | ||
5981 | @@ -8923,7 +8992,7 @@ | ||
5982 | else | ||
5983 | with_ext_funcs=yes | ||
5984 | fi; | ||
5985 | -echo "$as_me:8926: result: $with_ext_funcs" >&5 | ||
5986 | +echo "$as_me:8995: result: $with_ext_funcs" >&5 | ||
5987 | echo "${ECHO_T}$with_ext_funcs" >&6 | ||
5988 | if test "$with_ext_funcs" = yes ; then | ||
5989 | NCURSES_EXT_FUNCS=1 | ||
5990 | @@ -8960,7 +9029,7 @@ | ||
5991 | fi | ||
5992 | |||
5993 | ### use option --enable-const to turn on use of const beyond that in XSI. | ||
5994 | -echo "$as_me:8963: checking for extended use of const keyword" >&5 | ||
5995 | +echo "$as_me:9032: checking for extended use of const keyword" >&5 | ||
5996 | echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 | ||
5997 | |||
5998 | # Check whether --enable-const or --disable-const was given. | ||
5999 | @@ -8970,7 +9039,7 @@ | ||
6000 | else | ||
6001 | with_ext_const=no | ||
6002 | fi; | ||
6003 | -echo "$as_me:8973: result: $with_ext_const" >&5 | ||
6004 | +echo "$as_me:9042: result: $with_ext_const" >&5 | ||
6005 | echo "${ECHO_T}$with_ext_const" >&6 | ||
6006 | NCURSES_CONST='/*nothing*/' | ||
6007 | if test "$with_ext_const" = yes ; then | ||
6008 | @@ -8978,7 +9047,7 @@ | ||
6009 | fi | ||
6010 | |||
6011 | ### use option --enable-ext-colors to turn on use of colors beyond 16. | ||
6012 | -echo "$as_me:8981: checking if you want to use extended colors" >&5 | ||
6013 | +echo "$as_me:9050: checking if you want to use extended colors" >&5 | ||
6014 | echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 | ||
6015 | |||
6016 | # Check whether --enable-ext-colors or --disable-ext-colors was given. | ||
6017 | @@ -8988,12 +9057,12 @@ | ||
6018 | else | ||
6019 | with_ext_colors=no | ||
6020 | fi; | ||
6021 | -echo "$as_me:8991: result: $with_ext_colors" >&5 | ||
6022 | +echo "$as_me:9060: result: $with_ext_colors" >&5 | ||
6023 | echo "${ECHO_T}$with_ext_colors" >&6 | ||
6024 | NCURSES_EXT_COLORS=0 | ||
6025 | if test "$with_ext_colors" = yes ; then | ||
6026 | if test "$with_widec" != yes ; then | ||
6027 | - { { echo "$as_me:8996: error: This option applies only to wide-character library" >&5 | ||
6028 | + { { echo "$as_me:9065: error: This option applies only to wide-character library" >&5 | ||
6029 | echo "$as_me: error: This option applies only to wide-character library" >&2;} | ||
6030 | { (exit 1); exit 1; }; } | ||
6031 | else | ||
6032 | @@ -9004,7 +9073,7 @@ | ||
6033 | 5.*) | ||
6034 | cf_cv_rel_version=6.0 | ||
6035 | cf_cv_abi_version=6 | ||
6036 | - { echo "$as_me:9007: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 | ||
6037 | + { echo "$as_me:9076: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 | ||
6038 | echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} | ||
6039 | ;; | ||
6040 | esac | ||
6041 | @@ -9019,7 +9088,7 @@ | ||
6042 | fi | ||
6043 | |||
6044 | ### use option --enable-ext-mouse to modify coding to support 5-button mice | ||
6045 | -echo "$as_me:9022: checking if you want to use extended mouse encoding" >&5 | ||
6046 | +echo "$as_me:9091: checking if you want to use extended mouse encoding" >&5 | ||
6047 | echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 | ||
6048 | |||
6049 | # Check whether --enable-ext-mouse or --disable-ext-mouse was given. | ||
6050 | @@ -9029,7 +9098,7 @@ | ||
6051 | else | ||
6052 | with_ext_mouse=no | ||
6053 | fi; | ||
6054 | -echo "$as_me:9032: result: $with_ext_mouse" >&5 | ||
6055 | +echo "$as_me:9101: result: $with_ext_mouse" >&5 | ||
6056 | echo "${ECHO_T}$with_ext_mouse" >&6 | ||
6057 | NCURSES_MOUSE_VERSION=1 | ||
6058 | if test "$with_ext_mouse" = yes ; then | ||
6059 | @@ -9040,7 +9109,7 @@ | ||
6060 | 5.*) | ||
6061 | cf_cv_rel_version=6.0 | ||
6062 | cf_cv_abi_version=6 | ||
6063 | - { echo "$as_me:9043: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 | ||
6064 | + { echo "$as_me:9112: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 | ||
6065 | echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} | ||
6066 | ;; | ||
6067 | esac | ||
6068 | @@ -9048,7 +9117,7 @@ | ||
6069 | |||
6070 | fi | ||
6071 | |||
6072 | -echo "$as_me:9051: checking if you want \$NCURSES_NO_PADDING code" >&5 | ||
6073 | +echo "$as_me:9120: checking if you want \$NCURSES_NO_PADDING code" >&5 | ||
6074 | echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 | ||
6075 | |||
6076 | # Check whether --enable-no-padding or --disable-no-padding was given. | ||
6077 | @@ -9058,19 +9127,19 @@ | ||
6078 | else | ||
6079 | with_no_padding=$with_ext_funcs | ||
6080 | fi; | ||
6081 | -echo "$as_me:9061: result: $with_no_padding" >&5 | ||
6082 | +echo "$as_me:9130: result: $with_no_padding" >&5 | ||
6083 | echo "${ECHO_T}$with_no_padding" >&6 | ||
6084 | test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF | ||
6085 | #define NCURSES_NO_PADDING 1 | ||
6086 | EOF | ||
6087 | |||
6088 | -echo "$as_me:9067: checking for ANSI C header files" >&5 | ||
6089 | +echo "$as_me:9136: checking for ANSI C header files" >&5 | ||
6090 | echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 | ||
6091 | if test "${ac_cv_header_stdc+set}" = set; then | ||
6092 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6093 | else | ||
6094 | cat >conftest.$ac_ext <<_ACEOF | ||
6095 | -#line 9073 "configure" | ||
6096 | +#line 9142 "configure" | ||
6097 | #include "confdefs.h" | ||
6098 | #include <stdlib.h> | ||
6099 | #include <stdarg.h> | ||
6100 | @@ -9078,13 +9147,13 @@ | ||
6101 | #include <float.h> | ||
6102 | |||
6103 | _ACEOF | ||
6104 | -if { (eval echo "$as_me:9081: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
6105 | +if { (eval echo "$as_me:9150: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
6106 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
6107 | ac_status=$? | ||
6108 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
6109 | rm -f conftest.er1 | ||
6110 | cat conftest.err >&5 | ||
6111 | - echo "$as_me:9087: \$? = $ac_status" >&5 | ||
6112 | + echo "$as_me:9156: \$? = $ac_status" >&5 | ||
6113 | (exit $ac_status); } >/dev/null; then | ||
6114 | if test -s conftest.err; then | ||
6115 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
6116 | @@ -9106,7 +9175,7 @@ | ||
6117 | if test $ac_cv_header_stdc = yes; then | ||
6118 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | ||
6119 | cat >conftest.$ac_ext <<_ACEOF | ||
6120 | -#line 9109 "configure" | ||
6121 | +#line 9178 "configure" | ||
6122 | #include "confdefs.h" | ||
6123 | #include <string.h> | ||
6124 | |||
6125 | @@ -9124,7 +9193,7 @@ | ||
6126 | if test $ac_cv_header_stdc = yes; then | ||
6127 | # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | ||
6128 | cat >conftest.$ac_ext <<_ACEOF | ||
6129 | -#line 9127 "configure" | ||
6130 | +#line 9196 "configure" | ||
6131 | #include "confdefs.h" | ||
6132 | #include <stdlib.h> | ||
6133 | |||
6134 | @@ -9145,7 +9214,7 @@ | ||
6135 | : | ||
6136 | else | ||
6137 | cat >conftest.$ac_ext <<_ACEOF | ||
6138 | -#line 9148 "configure" | ||
6139 | +#line 9217 "configure" | ||
6140 | #include "confdefs.h" | ||
6141 | #include <ctype.h> | ||
6142 | #if ((' ' & 0x0FF) == 0x020) | ||
6143 | @@ -9171,15 +9240,15 @@ | ||
6144 | } | ||
6145 | _ACEOF | ||
6146 | rm -f conftest$ac_exeext | ||
6147 | -if { (eval echo "$as_me:9174: \"$ac_link\"") >&5 | ||
6148 | +if { (eval echo "$as_me:9243: \"$ac_link\"") >&5 | ||
6149 | (eval $ac_link) 2>&5 | ||
6150 | ac_status=$? | ||
6151 | - echo "$as_me:9177: \$? = $ac_status" >&5 | ||
6152 | + echo "$as_me:9246: \$? = $ac_status" >&5 | ||
6153 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
6154 | - { (eval echo "$as_me:9179: \"$ac_try\"") >&5 | ||
6155 | + { (eval echo "$as_me:9248: \"$ac_try\"") >&5 | ||
6156 | (eval $ac_try) 2>&5 | ||
6157 | ac_status=$? | ||
6158 | - echo "$as_me:9182: \$? = $ac_status" >&5 | ||
6159 | + echo "$as_me:9251: \$? = $ac_status" >&5 | ||
6160 | (exit $ac_status); }; }; then | ||
6161 | : | ||
6162 | else | ||
6163 | @@ -9192,7 +9261,7 @@ | ||
6164 | fi | ||
6165 | fi | ||
6166 | fi | ||
6167 | -echo "$as_me:9195: result: $ac_cv_header_stdc" >&5 | ||
6168 | +echo "$as_me:9264: result: $ac_cv_header_stdc" >&5 | ||
6169 | echo "${ECHO_T}$ac_cv_header_stdc" >&6 | ||
6170 | if test $ac_cv_header_stdc = yes; then | ||
6171 | |||
6172 | @@ -9208,28 +9277,28 @@ | ||
6173 | inttypes.h stdint.h unistd.h | ||
6174 | do | ||
6175 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
6176 | -echo "$as_me:9211: checking for $ac_header" >&5 | ||
6177 | +echo "$as_me:9280: checking for $ac_header" >&5 | ||
6178 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
6179 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
6180 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6181 | else | ||
6182 | cat >conftest.$ac_ext <<_ACEOF | ||
6183 | -#line 9217 "configure" | ||
6184 | +#line 9286 "configure" | ||
6185 | #include "confdefs.h" | ||
6186 | $ac_includes_default | ||
6187 | #include <$ac_header> | ||
6188 | _ACEOF | ||
6189 | rm -f conftest.$ac_objext | ||
6190 | -if { (eval echo "$as_me:9223: \"$ac_compile\"") >&5 | ||
6191 | +if { (eval echo "$as_me:9292: \"$ac_compile\"") >&5 | ||
6192 | (eval $ac_compile) 2>&5 | ||
6193 | ac_status=$? | ||
6194 | - echo "$as_me:9226: \$? = $ac_status" >&5 | ||
6195 | + echo "$as_me:9295: \$? = $ac_status" >&5 | ||
6196 | (exit $ac_status); } && | ||
6197 | { ac_try='test -s conftest.$ac_objext' | ||
6198 | - { (eval echo "$as_me:9229: \"$ac_try\"") >&5 | ||
6199 | + { (eval echo "$as_me:9298: \"$ac_try\"") >&5 | ||
6200 | (eval $ac_try) 2>&5 | ||
6201 | ac_status=$? | ||
6202 | - echo "$as_me:9232: \$? = $ac_status" >&5 | ||
6203 | + echo "$as_me:9301: \$? = $ac_status" >&5 | ||
6204 | (exit $ac_status); }; }; then | ||
6205 | eval "$as_ac_Header=yes" | ||
6206 | else | ||
6207 | @@ -9239,7 +9308,7 @@ | ||
6208 | fi | ||
6209 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
6210 | fi | ||
6211 | -echo "$as_me:9242: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
6212 | +echo "$as_me:9311: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
6213 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
6214 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
6215 | cat >>confdefs.h <<EOF | ||
6216 | @@ -9249,13 +9318,13 @@ | ||
6217 | fi | ||
6218 | done | ||
6219 | |||
6220 | -echo "$as_me:9252: checking for signed char" >&5 | ||
6221 | +echo "$as_me:9321: checking for signed char" >&5 | ||
6222 | echo $ECHO_N "checking for signed char... $ECHO_C" >&6 | ||
6223 | if test "${ac_cv_type_signed_char+set}" = set; then | ||
6224 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6225 | else | ||
6226 | cat >conftest.$ac_ext <<_ACEOF | ||
6227 | -#line 9258 "configure" | ||
6228 | +#line 9327 "configure" | ||
6229 | #include "confdefs.h" | ||
6230 | $ac_includes_default | ||
6231 | int | ||
6232 | @@ -9270,16 +9339,16 @@ | ||
6233 | } | ||
6234 | _ACEOF | ||
6235 | rm -f conftest.$ac_objext | ||
6236 | -if { (eval echo "$as_me:9273: \"$ac_compile\"") >&5 | ||
6237 | +if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5 | ||
6238 | (eval $ac_compile) 2>&5 | ||
6239 | ac_status=$? | ||
6240 | - echo "$as_me:9276: \$? = $ac_status" >&5 | ||
6241 | + echo "$as_me:9345: \$? = $ac_status" >&5 | ||
6242 | (exit $ac_status); } && | ||
6243 | { ac_try='test -s conftest.$ac_objext' | ||
6244 | - { (eval echo "$as_me:9279: \"$ac_try\"") >&5 | ||
6245 | + { (eval echo "$as_me:9348: \"$ac_try\"") >&5 | ||
6246 | (eval $ac_try) 2>&5 | ||
6247 | ac_status=$? | ||
6248 | - echo "$as_me:9282: \$? = $ac_status" >&5 | ||
6249 | + echo "$as_me:9351: \$? = $ac_status" >&5 | ||
6250 | (exit $ac_status); }; }; then | ||
6251 | ac_cv_type_signed_char=yes | ||
6252 | else | ||
6253 | @@ -9289,10 +9358,10 @@ | ||
6254 | fi | ||
6255 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
6256 | fi | ||
6257 | -echo "$as_me:9292: result: $ac_cv_type_signed_char" >&5 | ||
6258 | +echo "$as_me:9361: result: $ac_cv_type_signed_char" >&5 | ||
6259 | echo "${ECHO_T}$ac_cv_type_signed_char" >&6 | ||
6260 | |||
6261 | -echo "$as_me:9295: checking size of signed char" >&5 | ||
6262 | +echo "$as_me:9364: checking size of signed char" >&5 | ||
6263 | echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 | ||
6264 | if test "${ac_cv_sizeof_signed_char+set}" = set; then | ||
6265 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6266 | @@ -9301,7 +9370,7 @@ | ||
6267 | if test "$cross_compiling" = yes; then | ||
6268 | # Depending upon the size, compute the lo and hi bounds. | ||
6269 | cat >conftest.$ac_ext <<_ACEOF | ||
6270 | -#line 9304 "configure" | ||
6271 | +#line 9373 "configure" | ||
6272 | #include "confdefs.h" | ||
6273 | $ac_includes_default | ||
6274 | int | ||
6275 | @@ -9313,21 +9382,21 @@ | ||
6276 | } | ||
6277 | _ACEOF | ||
6278 | rm -f conftest.$ac_objext | ||
6279 | -if { (eval echo "$as_me:9316: \"$ac_compile\"") >&5 | ||
6280 | +if { (eval echo "$as_me:9385: \"$ac_compile\"") >&5 | ||
6281 | (eval $ac_compile) 2>&5 | ||
6282 | ac_status=$? | ||
6283 | - echo "$as_me:9319: \$? = $ac_status" >&5 | ||
6284 | + echo "$as_me:9388: \$? = $ac_status" >&5 | ||
6285 | (exit $ac_status); } && | ||
6286 | { ac_try='test -s conftest.$ac_objext' | ||
6287 | - { (eval echo "$as_me:9322: \"$ac_try\"") >&5 | ||
6288 | + { (eval echo "$as_me:9391: \"$ac_try\"") >&5 | ||
6289 | (eval $ac_try) 2>&5 | ||
6290 | ac_status=$? | ||
6291 | - echo "$as_me:9325: \$? = $ac_status" >&5 | ||
6292 | + echo "$as_me:9394: \$? = $ac_status" >&5 | ||
6293 | (exit $ac_status); }; }; then | ||
6294 | ac_lo=0 ac_mid=0 | ||
6295 | while :; do | ||
6296 | cat >conftest.$ac_ext <<_ACEOF | ||
6297 | -#line 9330 "configure" | ||
6298 | +#line 9399 "configure" | ||
6299 | #include "confdefs.h" | ||
6300 | $ac_includes_default | ||
6301 | int | ||
6302 | @@ -9339,16 +9408,16 @@ | ||
6303 | } | ||
6304 | _ACEOF | ||
6305 | rm -f conftest.$ac_objext | ||
6306 | -if { (eval echo "$as_me:9342: \"$ac_compile\"") >&5 | ||
6307 | +if { (eval echo "$as_me:9411: \"$ac_compile\"") >&5 | ||
6308 | (eval $ac_compile) 2>&5 | ||
6309 | ac_status=$? | ||
6310 | - echo "$as_me:9345: \$? = $ac_status" >&5 | ||
6311 | + echo "$as_me:9414: \$? = $ac_status" >&5 | ||
6312 | (exit $ac_status); } && | ||
6313 | { ac_try='test -s conftest.$ac_objext' | ||
6314 | - { (eval echo "$as_me:9348: \"$ac_try\"") >&5 | ||
6315 | + { (eval echo "$as_me:9417: \"$ac_try\"") >&5 | ||
6316 | (eval $ac_try) 2>&5 | ||
6317 | ac_status=$? | ||
6318 | - echo "$as_me:9351: \$? = $ac_status" >&5 | ||
6319 | + echo "$as_me:9420: \$? = $ac_status" >&5 | ||
6320 | (exit $ac_status); }; }; then | ||
6321 | ac_hi=$ac_mid; break | ||
6322 | else | ||
6323 | @@ -9364,7 +9433,7 @@ | ||
6324 | ac_hi=-1 ac_mid=-1 | ||
6325 | while :; do | ||
6326 | cat >conftest.$ac_ext <<_ACEOF | ||
6327 | -#line 9367 "configure" | ||
6328 | +#line 9436 "configure" | ||
6329 | #include "confdefs.h" | ||
6330 | $ac_includes_default | ||
6331 | int | ||
6332 | @@ -9376,16 +9445,16 @@ | ||
6333 | } | ||
6334 | _ACEOF | ||
6335 | rm -f conftest.$ac_objext | ||
6336 | -if { (eval echo "$as_me:9379: \"$ac_compile\"") >&5 | ||
6337 | +if { (eval echo "$as_me:9448: \"$ac_compile\"") >&5 | ||
6338 | (eval $ac_compile) 2>&5 | ||
6339 | ac_status=$? | ||
6340 | - echo "$as_me:9382: \$? = $ac_status" >&5 | ||
6341 | + echo "$as_me:9451: \$? = $ac_status" >&5 | ||
6342 | (exit $ac_status); } && | ||
6343 | { ac_try='test -s conftest.$ac_objext' | ||
6344 | - { (eval echo "$as_me:9385: \"$ac_try\"") >&5 | ||
6345 | + { (eval echo "$as_me:9454: \"$ac_try\"") >&5 | ||
6346 | (eval $ac_try) 2>&5 | ||
6347 | ac_status=$? | ||
6348 | - echo "$as_me:9388: \$? = $ac_status" >&5 | ||
6349 | + echo "$as_me:9457: \$? = $ac_status" >&5 | ||
6350 | (exit $ac_status); }; }; then | ||
6351 | ac_lo=$ac_mid; break | ||
6352 | else | ||
6353 | @@ -9401,7 +9470,7 @@ | ||
6354 | while test "x$ac_lo" != "x$ac_hi"; do | ||
6355 | ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` | ||
6356 | cat >conftest.$ac_ext <<_ACEOF | ||
6357 | -#line 9404 "configure" | ||
6358 | +#line 9473 "configure" | ||
6359 | #include "confdefs.h" | ||
6360 | $ac_includes_default | ||
6361 | int | ||
6362 | @@ -9413,16 +9482,16 @@ | ||
6363 | } | ||
6364 | _ACEOF | ||
6365 | rm -f conftest.$ac_objext | ||
6366 | -if { (eval echo "$as_me:9416: \"$ac_compile\"") >&5 | ||
6367 | +if { (eval echo "$as_me:9485: \"$ac_compile\"") >&5 | ||
6368 | (eval $ac_compile) 2>&5 | ||
6369 | ac_status=$? | ||
6370 | - echo "$as_me:9419: \$? = $ac_status" >&5 | ||
6371 | + echo "$as_me:9488: \$? = $ac_status" >&5 | ||
6372 | (exit $ac_status); } && | ||
6373 | { ac_try='test -s conftest.$ac_objext' | ||
6374 | - { (eval echo "$as_me:9422: \"$ac_try\"") >&5 | ||
6375 | + { (eval echo "$as_me:9491: \"$ac_try\"") >&5 | ||
6376 | (eval $ac_try) 2>&5 | ||
6377 | ac_status=$? | ||
6378 | - echo "$as_me:9425: \$? = $ac_status" >&5 | ||
6379 | + echo "$as_me:9494: \$? = $ac_status" >&5 | ||
6380 | (exit $ac_status); }; }; then | ||
6381 | ac_hi=$ac_mid | ||
6382 | else | ||
6383 | @@ -9435,12 +9504,12 @@ | ||
6384 | ac_cv_sizeof_signed_char=$ac_lo | ||
6385 | else | ||
6386 | if test "$cross_compiling" = yes; then | ||
6387 | - { { echo "$as_me:9438: error: cannot run test program while cross compiling" >&5 | ||
6388 | + { { echo "$as_me:9507: error: cannot run test program while cross compiling" >&5 | ||
6389 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | ||
6390 | { (exit 1); exit 1; }; } | ||
6391 | else | ||
6392 | cat >conftest.$ac_ext <<_ACEOF | ||
6393 | -#line 9443 "configure" | ||
6394 | +#line 9512 "configure" | ||
6395 | #include "confdefs.h" | ||
6396 | $ac_includes_default | ||
6397 | int | ||
6398 | @@ -9456,15 +9525,15 @@ | ||
6399 | } | ||
6400 | _ACEOF | ||
6401 | rm -f conftest$ac_exeext | ||
6402 | -if { (eval echo "$as_me:9459: \"$ac_link\"") >&5 | ||
6403 | +if { (eval echo "$as_me:9528: \"$ac_link\"") >&5 | ||
6404 | (eval $ac_link) 2>&5 | ||
6405 | ac_status=$? | ||
6406 | - echo "$as_me:9462: \$? = $ac_status" >&5 | ||
6407 | + echo "$as_me:9531: \$? = $ac_status" >&5 | ||
6408 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
6409 | - { (eval echo "$as_me:9464: \"$ac_try\"") >&5 | ||
6410 | + { (eval echo "$as_me:9533: \"$ac_try\"") >&5 | ||
6411 | (eval $ac_try) 2>&5 | ||
6412 | ac_status=$? | ||
6413 | - echo "$as_me:9467: \$? = $ac_status" >&5 | ||
6414 | + echo "$as_me:9536: \$? = $ac_status" >&5 | ||
6415 | (exit $ac_status); }; }; then | ||
6416 | ac_cv_sizeof_signed_char=`cat conftest.val` | ||
6417 | else | ||
6418 | @@ -9480,7 +9549,7 @@ | ||
6419 | ac_cv_sizeof_signed_char=0 | ||
6420 | fi | ||
6421 | fi | ||
6422 | -echo "$as_me:9483: result: $ac_cv_sizeof_signed_char" >&5 | ||
6423 | +echo "$as_me:9552: result: $ac_cv_sizeof_signed_char" >&5 | ||
6424 | echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 | ||
6425 | cat >>confdefs.h <<EOF | ||
6426 | #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char | ||
6427 | @@ -9491,7 +9560,7 @@ | ||
6428 | else | ||
6429 | NCURSES_SBOOL="char" | ||
6430 | fi | ||
6431 | -echo "$as_me:9494: checking if you want to use signed Boolean array in term.h" >&5 | ||
6432 | +echo "$as_me:9563: checking if you want to use signed Boolean array in term.h" >&5 | ||
6433 | echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 | ||
6434 | |||
6435 | # Check whether --enable-signed-char or --disable-signed-char was given. | ||
6436 | @@ -9501,12 +9570,12 @@ | ||
6437 | else | ||
6438 | with_signed_char=no | ||
6439 | fi; | ||
6440 | -echo "$as_me:9504: result: $with_signed_char" >&5 | ||
6441 | +echo "$as_me:9573: result: $with_signed_char" >&5 | ||
6442 | echo "${ECHO_T}$with_signed_char" >&6 | ||
6443 | test "$with_signed_char" != yes && NCURSES_SBOOL="char" | ||
6444 | |||
6445 | ### use option --enable-sigwinch to turn on use of SIGWINCH logic | ||
6446 | -echo "$as_me:9509: checking if you want SIGWINCH handler" >&5 | ||
6447 | +echo "$as_me:9578: checking if you want SIGWINCH handler" >&5 | ||
6448 | echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 | ||
6449 | |||
6450 | # Check whether --enable-sigwinch or --disable-sigwinch was given. | ||
6451 | @@ -9516,14 +9585,14 @@ | ||
6452 | else | ||
6453 | with_sigwinch=$with_ext_funcs | ||
6454 | fi; | ||
6455 | -echo "$as_me:9519: result: $with_sigwinch" >&5 | ||
6456 | +echo "$as_me:9588: result: $with_sigwinch" >&5 | ||
6457 | echo "${ECHO_T}$with_sigwinch" >&6 | ||
6458 | test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF | ||
6459 | #define USE_SIGWINCH 1 | ||
6460 | EOF | ||
6461 | |||
6462 | ### use option --enable-tcap-names to allow user to define new capabilities | ||
6463 | -echo "$as_me:9526: checking if you want user-definable terminal capabilities like termcap" >&5 | ||
6464 | +echo "$as_me:9595: checking if you want user-definable terminal capabilities like termcap" >&5 | ||
6465 | echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 | ||
6466 | |||
6467 | # Check whether --enable-tcap-names or --disable-tcap-names was given. | ||
6468 | @@ -9533,7 +9602,7 @@ | ||
6469 | else | ||
6470 | with_tcap_names=$with_ext_funcs | ||
6471 | fi; | ||
6472 | -echo "$as_me:9536: result: $with_tcap_names" >&5 | ||
6473 | +echo "$as_me:9605: result: $with_tcap_names" >&5 | ||
6474 | echo "${ECHO_T}$with_tcap_names" >&6 | ||
6475 | NCURSES_XNAMES=0 | ||
6476 | test "$with_tcap_names" = yes && NCURSES_XNAMES=1 | ||
6477 | @@ -9541,7 +9610,7 @@ | ||
6478 | ############################################################################### | ||
6479 | # These options are relatively safe to experiment with. | ||
6480 | |||
6481 | -echo "$as_me:9544: checking if you want all development code" >&5 | ||
6482 | +echo "$as_me:9613: checking if you want all development code" >&5 | ||
6483 | echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 | ||
6484 | |||
6485 | # Check whether --with-develop or --without-develop was given. | ||
6486 | @@ -9551,11 +9620,11 @@ | ||
6487 | else | ||
6488 | with_develop=no | ||
6489 | fi; | ||
6490 | -echo "$as_me:9554: result: $with_develop" >&5 | ||
6491 | +echo "$as_me:9623: result: $with_develop" >&5 | ||
6492 | echo "${ECHO_T}$with_develop" >&6 | ||
6493 | |||
6494 | ### use option --enable-hard-tabs to turn on use of hard-tabs optimize | ||
6495 | -echo "$as_me:9558: checking if you want hard-tabs code" >&5 | ||
6496 | +echo "$as_me:9627: checking if you want hard-tabs code" >&5 | ||
6497 | echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 | ||
6498 | |||
6499 | # Check whether --enable-hard-tabs or --disable-hard-tabs was given. | ||
6500 | @@ -9565,14 +9634,14 @@ | ||
6501 | else | ||
6502 | enable_hard_tabs=$with_develop | ||
6503 | fi; | ||
6504 | -echo "$as_me:9568: result: $enable_hard_tabs" >&5 | ||
6505 | +echo "$as_me:9637: result: $enable_hard_tabs" >&5 | ||
6506 | echo "${ECHO_T}$enable_hard_tabs" >&6 | ||
6507 | test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF | ||
6508 | #define USE_HARD_TABS 1 | ||
6509 | EOF | ||
6510 | |||
6511 | ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize | ||
6512 | -echo "$as_me:9575: checking if you want limited support for xmc" >&5 | ||
6513 | +echo "$as_me:9644: checking if you want limited support for xmc" >&5 | ||
6514 | echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 | ||
6515 | |||
6516 | # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. | ||
6517 | @@ -9582,7 +9651,7 @@ | ||
6518 | else | ||
6519 | enable_xmc_glitch=$with_develop | ||
6520 | fi; | ||
6521 | -echo "$as_me:9585: result: $enable_xmc_glitch" >&5 | ||
6522 | +echo "$as_me:9654: result: $enable_xmc_glitch" >&5 | ||
6523 | echo "${ECHO_T}$enable_xmc_glitch" >&6 | ||
6524 | test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF | ||
6525 | #define USE_XMC_SUPPORT 1 | ||
6526 | @@ -9591,7 +9660,7 @@ | ||
6527 | ############################################################################### | ||
6528 | # These are just experimental, probably should not be in a package: | ||
6529 | |||
6530 | -echo "$as_me:9594: checking if you do not want to assume colors are white-on-black" >&5 | ||
6531 | +echo "$as_me:9663: checking if you do not want to assume colors are white-on-black" >&5 | ||
6532 | echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 | ||
6533 | |||
6534 | # Check whether --enable-assumed-color or --disable-assumed-color was given. | ||
6535 | @@ -9601,14 +9670,14 @@ | ||
6536 | else | ||
6537 | with_assumed_color=yes | ||
6538 | fi; | ||
6539 | -echo "$as_me:9604: result: $with_assumed_color" >&5 | ||
6540 | +echo "$as_me:9673: result: $with_assumed_color" >&5 | ||
6541 | echo "${ECHO_T}$with_assumed_color" >&6 | ||
6542 | test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF | ||
6543 | #define USE_ASSUMED_COLOR 1 | ||
6544 | EOF | ||
6545 | |||
6546 | ### use option --enable-hashmap to turn on use of hashmap scrolling logic | ||
6547 | -echo "$as_me:9611: checking if you want hashmap scrolling-optimization code" >&5 | ||
6548 | +echo "$as_me:9680: checking if you want hashmap scrolling-optimization code" >&5 | ||
6549 | echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 | ||
6550 | |||
6551 | # Check whether --enable-hashmap or --disable-hashmap was given. | ||
6552 | @@ -9618,14 +9687,14 @@ | ||
6553 | else | ||
6554 | with_hashmap=yes | ||
6555 | fi; | ||
6556 | -echo "$as_me:9621: result: $with_hashmap" >&5 | ||
6557 | +echo "$as_me:9690: result: $with_hashmap" >&5 | ||
6558 | echo "${ECHO_T}$with_hashmap" >&6 | ||
6559 | test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF | ||
6560 | #define USE_HASHMAP 1 | ||
6561 | EOF | ||
6562 | |||
6563 | ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment | ||
6564 | -echo "$as_me:9628: checking if you want colorfgbg code" >&5 | ||
6565 | +echo "$as_me:9697: checking if you want colorfgbg code" >&5 | ||
6566 | echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 | ||
6567 | |||
6568 | # Check whether --enable-colorfgbg or --disable-colorfgbg was given. | ||
6569 | @@ -9635,7 +9704,7 @@ | ||
6570 | else | ||
6571 | with_colorfgbg=no | ||
6572 | fi; | ||
6573 | -echo "$as_me:9638: result: $with_colorfgbg" >&5 | ||
6574 | +echo "$as_me:9707: result: $with_colorfgbg" >&5 | ||
6575 | echo "${ECHO_T}$with_colorfgbg" >&6 | ||
6576 | test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF | ||
6577 | #define USE_COLORFGBG 1 | ||
6578 | @@ -9644,7 +9713,7 @@ | ||
6579 | # This is still experimental (20080329), but should ultimately be moved to | ||
6580 | # the script-block --with-normal, etc. | ||
6581 | |||
6582 | -echo "$as_me:9647: checking if you want to link with the pthread library" >&5 | ||
6583 | +echo "$as_me:9716: checking if you want to link with the pthread library" >&5 | ||
6584 | echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 | ||
6585 | |||
6586 | # Check whether --with-pthread or --without-pthread was given. | ||
6587 | @@ -9654,27 +9723,27 @@ | ||
6588 | else | ||
6589 | with_pthread=no | ||
6590 | fi; | ||
6591 | -echo "$as_me:9657: result: $with_pthread" >&5 | ||
6592 | +echo "$as_me:9726: result: $with_pthread" >&5 | ||
6593 | echo "${ECHO_T}$with_pthread" >&6 | ||
6594 | |||
6595 | if test "$with_pthread" != no ; then | ||
6596 | - echo "$as_me:9661: checking for pthread.h" >&5 | ||
6597 | + echo "$as_me:9730: checking for pthread.h" >&5 | ||
6598 | echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 | ||
6599 | if test "${ac_cv_header_pthread_h+set}" = set; then | ||
6600 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6601 | else | ||
6602 | cat >conftest.$ac_ext <<_ACEOF | ||
6603 | -#line 9667 "configure" | ||
6604 | +#line 9736 "configure" | ||
6605 | #include "confdefs.h" | ||
6606 | #include <pthread.h> | ||
6607 | _ACEOF | ||
6608 | -if { (eval echo "$as_me:9671: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
6609 | +if { (eval echo "$as_me:9740: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
6610 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
6611 | ac_status=$? | ||
6612 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
6613 | rm -f conftest.er1 | ||
6614 | cat conftest.err >&5 | ||
6615 | - echo "$as_me:9677: \$? = $ac_status" >&5 | ||
6616 | + echo "$as_me:9746: \$? = $ac_status" >&5 | ||
6617 | (exit $ac_status); } >/dev/null; then | ||
6618 | if test -s conftest.err; then | ||
6619 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
6620 | @@ -9693,7 +9762,7 @@ | ||
6621 | fi | ||
6622 | rm -f conftest.err conftest.$ac_ext | ||
6623 | fi | ||
6624 | -echo "$as_me:9696: result: $ac_cv_header_pthread_h" >&5 | ||
6625 | +echo "$as_me:9765: result: $ac_cv_header_pthread_h" >&5 | ||
6626 | echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 | ||
6627 | if test $ac_cv_header_pthread_h = yes; then | ||
6628 | |||
6629 | @@ -9701,12 +9770,12 @@ | ||
6630 | #define HAVE_PTHREADS_H 1 | ||
6631 | EOF | ||
6632 | |||
6633 | - echo "$as_me:9704: checking if we can link with the pthread library" >&5 | ||
6634 | + echo "$as_me:9773: checking if we can link with the pthread library" >&5 | ||
6635 | echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6 | ||
6636 | cf_save_LIBS="$LIBS" | ||
6637 | LIBS="-lpthread $LIBS" | ||
6638 | cat >conftest.$ac_ext <<_ACEOF | ||
6639 | -#line 9709 "configure" | ||
6640 | +#line 9778 "configure" | ||
6641 | #include "confdefs.h" | ||
6642 | |||
6643 | #include <pthread.h> | ||
6644 | @@ -9722,16 +9791,16 @@ | ||
6645 | } | ||
6646 | _ACEOF | ||
6647 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
6648 | -if { (eval echo "$as_me:9725: \"$ac_link\"") >&5 | ||
6649 | +if { (eval echo "$as_me:9794: \"$ac_link\"") >&5 | ||
6650 | (eval $ac_link) 2>&5 | ||
6651 | ac_status=$? | ||
6652 | - echo "$as_me:9728: \$? = $ac_status" >&5 | ||
6653 | + echo "$as_me:9797: \$? = $ac_status" >&5 | ||
6654 | (exit $ac_status); } && | ||
6655 | { ac_try='test -s conftest$ac_exeext' | ||
6656 | - { (eval echo "$as_me:9731: \"$ac_try\"") >&5 | ||
6657 | + { (eval echo "$as_me:9800: \"$ac_try\"") >&5 | ||
6658 | (eval $ac_try) 2>&5 | ||
6659 | ac_status=$? | ||
6660 | - echo "$as_me:9734: \$? = $ac_status" >&5 | ||
6661 | + echo "$as_me:9803: \$? = $ac_status" >&5 | ||
6662 | (exit $ac_status); }; }; then | ||
6663 | with_pthread=yes | ||
6664 | else | ||
6665 | @@ -9741,7 +9810,7 @@ | ||
6666 | fi | ||
6667 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
6668 | LIBS="$cf_save_LIBS" | ||
6669 | - echo "$as_me:9744: result: $with_pthread" >&5 | ||
6670 | + echo "$as_me:9813: result: $with_pthread" >&5 | ||
6671 | echo "${ECHO_T}$with_pthread" >&6 | ||
6672 | |||
6673 | if test "$with_pthread" = yes ; then | ||
6674 | @@ -9751,7 +9820,7 @@ | ||
6675 | EOF | ||
6676 | |||
6677 | else | ||
6678 | - { { echo "$as_me:9754: error: Cannot link with pthread library" >&5 | ||
6679 | + { { echo "$as_me:9823: error: Cannot link with pthread library" >&5 | ||
6680 | echo "$as_me: error: Cannot link with pthread library" >&2;} | ||
6681 | { (exit 1); exit 1; }; } | ||
6682 | fi | ||
6683 | @@ -9760,7 +9829,7 @@ | ||
6684 | |||
6685 | fi | ||
6686 | |||
6687 | -echo "$as_me:9763: checking if you want to use weak-symbols for pthreads" >&5 | ||
6688 | +echo "$as_me:9832: checking if you want to use weak-symbols for pthreads" >&5 | ||
6689 | echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 | ||
6690 | |||
6691 | # Check whether --enable-weak-symbols or --disable-weak-symbols was given. | ||
6692 | @@ -9770,18 +9839,18 @@ | ||
6693 | else | ||
6694 | use_weak_symbols=no | ||
6695 | fi; | ||
6696 | -echo "$as_me:9773: result: $use_weak_symbols" >&5 | ||
6697 | +echo "$as_me:9842: result: $use_weak_symbols" >&5 | ||
6698 | echo "${ECHO_T}$use_weak_symbols" >&6 | ||
6699 | if test "$use_weak_symbols" = yes ; then | ||
6700 | |||
6701 | -echo "$as_me:9777: checking if $CC supports weak symbols" >&5 | ||
6702 | +echo "$as_me:9846: checking if $CC supports weak symbols" >&5 | ||
6703 | echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 | ||
6704 | if test "${cf_cv_weak_symbols+set}" = set; then | ||
6705 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
6706 | else | ||
6707 | |||
6708 | cat >conftest.$ac_ext <<_ACEOF | ||
6709 | -#line 9784 "configure" | ||
6710 | +#line 9853 "configure" | ||
6711 | #include "confdefs.h" | ||
6712 | |||
6713 | #include <stdio.h> | ||
6714 | @@ -9807,16 +9876,16 @@ | ||
6715 | } | ||
6716 | _ACEOF | ||
6717 | rm -f conftest.$ac_objext | ||
6718 | -if { (eval echo "$as_me:9810: \"$ac_compile\"") >&5 | ||
6719 | +if { (eval echo "$as_me:9879: \"$ac_compile\"") >&5 | ||
6720 | (eval $ac_compile) 2>&5 | ||
6721 | ac_status=$? | ||
6722 | - echo "$as_me:9813: \$? = $ac_status" >&5 | ||
6723 | + echo "$as_me:9882: \$? = $ac_status" >&5 | ||
6724 | (exit $ac_status); } && | ||
6725 | { ac_try='test -s conftest.$ac_objext' | ||
6726 | - { (eval echo "$as_me:9816: \"$ac_try\"") >&5 | ||
6727 | + { (eval echo "$as_me:9885: \"$ac_try\"") >&5 | ||
6728 | (eval $ac_try) 2>&5 | ||
6729 | ac_status=$? | ||
6730 | - echo "$as_me:9819: \$? = $ac_status" >&5 | ||
6731 | + echo "$as_me:9888: \$? = $ac_status" >&5 | ||
6732 | (exit $ac_status); }; }; then | ||
6733 | cf_cv_weak_symbols=yes | ||
6734 | else | ||
6735 | @@ -9827,7 +9896,7 @@ | ||
6736 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
6737 | |||
6738 | fi | ||
6739 | -echo "$as_me:9830: result: $cf_cv_weak_symbols" >&5 | ||
6740 | +echo "$as_me:9899: result: $cf_cv_weak_symbols" >&5 | ||
6741 | echo "${ECHO_T}$cf_cv_weak_symbols" >&6 | ||
6742 | |||
6743 | else | ||
6744 | @@ -9857,7 +9926,7 @@ | ||
6745 | # opaque outside of that, so there is no --enable-opaque option. We can use | ||
6746 | # this option without --with-pthreads, but this will be always set for | ||
6747 | # pthreads. | ||
6748 | -echo "$as_me:9860: checking if you want experimental reentrant code" >&5 | ||
6749 | +echo "$as_me:9929: checking if you want experimental reentrant code" >&5 | ||
6750 | echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 | ||
6751 | |||
6752 | # Check whether --enable-reentrant or --disable-reentrant was given. | ||
6753 | @@ -9867,7 +9936,7 @@ | ||
6754 | else | ||
6755 | with_reentrant=no | ||
6756 | fi; | ||
6757 | -echo "$as_me:9870: result: $with_reentrant" >&5 | ||
6758 | +echo "$as_me:9939: result: $with_reentrant" >&5 | ||
6759 | echo "${ECHO_T}$with_reentrant" >&6 | ||
6760 | if test "$with_reentrant" = yes ; then | ||
6761 | cf_cv_enable_reentrant=1 | ||
6762 | @@ -9891,7 +9960,7 @@ | ||
6763 | 5.*) | ||
6764 | cf_cv_rel_version=6.0 | ||
6765 | cf_cv_abi_version=6 | ||
6766 | - { echo "$as_me:9894: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 | ||
6767 | + { echo "$as_me:9963: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 | ||
6768 | echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} | ||
6769 | ;; | ||
6770 | esac | ||
6771 | @@ -9904,7 +9973,7 @@ | ||
6772 | NCURSES_SIZE_T=short | ||
6773 | fi | ||
6774 | |||
6775 | -echo "$as_me:9907: checking if you want experimental safe-sprintf code" >&5 | ||
6776 | +echo "$as_me:9976: checking if you want experimental safe-sprintf code" >&5 | ||
6777 | echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 | ||
6778 | |||
6779 | # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. | ||
6780 | @@ -9914,7 +9983,7 @@ | ||
6781 | else | ||
6782 | with_safe_sprintf=no | ||
6783 | fi; | ||
6784 | -echo "$as_me:9917: result: $with_safe_sprintf" >&5 | ||
6785 | +echo "$as_me:9986: result: $with_safe_sprintf" >&5 | ||
6786 | echo "${ECHO_T}$with_safe_sprintf" >&6 | ||
6787 | test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF | ||
6788 | #define USE_SAFE_SPRINTF 1 | ||
6789 | @@ -9923,7 +9992,7 @@ | ||
6790 | ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic | ||
6791 | # when hashmap is used scroll hints are useless | ||
6792 | if test "$with_hashmap" = no ; then | ||
6793 | -echo "$as_me:9926: checking if you want to experiment without scrolling-hints code" >&5 | ||
6794 | +echo "$as_me:9995: checking if you want to experiment without scrolling-hints code" >&5 | ||
6795 | echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 | ||
6796 | |||
6797 | # Check whether --enable-scroll-hints or --disable-scroll-hints was given. | ||
6798 | @@ -9933,7 +10002,7 @@ | ||
6799 | else | ||
6800 | with_scroll_hints=yes | ||
6801 | fi; | ||
6802 | -echo "$as_me:9936: result: $with_scroll_hints" >&5 | ||
6803 | +echo "$as_me:10005: result: $with_scroll_hints" >&5 | ||
6804 | echo "${ECHO_T}$with_scroll_hints" >&6 | ||
6805 | test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF | ||
6806 | #define USE_SCROLL_HINTS 1 | ||
6807 | @@ -9941,7 +10010,7 @@ | ||
6808 | |||
6809 | fi | ||
6810 | |||
6811 | -echo "$as_me:9944: checking if you want experimental wgetch-events code" >&5 | ||
6812 | +echo "$as_me:10013: checking if you want experimental wgetch-events code" >&5 | ||
6813 | echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6 | ||
6814 | |||
6815 | # Check whether --enable-wgetch-events or --disable-wgetch-events was given. | ||
6816 | @@ -9951,7 +10020,7 @@ | ||
6817 | else | ||
6818 | with_wgetch_events=no | ||
6819 | fi; | ||
6820 | -echo "$as_me:9954: result: $with_wgetch_events" >&5 | ||
6821 | +echo "$as_me:10023: result: $with_wgetch_events" >&5 | ||
6822 | echo "${ECHO_T}$with_wgetch_events" >&6 | ||
6823 | test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF | ||
6824 | #define NCURSES_WGETCH_EVENTS 1 | ||
6825 | @@ -9960,7 +10029,7 @@ | ||
6826 | ############################################################################### | ||
6827 | |||
6828 | ### use option --disable-echo to suppress full display compiling commands | ||
6829 | -echo "$as_me:9963: checking if you want to display full commands during build" >&5 | ||
6830 | +echo "$as_me:10032: checking if you want to display full commands during build" >&5 | ||
6831 | echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6 | ||
6832 | |||
6833 | # Check whether --enable-echo or --disable-echo was given. | ||
6834 | @@ -9977,11 +10046,11 @@ | ||
6835 | test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent" | ||
6836 | test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent" | ||
6837 | fi | ||
6838 | -echo "$as_me:9980: result: $with_echo" >&5 | ||
6839 | +echo "$as_me:10049: result: $with_echo" >&5 | ||
6840 | echo "${ECHO_T}$with_echo" >&6 | ||
6841 | |||
6842 | ### use option --enable-warnings to turn on all gcc warnings | ||
6843 | -echo "$as_me:9984: checking if you want to see compiler warnings" >&5 | ||
6844 | +echo "$as_me:10053: checking if you want to see compiler warnings" >&5 | ||
6845 | echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 | ||
6846 | |||
6847 | # Check whether --enable-warnings or --disable-warnings was given. | ||
6848 | @@ -9989,7 +10058,7 @@ | ||
6849 | enableval="$enable_warnings" | ||
6850 | with_warnings=$enableval | ||
6851 | fi; | ||
6852 | -echo "$as_me:9992: result: $with_warnings" >&5 | ||
6853 | +echo "$as_me:10061: result: $with_warnings" >&5 | ||
6854 | echo "${ECHO_T}$with_warnings" >&6 | ||
6855 | |||
6856 | if test "x$with_warnings" = "xyes"; then | ||
6857 | @@ -10000,12 +10069,12 @@ | ||
6858 | if test "$GCC" = yes ; then | ||
6859 | case $host_os in | ||
6860 | linux*|gnu*) | ||
6861 | - echo "$as_me:10003: checking if this is really Intel C compiler" >&5 | ||
6862 | + echo "$as_me:10072: checking if this is really Intel C compiler" >&5 | ||
6863 | echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 | ||
6864 | cf_save_CFLAGS="$CFLAGS" | ||
6865 | CFLAGS="$CFLAGS -no-gcc" | ||
6866 | cat >conftest.$ac_ext <<_ACEOF | ||
6867 | -#line 10008 "configure" | ||
6868 | +#line 10077 "configure" | ||
6869 | #include "confdefs.h" | ||
6870 | |||
6871 | int | ||
6872 | @@ -10022,16 +10091,16 @@ | ||
6873 | } | ||
6874 | _ACEOF | ||
6875 | rm -f conftest.$ac_objext | ||
6876 | -if { (eval echo "$as_me:10025: \"$ac_compile\"") >&5 | ||
6877 | +if { (eval echo "$as_me:10094: \"$ac_compile\"") >&5 | ||
6878 | (eval $ac_compile) 2>&5 | ||
6879 | ac_status=$? | ||
6880 | - echo "$as_me:10028: \$? = $ac_status" >&5 | ||
6881 | + echo "$as_me:10097: \$? = $ac_status" >&5 | ||
6882 | (exit $ac_status); } && | ||
6883 | { ac_try='test -s conftest.$ac_objext' | ||
6884 | - { (eval echo "$as_me:10031: \"$ac_try\"") >&5 | ||
6885 | + { (eval echo "$as_me:10100: \"$ac_try\"") >&5 | ||
6886 | (eval $ac_try) 2>&5 | ||
6887 | ac_status=$? | ||
6888 | - echo "$as_me:10034: \$? = $ac_status" >&5 | ||
6889 | + echo "$as_me:10103: \$? = $ac_status" >&5 | ||
6890 | (exit $ac_status); }; }; then | ||
6891 | INTEL_COMPILER=yes | ||
6892 | cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" | ||
6893 | @@ -10042,14 +10111,14 @@ | ||
6894 | fi | ||
6895 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
6896 | CFLAGS="$cf_save_CFLAGS" | ||
6897 | - echo "$as_me:10045: result: $INTEL_COMPILER" >&5 | ||
6898 | + echo "$as_me:10114: result: $INTEL_COMPILER" >&5 | ||
6899 | echo "${ECHO_T}$INTEL_COMPILER" >&6 | ||
6900 | ;; | ||
6901 | esac | ||
6902 | fi | ||
6903 | |||
6904 | cat > conftest.$ac_ext <<EOF | ||
6905 | -#line 10052 "${as_me-configure}" | ||
6906 | +#line 10121 "${as_me-configure}" | ||
6907 | int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } | ||
6908 | EOF | ||
6909 | |||
6910 | @@ -10067,7 +10136,7 @@ | ||
6911 | # remark #981: operands are evaluated in unspecified order | ||
6912 | # warning #269: invalid format string conversion | ||
6913 | |||
6914 | - { echo "$as_me:10070: checking for $CC warning options..." >&5 | ||
6915 | + { echo "$as_me:10139: checking for $CC warning options..." >&5 | ||
6916 | echo "$as_me: checking for $CC warning options..." >&6;} | ||
6917 | cf_save_CFLAGS="$CFLAGS" | ||
6918 | EXTRA_CFLAGS="-Wall" | ||
6919 | @@ -10084,12 +10153,12 @@ | ||
6920 | wd981 | ||
6921 | do | ||
6922 | CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" | ||
6923 | - if { (eval echo "$as_me:10087: \"$ac_compile\"") >&5 | ||
6924 | + if { (eval echo "$as_me:10156: \"$ac_compile\"") >&5 | ||
6925 | (eval $ac_compile) 2>&5 | ||
6926 | ac_status=$? | ||
6927 | - echo "$as_me:10090: \$? = $ac_status" >&5 | ||
6928 | + echo "$as_me:10159: \$? = $ac_status" >&5 | ||
6929 | (exit $ac_status); }; then | ||
6930 | - test -n "$verbose" && echo "$as_me:10092: result: ... -$cf_opt" >&5 | ||
6931 | + test -n "$verbose" && echo "$as_me:10161: result: ... -$cf_opt" >&5 | ||
6932 | echo "${ECHO_T}... -$cf_opt" >&6 | ||
6933 | EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" | ||
6934 | fi | ||
6935 | @@ -10098,7 +10167,7 @@ | ||
6936 | |||
6937 | elif test "$GCC" = yes | ||
6938 | then | ||
6939 | - { echo "$as_me:10101: checking for $CC warning options..." >&5 | ||
6940 | + { echo "$as_me:10170: checking for $CC warning options..." >&5 | ||
6941 | echo "$as_me: checking for $CC warning options..." >&6;} | ||
6942 | cf_save_CFLAGS="$CFLAGS" | ||
6943 | EXTRA_CFLAGS="-W -Wall" | ||
6944 | @@ -10118,12 +10187,12 @@ | ||
6945 | Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum | ||
6946 | do | ||
6947 | CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" | ||
6948 | - if { (eval echo "$as_me:10121: \"$ac_compile\"") >&5 | ||
6949 | + if { (eval echo "$as_me:10190: \"$ac_compile\"") >&5 | ||
6950 | (eval $ac_compile) 2>&5 | ||
6951 | ac_status=$? | ||
6952 | - echo "$as_me:10124: \$? = $ac_status" >&5 | ||
6953 | + echo "$as_me:10193: \$? = $ac_status" >&5 | ||
6954 | (exit $ac_status); }; then | ||
6955 | - test -n "$verbose" && echo "$as_me:10126: result: ... -$cf_opt" >&5 | ||
6956 | + test -n "$verbose" && echo "$as_me:10195: result: ... -$cf_opt" >&5 | ||
6957 | echo "${ECHO_T}... -$cf_opt" >&6 | ||
6958 | case $cf_opt in #(vi | ||
6959 | Wcast-qual) #(vi | ||
6960 | @@ -10134,7 +10203,7 @@ | ||
6961 | [34].*) | ||
6962 | test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 | ||
6963 | |||
6964 | -echo "${as_me-configure}:10137: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 | ||
6965 | +echo "${as_me-configure}:10206: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 | ||
6966 | |||
6967 | continue;; | ||
6968 | esac | ||
6969 | @@ -10154,12 +10223,12 @@ | ||
6970 | if test "$GCC" = yes ; then | ||
6971 | case $host_os in | ||
6972 | linux*|gnu*) | ||
6973 | - echo "$as_me:10157: checking if this is really Intel C++ compiler" >&5 | ||
6974 | + echo "$as_me:10226: checking if this is really Intel C++ compiler" >&5 | ||
6975 | echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6 | ||
6976 | cf_save_CFLAGS="$CXXFLAGS" | ||
6977 | CXXFLAGS="$CXXFLAGS -no-gcc" | ||
6978 | cat >conftest.$ac_ext <<_ACEOF | ||
6979 | -#line 10162 "configure" | ||
6980 | +#line 10231 "configure" | ||
6981 | #include "confdefs.h" | ||
6982 | |||
6983 | int | ||
6984 | @@ -10176,16 +10245,16 @@ | ||
6985 | } | ||
6986 | _ACEOF | ||
6987 | rm -f conftest.$ac_objext | ||
6988 | -if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5 | ||
6989 | +if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5 | ||
6990 | (eval $ac_compile) 2>&5 | ||
6991 | ac_status=$? | ||
6992 | - echo "$as_me:10182: \$? = $ac_status" >&5 | ||
6993 | + echo "$as_me:10251: \$? = $ac_status" >&5 | ||
6994 | (exit $ac_status); } && | ||
6995 | { ac_try='test -s conftest.$ac_objext' | ||
6996 | - { (eval echo "$as_me:10185: \"$ac_try\"") >&5 | ||
6997 | + { (eval echo "$as_me:10254: \"$ac_try\"") >&5 | ||
6998 | (eval $ac_try) 2>&5 | ||
6999 | ac_status=$? | ||
7000 | - echo "$as_me:10188: \$? = $ac_status" >&5 | ||
7001 | + echo "$as_me:10257: \$? = $ac_status" >&5 | ||
7002 | (exit $ac_status); }; }; then | ||
7003 | INTEL_CPLUSPLUS=yes | ||
7004 | cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" | ||
7005 | @@ -10196,7 +10265,7 @@ | ||
7006 | fi | ||
7007 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
7008 | CXXFLAGS="$cf_save_CFLAGS" | ||
7009 | - echo "$as_me:10199: result: $INTEL_CPLUSPLUS" >&5 | ||
7010 | + echo "$as_me:10268: result: $INTEL_CPLUSPLUS" >&5 | ||
7011 | echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 | ||
7012 | ;; | ||
7013 | esac | ||
7014 | @@ -10210,7 +10279,7 @@ | ||
7015 | ac_main_return=return | ||
7016 | |||
7017 | cat > conftest.$ac_ext <<EOF | ||
7018 | -#line 10213 "configure" | ||
7019 | +#line 10282 "configure" | ||
7020 | int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } | ||
7021 | EOF | ||
7022 | |||
7023 | @@ -10228,7 +10297,7 @@ | ||
7024 | # remark #981: operands are evaluated in unspecified order | ||
7025 | # warning #269: invalid format string conversion | ||
7026 | |||
7027 | - { echo "$as_me:10231: checking for $CC warning options..." >&5 | ||
7028 | + { echo "$as_me:10300: checking for $CC warning options..." >&5 | ||
7029 | echo "$as_me: checking for $CC warning options..." >&6;} | ||
7030 | cf_save_CXXFLAGS="$CXXFLAGS" | ||
7031 | EXTRA_CXXFLAGS="-Wall" | ||
7032 | @@ -10245,12 +10314,12 @@ | ||
7033 | wd981 | ||
7034 | do | ||
7035 | CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" | ||
7036 | - if { (eval echo "$as_me:10248: \"$ac_compile\"") >&5 | ||
7037 | + if { (eval echo "$as_me:10317: \"$ac_compile\"") >&5 | ||
7038 | (eval $ac_compile) 2>&5 | ||
7039 | ac_status=$? | ||
7040 | - echo "$as_me:10251: \$? = $ac_status" >&5 | ||
7041 | + echo "$as_me:10320: \$? = $ac_status" >&5 | ||
7042 | (exit $ac_status); }; then | ||
7043 | - test -n "$verbose" && echo "$as_me:10253: result: ... -$cf_opt" >&5 | ||
7044 | + test -n "$verbose" && echo "$as_me:10322: result: ... -$cf_opt" >&5 | ||
7045 | echo "${ECHO_T}... -$cf_opt" >&6 | ||
7046 | EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" | ||
7047 | fi | ||
7048 | @@ -10259,7 +10328,7 @@ | ||
7049 | |||
7050 | elif test "$GXX" = yes | ||
7051 | then | ||
7052 | - { echo "$as_me:10262: checking for $CXX warning options..." >&5 | ||
7053 | + { echo "$as_me:10331: checking for $CXX warning options..." >&5 | ||
7054 | echo "$as_me: checking for $CXX warning options..." >&6;} | ||
7055 | cf_save_CXXFLAGS="$CXXFLAGS" | ||
7056 | EXTRA_CXXFLAGS="-W -Wall" | ||
7057 | @@ -10288,16 +10357,16 @@ | ||
7058 | Wundef $cf_gxx_extra_warnings Wno-unused | ||
7059 | do | ||
7060 | CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" | ||
7061 | - if { (eval echo "$as_me:10291: \"$ac_compile\"") >&5 | ||
7062 | + if { (eval echo "$as_me:10360: \"$ac_compile\"") >&5 | ||
7063 | (eval $ac_compile) 2>&5 | ||
7064 | ac_status=$? | ||
7065 | - echo "$as_me:10294: \$? = $ac_status" >&5 | ||
7066 | + echo "$as_me:10363: \$? = $ac_status" >&5 | ||
7067 | (exit $ac_status); }; then | ||
7068 | - test -n "$verbose" && echo "$as_me:10296: result: ... -$cf_opt" >&5 | ||
7069 | + test -n "$verbose" && echo "$as_me:10365: result: ... -$cf_opt" >&5 | ||
7070 | echo "${ECHO_T}... -$cf_opt" >&6 | ||
7071 | EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" | ||
7072 | else | ||
7073 | - test -n "$verbose" && echo "$as_me:10300: result: ... no -$cf_opt" >&5 | ||
7074 | + test -n "$verbose" && echo "$as_me:10369: result: ... no -$cf_opt" >&5 | ||
7075 | echo "${ECHO_T}... no -$cf_opt" >&6 | ||
7076 | fi | ||
7077 | done | ||
7078 | @@ -10333,10 +10402,10 @@ | ||
7079 | EOF | ||
7080 | if test "$GCC" = yes | ||
7081 | then | ||
7082 | - { echo "$as_me:10336: checking for $CC __attribute__ directives..." >&5 | ||
7083 | + { echo "$as_me:10405: checking for $CC __attribute__ directives..." >&5 | ||
7084 | echo "$as_me: checking for $CC __attribute__ directives..." >&6;} | ||
7085 | cat > conftest.$ac_ext <<EOF | ||
7086 | -#line 10339 "${as_me-configure}" | ||
7087 | +#line 10408 "${as_me-configure}" | ||
7088 | #include "confdefs.h" | ||
7089 | #include "conftest.h" | ||
7090 | #include "conftest.i" | ||
7091 | @@ -10374,12 +10443,12 @@ | ||
7092 | EOF | ||
7093 | ;; | ||
7094 | esac | ||
7095 | - if { (eval echo "$as_me:10377: \"$ac_compile\"") >&5 | ||
7096 | + if { (eval echo "$as_me:10446: \"$ac_compile\"") >&5 | ||
7097 | (eval $ac_compile) 2>&5 | ||
7098 | ac_status=$? | ||
7099 | - echo "$as_me:10380: \$? = $ac_status" >&5 | ||
7100 | + echo "$as_me:10449: \$? = $ac_status" >&5 | ||
7101 | (exit $ac_status); }; then | ||
7102 | - test -n "$verbose" && echo "$as_me:10382: result: ... $cf_attribute" >&5 | ||
7103 | + test -n "$verbose" && echo "$as_me:10451: result: ... $cf_attribute" >&5 | ||
7104 | echo "${ECHO_T}... $cf_attribute" >&6 | ||
7105 | cat conftest.h >>confdefs.h | ||
7106 | fi | ||
7107 | @@ -10391,7 +10460,7 @@ | ||
7108 | fi | ||
7109 | |||
7110 | ### use option --enable-assertions to turn on generation of assertion code | ||
7111 | -echo "$as_me:10394: checking if you want to enable runtime assertions" >&5 | ||
7112 | +echo "$as_me:10463: checking if you want to enable runtime assertions" >&5 | ||
7113 | echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 | ||
7114 | |||
7115 | # Check whether --enable-assertions or --disable-assertions was given. | ||
7116 | @@ -10401,7 +10470,7 @@ | ||
7117 | else | ||
7118 | with_assertions=no | ||
7119 | fi; | ||
7120 | -echo "$as_me:10404: result: $with_assertions" >&5 | ||
7121 | +echo "$as_me:10473: result: $with_assertions" >&5 | ||
7122 | echo "${ECHO_T}$with_assertions" >&6 | ||
7123 | if test -n "$GCC" | ||
7124 | then | ||
7125 | @@ -10419,7 +10488,7 @@ | ||
7126 | |||
7127 | ### use option --disable-leaks to suppress "permanent" leaks, for testing | ||
7128 | |||
7129 | -echo "$as_me:10422: checking if you want to use dmalloc for testing" >&5 | ||
7130 | +echo "$as_me:10491: checking if you want to use dmalloc for testing" >&5 | ||
7131 | echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 | ||
7132 | |||
7133 | # Check whether --with-dmalloc or --without-dmalloc was given. | ||
7134 | @@ -10435,7 +10504,7 @@ | ||
7135 | else | ||
7136 | with_dmalloc= | ||
7137 | fi; | ||
7138 | -echo "$as_me:10438: result: ${with_dmalloc:-no}" >&5 | ||
7139 | +echo "$as_me:10507: result: ${with_dmalloc:-no}" >&5 | ||
7140 | echo "${ECHO_T}${with_dmalloc:-no}" >&6 | ||
7141 | |||
7142 | case .$with_cflags in #(vi | ||
7143 | @@ -10519,23 +10588,23 @@ | ||
7144 | esac | ||
7145 | |||
7146 | if test "$with_dmalloc" = yes ; then | ||
7147 | - echo "$as_me:10522: checking for dmalloc.h" >&5 | ||
7148 | + echo "$as_me:10591: checking for dmalloc.h" >&5 | ||
7149 | echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 | ||
7150 | if test "${ac_cv_header_dmalloc_h+set}" = set; then | ||
7151 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7152 | else | ||
7153 | cat >conftest.$ac_ext <<_ACEOF | ||
7154 | -#line 10528 "configure" | ||
7155 | +#line 10597 "configure" | ||
7156 | #include "confdefs.h" | ||
7157 | #include <dmalloc.h> | ||
7158 | _ACEOF | ||
7159 | -if { (eval echo "$as_me:10532: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
7160 | +if { (eval echo "$as_me:10601: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
7161 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
7162 | ac_status=$? | ||
7163 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
7164 | rm -f conftest.er1 | ||
7165 | cat conftest.err >&5 | ||
7166 | - echo "$as_me:10538: \$? = $ac_status" >&5 | ||
7167 | + echo "$as_me:10607: \$? = $ac_status" >&5 | ||
7168 | (exit $ac_status); } >/dev/null; then | ||
7169 | if test -s conftest.err; then | ||
7170 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
7171 | @@ -10554,11 +10623,11 @@ | ||
7172 | fi | ||
7173 | rm -f conftest.err conftest.$ac_ext | ||
7174 | fi | ||
7175 | -echo "$as_me:10557: result: $ac_cv_header_dmalloc_h" >&5 | ||
7176 | +echo "$as_me:10626: result: $ac_cv_header_dmalloc_h" >&5 | ||
7177 | echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 | ||
7178 | if test $ac_cv_header_dmalloc_h = yes; then | ||
7179 | |||
7180 | -echo "$as_me:10561: checking for dmalloc_debug in -ldmalloc" >&5 | ||
7181 | +echo "$as_me:10630: checking for dmalloc_debug in -ldmalloc" >&5 | ||
7182 | echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 | ||
7183 | if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then | ||
7184 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7185 | @@ -10566,7 +10635,7 @@ | ||
7186 | ac_check_lib_save_LIBS=$LIBS | ||
7187 | LIBS="-ldmalloc $LIBS" | ||
7188 | cat >conftest.$ac_ext <<_ACEOF | ||
7189 | -#line 10569 "configure" | ||
7190 | +#line 10638 "configure" | ||
7191 | #include "confdefs.h" | ||
7192 | |||
7193 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
7194 | @@ -10585,16 +10654,16 @@ | ||
7195 | } | ||
7196 | _ACEOF | ||
7197 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7198 | -if { (eval echo "$as_me:10588: \"$ac_link\"") >&5 | ||
7199 | +if { (eval echo "$as_me:10657: \"$ac_link\"") >&5 | ||
7200 | (eval $ac_link) 2>&5 | ||
7201 | ac_status=$? | ||
7202 | - echo "$as_me:10591: \$? = $ac_status" >&5 | ||
7203 | + echo "$as_me:10660: \$? = $ac_status" >&5 | ||
7204 | (exit $ac_status); } && | ||
7205 | { ac_try='test -s conftest$ac_exeext' | ||
7206 | - { (eval echo "$as_me:10594: \"$ac_try\"") >&5 | ||
7207 | + { (eval echo "$as_me:10663: \"$ac_try\"") >&5 | ||
7208 | (eval $ac_try) 2>&5 | ||
7209 | ac_status=$? | ||
7210 | - echo "$as_me:10597: \$? = $ac_status" >&5 | ||
7211 | + echo "$as_me:10666: \$? = $ac_status" >&5 | ||
7212 | (exit $ac_status); }; }; then | ||
7213 | ac_cv_lib_dmalloc_dmalloc_debug=yes | ||
7214 | else | ||
7215 | @@ -10605,7 +10674,7 @@ | ||
7216 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
7217 | LIBS=$ac_check_lib_save_LIBS | ||
7218 | fi | ||
7219 | -echo "$as_me:10608: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 | ||
7220 | +echo "$as_me:10677: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 | ||
7221 | echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 | ||
7222 | if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then | ||
7223 | cat >>confdefs.h <<EOF | ||
7224 | @@ -10620,7 +10689,7 @@ | ||
7225 | |||
7226 | fi | ||
7227 | |||
7228 | -echo "$as_me:10623: checking if you want to use dbmalloc for testing" >&5 | ||
7229 | +echo "$as_me:10692: checking if you want to use dbmalloc for testing" >&5 | ||
7230 | echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 | ||
7231 | |||
7232 | # Check whether --with-dbmalloc or --without-dbmalloc was given. | ||
7233 | @@ -10636,7 +10705,7 @@ | ||
7234 | else | ||
7235 | with_dbmalloc= | ||
7236 | fi; | ||
7237 | -echo "$as_me:10639: result: ${with_dbmalloc:-no}" >&5 | ||
7238 | +echo "$as_me:10708: result: ${with_dbmalloc:-no}" >&5 | ||
7239 | echo "${ECHO_T}${with_dbmalloc:-no}" >&6 | ||
7240 | |||
7241 | case .$with_cflags in #(vi | ||
7242 | @@ -10720,23 +10789,23 @@ | ||
7243 | esac | ||
7244 | |||
7245 | if test "$with_dbmalloc" = yes ; then | ||
7246 | - echo "$as_me:10723: checking for dbmalloc.h" >&5 | ||
7247 | + echo "$as_me:10792: checking for dbmalloc.h" >&5 | ||
7248 | echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 | ||
7249 | if test "${ac_cv_header_dbmalloc_h+set}" = set; then | ||
7250 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7251 | else | ||
7252 | cat >conftest.$ac_ext <<_ACEOF | ||
7253 | -#line 10729 "configure" | ||
7254 | +#line 10798 "configure" | ||
7255 | #include "confdefs.h" | ||
7256 | #include <dbmalloc.h> | ||
7257 | _ACEOF | ||
7258 | -if { (eval echo "$as_me:10733: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
7259 | +if { (eval echo "$as_me:10802: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
7260 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
7261 | ac_status=$? | ||
7262 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
7263 | rm -f conftest.er1 | ||
7264 | cat conftest.err >&5 | ||
7265 | - echo "$as_me:10739: \$? = $ac_status" >&5 | ||
7266 | + echo "$as_me:10808: \$? = $ac_status" >&5 | ||
7267 | (exit $ac_status); } >/dev/null; then | ||
7268 | if test -s conftest.err; then | ||
7269 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
7270 | @@ -10755,11 +10824,11 @@ | ||
7271 | fi | ||
7272 | rm -f conftest.err conftest.$ac_ext | ||
7273 | fi | ||
7274 | -echo "$as_me:10758: result: $ac_cv_header_dbmalloc_h" >&5 | ||
7275 | +echo "$as_me:10827: result: $ac_cv_header_dbmalloc_h" >&5 | ||
7276 | echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 | ||
7277 | if test $ac_cv_header_dbmalloc_h = yes; then | ||
7278 | |||
7279 | -echo "$as_me:10762: checking for debug_malloc in -ldbmalloc" >&5 | ||
7280 | +echo "$as_me:10831: checking for debug_malloc in -ldbmalloc" >&5 | ||
7281 | echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 | ||
7282 | if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then | ||
7283 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7284 | @@ -10767,7 +10836,7 @@ | ||
7285 | ac_check_lib_save_LIBS=$LIBS | ||
7286 | LIBS="-ldbmalloc $LIBS" | ||
7287 | cat >conftest.$ac_ext <<_ACEOF | ||
7288 | -#line 10770 "configure" | ||
7289 | +#line 10839 "configure" | ||
7290 | #include "confdefs.h" | ||
7291 | |||
7292 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
7293 | @@ -10786,16 +10855,16 @@ | ||
7294 | } | ||
7295 | _ACEOF | ||
7296 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7297 | -if { (eval echo "$as_me:10789: \"$ac_link\"") >&5 | ||
7298 | +if { (eval echo "$as_me:10858: \"$ac_link\"") >&5 | ||
7299 | (eval $ac_link) 2>&5 | ||
7300 | ac_status=$? | ||
7301 | - echo "$as_me:10792: \$? = $ac_status" >&5 | ||
7302 | + echo "$as_me:10861: \$? = $ac_status" >&5 | ||
7303 | (exit $ac_status); } && | ||
7304 | { ac_try='test -s conftest$ac_exeext' | ||
7305 | - { (eval echo "$as_me:10795: \"$ac_try\"") >&5 | ||
7306 | + { (eval echo "$as_me:10864: \"$ac_try\"") >&5 | ||
7307 | (eval $ac_try) 2>&5 | ||
7308 | ac_status=$? | ||
7309 | - echo "$as_me:10798: \$? = $ac_status" >&5 | ||
7310 | + echo "$as_me:10867: \$? = $ac_status" >&5 | ||
7311 | (exit $ac_status); }; }; then | ||
7312 | ac_cv_lib_dbmalloc_debug_malloc=yes | ||
7313 | else | ||
7314 | @@ -10806,7 +10875,7 @@ | ||
7315 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
7316 | LIBS=$ac_check_lib_save_LIBS | ||
7317 | fi | ||
7318 | -echo "$as_me:10809: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 | ||
7319 | +echo "$as_me:10878: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 | ||
7320 | echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 | ||
7321 | if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then | ||
7322 | cat >>confdefs.h <<EOF | ||
7323 | @@ -10821,7 +10890,7 @@ | ||
7324 | |||
7325 | fi | ||
7326 | |||
7327 | -echo "$as_me:10824: checking if you want to use valgrind for testing" >&5 | ||
7328 | +echo "$as_me:10893: checking if you want to use valgrind for testing" >&5 | ||
7329 | echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 | ||
7330 | |||
7331 | # Check whether --with-valgrind or --without-valgrind was given. | ||
7332 | @@ -10837,7 +10906,7 @@ | ||
7333 | else | ||
7334 | with_valgrind= | ||
7335 | fi; | ||
7336 | -echo "$as_me:10840: result: ${with_valgrind:-no}" >&5 | ||
7337 | +echo "$as_me:10909: result: ${with_valgrind:-no}" >&5 | ||
7338 | echo "${ECHO_T}${with_valgrind:-no}" >&6 | ||
7339 | |||
7340 | case .$with_cflags in #(vi | ||
7341 | @@ -10920,7 +10989,7 @@ | ||
7342 | ;; | ||
7343 | esac | ||
7344 | |||
7345 | -echo "$as_me:10923: checking if you want to perform memory-leak testing" >&5 | ||
7346 | +echo "$as_me:10992: checking if you want to perform memory-leak testing" >&5 | ||
7347 | echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 | ||
7348 | |||
7349 | # Check whether --enable-leaks or --disable-leaks was given. | ||
7350 | @@ -10930,7 +10999,7 @@ | ||
7351 | else | ||
7352 | : ${with_no_leaks:=no} | ||
7353 | fi; | ||
7354 | -echo "$as_me:10933: result: $with_no_leaks" >&5 | ||
7355 | +echo "$as_me:11002: result: $with_no_leaks" >&5 | ||
7356 | echo "${ECHO_T}$with_no_leaks" >&6 | ||
7357 | |||
7358 | if test "$with_no_leaks" = yes ; then | ||
7359 | @@ -10975,7 +11044,7 @@ | ||
7360 | ;; | ||
7361 | esac | ||
7362 | |||
7363 | -echo "$as_me:10978: checking whether to add trace feature to all models" >&5 | ||
7364 | +echo "$as_me:11047: checking whether to add trace feature to all models" >&5 | ||
7365 | echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 | ||
7366 | |||
7367 | # Check whether --with-trace or --without-trace was given. | ||
7368 | @@ -10985,7 +11054,7 @@ | ||
7369 | else | ||
7370 | cf_with_trace=$cf_all_traces | ||
7371 | fi; | ||
7372 | -echo "$as_me:10988: result: $cf_with_trace" >&5 | ||
7373 | +echo "$as_me:11057: result: $cf_with_trace" >&5 | ||
7374 | echo "${ECHO_T}$cf_with_trace" >&6 | ||
7375 | |||
7376 | if test "$cf_with_trace" = yes ; then | ||
7377 | @@ -11066,13 +11135,13 @@ | ||
7378 | fi | ||
7379 | |||
7380 | ### Checks for libraries. | ||
7381 | -echo "$as_me:11069: checking for gettimeofday" >&5 | ||
7382 | +echo "$as_me:11138: checking for gettimeofday" >&5 | ||
7383 | echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 | ||
7384 | if test "${ac_cv_func_gettimeofday+set}" = set; then | ||
7385 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7386 | else | ||
7387 | cat >conftest.$ac_ext <<_ACEOF | ||
7388 | -#line 11075 "configure" | ||
7389 | +#line 11144 "configure" | ||
7390 | #include "confdefs.h" | ||
7391 | /* System header to define __stub macros and hopefully few prototypes, | ||
7392 | which can conflict with char gettimeofday (); below. */ | ||
7393 | @@ -11103,16 +11172,16 @@ | ||
7394 | } | ||
7395 | _ACEOF | ||
7396 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7397 | -if { (eval echo "$as_me:11106: \"$ac_link\"") >&5 | ||
7398 | +if { (eval echo "$as_me:11175: \"$ac_link\"") >&5 | ||
7399 | (eval $ac_link) 2>&5 | ||
7400 | ac_status=$? | ||
7401 | - echo "$as_me:11109: \$? = $ac_status" >&5 | ||
7402 | + echo "$as_me:11178: \$? = $ac_status" >&5 | ||
7403 | (exit $ac_status); } && | ||
7404 | { ac_try='test -s conftest$ac_exeext' | ||
7405 | - { (eval echo "$as_me:11112: \"$ac_try\"") >&5 | ||
7406 | + { (eval echo "$as_me:11181: \"$ac_try\"") >&5 | ||
7407 | (eval $ac_try) 2>&5 | ||
7408 | ac_status=$? | ||
7409 | - echo "$as_me:11115: \$? = $ac_status" >&5 | ||
7410 | + echo "$as_me:11184: \$? = $ac_status" >&5 | ||
7411 | (exit $ac_status); }; }; then | ||
7412 | ac_cv_func_gettimeofday=yes | ||
7413 | else | ||
7414 | @@ -11122,7 +11191,7 @@ | ||
7415 | fi | ||
7416 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
7417 | fi | ||
7418 | -echo "$as_me:11125: result: $ac_cv_func_gettimeofday" >&5 | ||
7419 | +echo "$as_me:11194: result: $ac_cv_func_gettimeofday" >&5 | ||
7420 | echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 | ||
7421 | if test $ac_cv_func_gettimeofday = yes; then | ||
7422 | cat >>confdefs.h <<\EOF | ||
7423 | @@ -11131,7 +11200,7 @@ | ||
7424 | |||
7425 | else | ||
7426 | |||
7427 | -echo "$as_me:11134: checking for gettimeofday in -lbsd" >&5 | ||
7428 | +echo "$as_me:11203: checking for gettimeofday in -lbsd" >&5 | ||
7429 | echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 | ||
7430 | if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then | ||
7431 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7432 | @@ -11139,7 +11208,7 @@ | ||
7433 | ac_check_lib_save_LIBS=$LIBS | ||
7434 | LIBS="-lbsd $LIBS" | ||
7435 | cat >conftest.$ac_ext <<_ACEOF | ||
7436 | -#line 11142 "configure" | ||
7437 | +#line 11211 "configure" | ||
7438 | #include "confdefs.h" | ||
7439 | |||
7440 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
7441 | @@ -11158,16 +11227,16 @@ | ||
7442 | } | ||
7443 | _ACEOF | ||
7444 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7445 | -if { (eval echo "$as_me:11161: \"$ac_link\"") >&5 | ||
7446 | +if { (eval echo "$as_me:11230: \"$ac_link\"") >&5 | ||
7447 | (eval $ac_link) 2>&5 | ||
7448 | ac_status=$? | ||
7449 | - echo "$as_me:11164: \$? = $ac_status" >&5 | ||
7450 | + echo "$as_me:11233: \$? = $ac_status" >&5 | ||
7451 | (exit $ac_status); } && | ||
7452 | { ac_try='test -s conftest$ac_exeext' | ||
7453 | - { (eval echo "$as_me:11167: \"$ac_try\"") >&5 | ||
7454 | + { (eval echo "$as_me:11236: \"$ac_try\"") >&5 | ||
7455 | (eval $ac_try) 2>&5 | ||
7456 | ac_status=$? | ||
7457 | - echo "$as_me:11170: \$? = $ac_status" >&5 | ||
7458 | + echo "$as_me:11239: \$? = $ac_status" >&5 | ||
7459 | (exit $ac_status); }; }; then | ||
7460 | ac_cv_lib_bsd_gettimeofday=yes | ||
7461 | else | ||
7462 | @@ -11178,7 +11247,7 @@ | ||
7463 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
7464 | LIBS=$ac_check_lib_save_LIBS | ||
7465 | fi | ||
7466 | -echo "$as_me:11181: result: $ac_cv_lib_bsd_gettimeofday" >&5 | ||
7467 | +echo "$as_me:11250: result: $ac_cv_lib_bsd_gettimeofday" >&5 | ||
7468 | echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 | ||
7469 | if test $ac_cv_lib_bsd_gettimeofday = yes; then | ||
7470 | cat >>confdefs.h <<\EOF | ||
7471 | @@ -11190,14 +11259,14 @@ | ||
7472 | |||
7473 | fi | ||
7474 | |||
7475 | -echo "$as_me:11193: checking if -lm needed for math functions" >&5 | ||
7476 | +echo "$as_me:11262: checking if -lm needed for math functions" >&5 | ||
7477 | echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 | ||
7478 | if test "${cf_cv_need_libm+set}" = set; then | ||
7479 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7480 | else | ||
7481 | |||
7482 | cat >conftest.$ac_ext <<_ACEOF | ||
7483 | -#line 11200 "configure" | ||
7484 | +#line 11269 "configure" | ||
7485 | #include "confdefs.h" | ||
7486 | |||
7487 | #include <stdio.h> | ||
7488 | @@ -11212,16 +11281,16 @@ | ||
7489 | } | ||
7490 | _ACEOF | ||
7491 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7492 | -if { (eval echo "$as_me:11215: \"$ac_link\"") >&5 | ||
7493 | +if { (eval echo "$as_me:11284: \"$ac_link\"") >&5 | ||
7494 | (eval $ac_link) 2>&5 | ||
7495 | ac_status=$? | ||
7496 | - echo "$as_me:11218: \$? = $ac_status" >&5 | ||
7497 | + echo "$as_me:11287: \$? = $ac_status" >&5 | ||
7498 | (exit $ac_status); } && | ||
7499 | { ac_try='test -s conftest$ac_exeext' | ||
7500 | - { (eval echo "$as_me:11221: \"$ac_try\"") >&5 | ||
7501 | + { (eval echo "$as_me:11290: \"$ac_try\"") >&5 | ||
7502 | (eval $ac_try) 2>&5 | ||
7503 | ac_status=$? | ||
7504 | - echo "$as_me:11224: \$? = $ac_status" >&5 | ||
7505 | + echo "$as_me:11293: \$? = $ac_status" >&5 | ||
7506 | (exit $ac_status); }; }; then | ||
7507 | cf_cv_need_libm=no | ||
7508 | else | ||
7509 | @@ -11231,7 +11300,7 @@ | ||
7510 | fi | ||
7511 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
7512 | fi | ||
7513 | -echo "$as_me:11234: result: $cf_cv_need_libm" >&5 | ||
7514 | +echo "$as_me:11303: result: $cf_cv_need_libm" >&5 | ||
7515 | echo "${ECHO_T}$cf_cv_need_libm" >&6 | ||
7516 | if test "$cf_cv_need_libm" = yes | ||
7517 | then | ||
7518 | @@ -11239,13 +11308,13 @@ | ||
7519 | fi | ||
7520 | |||
7521 | ### Checks for header files. | ||
7522 | -echo "$as_me:11242: checking for ANSI C header files" >&5 | ||
7523 | +echo "$as_me:11311: checking for ANSI C header files" >&5 | ||
7524 | echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 | ||
7525 | if test "${ac_cv_header_stdc+set}" = set; then | ||
7526 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7527 | else | ||
7528 | cat >conftest.$ac_ext <<_ACEOF | ||
7529 | -#line 11248 "configure" | ||
7530 | +#line 11317 "configure" | ||
7531 | #include "confdefs.h" | ||
7532 | #include <stdlib.h> | ||
7533 | #include <stdarg.h> | ||
7534 | @@ -11253,13 +11322,13 @@ | ||
7535 | #include <float.h> | ||
7536 | |||
7537 | _ACEOF | ||
7538 | -if { (eval echo "$as_me:11256: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
7539 | +if { (eval echo "$as_me:11325: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
7540 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
7541 | ac_status=$? | ||
7542 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
7543 | rm -f conftest.er1 | ||
7544 | cat conftest.err >&5 | ||
7545 | - echo "$as_me:11262: \$? = $ac_status" >&5 | ||
7546 | + echo "$as_me:11331: \$? = $ac_status" >&5 | ||
7547 | (exit $ac_status); } >/dev/null; then | ||
7548 | if test -s conftest.err; then | ||
7549 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
7550 | @@ -11281,7 +11350,7 @@ | ||
7551 | if test $ac_cv_header_stdc = yes; then | ||
7552 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | ||
7553 | cat >conftest.$ac_ext <<_ACEOF | ||
7554 | -#line 11284 "configure" | ||
7555 | +#line 11353 "configure" | ||
7556 | #include "confdefs.h" | ||
7557 | #include <string.h> | ||
7558 | |||
7559 | @@ -11299,7 +11368,7 @@ | ||
7560 | if test $ac_cv_header_stdc = yes; then | ||
7561 | # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | ||
7562 | cat >conftest.$ac_ext <<_ACEOF | ||
7563 | -#line 11302 "configure" | ||
7564 | +#line 11371 "configure" | ||
7565 | #include "confdefs.h" | ||
7566 | #include <stdlib.h> | ||
7567 | |||
7568 | @@ -11320,7 +11389,7 @@ | ||
7569 | : | ||
7570 | else | ||
7571 | cat >conftest.$ac_ext <<_ACEOF | ||
7572 | -#line 11323 "configure" | ||
7573 | +#line 11392 "configure" | ||
7574 | #include "confdefs.h" | ||
7575 | #include <ctype.h> | ||
7576 | #if ((' ' & 0x0FF) == 0x020) | ||
7577 | @@ -11346,15 +11415,15 @@ | ||
7578 | } | ||
7579 | _ACEOF | ||
7580 | rm -f conftest$ac_exeext | ||
7581 | -if { (eval echo "$as_me:11349: \"$ac_link\"") >&5 | ||
7582 | +if { (eval echo "$as_me:11418: \"$ac_link\"") >&5 | ||
7583 | (eval $ac_link) 2>&5 | ||
7584 | ac_status=$? | ||
7585 | - echo "$as_me:11352: \$? = $ac_status" >&5 | ||
7586 | + echo "$as_me:11421: \$? = $ac_status" >&5 | ||
7587 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
7588 | - { (eval echo "$as_me:11354: \"$ac_try\"") >&5 | ||
7589 | + { (eval echo "$as_me:11423: \"$ac_try\"") >&5 | ||
7590 | (eval $ac_try) 2>&5 | ||
7591 | ac_status=$? | ||
7592 | - echo "$as_me:11357: \$? = $ac_status" >&5 | ||
7593 | + echo "$as_me:11426: \$? = $ac_status" >&5 | ||
7594 | (exit $ac_status); }; }; then | ||
7595 | : | ||
7596 | else | ||
7597 | @@ -11367,7 +11436,7 @@ | ||
7598 | fi | ||
7599 | fi | ||
7600 | fi | ||
7601 | -echo "$as_me:11370: result: $ac_cv_header_stdc" >&5 | ||
7602 | +echo "$as_me:11439: result: $ac_cv_header_stdc" >&5 | ||
7603 | echo "${ECHO_T}$ac_cv_header_stdc" >&6 | ||
7604 | if test $ac_cv_header_stdc = yes; then | ||
7605 | |||
7606 | @@ -11380,13 +11449,13 @@ | ||
7607 | ac_header_dirent=no | ||
7608 | for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do | ||
7609 | as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` | ||
7610 | -echo "$as_me:11383: checking for $ac_hdr that defines DIR" >&5 | ||
7611 | +echo "$as_me:11452: checking for $ac_hdr that defines DIR" >&5 | ||
7612 | echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 | ||
7613 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
7614 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7615 | else | ||
7616 | cat >conftest.$ac_ext <<_ACEOF | ||
7617 | -#line 11389 "configure" | ||
7618 | +#line 11458 "configure" | ||
7619 | #include "confdefs.h" | ||
7620 | #include <sys/types.h> | ||
7621 | #include <$ac_hdr> | ||
7622 | @@ -11401,16 +11470,16 @@ | ||
7623 | } | ||
7624 | _ACEOF | ||
7625 | rm -f conftest.$ac_objext | ||
7626 | -if { (eval echo "$as_me:11404: \"$ac_compile\"") >&5 | ||
7627 | +if { (eval echo "$as_me:11473: \"$ac_compile\"") >&5 | ||
7628 | (eval $ac_compile) 2>&5 | ||
7629 | ac_status=$? | ||
7630 | - echo "$as_me:11407: \$? = $ac_status" >&5 | ||
7631 | + echo "$as_me:11476: \$? = $ac_status" >&5 | ||
7632 | (exit $ac_status); } && | ||
7633 | { ac_try='test -s conftest.$ac_objext' | ||
7634 | - { (eval echo "$as_me:11410: \"$ac_try\"") >&5 | ||
7635 | + { (eval echo "$as_me:11479: \"$ac_try\"") >&5 | ||
7636 | (eval $ac_try) 2>&5 | ||
7637 | ac_status=$? | ||
7638 | - echo "$as_me:11413: \$? = $ac_status" >&5 | ||
7639 | + echo "$as_me:11482: \$? = $ac_status" >&5 | ||
7640 | (exit $ac_status); }; }; then | ||
7641 | eval "$as_ac_Header=yes" | ||
7642 | else | ||
7643 | @@ -11420,7 +11489,7 @@ | ||
7644 | fi | ||
7645 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
7646 | fi | ||
7647 | -echo "$as_me:11423: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
7648 | +echo "$as_me:11492: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
7649 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
7650 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
7651 | cat >>confdefs.h <<EOF | ||
7652 | @@ -11433,7 +11502,7 @@ | ||
7653 | done | ||
7654 | # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. | ||
7655 | if test $ac_header_dirent = dirent.h; then | ||
7656 | - echo "$as_me:11436: checking for opendir in -ldir" >&5 | ||
7657 | + echo "$as_me:11505: checking for opendir in -ldir" >&5 | ||
7658 | echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 | ||
7659 | if test "${ac_cv_lib_dir_opendir+set}" = set; then | ||
7660 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7661 | @@ -11441,7 +11510,7 @@ | ||
7662 | ac_check_lib_save_LIBS=$LIBS | ||
7663 | LIBS="-ldir $LIBS" | ||
7664 | cat >conftest.$ac_ext <<_ACEOF | ||
7665 | -#line 11444 "configure" | ||
7666 | +#line 11513 "configure" | ||
7667 | #include "confdefs.h" | ||
7668 | |||
7669 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
7670 | @@ -11460,16 +11529,16 @@ | ||
7671 | } | ||
7672 | _ACEOF | ||
7673 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7674 | -if { (eval echo "$as_me:11463: \"$ac_link\"") >&5 | ||
7675 | +if { (eval echo "$as_me:11532: \"$ac_link\"") >&5 | ||
7676 | (eval $ac_link) 2>&5 | ||
7677 | ac_status=$? | ||
7678 | - echo "$as_me:11466: \$? = $ac_status" >&5 | ||
7679 | + echo "$as_me:11535: \$? = $ac_status" >&5 | ||
7680 | (exit $ac_status); } && | ||
7681 | { ac_try='test -s conftest$ac_exeext' | ||
7682 | - { (eval echo "$as_me:11469: \"$ac_try\"") >&5 | ||
7683 | + { (eval echo "$as_me:11538: \"$ac_try\"") >&5 | ||
7684 | (eval $ac_try) 2>&5 | ||
7685 | ac_status=$? | ||
7686 | - echo "$as_me:11472: \$? = $ac_status" >&5 | ||
7687 | + echo "$as_me:11541: \$? = $ac_status" >&5 | ||
7688 | (exit $ac_status); }; }; then | ||
7689 | ac_cv_lib_dir_opendir=yes | ||
7690 | else | ||
7691 | @@ -11480,14 +11549,14 @@ | ||
7692 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
7693 | LIBS=$ac_check_lib_save_LIBS | ||
7694 | fi | ||
7695 | -echo "$as_me:11483: result: $ac_cv_lib_dir_opendir" >&5 | ||
7696 | +echo "$as_me:11552: result: $ac_cv_lib_dir_opendir" >&5 | ||
7697 | echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 | ||
7698 | if test $ac_cv_lib_dir_opendir = yes; then | ||
7699 | LIBS="$LIBS -ldir" | ||
7700 | fi | ||
7701 | |||
7702 | else | ||
7703 | - echo "$as_me:11490: checking for opendir in -lx" >&5 | ||
7704 | + echo "$as_me:11559: checking for opendir in -lx" >&5 | ||
7705 | echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 | ||
7706 | if test "${ac_cv_lib_x_opendir+set}" = set; then | ||
7707 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7708 | @@ -11495,7 +11564,7 @@ | ||
7709 | ac_check_lib_save_LIBS=$LIBS | ||
7710 | LIBS="-lx $LIBS" | ||
7711 | cat >conftest.$ac_ext <<_ACEOF | ||
7712 | -#line 11498 "configure" | ||
7713 | +#line 11567 "configure" | ||
7714 | #include "confdefs.h" | ||
7715 | |||
7716 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
7717 | @@ -11514,16 +11583,16 @@ | ||
7718 | } | ||
7719 | _ACEOF | ||
7720 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7721 | -if { (eval echo "$as_me:11517: \"$ac_link\"") >&5 | ||
7722 | +if { (eval echo "$as_me:11586: \"$ac_link\"") >&5 | ||
7723 | (eval $ac_link) 2>&5 | ||
7724 | ac_status=$? | ||
7725 | - echo "$as_me:11520: \$? = $ac_status" >&5 | ||
7726 | + echo "$as_me:11589: \$? = $ac_status" >&5 | ||
7727 | (exit $ac_status); } && | ||
7728 | { ac_try='test -s conftest$ac_exeext' | ||
7729 | - { (eval echo "$as_me:11523: \"$ac_try\"") >&5 | ||
7730 | + { (eval echo "$as_me:11592: \"$ac_try\"") >&5 | ||
7731 | (eval $ac_try) 2>&5 | ||
7732 | ac_status=$? | ||
7733 | - echo "$as_me:11526: \$? = $ac_status" >&5 | ||
7734 | + echo "$as_me:11595: \$? = $ac_status" >&5 | ||
7735 | (exit $ac_status); }; }; then | ||
7736 | ac_cv_lib_x_opendir=yes | ||
7737 | else | ||
7738 | @@ -11534,7 +11603,7 @@ | ||
7739 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
7740 | LIBS=$ac_check_lib_save_LIBS | ||
7741 | fi | ||
7742 | -echo "$as_me:11537: result: $ac_cv_lib_x_opendir" >&5 | ||
7743 | +echo "$as_me:11606: result: $ac_cv_lib_x_opendir" >&5 | ||
7744 | echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 | ||
7745 | if test $ac_cv_lib_x_opendir = yes; then | ||
7746 | LIBS="$LIBS -lx" | ||
7747 | @@ -11542,13 +11611,13 @@ | ||
7748 | |||
7749 | fi | ||
7750 | |||
7751 | -echo "$as_me:11545: checking whether time.h and sys/time.h may both be included" >&5 | ||
7752 | +echo "$as_me:11614: checking whether time.h and sys/time.h may both be included" >&5 | ||
7753 | echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 | ||
7754 | if test "${ac_cv_header_time+set}" = set; then | ||
7755 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7756 | else | ||
7757 | cat >conftest.$ac_ext <<_ACEOF | ||
7758 | -#line 11551 "configure" | ||
7759 | +#line 11620 "configure" | ||
7760 | #include "confdefs.h" | ||
7761 | #include <sys/types.h> | ||
7762 | #include <sys/time.h> | ||
7763 | @@ -11564,16 +11633,16 @@ | ||
7764 | } | ||
7765 | _ACEOF | ||
7766 | rm -f conftest.$ac_objext | ||
7767 | -if { (eval echo "$as_me:11567: \"$ac_compile\"") >&5 | ||
7768 | +if { (eval echo "$as_me:11636: \"$ac_compile\"") >&5 | ||
7769 | (eval $ac_compile) 2>&5 | ||
7770 | ac_status=$? | ||
7771 | - echo "$as_me:11570: \$? = $ac_status" >&5 | ||
7772 | + echo "$as_me:11639: \$? = $ac_status" >&5 | ||
7773 | (exit $ac_status); } && | ||
7774 | { ac_try='test -s conftest.$ac_objext' | ||
7775 | - { (eval echo "$as_me:11573: \"$ac_try\"") >&5 | ||
7776 | + { (eval echo "$as_me:11642: \"$ac_try\"") >&5 | ||
7777 | (eval $ac_try) 2>&5 | ||
7778 | ac_status=$? | ||
7779 | - echo "$as_me:11576: \$? = $ac_status" >&5 | ||
7780 | + echo "$as_me:11645: \$? = $ac_status" >&5 | ||
7781 | (exit $ac_status); }; }; then | ||
7782 | ac_cv_header_time=yes | ||
7783 | else | ||
7784 | @@ -11583,7 +11652,7 @@ | ||
7785 | fi | ||
7786 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
7787 | fi | ||
7788 | -echo "$as_me:11586: result: $ac_cv_header_time" >&5 | ||
7789 | +echo "$as_me:11655: result: $ac_cv_header_time" >&5 | ||
7790 | echo "${ECHO_T}$ac_cv_header_time" >&6 | ||
7791 | if test $ac_cv_header_time = yes; then | ||
7792 | |||
7793 | @@ -11593,14 +11662,14 @@ | ||
7794 | |||
7795 | fi | ||
7796 | |||
7797 | -echo "$as_me:11596: checking for regular-expression headers" >&5 | ||
7798 | +echo "$as_me:11665: checking for regular-expression headers" >&5 | ||
7799 | echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 | ||
7800 | if test "${cf_cv_regex+set}" = set; then | ||
7801 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7802 | else | ||
7803 | |||
7804 | cat >conftest.$ac_ext <<_ACEOF | ||
7805 | -#line 11603 "configure" | ||
7806 | +#line 11672 "configure" | ||
7807 | #include "confdefs.h" | ||
7808 | #include <sys/types.h> | ||
7809 | #include <regex.h> | ||
7810 | @@ -11618,16 +11687,16 @@ | ||
7811 | } | ||
7812 | _ACEOF | ||
7813 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7814 | -if { (eval echo "$as_me:11621: \"$ac_link\"") >&5 | ||
7815 | +if { (eval echo "$as_me:11690: \"$ac_link\"") >&5 | ||
7816 | (eval $ac_link) 2>&5 | ||
7817 | ac_status=$? | ||
7818 | - echo "$as_me:11624: \$? = $ac_status" >&5 | ||
7819 | + echo "$as_me:11693: \$? = $ac_status" >&5 | ||
7820 | (exit $ac_status); } && | ||
7821 | { ac_try='test -s conftest$ac_exeext' | ||
7822 | - { (eval echo "$as_me:11627: \"$ac_try\"") >&5 | ||
7823 | + { (eval echo "$as_me:11696: \"$ac_try\"") >&5 | ||
7824 | (eval $ac_try) 2>&5 | ||
7825 | ac_status=$? | ||
7826 | - echo "$as_me:11630: \$? = $ac_status" >&5 | ||
7827 | + echo "$as_me:11699: \$? = $ac_status" >&5 | ||
7828 | (exit $ac_status); }; }; then | ||
7829 | cf_cv_regex="regex.h" | ||
7830 | else | ||
7831 | @@ -11635,7 +11704,7 @@ | ||
7832 | cat conftest.$ac_ext >&5 | ||
7833 | |||
7834 | cat >conftest.$ac_ext <<_ACEOF | ||
7835 | -#line 11638 "configure" | ||
7836 | +#line 11707 "configure" | ||
7837 | #include "confdefs.h" | ||
7838 | #include <regexp.h> | ||
7839 | int | ||
7840 | @@ -11650,16 +11719,16 @@ | ||
7841 | } | ||
7842 | _ACEOF | ||
7843 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7844 | -if { (eval echo "$as_me:11653: \"$ac_link\"") >&5 | ||
7845 | +if { (eval echo "$as_me:11722: \"$ac_link\"") >&5 | ||
7846 | (eval $ac_link) 2>&5 | ||
7847 | ac_status=$? | ||
7848 | - echo "$as_me:11656: \$? = $ac_status" >&5 | ||
7849 | + echo "$as_me:11725: \$? = $ac_status" >&5 | ||
7850 | (exit $ac_status); } && | ||
7851 | { ac_try='test -s conftest$ac_exeext' | ||
7852 | - { (eval echo "$as_me:11659: \"$ac_try\"") >&5 | ||
7853 | + { (eval echo "$as_me:11728: \"$ac_try\"") >&5 | ||
7854 | (eval $ac_try) 2>&5 | ||
7855 | ac_status=$? | ||
7856 | - echo "$as_me:11662: \$? = $ac_status" >&5 | ||
7857 | + echo "$as_me:11731: \$? = $ac_status" >&5 | ||
7858 | (exit $ac_status); }; }; then | ||
7859 | cf_cv_regex="regexp.h" | ||
7860 | else | ||
7861 | @@ -11669,7 +11738,7 @@ | ||
7862 | cf_save_LIBS="$LIBS" | ||
7863 | LIBS="-lgen $LIBS" | ||
7864 | cat >conftest.$ac_ext <<_ACEOF | ||
7865 | -#line 11672 "configure" | ||
7866 | +#line 11741 "configure" | ||
7867 | #include "confdefs.h" | ||
7868 | #include <regexpr.h> | ||
7869 | int | ||
7870 | @@ -11684,16 +11753,16 @@ | ||
7871 | } | ||
7872 | _ACEOF | ||
7873 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7874 | -if { (eval echo "$as_me:11687: \"$ac_link\"") >&5 | ||
7875 | +if { (eval echo "$as_me:11756: \"$ac_link\"") >&5 | ||
7876 | (eval $ac_link) 2>&5 | ||
7877 | ac_status=$? | ||
7878 | - echo "$as_me:11690: \$? = $ac_status" >&5 | ||
7879 | + echo "$as_me:11759: \$? = $ac_status" >&5 | ||
7880 | (exit $ac_status); } && | ||
7881 | { ac_try='test -s conftest$ac_exeext' | ||
7882 | - { (eval echo "$as_me:11693: \"$ac_try\"") >&5 | ||
7883 | + { (eval echo "$as_me:11762: \"$ac_try\"") >&5 | ||
7884 | (eval $ac_try) 2>&5 | ||
7885 | ac_status=$? | ||
7886 | - echo "$as_me:11696: \$? = $ac_status" >&5 | ||
7887 | + echo "$as_me:11765: \$? = $ac_status" >&5 | ||
7888 | (exit $ac_status); }; }; then | ||
7889 | cf_cv_regex="regexpr.h" | ||
7890 | else | ||
7891 | @@ -11709,7 +11778,7 @@ | ||
7892 | |||
7893 | fi | ||
7894 | |||
7895 | -echo "$as_me:11712: result: $cf_cv_regex" >&5 | ||
7896 | +echo "$as_me:11781: result: $cf_cv_regex" >&5 | ||
7897 | echo "${ECHO_T}$cf_cv_regex" >&6 | ||
7898 | case $cf_cv_regex in | ||
7899 | regex.h) cat >>confdefs.h <<\EOF | ||
7900 | @@ -11745,23 +11814,23 @@ | ||
7901 | |||
7902 | do | ||
7903 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
7904 | -echo "$as_me:11748: checking for $ac_header" >&5 | ||
7905 | +echo "$as_me:11817: checking for $ac_header" >&5 | ||
7906 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
7907 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
7908 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7909 | else | ||
7910 | cat >conftest.$ac_ext <<_ACEOF | ||
7911 | -#line 11754 "configure" | ||
7912 | +#line 11823 "configure" | ||
7913 | #include "confdefs.h" | ||
7914 | #include <$ac_header> | ||
7915 | _ACEOF | ||
7916 | -if { (eval echo "$as_me:11758: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
7917 | +if { (eval echo "$as_me:11827: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
7918 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
7919 | ac_status=$? | ||
7920 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
7921 | rm -f conftest.er1 | ||
7922 | cat conftest.err >&5 | ||
7923 | - echo "$as_me:11764: \$? = $ac_status" >&5 | ||
7924 | + echo "$as_me:11833: \$? = $ac_status" >&5 | ||
7925 | (exit $ac_status); } >/dev/null; then | ||
7926 | if test -s conftest.err; then | ||
7927 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
7928 | @@ -11780,7 +11849,7 @@ | ||
7929 | fi | ||
7930 | rm -f conftest.err conftest.$ac_ext | ||
7931 | fi | ||
7932 | -echo "$as_me:11783: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
7933 | +echo "$as_me:11852: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
7934 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
7935 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
7936 | cat >>confdefs.h <<EOF | ||
7937 | @@ -11794,7 +11863,7 @@ | ||
7938 | # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set | ||
7939 | if test "$ISC" = yes ; then | ||
7940 | |||
7941 | -echo "$as_me:11797: checking for main in -lcposix" >&5 | ||
7942 | +echo "$as_me:11866: checking for main in -lcposix" >&5 | ||
7943 | echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6 | ||
7944 | if test "${ac_cv_lib_cposix_main+set}" = set; then | ||
7945 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7946 | @@ -11802,7 +11871,7 @@ | ||
7947 | ac_check_lib_save_LIBS=$LIBS | ||
7948 | LIBS="-lcposix $LIBS" | ||
7949 | cat >conftest.$ac_ext <<_ACEOF | ||
7950 | -#line 11805 "configure" | ||
7951 | +#line 11874 "configure" | ||
7952 | #include "confdefs.h" | ||
7953 | |||
7954 | int | ||
7955 | @@ -11814,16 +11883,16 @@ | ||
7956 | } | ||
7957 | _ACEOF | ||
7958 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
7959 | -if { (eval echo "$as_me:11817: \"$ac_link\"") >&5 | ||
7960 | +if { (eval echo "$as_me:11886: \"$ac_link\"") >&5 | ||
7961 | (eval $ac_link) 2>&5 | ||
7962 | ac_status=$? | ||
7963 | - echo "$as_me:11820: \$? = $ac_status" >&5 | ||
7964 | + echo "$as_me:11889: \$? = $ac_status" >&5 | ||
7965 | (exit $ac_status); } && | ||
7966 | { ac_try='test -s conftest$ac_exeext' | ||
7967 | - { (eval echo "$as_me:11823: \"$ac_try\"") >&5 | ||
7968 | + { (eval echo "$as_me:11892: \"$ac_try\"") >&5 | ||
7969 | (eval $ac_try) 2>&5 | ||
7970 | ac_status=$? | ||
7971 | - echo "$as_me:11826: \$? = $ac_status" >&5 | ||
7972 | + echo "$as_me:11895: \$? = $ac_status" >&5 | ||
7973 | (exit $ac_status); }; }; then | ||
7974 | ac_cv_lib_cposix_main=yes | ||
7975 | else | ||
7976 | @@ -11834,7 +11903,7 @@ | ||
7977 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
7978 | LIBS=$ac_check_lib_save_LIBS | ||
7979 | fi | ||
7980 | -echo "$as_me:11837: result: $ac_cv_lib_cposix_main" >&5 | ||
7981 | +echo "$as_me:11906: result: $ac_cv_lib_cposix_main" >&5 | ||
7982 | echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6 | ||
7983 | if test $ac_cv_lib_cposix_main = yes; then | ||
7984 | cat >>confdefs.h <<EOF | ||
7985 | @@ -11845,7 +11914,7 @@ | ||
7986 | |||
7987 | fi | ||
7988 | |||
7989 | - echo "$as_me:11848: checking for bzero in -linet" >&5 | ||
7990 | + echo "$as_me:11917: checking for bzero in -linet" >&5 | ||
7991 | echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6 | ||
7992 | if test "${ac_cv_lib_inet_bzero+set}" = set; then | ||
7993 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
7994 | @@ -11853,7 +11922,7 @@ | ||
7995 | ac_check_lib_save_LIBS=$LIBS | ||
7996 | LIBS="-linet $LIBS" | ||
7997 | cat >conftest.$ac_ext <<_ACEOF | ||
7998 | -#line 11856 "configure" | ||
7999 | +#line 11925 "configure" | ||
8000 | #include "confdefs.h" | ||
8001 | |||
8002 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
8003 | @@ -11872,16 +11941,16 @@ | ||
8004 | } | ||
8005 | _ACEOF | ||
8006 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
8007 | -if { (eval echo "$as_me:11875: \"$ac_link\"") >&5 | ||
8008 | +if { (eval echo "$as_me:11944: \"$ac_link\"") >&5 | ||
8009 | (eval $ac_link) 2>&5 | ||
8010 | ac_status=$? | ||
8011 | - echo "$as_me:11878: \$? = $ac_status" >&5 | ||
8012 | + echo "$as_me:11947: \$? = $ac_status" >&5 | ||
8013 | (exit $ac_status); } && | ||
8014 | { ac_try='test -s conftest$ac_exeext' | ||
8015 | - { (eval echo "$as_me:11881: \"$ac_try\"") >&5 | ||
8016 | + { (eval echo "$as_me:11950: \"$ac_try\"") >&5 | ||
8017 | (eval $ac_try) 2>&5 | ||
8018 | ac_status=$? | ||
8019 | - echo "$as_me:11884: \$? = $ac_status" >&5 | ||
8020 | + echo "$as_me:11953: \$? = $ac_status" >&5 | ||
8021 | (exit $ac_status); }; }; then | ||
8022 | ac_cv_lib_inet_bzero=yes | ||
8023 | else | ||
8024 | @@ -11892,21 +11961,21 @@ | ||
8025 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
8026 | LIBS=$ac_check_lib_save_LIBS | ||
8027 | fi | ||
8028 | -echo "$as_me:11895: result: $ac_cv_lib_inet_bzero" >&5 | ||
8029 | +echo "$as_me:11964: result: $ac_cv_lib_inet_bzero" >&5 | ||
8030 | echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6 | ||
8031 | if test $ac_cv_lib_inet_bzero = yes; then | ||
8032 | LIBS="$LIBS -linet" | ||
8033 | fi | ||
8034 | fi | ||
8035 | |||
8036 | -echo "$as_me:11902: checking if sys/time.h works with sys/select.h" >&5 | ||
8037 | +echo "$as_me:11971: checking if sys/time.h works with sys/select.h" >&5 | ||
8038 | echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 | ||
8039 | if test "${cf_cv_sys_time_select+set}" = set; then | ||
8040 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8041 | else | ||
8042 | |||
8043 | cat >conftest.$ac_ext <<_ACEOF | ||
8044 | -#line 11909 "configure" | ||
8045 | +#line 11978 "configure" | ||
8046 | #include "confdefs.h" | ||
8047 | |||
8048 | #include <sys/types.h> | ||
8049 | @@ -11926,16 +11995,16 @@ | ||
8050 | } | ||
8051 | _ACEOF | ||
8052 | rm -f conftest.$ac_objext | ||
8053 | -if { (eval echo "$as_me:11929: \"$ac_compile\"") >&5 | ||
8054 | +if { (eval echo "$as_me:11998: \"$ac_compile\"") >&5 | ||
8055 | (eval $ac_compile) 2>&5 | ||
8056 | ac_status=$? | ||
8057 | - echo "$as_me:11932: \$? = $ac_status" >&5 | ||
8058 | + echo "$as_me:12001: \$? = $ac_status" >&5 | ||
8059 | (exit $ac_status); } && | ||
8060 | { ac_try='test -s conftest.$ac_objext' | ||
8061 | - { (eval echo "$as_me:11935: \"$ac_try\"") >&5 | ||
8062 | + { (eval echo "$as_me:12004: \"$ac_try\"") >&5 | ||
8063 | (eval $ac_try) 2>&5 | ||
8064 | ac_status=$? | ||
8065 | - echo "$as_me:11938: \$? = $ac_status" >&5 | ||
8066 | + echo "$as_me:12007: \$? = $ac_status" >&5 | ||
8067 | (exit $ac_status); }; }; then | ||
8068 | cf_cv_sys_time_select=yes | ||
8069 | else | ||
8070 | @@ -11947,7 +12016,7 @@ | ||
8071 | |||
8072 | fi | ||
8073 | |||
8074 | -echo "$as_me:11950: result: $cf_cv_sys_time_select" >&5 | ||
8075 | +echo "$as_me:12019: result: $cf_cv_sys_time_select" >&5 | ||
8076 | echo "${ECHO_T}$cf_cv_sys_time_select" >&6 | ||
8077 | test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF | ||
8078 | #define HAVE_SYS_TIME_SELECT 1 | ||
8079 | @@ -11961,7 +12030,7 @@ | ||
8080 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
8081 | ac_main_return=return | ||
8082 | |||
8083 | -echo "$as_me:11964: checking for $CC option to accept ANSI C" >&5 | ||
8084 | +echo "$as_me:12033: checking for $CC option to accept ANSI C" >&5 | ||
8085 | echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 | ||
8086 | if test "${ac_cv_prog_cc_stdc+set}" = set; then | ||
8087 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8088 | @@ -11969,7 +12038,7 @@ | ||
8089 | ac_cv_prog_cc_stdc=no | ||
8090 | ac_save_CC=$CC | ||
8091 | cat >conftest.$ac_ext <<_ACEOF | ||
8092 | -#line 11972 "configure" | ||
8093 | +#line 12041 "configure" | ||
8094 | #include "confdefs.h" | ||
8095 | #include <stdarg.h> | ||
8096 | #include <stdio.h> | ||
8097 | @@ -12018,16 +12087,16 @@ | ||
8098 | do | ||
8099 | CC="$ac_save_CC $ac_arg" | ||
8100 | rm -f conftest.$ac_objext | ||
8101 | -if { (eval echo "$as_me:12021: \"$ac_compile\"") >&5 | ||
8102 | +if { (eval echo "$as_me:12090: \"$ac_compile\"") >&5 | ||
8103 | (eval $ac_compile) 2>&5 | ||
8104 | ac_status=$? | ||
8105 | - echo "$as_me:12024: \$? = $ac_status" >&5 | ||
8106 | + echo "$as_me:12093: \$? = $ac_status" >&5 | ||
8107 | (exit $ac_status); } && | ||
8108 | { ac_try='test -s conftest.$ac_objext' | ||
8109 | - { (eval echo "$as_me:12027: \"$ac_try\"") >&5 | ||
8110 | + { (eval echo "$as_me:12096: \"$ac_try\"") >&5 | ||
8111 | (eval $ac_try) 2>&5 | ||
8112 | ac_status=$? | ||
8113 | - echo "$as_me:12030: \$? = $ac_status" >&5 | ||
8114 | + echo "$as_me:12099: \$? = $ac_status" >&5 | ||
8115 | (exit $ac_status); }; }; then | ||
8116 | ac_cv_prog_cc_stdc=$ac_arg | ||
8117 | break | ||
8118 | @@ -12044,21 +12113,21 @@ | ||
8119 | |||
8120 | case "x$ac_cv_prog_cc_stdc" in | ||
8121 | x|xno) | ||
8122 | - echo "$as_me:12047: result: none needed" >&5 | ||
8123 | + echo "$as_me:12116: result: none needed" >&5 | ||
8124 | echo "${ECHO_T}none needed" >&6 ;; | ||
8125 | *) | ||
8126 | - echo "$as_me:12050: result: $ac_cv_prog_cc_stdc" >&5 | ||
8127 | + echo "$as_me:12119: result: $ac_cv_prog_cc_stdc" >&5 | ||
8128 | echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 | ||
8129 | CC="$CC $ac_cv_prog_cc_stdc" ;; | ||
8130 | esac | ||
8131 | |||
8132 | -echo "$as_me:12055: checking for an ANSI C-conforming const" >&5 | ||
8133 | +echo "$as_me:12124: checking for an ANSI C-conforming const" >&5 | ||
8134 | echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 | ||
8135 | if test "${ac_cv_c_const+set}" = set; then | ||
8136 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8137 | else | ||
8138 | cat >conftest.$ac_ext <<_ACEOF | ||
8139 | -#line 12061 "configure" | ||
8140 | +#line 12130 "configure" | ||
8141 | #include "confdefs.h" | ||
8142 | |||
8143 | int | ||
8144 | @@ -12116,16 +12185,16 @@ | ||
8145 | } | ||
8146 | _ACEOF | ||
8147 | rm -f conftest.$ac_objext | ||
8148 | -if { (eval echo "$as_me:12119: \"$ac_compile\"") >&5 | ||
8149 | +if { (eval echo "$as_me:12188: \"$ac_compile\"") >&5 | ||
8150 | (eval $ac_compile) 2>&5 | ||
8151 | ac_status=$? | ||
8152 | - echo "$as_me:12122: \$? = $ac_status" >&5 | ||
8153 | + echo "$as_me:12191: \$? = $ac_status" >&5 | ||
8154 | (exit $ac_status); } && | ||
8155 | { ac_try='test -s conftest.$ac_objext' | ||
8156 | - { (eval echo "$as_me:12125: \"$ac_try\"") >&5 | ||
8157 | + { (eval echo "$as_me:12194: \"$ac_try\"") >&5 | ||
8158 | (eval $ac_try) 2>&5 | ||
8159 | ac_status=$? | ||
8160 | - echo "$as_me:12128: \$? = $ac_status" >&5 | ||
8161 | + echo "$as_me:12197: \$? = $ac_status" >&5 | ||
8162 | (exit $ac_status); }; }; then | ||
8163 | ac_cv_c_const=yes | ||
8164 | else | ||
8165 | @@ -12135,7 +12204,7 @@ | ||
8166 | fi | ||
8167 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
8168 | fi | ||
8169 | -echo "$as_me:12138: result: $ac_cv_c_const" >&5 | ||
8170 | +echo "$as_me:12207: result: $ac_cv_c_const" >&5 | ||
8171 | echo "${ECHO_T}$ac_cv_c_const" >&6 | ||
8172 | if test $ac_cv_c_const = no; then | ||
8173 | |||
8174 | @@ -12145,7 +12214,7 @@ | ||
8175 | |||
8176 | fi | ||
8177 | |||
8178 | -echo "$as_me:12148: checking for inline" >&5 | ||
8179 | +echo "$as_me:12217: checking for inline" >&5 | ||
8180 | echo $ECHO_N "checking for inline... $ECHO_C" >&6 | ||
8181 | if test "${ac_cv_c_inline+set}" = set; then | ||
8182 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8183 | @@ -12153,7 +12222,7 @@ | ||
8184 | ac_cv_c_inline=no | ||
8185 | for ac_kw in inline __inline__ __inline; do | ||
8186 | cat >conftest.$ac_ext <<_ACEOF | ||
8187 | -#line 12156 "configure" | ||
8188 | +#line 12225 "configure" | ||
8189 | #include "confdefs.h" | ||
8190 | #ifndef __cplusplus | ||
8191 | static $ac_kw int static_foo () {return 0; } | ||
8192 | @@ -12162,16 +12231,16 @@ | ||
8193 | |||
8194 | _ACEOF | ||
8195 | rm -f conftest.$ac_objext | ||
8196 | -if { (eval echo "$as_me:12165: \"$ac_compile\"") >&5 | ||
8197 | +if { (eval echo "$as_me:12234: \"$ac_compile\"") >&5 | ||
8198 | (eval $ac_compile) 2>&5 | ||
8199 | ac_status=$? | ||
8200 | - echo "$as_me:12168: \$? = $ac_status" >&5 | ||
8201 | + echo "$as_me:12237: \$? = $ac_status" >&5 | ||
8202 | (exit $ac_status); } && | ||
8203 | { ac_try='test -s conftest.$ac_objext' | ||
8204 | - { (eval echo "$as_me:12171: \"$ac_try\"") >&5 | ||
8205 | + { (eval echo "$as_me:12240: \"$ac_try\"") >&5 | ||
8206 | (eval $ac_try) 2>&5 | ||
8207 | ac_status=$? | ||
8208 | - echo "$as_me:12174: \$? = $ac_status" >&5 | ||
8209 | + echo "$as_me:12243: \$? = $ac_status" >&5 | ||
8210 | (exit $ac_status); }; }; then | ||
8211 | ac_cv_c_inline=$ac_kw; break | ||
8212 | else | ||
8213 | @@ -12182,7 +12251,7 @@ | ||
8214 | done | ||
8215 | |||
8216 | fi | ||
8217 | -echo "$as_me:12185: result: $ac_cv_c_inline" >&5 | ||
8218 | +echo "$as_me:12254: result: $ac_cv_c_inline" >&5 | ||
8219 | echo "${ECHO_T}$ac_cv_c_inline" >&6 | ||
8220 | case $ac_cv_c_inline in | ||
8221 | inline | yes) ;; | ||
8222 | @@ -12205,7 +12274,7 @@ | ||
8223 | : | ||
8224 | elif test "$GCC" = yes | ||
8225 | then | ||
8226 | - echo "$as_me:12208: checking if gcc supports options to tune inlining" >&5 | ||
8227 | + echo "$as_me:12277: checking if gcc supports options to tune inlining" >&5 | ||
8228 | echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6 | ||
8229 | if test "${cf_cv_gcc_inline+set}" = set; then | ||
8230 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8231 | @@ -12214,7 +12283,7 @@ | ||
8232 | cf_save_CFLAGS=$CFLAGS | ||
8233 | CFLAGS="$CFLAGS --param max-inline-insns-single=1200" | ||
8234 | cat >conftest.$ac_ext <<_ACEOF | ||
8235 | -#line 12217 "configure" | ||
8236 | +#line 12286 "configure" | ||
8237 | #include "confdefs.h" | ||
8238 | inline int foo(void) { return 1; } | ||
8239 | int | ||
8240 | @@ -12226,16 +12295,16 @@ | ||
8241 | } | ||
8242 | _ACEOF | ||
8243 | rm -f conftest.$ac_objext | ||
8244 | -if { (eval echo "$as_me:12229: \"$ac_compile\"") >&5 | ||
8245 | +if { (eval echo "$as_me:12298: \"$ac_compile\"") >&5 | ||
8246 | (eval $ac_compile) 2>&5 | ||
8247 | ac_status=$? | ||
8248 | - echo "$as_me:12232: \$? = $ac_status" >&5 | ||
8249 | + echo "$as_me:12301: \$? = $ac_status" >&5 | ||
8250 | (exit $ac_status); } && | ||
8251 | { ac_try='test -s conftest.$ac_objext' | ||
8252 | - { (eval echo "$as_me:12235: \"$ac_try\"") >&5 | ||
8253 | + { (eval echo "$as_me:12304: \"$ac_try\"") >&5 | ||
8254 | (eval $ac_try) 2>&5 | ||
8255 | ac_status=$? | ||
8256 | - echo "$as_me:12238: \$? = $ac_status" >&5 | ||
8257 | + echo "$as_me:12307: \$? = $ac_status" >&5 | ||
8258 | (exit $ac_status); }; }; then | ||
8259 | cf_cv_gcc_inline=yes | ||
8260 | else | ||
8261 | @@ -12247,7 +12316,7 @@ | ||
8262 | CFLAGS=$cf_save_CFLAGS | ||
8263 | |||
8264 | fi | ||
8265 | -echo "$as_me:12250: result: $cf_cv_gcc_inline" >&5 | ||
8266 | +echo "$as_me:12319: result: $cf_cv_gcc_inline" >&5 | ||
8267 | echo "${ECHO_T}$cf_cv_gcc_inline" >&6 | ||
8268 | if test "$cf_cv_gcc_inline" = yes ; then | ||
8269 | |||
8270 | @@ -12323,7 +12392,7 @@ | ||
8271 | fi | ||
8272 | fi | ||
8273 | |||
8274 | -echo "$as_me:12326: checking for signal global datatype" >&5 | ||
8275 | +echo "$as_me:12395: checking for signal global datatype" >&5 | ||
8276 | echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 | ||
8277 | if test "${cf_cv_sig_atomic_t+set}" = set; then | ||
8278 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8279 | @@ -12335,7 +12404,7 @@ | ||
8280 | "int" | ||
8281 | do | ||
8282 | cat >conftest.$ac_ext <<_ACEOF | ||
8283 | -#line 12338 "configure" | ||
8284 | +#line 12407 "configure" | ||
8285 | #include "confdefs.h" | ||
8286 | |||
8287 | #include <sys/types.h> | ||
8288 | @@ -12358,16 +12427,16 @@ | ||
8289 | } | ||
8290 | _ACEOF | ||
8291 | rm -f conftest.$ac_objext | ||
8292 | -if { (eval echo "$as_me:12361: \"$ac_compile\"") >&5 | ||
8293 | +if { (eval echo "$as_me:12430: \"$ac_compile\"") >&5 | ||
8294 | (eval $ac_compile) 2>&5 | ||
8295 | ac_status=$? | ||
8296 | - echo "$as_me:12364: \$? = $ac_status" >&5 | ||
8297 | + echo "$as_me:12433: \$? = $ac_status" >&5 | ||
8298 | (exit $ac_status); } && | ||
8299 | { ac_try='test -s conftest.$ac_objext' | ||
8300 | - { (eval echo "$as_me:12367: \"$ac_try\"") >&5 | ||
8301 | + { (eval echo "$as_me:12436: \"$ac_try\"") >&5 | ||
8302 | (eval $ac_try) 2>&5 | ||
8303 | ac_status=$? | ||
8304 | - echo "$as_me:12370: \$? = $ac_status" >&5 | ||
8305 | + echo "$as_me:12439: \$? = $ac_status" >&5 | ||
8306 | (exit $ac_status); }; }; then | ||
8307 | cf_cv_sig_atomic_t=$cf_type | ||
8308 | else | ||
8309 | @@ -12381,7 +12450,7 @@ | ||
8310 | |||
8311 | fi | ||
8312 | |||
8313 | -echo "$as_me:12384: result: $cf_cv_sig_atomic_t" >&5 | ||
8314 | +echo "$as_me:12453: result: $cf_cv_sig_atomic_t" >&5 | ||
8315 | echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 | ||
8316 | test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF | ||
8317 | #define SIG_ATOMIC_T $cf_cv_sig_atomic_t | ||
8318 | @@ -12389,7 +12458,7 @@ | ||
8319 | |||
8320 | if test $NCURSES_CHTYPE = auto ; then | ||
8321 | |||
8322 | -echo "$as_me:12392: checking for type of chtype" >&5 | ||
8323 | +echo "$as_me:12461: checking for type of chtype" >&5 | ||
8324 | echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 | ||
8325 | if test "${cf_cv_typeof_chtype+set}" = set; then | ||
8326 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8327 | @@ -12399,7 +12468,7 @@ | ||
8328 | cf_cv_typeof_chtype=long | ||
8329 | else | ||
8330 | cat >conftest.$ac_ext <<_ACEOF | ||
8331 | -#line 12402 "configure" | ||
8332 | +#line 12471 "configure" | ||
8333 | #include "confdefs.h" | ||
8334 | |||
8335 | #define WANT_BITS 31 | ||
8336 | @@ -12434,15 +12503,15 @@ | ||
8337 | |||
8338 | _ACEOF | ||
8339 | rm -f conftest$ac_exeext | ||
8340 | -if { (eval echo "$as_me:12437: \"$ac_link\"") >&5 | ||
8341 | +if { (eval echo "$as_me:12506: \"$ac_link\"") >&5 | ||
8342 | (eval $ac_link) 2>&5 | ||
8343 | ac_status=$? | ||
8344 | - echo "$as_me:12440: \$? = $ac_status" >&5 | ||
8345 | + echo "$as_me:12509: \$? = $ac_status" >&5 | ||
8346 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
8347 | - { (eval echo "$as_me:12442: \"$ac_try\"") >&5 | ||
8348 | + { (eval echo "$as_me:12511: \"$ac_try\"") >&5 | ||
8349 | (eval $ac_try) 2>&5 | ||
8350 | ac_status=$? | ||
8351 | - echo "$as_me:12445: \$? = $ac_status" >&5 | ||
8352 | + echo "$as_me:12514: \$? = $ac_status" >&5 | ||
8353 | (exit $ac_status); }; }; then | ||
8354 | cf_cv_typeof_chtype=`cat cf_test.out` | ||
8355 | else | ||
8356 | @@ -12457,7 +12526,7 @@ | ||
8357 | |||
8358 | fi | ||
8359 | |||
8360 | -echo "$as_me:12460: result: $cf_cv_typeof_chtype" >&5 | ||
8361 | +echo "$as_me:12529: result: $cf_cv_typeof_chtype" >&5 | ||
8362 | echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 | ||
8363 | |||
8364 | cat >>confdefs.h <<EOF | ||
8365 | @@ -12469,14 +12538,14 @@ | ||
8366 | fi | ||
8367 | test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype="" | ||
8368 | |||
8369 | -echo "$as_me:12472: checking if unsigned literals are legal" >&5 | ||
8370 | +echo "$as_me:12541: checking if unsigned literals are legal" >&5 | ||
8371 | echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 | ||
8372 | if test "${cf_cv_unsigned_literals+set}" = set; then | ||
8373 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8374 | else | ||
8375 | |||
8376 | cat >conftest.$ac_ext <<_ACEOF | ||
8377 | -#line 12479 "configure" | ||
8378 | +#line 12548 "configure" | ||
8379 | #include "confdefs.h" | ||
8380 | |||
8381 | int | ||
8382 | @@ -12488,16 +12557,16 @@ | ||
8383 | } | ||
8384 | _ACEOF | ||
8385 | rm -f conftest.$ac_objext | ||
8386 | -if { (eval echo "$as_me:12491: \"$ac_compile\"") >&5 | ||
8387 | +if { (eval echo "$as_me:12560: \"$ac_compile\"") >&5 | ||
8388 | (eval $ac_compile) 2>&5 | ||
8389 | ac_status=$? | ||
8390 | - echo "$as_me:12494: \$? = $ac_status" >&5 | ||
8391 | + echo "$as_me:12563: \$? = $ac_status" >&5 | ||
8392 | (exit $ac_status); } && | ||
8393 | { ac_try='test -s conftest.$ac_objext' | ||
8394 | - { (eval echo "$as_me:12497: \"$ac_try\"") >&5 | ||
8395 | + { (eval echo "$as_me:12566: \"$ac_try\"") >&5 | ||
8396 | (eval $ac_try) 2>&5 | ||
8397 | ac_status=$? | ||
8398 | - echo "$as_me:12500: \$? = $ac_status" >&5 | ||
8399 | + echo "$as_me:12569: \$? = $ac_status" >&5 | ||
8400 | (exit $ac_status); }; }; then | ||
8401 | cf_cv_unsigned_literals=yes | ||
8402 | else | ||
8403 | @@ -12509,7 +12578,7 @@ | ||
8404 | |||
8405 | fi | ||
8406 | |||
8407 | -echo "$as_me:12512: result: $cf_cv_unsigned_literals" >&5 | ||
8408 | +echo "$as_me:12581: result: $cf_cv_unsigned_literals" >&5 | ||
8409 | echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 | ||
8410 | |||
8411 | cf_cv_1UL="1" | ||
8412 | @@ -12525,14 +12594,14 @@ | ||
8413 | |||
8414 | ### Checks for external-data | ||
8415 | |||
8416 | -echo "$as_me:12528: checking if external errno is declared" >&5 | ||
8417 | +echo "$as_me:12597: checking if external errno is declared" >&5 | ||
8418 | echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 | ||
8419 | if test "${cf_cv_dcl_errno+set}" = set; then | ||
8420 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8421 | else | ||
8422 | |||
8423 | cat >conftest.$ac_ext <<_ACEOF | ||
8424 | -#line 12535 "configure" | ||
8425 | +#line 12604 "configure" | ||
8426 | #include "confdefs.h" | ||
8427 | |||
8428 | #ifdef HAVE_STDLIB_H | ||
8429 | @@ -12550,16 +12619,16 @@ | ||
8430 | } | ||
8431 | _ACEOF | ||
8432 | rm -f conftest.$ac_objext | ||
8433 | -if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5 | ||
8434 | +if { (eval echo "$as_me:12622: \"$ac_compile\"") >&5 | ||
8435 | (eval $ac_compile) 2>&5 | ||
8436 | ac_status=$? | ||
8437 | - echo "$as_me:12556: \$? = $ac_status" >&5 | ||
8438 | + echo "$as_me:12625: \$? = $ac_status" >&5 | ||
8439 | (exit $ac_status); } && | ||
8440 | { ac_try='test -s conftest.$ac_objext' | ||
8441 | - { (eval echo "$as_me:12559: \"$ac_try\"") >&5 | ||
8442 | + { (eval echo "$as_me:12628: \"$ac_try\"") >&5 | ||
8443 | (eval $ac_try) 2>&5 | ||
8444 | ac_status=$? | ||
8445 | - echo "$as_me:12562: \$? = $ac_status" >&5 | ||
8446 | + echo "$as_me:12631: \$? = $ac_status" >&5 | ||
8447 | (exit $ac_status); }; }; then | ||
8448 | cf_cv_dcl_errno=yes | ||
8449 | else | ||
8450 | @@ -12570,7 +12639,7 @@ | ||
8451 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
8452 | |||
8453 | fi | ||
8454 | -echo "$as_me:12573: result: $cf_cv_dcl_errno" >&5 | ||
8455 | +echo "$as_me:12642: result: $cf_cv_dcl_errno" >&5 | ||
8456 | echo "${ECHO_T}$cf_cv_dcl_errno" >&6 | ||
8457 | |||
8458 | if test "$cf_cv_dcl_errno" = no ; then | ||
8459 | @@ -12585,14 +12654,14 @@ | ||
8460 | |||
8461 | # It's possible (for near-UNIX clones) that the data doesn't exist | ||
8462 | |||
8463 | -echo "$as_me:12588: checking if external errno exists" >&5 | ||
8464 | +echo "$as_me:12657: checking if external errno exists" >&5 | ||
8465 | echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 | ||
8466 | if test "${cf_cv_have_errno+set}" = set; then | ||
8467 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8468 | else | ||
8469 | |||
8470 | cat >conftest.$ac_ext <<_ACEOF | ||
8471 | -#line 12595 "configure" | ||
8472 | +#line 12664 "configure" | ||
8473 | #include "confdefs.h" | ||
8474 | |||
8475 | #undef errno | ||
8476 | @@ -12607,16 +12676,16 @@ | ||
8477 | } | ||
8478 | _ACEOF | ||
8479 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
8480 | -if { (eval echo "$as_me:12610: \"$ac_link\"") >&5 | ||
8481 | +if { (eval echo "$as_me:12679: \"$ac_link\"") >&5 | ||
8482 | (eval $ac_link) 2>&5 | ||
8483 | ac_status=$? | ||
8484 | - echo "$as_me:12613: \$? = $ac_status" >&5 | ||
8485 | + echo "$as_me:12682: \$? = $ac_status" >&5 | ||
8486 | (exit $ac_status); } && | ||
8487 | { ac_try='test -s conftest$ac_exeext' | ||
8488 | - { (eval echo "$as_me:12616: \"$ac_try\"") >&5 | ||
8489 | + { (eval echo "$as_me:12685: \"$ac_try\"") >&5 | ||
8490 | (eval $ac_try) 2>&5 | ||
8491 | ac_status=$? | ||
8492 | - echo "$as_me:12619: \$? = $ac_status" >&5 | ||
8493 | + echo "$as_me:12688: \$? = $ac_status" >&5 | ||
8494 | (exit $ac_status); }; }; then | ||
8495 | cf_cv_have_errno=yes | ||
8496 | else | ||
8497 | @@ -12627,7 +12696,7 @@ | ||
8498 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
8499 | |||
8500 | fi | ||
8501 | -echo "$as_me:12630: result: $cf_cv_have_errno" >&5 | ||
8502 | +echo "$as_me:12699: result: $cf_cv_have_errno" >&5 | ||
8503 | echo "${ECHO_T}$cf_cv_have_errno" >&6 | ||
8504 | |||
8505 | if test "$cf_cv_have_errno" = yes ; then | ||
8506 | @@ -12640,7 +12709,7 @@ | ||
8507 | |||
8508 | fi | ||
8509 | |||
8510 | -echo "$as_me:12643: checking if data-only library module links" >&5 | ||
8511 | +echo "$as_me:12712: checking if data-only library module links" >&5 | ||
8512 | echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 | ||
8513 | if test "${cf_cv_link_dataonly+set}" = set; then | ||
8514 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8515 | @@ -12648,20 +12717,20 @@ | ||
8516 | |||
8517 | rm -f conftest.a | ||
8518 | cat >conftest.$ac_ext <<EOF | ||
8519 | -#line 12651 "configure" | ||
8520 | +#line 12720 "configure" | ||
8521 | int testdata[3] = { 123, 456, 789 }; | ||
8522 | EOF | ||
8523 | - if { (eval echo "$as_me:12654: \"$ac_compile\"") >&5 | ||
8524 | + if { (eval echo "$as_me:12723: \"$ac_compile\"") >&5 | ||
8525 | (eval $ac_compile) 2>&5 | ||
8526 | ac_status=$? | ||
8527 | - echo "$as_me:12657: \$? = $ac_status" >&5 | ||
8528 | + echo "$as_me:12726: \$? = $ac_status" >&5 | ||
8529 | (exit $ac_status); } ; then | ||
8530 | mv conftest.o data.o && \ | ||
8531 | ( $AR $AR_OPTS conftest.a data.o ) 2>&5 1>/dev/null | ||
8532 | fi | ||
8533 | rm -f conftest.$ac_ext data.o | ||
8534 | cat >conftest.$ac_ext <<EOF | ||
8535 | -#line 12664 "configure" | ||
8536 | +#line 12733 "configure" | ||
8537 | int testfunc() | ||
8538 | { | ||
8539 | #if defined(NeXT) | ||
8540 | @@ -12674,10 +12743,10 @@ | ||
8541 | #endif | ||
8542 | } | ||
8543 | EOF | ||
8544 | - if { (eval echo "$as_me:12677: \"$ac_compile\"") >&5 | ||
8545 | + if { (eval echo "$as_me:12746: \"$ac_compile\"") >&5 | ||
8546 | (eval $ac_compile) 2>&5 | ||
8547 | ac_status=$? | ||
8548 | - echo "$as_me:12680: \$? = $ac_status" >&5 | ||
8549 | + echo "$as_me:12749: \$? = $ac_status" >&5 | ||
8550 | (exit $ac_status); }; then | ||
8551 | mv conftest.o func.o && \ | ||
8552 | ( $AR $AR_OPTS conftest.a func.o ) 2>&5 1>/dev/null | ||
8553 | @@ -12690,7 +12759,7 @@ | ||
8554 | cf_cv_link_dataonly=unknown | ||
8555 | else | ||
8556 | cat >conftest.$ac_ext <<_ACEOF | ||
8557 | -#line 12693 "configure" | ||
8558 | +#line 12762 "configure" | ||
8559 | #include "confdefs.h" | ||
8560 | |||
8561 | int main() | ||
8562 | @@ -12701,15 +12770,15 @@ | ||
8563 | |||
8564 | _ACEOF | ||
8565 | rm -f conftest$ac_exeext | ||
8566 | -if { (eval echo "$as_me:12704: \"$ac_link\"") >&5 | ||
8567 | +if { (eval echo "$as_me:12773: \"$ac_link\"") >&5 | ||
8568 | (eval $ac_link) 2>&5 | ||
8569 | ac_status=$? | ||
8570 | - echo "$as_me:12707: \$? = $ac_status" >&5 | ||
8571 | + echo "$as_me:12776: \$? = $ac_status" >&5 | ||
8572 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
8573 | - { (eval echo "$as_me:12709: \"$ac_try\"") >&5 | ||
8574 | + { (eval echo "$as_me:12778: \"$ac_try\"") >&5 | ||
8575 | (eval $ac_try) 2>&5 | ||
8576 | ac_status=$? | ||
8577 | - echo "$as_me:12712: \$? = $ac_status" >&5 | ||
8578 | + echo "$as_me:12781: \$? = $ac_status" >&5 | ||
8579 | (exit $ac_status); }; }; then | ||
8580 | cf_cv_link_dataonly=yes | ||
8581 | else | ||
8582 | @@ -12724,7 +12793,7 @@ | ||
8583 | |||
8584 | fi | ||
8585 | |||
8586 | -echo "$as_me:12727: result: $cf_cv_link_dataonly" >&5 | ||
8587 | +echo "$as_me:12796: result: $cf_cv_link_dataonly" >&5 | ||
8588 | echo "${ECHO_T}$cf_cv_link_dataonly" >&6 | ||
8589 | |||
8590 | if test "$cf_cv_link_dataonly" = no ; then | ||
8591 | @@ -12759,13 +12828,13 @@ | ||
8592 | |||
8593 | do | ||
8594 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
8595 | -echo "$as_me:12762: checking for $ac_func" >&5 | ||
8596 | +echo "$as_me:12831: checking for $ac_func" >&5 | ||
8597 | echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | ||
8598 | if eval "test \"\${$as_ac_var+set}\" = set"; then | ||
8599 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8600 | else | ||
8601 | cat >conftest.$ac_ext <<_ACEOF | ||
8602 | -#line 12768 "configure" | ||
8603 | +#line 12837 "configure" | ||
8604 | #include "confdefs.h" | ||
8605 | /* System header to define __stub macros and hopefully few prototypes, | ||
8606 | which can conflict with char $ac_func (); below. */ | ||
8607 | @@ -12796,16 +12865,16 @@ | ||
8608 | } | ||
8609 | _ACEOF | ||
8610 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
8611 | -if { (eval echo "$as_me:12799: \"$ac_link\"") >&5 | ||
8612 | +if { (eval echo "$as_me:12868: \"$ac_link\"") >&5 | ||
8613 | (eval $ac_link) 2>&5 | ||
8614 | ac_status=$? | ||
8615 | - echo "$as_me:12802: \$? = $ac_status" >&5 | ||
8616 | + echo "$as_me:12871: \$? = $ac_status" >&5 | ||
8617 | (exit $ac_status); } && | ||
8618 | { ac_try='test -s conftest$ac_exeext' | ||
8619 | - { (eval echo "$as_me:12805: \"$ac_try\"") >&5 | ||
8620 | + { (eval echo "$as_me:12874: \"$ac_try\"") >&5 | ||
8621 | (eval $ac_try) 2>&5 | ||
8622 | ac_status=$? | ||
8623 | - echo "$as_me:12808: \$? = $ac_status" >&5 | ||
8624 | + echo "$as_me:12877: \$? = $ac_status" >&5 | ||
8625 | (exit $ac_status); }; }; then | ||
8626 | eval "$as_ac_var=yes" | ||
8627 | else | ||
8628 | @@ -12815,7 +12884,7 @@ | ||
8629 | fi | ||
8630 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
8631 | fi | ||
8632 | -echo "$as_me:12818: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
8633 | +echo "$as_me:12887: result: `eval echo '${'$as_ac_var'}'`" >&5 | ||
8634 | echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | ||
8635 | if test `eval echo '${'$as_ac_var'}'` = yes; then | ||
8636 | cat >>confdefs.h <<EOF | ||
8637 | @@ -12827,14 +12896,14 @@ | ||
8638 | |||
8639 | if test "$with_getcap" = "yes" ; then | ||
8640 | |||
8641 | -echo "$as_me:12830: checking for terminal-capability database functions" >&5 | ||
8642 | +echo "$as_me:12899: checking for terminal-capability database functions" >&5 | ||
8643 | echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 | ||
8644 | if test "${cf_cv_cgetent+set}" = set; then | ||
8645 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8646 | else | ||
8647 | |||
8648 | cat >conftest.$ac_ext <<_ACEOF | ||
8649 | -#line 12837 "configure" | ||
8650 | +#line 12906 "configure" | ||
8651 | #include "confdefs.h" | ||
8652 | |||
8653 | #include <stdlib.h> | ||
8654 | @@ -12854,16 +12923,16 @@ | ||
8655 | } | ||
8656 | _ACEOF | ||
8657 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
8658 | -if { (eval echo "$as_me:12857: \"$ac_link\"") >&5 | ||
8659 | +if { (eval echo "$as_me:12926: \"$ac_link\"") >&5 | ||
8660 | (eval $ac_link) 2>&5 | ||
8661 | ac_status=$? | ||
8662 | - echo "$as_me:12860: \$? = $ac_status" >&5 | ||
8663 | + echo "$as_me:12929: \$? = $ac_status" >&5 | ||
8664 | (exit $ac_status); } && | ||
8665 | { ac_try='test -s conftest$ac_exeext' | ||
8666 | - { (eval echo "$as_me:12863: \"$ac_try\"") >&5 | ||
8667 | + { (eval echo "$as_me:12932: \"$ac_try\"") >&5 | ||
8668 | (eval $ac_try) 2>&5 | ||
8669 | ac_status=$? | ||
8670 | - echo "$as_me:12866: \$? = $ac_status" >&5 | ||
8671 | + echo "$as_me:12935: \$? = $ac_status" >&5 | ||
8672 | (exit $ac_status); }; }; then | ||
8673 | cf_cv_cgetent=yes | ||
8674 | else | ||
8675 | @@ -12875,7 +12944,7 @@ | ||
8676 | |||
8677 | fi | ||
8678 | |||
8679 | -echo "$as_me:12878: result: $cf_cv_cgetent" >&5 | ||
8680 | +echo "$as_me:12947: result: $cf_cv_cgetent" >&5 | ||
8681 | echo "${ECHO_T}$cf_cv_cgetent" >&6 | ||
8682 | test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF | ||
8683 | #define HAVE_BSD_CGETENT 1 | ||
8684 | @@ -12883,14 +12952,14 @@ | ||
8685 | |||
8686 | fi | ||
8687 | |||
8688 | -echo "$as_me:12886: checking for isascii" >&5 | ||
8689 | +echo "$as_me:12955: checking for isascii" >&5 | ||
8690 | echo $ECHO_N "checking for isascii... $ECHO_C" >&6 | ||
8691 | if test "${cf_cv_have_isascii+set}" = set; then | ||
8692 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8693 | else | ||
8694 | |||
8695 | cat >conftest.$ac_ext <<_ACEOF | ||
8696 | -#line 12893 "configure" | ||
8697 | +#line 12962 "configure" | ||
8698 | #include "confdefs.h" | ||
8699 | #include <ctype.h> | ||
8700 | int | ||
8701 | @@ -12902,16 +12971,16 @@ | ||
8702 | } | ||
8703 | _ACEOF | ||
8704 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
8705 | -if { (eval echo "$as_me:12905: \"$ac_link\"") >&5 | ||
8706 | +if { (eval echo "$as_me:12974: \"$ac_link\"") >&5 | ||
8707 | (eval $ac_link) 2>&5 | ||
8708 | ac_status=$? | ||
8709 | - echo "$as_me:12908: \$? = $ac_status" >&5 | ||
8710 | + echo "$as_me:12977: \$? = $ac_status" >&5 | ||
8711 | (exit $ac_status); } && | ||
8712 | { ac_try='test -s conftest$ac_exeext' | ||
8713 | - { (eval echo "$as_me:12911: \"$ac_try\"") >&5 | ||
8714 | + { (eval echo "$as_me:12980: \"$ac_try\"") >&5 | ||
8715 | (eval $ac_try) 2>&5 | ||
8716 | ac_status=$? | ||
8717 | - echo "$as_me:12914: \$? = $ac_status" >&5 | ||
8718 | + echo "$as_me:12983: \$? = $ac_status" >&5 | ||
8719 | (exit $ac_status); }; }; then | ||
8720 | cf_cv_have_isascii=yes | ||
8721 | else | ||
8722 | @@ -12922,17 +12991,17 @@ | ||
8723 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
8724 | |||
8725 | fi | ||
8726 | -echo "$as_me:12925: result: $cf_cv_have_isascii" >&5 | ||
8727 | +echo "$as_me:12994: result: $cf_cv_have_isascii" >&5 | ||
8728 | echo "${ECHO_T}$cf_cv_have_isascii" >&6 | ||
8729 | test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF | ||
8730 | #define HAVE_ISASCII 1 | ||
8731 | EOF | ||
8732 | |||
8733 | if test "$ac_cv_func_sigaction" = yes; then | ||
8734 | -echo "$as_me:12932: checking whether sigaction needs _POSIX_SOURCE" >&5 | ||
8735 | +echo "$as_me:13001: checking whether sigaction needs _POSIX_SOURCE" >&5 | ||
8736 | echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 | ||
8737 | cat >conftest.$ac_ext <<_ACEOF | ||
8738 | -#line 12935 "configure" | ||
8739 | +#line 13004 "configure" | ||
8740 | #include "confdefs.h" | ||
8741 | |||
8742 | #include <sys/types.h> | ||
8743 | @@ -12946,16 +13015,16 @@ | ||
8744 | } | ||
8745 | _ACEOF | ||
8746 | rm -f conftest.$ac_objext | ||
8747 | -if { (eval echo "$as_me:12949: \"$ac_compile\"") >&5 | ||
8748 | +if { (eval echo "$as_me:13018: \"$ac_compile\"") >&5 | ||
8749 | (eval $ac_compile) 2>&5 | ||
8750 | ac_status=$? | ||
8751 | - echo "$as_me:12952: \$? = $ac_status" >&5 | ||
8752 | + echo "$as_me:13021: \$? = $ac_status" >&5 | ||
8753 | (exit $ac_status); } && | ||
8754 | { ac_try='test -s conftest.$ac_objext' | ||
8755 | - { (eval echo "$as_me:12955: \"$ac_try\"") >&5 | ||
8756 | + { (eval echo "$as_me:13024: \"$ac_try\"") >&5 | ||
8757 | (eval $ac_try) 2>&5 | ||
8758 | ac_status=$? | ||
8759 | - echo "$as_me:12958: \$? = $ac_status" >&5 | ||
8760 | + echo "$as_me:13027: \$? = $ac_status" >&5 | ||
8761 | (exit $ac_status); }; }; then | ||
8762 | sigact_bad=no | ||
8763 | else | ||
8764 | @@ -12963,7 +13032,7 @@ | ||
8765 | cat conftest.$ac_ext >&5 | ||
8766 | |||
8767 | cat >conftest.$ac_ext <<_ACEOF | ||
8768 | -#line 12966 "configure" | ||
8769 | +#line 13035 "configure" | ||
8770 | #include "confdefs.h" | ||
8771 | |||
8772 | #define _POSIX_SOURCE | ||
8773 | @@ -12978,16 +13047,16 @@ | ||
8774 | } | ||
8775 | _ACEOF | ||
8776 | rm -f conftest.$ac_objext | ||
8777 | -if { (eval echo "$as_me:12981: \"$ac_compile\"") >&5 | ||
8778 | +if { (eval echo "$as_me:13050: \"$ac_compile\"") >&5 | ||
8779 | (eval $ac_compile) 2>&5 | ||
8780 | ac_status=$? | ||
8781 | - echo "$as_me:12984: \$? = $ac_status" >&5 | ||
8782 | + echo "$as_me:13053: \$? = $ac_status" >&5 | ||
8783 | (exit $ac_status); } && | ||
8784 | { ac_try='test -s conftest.$ac_objext' | ||
8785 | - { (eval echo "$as_me:12987: \"$ac_try\"") >&5 | ||
8786 | + { (eval echo "$as_me:13056: \"$ac_try\"") >&5 | ||
8787 | (eval $ac_try) 2>&5 | ||
8788 | ac_status=$? | ||
8789 | - echo "$as_me:12990: \$? = $ac_status" >&5 | ||
8790 | + echo "$as_me:13059: \$? = $ac_status" >&5 | ||
8791 | (exit $ac_status); }; }; then | ||
8792 | sigact_bad=yes | ||
8793 | cat >>confdefs.h <<\EOF | ||
8794 | @@ -13002,11 +13071,11 @@ | ||
8795 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
8796 | fi | ||
8797 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
8798 | -echo "$as_me:13005: result: $sigact_bad" >&5 | ||
8799 | +echo "$as_me:13074: result: $sigact_bad" >&5 | ||
8800 | echo "${ECHO_T}$sigact_bad" >&6 | ||
8801 | fi | ||
8802 | |||
8803 | -echo "$as_me:13009: checking if nanosleep really works" >&5 | ||
8804 | +echo "$as_me:13078: checking if nanosleep really works" >&5 | ||
8805 | echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 | ||
8806 | if test "${cf_cv_func_nanosleep+set}" = set; then | ||
8807 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8808 | @@ -13016,7 +13085,7 @@ | ||
8809 | cf_cv_func_nanosleep=unknown | ||
8810 | else | ||
8811 | cat >conftest.$ac_ext <<_ACEOF | ||
8812 | -#line 13019 "configure" | ||
8813 | +#line 13088 "configure" | ||
8814 | #include "confdefs.h" | ||
8815 | |||
8816 | #include <stdio.h> | ||
8817 | @@ -13041,15 +13110,15 @@ | ||
8818 | |||
8819 | _ACEOF | ||
8820 | rm -f conftest$ac_exeext | ||
8821 | -if { (eval echo "$as_me:13044: \"$ac_link\"") >&5 | ||
8822 | +if { (eval echo "$as_me:13113: \"$ac_link\"") >&5 | ||
8823 | (eval $ac_link) 2>&5 | ||
8824 | ac_status=$? | ||
8825 | - echo "$as_me:13047: \$? = $ac_status" >&5 | ||
8826 | + echo "$as_me:13116: \$? = $ac_status" >&5 | ||
8827 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
8828 | - { (eval echo "$as_me:13049: \"$ac_try\"") >&5 | ||
8829 | + { (eval echo "$as_me:13118: \"$ac_try\"") >&5 | ||
8830 | (eval $ac_try) 2>&5 | ||
8831 | ac_status=$? | ||
8832 | - echo "$as_me:13052: \$? = $ac_status" >&5 | ||
8833 | + echo "$as_me:13121: \$? = $ac_status" >&5 | ||
8834 | (exit $ac_status); }; }; then | ||
8835 | cf_cv_func_nanosleep=yes | ||
8836 | else | ||
8837 | @@ -13061,7 +13130,7 @@ | ||
8838 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
8839 | fi | ||
8840 | fi | ||
8841 | -echo "$as_me:13064: result: $cf_cv_func_nanosleep" >&5 | ||
8842 | +echo "$as_me:13133: result: $cf_cv_func_nanosleep" >&5 | ||
8843 | echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 | ||
8844 | |||
8845 | test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF | ||
8846 | @@ -13075,23 +13144,23 @@ | ||
8847 | |||
8848 | do | ||
8849 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
8850 | -echo "$as_me:13078: checking for $ac_header" >&5 | ||
8851 | +echo "$as_me:13147: checking for $ac_header" >&5 | ||
8852 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
8853 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
8854 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8855 | else | ||
8856 | cat >conftest.$ac_ext <<_ACEOF | ||
8857 | -#line 13084 "configure" | ||
8858 | +#line 13153 "configure" | ||
8859 | #include "confdefs.h" | ||
8860 | #include <$ac_header> | ||
8861 | _ACEOF | ||
8862 | -if { (eval echo "$as_me:13088: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
8863 | +if { (eval echo "$as_me:13157: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
8864 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
8865 | ac_status=$? | ||
8866 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
8867 | rm -f conftest.er1 | ||
8868 | cat conftest.err >&5 | ||
8869 | - echo "$as_me:13094: \$? = $ac_status" >&5 | ||
8870 | + echo "$as_me:13163: \$? = $ac_status" >&5 | ||
8871 | (exit $ac_status); } >/dev/null; then | ||
8872 | if test -s conftest.err; then | ||
8873 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
8874 | @@ -13110,7 +13179,7 @@ | ||
8875 | fi | ||
8876 | rm -f conftest.err conftest.$ac_ext | ||
8877 | fi | ||
8878 | -echo "$as_me:13113: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
8879 | +echo "$as_me:13182: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
8880 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
8881 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
8882 | cat >>confdefs.h <<EOF | ||
8883 | @@ -13125,23 +13194,23 @@ | ||
8884 | for ac_header in sys/termio.h | ||
8885 | do | ||
8886 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
8887 | -echo "$as_me:13128: checking for $ac_header" >&5 | ||
8888 | +echo "$as_me:13197: checking for $ac_header" >&5 | ||
8889 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
8890 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
8891 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8892 | else | ||
8893 | cat >conftest.$ac_ext <<_ACEOF | ||
8894 | -#line 13134 "configure" | ||
8895 | +#line 13203 "configure" | ||
8896 | #include "confdefs.h" | ||
8897 | #include <$ac_header> | ||
8898 | _ACEOF | ||
8899 | -if { (eval echo "$as_me:13138: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
8900 | +if { (eval echo "$as_me:13207: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
8901 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
8902 | ac_status=$? | ||
8903 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
8904 | rm -f conftest.er1 | ||
8905 | cat conftest.err >&5 | ||
8906 | - echo "$as_me:13144: \$? = $ac_status" >&5 | ||
8907 | + echo "$as_me:13213: \$? = $ac_status" >&5 | ||
8908 | (exit $ac_status); } >/dev/null; then | ||
8909 | if test -s conftest.err; then | ||
8910 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
8911 | @@ -13160,7 +13229,7 @@ | ||
8912 | fi | ||
8913 | rm -f conftest.err conftest.$ac_ext | ||
8914 | fi | ||
8915 | -echo "$as_me:13163: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
8916 | +echo "$as_me:13232: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
8917 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
8918 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
8919 | cat >>confdefs.h <<EOF | ||
8920 | @@ -13178,10 +13247,10 @@ | ||
8921 | *) termios_bad=maybe ;; | ||
8922 | esac | ||
8923 | if test "$termios_bad" = maybe ; then | ||
8924 | - echo "$as_me:13181: checking whether termios.h needs _POSIX_SOURCE" >&5 | ||
8925 | + echo "$as_me:13250: checking whether termios.h needs _POSIX_SOURCE" >&5 | ||
8926 | echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 | ||
8927 | cat >conftest.$ac_ext <<_ACEOF | ||
8928 | -#line 13184 "configure" | ||
8929 | +#line 13253 "configure" | ||
8930 | #include "confdefs.h" | ||
8931 | #include <termios.h> | ||
8932 | int | ||
8933 | @@ -13193,16 +13262,16 @@ | ||
8934 | } | ||
8935 | _ACEOF | ||
8936 | rm -f conftest.$ac_objext | ||
8937 | -if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5 | ||
8938 | +if { (eval echo "$as_me:13265: \"$ac_compile\"") >&5 | ||
8939 | (eval $ac_compile) 2>&5 | ||
8940 | ac_status=$? | ||
8941 | - echo "$as_me:13199: \$? = $ac_status" >&5 | ||
8942 | + echo "$as_me:13268: \$? = $ac_status" >&5 | ||
8943 | (exit $ac_status); } && | ||
8944 | { ac_try='test -s conftest.$ac_objext' | ||
8945 | - { (eval echo "$as_me:13202: \"$ac_try\"") >&5 | ||
8946 | + { (eval echo "$as_me:13271: \"$ac_try\"") >&5 | ||
8947 | (eval $ac_try) 2>&5 | ||
8948 | ac_status=$? | ||
8949 | - echo "$as_me:13205: \$? = $ac_status" >&5 | ||
8950 | + echo "$as_me:13274: \$? = $ac_status" >&5 | ||
8951 | (exit $ac_status); }; }; then | ||
8952 | termios_bad=no | ||
8953 | else | ||
8954 | @@ -13210,7 +13279,7 @@ | ||
8955 | cat conftest.$ac_ext >&5 | ||
8956 | |||
8957 | cat >conftest.$ac_ext <<_ACEOF | ||
8958 | -#line 13213 "configure" | ||
8959 | +#line 13282 "configure" | ||
8960 | #include "confdefs.h" | ||
8961 | |||
8962 | #define _POSIX_SOURCE | ||
8963 | @@ -13224,16 +13293,16 @@ | ||
8964 | } | ||
8965 | _ACEOF | ||
8966 | rm -f conftest.$ac_objext | ||
8967 | -if { (eval echo "$as_me:13227: \"$ac_compile\"") >&5 | ||
8968 | +if { (eval echo "$as_me:13296: \"$ac_compile\"") >&5 | ||
8969 | (eval $ac_compile) 2>&5 | ||
8970 | ac_status=$? | ||
8971 | - echo "$as_me:13230: \$? = $ac_status" >&5 | ||
8972 | + echo "$as_me:13299: \$? = $ac_status" >&5 | ||
8973 | (exit $ac_status); } && | ||
8974 | { ac_try='test -s conftest.$ac_objext' | ||
8975 | - { (eval echo "$as_me:13233: \"$ac_try\"") >&5 | ||
8976 | + { (eval echo "$as_me:13302: \"$ac_try\"") >&5 | ||
8977 | (eval $ac_try) 2>&5 | ||
8978 | ac_status=$? | ||
8979 | - echo "$as_me:13236: \$? = $ac_status" >&5 | ||
8980 | + echo "$as_me:13305: \$? = $ac_status" >&5 | ||
8981 | (exit $ac_status); }; }; then | ||
8982 | termios_bad=unknown | ||
8983 | else | ||
8984 | @@ -13248,19 +13317,19 @@ | ||
8985 | |||
8986 | fi | ||
8987 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
8988 | - echo "$as_me:13251: result: $termios_bad" >&5 | ||
8989 | + echo "$as_me:13320: result: $termios_bad" >&5 | ||
8990 | echo "${ECHO_T}$termios_bad" >&6 | ||
8991 | fi | ||
8992 | fi | ||
8993 | |||
8994 | -echo "$as_me:13256: checking for tcgetattr" >&5 | ||
8995 | +echo "$as_me:13325: checking for tcgetattr" >&5 | ||
8996 | echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 | ||
8997 | if test "${cf_cv_have_tcgetattr+set}" = set; then | ||
8998 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
8999 | else | ||
9000 | |||
9001 | cat >conftest.$ac_ext <<_ACEOF | ||
9002 | -#line 13263 "configure" | ||
9003 | +#line 13332 "configure" | ||
9004 | #include "confdefs.h" | ||
9005 | |||
9006 | #include <sys/types.h> | ||
9007 | @@ -13288,16 +13357,16 @@ | ||
9008 | } | ||
9009 | _ACEOF | ||
9010 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
9011 | -if { (eval echo "$as_me:13291: \"$ac_link\"") >&5 | ||
9012 | +if { (eval echo "$as_me:13360: \"$ac_link\"") >&5 | ||
9013 | (eval $ac_link) 2>&5 | ||
9014 | ac_status=$? | ||
9015 | - echo "$as_me:13294: \$? = $ac_status" >&5 | ||
9016 | + echo "$as_me:13363: \$? = $ac_status" >&5 | ||
9017 | (exit $ac_status); } && | ||
9018 | { ac_try='test -s conftest$ac_exeext' | ||
9019 | - { (eval echo "$as_me:13297: \"$ac_try\"") >&5 | ||
9020 | + { (eval echo "$as_me:13366: \"$ac_try\"") >&5 | ||
9021 | (eval $ac_try) 2>&5 | ||
9022 | ac_status=$? | ||
9023 | - echo "$as_me:13300: \$? = $ac_status" >&5 | ||
9024 | + echo "$as_me:13369: \$? = $ac_status" >&5 | ||
9025 | (exit $ac_status); }; }; then | ||
9026 | cf_cv_have_tcgetattr=yes | ||
9027 | else | ||
9028 | @@ -13307,20 +13376,20 @@ | ||
9029 | fi | ||
9030 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
9031 | fi | ||
9032 | -echo "$as_me:13310: result: $cf_cv_have_tcgetattr" >&5 | ||
9033 | +echo "$as_me:13379: result: $cf_cv_have_tcgetattr" >&5 | ||
9034 | echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 | ||
9035 | test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF | ||
9036 | #define HAVE_TCGETATTR 1 | ||
9037 | EOF | ||
9038 | |||
9039 | -echo "$as_me:13316: checking for vsscanf function or workaround" >&5 | ||
9040 | +echo "$as_me:13385: checking for vsscanf function or workaround" >&5 | ||
9041 | echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 | ||
9042 | if test "${cf_cv_func_vsscanf+set}" = set; then | ||
9043 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9044 | else | ||
9045 | |||
9046 | cat >conftest.$ac_ext <<_ACEOF | ||
9047 | -#line 13323 "configure" | ||
9048 | +#line 13392 "configure" | ||
9049 | #include "confdefs.h" | ||
9050 | |||
9051 | #include <stdarg.h> | ||
9052 | @@ -13336,16 +13405,16 @@ | ||
9053 | } | ||
9054 | _ACEOF | ||
9055 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
9056 | -if { (eval echo "$as_me:13339: \"$ac_link\"") >&5 | ||
9057 | +if { (eval echo "$as_me:13408: \"$ac_link\"") >&5 | ||
9058 | (eval $ac_link) 2>&5 | ||
9059 | ac_status=$? | ||
9060 | - echo "$as_me:13342: \$? = $ac_status" >&5 | ||
9061 | + echo "$as_me:13411: \$? = $ac_status" >&5 | ||
9062 | (exit $ac_status); } && | ||
9063 | { ac_try='test -s conftest$ac_exeext' | ||
9064 | - { (eval echo "$as_me:13345: \"$ac_try\"") >&5 | ||
9065 | + { (eval echo "$as_me:13414: \"$ac_try\"") >&5 | ||
9066 | (eval $ac_try) 2>&5 | ||
9067 | ac_status=$? | ||
9068 | - echo "$as_me:13348: \$? = $ac_status" >&5 | ||
9069 | + echo "$as_me:13417: \$? = $ac_status" >&5 | ||
9070 | (exit $ac_status); }; }; then | ||
9071 | cf_cv_func_vsscanf=vsscanf | ||
9072 | else | ||
9073 | @@ -13353,7 +13422,7 @@ | ||
9074 | cat conftest.$ac_ext >&5 | ||
9075 | |||
9076 | cat >conftest.$ac_ext <<_ACEOF | ||
9077 | -#line 13356 "configure" | ||
9078 | +#line 13425 "configure" | ||
9079 | #include "confdefs.h" | ||
9080 | |||
9081 | #include <stdarg.h> | ||
9082 | @@ -13375,16 +13444,16 @@ | ||
9083 | } | ||
9084 | _ACEOF | ||
9085 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
9086 | -if { (eval echo "$as_me:13378: \"$ac_link\"") >&5 | ||
9087 | +if { (eval echo "$as_me:13447: \"$ac_link\"") >&5 | ||
9088 | (eval $ac_link) 2>&5 | ||
9089 | ac_status=$? | ||
9090 | - echo "$as_me:13381: \$? = $ac_status" >&5 | ||
9091 | + echo "$as_me:13450: \$? = $ac_status" >&5 | ||
9092 | (exit $ac_status); } && | ||
9093 | { ac_try='test -s conftest$ac_exeext' | ||
9094 | - { (eval echo "$as_me:13384: \"$ac_try\"") >&5 | ||
9095 | + { (eval echo "$as_me:13453: \"$ac_try\"") >&5 | ||
9096 | (eval $ac_try) 2>&5 | ||
9097 | ac_status=$? | ||
9098 | - echo "$as_me:13387: \$? = $ac_status" >&5 | ||
9099 | + echo "$as_me:13456: \$? = $ac_status" >&5 | ||
9100 | (exit $ac_status); }; }; then | ||
9101 | cf_cv_func_vsscanf=vfscanf | ||
9102 | else | ||
9103 | @@ -13392,7 +13461,7 @@ | ||
9104 | cat conftest.$ac_ext >&5 | ||
9105 | |||
9106 | cat >conftest.$ac_ext <<_ACEOF | ||
9107 | -#line 13395 "configure" | ||
9108 | +#line 13464 "configure" | ||
9109 | #include "confdefs.h" | ||
9110 | |||
9111 | #include <stdarg.h> | ||
9112 | @@ -13414,16 +13483,16 @@ | ||
9113 | } | ||
9114 | _ACEOF | ||
9115 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
9116 | -if { (eval echo "$as_me:13417: \"$ac_link\"") >&5 | ||
9117 | +if { (eval echo "$as_me:13486: \"$ac_link\"") >&5 | ||
9118 | (eval $ac_link) 2>&5 | ||
9119 | ac_status=$? | ||
9120 | - echo "$as_me:13420: \$? = $ac_status" >&5 | ||
9121 | + echo "$as_me:13489: \$? = $ac_status" >&5 | ||
9122 | (exit $ac_status); } && | ||
9123 | { ac_try='test -s conftest$ac_exeext' | ||
9124 | - { (eval echo "$as_me:13423: \"$ac_try\"") >&5 | ||
9125 | + { (eval echo "$as_me:13492: \"$ac_try\"") >&5 | ||
9126 | (eval $ac_try) 2>&5 | ||
9127 | ac_status=$? | ||
9128 | - echo "$as_me:13426: \$? = $ac_status" >&5 | ||
9129 | + echo "$as_me:13495: \$? = $ac_status" >&5 | ||
9130 | (exit $ac_status); }; }; then | ||
9131 | cf_cv_func_vsscanf=_doscan | ||
9132 | else | ||
9133 | @@ -13438,7 +13507,7 @@ | ||
9134 | fi | ||
9135 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
9136 | fi | ||
9137 | -echo "$as_me:13441: result: $cf_cv_func_vsscanf" >&5 | ||
9138 | +echo "$as_me:13510: result: $cf_cv_func_vsscanf" >&5 | ||
9139 | echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 | ||
9140 | |||
9141 | case $cf_cv_func_vsscanf in #(vi | ||
9142 | @@ -13456,7 +13525,7 @@ | ||
9143 | ;; | ||
9144 | esac | ||
9145 | |||
9146 | -echo "$as_me:13459: checking for working mkstemp" >&5 | ||
9147 | +echo "$as_me:13528: checking for working mkstemp" >&5 | ||
9148 | echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 | ||
9149 | if test "${cf_cv_func_mkstemp+set}" = set; then | ||
9150 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9151 | @@ -13464,13 +13533,13 @@ | ||
9152 | |||
9153 | rm -f conftest* | ||
9154 | if test "$cross_compiling" = yes; then | ||
9155 | - echo "$as_me:13467: checking for mkstemp" >&5 | ||
9156 | + echo "$as_me:13536: checking for mkstemp" >&5 | ||
9157 | echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 | ||
9158 | if test "${ac_cv_func_mkstemp+set}" = set; then | ||
9159 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9160 | else | ||
9161 | cat >conftest.$ac_ext <<_ACEOF | ||
9162 | -#line 13473 "configure" | ||
9163 | +#line 13542 "configure" | ||
9164 | #include "confdefs.h" | ||
9165 | /* System header to define __stub macros and hopefully few prototypes, | ||
9166 | which can conflict with char mkstemp (); below. */ | ||
9167 | @@ -13501,16 +13570,16 @@ | ||
9168 | } | ||
9169 | _ACEOF | ||
9170 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
9171 | -if { (eval echo "$as_me:13504: \"$ac_link\"") >&5 | ||
9172 | +if { (eval echo "$as_me:13573: \"$ac_link\"") >&5 | ||
9173 | (eval $ac_link) 2>&5 | ||
9174 | ac_status=$? | ||
9175 | - echo "$as_me:13507: \$? = $ac_status" >&5 | ||
9176 | + echo "$as_me:13576: \$? = $ac_status" >&5 | ||
9177 | (exit $ac_status); } && | ||
9178 | { ac_try='test -s conftest$ac_exeext' | ||
9179 | - { (eval echo "$as_me:13510: \"$ac_try\"") >&5 | ||
9180 | + { (eval echo "$as_me:13579: \"$ac_try\"") >&5 | ||
9181 | (eval $ac_try) 2>&5 | ||
9182 | ac_status=$? | ||
9183 | - echo "$as_me:13513: \$? = $ac_status" >&5 | ||
9184 | + echo "$as_me:13582: \$? = $ac_status" >&5 | ||
9185 | (exit $ac_status); }; }; then | ||
9186 | ac_cv_func_mkstemp=yes | ||
9187 | else | ||
9188 | @@ -13520,12 +13589,12 @@ | ||
9189 | fi | ||
9190 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
9191 | fi | ||
9192 | -echo "$as_me:13523: result: $ac_cv_func_mkstemp" >&5 | ||
9193 | +echo "$as_me:13592: result: $ac_cv_func_mkstemp" >&5 | ||
9194 | echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 | ||
9195 | |||
9196 | else | ||
9197 | cat >conftest.$ac_ext <<_ACEOF | ||
9198 | -#line 13528 "configure" | ||
9199 | +#line 13597 "configure" | ||
9200 | #include "confdefs.h" | ||
9201 | |||
9202 | #include <sys/types.h> | ||
9203 | @@ -13563,15 +13632,15 @@ | ||
9204 | |||
9205 | _ACEOF | ||
9206 | rm -f conftest$ac_exeext | ||
9207 | -if { (eval echo "$as_me:13566: \"$ac_link\"") >&5 | ||
9208 | +if { (eval echo "$as_me:13635: \"$ac_link\"") >&5 | ||
9209 | (eval $ac_link) 2>&5 | ||
9210 | ac_status=$? | ||
9211 | - echo "$as_me:13569: \$? = $ac_status" >&5 | ||
9212 | + echo "$as_me:13638: \$? = $ac_status" >&5 | ||
9213 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
9214 | - { (eval echo "$as_me:13571: \"$ac_try\"") >&5 | ||
9215 | + { (eval echo "$as_me:13640: \"$ac_try\"") >&5 | ||
9216 | (eval $ac_try) 2>&5 | ||
9217 | ac_status=$? | ||
9218 | - echo "$as_me:13574: \$? = $ac_status" >&5 | ||
9219 | + echo "$as_me:13643: \$? = $ac_status" >&5 | ||
9220 | (exit $ac_status); }; }; then | ||
9221 | cf_cv_func_mkstemp=yes | ||
9222 | |||
9223 | @@ -13586,7 +13655,7 @@ | ||
9224 | fi | ||
9225 | |||
9226 | fi | ||
9227 | -echo "$as_me:13589: result: $cf_cv_func_mkstemp" >&5 | ||
9228 | +echo "$as_me:13658: result: $cf_cv_func_mkstemp" >&5 | ||
9229 | echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 | ||
9230 | if test "$cf_cv_func_mkstemp" = yes ; then | ||
9231 | cat >>confdefs.h <<\EOF | ||
9232 | @@ -13604,21 +13673,21 @@ | ||
9233 | fi | ||
9234 | |||
9235 | if test "$cross_compiling" = yes ; then | ||
9236 | - { echo "$as_me:13607: WARNING: cross compiling: assume setvbuf params not reversed" >&5 | ||
9237 | + { echo "$as_me:13676: WARNING: cross compiling: assume setvbuf params not reversed" >&5 | ||
9238 | echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} | ||
9239 | else | ||
9240 | - echo "$as_me:13610: checking whether setvbuf arguments are reversed" >&5 | ||
9241 | + echo "$as_me:13679: checking whether setvbuf arguments are reversed" >&5 | ||
9242 | echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 | ||
9243 | if test "${ac_cv_func_setvbuf_reversed+set}" = set; then | ||
9244 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9245 | else | ||
9246 | if test "$cross_compiling" = yes; then | ||
9247 | - { { echo "$as_me:13616: error: cannot run test program while cross compiling" >&5 | ||
9248 | + { { echo "$as_me:13685: error: cannot run test program while cross compiling" >&5 | ||
9249 | echo "$as_me: error: cannot run test program while cross compiling" >&2;} | ||
9250 | { (exit 1); exit 1; }; } | ||
9251 | else | ||
9252 | cat >conftest.$ac_ext <<_ACEOF | ||
9253 | -#line 13621 "configure" | ||
9254 | +#line 13690 "configure" | ||
9255 | #include "confdefs.h" | ||
9256 | #include <stdio.h> | ||
9257 | /* If setvbuf has the reversed format, exit 0. */ | ||
9258 | @@ -13635,15 +13704,15 @@ | ||
9259 | } | ||
9260 | _ACEOF | ||
9261 | rm -f conftest$ac_exeext | ||
9262 | -if { (eval echo "$as_me:13638: \"$ac_link\"") >&5 | ||
9263 | +if { (eval echo "$as_me:13707: \"$ac_link\"") >&5 | ||
9264 | (eval $ac_link) 2>&5 | ||
9265 | ac_status=$? | ||
9266 | - echo "$as_me:13641: \$? = $ac_status" >&5 | ||
9267 | + echo "$as_me:13710: \$? = $ac_status" >&5 | ||
9268 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
9269 | - { (eval echo "$as_me:13643: \"$ac_try\"") >&5 | ||
9270 | + { (eval echo "$as_me:13712: \"$ac_try\"") >&5 | ||
9271 | (eval $ac_try) 2>&5 | ||
9272 | ac_status=$? | ||
9273 | - echo "$as_me:13646: \$? = $ac_status" >&5 | ||
9274 | + echo "$as_me:13715: \$? = $ac_status" >&5 | ||
9275 | (exit $ac_status); }; }; then | ||
9276 | ac_cv_func_setvbuf_reversed=yes | ||
9277 | else | ||
9278 | @@ -13656,7 +13725,7 @@ | ||
9279 | fi | ||
9280 | rm -f core core.* *.core | ||
9281 | fi | ||
9282 | -echo "$as_me:13659: result: $ac_cv_func_setvbuf_reversed" >&5 | ||
9283 | +echo "$as_me:13728: result: $ac_cv_func_setvbuf_reversed" >&5 | ||
9284 | echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 | ||
9285 | if test $ac_cv_func_setvbuf_reversed = yes; then | ||
9286 | |||
9287 | @@ -13667,13 +13736,13 @@ | ||
9288 | fi | ||
9289 | |||
9290 | fi | ||
9291 | -echo "$as_me:13670: checking return type of signal handlers" >&5 | ||
9292 | +echo "$as_me:13739: checking return type of signal handlers" >&5 | ||
9293 | echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 | ||
9294 | if test "${ac_cv_type_signal+set}" = set; then | ||
9295 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9296 | else | ||
9297 | cat >conftest.$ac_ext <<_ACEOF | ||
9298 | -#line 13676 "configure" | ||
9299 | +#line 13745 "configure" | ||
9300 | #include "confdefs.h" | ||
9301 | #include <sys/types.h> | ||
9302 | #include <signal.h> | ||
9303 | @@ -13695,16 +13764,16 @@ | ||
9304 | } | ||
9305 | _ACEOF | ||
9306 | rm -f conftest.$ac_objext | ||
9307 | -if { (eval echo "$as_me:13698: \"$ac_compile\"") >&5 | ||
9308 | +if { (eval echo "$as_me:13767: \"$ac_compile\"") >&5 | ||
9309 | (eval $ac_compile) 2>&5 | ||
9310 | ac_status=$? | ||
9311 | - echo "$as_me:13701: \$? = $ac_status" >&5 | ||
9312 | + echo "$as_me:13770: \$? = $ac_status" >&5 | ||
9313 | (exit $ac_status); } && | ||
9314 | { ac_try='test -s conftest.$ac_objext' | ||
9315 | - { (eval echo "$as_me:13704: \"$ac_try\"") >&5 | ||
9316 | + { (eval echo "$as_me:13773: \"$ac_try\"") >&5 | ||
9317 | (eval $ac_try) 2>&5 | ||
9318 | ac_status=$? | ||
9319 | - echo "$as_me:13707: \$? = $ac_status" >&5 | ||
9320 | + echo "$as_me:13776: \$? = $ac_status" >&5 | ||
9321 | (exit $ac_status); }; }; then | ||
9322 | ac_cv_type_signal=void | ||
9323 | else | ||
9324 | @@ -13714,21 +13783,21 @@ | ||
9325 | fi | ||
9326 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
9327 | fi | ||
9328 | -echo "$as_me:13717: result: $ac_cv_type_signal" >&5 | ||
9329 | +echo "$as_me:13786: result: $ac_cv_type_signal" >&5 | ||
9330 | echo "${ECHO_T}$ac_cv_type_signal" >&6 | ||
9331 | |||
9332 | cat >>confdefs.h <<EOF | ||
9333 | #define RETSIGTYPE $ac_cv_type_signal | ||
9334 | EOF | ||
9335 | |||
9336 | -echo "$as_me:13724: checking for type sigaction_t" >&5 | ||
9337 | +echo "$as_me:13793: checking for type sigaction_t" >&5 | ||
9338 | echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 | ||
9339 | if test "${cf_cv_type_sigaction+set}" = set; then | ||
9340 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9341 | else | ||
9342 | |||
9343 | cat >conftest.$ac_ext <<_ACEOF | ||
9344 | -#line 13731 "configure" | ||
9345 | +#line 13800 "configure" | ||
9346 | #include "confdefs.h" | ||
9347 | |||
9348 | #include <signal.h> | ||
9349 | @@ -13741,16 +13810,16 @@ | ||
9350 | } | ||
9351 | _ACEOF | ||
9352 | rm -f conftest.$ac_objext | ||
9353 | -if { (eval echo "$as_me:13744: \"$ac_compile\"") >&5 | ||
9354 | +if { (eval echo "$as_me:13813: \"$ac_compile\"") >&5 | ||
9355 | (eval $ac_compile) 2>&5 | ||
9356 | ac_status=$? | ||
9357 | - echo "$as_me:13747: \$? = $ac_status" >&5 | ||
9358 | + echo "$as_me:13816: \$? = $ac_status" >&5 | ||
9359 | (exit $ac_status); } && | ||
9360 | { ac_try='test -s conftest.$ac_objext' | ||
9361 | - { (eval echo "$as_me:13750: \"$ac_try\"") >&5 | ||
9362 | + { (eval echo "$as_me:13819: \"$ac_try\"") >&5 | ||
9363 | (eval $ac_try) 2>&5 | ||
9364 | ac_status=$? | ||
9365 | - echo "$as_me:13753: \$? = $ac_status" >&5 | ||
9366 | + echo "$as_me:13822: \$? = $ac_status" >&5 | ||
9367 | (exit $ac_status); }; }; then | ||
9368 | cf_cv_type_sigaction=yes | ||
9369 | else | ||
9370 | @@ -13761,13 +13830,13 @@ | ||
9371 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
9372 | fi | ||
9373 | |||
9374 | -echo "$as_me:13764: result: $cf_cv_type_sigaction" >&5 | ||
9375 | +echo "$as_me:13833: result: $cf_cv_type_sigaction" >&5 | ||
9376 | echo "${ECHO_T}$cf_cv_type_sigaction" >&6 | ||
9377 | test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF | ||
9378 | #define HAVE_TYPE_SIGACTION 1 | ||
9379 | EOF | ||
9380 | |||
9381 | -echo "$as_me:13770: checking declaration of size-change" >&5 | ||
9382 | +echo "$as_me:13839: checking declaration of size-change" >&5 | ||
9383 | echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 | ||
9384 | if test "${cf_cv_sizechange+set}" = set; then | ||
9385 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9386 | @@ -13782,7 +13851,7 @@ | ||
9387 | CPPFLAGS="$cf_save_CPPFLAGS" | ||
9388 | test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" | ||
9389 | cat >conftest.$ac_ext <<_ACEOF | ||
9390 | -#line 13785 "configure" | ||
9391 | +#line 13854 "configure" | ||
9392 | #include "confdefs.h" | ||
9393 | #include <sys/types.h> | ||
9394 | #ifdef HAVE_TERMIOS_H | ||
9395 | @@ -13826,16 +13895,16 @@ | ||
9396 | } | ||
9397 | _ACEOF | ||
9398 | rm -f conftest.$ac_objext | ||
9399 | -if { (eval echo "$as_me:13829: \"$ac_compile\"") >&5 | ||
9400 | +if { (eval echo "$as_me:13898: \"$ac_compile\"") >&5 | ||
9401 | (eval $ac_compile) 2>&5 | ||
9402 | ac_status=$? | ||
9403 | - echo "$as_me:13832: \$? = $ac_status" >&5 | ||
9404 | + echo "$as_me:13901: \$? = $ac_status" >&5 | ||
9405 | (exit $ac_status); } && | ||
9406 | { ac_try='test -s conftest.$ac_objext' | ||
9407 | - { (eval echo "$as_me:13835: \"$ac_try\"") >&5 | ||
9408 | + { (eval echo "$as_me:13904: \"$ac_try\"") >&5 | ||
9409 | (eval $ac_try) 2>&5 | ||
9410 | ac_status=$? | ||
9411 | - echo "$as_me:13838: \$? = $ac_status" >&5 | ||
9412 | + echo "$as_me:13907: \$? = $ac_status" >&5 | ||
9413 | (exit $ac_status); }; }; then | ||
9414 | cf_cv_sizechange=yes | ||
9415 | else | ||
9416 | @@ -13854,7 +13923,7 @@ | ||
9417 | done | ||
9418 | |||
9419 | fi | ||
9420 | -echo "$as_me:13857: result: $cf_cv_sizechange" >&5 | ||
9421 | +echo "$as_me:13926: result: $cf_cv_sizechange" >&5 | ||
9422 | echo "${ECHO_T}$cf_cv_sizechange" >&6 | ||
9423 | if test "$cf_cv_sizechange" != no ; then | ||
9424 | cat >>confdefs.h <<\EOF | ||
9425 | @@ -13871,13 +13940,13 @@ | ||
9426 | esac | ||
9427 | fi | ||
9428 | |||
9429 | -echo "$as_me:13874: checking for memmove" >&5 | ||
9430 | +echo "$as_me:13943: checking for memmove" >&5 | ||
9431 | echo $ECHO_N "checking for memmove... $ECHO_C" >&6 | ||
9432 | if test "${ac_cv_func_memmove+set}" = set; then | ||
9433 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9434 | else | ||
9435 | cat >conftest.$ac_ext <<_ACEOF | ||
9436 | -#line 13880 "configure" | ||
9437 | +#line 13949 "configure" | ||
9438 | #include "confdefs.h" | ||
9439 | /* System header to define __stub macros and hopefully few prototypes, | ||
9440 | which can conflict with char memmove (); below. */ | ||
9441 | @@ -13908,16 +13977,16 @@ | ||
9442 | } | ||
9443 | _ACEOF | ||
9444 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
9445 | -if { (eval echo "$as_me:13911: \"$ac_link\"") >&5 | ||
9446 | +if { (eval echo "$as_me:13980: \"$ac_link\"") >&5 | ||
9447 | (eval $ac_link) 2>&5 | ||
9448 | ac_status=$? | ||
9449 | - echo "$as_me:13914: \$? = $ac_status" >&5 | ||
9450 | + echo "$as_me:13983: \$? = $ac_status" >&5 | ||
9451 | (exit $ac_status); } && | ||
9452 | { ac_try='test -s conftest$ac_exeext' | ||
9453 | - { (eval echo "$as_me:13917: \"$ac_try\"") >&5 | ||
9454 | + { (eval echo "$as_me:13986: \"$ac_try\"") >&5 | ||
9455 | (eval $ac_try) 2>&5 | ||
9456 | ac_status=$? | ||
9457 | - echo "$as_me:13920: \$? = $ac_status" >&5 | ||
9458 | + echo "$as_me:13989: \$? = $ac_status" >&5 | ||
9459 | (exit $ac_status); }; }; then | ||
9460 | ac_cv_func_memmove=yes | ||
9461 | else | ||
9462 | @@ -13927,19 +13996,19 @@ | ||
9463 | fi | ||
9464 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
9465 | fi | ||
9466 | -echo "$as_me:13930: result: $ac_cv_func_memmove" >&5 | ||
9467 | +echo "$as_me:13999: result: $ac_cv_func_memmove" >&5 | ||
9468 | echo "${ECHO_T}$ac_cv_func_memmove" >&6 | ||
9469 | if test $ac_cv_func_memmove = yes; then | ||
9470 | : | ||
9471 | else | ||
9472 | |||
9473 | -echo "$as_me:13936: checking for bcopy" >&5 | ||
9474 | +echo "$as_me:14005: checking for bcopy" >&5 | ||
9475 | echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 | ||
9476 | if test "${ac_cv_func_bcopy+set}" = set; then | ||
9477 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9478 | else | ||
9479 | cat >conftest.$ac_ext <<_ACEOF | ||
9480 | -#line 13942 "configure" | ||
9481 | +#line 14011 "configure" | ||
9482 | #include "confdefs.h" | ||
9483 | /* System header to define __stub macros and hopefully few prototypes, | ||
9484 | which can conflict with char bcopy (); below. */ | ||
9485 | @@ -13970,16 +14039,16 @@ | ||
9486 | } | ||
9487 | _ACEOF | ||
9488 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
9489 | -if { (eval echo "$as_me:13973: \"$ac_link\"") >&5 | ||
9490 | +if { (eval echo "$as_me:14042: \"$ac_link\"") >&5 | ||
9491 | (eval $ac_link) 2>&5 | ||
9492 | ac_status=$? | ||
9493 | - echo "$as_me:13976: \$? = $ac_status" >&5 | ||
9494 | + echo "$as_me:14045: \$? = $ac_status" >&5 | ||
9495 | (exit $ac_status); } && | ||
9496 | { ac_try='test -s conftest$ac_exeext' | ||
9497 | - { (eval echo "$as_me:13979: \"$ac_try\"") >&5 | ||
9498 | + { (eval echo "$as_me:14048: \"$ac_try\"") >&5 | ||
9499 | (eval $ac_try) 2>&5 | ||
9500 | ac_status=$? | ||
9501 | - echo "$as_me:13982: \$? = $ac_status" >&5 | ||
9502 | + echo "$as_me:14051: \$? = $ac_status" >&5 | ||
9503 | (exit $ac_status); }; }; then | ||
9504 | ac_cv_func_bcopy=yes | ||
9505 | else | ||
9506 | @@ -13989,11 +14058,11 @@ | ||
9507 | fi | ||
9508 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
9509 | fi | ||
9510 | -echo "$as_me:13992: result: $ac_cv_func_bcopy" >&5 | ||
9511 | +echo "$as_me:14061: result: $ac_cv_func_bcopy" >&5 | ||
9512 | echo "${ECHO_T}$ac_cv_func_bcopy" >&6 | ||
9513 | if test $ac_cv_func_bcopy = yes; then | ||
9514 | |||
9515 | - echo "$as_me:13996: checking if bcopy does overlapping moves" >&5 | ||
9516 | + echo "$as_me:14065: checking if bcopy does overlapping moves" >&5 | ||
9517 | echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 | ||
9518 | if test "${cf_cv_good_bcopy+set}" = set; then | ||
9519 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9520 | @@ -14003,7 +14072,7 @@ | ||
9521 | cf_cv_good_bcopy=unknown | ||
9522 | else | ||
9523 | cat >conftest.$ac_ext <<_ACEOF | ||
9524 | -#line 14006 "configure" | ||
9525 | +#line 14075 "configure" | ||
9526 | #include "confdefs.h" | ||
9527 | |||
9528 | int main() { | ||
9529 | @@ -14017,15 +14086,15 @@ | ||
9530 | |||
9531 | _ACEOF | ||
9532 | rm -f conftest$ac_exeext | ||
9533 | -if { (eval echo "$as_me:14020: \"$ac_link\"") >&5 | ||
9534 | +if { (eval echo "$as_me:14089: \"$ac_link\"") >&5 | ||
9535 | (eval $ac_link) 2>&5 | ||
9536 | ac_status=$? | ||
9537 | - echo "$as_me:14023: \$? = $ac_status" >&5 | ||
9538 | + echo "$as_me:14092: \$? = $ac_status" >&5 | ||
9539 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
9540 | - { (eval echo "$as_me:14025: \"$ac_try\"") >&5 | ||
9541 | + { (eval echo "$as_me:14094: \"$ac_try\"") >&5 | ||
9542 | (eval $ac_try) 2>&5 | ||
9543 | ac_status=$? | ||
9544 | - echo "$as_me:14028: \$? = $ac_status" >&5 | ||
9545 | + echo "$as_me:14097: \$? = $ac_status" >&5 | ||
9546 | (exit $ac_status); }; }; then | ||
9547 | cf_cv_good_bcopy=yes | ||
9548 | else | ||
9549 | @@ -14038,7 +14107,7 @@ | ||
9550 | fi | ||
9551 | |||
9552 | fi | ||
9553 | -echo "$as_me:14041: result: $cf_cv_good_bcopy" >&5 | ||
9554 | +echo "$as_me:14110: result: $cf_cv_good_bcopy" >&5 | ||
9555 | echo "${ECHO_T}$cf_cv_good_bcopy" >&6 | ||
9556 | |||
9557 | else | ||
9558 | @@ -14059,7 +14128,7 @@ | ||
9559 | |||
9560 | fi | ||
9561 | |||
9562 | -echo "$as_me:14062: checking if poll really works" >&5 | ||
9563 | +echo "$as_me:14131: checking if poll really works" >&5 | ||
9564 | echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 | ||
9565 | if test "${cf_cv_working_poll+set}" = set; then | ||
9566 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9567 | @@ -14069,7 +14138,7 @@ | ||
9568 | cf_cv_working_poll=unknown | ||
9569 | else | ||
9570 | cat >conftest.$ac_ext <<_ACEOF | ||
9571 | -#line 14072 "configure" | ||
9572 | +#line 14141 "configure" | ||
9573 | #include "confdefs.h" | ||
9574 | |||
9575 | #include <stdio.h> | ||
9576 | @@ -14090,15 +14159,15 @@ | ||
9577 | } | ||
9578 | _ACEOF | ||
9579 | rm -f conftest$ac_exeext | ||
9580 | -if { (eval echo "$as_me:14093: \"$ac_link\"") >&5 | ||
9581 | +if { (eval echo "$as_me:14162: \"$ac_link\"") >&5 | ||
9582 | (eval $ac_link) 2>&5 | ||
9583 | ac_status=$? | ||
9584 | - echo "$as_me:14096: \$? = $ac_status" >&5 | ||
9585 | + echo "$as_me:14165: \$? = $ac_status" >&5 | ||
9586 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
9587 | - { (eval echo "$as_me:14098: \"$ac_try\"") >&5 | ||
9588 | + { (eval echo "$as_me:14167: \"$ac_try\"") >&5 | ||
9589 | (eval $ac_try) 2>&5 | ||
9590 | ac_status=$? | ||
9591 | - echo "$as_me:14101: \$? = $ac_status" >&5 | ||
9592 | + echo "$as_me:14170: \$? = $ac_status" >&5 | ||
9593 | (exit $ac_status); }; }; then | ||
9594 | cf_cv_working_poll=yes | ||
9595 | else | ||
9596 | @@ -14110,7 +14179,7 @@ | ||
9597 | rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | ||
9598 | fi | ||
9599 | fi | ||
9600 | -echo "$as_me:14113: result: $cf_cv_working_poll" >&5 | ||
9601 | +echo "$as_me:14182: result: $cf_cv_working_poll" >&5 | ||
9602 | echo "${ECHO_T}$cf_cv_working_poll" >&6 | ||
9603 | test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF | ||
9604 | #define HAVE_WORKING_POLL 1 | ||
9605 | @@ -14118,7 +14187,7 @@ | ||
9606 | |||
9607 | # special check for test/ditto.c | ||
9608 | |||
9609 | -echo "$as_me:14121: checking for openpty in -lutil" >&5 | ||
9610 | +echo "$as_me:14190: checking for openpty in -lutil" >&5 | ||
9611 | echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 | ||
9612 | if test "${ac_cv_lib_util_openpty+set}" = set; then | ||
9613 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9614 | @@ -14126,7 +14195,7 @@ | ||
9615 | ac_check_lib_save_LIBS=$LIBS | ||
9616 | LIBS="-lutil $LIBS" | ||
9617 | cat >conftest.$ac_ext <<_ACEOF | ||
9618 | -#line 14129 "configure" | ||
9619 | +#line 14198 "configure" | ||
9620 | #include "confdefs.h" | ||
9621 | |||
9622 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
9623 | @@ -14145,16 +14214,16 @@ | ||
9624 | } | ||
9625 | _ACEOF | ||
9626 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
9627 | -if { (eval echo "$as_me:14148: \"$ac_link\"") >&5 | ||
9628 | +if { (eval echo "$as_me:14217: \"$ac_link\"") >&5 | ||
9629 | (eval $ac_link) 2>&5 | ||
9630 | ac_status=$? | ||
9631 | - echo "$as_me:14151: \$? = $ac_status" >&5 | ||
9632 | + echo "$as_me:14220: \$? = $ac_status" >&5 | ||
9633 | (exit $ac_status); } && | ||
9634 | { ac_try='test -s conftest$ac_exeext' | ||
9635 | - { (eval echo "$as_me:14154: \"$ac_try\"") >&5 | ||
9636 | + { (eval echo "$as_me:14223: \"$ac_try\"") >&5 | ||
9637 | (eval $ac_try) 2>&5 | ||
9638 | ac_status=$? | ||
9639 | - echo "$as_me:14157: \$? = $ac_status" >&5 | ||
9640 | + echo "$as_me:14226: \$? = $ac_status" >&5 | ||
9641 | (exit $ac_status); }; }; then | ||
9642 | ac_cv_lib_util_openpty=yes | ||
9643 | else | ||
9644 | @@ -14165,7 +14234,7 @@ | ||
9645 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
9646 | LIBS=$ac_check_lib_save_LIBS | ||
9647 | fi | ||
9648 | -echo "$as_me:14168: result: $ac_cv_lib_util_openpty" >&5 | ||
9649 | +echo "$as_me:14237: result: $ac_cv_lib_util_openpty" >&5 | ||
9650 | echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 | ||
9651 | if test $ac_cv_lib_util_openpty = yes; then | ||
9652 | cf_cv_lib_util=yes | ||
9653 | @@ -14173,7 +14242,7 @@ | ||
9654 | cf_cv_lib_util=no | ||
9655 | fi | ||
9656 | |||
9657 | -echo "$as_me:14176: checking for openpty header" >&5 | ||
9658 | +echo "$as_me:14245: checking for openpty header" >&5 | ||
9659 | echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 | ||
9660 | if test "${cf_cv_func_openpty+set}" = set; then | ||
9661 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9662 | @@ -14184,7 +14253,7 @@ | ||
9663 | for cf_header in pty.h libutil.h util.h | ||
9664 | do | ||
9665 | cat >conftest.$ac_ext <<_ACEOF | ||
9666 | -#line 14187 "configure" | ||
9667 | +#line 14256 "configure" | ||
9668 | #include "confdefs.h" | ||
9669 | |||
9670 | #include <$cf_header> | ||
9671 | @@ -14201,16 +14270,16 @@ | ||
9672 | } | ||
9673 | _ACEOF | ||
9674 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
9675 | -if { (eval echo "$as_me:14204: \"$ac_link\"") >&5 | ||
9676 | +if { (eval echo "$as_me:14273: \"$ac_link\"") >&5 | ||
9677 | (eval $ac_link) 2>&5 | ||
9678 | ac_status=$? | ||
9679 | - echo "$as_me:14207: \$? = $ac_status" >&5 | ||
9680 | + echo "$as_me:14276: \$? = $ac_status" >&5 | ||
9681 | (exit $ac_status); } && | ||
9682 | { ac_try='test -s conftest$ac_exeext' | ||
9683 | - { (eval echo "$as_me:14210: \"$ac_try\"") >&5 | ||
9684 | + { (eval echo "$as_me:14279: \"$ac_try\"") >&5 | ||
9685 | (eval $ac_try) 2>&5 | ||
9686 | ac_status=$? | ||
9687 | - echo "$as_me:14213: \$? = $ac_status" >&5 | ||
9688 | + echo "$as_me:14282: \$? = $ac_status" >&5 | ||
9689 | (exit $ac_status); }; }; then | ||
9690 | |||
9691 | cf_cv_func_openpty=$cf_header | ||
9692 | @@ -14228,7 +14297,7 @@ | ||
9693 | LIBS="$cf_save_LIBS" | ||
9694 | |||
9695 | fi | ||
9696 | -echo "$as_me:14231: result: $cf_cv_func_openpty" >&5 | ||
9697 | +echo "$as_me:14300: result: $cf_cv_func_openpty" >&5 | ||
9698 | echo "${ECHO_T}$cf_cv_func_openpty" >&6 | ||
9699 | |||
9700 | if test "$cf_cv_func_openpty" != no ; then | ||
9701 | @@ -14280,7 +14349,7 @@ | ||
9702 | cf_save_CPPFLAGS=$CPPFLAGS | ||
9703 | CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" | ||
9704 | cat >conftest.$ac_ext <<_ACEOF | ||
9705 | -#line 14283 "configure" | ||
9706 | +#line 14352 "configure" | ||
9707 | #include "confdefs.h" | ||
9708 | #include <stdio.h> | ||
9709 | int | ||
9710 | @@ -14292,16 +14361,16 @@ | ||
9711 | } | ||
9712 | _ACEOF | ||
9713 | rm -f conftest.$ac_objext | ||
9714 | -if { (eval echo "$as_me:14295: \"$ac_compile\"") >&5 | ||
9715 | +if { (eval echo "$as_me:14364: \"$ac_compile\"") >&5 | ||
9716 | (eval $ac_compile) 2>&5 | ||
9717 | ac_status=$? | ||
9718 | - echo "$as_me:14298: \$? = $ac_status" >&5 | ||
9719 | + echo "$as_me:14367: \$? = $ac_status" >&5 | ||
9720 | (exit $ac_status); } && | ||
9721 | { ac_try='test -s conftest.$ac_objext' | ||
9722 | - { (eval echo "$as_me:14301: \"$ac_try\"") >&5 | ||
9723 | + { (eval echo "$as_me:14370: \"$ac_try\"") >&5 | ||
9724 | (eval $ac_try) 2>&5 | ||
9725 | ac_status=$? | ||
9726 | - echo "$as_me:14304: \$? = $ac_status" >&5 | ||
9727 | + echo "$as_me:14373: \$? = $ac_status" >&5 | ||
9728 | (exit $ac_status); }; }; then | ||
9729 | : | ||
9730 | else | ||
9731 | @@ -14318,7 +14387,7 @@ | ||
9732 | if test "$cf_have_incdir" = no ; then | ||
9733 | test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 | ||
9734 | |||
9735 | -echo "${as_me-configure}:14321: testing adding $cf_add_incdir to include-path ..." 1>&5 | ||
9736 | +echo "${as_me-configure}:14390: testing adding $cf_add_incdir to include-path ..." 1>&5 | ||
9737 | |||
9738 | CPPFLAGS="-I$cf_add_incdir $CPPFLAGS" | ||
9739 | |||
9740 | @@ -14352,7 +14421,7 @@ | ||
9741 | if test "$cf_have_libdir" = no ; then | ||
9742 | test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 | ||
9743 | |||
9744 | -echo "${as_me-configure}:14355: testing adding $cf_add_libdir to library-path ..." 1>&5 | ||
9745 | +echo "${as_me-configure}:14424: testing adding $cf_add_libdir to library-path ..." 1>&5 | ||
9746 | |||
9747 | LDFLAGS="-L$cf_add_libdir $LDFLAGS" | ||
9748 | fi | ||
9749 | @@ -14363,23 +14432,23 @@ | ||
9750 | fi | ||
9751 | esac | ||
9752 | |||
9753 | -echo "$as_me:14366: checking for db.h" >&5 | ||
9754 | +echo "$as_me:14435: checking for db.h" >&5 | ||
9755 | echo $ECHO_N "checking for db.h... $ECHO_C" >&6 | ||
9756 | if test "${ac_cv_header_db_h+set}" = set; then | ||
9757 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9758 | else | ||
9759 | cat >conftest.$ac_ext <<_ACEOF | ||
9760 | -#line 14372 "configure" | ||
9761 | +#line 14441 "configure" | ||
9762 | #include "confdefs.h" | ||
9763 | #include <db.h> | ||
9764 | _ACEOF | ||
9765 | -if { (eval echo "$as_me:14376: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
9766 | +if { (eval echo "$as_me:14445: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
9767 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
9768 | ac_status=$? | ||
9769 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
9770 | rm -f conftest.er1 | ||
9771 | cat conftest.err >&5 | ||
9772 | - echo "$as_me:14382: \$? = $ac_status" >&5 | ||
9773 | + echo "$as_me:14451: \$? = $ac_status" >&5 | ||
9774 | (exit $ac_status); } >/dev/null; then | ||
9775 | if test -s conftest.err; then | ||
9776 | ac_cpp_err=$ac_c_preproc_warn_flag | ||
9777 | @@ -14398,11 +14467,11 @@ | ||
9778 | fi | ||
9779 | rm -f conftest.err conftest.$ac_ext | ||
9780 | fi | ||
9781 | -echo "$as_me:14401: result: $ac_cv_header_db_h" >&5 | ||
9782 | +echo "$as_me:14470: result: $ac_cv_header_db_h" >&5 | ||
9783 | echo "${ECHO_T}$ac_cv_header_db_h" >&6 | ||
9784 | if test $ac_cv_header_db_h = yes; then | ||
9785 | |||
9786 | -echo "$as_me:14405: checking for version of db" >&5 | ||
9787 | +echo "$as_me:14474: checking for version of db" >&5 | ||
9788 | echo $ECHO_N "checking for version of db... $ECHO_C" >&6 | ||
9789 | if test "${cf_cv_hashed_db_version+set}" = set; then | ||
9790 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9791 | @@ -14413,10 +14482,10 @@ | ||
9792 | for cf_db_version in 1 2 3 4 5 | ||
9793 | do | ||
9794 | |||
9795 | -echo "${as_me-configure}:14416: testing checking for db version $cf_db_version ..." 1>&5 | ||
9796 | +echo "${as_me-configure}:14485: testing checking for db version $cf_db_version ..." 1>&5 | ||
9797 | |||
9798 | cat >conftest.$ac_ext <<_ACEOF | ||
9799 | -#line 14419 "configure" | ||
9800 | +#line 14488 "configure" | ||
9801 | #include "confdefs.h" | ||
9802 | |||
9803 | $ac_includes_default | ||
9804 | @@ -14446,16 +14515,16 @@ | ||
9805 | } | ||
9806 | _ACEOF | ||
9807 | rm -f conftest.$ac_objext | ||
9808 | -if { (eval echo "$as_me:14449: \"$ac_compile\"") >&5 | ||
9809 | +if { (eval echo "$as_me:14518: \"$ac_compile\"") >&5 | ||
9810 | (eval $ac_compile) 2>&5 | ||
9811 | ac_status=$? | ||
9812 | - echo "$as_me:14452: \$? = $ac_status" >&5 | ||
9813 | + echo "$as_me:14521: \$? = $ac_status" >&5 | ||
9814 | (exit $ac_status); } && | ||
9815 | { ac_try='test -s conftest.$ac_objext' | ||
9816 | - { (eval echo "$as_me:14455: \"$ac_try\"") >&5 | ||
9817 | + { (eval echo "$as_me:14524: \"$ac_try\"") >&5 | ||
9818 | (eval $ac_try) 2>&5 | ||
9819 | ac_status=$? | ||
9820 | - echo "$as_me:14458: \$? = $ac_status" >&5 | ||
9821 | + echo "$as_me:14527: \$? = $ac_status" >&5 | ||
9822 | (exit $ac_status); }; }; then | ||
9823 | |||
9824 | cf_cv_hashed_db_version=$cf_db_version | ||
9825 | @@ -14469,16 +14538,16 @@ | ||
9826 | done | ||
9827 | |||
9828 | fi | ||
9829 | -echo "$as_me:14472: result: $cf_cv_hashed_db_version" >&5 | ||
9830 | +echo "$as_me:14541: result: $cf_cv_hashed_db_version" >&5 | ||
9831 | echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 | ||
9832 | |||
9833 | if test "$cf_cv_hashed_db_version" = unknown ; then | ||
9834 | - { { echo "$as_me:14476: error: Cannot determine version of db" >&5 | ||
9835 | + { { echo "$as_me:14545: error: Cannot determine version of db" >&5 | ||
9836 | echo "$as_me: error: Cannot determine version of db" >&2;} | ||
9837 | { (exit 1); exit 1; }; } | ||
9838 | else | ||
9839 | |||
9840 | -echo "$as_me:14481: checking for db libraries" >&5 | ||
9841 | +echo "$as_me:14550: checking for db libraries" >&5 | ||
9842 | echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 | ||
9843 | if test "${cf_cv_hashed_db_libs+set}" = set; then | ||
9844 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
9845 | @@ -14492,10 +14561,10 @@ | ||
9846 | LIBS="-l$cf_db_libs $LIBS" | ||
9847 | fi | ||
9848 | |||
9849 | -echo "${as_me-configure}:14495: testing checking for library "$cf_db_libs" ..." 1>&5 | ||
9850 | +echo "${as_me-configure}:14564: testing checking for library "$cf_db_libs" ..." 1>&5 | ||
9851 | |||
9852 | cat >conftest.$ac_ext <<_ACEOF | ||
9853 | -#line 14498 "configure" | ||
9854 | +#line 14567 "configure" | ||
9855 | #include "confdefs.h" | ||
9856 | |||
9857 | $ac_includes_default | ||
9858 | @@ -14550,16 +14619,16 @@ | ||
9859 | } | ||
9860 | _ACEOF | ||
9861 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
9862 | -if { (eval echo "$as_me:14553: \"$ac_link\"") >&5 | ||
9863 | +if { (eval echo "$as_me:14622: \"$ac_link\"") >&5 | ||
9864 | (eval $ac_link) 2>&5 | ||
9865 | ac_status=$? | ||
9866 | - echo "$as_me:14556: \$? = $ac_status" >&5 | ||
9867 | + echo "$as_me:14625: \$? = $ac_status" >&5 | ||
9868 | (exit $ac_status); } && | ||
9869 | { ac_try='test -s conftest$ac_exeext' | ||
9870 | - { (eval echo "$as_me:14559: \"$ac_try\"") >&5 | ||
9871 | + { (eval echo "$as_me:14628: \"$ac_try\"") >&5 | ||
9872 | (eval $ac_try) 2>&5 | ||
9873 | ac_status=$? | ||
9874 | - echo "$as_me:14562: \$? = $ac_status" >&5 | ||
9875 | + echo "$as_me:14631: \$? = $ac_status" >&5 | ||
9876 | (exit $ac_status); }; }; then | ||
9877 | |||
9878 | if test -n "$cf_db_libs" ; then | ||
9879 | @@ -14579,11 +14648,11 @@ | ||
9880 | done | ||
9881 | |||
9882 | fi | ||
9883 | -echo "$as_me:14582: result: $cf_cv_hashed_db_libs" >&5 | ||
9884 | +echo "$as_me:14651: result: $cf_cv_hashed_db_libs" >&5 | ||
9885 | echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 | ||
9886 | |||
9887 | if test "$cf_cv_hashed_db_libs" = unknown ; then | ||
9888 | - { { echo "$as_me:14586: error: Cannot determine library for db" >&5 | ||
9889 | + { { echo "$as_me:14655: error: Cannot determine library for db" >&5 | ||
9890 | echo "$as_me: error: Cannot determine library for db" >&2;} | ||
9891 | { (exit 1); exit 1; }; } | ||
9892 | elif test "$cf_cv_hashed_db_libs" != default ; then | ||
9893 | @@ -14593,7 +14662,7 @@ | ||
9894 | |||
9895 | else | ||
9896 | |||
9897 | - { { echo "$as_me:14596: error: Cannot find db.h" >&5 | ||
9898 | + { { echo "$as_me:14665: error: Cannot find db.h" >&5 | ||
9899 | echo "$as_me: error: Cannot find db.h" >&2;} | ||
9900 | { (exit 1); exit 1; }; } | ||
9901 | |||
9902 | @@ -14608,7 +14677,7 @@ | ||
9903 | |||
9904 | # Just in case, check if the C compiler has a bool type. | ||
9905 | |||
9906 | -echo "$as_me:14611: checking if we should include stdbool.h" >&5 | ||
9907 | +echo "$as_me:14680: checking if we should include stdbool.h" >&5 | ||
9908 | echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 | ||
9909 | |||
9910 | if test "${cf_cv_header_stdbool_h+set}" = set; then | ||
9911 | @@ -14616,7 +14685,7 @@ | ||
9912 | else | ||
9913 | |||
9914 | cat >conftest.$ac_ext <<_ACEOF | ||
9915 | -#line 14619 "configure" | ||
9916 | +#line 14688 "configure" | ||
9917 | #include "confdefs.h" | ||
9918 | |||
9919 | int | ||
9920 | @@ -14628,23 +14697,23 @@ | ||
9921 | } | ||
9922 | _ACEOF | ||
9923 | rm -f conftest.$ac_objext | ||
9924 | -if { (eval echo "$as_me:14631: \"$ac_compile\"") >&5 | ||
9925 | +if { (eval echo "$as_me:14700: \"$ac_compile\"") >&5 | ||
9926 | (eval $ac_compile) 2>&5 | ||
9927 | ac_status=$? | ||
9928 | - echo "$as_me:14634: \$? = $ac_status" >&5 | ||
9929 | + echo "$as_me:14703: \$? = $ac_status" >&5 | ||
9930 | (exit $ac_status); } && | ||
9931 | { ac_try='test -s conftest.$ac_objext' | ||
9932 | - { (eval echo "$as_me:14637: \"$ac_try\"") >&5 | ||
9933 | + { (eval echo "$as_me:14706: \"$ac_try\"") >&5 | ||
9934 | (eval $ac_try) 2>&5 | ||
9935 | ac_status=$? | ||
9936 | - echo "$as_me:14640: \$? = $ac_status" >&5 | ||
9937 | + echo "$as_me:14709: \$? = $ac_status" >&5 | ||
9938 | (exit $ac_status); }; }; then | ||
9939 | cf_cv_header_stdbool_h=0 | ||
9940 | else | ||
9941 | echo "$as_me: failed program was:" >&5 | ||
9942 | cat conftest.$ac_ext >&5 | ||
9943 | cat >conftest.$ac_ext <<_ACEOF | ||
9944 | -#line 14647 "configure" | ||
9945 | +#line 14716 "configure" | ||
9946 | #include "confdefs.h" | ||
9947 | |||
9948 | #ifndef __BEOS__ | ||
9949 | @@ -14660,16 +14729,16 @@ | ||
9950 | } | ||
9951 | _ACEOF | ||
9952 | rm -f conftest.$ac_objext | ||
9953 | -if { (eval echo "$as_me:14663: \"$ac_compile\"") >&5 | ||
9954 | +if { (eval echo "$as_me:14732: \"$ac_compile\"") >&5 | ||
9955 | (eval $ac_compile) 2>&5 | ||
9956 | ac_status=$? | ||
9957 | - echo "$as_me:14666: \$? = $ac_status" >&5 | ||
9958 | + echo "$as_me:14735: \$? = $ac_status" >&5 | ||
9959 | (exit $ac_status); } && | ||
9960 | { ac_try='test -s conftest.$ac_objext' | ||
9961 | - { (eval echo "$as_me:14669: \"$ac_try\"") >&5 | ||
9962 | + { (eval echo "$as_me:14738: \"$ac_try\"") >&5 | ||
9963 | (eval $ac_try) 2>&5 | ||
9964 | ac_status=$? | ||
9965 | - echo "$as_me:14672: \$? = $ac_status" >&5 | ||
9966 | + echo "$as_me:14741: \$? = $ac_status" >&5 | ||
9967 | (exit $ac_status); }; }; then | ||
9968 | cf_cv_header_stdbool_h=1 | ||
9969 | else | ||
9970 | @@ -14683,13 +14752,13 @@ | ||
9971 | fi | ||
9972 | |||
9973 | if test "$cf_cv_header_stdbool_h" = 1 | ||
9974 | -then echo "$as_me:14686: result: yes" >&5 | ||
9975 | +then echo "$as_me:14755: result: yes" >&5 | ||
9976 | echo "${ECHO_T}yes" >&6 | ||
9977 | -else echo "$as_me:14688: result: no" >&5 | ||
9978 | +else echo "$as_me:14757: result: no" >&5 | ||
9979 | echo "${ECHO_T}no" >&6 | ||
9980 | fi | ||
9981 | |||
9982 | -echo "$as_me:14692: checking for builtin bool type" >&5 | ||
9983 | +echo "$as_me:14761: checking for builtin bool type" >&5 | ||
9984 | echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 | ||
9985 | |||
9986 | if test "${cf_cv_cc_bool_type+set}" = set; then | ||
9987 | @@ -14697,7 +14766,7 @@ | ||
9988 | else | ||
9989 | |||
9990 | cat >conftest.$ac_ext <<_ACEOF | ||
9991 | -#line 14700 "configure" | ||
9992 | +#line 14769 "configure" | ||
9993 | #include "confdefs.h" | ||
9994 | |||
9995 | #include <stdio.h> | ||
9996 | @@ -14712,16 +14781,16 @@ | ||
9997 | } | ||
9998 | _ACEOF | ||
9999 | rm -f conftest.$ac_objext | ||
10000 | -if { (eval echo "$as_me:14715: \"$ac_compile\"") >&5 | ||
10001 | +if { (eval echo "$as_me:14784: \"$ac_compile\"") >&5 | ||
10002 | (eval $ac_compile) 2>&5 | ||
10003 | ac_status=$? | ||
10004 | - echo "$as_me:14718: \$? = $ac_status" >&5 | ||
10005 | + echo "$as_me:14787: \$? = $ac_status" >&5 | ||
10006 | (exit $ac_status); } && | ||
10007 | { ac_try='test -s conftest.$ac_objext' | ||
10008 | - { (eval echo "$as_me:14721: \"$ac_try\"") >&5 | ||
10009 | + { (eval echo "$as_me:14790: \"$ac_try\"") >&5 | ||
10010 | (eval $ac_try) 2>&5 | ||
10011 | ac_status=$? | ||
10012 | - echo "$as_me:14724: \$? = $ac_status" >&5 | ||
10013 | + echo "$as_me:14793: \$? = $ac_status" >&5 | ||
10014 | (exit $ac_status); }; }; then | ||
10015 | cf_cv_cc_bool_type=1 | ||
10016 | else | ||
10017 | @@ -14734,9 +14803,9 @@ | ||
10018 | fi | ||
10019 | |||
10020 | if test "$cf_cv_cc_bool_type" = 1 | ||
10021 | -then echo "$as_me:14737: result: yes" >&5 | ||
10022 | +then echo "$as_me:14806: result: yes" >&5 | ||
10023 | echo "${ECHO_T}yes" >&6 | ||
10024 | -else echo "$as_me:14739: result: no" >&5 | ||
10025 | +else echo "$as_me:14808: result: no" >&5 | ||
10026 | echo "${ECHO_T}no" >&6 | ||
10027 | fi | ||
10028 | |||
10029 | @@ -14758,7 +14827,7 @@ | ||
10030 | cf_stdcpp_libname=stdc++ | ||
10031 | ;; | ||
10032 | esac | ||
10033 | -echo "$as_me:14761: checking for library $cf_stdcpp_libname" >&5 | ||
10034 | +echo "$as_me:14830: checking for library $cf_stdcpp_libname" >&5 | ||
10035 | echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 | ||
10036 | if test "${cf_cv_libstdcpp+set}" = set; then | ||
10037 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10038 | @@ -14767,7 +14836,7 @@ | ||
10039 | cf_save="$LIBS" | ||
10040 | LIBS="$LIBS -l$cf_stdcpp_libname" | ||
10041 | cat >conftest.$ac_ext <<_ACEOF | ||
10042 | -#line 14770 "configure" | ||
10043 | +#line 14839 "configure" | ||
10044 | #include "confdefs.h" | ||
10045 | |||
10046 | #include <strstream.h> | ||
10047 | @@ -14783,16 +14852,16 @@ | ||
10048 | } | ||
10049 | _ACEOF | ||
10050 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
10051 | -if { (eval echo "$as_me:14786: \"$ac_link\"") >&5 | ||
10052 | +if { (eval echo "$as_me:14855: \"$ac_link\"") >&5 | ||
10053 | (eval $ac_link) 2>&5 | ||
10054 | ac_status=$? | ||
10055 | - echo "$as_me:14789: \$? = $ac_status" >&5 | ||
10056 | + echo "$as_me:14858: \$? = $ac_status" >&5 | ||
10057 | (exit $ac_status); } && | ||
10058 | { ac_try='test -s conftest$ac_exeext' | ||
10059 | - { (eval echo "$as_me:14792: \"$ac_try\"") >&5 | ||
10060 | + { (eval echo "$as_me:14861: \"$ac_try\"") >&5 | ||
10061 | (eval $ac_try) 2>&5 | ||
10062 | ac_status=$? | ||
10063 | - echo "$as_me:14795: \$? = $ac_status" >&5 | ||
10064 | + echo "$as_me:14864: \$? = $ac_status" >&5 | ||
10065 | (exit $ac_status); }; }; then | ||
10066 | cf_cv_libstdcpp=yes | ||
10067 | else | ||
10068 | @@ -14804,12 +14873,12 @@ | ||
10069 | LIBS="$cf_save" | ||
10070 | |||
10071 | fi | ||
10072 | -echo "$as_me:14807: result: $cf_cv_libstdcpp" >&5 | ||
10073 | +echo "$as_me:14876: result: $cf_cv_libstdcpp" >&5 | ||
10074 | echo "${ECHO_T}$cf_cv_libstdcpp" >&6 | ||
10075 | test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname" | ||
10076 | fi | ||
10077 | |||
10078 | - echo "$as_me:14812: checking whether $CXX understands -c and -o together" >&5 | ||
10079 | + echo "$as_me:14881: checking whether $CXX understands -c and -o together" >&5 | ||
10080 | echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 | ||
10081 | if test "${cf_cv_prog_CXX_c_o+set}" = set; then | ||
10082 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10083 | @@ -14825,15 +14894,15 @@ | ||
10084 | # We do the test twice because some compilers refuse to overwrite an | ||
10085 | # existing .o file with -o, though they will create one. | ||
10086 | ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5' | ||
10087 | -if { (eval echo "$as_me:14828: \"$ac_try\"") >&5 | ||
10088 | +if { (eval echo "$as_me:14897: \"$ac_try\"") >&5 | ||
10089 | (eval $ac_try) 2>&5 | ||
10090 | ac_status=$? | ||
10091 | - echo "$as_me:14831: \$? = $ac_status" >&5 | ||
10092 | + echo "$as_me:14900: \$? = $ac_status" >&5 | ||
10093 | (exit $ac_status); } && | ||
10094 | - test -f conftest2.$ac_objext && { (eval echo "$as_me:14833: \"$ac_try\"") >&5 | ||
10095 | + test -f conftest2.$ac_objext && { (eval echo "$as_me:14902: \"$ac_try\"") >&5 | ||
10096 | (eval $ac_try) 2>&5 | ||
10097 | ac_status=$? | ||
10098 | - echo "$as_me:14836: \$? = $ac_status" >&5 | ||
10099 | + echo "$as_me:14905: \$? = $ac_status" >&5 | ||
10100 | (exit $ac_status); }; | ||
10101 | then | ||
10102 | eval cf_cv_prog_CXX_c_o=yes | ||
10103 | @@ -14844,10 +14913,10 @@ | ||
10104 | |||
10105 | fi | ||
10106 | if test $cf_cv_prog_CXX_c_o = yes; then | ||
10107 | - echo "$as_me:14847: result: yes" >&5 | ||
10108 | + echo "$as_me:14916: result: yes" >&5 | ||
10109 | echo "${ECHO_T}yes" >&6 | ||
10110 | else | ||
10111 | - echo "$as_me:14850: result: no" >&5 | ||
10112 | + echo "$as_me:14919: result: no" >&5 | ||
10113 | echo "${ECHO_T}no" >&6 | ||
10114 | fi | ||
10115 | |||
10116 | @@ -14867,12 +14936,12 @@ | ||
10117 | ;; | ||
10118 | esac | ||
10119 | if test "$GXX" = yes; then | ||
10120 | - echo "$as_me:14870: checking for lib$cf_gpp_libname" >&5 | ||
10121 | + echo "$as_me:14939: checking for lib$cf_gpp_libname" >&5 | ||
10122 | echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 | ||
10123 | cf_save="$LIBS" | ||
10124 | LIBS="$LIBS -l$cf_gpp_libname" | ||
10125 | cat >conftest.$ac_ext <<_ACEOF | ||
10126 | -#line 14875 "configure" | ||
10127 | +#line 14944 "configure" | ||
10128 | #include "confdefs.h" | ||
10129 | |||
10130 | #include <$cf_gpp_libname/builtin.h> | ||
10131 | @@ -14886,16 +14955,16 @@ | ||
10132 | } | ||
10133 | _ACEOF | ||
10134 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
10135 | -if { (eval echo "$as_me:14889: \"$ac_link\"") >&5 | ||
10136 | +if { (eval echo "$as_me:14958: \"$ac_link\"") >&5 | ||
10137 | (eval $ac_link) 2>&5 | ||
10138 | ac_status=$? | ||
10139 | - echo "$as_me:14892: \$? = $ac_status" >&5 | ||
10140 | + echo "$as_me:14961: \$? = $ac_status" >&5 | ||
10141 | (exit $ac_status); } && | ||
10142 | { ac_try='test -s conftest$ac_exeext' | ||
10143 | - { (eval echo "$as_me:14895: \"$ac_try\"") >&5 | ||
10144 | + { (eval echo "$as_me:14964: \"$ac_try\"") >&5 | ||
10145 | (eval $ac_try) 2>&5 | ||
10146 | ac_status=$? | ||
10147 | - echo "$as_me:14898: \$? = $ac_status" >&5 | ||
10148 | + echo "$as_me:14967: \$? = $ac_status" >&5 | ||
10149 | (exit $ac_status); }; }; then | ||
10150 | cf_cxx_library=yes | ||
10151 | CXXLIBS="$CXXLIBS -l$cf_gpp_libname" | ||
10152 | @@ -14914,7 +14983,7 @@ | ||
10153 | echo "$as_me: failed program was:" >&5 | ||
10154 | cat conftest.$ac_ext >&5 | ||
10155 | cat >conftest.$ac_ext <<_ACEOF | ||
10156 | -#line 14917 "configure" | ||
10157 | +#line 14986 "configure" | ||
10158 | #include "confdefs.h" | ||
10159 | |||
10160 | #include <builtin.h> | ||
10161 | @@ -14928,16 +14997,16 @@ | ||
10162 | } | ||
10163 | _ACEOF | ||
10164 | rm -f conftest.$ac_objext conftest$ac_exeext | ||
10165 | -if { (eval echo "$as_me:14931: \"$ac_link\"") >&5 | ||
10166 | +if { (eval echo "$as_me:15000: \"$ac_link\"") >&5 | ||
10167 | (eval $ac_link) 2>&5 | ||
10168 | ac_status=$? | ||
10169 | - echo "$as_me:14934: \$? = $ac_status" >&5 | ||
10170 | + echo "$as_me:15003: \$? = $ac_status" >&5 | ||
10171 | (exit $ac_status); } && | ||
10172 | { ac_try='test -s conftest$ac_exeext' | ||
10173 | - { (eval echo "$as_me:14937: \"$ac_try\"") >&5 | ||
10174 | + { (eval echo "$as_me:15006: \"$ac_try\"") >&5 | ||
10175 | (eval $ac_try) 2>&5 | ||
10176 | ac_status=$? | ||
10177 | - echo "$as_me:14940: \$? = $ac_status" >&5 | ||
10178 | + echo "$as_me:15009: \$? = $ac_status" >&5 | ||
10179 | (exit $ac_status); }; }; then | ||
10180 | cf_cxx_library=yes | ||
10181 | CXXLIBS="$CXXLIBS -l$cf_gpp_libname" | ||
10182 | @@ -14954,7 +15023,7 @@ | ||
10183 | fi | ||
10184 | rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext | ||
10185 | LIBS="$cf_save" | ||
10186 | - echo "$as_me:14957: result: $cf_cxx_library" >&5 | ||
10187 | + echo "$as_me:15026: result: $cf_cxx_library" >&5 | ||
10188 | echo "${ECHO_T}$cf_cxx_library" >&6 | ||
10189 | fi | ||
10190 | |||
10191 | @@ -14970,7 +15039,7 @@ | ||
10192 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
10193 | ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | ||
10194 | ac_main_return=return | ||
10195 | -echo "$as_me:14973: checking how to run the C++ preprocessor" >&5 | ||
10196 | +echo "$as_me:15042: checking how to run the C++ preprocessor" >&5 | ||
10197 | echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 | ||
10198 | if test -z "$CXXCPP"; then | ||
10199 | if test "${ac_cv_prog_CXXCPP+set}" = set; then | ||
10200 | @@ -14987,18 +15056,18 @@ | ||
10201 | # On the NeXT, cc -E runs the code through the compiler's parser, | ||
10202 | # not just through cpp. "Syntax error" is here to catch this case. | ||
10203 | cat >conftest.$ac_ext <<_ACEOF | ||
10204 | -#line 14990 "configure" | ||
10205 | +#line 15059 "configure" | ||
10206 | #include "confdefs.h" | ||
10207 | #include <assert.h> | ||
10208 | Syntax error | ||
10209 | _ACEOF | ||
10210 | -if { (eval echo "$as_me:14995: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
10211 | +if { (eval echo "$as_me:15064: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
10212 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
10213 | ac_status=$? | ||
10214 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
10215 | rm -f conftest.er1 | ||
10216 | cat conftest.err >&5 | ||
10217 | - echo "$as_me:15001: \$? = $ac_status" >&5 | ||
10218 | + echo "$as_me:15070: \$? = $ac_status" >&5 | ||
10219 | (exit $ac_status); } >/dev/null; then | ||
10220 | if test -s conftest.err; then | ||
10221 | ac_cpp_err=$ac_cxx_preproc_warn_flag | ||
10222 | @@ -15021,17 +15090,17 @@ | ||
10223 | # OK, works on sane cases. Now check whether non-existent headers | ||
10224 | # can be detected and how. | ||
10225 | cat >conftest.$ac_ext <<_ACEOF | ||
10226 | -#line 15024 "configure" | ||
10227 | +#line 15093 "configure" | ||
10228 | #include "confdefs.h" | ||
10229 | #include <ac_nonexistent.h> | ||
10230 | _ACEOF | ||
10231 | -if { (eval echo "$as_me:15028: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
10232 | +if { (eval echo "$as_me:15097: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
10233 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
10234 | ac_status=$? | ||
10235 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
10236 | rm -f conftest.er1 | ||
10237 | cat conftest.err >&5 | ||
10238 | - echo "$as_me:15034: \$? = $ac_status" >&5 | ||
10239 | + echo "$as_me:15103: \$? = $ac_status" >&5 | ||
10240 | (exit $ac_status); } >/dev/null; then | ||
10241 | if test -s conftest.err; then | ||
10242 | ac_cpp_err=$ac_cxx_preproc_warn_flag | ||
10243 | @@ -15068,7 +15137,7 @@ | ||
10244 | else | ||
10245 | ac_cv_prog_CXXCPP=$CXXCPP | ||
10246 | fi | ||
10247 | -echo "$as_me:15071: result: $CXXCPP" >&5 | ||
10248 | +echo "$as_me:15140: result: $CXXCPP" >&5 | ||
10249 | echo "${ECHO_T}$CXXCPP" >&6 | ||
10250 | ac_preproc_ok=false | ||
10251 | for ac_cxx_preproc_warn_flag in '' yes | ||
10252 | @@ -15078,18 +15147,18 @@ | ||
10253 | # On the NeXT, cc -E runs the code through the compiler's parser, | ||
10254 | # not just through cpp. "Syntax error" is here to catch this case. | ||
10255 | cat >conftest.$ac_ext <<_ACEOF | ||
10256 | -#line 15081 "configure" | ||
10257 | +#line 15150 "configure" | ||
10258 | #include "confdefs.h" | ||
10259 | #include <assert.h> | ||
10260 | Syntax error | ||
10261 | _ACEOF | ||
10262 | -if { (eval echo "$as_me:15086: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
10263 | +if { (eval echo "$as_me:15155: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
10264 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
10265 | ac_status=$? | ||
10266 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
10267 | rm -f conftest.er1 | ||
10268 | cat conftest.err >&5 | ||
10269 | - echo "$as_me:15092: \$? = $ac_status" >&5 | ||
10270 | + echo "$as_me:15161: \$? = $ac_status" >&5 | ||
10271 | (exit $ac_status); } >/dev/null; then | ||
10272 | if test -s conftest.err; then | ||
10273 | ac_cpp_err=$ac_cxx_preproc_warn_flag | ||
10274 | @@ -15112,17 +15181,17 @@ | ||
10275 | # OK, works on sane cases. Now check whether non-existent headers | ||
10276 | # can be detected and how. | ||
10277 | cat >conftest.$ac_ext <<_ACEOF | ||
10278 | -#line 15115 "configure" | ||
10279 | +#line 15184 "configure" | ||
10280 | #include "confdefs.h" | ||
10281 | #include <ac_nonexistent.h> | ||
10282 | _ACEOF | ||
10283 | -if { (eval echo "$as_me:15119: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
10284 | +if { (eval echo "$as_me:15188: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
10285 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
10286 | ac_status=$? | ||
10287 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
10288 | rm -f conftest.er1 | ||
10289 | cat conftest.err >&5 | ||
10290 | - echo "$as_me:15125: \$? = $ac_status" >&5 | ||
10291 | + echo "$as_me:15194: \$? = $ac_status" >&5 | ||
10292 | (exit $ac_status); } >/dev/null; then | ||
10293 | if test -s conftest.err; then | ||
10294 | ac_cpp_err=$ac_cxx_preproc_warn_flag | ||
10295 | @@ -15150,7 +15219,7 @@ | ||
10296 | if $ac_preproc_ok; then | ||
10297 | : | ||
10298 | else | ||
10299 | - { { echo "$as_me:15153: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 | ||
10300 | + { { echo "$as_me:15222: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 | ||
10301 | echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} | ||
10302 | { (exit 1); exit 1; }; } | ||
10303 | fi | ||
10304 | @@ -15165,23 +15234,23 @@ | ||
10305 | for ac_header in iostream typeinfo | ||
10306 | do | ||
10307 | as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | ||
10308 | -echo "$as_me:15168: checking for $ac_header" >&5 | ||
10309 | +echo "$as_me:15237: checking for $ac_header" >&5 | ||
10310 | echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | ||
10311 | if eval "test \"\${$as_ac_Header+set}\" = set"; then | ||
10312 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10313 | else | ||
10314 | cat >conftest.$ac_ext <<_ACEOF | ||
10315 | -#line 15174 "configure" | ||
10316 | +#line 15243 "configure" | ||
10317 | #include "confdefs.h" | ||
10318 | #include <$ac_header> | ||
10319 | _ACEOF | ||
10320 | -if { (eval echo "$as_me:15178: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
10321 | +if { (eval echo "$as_me:15247: \"$ac_cpp conftest.$ac_ext\"") >&5 | ||
10322 | (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | ||
10323 | ac_status=$? | ||
10324 | egrep -v '^ *\+' conftest.er1 >conftest.err | ||
10325 | rm -f conftest.er1 | ||
10326 | cat conftest.err >&5 | ||
10327 | - echo "$as_me:15184: \$? = $ac_status" >&5 | ||
10328 | + echo "$as_me:15253: \$? = $ac_status" >&5 | ||
10329 | (exit $ac_status); } >/dev/null; then | ||
10330 | if test -s conftest.err; then | ||
10331 | ac_cpp_err=$ac_cxx_preproc_warn_flag | ||
10332 | @@ -15200,7 +15269,7 @@ | ||
10333 | fi | ||
10334 | rm -f conftest.err conftest.$ac_ext | ||
10335 | fi | ||
10336 | -echo "$as_me:15203: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
10337 | +echo "$as_me:15272: result: `eval echo '${'$as_ac_Header'}'`" >&5 | ||
10338 | echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | ||
10339 | if test `eval echo '${'$as_ac_Header'}'` = yes; then | ||
10340 | cat >>confdefs.h <<EOF | ||
10341 | @@ -15211,10 +15280,10 @@ | ||
10342 | done | ||
10343 | |||
10344 | if test x"$ac_cv_header_iostream" = xyes ; then | ||
10345 | - echo "$as_me:15214: checking if iostream uses std-namespace" >&5 | ||
10346 | + echo "$as_me:15283: checking if iostream uses std-namespace" >&5 | ||
10347 | echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 | ||
10348 | cat >conftest.$ac_ext <<_ACEOF | ||
10349 | -#line 15217 "configure" | ||
10350 | +#line 15286 "configure" | ||
10351 | #include "confdefs.h" | ||
10352 | |||
10353 | #include <iostream> | ||
10354 | @@ -15231,16 +15300,16 @@ | ||
10355 | } | ||
10356 | _ACEOF | ||
10357 | rm -f conftest.$ac_objext | ||
10358 | -if { (eval echo "$as_me:15234: \"$ac_compile\"") >&5 | ||
10359 | +if { (eval echo "$as_me:15303: \"$ac_compile\"") >&5 | ||
10360 | (eval $ac_compile) 2>&5 | ||
10361 | ac_status=$? | ||
10362 | - echo "$as_me:15237: \$? = $ac_status" >&5 | ||
10363 | + echo "$as_me:15306: \$? = $ac_status" >&5 | ||
10364 | (exit $ac_status); } && | ||
10365 | { ac_try='test -s conftest.$ac_objext' | ||
10366 | - { (eval echo "$as_me:15240: \"$ac_try\"") >&5 | ||
10367 | + { (eval echo "$as_me:15309: \"$ac_try\"") >&5 | ||
10368 | (eval $ac_try) 2>&5 | ||
10369 | ac_status=$? | ||
10370 | - echo "$as_me:15243: \$? = $ac_status" >&5 | ||
10371 | + echo "$as_me:15312: \$? = $ac_status" >&5 | ||
10372 | (exit $ac_status); }; }; then | ||
10373 | cf_iostream_namespace=yes | ||
10374 | else | ||
10375 | @@ -15249,7 +15318,7 @@ | ||
10376 | cf_iostream_namespace=no | ||
10377 | fi | ||
10378 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
10379 | - echo "$as_me:15252: result: $cf_iostream_namespace" >&5 | ||
10380 | + echo "$as_me:15321: result: $cf_iostream_namespace" >&5 | ||
10381 | echo "${ECHO_T}$cf_iostream_namespace" >&6 | ||
10382 | if test "$cf_iostream_namespace" = yes ; then | ||
10383 | cat >>confdefs.h <<\EOF | ||
10384 | @@ -15259,7 +15328,7 @@ | ||
10385 | fi | ||
10386 | fi | ||
10387 | |||
10388 | -echo "$as_me:15262: checking if we should include stdbool.h" >&5 | ||
10389 | +echo "$as_me:15331: checking if we should include stdbool.h" >&5 | ||
10390 | echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 | ||
10391 | |||
10392 | if test "${cf_cv_header_stdbool_h+set}" = set; then | ||
10393 | @@ -15267,7 +15336,7 @@ | ||
10394 | else | ||
10395 | |||
10396 | cat >conftest.$ac_ext <<_ACEOF | ||
10397 | -#line 15270 "configure" | ||
10398 | +#line 15339 "configure" | ||
10399 | #include "confdefs.h" | ||
10400 | |||
10401 | int | ||
10402 | @@ -15279,23 +15348,23 @@ | ||
10403 | } | ||
10404 | _ACEOF | ||
10405 | rm -f conftest.$ac_objext | ||
10406 | -if { (eval echo "$as_me:15282: \"$ac_compile\"") >&5 | ||
10407 | +if { (eval echo "$as_me:15351: \"$ac_compile\"") >&5 | ||
10408 | (eval $ac_compile) 2>&5 | ||
10409 | ac_status=$? | ||
10410 | - echo "$as_me:15285: \$? = $ac_status" >&5 | ||
10411 | + echo "$as_me:15354: \$? = $ac_status" >&5 | ||
10412 | (exit $ac_status); } && | ||
10413 | { ac_try='test -s conftest.$ac_objext' | ||
10414 | - { (eval echo "$as_me:15288: \"$ac_try\"") >&5 | ||
10415 | + { (eval echo "$as_me:15357: \"$ac_try\"") >&5 | ||
10416 | (eval $ac_try) 2>&5 | ||
10417 | ac_status=$? | ||
10418 | - echo "$as_me:15291: \$? = $ac_status" >&5 | ||
10419 | + echo "$as_me:15360: \$? = $ac_status" >&5 | ||
10420 | (exit $ac_status); }; }; then | ||
10421 | cf_cv_header_stdbool_h=0 | ||
10422 | else | ||
10423 | echo "$as_me: failed program was:" >&5 | ||
10424 | cat conftest.$ac_ext >&5 | ||
10425 | cat >conftest.$ac_ext <<_ACEOF | ||
10426 | -#line 15298 "configure" | ||
10427 | +#line 15367 "configure" | ||
10428 | #include "confdefs.h" | ||
10429 | |||
10430 | #ifndef __BEOS__ | ||
10431 | @@ -15311,16 +15380,16 @@ | ||
10432 | } | ||
10433 | _ACEOF | ||
10434 | rm -f conftest.$ac_objext | ||
10435 | -if { (eval echo "$as_me:15314: \"$ac_compile\"") >&5 | ||
10436 | +if { (eval echo "$as_me:15383: \"$ac_compile\"") >&5 | ||
10437 | (eval $ac_compile) 2>&5 | ||
10438 | ac_status=$? | ||
10439 | - echo "$as_me:15317: \$? = $ac_status" >&5 | ||
10440 | + echo "$as_me:15386: \$? = $ac_status" >&5 | ||
10441 | (exit $ac_status); } && | ||
10442 | { ac_try='test -s conftest.$ac_objext' | ||
10443 | - { (eval echo "$as_me:15320: \"$ac_try\"") >&5 | ||
10444 | + { (eval echo "$as_me:15389: \"$ac_try\"") >&5 | ||
10445 | (eval $ac_try) 2>&5 | ||
10446 | ac_status=$? | ||
10447 | - echo "$as_me:15323: \$? = $ac_status" >&5 | ||
10448 | + echo "$as_me:15392: \$? = $ac_status" >&5 | ||
10449 | (exit $ac_status); }; }; then | ||
10450 | cf_cv_header_stdbool_h=1 | ||
10451 | else | ||
10452 | @@ -15334,13 +15403,13 @@ | ||
10453 | fi | ||
10454 | |||
10455 | if test "$cf_cv_header_stdbool_h" = 1 | ||
10456 | -then echo "$as_me:15337: result: yes" >&5 | ||
10457 | +then echo "$as_me:15406: result: yes" >&5 | ||
10458 | echo "${ECHO_T}yes" >&6 | ||
10459 | -else echo "$as_me:15339: result: no" >&5 | ||
10460 | +else echo "$as_me:15408: result: no" >&5 | ||
10461 | echo "${ECHO_T}no" >&6 | ||
10462 | fi | ||
10463 | |||
10464 | -echo "$as_me:15343: checking for builtin bool type" >&5 | ||
10465 | +echo "$as_me:15412: checking for builtin bool type" >&5 | ||
10466 | echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 | ||
10467 | |||
10468 | if test "${cf_cv_builtin_bool+set}" = set; then | ||
10469 | @@ -15348,7 +15417,7 @@ | ||
10470 | else | ||
10471 | |||
10472 | cat >conftest.$ac_ext <<_ACEOF | ||
10473 | -#line 15351 "configure" | ||
10474 | +#line 15420 "configure" | ||
10475 | #include "confdefs.h" | ||
10476 | |||
10477 | #include <stdio.h> | ||
10478 | @@ -15363,16 +15432,16 @@ | ||
10479 | } | ||
10480 | _ACEOF | ||
10481 | rm -f conftest.$ac_objext | ||
10482 | -if { (eval echo "$as_me:15366: \"$ac_compile\"") >&5 | ||
10483 | +if { (eval echo "$as_me:15435: \"$ac_compile\"") >&5 | ||
10484 | (eval $ac_compile) 2>&5 | ||
10485 | ac_status=$? | ||
10486 | - echo "$as_me:15369: \$? = $ac_status" >&5 | ||
10487 | + echo "$as_me:15438: \$? = $ac_status" >&5 | ||
10488 | (exit $ac_status); } && | ||
10489 | { ac_try='test -s conftest.$ac_objext' | ||
10490 | - { (eval echo "$as_me:15372: \"$ac_try\"") >&5 | ||
10491 | + { (eval echo "$as_me:15441: \"$ac_try\"") >&5 | ||
10492 | (eval $ac_try) 2>&5 | ||
10493 | ac_status=$? | ||
10494 | - echo "$as_me:15375: \$? = $ac_status" >&5 | ||
10495 | + echo "$as_me:15444: \$? = $ac_status" >&5 | ||
10496 | (exit $ac_status); }; }; then | ||
10497 | cf_cv_builtin_bool=1 | ||
10498 | else | ||
10499 | @@ -15385,13 +15454,13 @@ | ||
10500 | fi | ||
10501 | |||
10502 | if test "$cf_cv_builtin_bool" = 1 | ||
10503 | -then echo "$as_me:15388: result: yes" >&5 | ||
10504 | +then echo "$as_me:15457: result: yes" >&5 | ||
10505 | echo "${ECHO_T}yes" >&6 | ||
10506 | -else echo "$as_me:15390: result: no" >&5 | ||
10507 | +else echo "$as_me:15459: result: no" >&5 | ||
10508 | echo "${ECHO_T}no" >&6 | ||
10509 | fi | ||
10510 | |||
10511 | -echo "$as_me:15394: checking for size of bool" >&5 | ||
10512 | +echo "$as_me:15463: checking for size of bool" >&5 | ||
10513 | echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 | ||
10514 | if test "${cf_cv_type_of_bool+set}" = set; then | ||
10515 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10516 | @@ -15402,7 +15471,7 @@ | ||
10517 | cf_cv_type_of_bool=unknown | ||
10518 | else | ||
10519 | cat >conftest.$ac_ext <<_ACEOF | ||
10520 | -#line 15405 "configure" | ||
10521 | +#line 15474 "configure" | ||
10522 | #include "confdefs.h" | ||
10523 | |||
10524 | #include <stdlib.h> | ||
10525 | @@ -15444,15 +15513,15 @@ | ||
10526 | |||
10527 | _ACEOF | ||
10528 | rm -f conftest$ac_exeext | ||
10529 | -if { (eval echo "$as_me:15447: \"$ac_link\"") >&5 | ||
10530 | +if { (eval echo "$as_me:15516: \"$ac_link\"") >&5 | ||
10531 | (eval $ac_link) 2>&5 | ||
10532 | ac_status=$? | ||
10533 | - echo "$as_me:15450: \$? = $ac_status" >&5 | ||
10534 | + echo "$as_me:15519: \$? = $ac_status" >&5 | ||
10535 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
10536 | - { (eval echo "$as_me:15452: \"$ac_try\"") >&5 | ||
10537 | + { (eval echo "$as_me:15521: \"$ac_try\"") >&5 | ||
10538 | (eval $ac_try) 2>&5 | ||
10539 | ac_status=$? | ||
10540 | - echo "$as_me:15455: \$? = $ac_status" >&5 | ||
10541 | + echo "$as_me:15524: \$? = $ac_status" >&5 | ||
10542 | (exit $ac_status); }; }; then | ||
10543 | cf_cv_type_of_bool=`cat cf_test.out` | ||
10544 | if test -z "$cf_cv_type_of_bool"; then | ||
10545 | @@ -15470,18 +15539,18 @@ | ||
10546 | fi | ||
10547 | |||
10548 | rm -f cf_test.out | ||
10549 | -echo "$as_me:15473: result: $cf_cv_type_of_bool" >&5 | ||
10550 | +echo "$as_me:15542: result: $cf_cv_type_of_bool" >&5 | ||
10551 | echo "${ECHO_T}$cf_cv_type_of_bool" >&6 | ||
10552 | if test "$cf_cv_type_of_bool" = unknown ; then | ||
10553 | case .$NCURSES_BOOL in #(vi | ||
10554 | .auto|.) NCURSES_BOOL=unsigned;; | ||
10555 | esac | ||
10556 | - { echo "$as_me:15479: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 | ||
10557 | + { echo "$as_me:15548: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 | ||
10558 | echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} | ||
10559 | cf_cv_type_of_bool=$NCURSES_BOOL | ||
10560 | fi | ||
10561 | |||
10562 | -echo "$as_me:15484: checking for special defines needed for etip.h" >&5 | ||
10563 | +echo "$as_me:15553: checking for special defines needed for etip.h" >&5 | ||
10564 | echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 | ||
10565 | cf_save_CXXFLAGS="$CXXFLAGS" | ||
10566 | cf_result="none" | ||
10567 | @@ -15493,7 +15562,7 @@ | ||
10568 | test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" | ||
10569 | test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" | ||
10570 | cat >conftest.$ac_ext <<_ACEOF | ||
10571 | -#line 15496 "configure" | ||
10572 | +#line 15565 "configure" | ||
10573 | #include "confdefs.h" | ||
10574 | |||
10575 | #include <etip.h.in> | ||
10576 | @@ -15507,16 +15576,16 @@ | ||
10577 | } | ||
10578 | _ACEOF | ||
10579 | rm -f conftest.$ac_objext | ||
10580 | -if { (eval echo "$as_me:15510: \"$ac_compile\"") >&5 | ||
10581 | +if { (eval echo "$as_me:15579: \"$ac_compile\"") >&5 | ||
10582 | (eval $ac_compile) 2>&5 | ||
10583 | ac_status=$? | ||
10584 | - echo "$as_me:15513: \$? = $ac_status" >&5 | ||
10585 | + echo "$as_me:15582: \$? = $ac_status" >&5 | ||
10586 | (exit $ac_status); } && | ||
10587 | { ac_try='test -s conftest.$ac_objext' | ||
10588 | - { (eval echo "$as_me:15516: \"$ac_try\"") >&5 | ||
10589 | + { (eval echo "$as_me:15585: \"$ac_try\"") >&5 | ||
10590 | (eval $ac_try) 2>&5 | ||
10591 | ac_status=$? | ||
10592 | - echo "$as_me:15519: \$? = $ac_status" >&5 | ||
10593 | + echo "$as_me:15588: \$? = $ac_status" >&5 | ||
10594 | (exit $ac_status); }; }; then | ||
10595 | |||
10596 | test -n "$cf_math" && cat >>confdefs.h <<EOF | ||
10597 | @@ -15537,12 +15606,12 @@ | ||
10598 | rm -f conftest.$ac_objext conftest.$ac_ext | ||
10599 | done | ||
10600 | done | ||
10601 | -echo "$as_me:15540: result: $cf_result" >&5 | ||
10602 | +echo "$as_me:15609: result: $cf_result" >&5 | ||
10603 | echo "${ECHO_T}$cf_result" >&6 | ||
10604 | CXXFLAGS="$cf_save_CXXFLAGS" | ||
10605 | |||
10606 | if test -n "$CXX"; then | ||
10607 | -echo "$as_me:15545: checking if $CXX accepts parameter initialization" >&5 | ||
10608 | +echo "$as_me:15614: checking if $CXX accepts parameter initialization" >&5 | ||
10609 | echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 | ||
10610 | if test "${cf_cv_cpp_param_init+set}" = set; then | ||
10611 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10612 | @@ -15559,7 +15628,7 @@ | ||
10613 | cf_cv_cpp_param_init=unknown | ||
10614 | else | ||
10615 | cat >conftest.$ac_ext <<_ACEOF | ||
10616 | -#line 15562 "configure" | ||
10617 | +#line 15631 "configure" | ||
10618 | #include "confdefs.h" | ||
10619 | |||
10620 | class TEST { | ||
10621 | @@ -15578,15 +15647,15 @@ | ||
10622 | |||
10623 | _ACEOF | ||
10624 | rm -f conftest$ac_exeext | ||
10625 | -if { (eval echo "$as_me:15581: \"$ac_link\"") >&5 | ||
10626 | +if { (eval echo "$as_me:15650: \"$ac_link\"") >&5 | ||
10627 | (eval $ac_link) 2>&5 | ||
10628 | ac_status=$? | ||
10629 | - echo "$as_me:15584: \$? = $ac_status" >&5 | ||
10630 | + echo "$as_me:15653: \$? = $ac_status" >&5 | ||
10631 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
10632 | - { (eval echo "$as_me:15586: \"$ac_try\"") >&5 | ||
10633 | + { (eval echo "$as_me:15655: \"$ac_try\"") >&5 | ||
10634 | (eval $ac_try) 2>&5 | ||
10635 | ac_status=$? | ||
10636 | - echo "$as_me:15589: \$? = $ac_status" >&5 | ||
10637 | + echo "$as_me:15658: \$? = $ac_status" >&5 | ||
10638 | (exit $ac_status); }; }; then | ||
10639 | cf_cv_cpp_param_init=yes | ||
10640 | else | ||
10641 | @@ -15605,7 +15674,7 @@ | ||
10642 | ac_main_return=return | ||
10643 | |||
10644 | fi | ||
10645 | -echo "$as_me:15608: result: $cf_cv_cpp_param_init" >&5 | ||
10646 | +echo "$as_me:15677: result: $cf_cv_cpp_param_init" >&5 | ||
10647 | echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 | ||
10648 | fi | ||
10649 | test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF | ||
10650 | @@ -15614,7 +15683,7 @@ | ||
10651 | |||
10652 | if test -n "$CXX"; then | ||
10653 | |||
10654 | -echo "$as_me:15617: checking if $CXX accepts static_cast" >&5 | ||
10655 | +echo "$as_me:15686: checking if $CXX accepts static_cast" >&5 | ||
10656 | echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 | ||
10657 | if test "${cf_cv_cpp_static_cast+set}" = set; then | ||
10658 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10659 | @@ -15628,7 +15697,7 @@ | ||
10660 | ac_main_return=return | ||
10661 | |||
10662 | cat >conftest.$ac_ext <<_ACEOF | ||
10663 | -#line 15631 "configure" | ||
10664 | +#line 15700 "configure" | ||
10665 | #include "confdefs.h" | ||
10666 | |||
10667 | class NCursesPanel | ||
10668 | @@ -15672,16 +15741,16 @@ | ||
10669 | } | ||
10670 | _ACEOF | ||
10671 | rm -f conftest.$ac_objext | ||
10672 | -if { (eval echo "$as_me:15675: \"$ac_compile\"") >&5 | ||
10673 | +if { (eval echo "$as_me:15744: \"$ac_compile\"") >&5 | ||
10674 | (eval $ac_compile) 2>&5 | ||
10675 | ac_status=$? | ||
10676 | - echo "$as_me:15678: \$? = $ac_status" >&5 | ||
10677 | + echo "$as_me:15747: \$? = $ac_status" >&5 | ||
10678 | (exit $ac_status); } && | ||
10679 | { ac_try='test -s conftest.$ac_objext' | ||
10680 | - { (eval echo "$as_me:15681: \"$ac_try\"") >&5 | ||
10681 | + { (eval echo "$as_me:15750: \"$ac_try\"") >&5 | ||
10682 | (eval $ac_try) 2>&5 | ||
10683 | ac_status=$? | ||
10684 | - echo "$as_me:15684: \$? = $ac_status" >&5 | ||
10685 | + echo "$as_me:15753: \$? = $ac_status" >&5 | ||
10686 | (exit $ac_status); }; }; then | ||
10687 | cf_cv_cpp_static_cast=yes | ||
10688 | else | ||
10689 | @@ -15699,7 +15768,7 @@ | ||
10690 | ac_main_return=return | ||
10691 | |||
10692 | fi | ||
10693 | -echo "$as_me:15702: result: $cf_cv_cpp_static_cast" >&5 | ||
10694 | +echo "$as_me:15771: result: $cf_cv_cpp_static_cast" >&5 | ||
10695 | echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 | ||
10696 | |||
10697 | fi | ||
10698 | @@ -15747,7 +15816,7 @@ | ||
10699 | else | ||
10700 | if test "$cf_cv_header_stdbool_h" = 1 ; then | ||
10701 | |||
10702 | -echo "$as_me:15750: checking for size of bool" >&5 | ||
10703 | +echo "$as_me:15819: checking for size of bool" >&5 | ||
10704 | echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 | ||
10705 | if test "${cf_cv_type_of_bool+set}" = set; then | ||
10706 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10707 | @@ -15758,7 +15827,7 @@ | ||
10708 | cf_cv_type_of_bool=unknown | ||
10709 | else | ||
10710 | cat >conftest.$ac_ext <<_ACEOF | ||
10711 | -#line 15761 "configure" | ||
10712 | +#line 15830 "configure" | ||
10713 | #include "confdefs.h" | ||
10714 | |||
10715 | #include <stdlib.h> | ||
10716 | @@ -15800,15 +15869,15 @@ | ||
10717 | |||
10718 | _ACEOF | ||
10719 | rm -f conftest$ac_exeext | ||
10720 | -if { (eval echo "$as_me:15803: \"$ac_link\"") >&5 | ||
10721 | +if { (eval echo "$as_me:15872: \"$ac_link\"") >&5 | ||
10722 | (eval $ac_link) 2>&5 | ||
10723 | ac_status=$? | ||
10724 | - echo "$as_me:15806: \$? = $ac_status" >&5 | ||
10725 | + echo "$as_me:15875: \$? = $ac_status" >&5 | ||
10726 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | ||
10727 | - { (eval echo "$as_me:15808: \"$ac_try\"") >&5 | ||
10728 | + { (eval echo "$as_me:15877: \"$ac_try\"") >&5 | ||
10729 | (eval $ac_try) 2>&5 | ||
10730 | ac_status=$? | ||
10731 | - echo "$as_me:15811: \$? = $ac_status" >&5 | ||
10732 | + echo "$as_me:15880: \$? = $ac_status" >&5 | ||
10733 | (exit $ac_status); }; }; then | ||
10734 | cf_cv_type_of_bool=`cat cf_test.out` | ||
10735 | if test -z "$cf_cv_type_of_bool"; then | ||
10736 | @@ -15826,25 +15895,25 @@ | ||
10737 | fi | ||
10738 | |||
10739 | rm -f cf_test.out | ||
10740 | -echo "$as_me:15829: result: $cf_cv_type_of_bool" >&5 | ||
10741 | +echo "$as_me:15898: result: $cf_cv_type_of_bool" >&5 | ||
10742 | echo "${ECHO_T}$cf_cv_type_of_bool" >&6 | ||
10743 | if test "$cf_cv_type_of_bool" = unknown ; then | ||
10744 | case .$NCURSES_BOOL in #(vi | ||
10745 | .auto|.) NCURSES_BOOL=unsigned;; | ||
10746 | esac | ||
10747 | - { echo "$as_me:15835: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 | ||
10748 | + { echo "$as_me:15904: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 | ||
10749 | echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} | ||
10750 | cf_cv_type_of_bool=$NCURSES_BOOL | ||
10751 | fi | ||
10752 | |||
10753 | else | ||
10754 | - echo "$as_me:15841: checking for fallback type of bool" >&5 | ||
10755 | + echo "$as_me:15910: checking for fallback type of bool" >&5 | ||
10756 | echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 | ||
10757 | case "$host_cpu" in #(vi | ||
10758 | i?86) cf_cv_type_of_bool=char ;; #(vi | ||
10759 | *) cf_cv_type_of_bool=int ;; | ||
10760 | esac | ||
10761 | - echo "$as_me:15847: result: $cf_cv_type_of_bool" >&5 | ||
10762 | + echo "$as_me:15916: result: $cf_cv_type_of_bool" >&5 | ||
10763 | echo "${ECHO_T}$cf_cv_type_of_bool" >&6 | ||
10764 | fi | ||
10765 | fi | ||
10766 | @@ -15873,7 +15942,7 @@ | ||
10767 | |||
10768 | if test "$cf_with_ada" != "no" ; then | ||
10769 | if test "$with_libtool" != "no"; then | ||
10770 | - { echo "$as_me:15876: WARNING: libtool does not support Ada - disabling feature" >&5 | ||
10771 | + { echo "$as_me:15945: WARNING: libtool does not support Ada - disabling feature" >&5 | ||
10772 | echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} | ||
10773 | cf_with_ada=no | ||
10774 | fi | ||
10775 | @@ -15883,7 +15952,7 @@ | ||
10776 | cf_ada_make=gnatmake | ||
10777 | # Extract the first word of "$cf_ada_make", so it can be a program name with args. | ||
10778 | set dummy $cf_ada_make; ac_word=$2 | ||
10779 | -echo "$as_me:15886: checking for $ac_word" >&5 | ||
10780 | +echo "$as_me:15955: checking for $ac_word" >&5 | ||
10781 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
10782 | if test "${ac_cv_prog_gnat_exists+set}" = set; then | ||
10783 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10784 | @@ -15898,7 +15967,7 @@ | ||
10785 | test -z "$ac_dir" && ac_dir=. | ||
10786 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
10787 | ac_cv_prog_gnat_exists="yes" | ||
10788 | -echo "$as_me:15901: found $ac_dir/$ac_word" >&5 | ||
10789 | +echo "$as_me:15970: found $ac_dir/$ac_word" >&5 | ||
10790 | break | ||
10791 | done | ||
10792 | |||
10793 | @@ -15907,10 +15976,10 @@ | ||
10794 | fi | ||
10795 | gnat_exists=$ac_cv_prog_gnat_exists | ||
10796 | if test -n "$gnat_exists"; then | ||
10797 | - echo "$as_me:15910: result: $gnat_exists" >&5 | ||
10798 | + echo "$as_me:15979: result: $gnat_exists" >&5 | ||
10799 | echo "${ECHO_T}$gnat_exists" >&6 | ||
10800 | else | ||
10801 | - echo "$as_me:15913: result: no" >&5 | ||
10802 | + echo "$as_me:15982: result: no" >&5 | ||
10803 | echo "${ECHO_T}no" >&6 | ||
10804 | fi | ||
10805 | |||
10806 | @@ -15918,11 +15987,11 @@ | ||
10807 | cf_ada_make= | ||
10808 | else | ||
10809 | |||
10810 | -echo "$as_me:15921: checking for gnat version" >&5 | ||
10811 | +echo "$as_me:15990: checking for gnat version" >&5 | ||
10812 | echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 | ||
10813 | cf_gnat_version=`${cf_ada_make-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\ | ||
10814 | sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` | ||
10815 | -echo "$as_me:15925: result: $cf_gnat_version" >&5 | ||
10816 | +echo "$as_me:15994: result: $cf_gnat_version" >&5 | ||
10817 | echo "${ECHO_T}$cf_gnat_version" >&6 | ||
10818 | |||
10819 | case $cf_gnat_version in | ||
10820 | @@ -15945,7 +16014,7 @@ | ||
10821 | |||
10822 | # Extract the first word of "m4", so it can be a program name with args. | ||
10823 | set dummy m4; ac_word=$2 | ||
10824 | -echo "$as_me:15948: checking for $ac_word" >&5 | ||
10825 | +echo "$as_me:16017: checking for $ac_word" >&5 | ||
10826 | echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | ||
10827 | if test "${ac_cv_prog_M4_exists+set}" = set; then | ||
10828 | echo $ECHO_N "(cached) $ECHO_C" >&6 | ||
10829 | @@ -15960,7 +16029,7 @@ | ||
10830 | test -z "$ac_dir" && ac_dir=. | ||
10831 | $as_executable_p "$ac_dir/$ac_word" || continue | ||
10832 | ac_cv_prog_M4_exists="yes" | ||
10833 | -echo "$as_me:15963: found $ac_dir/$ac_word" >&5 | ||
10834 | +echo "$as_me:16032: found $ac_dir/$ac_word" >&5 | ||
10835 | break | ||
10836 | done | ||
10837 | |||
10838 | @@ -15969,10 +16038,10 @@ | ||
10839 | fi | ||
10840 | M4_exists=$ac_cv_prog_M4_exists | ||
10841 | if test -n "$M4_exists"; then | ||
10842 | - echo "$as_me:15972: result: $M4_exists" >&5 | ||
10843 | + echo "$as_me:16041: result: $M4_exists" >&5 | ||
10844 | echo "${ECHO_T}$M4_exists" >&6 | ||
10845 | else | ||
10846 | - echo "$as_me:15975: result: no" >&5 | ||
10847 | + echo "$as_me:16044: result: no" >&5 | ||
10848 | echo "${ECHO_T}no" >&6 | ||
10849 | fi | ||
10850 | |||
10851 | @@ -15981,7 +16050,7 @@ | ||
10852 | echo Ada95 binding required program m4 not found. Ada95 binding disabled. | ||
10853 | fi | ||
10854 | if test "$cf_cv_prog_gnat_correct" = yes; then | ||
10855 | - echo "$as_me:15984: checking if GNAT works" >&5 | ||
10856 | + echo "$as_me:16053: checking if GNAT works" >&5 | ||
10857 | echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 | ||
10858 | |||
10859 | rm -f conftest* | ||
10860 | @@ -16009,14 +16078,14 @@ | ||
10861 | fi | ||
10862 | rm -f conftest* | ||
10863 | |||
10864 | - echo "$as_me:16012: result: $cf_cv_prog_gnat_correct" >&5 | ||
10865 | + echo "$as_me:16081: result: $cf_cv_prog_gnat_correct" >&5 | ||
10866 | echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 | ||
10867 | fi | ||
10868 | fi | ||
10869 | if test "$cf_cv_prog_gnat_correct" = yes; then | ||
10870 | ADAFLAGS="-O3 -gnatpn $ADAFLAGS" | ||
10871 | |||
10872 | - echo "$as_me:16019: checking if GNAT pragma Unreferenced works" >&5 | ||
10873 | + echo "$as_me:16088: checking if GNAT pragma Unreferenced works" >&5 | ||
10874 | echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 | ||
10875 | |||
10876 | rm -f conftest* | ||
10877 | @@ -16043,7 +16112,7 @@ | ||
10878 | fi | ||
10879 | rm -f conftest* | ||
10880 | |||
10881 | - echo "$as_me:16046: result: $cf_cv_pragma_unreferenced" >&5 | ||
10882 | + echo "$as_me:16115: result: $cf_cv_pragma_unreferenced" >&5 | ||
10883 | echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6 | ||
10884 | |||
10885 | # if the pragma is supported, use it (needed in the Trace code). | ||
10886 | @@ -16096,7 +16165,7 @@ | ||
10887 | withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` | ||
10888 | ;; | ||
10889 | *) | ||
10890 | - { { echo "$as_me:16099: error: expected a pathname, not \"$withval\"" >&5 | ||
10891 | + { { echo "$as_me:16168: error: expected a pathname, not \"$withval\"" >&5 | ||
10892 | echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} | ||
10893 | { (exit 1); exit 1; }; } | ||
10894 | ;; | ||
10895 | @@ -16138,7 +16207,7 @@ | ||
10896 | withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` | ||
10897 | ;; | ||
10898 | *) | ||
10899 | - { { echo "$as_me:16141: error: expected a pathname, not \"$withval\"" >&5 | ||
10900 | + { { echo "$as_me:16210: error: expected a pathname, not \"$withval\"" >&5 | ||
10901 | echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} | ||
10902 | { (exit 1); exit 1; }; } | ||
10903 | ;; | ||
10904 | @@ -16163,7 +16232,7 @@ | ||
10905 | ### chooses to split module lists into libraries. | ||
10906 | ### | ||
10907 | ### (see CF_LIB_RULES). | ||
10908 | -echo "$as_me:16166: checking for library subsets" >&5 | ||
10909 | +echo "$as_me:16235: checking for library subsets" >&5 | ||
10910 | echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 | ||
10911 | LIB_SUBSETS= | ||
10912 | |||
10913 | @@ -16188,7 +16257,7 @@ | ||
10914 | test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" | ||
10915 | test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" | ||
10916 | |||
10917 | -echo "$as_me:16191: result: $LIB_SUBSETS" >&5 | ||
10918 | +echo "$as_me:16260: result: $LIB_SUBSETS" >&5 | ||
10919 | echo "${ECHO_T}$LIB_SUBSETS" >&6 | ||
10920 | |||
10921 | ### Construct the list of include-directories to be generated | ||
10922 | @@ -16226,7 +16295,7 @@ | ||
10923 | fi | ||
10924 | |||
10925 | ### Build up pieces for makefile rules | ||
10926 | -echo "$as_me:16229: checking default library suffix" >&5 | ||
10927 | +echo "$as_me:16298: checking default library suffix" >&5 | ||
10928 | echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 | ||
10929 | |||
10930 | case $DFT_LWR_MODEL in | ||
10931 | @@ -16237,10 +16306,10 @@ | ||
10932 | shared) DFT_ARG_SUFFIX='' ;; | ||
10933 | esac | ||
10934 | test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" | ||
10935 | -echo "$as_me:16240: result: $DFT_ARG_SUFFIX" >&5 | ||
10936 | +echo "$as_me:16309: result: $DFT_ARG_SUFFIX" >&5 | ||
10937 | echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 | ||
10938 | |||
10939 | -echo "$as_me:16243: checking default library-dependency suffix" >&5 | ||
10940 | +echo "$as_me:16312: checking default library-dependency suffix" >&5 | ||
10941 | echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 | ||
10942 | |||
10943 | case $DFT_LWR_MODEL in | ||
10944 | @@ -16289,10 +16358,10 @@ | ||
10945 | esac | ||
10946 | test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}" | ||
10947 | test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}" | ||
10948 | -echo "$as_me:16292: result: $DFT_DEP_SUFFIX" >&5 | ||
10949 | +echo "$as_me:16361: result: $DFT_DEP_SUFFIX" >&5 | ||
10950 | echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 | ||
10951 | |||
10952 | -echo "$as_me:16295: checking default object directory" >&5 | ||
10953 | +echo "$as_me:16364: checking default object directory" >&5 | ||
10954 | echo $ECHO_N "checking default object directory... $ECHO_C" >&6 | ||
10955 | |||
10956 | case $DFT_LWR_MODEL in | ||
10957 | @@ -16308,12 +16377,12 @@ | ||
10958 | DFT_OBJ_SUBDIR='obj_s' ;; | ||
10959 | esac | ||
10960 | esac | ||
10961 | -echo "$as_me:16311: result: $DFT_OBJ_SUBDIR" >&5 | ||
10962 | +echo "$as_me:16380: result: $DFT_OBJ_SUBDIR" >&5 | ||
10963 | echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 | ||
10964 | |||
10965 | # libtool thinks it can make c++ shared libraries (perhaps only g++) | ||
10966 | if test "$cf_with_cxx" = yes ; then | ||
10967 | -echo "$as_me:16316: checking c++ library-dependency suffix" >&5 | ||
10968 | +echo "$as_me:16385: checking c++ library-dependency suffix" >&5 | ||
10969 | echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 | ||
10970 | if test "$with_libtool" != "no"; then | ||
10971 | CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX | ||
10972 | @@ -16366,7 +16435,7 @@ | ||
10973 | test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}" | ||
10974 | test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}" | ||
10975 | fi | ||
10976 | -echo "$as_me:16369: result: $CXX_LIB_SUFFIX" >&5 | ||
10977 | +echo "$as_me:16438: result: $CXX_LIB_SUFFIX" >&5 | ||
10978 | echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 | ||
10979 | |||
10980 | fi | ||
10981 | @@ -16519,12 +16588,12 @@ | ||
10982 | ;; | ||
10983 | esac | ||
10984 | |||
10985 | -echo "$as_me:16522: checking where we will install curses.h" >&5 | ||
10986 | +echo "$as_me:16591: checking where we will install curses.h" >&5 | ||
10987 | echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 | ||
10988 | test "$with_overwrite" = no && \ | ||
10989 | test "x$includedir" = 'x${prefix}/include' && \ | ||
10990 | includedir='${prefix}/include/ncurses'${LIB_SUFFIX} | ||
10991 | -echo "$as_me:16527: result: $includedir" >&5 | ||
10992 | +echo "$as_me:16596: result: $includedir" >&5 | ||
10993 | echo "${ECHO_T}$includedir" >&6 | ||
10994 | |||
10995 | ### Resolve a conflict between normal and wide-curses by forcing applications | ||
10996 | @@ -16532,7 +16601,7 @@ | ||
10997 | if test "$with_overwrite" != no ; then | ||
10998 | if test "$NCURSES_LIBUTF8" = 1 ; then | ||
10999 | NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' | ||
11000 | - { echo "$as_me:16535: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 | ||
11001 | + { echo "$as_me:16604: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 | ||
11002 | echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} | ||
11003 | fi | ||
11004 | fi | ||
11005 | @@ -16548,7 +16617,7 @@ | ||
11006 | ### Construct the list of subdirectories for which we'll customize makefiles | ||
11007 | ### with the appropriate compile-rules. | ||
11008 | |||
11009 | -echo "$as_me:16551: checking for src modules" >&5 | ||
11010 | +echo "$as_me:16620: checking for src modules" >&5 | ||
11011 | echo $ECHO_N "checking for src modules... $ECHO_C" >&6 | ||
11012 | |||
11013 | # dependencies and linker-arguments for test-programs | ||
11014 | @@ -16611,13 +16680,17 @@ | ||
11015 | fi | ||
11016 | fi | ||
11017 | done | ||
11018 | -echo "$as_me:16614: result: $cf_cv_src_modules" >&5 | ||
11019 | +echo "$as_me:16683: result: $cf_cv_src_modules" >&5 | ||
11020 | echo "${ECHO_T}$cf_cv_src_modules" >&6 | ||
11021 | |||
11022 | TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" | ||
11023 | TEST_ARG2="-L${LIB_2ND} $TEST_ARG2" | ||
11024 | |||
11025 | -SRC_SUBDIRS="man include" | ||
11026 | +SRC_SUBDIRS= | ||
11027 | +if test "x$cf_with_manpages" != xno ; then | ||
11028 | + SRC_SUBDIRS="$SRC_SUBDIRS man" | ||
11029 | +fi | ||
11030 | +SRC_SUBDIRS="$SRC_SUBDIRS include" | ||
11031 | for cf_dir in $cf_cv_src_modules | ||
11032 | do | ||
11033 | SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir" | ||
11034 | @@ -16760,18 +16833,18 @@ | ||
11035 | ### If we're building with rpath, try to link non-standard libs that way too. | ||
11036 | if test "$DFT_LWR_MODEL" = "shared"; then | ||
11037 | |||
11038 | -echo "$as_me:16763: checking for updated LDFLAGS" >&5 | ||
11039 | +echo "$as_me:16836: checking for updated LDFLAGS" >&5 | ||
11040 | echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 | ||
11041 | if test -n "$LDFLAGS" ; then | ||
11042 | -echo "$as_me:16766: result: maybe" >&5 | ||
11043 | +echo "$as_me:16839: result: maybe" >&5 | ||
11044 | echo "${ECHO_T}maybe" >&6 | ||
11045 | test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 | ||
11046 | |||
11047 | -echo "${as_me-configure}:16770: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 | ||
11048 | +echo "${as_me-configure}:16843: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 | ||
11049 | |||
11050 | test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 | ||
11051 | |||
11052 | -echo "${as_me-configure}:16774: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 | ||
11053 | +echo "${as_me-configure}:16847: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 | ||
11054 | |||
11055 | case "$EXTRA_LDFLAGS" in #(vi | ||
11056 | -Wl,-rpath,*) #(vi | ||
11057 | @@ -16793,7 +16866,7 @@ | ||
11058 | do | ||
11059 | test -n "$verbose" && echo " Filtering $cf_rpath_src" 1>&6 | ||
11060 | |||
11061 | -echo "${as_me-configure}:16796: testing Filtering $cf_rpath_src ..." 1>&5 | ||
11062 | +echo "${as_me-configure}:16869: testing Filtering $cf_rpath_src ..." 1>&5 | ||
11063 | |||
11064 | case $cf_rpath_src in #(vi | ||
11065 | -L*) #(vi | ||
11066 | @@ -16804,7 +16877,7 @@ | ||
11067 | fi | ||
11068 | test -n "$verbose" && echo " ...Filter $cf_rpath_tmp" 1>&6 | ||
11069 | |||
11070 | -echo "${as_me-configure}:16807: testing ...Filter $cf_rpath_tmp ..." 1>&5 | ||
11071 | +echo "${as_me-configure}:16880: testing ...Filter $cf_rpath_tmp ..." 1>&5 | ||
11072 | |||
11073 | EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" | ||
11074 | ;; | ||
11075 | @@ -16814,15 +16887,15 @@ | ||
11076 | LDFLAGS=$cf_rpath_dst | ||
11077 | test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 | ||
11078 | |||
11079 | -echo "${as_me-configure}:16817: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 | ||
11080 | +echo "${as_me-configure}:16890: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 | ||
11081 | |||
11082 | test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 | ||
11083 | |||
11084 | -echo "${as_me-configure}:16821: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 | ||
11085 | +echo "${as_me-configure}:16894: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 | ||
11086 | |||
11087 | fi | ||
11088 | else | ||
11089 | -echo "$as_me:16825: result: no" >&5 | ||
11090 | +echo "$as_me:16898: result: no" >&5 | ||
11091 | echo "${ECHO_T}no" >&6 | ||
11092 | fi | ||
11093 | |||
11094 | @@ -16932,7 +17005,7 @@ | ||
11095 | : ${CONFIG_STATUS=./config.status} | ||
11096 | ac_clean_files_save=$ac_clean_files | ||
11097 | ac_clean_files="$ac_clean_files $CONFIG_STATUS" | ||
11098 | -{ echo "$as_me:16935: creating $CONFIG_STATUS" >&5 | ||
11099 | +{ echo "$as_me:17008: creating $CONFIG_STATUS" >&5 | ||
11100 | echo "$as_me: creating $CONFIG_STATUS" >&6;} | ||
11101 | cat >$CONFIG_STATUS <<_ACEOF | ||
11102 | #! $SHELL | ||
11103 | @@ -17108,7 +17181,7 @@ | ||
11104 | echo "$ac_cs_version"; exit 0 ;; | ||
11105 | --he | --h) | ||
11106 | # Conflict between --help and --header | ||
11107 | - { { echo "$as_me:17111: error: ambiguous option: $1 | ||
11108 | + { { echo "$as_me:17184: error: ambiguous option: $1 | ||
11109 | Try \`$0 --help' for more information." >&5 | ||
11110 | echo "$as_me: error: ambiguous option: $1 | ||
11111 | Try \`$0 --help' for more information." >&2;} | ||
11112 | @@ -17127,7 +17200,7 @@ | ||
11113 | ac_need_defaults=false;; | ||
11114 | |||
11115 | # This is an error. | ||
11116 | - -*) { { echo "$as_me:17130: error: unrecognized option: $1 | ||
11117 | + -*) { { echo "$as_me:17203: error: unrecognized option: $1 | ||
11118 | Try \`$0 --help' for more information." >&5 | ||
11119 | echo "$as_me: error: unrecognized option: $1 | ||
11120 | Try \`$0 --help' for more information." >&2;} | ||
11121 | @@ -17206,6 +17279,7 @@ | ||
11122 | cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix" | ||
11123 | cf_cv_system_name="$cf_cv_system_name" | ||
11124 | cf_with_cxx_binding="$cf_with_cxx_binding" | ||
11125 | +cf_with_manpages="$cf_with_manpages" | ||
11126 | host="$host" | ||
11127 | target="$target" | ||
11128 | |||
11129 | @@ -17224,7 +17298,7 @@ | ||
11130 | "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; | ||
11131 | "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; | ||
11132 | "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; | ||
11133 | - *) { { echo "$as_me:17227: error: invalid argument: $ac_config_target" >&5 | ||
11134 | + *) { { echo "$as_me:17301: error: invalid argument: $ac_config_target" >&5 | ||
11135 | echo "$as_me: error: invalid argument: $ac_config_target" >&2;} | ||
11136 | { (exit 1); exit 1; }; };; | ||
11137 | esac | ||
11138 | @@ -17607,7 +17681,7 @@ | ||
11139 | esac | ||
11140 | |||
11141 | if test x"$ac_file" != x-; then | ||
11142 | - { echo "$as_me:17610: creating $ac_file" >&5 | ||
11143 | + { echo "$as_me:17684: creating $ac_file" >&5 | ||
11144 | echo "$as_me: creating $ac_file" >&6;} | ||
11145 | rm -f "$ac_file" | ||
11146 | fi | ||
11147 | @@ -17625,7 +17699,7 @@ | ||
11148 | -) echo $tmp/stdin ;; | ||
11149 | [\\/$]*) | ||
11150 | # Absolute (can't be DOS-style, as IFS=:) | ||
11151 | - test -f "$f" || { { echo "$as_me:17628: error: cannot find input file: $f" >&5 | ||
11152 | + test -f "$f" || { { echo "$as_me:17702: error: cannot find input file: $f" >&5 | ||
11153 | echo "$as_me: error: cannot find input file: $f" >&2;} | ||
11154 | { (exit 1); exit 1; }; } | ||
11155 | echo $f;; | ||
11156 | @@ -17638,7 +17712,7 @@ | ||
11157 | echo $srcdir/$f | ||
11158 | else | ||
11159 | # /dev/null tree | ||
11160 | - { { echo "$as_me:17641: error: cannot find input file: $f" >&5 | ||
11161 | + { { echo "$as_me:17715: error: cannot find input file: $f" >&5 | ||
11162 | echo "$as_me: error: cannot find input file: $f" >&2;} | ||
11163 | { (exit 1); exit 1; }; } | ||
11164 | fi;; | ||
11165 | @@ -17704,7 +17778,7 @@ | ||
11166 | * ) ac_file_in=$ac_file.in ;; | ||
11167 | esac | ||
11168 | |||
11169 | - test x"$ac_file" != x- && { echo "$as_me:17707: creating $ac_file" >&5 | ||
11170 | + test x"$ac_file" != x- && { echo "$as_me:17781: creating $ac_file" >&5 | ||
11171 | echo "$as_me: creating $ac_file" >&6;} | ||
11172 | |||
11173 | # First look for the input files in the build tree, otherwise in the | ||
11174 | @@ -17715,7 +17789,7 @@ | ||
11175 | -) echo $tmp/stdin ;; | ||
11176 | [\\/$]*) | ||
11177 | # Absolute (can't be DOS-style, as IFS=:) | ||
11178 | - test -f "$f" || { { echo "$as_me:17718: error: cannot find input file: $f" >&5 | ||
11179 | + test -f "$f" || { { echo "$as_me:17792: error: cannot find input file: $f" >&5 | ||
11180 | echo "$as_me: error: cannot find input file: $f" >&2;} | ||
11181 | { (exit 1); exit 1; }; } | ||
11182 | echo $f;; | ||
11183 | @@ -17728,7 +17802,7 @@ | ||
11184 | echo $srcdir/$f | ||
11185 | else | ||
11186 | # /dev/null tree | ||
11187 | - { { echo "$as_me:17731: error: cannot find input file: $f" >&5 | ||
11188 | + { { echo "$as_me:17805: error: cannot find input file: $f" >&5 | ||
11189 | echo "$as_me: error: cannot find input file: $f" >&2;} | ||
11190 | { (exit 1); exit 1; }; } | ||
11191 | fi;; | ||
11192 | @@ -17786,7 +17860,7 @@ | ||
11193 | rm -f $tmp/in | ||
11194 | if test x"$ac_file" != x-; then | ||
11195 | if cmp -s $ac_file $tmp/config.h 2>/dev/null; then | ||
11196 | - { echo "$as_me:17789: $ac_file is unchanged" >&5 | ||
11197 | + { echo "$as_me:17863: $ac_file is unchanged" >&5 | ||
11198 | echo "$as_me: $ac_file is unchanged" >&6;} | ||
11199 | else | ||
11200 | ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
11201 | @@ -18234,18 +18308,28 @@ | ||
11202 | install.libs uninstall.libs \\ | ||
11203 | install.data uninstall.data :: | ||
11204 | $MAKE_TERMINFO cd misc && \${MAKE} \${CF_MFLAGS} \$@ | ||
11205 | +CF_EOF | ||
11206 | + | ||
11207 | +if test "x$cf_with_manpages" = xyes; then | ||
11208 | +cat >> Makefile <<CF_EOF | ||
11209 | |||
11210 | install.man \\ | ||
11211 | uninstall.man :: | ||
11212 | cd man && \${MAKE} \${CF_MFLAGS} \$@ | ||
11213 | +CF_EOF | ||
11214 | +fi | ||
11215 | + | ||
11216 | +cat >> Makefile <<CF_EOF | ||
11217 | |||
11218 | distclean :: | ||
11219 | rm -f config.cache config.log config.status Makefile include/ncurses_cfg.h | ||
11220 | rm -f headers.sh headers.sed mk_shared_lib.sh | ||
11221 | + rm -f edit_man.* man_alias.* | ||
11222 | rm -rf \${DIRS_TO_MAKE} | ||
11223 | CF_EOF | ||
11224 | |||
11225 | # Special case: tack's manpage lives in its own directory. | ||
11226 | +if test "x$cf_with_manpages" = xyes; then | ||
11227 | if test -d tack ; then | ||
11228 | if test -f $srcdir/$tack.h; then | ||
11229 | cat >> Makefile <<CF_EOF | ||
11230 | @@ -18256,6 +18340,7 @@ | ||
11231 | CF_EOF | ||
11232 | fi | ||
11233 | fi | ||
11234 | +fi | ||
11235 | |||
11236 | rm -f headers.sed headers.sh | ||
11237 | |||
11238 | diff -Naur ncurses-5.7.orig/configure.in ncurses-5.7/configure.in | ||
11239 | --- ncurses-5.7.orig/configure.in 2008-10-18 07:53:32.000000000 -0700 | ||
11240 | +++ ncurses-5.7/configure.in 2008-12-20 14:47:08.000000000 -0800 | ||
11241 | @@ -28,14 +28,14 @@ | ||
11242 | dnl | ||
11243 | dnl Author: Thomas E. Dickey 1995-on | ||
11244 | dnl | ||
11245 | -dnl $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
11246 | +dnl $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
11247 | dnl Process this file with autoconf to produce a configure script. | ||
11248 | dnl | ||
11249 | dnl See http://invisible-island.net/autoconf/ for additional information. | ||
11250 | dnl | ||
11251 | dnl --------------------------------------------------------------------------- | ||
11252 | AC_PREREQ(2.13.20020210) | ||
11253 | -AC_REVISION($Revision: 1.1 $) | ||
11254 | +AC_REVISION($Revision: 1.1 $) | ||
11255 | AC_INIT(ncurses/base/lib_initscr.c) | ||
11256 | AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) | ||
11257 | |||
11258 | @@ -122,6 +122,13 @@ | ||
11259 | [cf_with_ada=yes]) | ||
11260 | AC_MSG_RESULT($cf_with_ada) | ||
11261 | |||
11262 | +AC_MSG_CHECKING(if you want to install manpages) | ||
11263 | +AC_ARG_WITH(manpages, | ||
11264 | + [ --without-manpages suppress install of manpages], | ||
11265 | + [cf_with_manpages=$withval], | ||
11266 | + [cf_with_manpages=yes]) | ||
11267 | +AC_MSG_RESULT($cf_with_manpages) | ||
11268 | + | ||
11269 | AC_MSG_CHECKING(if you want to build programs such as tic) | ||
11270 | AC_ARG_WITH(progs, | ||
11271 | [ --without-progs suppress build with programs (e.g., tic)], | ||
11272 | @@ -807,7 +814,7 @@ | ||
11273 | test "$with_rcs_ids" = yes && AC_DEFINE(USE_RCS_IDS) | ||
11274 | |||
11275 | ############################################################################### | ||
11276 | -CF_MAN_PAGES([ captoinfo clear infocmp infotocap tic toe tput ]) | ||
11277 | +CF_MAN_PAGES([ captoinfo clear infocmp infotocap tabs tic toe tput tset ]) | ||
11278 | |||
11279 | ############################################################################### | ||
11280 | CF_HELP_MESSAGE(Extensions:) | ||
11281 | @@ -1821,6 +1828,7 @@ | ||
11282 | cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix" | ||
11283 | cf_cv_system_name="$cf_cv_system_name" | ||
11284 | cf_with_cxx_binding="$cf_with_cxx_binding" | ||
11285 | +cf_with_manpages="$cf_with_manpages" | ||
11286 | host="$host" | ||
11287 | target="$target" | ||
11288 | |||
11289 | diff -Naur ncurses-5.7.orig/dist.mk ncurses-5.7/dist.mk | ||
11290 | --- ncurses-5.7.orig/dist.mk 2008-11-01 17:58:38.000000000 -0700 | ||
11291 | +++ ncurses-5.7/dist.mk 2008-12-20 14:47:16.000000000 -0800 | ||
11292 | @@ -25,7 +25,7 @@ | ||
11293 | # use or other dealings in this Software without prior written # | ||
11294 | # authorization. # | ||
11295 | ############################################################################## | ||
11296 | -# $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
11297 | +# $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
11298 | # Makefile for creating ncurses distributions. | ||
11299 | # | ||
11300 | # This only needs to be used directly as a makefile by developers, but | ||
11301 | @@ -37,7 +37,7 @@ | ||
11302 | # These define the major/minor/patch versions of ncurses. | ||
11303 | NCURSES_MAJOR = 5 | ||
11304 | NCURSES_MINOR = 7 | ||
11305 | -NCURSES_PATCH = 20081102 | ||
11306 | +NCURSES_PATCH = 20081213 | ||
11307 | |||
11308 | # We don't append the patch to the version, since this only applies to releases | ||
11309 | VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) | ||
11310 | diff -Naur ncurses-5.7.orig/form/frm_driver.c ncurses-5.7/form/frm_driver.c | ||
11311 | --- ncurses-5.7.orig/form/frm_driver.c 2008-10-18 09:25:00.000000000 -0700 | ||
11312 | +++ ncurses-5.7/form/frm_driver.c 2008-12-20 14:47:14.000000000 -0800 | ||
11313 | @@ -32,7 +32,7 @@ | ||
11314 | |||
11315 | #include "form.priv.h" | ||
11316 | |||
11317 | -MODULE_ID("$Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $") | ||
11318 | +MODULE_ID("$Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $") | ||
11319 | |||
11320 | /*---------------------------------------------------------------------------- | ||
11321 | This is the core module of the form library. It contains the majority | ||
11322 | @@ -4366,6 +4366,7 @@ | ||
11323 | delwin(field->working); | ||
11324 | field->working = newpad(field->drows, field->dcols); | ||
11325 | } | ||
11326 | + len = Buffer_Length(field); | ||
11327 | wclear(field->working); | ||
11328 | mvwaddstr(field->working, 0, 0, value); | ||
11329 | |||
11330 | diff -Naur ncurses-5.7.orig/include/curses.h.in ncurses-5.7/include/curses.h.in | ||
11331 | --- ncurses-5.7.orig/include/curses.h.in 2008-08-30 13:11:29.000000000 -0700 | ||
11332 | +++ ncurses-5.7/include/curses.h.in 2008-12-20 14:47:12.000000000 -0800 | ||
11333 | @@ -32,7 +32,7 @@ | ||
11334 | * and: Thomas E. Dickey 1996-on * | ||
11335 | ****************************************************************************/ | ||
11336 | |||
11337 | -/* $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ */ | ||
11338 | +/* $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ */ | ||
11339 | |||
11340 | #ifndef __NCURSES_H | ||
11341 | #define __NCURSES_H | ||
11342 | @@ -40,12 +40,6 @@ | ||
11343 | #define CURSES 1 | ||
11344 | #define CURSES_H 1 | ||
11345 | |||
11346 | -/* This should be defined for the enhanced functionality to be visible. | ||
11347 | - * However, some of the wide-character (enhanced) functionality is missing. | ||
11348 | - * So we do not define it (yet). | ||
11349 | -#define _XOPEN_CURSES 1 | ||
11350 | - */ | ||
11351 | - | ||
11352 | /* These are defined only in curses.h, and are used for conditional compiles */ | ||
11353 | #define NCURSES_VERSION_MAJOR @NCURSES_MAJOR@ | ||
11354 | #define NCURSES_VERSION_MINOR @NCURSES_MINOR@ | ||
11355 | diff -Naur ncurses-5.7.orig/include/curses.tail ncurses-5.7/include/curses.tail | ||
11356 | --- ncurses-5.7.orig/include/curses.tail 2008-07-05 13:20:38.000000000 -0700 | ||
11357 | +++ ncurses-5.7/include/curses.tail 2008-12-20 14:47:10.000000000 -0800 | ||
11358 | @@ -1,4 +1,4 @@ | ||
11359 | -/* $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ */ | ||
11360 | +/* $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ */ | ||
11361 | /* | ||
11362 | * vile:cmode: | ||
11363 | * This file is part of ncurses, designed to be appended after curses.h.in | ||
11364 | @@ -94,6 +94,7 @@ | ||
11365 | } | ||
11366 | MEVENT; | ||
11367 | |||
11368 | +extern NCURSES_EXPORT(bool) has_mouse (void); | ||
11369 | extern NCURSES_EXPORT(int) getmouse (MEVENT *); | ||
11370 | extern NCURSES_EXPORT(int) ungetmouse (MEVENT *); | ||
11371 | extern NCURSES_EXPORT(mmask_t) mousemask (mmask_t, mmask_t *); | ||
11372 | diff -Naur ncurses-5.7.orig/include/curses.wide ncurses-5.7/include/curses.wide | ||
11373 | --- ncurses-5.7.orig/include/curses.wide 2007-03-10 09:52:23.000000000 -0800 | ||
11374 | +++ ncurses-5.7/include/curses.wide 2008-12-20 14:47:12.000000000 -0800 | ||
11375 | @@ -1,9 +1,11 @@ | ||
11376 | -/* $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ */ | ||
11377 | +/* $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ */ | ||
11378 | /* | ||
11379 | * vile:cmode: | ||
11380 | * This file is part of ncurses, designed to be appended after curses.h.in | ||
11381 | * (see that file for the relevant copyright). | ||
11382 | */ | ||
11383 | +#define _XOPEN_CURSES 1 | ||
11384 | + | ||
11385 | #ifdef _XOPEN_SOURCE_EXTENDED | ||
11386 | |||
11387 | extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs; | ||
11388 | diff -Naur ncurses-5.7.orig/man/curs_mouse.3x ncurses-5.7/man/curs_mouse.3x | ||
11389 | --- ncurses-5.7.orig/man/curs_mouse.3x 2006-12-30 15:43:34.000000000 -0800 | ||
11390 | +++ ncurses-5.7/man/curs_mouse.3x 2008-12-20 14:47:10.000000000 -0800 | ||
11391 | @@ -1,6 +1,6 @@ | ||
11392 | '\" t | ||
11393 | .\"*************************************************************************** | ||
11394 | -.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * | ||
11395 | +.\" Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * | ||
11396 | .\" * | ||
11397 | .\" Permission is hereby granted, free of charge, to any person obtaining a * | ||
11398 | .\" copy of this software and associated documentation files (the * | ||
11399 | @@ -27,11 +27,12 @@ | ||
11400 | .\" authorization. * | ||
11401 | .\"*************************************************************************** | ||
11402 | .\" | ||
11403 | -.\" $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
11404 | +.\" $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
11405 | .TH curs_mouse 3X "" | ||
11406 | .na | ||
11407 | .hy 0 | ||
11408 | .SH NAME | ||
11409 | +\fBhas_mouse\fR, | ||
11410 | \fBgetmouse\fR, \fBungetmouse\fR, | ||
11411 | \fBmousemask\fR, \fBwenclose\fR, | ||
11412 | \fBmouse_trafo\fR, \fBwmouse_trafo\fR, | ||
11413 | @@ -53,7 +54,9 @@ | ||
11414 | MEVENT;\fR | ||
11415 | .fi | ||
11416 | .br | ||
11417 | -\fBint getmouse(MEVENT *event);\fR | ||
11418 | +\fBbool has_mouse(void);\fR | ||
11419 | +.br | ||
11420 | +-\fBint getmouse(MEVENT *event);\fR | ||
11421 | .br | ||
11422 | \fBint ungetmouse(MEVENT *event);\fR | ||
11423 | .br | ||
11424 | @@ -197,6 +200,9 @@ | ||
11425 | Use \fBmouseinterval(-1)\fR to obtain the interval without altering it. | ||
11426 | The default is one sixth of a second. | ||
11427 | .PP | ||
11428 | +The \fBhas_mouse\fP function returns TRUE if the mouse driver has been | ||
11429 | +successfully initialized. | ||
11430 | +.PP | ||
11431 | Note that mouse events will be ignored when input is in cooked mode, and will | ||
11432 | cause an error beep when cooked mode is being simulated in a window by a | ||
11433 | function such as \fBgetstr\fR that expects a linefeed for input-loop | ||
11434 | diff -Naur ncurses-5.7.orig/man/keybound.3x ncurses-5.7/man/keybound.3x | ||
11435 | --- ncurses-5.7.orig/man/keybound.3x 2006-02-25 13:47:06.000000000 -0800 | ||
11436 | +++ ncurses-5.7/man/keybound.3x 2008-12-20 14:47:16.000000000 -0800 | ||
11437 | @@ -1,5 +1,5 @@ | ||
11438 | .\"*************************************************************************** | ||
11439 | -.\" Copyright (c) 1999-2003,2006 Free Software Foundation, Inc. * | ||
11440 | +.\" Copyright (c) 1999-2006,2008 Free Software Foundation, Inc. * | ||
11441 | .\" * | ||
11442 | .\" Permission is hereby granted, free of charge, to any person obtaining a * | ||
11443 | .\" copy of this software and associated documentation files (the * | ||
11444 | @@ -28,8 +28,8 @@ | ||
11445 | .\" | ||
11446 | .\" Author: Thomas E. Dickey 1999 | ||
11447 | .\" | ||
11448 | -.\" $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
11449 | -.TH keyok 3X "" | ||
11450 | +.\" $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
11451 | +.TH keybound 3X "" | ||
11452 | .SH NAME | ||
11453 | \fBkeybound\fP \- return definition of keycode | ||
11454 | .SH SYNOPSIS | ||
11455 | diff -Naur ncurses-5.7.orig/man/tabs.1 ncurses-5.7/man/tabs.1 | ||
11456 | --- ncurses-5.7.orig/man/tabs.1 1969-12-31 16:00:00.000000000 -0800 | ||
11457 | +++ ncurses-5.7/man/tabs.1 2008-12-20 14:47:08.000000000 -0800 | ||
11458 | @@ -0,0 +1,143 @@ | ||
11459 | +.\"*************************************************************************** | ||
11460 | +.\" Copyright (c) 2008 Free Software Foundation, Inc. * | ||
11461 | +.\" * | ||
11462 | +.\" Permission is hereby granted, free of charge, to any person obtaining a * | ||
11463 | +.\" copy of this software and associated documentation files (the * | ||
11464 | +.\" "Software"), to deal in the Software without restriction, including * | ||
11465 | +.\" without limitation the rights to use, copy, modify, merge, publish, * | ||
11466 | +.\" distribute, distribute with modifications, sublicense, and/or sell * | ||
11467 | +.\" copies of the Software, and to permit persons to whom the Software is * | ||
11468 | +.\" furnished to do so, subject to the following conditions: * | ||
11469 | +.\" * | ||
11470 | +.\" The above copyright notice and this permission notice shall be included * | ||
11471 | +.\" in all copies or substantial portions of the Software. * | ||
11472 | +.\" * | ||
11473 | +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * | ||
11474 | +.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * | ||
11475 | +.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * | ||
11476 | +.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * | ||
11477 | +.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * | ||
11478 | +.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * | ||
11479 | +.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE. * | ||
11480 | +.\" * | ||
11481 | +.\" Except as contained in this notice, the name(s) of the above copyright * | ||
11482 | +.\" holders shall not be used in advertising or otherwise to promote the * | ||
11483 | +.\" sale, use or other dealings in this Software without prior written * | ||
11484 | +.\" authorization. * | ||
11485 | +.\"*************************************************************************** | ||
11486 | +.\" | ||
11487 | +.\" $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
11488 | +.TH @TABS@ 1M "" | ||
11489 | +.ds n 5 | ||
11490 | +.SH NAME | ||
11491 | +\fBtabs\fR - set tabs on a terminal | ||
11492 | +.SH SYNOPSIS | ||
11493 | +\fBtabs\fR [\fB-v\fR[\fIn\fR]] [\fB-ahuUV\fR] \fIfile...\fR | ||
11494 | +.br | ||
11495 | +.SH DESCRIPTION | ||
11496 | +.PP | ||
11497 | +The \fBtabs\fP program clears and sets tab-stops on the terminal. | ||
11498 | +This uses the terminfo \fIclear_all_tabs\fP and \fIset_tab\fP capabilities. | ||
11499 | +If either is absent, \fBtabs\fP is unable to clear/set tab-stops. | ||
11500 | +The terminal should be configured to use hard tabs, e.g., | ||
11501 | +.sp | ||
11502 | +.RS | ||
11503 | +stty tab0 | ||
11504 | +.RE | ||
11505 | +.SH OPTIONS | ||
11506 | +.SS General Options | ||
11507 | +.TP 5 | ||
11508 | +.BI -T "name" | ||
11509 | +Tell \fBtabs\fP which terminal type to use. | ||
11510 | +If this option is not given, \fBtabs\fP will use the \fB$TERM\fP | ||
11511 | +environment variable. | ||
11512 | +If that is not set, it will use the \fIansi+tabs\fP entry. | ||
11513 | +.TP 5 | ||
11514 | +.B -d | ||
11515 | +The debugging option shows a ruler line, followed by two data lines. | ||
11516 | +The first data line shows the expected tab-stops marked with asterisks. | ||
11517 | +The second data line shows the actual tab-stops, marked with asterisks. | ||
11518 | +.TP 5 | ||
11519 | +.B -n | ||
11520 | +This option tells \fBtabs\fP to check the options and run any debugging | ||
11521 | +option, but not to modify the terminal settings. | ||
11522 | +.PP | ||
11523 | +The \fBtabs\fP program processes a single list of tab stops. | ||
11524 | +The last option to be processed which defines a list is the one that | ||
11525 | +determines the list to be processed. | ||
11526 | +.SS Implicit Lists | ||
11527 | +Use a single number as an option, e.g., "\fB-5\fP" to set tabs at the given | ||
11528 | +interval (in this case 1, 6, 11, 16, 21, etc.). Tabs are repeated up to | ||
11529 | +the right margin of the screen. | ||
11530 | +.SS Explicit Lists | ||
11531 | +An explicit list can be defined after the options (this does not use a "-"). | ||
11532 | +The values in the list must be in increasing numeric order, and greater than | ||
11533 | +zero. They are separated by a comma or a blank, for example, | ||
11534 | +.sp | ||
11535 | +.RS | ||
11536 | +tabs 1,6,11,16,21 | ||
11537 | +.br | ||
11538 | +tabs 1 6 11 16 21 | ||
11539 | +.RE | ||
11540 | +Use a '+' to treat a number as an increment relative to the previous value, | ||
11541 | +e.g., | ||
11542 | +.sp | ||
11543 | +.RS | ||
11544 | +tabs 1,+5,+5,+5,+5 | ||
11545 | +.RE | ||
11546 | +which is equivalent to the 1,6,11,16,21 example. | ||
11547 | +.SS Predefined Tab-Stops | ||
11548 | +X/Open defines several predefined lists of tab stops. | ||
11549 | +.TP 5 | ||
11550 | +.B -a | ||
11551 | +Assembler, IBM S/370, first format | ||
11552 | +.TP 5 | ||
11553 | +.B -a2 | ||
11554 | +Assembler, IBM S/370, second format | ||
11555 | +.TP 5 | ||
11556 | +.B -c | ||
11557 | +COBOL, normal format | ||
11558 | +.TP 5 | ||
11559 | +.B -c2 | ||
11560 | +COBOL compact format | ||
11561 | +.TP 5 | ||
11562 | +.B -c3 | ||
11563 | +COBOL compact format extended | ||
11564 | +.TP 5 | ||
11565 | +.B -f | ||
11566 | +FORTRAN | ||
11567 | +.TP 5 | ||
11568 | +.B -p | ||
11569 | +PL/I | ||
11570 | +.TP 5 | ||
11571 | +.B -s | ||
11572 | +SNOBOL | ||
11573 | +.TP 5 | ||
11574 | +.B -u | ||
11575 | +UNIVAC 1100 Assembler | ||
11576 | +.SH PORTABILITY | ||
11577 | +.PP | ||
11578 | +X/Open describes a \fB+m\fP option, to set a terminal's left-margin. | ||
11579 | +None of the entries in the terminal database provide this capability. | ||
11580 | +.PP | ||
11581 | +The \fB-d\fP (debug) and \fB-n\fP (no-op) options are extensions not provided | ||
11582 | +by other implementations. | ||
11583 | +.PP | ||
11584 | +Documentation for other implementations states that there is a limit on the | ||
11585 | +number of tab stops. While some terminals may not accept an arbitrary number | ||
11586 | +of tab stops, this implementation will attempt to set tab stops up to the | ||
11587 | +right margin of the screen, if the given list happens to be that long. | ||
11588 | +.SH SEE ALSO | ||
11589 | +\fB@TSET@\fR(1), | ||
11590 | +\fB@INFOCMP@\fR(1M), | ||
11591 | +\fBcurses\fR(3X), | ||
11592 | +\fBterminfo\fR(\*n). | ||
11593 | +.PP | ||
11594 | +This describes \fBncurses\fR | ||
11595 | +version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@). | ||
11596 | +.\"# | ||
11597 | +.\"# The following sets edit modes for GNU EMACS | ||
11598 | +.\"# Local Variables: | ||
11599 | +.\"# mode:nroff | ||
11600 | +.\"# fill-column:79 | ||
11601 | +.\"# End: | ||
11602 | diff -Naur ncurses-5.7.orig/man/tset.1 ncurses-5.7/man/tset.1 | ||
11603 | --- ncurses-5.7.orig/man/tset.1 2006-12-24 07:00:30.000000000 -0800 | ||
11604 | +++ ncurses-5.7/man/tset.1 2008-12-20 14:47:08.000000000 -0800 | ||
11605 | @@ -1,5 +1,5 @@ | ||
11606 | .\"*************************************************************************** | ||
11607 | -.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * | ||
11608 | +.\" Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * | ||
11609 | .\" * | ||
11610 | .\" Permission is hereby granted, free of charge, to any person obtaining a * | ||
11611 | .\" copy of this software and associated documentation files (the * | ||
11612 | @@ -26,8 +26,8 @@ | ||
11613 | .\" authorization. * | ||
11614 | .\"*************************************************************************** | ||
11615 | .\" | ||
11616 | -.\" $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
11617 | -.TH tset 1 "" | ||
11618 | +.\" $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
11619 | +.TH @TSET@ 1 "" | ||
11620 | .SH NAME | ||
11621 | \fBtset\fR, \fBreset\fR - terminal initialization | ||
11622 | .SH SYNOPSIS | ||
11623 | diff -Naur ncurses-5.7.orig/misc/Makefile.in ncurses-5.7/misc/Makefile.in | ||
11624 | --- ncurses-5.7.orig/misc/Makefile.in 2007-03-31 08:54:17.000000000 -0700 | ||
11625 | +++ ncurses-5.7/misc/Makefile.in 2008-12-20 14:47:16.000000000 -0800 | ||
11626 | @@ -1,6 +1,6 @@ | ||
11627 | -# $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
11628 | +# $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
11629 | ############################################################################## | ||
11630 | -# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # | ||
11631 | +# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. # | ||
11632 | # # | ||
11633 | # Permission is hereby granted, free of charge, to any person obtaining a # | ||
11634 | # copy of this software and associated documentation files (the "Software"), # | ||
11635 | @@ -66,7 +66,7 @@ | ||
11636 | source = @TERMINFO_SRC@ | ||
11637 | |||
11638 | INSTALL = @INSTALL@ | ||
11639 | -INSTALL_PROG = @INSTALL_PROGRAM@ | ||
11640 | +INSTALL_PROG = @INSTALL_SCRIPT@ | ||
11641 | INSTALL_DATA = @INSTALL_DATA@ | ||
11642 | |||
11643 | ################################################################################ | ||
11644 | diff -Naur ncurses-5.7.orig/misc/terminfo.src ncurses-5.7/misc/terminfo.src | ||
11645 | --- ncurses-5.7.orig/misc/terminfo.src 2008-10-12 16:03:54.000000000 -0700 | ||
11646 | +++ ncurses-5.7/misc/terminfo.src 2008-12-20 14:47:12.000000000 -0800 | ||
11647 | @@ -6,8 +6,8 @@ | ||
11648 | # Report bugs and new terminal descriptions to | ||
11649 | # bug-ncurses@gnu.org | ||
11650 | # | ||
11651 | -# $Revision: 1.1 $ | ||
11652 | -# $Date: 2008-12-22 10:40:11 $ | ||
11653 | +# $Revision: 1.1 $ | ||
11654 | +# $Date: 2008-12-22 10:40:11 $ | ||
11655 | # | ||
11656 | # The original header is preserved below for reference. It is noted that there | ||
11657 | # is a "newer" version which differs in some cosmetic details (but actually | ||
11658 | @@ -340,7 +340,7 @@ | ||
11659 | cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC, | ||
11660 | cuu=\E[%p1%dA, use=ansi+local1, | ||
11661 | ansi+tabs, | ||
11662 | - cbt=\E[Z, ht=^I, hts=\EH, tbc=\E[2g, | ||
11663 | + cbt=\E[Z, ht=^I, hts=\EH, tbc=\E[3g, | ||
11664 | ansi+inittabs, | ||
11665 | it#8, use=ansi+tabs, | ||
11666 | ansi+erase, | ||
11667 | @@ -545,7 +545,7 @@ | ||
11668 | cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, | ||
11669 | dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, | ||
11670 | hts=\EH, il1=\E[L, ind=^J, kbs=^H, kcub1=\E[D, kcud1=\E[B, | ||
11671 | - kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, tbc=\E[2g, | ||
11672 | + kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, tbc=\E[3g, | ||
11673 | use=klone+sgr-dumb, | ||
11674 | pcansi-25-m|pcansi25m|ibm-pc terminal programs with 25 lines (mono mode), | ||
11675 | lines#25, use=pcansi-m, | ||
11676 | @@ -576,7 +576,7 @@ | ||
11677 | kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, | ||
11678 | kich1=\E[L, mc4=\E[4i, mc5=\E[5i, nel=\r\E[S, | ||
11679 | rep=%p1%c\E[%p2%{1}%-%db, rin=\E[%p1%dT, s0ds=\E(B, | ||
11680 | - s1ds=\E)B, s2ds=\E*B, s3ds=\E+B, tbc=\E[2g, | ||
11681 | + s1ds=\E)B, s2ds=\E*B, s3ds=\E+B, tbc=\E[3g, | ||
11682 | vpa=\E[%i%p1%dd, use=pcansi-m, | ||
11683 | |||
11684 | ansi+enq|ncurses extension for ANSI ENQ, | ||
11685 | @@ -1005,7 +1005,7 @@ | ||
11686 | sc=\E7, | ||
11687 | sgr=\E[10m\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p9%t;12%e;10%;%?%p7%t;9%;m, | ||
11688 | sgr0=\E[0;10m, smacs=\E[12m, smso=\E[7m, smul=\E[4m, | ||
11689 | - tbc=\E[2g, vpa=\E[%i%p1%dd, use=klone+color, | ||
11690 | + tbc=\E[3g, vpa=\E[%i%p1%dd, use=klone+color, | ||
11691 | # (pc6300plus: removed ":KM=/usr/lib/ua/kmap.s5:"; renamed BO/EE/CI/CV -- esr) | ||
11692 | pc6300plus|AT&T 6300 plus, | ||
11693 | OTbs, am, xon, | ||
11694 | @@ -1416,7 +1416,7 @@ | ||
11695 | setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, | ||
11696 | sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%t;7%;%?%p7%t;9%;m%?%p9%t\016%e\017%;, | ||
11697 | sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smso=\E[7m, | ||
11698 | - smul=\E[4m, tbc=\E[2g, | ||
11699 | + smul=\E[4m, tbc=\E[3g, | ||
11700 | tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH, | ||
11701 | # | ||
11702 | qansi|QNX ansi with console writes, | ||
11703 | @@ -4357,6 +4357,26 @@ | ||
11704 | sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m, | ||
11705 | smul=\E[4m, | ||
11706 | |||
11707 | +# The codes supported by the term.el terminal emulation in GNU Emacs 22.2 | ||
11708 | +eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96, | ||
11709 | + am, mir, msgr, xenl, | ||
11710 | + colors#8, cols#80, lines#24, pairs#64, | ||
11711 | + bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=^M, | ||
11712 | + csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, | ||
11713 | + cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, | ||
11714 | + cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, | ||
11715 | + dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, | ||
11716 | + el=\E[K, el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@, | ||
11717 | + il=\E[%p1%dL, il1=\E[L, ind=^J, invis=\E[8m, kbs=\177, | ||
11718 | + kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, | ||
11719 | + kdch1=\E[3~, kend=\E[4~, khome=\E[1~, kich1=\E[2~, | ||
11720 | + knp=\E[6~, kpp=\E[5~, op=\E[39;49m, rc=\E8, rev=\E[7m, | ||
11721 | + ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, | ||
11722 | + sc=\E7, setab=\E[%p1%'('%+%dm, setaf=\E[%p1%{30}%+%dm, | ||
11723 | + sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m, | ||
11724 | + sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m, | ||
11725 | + u6=\E[%i%d;%dR, u7=\E[6n, | ||
11726 | + | ||
11727 | # Entries for use by the `screen' program by Juergen Weigert, | ||
11728 | # Michael Schroeder, Oliver Laumann. The screen and | ||
11729 | # screen-w entries came with version 3.7.1. The screen2 and screen3 entries | ||
11730 | @@ -5247,7 +5267,7 @@ | ||
11731 | setab=\E[4%p1%dm, setaf=\E[3%p1%dm, | ||
11732 | sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m, | ||
11733 | sgr0=\E[0;10m, smacs=\E[11m, smir=\E[4h, smso=\E[7m, | ||
11734 | - smul=\E[4m, tbc=\E[2g, vpa=\E[%i%p1%dd, use=vt102+enq, | ||
11735 | + smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt102+enq, | ||
11736 | |||
11737 | # Key definitions: | ||
11738 | # The encodings for unshifted arrow keys, F1-F12, Home, Insert, etc. match the | ||
11739 | @@ -11060,7 +11080,7 @@ | ||
11740 | sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m, | ||
11741 | sgr0=\E[m, | ||
11742 | smkx=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E\\, | ||
11743 | - smm=\E[>52h, smso=\E[7m, smul=\E[4m, tbc=\E[2g, | ||
11744 | + smm=\E[>52h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, | ||
11745 | vpa=\E[%p1%{1}%+%dd, | ||
11746 | |||
11747 | aaa+rv|ann arbor ambassador in reverse video, | ||
11748 | @@ -12147,7 +12167,7 @@ | ||
11749 | sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m, | ||
11750 | sgr0=\E[m, smacs=\017$<1>, smcup=\E[=4l\E[1;24w\E2\r, | ||
11751 | smir=\E[4h, smkx=\E[1!z\E[0;3u, smso=\E[7m, smul=\E[4m, | ||
11752 | - tbc=\E[2g, vpa=\E[%p1%{1}%+%dd, | ||
11753 | + tbc=\E[3g, vpa=\E[%p1%{1}%+%dd, | ||
11754 | avt-rv-ns|concept avt in reverse video mode/no status line, | ||
11755 | flash=\E[=205l$<200>\E[=205h, is1=\E[=103l\E[=205h, | ||
11756 | use=avt-ns, | ||
11757 | @@ -14584,7 +14604,7 @@ | ||
11758 | sc=\E[%y, | ||
11759 | sgr=\E[%{0}%?%p1%p3%|%t%{7}%+%;%?%p2%t%{2}%+%;%?%p4%t%{5}%+%;%?%p6%t%{1}%+%;m%?%p8%t\E[%{32}%+%d%%{%;%?%p9%t\016%e\017%;, | ||
11760 | sgr0=\E[0m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m, | ||
11761 | - tbc=\E[2g, tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd, | ||
11762 | + tbc=\E[3g, tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd, | ||
11763 | |||
11764 | # p9-w: Prism-9 in 132 column mode | ||
11765 | # -------------------------------- | ||
11766 | @@ -16037,7 +16057,7 @@ | ||
11767 | rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, rmam=\E[?7l, | ||
11768 | rmso=\E[m, rmul=\E[m, | ||
11769 | sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m, | ||
11770 | - sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[2g, | ||
11771 | + sgr0=\E[m, smam=\E[?7h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, | ||
11772 | vpa=\E[%p1%{1}%+%dd, | ||
11773 | # The tek4125 emulates a vt100 incorrectly - the scrolling region | ||
11774 | # command is ignored. The following entry replaces <csr> with the needed | ||
11775 | @@ -17729,7 +17749,7 @@ | ||
11776 | rmul=\E[m, rs2=\E[?=h\Ec, s0ds=^O, s1ds=^N, | ||
11777 | sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, | ||
11778 | sgr0=\E[m\017, smacs=^N, smcup=\E[?>h\EPY99\:98\E\\, | ||
11779 | - smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m, tbc=\E[2g, | ||
11780 | + smir=\E[4h, smso=\E[0;7m, smul=\E[0;4m, tbc=\E[3g, | ||
11781 | tsl=\EPY99\:98\E\\\E[0;98v\E[2;7m, | ||
11782 | tws2102-sna|dku7102-sna|BULL Questar tws2102 for SNA, | ||
11783 | dsl=\E[0;98v\E[2J\E[v, fsl=\E[v, is3=\Eb, tsl=\E[0;98v, | ||
11784 | @@ -21791,6 +21811,13 @@ | ||
11785 | # * add "aterm" -TD | ||
11786 | # * add "linux2.6.26" -TD | ||
11787 | # | ||
11788 | +# 2008-11-15 | ||
11789 | +# * change several \E[2g (clear tab at current column) to \E[3g | ||
11790 | +# (clear all tabs) to match definition for tbc capability -TD | ||
11791 | +# | ||
11792 | +# 2008-11-29 | ||
11793 | +# * add eterm-color -TD | ||
11794 | +# | ||
11795 | # The following sets edit modes for GNU EMACS. | ||
11796 | # Local Variables: | ||
11797 | # fill-prefix:"\t" | ||
11798 | diff -Naur ncurses-5.7.orig/ncurses/base/lib_addch.c ncurses-5.7/ncurses/base/lib_addch.c | ||
11799 | --- ncurses-5.7.orig/ncurses/base/lib_addch.c 2008-08-16 12:20:04.000000000 -0700 | ||
11800 | +++ ncurses-5.7/ncurses/base/lib_addch.c 2008-12-20 14:47:12.000000000 -0800 | ||
11801 | @@ -36,7 +36,7 @@ | ||
11802 | #include <curses.priv.h> | ||
11803 | #include <ctype.h> | ||
11804 | |||
11805 | -MODULE_ID("$Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $") | ||
11806 | +MODULE_ID("$Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $") | ||
11807 | |||
11808 | static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT); | ||
11809 | |||
11810 | @@ -265,15 +265,25 @@ | ||
11811 | int len = _nc_build_wch(win, CHREF(ch)); | ||
11812 | |||
11813 | if (len >= -1) { | ||
11814 | - /* handle EILSEQ */ | ||
11815 | + attr_t attr = AttrOf(ch); | ||
11816 | + | ||
11817 | + /* handle EILSEQ (i.e., when len >= -1) */ | ||
11818 | if (is8bits(CharOf(ch))) { | ||
11819 | + int rc = OK; | ||
11820 | const char *s = unctrl((chtype) CharOf(ch)); | ||
11821 | - if (s[1] != 0) { | ||
11822 | - return waddstr(win, s); | ||
11823 | + | ||
11824 | + if (s[1] != '\0') { | ||
11825 | + while (*s != '\0') { | ||
11826 | + rc = waddch(win, UChar(*s) | attr); | ||
11827 | + if (rc != OK) | ||
11828 | + break; | ||
11829 | + ++s; | ||
11830 | + } | ||
11831 | + return rc; | ||
11832 | } | ||
11833 | } | ||
11834 | if (len == -1) | ||
11835 | - return waddch(win, ' '); | ||
11836 | + return waddch(win, ' ' | attr); | ||
11837 | } else { | ||
11838 | return OK; | ||
11839 | } | ||
11840 | diff -Naur ncurses-5.7.orig/ncurses/base/lib_freeall.c ncurses-5.7/ncurses/base/lib_freeall.c | ||
11841 | --- ncurses-5.7.orig/ncurses/base/lib_freeall.c 2008-09-27 06:09:57.000000000 -0700 | ||
11842 | +++ ncurses-5.7/ncurses/base/lib_freeall.c 2008-12-20 14:47:14.000000000 -0800 | ||
11843 | @@ -40,7 +40,7 @@ | ||
11844 | extern int malloc_errfd; /* FIXME */ | ||
11845 | #endif | ||
11846 | |||
11847 | -MODULE_ID("$Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $") | ||
11848 | +MODULE_ID("$Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $") | ||
11849 | |||
11850 | /* | ||
11851 | * Free all ncurses data. This is used for testing only (there's no practical | ||
11852 | @@ -98,8 +98,6 @@ | ||
11853 | delscreen(SP); | ||
11854 | _nc_unlock_global(curses); | ||
11855 | } | ||
11856 | - if (cur_term != 0) | ||
11857 | - del_curterm(cur_term); | ||
11858 | |||
11859 | (void) _nc_printf_string(0, empty_va); | ||
11860 | #ifdef TRACE | ||
11861 | diff -Naur ncurses-5.7.orig/ncurses/base/lib_mouse.c ncurses-5.7/ncurses/base/lib_mouse.c | ||
11862 | --- ncurses-5.7.orig/ncurses/base/lib_mouse.c 2008-10-18 14:48:55.000000000 -0700 | ||
11863 | +++ ncurses-5.7/ncurses/base/lib_mouse.c 2008-12-20 14:47:14.000000000 -0800 | ||
11864 | @@ -79,7 +79,7 @@ | ||
11865 | |||
11866 | #include <curses.priv.h> | ||
11867 | |||
11868 | -MODULE_ID("$Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $") | ||
11869 | +MODULE_ID("$Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $") | ||
11870 | |||
11871 | #include <term.h> | ||
11872 | #include <tic.h> | ||
11873 | @@ -694,11 +694,16 @@ | ||
11874 | |||
11875 | #if USE_GPM_SUPPORT | ||
11876 | case M_GPM: | ||
11877 | - { | ||
11878 | + if (sp->_mouse_fd >= 0) { | ||
11879 | /* query server for event, return TRUE if we find one */ | ||
11880 | Gpm_Event ev; | ||
11881 | |||
11882 | - if (my_Gpm_GetEvent(&ev) == 1) { | ||
11883 | + switch (my_Gpm_GetEvent(&ev)) { | ||
11884 | + case 0: | ||
11885 | + /* Connection closed, drop the mouse. */ | ||
11886 | + sp->_mouse_fd = -1; | ||
11887 | + break; | ||
11888 | + case 1: | ||
11889 | /* there's only one mouse... */ | ||
11890 | eventp->id = NORMAL_EVENT; | ||
11891 | |||
11892 | @@ -731,6 +736,7 @@ | ||
11893 | /* bump the next-free pointer into the circular list */ | ||
11894 | sp->_mouse_eventp = eventp = NEXT(eventp); | ||
11895 | result = TRUE; | ||
11896 | + break; | ||
11897 | } | ||
11898 | } | ||
11899 | break; | ||
11900 | @@ -1397,10 +1403,16 @@ | ||
11901 | |||
11902 | /* This may be used by other routines to ask for the existence of mouse | ||
11903 | support */ | ||
11904 | -NCURSES_EXPORT(int) | ||
11905 | -_nc_has_mouse(void) | ||
11906 | +NCURSES_EXPORT(bool) | ||
11907 | +_nc_has_mouse(SCREEN *sp) | ||
11908 | +{ | ||
11909 | + return ((sp->_mouse_type == M_NONE) ? FALSE : TRUE); | ||
11910 | +} | ||
11911 | + | ||
11912 | +NCURSES_EXPORT(bool) | ||
11913 | +has_mouse(void) | ||
11914 | { | ||
11915 | - return (SP->_mouse_type == M_NONE ? 0 : 1); | ||
11916 | + return _nc_has_mouse(SP); | ||
11917 | } | ||
11918 | |||
11919 | NCURSES_EXPORT(bool) | ||
11920 | diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h | ||
11921 | --- ncurses-5.7.orig/ncurses/curses.priv.h 2008-10-04 14:37:45.000000000 -0700 | ||
11922 | +++ ncurses-5.7/ncurses/curses.priv.h 2008-12-20 14:47:10.000000000 -0800 | ||
11923 | @@ -34,7 +34,7 @@ | ||
11924 | |||
11925 | |||
11926 | /* | ||
11927 | - * $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
11928 | + * $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
11929 | * | ||
11930 | * curses.priv.h | ||
11931 | * | ||
11932 | @@ -1519,7 +1519,7 @@ | ||
11933 | extern NCURSES_EXPORT(void) _nc_screen_wrap (void); | ||
11934 | |||
11935 | /* lib_mouse.c */ | ||
11936 | -extern NCURSES_EXPORT(int) _nc_has_mouse (void); | ||
11937 | +extern NCURSES_EXPORT(bool) _nc_has_mouse (SCREEN *); | ||
11938 | |||
11939 | /* lib_mvcur.c */ | ||
11940 | #define INFINITY 1000000 /* cost: too high to use */ | ||
11941 | diff -Naur ncurses-5.7.orig/ncurses/tinfo/entries.c ncurses-5.7/ncurses/tinfo/entries.c | ||
11942 | --- ncurses-5.7.orig/ncurses/tinfo/entries.c 2008-09-27 06:11:10.000000000 -0700 | ||
11943 | +++ ncurses-5.7/ncurses/tinfo/entries.c 2008-12-20 14:47:14.000000000 -0800 | ||
11944 | @@ -37,7 +37,7 @@ | ||
11945 | #include <tic.h> | ||
11946 | #include <term_entry.h> | ||
11947 | |||
11948 | -MODULE_ID("$Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $") | ||
11949 | +MODULE_ID("$Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $") | ||
11950 | |||
11951 | /**************************************************************************** | ||
11952 | * | ||
11953 | @@ -117,6 +117,9 @@ | ||
11954 | |||
11955 | T((T_CALLED("_nc_free_tinfo()"))); | ||
11956 | #if NO_LEAKS | ||
11957 | + if (cur_term != 0) | ||
11958 | + del_curterm(cur_term); | ||
11959 | + | ||
11960 | _nc_free_tparm(); | ||
11961 | _nc_tgetent_leaks(); | ||
11962 | _nc_free_entries(_nc_head); | ||
11963 | diff -Naur ncurses-5.7.orig/ncurses/tinfo/hashed_db.c ncurses-5.7/ncurses/tinfo/hashed_db.c | ||
11964 | --- ncurses-5.7.orig/ncurses/tinfo/hashed_db.c 2006-08-19 12:48:38.000000000 -0700 | ||
11965 | +++ ncurses-5.7/ncurses/tinfo/hashed_db.c 2008-12-20 14:47:16.000000000 -0800 | ||
11966 | @@ -1,5 +1,5 @@ | ||
11967 | /**************************************************************************** | ||
11968 | - * Copyright (c) 2006 Free Software Foundation, Inc. * | ||
11969 | + * Copyright (c) 2006,2008 Free Software Foundation, Inc. * | ||
11970 | * * | ||
11971 | * Permission is hereby granted, free of charge, to any person obtaining a * | ||
11972 | * copy of this software and associated documentation files (the * | ||
11973 | @@ -27,7 +27,7 @@ | ||
11974 | ****************************************************************************/ | ||
11975 | |||
11976 | /**************************************************************************** | ||
11977 | - * Author: Thomas E. Dickey 2006 * | ||
11978 | + * Author: Thomas E. Dickey 2006-on * | ||
11979 | ****************************************************************************/ | ||
11980 | |||
11981 | #include <curses.priv.h> | ||
11982 | @@ -36,7 +36,7 @@ | ||
11983 | |||
11984 | #if USE_HASHED_DB | ||
11985 | |||
11986 | -MODULE_ID("$Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $") | ||
11987 | +MODULE_ID("$Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $") | ||
11988 | |||
11989 | #if HASHED_DB_API >= 2 | ||
11990 | static DBC *cursor; | ||
11991 | @@ -49,27 +49,30 @@ | ||
11992 | _nc_db_open(const char *path, bool modify) | ||
11993 | { | ||
11994 | DB *result = 0; | ||
11995 | + int code; | ||
11996 | |||
11997 | #if HASHED_DB_API >= 4 | ||
11998 | db_create(&result, NULL, 0); | ||
11999 | - result->open(result, | ||
12000 | - NULL, | ||
12001 | - path, | ||
12002 | - NULL, | ||
12003 | - DB_HASH, | ||
12004 | - modify ? DB_CREATE : DB_RDONLY, | ||
12005 | - 0644); | ||
12006 | + if ((code = result->open(result, | ||
12007 | + NULL, | ||
12008 | + path, | ||
12009 | + NULL, | ||
12010 | + DB_HASH, | ||
12011 | + modify ? DB_CREATE : DB_RDONLY, | ||
12012 | + 0644)) != 0) { | ||
12013 | + result = 0; | ||
12014 | + } | ||
12015 | #elif HASHED_DB_API >= 3 | ||
12016 | db_create(&result, NULL, 0); | ||
12017 | - result->open(result, | ||
12018 | - path, | ||
12019 | - NULL, | ||
12020 | - DB_HASH, | ||
12021 | - modify ? DB_CREATE : DB_RDONLY, | ||
12022 | - 0644); | ||
12023 | + if ((code = result->open(result, | ||
12024 | + path, | ||
12025 | + NULL, | ||
12026 | + DB_HASH, | ||
12027 | + modify ? DB_CREATE : DB_RDONLY, | ||
12028 | + 0644)) != 0) { | ||
12029 | + result = 0; | ||
12030 | + } | ||
12031 | #elif HASHED_DB_API >= 2 | ||
12032 | - int code; | ||
12033 | - | ||
12034 | if ((code = db_open(path, | ||
12035 | DB_HASH, | ||
12036 | modify ? DB_CREATE : DB_RDONLY, | ||
12037 | @@ -77,21 +80,22 @@ | ||
12038 | (DB_ENV *) 0, | ||
12039 | (DB_INFO *) 0, | ||
12040 | &result)) != 0) { | ||
12041 | - T(("cannot open %s: %s", path, strerror(code))); | ||
12042 | result = 0; | ||
12043 | - } else { | ||
12044 | - T(("opened %s", path)); | ||
12045 | } | ||
12046 | #else | ||
12047 | - result = dbopen(path, | ||
12048 | - modify ? (O_CREAT | O_RDWR) : O_RDONLY, | ||
12049 | - 0644, | ||
12050 | - DB_HASH, | ||
12051 | - NULL); | ||
12052 | + if ((result = dbopen(path, | ||
12053 | + modify ? (O_CREAT | O_RDWR) : O_RDONLY, | ||
12054 | + 0644, | ||
12055 | + DB_HASH, | ||
12056 | + NULL)) == 0) { | ||
12057 | + code = errno; | ||
12058 | + } | ||
12059 | +#endif | ||
12060 | if (result != 0) { | ||
12061 | T(("opened %s", path)); | ||
12062 | + } else { | ||
12063 | + T(("cannot open %s: %s", path, strerror(code))); | ||
12064 | } | ||
12065 | -#endif | ||
12066 | return result; | ||
12067 | } | ||
12068 | |||
12069 | diff -Naur ncurses-5.7.orig/progs/Makefile.in ncurses-5.7/progs/Makefile.in | ||
12070 | --- ncurses-5.7.orig/progs/Makefile.in 2008-09-07 06:58:55.000000000 -0700 | ||
12071 | +++ ncurses-5.7/progs/Makefile.in 2008-12-20 14:47:08.000000000 -0800 | ||
12072 | @@ -1,6 +1,6 @@ | ||
12073 | -# $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
12074 | +# $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
12075 | ############################################################################## | ||
12076 | -# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. # | ||
12077 | +# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. # | ||
12078 | # # | ||
12079 | # Permission is hereby granted, free of charge, to any person obtaining a # | ||
12080 | # copy of this software and associated documentation files (the "Software"), # | ||
12081 | @@ -124,7 +124,7 @@ | ||
12082 | transform.h | ||
12083 | |||
12084 | # tic relies on direct access to the terminfo database | ||
12085 | -GET_PROGS = infocmp$x clear$x tput$x tset$x toe$x | ||
12086 | +GET_PROGS = infocmp$x clear$x tabs$x tput$x tset$x toe$x | ||
12087 | PUT_PROGS = @MAKE_TERMINFO@ tic$x | ||
12088 | PROGS = $(PUT_PROGS) $(GET_PROGS) | ||
12089 | |||
12090 | @@ -159,6 +159,7 @@ | ||
12091 | actual_infotocap = `echo infotocap$x| $(TRANSFORM)` | ||
12092 | actual_init = `echo init$x| $(TRANSFORM)` | ||
12093 | actual_reset = `echo reset$x| $(TRANSFORM)` | ||
12094 | +actual_tabs = `echo tabs$x| $(TRANSFORM)` | ||
12095 | actual_tic = `echo tic$x| $(TRANSFORM)` | ||
12096 | actual_toe = `echo toe$x| $(TRANSFORM)` | ||
12097 | actual_tput = `echo tput$x| $(TRANSFORM)` | ||
12098 | @@ -187,6 +188,7 @@ | ||
12099 | @MAKE_TERMINFO@ (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo)) | ||
12100 | $(LIBTOOL_INSTALL) $(INSTALL_PROG) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp) | ||
12101 | $(LIBTOOL_INSTALL) $(INSTALL_PROG) clear$x $(DESTDIR)$(bindir)/$(actual_clear) | ||
12102 | + $(LIBTOOL_INSTALL) $(INSTALL_PROG) tabs$x $(DESTDIR)$(bindir)/$(actual_tabs) | ||
12103 | $(LIBTOOL_INSTALL) $(INSTALL_PROG) tput$x $(DESTDIR)$(bindir)/$(actual_tput) | ||
12104 | $(LIBTOOL_INSTALL) $(INSTALL_PROG) tset$x $(DESTDIR)$(bindir)/$(actual_tset) | ||
12105 | @echo "linking $(actual_reset) to $(actual_tset)" | ||
12106 | @@ -200,6 +202,7 @@ | ||
12107 | @MAKE_TERMINFO@ -@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap) | ||
12108 | -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_infocmp) | ||
12109 | -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_clear) | ||
12110 | + -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tabs) | ||
12111 | -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tput) | ||
12112 | -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tset) | ||
12113 | -@rm -f $(DESTDIR)$(bindir)/$(actual_reset) | ||
12114 | @@ -230,6 +233,12 @@ | ||
12115 | clear$x: $(DEPS_CLEAR) $(DEPS_CURSES) | ||
12116 | @ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_TINFO) -o $@ | ||
12117 | |||
12118 | +DEPS_TABS = \ | ||
12119 | + $(MODEL)/tabs$o | ||
12120 | + | ||
12121 | +tabs$x: $(DEPS_TABS) $(DEPS_TABS) | ||
12122 | + @ECHO_LINK@ $(LINK) $(DEPS_TABS) $(LDFLAGS_TINFO) -o $@ | ||
12123 | + | ||
12124 | DEPS_TPUT = \ | ||
12125 | $(MODEL)/tput$o | ||
12126 | |||
12127 | @@ -289,6 +298,7 @@ | ||
12128 | @MAKE_TERMINFO@ $(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/toe.c $(srcdir)/dump_entry.c $(LINT_LIBS) | ||
12129 | $(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/clear.c $(LINT_LIBS) | ||
12130 | $(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/infocmp.c $(srcdir)/dump_entry.c $(LINT_LIBS) | ||
12131 | + $(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/tabs.c $(LINT_LIBS) | ||
12132 | $(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/tput.c $(LINT_LIBS) | ||
12133 | $(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/tset.c $(srcdir)/dump_entry.c $(LINT_LIBS) | ||
12134 | |||
12135 | diff -Naur ncurses-5.7.orig/progs/modules ncurses-5.7/progs/modules | ||
12136 | --- ncurses-5.7.orig/progs/modules 2006-12-23 16:53:21.000000000 -0800 | ||
12137 | +++ ncurses-5.7/progs/modules 2008-12-20 14:47:08.000000000 -0800 | ||
12138 | @@ -1,7 +1,7 @@ | ||
12139 | -# $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
12140 | +# $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
12141 | # Program modules (some are in ncurses lib!) | ||
12142 | ############################################################################## | ||
12143 | -# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. # | ||
12144 | +# Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. # | ||
12145 | # # | ||
12146 | # Permission is hereby granted, free of charge, to any person obtaining a # | ||
12147 | # copy of this software and associated documentation files (the "Software"), # | ||
12148 | @@ -37,6 +37,7 @@ | ||
12149 | toe progs $(srcdir) $(HEADER_DEPS) $(srcdir)/dump_entry.h | ||
12150 | dump_entry progs $(srcdir) $(HEADER_DEPS) $(srcdir)/dump_entry.h ../include/parametrized.h $(INCDIR)/capdefaults.c termsort.c | ||
12151 | infocmp progs $(srcdir) $(HEADER_DEPS) $(srcdir)/dump_entry.h | ||
12152 | +tabs progs $(srcdir) $(HEADER_DEPS) | ||
12153 | tput progs $(srcdir) $(HEADER_DEPS) transform.h termsort.c | ||
12154 | tset progs $(srcdir) $(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h ../include/termcap.h | ||
12155 | |||
12156 | diff -Naur ncurses-5.7.orig/progs/tabs.c ncurses-5.7/progs/tabs.c | ||
12157 | --- ncurses-5.7.orig/progs/tabs.c 1969-12-31 16:00:00.000000000 -0800 | ||
12158 | +++ ncurses-5.7/progs/tabs.c 2008-12-20 14:47:10.000000000 -0800 | ||
12159 | @@ -0,0 +1,506 @@ | ||
12160 | +/**************************************************************************** | ||
12161 | + * Copyright (c) 2008 Free Software Foundation, Inc. * | ||
12162 | + * * | ||
12163 | + * Permission is hereby granted, free of charge, to any person obtaining a * | ||
12164 | + * copy of this software and associated documentation files (the * | ||
12165 | + * "Software"), to deal in the Software without restriction, including * | ||
12166 | + * without limitation the rights to use, copy, modify, merge, publish, * | ||
12167 | + * distribute, distribute with modifications, sublicense, and/or sell * | ||
12168 | + * copies of the Software, and to permit persons to whom the Software is * | ||
12169 | + * furnished to do so, subject to the following conditions: * | ||
12170 | + * * | ||
12171 | + * The above copyright notice and this permission notice shall be included * | ||
12172 | + * in all copies or substantial portions of the Software. * | ||
12173 | + * * | ||
12174 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * | ||
12175 | + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * | ||
12176 | + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * | ||
12177 | + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * | ||
12178 | + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * | ||
12179 | + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * | ||
12180 | + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * | ||
12181 | + * * | ||
12182 | + * Except as contained in this notice, the name(s) of the above copyright * | ||
12183 | + * holders shall not be used in advertising or otherwise to promote the * | ||
12184 | + * sale, use or other dealings in this Software without prior written * | ||
12185 | + * authorization. * | ||
12186 | + ****************************************************************************/ | ||
12187 | + | ||
12188 | +/**************************************************************************** | ||
12189 | + * Author: Thomas E. Dickey 2008 * | ||
12190 | + ****************************************************************************/ | ||
12191 | + | ||
12192 | +/* | ||
12193 | + * tabs.c -- set terminal hard-tabstops | ||
12194 | + */ | ||
12195 | + | ||
12196 | +#define USE_LIBTINFO | ||
12197 | +#include <progs.priv.h> | ||
12198 | + | ||
12199 | +MODULE_ID("$Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $") | ||
12200 | + | ||
12201 | +static void usage(void) GCC_NORETURN; | ||
12202 | + | ||
12203 | +static int max_cols; | ||
12204 | + | ||
12205 | +static int | ||
12206 | +putch(int c) | ||
12207 | +{ | ||
12208 | + return putchar(c); | ||
12209 | +} | ||
12210 | + | ||
12211 | +static void | ||
12212 | +do_tabs(int *tab_list) | ||
12213 | +{ | ||
12214 | + int last = 1; | ||
12215 | + int stop; | ||
12216 | + | ||
12217 | + putchar('\r'); | ||
12218 | + while ((stop = *tab_list++) > 0) { | ||
12219 | + if (last < stop) { | ||
12220 | + while (last++ < stop) { | ||
12221 | + if (last > max_cols) | ||
12222 | + break; | ||
12223 | + putchar(' '); | ||
12224 | + } | ||
12225 | + } | ||
12226 | + if (stop <= max_cols) { | ||
12227 | + tputs(tparm(set_tab, stop), 1, putch); | ||
12228 | + last = stop; | ||
12229 | + } else { | ||
12230 | + break; | ||
12231 | + } | ||
12232 | + } | ||
12233 | + putchar('\n'); | ||
12234 | +} | ||
12235 | + | ||
12236 | +static int * | ||
12237 | +decode_tabs(const char *tab_list) | ||
12238 | +{ | ||
12239 | + int *result = typeCalloc(int, strlen(tab_list) + (unsigned) max_cols); | ||
12240 | + int n = 0; | ||
12241 | + int value = 0; | ||
12242 | + int prior = 0; | ||
12243 | + int ch; | ||
12244 | + | ||
12245 | + if (result != 0) { | ||
12246 | + while ((ch = *tab_list++) != '\0') { | ||
12247 | + if (isdigit(UChar(ch))) { | ||
12248 | + value *= 10; | ||
12249 | + value += (ch - '0'); | ||
12250 | + } else if (ch == ',') { | ||
12251 | + result[n] = value + prior; | ||
12252 | + if (n > 0 && value <= result[n - 1]) { | ||
12253 | + fprintf(stderr, | ||
12254 | + "tab-stops are not in increasing order\n"); | ||
12255 | + free(result); | ||
12256 | + result = 0; | ||
12257 | + break; | ||
12258 | + } | ||
12259 | + ++n; | ||
12260 | + value = 0; | ||
12261 | + prior = 0; | ||
12262 | + } else if (ch == '+') { | ||
12263 | + if (n) | ||
12264 | + prior = result[n - 1]; | ||
12265 | + } | ||
12266 | + } | ||
12267 | + } | ||
12268 | + | ||
12269 | + if (result != 0) { | ||
12270 | + /* | ||
12271 | + * If there is only one value, then it is an option such as "-8". | ||
12272 | + */ | ||
12273 | + if ((n == 0) && (value > 0)) { | ||
12274 | + int step = value; | ||
12275 | + while (n < max_cols - 1) { | ||
12276 | + result[n++] = value; | ||
12277 | + value += step; | ||
12278 | + } | ||
12279 | + } | ||
12280 | + | ||
12281 | + /* | ||
12282 | + * Add the last value, if any. | ||
12283 | + */ | ||
12284 | + result[n++] = value; | ||
12285 | + result[n] = 0; | ||
12286 | + } | ||
12287 | + return result; | ||
12288 | +} | ||
12289 | + | ||
12290 | +static void | ||
12291 | +print_ruler(int *tab_list) | ||
12292 | +{ | ||
12293 | + int last = 0; | ||
12294 | + int stop; | ||
12295 | + int n; | ||
12296 | + | ||
12297 | + /* first print a readable ruler */ | ||
12298 | + for (n = 0; n < max_cols; n += 10) { | ||
12299 | + int ch = 1 + (n / 10); | ||
12300 | + char buffer[20]; | ||
12301 | + sprintf(buffer, "----+----%c", | ||
12302 | + ((ch < 10) | ||
12303 | + ? (ch + '0') | ||
12304 | + : (ch + 'A' - 10))); | ||
12305 | + printf("%.*s", ((max_cols - n) > 10) ? 10 : (max_cols - n), buffer); | ||
12306 | + } | ||
12307 | + putchar('\n'); | ||
12308 | + | ||
12309 | + /* now, print '*' for each stop */ | ||
12310 | + for (n = 0, last = 0; (tab_list[n] > 0) && (last < max_cols); ++n) { | ||
12311 | + stop = tab_list[n]; | ||
12312 | + while (++last < stop) { | ||
12313 | + if (last <= max_cols) { | ||
12314 | + putchar('-'); | ||
12315 | + } else { | ||
12316 | + break; | ||
12317 | + } | ||
12318 | + } | ||
12319 | + if (last <= max_cols) { | ||
12320 | + putchar('*'); | ||
12321 | + last = stop; | ||
12322 | + } else { | ||
12323 | + break; | ||
12324 | + } | ||
12325 | + } | ||
12326 | + while (++last <= max_cols) | ||
12327 | + putchar('-'); | ||
12328 | + putchar('\n'); | ||
12329 | +} | ||
12330 | + | ||
12331 | +/* | ||
12332 | + * Write an '*' on each tabstop, to demonstrate whether it lines up with the | ||
12333 | + * ruler. | ||
12334 | + */ | ||
12335 | +static void | ||
12336 | +write_tabs(int *tab_list) | ||
12337 | +{ | ||
12338 | + int stop; | ||
12339 | + | ||
12340 | + while ((stop = *tab_list++) > 0 && stop <= max_cols) { | ||
12341 | + fputs((stop == 1) ? "*" : "\t*", stdout); | ||
12342 | + }; | ||
12343 | + /* also show a tab _past_ the stops */ | ||
12344 | + if (stop < max_cols) | ||
12345 | + fputs("\t+", stdout); | ||
12346 | + putchar('\n'); | ||
12347 | +} | ||
12348 | + | ||
12349 | +/* | ||
12350 | + * Trim leading/trailing blanks, as well as blanks after a comma. | ||
12351 | + * Convert embedded blanks to commas. | ||
12352 | + */ | ||
12353 | +static char * | ||
12354 | +trimmed_tab_list(const char *source) | ||
12355 | +{ | ||
12356 | + char *result = strdup(source); | ||
12357 | + int ch, j, k, last; | ||
12358 | + | ||
12359 | + if (result != 0) { | ||
12360 | + for (j = k = last = 0; result[j] != 0; ++j) { | ||
12361 | + ch = UChar(result[j]); | ||
12362 | + if (isspace(ch)) { | ||
12363 | + if (last == '\0') { | ||
12364 | + continue; | ||
12365 | + } else if (isdigit(last) || last == ',') { | ||
12366 | + ch = ','; | ||
12367 | + } | ||
12368 | + } else if (ch == ',') { | ||
12369 | + ; | ||
12370 | + } else { | ||
12371 | + if (last == ',') | ||
12372 | + result[k++] = last; | ||
12373 | + result[k++] = ch; | ||
12374 | + } | ||
12375 | + last = ch; | ||
12376 | + } | ||
12377 | + result[k] = '\0'; | ||
12378 | + } | ||
12379 | + return result; | ||
12380 | +} | ||
12381 | + | ||
12382 | +static bool | ||
12383 | +comma_is_needed(const char *source) | ||
12384 | +{ | ||
12385 | + bool result = FALSE; | ||
12386 | + | ||
12387 | + if (source != 0) { | ||
12388 | + unsigned len = strlen(source); | ||
12389 | + if (len != 0) | ||
12390 | + result = (source[len - 1] != ','); | ||
12391 | + } else { | ||
12392 | + result = FALSE; | ||
12393 | + } | ||
12394 | + return result; | ||
12395 | +} | ||
12396 | + | ||
12397 | +/* | ||
12398 | + * Add a command-line parameter to the tab-list. It can be blank- or comma- | ||
12399 | + * separated (or a mixture). For simplicity, empty tabs are ignored, e.g., | ||
12400 | + * tabs 1,,6,11 | ||
12401 | + * tabs 1,6,11 | ||
12402 | + * are treated the same. | ||
12403 | + */ | ||
12404 | +static const char * | ||
12405 | +add_to_tab_list(char **append, const char *value) | ||
12406 | +{ | ||
12407 | + char *result = *append; | ||
12408 | + char *copied = trimmed_tab_list(value); | ||
12409 | + | ||
12410 | + if (copied != 0 && *copied != '\0') { | ||
12411 | + const char *comma = ","; | ||
12412 | + unsigned need = 1 + strlen(copied); | ||
12413 | + | ||
12414 | + if (*copied == ',') | ||
12415 | + comma = ""; | ||
12416 | + else if (!comma_is_needed(*append)) | ||
12417 | + comma = ""; | ||
12418 | + | ||
12419 | + need += strlen(comma); | ||
12420 | + if (*append != 0) | ||
12421 | + need += strlen(*append); | ||
12422 | + | ||
12423 | + result = malloc(need); | ||
12424 | + if (result != 0) { | ||
12425 | + *result = '\0'; | ||
12426 | + if (*append != 0) { | ||
12427 | + strcpy(result, *append); | ||
12428 | + free(*append); | ||
12429 | + } | ||
12430 | + strcat(result, comma); | ||
12431 | + strcat(result, copied); | ||
12432 | + } | ||
12433 | + | ||
12434 | + *append = result; | ||
12435 | + } | ||
12436 | + return result; | ||
12437 | +} | ||
12438 | + | ||
12439 | +/* | ||
12440 | + * Check for illegal characters in the tab-list. | ||
12441 | + */ | ||
12442 | +static bool | ||
12443 | +legal_tab_list(const char *program, const char *tab_list) | ||
12444 | +{ | ||
12445 | + bool result = TRUE; | ||
12446 | + | ||
12447 | + if (tab_list != 0 && *tab_list != '\0') { | ||
12448 | + if (comma_is_needed(tab_list)) { | ||
12449 | + int n, ch; | ||
12450 | + for (n = 0; tab_list[n] != '\0'; ++n) { | ||
12451 | + ch = UChar(tab_list[n]); | ||
12452 | + if (!(isdigit(ch) || ch == ',')) { | ||
12453 | + fprintf(stderr, | ||
12454 | + "%s: unexpected character found '%c'\n", | ||
12455 | + program, ch); | ||
12456 | + result = FALSE; | ||
12457 | + break; | ||
12458 | + } | ||
12459 | + } | ||
12460 | + } else { | ||
12461 | + fprintf(stderr, "%s: trailing comma found '%s'\n", program, tab_list); | ||
12462 | + result = FALSE; | ||
12463 | + } | ||
12464 | + } else { | ||
12465 | + fprintf(stderr, "%s: no tab-list given\n", program); | ||
12466 | + result = FALSE; | ||
12467 | + } | ||
12468 | + return result; | ||
12469 | +} | ||
12470 | + | ||
12471 | +static void | ||
12472 | +usage(void) | ||
12473 | +{ | ||
12474 | + static const char *msg[] = | ||
12475 | + { | ||
12476 | + "Usage: tabs [options] [tabstop-list]" | ||
12477 | + ,"" | ||
12478 | + ,"Options:" | ||
12479 | + ," -0 reset tabs" | ||
12480 | + ," -8 set tabs to standard interval" | ||
12481 | + ," -a Assembler, IBM S/370, first format" | ||
12482 | + ," -a2 Assembler, IBM S/370, second format" | ||
12483 | + ," -c COBOL, normal format" | ||
12484 | + ," -c2 COBOL compact format" | ||
12485 | + ," -c3 COBOL compact format extended" | ||
12486 | + ," -d debug (show ruler with expected/actual tab positions)" | ||
12487 | + ," -f FORTRAN" | ||
12488 | + ," -n no-op (do not modify terminal settings)" | ||
12489 | + ," -p PL/I" | ||
12490 | + ," -s SNOBOL" | ||
12491 | + ," -u UNIVAC 1100 Assembler" | ||
12492 | + ," -T name use terminal type 'name'" | ||
12493 | + ,"" | ||
12494 | + ,"A tabstop-list is an ordered list of column numbers, e.g., 1,11,21" | ||
12495 | + ,"or 1,+10,+10 which is the same." | ||
12496 | + }; | ||
12497 | + unsigned n; | ||
12498 | + | ||
12499 | + fflush(stdout); | ||
12500 | + for (n = 0; n < SIZEOF(msg); ++n) { | ||
12501 | + fprintf(stderr, "%s\n", msg[n]); | ||
12502 | + } | ||
12503 | + ExitProgram(EXIT_FAILURE); | ||
12504 | +} | ||
12505 | + | ||
12506 | +int | ||
12507 | +main(int argc, char *argv[]) | ||
12508 | +{ | ||
12509 | + int rc = EXIT_FAILURE; | ||
12510 | + bool debug = FALSE; | ||
12511 | + bool no_op = FALSE; | ||
12512 | + int n, ch; | ||
12513 | + NCURSES_CONST char *term_name = 0; | ||
12514 | + const char *mar_list = 0; /* ignored */ | ||
12515 | + char *append = 0; | ||
12516 | + const char *tab_list = 0; | ||
12517 | + | ||
12518 | + if ((term_name = getenv("TERM")) == 0) | ||
12519 | + term_name = "ansi+tabs"; | ||
12520 | + | ||
12521 | + /* cannot use getopt, since some options are two-character */ | ||
12522 | + for (n = 1; n < argc; ++n) { | ||
12523 | + char *option = argv[n]; | ||
12524 | + switch (option[0]) { | ||
12525 | + case '-': | ||
12526 | + while ((ch = *++option) != '\0') { | ||
12527 | + switch (ch) { | ||
12528 | + case 'a': | ||
12529 | + switch (*option) { | ||
12530 | + case '\0': | ||
12531 | + tab_list = "1,10,16,36,72"; | ||
12532 | + /* Assembler, IBM S/370, first format */ | ||
12533 | + break; | ||
12534 | + case '2': | ||
12535 | + tab_list = "1,10,16,40,72"; | ||
12536 | + /* Assembler, IBM S/370, second format */ | ||
12537 | + break; | ||
12538 | + default: | ||
12539 | + usage(); | ||
12540 | + } | ||
12541 | + break; | ||
12542 | + case 'c': | ||
12543 | + switch (*option) { | ||
12544 | + case '\0': | ||
12545 | + tab_list = "1,8,12,16,20,55"; | ||
12546 | + /* COBOL, normal format */ | ||
12547 | + break; | ||
12548 | + case '2': | ||
12549 | + tab_list = "1,6,10,14,49"; | ||
12550 | + /* COBOL compact format */ | ||
12551 | + break; | ||
12552 | + case '3': | ||
12553 | + tab_list = "1,6,10,14,18,22,26,30,34,38,42,46,50,54,58,62,67"; | ||
12554 | + /* COBOL compact format extended */ | ||
12555 | + break; | ||
12556 | + default: | ||
12557 | + usage(); | ||
12558 | + } | ||
12559 | + break; | ||
12560 | + case 'd': /* ncurses extension */ | ||
12561 | + debug = TRUE; | ||
12562 | + break; | ||
12563 | + case 'f': | ||
12564 | + tab_list = "1,7,11,15,19,23"; | ||
12565 | + /* FORTRAN */ | ||
12566 | + break; | ||
12567 | + case 'n': /* ncurses extension */ | ||
12568 | + no_op = TRUE; | ||
12569 | + break; | ||
12570 | + case 'p': | ||
12571 | + tab_list = "1,5,9,13,17,21,25,29,33,37,41,45,49,53,57,61"; | ||
12572 | + /* PL/I */ | ||
12573 | + break; | ||
12574 | + case 's': | ||
12575 | + tab_list = "1,10,55"; | ||
12576 | + /* SNOBOL */ | ||
12577 | + break; | ||
12578 | + case 'u': | ||
12579 | + tab_list = "1,12,20,44"; | ||
12580 | + /* UNIVAC 1100 Assembler */ | ||
12581 | + break; | ||
12582 | + case 'T': | ||
12583 | + ++n; | ||
12584 | + if (*++option != '\0') { | ||
12585 | + term_name = option; | ||
12586 | + } else { | ||
12587 | + term_name = argv[n++]; | ||
12588 | + } | ||
12589 | + option += ((int) strlen(option)) - 1; | ||
12590 | + continue; | ||
12591 | + default: | ||
12592 | + if (isdigit(UChar(*option))) { | ||
12593 | + tab_list = option; | ||
12594 | + ++n; | ||
12595 | + } else { | ||
12596 | + usage(); | ||
12597 | + } | ||
12598 | + option += ((int) strlen(option)) - 1; | ||
12599 | + break; | ||
12600 | + } | ||
12601 | + } | ||
12602 | + break; | ||
12603 | + case '+': | ||
12604 | + while ((ch = *++option) != '\0') { | ||
12605 | + switch (ch) { | ||
12606 | + case 'm': | ||
12607 | + mar_list = option; | ||
12608 | + break; | ||
12609 | + default: | ||
12610 | + usage(); | ||
12611 | + } | ||
12612 | + } | ||
12613 | + break; | ||
12614 | + default: | ||
12615 | + if (append != 0) { | ||
12616 | + if (tab_list != (const char *) append) { | ||
12617 | + /* one of the predefined options was used */ | ||
12618 | + free(append); | ||
12619 | + append = 0; | ||
12620 | + } | ||
12621 | + } | ||
12622 | + tab_list = add_to_tab_list(&append, option); | ||
12623 | + option += ((int) strlen(option)) - 1; | ||
12624 | + break; | ||
12625 | + } | ||
12626 | + } | ||
12627 | + | ||
12628 | + setupterm(term_name, STDOUT_FILENO, (int *) 0); | ||
12629 | + | ||
12630 | + max_cols = (columns > 0) ? columns : 80; | ||
12631 | + | ||
12632 | + if (!VALID_STRING(clear_all_tabs)) { | ||
12633 | + fprintf(stderr, | ||
12634 | + "%s: terminal type '%s' cannot reset tabs\n", | ||
12635 | + argv[0], term_name); | ||
12636 | + } else if (!VALID_STRING(set_tab)) { | ||
12637 | + fprintf(stderr, | ||
12638 | + "%s: terminal type '%s' cannot set tabs\n", | ||
12639 | + argv[0], term_name); | ||
12640 | + } else if (legal_tab_list(argv[0], tab_list)) { | ||
12641 | + int *list = decode_tabs(tab_list); | ||
12642 | + | ||
12643 | + if (!no_op) | ||
12644 | + tputs(clear_all_tabs, 1, putch); | ||
12645 | + | ||
12646 | + if (list != 0) { | ||
12647 | + if (!no_op) | ||
12648 | + do_tabs(list); | ||
12649 | + if (debug) { | ||
12650 | + fflush(stderr); | ||
12651 | + printf("tabs %s\n", tab_list); | ||
12652 | + print_ruler(list); | ||
12653 | + write_tabs(list); | ||
12654 | + } | ||
12655 | + free(list); | ||
12656 | + } else if (debug) { | ||
12657 | + fflush(stderr); | ||
12658 | + printf("tabs %s\n", tab_list); | ||
12659 | + } | ||
12660 | + rc = EXIT_SUCCESS; | ||
12661 | + } | ||
12662 | + if (append != 0) | ||
12663 | + free(append); | ||
12664 | + ExitProgram(rc); | ||
12665 | +} | ||
12666 | diff -Naur ncurses-5.7.orig/test/filter.c ncurses-5.7/test/filter.c | ||
12667 | --- ncurses-5.7.orig/test/filter.c 2006-12-09 08:53:47.000000000 -0800 | ||
12668 | +++ ncurses-5.7/test/filter.c 2008-12-20 14:47:14.000000000 -0800 | ||
12669 | @@ -1,5 +1,5 @@ | ||
12670 | /**************************************************************************** | ||
12671 | - * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. * | ||
12672 | + * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * | ||
12673 | * * | ||
12674 | * Permission is hereby granted, free of charge, to any person obtaining a * | ||
12675 | * copy of this software and associated documentation files (the * | ||
12676 | @@ -29,7 +29,7 @@ | ||
12677 | /* | ||
12678 | * Author: Thomas E. Dickey <dickey@clark.net> 1998 | ||
12679 | * | ||
12680 | - * $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
12681 | + * $Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
12682 | */ | ||
12683 | #include <test.priv.h> | ||
12684 | |||
12685 | @@ -78,16 +78,50 @@ | ||
12686 | return code; | ||
12687 | } | ||
12688 | |||
12689 | +static void | ||
12690 | +usage(void) | ||
12691 | +{ | ||
12692 | + static const char *msg[] = | ||
12693 | + { | ||
12694 | + "Usage: filter [options]" | ||
12695 | + ,"" | ||
12696 | + ,"Options:" | ||
12697 | + ," -i use initscr() rather than newterm()" | ||
12698 | + }; | ||
12699 | + unsigned n; | ||
12700 | + for (n = 0; n < SIZEOF(msg); n++) | ||
12701 | + fprintf(stderr, "%s\n", msg[n]); | ||
12702 | + ExitProgram(EXIT_FAILURE); | ||
12703 | +} | ||
12704 | + | ||
12705 | int | ||
12706 | -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) | ||
12707 | +main(int argc, char *argv[]) | ||
12708 | { | ||
12709 | + int ch; | ||
12710 | char buffer[80]; | ||
12711 | attr_t underline; | ||
12712 | + bool i_option = FALSE; | ||
12713 | |||
12714 | setlocale(LC_ALL, ""); | ||
12715 | |||
12716 | + while ((ch = getopt(argc, argv, "i")) != -1) { | ||
12717 | + switch (ch) { | ||
12718 | + case 'i': | ||
12719 | + i_option = TRUE; | ||
12720 | + break; | ||
12721 | + default: | ||
12722 | + usage(); | ||
12723 | + } | ||
12724 | + } | ||
12725 | + | ||
12726 | + printf("starting filter program using %s...\n", | ||
12727 | + i_option ? "initscr" : "newterm"); | ||
12728 | filter(); | ||
12729 | - (void) newterm((char *) 0, stdout, stdin); | ||
12730 | + if (i_option) { | ||
12731 | + initscr(); | ||
12732 | + } else { | ||
12733 | + (void) newterm((char *) 0, stdout, stdin); | ||
12734 | + } | ||
12735 | cbreak(); | ||
12736 | keypad(stdscr, TRUE); | ||
12737 | |||
12738 | diff -Naur ncurses-5.7.orig/test/ncurses.c ncurses-5.7/test/ncurses.c | ||
12739 | --- ncurses-5.7.orig/test/ncurses.c 2008-09-27 07:34:58.000000000 -0700 | ||
12740 | +++ ncurses-5.7/test/ncurses.c 2008-12-20 14:47:12.000000000 -0800 | ||
12741 | @@ -40,7 +40,7 @@ | ||
12742 | Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993 | ||
12743 | Thomas E. Dickey (beginning revision 1.27 in 1996). | ||
12744 | |||
12745 | -$Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
12746 | +$Id: ncurses-5.7-branch-update-20081213.patch,v 1.1 2008-12-22 10:40:11 niro Exp $ | ||
12747 | |||
12748 | ***************************************************************************/ | ||
12749 | |||
12750 | @@ -569,8 +569,11 @@ | ||
12751 | * | ||
12752 | ****************************************************************************/ | ||
12753 | |||
12754 | +#define NUM_GETCH_FLAGS 256 | ||
12755 | +typedef bool GetchFlags[NUM_GETCH_FLAGS]; | ||
12756 | + | ||
12757 | static void | ||
12758 | -setup_getch(WINDOW *win, bool flags[]) | ||
12759 | +setup_getch(WINDOW *win, GetchFlags flags) | ||
12760 | { | ||
12761 | keypad(win, flags['k']); /* should be redundant, but for testing */ | ||
12762 | meta(win, flags['m']); /* force this to a known state */ | ||
12763 | @@ -581,7 +584,17 @@ | ||
12764 | } | ||
12765 | |||
12766 | static void | ||
12767 | -wgetch_help(WINDOW *win, bool flags[]) | ||
12768 | +init_getch(WINDOW *win, GetchFlags flags) | ||
12769 | +{ | ||
12770 | + memset(flags, FALSE, NUM_GETCH_FLAGS); | ||
12771 | + flags[UChar('k')] = (win == stdscr); | ||
12772 | + flags[UChar('m')] = TRUE; | ||
12773 | + | ||
12774 | + setup_getch(win, flags); | ||
12775 | +} | ||
12776 | + | ||
12777 | +static void | ||
12778 | +wgetch_help(WINDOW *win, GetchFlags flags) | ||
12779 | { | ||
12780 | static const char *help[] = | ||
12781 | { | ||
12782 | @@ -731,13 +744,10 @@ | ||
12783 | int first_y, first_x; | ||
12784 | int c; | ||
12785 | int incount = 0; | ||
12786 | - bool flags[256]; | ||
12787 | + GetchFlags flags; | ||
12788 | bool blocking = (delay < 0); | ||
12789 | |||
12790 | - memset(flags, FALSE, sizeof(flags)); | ||
12791 | - flags[UChar('k')] = (win == stdscr); | ||
12792 | - | ||
12793 | - setup_getch(win, flags); | ||
12794 | + init_getch(win, flags); | ||
12795 | wtimeout(win, delay); | ||
12796 | getyx(win, first_y, first_x); | ||
12797 | |||
12798 | @@ -835,12 +845,18 @@ | ||
12799 | } | ||
12800 | #endif | ||
12801 | (void) waddstr(win, keyname(c)); | ||
12802 | - } else if (c > 0x80) { | ||
12803 | - unsigned c2 = (unsigned) (c & 0x7f); | ||
12804 | - if (isprint(c2)) | ||
12805 | - (void) wprintw(win, "M-%c", UChar(c2)); | ||
12806 | - else | ||
12807 | + } else if (c >= 0x80) { | ||
12808 | + unsigned c2 = (unsigned) c; | ||
12809 | +#if !(defined(NCURSES_VERSION) || defined(_XOPEN_CURSES)) | ||
12810 | + /* at least Solaris SVR4 curses breaks unctrl(128), etc. */ | ||
12811 | + c2 &= 0x7f; | ||
12812 | +#endif | ||
12813 | + if (isprint(c)) | ||
12814 | + (void) wprintw(win, "%c", UChar(c)); | ||
12815 | + else if (c2 != UChar(c)) | ||
12816 | (void) wprintw(win, "M-%s", unctrl(c2)); | ||
12817 | + else | ||
12818 | + (void) wprintw(win, "%s", unctrl(c2)); | ||
12819 | waddstr(win, " (high-half character)"); | ||
12820 | } else { | ||
12821 | if (isprint(c)) | ||
12822 | @@ -854,6 +870,9 @@ | ||
12823 | } | ||
12824 | |||
12825 | wtimeout(win, -1); | ||
12826 | + | ||
12827 | + if (!level) | ||
12828 | + init_getch(win, flags); | ||
12829 | } | ||
12830 | |||
12831 | static int | ||
12832 | @@ -978,15 +997,12 @@ | ||
12833 | int first_y, first_x; | ||
12834 | wint_t c; | ||
12835 | int incount = 0; | ||
12836 | - bool flags[256]; | ||
12837 | + GetchFlags flags; | ||
12838 | bool blocking = (delay < 0); | ||
12839 | int y, x, code; | ||
12840 | char *temp; | ||
12841 | |||
12842 | - memset(flags, FALSE, sizeof(flags)); | ||
12843 | - flags[UChar('k')] = (win == stdscr); | ||
12844 | - | ||
12845 | - setup_getch(win, flags); | ||
12846 | + init_getch(win, flags); | ||
12847 | wtimeout(win, delay); | ||
12848 | getyx(win, first_y, first_x); | ||
12849 | |||
12850 | @@ -1096,14 +1112,14 @@ | ||
12851 | resize_wide_boxes(level, win); | ||
12852 | } | ||
12853 | #endif | ||
12854 | - (void) waddstr(win, key_name((wchar_t) c)); | ||
12855 | + (void) waddstr(win, keyname((wchar_t) c)); | ||
12856 | } else { | ||
12857 | + (void) waddstr(win, key_name((wchar_t) c)); | ||
12858 | if (c < 256 && iscntrl(c)) { | ||
12859 | - (void) wprintw(win, "%s (control character)", unctrl(c)); | ||
12860 | + (void) wprintw(win, " (control character)"); | ||
12861 | } else { | ||
12862 | - wchar_t c2 = (wchar_t) c; | ||
12863 | - waddnwstr(win, &c2, 1); | ||
12864 | - (void) wprintw(win, " = %#x (printable character)", (unsigned) c); | ||
12865 | + (void) wprintw(win, " = %#x (printable character)", | ||
12866 | + (unsigned) c); | ||
12867 | } | ||
12868 | } | ||
12869 | wgetch_wrap(win, first_y); | ||
12870 | @@ -1111,6 +1127,9 @@ | ||
12871 | } | ||
12872 | |||
12873 | wtimeout(win, -1); | ||
12874 | + | ||
12875 | + if (!level) | ||
12876 | + init_getch(win, flags); | ||
12877 | } | ||
12878 | |||
12879 | static void | ||
12880 | @@ -3238,7 +3257,7 @@ | ||
12881 | int col = (n / height) * COLS / 2; | ||
12882 | |||
12883 | mvprintw(row, col, "%*s : ", COLS / 4, name); | ||
12884 | - while (repeat-- >= 0) { | ||
12885 | + while (--repeat >= 0) { | ||
12886 | add_wch(code); | ||
12887 | } | ||
12888 | return n + 1; |