1# ncurses 6.1 - patch 20200104 - Thomas E. Dickey
2#
3# ------------------------------------------------------------------------------
4#
5# Ncurses 6.1 is at
6# 	ftp.gnu.org:/pub/gnu
7#
8# Patches for ncurses 6.1 can be found at
9# 	ftp://ftp.invisible-island.net/ncurses/6.1
10#	http://invisible-mirror.net/archives/ncurses/6.1
11#
12# ------------------------------------------------------------------------------
13# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20200104.patch.gz
14# patch by Thomas E. Dickey <dickey@invisible-island.net>
15# created  Sun Jan  5 03:01:45 UTC 2020
16# ------------------------------------------------------------------------------
17# Ada95/aclocal.m4                      |   43
18# Ada95/configure                       |   36
19# Ada95/package/debian/copyright        |    4
20# COPYING                               |    4
21# NEWS                                  |    8
22# VERSION                               |    2
23# aclocal.m4                            |   60
24# configure                             | 3947 ++++++++++++++++----------------
25# dist.mk                               |    6
26# package/debian-mingw/changelog        |    4
27# package/debian-mingw/copyright        |    4
28# package/debian-mingw64/changelog      |    4
29# package/debian-mingw64/copyright      |    4
30# package/debian/changelog              |    4
31# package/debian/copyright              |    4
32# package/mingw-ncurses.nsi             |    6
33# package/mingw-ncurses.spec            |    2
34# package/ncurses.spec                  |    2
35# package/ncursest.spec                 |    2
36# test/aclocal.m4                       |   24
37# test/configure                        | 2977 ++++++++++++------------
38# test/configure.in                     |    8
39# test/package/debian-mingw/copyright   |    4
40# test/package/debian-mingw64/copyright |    4
41# test/package/debian/copyright         |    4
42# 25 files changed, 3607 insertions(+), 3560 deletions(-)
43# ------------------------------------------------------------------------------
44Index: Ada95/aclocal.m4
45Prereq:  1.147
46--- ncurses-6.1-20191228+/Ada95/aclocal.m4	2019-11-02 20:56:52.000000000 +0000
47+++ ncurses-6.1-20200104/Ada95/aclocal.m4	2019-12-31 14:00:55.000000000 +0000
48@@ -28,7 +28,7 @@
49 dnl
50 dnl Author: Thomas E. Dickey
51 dnl
52-dnl $Id: aclocal.m4,v 1.147 2019/11/02 20:56:52 tom Exp $
53+dnl $Id: aclocal.m4,v 1.148 2019/12/31 14:00:55 tom Exp $
54 dnl Macros used in NCURSES Ada95 auto-configuration script.
55 dnl
56 dnl These macros are maintained separately from NCURSES.  The copyright on
57@@ -677,17 +677,17 @@
58 fi
59 ])dnl
60 dnl ---------------------------------------------------------------------------
61-dnl CF_CHECK_GNAT_VERSION version: 1 updated: 2019/09/21 18:08:42
62+dnl CF_CHECK_GNAT_VERSION version: 2 updated: 2019/12/31 08:53:54
63 dnl ---------------------
64 AC_DEFUN([CF_CHECK_GNAT_VERSION],
65 [
66 AC_REQUIRE([CF_GNAT_VERSION])
67-case $cf_gnat_version in
68+case $cf_cv_gnat_version in
69 (3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]])
70 	cf_cv_prog_gnat_correct=yes
71 	;;
72 (*)
73-	AC_MSG_WARN(Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding.)
74+	AC_MSG_WARN(Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding.)
75 	cf_cv_prog_gnat_correct=no
76 	;;
77 esac
78@@ -1312,14 +1312,14 @@
79 AC_SUBST(GNATPREP_OPTS)
80 ])dnl
81 dnl ---------------------------------------------------------------------------
82-dnl CF_GNAT_GENERICS version: 3 updated: 2015/04/17 21:13:04
83+dnl CF_GNAT_GENERICS version: 4 updated: 2019/12/31 08:53:54
84 dnl ----------------
85 AC_DEFUN([CF_GNAT_GENERICS],
86 [
87 AC_REQUIRE([CF_GNAT_VERSION])
88
89 AC_MSG_CHECKING(if GNAT supports generics)
90-case $cf_gnat_version in
91+case $cf_cv_gnat_version in
92 (3.[[1-9]]*|[[4-9]].*)
93 	cf_gnat_generics=yes
94 	;;
95@@ -1342,7 +1342,7 @@
96 AC_SUBST(cf_generic_objects)
97 ])dnl
98 dnl ---------------------------------------------------------------------------
99-dnl CF_GNAT_PROJECTS version: 9 updated: 2018/01/14 15:46:09
100+dnl CF_GNAT_PROJECTS version: 10 updated: 2019/12/31 08:53:54
101 dnl ----------------
102 dnl GNAT projects are configured with ".gpr" project files.
103 dnl GNAT libraries are a further development, using the project feature.
104@@ -1356,7 +1356,7 @@
105
106 if test "$enable_gnat_projects" != no ; then
107 AC_MSG_CHECKING(if GNAT supports project files)
108-case $cf_gnat_version in
109+case $cf_cv_gnat_version in
110 (3.[[0-9]]*)
111 	;;
112 (*)
113@@ -1552,20 +1552,20 @@
114 rm -rf conftest* *~conftest*
115 ])dnl
116 dnl ---------------------------------------------------------------------------
117-dnl CF_GNAT_VERSION version: 21 updated: 2019/09/21 18:08:42
118+dnl CF_GNAT_VERSION version: 22 updated: 2019/12/31 08:53:54
119 dnl ---------------
120 dnl $1 = cache variable to update
121 dnl $2 = program name
122 dnl Verify version of GNAT or related tool
123 AC_DEFUN([CF_GNAT_VERSION],
124 [
125-AC_CACHE_CHECK(for ifelse($2,,gnat,$2) version, cf_gnat_version,[
126-cf_gnat_version=`ifelse($2,,${cf_ada_make:-gnatmake},$2) --version 2>&1 | \
127+AC_CACHE_CHECK(for ifelse($2,,gnat,$2) version, cf_cv_gnat_version,[
128+cf_cv_gnat_version=`ifelse($2,,${cf_ada_make:-gnatmake},$2) --version 2>&1 | \
129 	grep '[[0-9]].[[0-9]][[0-9]]*' |\
130 	sed -e '2,$d' -e 's/[[^0-9 \.]]//g' -e 's/^[[ ]]*//' -e 's/ .*//'`
131 ])
132-test -z "$cf_gnat_version" && cf_gnat_version=no
133-ifelse($1,,,[eval $1=$cf_gnat_version; unset cf_gnat_version])
134+test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
135+ifelse($1,,,[eval $1=$cf_cv_gnat_version; unset cf_cv_gnat_version])
136 ])dnl
137 dnl ---------------------------------------------------------------------------
138 dnl CF_GNU_SOURCE version: 10 updated: 2018/12/10 20:09:41
139@@ -1725,11 +1725,12 @@
140 $1="[$]$1 $cf_header_path_list"
141 ])dnl
142 dnl ---------------------------------------------------------------------------
143-dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
144+dnl CF_HELP_MESSAGE version: 4 updated: 2019/12/31 08:53:54
145 dnl ---------------
146 dnl Insert text into the help-message, for readability, from AC_ARG_WITH.
147 AC_DEFUN([CF_HELP_MESSAGE],
148-[AC_DIVERT_HELP([$1])dnl
149+[CF_ACVERSION_CHECK(2.53,[],[
150+AC_DIVERT_HELP($1)])dnl
151 ])dnl
152 dnl ---------------------------------------------------------------------------
153 dnl CF_INCLUDE_DIRS version: 10 updated: 2014/09/19 20:58:42
154@@ -3054,11 +3055,15 @@
155 test -z "$AWK" && AC_MSG_ERROR(No awk program found)
156 ])dnl
157 dnl ---------------------------------------------------------------------------
158-dnl CF_PROG_CC version: 4 updated: 2014/07/12 18:57:58
159+dnl CF_PROG_CC version: 5 updated: 2019/12/31 08:53:54
160 dnl ----------
161 dnl standard check for CC, plus followup sanity checks
162 dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name
163 AC_DEFUN([CF_PROG_CC],[
164+CF_ACVERSION_CHECK(2.53,
165+	[AC_MSG_WARN(this will incorrectly handle gnatgcc choice)
166+	 AC_REQUIRE([AC_PROG_CC])],
167+	[])
168 ifelse($1,,[AC_PROG_CC],[AC_PROG_CC($1)])
169 CF_GCC_VERSION
170 CF_ACVERSION_CHECK(2.52,
171@@ -3148,7 +3153,7 @@
172 test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT",[Define to the program extension (normally blank)])
173 ])dnl
174 dnl ---------------------------------------------------------------------------
175-dnl CF_PROG_GNAT version: 9 updated: 2019/09/21 18:08:42
176+dnl CF_PROG_GNAT version: 10 updated: 2019/12/31 08:53:54
177 dnl ------------
178 dnl Check for gnat/gnatmake/etc, ensure that the toolset is complete.
179 AC_DEFUN([CF_PROG_GNAT],[
180@@ -3162,14 +3167,14 @@
181 	eval cf_cv_PATH_$cf_upper_prog_gnat=[$]ac_cv_path_cf_TEMP_gnat
182
183 	if test "x$cf_TEMP_gnat" != xno; then
184-		unset cf_gnat_version
185+		unset cf_cv_gnat_version
186 		unset cf_TEMP_gnat
187 		CF_GNAT_VERSION(cf_TEMP_gnat,$cf_prog_gnat)
188 	fi
189 	eval cf_cv_VERSION_$cf_upper_prog_gnat=[$]cf_TEMP_gnat
190
191 	unset cf_TEMP_gnat
192-	unset cf_gnat_version
193+	unset cf_cv_gnat_version
194 	unset ac_cv_path_cf_TEMP_gnat
195 done
196
197Index: Ada95/configure
198--- ncurses-6.1-20191228+/Ada95/configure	2019-11-02 20:57:14.000000000 +0000
199+++ ncurses-6.1-20200104/Ada95/configure	2019-12-31 14:01:23.000000000 +0000
200@@ -15724,30 +15724,30 @@
201 	eval cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat
202
203 	if test "x$cf_TEMP_gnat" != xno; then
204-		unset cf_gnat_version
205+		unset cf_cv_gnat_version
206 		unset cf_TEMP_gnat
207
208 echo "$as_me:15730: checking for $cf_prog_gnat version" >&5
209 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
210-if test "${cf_gnat_version+set}" = set; then
211+if test "${cf_cv_gnat_version+set}" = set; then
212   echo $ECHO_N "(cached) $ECHO_C" >&6
213 else
214
215-cf_gnat_version=`$cf_prog_gnat --version 2>&1 | \
216+cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
217 	grep '[0-9].[0-9][0-9]*' |\
218 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
219
220 fi
221-echo "$as_me:15741: result: $cf_gnat_version" >&5
222-echo "${ECHO_T}$cf_gnat_version" >&6
223-test -z "$cf_gnat_version" && cf_gnat_version=no
224-eval cf_TEMP_gnat=$cf_gnat_version; unset cf_gnat_version
225+echo "$as_me:15741: result: $cf_cv_gnat_version" >&5
226+echo "${ECHO_T}$cf_cv_gnat_version" >&6
227+test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
228+eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
229
230 	fi
231 	eval cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat
232
233 	unset cf_TEMP_gnat
234-	unset cf_gnat_version
235+	unset cf_cv_gnat_version
236 	unset ac_cv_path_cf_TEMP_gnat
237 done
238
239@@ -15804,26 +15804,26 @@
240
241 echo "$as_me:15805: checking for gnat version" >&5
242 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
243-if test "${cf_gnat_version+set}" = set; then
244+if test "${cf_cv_gnat_version+set}" = set; then
245   echo $ECHO_N "(cached) $ECHO_C" >&6
246 else
247
248-cf_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
249+cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
250 	grep '[0-9].[0-9][0-9]*' |\
251 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
252
253 fi
254-echo "$as_me:15816: result: $cf_gnat_version" >&5
255-echo "${ECHO_T}$cf_gnat_version" >&6
256-test -z "$cf_gnat_version" && cf_gnat_version=no
257+echo "$as_me:15816: result: $cf_cv_gnat_version" >&5
258+echo "${ECHO_T}$cf_cv_gnat_version" >&6
259+test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
260
261-case $cf_gnat_version in
262+case $cf_cv_gnat_version in
263 (3.1[1-9]*|3.[2-9]*|[4-9].*|20[0-9][0-9])
264 	cf_cv_prog_gnat_correct=yes
265 	;;
266 (*)
267-	{ echo "$as_me:15825: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
268-echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
269+	{ echo "$as_me:15825: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
270+echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
271 	cf_cv_prog_gnat_correct=no
272 	;;
273 esac
274@@ -15941,7 +15941,7 @@
275
276 echo "$as_me:15942: checking if GNAT supports generics" >&5
277 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
278-case $cf_gnat_version in
279+case $cf_cv_gnat_version in
280 (3.[1-9]*|[4-9].*)
281 	cf_gnat_generics=yes
282 	;;
283@@ -16024,7 +16024,7 @@
284 if test "$enable_gnat_projects" != no ; then
285 echo "$as_me:16025: checking if GNAT supports project files" >&5
286 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
287-case $cf_gnat_version in
288+case $cf_cv_gnat_version in
289 (3.[0-9]*)
290 	;;
291 (*)
292Index: Ada95/package/debian/copyright
293--- ncurses-6.1-20191228+/Ada95/package/debian/copyright	2019-01-05 23:51:47.000000000 +0000
294+++ ncurses-6.1-20200104/Ada95/package/debian/copyright	2020-01-04 14:49:29.000000000 +0000
295@@ -4,11 +4,11 @@
296
297 -------------------------------------------------------------------------------
298 Files: *
299-Copyright: 1998-2018,2019 Free Software Foundation, Inc.
300+Copyright: 1998-2019,2020 Free Software Foundation, Inc.
301 Licence: X11
302
303 Files: aclocal.m4 package
304-Copyright: 2010-2018,2019 by Thomas E. Dickey
305+Copyright: 2010-2019,2020 by Thomas E. Dickey
306 Licence: X11
307
308     Permission is hereby granted, free of charge, to any person obtaining a
309Index: COPYING
310Prereq:  1.7
311--- ncurses-6.1-20191228+/COPYING	2019-01-05 23:51:47.000000000 +0000
312+++ ncurses-6.1-20200104/COPYING	2020-01-04 14:49:29.000000000 +0000
313@@ -1,4 +1,4 @@
314-Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.
315+Copyright (c) 1998-2019,2020 Free Software Foundation, Inc.
316
317 Permission is hereby granted, free of charge, to any person obtaining a
318 copy of this software and associated documentation files (the
319@@ -25,4 +25,4 @@
320 authorization.
321
322 -- vile:txtmode fc=72
323--- $Id: COPYING,v 1.7 2019/01/05 23:51:47 tom Exp $
324+-- $Id: COPYING,v 1.8 2020/01/04 14:49:29 tom Exp $
325Index: NEWS
326Prereq:  1.3422
327--- ncurses-6.1-20191228+/NEWS	2019-12-25 23:16:49.000000000 +0000
328+++ ncurses-6.1-20200104/NEWS	2019-12-31 10:59:47.000000000 +0000
329@@ -25,7 +25,7 @@
330 -- sale, use or other dealings in this Software without prior written        --
331 -- authorization.                                                            --
332 -------------------------------------------------------------------------------
333--- $Id: NEWS,v 1.3422 2019/12/25 23:16:49 tom Exp $
334+-- $Id: NEWS,v 1.3424 2019/12/31 10:59:47 tom Exp $
335 -------------------------------------------------------------------------------
336
337 This is a log of changes that ncurses has gone through since Zeyd started
338@@ -45,6 +45,12 @@
339 Changes through 1.9.9e did not credit all contributions;
340 it is not possible to add this information.
341
342+20200104
343+	+ modify a couple of macros in aclocal.m4 to allow autoconf 2.69 to
344+	  "work", to help illustrate discussion in
345+	  https://invisible-island.net/autoconf/my-autoconf.html
346+	+ fix some warnings from autoheader-252
347+
348 20191228
349 	+ in gen-pkgconfig.in, move the RPATH_LIST and PRIVATE_LIBS assignments
350 	  past the various prefix/libdir assignments, to allow for using those
351Index: VERSION
352--- ncurses-6.1-20191228+/VERSION	2019-12-28 15:45:41.000000000 +0000
353+++ ncurses-6.1-20200104/VERSION	2020-01-04 14:49:29.000000000 +0000
354@@ -1 +1 @@
355-5:0:10	6.1	20191228
356+5:0:10	6.1	20200104
357Index: aclocal.m4
358Prereq:  1.885
359--- ncurses-6.1-20191228+/aclocal.m4	2019-11-02 20:32:27.000000000 +0000
360+++ ncurses-6.1-20200104/aclocal.m4	2019-12-31 13:58:42.000000000 +0000
361@@ -28,7 +28,7 @@
362 dnl
363 dnl Author: Thomas E. Dickey 1995-on
364 dnl
365-dnl $Id: aclocal.m4,v 1.885 2019/11/02 20:32:27 tom Exp $
366+dnl $Id: aclocal.m4,v 1.889 2019/12/31 13:58:42 tom Exp $
367 dnl Macros used in NCURSES auto-configuration script.
368 dnl
369 dnl These macros are maintained separately from NCURSES.  The copyright on
370@@ -346,7 +346,7 @@
371 fi
372 ])dnl
373 dnl ---------------------------------------------------------------------------
374-dnl CF_ADD_LIBS version: 2 updated: 2014/07/13 14:33:27
375+dnl CF_ADD_LIBS version: 3 updated: 2019/11/02 16:47:33
376 dnl -----------
377 dnl Add one or more libraries, used to enforce consistency.  Libraries are
378 dnl prepended to an existing list, since their dependencies are assumed to
379@@ -1137,17 +1137,17 @@
380 fi
381 ])dnl
382 dnl ---------------------------------------------------------------------------
383-dnl CF_CHECK_GNAT_VERSION version: 1 updated: 2019/09/21 18:08:42
384+dnl CF_CHECK_GNAT_VERSION version: 2 updated: 2019/12/31 08:53:54
385 dnl ---------------------
386 AC_DEFUN([CF_CHECK_GNAT_VERSION],
387 [
388 AC_REQUIRE([CF_GNAT_VERSION])
389-case $cf_gnat_version in
390+case $cf_cv_gnat_version in
391 (3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]])
392 	cf_cv_prog_gnat_correct=yes
393 	;;
394 (*)
395-	AC_MSG_WARN(Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding.)
396+	AC_MSG_WARN(Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding.)
397 	cf_cv_prog_gnat_correct=no
398 	;;
399 esac
400@@ -2130,7 +2130,7 @@
401 	AC_MSG_RESULT($ADAFLAGS)
402 ])dnl
403 dnl ---------------------------------------------------------------------------
404-dnl CF_FOPEN_BIN_R version: 1 updated: 2019/03/30 17:52:21
405+dnl CF_FOPEN_BIN_R version: 2 updated: 2019/12/31 08:53:54
406 dnl --------------
407 dnl Check if fopen works when the "b" (binary) flag is added to the mode
408 dnl parameter.  POSIX ignores the "b", which c89 specified.  Some very old
409@@ -2170,7 +2170,7 @@
410 		[cf_cv_fopen_bin_r=no],
411 		[cf_cv_fopen_bin_r=unknown])
412 ])
413-test "x$cf_cv_fopen_bin_r" != xno && AC_DEFINE(USE_FOPEN_BIN_R)
414+test "x$cf_cv_fopen_bin_r" != xno && AC_DEFINE(USE_FOPEN_BIN_R,1,[Define to 1 if fopen accepts explicit binary mode])
415 ])dnl
416 dnl ---------------------------------------------------------------------------
417 dnl CF_FORGET_TOOL version: 1 updated: 2013/04/06 18:03:09
418@@ -2723,14 +2723,14 @@
419 AC_SUBST(GNATPREP_OPTS)
420 ])dnl
421 dnl ---------------------------------------------------------------------------
422-dnl CF_GNAT_GENERICS version: 3 updated: 2015/04/17 21:13:04
423+dnl CF_GNAT_GENERICS version: 4 updated: 2019/12/31 08:53:54
424 dnl ----------------
425 AC_DEFUN([CF_GNAT_GENERICS],
426 [
427 AC_REQUIRE([CF_GNAT_VERSION])
428
429 AC_MSG_CHECKING(if GNAT supports generics)
430-case $cf_gnat_version in
431+case $cf_cv_gnat_version in
432 (3.[[1-9]]*|[[4-9]].*)
433 	cf_gnat_generics=yes
434 	;;
435@@ -2753,7 +2753,7 @@
436 AC_SUBST(cf_generic_objects)
437 ])dnl
438 dnl ---------------------------------------------------------------------------
439-dnl CF_GNAT_PROJECTS version: 9 updated: 2018/01/14 15:46:09
440+dnl CF_GNAT_PROJECTS version: 10 updated: 2019/12/31 08:53:54
441 dnl ----------------
442 dnl GNAT projects are configured with ".gpr" project files.
443 dnl GNAT libraries are a further development, using the project feature.
444@@ -2767,7 +2767,7 @@
445
446 if test "$enable_gnat_projects" != no ; then
447 AC_MSG_CHECKING(if GNAT supports project files)
448-case $cf_gnat_version in
449+case $cf_cv_gnat_version in
450 (3.[[0-9]]*)
451 	;;
452 (*)
453@@ -2963,20 +2963,20 @@
454 rm -rf conftest* *~conftest*
455 ])dnl
456 dnl ---------------------------------------------------------------------------
457-dnl CF_GNAT_VERSION version: 21 updated: 2019/09/21 18:08:42
458+dnl CF_GNAT_VERSION version: 22 updated: 2019/12/31 08:53:54
459 dnl ---------------
460 dnl $1 = cache variable to update
461 dnl $2 = program name
462 dnl Verify version of GNAT or related tool
463 AC_DEFUN([CF_GNAT_VERSION],
464 [
465-AC_CACHE_CHECK(for ifelse($2,,gnat,$2) version, cf_gnat_version,[
466-cf_gnat_version=`ifelse($2,,${cf_ada_make:-gnatmake},$2) --version 2>&1 | \
467+AC_CACHE_CHECK(for ifelse($2,,gnat,$2) version, cf_cv_gnat_version,[
468+cf_cv_gnat_version=`ifelse($2,,${cf_ada_make:-gnatmake},$2) --version 2>&1 | \
469 	grep '[[0-9]].[[0-9]][[0-9]]*' |\
470 	sed -e '2,$d' -e 's/[[^0-9 \.]]//g' -e 's/^[[ ]]*//' -e 's/ .*//'`
471 ])
472-test -z "$cf_gnat_version" && cf_gnat_version=no
473-ifelse($1,,,[eval $1=$cf_gnat_version; unset cf_gnat_version])
474+test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
475+ifelse($1,,,[eval $1=$cf_cv_gnat_version; unset cf_cv_gnat_version])
476 ])dnl
477 dnl ---------------------------------------------------------------------------
478 dnl CF_GNU_SOURCE version: 10 updated: 2018/12/10 20:09:41
479@@ -3471,11 +3471,12 @@
480 $1="[$]$1 $cf_header_path_list"
481 ])dnl
482 dnl ---------------------------------------------------------------------------
483-dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
484+dnl CF_HELP_MESSAGE version: 4 updated: 2019/12/31 08:53:54
485 dnl ---------------
486 dnl Insert text into the help-message, for readability, from AC_ARG_WITH.
487 AC_DEFUN([CF_HELP_MESSAGE],
488-[AC_DIVERT_HELP([$1])dnl
489+[CF_ACVERSION_CHECK(2.53,[],[
490+AC_DIVERT_HELP($1)])dnl
491 ])dnl
492 dnl ---------------------------------------------------------------------------
493 dnl CF_INCLUDE_DIRS version: 10 updated: 2014/09/19 20:58:42
494@@ -5985,11 +5986,15 @@
495 test -z "$AWK" && AC_MSG_ERROR(No awk program found)
496 ])dnl
497 dnl ---------------------------------------------------------------------------
498-dnl CF_PROG_CC version: 4 updated: 2014/07/12 18:57:58
499+dnl CF_PROG_CC version: 5 updated: 2019/12/31 08:53:54
500 dnl ----------
501 dnl standard check for CC, plus followup sanity checks
502 dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name
503 AC_DEFUN([CF_PROG_CC],[
504+CF_ACVERSION_CHECK(2.53,
505+	[AC_MSG_WARN(this will incorrectly handle gnatgcc choice)
506+	 AC_REQUIRE([AC_PROG_CC])],
507+	[])
508 ifelse($1,,[AC_PROG_CC],[AC_PROG_CC($1)])
509 CF_GCC_VERSION
510 CF_ACVERSION_CHECK(2.52,
511@@ -6054,7 +6059,7 @@
512 	test -z "$EGREP" && AC_MSG_ERROR(No egrep program found)
513 ])dnl
514 dnl ---------------------------------------------------------------------------
515-dnl CF_PROG_GNAT version: 9 updated: 2019/09/21 18:08:42
516+dnl CF_PROG_GNAT version: 10 updated: 2019/12/31 08:53:54
517 dnl ------------
518 dnl Check for gnat/gnatmake/etc, ensure that the toolset is complete.
519 AC_DEFUN([CF_PROG_GNAT],[
520@@ -6068,14 +6073,14 @@
521 	eval cf_cv_PATH_$cf_upper_prog_gnat=[$]ac_cv_path_cf_TEMP_gnat
522
523 	if test "x$cf_TEMP_gnat" != xno; then
524-		unset cf_gnat_version
525+		unset cf_cv_gnat_version
526 		unset cf_TEMP_gnat
527 		CF_GNAT_VERSION(cf_TEMP_gnat,$cf_prog_gnat)
528 	fi
529 	eval cf_cv_VERSION_$cf_upper_prog_gnat=[$]cf_TEMP_gnat
530
531 	unset cf_TEMP_gnat
532-	unset cf_gnat_version
533+	unset cf_cv_gnat_version
534 	unset ac_cv_path_cf_TEMP_gnat
535 done
536
537@@ -6197,11 +6202,16 @@
538 AC_SUBST(LDCONFIG)
539 ])dnl
540 dnl ---------------------------------------------------------------------------
541-dnl CF_PROG_LINT version: 3 updated: 2016/05/22 15:25:54
542+dnl CF_PROG_LINT version: 4 updated: 2019/11/20 18:55:37
543 dnl ------------
544 AC_DEFUN([CF_PROG_LINT],
545 [
546 AC_CHECK_PROGS(LINT, lint cppcheck splint)
547+case "x$LINT" in
548+(xcppcheck|x*/cppcheck)
549+	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all"
550+	;;
551+esac
552 AC_SUBST(LINT_OPTS)
553 ])dnl
554 dnl ---------------------------------------------------------------------------
555@@ -8774,7 +8784,7 @@
556 AC_SUBST(WILDCARD_SYMS)
557 ])dnl
558 dnl ---------------------------------------------------------------------------
559-dnl CF_WITH_X11_RGB version: 1 updated: 2017/11/25 17:32:16
560+dnl CF_WITH_X11_RGB version: 2 updated: 2019/12/31 08:53:54
561 dnl ---------------
562 dnl Handle configure option "--with-x11-rgb", setting these shell
563 dnl variables:
564@@ -8850,7 +8860,7 @@
565
566 AC_MSG_RESULT($RGB_PATH)
567 AC_SUBST(RGB_PATH)
568-AC_DEFINE_UNQUOTED(RGB_PATH,"$cf_path")
569+AC_DEFINE_UNQUOTED(RGB_PATH,"$cf_path",[Define to the full pathname of rgb.txt])
570
571 no_x11_rgb=
572 if test "$RGB_PATH" = no
573Index: configure
574--- ncurses-6.1-20191228+/configure	2019-11-16 15:59:28.000000000 +0000
575+++ ncurses-6.1-20200104/configure	2019-12-31 13:59:02.000000000 +0000
576@@ -3661,18 +3661,24 @@
577   test -n "$LINT" && break
578 done
579
580-echo "$as_me:3664: checking whether ln -s works" >&5
581+case "x$LINT" in
582+(xcppcheck|x*/cppcheck)
583+	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all"
584+	;;
585+esac
586+
587+echo "$as_me:3670: checking whether ln -s works" >&5
588 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
589 LN_S=$as_ln_s
590 if test "$LN_S" = "ln -s"; then
591-  echo "$as_me:3668: result: yes" >&5
592+  echo "$as_me:3674: result: yes" >&5
593 echo "${ECHO_T}yes" >&6
594 else
595-  echo "$as_me:3671: result: no, using $LN_S" >&5
596+  echo "$as_me:3677: result: no, using $LN_S" >&5
597 echo "${ECHO_T}no, using $LN_S" >&6
598 fi
599
600-echo "$as_me:3675: checking if $LN_S -f options work" >&5
601+echo "$as_me:3681: checking if $LN_S -f options work" >&5
602 echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
603
604 rm -f conf$$.src conf$$dst
605@@ -3684,12 +3690,12 @@
606 	cf_prog_ln_sf=no
607 fi
608 rm -f conf$$.dst conf$$src
609-echo "$as_me:3687: result: $cf_prog_ln_sf" >&5
610+echo "$as_me:3693: result: $cf_prog_ln_sf" >&5
611 echo "${ECHO_T}$cf_prog_ln_sf" >&6
612
613 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
614
615-echo "$as_me:3692: checking for long file names" >&5
616+echo "$as_me:3698: checking for long file names" >&5
617 echo $ECHO_N "checking for long file names... $ECHO_C" >&6
618 if test "${ac_cv_sys_long_file_names+set}" = set; then
619   echo $ECHO_N "(cached) $ECHO_C" >&6
620@@ -3728,7 +3734,7 @@
621   rm -rf $ac_xdir 2>/dev/null
622 done
623 fi
624-echo "$as_me:3731: result: $ac_cv_sys_long_file_names" >&5
625+echo "$as_me:3737: result: $ac_cv_sys_long_file_names" >&5
626 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
627 if test $ac_cv_sys_long_file_names = yes; then
628
629@@ -3747,7 +3753,7 @@
630   withval="$with_config_suffix"
631   case "x$withval" in
632 	(xyes|xno)
633-		{ echo "$as_me:3750: WARNING: expected a value for config-suffix option" >&5
634+		{ echo "$as_me:3756: WARNING: expected a value for config-suffix option" >&5
635 echo "$as_me: WARNING: expected a value for config-suffix option" >&2;}
636 		;;
637 	(*)	cf_config_suffix="$withval"
638@@ -3757,7 +3763,7 @@
639
640 # If we find pkg-config, check if we should install the ".pc" files.
641
642-echo "$as_me:3760: checking if you want to use pkg-config" >&5
643+echo "$as_me:3766: checking if you want to use pkg-config" >&5
644 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
645
646 # Check whether --with-pkg-config or --without-pkg-config was given.
647@@ -3767,7 +3773,7 @@
648 else
649   cf_pkg_config=yes
650 fi;
651-echo "$as_me:3770: result: $cf_pkg_config" >&5
652+echo "$as_me:3776: result: $cf_pkg_config" >&5
653 echo "${ECHO_T}$cf_pkg_config" >&6
654
655 case $cf_pkg_config in
656@@ -3779,7 +3785,7 @@
657 if test -n "$ac_tool_prefix"; then
658   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
659 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
660-echo "$as_me:3782: checking for $ac_word" >&5
661+echo "$as_me:3788: checking for $ac_word" >&5
662 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
663 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
664   echo $ECHO_N "(cached) $ECHO_C" >&6
665@@ -3796,7 +3802,7 @@
666   test -z "$ac_dir" && ac_dir=.
667   if $as_executable_p "$ac_dir/$ac_word"; then
668    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
669-   echo "$as_me:3799: found $ac_dir/$ac_word" >&5
670+   echo "$as_me:3805: found $ac_dir/$ac_word" >&5
671    break
672 fi
673 done
674@@ -3807,10 +3813,10 @@
675 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
676
677 if test -n "$PKG_CONFIG"; then
678-  echo "$as_me:3810: result: $PKG_CONFIG" >&5
679+  echo "$as_me:3816: result: $PKG_CONFIG" >&5
680 echo "${ECHO_T}$PKG_CONFIG" >&6
681 else
682-  echo "$as_me:3813: result: no" >&5
683+  echo "$as_me:3819: result: no" >&5
684 echo "${ECHO_T}no" >&6
685 fi
686
687@@ -3819,7 +3825,7 @@
688   ac_pt_PKG_CONFIG=$PKG_CONFIG
689   # Extract the first word of "pkg-config", so it can be a program name with args.
690 set dummy pkg-config; ac_word=$2
691-echo "$as_me:3822: checking for $ac_word" >&5
692+echo "$as_me:3828: checking for $ac_word" >&5
693 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
694 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
695   echo $ECHO_N "(cached) $ECHO_C" >&6
696@@ -3836,7 +3842,7 @@
697   test -z "$ac_dir" && ac_dir=.
698   if $as_executable_p "$ac_dir/$ac_word"; then
699    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
700-   echo "$as_me:3839: found $ac_dir/$ac_word" >&5
701+   echo "$as_me:3845: found $ac_dir/$ac_word" >&5
702    break
703 fi
704 done
705@@ -3848,10 +3854,10 @@
706 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
707
708 if test -n "$ac_pt_PKG_CONFIG"; then
709-  echo "$as_me:3851: result: $ac_pt_PKG_CONFIG" >&5
710+  echo "$as_me:3857: result: $ac_pt_PKG_CONFIG" >&5
711 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
712 else
713-  echo "$as_me:3854: result: no" >&5
714+  echo "$as_me:3860: result: no" >&5
715 echo "${ECHO_T}no" >&6
716 fi
717
718@@ -3894,24 +3900,24 @@
719 	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
720 	;;
721 (*)
722-	{ { echo "$as_me:3897: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
723+	{ { echo "$as_me:3903: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
724 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
725    { (exit 1); exit 1; }; }
726 	;;
727 esac
728
729 elif test "x$cf_pkg_config" != xno ; then
730-	{ echo "$as_me:3904: WARNING: pkg-config is not installed" >&5
731+	{ echo "$as_me:3910: WARNING: pkg-config is not installed" >&5
732 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
733 fi
734
735 case $PKG_CONFIG in
736 (no|none|yes)
737-	echo "$as_me:3910: checking for pkg-config library directory" >&5
738+	echo "$as_me:3916: checking for pkg-config library directory" >&5
739 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
740 	;;
741 (*)
742-	echo "$as_me:3914: checking for $PKG_CONFIG library directory" >&5
743+	echo "$as_me:3920: checking for $PKG_CONFIG library directory" >&5
744 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
745 	;;
746 esac
747@@ -3966,18 +3972,18 @@
748
749 	test -n "$verbose" && echo "	list..." 1>&6
750
751-echo "${as_me:-configure}:3969: testing list... ..." 1>&5
752+echo "${as_me:-configure}:3975: testing list... ..." 1>&5
753
754 	for cf_config in $cf_search_path
755 	do
756 		test -n "$verbose" && echo "	checking $cf_config/pkgconfig" 1>&6
757
758-echo "${as_me:-configure}:3975: testing checking $cf_config/pkgconfig ..." 1>&5
759+echo "${as_me:-configure}:3981: testing checking $cf_config/pkgconfig ..." 1>&5
760
761 		if test -d $cf_config/pkgconfig
762 		then
763 			PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
764-			echo "$as_me:3980: checking done" >&5
765+			echo "$as_me:3986: checking done" >&5
766 echo $ECHO_N "checking done... $ECHO_C" >&6
767 			break
768 		fi
769@@ -3988,16 +3994,16 @@
770 esac
771
772 if test "x$PKG_CONFIG_LIBDIR" != xno ; then
773-	echo "$as_me:3991: result: $PKG_CONFIG_LIBDIR" >&5
774+	echo "$as_me:3997: result: $PKG_CONFIG_LIBDIR" >&5
775 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
776 fi
777
778 if test "x$PKG_CONFIG" != xnone
779 then
780-	echo "$as_me:3997: checking if we should install .pc files for $PKG_CONFIG" >&5
781+	echo "$as_me:4003: checking if we should install .pc files for $PKG_CONFIG" >&5
782 echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
783 else
784-	echo "$as_me:4000: checking if we should install .pc files" >&5
785+	echo "$as_me:4006: checking if we should install .pc files" >&5
786 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
787 fi
788
789@@ -4008,7 +4014,7 @@
790 else
791   enable_pc_files=no
792 fi;
793-echo "$as_me:4011: result: $enable_pc_files" >&5
794+echo "$as_me:4017: result: $enable_pc_files" >&5
795 echo "${ECHO_T}$enable_pc_files" >&6
796
797 if test "x$enable_pc_files" != xno
798@@ -4016,7 +4022,7 @@
799 	MAKE_PC_FILES=
800 	case "x$PKG_CONFIG_LIBDIR" in
801 	(xno|xyes)
802-		{ echo "$as_me:4019: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
803+		{ echo "$as_me:4025: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
804 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
805 		;;
806 	(*)
807@@ -4046,7 +4052,7 @@
808 	PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
809 	;;
810 (*)
811-	{ { echo "$as_me:4049: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
812+	{ { echo "$as_me:4055: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
813 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;}
814    { (exit 1); exit 1; }; }
815 	;;
816@@ -4060,7 +4066,7 @@
817
818 if test -z "$MAKE_PC_FILES"
819 then
820-	echo "$as_me:4063: checking for suffix to add to pc-files" >&5
821+	echo "$as_me:4069: checking for suffix to add to pc-files" >&5
822 echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6
823
824 # Check whether --with-pc-suffix or --without-pc-suffix was given.
825@@ -4075,13 +4081,13 @@
826 	esac
827 fi;
828 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
829-	echo "$as_me:4078: result: $PC_MODULE_SUFFIX" >&5
830+	echo "$as_me:4084: result: $PC_MODULE_SUFFIX" >&5
831 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
832 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
833
834 fi
835
836-echo "$as_me:4084: checking if we should assume mixed-case filenames" >&5
837+echo "$as_me:4090: checking if we should assume mixed-case filenames" >&5
838 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
839
840 # Check whether --enable-mixed-case or --disable-mixed-case was given.
841@@ -4091,11 +4097,11 @@
842 else
843   enable_mixedcase=auto
844 fi;
845-echo "$as_me:4094: result: $enable_mixedcase" >&5
846+echo "$as_me:4100: result: $enable_mixedcase" >&5
847 echo "${ECHO_T}$enable_mixedcase" >&6
848 if test "$enable_mixedcase" = "auto" ; then
849
850-echo "$as_me:4098: checking if filesystem supports mixed-case filenames" >&5
851+echo "$as_me:4104: checking if filesystem supports mixed-case filenames" >&5
852 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
853 if test "${cf_cv_mixedcase+set}" = set; then
854   echo $ECHO_N "(cached) $ECHO_C" >&6
855@@ -4122,7 +4128,7 @@
856 fi
857
858 fi
859-echo "$as_me:4125: result: $cf_cv_mixedcase" >&5
860+echo "$as_me:4131: result: $cf_cv_mixedcase" >&5
861 echo "${ECHO_T}$cf_cv_mixedcase" >&6
862 test "$cf_cv_mixedcase" = yes &&
863 cat >>confdefs.h <<\EOF
864@@ -4141,7 +4147,7 @@
865 fi
866
867 # do this after mixed-case option (tags/TAGS is not as important as tic).
868-echo "$as_me:4144: checking whether ${MAKE-make} sets \${MAKE}" >&5
869+echo "$as_me:4150: checking whether ${MAKE-make} sets \${MAKE}" >&5
870 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
871 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
872 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
873@@ -4161,11 +4167,11 @@
874 rm -f conftest.make
875 fi
876 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
877-  echo "$as_me:4164: result: yes" >&5
878+  echo "$as_me:4170: result: yes" >&5
879 echo "${ECHO_T}yes" >&6
880   SET_MAKE=
881 else
882-  echo "$as_me:4168: result: no" >&5
883+  echo "$as_me:4174: result: no" >&5
884 echo "${ECHO_T}no" >&6
885   SET_MAKE="MAKE=${MAKE-make}"
886 fi
887@@ -4174,7 +4180,7 @@
888 do
889   # Extract the first word of "$ac_prog", so it can be a program name with args.
890 set dummy $ac_prog; ac_word=$2
891-echo "$as_me:4177: checking for $ac_word" >&5
892+echo "$as_me:4183: checking for $ac_word" >&5
893 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
894 if test "${ac_cv_prog_CTAGS+set}" = set; then
895   echo $ECHO_N "(cached) $ECHO_C" >&6
896@@ -4189,7 +4195,7 @@
897   test -z "$ac_dir" && ac_dir=.
898   $as_executable_p "$ac_dir/$ac_word" || continue
899 ac_cv_prog_CTAGS="$ac_prog"
900-echo "$as_me:4192: found $ac_dir/$ac_word" >&5
901+echo "$as_me:4198: found $ac_dir/$ac_word" >&5
902 break
903 done
904
905@@ -4197,10 +4203,10 @@
906 fi
907 CTAGS=$ac_cv_prog_CTAGS
908 if test -n "$CTAGS"; then
909-  echo "$as_me:4200: result: $CTAGS" >&5
910+  echo "$as_me:4206: result: $CTAGS" >&5
911 echo "${ECHO_T}$CTAGS" >&6
912 else
913-  echo "$as_me:4203: result: no" >&5
914+  echo "$as_me:4209: result: no" >&5
915 echo "${ECHO_T}no" >&6
916 fi
917
918@@ -4211,7 +4217,7 @@
919 do
920   # Extract the first word of "$ac_prog", so it can be a program name with args.
921 set dummy $ac_prog; ac_word=$2
922-echo "$as_me:4214: checking for $ac_word" >&5
923+echo "$as_me:4220: checking for $ac_word" >&5
924 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
925 if test "${ac_cv_prog_ETAGS+set}" = set; then
926   echo $ECHO_N "(cached) $ECHO_C" >&6
927@@ -4226,7 +4232,7 @@
928   test -z "$ac_dir" && ac_dir=.
929   $as_executable_p "$ac_dir/$ac_word" || continue
930 ac_cv_prog_ETAGS="$ac_prog"
931-echo "$as_me:4229: found $ac_dir/$ac_word" >&5
932+echo "$as_me:4235: found $ac_dir/$ac_word" >&5
933 break
934 done
935
936@@ -4234,10 +4240,10 @@
937 fi
938 ETAGS=$ac_cv_prog_ETAGS
939 if test -n "$ETAGS"; then
940-  echo "$as_me:4237: result: $ETAGS" >&5
941+  echo "$as_me:4243: result: $ETAGS" >&5
942 echo "${ECHO_T}$ETAGS" >&6
943 else
944-  echo "$as_me:4240: result: no" >&5
945+  echo "$as_me:4246: result: no" >&5
946 echo "${ECHO_T}no" >&6
947 fi
948
949@@ -4246,7 +4252,7 @@
950
951 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
952 set dummy ${CTAGS:-ctags}; ac_word=$2
953-echo "$as_me:4249: checking for $ac_word" >&5
954+echo "$as_me:4255: checking for $ac_word" >&5
955 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
956 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
957   echo $ECHO_N "(cached) $ECHO_C" >&6
958@@ -4261,7 +4267,7 @@
959   test -z "$ac_dir" && ac_dir=.
960   $as_executable_p "$ac_dir/$ac_word" || continue
961 ac_cv_prog_MAKE_LOWER_TAGS="yes"
962-echo "$as_me:4264: found $ac_dir/$ac_word" >&5
963+echo "$as_me:4270: found $ac_dir/$ac_word" >&5
964 break
965 done
966
967@@ -4270,17 +4276,17 @@
968 fi
969 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
970 if test -n "$MAKE_LOWER_TAGS"; then
971-  echo "$as_me:4273: result: $MAKE_LOWER_TAGS" >&5
972+  echo "$as_me:4279: result: $MAKE_LOWER_TAGS" >&5
973 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
974 else
975-  echo "$as_me:4276: result: no" >&5
976+  echo "$as_me:4282: result: no" >&5
977 echo "${ECHO_T}no" >&6
978 fi
979
980 if test "$cf_cv_mixedcase" = yes ; then
981 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
982 set dummy ${ETAGS:-etags}; ac_word=$2
983-echo "$as_me:4283: checking for $ac_word" >&5
984+echo "$as_me:4289: checking for $ac_word" >&5
985 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
986 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
987   echo $ECHO_N "(cached) $ECHO_C" >&6
988@@ -4295,7 +4301,7 @@
989   test -z "$ac_dir" && ac_dir=.
990   $as_executable_p "$ac_dir/$ac_word" || continue
991 ac_cv_prog_MAKE_UPPER_TAGS="yes"
992-echo "$as_me:4298: found $ac_dir/$ac_word" >&5
993+echo "$as_me:4304: found $ac_dir/$ac_word" >&5
994 break
995 done
996
997@@ -4304,10 +4310,10 @@
998 fi
999 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
1000 if test -n "$MAKE_UPPER_TAGS"; then
1001-  echo "$as_me:4307: result: $MAKE_UPPER_TAGS" >&5
1002+  echo "$as_me:4313: result: $MAKE_UPPER_TAGS" >&5
1003 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
1004 else
1005-  echo "$as_me:4310: result: no" >&5
1006+  echo "$as_me:4316: result: no" >&5
1007 echo "${ECHO_T}no" >&6
1008 fi
1009
1010@@ -4327,7 +4333,7 @@
1011 	MAKE_LOWER_TAGS="#"
1012 fi
1013
1014-echo "$as_me:4330: checking for makeflags variable" >&5
1015+echo "$as_me:4336: checking for makeflags variable" >&5
1016 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
1017 if test "${cf_cv_makeflags+set}" = set; then
1018   echo $ECHO_N "(cached) $ECHO_C" >&6
1019@@ -4357,7 +4363,7 @@
1020 			;;
1021 		(*)
1022
1023-echo "${as_me:-configure}:4360: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
1024+echo "${as_me:-configure}:4366: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
1025
1026 			;;
1027 		esac
1028@@ -4365,13 +4371,13 @@
1029 	rm -f cf_makeflags.tmp
1030
1031 fi
1032-echo "$as_me:4368: result: $cf_cv_makeflags" >&5
1033+echo "$as_me:4374: result: $cf_cv_makeflags" >&5
1034 echo "${ECHO_T}$cf_cv_makeflags" >&6
1035
1036 if test -n "$ac_tool_prefix"; then
1037   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
1038 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
1039-echo "$as_me:4374: checking for $ac_word" >&5
1040+echo "$as_me:4380: checking for $ac_word" >&5
1041 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1042 if test "${ac_cv_prog_RANLIB+set}" = set; then
1043   echo $ECHO_N "(cached) $ECHO_C" >&6
1044@@ -4386,7 +4392,7 @@
1045   test -z "$ac_dir" && ac_dir=.
1046   $as_executable_p "$ac_dir/$ac_word" || continue
1047 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
1048-echo "$as_me:4389: found $ac_dir/$ac_word" >&5
1049+echo "$as_me:4395: found $ac_dir/$ac_word" >&5
1050 break
1051 done
1052
1053@@ -4394,10 +4400,10 @@
1054 fi
1055 RANLIB=$ac_cv_prog_RANLIB
1056 if test -n "$RANLIB"; then
1057-  echo "$as_me:4397: result: $RANLIB" >&5
1058+  echo "$as_me:4403: result: $RANLIB" >&5
1059 echo "${ECHO_T}$RANLIB" >&6
1060 else
1061-  echo "$as_me:4400: result: no" >&5
1062+  echo "$as_me:4406: result: no" >&5
1063 echo "${ECHO_T}no" >&6
1064 fi
1065
1066@@ -4406,7 +4412,7 @@
1067   ac_ct_RANLIB=$RANLIB
1068   # Extract the first word of "ranlib", so it can be a program name with args.
1069 set dummy ranlib; ac_word=$2
1070-echo "$as_me:4409: checking for $ac_word" >&5
1071+echo "$as_me:4415: checking for $ac_word" >&5
1072 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1073 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
1074   echo $ECHO_N "(cached) $ECHO_C" >&6
1075@@ -4421,7 +4427,7 @@
1076   test -z "$ac_dir" && ac_dir=.
1077   $as_executable_p "$ac_dir/$ac_word" || continue
1078 ac_cv_prog_ac_ct_RANLIB="ranlib"
1079-echo "$as_me:4424: found $ac_dir/$ac_word" >&5
1080+echo "$as_me:4430: found $ac_dir/$ac_word" >&5
1081 break
1082 done
1083
1084@@ -4430,10 +4436,10 @@
1085 fi
1086 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
1087 if test -n "$ac_ct_RANLIB"; then
1088-  echo "$as_me:4433: result: $ac_ct_RANLIB" >&5
1089+  echo "$as_me:4439: result: $ac_ct_RANLIB" >&5
1090 echo "${ECHO_T}$ac_ct_RANLIB" >&6
1091 else
1092-  echo "$as_me:4436: result: no" >&5
1093+  echo "$as_me:4442: result: no" >&5
1094 echo "${ECHO_T}no" >&6
1095 fi
1096
1097@@ -4445,7 +4451,7 @@
1098 if test -n "$ac_tool_prefix"; then
1099   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
1100 set dummy ${ac_tool_prefix}ld; ac_word=$2
1101-echo "$as_me:4448: checking for $ac_word" >&5
1102+echo "$as_me:4454: checking for $ac_word" >&5
1103 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1104 if test "${ac_cv_prog_LD+set}" = set; then
1105   echo $ECHO_N "(cached) $ECHO_C" >&6
1106@@ -4460,7 +4466,7 @@
1107   test -z "$ac_dir" && ac_dir=.
1108   $as_executable_p "$ac_dir/$ac_word" || continue
1109 ac_cv_prog_LD="${ac_tool_prefix}ld"
1110-echo "$as_me:4463: found $ac_dir/$ac_word" >&5
1111+echo "$as_me:4469: found $ac_dir/$ac_word" >&5
1112 break
1113 done
1114
1115@@ -4468,10 +4474,10 @@
1116 fi
1117 LD=$ac_cv_prog_LD
1118 if test -n "$LD"; then
1119-  echo "$as_me:4471: result: $LD" >&5
1120+  echo "$as_me:4477: result: $LD" >&5
1121 echo "${ECHO_T}$LD" >&6
1122 else
1123-  echo "$as_me:4474: result: no" >&5
1124+  echo "$as_me:4480: result: no" >&5
1125 echo "${ECHO_T}no" >&6
1126 fi
1127
1128@@ -4480,7 +4486,7 @@
1129   ac_ct_LD=$LD
1130   # Extract the first word of "ld", so it can be a program name with args.
1131 set dummy ld; ac_word=$2
1132-echo "$as_me:4483: checking for $ac_word" >&5
1133+echo "$as_me:4489: checking for $ac_word" >&5
1134 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1135 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
1136   echo $ECHO_N "(cached) $ECHO_C" >&6
1137@@ -4495,7 +4501,7 @@
1138   test -z "$ac_dir" && ac_dir=.
1139   $as_executable_p "$ac_dir/$ac_word" || continue
1140 ac_cv_prog_ac_ct_LD="ld"
1141-echo "$as_me:4498: found $ac_dir/$ac_word" >&5
1142+echo "$as_me:4504: found $ac_dir/$ac_word" >&5
1143 break
1144 done
1145
1146@@ -4504,10 +4510,10 @@
1147 fi
1148 ac_ct_LD=$ac_cv_prog_ac_ct_LD
1149 if test -n "$ac_ct_LD"; then
1150-  echo "$as_me:4507: result: $ac_ct_LD" >&5
1151+  echo "$as_me:4513: result: $ac_ct_LD" >&5
1152 echo "${ECHO_T}$ac_ct_LD" >&6
1153 else
1154-  echo "$as_me:4510: result: no" >&5
1155+  echo "$as_me:4516: result: no" >&5
1156 echo "${ECHO_T}no" >&6
1157 fi
1158
1159@@ -4519,7 +4525,7 @@
1160 if test -n "$ac_tool_prefix"; then
1161   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
1162 set dummy ${ac_tool_prefix}ar; ac_word=$2
1163-echo "$as_me:4522: checking for $ac_word" >&5
1164+echo "$as_me:4528: checking for $ac_word" >&5
1165 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1166 if test "${ac_cv_prog_AR+set}" = set; then
1167   echo $ECHO_N "(cached) $ECHO_C" >&6
1168@@ -4534,7 +4540,7 @@
1169   test -z "$ac_dir" && ac_dir=.
1170   $as_executable_p "$ac_dir/$ac_word" || continue
1171 ac_cv_prog_AR="${ac_tool_prefix}ar"
1172-echo "$as_me:4537: found $ac_dir/$ac_word" >&5
1173+echo "$as_me:4543: found $ac_dir/$ac_word" >&5
1174 break
1175 done
1176
1177@@ -4542,10 +4548,10 @@
1178 fi
1179 AR=$ac_cv_prog_AR
1180 if test -n "$AR"; then
1181-  echo "$as_me:4545: result: $AR" >&5
1182+  echo "$as_me:4551: result: $AR" >&5
1183 echo "${ECHO_T}$AR" >&6
1184 else
1185-  echo "$as_me:4548: result: no" >&5
1186+  echo "$as_me:4554: result: no" >&5
1187 echo "${ECHO_T}no" >&6
1188 fi
1189
1190@@ -4554,7 +4560,7 @@
1191   ac_ct_AR=$AR
1192   # Extract the first word of "ar", so it can be a program name with args.
1193 set dummy ar; ac_word=$2
1194-echo "$as_me:4557: checking for $ac_word" >&5
1195+echo "$as_me:4563: checking for $ac_word" >&5
1196 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1197 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
1198   echo $ECHO_N "(cached) $ECHO_C" >&6
1199@@ -4569,7 +4575,7 @@
1200   test -z "$ac_dir" && ac_dir=.
1201   $as_executable_p "$ac_dir/$ac_word" || continue
1202 ac_cv_prog_ac_ct_AR="ar"
1203-echo "$as_me:4572: found $ac_dir/$ac_word" >&5
1204+echo "$as_me:4578: found $ac_dir/$ac_word" >&5
1205 break
1206 done
1207
1208@@ -4578,10 +4584,10 @@
1209 fi
1210 ac_ct_AR=$ac_cv_prog_ac_ct_AR
1211 if test -n "$ac_ct_AR"; then
1212-  echo "$as_me:4581: result: $ac_ct_AR" >&5
1213+  echo "$as_me:4587: result: $ac_ct_AR" >&5
1214 echo "${ECHO_T}$ac_ct_AR" >&6
1215 else
1216-  echo "$as_me:4584: result: no" >&5
1217+  echo "$as_me:4590: result: no" >&5
1218 echo "${ECHO_T}no" >&6
1219 fi
1220
1221@@ -4593,7 +4599,7 @@
1222 if test -n "$ac_tool_prefix"; then
1223   # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
1224 set dummy ${ac_tool_prefix}nm; ac_word=$2
1225-echo "$as_me:4596: checking for $ac_word" >&5
1226+echo "$as_me:4602: checking for $ac_word" >&5
1227 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1228 if test "${ac_cv_prog_NM+set}" = set; then
1229   echo $ECHO_N "(cached) $ECHO_C" >&6
1230@@ -4608,7 +4614,7 @@
1231   test -z "$ac_dir" && ac_dir=.
1232   $as_executable_p "$ac_dir/$ac_word" || continue
1233 ac_cv_prog_NM="${ac_tool_prefix}nm"
1234-echo "$as_me:4611: found $ac_dir/$ac_word" >&5
1235+echo "$as_me:4617: found $ac_dir/$ac_word" >&5
1236 break
1237 done
1238
1239@@ -4616,10 +4622,10 @@
1240 fi
1241 NM=$ac_cv_prog_NM
1242 if test -n "$NM"; then
1243-  echo "$as_me:4619: result: $NM" >&5
1244+  echo "$as_me:4625: result: $NM" >&5
1245 echo "${ECHO_T}$NM" >&6
1246 else
1247-  echo "$as_me:4622: result: no" >&5
1248+  echo "$as_me:4628: result: no" >&5
1249 echo "${ECHO_T}no" >&6
1250 fi
1251
1252@@ -4628,7 +4634,7 @@
1253   ac_ct_NM=$NM
1254   # Extract the first word of "nm", so it can be a program name with args.
1255 set dummy nm; ac_word=$2
1256-echo "$as_me:4631: checking for $ac_word" >&5
1257+echo "$as_me:4637: checking for $ac_word" >&5
1258 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1259 if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
1260   echo $ECHO_N "(cached) $ECHO_C" >&6
1261@@ -4643,7 +4649,7 @@
1262   test -z "$ac_dir" && ac_dir=.
1263   $as_executable_p "$ac_dir/$ac_word" || continue
1264 ac_cv_prog_ac_ct_NM="nm"
1265-echo "$as_me:4646: found $ac_dir/$ac_word" >&5
1266+echo "$as_me:4652: found $ac_dir/$ac_word" >&5
1267 break
1268 done
1269
1270@@ -4652,10 +4658,10 @@
1271 fi
1272 ac_ct_NM=$ac_cv_prog_ac_ct_NM
1273 if test -n "$ac_ct_NM"; then
1274-  echo "$as_me:4655: result: $ac_ct_NM" >&5
1275+  echo "$as_me:4661: result: $ac_ct_NM" >&5
1276 echo "${ECHO_T}$ac_ct_NM" >&6
1277 else
1278-  echo "$as_me:4658: result: no" >&5
1279+  echo "$as_me:4664: result: no" >&5
1280 echo "${ECHO_T}no" >&6
1281 fi
1282
1283@@ -4667,7 +4673,7 @@
1284 if test -n "$ac_tool_prefix"; then
1285   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
1286 set dummy ${ac_tool_prefix}ar; ac_word=$2
1287-echo "$as_me:4670: checking for $ac_word" >&5
1288+echo "$as_me:4676: checking for $ac_word" >&5
1289 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1290 if test "${ac_cv_prog_AR+set}" = set; then
1291   echo $ECHO_N "(cached) $ECHO_C" >&6
1292@@ -4682,7 +4688,7 @@
1293   test -z "$ac_dir" && ac_dir=.
1294   $as_executable_p "$ac_dir/$ac_word" || continue
1295 ac_cv_prog_AR="${ac_tool_prefix}ar"
1296-echo "$as_me:4685: found $ac_dir/$ac_word" >&5
1297+echo "$as_me:4691: found $ac_dir/$ac_word" >&5
1298 break
1299 done
1300
1301@@ -4690,10 +4696,10 @@
1302 fi
1303 AR=$ac_cv_prog_AR
1304 if test -n "$AR"; then
1305-  echo "$as_me:4693: result: $AR" >&5
1306+  echo "$as_me:4699: result: $AR" >&5
1307 echo "${ECHO_T}$AR" >&6
1308 else
1309-  echo "$as_me:4696: result: no" >&5
1310+  echo "$as_me:4702: result: no" >&5
1311 echo "${ECHO_T}no" >&6
1312 fi
1313
1314@@ -4702,7 +4708,7 @@
1315   ac_ct_AR=$AR
1316   # Extract the first word of "ar", so it can be a program name with args.
1317 set dummy ar; ac_word=$2
1318-echo "$as_me:4705: checking for $ac_word" >&5
1319+echo "$as_me:4711: checking for $ac_word" >&5
1320 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1321 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
1322   echo $ECHO_N "(cached) $ECHO_C" >&6
1323@@ -4717,7 +4723,7 @@
1324   test -z "$ac_dir" && ac_dir=.
1325   $as_executable_p "$ac_dir/$ac_word" || continue
1326 ac_cv_prog_ac_ct_AR="ar"
1327-echo "$as_me:4720: found $ac_dir/$ac_word" >&5
1328+echo "$as_me:4726: found $ac_dir/$ac_word" >&5
1329 break
1330 done
1331
1332@@ -4726,10 +4732,10 @@
1333 fi
1334 ac_ct_AR=$ac_cv_prog_ac_ct_AR
1335 if test -n "$ac_ct_AR"; then
1336-  echo "$as_me:4729: result: $ac_ct_AR" >&5
1337+  echo "$as_me:4735: result: $ac_ct_AR" >&5
1338 echo "${ECHO_T}$ac_ct_AR" >&6
1339 else
1340-  echo "$as_me:4732: result: no" >&5
1341+  echo "$as_me:4738: result: no" >&5
1342 echo "${ECHO_T}no" >&6
1343 fi
1344
1345@@ -4738,7 +4744,7 @@
1346   AR="$ac_cv_prog_AR"
1347 fi
1348
1349-echo "$as_me:4741: checking for options to update archives" >&5
1350+echo "$as_me:4747: checking for options to update archives" >&5
1351 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
1352 if test "${cf_cv_ar_flags+set}" = set; then
1353   echo $ECHO_N "(cached) $ECHO_C" >&6
1354@@ -4761,13 +4767,13 @@
1355 		rm -f conftest.a
1356
1357 		cat >conftest.$ac_ext <<EOF
1358-#line 4764 "configure"
1359+#line 4770 "configure"
1360 int	testdata[3] = { 123, 456, 789 };
1361 EOF
1362-		if { (eval echo "$as_me:4767: \"$ac_compile\"") >&5
1363+		if { (eval echo "$as_me:4773: \"$ac_compile\"") >&5
1364   (eval $ac_compile) 2>&5
1365   ac_status=$?
1366-  echo "$as_me:4770: \$? = $ac_status" >&5
1367+  echo "$as_me:4776: \$? = $ac_status" >&5
1368   (exit $ac_status); } ; then
1369 			echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
1370 			$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
1371@@ -4778,7 +4784,7 @@
1372 		else
1373 			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
1374
1375-echo "${as_me:-configure}:4781: testing cannot compile test-program ..." 1>&5
1376+echo "${as_me:-configure}:4787: testing cannot compile test-program ..." 1>&5
1377
1378 			break
1379 		fi
1380@@ -4786,7 +4792,7 @@
1381 	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
1382
1383 fi
1384-echo "$as_me:4789: result: $cf_cv_ar_flags" >&5
1385+echo "$as_me:4795: result: $cf_cv_ar_flags" >&5
1386 echo "${ECHO_T}$cf_cv_ar_flags" >&6
1387
1388 if test -n "$ARFLAGS" ; then
1389@@ -4797,7 +4803,7 @@
1390 	ARFLAGS=$cf_cv_ar_flags
1391 fi
1392
1393-echo "$as_me:4800: checking if you have specified an install-prefix" >&5
1394+echo "$as_me:4806: checking if you have specified an install-prefix" >&5
1395 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
1396
1397 # Check whether --with-install-prefix or --without-install-prefix was given.
1398@@ -4810,7 +4816,7 @@
1399 		;;
1400 	esac
1401 fi;
1402-echo "$as_me:4813: result: $DESTDIR" >&5
1403+echo "$as_me:4819: result: $DESTDIR" >&5
1404 echo "${ECHO_T}$DESTDIR" >&6
1405
1406 ###############################################################################
1407@@ -4838,7 +4844,7 @@
1408 do
1409   # Extract the first word of "$ac_prog", so it can be a program name with args.
1410 set dummy $ac_prog; ac_word=$2
1411-echo "$as_me:4841: checking for $ac_word" >&5
1412+echo "$as_me:4847: checking for $ac_word" >&5
1413 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1414 if test "${ac_cv_prog_BUILD_CC+set}" = set; then
1415   echo $ECHO_N "(cached) $ECHO_C" >&6
1416@@ -4853,7 +4859,7 @@
1417   test -z "$ac_dir" && ac_dir=.
1418   $as_executable_p "$ac_dir/$ac_word" || continue
1419 ac_cv_prog_BUILD_CC="$ac_prog"
1420-echo "$as_me:4856: found $ac_dir/$ac_word" >&5
1421+echo "$as_me:4862: found $ac_dir/$ac_word" >&5
1422 break
1423 done
1424
1425@@ -4861,10 +4867,10 @@
1426 fi
1427 BUILD_CC=$ac_cv_prog_BUILD_CC
1428 if test -n "$BUILD_CC"; then
1429-  echo "$as_me:4864: result: $BUILD_CC" >&5
1430+  echo "$as_me:4870: result: $BUILD_CC" >&5
1431 echo "${ECHO_T}$BUILD_CC" >&6
1432 else
1433-  echo "$as_me:4867: result: no" >&5
1434+  echo "$as_me:4873: result: no" >&5
1435 echo "${ECHO_T}no" >&6
1436 fi
1437
1438@@ -4873,12 +4879,12 @@
1439 test -n "$BUILD_CC" || BUILD_CC="none"
1440
1441 fi;
1442-	echo "$as_me:4876: checking for native build C compiler" >&5
1443+	echo "$as_me:4882: checking for native build C compiler" >&5
1444 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
1445-	echo "$as_me:4878: result: $BUILD_CC" >&5
1446+	echo "$as_me:4884: result: $BUILD_CC" >&5
1447 echo "${ECHO_T}$BUILD_CC" >&6
1448
1449-	echo "$as_me:4881: checking for native build C preprocessor" >&5
1450+	echo "$as_me:4887: checking for native build C preprocessor" >&5
1451 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
1452
1453 # Check whether --with-build-cpp or --without-build-cpp was given.
1454@@ -4888,10 +4894,10 @@
1455 else
1456   BUILD_CPP='${BUILD_CC} -E'
1457 fi;
1458-	echo "$as_me:4891: result: $BUILD_CPP" >&5
1459+	echo "$as_me:4897: result: $BUILD_CPP" >&5
1460 echo "${ECHO_T}$BUILD_CPP" >&6
1461
1462-	echo "$as_me:4894: checking for native build C flags" >&5
1463+	echo "$as_me:4900: checking for native build C flags" >&5
1464 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
1465
1466 # Check whether --with-build-cflags or --without-build-cflags was given.
1467@@ -4899,10 +4905,10 @@
1468   withval="$with_build_cflags"
1469   BUILD_CFLAGS="$withval"
1470 fi;
1471-	echo "$as_me:4902: result: $BUILD_CFLAGS" >&5
1472+	echo "$as_me:4908: result: $BUILD_CFLAGS" >&5
1473 echo "${ECHO_T}$BUILD_CFLAGS" >&6
1474
1475-	echo "$as_me:4905: checking for native build C preprocessor-flags" >&5
1476+	echo "$as_me:4911: checking for native build C preprocessor-flags" >&5
1477 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
1478
1479 # Check whether --with-build-cppflags or --without-build-cppflags was given.
1480@@ -4910,10 +4916,10 @@
1481   withval="$with_build_cppflags"
1482   BUILD_CPPFLAGS="$withval"
1483 fi;
1484-	echo "$as_me:4913: result: $BUILD_CPPFLAGS" >&5
1485+	echo "$as_me:4919: result: $BUILD_CPPFLAGS" >&5
1486 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
1487
1488-	echo "$as_me:4916: checking for native build linker-flags" >&5
1489+	echo "$as_me:4922: checking for native build linker-flags" >&5
1490 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
1491
1492 # Check whether --with-build-ldflags or --without-build-ldflags was given.
1493@@ -4921,10 +4927,10 @@
1494   withval="$with_build_ldflags"
1495   BUILD_LDFLAGS="$withval"
1496 fi;
1497-	echo "$as_me:4924: result: $BUILD_LDFLAGS" >&5
1498+	echo "$as_me:4930: result: $BUILD_LDFLAGS" >&5
1499 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
1500
1501-	echo "$as_me:4927: checking for native build linker-libraries" >&5
1502+	echo "$as_me:4933: checking for native build linker-libraries" >&5
1503 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
1504
1505 # Check whether --with-build-libs or --without-build-libs was given.
1506@@ -4932,7 +4938,7 @@
1507   withval="$with_build_libs"
1508   BUILD_LIBS="$withval"
1509 fi;
1510-	echo "$as_me:4935: result: $BUILD_LIBS" >&5
1511+	echo "$as_me:4941: result: $BUILD_LIBS" >&5
1512 echo "${ECHO_T}$BUILD_LIBS" >&6
1513
1514 	# this assumes we're on Unix.
1515@@ -4942,7 +4948,7 @@
1516 	: ${BUILD_CC:='${CC}'}
1517
1518 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
1519-		{ { echo "$as_me:4945: error: Cross-build requires two compilers.
1520+		{ { echo "$as_me:4951: error: Cross-build requires two compilers.
1521 Use --with-build-cc to specify the native compiler." >&5
1522 echo "$as_me: error: Cross-build requires two compilers.
1523 Use --with-build-cc to specify the native compiler." >&2;}
1524@@ -4967,7 +4973,7 @@
1525 ### shared, for example.
1526 cf_list_models=""
1527
1528-echo "$as_me:4970: checking if libtool -version-number should be used" >&5
1529+echo "$as_me:4976: checking if libtool -version-number should be used" >&5
1530 echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6
1531
1532 # Check whether --enable-libtool-version or --disable-libtool-version was given.
1533@@ -4984,7 +4990,7 @@
1534 	cf_libtool_version=yes
1535
1536 fi;
1537-echo "$as_me:4987: result: $cf_libtool_version" >&5
1538+echo "$as_me:4993: result: $cf_libtool_version" >&5
1539 echo "${ECHO_T}$cf_libtool_version" >&6
1540
1541 if test "$cf_libtool_version" = yes ; then
1542@@ -4993,25 +4999,25 @@
1543 	LIBTOOL_VERSION="-version-info"
1544 	case "x$VERSION" in
1545 	(x)
1546-		{ echo "$as_me:4996: WARNING: VERSION was not set" >&5
1547+		{ echo "$as_me:5002: WARNING: VERSION was not set" >&5
1548 echo "$as_me: WARNING: VERSION was not set" >&2;}
1549 		;;
1550 	(x*.*.*)
1551 		ABI_VERSION="$VERSION"
1552 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
1553
1554-echo "${as_me:-configure}:5003: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
1555+echo "${as_me:-configure}:5009: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
1556
1557 		;;
1558 	(x*:*:*)
1559 		ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'`
1560 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
1561
1562-echo "${as_me:-configure}:5010: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
1563+echo "${as_me:-configure}:5016: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
1564
1565 		;;
1566 	(*)
1567-		{ echo "$as_me:5014: WARNING: unexpected VERSION value: $VERSION" >&5
1568+		{ echo "$as_me:5020: WARNING: unexpected VERSION value: $VERSION" >&5
1569 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
1570 		;;
1571 	esac
1572@@ -5033,7 +5039,7 @@
1573 LIB_INSTALL=
1574 LIB_UNINSTALL=
1575
1576-echo "$as_me:5036: checking if you want to build libraries with libtool" >&5
1577+echo "$as_me:5042: checking if you want to build libraries with libtool" >&5
1578 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
1579
1580 # Check whether --with-libtool or --without-libtool was given.
1581@@ -5043,7 +5049,7 @@
1582 else
1583   with_libtool=no
1584 fi;
1585-echo "$as_me:5046: result: $with_libtool" >&5
1586+echo "$as_me:5052: result: $with_libtool" >&5
1587 echo "${ECHO_T}$with_libtool" >&6
1588 if test "$with_libtool" != "no"; then
1589
1590@@ -5074,7 +5080,7 @@
1591 	with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
1592 	;;
1593 (*)
1594-	{ { echo "$as_me:5077: error: expected a pathname, not \"$with_libtool\"" >&5
1595+	{ { echo "$as_me:5083: error: expected a pathname, not \"$with_libtool\"" >&5
1596 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
1597    { (exit 1); exit 1; }; }
1598 	;;
1599@@ -5087,7 +5093,7 @@
1600   do
1601     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1602 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1603-echo "$as_me:5090: checking for $ac_word" >&5
1604+echo "$as_me:5096: checking for $ac_word" >&5
1605 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1606 if test "${ac_cv_prog_LIBTOOL+set}" = set; then
1607   echo $ECHO_N "(cached) $ECHO_C" >&6
1608@@ -5102,7 +5108,7 @@
1609   test -z "$ac_dir" && ac_dir=.
1610   $as_executable_p "$ac_dir/$ac_word" || continue
1611 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
1612-echo "$as_me:5105: found $ac_dir/$ac_word" >&5
1613+echo "$as_me:5111: found $ac_dir/$ac_word" >&5
1614 break
1615 done
1616
1617@@ -5110,10 +5116,10 @@
1618 fi
1619 LIBTOOL=$ac_cv_prog_LIBTOOL
1620 if test -n "$LIBTOOL"; then
1621-  echo "$as_me:5113: result: $LIBTOOL" >&5
1622+  echo "$as_me:5119: result: $LIBTOOL" >&5
1623 echo "${ECHO_T}$LIBTOOL" >&6
1624 else
1625-  echo "$as_me:5116: result: no" >&5
1626+  echo "$as_me:5122: result: no" >&5
1627 echo "${ECHO_T}no" >&6
1628 fi
1629
1630@@ -5126,7 +5132,7 @@
1631 do
1632   # Extract the first word of "$ac_prog", so it can be a program name with args.
1633 set dummy $ac_prog; ac_word=$2
1634-echo "$as_me:5129: checking for $ac_word" >&5
1635+echo "$as_me:5135: checking for $ac_word" >&5
1636 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1637 if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
1638   echo $ECHO_N "(cached) $ECHO_C" >&6
1639@@ -5141,7 +5147,7 @@
1640   test -z "$ac_dir" && ac_dir=.
1641   $as_executable_p "$ac_dir/$ac_word" || continue
1642 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
1643-echo "$as_me:5144: found $ac_dir/$ac_word" >&5
1644+echo "$as_me:5150: found $ac_dir/$ac_word" >&5
1645 break
1646 done
1647
1648@@ -5149,10 +5155,10 @@
1649 fi
1650 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
1651 if test -n "$ac_ct_LIBTOOL"; then
1652-  echo "$as_me:5152: result: $ac_ct_LIBTOOL" >&5
1653+  echo "$as_me:5158: result: $ac_ct_LIBTOOL" >&5
1654 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
1655 else
1656-  echo "$as_me:5155: result: no" >&5
1657+  echo "$as_me:5161: result: no" >&5
1658 echo "${ECHO_T}no" >&6
1659 fi
1660
1661@@ -5183,7 +5189,7 @@
1662   do
1663     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1664 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1665-echo "$as_me:5186: checking for $ac_word" >&5
1666+echo "$as_me:5192: checking for $ac_word" >&5
1667 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1668 if test "${ac_cv_prog_LIBTOOL+set}" = set; then
1669   echo $ECHO_N "(cached) $ECHO_C" >&6
1670@@ -5198,7 +5204,7 @@
1671   test -z "$ac_dir" && ac_dir=.
1672   $as_executable_p "$ac_dir/$ac_word" || continue
1673 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
1674-echo "$as_me:5201: found $ac_dir/$ac_word" >&5
1675+echo "$as_me:5207: found $ac_dir/$ac_word" >&5
1676 break
1677 done
1678
1679@@ -5206,10 +5212,10 @@
1680 fi
1681 LIBTOOL=$ac_cv_prog_LIBTOOL
1682 if test -n "$LIBTOOL"; then
1683-  echo "$as_me:5209: result: $LIBTOOL" >&5
1684+  echo "$as_me:5215: result: $LIBTOOL" >&5
1685 echo "${ECHO_T}$LIBTOOL" >&6
1686 else
1687-  echo "$as_me:5212: result: no" >&5
1688+  echo "$as_me:5218: result: no" >&5
1689 echo "${ECHO_T}no" >&6
1690 fi
1691
1692@@ -5222,7 +5228,7 @@
1693 do
1694   # Extract the first word of "$ac_prog", so it can be a program name with args.
1695 set dummy $ac_prog; ac_word=$2
1696-echo "$as_me:5225: checking for $ac_word" >&5
1697+echo "$as_me:5231: checking for $ac_word" >&5
1698 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1699 if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
1700   echo $ECHO_N "(cached) $ECHO_C" >&6
1701@@ -5237,7 +5243,7 @@
1702   test -z "$ac_dir" && ac_dir=.
1703   $as_executable_p "$ac_dir/$ac_word" || continue
1704 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
1705-echo "$as_me:5240: found $ac_dir/$ac_word" >&5
1706+echo "$as_me:5246: found $ac_dir/$ac_word" >&5
1707 break
1708 done
1709
1710@@ -5245,10 +5251,10 @@
1711 fi
1712 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
1713 if test -n "$ac_ct_LIBTOOL"; then
1714-  echo "$as_me:5248: result: $ac_ct_LIBTOOL" >&5
1715+  echo "$as_me:5254: result: $ac_ct_LIBTOOL" >&5
1716 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
1717 else
1718-  echo "$as_me:5251: result: no" >&5
1719+  echo "$as_me:5257: result: no" >&5
1720 echo "${ECHO_T}no" >&6
1721 fi
1722
1723@@ -5270,7 +5276,7 @@
1724 		fi
1725 	fi
1726 	if test -z "$LIBTOOL" ; then
1727-		{ { echo "$as_me:5273: error: Cannot find libtool" >&5
1728+		{ { echo "$as_me:5279: error: Cannot find libtool" >&5
1729 echo "$as_me: error: Cannot find libtool" >&2;}
1730    { (exit 1); exit 1; }; }
1731 	fi
1732@@ -5286,7 +5292,7 @@
1733
1734 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
1735 then
1736-	echo "$as_me:5289: checking version of $LIBTOOL" >&5
1737+	echo "$as_me:5295: checking version of $LIBTOOL" >&5
1738 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
1739
1740 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
1741@@ -5297,15 +5303,15 @@
1742 fi
1743 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
1744
1745-	echo "$as_me:5300: result: $cf_cv_libtool_version" >&5
1746+	echo "$as_me:5306: result: $cf_cv_libtool_version" >&5
1747 echo "${ECHO_T}$cf_cv_libtool_version" >&6
1748 	if test -z "$cf_cv_libtool_version" ; then
1749-		{ { echo "$as_me:5303: error: This is not GNU libtool" >&5
1750+		{ { echo "$as_me:5309: error: This is not GNU libtool" >&5
1751 echo "$as_me: error: This is not GNU libtool" >&2;}
1752    { (exit 1); exit 1; }; }
1753 	fi
1754 else
1755-	{ { echo "$as_me:5308: error: GNU libtool has not been found" >&5
1756+	{ { echo "$as_me:5314: error: GNU libtool has not been found" >&5
1757 echo "$as_me: error: GNU libtool has not been found" >&2;}
1758    { (exit 1); exit 1; }; }
1759 fi
1760@@ -5341,7 +5347,7 @@
1761
1762 else
1763
1764-echo "$as_me:5344: checking if you want to build shared libraries" >&5
1765+echo "$as_me:5350: checking if you want to build shared libraries" >&5
1766 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
1767
1768 # Check whether --with-shared or --without-shared was given.
1769@@ -5351,11 +5357,11 @@
1770 else
1771   with_shared=no
1772 fi;
1773-echo "$as_me:5354: result: $with_shared" >&5
1774+echo "$as_me:5360: result: $with_shared" >&5
1775 echo "${ECHO_T}$with_shared" >&6
1776 test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared"
1777
1778-echo "$as_me:5358: checking if you want to build static libraries" >&5
1779+echo "$as_me:5364: checking if you want to build static libraries" >&5
1780 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
1781
1782 # Check whether --with-normal or --without-normal was given.
1783@@ -5365,11 +5371,11 @@
1784 else
1785   with_normal=yes
1786 fi;
1787-echo "$as_me:5368: result: $with_normal" >&5
1788+echo "$as_me:5374: result: $with_normal" >&5
1789 echo "${ECHO_T}$with_normal" >&6
1790 test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal"
1791
1792-echo "$as_me:5372: checking if you want to build debug libraries" >&5
1793+echo "$as_me:5378: checking if you want to build debug libraries" >&5
1794 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
1795
1796 # Check whether --with-debug or --without-debug was given.
1797@@ -5379,11 +5385,11 @@
1798 else
1799   with_debug=yes
1800 fi;
1801-echo "$as_me:5382: result: $with_debug" >&5
1802+echo "$as_me:5388: result: $with_debug" >&5
1803 echo "${ECHO_T}$with_debug" >&6
1804 test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug"
1805
1806-echo "$as_me:5386: checking if you want to build profiling libraries" >&5
1807+echo "$as_me:5392: checking if you want to build profiling libraries" >&5
1808 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
1809
1810 # Check whether --with-profile or --without-profile was given.
1811@@ -5393,7 +5399,7 @@
1812 else
1813   with_profile=no
1814 fi;
1815-echo "$as_me:5396: result: $with_profile" >&5
1816+echo "$as_me:5402: result: $with_profile" >&5
1817 echo "${ECHO_T}$with_profile" >&6
1818 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
1819
1820@@ -5401,7 +5407,7 @@
1821
1822 if test "X$cf_with_cxx_binding" != Xno; then
1823 if test "x$with_shared" = "xyes"; then
1824-echo "$as_me:5404: checking if you want to build C++ shared libraries" >&5
1825+echo "$as_me:5410: checking if you want to build C++ shared libraries" >&5
1826 echo $ECHO_N "checking if you want to build C++ shared libraries... $ECHO_C" >&6
1827
1828 # Check whether --with-cxx-shared or --without-cxx-shared was given.
1829@@ -5411,26 +5417,26 @@
1830 else
1831   with_shared_cxx=no
1832 fi;
1833-echo "$as_me:5414: result: $with_shared_cxx" >&5
1834+echo "$as_me:5420: result: $with_shared_cxx" >&5
1835 echo "${ECHO_T}$with_shared_cxx" >&6
1836 fi
1837 fi
1838
1839 ###############################################################################
1840
1841-echo "$as_me:5421: checking for specified models" >&5
1842+echo "$as_me:5427: checking for specified models" >&5
1843 echo $ECHO_N "checking for specified models... $ECHO_C" >&6
1844 test -z "$cf_list_models" && cf_list_models=normal
1845 test "$with_libtool" != "no" && cf_list_models=libtool
1846-echo "$as_me:5425: result: $cf_list_models" >&5
1847+echo "$as_me:5431: result: $cf_list_models" >&5
1848 echo "${ECHO_T}$cf_list_models" >&6
1849
1850 ### Use the first model as the default, and save its suffix for use in building
1851 ### up test-applications.
1852-echo "$as_me:5430: checking for default model" >&5
1853+echo "$as_me:5436: checking for default model" >&5
1854 echo $ECHO_N "checking for default model... $ECHO_C" >&6
1855 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
1856-echo "$as_me:5433: result: $DFT_LWR_MODEL" >&5
1857+echo "$as_me:5439: result: $DFT_LWR_MODEL" >&5
1858 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
1859
1860 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
1861@@ -5444,7 +5450,7 @@
1862 LIB_DIR=../lib
1863 LIB_2ND=../../lib
1864
1865-echo "$as_me:5447: checking if you want to have a library-prefix" >&5
1866+echo "$as_me:5453: checking if you want to have a library-prefix" >&5
1867 echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
1868
1869 # Check whether --with-lib-prefix or --without-lib-prefix was given.
1870@@ -5454,7 +5460,7 @@
1871 else
1872   with_lib_prefix=auto
1873 fi;
1874-echo "$as_me:5457: result: $with_lib_prefix" >&5
1875+echo "$as_me:5463: result: $with_lib_prefix" >&5
1876 echo "${ECHO_T}$with_lib_prefix" >&6
1877
1878 if test $with_lib_prefix = auto
1879@@ -5482,19 +5488,19 @@
1880
1881 LIB_SUFFIX=
1882
1883-	echo "$as_me:5485: checking for PATH separator" >&5
1884+	echo "$as_me:5491: checking for PATH separator" >&5
1885 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
1886 	case $cf_cv_system_name in
1887 	(os2*)	PATH_SEPARATOR=';'  ;;
1888 	(*)	${PATH_SEPARATOR:=':'}  ;;
1889 	esac
1890
1891-	echo "$as_me:5492: result: $PATH_SEPARATOR" >&5
1892+	echo "$as_me:5498: result: $PATH_SEPARATOR" >&5
1893 echo "${ECHO_T}$PATH_SEPARATOR" >&6
1894
1895 ###############################################################################
1896
1897-echo "$as_me:5497: checking if you want to build a separate terminfo library" >&5
1898+echo "$as_me:5503: checking if you want to build a separate terminfo library" >&5
1899 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
1900
1901 # Check whether --with-termlib or --without-termlib was given.
1902@@ -5504,10 +5510,10 @@
1903 else
1904   with_termlib=no
1905 fi;
1906-echo "$as_me:5507: result: $with_termlib" >&5
1907+echo "$as_me:5513: result: $with_termlib" >&5
1908 echo "${ECHO_T}$with_termlib" >&6
1909
1910-echo "$as_me:5510: checking if you want to build a separate tic library" >&5
1911+echo "$as_me:5516: checking if you want to build a separate tic library" >&5
1912 echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
1913
1914 # Check whether --with-ticlib or --without-ticlib was given.
1915@@ -5517,7 +5523,7 @@
1916 else
1917   with_ticlib=no
1918 fi;
1919-echo "$as_me:5520: result: $with_ticlib" >&5
1920+echo "$as_me:5526: result: $with_ticlib" >&5
1921 echo "${ECHO_T}$with_ticlib" >&6
1922
1923 if test X"$CC_G_OPT" = X"" ; then
1924@@ -5530,7 +5536,7 @@
1925 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
1926 fi
1927
1928-echo "$as_me:5533: checking for default loader flags" >&5
1929+echo "$as_me:5539: checking for default loader flags" >&5
1930 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
1931 case $DFT_LWR_MODEL in
1932 (libtool) LD_MODEL=''   ;;
1933@@ -5539,13 +5545,13 @@
1934 (profile) LD_MODEL='-pg';;
1935 (shared)  LD_MODEL=''   ;;
1936 esac
1937-echo "$as_me:5542: result: $LD_MODEL" >&5
1938+echo "$as_me:5548: result: $LD_MODEL" >&5
1939 echo "${ECHO_T}$LD_MODEL" >&6
1940
1941 case $DFT_LWR_MODEL in
1942 (shared)
1943
1944-echo "$as_me:5548: checking if rpath option should be used" >&5
1945+echo "$as_me:5554: checking if rpath option should be used" >&5
1946 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
1947
1948 # Check whether --enable-rpath or --disable-rpath was given.
1949@@ -5555,10 +5561,10 @@
1950 else
1951   cf_cv_enable_rpath=no
1952 fi;
1953-echo "$as_me:5558: result: $cf_cv_enable_rpath" >&5
1954+echo "$as_me:5564: result: $cf_cv_enable_rpath" >&5
1955 echo "${ECHO_T}$cf_cv_enable_rpath" >&6
1956
1957-echo "$as_me:5561: checking if shared libraries should be relinked during install" >&5
1958+echo "$as_me:5567: checking if shared libraries should be relinked during install" >&5
1959 echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
1960
1961 # Check whether --enable-relink or --disable-relink was given.
1962@@ -5568,7 +5574,7 @@
1963 else
1964   cf_cv_do_relink=yes
1965 fi;
1966-echo "$as_me:5571: result: $cf_cv_do_relink" >&5
1967+echo "$as_me:5577: result: $cf_cv_do_relink" >&5
1968 echo "${ECHO_T}$cf_cv_do_relink" >&6
1969 	;;
1970 esac
1971@@ -5579,7 +5585,7 @@
1972 LD_RPATH_OPT=
1973 if test "x$cf_cv_enable_rpath" != xno
1974 then
1975-	echo "$as_me:5582: checking for an rpath option" >&5
1976+	echo "$as_me:5588: checking for an rpath option" >&5
1977 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
1978 	case $cf_cv_system_name in
1979 	(irix*)
1980@@ -5610,12 +5616,12 @@
1981 	(*)
1982 		;;
1983 	esac
1984-	echo "$as_me:5613: result: $LD_RPATH_OPT" >&5
1985+	echo "$as_me:5619: result: $LD_RPATH_OPT" >&5
1986 echo "${ECHO_T}$LD_RPATH_OPT" >&6
1987
1988 	case "x$LD_RPATH_OPT" in
1989 	(x-R*)
1990-		echo "$as_me:5618: checking if we need a space after rpath option" >&5
1991+		echo "$as_me:5624: checking if we need a space after rpath option" >&5
1992 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
1993 		cf_save_LIBS="$LIBS"
1994
1995@@ -5636,7 +5642,7 @@
1996 LIBS="$cf_add_libs"
1997
1998 		cat >conftest.$ac_ext <<_ACEOF
1999-#line 5639 "configure"
2000+#line 5645 "configure"
2001 #include "confdefs.h"
2002
2003 int
2004@@ -5648,16 +5654,16 @@
2005 }
2006 _ACEOF
2007 rm -f conftest.$ac_objext conftest$ac_exeext
2008-if { (eval echo "$as_me:5651: \"$ac_link\"") >&5
2009+if { (eval echo "$as_me:5657: \"$ac_link\"") >&5
2010   (eval $ac_link) 2>&5
2011   ac_status=$?
2012-  echo "$as_me:5654: \$? = $ac_status" >&5
2013+  echo "$as_me:5660: \$? = $ac_status" >&5
2014   (exit $ac_status); } &&
2015          { ac_try='test -s conftest$ac_exeext'
2016-  { (eval echo "$as_me:5657: \"$ac_try\"") >&5
2017+  { (eval echo "$as_me:5663: \"$ac_try\"") >&5
2018   (eval $ac_try) 2>&5
2019   ac_status=$?
2020-  echo "$as_me:5660: \$? = $ac_status" >&5
2021+  echo "$as_me:5666: \$? = $ac_status" >&5
2022   (exit $ac_status); }; }; then
2023   cf_rpath_space=no
2024 else
2025@@ -5667,7 +5673,7 @@
2026 fi
2027 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2028 		LIBS="$cf_save_LIBS"
2029-		echo "$as_me:5670: result: $cf_rpath_space" >&5
2030+		echo "$as_me:5676: result: $cf_rpath_space" >&5
2031 echo "${ECHO_T}$cf_rpath_space" >&6
2032 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
2033 		;;
2034@@ -5689,7 +5695,7 @@
2035 	cf_ld_rpath_opt=
2036 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
2037
2038-	echo "$as_me:5692: checking if release/abi version should be used for shared libs" >&5
2039+	echo "$as_me:5698: checking if release/abi version should be used for shared libs" >&5
2040 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
2041
2042 # Check whether --with-shlib-version or --without-shlib-version was given.
2043@@ -5704,9 +5710,9 @@
2044 		cf_cv_shlib_version=$withval
2045 		;;
2046 	(*)
2047-		echo "$as_me:5707: result: $withval" >&5
2048+		echo "$as_me:5713: result: $withval" >&5
2049 echo "${ECHO_T}$withval" >&6
2050-		{ { echo "$as_me:5709: error: option value must be one of: rel, abi, or auto" >&5
2051+		{ { echo "$as_me:5715: error: option value must be one of: rel, abi, or auto" >&5
2052 echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
2053    { (exit 1); exit 1; }; }
2054 		;;
2055@@ -5715,7 +5721,7 @@
2056 else
2057   cf_cv_shlib_version=auto
2058 fi;
2059-	echo "$as_me:5718: result: $cf_cv_shlib_version" >&5
2060+	echo "$as_me:5724: result: $cf_cv_shlib_version" >&5
2061 echo "${ECHO_T}$cf_cv_shlib_version" >&6
2062
2063 	cf_cv_rm_so_locs=no
2064@@ -5738,14 +5744,14 @@
2065
2066 	if test "$cf_try_fPIC" = yes
2067 	then
2068-		echo "$as_me:5741: checking which $CC option to use" >&5
2069+		echo "$as_me:5747: checking which $CC option to use" >&5
2070 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
2071 		cf_save_CFLAGS="$CFLAGS"
2072 		for CC_SHARED_OPTS in -fPIC -fpic ''
2073 		do
2074 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
2075 			cat >conftest.$ac_ext <<_ACEOF
2076-#line 5748 "configure"
2077+#line 5754 "configure"
2078 #include "confdefs.h"
2079 #include <stdio.h>
2080 int
2081@@ -5757,16 +5763,16 @@
2082 }
2083 _ACEOF
2084 rm -f conftest.$ac_objext
2085-if { (eval echo "$as_me:5760: \"$ac_compile\"") >&5
2086+if { (eval echo "$as_me:5766: \"$ac_compile\"") >&5
2087   (eval $ac_compile) 2>&5
2088   ac_status=$?
2089-  echo "$as_me:5763: \$? = $ac_status" >&5
2090+  echo "$as_me:5769: \$? = $ac_status" >&5
2091   (exit $ac_status); } &&
2092          { ac_try='test -s conftest.$ac_objext'
2093-  { (eval echo "$as_me:5766: \"$ac_try\"") >&5
2094+  { (eval echo "$as_me:5772: \"$ac_try\"") >&5
2095   (eval $ac_try) 2>&5
2096   ac_status=$?
2097-  echo "$as_me:5769: \$? = $ac_status" >&5
2098+  echo "$as_me:5775: \$? = $ac_status" >&5
2099   (exit $ac_status); }; }; then
2100   break
2101 else
2102@@ -5775,7 +5781,7 @@
2103 fi
2104 rm -f conftest.$ac_objext conftest.$ac_ext
2105 		done
2106-		echo "$as_me:5778: result: $CC_SHARED_OPTS" >&5
2107+		echo "$as_me:5784: result: $CC_SHARED_OPTS" >&5
2108 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
2109 		CFLAGS="$cf_save_CFLAGS"
2110 	fi
2111@@ -5846,7 +5852,7 @@
2112 		MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
2113 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
2114 		cf_cv_shlib_version_infix=yes
2115-		echo "$as_me:5849: checking if ld -search_paths_first works" >&5
2116+		echo "$as_me:5855: checking if ld -search_paths_first works" >&5
2117 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
2118 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
2119   echo $ECHO_N "(cached) $ECHO_C" >&6
2120@@ -5855,7 +5861,7 @@
2121 			cf_save_LDFLAGS=$LDFLAGS
2122 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
2123 			cat >conftest.$ac_ext <<_ACEOF
2124-#line 5858 "configure"
2125+#line 5864 "configure"
2126 #include "confdefs.h"
2127
2128 int
2129@@ -5867,16 +5873,16 @@
2130 }
2131 _ACEOF
2132 rm -f conftest.$ac_objext conftest$ac_exeext
2133-if { (eval echo "$as_me:5870: \"$ac_link\"") >&5
2134+if { (eval echo "$as_me:5876: \"$ac_link\"") >&5
2135   (eval $ac_link) 2>&5
2136   ac_status=$?
2137-  echo "$as_me:5873: \$? = $ac_status" >&5
2138+  echo "$as_me:5879: \$? = $ac_status" >&5
2139   (exit $ac_status); } &&
2140          { ac_try='test -s conftest$ac_exeext'
2141-  { (eval echo "$as_me:5876: \"$ac_try\"") >&5
2142+  { (eval echo "$as_me:5882: \"$ac_try\"") >&5
2143   (eval $ac_try) 2>&5
2144   ac_status=$?
2145-  echo "$as_me:5879: \$? = $ac_status" >&5
2146+  echo "$as_me:5885: \$? = $ac_status" >&5
2147   (exit $ac_status); }; }; then
2148   cf_cv_ldflags_search_paths_first=yes
2149 else
2150@@ -5887,7 +5893,7 @@
2151 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2152 				LDFLAGS=$cf_save_LDFLAGS
2153 fi
2154-echo "$as_me:5890: result: $cf_cv_ldflags_search_paths_first" >&5
2155+echo "$as_me:5896: result: $cf_cv_ldflags_search_paths_first" >&5
2156 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
2157 		if test $cf_cv_ldflags_search_paths_first = yes; then
2158 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
2159@@ -6112,7 +6118,7 @@
2160 			do
2161 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
2162 				cat >conftest.$ac_ext <<_ACEOF
2163-#line 6115 "configure"
2164+#line 6121 "configure"
2165 #include "confdefs.h"
2166 #include <stdio.h>
2167 int
2168@@ -6124,16 +6130,16 @@
2169 }
2170 _ACEOF
2171 rm -f conftest.$ac_objext
2172-if { (eval echo "$as_me:6127: \"$ac_compile\"") >&5
2173+if { (eval echo "$as_me:6133: \"$ac_compile\"") >&5
2174   (eval $ac_compile) 2>&5
2175   ac_status=$?
2176-  echo "$as_me:6130: \$? = $ac_status" >&5
2177+  echo "$as_me:6136: \$? = $ac_status" >&5
2178   (exit $ac_status); } &&
2179          { ac_try='test -s conftest.$ac_objext'
2180-  { (eval echo "$as_me:6133: \"$ac_try\"") >&5
2181+  { (eval echo "$as_me:6139: \"$ac_try\"") >&5
2182   (eval $ac_try) 2>&5
2183   ac_status=$?
2184-  echo "$as_me:6136: \$? = $ac_status" >&5
2185+  echo "$as_me:6142: \$? = $ac_status" >&5
2186   (exit $ac_status); }; }; then
2187   break
2188 else
2189@@ -6170,7 +6176,7 @@
2190 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
2191 			;;
2192 		(*)
2193-			{ echo "$as_me:6173: WARNING: ignored --with-shlib-version" >&5
2194+			{ echo "$as_me:6179: WARNING: ignored --with-shlib-version" >&5
2195 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
2196 			;;
2197 		esac
2198@@ -6180,7 +6186,7 @@
2199 	if test -n "$cf_try_cflags"
2200 	then
2201 cat > conftest.$ac_ext <<EOF
2202-#line 6183 "${as_me:-configure}"
2203+#line 6189 "${as_me:-configure}"
2204 #include <stdio.h>
2205 int main(int argc, char *argv[])
2206 {
2207@@ -6192,18 +6198,18 @@
2208 		for cf_opt in $cf_try_cflags
2209 		do
2210 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
2211-			echo "$as_me:6195: checking if CFLAGS option -$cf_opt works" >&5
2212+			echo "$as_me:6201: checking if CFLAGS option -$cf_opt works" >&5
2213 echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
2214-			if { (eval echo "$as_me:6197: \"$ac_compile\"") >&5
2215+			if { (eval echo "$as_me:6203: \"$ac_compile\"") >&5
2216   (eval $ac_compile) 2>&5
2217   ac_status=$?
2218-  echo "$as_me:6200: \$? = $ac_status" >&5
2219+  echo "$as_me:6206: \$? = $ac_status" >&5
2220   (exit $ac_status); }; then
2221-				echo "$as_me:6202: result: yes" >&5
2222+				echo "$as_me:6208: result: yes" >&5
2223 echo "${ECHO_T}yes" >&6
2224 				cf_save_CFLAGS="$CFLAGS"
2225 			else
2226-				echo "$as_me:6206: result: no" >&5
2227+				echo "$as_me:6212: result: no" >&5
2228 echo "${ECHO_T}no" >&6
2229 			fi
2230 		done
2231@@ -6218,17 +6224,17 @@
2232
2233 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
2234
2235-echo "${as_me:-configure}:6221: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
2236+echo "${as_me:-configure}:6227: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
2237
2238 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
2239
2240-echo "${as_me:-configure}:6225: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
2241+echo "${as_me:-configure}:6231: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
2242
2243 for model in $cf_list_models; do
2244 	case $model in
2245 	(libtool)
2246
2247-echo "$as_me:6231: checking for additional libtool options" >&5
2248+echo "$as_me:6237: checking for additional libtool options" >&5
2249 echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
2250
2251 # Check whether --with-libtool-opts or --without-libtool-opts was given.
2252@@ -6238,7 +6244,7 @@
2253 else
2254   with_libtool_opts=no
2255 fi;
2256-echo "$as_me:6241: result: $with_libtool_opts" >&5
2257+echo "$as_me:6247: result: $with_libtool_opts" >&5
2258 echo "${ECHO_T}$with_libtool_opts" >&6
2259
2260 case .$with_libtool_opts in
2261@@ -6249,7 +6255,7 @@
2262 	;;
2263 esac
2264
2265-echo "$as_me:6252: checking if exported-symbols file should be used" >&5
2266+echo "$as_me:6258: checking if exported-symbols file should be used" >&5
2267 echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
2268
2269 # Check whether --with-export-syms or --without-export-syms was given.
2270@@ -6264,7 +6270,7 @@
2271 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
2272
2273 fi
2274-echo "$as_me:6267: result: $with_export_syms" >&5
2275+echo "$as_me:6273: result: $with_export_syms" >&5
2276 echo "${ECHO_T}$with_export_syms" >&6
2277 if test "x$with_export_syms" != xno
2278 then
2279@@ -6275,15 +6281,15 @@
2280 		;;
2281 	(shared)
2282 		if test "$CC_SHARED_OPTS" = "unknown"; then
2283-			{ { echo "$as_me:6278: error: Shared libraries are not supported in this version" >&5
2284+			{ { echo "$as_me:6284: error: Shared libraries are not supported in this version" >&5
2285 echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
2286    { (exit 1); exit 1; }; }
2287 		fi
2288 		# workaround for inept transition to PIE vs PIC...
2289-		echo "$as_me:6283: checking if current CFLAGS link properly" >&5
2290+		echo "$as_me:6289: checking if current CFLAGS link properly" >&5
2291 echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6
2292 		cat >conftest.$ac_ext <<_ACEOF
2293-#line 6286 "configure"
2294+#line 6292 "configure"
2295 #include "confdefs.h"
2296 #include <stdio.h>
2297 int
2298@@ -6295,16 +6301,16 @@
2299 }
2300 _ACEOF
2301 rm -f conftest.$ac_objext conftest$ac_exeext
2302-if { (eval echo "$as_me:6298: \"$ac_link\"") >&5
2303+if { (eval echo "$as_me:6304: \"$ac_link\"") >&5
2304   (eval $ac_link) 2>&5
2305   ac_status=$?
2306-  echo "$as_me:6301: \$? = $ac_status" >&5
2307+  echo "$as_me:6307: \$? = $ac_status" >&5
2308   (exit $ac_status); } &&
2309          { ac_try='test -s conftest$ac_exeext'
2310-  { (eval echo "$as_me:6304: \"$ac_try\"") >&5
2311+  { (eval echo "$as_me:6310: \"$ac_try\"") >&5
2312   (eval $ac_try) 2>&5
2313   ac_status=$?
2314-  echo "$as_me:6307: \$? = $ac_status" >&5
2315+  echo "$as_me:6313: \$? = $ac_status" >&5
2316   (exit $ac_status); }; }; then
2317   cf_cflags_work=yes
2318 else
2319@@ -6313,18 +6319,18 @@
2320 cf_cflags_work=no
2321 fi
2322 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2323-		echo "$as_me:6316: result: $cf_cflags_work" >&5
2324+		echo "$as_me:6322: result: $cf_cflags_work" >&5
2325 echo "${ECHO_T}$cf_cflags_work" >&6
2326 		if test "$cf_cflags_work" = no
2327 		then
2328 			test -n "$verbose" && echo "	try to work around by appending shared-options" 1>&6
2329
2330-echo "${as_me:-configure}:6322: testing try to work around by appending shared-options ..." 1>&5
2331+echo "${as_me:-configure}:6328: testing try to work around by appending shared-options ..." 1>&5
2332
2333 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
2334 		fi
2335
2336-echo "$as_me:6327: checking if versioned-symbols file should be used" >&5
2337+echo "$as_me:6333: checking if versioned-symbols file should be used" >&5
2338 echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
2339
2340 # Check whether --with-versioned-syms or --without-versioned-syms was given.
2341@@ -6342,18 +6348,18 @@
2342 (xno)
2343 	;;
2344 (x/*)
2345-	test -f "$with_versioned_syms" || { { echo "$as_me:6345: error: expected a filename: $with_versioned_syms" >&5
2346+	test -f "$with_versioned_syms" || { { echo "$as_me:6351: error: expected a filename: $with_versioned_syms" >&5
2347 echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
2348    { (exit 1); exit 1; }; }
2349 	;;
2350 (*)
2351-	test -f "$with_versioned_syms" || { { echo "$as_me:6350: error: expected a filename: $with_versioned_syms" >&5
2352+	test -f "$with_versioned_syms" || { { echo "$as_me:6356: error: expected a filename: $with_versioned_syms" >&5
2353 echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
2354    { (exit 1); exit 1; }; }
2355 	with_versioned_syms=`pwd`/"$with_versioned_syms"
2356 	;;
2357 esac
2358-echo "$as_me:6356: result: $with_versioned_syms" >&5
2359+echo "$as_me:6362: result: $with_versioned_syms" >&5
2360 echo "${ECHO_T}$with_versioned_syms" >&6
2361
2362 RESULTING_SYMS=
2363@@ -6369,7 +6375,7 @@
2364 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
2365 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
2366
2367-echo "${as_me:-configure}:6372: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
2368+echo "${as_me:-configure}:6378: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
2369
2370 		;;
2371 	(*-dy\ *)
2372@@ -6377,11 +6383,11 @@
2373 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
2374 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
2375
2376-echo "${as_me:-configure}:6380: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
2377+echo "${as_me:-configure}:6386: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
2378
2379 		;;
2380 	(*)
2381-		{ echo "$as_me:6384: WARNING: this system does not support versioned-symbols" >&5
2382+		{ echo "$as_me:6390: WARNING: this system does not support versioned-symbols" >&5
2383 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
2384 		;;
2385 	esac
2386@@ -6393,7 +6399,7 @@
2387 	# symbols.
2388 	if test "x$VERSIONED_SYMS" != "x"
2389 	then
2390-		echo "$as_me:6396: checking if wildcards can be used to selectively omit symbols" >&5
2391+		echo "$as_me:6402: checking if wildcards can be used to selectively omit symbols" >&5
2392 echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
2393 		WILDCARD_SYMS=no
2394
2395@@ -6430,7 +6436,7 @@
2396 } submodule_1.0;
2397 EOF
2398 		cat >conftest.$ac_ext <<EOF
2399-#line 6433 "configure"
2400+#line 6439 "configure"
2401 int	_ismissing(void) { return 1; }
2402 int	_localf1(void) { return 1; }
2403 int	_localf2(void) { return 2; }
2404@@ -6461,7 +6467,7 @@
2405 			cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ 	][DT][ 	]'`
2406 			test -n "$cf_missing" && WILDCARD_SYMS=yes
2407 		fi
2408-		echo "$as_me:6464: result: $WILDCARD_SYMS" >&5
2409+		echo "$as_me:6470: result: $WILDCARD_SYMS" >&5
2410 echo "${ECHO_T}$WILDCARD_SYMS" >&6
2411 		rm -f conftest.*
2412 	fi
2413@@ -6474,7 +6480,7 @@
2414 ### Checks for special libraries, must be done up-front.
2415 SHLIB_LIST=""
2416
2417-echo "$as_me:6477: checking if you want to link with the GPM mouse library" >&5
2418+echo "$as_me:6483: checking if you want to link with the GPM mouse library" >&5
2419 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
2420
2421 # Check whether --with-gpm or --without-gpm was given.
2422@@ -6484,27 +6490,27 @@
2423 else
2424   with_gpm=maybe
2425 fi;
2426-echo "$as_me:6487: result: $with_gpm" >&5
2427+echo "$as_me:6493: result: $with_gpm" >&5
2428 echo "${ECHO_T}$with_gpm" >&6
2429
2430 if test "$with_gpm" != no ; then
2431-	echo "$as_me:6491: checking for gpm.h" >&5
2432+	echo "$as_me:6497: checking for gpm.h" >&5
2433 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
2434 if test "${ac_cv_header_gpm_h+set}" = set; then
2435   echo $ECHO_N "(cached) $ECHO_C" >&6
2436 else
2437   cat >conftest.$ac_ext <<_ACEOF
2438-#line 6497 "configure"
2439+#line 6503 "configure"
2440 #include "confdefs.h"
2441 #include <gpm.h>
2442 _ACEOF
2443-if { (eval echo "$as_me:6501: \"$ac_cpp conftest.$ac_ext\"") >&5
2444+if { (eval echo "$as_me:6507: \"$ac_cpp conftest.$ac_ext\"") >&5
2445   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
2446   ac_status=$?
2447   egrep -v '^ *\+' conftest.er1 >conftest.err
2448   rm -f conftest.er1
2449   cat conftest.err >&5
2450-  echo "$as_me:6507: \$? = $ac_status" >&5
2451+  echo "$as_me:6513: \$? = $ac_status" >&5
2452   (exit $ac_status); } >/dev/null; then
2453   if test -s conftest.err; then
2454     ac_cpp_err=$ac_c_preproc_warn_flag
2455@@ -6523,7 +6529,7 @@
2456 fi
2457 rm -f conftest.err conftest.$ac_ext
2458 fi
2459-echo "$as_me:6526: result: $ac_cv_header_gpm_h" >&5
2460+echo "$as_me:6532: result: $ac_cv_header_gpm_h" >&5
2461 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
2462 if test $ac_cv_header_gpm_h = yes; then
2463
2464@@ -6534,7 +6540,7 @@
2465 		if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
2466 			test -n "$verbose" && echo "	assuming we really have GPM library" 1>&6
2467
2468-echo "${as_me:-configure}:6537: testing assuming we really have GPM library ..." 1>&5
2469+echo "${as_me:-configure}:6543: testing assuming we really have GPM library ..." 1>&5
2470
2471 cat >>confdefs.h <<\EOF
2472 #define HAVE_LIBGPM 1
2473@@ -6542,7 +6548,7 @@
2474
2475 			with_gpm=yes
2476 		else
2477-			echo "$as_me:6545: checking for Gpm_Open in -lgpm" >&5
2478+			echo "$as_me:6551: checking for Gpm_Open in -lgpm" >&5
2479 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
2480 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
2481   echo $ECHO_N "(cached) $ECHO_C" >&6
2482@@ -6550,7 +6556,7 @@
2483   ac_check_lib_save_LIBS=$LIBS
2484 LIBS="-lgpm  $LIBS"
2485 cat >conftest.$ac_ext <<_ACEOF
2486-#line 6553 "configure"
2487+#line 6559 "configure"
2488 #include "confdefs.h"
2489
2490 /* Override any gcc2 internal prototype to avoid an error.  */
2491@@ -6569,16 +6575,16 @@
2492 }
2493 _ACEOF
2494 rm -f conftest.$ac_objext conftest$ac_exeext
2495-if { (eval echo "$as_me:6572: \"$ac_link\"") >&5
2496+if { (eval echo "$as_me:6578: \"$ac_link\"") >&5
2497   (eval $ac_link) 2>&5
2498   ac_status=$?
2499-  echo "$as_me:6575: \$? = $ac_status" >&5
2500+  echo "$as_me:6581: \$? = $ac_status" >&5
2501   (exit $ac_status); } &&
2502          { ac_try='test -s conftest$ac_exeext'
2503-  { (eval echo "$as_me:6578: \"$ac_try\"") >&5
2504+  { (eval echo "$as_me:6584: \"$ac_try\"") >&5
2505   (eval $ac_try) 2>&5
2506   ac_status=$?
2507-  echo "$as_me:6581: \$? = $ac_status" >&5
2508+  echo "$as_me:6587: \$? = $ac_status" >&5
2509   (exit $ac_status); }; }; then
2510   ac_cv_lib_gpm_Gpm_Open=yes
2511 else
2512@@ -6589,18 +6595,18 @@
2513 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2514 LIBS=$ac_check_lib_save_LIBS
2515 fi
2516-echo "$as_me:6592: result: $ac_cv_lib_gpm_Gpm_Open" >&5
2517+echo "$as_me:6598: result: $ac_cv_lib_gpm_Gpm_Open" >&5
2518 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
2519 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
2520   with_gpm=yes
2521 else
2522
2523 				if test "$with_gpm" = maybe; then
2524-					{ echo "$as_me:6599: WARNING: Cannot link with GPM library" >&5
2525+					{ echo "$as_me:6605: WARNING: Cannot link with GPM library" >&5
2526 echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
2527 					with_gpm=no
2528 				else
2529-					{ { echo "$as_me:6603: error: Cannot link with GPM library" >&5
2530+					{ { echo "$as_me:6609: error: Cannot link with GPM library" >&5
2531 echo "$as_me: error: Cannot link with GPM library" >&2;}
2532    { (exit 1); exit 1; }; }
2533 				fi
2534@@ -6611,7 +6617,7 @@
2535
2536 else
2537
2538-		test "$with_gpm" != maybe && { echo "$as_me:6614: WARNING: Cannot find GPM header" >&5
2539+		test "$with_gpm" != maybe && { echo "$as_me:6620: WARNING: Cannot find GPM header" >&5
2540 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
2541 		with_gpm=no
2542
2543@@ -6620,7 +6626,7 @@
2544 fi
2545
2546 if test "$with_gpm" != no ; then
2547-	echo "$as_me:6623: checking if you want to load GPM dynamically" >&5
2548+	echo "$as_me:6629: checking if you want to load GPM dynamically" >&5
2549 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
2550
2551 # Check whether --with-dlsym or --without-dlsym was given.
2552@@ -6630,18 +6636,18 @@
2553 else
2554   with_dlsym=yes
2555 fi;
2556-	echo "$as_me:6633: result: $with_dlsym" >&5
2557+	echo "$as_me:6639: result: $with_dlsym" >&5
2558 echo "${ECHO_T}$with_dlsym" >&6
2559 	if test "x$with_dlsym" = xyes ; then
2560
2561 cf_have_dlsym=no
2562-echo "$as_me:6638: checking for dlsym" >&5
2563+echo "$as_me:6644: checking for dlsym" >&5
2564 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
2565 if test "${ac_cv_func_dlsym+set}" = set; then
2566   echo $ECHO_N "(cached) $ECHO_C" >&6
2567 else
2568   cat >conftest.$ac_ext <<_ACEOF
2569-#line 6644 "configure"
2570+#line 6650 "configure"
2571 #include "confdefs.h"
2572 #define dlsym autoconf_temporary
2573 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
2574@@ -6672,16 +6678,16 @@
2575 }
2576 _ACEOF
2577 rm -f conftest.$ac_objext conftest$ac_exeext
2578-if { (eval echo "$as_me:6675: \"$ac_link\"") >&5
2579+if { (eval echo "$as_me:6681: \"$ac_link\"") >&5
2580   (eval $ac_link) 2>&5
2581   ac_status=$?
2582-  echo "$as_me:6678: \$? = $ac_status" >&5
2583+  echo "$as_me:6684: \$? = $ac_status" >&5
2584   (exit $ac_status); } &&
2585          { ac_try='test -s conftest$ac_exeext'
2586-  { (eval echo "$as_me:6681: \"$ac_try\"") >&5
2587+  { (eval echo "$as_me:6687: \"$ac_try\"") >&5
2588   (eval $ac_try) 2>&5
2589   ac_status=$?
2590-  echo "$as_me:6684: \$? = $ac_status" >&5
2591+  echo "$as_me:6690: \$? = $ac_status" >&5
2592   (exit $ac_status); }; }; then
2593   ac_cv_func_dlsym=yes
2594 else
2595@@ -6691,14 +6697,14 @@
2596 fi
2597 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2598 fi
2599-echo "$as_me:6694: result: $ac_cv_func_dlsym" >&5
2600+echo "$as_me:6700: result: $ac_cv_func_dlsym" >&5
2601 echo "${ECHO_T}$ac_cv_func_dlsym" >&6
2602 if test $ac_cv_func_dlsym = yes; then
2603   cf_have_dlsym=yes
2604 else
2605
2606 cf_have_libdl=no
2607-echo "$as_me:6701: checking for dlsym in -ldl" >&5
2608+echo "$as_me:6707: checking for dlsym in -ldl" >&5
2609 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
2610 if test "${ac_cv_lib_dl_dlsym+set}" = set; then
2611   echo $ECHO_N "(cached) $ECHO_C" >&6
2612@@ -6706,7 +6712,7 @@
2613   ac_check_lib_save_LIBS=$LIBS
2614 LIBS="-ldl  $LIBS"
2615 cat >conftest.$ac_ext <<_ACEOF
2616-#line 6709 "configure"
2617+#line 6715 "configure"
2618 #include "confdefs.h"
2619
2620 /* Override any gcc2 internal prototype to avoid an error.  */
2621@@ -6725,16 +6731,16 @@
2622 }
2623 _ACEOF
2624 rm -f conftest.$ac_objext conftest$ac_exeext
2625-if { (eval echo "$as_me:6728: \"$ac_link\"") >&5
2626+if { (eval echo "$as_me:6734: \"$ac_link\"") >&5
2627   (eval $ac_link) 2>&5
2628   ac_status=$?
2629-  echo "$as_me:6731: \$? = $ac_status" >&5
2630+  echo "$as_me:6737: \$? = $ac_status" >&5
2631   (exit $ac_status); } &&
2632          { ac_try='test -s conftest$ac_exeext'
2633-  { (eval echo "$as_me:6734: \"$ac_try\"") >&5
2634+  { (eval echo "$as_me:6740: \"$ac_try\"") >&5
2635   (eval $ac_try) 2>&5
2636   ac_status=$?
2637-  echo "$as_me:6737: \$? = $ac_status" >&5
2638+  echo "$as_me:6743: \$? = $ac_status" >&5
2639   (exit $ac_status); }; }; then
2640   ac_cv_lib_dl_dlsym=yes
2641 else
2642@@ -6745,7 +6751,7 @@
2643 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2644 LIBS=$ac_check_lib_save_LIBS
2645 fi
2646-echo "$as_me:6748: result: $ac_cv_lib_dl_dlsym" >&5
2647+echo "$as_me:6754: result: $ac_cv_lib_dl_dlsym" >&5
2648 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
2649 if test $ac_cv_lib_dl_dlsym = yes; then
2650
2651@@ -6774,10 +6780,10 @@
2652 LIBS="$cf_add_libs"
2653  }
2654
2655-	echo "$as_me:6777: checking whether able to link to dl*() functions" >&5
2656+	echo "$as_me:6783: checking whether able to link to dl*() functions" >&5
2657 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
2658 	cat >conftest.$ac_ext <<_ACEOF
2659-#line 6780 "configure"
2660+#line 6786 "configure"
2661 #include "confdefs.h"
2662 #include <dlfcn.h>
2663 int
2664@@ -6795,16 +6801,16 @@
2665 }
2666 _ACEOF
2667 rm -f conftest.$ac_objext conftest$ac_exeext
2668-if { (eval echo "$as_me:6798: \"$ac_link\"") >&5
2669+if { (eval echo "$as_me:6804: \"$ac_link\"") >&5
2670   (eval $ac_link) 2>&5
2671   ac_status=$?
2672-  echo "$as_me:6801: \$? = $ac_status" >&5
2673+  echo "$as_me:6807: \$? = $ac_status" >&5
2674   (exit $ac_status); } &&
2675          { ac_try='test -s conftest$ac_exeext'
2676-  { (eval echo "$as_me:6804: \"$ac_try\"") >&5
2677+  { (eval echo "$as_me:6810: \"$ac_try\"") >&5
2678   (eval $ac_try) 2>&5
2679   ac_status=$?
2680-  echo "$as_me:6807: \$? = $ac_status" >&5
2681+  echo "$as_me:6813: \$? = $ac_status" >&5
2682   (exit $ac_status); }; }; then
2683
2684 cat >>confdefs.h <<\EOF
2685@@ -6815,15 +6821,15 @@
2686   echo "$as_me: failed program was:" >&5
2687 cat conftest.$ac_ext >&5
2688
2689-		{ { echo "$as_me:6818: error: Cannot link test program for libdl" >&5
2690+		{ { echo "$as_me:6824: error: Cannot link test program for libdl" >&5
2691 echo "$as_me: error: Cannot link test program for libdl" >&2;}
2692    { (exit 1); exit 1; }; }
2693 fi
2694 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2695-	echo "$as_me:6823: result: ok" >&5
2696+	echo "$as_me:6829: result: ok" >&5
2697 echo "${ECHO_T}ok" >&6
2698 else
2699-	{ { echo "$as_me:6826: error: Cannot find dlsym function" >&5
2700+	{ { echo "$as_me:6832: error: Cannot find dlsym function" >&5
2701 echo "$as_me: error: Cannot find dlsym function" >&2;}
2702    { (exit 1); exit 1; }; }
2703 fi
2704@@ -6831,12 +6837,12 @@
2705 		if test "x$with_gpm" != xyes ; then
2706 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
2707
2708-echo "${as_me:-configure}:6834: testing assuming soname for gpm is $with_gpm ..." 1>&5
2709+echo "${as_me:-configure}:6840: testing assuming soname for gpm is $with_gpm ..." 1>&5
2710
2711 			cf_cv_gpm_soname="$with_gpm"
2712 		else
2713
2714-echo "$as_me:6839: checking for soname of gpm library" >&5
2715+echo "$as_me:6845: checking for soname of gpm library" >&5
2716 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
2717 if test "${cf_cv_gpm_soname+set}" = set; then
2718   echo $ECHO_N "(cached) $ECHO_C" >&6
2719@@ -6870,15 +6876,15 @@
2720 done
2721 LIBS="$cf_add_libs"
2722
2723-	if { (eval echo "$as_me:6873: \"$ac_compile\"") >&5
2724+	if { (eval echo "$as_me:6879: \"$ac_compile\"") >&5
2725   (eval $ac_compile) 2>&5
2726   ac_status=$?
2727-  echo "$as_me:6876: \$? = $ac_status" >&5
2728+  echo "$as_me:6882: \$? = $ac_status" >&5
2729   (exit $ac_status); } ; then
2730-		if { (eval echo "$as_me:6878: \"$ac_link\"") >&5
2731+		if { (eval echo "$as_me:6884: \"$ac_link\"") >&5
2732   (eval $ac_link) 2>&5
2733   ac_status=$?
2734-  echo "$as_me:6881: \$? = $ac_status" >&5
2735+  echo "$as_me:6887: \$? = $ac_status" >&5
2736   (exit $ac_status); } ; then
2737 			cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
2738 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
2739@@ -6889,7 +6895,7 @@
2740 fi
2741
2742 fi
2743-echo "$as_me:6892: result: $cf_cv_gpm_soname" >&5
2744+echo "$as_me:6898: result: $cf_cv_gpm_soname" >&5
2745 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
2746
2747 		fi
2748@@ -6957,7 +6963,7 @@
2749 #define HAVE_LIBGPM 1
2750 EOF
2751
2752-echo "$as_me:6960: checking for Gpm_Wgetch in -lgpm" >&5
2753+echo "$as_me:6966: checking for Gpm_Wgetch in -lgpm" >&5
2754 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
2755 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
2756   echo $ECHO_N "(cached) $ECHO_C" >&6
2757@@ -6965,7 +6971,7 @@
2758   ac_check_lib_save_LIBS=$LIBS
2759 LIBS="-lgpm  $LIBS"
2760 cat >conftest.$ac_ext <<_ACEOF
2761-#line 6968 "configure"
2762+#line 6974 "configure"
2763 #include "confdefs.h"
2764
2765 /* Override any gcc2 internal prototype to avoid an error.  */
2766@@ -6984,16 +6990,16 @@
2767 }
2768 _ACEOF
2769 rm -f conftest.$ac_objext conftest$ac_exeext
2770-if { (eval echo "$as_me:6987: \"$ac_link\"") >&5
2771+if { (eval echo "$as_me:6993: \"$ac_link\"") >&5
2772   (eval $ac_link) 2>&5
2773   ac_status=$?
2774-  echo "$as_me:6990: \$? = $ac_status" >&5
2775+  echo "$as_me:6996: \$? = $ac_status" >&5
2776   (exit $ac_status); } &&
2777          { ac_try='test -s conftest$ac_exeext'
2778-  { (eval echo "$as_me:6993: \"$ac_try\"") >&5
2779+  { (eval echo "$as_me:6999: \"$ac_try\"") >&5
2780   (eval $ac_try) 2>&5
2781   ac_status=$?
2782-  echo "$as_me:6996: \$? = $ac_status" >&5
2783+  echo "$as_me:7002: \$? = $ac_status" >&5
2784   (exit $ac_status); }; }; then
2785   ac_cv_lib_gpm_Gpm_Wgetch=yes
2786 else
2787@@ -7004,11 +7010,11 @@
2788 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2789 LIBS=$ac_check_lib_save_LIBS
2790 fi
2791-echo "$as_me:7007: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
2792+echo "$as_me:7013: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
2793 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
2794 if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
2795
2796-echo "$as_me:7011: checking if GPM is weakly bound to curses library" >&5
2797+echo "$as_me:7017: checking if GPM is weakly bound to curses library" >&5
2798 echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
2799 if test "${cf_cv_check_gpm_wgetch+set}" = set; then
2800   echo $ECHO_N "(cached) $ECHO_C" >&6
2801@@ -7032,15 +7038,15 @@
2802 	# to rely on the static library, noting that some packagers may not
2803 	# include it.
2804 	LIBS="-static -lgpm -dynamic $LIBS"
2805-	if { (eval echo "$as_me:7035: \"$ac_compile\"") >&5
2806+	if { (eval echo "$as_me:7041: \"$ac_compile\"") >&5
2807   (eval $ac_compile) 2>&5
2808   ac_status=$?
2809-  echo "$as_me:7038: \$? = $ac_status" >&5
2810+  echo "$as_me:7044: \$? = $ac_status" >&5
2811   (exit $ac_status); } ; then
2812-		if { (eval echo "$as_me:7040: \"$ac_link\"") >&5
2813+		if { (eval echo "$as_me:7046: \"$ac_link\"") >&5
2814   (eval $ac_link) 2>&5
2815   ac_status=$?
2816-  echo "$as_me:7043: \$? = $ac_status" >&5
2817+  echo "$as_me:7049: \$? = $ac_status" >&5
2818   (exit $ac_status); } ; then
2819 			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
2820 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
2821@@ -7052,11 +7058,11 @@
2822 fi
2823
2824 fi
2825-echo "$as_me:7055: result: $cf_cv_check_gpm_wgetch" >&5
2826+echo "$as_me:7061: result: $cf_cv_check_gpm_wgetch" >&5
2827 echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
2828
2829 if test "$cf_cv_check_gpm_wgetch" != yes ; then
2830-	{ echo "$as_me:7059: WARNING: GPM library is already linked with curses - read the FAQ" >&5
2831+	{ echo "$as_me:7065: WARNING: GPM library is already linked with curses - read the FAQ" >&5
2832 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
2833 fi
2834
2835@@ -7064,7 +7070,7 @@
2836
2837 fi
2838
2839-echo "$as_me:7067: checking if you want to use PCRE2 for regular-expressions" >&5
2840+echo "$as_me:7073: checking if you want to use PCRE2 for regular-expressions" >&5
2841 echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6
2842
2843 # Check whether --with-pcre2 or --without-pcre2 was given.
2844@@ -7073,7 +7079,7 @@
2845
2846 fi;
2847 test -z "$with_pcre2" && with_pcre2=no
2848-echo "$as_me:7076: result: $with_pcre2" >&5
2849+echo "$as_me:7082: result: $with_pcre2" >&5
2850 echo "${ECHO_T}$with_pcre2" >&6
2851
2852 if test "x$with_pcre2" != xno ; then
2853@@ -7081,17 +7087,17 @@
2854 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre2; then
2855 	test -n "$verbose" && echo "	found package libpcre2" 1>&6
2856
2857-echo "${as_me:-configure}:7084: testing found package libpcre2 ..." 1>&5
2858+echo "${as_me:-configure}:7090: testing found package libpcre2 ..." 1>&5
2859
2860 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre2 2>/dev/null`"
2861 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   libpcre2 2>/dev/null`"
2862 	test -n "$verbose" && echo "	package libpcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
2863
2864-echo "${as_me:-configure}:7090: testing package libpcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
2865+echo "${as_me:-configure}:7096: testing package libpcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
2866
2867 	test -n "$verbose" && echo "	package libpcre2 LIBS: $cf_pkgconfig_libs" 1>&6
2868
2869-echo "${as_me:-configure}:7094: testing package libpcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
2870+echo "${as_me:-configure}:7100: testing package libpcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
2871
2872 cf_fix_cppflags=no
2873 cf_new_cflags=
2874@@ -7215,17 +7221,17 @@
2875 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre; then
2876 	test -n "$verbose" && echo "	found package libpcre" 1>&6
2877
2878-echo "${as_me:-configure}:7218: testing found package libpcre ..." 1>&5
2879+echo "${as_me:-configure}:7224: testing found package libpcre ..." 1>&5
2880
2881 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre 2>/dev/null`"
2882 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   libpcre 2>/dev/null`"
2883 	test -n "$verbose" && echo "	package libpcre CFLAGS: $cf_pkgconfig_incs" 1>&6
2884
2885-echo "${as_me:-configure}:7224: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5
2886+echo "${as_me:-configure}:7230: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5
2887
2888 	test -n "$verbose" && echo "	package libpcre LIBS: $cf_pkgconfig_libs" 1>&6
2889
2890-echo "${as_me:-configure}:7228: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
2891+echo "${as_me:-configure}:7234: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
2892
2893 cf_fix_cppflags=no
2894 cf_new_cflags=
2895@@ -7346,7 +7352,7 @@
2896 	cf_pkgconfig_incs=
2897 	cf_pkgconfig_libs=
2898
2899-			{ { echo "$as_me:7349: error: Cannot find PCRE2 library" >&5
2900+			{ { echo "$as_me:7355: error: Cannot find PCRE2 library" >&5
2901 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
2902    { (exit 1); exit 1; }; }
2903 fi
2904@@ -7362,7 +7368,7 @@
2905 	(*pcre2-posix*|*pcreposix*)
2906 		;;
2907 	(*)
2908-		echo "$as_me:7365: checking for regcomp in -lpcre2-posix" >&5
2909+		echo "$as_me:7371: checking for regcomp in -lpcre2-posix" >&5
2910 echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6
2911 if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then
2912   echo $ECHO_N "(cached) $ECHO_C" >&6
2913@@ -7370,7 +7376,7 @@
2914   ac_check_lib_save_LIBS=$LIBS
2915 LIBS="-lpcre2-posix  $LIBS"
2916 cat >conftest.$ac_ext <<_ACEOF
2917-#line 7373 "configure"
2918+#line 7379 "configure"
2919 #include "confdefs.h"
2920
2921 /* Override any gcc2 internal prototype to avoid an error.  */
2922@@ -7389,16 +7395,16 @@
2923 }
2924 _ACEOF
2925 rm -f conftest.$ac_objext conftest$ac_exeext
2926-if { (eval echo "$as_me:7392: \"$ac_link\"") >&5
2927+if { (eval echo "$as_me:7398: \"$ac_link\"") >&5
2928   (eval $ac_link) 2>&5
2929   ac_status=$?
2930-  echo "$as_me:7395: \$? = $ac_status" >&5
2931+  echo "$as_me:7401: \$? = $ac_status" >&5
2932   (exit $ac_status); } &&
2933          { ac_try='test -s conftest$ac_exeext'
2934-  { (eval echo "$as_me:7398: \"$ac_try\"") >&5
2935+  { (eval echo "$as_me:7404: \"$ac_try\"") >&5
2936   (eval $ac_try) 2>&5
2937   ac_status=$?
2938-  echo "$as_me:7401: \$? = $ac_status" >&5
2939+  echo "$as_me:7407: \$? = $ac_status" >&5
2940   (exit $ac_status); }; }; then
2941   ac_cv_lib_pcre2_posix_regcomp=yes
2942 else
2943@@ -7409,7 +7415,7 @@
2944 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2945 LIBS=$ac_check_lib_save_LIBS
2946 fi
2947-echo "$as_me:7412: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
2948+echo "$as_me:7418: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
2949 echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6
2950 if test $ac_cv_lib_pcre2_posix_regcomp = yes; then
2951
2952@@ -7430,7 +7436,7 @@
2953 LIBS="$cf_add_libs"
2954
2955 else
2956-  echo "$as_me:7433: checking for regcomp in -lpcreposix" >&5
2957+  echo "$as_me:7439: checking for regcomp in -lpcreposix" >&5
2958 echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6
2959 if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then
2960   echo $ECHO_N "(cached) $ECHO_C" >&6
2961@@ -7438,7 +7444,7 @@
2962   ac_check_lib_save_LIBS=$LIBS
2963 LIBS="-lpcreposix  $LIBS"
2964 cat >conftest.$ac_ext <<_ACEOF
2965-#line 7441 "configure"
2966+#line 7447 "configure"
2967 #include "confdefs.h"
2968
2969 /* Override any gcc2 internal prototype to avoid an error.  */
2970@@ -7457,16 +7463,16 @@
2971 }
2972 _ACEOF
2973 rm -f conftest.$ac_objext conftest$ac_exeext
2974-if { (eval echo "$as_me:7460: \"$ac_link\"") >&5
2975+if { (eval echo "$as_me:7466: \"$ac_link\"") >&5
2976   (eval $ac_link) 2>&5
2977   ac_status=$?
2978-  echo "$as_me:7463: \$? = $ac_status" >&5
2979+  echo "$as_me:7469: \$? = $ac_status" >&5
2980   (exit $ac_status); } &&
2981          { ac_try='test -s conftest$ac_exeext'
2982-  { (eval echo "$as_me:7466: \"$ac_try\"") >&5
2983+  { (eval echo "$as_me:7472: \"$ac_try\"") >&5
2984   (eval $ac_try) 2>&5
2985   ac_status=$?
2986-  echo "$as_me:7469: \$? = $ac_status" >&5
2987+  echo "$as_me:7475: \$? = $ac_status" >&5
2988   (exit $ac_status); }; }; then
2989   ac_cv_lib_pcreposix_regcomp=yes
2990 else
2991@@ -7477,7 +7483,7 @@
2992 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2993 LIBS=$ac_check_lib_save_LIBS
2994 fi
2995-echo "$as_me:7480: result: $ac_cv_lib_pcreposix_regcomp" >&5
2996+echo "$as_me:7486: result: $ac_cv_lib_pcreposix_regcomp" >&5
2997 echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6
2998 if test $ac_cv_lib_pcreposix_regcomp = yes; then
2999
3000@@ -7498,7 +7504,7 @@
3001 LIBS="$cf_add_libs"
3002
3003 else
3004-  { { echo "$as_me:7501: error: Cannot find PCRE2 POSIX library" >&5
3005+  { { echo "$as_me:7507: error: Cannot find PCRE2 POSIX library" >&5
3006 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
3007    { (exit 1); exit 1; }; }
3008 fi
3009@@ -7513,23 +7519,23 @@
3010 for ac_header in pcre2-posix.h pcreposix.h
3011 do
3012 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
3013-echo "$as_me:7516: checking for $ac_header" >&5
3014+echo "$as_me:7522: checking for $ac_header" >&5
3015 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
3016 if eval "test \"\${$as_ac_Header+set}\" = set"; then
3017   echo $ECHO_N "(cached) $ECHO_C" >&6
3018 else
3019   cat >conftest.$ac_ext <<_ACEOF
3020-#line 7522 "configure"
3021+#line 7528 "configure"
3022 #include "confdefs.h"
3023 #include <$ac_header>
3024 _ACEOF
3025-if { (eval echo "$as_me:7526: \"$ac_cpp conftest.$ac_ext\"") >&5
3026+if { (eval echo "$as_me:7532: \"$ac_cpp conftest.$ac_ext\"") >&5
3027   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
3028   ac_status=$?
3029   egrep -v '^ *\+' conftest.er1 >conftest.err
3030   rm -f conftest.er1
3031   cat conftest.err >&5
3032-  echo "$as_me:7532: \$? = $ac_status" >&5
3033+  echo "$as_me:7538: \$? = $ac_status" >&5
3034   (exit $ac_status); } >/dev/null; then
3035   if test -s conftest.err; then
3036     ac_cpp_err=$ac_c_preproc_warn_flag
3037@@ -7548,7 +7554,7 @@
3038 fi
3039 rm -f conftest.err conftest.$ac_ext
3040 fi
3041-echo "$as_me:7551: result: `eval echo '${'$as_ac_Header'}'`" >&5
3042+echo "$as_me:7557: result: `eval echo '${'$as_ac_Header'}'`" >&5
3043 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
3044 if test `eval echo '${'$as_ac_Header'}'` = yes; then
3045   cat >>confdefs.h <<EOF
3046@@ -7562,7 +7568,7 @@
3047
3048 # not everyone has "test -c"
3049 if test -c /dev/sysmouse 2>/dev/null ; then
3050-echo "$as_me:7565: checking if you want to use sysmouse" >&5
3051+echo "$as_me:7571: checking if you want to use sysmouse" >&5
3052 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
3053
3054 # Check whether --with-sysmouse or --without-sysmouse was given.
3055@@ -7574,7 +7580,7 @@
3056 fi;
3057 	if test "$cf_with_sysmouse" != no ; then
3058 	cat >conftest.$ac_ext <<_ACEOF
3059-#line 7577 "configure"
3060+#line 7583 "configure"
3061 #include "confdefs.h"
3062
3063 #include <osreldate.h>
3064@@ -7597,16 +7603,16 @@
3065 }
3066 _ACEOF
3067 rm -f conftest.$ac_objext
3068-if { (eval echo "$as_me:7600: \"$ac_compile\"") >&5
3069+if { (eval echo "$as_me:7606: \"$ac_compile\"") >&5
3070   (eval $ac_compile) 2>&5
3071   ac_status=$?
3072-  echo "$as_me:7603: \$? = $ac_status" >&5
3073+  echo "$as_me:7609: \$? = $ac_status" >&5
3074   (exit $ac_status); } &&
3075          { ac_try='test -s conftest.$ac_objext'
3076-  { (eval echo "$as_me:7606: \"$ac_try\"") >&5
3077+  { (eval echo "$as_me:7612: \"$ac_try\"") >&5
3078   (eval $ac_try) 2>&5
3079   ac_status=$?
3080-  echo "$as_me:7609: \$? = $ac_status" >&5
3081+  echo "$as_me:7615: \$? = $ac_status" >&5
3082   (exit $ac_status); }; }; then
3083   cf_with_sysmouse=yes
3084 else
3085@@ -7616,7 +7622,7 @@
3086 fi
3087 rm -f conftest.$ac_objext conftest.$ac_ext
3088 	fi
3089-echo "$as_me:7619: result: $cf_with_sysmouse" >&5
3090+echo "$as_me:7625: result: $cf_with_sysmouse" >&5
3091 echo "${ECHO_T}$cf_with_sysmouse" >&6
3092 test "$cf_with_sysmouse" = yes &&
3093 cat >>confdefs.h <<\EOF
3094@@ -7626,7 +7632,7 @@
3095 fi
3096
3097 # pretend that ncurses==ncursesw==ncursest
3098-echo "$as_me:7629: checking if you want to disable library suffixes" >&5
3099+echo "$as_me:7635: checking if you want to disable library suffixes" >&5
3100 echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
3101
3102 # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.
3103@@ -7643,13 +7649,13 @@
3104 	disable_lib_suffixes=no
3105
3106 fi;
3107-echo "$as_me:7646: result: $disable_lib_suffixes" >&5
3108+echo "$as_me:7652: result: $disable_lib_suffixes" >&5
3109 echo "${ECHO_T}$disable_lib_suffixes" >&6
3110
3111 ### If we're building with rpath, try to link non-standard libs that way too.
3112 if test "$DFT_LWR_MODEL" = "shared" && test "x$cf_cv_enable_rpath" != xno; then
3113
3114-echo "$as_me:7652: checking if rpath-hack should be disabled" >&5
3115+echo "$as_me:7658: checking if rpath-hack should be disabled" >&5
3116 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
3117
3118 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
3119@@ -7666,21 +7672,21 @@
3120 	cf_disable_rpath_hack=no
3121
3122 fi;
3123-echo "$as_me:7669: result: $cf_disable_rpath_hack" >&5
3124+echo "$as_me:7675: result: $cf_disable_rpath_hack" >&5
3125 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
3126 if test "$cf_disable_rpath_hack" = no ; then
3127
3128-echo "$as_me:7673: checking for updated LDFLAGS" >&5
3129+echo "$as_me:7679: checking for updated LDFLAGS" >&5
3130 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
3131 if test -n "$LD_RPATH_OPT" ; then
3132-	echo "$as_me:7676: result: maybe" >&5
3133+	echo "$as_me:7682: result: maybe" >&5
3134 echo "${ECHO_T}maybe" >&6
3135
3136 	for ac_prog in ldd
3137 do
3138   # Extract the first word of "$ac_prog", so it can be a program name with args.
3139 set dummy $ac_prog; ac_word=$2
3140-echo "$as_me:7683: checking for $ac_word" >&5
3141+echo "$as_me:7689: checking for $ac_word" >&5
3142 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
3143 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
3144   echo $ECHO_N "(cached) $ECHO_C" >&6
3145@@ -7695,7 +7701,7 @@
3146   test -z "$ac_dir" && ac_dir=.
3147   $as_executable_p "$ac_dir/$ac_word" || continue
3148 ac_cv_prog_cf_ldd_prog="$ac_prog"
3149-echo "$as_me:7698: found $ac_dir/$ac_word" >&5
3150+echo "$as_me:7704: found $ac_dir/$ac_word" >&5
3151 break
3152 done
3153
3154@@ -7703,10 +7709,10 @@
3155 fi
3156 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
3157 if test -n "$cf_ldd_prog"; then
3158-  echo "$as_me:7706: result: $cf_ldd_prog" >&5
3159+  echo "$as_me:7712: result: $cf_ldd_prog" >&5
3160 echo "${ECHO_T}$cf_ldd_prog" >&6
3161 else
3162-  echo "$as_me:7709: result: no" >&5
3163+  echo "$as_me:7715: result: no" >&5
3164 echo "${ECHO_T}no" >&6
3165 fi
3166
3167@@ -7720,7 +7726,7 @@
3168 		cf_rpath_oops=
3169
3170 cat >conftest.$ac_ext <<_ACEOF
3171-#line 7723 "configure"
3172+#line 7729 "configure"
3173 #include "confdefs.h"
3174 #include <stdio.h>
3175 int
3176@@ -7732,16 +7738,16 @@
3177 }
3178 _ACEOF
3179 rm -f conftest.$ac_objext conftest$ac_exeext
3180-if { (eval echo "$as_me:7735: \"$ac_link\"") >&5
3181+if { (eval echo "$as_me:7741: \"$ac_link\"") >&5
3182   (eval $ac_link) 2>&5
3183   ac_status=$?
3184-  echo "$as_me:7738: \$? = $ac_status" >&5
3185+  echo "$as_me:7744: \$? = $ac_status" >&5
3186   (exit $ac_status); } &&
3187          { ac_try='test -s conftest$ac_exeext'
3188-  { (eval echo "$as_me:7741: \"$ac_try\"") >&5
3189+  { (eval echo "$as_me:7747: \"$ac_try\"") >&5
3190   (eval $ac_try) 2>&5
3191   ac_status=$?
3192-  echo "$as_me:7744: \$? = $ac_status" >&5
3193+  echo "$as_me:7750: \$? = $ac_status" >&5
3194   (exit $ac_status); }; }; then
3195   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
3196 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
3197@@ -7769,7 +7775,7 @@
3198 					then
3199 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
3200
3201-echo "${as_me:-configure}:7772: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
3202+echo "${as_me:-configure}:7778: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
3203
3204 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
3205 						break
3206@@ -7781,11 +7787,11 @@
3207
3208 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
3209
3210-echo "${as_me:-configure}:7784: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
3211+echo "${as_me:-configure}:7790: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
3212
3213 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
3214
3215-echo "${as_me:-configure}:7788: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
3216+echo "${as_me:-configure}:7794: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
3217
3218 cf_rpath_dst=
3219 for cf_rpath_src in $LDFLAGS
3220@@ -7822,7 +7828,7 @@
3221 			then
3222 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
3223
3224-echo "${as_me:-configure}:7825: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
3225+echo "${as_me:-configure}:7831: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
3226
3227 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
3228 			fi
3229@@ -7835,11 +7841,11 @@
3230
3231 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
3232
3233-echo "${as_me:-configure}:7838: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
3234+echo "${as_me:-configure}:7844: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
3235
3236 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
3237
3238-echo "${as_me:-configure}:7842: testing ...checking LIBS $LIBS ..." 1>&5
3239+echo "${as_me:-configure}:7848: testing ...checking LIBS $LIBS ..." 1>&5
3240
3241 cf_rpath_dst=
3242 for cf_rpath_src in $LIBS
3243@@ -7876,7 +7882,7 @@
3244 			then
3245 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
3246
3247-echo "${as_me:-configure}:7879: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
3248+echo "${as_me:-configure}:7885: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
3249
3250 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
3251 			fi
3252@@ -7889,14 +7895,14 @@
3253
3254 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
3255
3256-echo "${as_me:-configure}:7892: testing ...checked LIBS $LIBS ..." 1>&5
3257+echo "${as_me:-configure}:7898: testing ...checked LIBS $LIBS ..." 1>&5
3258
3259 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
3260
3261-echo "${as_me:-configure}:7896: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
3262+echo "${as_me:-configure}:7902: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
3263
3264 else
3265-	echo "$as_me:7899: result: no" >&5
3266+	echo "$as_me:7905: result: no" >&5
3267 echo "${ECHO_T}no" >&6
3268 fi
3269
3270@@ -7907,7 +7913,7 @@
3271 ###############################################################################
3272
3273 ###	use option --with-extra-suffix to append suffix to headers and libraries
3274-echo "$as_me:7910: checking if you wish to append extra suffix to header/library paths" >&5
3275+echo "$as_me:7916: checking if you wish to append extra suffix to header/library paths" >&5
3276 echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
3277 EXTRA_SUFFIX=
3278
3279@@ -7926,11 +7932,11 @@
3280 	esac
3281
3282 fi;
3283-echo "$as_me:7929: result: $EXTRA_SUFFIX" >&5
3284+echo "$as_me:7935: result: $EXTRA_SUFFIX" >&5
3285 echo "${ECHO_T}$EXTRA_SUFFIX" >&6
3286
3287 ###	use option --disable-overwrite to leave out the link to -lcurses
3288-echo "$as_me:7933: checking if you wish to install ncurses overwriting curses" >&5
3289+echo "$as_me:7939: checking if you wish to install ncurses overwriting curses" >&5
3290 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
3291
3292 # Check whether --enable-overwrite or --disable-overwrite was given.
3293@@ -7940,10 +7946,10 @@
3294 else
3295   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
3296 fi;
3297-echo "$as_me:7943: result: $with_overwrite" >&5
3298+echo "$as_me:7949: result: $with_overwrite" >&5
3299 echo "${ECHO_T}$with_overwrite" >&6
3300
3301-echo "$as_me:7946: checking if external terminfo-database is used" >&5
3302+echo "$as_me:7952: checking if external terminfo-database is used" >&5
3303 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
3304
3305 # Check whether --enable-database or --disable-database was given.
3306@@ -7953,7 +7959,7 @@
3307 else
3308   use_database=yes
3309 fi;
3310-echo "$as_me:7956: result: $use_database" >&5
3311+echo "$as_me:7962: result: $use_database" >&5
3312 echo "${ECHO_T}$use_database" >&6
3313
3314 case $host_os in
3315@@ -7969,7 +7975,7 @@
3316 if test "$use_database" != no ; then
3317 	NCURSES_USE_DATABASE=1
3318
3319-	echo "$as_me:7972: checking which terminfo source-file will be installed" >&5
3320+	echo "$as_me:7978: checking which terminfo source-file will be installed" >&5
3321 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
3322
3323 # Check whether --with-database or --without-database was given.
3324@@ -7977,10 +7983,10 @@
3325   withval="$with_database"
3326   TERMINFO_SRC=$withval
3327 fi;
3328-	echo "$as_me:7980: result: $TERMINFO_SRC" >&5
3329+	echo "$as_me:7986: result: $TERMINFO_SRC" >&5
3330 echo "${ECHO_T}$TERMINFO_SRC" >&6
3331
3332-	echo "$as_me:7983: checking whether to use hashed database instead of directory/tree" >&5
3333+	echo "$as_me:7989: checking whether to use hashed database instead of directory/tree" >&5
3334 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
3335
3336 # Check whether --with-hashed-db or --without-hashed-db was given.
3337@@ -7990,13 +7996,13 @@
3338 else
3339   with_hashed_db=no
3340 fi;
3341-	echo "$as_me:7993: result: $with_hashed_db" >&5
3342+	echo "$as_me:7999: result: $with_hashed_db" >&5
3343 echo "${ECHO_T}$with_hashed_db" >&6
3344 else
3345 	with_hashed_db=no
3346 fi
3347
3348-echo "$as_me:7999: checking for list of fallback descriptions" >&5
3349+echo "$as_me:8005: checking for list of fallback descriptions" >&5
3350 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
3351
3352 # Check whether --with-fallbacks or --without-fallbacks was given.
3353@@ -8006,7 +8012,7 @@
3354 else
3355   with_fallback=
3356 fi;
3357-echo "$as_me:8009: result: $with_fallback" >&5
3358+echo "$as_me:8015: result: $with_fallback" >&5
3359 echo "${ECHO_T}$with_fallback" >&6
3360
3361 case ".$with_fallback" in
3362@@ -8014,7 +8020,7 @@
3363 	FALLBACK_LIST=
3364 	;;
3365 (.yes)
3366-	{ echo "$as_me:8017: WARNING: expected a list of terminal descriptions" >&5
3367+	{ echo "$as_me:8023: WARNING: expected a list of terminal descriptions" >&5
3368 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
3369 	;;
3370 (*)
3371@@ -8036,10 +8042,10 @@
3372 # Check whether --with-tic-path or --without-tic-path was given.
3373 if test "${with_tic_path+set}" = set; then
3374   withval="$with_tic_path"
3375-  echo "$as_me:8039: checking for tic program for fallbacks" >&5
3376+  echo "$as_me:8045: checking for tic program for fallbacks" >&5
3377 echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
3378 		TIC=$withval
3379-		echo "$as_me:8042: result: $TIC" >&5
3380+		echo "$as_me:8048: result: $TIC" >&5
3381 echo "${ECHO_T}$TIC" >&6
3382
3383 if test "x$prefix" != xNONE; then
3384@@ -8067,7 +8073,7 @@
3385 	TIC=`echo $TIC | sed -e s%NONE%$cf_path_syntax%`
3386 	;;
3387 (*)
3388-	{ { echo "$as_me:8070: error: expected a pathname, not \"$TIC\"" >&5
3389+	{ { echo "$as_me:8076: error: expected a pathname, not \"$TIC\"" >&5
3390 echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
3391    { (exit 1); exit 1; }; }
3392 	;;
3393@@ -8080,7 +8086,7 @@
3394 do
3395   # Extract the first word of "$ac_prog", so it can be a program name with args.
3396 set dummy $ac_prog; ac_word=$2
3397-echo "$as_me:8083: checking for $ac_word" >&5
3398+echo "$as_me:8089: checking for $ac_word" >&5
3399 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
3400 if test "${ac_cv_path_TIC+set}" = set; then
3401   echo $ECHO_N "(cached) $ECHO_C" >&6
3402@@ -8097,7 +8103,7 @@
3403   test -z "$ac_dir" && ac_dir=.
3404   if $as_executable_p "$ac_dir/$ac_word"; then
3405    ac_cv_path_TIC="$ac_dir/$ac_word"
3406-   echo "$as_me:8100: found $ac_dir/$ac_word" >&5
3407+   echo "$as_me:8106: found $ac_dir/$ac_word" >&5
3408    break
3409 fi
3410 done
3411@@ -8108,10 +8114,10 @@
3412 TIC=$ac_cv_path_TIC
3413
3414 if test -n "$TIC"; then
3415-  echo "$as_me:8111: result: $TIC" >&5
3416+  echo "$as_me:8117: result: $TIC" >&5
3417 echo "${ECHO_T}$TIC" >&6
3418 else
3419-  echo "$as_me:8114: result: no" >&5
3420+  echo "$as_me:8120: result: no" >&5
3421 echo "${ECHO_T}no" >&6
3422 fi
3423
3424@@ -8170,7 +8176,7 @@
3425
3426 if test -n "$cf_path_prog" ; then
3427
3428-echo "${as_me:-configure}:8173: testing defining path for ${cf_path_prog} ..." 1>&5
3429+echo "${as_me:-configure}:8179: testing defining path for ${cf_path_prog} ..." 1>&5
3430
3431 cat >>confdefs.h <<EOF
3432 #define TIC_PATH "$cf_path_prog"
3433@@ -8185,7 +8191,7 @@
3434
3435 		if test -z "$TIC"
3436 		then
3437-			{ echo "$as_me:8188: WARNING: no tic program found for fallbacks" >&5
3438+			{ echo "$as_me:8194: WARNING: no tic program found for fallbacks" >&5
3439 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
3440 		fi
3441
3442@@ -8194,10 +8200,10 @@
3443 # Check whether --with-infocmp-path or --without-infocmp-path was given.
3444 if test "${with_infocmp_path+set}" = set; then
3445   withval="$with_infocmp_path"
3446-  echo "$as_me:8197: checking for infocmp program for fallbacks" >&5
3447+  echo "$as_me:8203: checking for infocmp program for fallbacks" >&5
3448 echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
3449 		INFOCMP=$withval
3450-		echo "$as_me:8200: result: $INFOCMP" >&5
3451+		echo "$as_me:8206: result: $INFOCMP" >&5
3452 echo "${ECHO_T}$INFOCMP" >&6
3453
3454 if test "x$prefix" != xNONE; then
3455@@ -8225,7 +8231,7 @@
3456 	INFOCMP=`echo $INFOCMP | sed -e s%NONE%$cf_path_syntax%`
3457 	;;
3458 (*)
3459-	{ { echo "$as_me:8228: error: expected a pathname, not \"$INFOCMP\"" >&5
3460+	{ { echo "$as_me:8234: error: expected a pathname, not \"$INFOCMP\"" >&5
3461 echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
3462    { (exit 1); exit 1; }; }
3463 	;;
3464@@ -8238,7 +8244,7 @@
3465 do
3466   # Extract the first word of "$ac_prog", so it can be a program name with args.
3467 set dummy $ac_prog; ac_word=$2
3468-echo "$as_me:8241: checking for $ac_word" >&5
3469+echo "$as_me:8247: checking for $ac_word" >&5
3470 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
3471 if test "${ac_cv_path_INFOCMP+set}" = set; then
3472   echo $ECHO_N "(cached) $ECHO_C" >&6
3473@@ -8255,7 +8261,7 @@
3474   test -z "$ac_dir" && ac_dir=.
3475   if $as_executable_p "$ac_dir/$ac_word"; then
3476    ac_cv_path_INFOCMP="$ac_dir/$ac_word"
3477-   echo "$as_me:8258: found $ac_dir/$ac_word" >&5
3478+   echo "$as_me:8264: found $ac_dir/$ac_word" >&5
3479    break
3480 fi
3481 done
3482@@ -8266,10 +8272,10 @@
3483 INFOCMP=$ac_cv_path_INFOCMP
3484
3485 if test -n "$INFOCMP"; then
3486-  echo "$as_me:8269: result: $INFOCMP" >&5
3487+  echo "$as_me:8275: result: $INFOCMP" >&5
3488 echo "${ECHO_T}$INFOCMP" >&6
3489 else
3490-  echo "$as_me:8272: result: no" >&5
3491+  echo "$as_me:8278: result: no" >&5
3492 echo "${ECHO_T}no" >&6
3493 fi
3494
3495@@ -8328,7 +8334,7 @@
3496
3497 if test -n "$cf_path_prog" ; then
3498
3499-echo "${as_me:-configure}:8331: testing defining path for ${cf_path_prog} ..." 1>&5
3500+echo "${as_me:-configure}:8337: testing defining path for ${cf_path_prog} ..." 1>&5
3501
3502 cat >>confdefs.h <<EOF
3503 #define INFOCMP_PATH "$cf_path_prog"
3504@@ -8343,7 +8349,7 @@
3505
3506 		if test -z "$INFOCMP"
3507 		then
3508-			{ echo "$as_me:8346: WARNING: no infocmp program found for fallbacks" >&5
3509+			{ echo "$as_me:8352: WARNING: no infocmp program found for fallbacks" >&5
3510 echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
3511 		fi
3512
3513@@ -8354,7 +8360,7 @@
3514 	: ${INFOCMP:=infocmp}
3515 fi
3516
3517-echo "$as_me:8357: checking if you want modern xterm or antique" >&5
3518+echo "$as_me:8363: checking if you want modern xterm or antique" >&5
3519 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
3520
3521 # Check whether --with-xterm-new or --without-xterm-new was given.
3522@@ -8368,11 +8374,11 @@
3523 (no) with_xterm_new=xterm-old;;
3524 (*)	 with_xterm_new=xterm-new;;
3525 esac
3526-echo "$as_me:8371: result: $with_xterm_new" >&5
3527+echo "$as_me:8377: result: $with_xterm_new" >&5
3528 echo "${ECHO_T}$with_xterm_new" >&6
3529 WHICH_XTERM=$with_xterm_new
3530
3531-echo "$as_me:8375: checking if xterm backspace sends BS or DEL" >&5
3532+echo "$as_me:8381: checking if xterm backspace sends BS or DEL" >&5
3533 echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
3534
3535 # Check whether --with-xterm-kbs or --without-xterm-kbs was given.
3536@@ -8393,7 +8399,7 @@
3537 	with_xterm_kbs=$withval
3538 	;;
3539 esac
3540-echo "$as_me:8396: result: $with_xterm_kbs" >&5
3541+echo "$as_me:8402: result: $with_xterm_kbs" >&5
3542 echo "${ECHO_T}$with_xterm_kbs" >&6
3543 XTERM_KBS=$with_xterm_kbs
3544
3545@@ -8403,7 +8409,7 @@
3546 	MAKE_TERMINFO="#"
3547 else
3548
3549-echo "$as_me:8406: checking for list of terminfo directories" >&5
3550+echo "$as_me:8412: checking for list of terminfo directories" >&5
3551 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
3552
3553 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
3554@@ -8443,7 +8449,7 @@
3555 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
3556 	;;
3557 (*)
3558-	{ { echo "$as_me:8446: error: expected a pathname, not \"$cf_src_path\"" >&5
3559+	{ { echo "$as_me:8452: error: expected a pathname, not \"$cf_src_path\"" >&5
3560 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
3561    { (exit 1); exit 1; }; }
3562 	;;
3563@@ -8466,7 +8472,7 @@
3564 	;;
3565 esac
3566
3567-echo "$as_me:8469: result: $TERMINFO_DIRS" >&5
3568+echo "$as_me:8475: result: $TERMINFO_DIRS" >&5
3569 echo "${ECHO_T}$TERMINFO_DIRS" >&6
3570 test -n "$TERMINFO_DIRS" &&
3571 cat >>confdefs.h <<EOF
3572@@ -8475,13 +8481,13 @@
3573
3574 case "x$TERMINFO" in
3575 x???:*)
3576-	{ echo "$as_me:8478: WARNING: ignoring non-directory/file TERMINFO value" >&5
3577+	{ echo "$as_me:8484: WARNING: ignoring non-directory/file TERMINFO value" >&5
3578 echo "$as_me: WARNING: ignoring non-directory/file TERMINFO value" >&2;}
3579 	unset TERMINFO
3580 	;;
3581 esac
3582
3583-echo "$as_me:8484: checking for default terminfo directory" >&5
3584+echo "$as_me:8490: checking for default terminfo directory" >&5
3585 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
3586
3587 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
3588@@ -8517,7 +8523,7 @@
3589 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
3590 	;;
3591 (*)
3592-	{ { echo "$as_me:8520: error: expected a pathname, not \"$withval\"" >&5
3593+	{ { echo "$as_me:8526: error: expected a pathname, not \"$withval\"" >&5
3594 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
3595    { (exit 1); exit 1; }; }
3596 	;;
3597@@ -8526,7 +8532,7 @@
3598 fi
3599 eval TERMINFO="$withval"
3600
3601-echo "$as_me:8529: result: $TERMINFO" >&5
3602+echo "$as_me:8535: result: $TERMINFO" >&5
3603 echo "${ECHO_T}$TERMINFO" >&6
3604
3605 cat >>confdefs.h <<EOF
3606@@ -8537,7 +8543,7 @@
3607
3608 ###	use option --disable-big-core to make tic run on small machines
3609 ###	We need 4Mb, check if we can allocate 50% more than that.
3610-echo "$as_me:8540: checking if big-core option selected" >&5
3611+echo "$as_me:8546: checking if big-core option selected" >&5
3612 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
3613
3614 # Check whether --enable-big-core or --disable-big-core was given.
3615@@ -8549,7 +8555,7 @@
3616   with_big_core=no
3617 else
3618   cat >conftest.$ac_ext <<_ACEOF
3619-#line 8552 "configure"
3620+#line 8558 "configure"
3621 #include "confdefs.h"
3622
3623 #include <stdlib.h>
3624@@ -8563,15 +8569,15 @@
3625 }
3626 _ACEOF
3627 rm -f conftest$ac_exeext
3628-if { (eval echo "$as_me:8566: \"$ac_link\"") >&5
3629+if { (eval echo "$as_me:8572: \"$ac_link\"") >&5
3630   (eval $ac_link) 2>&5
3631   ac_status=$?
3632-  echo "$as_me:8569: \$? = $ac_status" >&5
3633+  echo "$as_me:8575: \$? = $ac_status" >&5
3634   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
3635-  { (eval echo "$as_me:8571: \"$ac_try\"") >&5
3636+  { (eval echo "$as_me:8577: \"$ac_try\"") >&5
3637   (eval $ac_try) 2>&5
3638   ac_status=$?
3639-  echo "$as_me:8574: \$? = $ac_status" >&5
3640+  echo "$as_me:8580: \$? = $ac_status" >&5
3641   (exit $ac_status); }; }; then
3642   with_big_core=yes
3643 else
3644@@ -8583,7 +8589,7 @@
3645 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
3646 fi
3647 fi;
3648-echo "$as_me:8586: result: $with_big_core" >&5
3649+echo "$as_me:8592: result: $with_big_core" >&5
3650 echo "${ECHO_T}$with_big_core" >&6
3651 test "x$with_big_core" = "xyes" &&
3652 cat >>confdefs.h <<\EOF
3653@@ -8593,7 +8599,7 @@
3654 ### ISO C only guarantees 512-char strings, we have tables which load faster
3655 ### when constructed using "big" strings.  More than the C compiler, the awk
3656 ### program is a limit on most vendor UNIX systems.  Check that we can build.
3657-echo "$as_me:8596: checking if big-strings option selected" >&5
3658+echo "$as_me:8602: checking if big-strings option selected" >&5
3659 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
3660
3661 # Check whether --enable-big-strings or --disable-big-strings was given.
3662@@ -8617,14 +8623,14 @@
3663 	esac
3664
3665 fi;
3666-echo "$as_me:8620: result: $with_big_strings" >&5
3667+echo "$as_me:8626: result: $with_big_strings" >&5
3668 echo "${ECHO_T}$with_big_strings" >&6
3669
3670 USE_BIG_STRINGS=0
3671 test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
3672
3673 ###	use option --enable-termcap to compile in the termcap fallback support
3674-echo "$as_me:8627: checking if you want termcap-fallback support" >&5
3675+echo "$as_me:8633: checking if you want termcap-fallback support" >&5
3676 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
3677
3678 # Check whether --enable-termcap or --disable-termcap was given.
3679@@ -8634,14 +8640,14 @@
3680 else
3681   with_termcap=no
3682 fi;
3683-echo "$as_me:8637: result: $with_termcap" >&5
3684+echo "$as_me:8643: result: $with_termcap" >&5
3685 echo "${ECHO_T}$with_termcap" >&6
3686
3687 NCURSES_USE_TERMCAP=0
3688 if test "x$with_termcap" != "xyes" ; then
3689 	if test "$use_database" = no ; then
3690 		if test -z "$with_fallback" ; then
3691-			{ { echo "$as_me:8644: error: You have disabled the database w/o specifying fallbacks" >&5
3692+			{ { echo "$as_me:8650: error: You have disabled the database w/o specifying fallbacks" >&5
3693 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
3694    { (exit 1); exit 1; }; }
3695 		fi
3696@@ -8654,13 +8660,13 @@
3697 else
3698
3699 	if test "$with_ticlib" != no ; then
3700-		{ { echo "$as_me:8657: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
3701+		{ { echo "$as_me:8663: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
3702 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
3703    { (exit 1); exit 1; }; }
3704 	fi
3705
3706 	NCURSES_USE_TERMCAP=1
3707-	echo "$as_me:8663: checking for list of termcap files" >&5
3708+	echo "$as_me:8669: checking for list of termcap files" >&5
3709 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
3710
3711 # Check whether --with-termpath or --without-termpath was given.
3712@@ -8700,7 +8706,7 @@
3713 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
3714 	;;
3715 (*)
3716-	{ { echo "$as_me:8703: error: expected a pathname, not \"$cf_src_path\"" >&5
3717+	{ { echo "$as_me:8709: error: expected a pathname, not \"$cf_src_path\"" >&5
3718 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
3719    { (exit 1); exit 1; }; }
3720 	;;
3721@@ -8723,7 +8729,7 @@
3722 	;;
3723 esac
3724
3725-	echo "$as_me:8726: result: $TERMPATH" >&5
3726+	echo "$as_me:8732: result: $TERMPATH" >&5
3727 echo "${ECHO_T}$TERMPATH" >&6
3728 	test -n "$TERMPATH" &&
3729 cat >>confdefs.h <<EOF
3730@@ -8731,7 +8737,7 @@
3731 EOF
3732
3733 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
3734-	echo "$as_me:8734: checking if fast termcap-loader is needed" >&5
3735+	echo "$as_me:8740: checking if fast termcap-loader is needed" >&5
3736 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
3737
3738 # Check whether --enable-getcap or --disable-getcap was given.
3739@@ -8741,14 +8747,14 @@
3740 else
3741   with_getcap=no
3742 fi;
3743-	echo "$as_me:8744: result: $with_getcap" >&5
3744+	echo "$as_me:8750: result: $with_getcap" >&5
3745 echo "${ECHO_T}$with_getcap" >&6
3746 	test "x$with_getcap" = "xyes" &&
3747 cat >>confdefs.h <<\EOF
3748 #define USE_GETCAP 1
3749 EOF
3750
3751-	echo "$as_me:8751: checking if translated termcaps will be cached in ~/.terminfo" >&5
3752+	echo "$as_me:8757: checking if translated termcaps will be cached in ~/.terminfo" >&5
3753 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
3754
3755 # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
3756@@ -8758,7 +8764,7 @@
3757 else
3758   with_getcap_cache=no
3759 fi;
3760-	echo "$as_me:8761: result: $with_getcap_cache" >&5
3761+	echo "$as_me:8767: result: $with_getcap_cache" >&5
3762 echo "${ECHO_T}$with_getcap_cache" >&6
3763 	test "x$with_getcap_cache" = "xyes" &&
3764 cat >>confdefs.h <<\EOF
3765@@ -8768,7 +8774,7 @@
3766 fi
3767
3768 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
3769-echo "$as_me:8771: checking if ~/.terminfo is wanted" >&5
3770+echo "$as_me:8777: checking if ~/.terminfo is wanted" >&5
3771 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
3772
3773 # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
3774@@ -8778,14 +8784,14 @@
3775 else
3776   with_home_terminfo=yes
3777 fi;
3778-echo "$as_me:8781: result: $with_home_terminfo" >&5
3779+echo "$as_me:8787: result: $with_home_terminfo" >&5
3780 echo "${ECHO_T}$with_home_terminfo" >&6
3781 test "x$with_home_terminfo" = "xyes" &&
3782 cat >>confdefs.h <<\EOF
3783 #define USE_HOME_TERMINFO 1
3784 EOF
3785
3786-echo "$as_me:8788: checking if you want to use restricted environment when running as root" >&5
3787+echo "$as_me:8794: checking if you want to use restricted environment when running as root" >&5
3788 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
3789
3790 # Check whether --enable-root-environ or --disable-root-environ was given.
3791@@ -8795,7 +8801,7 @@
3792 else
3793   with_root_environ=yes
3794 fi;
3795-echo "$as_me:8798: result: $with_root_environ" >&5
3796+echo "$as_me:8804: result: $with_root_environ" >&5
3797 echo "${ECHO_T}$with_root_environ" >&6
3798 test "x$with_root_environ" = xyes &&
3799 cat >>confdefs.h <<\EOF
3800@@ -8810,23 +8816,23 @@
3801
3802 do
3803 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
3804-echo "$as_me:8813: checking for $ac_header" >&5
3805+echo "$as_me:8819: checking for $ac_header" >&5
3806 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
3807 if eval "test \"\${$as_ac_Header+set}\" = set"; then
3808   echo $ECHO_N "(cached) $ECHO_C" >&6
3809 else
3810   cat >conftest.$ac_ext <<_ACEOF
3811-#line 8819 "configure"
3812+#line 8825 "configure"
3813 #include "confdefs.h"
3814 #include <$ac_header>
3815 _ACEOF
3816-if { (eval echo "$as_me:8823: \"$ac_cpp conftest.$ac_ext\"") >&5
3817+if { (eval echo "$as_me:8829: \"$ac_cpp conftest.$ac_ext\"") >&5
3818   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
3819   ac_status=$?
3820   egrep -v '^ *\+' conftest.er1 >conftest.err
3821   rm -f conftest.er1
3822   cat conftest.err >&5
3823-  echo "$as_me:8829: \$? = $ac_status" >&5
3824+  echo "$as_me:8835: \$? = $ac_status" >&5
3825   (exit $ac_status); } >/dev/null; then
3826   if test -s conftest.err; then
3827     ac_cpp_err=$ac_c_preproc_warn_flag
3828@@ -8845,7 +8851,7 @@
3829 fi
3830 rm -f conftest.err conftest.$ac_ext
3831 fi
3832-echo "$as_me:8848: result: `eval echo '${'$as_ac_Header'}'`" >&5
3833+echo "$as_me:8854: result: `eval echo '${'$as_ac_Header'}'`" >&5
3834 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
3835 if test `eval echo '${'$as_ac_Header'}'` = yes; then
3836   cat >>confdefs.h <<EOF
3837@@ -8860,13 +8866,13 @@
3838 	unlink
3839 do
3840 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
3841-echo "$as_me:8863: checking for $ac_func" >&5
3842+echo "$as_me:8869: checking for $ac_func" >&5
3843 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
3844 if eval "test \"\${$as_ac_var+set}\" = set"; then
3845   echo $ECHO_N "(cached) $ECHO_C" >&6
3846 else
3847   cat >conftest.$ac_ext <<_ACEOF
3848-#line 8869 "configure"
3849+#line 8875 "configure"
3850 #include "confdefs.h"
3851 #define $ac_func autoconf_temporary
3852 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
3853@@ -8897,16 +8903,16 @@
3854 }
3855 _ACEOF
3856 rm -f conftest.$ac_objext conftest$ac_exeext
3857-if { (eval echo "$as_me:8900: \"$ac_link\"") >&5
3858+if { (eval echo "$as_me:8906: \"$ac_link\"") >&5
3859   (eval $ac_link) 2>&5
3860   ac_status=$?
3861-  echo "$as_me:8903: \$? = $ac_status" >&5
3862+  echo "$as_me:8909: \$? = $ac_status" >&5
3863   (exit $ac_status); } &&
3864          { ac_try='test -s conftest$ac_exeext'
3865-  { (eval echo "$as_me:8906: \"$ac_try\"") >&5
3866+  { (eval echo "$as_me:8912: \"$ac_try\"") >&5
3867   (eval $ac_try) 2>&5
3868   ac_status=$?
3869-  echo "$as_me:8909: \$? = $ac_status" >&5
3870+  echo "$as_me:8915: \$? = $ac_status" >&5
3871   (exit $ac_status); }; }; then
3872   eval "$as_ac_var=yes"
3873 else
3874@@ -8916,7 +8922,7 @@
3875 fi
3876 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3877 fi
3878-echo "$as_me:8919: result: `eval echo '${'$as_ac_var'}'`" >&5
3879+echo "$as_me:8925: result: `eval echo '${'$as_ac_var'}'`" >&5
3880 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
3881 if test `eval echo '${'$as_ac_var'}'` = yes; then
3882   cat >>confdefs.h <<EOF
3883@@ -8933,13 +8939,13 @@
3884 		symlink
3885 do
3886 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
3887-echo "$as_me:8936: checking for $ac_func" >&5
3888+echo "$as_me:8942: checking for $ac_func" >&5
3889 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
3890 if eval "test \"\${$as_ac_var+set}\" = set"; then
3891   echo $ECHO_N "(cached) $ECHO_C" >&6
3892 else
3893   cat >conftest.$ac_ext <<_ACEOF
3894-#line 8942 "configure"
3895+#line 8948 "configure"
3896 #include "confdefs.h"
3897 #define $ac_func autoconf_temporary
3898 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
3899@@ -8970,16 +8976,16 @@
3900 }
3901 _ACEOF
3902 rm -f conftest.$ac_objext conftest$ac_exeext
3903-if { (eval echo "$as_me:8973: \"$ac_link\"") >&5
3904+if { (eval echo "$as_me:8979: \"$ac_link\"") >&5
3905   (eval $ac_link) 2>&5
3906   ac_status=$?
3907-  echo "$as_me:8976: \$? = $ac_status" >&5
3908+  echo "$as_me:8982: \$? = $ac_status" >&5
3909   (exit $ac_status); } &&
3910          { ac_try='test -s conftest$ac_exeext'
3911-  { (eval echo "$as_me:8979: \"$ac_try\"") >&5
3912+  { (eval echo "$as_me:8985: \"$ac_try\"") >&5
3913   (eval $ac_try) 2>&5
3914   ac_status=$?
3915-  echo "$as_me:8982: \$? = $ac_status" >&5
3916+  echo "$as_me:8988: \$? = $ac_status" >&5
3917   (exit $ac_status); }; }; then
3918   eval "$as_ac_var=yes"
3919 else
3920@@ -8989,7 +8995,7 @@
3921 fi
3922 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3923 fi
3924-echo "$as_me:8992: result: `eval echo '${'$as_ac_var'}'`" >&5
3925+echo "$as_me:8998: result: `eval echo '${'$as_ac_var'}'`" >&5
3926 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
3927 if test `eval echo '${'$as_ac_var'}'` = yes; then
3928   cat >>confdefs.h <<EOF
3929@@ -9000,7 +9006,7 @@
3930 done
3931
3932 else
3933-	echo "$as_me:9003: checking if link/symlink functions work" >&5
3934+	echo "$as_me:9009: checking if link/symlink functions work" >&5
3935 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
3936 if test "${cf_cv_link_funcs+set}" = set; then
3937   echo $ECHO_N "(cached) $ECHO_C" >&6
3938@@ -9013,7 +9019,7 @@
3939 			eval 'ac_cv_func_'$cf_func'=error'
3940 else
3941   cat >conftest.$ac_ext <<_ACEOF
3942-#line 9016 "configure"
3943+#line 9022 "configure"
3944 #include "confdefs.h"
3945
3946 #include <sys/types.h>
3947@@ -9043,15 +9049,15 @@
3948
3949 _ACEOF
3950 rm -f conftest$ac_exeext
3951-if { (eval echo "$as_me:9046: \"$ac_link\"") >&5
3952+if { (eval echo "$as_me:9052: \"$ac_link\"") >&5
3953   (eval $ac_link) 2>&5
3954   ac_status=$?
3955-  echo "$as_me:9049: \$? = $ac_status" >&5
3956+  echo "$as_me:9055: \$? = $ac_status" >&5
3957   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
3958-  { (eval echo "$as_me:9051: \"$ac_try\"") >&5
3959+  { (eval echo "$as_me:9057: \"$ac_try\"") >&5
3960   (eval $ac_try) 2>&5
3961   ac_status=$?
3962-  echo "$as_me:9054: \$? = $ac_status" >&5
3963+  echo "$as_me:9060: \$? = $ac_status" >&5
3964   (exit $ac_status); }; }; then
3965
3966 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
3967@@ -9069,7 +9075,7 @@
3968 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
3969
3970 fi
3971-echo "$as_me:9072: result: $cf_cv_link_funcs" >&5
3972+echo "$as_me:9078: result: $cf_cv_link_funcs" >&5
3973 echo "${ECHO_T}$cf_cv_link_funcs" >&6
3974 	test "$ac_cv_func_link"    = yes &&
3975 cat >>confdefs.h <<\EOF
3976@@ -9089,7 +9095,7 @@
3977 # soft links (symbolic links) are useful for some systems where hard links do
3978 # not work, or to make it simpler to copy terminfo trees around.
3979 if test "x$ac_cv_func_symlink" = xyes ; then
3980-	echo "$as_me:9092: checking if tic should use symbolic links" >&5
3981+	echo "$as_me:9098: checking if tic should use symbolic links" >&5
3982 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
3983
3984 # Check whether --enable-symlinks or --disable-symlinks was given.
3985@@ -9099,21 +9105,21 @@
3986 else
3987   with_symlinks=no
3988 fi;
3989-	echo "$as_me:9102: result: $with_symlinks" >&5
3990+	echo "$as_me:9108: result: $with_symlinks" >&5
3991 echo "${ECHO_T}$with_symlinks" >&6
3992 fi
3993
3994 # If we have hard links and did not choose to use soft links instead, there is
3995 # no reason to make this choice optional - use the hard links.
3996 if test "$with_symlinks" = no ; then
3997-	echo "$as_me:9109: checking if tic should use hard links" >&5
3998+	echo "$as_me:9115: checking if tic should use hard links" >&5
3999 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
4000 	if test "x$ac_cv_func_link" = xyes ; then
4001 		with_links=yes
4002 	else
4003 		with_links=no
4004 	fi
4005-	echo "$as_me:9116: result: $with_links" >&5
4006+	echo "$as_me:9122: result: $with_links" >&5
4007 echo "${ECHO_T}$with_links" >&6
4008 fi
4009
4010@@ -9128,7 +9134,7 @@
4011 EOF
4012
4013 ###   use option --enable-broken-linker to force on use of broken-linker support
4014-echo "$as_me:9131: checking if you want broken-linker support code" >&5
4015+echo "$as_me:9137: checking if you want broken-linker support code" >&5
4016 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
4017
4018 # Check whether --enable-broken_linker or --disable-broken_linker was given.
4019@@ -9138,7 +9144,7 @@
4020 else
4021   with_broken_linker=${BROKEN_LINKER:-no}
4022 fi;
4023-echo "$as_me:9141: result: $with_broken_linker" >&5
4024+echo "$as_me:9147: result: $with_broken_linker" >&5
4025 echo "${ECHO_T}$with_broken_linker" >&6
4026
4027 BROKEN_LINKER=0
4028@@ -9160,14 +9166,14 @@
4029 		BROKEN_LINKER=1
4030 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
4031
4032-echo "${as_me:-configure}:9163: testing cygwin linker is broken anyway ..." 1>&5
4033+echo "${as_me:-configure}:9169: testing cygwin linker is broken anyway ..." 1>&5
4034
4035 		;;
4036 	esac
4037 fi
4038
4039 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
4040-echo "$as_me:9170: checking if tputs should process BSD-style prefix padding" >&5
4041+echo "$as_me:9176: checking if tputs should process BSD-style prefix padding" >&5
4042 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
4043
4044 # Check whether --enable-bsdpad or --disable-bsdpad was given.
4045@@ -9177,7 +9183,7 @@
4046 else
4047   with_bsdpad=no
4048 fi;
4049-echo "$as_me:9180: result: $with_bsdpad" >&5
4050+echo "$as_me:9186: result: $with_bsdpad" >&5
4051 echo "${ECHO_T}$with_bsdpad" >&6
4052 test "x$with_bsdpad" = xyes &&
4053 cat >>confdefs.h <<\EOF
4054@@ -9196,14 +9202,14 @@
4055 # Check to define _XOPEN_SOURCE "automatically"
4056 CPPFLAGS_before_XOPEN="$CPPFLAGS"
4057
4058-echo "$as_me:9199: checking if the POSIX test-macros are already defined" >&5
4059+echo "$as_me:9205: checking if the POSIX test-macros are already defined" >&5
4060 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
4061 if test "${cf_cv_posix_visible+set}" = set; then
4062   echo $ECHO_N "(cached) $ECHO_C" >&6
4063 else
4064
4065 cat >conftest.$ac_ext <<_ACEOF
4066-#line 9206 "configure"
4067+#line 9212 "configure"
4068 #include "confdefs.h"
4069 #include <stdio.h>
4070 int
4071@@ -9222,16 +9228,16 @@
4072 }
4073 _ACEOF
4074 rm -f conftest.$ac_objext
4075-if { (eval echo "$as_me:9225: \"$ac_compile\"") >&5
4076+if { (eval echo "$as_me:9231: \"$ac_compile\"") >&5
4077   (eval $ac_compile) 2>&5
4078   ac_status=$?
4079-  echo "$as_me:9228: \$? = $ac_status" >&5
4080+  echo "$as_me:9234: \$? = $ac_status" >&5
4081   (exit $ac_status); } &&
4082          { ac_try='test -s conftest.$ac_objext'
4083-  { (eval echo "$as_me:9231: \"$ac_try\"") >&5
4084+  { (eval echo "$as_me:9237: \"$ac_try\"") >&5
4085   (eval $ac_try) 2>&5
4086   ac_status=$?
4087-  echo "$as_me:9234: \$? = $ac_status" >&5
4088+  echo "$as_me:9240: \$? = $ac_status" >&5
4089   (exit $ac_status); }; }; then
4090   cf_cv_posix_visible=no
4091 else
4092@@ -9242,7 +9248,7 @@
4093 rm -f conftest.$ac_objext conftest.$ac_ext
4094
4095 fi
4096-echo "$as_me:9245: result: $cf_cv_posix_visible" >&5
4097+echo "$as_me:9251: result: $cf_cv_posix_visible" >&5
4098 echo "${ECHO_T}$cf_cv_posix_visible" >&6
4099
4100 if test "$cf_cv_posix_visible" = no; then
4101@@ -9287,14 +9293,14 @@
4102
4103 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
4104
4105-echo "$as_me:9290: checking if this is the GNU C library" >&5
4106+echo "$as_me:9296: checking if this is the GNU C library" >&5
4107 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
4108 if test "${cf_cv_gnu_library+set}" = set; then
4109   echo $ECHO_N "(cached) $ECHO_C" >&6
4110 else
4111
4112 cat >conftest.$ac_ext <<_ACEOF
4113-#line 9297 "configure"
4114+#line 9303 "configure"
4115 #include "confdefs.h"
4116 #include <sys/types.h>
4117 int
4118@@ -9313,16 +9319,16 @@
4119 }
4120 _ACEOF
4121 rm -f conftest.$ac_objext
4122-if { (eval echo "$as_me:9316: \"$ac_compile\"") >&5
4123+if { (eval echo "$as_me:9322: \"$ac_compile\"") >&5
4124   (eval $ac_compile) 2>&5
4125   ac_status=$?
4126-  echo "$as_me:9319: \$? = $ac_status" >&5
4127+  echo "$as_me:9325: \$? = $ac_status" >&5
4128   (exit $ac_status); } &&
4129          { ac_try='test -s conftest.$ac_objext'
4130-  { (eval echo "$as_me:9322: \"$ac_try\"") >&5
4131+  { (eval echo "$as_me:9328: \"$ac_try\"") >&5
4132   (eval $ac_try) 2>&5
4133   ac_status=$?
4134-  echo "$as_me:9325: \$? = $ac_status" >&5
4135+  echo "$as_me:9331: \$? = $ac_status" >&5
4136   (exit $ac_status); }; }; then
4137   cf_cv_gnu_library=yes
4138 else
4139@@ -9333,7 +9339,7 @@
4140 rm -f conftest.$ac_objext conftest.$ac_ext
4141
4142 fi
4143-echo "$as_me:9336: result: $cf_cv_gnu_library" >&5
4144+echo "$as_me:9342: result: $cf_cv_gnu_library" >&5
4145 echo "${ECHO_T}$cf_cv_gnu_library" >&6
4146
4147 if test x$cf_cv_gnu_library = xyes; then
4148@@ -9341,7 +9347,7 @@
4149 	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
4150 	# was changed to help a little.  newlib incorporated the change about 4
4151 	# years later.
4152-	echo "$as_me:9344: checking if _DEFAULT_SOURCE can be used as a basis" >&5
4153+	echo "$as_me:9350: checking if _DEFAULT_SOURCE can be used as a basis" >&5
4154 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
4155 if test "${cf_cv_gnu_library_219+set}" = set; then
4156   echo $ECHO_N "(cached) $ECHO_C" >&6
4157@@ -9353,7 +9359,7 @@
4158 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
4159
4160 		cat >conftest.$ac_ext <<_ACEOF
4161-#line 9356 "configure"
4162+#line 9362 "configure"
4163 #include "confdefs.h"
4164 #include <sys/types.h>
4165 int
4166@@ -9372,16 +9378,16 @@
4167 }
4168 _ACEOF
4169 rm -f conftest.$ac_objext
4170-if { (eval echo "$as_me:9375: \"$ac_compile\"") >&5
4171+if { (eval echo "$as_me:9381: \"$ac_compile\"") >&5
4172   (eval $ac_compile) 2>&5
4173   ac_status=$?
4174-  echo "$as_me:9378: \$? = $ac_status" >&5
4175+  echo "$as_me:9384: \$? = $ac_status" >&5
4176   (exit $ac_status); } &&
4177          { ac_try='test -s conftest.$ac_objext'
4178-  { (eval echo "$as_me:9381: \"$ac_try\"") >&5
4179+  { (eval echo "$as_me:9387: \"$ac_try\"") >&5
4180   (eval $ac_try) 2>&5
4181   ac_status=$?
4182-  echo "$as_me:9384: \$? = $ac_status" >&5
4183+  echo "$as_me:9390: \$? = $ac_status" >&5
4184   (exit $ac_status); }; }; then
4185   cf_cv_gnu_library_219=yes
4186 else
4187@@ -9393,12 +9399,12 @@
4188 		CPPFLAGS="$cf_save"
4189
4190 fi
4191-echo "$as_me:9396: result: $cf_cv_gnu_library_219" >&5
4192+echo "$as_me:9402: result: $cf_cv_gnu_library_219" >&5
4193 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
4194
4195 	if test "x$cf_cv_gnu_library_219" = xyes; then
4196 		cf_save="$CPPFLAGS"
4197-		echo "$as_me:9401: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
4198+		echo "$as_me:9407: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
4199 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
4200 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
4201   echo $ECHO_N "(cached) $ECHO_C" >&6
4202@@ -9503,7 +9509,7 @@
4203 fi
4204
4205 			cat >conftest.$ac_ext <<_ACEOF
4206-#line 9506 "configure"
4207+#line 9512 "configure"
4208 #include "confdefs.h"
4209
4210 				#include <limits.h>
4211@@ -9523,16 +9529,16 @@
4212 }
4213 _ACEOF
4214 rm -f conftest.$ac_objext
4215-if { (eval echo "$as_me:9526: \"$ac_compile\"") >&5
4216+if { (eval echo "$as_me:9532: \"$ac_compile\"") >&5
4217   (eval $ac_compile) 2>&5
4218   ac_status=$?
4219-  echo "$as_me:9529: \$? = $ac_status" >&5
4220+  echo "$as_me:9535: \$? = $ac_status" >&5
4221   (exit $ac_status); } &&
4222          { ac_try='test -s conftest.$ac_objext'
4223-  { (eval echo "$as_me:9532: \"$ac_try\"") >&5
4224+  { (eval echo "$as_me:9538: \"$ac_try\"") >&5
4225   (eval $ac_try) 2>&5
4226   ac_status=$?
4227-  echo "$as_me:9535: \$? = $ac_status" >&5
4228+  echo "$as_me:9541: \$? = $ac_status" >&5
4229   (exit $ac_status); }; }; then
4230   cf_cv_gnu_dftsrc_219=yes
4231 else
4232@@ -9543,7 +9549,7 @@
4233 rm -f conftest.$ac_objext conftest.$ac_ext
4234
4235 fi
4236-echo "$as_me:9546: result: $cf_cv_gnu_dftsrc_219" >&5
4237+echo "$as_me:9552: result: $cf_cv_gnu_dftsrc_219" >&5
4238 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
4239 		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
4240 	else
4241@@ -9552,14 +9558,14 @@
4242
4243 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
4244
4245-		echo "$as_me:9555: checking if we must define _GNU_SOURCE" >&5
4246+		echo "$as_me:9561: checking if we must define _GNU_SOURCE" >&5
4247 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
4248 if test "${cf_cv_gnu_source+set}" = set; then
4249   echo $ECHO_N "(cached) $ECHO_C" >&6
4250 else
4251
4252 		cat >conftest.$ac_ext <<_ACEOF
4253-#line 9562 "configure"
4254+#line 9568 "configure"
4255 #include "confdefs.h"
4256 #include <sys/types.h>
4257 int
4258@@ -9574,16 +9580,16 @@
4259 }
4260 _ACEOF
4261 rm -f conftest.$ac_objext
4262-if { (eval echo "$as_me:9577: \"$ac_compile\"") >&5
4263+if { (eval echo "$as_me:9583: \"$ac_compile\"") >&5
4264   (eval $ac_compile) 2>&5
4265   ac_status=$?
4266-  echo "$as_me:9580: \$? = $ac_status" >&5
4267+  echo "$as_me:9586: \$? = $ac_status" >&5
4268   (exit $ac_status); } &&
4269          { ac_try='test -s conftest.$ac_objext'
4270-  { (eval echo "$as_me:9583: \"$ac_try\"") >&5
4271+  { (eval echo "$as_me:9589: \"$ac_try\"") >&5
4272   (eval $ac_try) 2>&5
4273   ac_status=$?
4274-  echo "$as_me:9586: \$? = $ac_status" >&5
4275+  echo "$as_me:9592: \$? = $ac_status" >&5
4276   (exit $ac_status); }; }; then
4277   cf_cv_gnu_source=no
4278 else
4279@@ -9690,7 +9696,7 @@
4280 fi
4281
4282 			 cat >conftest.$ac_ext <<_ACEOF
4283-#line 9693 "configure"
4284+#line 9699 "configure"
4285 #include "confdefs.h"
4286 #include <sys/types.h>
4287 int
4288@@ -9705,16 +9711,16 @@
4289 }
4290 _ACEOF
4291 rm -f conftest.$ac_objext
4292-if { (eval echo "$as_me:9708: \"$ac_compile\"") >&5
4293+if { (eval echo "$as_me:9714: \"$ac_compile\"") >&5
4294   (eval $ac_compile) 2>&5
4295   ac_status=$?
4296-  echo "$as_me:9711: \$? = $ac_status" >&5
4297+  echo "$as_me:9717: \$? = $ac_status" >&5
4298   (exit $ac_status); } &&
4299          { ac_try='test -s conftest.$ac_objext'
4300-  { (eval echo "$as_me:9714: \"$ac_try\"") >&5
4301+  { (eval echo "$as_me:9720: \"$ac_try\"") >&5
4302   (eval $ac_try) 2>&5
4303   ac_status=$?
4304-  echo "$as_me:9717: \$? = $ac_status" >&5
4305+  echo "$as_me:9723: \$? = $ac_status" >&5
4306   (exit $ac_status); }; }; then
4307   cf_cv_gnu_source=no
4308 else
4309@@ -9729,12 +9735,12 @@
4310 rm -f conftest.$ac_objext conftest.$ac_ext
4311
4312 fi
4313-echo "$as_me:9732: result: $cf_cv_gnu_source" >&5
4314+echo "$as_me:9738: result: $cf_cv_gnu_source" >&5
4315 echo "${ECHO_T}$cf_cv_gnu_source" >&6
4316
4317 		if test "$cf_cv_gnu_source" = yes
4318 		then
4319-		echo "$as_me:9737: checking if we should also define _DEFAULT_SOURCE" >&5
4320+		echo "$as_me:9743: checking if we should also define _DEFAULT_SOURCE" >&5
4321 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
4322 if test "${cf_cv_default_source+set}" = set; then
4323   echo $ECHO_N "(cached) $ECHO_C" >&6
4324@@ -9744,7 +9750,7 @@
4325 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
4326
4327 			cat >conftest.$ac_ext <<_ACEOF
4328-#line 9747 "configure"
4329+#line 9753 "configure"
4330 #include "confdefs.h"
4331 #include <sys/types.h>
4332 int
4333@@ -9759,16 +9765,16 @@
4334 }
4335 _ACEOF
4336 rm -f conftest.$ac_objext
4337-if { (eval echo "$as_me:9762: \"$ac_compile\"") >&5
4338+if { (eval echo "$as_me:9768: \"$ac_compile\"") >&5
4339   (eval $ac_compile) 2>&5
4340   ac_status=$?
4341-  echo "$as_me:9765: \$? = $ac_status" >&5
4342+  echo "$as_me:9771: \$? = $ac_status" >&5
4343   (exit $ac_status); } &&
4344          { ac_try='test -s conftest.$ac_objext'
4345-  { (eval echo "$as_me:9768: \"$ac_try\"") >&5
4346+  { (eval echo "$as_me:9774: \"$ac_try\"") >&5
4347   (eval $ac_try) 2>&5
4348   ac_status=$?
4349-  echo "$as_me:9771: \$? = $ac_status" >&5
4350+  echo "$as_me:9777: \$? = $ac_status" >&5
4351   (exit $ac_status); }; }; then
4352   cf_cv_default_source=no
4353 else
4354@@ -9779,7 +9785,7 @@
4355 rm -f conftest.$ac_objext conftest.$ac_ext
4356
4357 fi
4358-echo "$as_me:9782: result: $cf_cv_default_source" >&5
4359+echo "$as_me:9788: result: $cf_cv_default_source" >&5
4360 echo "${ECHO_T}$cf_cv_default_source" >&6
4361 			if test "$cf_cv_default_source" = yes
4362 			then
4363@@ -9816,16 +9822,16 @@
4364 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
4365 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
4366
4367-echo "$as_me:9819: checking if we should define _POSIX_C_SOURCE" >&5
4368+echo "$as_me:9825: checking if we should define _POSIX_C_SOURCE" >&5
4369 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
4370 if test "${cf_cv_posix_c_source+set}" = set; then
4371   echo $ECHO_N "(cached) $ECHO_C" >&6
4372 else
4373
4374-echo "${as_me:-configure}:9825: testing if the symbol is already defined go no further ..." 1>&5
4375+echo "${as_me:-configure}:9831: testing if the symbol is already defined go no further ..." 1>&5
4376
4377 	cat >conftest.$ac_ext <<_ACEOF
4378-#line 9828 "configure"
4379+#line 9834 "configure"
4380 #include "confdefs.h"
4381 #include <sys/types.h>
4382 int
4383@@ -9840,16 +9846,16 @@
4384 }
4385 _ACEOF
4386 rm -f conftest.$ac_objext
4387-if { (eval echo "$as_me:9843: \"$ac_compile\"") >&5
4388+if { (eval echo "$as_me:9849: \"$ac_compile\"") >&5
4389   (eval $ac_compile) 2>&5
4390   ac_status=$?
4391-  echo "$as_me:9846: \$? = $ac_status" >&5
4392+  echo "$as_me:9852: \$? = $ac_status" >&5
4393   (exit $ac_status); } &&
4394          { ac_try='test -s conftest.$ac_objext'
4395-  { (eval echo "$as_me:9849: \"$ac_try\"") >&5
4396+  { (eval echo "$as_me:9855: \"$ac_try\"") >&5
4397   (eval $ac_try) 2>&5
4398   ac_status=$?
4399-  echo "$as_me:9852: \$? = $ac_status" >&5
4400+  echo "$as_me:9858: \$? = $ac_status" >&5
4401   (exit $ac_status); }; }; then
4402   cf_cv_posix_c_source=no
4403 else
4404@@ -9870,7 +9876,7 @@
4405 	 esac
4406 	 if test "$cf_want_posix_source" = yes ; then
4407 		cat >conftest.$ac_ext <<_ACEOF
4408-#line 9873 "configure"
4409+#line 9879 "configure"
4410 #include "confdefs.h"
4411 #include <sys/types.h>
4412 int
4413@@ -9885,16 +9891,16 @@
4414 }
4415 _ACEOF
4416 rm -f conftest.$ac_objext
4417-if { (eval echo "$as_me:9888: \"$ac_compile\"") >&5
4418+if { (eval echo "$as_me:9894: \"$ac_compile\"") >&5
4419   (eval $ac_compile) 2>&5
4420   ac_status=$?
4421-  echo "$as_me:9891: \$? = $ac_status" >&5
4422+  echo "$as_me:9897: \$? = $ac_status" >&5
4423   (exit $ac_status); } &&
4424          { ac_try='test -s conftest.$ac_objext'
4425-  { (eval echo "$as_me:9894: \"$ac_try\"") >&5
4426+  { (eval echo "$as_me:9900: \"$ac_try\"") >&5
4427   (eval $ac_try) 2>&5
4428   ac_status=$?
4429-  echo "$as_me:9897: \$? = $ac_status" >&5
4430+  echo "$as_me:9903: \$? = $ac_status" >&5
4431   (exit $ac_status); }; }; then
4432   :
4433 else
4434@@ -9905,7 +9911,7 @@
4435 rm -f conftest.$ac_objext conftest.$ac_ext
4436 	 fi
4437
4438-echo "${as_me:-configure}:9908: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
4439+echo "${as_me:-configure}:9914: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
4440
4441 	 CFLAGS="$cf_trim_CFLAGS"
4442 	 CPPFLAGS="$cf_trim_CPPFLAGS"
4443@@ -9913,10 +9919,10 @@
4444 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
4445 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
4446
4447-echo "${as_me:-configure}:9916: testing if the second compile does not leave our definition intact error ..." 1>&5
4448+echo "${as_me:-configure}:9922: testing if the second compile does not leave our definition intact error ..." 1>&5
4449
4450 	 cat >conftest.$ac_ext <<_ACEOF
4451-#line 9919 "configure"
4452+#line 9925 "configure"
4453 #include "confdefs.h"
4454 #include <sys/types.h>
4455 int
4456@@ -9931,16 +9937,16 @@
4457 }
4458 _ACEOF
4459 rm -f conftest.$ac_objext
4460-if { (eval echo "$as_me:9934: \"$ac_compile\"") >&5
4461+if { (eval echo "$as_me:9940: \"$ac_compile\"") >&5
4462   (eval $ac_compile) 2>&5
4463   ac_status=$?
4464-  echo "$as_me:9937: \$? = $ac_status" >&5
4465+  echo "$as_me:9943: \$? = $ac_status" >&5
4466   (exit $ac_status); } &&
4467          { ac_try='test -s conftest.$ac_objext'
4468-  { (eval echo "$as_me:9940: \"$ac_try\"") >&5
4469+  { (eval echo "$as_me:9946: \"$ac_try\"") >&5
4470   (eval $ac_try) 2>&5
4471   ac_status=$?
4472-  echo "$as_me:9943: \$? = $ac_status" >&5
4473+  echo "$as_me:9949: \$? = $ac_status" >&5
4474   (exit $ac_status); }; }; then
4475   :
4476 else
4477@@ -9956,7 +9962,7 @@
4478 rm -f conftest.$ac_objext conftest.$ac_ext
4479
4480 fi
4481-echo "$as_me:9959: result: $cf_cv_posix_c_source" >&5
4482+echo "$as_me:9965: result: $cf_cv_posix_c_source" >&5
4483 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
4484
4485 if test "$cf_cv_posix_c_source" != no ; then
4486@@ -10096,14 +10102,14 @@
4487 	;;
4488 (*)
4489
4490-echo "$as_me:10099: checking if we should define _XOPEN_SOURCE" >&5
4491+echo "$as_me:10105: checking if we should define _XOPEN_SOURCE" >&5
4492 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
4493 if test "${cf_cv_xopen_source+set}" = set; then
4494   echo $ECHO_N "(cached) $ECHO_C" >&6
4495 else
4496
4497 	cat >conftest.$ac_ext <<_ACEOF
4498-#line 10106 "configure"
4499+#line 10112 "configure"
4500 #include "confdefs.h"
4501
4502 #include <stdlib.h>
4503@@ -10122,16 +10128,16 @@
4504 }
4505 _ACEOF
4506 rm -f conftest.$ac_objext
4507-if { (eval echo "$as_me:10125: \"$ac_compile\"") >&5
4508+if { (eval echo "$as_me:10131: \"$ac_compile\"") >&5
4509   (eval $ac_compile) 2>&5
4510   ac_status=$?
4511-  echo "$as_me:10128: \$? = $ac_status" >&5
4512+  echo "$as_me:10134: \$? = $ac_status" >&5
4513   (exit $ac_status); } &&
4514          { ac_try='test -s conftest.$ac_objext'
4515-  { (eval echo "$as_me:10131: \"$ac_try\"") >&5
4516+  { (eval echo "$as_me:10137: \"$ac_try\"") >&5
4517   (eval $ac_try) 2>&5
4518   ac_status=$?
4519-  echo "$as_me:10134: \$? = $ac_status" >&5
4520+  echo "$as_me:10140: \$? = $ac_status" >&5
4521   (exit $ac_status); }; }; then
4522   cf_cv_xopen_source=no
4523 else
4524@@ -10143,7 +10149,7 @@
4525 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
4526
4527 	 cat >conftest.$ac_ext <<_ACEOF
4528-#line 10146 "configure"
4529+#line 10152 "configure"
4530 #include "confdefs.h"
4531
4532 #include <stdlib.h>
4533@@ -10162,16 +10168,16 @@
4534 }
4535 _ACEOF
4536 rm -f conftest.$ac_objext
4537-if { (eval echo "$as_me:10165: \"$ac_compile\"") >&5
4538+if { (eval echo "$as_me:10171: \"$ac_compile\"") >&5
4539   (eval $ac_compile) 2>&5
4540   ac_status=$?
4541-  echo "$as_me:10168: \$? = $ac_status" >&5
4542+  echo "$as_me:10174: \$? = $ac_status" >&5
4543   (exit $ac_status); } &&
4544          { ac_try='test -s conftest.$ac_objext'
4545-  { (eval echo "$as_me:10171: \"$ac_try\"") >&5
4546+  { (eval echo "$as_me:10177: \"$ac_try\"") >&5
4547   (eval $ac_try) 2>&5
4548   ac_status=$?
4549-  echo "$as_me:10174: \$? = $ac_status" >&5
4550+  echo "$as_me:10180: \$? = $ac_status" >&5
4551   (exit $ac_status); }; }; then
4552   cf_cv_xopen_source=no
4553 else
4554@@ -10186,7 +10192,7 @@
4555 rm -f conftest.$ac_objext conftest.$ac_ext
4556
4557 fi
4558-echo "$as_me:10189: result: $cf_cv_xopen_source" >&5
4559+echo "$as_me:10195: result: $cf_cv_xopen_source" >&5
4560 echo "${ECHO_T}$cf_cv_xopen_source" >&6
4561
4562 if test "$cf_cv_xopen_source" != no ; then
4563@@ -10316,16 +10322,16 @@
4564 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
4565 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
4566
4567-echo "$as_me:10319: checking if we should define _POSIX_C_SOURCE" >&5
4568+echo "$as_me:10325: checking if we should define _POSIX_C_SOURCE" >&5
4569 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
4570 if test "${cf_cv_posix_c_source+set}" = set; then
4571   echo $ECHO_N "(cached) $ECHO_C" >&6
4572 else
4573
4574-echo "${as_me:-configure}:10325: testing if the symbol is already defined go no further ..." 1>&5
4575+echo "${as_me:-configure}:10331: testing if the symbol is already defined go no further ..." 1>&5
4576
4577 	cat >conftest.$ac_ext <<_ACEOF
4578-#line 10328 "configure"
4579+#line 10334 "configure"
4580 #include "confdefs.h"
4581 #include <sys/types.h>
4582 int
4583@@ -10340,16 +10346,16 @@
4584 }
4585 _ACEOF
4586 rm -f conftest.$ac_objext
4587-if { (eval echo "$as_me:10343: \"$ac_compile\"") >&5
4588+if { (eval echo "$as_me:10349: \"$ac_compile\"") >&5
4589   (eval $ac_compile) 2>&5
4590   ac_status=$?
4591-  echo "$as_me:10346: \$? = $ac_status" >&5
4592+  echo "$as_me:10352: \$? = $ac_status" >&5
4593   (exit $ac_status); } &&
4594          { ac_try='test -s conftest.$ac_objext'
4595-  { (eval echo "$as_me:10349: \"$ac_try\"") >&5
4596+  { (eval echo "$as_me:10355: \"$ac_try\"") >&5
4597   (eval $ac_try) 2>&5
4598   ac_status=$?
4599-  echo "$as_me:10352: \$? = $ac_status" >&5
4600+  echo "$as_me:10358: \$? = $ac_status" >&5
4601   (exit $ac_status); }; }; then
4602   cf_cv_posix_c_source=no
4603 else
4604@@ -10370,7 +10376,7 @@
4605 	 esac
4606 	 if test "$cf_want_posix_source" = yes ; then
4607 		cat >conftest.$ac_ext <<_ACEOF
4608-#line 10373 "configure"
4609+#line 10379 "configure"
4610 #include "confdefs.h"
4611 #include <sys/types.h>
4612 int
4613@@ -10385,16 +10391,16 @@
4614 }
4615 _ACEOF
4616 rm -f conftest.$ac_objext
4617-if { (eval echo "$as_me:10388: \"$ac_compile\"") >&5
4618+if { (eval echo "$as_me:10394: \"$ac_compile\"") >&5
4619   (eval $ac_compile) 2>&5
4620   ac_status=$?
4621-  echo "$as_me:10391: \$? = $ac_status" >&5
4622+  echo "$as_me:10397: \$? = $ac_status" >&5
4623   (exit $ac_status); } &&
4624          { ac_try='test -s conftest.$ac_objext'
4625-  { (eval echo "$as_me:10394: \"$ac_try\"") >&5
4626+  { (eval echo "$as_me:10400: \"$ac_try\"") >&5
4627   (eval $ac_try) 2>&5
4628   ac_status=$?
4629-  echo "$as_me:10397: \$? = $ac_status" >&5
4630+  echo "$as_me:10403: \$? = $ac_status" >&5
4631   (exit $ac_status); }; }; then
4632   :
4633 else
4634@@ -10405,7 +10411,7 @@
4635 rm -f conftest.$ac_objext conftest.$ac_ext
4636 	 fi
4637
4638-echo "${as_me:-configure}:10408: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
4639+echo "${as_me:-configure}:10414: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
4640
4641 	 CFLAGS="$cf_trim_CFLAGS"
4642 	 CPPFLAGS="$cf_trim_CPPFLAGS"
4643@@ -10413,10 +10419,10 @@
4644 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
4645 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
4646
4647-echo "${as_me:-configure}:10416: testing if the second compile does not leave our definition intact error ..." 1>&5
4648+echo "${as_me:-configure}:10422: testing if the second compile does not leave our definition intact error ..." 1>&5
4649
4650 	 cat >conftest.$ac_ext <<_ACEOF
4651-#line 10419 "configure"
4652+#line 10425 "configure"
4653 #include "confdefs.h"
4654 #include <sys/types.h>
4655 int
4656@@ -10431,16 +10437,16 @@
4657 }
4658 _ACEOF
4659 rm -f conftest.$ac_objext
4660-if { (eval echo "$as_me:10434: \"$ac_compile\"") >&5
4661+if { (eval echo "$as_me:10440: \"$ac_compile\"") >&5
4662   (eval $ac_compile) 2>&5
4663   ac_status=$?
4664-  echo "$as_me:10437: \$? = $ac_status" >&5
4665+  echo "$as_me:10443: \$? = $ac_status" >&5
4666   (exit $ac_status); } &&
4667          { ac_try='test -s conftest.$ac_objext'
4668-  { (eval echo "$as_me:10440: \"$ac_try\"") >&5
4669+  { (eval echo "$as_me:10446: \"$ac_try\"") >&5
4670   (eval $ac_try) 2>&5
4671   ac_status=$?
4672-  echo "$as_me:10443: \$? = $ac_status" >&5
4673+  echo "$as_me:10449: \$? = $ac_status" >&5
4674   (exit $ac_status); }; }; then
4675   :
4676 else
4677@@ -10456,7 +10462,7 @@
4678 rm -f conftest.$ac_objext conftest.$ac_ext
4679
4680 fi
4681-echo "$as_me:10459: result: $cf_cv_posix_c_source" >&5
4682+echo "$as_me:10465: result: $cf_cv_posix_c_source" >&5
4683 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
4684
4685 if test "$cf_cv_posix_c_source" != no ; then
4686@@ -10650,7 +10656,7 @@
4687 if test -n "$cf_new_cflags" ; then
4688 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
4689
4690-echo "${as_me:-configure}:10653: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
4691+echo "${as_me:-configure}:10659: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
4692
4693 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
4694 	CFLAGS="${CFLAGS}$cf_new_cflags"
4695@@ -10660,7 +10666,7 @@
4696 if test -n "$cf_new_cppflags" ; then
4697 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
4698
4699-echo "${as_me:-configure}:10663: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
4700+echo "${as_me:-configure}:10669: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
4701
4702 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
4703 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
4704@@ -10670,7 +10676,7 @@
4705 if test -n "$cf_new_extra_cppflags" ; then
4706 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
4707
4708-echo "${as_me:-configure}:10673: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
4709+echo "${as_me:-configure}:10679: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
4710
4711 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
4712 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
4713@@ -10680,10 +10686,10 @@
4714 fi
4715
4716 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
4717-	echo "$as_me:10683: checking if _XOPEN_SOURCE really is set" >&5
4718+	echo "$as_me:10689: checking if _XOPEN_SOURCE really is set" >&5
4719 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
4720 	cat >conftest.$ac_ext <<_ACEOF
4721-#line 10686 "configure"
4722+#line 10692 "configure"
4723 #include "confdefs.h"
4724 #include <stdlib.h>
4725 int
4726@@ -10698,16 +10704,16 @@
4727 }
4728 _ACEOF
4729 rm -f conftest.$ac_objext
4730-if { (eval echo "$as_me:10701: \"$ac_compile\"") >&5
4731+if { (eval echo "$as_me:10707: \"$ac_compile\"") >&5
4732   (eval $ac_compile) 2>&5
4733   ac_status=$?
4734-  echo "$as_me:10704: \$? = $ac_status" >&5
4735+  echo "$as_me:10710: \$? = $ac_status" >&5
4736   (exit $ac_status); } &&
4737          { ac_try='test -s conftest.$ac_objext'
4738-  { (eval echo "$as_me:10707: \"$ac_try\"") >&5
4739+  { (eval echo "$as_me:10713: \"$ac_try\"") >&5
4740   (eval $ac_try) 2>&5
4741   ac_status=$?
4742-  echo "$as_me:10710: \$? = $ac_status" >&5
4743+  echo "$as_me:10716: \$? = $ac_status" >&5
4744   (exit $ac_status); }; }; then
4745   cf_XOPEN_SOURCE_set=yes
4746 else
4747@@ -10716,12 +10722,12 @@
4748 cf_XOPEN_SOURCE_set=no
4749 fi
4750 rm -f conftest.$ac_objext conftest.$ac_ext
4751-	echo "$as_me:10719: result: $cf_XOPEN_SOURCE_set" >&5
4752+	echo "$as_me:10725: result: $cf_XOPEN_SOURCE_set" >&5
4753 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
4754 	if test $cf_XOPEN_SOURCE_set = yes
4755 	then
4756 		cat >conftest.$ac_ext <<_ACEOF
4757-#line 10724 "configure"
4758+#line 10730 "configure"
4759 #include "confdefs.h"
4760 #include <stdlib.h>
4761 int
4762@@ -10736,16 +10742,16 @@
4763 }
4764 _ACEOF
4765 rm -f conftest.$ac_objext
4766-if { (eval echo "$as_me:10739: \"$ac_compile\"") >&5
4767+if { (eval echo "$as_me:10745: \"$ac_compile\"") >&5
4768   (eval $ac_compile) 2>&5
4769   ac_status=$?
4770-  echo "$as_me:10742: \$? = $ac_status" >&5
4771+  echo "$as_me:10748: \$? = $ac_status" >&5
4772   (exit $ac_status); } &&
4773          { ac_try='test -s conftest.$ac_objext'
4774-  { (eval echo "$as_me:10745: \"$ac_try\"") >&5
4775+  { (eval echo "$as_me:10751: \"$ac_try\"") >&5
4776   (eval $ac_try) 2>&5
4777   ac_status=$?
4778-  echo "$as_me:10748: \$? = $ac_status" >&5
4779+  echo "$as_me:10754: \$? = $ac_status" >&5
4780   (exit $ac_status); }; }; then
4781   cf_XOPEN_SOURCE_set_ok=yes
4782 else
4783@@ -10756,19 +10762,19 @@
4784 rm -f conftest.$ac_objext conftest.$ac_ext
4785 		if test $cf_XOPEN_SOURCE_set_ok = no
4786 		then
4787-			{ echo "$as_me:10759: WARNING: _XOPEN_SOURCE is lower than requested" >&5
4788+			{ echo "$as_me:10765: WARNING: _XOPEN_SOURCE is lower than requested" >&5
4789 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
4790 		fi
4791 	else
4792
4793-echo "$as_me:10764: checking if we should define _XOPEN_SOURCE" >&5
4794+echo "$as_me:10770: checking if we should define _XOPEN_SOURCE" >&5
4795 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
4796 if test "${cf_cv_xopen_source+set}" = set; then
4797   echo $ECHO_N "(cached) $ECHO_C" >&6
4798 else
4799
4800 	cat >conftest.$ac_ext <<_ACEOF
4801-#line 10771 "configure"
4802+#line 10777 "configure"
4803 #include "confdefs.h"
4804
4805 #include <stdlib.h>
4806@@ -10787,16 +10793,16 @@
4807 }
4808 _ACEOF
4809 rm -f conftest.$ac_objext
4810-if { (eval echo "$as_me:10790: \"$ac_compile\"") >&5
4811+if { (eval echo "$as_me:10796: \"$ac_compile\"") >&5
4812   (eval $ac_compile) 2>&5
4813   ac_status=$?
4814-  echo "$as_me:10793: \$? = $ac_status" >&5
4815+  echo "$as_me:10799: \$? = $ac_status" >&5
4816   (exit $ac_status); } &&
4817          { ac_try='test -s conftest.$ac_objext'
4818-  { (eval echo "$as_me:10796: \"$ac_try\"") >&5
4819+  { (eval echo "$as_me:10802: \"$ac_try\"") >&5
4820   (eval $ac_try) 2>&5
4821   ac_status=$?
4822-  echo "$as_me:10799: \$? = $ac_status" >&5
4823+  echo "$as_me:10805: \$? = $ac_status" >&5
4824   (exit $ac_status); }; }; then
4825   cf_cv_xopen_source=no
4826 else
4827@@ -10808,7 +10814,7 @@
4828 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
4829
4830 	 cat >conftest.$ac_ext <<_ACEOF
4831-#line 10811 "configure"
4832+#line 10817 "configure"
4833 #include "confdefs.h"
4834
4835 #include <stdlib.h>
4836@@ -10827,16 +10833,16 @@
4837 }
4838 _ACEOF
4839 rm -f conftest.$ac_objext
4840-if { (eval echo "$as_me:10830: \"$ac_compile\"") >&5
4841+if { (eval echo "$as_me:10836: \"$ac_compile\"") >&5
4842   (eval $ac_compile) 2>&5
4843   ac_status=$?
4844-  echo "$as_me:10833: \$? = $ac_status" >&5
4845+  echo "$as_me:10839: \$? = $ac_status" >&5
4846   (exit $ac_status); } &&
4847          { ac_try='test -s conftest.$ac_objext'
4848-  { (eval echo "$as_me:10836: \"$ac_try\"") >&5
4849+  { (eval echo "$as_me:10842: \"$ac_try\"") >&5
4850   (eval $ac_try) 2>&5
4851   ac_status=$?
4852-  echo "$as_me:10839: \$? = $ac_status" >&5
4853+  echo "$as_me:10845: \$? = $ac_status" >&5
4854   (exit $ac_status); }; }; then
4855   cf_cv_xopen_source=no
4856 else
4857@@ -10851,7 +10857,7 @@
4858 rm -f conftest.$ac_objext conftest.$ac_ext
4859
4860 fi
4861-echo "$as_me:10854: result: $cf_cv_xopen_source" >&5
4862+echo "$as_me:10860: result: $cf_cv_xopen_source" >&5
4863 echo "${ECHO_T}$cf_cv_xopen_source" >&6
4864
4865 if test "$cf_cv_xopen_source" != no ; then
4866@@ -10974,14 +10980,14 @@
4867
4868 # Work around breakage on OS X
4869
4870-echo "$as_me:10977: checking if SIGWINCH is defined" >&5
4871+echo "$as_me:10983: checking if SIGWINCH is defined" >&5
4872 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
4873 if test "${cf_cv_define_sigwinch+set}" = set; then
4874   echo $ECHO_N "(cached) $ECHO_C" >&6
4875 else
4876
4877 	cat >conftest.$ac_ext <<_ACEOF
4878-#line 10984 "configure"
4879+#line 10990 "configure"
4880 #include "confdefs.h"
4881
4882 #include <sys/types.h>
4883@@ -10996,23 +11002,23 @@
4884 }
4885 _ACEOF
4886 rm -f conftest.$ac_objext
4887-if { (eval echo "$as_me:10999: \"$ac_compile\"") >&5
4888+if { (eval echo "$as_me:11005: \"$ac_compile\"") >&5
4889   (eval $ac_compile) 2>&5
4890   ac_status=$?
4891-  echo "$as_me:11002: \$? = $ac_status" >&5
4892+  echo "$as_me:11008: \$? = $ac_status" >&5
4893   (exit $ac_status); } &&
4894          { ac_try='test -s conftest.$ac_objext'
4895-  { (eval echo "$as_me:11005: \"$ac_try\"") >&5
4896+  { (eval echo "$as_me:11011: \"$ac_try\"") >&5
4897   (eval $ac_try) 2>&5
4898   ac_status=$?
4899-  echo "$as_me:11008: \$? = $ac_status" >&5
4900+  echo "$as_me:11014: \$? = $ac_status" >&5
4901   (exit $ac_status); }; }; then
4902   cf_cv_define_sigwinch=yes
4903 else
4904   echo "$as_me: failed program was:" >&5
4905 cat conftest.$ac_ext >&5
4906 cat >conftest.$ac_ext <<_ACEOF
4907-#line 11015 "configure"
4908+#line 11021 "configure"
4909 #include "confdefs.h"
4910
4911 #undef _XOPEN_SOURCE
4912@@ -11030,16 +11036,16 @@
4913 }
4914 _ACEOF
4915 rm -f conftest.$ac_objext
4916-if { (eval echo "$as_me:11033: \"$ac_compile\"") >&5
4917+if { (eval echo "$as_me:11039: \"$ac_compile\"") >&5
4918   (eval $ac_compile) 2>&5
4919   ac_status=$?
4920-  echo "$as_me:11036: \$? = $ac_status" >&5
4921+  echo "$as_me:11042: \$? = $ac_status" >&5
4922   (exit $ac_status); } &&
4923          { ac_try='test -s conftest.$ac_objext'
4924-  { (eval echo "$as_me:11039: \"$ac_try\"") >&5
4925+  { (eval echo "$as_me:11045: \"$ac_try\"") >&5
4926   (eval $ac_try) 2>&5
4927   ac_status=$?
4928-  echo "$as_me:11042: \$? = $ac_status" >&5
4929+  echo "$as_me:11048: \$? = $ac_status" >&5
4930   (exit $ac_status); }; }; then
4931   cf_cv_define_sigwinch=maybe
4932 else
4933@@ -11053,11 +11059,11 @@
4934 rm -f conftest.$ac_objext conftest.$ac_ext
4935
4936 fi
4937-echo "$as_me:11056: result: $cf_cv_define_sigwinch" >&5
4938+echo "$as_me:11062: result: $cf_cv_define_sigwinch" >&5
4939 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
4940
4941 if test "$cf_cv_define_sigwinch" = maybe ; then
4942-echo "$as_me:11060: checking for actual SIGWINCH definition" >&5
4943+echo "$as_me:11066: checking for actual SIGWINCH definition" >&5
4944 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
4945 if test "${cf_cv_fixup_sigwinch+set}" = set; then
4946   echo $ECHO_N "(cached) $ECHO_C" >&6
4947@@ -11068,7 +11074,7 @@
4948 while test $cf_sigwinch != 1
4949 do
4950 	cat >conftest.$ac_ext <<_ACEOF
4951-#line 11071 "configure"
4952+#line 11077 "configure"
4953 #include "confdefs.h"
4954
4955 #undef _XOPEN_SOURCE
4956@@ -11090,16 +11096,16 @@
4957 }
4958 _ACEOF
4959 rm -f conftest.$ac_objext
4960-if { (eval echo "$as_me:11093: \"$ac_compile\"") >&5
4961+if { (eval echo "$as_me:11099: \"$ac_compile\"") >&5
4962   (eval $ac_compile) 2>&5
4963   ac_status=$?
4964-  echo "$as_me:11096: \$? = $ac_status" >&5
4965+  echo "$as_me:11102: \$? = $ac_status" >&5
4966   (exit $ac_status); } &&
4967          { ac_try='test -s conftest.$ac_objext'
4968-  { (eval echo "$as_me:11099: \"$ac_try\"") >&5
4969+  { (eval echo "$as_me:11105: \"$ac_try\"") >&5
4970   (eval $ac_try) 2>&5
4971   ac_status=$?
4972-  echo "$as_me:11102: \$? = $ac_status" >&5
4973+  echo "$as_me:11108: \$? = $ac_status" >&5
4974   (exit $ac_status); }; }; then
4975   cf_cv_fixup_sigwinch=$cf_sigwinch
4976 	 break
4977@@ -11113,7 +11119,7 @@
4978 done
4979
4980 fi
4981-echo "$as_me:11116: result: $cf_cv_fixup_sigwinch" >&5
4982+echo "$as_me:11122: result: $cf_cv_fixup_sigwinch" >&5
4983 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
4984
4985 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
4986@@ -11123,13 +11129,13 @@
4987
4988 # Checks for CODESET support.
4989
4990-echo "$as_me:11126: checking for nl_langinfo and CODESET" >&5
4991+echo "$as_me:11132: checking for nl_langinfo and CODESET" >&5
4992 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
4993 if test "${am_cv_langinfo_codeset+set}" = set; then
4994   echo $ECHO_N "(cached) $ECHO_C" >&6
4995 else
4996   cat >conftest.$ac_ext <<_ACEOF
4997-#line 11132 "configure"
4998+#line 11138 "configure"
4999 #include "confdefs.h"
5000 #include <langinfo.h>
5001 int
5002@@ -11141,16 +11147,16 @@
5003 }
5004 _ACEOF
5005 rm -f conftest.$ac_objext conftest$ac_exeext
5006-if { (eval echo "$as_me:11144: \"$ac_link\"") >&5
5007+if { (eval echo "$as_me:11150: \"$ac_link\"") >&5
5008   (eval $ac_link) 2>&5
5009   ac_status=$?
5010-  echo "$as_me:11147: \$? = $ac_status" >&5
5011+  echo "$as_me:11153: \$? = $ac_status" >&5
5012   (exit $ac_status); } &&
5013          { ac_try='test -s conftest$ac_exeext'
5014-  { (eval echo "$as_me:11150: \"$ac_try\"") >&5
5015+  { (eval echo "$as_me:11156: \"$ac_try\"") >&5
5016   (eval $ac_try) 2>&5
5017   ac_status=$?
5018-  echo "$as_me:11153: \$? = $ac_status" >&5
5019+  echo "$as_me:11159: \$? = $ac_status" >&5
5020   (exit $ac_status); }; }; then
5021   am_cv_langinfo_codeset=yes
5022 else
5023@@ -11161,7 +11167,7 @@
5024 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5025
5026 fi
5027-echo "$as_me:11164: result: $am_cv_langinfo_codeset" >&5
5028+echo "$as_me:11170: result: $am_cv_langinfo_codeset" >&5
5029 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
5030 	if test $am_cv_langinfo_codeset = yes; then
5031
5032@@ -11175,7 +11181,7 @@
5033 NCURSES_OK_WCHAR_T=
5034 NCURSES_OK_WINT_T=
5035
5036-echo "$as_me:11178: checking if you want wide-character code" >&5
5037+echo "$as_me:11184: checking if you want wide-character code" >&5
5038 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
5039
5040 # Check whether --enable-widec or --disable-widec was given.
5041@@ -11185,7 +11191,7 @@
5042 else
5043   with_widec=no
5044 fi;
5045-echo "$as_me:11188: result: $with_widec" >&5
5046+echo "$as_me:11194: result: $with_widec" >&5
5047 echo "${ECHO_T}$with_widec" >&6
5048
5049 NCURSES_WCWIDTH_GRAPHICS=1
5050@@ -11209,23 +11215,23 @@
5051
5052 do
5053 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
5054-echo "$as_me:11212: checking for $ac_header" >&5
5055+echo "$as_me:11218: checking for $ac_header" >&5
5056 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
5057 if eval "test \"\${$as_ac_Header+set}\" = set"; then
5058   echo $ECHO_N "(cached) $ECHO_C" >&6
5059 else
5060   cat >conftest.$ac_ext <<_ACEOF
5061-#line 11218 "configure"
5062+#line 11224 "configure"
5063 #include "confdefs.h"
5064 #include <$ac_header>
5065 _ACEOF
5066-if { (eval echo "$as_me:11222: \"$ac_cpp conftest.$ac_ext\"") >&5
5067+if { (eval echo "$as_me:11228: \"$ac_cpp conftest.$ac_ext\"") >&5
5068   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
5069   ac_status=$?
5070   egrep -v '^ *\+' conftest.er1 >conftest.err
5071   rm -f conftest.er1
5072   cat conftest.err >&5
5073-  echo "$as_me:11228: \$? = $ac_status" >&5
5074+  echo "$as_me:11234: \$? = $ac_status" >&5
5075   (exit $ac_status); } >/dev/null; then
5076   if test -s conftest.err; then
5077     ac_cpp_err=$ac_c_preproc_warn_flag
5078@@ -11244,7 +11250,7 @@
5079 fi
5080 rm -f conftest.err conftest.$ac_ext
5081 fi
5082-echo "$as_me:11247: result: `eval echo '${'$as_ac_Header'}'`" >&5
5083+echo "$as_me:11253: result: `eval echo '${'$as_ac_Header'}'`" >&5
5084 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
5085 if test `eval echo '${'$as_ac_Header'}'` = yes; then
5086   cat >>confdefs.h <<EOF
5087@@ -11254,14 +11260,14 @@
5088 fi
5089 done
5090
5091-echo "$as_me:11257: checking if wchar.h can be used as is" >&5
5092+echo "$as_me:11263: checking if wchar.h can be used as is" >&5
5093 echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
5094 if test "${cf_cv_wchar_h_okay+set}" = set; then
5095   echo $ECHO_N "(cached) $ECHO_C" >&6
5096 else
5097
5098 cat >conftest.$ac_ext <<_ACEOF
5099-#line 11264 "configure"
5100+#line 11270 "configure"
5101 #include "confdefs.h"
5102
5103 #include <stdlib.h>
5104@@ -11283,16 +11289,16 @@
5105 }
5106 _ACEOF
5107 rm -f conftest.$ac_objext
5108-if { (eval echo "$as_me:11286: \"$ac_compile\"") >&5
5109+if { (eval echo "$as_me:11292: \"$ac_compile\"") >&5
5110   (eval $ac_compile) 2>&5
5111   ac_status=$?
5112-  echo "$as_me:11289: \$? = $ac_status" >&5
5113+  echo "$as_me:11295: \$? = $ac_status" >&5
5114   (exit $ac_status); } &&
5115          { ac_try='test -s conftest.$ac_objext'
5116-  { (eval echo "$as_me:11292: \"$ac_try\"") >&5
5117+  { (eval echo "$as_me:11298: \"$ac_try\"") >&5
5118   (eval $ac_try) 2>&5
5119   ac_status=$?
5120-  echo "$as_me:11295: \$? = $ac_status" >&5
5121+  echo "$as_me:11301: \$? = $ac_status" >&5
5122   (exit $ac_status); }; }; then
5123   cf_cv_wchar_h_okay=yes
5124 else
5125@@ -11302,16 +11308,16 @@
5126 fi
5127 rm -f conftest.$ac_objext conftest.$ac_ext
5128 fi
5129-echo "$as_me:11305: result: $cf_cv_wchar_h_okay" >&5
5130+echo "$as_me:11311: result: $cf_cv_wchar_h_okay" >&5
5131 echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
5132
5133 if test $cf_cv_wchar_h_okay = no
5134 then
5135
5136-echo "$as_me:11311: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
5137+echo "$as_me:11317: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
5138 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
5139 cat >conftest.$ac_ext <<_ACEOF
5140-#line 11314 "configure"
5141+#line 11320 "configure"
5142 #include "confdefs.h"
5143 #include <sys/types.h>
5144
5145@@ -11327,16 +11333,16 @@
5146 }
5147 _ACEOF
5148 rm -f conftest.$ac_objext
5149-if { (eval echo "$as_me:11330: \"$ac_compile\"") >&5
5150+if { (eval echo "$as_me:11336: \"$ac_compile\"") >&5
5151   (eval $ac_compile) 2>&5
5152   ac_status=$?
5153-  echo "$as_me:11333: \$? = $ac_status" >&5
5154+  echo "$as_me:11339: \$? = $ac_status" >&5
5155   (exit $ac_status); } &&
5156          { ac_try='test -s conftest.$ac_objext'
5157-  { (eval echo "$as_me:11336: \"$ac_try\"") >&5
5158+  { (eval echo "$as_me:11342: \"$ac_try\"") >&5
5159   (eval $ac_try) 2>&5
5160   ac_status=$?
5161-  echo "$as_me:11339: \$? = $ac_status" >&5
5162+  echo "$as_me:11345: \$? = $ac_status" >&5
5163   (exit $ac_status); }; }; then
5164   cf_result=no
5165 else
5166@@ -11345,16 +11351,16 @@
5167 cf_result=yes
5168 fi
5169 rm -f conftest.$ac_objext conftest.$ac_ext
5170-echo "$as_me:11348: result: $cf_result" >&5
5171+echo "$as_me:11354: result: $cf_result" >&5
5172 echo "${ECHO_T}$cf_result" >&6
5173
5174 if test "$cf_result" = yes ; then
5175 	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
5176 elif test "x" != "x" ; then
5177-	echo "$as_me:11354: checking checking for compatible value versus " >&5
5178+	echo "$as_me:11360: checking checking for compatible value versus " >&5
5179 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
5180 	cat >conftest.$ac_ext <<_ACEOF
5181-#line 11357 "configure"
5182+#line 11363 "configure"
5183 #include "confdefs.h"
5184 #include <sys/types.h>
5185
5186@@ -11370,16 +11376,16 @@
5187 }
5188 _ACEOF
5189 rm -f conftest.$ac_objext
5190-if { (eval echo "$as_me:11373: \"$ac_compile\"") >&5
5191+if { (eval echo "$as_me:11379: \"$ac_compile\"") >&5
5192   (eval $ac_compile) 2>&5
5193   ac_status=$?
5194-  echo "$as_me:11376: \$? = $ac_status" >&5
5195+  echo "$as_me:11382: \$? = $ac_status" >&5
5196   (exit $ac_status); } &&
5197          { ac_try='test -s conftest.$ac_objext'
5198-  { (eval echo "$as_me:11379: \"$ac_try\"") >&5
5199+  { (eval echo "$as_me:11385: \"$ac_try\"") >&5
5200   (eval $ac_try) 2>&5
5201   ac_status=$?
5202-  echo "$as_me:11382: \$? = $ac_status" >&5
5203+  echo "$as_me:11388: \$? = $ac_status" >&5
5204   (exit $ac_status); }; }; then
5205   cf_result=yes
5206 else
5207@@ -11388,7 +11394,7 @@
5208 cf_result=no
5209 fi
5210 rm -f conftest.$ac_objext conftest.$ac_ext
5211-	echo "$as_me:11391: result: $cf_result" >&5
5212+	echo "$as_me:11397: result: $cf_result" >&5
5213 echo "${ECHO_T}$cf_result" >&6
5214 	if test "$cf_result" = no ; then
5215 		# perhaps we can override it - try...
5216@@ -11398,7 +11404,7 @@
5217
5218 fi
5219
5220-echo "$as_me:11401: checking if wcwidth agrees graphics are single-width" >&5
5221+echo "$as_me:11407: checking if wcwidth agrees graphics are single-width" >&5
5222 echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6
5223 if test "${cf_cv_wcwidth_graphics+set}" = set; then
5224   echo $ECHO_N "(cached) $ECHO_C" >&6
5225@@ -11469,7 +11475,7 @@
5226   cf_cv_wcwidth_graphics=unknown
5227 else
5228   cat >conftest.$ac_ext <<_ACEOF
5229-#line 11472 "configure"
5230+#line 11478 "configure"
5231 #include "confdefs.h"
5232
5233 #include <locale.h>
5234@@ -11513,15 +11519,15 @@
5235
5236 _ACEOF
5237 rm -f conftest$ac_exeext
5238-if { (eval echo "$as_me:11516: \"$ac_link\"") >&5
5239+if { (eval echo "$as_me:11522: \"$ac_link\"") >&5
5240   (eval $ac_link) 2>&5
5241   ac_status=$?
5242-  echo "$as_me:11519: \$? = $ac_status" >&5
5243+  echo "$as_me:11525: \$? = $ac_status" >&5
5244   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
5245-  { (eval echo "$as_me:11521: \"$ac_try\"") >&5
5246+  { (eval echo "$as_me:11527: \"$ac_try\"") >&5
5247   (eval $ac_try) 2>&5
5248   ac_status=$?
5249-  echo "$as_me:11524: \$? = $ac_status" >&5
5250+  echo "$as_me:11530: \$? = $ac_status" >&5
5251   (exit $ac_status); }; }; then
5252   cf_cv_wcwidth_graphics=yes
5253 else
5254@@ -11534,7 +11540,7 @@
5255 fi
5256
5257 fi
5258-echo "$as_me:11537: result: $cf_cv_wcwidth_graphics" >&5
5259+echo "$as_me:11543: result: $cf_cv_wcwidth_graphics" >&5
5260 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
5261
5262 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
5263@@ -11545,13 +11551,13 @@
5264 for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
5265 do
5266 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
5267-echo "$as_me:11548: checking for $ac_func" >&5
5268+echo "$as_me:11554: checking for $ac_func" >&5
5269 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
5270 if eval "test \"\${$as_ac_var+set}\" = set"; then
5271   echo $ECHO_N "(cached) $ECHO_C" >&6
5272 else
5273   cat >conftest.$ac_ext <<_ACEOF
5274-#line 11554 "configure"
5275+#line 11560 "configure"
5276 #include "confdefs.h"
5277 #define $ac_func autoconf_temporary
5278 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
5279@@ -11582,16 +11588,16 @@
5280 }
5281 _ACEOF
5282 rm -f conftest.$ac_objext conftest$ac_exeext
5283-if { (eval echo "$as_me:11585: \"$ac_link\"") >&5
5284+if { (eval echo "$as_me:11591: \"$ac_link\"") >&5
5285   (eval $ac_link) 2>&5
5286   ac_status=$?
5287-  echo "$as_me:11588: \$? = $ac_status" >&5
5288+  echo "$as_me:11594: \$? = $ac_status" >&5
5289   (exit $ac_status); } &&
5290          { ac_try='test -s conftest$ac_exeext'
5291-  { (eval echo "$as_me:11591: \"$ac_try\"") >&5
5292+  { (eval echo "$as_me:11597: \"$ac_try\"") >&5
5293   (eval $ac_try) 2>&5
5294   ac_status=$?
5295-  echo "$as_me:11594: \$? = $ac_status" >&5
5296+  echo "$as_me:11600: \$? = $ac_status" >&5
5297   (exit $ac_status); }; }; then
5298   eval "$as_ac_var=yes"
5299 else
5300@@ -11601,7 +11607,7 @@
5301 fi
5302 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5303 fi
5304-echo "$as_me:11604: result: `eval echo '${'$as_ac_var'}'`" >&5
5305+echo "$as_me:11610: result: `eval echo '${'$as_ac_var'}'`" >&5
5306 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
5307 if test `eval echo '${'$as_ac_var'}'` = yes; then
5308   cat >>confdefs.h <<EOF
5309@@ -11613,7 +11619,7 @@
5310
5311 	if test "x$ac_cv_func_putwc" != xyes ; then
5312
5313-echo "$as_me:11616: checking for multibyte character support" >&5
5314+echo "$as_me:11622: checking for multibyte character support" >&5
5315 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
5316 if test "${cf_cv_utf8_lib+set}" = set; then
5317   echo $ECHO_N "(cached) $ECHO_C" >&6
5318@@ -11621,7 +11627,7 @@
5319
5320 	cf_save_LIBS="$LIBS"
5321 	cat >conftest.$ac_ext <<_ACEOF
5322-#line 11624 "configure"
5323+#line 11630 "configure"
5324 #include "confdefs.h"
5325
5326 #include <stdlib.h>
5327@@ -11634,16 +11640,16 @@
5328 }
5329 _ACEOF
5330 rm -f conftest.$ac_objext conftest$ac_exeext
5331-if { (eval echo "$as_me:11637: \"$ac_link\"") >&5
5332+if { (eval echo "$as_me:11643: \"$ac_link\"") >&5
5333   (eval $ac_link) 2>&5
5334   ac_status=$?
5335-  echo "$as_me:11640: \$? = $ac_status" >&5
5336+  echo "$as_me:11646: \$? = $ac_status" >&5
5337   (exit $ac_status); } &&
5338          { ac_try='test -s conftest$ac_exeext'
5339-  { (eval echo "$as_me:11643: \"$ac_try\"") >&5
5340+  { (eval echo "$as_me:11649: \"$ac_try\"") >&5
5341   (eval $ac_try) 2>&5
5342   ac_status=$?
5343-  echo "$as_me:11646: \$? = $ac_status" >&5
5344+  echo "$as_me:11652: \$? = $ac_status" >&5
5345   (exit $ac_status); }; }; then
5346   cf_cv_utf8_lib=yes
5347 else
5348@@ -11655,12 +11661,12 @@
5349 cf_cv_header_path_utf8=
5350 cf_cv_library_path_utf8=
5351
5352-echo "${as_me:-configure}:11658: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
5353+echo "${as_me:-configure}:11664: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
5354
5355 cf_save_LIBS="$LIBS"
5356
5357 cat >conftest.$ac_ext <<_ACEOF
5358-#line 11663 "configure"
5359+#line 11669 "configure"
5360 #include "confdefs.h"
5361
5362 #include <libutf8.h>
5363@@ -11673,16 +11679,16 @@
5364 }
5365 _ACEOF
5366 rm -f conftest.$ac_objext conftest$ac_exeext
5367-if { (eval echo "$as_me:11676: \"$ac_link\"") >&5
5368+if { (eval echo "$as_me:11682: \"$ac_link\"") >&5
5369   (eval $ac_link) 2>&5
5370   ac_status=$?
5371-  echo "$as_me:11679: \$? = $ac_status" >&5
5372+  echo "$as_me:11685: \$? = $ac_status" >&5
5373   (exit $ac_status); } &&
5374          { ac_try='test -s conftest$ac_exeext'
5375-  { (eval echo "$as_me:11682: \"$ac_try\"") >&5
5376+  { (eval echo "$as_me:11688: \"$ac_try\"") >&5
5377   (eval $ac_try) 2>&5
5378   ac_status=$?
5379-  echo "$as_me:11685: \$? = $ac_status" >&5
5380+  echo "$as_me:11691: \$? = $ac_status" >&5
5381   (exit $ac_status); }; }; then
5382
5383 	cf_cv_find_linkage_utf8=yes
5384@@ -11696,7 +11702,7 @@
5385 LIBS="-lutf8  $cf_save_LIBS"
5386
5387 cat >conftest.$ac_ext <<_ACEOF
5388-#line 11699 "configure"
5389+#line 11705 "configure"
5390 #include "confdefs.h"
5391
5392 #include <libutf8.h>
5393@@ -11709,16 +11715,16 @@
5394 }
5395 _ACEOF
5396 rm -f conftest.$ac_objext conftest$ac_exeext
5397-if { (eval echo "$as_me:11712: \"$ac_link\"") >&5
5398+if { (eval echo "$as_me:11718: \"$ac_link\"") >&5
5399   (eval $ac_link) 2>&5
5400   ac_status=$?
5401-  echo "$as_me:11715: \$? = $ac_status" >&5
5402+  echo "$as_me:11721: \$? = $ac_status" >&5
5403   (exit $ac_status); } &&
5404          { ac_try='test -s conftest$ac_exeext'
5405-  { (eval echo "$as_me:11718: \"$ac_try\"") >&5
5406+  { (eval echo "$as_me:11724: \"$ac_try\"") >&5
5407   (eval $ac_try) 2>&5
5408   ac_status=$?
5409-  echo "$as_me:11721: \$? = $ac_status" >&5
5410+  echo "$as_me:11727: \$? = $ac_status" >&5
5411   (exit $ac_status); }; }; then
5412
5413 	cf_cv_find_linkage_utf8=yes
5414@@ -11735,9 +11741,9 @@
5415
5416 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
5417
5418-echo "${as_me:-configure}:11738: testing find linkage for utf8 library ..." 1>&5
5419+echo "${as_me:-configure}:11744: testing find linkage for utf8 library ..." 1>&5
5420
5421-echo "${as_me:-configure}:11740: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
5422+echo "${as_me:-configure}:11746: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
5423
5424 	cf_save_CPPFLAGS="$CPPFLAGS"
5425 	cf_test_CPPFLAGS="$CPPFLAGS"
5426@@ -11828,7 +11834,7 @@
5427 		if test -d $cf_cv_header_path_utf8 ; then
5428 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
5429
5430-echo "${as_me:-configure}:11831: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
5431+echo "${as_me:-configure}:11837: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
5432
5433 			CPPFLAGS="$cf_save_CPPFLAGS"
5434
5435@@ -11836,7 +11842,7 @@
5436 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
5437
5438 			cat >conftest.$ac_ext <<_ACEOF
5439-#line 11839 "configure"
5440+#line 11845 "configure"
5441 #include "confdefs.h"
5442
5443 #include <libutf8.h>
5444@@ -11849,21 +11855,21 @@
5445 }
5446 _ACEOF
5447 rm -f conftest.$ac_objext
5448-if { (eval echo "$as_me:11852: \"$ac_compile\"") >&5
5449+if { (eval echo "$as_me:11858: \"$ac_compile\"") >&5
5450   (eval $ac_compile) 2>&5
5451   ac_status=$?
5452-  echo "$as_me:11855: \$? = $ac_status" >&5
5453+  echo "$as_me:11861: \$? = $ac_status" >&5
5454   (exit $ac_status); } &&
5455          { ac_try='test -s conftest.$ac_objext'
5456-  { (eval echo "$as_me:11858: \"$ac_try\"") >&5
5457+  { (eval echo "$as_me:11864: \"$ac_try\"") >&5
5458   (eval $ac_try) 2>&5
5459   ac_status=$?
5460-  echo "$as_me:11861: \$? = $ac_status" >&5
5461+  echo "$as_me:11867: \$? = $ac_status" >&5
5462   (exit $ac_status); }; }; then
5463
5464 				test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
5465
5466-echo "${as_me:-configure}:11866: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
5467+echo "${as_me:-configure}:11872: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
5468
5469 				cf_cv_find_linkage_utf8=maybe
5470 				cf_test_CPPFLAGS="$CPPFLAGS"
5471@@ -11881,7 +11887,7 @@
5472
5473 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
5474
5475-echo "${as_me:-configure}:11884: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
5476+echo "${as_me:-configure}:11890: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
5477
5478 		cf_save_LIBS="$LIBS"
5479 		cf_save_LDFLAGS="$LDFLAGS"
5480@@ -11956,13 +11962,13 @@
5481 				if test -d $cf_cv_library_path_utf8 ; then
5482 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
5483
5484-echo "${as_me:-configure}:11959: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
5485+echo "${as_me:-configure}:11965: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
5486
5487 					CPPFLAGS="$cf_test_CPPFLAGS"
5488 					LIBS="-lutf8  $cf_save_LIBS"
5489 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
5490 					cat >conftest.$ac_ext <<_ACEOF
5491-#line 11965 "configure"
5492+#line 11971 "configure"
5493 #include "confdefs.h"
5494
5495 #include <libutf8.h>
5496@@ -11975,21 +11981,21 @@
5497 }
5498 _ACEOF
5499 rm -f conftest.$ac_objext conftest$ac_exeext
5500-if { (eval echo "$as_me:11978: \"$ac_link\"") >&5
5501+if { (eval echo "$as_me:11984: \"$ac_link\"") >&5
5502   (eval $ac_link) 2>&5
5503   ac_status=$?
5504-  echo "$as_me:11981: \$? = $ac_status" >&5
5505+  echo "$as_me:11987: \$? = $ac_status" >&5
5506   (exit $ac_status); } &&
5507          { ac_try='test -s conftest$ac_exeext'
5508-  { (eval echo "$as_me:11984: \"$ac_try\"") >&5
5509+  { (eval echo "$as_me:11990: \"$ac_try\"") >&5
5510   (eval $ac_try) 2>&5
5511   ac_status=$?
5512-  echo "$as_me:11987: \$? = $ac_status" >&5
5513+  echo "$as_me:11993: \$? = $ac_status" >&5
5514   (exit $ac_status); }; }; then
5515
5516 					test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
5517
5518-echo "${as_me:-configure}:11992: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
5519+echo "${as_me:-configure}:11998: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
5520
5521 					cf_cv_find_linkage_utf8=yes
5522 					cf_cv_library_file_utf8="-lutf8"
5523@@ -12031,7 +12037,7 @@
5524 fi
5525 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5526 fi
5527-echo "$as_me:12034: result: $cf_cv_utf8_lib" >&5
5528+echo "$as_me:12040: result: $cf_cv_utf8_lib" >&5
5529 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
5530
5531 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
5532@@ -12069,7 +12075,7 @@
5533 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
5534
5535 			  cat >conftest.$ac_ext <<_ACEOF
5536-#line 12072 "configure"
5537+#line 12078 "configure"
5538 #include "confdefs.h"
5539 #include <stdio.h>
5540 int
5541@@ -12081,16 +12087,16 @@
5542 }
5543 _ACEOF
5544 rm -f conftest.$ac_objext
5545-if { (eval echo "$as_me:12084: \"$ac_compile\"") >&5
5546+if { (eval echo "$as_me:12090: \"$ac_compile\"") >&5
5547   (eval $ac_compile) 2>&5
5548   ac_status=$?
5549-  echo "$as_me:12087: \$? = $ac_status" >&5
5550+  echo "$as_me:12093: \$? = $ac_status" >&5
5551   (exit $ac_status); } &&
5552          { ac_try='test -s conftest.$ac_objext'
5553-  { (eval echo "$as_me:12090: \"$ac_try\"") >&5
5554+  { (eval echo "$as_me:12096: \"$ac_try\"") >&5
5555   (eval $ac_try) 2>&5
5556   ac_status=$?
5557-  echo "$as_me:12093: \$? = $ac_status" >&5
5558+  echo "$as_me:12099: \$? = $ac_status" >&5
5559   (exit $ac_status); }; }; then
5560   :
5561 else
5562@@ -12107,7 +12113,7 @@
5563 		if test "$cf_have_incdir" = no ; then
5564 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
5565
5566-echo "${as_me:-configure}:12110: testing adding $cf_add_incdir to include-path ..." 1>&5
5567+echo "${as_me:-configure}:12116: testing adding $cf_add_incdir to include-path ..." 1>&5
5568
5569 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
5570
5571@@ -12143,7 +12149,7 @@
5572 			if test "$cf_have_libdir" = no ; then
5573 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
5574
5575-echo "${as_me:-configure}:12146: testing adding $cf_add_libdir to library-path ..." 1>&5
5576+echo "${as_me:-configure}:12152: testing adding $cf_add_libdir to library-path ..." 1>&5
5577
5578 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
5579 			fi
5580@@ -12175,14 +12181,14 @@
5581 	fi
5582
5583 # This is needed on Tru64 5.0 to declare mbstate_t
5584-echo "$as_me:12178: checking if we must include wchar.h to declare mbstate_t" >&5
5585+echo "$as_me:12184: checking if we must include wchar.h to declare mbstate_t" >&5
5586 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
5587 if test "${cf_cv_mbstate_t+set}" = set; then
5588   echo $ECHO_N "(cached) $ECHO_C" >&6
5589 else
5590
5591 cat >conftest.$ac_ext <<_ACEOF
5592-#line 12185 "configure"
5593+#line 12191 "configure"
5594 #include "confdefs.h"
5595
5596 #include <stdlib.h>
5597@@ -12200,23 +12206,23 @@
5598 }
5599 _ACEOF
5600 rm -f conftest.$ac_objext
5601-if { (eval echo "$as_me:12203: \"$ac_compile\"") >&5
5602+if { (eval echo "$as_me:12209: \"$ac_compile\"") >&5
5603   (eval $ac_compile) 2>&5
5604   ac_status=$?
5605-  echo "$as_me:12206: \$? = $ac_status" >&5
5606+  echo "$as_me:12212: \$? = $ac_status" >&5
5607   (exit $ac_status); } &&
5608          { ac_try='test -s conftest.$ac_objext'
5609-  { (eval echo "$as_me:12209: \"$ac_try\"") >&5
5610+  { (eval echo "$as_me:12215: \"$ac_try\"") >&5
5611   (eval $ac_try) 2>&5
5612   ac_status=$?
5613-  echo "$as_me:12212: \$? = $ac_status" >&5
5614+  echo "$as_me:12218: \$? = $ac_status" >&5
5615   (exit $ac_status); }; }; then
5616   cf_cv_mbstate_t=no
5617 else
5618   echo "$as_me: failed program was:" >&5
5619 cat conftest.$ac_ext >&5
5620 cat >conftest.$ac_ext <<_ACEOF
5621-#line 12219 "configure"
5622+#line 12225 "configure"
5623 #include "confdefs.h"
5624
5625 #include <stdlib.h>
5626@@ -12235,16 +12241,16 @@
5627 }
5628 _ACEOF
5629 rm -f conftest.$ac_objext
5630-if { (eval echo "$as_me:12238: \"$ac_compile\"") >&5
5631+if { (eval echo "$as_me:12244: \"$ac_compile\"") >&5
5632   (eval $ac_compile) 2>&5
5633   ac_status=$?
5634-  echo "$as_me:12241: \$? = $ac_status" >&5
5635+  echo "$as_me:12247: \$? = $ac_status" >&5
5636   (exit $ac_status); } &&
5637          { ac_try='test -s conftest.$ac_objext'
5638-  { (eval echo "$as_me:12244: \"$ac_try\"") >&5
5639+  { (eval echo "$as_me:12250: \"$ac_try\"") >&5
5640   (eval $ac_try) 2>&5
5641   ac_status=$?
5642-  echo "$as_me:12247: \$? = $ac_status" >&5
5643+  echo "$as_me:12253: \$? = $ac_status" >&5
5644   (exit $ac_status); }; }; then
5645   cf_cv_mbstate_t=yes
5646 else
5647@@ -12256,7 +12262,7 @@
5648 fi
5649 rm -f conftest.$ac_objext conftest.$ac_ext
5650 fi
5651-echo "$as_me:12259: result: $cf_cv_mbstate_t" >&5
5652+echo "$as_me:12265: result: $cf_cv_mbstate_t" >&5
5653 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
5654
5655 if test "$cf_cv_mbstate_t" = yes ; then
5656@@ -12274,14 +12280,14 @@
5657 fi
5658
5659 # This is needed on Tru64 5.0 to declare wchar_t
5660-echo "$as_me:12277: checking if we must include wchar.h to declare wchar_t" >&5
5661+echo "$as_me:12283: checking if we must include wchar.h to declare wchar_t" >&5
5662 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
5663 if test "${cf_cv_wchar_t+set}" = set; then
5664   echo $ECHO_N "(cached) $ECHO_C" >&6
5665 else
5666
5667 cat >conftest.$ac_ext <<_ACEOF
5668-#line 12284 "configure"
5669+#line 12290 "configure"
5670 #include "confdefs.h"
5671
5672 #include <stdlib.h>
5673@@ -12299,23 +12305,23 @@
5674 }
5675 _ACEOF
5676 rm -f conftest.$ac_objext
5677-if { (eval echo "$as_me:12302: \"$ac_compile\"") >&5
5678+if { (eval echo "$as_me:12308: \"$ac_compile\"") >&5
5679   (eval $ac_compile) 2>&5
5680   ac_status=$?
5681-  echo "$as_me:12305: \$? = $ac_status" >&5
5682+  echo "$as_me:12311: \$? = $ac_status" >&5
5683   (exit $ac_status); } &&
5684          { ac_try='test -s conftest.$ac_objext'
5685-  { (eval echo "$as_me:12308: \"$ac_try\"") >&5
5686+  { (eval echo "$as_me:12314: \"$ac_try\"") >&5
5687   (eval $ac_try) 2>&5
5688   ac_status=$?
5689-  echo "$as_me:12311: \$? = $ac_status" >&5
5690+  echo "$as_me:12317: \$? = $ac_status" >&5
5691   (exit $ac_status); }; }; then
5692   cf_cv_wchar_t=no
5693 else
5694   echo "$as_me: failed program was:" >&5
5695 cat conftest.$ac_ext >&5
5696 cat >conftest.$ac_ext <<_ACEOF
5697-#line 12318 "configure"
5698+#line 12324 "configure"
5699 #include "confdefs.h"
5700
5701 #include <stdlib.h>
5702@@ -12334,16 +12340,16 @@
5703 }
5704 _ACEOF
5705 rm -f conftest.$ac_objext
5706-if { (eval echo "$as_me:12337: \"$ac_compile\"") >&5
5707+if { (eval echo "$as_me:12343: \"$ac_compile\"") >&5
5708   (eval $ac_compile) 2>&5
5709   ac_status=$?
5710-  echo "$as_me:12340: \$? = $ac_status" >&5
5711+  echo "$as_me:12346: \$? = $ac_status" >&5
5712   (exit $ac_status); } &&
5713          { ac_try='test -s conftest.$ac_objext'
5714-  { (eval echo "$as_me:12343: \"$ac_try\"") >&5
5715+  { (eval echo "$as_me:12349: \"$ac_try\"") >&5
5716   (eval $ac_try) 2>&5
5717   ac_status=$?
5718-  echo "$as_me:12346: \$? = $ac_status" >&5
5719+  echo "$as_me:12352: \$? = $ac_status" >&5
5720   (exit $ac_status); }; }; then
5721   cf_cv_wchar_t=yes
5722 else
5723@@ -12355,7 +12361,7 @@
5724 fi
5725 rm -f conftest.$ac_objext conftest.$ac_ext
5726 fi
5727-echo "$as_me:12358: result: $cf_cv_wchar_t" >&5
5728+echo "$as_me:12364: result: $cf_cv_wchar_t" >&5
5729 echo "${ECHO_T}$cf_cv_wchar_t" >&6
5730
5731 if test "$cf_cv_wchar_t" = yes ; then
5732@@ -12378,14 +12384,14 @@
5733 fi
5734
5735 # This is needed on Tru64 5.0 to declare wint_t
5736-echo "$as_me:12381: checking if we must include wchar.h to declare wint_t" >&5
5737+echo "$as_me:12387: checking if we must include wchar.h to declare wint_t" >&5
5738 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
5739 if test "${cf_cv_wint_t+set}" = set; then
5740   echo $ECHO_N "(cached) $ECHO_C" >&6
5741 else
5742
5743 cat >conftest.$ac_ext <<_ACEOF
5744-#line 12388 "configure"
5745+#line 12394 "configure"
5746 #include "confdefs.h"
5747
5748 #include <stdlib.h>
5749@@ -12403,23 +12409,23 @@
5750 }
5751 _ACEOF
5752 rm -f conftest.$ac_objext
5753-if { (eval echo "$as_me:12406: \"$ac_compile\"") >&5
5754+if { (eval echo "$as_me:12412: \"$ac_compile\"") >&5
5755   (eval $ac_compile) 2>&5
5756   ac_status=$?
5757-  echo "$as_me:12409: \$? = $ac_status" >&5
5758+  echo "$as_me:12415: \$? = $ac_status" >&5
5759   (exit $ac_status); } &&
5760          { ac_try='test -s conftest.$ac_objext'
5761-  { (eval echo "$as_me:12412: \"$ac_try\"") >&5
5762+  { (eval echo "$as_me:12418: \"$ac_try\"") >&5
5763   (eval $ac_try) 2>&5
5764   ac_status=$?
5765-  echo "$as_me:12415: \$? = $ac_status" >&5
5766+  echo "$as_me:12421: \$? = $ac_status" >&5
5767   (exit $ac_status); }; }; then
5768   cf_cv_wint_t=no
5769 else
5770   echo "$as_me: failed program was:" >&5
5771 cat conftest.$ac_ext >&5
5772 cat >conftest.$ac_ext <<_ACEOF
5773-#line 12422 "configure"
5774+#line 12428 "configure"
5775 #include "confdefs.h"
5776
5777 #include <stdlib.h>
5778@@ -12438,16 +12444,16 @@
5779 }
5780 _ACEOF
5781 rm -f conftest.$ac_objext
5782-if { (eval echo "$as_me:12441: \"$ac_compile\"") >&5
5783+if { (eval echo "$as_me:12447: \"$ac_compile\"") >&5
5784   (eval $ac_compile) 2>&5
5785   ac_status=$?
5786-  echo "$as_me:12444: \$? = $ac_status" >&5
5787+  echo "$as_me:12450: \$? = $ac_status" >&5
5788   (exit $ac_status); } &&
5789          { ac_try='test -s conftest.$ac_objext'
5790-  { (eval echo "$as_me:12447: \"$ac_try\"") >&5
5791+  { (eval echo "$as_me:12453: \"$ac_try\"") >&5
5792   (eval $ac_try) 2>&5
5793   ac_status=$?
5794-  echo "$as_me:12450: \$? = $ac_status" >&5
5795+  echo "$as_me:12456: \$? = $ac_status" >&5
5796   (exit $ac_status); }; }; then
5797   cf_cv_wint_t=yes
5798 else
5799@@ -12459,7 +12465,7 @@
5800 fi
5801 rm -f conftest.$ac_objext conftest.$ac_ext
5802 fi
5803-echo "$as_me:12462: result: $cf_cv_wint_t" >&5
5804+echo "$as_me:12468: result: $cf_cv_wint_t" >&5
5805 echo "${ECHO_T}$cf_cv_wint_t" >&6
5806
5807 if test "$cf_cv_wint_t" = yes ; then
5808@@ -12491,7 +12497,7 @@
5809 fi
5810
5811 ###   use option --disable-lp64 to allow long chtype
5812-echo "$as_me:12494: checking whether to enable _LP64 definition in curses.h" >&5
5813+echo "$as_me:12500: checking whether to enable _LP64 definition in curses.h" >&5
5814 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
5815
5816 # Check whether --enable-lp64 or --disable-lp64 was given.
5817@@ -12501,7 +12507,7 @@
5818 else
5819   with_lp64=$cf_dft_with_lp64
5820 fi;
5821-echo "$as_me:12504: result: $with_lp64" >&5
5822+echo "$as_me:12510: result: $with_lp64" >&5
5823 echo "${ECHO_T}$with_lp64" >&6
5824
5825 if test "x$with_lp64" = xyes ; then
5826@@ -12517,7 +12523,7 @@
5827 fi;
5828 if test "$enable_largefile" != no; then
5829
5830-  echo "$as_me:12520: checking for special C compiler options needed for large files" >&5
5831+  echo "$as_me:12526: checking for special C compiler options needed for large files" >&5
5832 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
5833 if test "${ac_cv_sys_largefile_CC+set}" = set; then
5834   echo $ECHO_N "(cached) $ECHO_C" >&6
5835@@ -12529,7 +12535,7 @@
5836      	 # IRIX 6.2 and later do not support large files by default,
5837      	 # so use the C compiler's -n32 option if that helps.
5838          cat >conftest.$ac_ext <<_ACEOF
5839-#line 12532 "configure"
5840+#line 12538 "configure"
5841 #include "confdefs.h"
5842 #include <sys/types.h>
5843  /* Check that off_t can represent 2**63 - 1 correctly.
5844@@ -12549,16 +12555,16 @@
5845 }
5846 _ACEOF
5847      	 rm -f conftest.$ac_objext
5848-if { (eval echo "$as_me:12552: \"$ac_compile\"") >&5
5849+if { (eval echo "$as_me:12558: \"$ac_compile\"") >&5
5850   (eval $ac_compile) 2>&5
5851   ac_status=$?
5852-  echo "$as_me:12555: \$? = $ac_status" >&5
5853+  echo "$as_me:12561: \$? = $ac_status" >&5
5854   (exit $ac_status); } &&
5855          { ac_try='test -s conftest.$ac_objext'
5856-  { (eval echo "$as_me:12558: \"$ac_try\"") >&5
5857+  { (eval echo "$as_me:12564: \"$ac_try\"") >&5
5858   (eval $ac_try) 2>&5
5859   ac_status=$?
5860-  echo "$as_me:12561: \$? = $ac_status" >&5
5861+  echo "$as_me:12567: \$? = $ac_status" >&5
5862   (exit $ac_status); }; }; then
5863   break
5864 else
5865@@ -12568,16 +12574,16 @@
5866 rm -f conftest.$ac_objext
5867      	 CC="$CC -n32"
5868      	 rm -f conftest.$ac_objext
5869-if { (eval echo "$as_me:12571: \"$ac_compile\"") >&5
5870+if { (eval echo "$as_me:12577: \"$ac_compile\"") >&5
5871   (eval $ac_compile) 2>&5
5872   ac_status=$?
5873-  echo "$as_me:12574: \$? = $ac_status" >&5
5874+  echo "$as_me:12580: \$? = $ac_status" >&5
5875   (exit $ac_status); } &&
5876          { ac_try='test -s conftest.$ac_objext'
5877-  { (eval echo "$as_me:12577: \"$ac_try\"") >&5
5878+  { (eval echo "$as_me:12583: \"$ac_try\"") >&5
5879   (eval $ac_try) 2>&5
5880   ac_status=$?
5881-  echo "$as_me:12580: \$? = $ac_status" >&5
5882+  echo "$as_me:12586: \$? = $ac_status" >&5
5883   (exit $ac_status); }; }; then
5884   ac_cv_sys_largefile_CC=' -n32'; break
5885 else
5886@@ -12591,13 +12597,13 @@
5887        rm -f conftest.$ac_ext
5888     fi
5889 fi
5890-echo "$as_me:12594: result: $ac_cv_sys_largefile_CC" >&5
5891+echo "$as_me:12600: result: $ac_cv_sys_largefile_CC" >&5
5892 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
5893   if test "$ac_cv_sys_largefile_CC" != no; then
5894     CC=$CC$ac_cv_sys_largefile_CC
5895   fi
5896
5897-  echo "$as_me:12600: checking for _FILE_OFFSET_BITS value needed for large files" >&5
5898+  echo "$as_me:12606: checking for _FILE_OFFSET_BITS value needed for large files" >&5
5899 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
5900 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
5901   echo $ECHO_N "(cached) $ECHO_C" >&6
5902@@ -12605,7 +12611,7 @@
5903   while :; do
5904   ac_cv_sys_file_offset_bits=no
5905   cat >conftest.$ac_ext <<_ACEOF
5906-#line 12608 "configure"
5907+#line 12614 "configure"
5908 #include "confdefs.h"
5909 #include <sys/types.h>
5910  /* Check that off_t can represent 2**63 - 1 correctly.
5911@@ -12625,16 +12631,16 @@
5912 }
5913 _ACEOF
5914 rm -f conftest.$ac_objext
5915-if { (eval echo "$as_me:12628: \"$ac_compile\"") >&5
5916+if { (eval echo "$as_me:12634: \"$ac_compile\"") >&5
5917   (eval $ac_compile) 2>&5
5918   ac_status=$?
5919-  echo "$as_me:12631: \$? = $ac_status" >&5
5920+  echo "$as_me:12637: \$? = $ac_status" >&5
5921   (exit $ac_status); } &&
5922          { ac_try='test -s conftest.$ac_objext'
5923-  { (eval echo "$as_me:12634: \"$ac_try\"") >&5
5924+  { (eval echo "$as_me:12640: \"$ac_try\"") >&5
5925   (eval $ac_try) 2>&5
5926   ac_status=$?
5927-  echo "$as_me:12637: \$? = $ac_status" >&5
5928+  echo "$as_me:12643: \$? = $ac_status" >&5
5929   (exit $ac_status); }; }; then
5930   break
5931 else
5932@@ -12643,7 +12649,7 @@
5933 fi
5934 rm -f conftest.$ac_objext conftest.$ac_ext
5935   cat >conftest.$ac_ext <<_ACEOF
5936-#line 12646 "configure"
5937+#line 12652 "configure"
5938 #include "confdefs.h"
5939 #define _FILE_OFFSET_BITS 64
5940 #include <sys/types.h>
5941@@ -12664,16 +12670,16 @@
5942 }
5943 _ACEOF
5944 rm -f conftest.$ac_objext
5945-if { (eval echo "$as_me:12667: \"$ac_compile\"") >&5
5946+if { (eval echo "$as_me:12673: \"$ac_compile\"") >&5
5947   (eval $ac_compile) 2>&5
5948   ac_status=$?
5949-  echo "$as_me:12670: \$? = $ac_status" >&5
5950+  echo "$as_me:12676: \$? = $ac_status" >&5
5951   (exit $ac_status); } &&
5952          { ac_try='test -s conftest.$ac_objext'
5953-  { (eval echo "$as_me:12673: \"$ac_try\"") >&5
5954+  { (eval echo "$as_me:12679: \"$ac_try\"") >&5
5955   (eval $ac_try) 2>&5
5956   ac_status=$?
5957-  echo "$as_me:12676: \$? = $ac_status" >&5
5958+  echo "$as_me:12682: \$? = $ac_status" >&5
5959   (exit $ac_status); }; }; then
5960   ac_cv_sys_file_offset_bits=64; break
5961 else
5962@@ -12684,7 +12690,7 @@
5963   break
5964 done
5965 fi
5966-echo "$as_me:12687: result: $ac_cv_sys_file_offset_bits" >&5
5967+echo "$as_me:12693: result: $ac_cv_sys_file_offset_bits" >&5
5968 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
5969 if test "$ac_cv_sys_file_offset_bits" != no; then
5970
5971@@ -12694,7 +12700,7 @@
5972
5973 fi
5974 rm -rf conftest*
5975-  echo "$as_me:12697: checking for _LARGE_FILES value needed for large files" >&5
5976+  echo "$as_me:12703: checking for _LARGE_FILES value needed for large files" >&5
5977 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
5978 if test "${ac_cv_sys_large_files+set}" = set; then
5979   echo $ECHO_N "(cached) $ECHO_C" >&6
5980@@ -12702,7 +12708,7 @@
5981   while :; do
5982   ac_cv_sys_large_files=no
5983   cat >conftest.$ac_ext <<_ACEOF
5984-#line 12705 "configure"
5985+#line 12711 "configure"
5986 #include "confdefs.h"
5987 #include <sys/types.h>
5988  /* Check that off_t can represent 2**63 - 1 correctly.
5989@@ -12722,16 +12728,16 @@
5990 }
5991 _ACEOF
5992 rm -f conftest.$ac_objext
5993-if { (eval echo "$as_me:12725: \"$ac_compile\"") >&5
5994+if { (eval echo "$as_me:12731: \"$ac_compile\"") >&5
5995   (eval $ac_compile) 2>&5
5996   ac_status=$?
5997-  echo "$as_me:12728: \$? = $ac_status" >&5
5998+  echo "$as_me:12734: \$? = $ac_status" >&5
5999   (exit $ac_status); } &&
6000          { ac_try='test -s conftest.$ac_objext'
6001-  { (eval echo "$as_me:12731: \"$ac_try\"") >&5
6002+  { (eval echo "$as_me:12737: \"$ac_try\"") >&5
6003   (eval $ac_try) 2>&5
6004   ac_status=$?
6005-  echo "$as_me:12734: \$? = $ac_status" >&5
6006+  echo "$as_me:12740: \$? = $ac_status" >&5
6007   (exit $ac_status); }; }; then
6008   break
6009 else
6010@@ -12740,7 +12746,7 @@
6011 fi
6012 rm -f conftest.$ac_objext conftest.$ac_ext
6013   cat >conftest.$ac_ext <<_ACEOF
6014-#line 12743 "configure"
6015+#line 12749 "configure"
6016 #include "confdefs.h"
6017 #define _LARGE_FILES 1
6018 #include <sys/types.h>
6019@@ -12761,16 +12767,16 @@
6020 }
6021 _ACEOF
6022 rm -f conftest.$ac_objext
6023-if { (eval echo "$as_me:12764: \"$ac_compile\"") >&5
6024+if { (eval echo "$as_me:12770: \"$ac_compile\"") >&5
6025   (eval $ac_compile) 2>&5
6026   ac_status=$?
6027-  echo "$as_me:12767: \$? = $ac_status" >&5
6028+  echo "$as_me:12773: \$? = $ac_status" >&5
6029   (exit $ac_status); } &&
6030          { ac_try='test -s conftest.$ac_objext'
6031-  { (eval echo "$as_me:12770: \"$ac_try\"") >&5
6032+  { (eval echo "$as_me:12776: \"$ac_try\"") >&5
6033   (eval $ac_try) 2>&5
6034   ac_status=$?
6035-  echo "$as_me:12773: \$? = $ac_status" >&5
6036+  echo "$as_me:12779: \$? = $ac_status" >&5
6037   (exit $ac_status); }; }; then
6038   ac_cv_sys_large_files=1; break
6039 else
6040@@ -12781,7 +12787,7 @@
6041   break
6042 done
6043 fi
6044-echo "$as_me:12784: result: $ac_cv_sys_large_files" >&5
6045+echo "$as_me:12790: result: $ac_cv_sys_large_files" >&5
6046 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
6047 if test "$ac_cv_sys_large_files" != no; then
6048
6049@@ -12794,7 +12800,7 @@
6050 fi
6051
6052 	if test "$enable_largefile" != no ; then
6053-	echo "$as_me:12797: checking for _LARGEFILE_SOURCE value needed for large files" >&5
6054+	echo "$as_me:12803: checking for _LARGEFILE_SOURCE value needed for large files" >&5
6055 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
6056 if test "${ac_cv_sys_largefile_source+set}" = set; then
6057   echo $ECHO_N "(cached) $ECHO_C" >&6
6058@@ -12802,7 +12808,7 @@
6059   while :; do
6060   ac_cv_sys_largefile_source=no
6061   cat >conftest.$ac_ext <<_ACEOF
6062-#line 12805 "configure"
6063+#line 12811 "configure"
6064 #include "confdefs.h"
6065 #include <stdio.h>
6066 int
6067@@ -12814,16 +12820,16 @@
6068 }
6069 _ACEOF
6070 rm -f conftest.$ac_objext
6071-if { (eval echo "$as_me:12817: \"$ac_compile\"") >&5
6072+if { (eval echo "$as_me:12823: \"$ac_compile\"") >&5
6073   (eval $ac_compile) 2>&5
6074   ac_status=$?
6075-  echo "$as_me:12820: \$? = $ac_status" >&5
6076+  echo "$as_me:12826: \$? = $ac_status" >&5
6077   (exit $ac_status); } &&
6078          { ac_try='test -s conftest.$ac_objext'
6079-  { (eval echo "$as_me:12823: \"$ac_try\"") >&5
6080+  { (eval echo "$as_me:12829: \"$ac_try\"") >&5
6081   (eval $ac_try) 2>&5
6082   ac_status=$?
6083-  echo "$as_me:12826: \$? = $ac_status" >&5
6084+  echo "$as_me:12832: \$? = $ac_status" >&5
6085   (exit $ac_status); }; }; then
6086   break
6087 else
6088@@ -12832,7 +12838,7 @@
6089 fi
6090 rm -f conftest.$ac_objext conftest.$ac_ext
6091   cat >conftest.$ac_ext <<_ACEOF
6092-#line 12835 "configure"
6093+#line 12841 "configure"
6094 #include "confdefs.h"
6095 #define _LARGEFILE_SOURCE 1
6096 #include <stdio.h>
6097@@ -12845,16 +12851,16 @@
6098 }
6099 _ACEOF
6100 rm -f conftest.$ac_objext
6101-if { (eval echo "$as_me:12848: \"$ac_compile\"") >&5
6102+if { (eval echo "$as_me:12854: \"$ac_compile\"") >&5
6103   (eval $ac_compile) 2>&5
6104   ac_status=$?
6105-  echo "$as_me:12851: \$? = $ac_status" >&5
6106+  echo "$as_me:12857: \$? = $ac_status" >&5
6107   (exit $ac_status); } &&
6108          { ac_try='test -s conftest.$ac_objext'
6109-  { (eval echo "$as_me:12854: \"$ac_try\"") >&5
6110+  { (eval echo "$as_me:12860: \"$ac_try\"") >&5
6111   (eval $ac_try) 2>&5
6112   ac_status=$?
6113-  echo "$as_me:12857: \$? = $ac_status" >&5
6114+  echo "$as_me:12863: \$? = $ac_status" >&5
6115   (exit $ac_status); }; }; then
6116   ac_cv_sys_largefile_source=1; break
6117 else
6118@@ -12865,7 +12871,7 @@
6119   break
6120 done
6121 fi
6122-echo "$as_me:12868: result: $ac_cv_sys_largefile_source" >&5
6123+echo "$as_me:12874: result: $ac_cv_sys_largefile_source" >&5
6124 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
6125 if test "$ac_cv_sys_largefile_source" != no; then
6126
6127@@ -12879,13 +12885,13 @@
6128 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
6129 # in glibc 2.1.3, but that breaks too many other things.
6130 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
6131-echo "$as_me:12882: checking for fseeko" >&5
6132+echo "$as_me:12888: checking for fseeko" >&5
6133 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
6134 if test "${ac_cv_func_fseeko+set}" = set; then
6135   echo $ECHO_N "(cached) $ECHO_C" >&6
6136 else
6137   cat >conftest.$ac_ext <<_ACEOF
6138-#line 12888 "configure"
6139+#line 12894 "configure"
6140 #include "confdefs.h"
6141 #include <stdio.h>
6142 int
6143@@ -12897,16 +12903,16 @@
6144 }
6145 _ACEOF
6146 rm -f conftest.$ac_objext conftest$ac_exeext
6147-if { (eval echo "$as_me:12900: \"$ac_link\"") >&5
6148+if { (eval echo "$as_me:12906: \"$ac_link\"") >&5
6149   (eval $ac_link) 2>&5
6150   ac_status=$?
6151-  echo "$as_me:12903: \$? = $ac_status" >&5
6152+  echo "$as_me:12909: \$? = $ac_status" >&5
6153   (exit $ac_status); } &&
6154          { ac_try='test -s conftest$ac_exeext'
6155-  { (eval echo "$as_me:12906: \"$ac_try\"") >&5
6156+  { (eval echo "$as_me:12912: \"$ac_try\"") >&5
6157   (eval $ac_try) 2>&5
6158   ac_status=$?
6159-  echo "$as_me:12909: \$? = $ac_status" >&5
6160+  echo "$as_me:12915: \$? = $ac_status" >&5
6161   (exit $ac_status); }; }; then
6162   ac_cv_func_fseeko=yes
6163 else
6164@@ -12916,7 +12922,7 @@
6165 fi
6166 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6167 fi
6168-echo "$as_me:12919: result: $ac_cv_func_fseeko" >&5
6169+echo "$as_me:12925: result: $ac_cv_func_fseeko" >&5
6170 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
6171 if test $ac_cv_func_fseeko = yes; then
6172
6173@@ -12955,14 +12961,14 @@
6174
6175 	fi
6176
6177-	echo "$as_me:12958: checking whether to use struct dirent64" >&5
6178+	echo "$as_me:12964: checking whether to use struct dirent64" >&5
6179 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
6180 if test "${cf_cv_struct_dirent64+set}" = set; then
6181   echo $ECHO_N "(cached) $ECHO_C" >&6
6182 else
6183
6184 		cat >conftest.$ac_ext <<_ACEOF
6185-#line 12965 "configure"
6186+#line 12971 "configure"
6187 #include "confdefs.h"
6188
6189 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
6190@@ -12984,16 +12990,16 @@
6191 }
6192 _ACEOF
6193 rm -f conftest.$ac_objext
6194-if { (eval echo "$as_me:12987: \"$ac_compile\"") >&5
6195+if { (eval echo "$as_me:12993: \"$ac_compile\"") >&5
6196   (eval $ac_compile) 2>&5
6197   ac_status=$?
6198-  echo "$as_me:12990: \$? = $ac_status" >&5
6199+  echo "$as_me:12996: \$? = $ac_status" >&5
6200   (exit $ac_status); } &&
6201          { ac_try='test -s conftest.$ac_objext'
6202-  { (eval echo "$as_me:12993: \"$ac_try\"") >&5
6203+  { (eval echo "$as_me:12999: \"$ac_try\"") >&5
6204   (eval $ac_try) 2>&5
6205   ac_status=$?
6206-  echo "$as_me:12996: \$? = $ac_status" >&5
6207+  echo "$as_me:13002: \$? = $ac_status" >&5
6208   (exit $ac_status); }; }; then
6209   cf_cv_struct_dirent64=yes
6210 else
6211@@ -13004,7 +13010,7 @@
6212 rm -f conftest.$ac_objext conftest.$ac_ext
6213
6214 fi
6215-echo "$as_me:13007: result: $cf_cv_struct_dirent64" >&5
6216+echo "$as_me:13013: result: $cf_cv_struct_dirent64" >&5
6217 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
6218 	test "$cf_cv_struct_dirent64" = yes &&
6219 cat >>confdefs.h <<\EOF
6220@@ -13014,7 +13020,7 @@
6221 	fi
6222
6223 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
6224-echo "$as_me:13017: checking if you want tparm not to use X/Open fixed-parameter list" >&5
6225+echo "$as_me:13023: checking if you want tparm not to use X/Open fixed-parameter list" >&5
6226 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
6227
6228 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
6229@@ -13024,14 +13030,14 @@
6230 else
6231   with_tparm_varargs=yes
6232 fi;
6233-echo "$as_me:13027: result: $with_tparm_varargs" >&5
6234+echo "$as_me:13033: result: $with_tparm_varargs" >&5
6235 echo "${ECHO_T}$with_tparm_varargs" >&6
6236 NCURSES_TPARM_VARARGS=0
6237 test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
6238
6239 ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
6240 if test "$with_ticlib" != no ; then
6241-echo "$as_me:13034: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
6242+echo "$as_me:13040: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
6243 echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
6244
6245 # Check whether --enable-tic-depends or --disable-tic-depends was given.
6246@@ -13041,14 +13047,14 @@
6247 else
6248   with_tic_depends=yes
6249 fi;
6250-echo "$as_me:13044: result: $with_tic_depends" >&5
6251+echo "$as_me:13050: result: $with_tic_depends" >&5
6252 echo "${ECHO_T}$with_tic_depends" >&6
6253 else
6254 	with_tic_depends=no
6255 fi
6256
6257 ###   use option --disable-wattr-macros to suppress wattr* macros from curses.h
6258-echo "$as_me:13051: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
6259+echo "$as_me:13057: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
6260 echo $ECHO_N "checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition... $ECHO_C" >&6
6261
6262 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
6263@@ -13060,15 +13066,15 @@
6264 fi;
6265 if [ "x$with_wattr_macros" != xyes ]; then
6266 	NCURSES_WATTR_MACROS=0
6267-	echo "$as_me:13063: result: yes" >&5
6268+	echo "$as_me:13069: result: yes" >&5
6269 echo "${ECHO_T}yes" >&6
6270 else
6271 	NCURSES_WATTR_MACROS=1
6272-	echo "$as_me:13067: result: no" >&5
6273+	echo "$as_me:13073: result: no" >&5
6274 echo "${ECHO_T}no" >&6
6275 fi
6276
6277-echo "$as_me:13071: checking for X11 rgb file" >&5
6278+echo "$as_me:13077: checking for X11 rgb file" >&5
6279 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
6280
6281 # Check whether --with-x11-rgb or --without-x11-rgb was given.
6282@@ -13132,7 +13138,7 @@
6283 	cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
6284 	;;
6285 (*)
6286-	{ { echo "$as_me:13135: error: expected a pathname, not \"$cf_path\"" >&5
6287+	{ { echo "$as_me:13141: error: expected a pathname, not \"$cf_path\"" >&5
6288 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
6289    { (exit 1); exit 1; }; }
6290 	;;
6291@@ -13140,7 +13146,7 @@
6292
6293 fi
6294
6295-echo "$as_me:13143: result: $RGB_PATH" >&5
6296+echo "$as_me:13149: result: $RGB_PATH" >&5
6297 echo "${ECHO_T}$RGB_PATH" >&6
6298
6299 cat >>confdefs.h <<EOF
6300@@ -13154,7 +13160,7 @@
6301 fi
6302
6303 ###   use option --with-bool to override bool's type
6304-echo "$as_me:13157: checking for type of bool" >&5
6305+echo "$as_me:13163: checking for type of bool" >&5
6306 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
6307
6308 # Check whether --with-bool or --without-bool was given.
6309@@ -13164,10 +13170,10 @@
6310 else
6311   NCURSES_BOOL=auto
6312 fi;
6313-echo "$as_me:13167: result: $NCURSES_BOOL" >&5
6314+echo "$as_me:13173: result: $NCURSES_BOOL" >&5
6315 echo "${ECHO_T}$NCURSES_BOOL" >&6
6316
6317-echo "$as_me:13170: checking for alternate terminal capabilities file" >&5
6318+echo "$as_me:13176: checking for alternate terminal capabilities file" >&5
6319 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
6320
6321 # Check whether --with-caps or --without-caps was given.
6322@@ -13178,11 +13184,11 @@
6323   TERMINFO_CAPS=Caps
6324 fi;
6325 test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
6326-echo "$as_me:13181: result: $TERMINFO_CAPS" >&5
6327+echo "$as_me:13187: result: $TERMINFO_CAPS" >&5
6328 echo "${ECHO_T}$TERMINFO_CAPS" >&6
6329
6330 ###   use option --with-chtype to override chtype's type
6331-echo "$as_me:13185: checking for type of chtype" >&5
6332+echo "$as_me:13191: checking for type of chtype" >&5
6333 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
6334
6335 # Check whether --with-chtype or --without-chtype was given.
6336@@ -13192,11 +13198,11 @@
6337 else
6338   NCURSES_CHTYPE=$cf_dft_chtype
6339 fi;
6340-echo "$as_me:13195: result: $NCURSES_CHTYPE" >&5
6341+echo "$as_me:13201: result: $NCURSES_CHTYPE" >&5
6342 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
6343
6344 ###   use option --with-ospeed to override ospeed's type
6345-echo "$as_me:13199: checking for type of ospeed" >&5
6346+echo "$as_me:13205: checking for type of ospeed" >&5
6347 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
6348
6349 # Check whether --with-ospeed or --without-ospeed was given.
6350@@ -13206,11 +13212,11 @@
6351 else
6352   NCURSES_OSPEED=short
6353 fi;
6354-echo "$as_me:13209: result: $NCURSES_OSPEED" >&5
6355+echo "$as_me:13215: result: $NCURSES_OSPEED" >&5
6356 echo "${ECHO_T}$NCURSES_OSPEED" >&6
6357
6358 ###   use option --with-mmask-t to override mmask_t's type
6359-echo "$as_me:13213: checking for type of mmask_t" >&5
6360+echo "$as_me:13219: checking for type of mmask_t" >&5
6361 echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
6362
6363 # Check whether --with-mmask-t or --without-mmask-t was given.
6364@@ -13220,11 +13226,11 @@
6365 else
6366   NCURSES_MMASK_T=$cf_dft_mmask_t
6367 fi;
6368-echo "$as_me:13223: result: $NCURSES_MMASK_T" >&5
6369+echo "$as_me:13229: result: $NCURSES_MMASK_T" >&5
6370 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
6371
6372 ###   use option --with-ccharw-max to override CCHARW_MAX size
6373-echo "$as_me:13227: checking for size CCHARW_MAX" >&5
6374+echo "$as_me:13233: checking for size CCHARW_MAX" >&5
6375 echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
6376
6377 # Check whether --with-ccharw-max or --without-ccharw-max was given.
6378@@ -13234,16 +13240,16 @@
6379 else
6380   NCURSES_CCHARW_MAX=5
6381 fi;
6382-echo "$as_me:13237: result: $NCURSES_CCHARW_MAX" >&5
6383+echo "$as_me:13243: result: $NCURSES_CCHARW_MAX" >&5
6384 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
6385
6386-echo "$as_me:13240: checking for ANSI C header files" >&5
6387+echo "$as_me:13246: checking for ANSI C header files" >&5
6388 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
6389 if test "${ac_cv_header_stdc+set}" = set; then
6390   echo $ECHO_N "(cached) $ECHO_C" >&6
6391 else
6392   cat >conftest.$ac_ext <<_ACEOF
6393-#line 13246 "configure"
6394+#line 13252 "configure"
6395 #include "confdefs.h"
6396 #include <stdlib.h>
6397 #include <stdarg.h>
6398@@ -13251,13 +13257,13 @@
6399 #include <float.h>
6400
6401 _ACEOF
6402-if { (eval echo "$as_me:13254: \"$ac_cpp conftest.$ac_ext\"") >&5
6403+if { (eval echo "$as_me:13260: \"$ac_cpp conftest.$ac_ext\"") >&5
6404   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
6405   ac_status=$?
6406   egrep -v '^ *\+' conftest.er1 >conftest.err
6407   rm -f conftest.er1
6408   cat conftest.err >&5
6409-  echo "$as_me:13260: \$? = $ac_status" >&5
6410+  echo "$as_me:13266: \$? = $ac_status" >&5
6411   (exit $ac_status); } >/dev/null; then
6412   if test -s conftest.err; then
6413     ac_cpp_err=$ac_c_preproc_warn_flag
6414@@ -13279,7 +13285,7 @@
6415 if test $ac_cv_header_stdc = yes; then
6416   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
6417   cat >conftest.$ac_ext <<_ACEOF
6418-#line 13282 "configure"
6419+#line 13288 "configure"
6420 #include "confdefs.h"
6421 #include <string.h>
6422
6423@@ -13297,7 +13303,7 @@
6424 if test $ac_cv_header_stdc = yes; then
6425   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
6426   cat >conftest.$ac_ext <<_ACEOF
6427-#line 13300 "configure"
6428+#line 13306 "configure"
6429 #include "confdefs.h"
6430 #include <stdlib.h>
6431
6432@@ -13318,7 +13324,7 @@
6433   :
6434 else
6435   cat >conftest.$ac_ext <<_ACEOF
6436-#line 13321 "configure"
6437+#line 13327 "configure"
6438 #include "confdefs.h"
6439 #include <ctype.h>
6440 #if ((' ' & 0x0FF) == 0x020)
6441@@ -13344,15 +13350,15 @@
6442 }
6443 _ACEOF
6444 rm -f conftest$ac_exeext
6445-if { (eval echo "$as_me:13347: \"$ac_link\"") >&5
6446+if { (eval echo "$as_me:13353: \"$ac_link\"") >&5
6447   (eval $ac_link) 2>&5
6448   ac_status=$?
6449-  echo "$as_me:13350: \$? = $ac_status" >&5
6450+  echo "$as_me:13356: \$? = $ac_status" >&5
6451   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
6452-  { (eval echo "$as_me:13352: \"$ac_try\"") >&5
6453+  { (eval echo "$as_me:13358: \"$ac_try\"") >&5
6454   (eval $ac_try) 2>&5
6455   ac_status=$?
6456-  echo "$as_me:13355: \$? = $ac_status" >&5
6457+  echo "$as_me:13361: \$? = $ac_status" >&5
6458   (exit $ac_status); }; }; then
6459   :
6460 else
6461@@ -13365,7 +13371,7 @@
6462 fi
6463 fi
6464 fi
6465-echo "$as_me:13368: result: $ac_cv_header_stdc" >&5
6466+echo "$as_me:13374: result: $ac_cv_header_stdc" >&5
6467 echo "${ECHO_T}$ac_cv_header_stdc" >&6
6468 if test $ac_cv_header_stdc = yes; then
6469
6470@@ -13381,28 +13387,28 @@
6471                   inttypes.h stdint.h unistd.h
6472 do
6473 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
6474-echo "$as_me:13384: checking for $ac_header" >&5
6475+echo "$as_me:13390: checking for $ac_header" >&5
6476 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
6477 if eval "test \"\${$as_ac_Header+set}\" = set"; then
6478   echo $ECHO_N "(cached) $ECHO_C" >&6
6479 else
6480   cat >conftest.$ac_ext <<_ACEOF
6481-#line 13390 "configure"
6482+#line 13396 "configure"
6483 #include "confdefs.h"
6484 $ac_includes_default
6485 #include <$ac_header>
6486 _ACEOF
6487 rm -f conftest.$ac_objext
6488-if { (eval echo "$as_me:13396: \"$ac_compile\"") >&5
6489+if { (eval echo "$as_me:13402: \"$ac_compile\"") >&5
6490   (eval $ac_compile) 2>&5
6491   ac_status=$?
6492-  echo "$as_me:13399: \$? = $ac_status" >&5
6493+  echo "$as_me:13405: \$? = $ac_status" >&5
6494   (exit $ac_status); } &&
6495          { ac_try='test -s conftest.$ac_objext'
6496-  { (eval echo "$as_me:13402: \"$ac_try\"") >&5
6497+  { (eval echo "$as_me:13408: \"$ac_try\"") >&5
6498   (eval $ac_try) 2>&5
6499   ac_status=$?
6500-  echo "$as_me:13405: \$? = $ac_status" >&5
6501+  echo "$as_me:13411: \$? = $ac_status" >&5
6502   (exit $ac_status); }; }; then
6503   eval "$as_ac_Header=yes"
6504 else
6505@@ -13412,7 +13418,7 @@
6506 fi
6507 rm -f conftest.$ac_objext conftest.$ac_ext
6508 fi
6509-echo "$as_me:13415: result: `eval echo '${'$as_ac_Header'}'`" >&5
6510+echo "$as_me:13421: result: `eval echo '${'$as_ac_Header'}'`" >&5
6511 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
6512 if test `eval echo '${'$as_ac_Header'}'` = yes; then
6513   cat >>confdefs.h <<EOF
6514@@ -13422,13 +13428,13 @@
6515 fi
6516 done
6517
6518-echo "$as_me:13425: checking for signed char" >&5
6519+echo "$as_me:13431: checking for signed char" >&5
6520 echo $ECHO_N "checking for signed char... $ECHO_C" >&6
6521 if test "${ac_cv_type_signed_char+set}" = set; then
6522   echo $ECHO_N "(cached) $ECHO_C" >&6
6523 else
6524   cat >conftest.$ac_ext <<_ACEOF
6525-#line 13431 "configure"
6526+#line 13437 "configure"
6527 #include "confdefs.h"
6528 $ac_includes_default
6529 int
6530@@ -13443,16 +13449,16 @@
6531 }
6532 _ACEOF
6533 rm -f conftest.$ac_objext
6534-if { (eval echo "$as_me:13446: \"$ac_compile\"") >&5
6535+if { (eval echo "$as_me:13452: \"$ac_compile\"") >&5
6536   (eval $ac_compile) 2>&5
6537   ac_status=$?
6538-  echo "$as_me:13449: \$? = $ac_status" >&5
6539+  echo "$as_me:13455: \$? = $ac_status" >&5
6540   (exit $ac_status); } &&
6541          { ac_try='test -s conftest.$ac_objext'
6542-  { (eval echo "$as_me:13452: \"$ac_try\"") >&5
6543+  { (eval echo "$as_me:13458: \"$ac_try\"") >&5
6544   (eval $ac_try) 2>&5
6545   ac_status=$?
6546-  echo "$as_me:13455: \$? = $ac_status" >&5
6547+  echo "$as_me:13461: \$? = $ac_status" >&5
6548   (exit $ac_status); }; }; then
6549   ac_cv_type_signed_char=yes
6550 else
6551@@ -13462,10 +13468,10 @@
6552 fi
6553 rm -f conftest.$ac_objext conftest.$ac_ext
6554 fi
6555-echo "$as_me:13465: result: $ac_cv_type_signed_char" >&5
6556+echo "$as_me:13471: result: $ac_cv_type_signed_char" >&5
6557 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
6558
6559-echo "$as_me:13468: checking size of signed char" >&5
6560+echo "$as_me:13474: checking size of signed char" >&5
6561 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
6562 if test "${ac_cv_sizeof_signed_char+set}" = set; then
6563   echo $ECHO_N "(cached) $ECHO_C" >&6
6564@@ -13474,7 +13480,7 @@
6565   if test "$cross_compiling" = yes; then
6566   # Depending upon the size, compute the lo and hi bounds.
6567 cat >conftest.$ac_ext <<_ACEOF
6568-#line 13477 "configure"
6569+#line 13483 "configure"
6570 #include "confdefs.h"
6571 $ac_includes_default
6572 int
6573@@ -13486,21 +13492,21 @@
6574 }
6575 _ACEOF
6576 rm -f conftest.$ac_objext
6577-if { (eval echo "$as_me:13489: \"$ac_compile\"") >&5
6578+if { (eval echo "$as_me:13495: \"$ac_compile\"") >&5
6579   (eval $ac_compile) 2>&5
6580   ac_status=$?
6581-  echo "$as_me:13492: \$? = $ac_status" >&5
6582+  echo "$as_me:13498: \$? = $ac_status" >&5
6583   (exit $ac_status); } &&
6584          { ac_try='test -s conftest.$ac_objext'
6585-  { (eval echo "$as_me:13495: \"$ac_try\"") >&5
6586+  { (eval echo "$as_me:13501: \"$ac_try\"") >&5
6587   (eval $ac_try) 2>&5
6588   ac_status=$?
6589-  echo "$as_me:13498: \$? = $ac_status" >&5
6590+  echo "$as_me:13504: \$? = $ac_status" >&5
6591   (exit $ac_status); }; }; then
6592   ac_lo=0 ac_mid=0
6593   while :; do
6594     cat >conftest.$ac_ext <<_ACEOF
6595-#line 13503 "configure"
6596+#line 13509 "configure"
6597 #include "confdefs.h"
6598 $ac_includes_default
6599 int
6600@@ -13512,16 +13518,16 @@
6601 }
6602 _ACEOF
6603 rm -f conftest.$ac_objext
6604-if { (eval echo "$as_me:13515: \"$ac_compile\"") >&5
6605+if { (eval echo "$as_me:13521: \"$ac_compile\"") >&5
6606   (eval $ac_compile) 2>&5
6607   ac_status=$?
6608-  echo "$as_me:13518: \$? = $ac_status" >&5
6609+  echo "$as_me:13524: \$? = $ac_status" >&5
6610   (exit $ac_status); } &&
6611          { ac_try='test -s conftest.$ac_objext'
6612-  { (eval echo "$as_me:13521: \"$ac_try\"") >&5
6613+  { (eval echo "$as_me:13527: \"$ac_try\"") >&5
6614   (eval $ac_try) 2>&5
6615   ac_status=$?
6616-  echo "$as_me:13524: \$? = $ac_status" >&5
6617+  echo "$as_me:13530: \$? = $ac_status" >&5
6618   (exit $ac_status); }; }; then
6619   ac_hi=$ac_mid; break
6620 else
6621@@ -13537,7 +13543,7 @@
6622 ac_hi=-1 ac_mid=-1
6623   while :; do
6624     cat >conftest.$ac_ext <<_ACEOF
6625-#line 13540 "configure"
6626+#line 13546 "configure"
6627 #include "confdefs.h"
6628 $ac_includes_default
6629 int
6630@@ -13549,16 +13555,16 @@
6631 }
6632 _ACEOF
6633 rm -f conftest.$ac_objext
6634-if { (eval echo "$as_me:13552: \"$ac_compile\"") >&5
6635+if { (eval echo "$as_me:13558: \"$ac_compile\"") >&5
6636   (eval $ac_compile) 2>&5
6637   ac_status=$?
6638-  echo "$as_me:13555: \$? = $ac_status" >&5
6639+  echo "$as_me:13561: \$? = $ac_status" >&5
6640   (exit $ac_status); } &&
6641          { ac_try='test -s conftest.$ac_objext'
6642-  { (eval echo "$as_me:13558: \"$ac_try\"") >&5
6643+  { (eval echo "$as_me:13564: \"$ac_try\"") >&5
6644   (eval $ac_try) 2>&5
6645   ac_status=$?
6646-  echo "$as_me:13561: \$? = $ac_status" >&5
6647+  echo "$as_me:13567: \$? = $ac_status" >&5
6648   (exit $ac_status); }; }; then
6649   ac_lo=$ac_mid; break
6650 else
6651@@ -13574,7 +13580,7 @@
6652 while test "x$ac_lo" != "x$ac_hi"; do
6653   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
6654   cat >conftest.$ac_ext <<_ACEOF
6655-#line 13577 "configure"
6656+#line 13583 "configure"
6657 #include "confdefs.h"
6658 $ac_includes_default
6659 int
6660@@ -13586,16 +13592,16 @@
6661 }
6662 _ACEOF
6663 rm -f conftest.$ac_objext
6664-if { (eval echo "$as_me:13589: \"$ac_compile\"") >&5
6665+if { (eval echo "$as_me:13595: \"$ac_compile\"") >&5
6666   (eval $ac_compile) 2>&5
6667   ac_status=$?
6668-  echo "$as_me:13592: \$? = $ac_status" >&5
6669+  echo "$as_me:13598: \$? = $ac_status" >&5
6670   (exit $ac_status); } &&
6671          { ac_try='test -s conftest.$ac_objext'
6672-  { (eval echo "$as_me:13595: \"$ac_try\"") >&5
6673+  { (eval echo "$as_me:13601: \"$ac_try\"") >&5
6674   (eval $ac_try) 2>&5
6675   ac_status=$?
6676-  echo "$as_me:13598: \$? = $ac_status" >&5
6677+  echo "$as_me:13604: \$? = $ac_status" >&5
6678   (exit $ac_status); }; }; then
6679   ac_hi=$ac_mid
6680 else
6681@@ -13608,12 +13614,12 @@
6682 ac_cv_sizeof_signed_char=$ac_lo
6683 else
6684   if test "$cross_compiling" = yes; then
6685-  { { echo "$as_me:13611: error: cannot run test program while cross compiling" >&5
6686+  { { echo "$as_me:13617: error: cannot run test program while cross compiling" >&5
6687 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
6688    { (exit 1); exit 1; }; }
6689 else
6690   cat >conftest.$ac_ext <<_ACEOF
6691-#line 13616 "configure"
6692+#line 13622 "configure"
6693 #include "confdefs.h"
6694 $ac_includes_default
6695 int
6696@@ -13629,15 +13635,15 @@
6697 }
6698 _ACEOF
6699 rm -f conftest$ac_exeext
6700-if { (eval echo "$as_me:13632: \"$ac_link\"") >&5
6701+if { (eval echo "$as_me:13638: \"$ac_link\"") >&5
6702   (eval $ac_link) 2>&5
6703   ac_status=$?
6704-  echo "$as_me:13635: \$? = $ac_status" >&5
6705+  echo "$as_me:13641: \$? = $ac_status" >&5
6706   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
6707-  { (eval echo "$as_me:13637: \"$ac_try\"") >&5
6708+  { (eval echo "$as_me:13643: \"$ac_try\"") >&5
6709   (eval $ac_try) 2>&5
6710   ac_status=$?
6711-  echo "$as_me:13640: \$? = $ac_status" >&5
6712+  echo "$as_me:13646: \$? = $ac_status" >&5
6713   (exit $ac_status); }; }; then
6714   ac_cv_sizeof_signed_char=`cat conftest.val`
6715 else
6716@@ -13653,7 +13659,7 @@
6717   ac_cv_sizeof_signed_char=0
6718 fi
6719 fi
6720-echo "$as_me:13656: result: $ac_cv_sizeof_signed_char" >&5
6721+echo "$as_me:13662: result: $ac_cv_sizeof_signed_char" >&5
6722 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
6723 cat >>confdefs.h <<EOF
6724 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
6725@@ -13664,7 +13670,7 @@
6726 else
6727 	NCURSES_SBOOL="char"
6728 fi
6729-echo "$as_me:13667: checking if you want to use signed Boolean array in term.h" >&5
6730+echo "$as_me:13673: checking if you want to use signed Boolean array in term.h" >&5
6731 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
6732
6733 # Check whether --enable-signed-char or --disable-signed-char was given.
6734@@ -13674,12 +13680,12 @@
6735 else
6736   with_signed_char=no
6737 fi;
6738-echo "$as_me:13677: result: $with_signed_char" >&5
6739+echo "$as_me:13683: result: $with_signed_char" >&5
6740 echo "${ECHO_T}$with_signed_char" >&6
6741 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
6742
6743 ###   use option --with-tparm-arg to override tparm's argument type
6744-echo "$as_me:13682: checking for type of tparm args" >&5
6745+echo "$as_me:13688: checking for type of tparm args" >&5
6746 echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
6747
6748 # Check whether --with-tparm-arg or --without-tparm-arg was given.
6749@@ -13689,11 +13695,11 @@
6750 else
6751   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
6752 fi;
6753-echo "$as_me:13692: result: $NCURSES_TPARM_ARG" >&5
6754+echo "$as_me:13698: result: $NCURSES_TPARM_ARG" >&5
6755 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
6756
6757 ### Enable compiling-in rcs id's
6758-echo "$as_me:13696: checking if RCS identifiers should be compiled-in" >&5
6759+echo "$as_me:13702: checking if RCS identifiers should be compiled-in" >&5
6760 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
6761
6762 # Check whether --with-rcs-ids or --without-rcs-ids was given.
6763@@ -13703,7 +13709,7 @@
6764 else
6765   with_rcs_ids=no
6766 fi;
6767-echo "$as_me:13706: result: $with_rcs_ids" >&5
6768+echo "$as_me:13712: result: $with_rcs_ids" >&5
6769 echo "${ECHO_T}$with_rcs_ids" >&6
6770 test "x$with_rcs_ids" = xyes &&
6771 cat >>confdefs.h <<\EOF
6772@@ -13712,7 +13718,7 @@
6773
6774 ###############################################################################
6775
6776-echo "$as_me:13715: checking format of man-pages" >&5
6777+echo "$as_me:13721: checking format of man-pages" >&5
6778 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
6779
6780 # Check whether --with-manpage-format or --without-manpage-format was given.
6781@@ -13801,14 +13807,14 @@
6782 	;;
6783 esac
6784
6785-echo "$as_me:13804: result: $MANPAGE_FORMAT" >&5
6786+echo "$as_me:13810: result: $MANPAGE_FORMAT" >&5
6787 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
6788 if test -n "$cf_unknown" ; then
6789-	{ echo "$as_me:13807: WARNING: Unexpected manpage-format $cf_unknown" >&5
6790+	{ echo "$as_me:13813: WARNING: Unexpected manpage-format $cf_unknown" >&5
6791 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
6792 fi
6793
6794-echo "$as_me:13811: checking for manpage renaming" >&5
6795+echo "$as_me:13817: checking for manpage renaming" >&5
6796 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
6797
6798 # Check whether --with-manpage-renames or --without-manpage-renames was given.
6799@@ -13836,7 +13842,7 @@
6800 	if test -f $srcdir/man/$MANPAGE_RENAMES ; then
6801 		MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
6802 	elif test ! -f $MANPAGE_RENAMES ; then
6803-		{ { echo "$as_me:13839: error: not a filename: $MANPAGE_RENAMES" >&5
6804+		{ { echo "$as_me:13845: error: not a filename: $MANPAGE_RENAMES" >&5
6805 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
6806    { (exit 1); exit 1; }; }
6807 	fi
6808@@ -13850,10 +13856,10 @@
6809 	fi
6810 fi
6811
6812-echo "$as_me:13853: result: $MANPAGE_RENAMES" >&5
6813+echo "$as_me:13859: result: $MANPAGE_RENAMES" >&5
6814 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
6815
6816-echo "$as_me:13856: checking if manpage aliases will be installed" >&5
6817+echo "$as_me:13862: checking if manpage aliases will be installed" >&5
6818 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
6819
6820 # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
6821@@ -13864,7 +13870,7 @@
6822   MANPAGE_ALIASES=yes
6823 fi;
6824
6825-echo "$as_me:13867: result: $MANPAGE_ALIASES" >&5
6826+echo "$as_me:13873: result: $MANPAGE_ALIASES" >&5
6827 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
6828
6829 case "x$LN_S" in
6830@@ -13878,7 +13884,7 @@
6831
6832 MANPAGE_SYMLINKS=no
6833 if test "$MANPAGE_ALIASES" = yes ; then
6834-echo "$as_me:13881: checking if manpage symlinks should be used" >&5
6835+echo "$as_me:13887: checking if manpage symlinks should be used" >&5
6836 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
6837
6838 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
6839@@ -13891,17 +13897,17 @@
6840
6841 if test "$$cf_use_symlinks" = no; then
6842 if test "$MANPAGE_SYMLINKS" = yes ; then
6843-	{ echo "$as_me:13894: WARNING: cannot make symlinks" >&5
6844+	{ echo "$as_me:13900: WARNING: cannot make symlinks" >&5
6845 echo "$as_me: WARNING: cannot make symlinks" >&2;}
6846 	MANPAGE_SYMLINKS=no
6847 fi
6848 fi
6849
6850-echo "$as_me:13900: result: $MANPAGE_SYMLINKS" >&5
6851+echo "$as_me:13906: result: $MANPAGE_SYMLINKS" >&5
6852 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
6853 fi
6854
6855-echo "$as_me:13904: checking for manpage tbl" >&5
6856+echo "$as_me:13910: checking for manpage tbl" >&5
6857 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
6858
6859 # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
6860@@ -13912,7 +13918,7 @@
6861   MANPAGE_TBL=no
6862 fi;
6863
6864-echo "$as_me:13915: result: $MANPAGE_TBL" >&5
6865+echo "$as_me:13921: result: $MANPAGE_TBL" >&5
6866 echo "${ECHO_T}$MANPAGE_TBL" >&6
6867
6868 if test "$prefix" = "NONE" ; then
6869@@ -14245,7 +14251,7 @@
6870 ###############################################################################
6871
6872 ### Note that some functions (such as const) are normally disabled anyway.
6873-echo "$as_me:14248: checking if you want to build with function extensions" >&5
6874+echo "$as_me:14254: checking if you want to build with function extensions" >&5
6875 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
6876
6877 # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
6878@@ -14255,7 +14261,7 @@
6879 else
6880   with_ext_funcs=yes
6881 fi;
6882-echo "$as_me:14258: result: $with_ext_funcs" >&5
6883+echo "$as_me:14264: result: $with_ext_funcs" >&5
6884 echo "${ECHO_T}$with_ext_funcs" >&6
6885 if test "x$with_ext_funcs" = xyes ; then
6886 	NCURSES_EXT_FUNCS=1
6887@@ -14315,7 +14321,7 @@
6888 	GENERATED_EXT_FUNCS=
6889 fi
6890
6891-echo "$as_me:14318: checking if you want to build with SCREEN extensions" >&5
6892+echo "$as_me:14324: checking if you want to build with SCREEN extensions" >&5
6893 echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
6894
6895 # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
6896@@ -14325,7 +14331,7 @@
6897 else
6898   with_sp_funcs=$cf_dft_ext_spfuncs
6899 fi;
6900-echo "$as_me:14328: result: $with_sp_funcs" >&5
6901+echo "$as_me:14334: result: $with_sp_funcs" >&5
6902 echo "${ECHO_T}$with_sp_funcs" >&6
6903 if test "x$with_sp_funcs" = xyes ; then
6904 	NCURSES_SP_FUNCS=1
6905@@ -14344,7 +14350,7 @@
6906 	GENERATED_SP_FUNCS=
6907 fi
6908
6909-echo "$as_me:14347: checking if you want to build with terminal-driver" >&5
6910+echo "$as_me:14353: checking if you want to build with terminal-driver" >&5
6911 echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
6912
6913 # Check whether --enable-term-driver or --disable-term-driver was given.
6914@@ -14354,7 +14360,7 @@
6915 else
6916   with_term_driver=no
6917 fi;
6918-echo "$as_me:14357: result: $with_term_driver" >&5
6919+echo "$as_me:14363: result: $with_term_driver" >&5
6920 echo "${ECHO_T}$with_term_driver" >&6
6921 if test "x$with_term_driver" = xyes ; then
6922
6923@@ -14363,19 +14369,19 @@
6924 EOF
6925
6926 	if test "x$with_termlib" != xno ; then
6927-		{ { echo "$as_me:14366: error: The term-driver option conflicts with the termlib option" >&5
6928+		{ { echo "$as_me:14372: error: The term-driver option conflicts with the termlib option" >&5
6929 echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
6930    { (exit 1); exit 1; }; }
6931 	fi
6932 	if test "x$with_sp_funcs" != xyes ; then
6933-		{ { echo "$as_me:14371: error: The term-driver option relies upon sp-funcs" >&5
6934+		{ { echo "$as_me:14377: error: The term-driver option relies upon sp-funcs" >&5
6935 echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
6936    { (exit 1); exit 1; }; }
6937 	fi
6938 fi
6939
6940 ###   use option --enable-const to turn on use of const beyond that in XSI.
6941-echo "$as_me:14378: checking for extended use of const keyword" >&5
6942+echo "$as_me:14384: checking for extended use of const keyword" >&5
6943 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
6944
6945 # Check whether --enable-const or --disable-const was given.
6946@@ -14385,7 +14391,7 @@
6947 else
6948   with_ext_const=$cf_dft_ext_const
6949 fi;
6950-echo "$as_me:14388: result: $with_ext_const" >&5
6951+echo "$as_me:14394: result: $with_ext_const" >&5
6952 echo "${ECHO_T}$with_ext_const" >&6
6953 NCURSES_CONST='/*nothing*/'
6954 if test "x$with_ext_const" = xyes ; then
6955@@ -14393,7 +14399,7 @@
6956 fi
6957
6958 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
6959-echo "$as_me:14396: checking if you want to use extended colors" >&5
6960+echo "$as_me:14402: checking if you want to use extended colors" >&5
6961 echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
6962
6963 # Check whether --enable-ext-colors or --disable-ext-colors was given.
6964@@ -14403,12 +14409,12 @@
6965 else
6966   with_ext_colors=$cf_dft_ext_colors
6967 fi;
6968-echo "$as_me:14406: result: $with_ext_colors" >&5
6969+echo "$as_me:14412: result: $with_ext_colors" >&5
6970 echo "${ECHO_T}$with_ext_colors" >&6
6971 NCURSES_EXT_COLORS=0
6972 if test "x$with_ext_colors" = xyes ; then
6973 	if test "x$with_widec" != xyes ; then
6974-		{ echo "$as_me:14411: WARNING: This option applies only to wide-character library" >&5
6975+		{ echo "$as_me:14417: WARNING: This option applies only to wide-character library" >&5
6976 echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
6977 	else
6978 		# cannot be ABI 5 since it changes sizeof(cchar_t)
6979@@ -14418,7 +14424,7 @@
6980 	(5.*)
6981 		cf_cv_rel_version=6.0
6982 		cf_cv_abi_version=6
6983-		{ echo "$as_me:14421: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
6984+		{ echo "$as_me:14427: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
6985 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
6986 		;;
6987 	esac
6988@@ -14446,7 +14452,7 @@
6989 fi
6990
6991 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
6992-echo "$as_me:14449: checking if you want to use extended mouse encoding" >&5
6993+echo "$as_me:14455: checking if you want to use extended mouse encoding" >&5
6994 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
6995
6996 # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
6997@@ -14456,7 +14462,7 @@
6998 else
6999   with_ext_mouse=$cf_dft_ext_mouse
7000 fi;
7001-echo "$as_me:14459: result: $with_ext_mouse" >&5
7002+echo "$as_me:14465: result: $with_ext_mouse" >&5
7003 echo "${ECHO_T}$with_ext_mouse" >&6
7004 NCURSES_MOUSE_VERSION=1
7005 if test "x$with_ext_mouse" = xyes ; then
7006@@ -14467,7 +14473,7 @@
7007 	(5.*)
7008 		cf_cv_rel_version=6.0
7009 		cf_cv_abi_version=6
7010-		{ echo "$as_me:14470: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
7011+		{ echo "$as_me:14476: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
7012 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
7013 		;;
7014 	esac
7015@@ -14476,7 +14482,7 @@
7016 fi
7017
7018 ###   use option --enable-ext-putwin to turn on extended screendumps
7019-echo "$as_me:14479: checking if you want to use extended putwin/screendump" >&5
7020+echo "$as_me:14485: checking if you want to use extended putwin/screendump" >&5
7021 echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
7022
7023 # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
7024@@ -14486,7 +14492,7 @@
7025 else
7026   with_ext_putwin=$cf_dft_ext_putwin
7027 fi;
7028-echo "$as_me:14489: result: $with_ext_putwin" >&5
7029+echo "$as_me:14495: result: $with_ext_putwin" >&5
7030 echo "${ECHO_T}$with_ext_putwin" >&6
7031 if test "x$with_ext_putwin" = xyes ; then
7032
7033@@ -14496,7 +14502,7 @@
7034
7035 fi
7036
7037-echo "$as_me:14499: checking if you want \$NCURSES_NO_PADDING code" >&5
7038+echo "$as_me:14505: checking if you want \$NCURSES_NO_PADDING code" >&5
7039 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
7040
7041 # Check whether --enable-no-padding or --disable-no-padding was given.
7042@@ -14506,7 +14512,7 @@
7043 else
7044   with_no_padding=$with_ext_funcs
7045 fi;
7046-echo "$as_me:14509: result: $with_no_padding" >&5
7047+echo "$as_me:14515: result: $with_no_padding" >&5
7048 echo "${ECHO_T}$with_no_padding" >&6
7049 test "x$with_no_padding" = xyes &&
7050 cat >>confdefs.h <<\EOF
7051@@ -14514,7 +14520,7 @@
7052 EOF
7053
7054 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
7055-echo "$as_me:14517: checking if you want SIGWINCH handler" >&5
7056+echo "$as_me:14523: checking if you want SIGWINCH handler" >&5
7057 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
7058
7059 # Check whether --enable-sigwinch or --disable-sigwinch was given.
7060@@ -14524,7 +14530,7 @@
7061 else
7062   with_sigwinch=$with_ext_funcs
7063 fi;
7064-echo "$as_me:14527: result: $with_sigwinch" >&5
7065+echo "$as_me:14533: result: $with_sigwinch" >&5
7066 echo "${ECHO_T}$with_sigwinch" >&6
7067 test "x$with_sigwinch" = xyes &&
7068 cat >>confdefs.h <<\EOF
7069@@ -14532,7 +14538,7 @@
7070 EOF
7071
7072 ###   use option --enable-tcap-names to allow user to define new capabilities
7073-echo "$as_me:14535: checking if you want user-definable terminal capabilities like termcap" >&5
7074+echo "$as_me:14541: checking if you want user-definable terminal capabilities like termcap" >&5
7075 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
7076
7077 # Check whether --enable-tcap-names or --disable-tcap-names was given.
7078@@ -14542,14 +14548,14 @@
7079 else
7080   with_tcap_names=$with_ext_funcs
7081 fi;
7082-echo "$as_me:14545: result: $with_tcap_names" >&5
7083+echo "$as_me:14551: result: $with_tcap_names" >&5
7084 echo "${ECHO_T}$with_tcap_names" >&6
7085 NCURSES_XNAMES=0
7086 test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
7087
7088 ##############################################################################
7089
7090-echo "$as_me:14552: checking if you want to link with the pthread library" >&5
7091+echo "$as_me:14558: checking if you want to link with the pthread library" >&5
7092 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
7093
7094 # Check whether --with-pthread or --without-pthread was given.
7095@@ -14559,27 +14565,27 @@
7096 else
7097   with_pthread=no
7098 fi;
7099-echo "$as_me:14562: result: $with_pthread" >&5
7100+echo "$as_me:14568: result: $with_pthread" >&5
7101 echo "${ECHO_T}$with_pthread" >&6
7102
7103 if test "$with_pthread" != no ; then
7104-	echo "$as_me:14566: checking for pthread.h" >&5
7105+	echo "$as_me:14572: checking for pthread.h" >&5
7106 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
7107 if test "${ac_cv_header_pthread_h+set}" = set; then
7108   echo $ECHO_N "(cached) $ECHO_C" >&6
7109 else
7110   cat >conftest.$ac_ext <<_ACEOF
7111-#line 14572 "configure"
7112+#line 14578 "configure"
7113 #include "confdefs.h"
7114 #include <pthread.h>
7115 _ACEOF
7116-if { (eval echo "$as_me:14576: \"$ac_cpp conftest.$ac_ext\"") >&5
7117+if { (eval echo "$as_me:14582: \"$ac_cpp conftest.$ac_ext\"") >&5
7118   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7119   ac_status=$?
7120   egrep -v '^ *\+' conftest.er1 >conftest.err
7121   rm -f conftest.er1
7122   cat conftest.err >&5
7123-  echo "$as_me:14582: \$? = $ac_status" >&5
7124+  echo "$as_me:14588: \$? = $ac_status" >&5
7125   (exit $ac_status); } >/dev/null; then
7126   if test -s conftest.err; then
7127     ac_cpp_err=$ac_c_preproc_warn_flag
7128@@ -14598,7 +14604,7 @@
7129 fi
7130 rm -f conftest.err conftest.$ac_ext
7131 fi
7132-echo "$as_me:14601: result: $ac_cv_header_pthread_h" >&5
7133+echo "$as_me:14607: result: $ac_cv_header_pthread_h" >&5
7134 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
7135 if test $ac_cv_header_pthread_h = yes; then
7136
7137@@ -14608,7 +14614,7 @@
7138
7139 	for cf_lib_pthread in pthread c_r
7140 	do
7141-	    echo "$as_me:14611: checking if we can link with the $cf_lib_pthread library" >&5
7142+	    echo "$as_me:14617: checking if we can link with the $cf_lib_pthread library" >&5
7143 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
7144 	    cf_save_LIBS="$LIBS"
7145
7146@@ -14629,7 +14635,7 @@
7147 LIBS="$cf_add_libs"
7148
7149 	    cat >conftest.$ac_ext <<_ACEOF
7150-#line 14632 "configure"
7151+#line 14638 "configure"
7152 #include "confdefs.h"
7153
7154 #include <pthread.h>
7155@@ -14646,16 +14652,16 @@
7156 }
7157 _ACEOF
7158 rm -f conftest.$ac_objext conftest$ac_exeext
7159-if { (eval echo "$as_me:14649: \"$ac_link\"") >&5
7160+if { (eval echo "$as_me:14655: \"$ac_link\"") >&5
7161   (eval $ac_link) 2>&5
7162   ac_status=$?
7163-  echo "$as_me:14652: \$? = $ac_status" >&5
7164+  echo "$as_me:14658: \$? = $ac_status" >&5
7165   (exit $ac_status); } &&
7166          { ac_try='test -s conftest$ac_exeext'
7167-  { (eval echo "$as_me:14655: \"$ac_try\"") >&5
7168+  { (eval echo "$as_me:14661: \"$ac_try\"") >&5
7169   (eval $ac_try) 2>&5
7170   ac_status=$?
7171-  echo "$as_me:14658: \$? = $ac_status" >&5
7172+  echo "$as_me:14664: \$? = $ac_status" >&5
7173   (exit $ac_status); }; }; then
7174   with_pthread=yes
7175 else
7176@@ -14665,7 +14671,7 @@
7177 fi
7178 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
7179 	    LIBS="$cf_save_LIBS"
7180-	    echo "$as_me:14668: result: $with_pthread" >&5
7181+	    echo "$as_me:14674: result: $with_pthread" >&5
7182 echo "${ECHO_T}$with_pthread" >&6
7183 	    test "$with_pthread" = yes && break
7184 	done
7185@@ -14693,7 +14699,7 @@
7186 EOF
7187
7188 	else
7189-	    { { echo "$as_me:14696: error: Cannot link with pthread library" >&5
7190+	    { { echo "$as_me:14702: error: Cannot link with pthread library" >&5
7191 echo "$as_me: error: Cannot link with pthread library" >&2;}
7192    { (exit 1); exit 1; }; }
7193 	fi
7194@@ -14703,13 +14709,13 @@
7195 fi
7196
7197 if test "x$with_pthread" != xno; then
7198-	echo "$as_me:14706: checking for pthread_kill" >&5
7199+	echo "$as_me:14712: checking for pthread_kill" >&5
7200 echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
7201 if test "${ac_cv_func_pthread_kill+set}" = set; then
7202   echo $ECHO_N "(cached) $ECHO_C" >&6
7203 else
7204   cat >conftest.$ac_ext <<_ACEOF
7205-#line 14712 "configure"
7206+#line 14718 "configure"
7207 #include "confdefs.h"
7208 #define pthread_kill autoconf_temporary
7209 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
7210@@ -14740,16 +14746,16 @@
7211 }
7212 _ACEOF
7213 rm -f conftest.$ac_objext conftest$ac_exeext
7214-if { (eval echo "$as_me:14743: \"$ac_link\"") >&5
7215+if { (eval echo "$as_me:14749: \"$ac_link\"") >&5
7216   (eval $ac_link) 2>&5
7217   ac_status=$?
7218-  echo "$as_me:14746: \$? = $ac_status" >&5
7219+  echo "$as_me:14752: \$? = $ac_status" >&5
7220   (exit $ac_status); } &&
7221          { ac_try='test -s conftest$ac_exeext'
7222-  { (eval echo "$as_me:14749: \"$ac_try\"") >&5
7223+  { (eval echo "$as_me:14755: \"$ac_try\"") >&5
7224   (eval $ac_try) 2>&5
7225   ac_status=$?
7226-  echo "$as_me:14752: \$? = $ac_status" >&5
7227+  echo "$as_me:14758: \$? = $ac_status" >&5
7228   (exit $ac_status); }; }; then
7229   ac_cv_func_pthread_kill=yes
7230 else
7231@@ -14759,11 +14765,11 @@
7232 fi
7233 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
7234 fi
7235-echo "$as_me:14762: result: $ac_cv_func_pthread_kill" >&5
7236+echo "$as_me:14768: result: $ac_cv_func_pthread_kill" >&5
7237 echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
7238 if test $ac_cv_func_pthread_kill = yes; then
7239
7240-		echo "$as_me:14766: checking if you want to allow EINTR in wgetch with pthreads" >&5
7241+		echo "$as_me:14772: checking if you want to allow EINTR in wgetch with pthreads" >&5
7242 echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
7243
7244 # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
7245@@ -14773,7 +14779,7 @@
7246 else
7247   use_pthreads_eintr=no
7248 fi;
7249-		echo "$as_me:14776: result: $use_pthreads_eintr" >&5
7250+		echo "$as_me:14782: result: $use_pthreads_eintr" >&5
7251 echo "${ECHO_T}$use_pthreads_eintr" >&6
7252 		if test "x$use_pthreads_eintr" = xyes ; then
7253
7254@@ -14784,7 +14790,7 @@
7255 		fi
7256 fi
7257
7258-	echo "$as_me:14787: checking if you want to use weak-symbols for pthreads" >&5
7259+	echo "$as_me:14793: checking if you want to use weak-symbols for pthreads" >&5
7260 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
7261
7262 # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
7263@@ -14794,18 +14800,18 @@
7264 else
7265   use_weak_symbols=no
7266 fi;
7267-	echo "$as_me:14797: result: $use_weak_symbols" >&5
7268+	echo "$as_me:14803: result: $use_weak_symbols" >&5
7269 echo "${ECHO_T}$use_weak_symbols" >&6
7270 	if test "x$use_weak_symbols" = xyes ; then
7271
7272-echo "$as_me:14801: checking if $CC supports weak symbols" >&5
7273+echo "$as_me:14807: checking if $CC supports weak symbols" >&5
7274 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
7275 if test "${cf_cv_weak_symbols+set}" = set; then
7276   echo $ECHO_N "(cached) $ECHO_C" >&6
7277 else
7278
7279 cat >conftest.$ac_ext <<_ACEOF
7280-#line 14808 "configure"
7281+#line 14814 "configure"
7282 #include "confdefs.h"
7283
7284 #include <stdio.h>
7285@@ -14831,16 +14837,16 @@
7286 }
7287 _ACEOF
7288 rm -f conftest.$ac_objext
7289-if { (eval echo "$as_me:14834: \"$ac_compile\"") >&5
7290+if { (eval echo "$as_me:14840: \"$ac_compile\"") >&5
7291   (eval $ac_compile) 2>&5
7292   ac_status=$?
7293-  echo "$as_me:14837: \$? = $ac_status" >&5
7294+  echo "$as_me:14843: \$? = $ac_status" >&5
7295   (exit $ac_status); } &&
7296          { ac_try='test -s conftest.$ac_objext'
7297-  { (eval echo "$as_me:14840: \"$ac_try\"") >&5
7298+  { (eval echo "$as_me:14846: \"$ac_try\"") >&5
7299   (eval $ac_try) 2>&5
7300   ac_status=$?
7301-  echo "$as_me:14843: \$? = $ac_status" >&5
7302+  echo "$as_me:14849: \$? = $ac_status" >&5
7303   (exit $ac_status); }; }; then
7304   cf_cv_weak_symbols=yes
7305 else
7306@@ -14851,7 +14857,7 @@
7307 rm -f conftest.$ac_objext conftest.$ac_ext
7308
7309 fi
7310-echo "$as_me:14854: result: $cf_cv_weak_symbols" >&5
7311+echo "$as_me:14860: result: $cf_cv_weak_symbols" >&5
7312 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
7313
7314 	else
7315@@ -14901,7 +14907,7 @@
7316 # opaque outside of that, so there is no --enable-opaque option.  We can use
7317 # this option without --with-pthreads, but this will be always set for
7318 # pthreads.
7319-echo "$as_me:14904: checking if you want reentrant code" >&5
7320+echo "$as_me:14910: checking if you want reentrant code" >&5
7321 echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
7322
7323 # Check whether --enable-reentrant or --disable-reentrant was given.
7324@@ -14911,7 +14917,7 @@
7325 else
7326   with_reentrant=no
7327 fi;
7328-echo "$as_me:14914: result: $with_reentrant" >&5
7329+echo "$as_me:14920: result: $with_reentrant" >&5
7330 echo "${ECHO_T}$with_reentrant" >&6
7331 if test "x$with_reentrant" = xyes ; then
7332 	cf_cv_enable_reentrant=1
7333@@ -14999,7 +15005,7 @@
7334 	(5.*)
7335 		cf_cv_rel_version=6.0
7336 		cf_cv_abi_version=6
7337-		{ echo "$as_me:15002: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
7338+		{ echo "$as_me:15008: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
7339 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
7340 		;;
7341 	esac
7342@@ -15011,7 +15017,7 @@
7343 	NCURSES_SIZE_T=short
7344 fi
7345
7346-echo "$as_me:15014: checking if you want opaque curses-library structures" >&5
7347+echo "$as_me:15020: checking if you want opaque curses-library structures" >&5
7348 echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6
7349
7350 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
7351@@ -15033,16 +15039,16 @@
7352 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no
7353
7354 fi;
7355-echo "$as_me:15036: result: $enable_opaque_curses" >&5
7356+echo "$as_me:15042: result: $enable_opaque_curses" >&5
7357 echo "${ECHO_T}$enable_opaque_curses" >&6
7358
7359 test "$cf_cv_enable_reentrant" = 1 && \
7360 test "$enable_opaque_curses" = no && \
7361-{ { echo "$as_me:15041: error: reentrant configuration requires opaque library" >&5
7362+{ { echo "$as_me:15047: error: reentrant configuration requires opaque library" >&5
7363 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
7364    { (exit 1); exit 1; }; }
7365
7366-echo "$as_me:15045: checking if you want opaque form-library structures" >&5
7367+echo "$as_me:15051: checking if you want opaque form-library structures" >&5
7368 echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6
7369
7370 # Check whether --enable-opaque-form or --disable-opaque-form was given.
7371@@ -15052,10 +15058,10 @@
7372 else
7373   enable_opaque_form=no
7374 fi;
7375-echo "$as_me:15055: result: $enable_opaque_form" >&5
7376+echo "$as_me:15061: result: $enable_opaque_form" >&5
7377 echo "${ECHO_T}$enable_opaque_form" >&6
7378
7379-echo "$as_me:15058: checking if you want opaque menu-library structures" >&5
7380+echo "$as_me:15064: checking if you want opaque menu-library structures" >&5
7381 echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6
7382
7383 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
7384@@ -15065,10 +15071,10 @@
7385 else
7386   enable_opaque_menu=no
7387 fi;
7388-echo "$as_me:15068: result: $enable_opaque_menu" >&5
7389+echo "$as_me:15074: result: $enable_opaque_menu" >&5
7390 echo "${ECHO_T}$enable_opaque_menu" >&6
7391
7392-echo "$as_me:15071: checking if you want opaque panel-library structures" >&5
7393+echo "$as_me:15077: checking if you want opaque panel-library structures" >&5
7394 echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6
7395
7396 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
7397@@ -15078,7 +15084,7 @@
7398 else
7399   enable_opaque_panel=no
7400 fi;
7401-echo "$as_me:15081: result: $enable_opaque_panel" >&5
7402+echo "$as_me:15087: result: $enable_opaque_panel" >&5
7403 echo "${ECHO_T}$enable_opaque_panel" >&6
7404
7405 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
7406@@ -15088,7 +15094,7 @@
7407
7408 ### Allow using a different wrap-prefix
7409 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
7410-	echo "$as_me:15091: checking for prefix used to wrap public variables" >&5
7411+	echo "$as_me:15097: checking for prefix used to wrap public variables" >&5
7412 echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
7413
7414 # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
7415@@ -15098,7 +15104,7 @@
7416 else
7417   NCURSES_WRAP_PREFIX=_nc_
7418 fi;
7419-	echo "$as_me:15101: result: $NCURSES_WRAP_PREFIX" >&5
7420+	echo "$as_me:15107: result: $NCURSES_WRAP_PREFIX" >&5
7421 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
7422 else
7423 	NCURSES_WRAP_PREFIX=_nc_
7424@@ -15111,7 +15117,7 @@
7425 ###############################################################################
7426 # These options are relatively safe to experiment with.
7427
7428-echo "$as_me:15114: checking if you want all development code" >&5
7429+echo "$as_me:15120: checking if you want all development code" >&5
7430 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
7431
7432 # Check whether --with-develop or --without-develop was given.
7433@@ -15121,11 +15127,11 @@
7434 else
7435   with_develop=no
7436 fi;
7437-echo "$as_me:15124: result: $with_develop" >&5
7438+echo "$as_me:15130: result: $with_develop" >&5
7439 echo "${ECHO_T}$with_develop" >&6
7440
7441 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
7442-echo "$as_me:15128: checking if you want hard-tabs code" >&5
7443+echo "$as_me:15134: checking if you want hard-tabs code" >&5
7444 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
7445
7446 # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
7447@@ -15135,7 +15141,7 @@
7448 else
7449   enable_hard_tabs=$with_develop
7450 fi;
7451-echo "$as_me:15138: result: $enable_hard_tabs" >&5
7452+echo "$as_me:15144: result: $enable_hard_tabs" >&5
7453 echo "${ECHO_T}$enable_hard_tabs" >&6
7454 test "x$enable_hard_tabs" = xyes &&
7455 cat >>confdefs.h <<\EOF
7456@@ -15143,7 +15149,7 @@
7457 EOF
7458
7459 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
7460-echo "$as_me:15146: checking if you want limited support for xmc" >&5
7461+echo "$as_me:15152: checking if you want limited support for xmc" >&5
7462 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
7463
7464 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
7465@@ -15153,7 +15159,7 @@
7466 else
7467   enable_xmc_glitch=$with_develop
7468 fi;
7469-echo "$as_me:15156: result: $enable_xmc_glitch" >&5
7470+echo "$as_me:15162: result: $enable_xmc_glitch" >&5
7471 echo "${ECHO_T}$enable_xmc_glitch" >&6
7472 test "x$enable_xmc_glitch" = xyes &&
7473 cat >>confdefs.h <<\EOF
7474@@ -15163,7 +15169,7 @@
7475 ###############################################################################
7476 # These are just experimental, probably should not be in a package:
7477
7478-echo "$as_me:15166: checking if you do not want to assume colors are white-on-black" >&5
7479+echo "$as_me:15172: checking if you do not want to assume colors are white-on-black" >&5
7480 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
7481
7482 # Check whether --enable-assumed-color or --disable-assumed-color was given.
7483@@ -15173,7 +15179,7 @@
7484 else
7485   with_assumed_color=yes
7486 fi;
7487-echo "$as_me:15176: result: $with_assumed_color" >&5
7488+echo "$as_me:15182: result: $with_assumed_color" >&5
7489 echo "${ECHO_T}$with_assumed_color" >&6
7490 test "x$with_assumed_color" = xyes &&
7491 cat >>confdefs.h <<\EOF
7492@@ -15181,7 +15187,7 @@
7493 EOF
7494
7495 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
7496-echo "$as_me:15184: checking if you want hashmap scrolling-optimization code" >&5
7497+echo "$as_me:15190: checking if you want hashmap scrolling-optimization code" >&5
7498 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
7499
7500 # Check whether --enable-hashmap or --disable-hashmap was given.
7501@@ -15191,7 +15197,7 @@
7502 else
7503   with_hashmap=yes
7504 fi;
7505-echo "$as_me:15194: result: $with_hashmap" >&5
7506+echo "$as_me:15200: result: $with_hashmap" >&5
7507 echo "${ECHO_T}$with_hashmap" >&6
7508 test "x$with_hashmap" = xyes &&
7509 cat >>confdefs.h <<\EOF
7510@@ -15199,7 +15205,7 @@
7511 EOF
7512
7513 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
7514-echo "$as_me:15202: checking if you want colorfgbg code" >&5
7515+echo "$as_me:15208: checking if you want colorfgbg code" >&5
7516 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
7517
7518 # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
7519@@ -15209,7 +15215,7 @@
7520 else
7521   with_colorfgbg=no
7522 fi;
7523-echo "$as_me:15212: result: $with_colorfgbg" >&5
7524+echo "$as_me:15218: result: $with_colorfgbg" >&5
7525 echo "${ECHO_T}$with_colorfgbg" >&6
7526 test "x$with_colorfgbg" = xyes &&
7527 cat >>confdefs.h <<\EOF
7528@@ -15217,7 +15223,7 @@
7529 EOF
7530
7531 ###   use option --enable-interop to turn on use of bindings used for interop
7532-echo "$as_me:15220: checking if you want interop bindings" >&5
7533+echo "$as_me:15226: checking if you want interop bindings" >&5
7534 echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
7535
7536 # Check whether --enable-interop or --disable-interop was given.
7537@@ -15227,13 +15233,13 @@
7538 else
7539   with_exp_interop=$cf_dft_interop
7540 fi;
7541-echo "$as_me:15230: result: $with_exp_interop" >&5
7542+echo "$as_me:15236: result: $with_exp_interop" >&5
7543 echo "${ECHO_T}$with_exp_interop" >&6
7544
7545 NCURSES_INTEROP_FUNCS=0
7546 test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1
7547
7548-echo "$as_me:15236: checking if you want experimental safe-sprintf code" >&5
7549+echo "$as_me:15242: checking if you want experimental safe-sprintf code" >&5
7550 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
7551
7552 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
7553@@ -15243,13 +15249,13 @@
7554 else
7555   with_safe_sprintf=no
7556 fi;
7557-echo "$as_me:15246: result: $with_safe_sprintf" >&5
7558+echo "$as_me:15252: result: $with_safe_sprintf" >&5
7559 echo "${ECHO_T}$with_safe_sprintf" >&6
7560
7561 ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
7562 # when hashmap is used scroll hints are useless
7563 if test "$with_hashmap" = no ; then
7564-echo "$as_me:15252: checking if you want to experiment without scrolling-hints code" >&5
7565+echo "$as_me:15258: checking if you want to experiment without scrolling-hints code" >&5
7566 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
7567
7568 # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
7569@@ -15259,7 +15265,7 @@
7570 else
7571   with_scroll_hints=yes
7572 fi;
7573-echo "$as_me:15262: result: $with_scroll_hints" >&5
7574+echo "$as_me:15268: result: $with_scroll_hints" >&5
7575 echo "${ECHO_T}$with_scroll_hints" >&6
7576 test "x$with_scroll_hints" = xyes &&
7577 cat >>confdefs.h <<\EOF
7578@@ -15268,7 +15274,7 @@
7579
7580 fi
7581
7582-echo "$as_me:15271: checking if you want wgetch-events code" >&5
7583+echo "$as_me:15277: checking if you want wgetch-events code" >&5
7584 echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
7585
7586 # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
7587@@ -15278,7 +15284,7 @@
7588 else
7589   with_wgetch_events=no
7590 fi;
7591-echo "$as_me:15281: result: $with_wgetch_events" >&5
7592+echo "$as_me:15287: result: $with_wgetch_events" >&5
7593 echo "${ECHO_T}$with_wgetch_events" >&6
7594 test "x$with_wgetch_events" = xyes &&
7595 cat >>confdefs.h <<\EOF
7596@@ -15289,7 +15295,7 @@
7597
7598 ###	use option --disable-echo to suppress full display compiling commands
7599
7600-echo "$as_me:15292: checking if you want to see long compiling messages" >&5
7601+echo "$as_me:15298: checking if you want to see long compiling messages" >&5
7602 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
7603
7604 # Check whether --enable-echo or --disable-echo was given.
7605@@ -15323,7 +15329,7 @@
7606 	ECHO_CC=''
7607
7608 fi;
7609-echo "$as_me:15326: result: $enableval" >&5
7610+echo "$as_me:15332: result: $enableval" >&5
7611 echo "${ECHO_T}$enableval" >&6
7612
7613 if test "x$enable_echo" = xyes; then
7614@@ -15336,7 +15342,7 @@
7615
7616 # --disable-stripping is used for debugging
7617
7618-echo "$as_me:15339: checking if you want to install stripped executables" >&5
7619+echo "$as_me:15345: checking if you want to install stripped executables" >&5
7620 echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6
7621
7622 # Check whether --enable-stripping or --disable-stripping was given.
7623@@ -15353,7 +15359,7 @@
7624 	with_stripping=yes
7625
7626 fi;
7627-echo "$as_me:15356: result: $with_stripping" >&5
7628+echo "$as_me:15362: result: $with_stripping" >&5
7629 echo "${ECHO_T}$with_stripping" >&6
7630
7631 if test "$with_stripping" = yes
7632@@ -15364,7 +15370,7 @@
7633 fi
7634
7635 : ${INSTALL:=install}
7636-echo "$as_me:15367: checking if install accepts -p option" >&5
7637+echo "$as_me:15373: checking if install accepts -p option" >&5
7638 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
7639 if test "${cf_cv_install_p+set}" = set; then
7640   echo $ECHO_N "(cached) $ECHO_C" >&6
7641@@ -15395,10 +15401,10 @@
7642 	rm -rf conftest*
7643
7644 fi
7645-echo "$as_me:15398: result: $cf_cv_install_p" >&5
7646+echo "$as_me:15404: result: $cf_cv_install_p" >&5
7647 echo "${ECHO_T}$cf_cv_install_p" >&6
7648
7649-echo "$as_me:15401: checking if install needs to be told about ownership" >&5
7650+echo "$as_me:15407: checking if install needs to be told about ownership" >&5
7651 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
7652 case `$ac_config_guess` in
7653 (*minix)
7654@@ -15409,7 +15415,7 @@
7655 	;;
7656 esac
7657
7658-echo "$as_me:15412: result: $with_install_o" >&5
7659+echo "$as_me:15418: result: $with_install_o" >&5
7660 echo "${ECHO_T}$with_install_o" >&6
7661 if test "x$with_install_o" = xyes
7662 then
7663@@ -15433,7 +15439,7 @@
7664 fi
7665
7666 ###	use option --enable-warnings to turn on all gcc warnings
7667-echo "$as_me:15436: checking if you want to see compiler warnings" >&5
7668+echo "$as_me:15442: checking if you want to see compiler warnings" >&5
7669 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
7670
7671 # Check whether --enable-warnings or --disable-warnings was given.
7672@@ -15441,7 +15447,7 @@
7673   enableval="$enable_warnings"
7674   with_warnings=$enableval
7675 fi;
7676-echo "$as_me:15444: result: $with_warnings" >&5
7677+echo "$as_me:15450: result: $with_warnings" >&5
7678 echo "${ECHO_T}$with_warnings" >&6
7679
7680 if test "x$with_warnings" = "xyes"; then
7681@@ -15450,7 +15456,7 @@
7682
7683 if test "x$have_x" = xyes; then
7684 cat >conftest.$ac_ext <<_ACEOF
7685-#line 15453 "configure"
7686+#line 15459 "configure"
7687 #include "confdefs.h"
7688
7689 #include <stdlib.h>
7690@@ -15465,26 +15471,26 @@
7691 }
7692 _ACEOF
7693 rm -f conftest.$ac_objext
7694-if { (eval echo "$as_me:15468: \"$ac_compile\"") >&5
7695+if { (eval echo "$as_me:15474: \"$ac_compile\"") >&5
7696   (eval $ac_compile) 2>&5
7697   ac_status=$?
7698-  echo "$as_me:15471: \$? = $ac_status" >&5
7699+  echo "$as_me:15477: \$? = $ac_status" >&5
7700   (exit $ac_status); } &&
7701          { ac_try='test -s conftest.$ac_objext'
7702-  { (eval echo "$as_me:15474: \"$ac_try\"") >&5
7703+  { (eval echo "$as_me:15480: \"$ac_try\"") >&5
7704   (eval $ac_try) 2>&5
7705   ac_status=$?
7706-  echo "$as_me:15477: \$? = $ac_status" >&5
7707+  echo "$as_me:15483: \$? = $ac_status" >&5
7708   (exit $ac_status); }; }; then
7709
7710-echo "$as_me:15480: checking for X11/Xt const-feature" >&5
7711+echo "$as_me:15486: checking for X11/Xt const-feature" >&5
7712 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
7713 if test "${cf_cv_const_x_string+set}" = set; then
7714   echo $ECHO_N "(cached) $ECHO_C" >&6
7715 else
7716
7717 	cat >conftest.$ac_ext <<_ACEOF
7718-#line 15487 "configure"
7719+#line 15493 "configure"
7720 #include "confdefs.h"
7721
7722 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
7723@@ -15501,16 +15507,16 @@
7724 }
7725 _ACEOF
7726 rm -f conftest.$ac_objext
7727-if { (eval echo "$as_me:15504: \"$ac_compile\"") >&5
7728+if { (eval echo "$as_me:15510: \"$ac_compile\"") >&5
7729   (eval $ac_compile) 2>&5
7730   ac_status=$?
7731-  echo "$as_me:15507: \$? = $ac_status" >&5
7732+  echo "$as_me:15513: \$? = $ac_status" >&5
7733   (exit $ac_status); } &&
7734          { ac_try='test -s conftest.$ac_objext'
7735-  { (eval echo "$as_me:15510: \"$ac_try\"") >&5
7736+  { (eval echo "$as_me:15516: \"$ac_try\"") >&5
7737   (eval $ac_try) 2>&5
7738   ac_status=$?
7739-  echo "$as_me:15513: \$? = $ac_status" >&5
7740+  echo "$as_me:15519: \$? = $ac_status" >&5
7741   (exit $ac_status); }; }; then
7742
7743 			cf_cv_const_x_string=no
7744@@ -15525,7 +15531,7 @@
7745 rm -f conftest.$ac_objext conftest.$ac_ext
7746
7747 fi
7748-echo "$as_me:15528: result: $cf_cv_const_x_string" >&5
7749+echo "$as_me:15534: result: $cf_cv_const_x_string" >&5
7750 echo "${ECHO_T}$cf_cv_const_x_string" >&6
7751
7752 case $cf_cv_const_x_string in
7753@@ -15550,7 +15556,7 @@
7754 rm -f conftest.$ac_objext conftest.$ac_ext
7755  fi
7756 cat > conftest.$ac_ext <<EOF
7757-#line 15553 "${as_me:-configure}"
7758+#line 15559 "${as_me:-configure}"
7759 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
7760 EOF
7761 if test "$INTEL_COMPILER" = yes
7762@@ -15566,7 +15572,7 @@
7763 # remark #981: operands are evaluated in unspecified order
7764 # warning #279: controlling expression is constant
7765
7766-	{ echo "$as_me:15569: checking for $CC warning options..." >&5
7767+	{ echo "$as_me:15575: checking for $CC warning options..." >&5
7768 echo "$as_me: checking for $CC warning options..." >&6;}
7769 	cf_save_CFLAGS="$CFLAGS"
7770 	EXTRA_CFLAGS="-Wall"
7771@@ -15582,12 +15588,12 @@
7772 		wd981
7773 	do
7774 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
7775-		if { (eval echo "$as_me:15585: \"$ac_compile\"") >&5
7776+		if { (eval echo "$as_me:15591: \"$ac_compile\"") >&5
7777   (eval $ac_compile) 2>&5
7778   ac_status=$?
7779-  echo "$as_me:15588: \$? = $ac_status" >&5
7780+  echo "$as_me:15594: \$? = $ac_status" >&5
7781   (exit $ac_status); }; then
7782-			test -n "$verbose" && echo "$as_me:15590: result: ... -$cf_opt" >&5
7783+			test -n "$verbose" && echo "$as_me:15596: result: ... -$cf_opt" >&5
7784 echo "${ECHO_T}... -$cf_opt" >&6
7785 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
7786 		fi
7787@@ -15595,7 +15601,7 @@
7788 	CFLAGS="$cf_save_CFLAGS"
7789 elif test "$GCC" = yes
7790 then
7791-	{ echo "$as_me:15598: checking for $CC warning options..." >&5
7792+	{ echo "$as_me:15604: checking for $CC warning options..." >&5
7793 echo "$as_me: checking for $CC warning options..." >&6;}
7794 	cf_save_CFLAGS="$CFLAGS"
7795 	EXTRA_CFLAGS=
7796@@ -15619,12 +15625,12 @@
7797 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
7798 	do
7799 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
7800-		if { (eval echo "$as_me:15622: \"$ac_compile\"") >&5
7801+		if { (eval echo "$as_me:15628: \"$ac_compile\"") >&5
7802   (eval $ac_compile) 2>&5
7803   ac_status=$?
7804-  echo "$as_me:15625: \$? = $ac_status" >&5
7805+  echo "$as_me:15631: \$? = $ac_status" >&5
7806   (exit $ac_status); }; then
7807-			test -n "$verbose" && echo "$as_me:15627: result: ... -$cf_opt" >&5
7808+			test -n "$verbose" && echo "$as_me:15633: result: ... -$cf_opt" >&5
7809 echo "${ECHO_T}... -$cf_opt" >&6
7810 			case $cf_opt in
7811 			(Winline)
7812@@ -15632,7 +15638,7 @@
7813 				([34].*)
7814 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
7815
7816-echo "${as_me:-configure}:15635: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
7817+echo "${as_me:-configure}:15641: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
7818
7819 					continue;;
7820 				esac
7821@@ -15642,7 +15648,7 @@
7822 				([12].*)
7823 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
7824
7825-echo "${as_me:-configure}:15645: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
7826+echo "${as_me:-configure}:15651: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
7827
7828 					continue;;
7829 				esac
7830@@ -15662,12 +15668,12 @@
7831 if test "$GCC" = yes ; then
7832 	case $host_os in
7833 	(linux*|gnu*)
7834-		echo "$as_me:15665: checking if this is really Intel C++ compiler" >&5
7835+		echo "$as_me:15671: checking if this is really Intel C++ compiler" >&5
7836 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
7837 		cf_save_CFLAGS="$CXXFLAGS"
7838 		CXXFLAGS="$CXXFLAGS -no-gcc"
7839 		cat >conftest.$ac_ext <<_ACEOF
7840-#line 15670 "configure"
7841+#line 15676 "configure"
7842 #include "confdefs.h"
7843
7844 int
7845@@ -15684,16 +15690,16 @@
7846 }
7847 _ACEOF
7848 rm -f conftest.$ac_objext
7849-if { (eval echo "$as_me:15687: \"$ac_compile\"") >&5
7850+if { (eval echo "$as_me:15693: \"$ac_compile\"") >&5
7851   (eval $ac_compile) 2>&5
7852   ac_status=$?
7853-  echo "$as_me:15690: \$? = $ac_status" >&5
7854+  echo "$as_me:15696: \$? = $ac_status" >&5
7855   (exit $ac_status); } &&
7856          { ac_try='test -s conftest.$ac_objext'
7857-  { (eval echo "$as_me:15693: \"$ac_try\"") >&5
7858+  { (eval echo "$as_me:15699: \"$ac_try\"") >&5
7859   (eval $ac_try) 2>&5
7860   ac_status=$?
7861-  echo "$as_me:15696: \$? = $ac_status" >&5
7862+  echo "$as_me:15702: \$? = $ac_status" >&5
7863   (exit $ac_status); }; }; then
7864   INTEL_CPLUSPLUS=yes
7865 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
7866@@ -15704,7 +15710,7 @@
7867 fi
7868 rm -f conftest.$ac_objext conftest.$ac_ext
7869 		CXXFLAGS="$cf_save_CFLAGS"
7870-		echo "$as_me:15707: result: $INTEL_CPLUSPLUS" >&5
7871+		echo "$as_me:15713: result: $INTEL_CPLUSPLUS" >&5
7872 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
7873 		;;
7874 	esac
7875@@ -15713,12 +15719,12 @@
7876 CLANG_CPLUSPLUS=no
7877
7878 if test "$GCC" = yes ; then
7879-	echo "$as_me:15716: checking if this is really Clang C++ compiler" >&5
7880+	echo "$as_me:15722: checking if this is really Clang C++ compiler" >&5
7881 echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
7882 	cf_save_CFLAGS="$CXXFLAGS"
7883 	CXXFLAGS="$CXXFLAGS -Qunused-arguments"
7884 	cat >conftest.$ac_ext <<_ACEOF
7885-#line 15721 "configure"
7886+#line 15727 "configure"
7887 #include "confdefs.h"
7888
7889 int
7890@@ -15735,16 +15741,16 @@
7891 }
7892 _ACEOF
7893 rm -f conftest.$ac_objext
7894-if { (eval echo "$as_me:15738: \"$ac_compile\"") >&5
7895+if { (eval echo "$as_me:15744: \"$ac_compile\"") >&5
7896   (eval $ac_compile) 2>&5
7897   ac_status=$?
7898-  echo "$as_me:15741: \$? = $ac_status" >&5
7899+  echo "$as_me:15747: \$? = $ac_status" >&5
7900   (exit $ac_status); } &&
7901          { ac_try='test -s conftest.$ac_objext'
7902-  { (eval echo "$as_me:15744: \"$ac_try\"") >&5
7903+  { (eval echo "$as_me:15750: \"$ac_try\"") >&5
7904   (eval $ac_try) 2>&5
7905   ac_status=$?
7906-  echo "$as_me:15747: \$? = $ac_status" >&5
7907+  echo "$as_me:15753: \$? = $ac_status" >&5
7908   (exit $ac_status); }; }; then
7909   CLANG_CPLUSPLUS=yes
7910 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
7911@@ -15755,7 +15761,7 @@
7912 fi
7913 rm -f conftest.$ac_objext conftest.$ac_ext
7914 	CXXFLAGS="$cf_save_CFLAGS"
7915-	echo "$as_me:15758: result: $CLANG_CPLUSPLUS" >&5
7916+	echo "$as_me:15764: result: $CLANG_CPLUSPLUS" >&5
7917 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
7918 fi
7919
7920@@ -15767,7 +15773,7 @@
7921 ac_main_return=return
7922
7923 cat > conftest.$ac_ext <<EOF
7924-#line 15770 "configure"
7925+#line 15776 "configure"
7926 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
7927 EOF
7928
7929@@ -15785,7 +15791,7 @@
7930 # remark #981: operands are evaluated in unspecified order
7931 # warning #269: invalid format string conversion
7932
7933-	{ echo "$as_me:15788: checking for $CC warning options..." >&5
7934+	{ echo "$as_me:15794: checking for $CC warning options..." >&5
7935 echo "$as_me: checking for $CC warning options..." >&6;}
7936 	cf_save_CXXFLAGS="$CXXFLAGS"
7937 	EXTRA_CXXFLAGS="-Wall"
7938@@ -15802,12 +15808,12 @@
7939 		wd981
7940 	do
7941 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
7942-		if { (eval echo "$as_me:15805: \"$ac_compile\"") >&5
7943+		if { (eval echo "$as_me:15811: \"$ac_compile\"") >&5
7944   (eval $ac_compile) 2>&5
7945   ac_status=$?
7946-  echo "$as_me:15808: \$? = $ac_status" >&5
7947+  echo "$as_me:15814: \$? = $ac_status" >&5
7948   (exit $ac_status); }; then
7949-			test -n "$verbose" && echo "$as_me:15810: result: ... -$cf_opt" >&5
7950+			test -n "$verbose" && echo "$as_me:15816: result: ... -$cf_opt" >&5
7951 echo "${ECHO_T}... -$cf_opt" >&6
7952 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
7953 		fi
7954@@ -15816,7 +15822,7 @@
7955
7956 elif test "$GXX" = yes
7957 then
7958-	{ echo "$as_me:15819: checking for $CXX warning options..." >&5
7959+	{ echo "$as_me:15825: checking for $CXX warning options..." >&5
7960 echo "$as_me: checking for $CXX warning options..." >&6;}
7961 	cf_save_CXXFLAGS="$CXXFLAGS"
7962 	EXTRA_CXXFLAGS="-W -Wall"
7963@@ -15846,16 +15852,16 @@
7964 		Wundef $cf_gxx_extra_warnings Wno-unused
7965 	do
7966 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
7967-		if { (eval echo "$as_me:15849: \"$ac_compile\"") >&5
7968+		if { (eval echo "$as_me:15855: \"$ac_compile\"") >&5
7969   (eval $ac_compile) 2>&5
7970   ac_status=$?
7971-  echo "$as_me:15852: \$? = $ac_status" >&5
7972+  echo "$as_me:15858: \$? = $ac_status" >&5
7973   (exit $ac_status); }; then
7974-			test -n "$verbose" && echo "$as_me:15854: result: ... -$cf_opt" >&5
7975+			test -n "$verbose" && echo "$as_me:15860: result: ... -$cf_opt" >&5
7976 echo "${ECHO_T}... -$cf_opt" >&6
7977 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
7978 		else
7979-			test -n "$verbose" && echo "$as_me:15858: result: ... no -$cf_opt" >&5
7980+			test -n "$verbose" && echo "$as_me:15864: result: ... no -$cf_opt" >&5
7981 echo "${ECHO_T}... no -$cf_opt" >&6
7982 		fi
7983 	done
7984@@ -15891,10 +15897,10 @@
7985 EOF
7986 if test "$GCC" = yes
7987 then
7988-	{ echo "$as_me:15894: checking for $CC __attribute__ directives..." >&5
7989+	{ echo "$as_me:15900: checking for $CC __attribute__ directives..." >&5
7990 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
7991 cat > conftest.$ac_ext <<EOF
7992-#line 15897 "${as_me:-configure}"
7993+#line 15903 "${as_me:-configure}"
7994 #include "confdefs.h"
7995 #include "conftest.h"
7996 #include "conftest.i"
7997@@ -15943,12 +15949,12 @@
7998 			;;
7999 		esac
8000
8001-		if { (eval echo "$as_me:15946: \"$ac_compile\"") >&5
8002+		if { (eval echo "$as_me:15952: \"$ac_compile\"") >&5
8003   (eval $ac_compile) 2>&5
8004   ac_status=$?
8005-  echo "$as_me:15949: \$? = $ac_status" >&5
8006+  echo "$as_me:15955: \$? = $ac_status" >&5
8007   (exit $ac_status); }; then
8008-			test -n "$verbose" && echo "$as_me:15951: result: ... $cf_attribute" >&5
8009+			test -n "$verbose" && echo "$as_me:15957: result: ... $cf_attribute" >&5
8010 echo "${ECHO_T}... $cf_attribute" >&6
8011 			cat conftest.h >>confdefs.h
8012 			case $cf_attribute in
8013@@ -16007,7 +16013,7 @@
8014 rm -rf conftest*
8015 fi
8016
8017-echo "$as_me:16010: checking if you want to work around bogus compiler/loader warnings" >&5
8018+echo "$as_me:16016: checking if you want to work around bogus compiler/loader warnings" >&5
8019 echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
8020
8021 # Check whether --enable-string-hacks or --disable-string-hacks was given.
8022@@ -16017,7 +16023,7 @@
8023 else
8024   with_string_hacks=no
8025 fi;
8026-echo "$as_me:16020: result: $with_string_hacks" >&5
8027+echo "$as_me:16026: result: $with_string_hacks" >&5
8028 echo "${ECHO_T}$with_string_hacks" >&6
8029
8030 if test "x$with_string_hacks" = "xyes"; then
8031@@ -16026,15 +16032,15 @@
8032 #define USE_STRING_HACKS 1
8033 EOF
8034
8035-	{ echo "$as_me:16029: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
8036+	{ echo "$as_me:16035: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
8037 echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
8038-	echo "$as_me:16031: checking for strlcat" >&5
8039+	echo "$as_me:16037: checking for strlcat" >&5
8040 echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
8041 if test "${ac_cv_func_strlcat+set}" = set; then
8042   echo $ECHO_N "(cached) $ECHO_C" >&6
8043 else
8044   cat >conftest.$ac_ext <<_ACEOF
8045-#line 16037 "configure"
8046+#line 16043 "configure"
8047 #include "confdefs.h"
8048 #define strlcat autoconf_temporary
8049 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
8050@@ -16065,16 +16071,16 @@
8051 }
8052 _ACEOF
8053 rm -f conftest.$ac_objext conftest$ac_exeext
8054-if { (eval echo "$as_me:16068: \"$ac_link\"") >&5
8055+if { (eval echo "$as_me:16074: \"$ac_link\"") >&5
8056   (eval $ac_link) 2>&5
8057   ac_status=$?
8058-  echo "$as_me:16071: \$? = $ac_status" >&5
8059+  echo "$as_me:16077: \$? = $ac_status" >&5
8060   (exit $ac_status); } &&
8061          { ac_try='test -s conftest$ac_exeext'
8062-  { (eval echo "$as_me:16074: \"$ac_try\"") >&5
8063+  { (eval echo "$as_me:16080: \"$ac_try\"") >&5
8064   (eval $ac_try) 2>&5
8065   ac_status=$?
8066-  echo "$as_me:16077: \$? = $ac_status" >&5
8067+  echo "$as_me:16083: \$? = $ac_status" >&5
8068   (exit $ac_status); }; }; then
8069   ac_cv_func_strlcat=yes
8070 else
8071@@ -16084,7 +16090,7 @@
8072 fi
8073 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8074 fi
8075-echo "$as_me:16087: result: $ac_cv_func_strlcat" >&5
8076+echo "$as_me:16093: result: $ac_cv_func_strlcat" >&5
8077 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
8078 if test $ac_cv_func_strlcat = yes; then
8079
8080@@ -16094,7 +16100,7 @@
8081
8082 else
8083
8084-		echo "$as_me:16097: checking for strlcat in -lbsd" >&5
8085+		echo "$as_me:16103: checking for strlcat in -lbsd" >&5
8086 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
8087 if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
8088   echo $ECHO_N "(cached) $ECHO_C" >&6
8089@@ -16102,7 +16108,7 @@
8090   ac_check_lib_save_LIBS=$LIBS
8091 LIBS="-lbsd  $LIBS"
8092 cat >conftest.$ac_ext <<_ACEOF
8093-#line 16105 "configure"
8094+#line 16111 "configure"
8095 #include "confdefs.h"
8096
8097 /* Override any gcc2 internal prototype to avoid an error.  */
8098@@ -16121,16 +16127,16 @@
8099 }
8100 _ACEOF
8101 rm -f conftest.$ac_objext conftest$ac_exeext
8102-if { (eval echo "$as_me:16124: \"$ac_link\"") >&5
8103+if { (eval echo "$as_me:16130: \"$ac_link\"") >&5
8104   (eval $ac_link) 2>&5
8105   ac_status=$?
8106-  echo "$as_me:16127: \$? = $ac_status" >&5
8107+  echo "$as_me:16133: \$? = $ac_status" >&5
8108   (exit $ac_status); } &&
8109          { ac_try='test -s conftest$ac_exeext'
8110-  { (eval echo "$as_me:16130: \"$ac_try\"") >&5
8111+  { (eval echo "$as_me:16136: \"$ac_try\"") >&5
8112   (eval $ac_try) 2>&5
8113   ac_status=$?
8114-  echo "$as_me:16133: \$? = $ac_status" >&5
8115+  echo "$as_me:16139: \$? = $ac_status" >&5
8116   (exit $ac_status); }; }; then
8117   ac_cv_lib_bsd_strlcat=yes
8118 else
8119@@ -16141,7 +16147,7 @@
8120 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8121 LIBS=$ac_check_lib_save_LIBS
8122 fi
8123-echo "$as_me:16144: result: $ac_cv_lib_bsd_strlcat" >&5
8124+echo "$as_me:16150: result: $ac_cv_lib_bsd_strlcat" >&5
8125 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
8126 if test $ac_cv_lib_bsd_strlcat = yes; then
8127
8128@@ -16164,23 +16170,23 @@
8129 for ac_header in bsd/string.h
8130 do
8131 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
8132-echo "$as_me:16167: checking for $ac_header" >&5
8133+echo "$as_me:16173: checking for $ac_header" >&5
8134 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
8135 if eval "test \"\${$as_ac_Header+set}\" = set"; then
8136   echo $ECHO_N "(cached) $ECHO_C" >&6
8137 else
8138   cat >conftest.$ac_ext <<_ACEOF
8139-#line 16173 "configure"
8140+#line 16179 "configure"
8141 #include "confdefs.h"
8142 #include <$ac_header>
8143 _ACEOF
8144-if { (eval echo "$as_me:16177: \"$ac_cpp conftest.$ac_ext\"") >&5
8145+if { (eval echo "$as_me:16183: \"$ac_cpp conftest.$ac_ext\"") >&5
8146   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8147   ac_status=$?
8148   egrep -v '^ *\+' conftest.er1 >conftest.err
8149   rm -f conftest.er1
8150   cat conftest.err >&5
8151-  echo "$as_me:16183: \$? = $ac_status" >&5
8152+  echo "$as_me:16189: \$? = $ac_status" >&5
8153   (exit $ac_status); } >/dev/null; then
8154   if test -s conftest.err; then
8155     ac_cpp_err=$ac_c_preproc_warn_flag
8156@@ -16199,7 +16205,7 @@
8157 fi
8158 rm -f conftest.err conftest.$ac_ext
8159 fi
8160-echo "$as_me:16202: result: `eval echo '${'$as_ac_Header'}'`" >&5
8161+echo "$as_me:16208: result: `eval echo '${'$as_ac_Header'}'`" >&5
8162 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
8163 if test `eval echo '${'$as_ac_Header'}'` = yes; then
8164   cat >>confdefs.h <<EOF
8165@@ -16220,13 +16226,13 @@
8166 for ac_func in strlcpy snprintf
8167 do
8168 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
8169-echo "$as_me:16223: checking for $ac_func" >&5
8170+echo "$as_me:16229: checking for $ac_func" >&5
8171 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
8172 if eval "test \"\${$as_ac_var+set}\" = set"; then
8173   echo $ECHO_N "(cached) $ECHO_C" >&6
8174 else
8175   cat >conftest.$ac_ext <<_ACEOF
8176-#line 16229 "configure"
8177+#line 16235 "configure"
8178 #include "confdefs.h"
8179 #define $ac_func autoconf_temporary
8180 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
8181@@ -16257,16 +16263,16 @@
8182 }
8183 _ACEOF
8184 rm -f conftest.$ac_objext conftest$ac_exeext
8185-if { (eval echo "$as_me:16260: \"$ac_link\"") >&5
8186+if { (eval echo "$as_me:16266: \"$ac_link\"") >&5
8187   (eval $ac_link) 2>&5
8188   ac_status=$?
8189-  echo "$as_me:16263: \$? = $ac_status" >&5
8190+  echo "$as_me:16269: \$? = $ac_status" >&5
8191   (exit $ac_status); } &&
8192          { ac_try='test -s conftest$ac_exeext'
8193-  { (eval echo "$as_me:16266: \"$ac_try\"") >&5
8194+  { (eval echo "$as_me:16272: \"$ac_try\"") >&5
8195   (eval $ac_try) 2>&5
8196   ac_status=$?
8197-  echo "$as_me:16269: \$? = $ac_status" >&5
8198+  echo "$as_me:16275: \$? = $ac_status" >&5
8199   (exit $ac_status); }; }; then
8200   eval "$as_ac_var=yes"
8201 else
8202@@ -16276,7 +16282,7 @@
8203 fi
8204 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8205 fi
8206-echo "$as_me:16279: result: `eval echo '${'$as_ac_var'}'`" >&5
8207+echo "$as_me:16285: result: `eval echo '${'$as_ac_var'}'`" >&5
8208 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
8209 if test `eval echo '${'$as_ac_var'}'` = yes; then
8210   cat >>confdefs.h <<EOF
8211@@ -16289,7 +16295,7 @@
8212 fi
8213
8214 ###	use option --enable-assertions to turn on generation of assertion code
8215-echo "$as_me:16292: checking if you want to enable runtime assertions" >&5
8216+echo "$as_me:16298: checking if you want to enable runtime assertions" >&5
8217 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
8218
8219 # Check whether --enable-assertions or --disable-assertions was given.
8220@@ -16299,7 +16305,7 @@
8221 else
8222   with_assertions=no
8223 fi;
8224-echo "$as_me:16302: result: $with_assertions" >&5
8225+echo "$as_me:16308: result: $with_assertions" >&5
8226 echo "${ECHO_T}$with_assertions" >&6
8227 if test -n "$GCC"
8228 then
8229@@ -16315,7 +16321,7 @@
8230
8231 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
8232
8233-echo "$as_me:16318: checking if you want to use dmalloc for testing" >&5
8234+echo "$as_me:16324: checking if you want to use dmalloc for testing" >&5
8235 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
8236
8237 # Check whether --with-dmalloc or --without-dmalloc was given.
8238@@ -16332,7 +16338,7 @@
8239 else
8240   with_dmalloc=
8241 fi;
8242-echo "$as_me:16335: result: ${with_dmalloc:-no}" >&5
8243+echo "$as_me:16341: result: ${with_dmalloc:-no}" >&5
8244 echo "${ECHO_T}${with_dmalloc:-no}" >&6
8245
8246 case .$with_cflags in
8247@@ -16446,23 +16452,23 @@
8248 esac
8249
8250 if test "$with_dmalloc" = yes ; then
8251-	echo "$as_me:16449: checking for dmalloc.h" >&5
8252+	echo "$as_me:16455: checking for dmalloc.h" >&5
8253 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
8254 if test "${ac_cv_header_dmalloc_h+set}" = set; then
8255   echo $ECHO_N "(cached) $ECHO_C" >&6
8256 else
8257   cat >conftest.$ac_ext <<_ACEOF
8258-#line 16455 "configure"
8259+#line 16461 "configure"
8260 #include "confdefs.h"
8261 #include <dmalloc.h>
8262 _ACEOF
8263-if { (eval echo "$as_me:16459: \"$ac_cpp conftest.$ac_ext\"") >&5
8264+if { (eval echo "$as_me:16465: \"$ac_cpp conftest.$ac_ext\"") >&5
8265   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8266   ac_status=$?
8267   egrep -v '^ *\+' conftest.er1 >conftest.err
8268   rm -f conftest.er1
8269   cat conftest.err >&5
8270-  echo "$as_me:16465: \$? = $ac_status" >&5
8271+  echo "$as_me:16471: \$? = $ac_status" >&5
8272   (exit $ac_status); } >/dev/null; then
8273   if test -s conftest.err; then
8274     ac_cpp_err=$ac_c_preproc_warn_flag
8275@@ -16481,11 +16487,11 @@
8276 fi
8277 rm -f conftest.err conftest.$ac_ext
8278 fi
8279-echo "$as_me:16484: result: $ac_cv_header_dmalloc_h" >&5
8280+echo "$as_me:16490: result: $ac_cv_header_dmalloc_h" >&5
8281 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
8282 if test $ac_cv_header_dmalloc_h = yes; then
8283
8284-echo "$as_me:16488: checking for dmalloc_debug in -ldmalloc" >&5
8285+echo "$as_me:16494: checking for dmalloc_debug in -ldmalloc" >&5
8286 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
8287 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
8288   echo $ECHO_N "(cached) $ECHO_C" >&6
8289@@ -16493,7 +16499,7 @@
8290   ac_check_lib_save_LIBS=$LIBS
8291 LIBS="-ldmalloc  $LIBS"
8292 cat >conftest.$ac_ext <<_ACEOF
8293-#line 16496 "configure"
8294+#line 16502 "configure"
8295 #include "confdefs.h"
8296
8297 /* Override any gcc2 internal prototype to avoid an error.  */
8298@@ -16512,16 +16518,16 @@
8299 }
8300 _ACEOF
8301 rm -f conftest.$ac_objext conftest$ac_exeext
8302-if { (eval echo "$as_me:16515: \"$ac_link\"") >&5
8303+if { (eval echo "$as_me:16521: \"$ac_link\"") >&5
8304   (eval $ac_link) 2>&5
8305   ac_status=$?
8306-  echo "$as_me:16518: \$? = $ac_status" >&5
8307+  echo "$as_me:16524: \$? = $ac_status" >&5
8308   (exit $ac_status); } &&
8309          { ac_try='test -s conftest$ac_exeext'
8310-  { (eval echo "$as_me:16521: \"$ac_try\"") >&5
8311+  { (eval echo "$as_me:16527: \"$ac_try\"") >&5
8312   (eval $ac_try) 2>&5
8313   ac_status=$?
8314-  echo "$as_me:16524: \$? = $ac_status" >&5
8315+  echo "$as_me:16530: \$? = $ac_status" >&5
8316   (exit $ac_status); }; }; then
8317   ac_cv_lib_dmalloc_dmalloc_debug=yes
8318 else
8319@@ -16532,7 +16538,7 @@
8320 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8321 LIBS=$ac_check_lib_save_LIBS
8322 fi
8323-echo "$as_me:16535: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
8324+echo "$as_me:16541: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
8325 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
8326 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
8327   cat >>confdefs.h <<EOF
8328@@ -16547,7 +16553,7 @@
8329
8330 fi
8331
8332-echo "$as_me:16550: checking if you want to use dbmalloc for testing" >&5
8333+echo "$as_me:16556: checking if you want to use dbmalloc for testing" >&5
8334 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
8335
8336 # Check whether --with-dbmalloc or --without-dbmalloc was given.
8337@@ -16564,7 +16570,7 @@
8338 else
8339   with_dbmalloc=
8340 fi;
8341-echo "$as_me:16567: result: ${with_dbmalloc:-no}" >&5
8342+echo "$as_me:16573: result: ${with_dbmalloc:-no}" >&5
8343 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
8344
8345 case .$with_cflags in
8346@@ -16678,23 +16684,23 @@
8347 esac
8348
8349 if test "$with_dbmalloc" = yes ; then
8350-	echo "$as_me:16681: checking for dbmalloc.h" >&5
8351+	echo "$as_me:16687: checking for dbmalloc.h" >&5
8352 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
8353 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
8354   echo $ECHO_N "(cached) $ECHO_C" >&6
8355 else
8356   cat >conftest.$ac_ext <<_ACEOF
8357-#line 16687 "configure"
8358+#line 16693 "configure"
8359 #include "confdefs.h"
8360 #include <dbmalloc.h>
8361 _ACEOF
8362-if { (eval echo "$as_me:16691: \"$ac_cpp conftest.$ac_ext\"") >&5
8363+if { (eval echo "$as_me:16697: \"$ac_cpp conftest.$ac_ext\"") >&5
8364   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8365   ac_status=$?
8366   egrep -v '^ *\+' conftest.er1 >conftest.err
8367   rm -f conftest.er1
8368   cat conftest.err >&5
8369-  echo "$as_me:16697: \$? = $ac_status" >&5
8370+  echo "$as_me:16703: \$? = $ac_status" >&5
8371   (exit $ac_status); } >/dev/null; then
8372   if test -s conftest.err; then
8373     ac_cpp_err=$ac_c_preproc_warn_flag
8374@@ -16713,11 +16719,11 @@
8375 fi
8376 rm -f conftest.err conftest.$ac_ext
8377 fi
8378-echo "$as_me:16716: result: $ac_cv_header_dbmalloc_h" >&5
8379+echo "$as_me:16722: result: $ac_cv_header_dbmalloc_h" >&5
8380 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
8381 if test $ac_cv_header_dbmalloc_h = yes; then
8382
8383-echo "$as_me:16720: checking for debug_malloc in -ldbmalloc" >&5
8384+echo "$as_me:16726: checking for debug_malloc in -ldbmalloc" >&5
8385 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
8386 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
8387   echo $ECHO_N "(cached) $ECHO_C" >&6
8388@@ -16725,7 +16731,7 @@
8389   ac_check_lib_save_LIBS=$LIBS
8390 LIBS="-ldbmalloc  $LIBS"
8391 cat >conftest.$ac_ext <<_ACEOF
8392-#line 16728 "configure"
8393+#line 16734 "configure"
8394 #include "confdefs.h"
8395
8396 /* Override any gcc2 internal prototype to avoid an error.  */
8397@@ -16744,16 +16750,16 @@
8398 }
8399 _ACEOF
8400 rm -f conftest.$ac_objext conftest$ac_exeext
8401-if { (eval echo "$as_me:16747: \"$ac_link\"") >&5
8402+if { (eval echo "$as_me:16753: \"$ac_link\"") >&5
8403   (eval $ac_link) 2>&5
8404   ac_status=$?
8405-  echo "$as_me:16750: \$? = $ac_status" >&5
8406+  echo "$as_me:16756: \$? = $ac_status" >&5
8407   (exit $ac_status); } &&
8408          { ac_try='test -s conftest$ac_exeext'
8409-  { (eval echo "$as_me:16753: \"$ac_try\"") >&5
8410+  { (eval echo "$as_me:16759: \"$ac_try\"") >&5
8411   (eval $ac_try) 2>&5
8412   ac_status=$?
8413-  echo "$as_me:16756: \$? = $ac_status" >&5
8414+  echo "$as_me:16762: \$? = $ac_status" >&5
8415   (exit $ac_status); }; }; then
8416   ac_cv_lib_dbmalloc_debug_malloc=yes
8417 else
8418@@ -16764,7 +16770,7 @@
8419 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8420 LIBS=$ac_check_lib_save_LIBS
8421 fi
8422-echo "$as_me:16767: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
8423+echo "$as_me:16773: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
8424 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
8425 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
8426   cat >>confdefs.h <<EOF
8427@@ -16779,7 +16785,7 @@
8428
8429 fi
8430
8431-echo "$as_me:16782: checking if you want to use valgrind for testing" >&5
8432+echo "$as_me:16788: checking if you want to use valgrind for testing" >&5
8433 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
8434
8435 # Check whether --with-valgrind or --without-valgrind was given.
8436@@ -16796,7 +16802,7 @@
8437 else
8438   with_valgrind=
8439 fi;
8440-echo "$as_me:16799: result: ${with_valgrind:-no}" >&5
8441+echo "$as_me:16805: result: ${with_valgrind:-no}" >&5
8442 echo "${ECHO_T}${with_valgrind:-no}" >&6
8443
8444 case .$with_cflags in
8445@@ -16909,7 +16915,7 @@
8446 	;;
8447 esac
8448
8449-echo "$as_me:16912: checking if you want to perform memory-leak testing" >&5
8450+echo "$as_me:16918: checking if you want to perform memory-leak testing" >&5
8451 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
8452
8453 # Check whether --enable-leaks or --disable-leaks was given.
8454@@ -16919,7 +16925,7 @@
8455 else
8456   : ${with_no_leaks:=no}
8457 fi;
8458-echo "$as_me:16922: result: $with_no_leaks" >&5
8459+echo "$as_me:16928: result: $with_no_leaks" >&5
8460 echo "${ECHO_T}$with_no_leaks" >&6
8461
8462 if test "$with_no_leaks" = yes ; then
8463@@ -16971,7 +16977,7 @@
8464 	;;
8465 esac
8466
8467-echo "$as_me:16974: checking whether to add trace feature to all models" >&5
8468+echo "$as_me:16980: checking whether to add trace feature to all models" >&5
8469 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
8470
8471 # Check whether --with-trace or --without-trace was given.
8472@@ -16981,7 +16987,7 @@
8473 else
8474   cf_with_trace=$cf_all_traces
8475 fi;
8476-echo "$as_me:16984: result: $cf_with_trace" >&5
8477+echo "$as_me:16990: result: $cf_with_trace" >&5
8478 echo "${ECHO_T}$cf_with_trace" >&6
8479
8480 if test "x$cf_with_trace" = xyes ; then
8481@@ -17095,7 +17101,7 @@
8482 	ADA_TRACE=FALSE
8483 fi
8484
8485-echo "$as_me:17098: checking if we want to use GNAT projects" >&5
8486+echo "$as_me:17104: checking if we want to use GNAT projects" >&5
8487 echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
8488
8489 # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
8490@@ -17112,7 +17118,7 @@
8491 	enable_gnat_projects=yes
8492
8493 fi;
8494-echo "$as_me:17115: result: $enable_gnat_projects" >&5
8495+echo "$as_me:17121: result: $enable_gnat_projects" >&5
8496 echo "${ECHO_T}$enable_gnat_projects" >&6
8497
8498 ###	Checks for libraries.
8499@@ -17122,13 +17128,13 @@
8500 	# Note: WINVER may be a problem with Windows 10
8501 	;;
8502 (*)
8503-echo "$as_me:17125: checking for gettimeofday" >&5
8504+echo "$as_me:17131: checking for gettimeofday" >&5
8505 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
8506 if test "${ac_cv_func_gettimeofday+set}" = set; then
8507   echo $ECHO_N "(cached) $ECHO_C" >&6
8508 else
8509   cat >conftest.$ac_ext <<_ACEOF
8510-#line 17131 "configure"
8511+#line 17137 "configure"
8512 #include "confdefs.h"
8513 #define gettimeofday autoconf_temporary
8514 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
8515@@ -17159,16 +17165,16 @@
8516 }
8517 _ACEOF
8518 rm -f conftest.$ac_objext conftest$ac_exeext
8519-if { (eval echo "$as_me:17162: \"$ac_link\"") >&5
8520+if { (eval echo "$as_me:17168: \"$ac_link\"") >&5
8521   (eval $ac_link) 2>&5
8522   ac_status=$?
8523-  echo "$as_me:17165: \$? = $ac_status" >&5
8524+  echo "$as_me:17171: \$? = $ac_status" >&5
8525   (exit $ac_status); } &&
8526          { ac_try='test -s conftest$ac_exeext'
8527-  { (eval echo "$as_me:17168: \"$ac_try\"") >&5
8528+  { (eval echo "$as_me:17174: \"$ac_try\"") >&5
8529   (eval $ac_try) 2>&5
8530   ac_status=$?
8531-  echo "$as_me:17171: \$? = $ac_status" >&5
8532+  echo "$as_me:17177: \$? = $ac_status" >&5
8533   (exit $ac_status); }; }; then
8534   ac_cv_func_gettimeofday=yes
8535 else
8536@@ -17178,7 +17184,7 @@
8537 fi
8538 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8539 fi
8540-echo "$as_me:17181: result: $ac_cv_func_gettimeofday" >&5
8541+echo "$as_me:17187: result: $ac_cv_func_gettimeofday" >&5
8542 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
8543 if test $ac_cv_func_gettimeofday = yes; then
8544
8545@@ -17188,7 +17194,7 @@
8546
8547 else
8548
8549-echo "$as_me:17191: checking for gettimeofday in -lbsd" >&5
8550+echo "$as_me:17197: checking for gettimeofday in -lbsd" >&5
8551 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
8552 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
8553   echo $ECHO_N "(cached) $ECHO_C" >&6
8554@@ -17196,7 +17202,7 @@
8555   ac_check_lib_save_LIBS=$LIBS
8556 LIBS="-lbsd  $LIBS"
8557 cat >conftest.$ac_ext <<_ACEOF
8558-#line 17199 "configure"
8559+#line 17205 "configure"
8560 #include "confdefs.h"
8561
8562 /* Override any gcc2 internal prototype to avoid an error.  */
8563@@ -17215,16 +17221,16 @@
8564 }
8565 _ACEOF
8566 rm -f conftest.$ac_objext conftest$ac_exeext
8567-if { (eval echo "$as_me:17218: \"$ac_link\"") >&5
8568+if { (eval echo "$as_me:17224: \"$ac_link\"") >&5
8569   (eval $ac_link) 2>&5
8570   ac_status=$?
8571-  echo "$as_me:17221: \$? = $ac_status" >&5
8572+  echo "$as_me:17227: \$? = $ac_status" >&5
8573   (exit $ac_status); } &&
8574          { ac_try='test -s conftest$ac_exeext'
8575-  { (eval echo "$as_me:17224: \"$ac_try\"") >&5
8576+  { (eval echo "$as_me:17230: \"$ac_try\"") >&5
8577   (eval $ac_try) 2>&5
8578   ac_status=$?
8579-  echo "$as_me:17227: \$? = $ac_status" >&5
8580+  echo "$as_me:17233: \$? = $ac_status" >&5
8581   (exit $ac_status); }; }; then
8582   ac_cv_lib_bsd_gettimeofday=yes
8583 else
8584@@ -17235,7 +17241,7 @@
8585 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8586 LIBS=$ac_check_lib_save_LIBS
8587 fi
8588-echo "$as_me:17238: result: $ac_cv_lib_bsd_gettimeofday" >&5
8589+echo "$as_me:17244: result: $ac_cv_lib_bsd_gettimeofday" >&5
8590 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
8591 if test $ac_cv_lib_bsd_gettimeofday = yes; then
8592
8593@@ -17265,14 +17271,14 @@
8594 	;;
8595 esac
8596
8597-echo "$as_me:17268: checking if -lm needed for math functions" >&5
8598+echo "$as_me:17274: checking if -lm needed for math functions" >&5
8599 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
8600 if test "${cf_cv_need_libm+set}" = set; then
8601   echo $ECHO_N "(cached) $ECHO_C" >&6
8602 else
8603
8604 	cat >conftest.$ac_ext <<_ACEOF
8605-#line 17275 "configure"
8606+#line 17281 "configure"
8607 #include "confdefs.h"
8608
8609 	#include <stdio.h>
8610@@ -17288,16 +17294,16 @@
8611 }
8612 _ACEOF
8613 rm -f conftest.$ac_objext conftest$ac_exeext
8614-if { (eval echo "$as_me:17291: \"$ac_link\"") >&5
8615+if { (eval echo "$as_me:17297: \"$ac_link\"") >&5
8616   (eval $ac_link) 2>&5
8617   ac_status=$?
8618-  echo "$as_me:17294: \$? = $ac_status" >&5
8619+  echo "$as_me:17300: \$? = $ac_status" >&5
8620   (exit $ac_status); } &&
8621          { ac_try='test -s conftest$ac_exeext'
8622-  { (eval echo "$as_me:17297: \"$ac_try\"") >&5
8623+  { (eval echo "$as_me:17303: \"$ac_try\"") >&5
8624   (eval $ac_try) 2>&5
8625   ac_status=$?
8626-  echo "$as_me:17300: \$? = $ac_status" >&5
8627+  echo "$as_me:17306: \$? = $ac_status" >&5
8628   (exit $ac_status); }; }; then
8629   cf_cv_need_libm=no
8630 else
8631@@ -17307,7 +17313,7 @@
8632 fi
8633 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8634 fi
8635-echo "$as_me:17310: result: $cf_cv_need_libm" >&5
8636+echo "$as_me:17316: result: $cf_cv_need_libm" >&5
8637 echo "${ECHO_T}$cf_cv_need_libm" >&6
8638 if test "$cf_cv_need_libm" = yes
8639 then
8640@@ -17315,13 +17321,13 @@
8641 fi
8642
8643 ###	Checks for header files.
8644-echo "$as_me:17318: checking for ANSI C header files" >&5
8645+echo "$as_me:17324: checking for ANSI C header files" >&5
8646 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
8647 if test "${ac_cv_header_stdc+set}" = set; then
8648   echo $ECHO_N "(cached) $ECHO_C" >&6
8649 else
8650   cat >conftest.$ac_ext <<_ACEOF
8651-#line 17324 "configure"
8652+#line 17330 "configure"
8653 #include "confdefs.h"
8654 #include <stdlib.h>
8655 #include <stdarg.h>
8656@@ -17329,13 +17335,13 @@
8657 #include <float.h>
8658
8659 _ACEOF
8660-if { (eval echo "$as_me:17332: \"$ac_cpp conftest.$ac_ext\"") >&5
8661+if { (eval echo "$as_me:17338: \"$ac_cpp conftest.$ac_ext\"") >&5
8662   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8663   ac_status=$?
8664   egrep -v '^ *\+' conftest.er1 >conftest.err
8665   rm -f conftest.er1
8666   cat conftest.err >&5
8667-  echo "$as_me:17338: \$? = $ac_status" >&5
8668+  echo "$as_me:17344: \$? = $ac_status" >&5
8669   (exit $ac_status); } >/dev/null; then
8670   if test -s conftest.err; then
8671     ac_cpp_err=$ac_c_preproc_warn_flag
8672@@ -17357,7 +17363,7 @@
8673 if test $ac_cv_header_stdc = yes; then
8674   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
8675   cat >conftest.$ac_ext <<_ACEOF
8676-#line 17360 "configure"
8677+#line 17366 "configure"
8678 #include "confdefs.h"
8679 #include <string.h>
8680
8681@@ -17375,7 +17381,7 @@
8682 if test $ac_cv_header_stdc = yes; then
8683   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
8684   cat >conftest.$ac_ext <<_ACEOF
8685-#line 17378 "configure"
8686+#line 17384 "configure"
8687 #include "confdefs.h"
8688 #include <stdlib.h>
8689
8690@@ -17396,7 +17402,7 @@
8691   :
8692 else
8693   cat >conftest.$ac_ext <<_ACEOF
8694-#line 17399 "configure"
8695+#line 17405 "configure"
8696 #include "confdefs.h"
8697 #include <ctype.h>
8698 #if ((' ' & 0x0FF) == 0x020)
8699@@ -17422,15 +17428,15 @@
8700 }
8701 _ACEOF
8702 rm -f conftest$ac_exeext
8703-if { (eval echo "$as_me:17425: \"$ac_link\"") >&5
8704+if { (eval echo "$as_me:17431: \"$ac_link\"") >&5
8705   (eval $ac_link) 2>&5
8706   ac_status=$?
8707-  echo "$as_me:17428: \$? = $ac_status" >&5
8708+  echo "$as_me:17434: \$? = $ac_status" >&5
8709   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
8710-  { (eval echo "$as_me:17430: \"$ac_try\"") >&5
8711+  { (eval echo "$as_me:17436: \"$ac_try\"") >&5
8712   (eval $ac_try) 2>&5
8713   ac_status=$?
8714-  echo "$as_me:17433: \$? = $ac_status" >&5
8715+  echo "$as_me:17439: \$? = $ac_status" >&5
8716   (exit $ac_status); }; }; then
8717   :
8718 else
8719@@ -17443,7 +17449,7 @@
8720 fi
8721 fi
8722 fi
8723-echo "$as_me:17446: result: $ac_cv_header_stdc" >&5
8724+echo "$as_me:17452: result: $ac_cv_header_stdc" >&5
8725 echo "${ECHO_T}$ac_cv_header_stdc" >&6
8726 if test $ac_cv_header_stdc = yes; then
8727
8728@@ -17456,13 +17462,13 @@
8729 ac_header_dirent=no
8730 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
8731   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
8732-echo "$as_me:17459: checking for $ac_hdr that defines DIR" >&5
8733+echo "$as_me:17465: checking for $ac_hdr that defines DIR" >&5
8734 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
8735 if eval "test \"\${$as_ac_Header+set}\" = set"; then
8736   echo $ECHO_N "(cached) $ECHO_C" >&6
8737 else
8738   cat >conftest.$ac_ext <<_ACEOF
8739-#line 17465 "configure"
8740+#line 17471 "configure"
8741 #include "confdefs.h"
8742 #include <sys/types.h>
8743 #include <$ac_hdr>
8744@@ -17477,16 +17483,16 @@
8745 }
8746 _ACEOF
8747 rm -f conftest.$ac_objext
8748-if { (eval echo "$as_me:17480: \"$ac_compile\"") >&5
8749+if { (eval echo "$as_me:17486: \"$ac_compile\"") >&5
8750   (eval $ac_compile) 2>&5
8751   ac_status=$?
8752-  echo "$as_me:17483: \$? = $ac_status" >&5
8753+  echo "$as_me:17489: \$? = $ac_status" >&5
8754   (exit $ac_status); } &&
8755          { ac_try='test -s conftest.$ac_objext'
8756-  { (eval echo "$as_me:17486: \"$ac_try\"") >&5
8757+  { (eval echo "$as_me:17492: \"$ac_try\"") >&5
8758   (eval $ac_try) 2>&5
8759   ac_status=$?
8760-  echo "$as_me:17489: \$? = $ac_status" >&5
8761+  echo "$as_me:17495: \$? = $ac_status" >&5
8762   (exit $ac_status); }; }; then
8763   eval "$as_ac_Header=yes"
8764 else
8765@@ -17496,7 +17502,7 @@
8766 fi
8767 rm -f conftest.$ac_objext conftest.$ac_ext
8768 fi
8769-echo "$as_me:17499: result: `eval echo '${'$as_ac_Header'}'`" >&5
8770+echo "$as_me:17505: result: `eval echo '${'$as_ac_Header'}'`" >&5
8771 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
8772 if test `eval echo '${'$as_ac_Header'}'` = yes; then
8773   cat >>confdefs.h <<EOF
8774@@ -17509,7 +17515,7 @@
8775 done
8776 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
8777 if test $ac_header_dirent = dirent.h; then
8778-  echo "$as_me:17512: checking for opendir in -ldir" >&5
8779+  echo "$as_me:17518: checking for opendir in -ldir" >&5
8780 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
8781 if test "${ac_cv_lib_dir_opendir+set}" = set; then
8782   echo $ECHO_N "(cached) $ECHO_C" >&6
8783@@ -17517,7 +17523,7 @@
8784   ac_check_lib_save_LIBS=$LIBS
8785 LIBS="-ldir  $LIBS"
8786 cat >conftest.$ac_ext <<_ACEOF
8787-#line 17520 "configure"
8788+#line 17526 "configure"
8789 #include "confdefs.h"
8790
8791 /* Override any gcc2 internal prototype to avoid an error.  */
8792@@ -17536,16 +17542,16 @@
8793 }
8794 _ACEOF
8795 rm -f conftest.$ac_objext conftest$ac_exeext
8796-if { (eval echo "$as_me:17539: \"$ac_link\"") >&5
8797+if { (eval echo "$as_me:17545: \"$ac_link\"") >&5
8798   (eval $ac_link) 2>&5
8799   ac_status=$?
8800-  echo "$as_me:17542: \$? = $ac_status" >&5
8801+  echo "$as_me:17548: \$? = $ac_status" >&5
8802   (exit $ac_status); } &&
8803          { ac_try='test -s conftest$ac_exeext'
8804-  { (eval echo "$as_me:17545: \"$ac_try\"") >&5
8805+  { (eval echo "$as_me:17551: \"$ac_try\"") >&5
8806   (eval $ac_try) 2>&5
8807   ac_status=$?
8808-  echo "$as_me:17548: \$? = $ac_status" >&5
8809+  echo "$as_me:17554: \$? = $ac_status" >&5
8810   (exit $ac_status); }; }; then
8811   ac_cv_lib_dir_opendir=yes
8812 else
8813@@ -17556,14 +17562,14 @@
8814 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8815 LIBS=$ac_check_lib_save_LIBS
8816 fi
8817-echo "$as_me:17559: result: $ac_cv_lib_dir_opendir" >&5
8818+echo "$as_me:17565: result: $ac_cv_lib_dir_opendir" >&5
8819 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
8820 if test $ac_cv_lib_dir_opendir = yes; then
8821   LIBS="$LIBS -ldir"
8822 fi
8823
8824 else
8825-  echo "$as_me:17566: checking for opendir in -lx" >&5
8826+  echo "$as_me:17572: checking for opendir in -lx" >&5
8827 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
8828 if test "${ac_cv_lib_x_opendir+set}" = set; then
8829   echo $ECHO_N "(cached) $ECHO_C" >&6
8830@@ -17571,7 +17577,7 @@
8831   ac_check_lib_save_LIBS=$LIBS
8832 LIBS="-lx  $LIBS"
8833 cat >conftest.$ac_ext <<_ACEOF
8834-#line 17574 "configure"
8835+#line 17580 "configure"
8836 #include "confdefs.h"
8837
8838 /* Override any gcc2 internal prototype to avoid an error.  */
8839@@ -17590,16 +17596,16 @@
8840 }
8841 _ACEOF
8842 rm -f conftest.$ac_objext conftest$ac_exeext
8843-if { (eval echo "$as_me:17593: \"$ac_link\"") >&5
8844+if { (eval echo "$as_me:17599: \"$ac_link\"") >&5
8845   (eval $ac_link) 2>&5
8846   ac_status=$?
8847-  echo "$as_me:17596: \$? = $ac_status" >&5
8848+  echo "$as_me:17602: \$? = $ac_status" >&5
8849   (exit $ac_status); } &&
8850          { ac_try='test -s conftest$ac_exeext'
8851-  { (eval echo "$as_me:17599: \"$ac_try\"") >&5
8852+  { (eval echo "$as_me:17605: \"$ac_try\"") >&5
8853   (eval $ac_try) 2>&5
8854   ac_status=$?
8855-  echo "$as_me:17602: \$? = $ac_status" >&5
8856+  echo "$as_me:17608: \$? = $ac_status" >&5
8857   (exit $ac_status); }; }; then
8858   ac_cv_lib_x_opendir=yes
8859 else
8860@@ -17610,7 +17616,7 @@
8861 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8862 LIBS=$ac_check_lib_save_LIBS
8863 fi
8864-echo "$as_me:17613: result: $ac_cv_lib_x_opendir" >&5
8865+echo "$as_me:17619: result: $ac_cv_lib_x_opendir" >&5
8866 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
8867 if test $ac_cv_lib_x_opendir = yes; then
8868   LIBS="$LIBS -lx"
8869@@ -17618,13 +17624,13 @@
8870
8871 fi
8872
8873-echo "$as_me:17621: checking whether time.h and sys/time.h may both be included" >&5
8874+echo "$as_me:17627: checking whether time.h and sys/time.h may both be included" >&5
8875 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
8876 if test "${ac_cv_header_time+set}" = set; then
8877   echo $ECHO_N "(cached) $ECHO_C" >&6
8878 else
8879   cat >conftest.$ac_ext <<_ACEOF
8880-#line 17627 "configure"
8881+#line 17633 "configure"
8882 #include "confdefs.h"
8883 #include <sys/types.h>
8884 #include <sys/time.h>
8885@@ -17640,16 +17646,16 @@
8886 }
8887 _ACEOF
8888 rm -f conftest.$ac_objext
8889-if { (eval echo "$as_me:17643: \"$ac_compile\"") >&5
8890+if { (eval echo "$as_me:17649: \"$ac_compile\"") >&5
8891   (eval $ac_compile) 2>&5
8892   ac_status=$?
8893-  echo "$as_me:17646: \$? = $ac_status" >&5
8894+  echo "$as_me:17652: \$? = $ac_status" >&5
8895   (exit $ac_status); } &&
8896          { ac_try='test -s conftest.$ac_objext'
8897-  { (eval echo "$as_me:17649: \"$ac_try\"") >&5
8898+  { (eval echo "$as_me:17655: \"$ac_try\"") >&5
8899   (eval $ac_try) 2>&5
8900   ac_status=$?
8901-  echo "$as_me:17652: \$? = $ac_status" >&5
8902+  echo "$as_me:17658: \$? = $ac_status" >&5
8903   (exit $ac_status); }; }; then
8904   ac_cv_header_time=yes
8905 else
8906@@ -17659,7 +17665,7 @@
8907 fi
8908 rm -f conftest.$ac_objext conftest.$ac_ext
8909 fi
8910-echo "$as_me:17662: result: $ac_cv_header_time" >&5
8911+echo "$as_me:17668: result: $ac_cv_header_time" >&5
8912 echo "${ECHO_T}$ac_cv_header_time" >&6
8913 if test $ac_cv_header_time = yes; then
8914
8915@@ -17678,13 +17684,13 @@
8916 	;;
8917 esac
8918
8919-echo "$as_me:17681: checking for regcomp" >&5
8920+echo "$as_me:17687: checking for regcomp" >&5
8921 echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
8922 if test "${ac_cv_func_regcomp+set}" = set; then
8923   echo $ECHO_N "(cached) $ECHO_C" >&6
8924 else
8925   cat >conftest.$ac_ext <<_ACEOF
8926-#line 17687 "configure"
8927+#line 17693 "configure"
8928 #include "confdefs.h"
8929 #define regcomp autoconf_temporary
8930 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
8931@@ -17715,16 +17721,16 @@
8932 }
8933 _ACEOF
8934 rm -f conftest.$ac_objext conftest$ac_exeext
8935-if { (eval echo "$as_me:17718: \"$ac_link\"") >&5
8936+if { (eval echo "$as_me:17724: \"$ac_link\"") >&5
8937   (eval $ac_link) 2>&5
8938   ac_status=$?
8939-  echo "$as_me:17721: \$? = $ac_status" >&5
8940+  echo "$as_me:17727: \$? = $ac_status" >&5
8941   (exit $ac_status); } &&
8942          { ac_try='test -s conftest$ac_exeext'
8943-  { (eval echo "$as_me:17724: \"$ac_try\"") >&5
8944+  { (eval echo "$as_me:17730: \"$ac_try\"") >&5
8945   (eval $ac_try) 2>&5
8946   ac_status=$?
8947-  echo "$as_me:17727: \$? = $ac_status" >&5
8948+  echo "$as_me:17733: \$? = $ac_status" >&5
8949   (exit $ac_status); }; }; then
8950   ac_cv_func_regcomp=yes
8951 else
8952@@ -17734,7 +17740,7 @@
8953 fi
8954 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8955 fi
8956-echo "$as_me:17737: result: $ac_cv_func_regcomp" >&5
8957+echo "$as_me:17743: result: $ac_cv_func_regcomp" >&5
8958 echo "${ECHO_T}$ac_cv_func_regcomp" >&6
8959 if test $ac_cv_func_regcomp = yes; then
8960   cf_regex_func=regcomp
8961@@ -17743,7 +17749,7 @@
8962 	for cf_regex_lib in $cf_regex_libs
8963 	do
8964 		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
8965-echo "$as_me:17746: checking for regcomp in -l$cf_regex_lib" >&5
8966+echo "$as_me:17752: checking for regcomp in -l$cf_regex_lib" >&5
8967 echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
8968 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
8969   echo $ECHO_N "(cached) $ECHO_C" >&6
8970@@ -17751,7 +17757,7 @@
8971   ac_check_lib_save_LIBS=$LIBS
8972 LIBS="-l$cf_regex_lib  $LIBS"
8973 cat >conftest.$ac_ext <<_ACEOF
8974-#line 17754 "configure"
8975+#line 17760 "configure"
8976 #include "confdefs.h"
8977
8978 /* Override any gcc2 internal prototype to avoid an error.  */
8979@@ -17770,16 +17776,16 @@
8980 }
8981 _ACEOF
8982 rm -f conftest.$ac_objext conftest$ac_exeext
8983-if { (eval echo "$as_me:17773: \"$ac_link\"") >&5
8984+if { (eval echo "$as_me:17779: \"$ac_link\"") >&5
8985   (eval $ac_link) 2>&5
8986   ac_status=$?
8987-  echo "$as_me:17776: \$? = $ac_status" >&5
8988+  echo "$as_me:17782: \$? = $ac_status" >&5
8989   (exit $ac_status); } &&
8990          { ac_try='test -s conftest$ac_exeext'
8991-  { (eval echo "$as_me:17779: \"$ac_try\"") >&5
8992+  { (eval echo "$as_me:17785: \"$ac_try\"") >&5
8993   (eval $ac_try) 2>&5
8994   ac_status=$?
8995-  echo "$as_me:17782: \$? = $ac_status" >&5
8996+  echo "$as_me:17788: \$? = $ac_status" >&5
8997   (exit $ac_status); }; }; then
8998   eval "$as_ac_Lib=yes"
8999 else
9000@@ -17790,7 +17796,7 @@
9001 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9002 LIBS=$ac_check_lib_save_LIBS
9003 fi
9004-echo "$as_me:17793: result: `eval echo '${'$as_ac_Lib'}'`" >&5
9005+echo "$as_me:17799: result: `eval echo '${'$as_ac_Lib'}'`" >&5
9006 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
9007 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
9008
9009@@ -17819,13 +17825,13 @@
9010 fi
9011
9012 if test "$cf_regex_func" = no ; then
9013-	echo "$as_me:17822: checking for compile" >&5
9014+	echo "$as_me:17828: checking for compile" >&5
9015 echo $ECHO_N "checking for compile... $ECHO_C" >&6
9016 if test "${ac_cv_func_compile+set}" = set; then
9017   echo $ECHO_N "(cached) $ECHO_C" >&6
9018 else
9019   cat >conftest.$ac_ext <<_ACEOF
9020-#line 17828 "configure"
9021+#line 17834 "configure"
9022 #include "confdefs.h"
9023 #define compile autoconf_temporary
9024 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
9025@@ -17856,16 +17862,16 @@
9026 }
9027 _ACEOF
9028 rm -f conftest.$ac_objext conftest$ac_exeext
9029-if { (eval echo "$as_me:17859: \"$ac_link\"") >&5
9030+if { (eval echo "$as_me:17865: \"$ac_link\"") >&5
9031   (eval $ac_link) 2>&5
9032   ac_status=$?
9033-  echo "$as_me:17862: \$? = $ac_status" >&5
9034+  echo "$as_me:17868: \$? = $ac_status" >&5
9035   (exit $ac_status); } &&
9036          { ac_try='test -s conftest$ac_exeext'
9037-  { (eval echo "$as_me:17865: \"$ac_try\"") >&5
9038+  { (eval echo "$as_me:17871: \"$ac_try\"") >&5
9039   (eval $ac_try) 2>&5
9040   ac_status=$?
9041-  echo "$as_me:17868: \$? = $ac_status" >&5
9042+  echo "$as_me:17874: \$? = $ac_status" >&5
9043   (exit $ac_status); }; }; then
9044   ac_cv_func_compile=yes
9045 else
9046@@ -17875,13 +17881,13 @@
9047 fi
9048 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9049 fi
9050-echo "$as_me:17878: result: $ac_cv_func_compile" >&5
9051+echo "$as_me:17884: result: $ac_cv_func_compile" >&5
9052 echo "${ECHO_T}$ac_cv_func_compile" >&6
9053 if test $ac_cv_func_compile = yes; then
9054   cf_regex_func=compile
9055 else
9056
9057-		echo "$as_me:17884: checking for compile in -lgen" >&5
9058+		echo "$as_me:17890: checking for compile in -lgen" >&5
9059 echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
9060 if test "${ac_cv_lib_gen_compile+set}" = set; then
9061   echo $ECHO_N "(cached) $ECHO_C" >&6
9062@@ -17889,7 +17895,7 @@
9063   ac_check_lib_save_LIBS=$LIBS
9064 LIBS="-lgen  $LIBS"
9065 cat >conftest.$ac_ext <<_ACEOF
9066-#line 17892 "configure"
9067+#line 17898 "configure"
9068 #include "confdefs.h"
9069
9070 /* Override any gcc2 internal prototype to avoid an error.  */
9071@@ -17908,16 +17914,16 @@
9072 }
9073 _ACEOF
9074 rm -f conftest.$ac_objext conftest$ac_exeext
9075-if { (eval echo "$as_me:17911: \"$ac_link\"") >&5
9076+if { (eval echo "$as_me:17917: \"$ac_link\"") >&5
9077   (eval $ac_link) 2>&5
9078   ac_status=$?
9079-  echo "$as_me:17914: \$? = $ac_status" >&5
9080+  echo "$as_me:17920: \$? = $ac_status" >&5
9081   (exit $ac_status); } &&
9082          { ac_try='test -s conftest$ac_exeext'
9083-  { (eval echo "$as_me:17917: \"$ac_try\"") >&5
9084+  { (eval echo "$as_me:17923: \"$ac_try\"") >&5
9085   (eval $ac_try) 2>&5
9086   ac_status=$?
9087-  echo "$as_me:17920: \$? = $ac_status" >&5
9088+  echo "$as_me:17926: \$? = $ac_status" >&5
9089   (exit $ac_status); }; }; then
9090   ac_cv_lib_gen_compile=yes
9091 else
9092@@ -17928,7 +17934,7 @@
9093 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9094 LIBS=$ac_check_lib_save_LIBS
9095 fi
9096-echo "$as_me:17931: result: $ac_cv_lib_gen_compile" >&5
9097+echo "$as_me:17937: result: $ac_cv_lib_gen_compile" >&5
9098 echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
9099 if test $ac_cv_lib_gen_compile = yes; then
9100
9101@@ -17956,11 +17962,11 @@
9102 fi
9103
9104 if test "$cf_regex_func" = no ; then
9105-	{ echo "$as_me:17959: WARNING: cannot find regular expression library" >&5
9106+	{ echo "$as_me:17965: WARNING: cannot find regular expression library" >&5
9107 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
9108 fi
9109
9110-echo "$as_me:17963: checking for regular-expression headers" >&5
9111+echo "$as_me:17969: checking for regular-expression headers" >&5
9112 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
9113 if test "${cf_cv_regex_hdrs+set}" = set; then
9114   echo $ECHO_N "(cached) $ECHO_C" >&6
9115@@ -17972,7 +17978,7 @@
9116 	for cf_regex_hdr in regexp.h regexpr.h
9117 	do
9118 		cat >conftest.$ac_ext <<_ACEOF
9119-#line 17975 "configure"
9120+#line 17981 "configure"
9121 #include "confdefs.h"
9122 #include <$cf_regex_hdr>
9123 int
9124@@ -17987,16 +17993,16 @@
9125 }
9126 _ACEOF
9127 rm -f conftest.$ac_objext conftest$ac_exeext
9128-if { (eval echo "$as_me:17990: \"$ac_link\"") >&5
9129+if { (eval echo "$as_me:17996: \"$ac_link\"") >&5
9130   (eval $ac_link) 2>&5
9131   ac_status=$?
9132-  echo "$as_me:17993: \$? = $ac_status" >&5
9133+  echo "$as_me:17999: \$? = $ac_status" >&5
9134   (exit $ac_status); } &&
9135          { ac_try='test -s conftest$ac_exeext'
9136-  { (eval echo "$as_me:17996: \"$ac_try\"") >&5
9137+  { (eval echo "$as_me:18002: \"$ac_try\"") >&5
9138   (eval $ac_try) 2>&5
9139   ac_status=$?
9140-  echo "$as_me:17999: \$? = $ac_status" >&5
9141+  echo "$as_me:18005: \$? = $ac_status" >&5
9142   (exit $ac_status); }; }; then
9143
9144 			cf_cv_regex_hdrs=$cf_regex_hdr
9145@@ -18013,7 +18019,7 @@
9146 	for cf_regex_hdr in regex.h
9147 	do
9148 		cat >conftest.$ac_ext <<_ACEOF
9149-#line 18016 "configure"
9150+#line 18022 "configure"
9151 #include "confdefs.h"
9152 #include <sys/types.h>
9153 #include <$cf_regex_hdr>
9154@@ -18031,16 +18037,16 @@
9155 }
9156 _ACEOF
9157 rm -f conftest.$ac_objext conftest$ac_exeext
9158-if { (eval echo "$as_me:18034: \"$ac_link\"") >&5
9159+if { (eval echo "$as_me:18040: \"$ac_link\"") >&5
9160   (eval $ac_link) 2>&5
9161   ac_status=$?
9162-  echo "$as_me:18037: \$? = $ac_status" >&5
9163+  echo "$as_me:18043: \$? = $ac_status" >&5
9164   (exit $ac_status); } &&
9165          { ac_try='test -s conftest$ac_exeext'
9166-  { (eval echo "$as_me:18040: \"$ac_try\"") >&5
9167+  { (eval echo "$as_me:18046: \"$ac_try\"") >&5
9168   (eval $ac_try) 2>&5
9169   ac_status=$?
9170-  echo "$as_me:18043: \$? = $ac_status" >&5
9171+  echo "$as_me:18049: \$? = $ac_status" >&5
9172   (exit $ac_status); }; }; then
9173
9174 			cf_cv_regex_hdrs=$cf_regex_hdr
9175@@ -18056,11 +18062,11 @@
9176 esac
9177
9178 fi
9179-echo "$as_me:18059: result: $cf_cv_regex_hdrs" >&5
9180+echo "$as_me:18065: result: $cf_cv_regex_hdrs" >&5
9181 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
9182
9183 case $cf_cv_regex_hdrs in
9184-	(no)		{ echo "$as_me:18063: WARNING: no regular expression header found" >&5
9185+	(no)		{ echo "$as_me:18069: WARNING: no regular expression header found" >&5
9186 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
9187 	(regex.h)
9188 cat >>confdefs.h <<\EOF
9189@@ -18099,23 +18105,23 @@
9190
9191 do
9192 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
9193-echo "$as_me:18102: checking for $ac_header" >&5
9194+echo "$as_me:18108: checking for $ac_header" >&5
9195 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
9196 if eval "test \"\${$as_ac_Header+set}\" = set"; then
9197   echo $ECHO_N "(cached) $ECHO_C" >&6
9198 else
9199   cat >conftest.$ac_ext <<_ACEOF
9200-#line 18108 "configure"
9201+#line 18114 "configure"
9202 #include "confdefs.h"
9203 #include <$ac_header>
9204 _ACEOF
9205-if { (eval echo "$as_me:18112: \"$ac_cpp conftest.$ac_ext\"") >&5
9206+if { (eval echo "$as_me:18118: \"$ac_cpp conftest.$ac_ext\"") >&5
9207   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
9208   ac_status=$?
9209   egrep -v '^ *\+' conftest.er1 >conftest.err
9210   rm -f conftest.er1
9211   cat conftest.err >&5
9212-  echo "$as_me:18118: \$? = $ac_status" >&5
9213+  echo "$as_me:18124: \$? = $ac_status" >&5
9214   (exit $ac_status); } >/dev/null; then
9215   if test -s conftest.err; then
9216     ac_cpp_err=$ac_c_preproc_warn_flag
9217@@ -18134,7 +18140,7 @@
9218 fi
9219 rm -f conftest.err conftest.$ac_ext
9220 fi
9221-echo "$as_me:18137: result: `eval echo '${'$as_ac_Header'}'`" >&5
9222+echo "$as_me:18143: result: `eval echo '${'$as_ac_Header'}'`" >&5
9223 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
9224 if test `eval echo '${'$as_ac_Header'}'` = yes; then
9225   cat >>confdefs.h <<EOF
9226@@ -18147,23 +18153,23 @@
9227 for ac_header in unistd.h getopt.h
9228 do
9229 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
9230-echo "$as_me:18150: checking for $ac_header" >&5
9231+echo "$as_me:18156: checking for $ac_header" >&5
9232 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
9233 if eval "test \"\${$as_ac_Header+set}\" = set"; then
9234   echo $ECHO_N "(cached) $ECHO_C" >&6
9235 else
9236   cat >conftest.$ac_ext <<_ACEOF
9237-#line 18156 "configure"
9238+#line 18162 "configure"
9239 #include "confdefs.h"
9240 #include <$ac_header>
9241 _ACEOF
9242-if { (eval echo "$as_me:18160: \"$ac_cpp conftest.$ac_ext\"") >&5
9243+if { (eval echo "$as_me:18166: \"$ac_cpp conftest.$ac_ext\"") >&5
9244   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
9245   ac_status=$?
9246   egrep -v '^ *\+' conftest.er1 >conftest.err
9247   rm -f conftest.er1
9248   cat conftest.err >&5
9249-  echo "$as_me:18166: \$? = $ac_status" >&5
9250+  echo "$as_me:18172: \$? = $ac_status" >&5
9251   (exit $ac_status); } >/dev/null; then
9252   if test -s conftest.err; then
9253     ac_cpp_err=$ac_c_preproc_warn_flag
9254@@ -18182,7 +18188,7 @@
9255 fi
9256 rm -f conftest.err conftest.$ac_ext
9257 fi
9258-echo "$as_me:18185: result: `eval echo '${'$as_ac_Header'}'`" >&5
9259+echo "$as_me:18191: result: `eval echo '${'$as_ac_Header'}'`" >&5
9260 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
9261 if test `eval echo '${'$as_ac_Header'}'` = yes; then
9262   cat >>confdefs.h <<EOF
9263@@ -18192,7 +18198,7 @@
9264 fi
9265 done
9266
9267-echo "$as_me:18195: checking for header declaring getopt variables" >&5
9268+echo "$as_me:18201: checking for header declaring getopt variables" >&5
9269 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
9270 if test "${cf_cv_getopt_header+set}" = set; then
9271   echo $ECHO_N "(cached) $ECHO_C" >&6
9272@@ -18202,7 +18208,7 @@
9273 for cf_header in stdio.h stdlib.h unistd.h getopt.h
9274 do
9275 cat >conftest.$ac_ext <<_ACEOF
9276-#line 18205 "configure"
9277+#line 18211 "configure"
9278 #include "confdefs.h"
9279
9280 #include <$cf_header>
9281@@ -18215,16 +18221,16 @@
9282 }
9283 _ACEOF
9284 rm -f conftest.$ac_objext
9285-if { (eval echo "$as_me:18218: \"$ac_compile\"") >&5
9286+if { (eval echo "$as_me:18224: \"$ac_compile\"") >&5
9287   (eval $ac_compile) 2>&5
9288   ac_status=$?
9289-  echo "$as_me:18221: \$? = $ac_status" >&5
9290+  echo "$as_me:18227: \$? = $ac_status" >&5
9291   (exit $ac_status); } &&
9292          { ac_try='test -s conftest.$ac_objext'
9293-  { (eval echo "$as_me:18224: \"$ac_try\"") >&5
9294+  { (eval echo "$as_me:18230: \"$ac_try\"") >&5
9295   (eval $ac_try) 2>&5
9296   ac_status=$?
9297-  echo "$as_me:18227: \$? = $ac_status" >&5
9298+  echo "$as_me:18233: \$? = $ac_status" >&5
9299   (exit $ac_status); }; }; then
9300   cf_cv_getopt_header=$cf_header
9301  break
9302@@ -18236,7 +18242,7 @@
9303 done
9304
9305 fi
9306-echo "$as_me:18239: result: $cf_cv_getopt_header" >&5
9307+echo "$as_me:18245: result: $cf_cv_getopt_header" >&5
9308 echo "${ECHO_T}$cf_cv_getopt_header" >&6
9309 if test $cf_cv_getopt_header != none ; then
9310
9311@@ -18253,14 +18259,14 @@
9312
9313 fi
9314
9315-echo "$as_me:18256: checking if external environ is declared" >&5
9316+echo "$as_me:18262: checking if external environ is declared" >&5
9317 echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
9318 if test "${cf_cv_dcl_environ+set}" = set; then
9319   echo $ECHO_N "(cached) $ECHO_C" >&6
9320 else
9321
9322     cat >conftest.$ac_ext <<_ACEOF
9323-#line 18263 "configure"
9324+#line 18269 "configure"
9325 #include "confdefs.h"
9326
9327 #ifdef HAVE_STDLIB_H
9328@@ -18276,16 +18282,16 @@
9329 }
9330 _ACEOF
9331 rm -f conftest.$ac_objext
9332-if { (eval echo "$as_me:18279: \"$ac_compile\"") >&5
9333+if { (eval echo "$as_me:18285: \"$ac_compile\"") >&5
9334   (eval $ac_compile) 2>&5
9335   ac_status=$?
9336-  echo "$as_me:18282: \$? = $ac_status" >&5
9337+  echo "$as_me:18288: \$? = $ac_status" >&5
9338   (exit $ac_status); } &&
9339          { ac_try='test -s conftest.$ac_objext'
9340-  { (eval echo "$as_me:18285: \"$ac_try\"") >&5
9341+  { (eval echo "$as_me:18291: \"$ac_try\"") >&5
9342   (eval $ac_try) 2>&5
9343   ac_status=$?
9344-  echo "$as_me:18288: \$? = $ac_status" >&5
9345+  echo "$as_me:18294: \$? = $ac_status" >&5
9346   (exit $ac_status); }; }; then
9347   cf_cv_dcl_environ=yes
9348 else
9349@@ -18296,7 +18302,7 @@
9350 rm -f conftest.$ac_objext conftest.$ac_ext
9351
9352 fi
9353-echo "$as_me:18299: result: $cf_cv_dcl_environ" >&5
9354+echo "$as_me:18305: result: $cf_cv_dcl_environ" >&5
9355 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
9356
9357 if test "$cf_cv_dcl_environ" = no ; then
9358@@ -18311,14 +18317,14 @@
9359
9360 # It's possible (for near-UNIX clones) that the data doesn't exist
9361
9362-echo "$as_me:18314: checking if external environ exists" >&5
9363+echo "$as_me:18320: checking if external environ exists" >&5
9364 echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
9365 if test "${cf_cv_have_environ+set}" = set; then
9366   echo $ECHO_N "(cached) $ECHO_C" >&6
9367 else
9368
9369 	cat >conftest.$ac_ext <<_ACEOF
9370-#line 18321 "configure"
9371+#line 18327 "configure"
9372 #include "confdefs.h"
9373
9374 #undef environ
9375@@ -18333,16 +18339,16 @@
9376 }
9377 _ACEOF
9378 rm -f conftest.$ac_objext conftest$ac_exeext
9379-if { (eval echo "$as_me:18336: \"$ac_link\"") >&5
9380+if { (eval echo "$as_me:18342: \"$ac_link\"") >&5
9381   (eval $ac_link) 2>&5
9382   ac_status=$?
9383-  echo "$as_me:18339: \$? = $ac_status" >&5
9384+  echo "$as_me:18345: \$? = $ac_status" >&5
9385   (exit $ac_status); } &&
9386          { ac_try='test -s conftest$ac_exeext'
9387-  { (eval echo "$as_me:18342: \"$ac_try\"") >&5
9388+  { (eval echo "$as_me:18348: \"$ac_try\"") >&5
9389   (eval $ac_try) 2>&5
9390   ac_status=$?
9391-  echo "$as_me:18345: \$? = $ac_status" >&5
9392+  echo "$as_me:18351: \$? = $ac_status" >&5
9393   (exit $ac_status); }; }; then
9394   cf_cv_have_environ=yes
9395 else
9396@@ -18353,7 +18359,7 @@
9397 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9398
9399 fi
9400-echo "$as_me:18356: result: $cf_cv_have_environ" >&5
9401+echo "$as_me:18362: result: $cf_cv_have_environ" >&5
9402 echo "${ECHO_T}$cf_cv_have_environ" >&6
9403
9404 if test "$cf_cv_have_environ" = yes ; then
9405@@ -18366,13 +18372,13 @@
9406
9407 fi
9408
9409-echo "$as_me:18369: checking for getenv" >&5
9410+echo "$as_me:18375: checking for getenv" >&5
9411 echo $ECHO_N "checking for getenv... $ECHO_C" >&6
9412 if test "${ac_cv_func_getenv+set}" = set; then
9413   echo $ECHO_N "(cached) $ECHO_C" >&6
9414 else
9415   cat >conftest.$ac_ext <<_ACEOF
9416-#line 18375 "configure"
9417+#line 18381 "configure"
9418 #include "confdefs.h"
9419 #define getenv autoconf_temporary
9420 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
9421@@ -18403,16 +18409,16 @@
9422 }
9423 _ACEOF
9424 rm -f conftest.$ac_objext conftest$ac_exeext
9425-if { (eval echo "$as_me:18406: \"$ac_link\"") >&5
9426+if { (eval echo "$as_me:18412: \"$ac_link\"") >&5
9427   (eval $ac_link) 2>&5
9428   ac_status=$?
9429-  echo "$as_me:18409: \$? = $ac_status" >&5
9430+  echo "$as_me:18415: \$? = $ac_status" >&5
9431   (exit $ac_status); } &&
9432          { ac_try='test -s conftest$ac_exeext'
9433-  { (eval echo "$as_me:18412: \"$ac_try\"") >&5
9434+  { (eval echo "$as_me:18418: \"$ac_try\"") >&5
9435   (eval $ac_try) 2>&5
9436   ac_status=$?
9437-  echo "$as_me:18415: \$? = $ac_status" >&5
9438+  echo "$as_me:18421: \$? = $ac_status" >&5
9439   (exit $ac_status); }; }; then
9440   ac_cv_func_getenv=yes
9441 else
9442@@ -18422,19 +18428,19 @@
9443 fi
9444 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9445 fi
9446-echo "$as_me:18425: result: $ac_cv_func_getenv" >&5
9447+echo "$as_me:18431: result: $ac_cv_func_getenv" >&5
9448 echo "${ECHO_T}$ac_cv_func_getenv" >&6
9449
9450 for ac_func in putenv setenv strdup
9451 do
9452 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
9453-echo "$as_me:18431: checking for $ac_func" >&5
9454+echo "$as_me:18437: checking for $ac_func" >&5
9455 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
9456 if eval "test \"\${$as_ac_var+set}\" = set"; then
9457   echo $ECHO_N "(cached) $ECHO_C" >&6
9458 else
9459   cat >conftest.$ac_ext <<_ACEOF
9460-#line 18437 "configure"
9461+#line 18443 "configure"
9462 #include "confdefs.h"
9463 #define $ac_func autoconf_temporary
9464 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
9465@@ -18465,16 +18471,16 @@
9466 }
9467 _ACEOF
9468 rm -f conftest.$ac_objext conftest$ac_exeext
9469-if { (eval echo "$as_me:18468: \"$ac_link\"") >&5
9470+if { (eval echo "$as_me:18474: \"$ac_link\"") >&5
9471   (eval $ac_link) 2>&5
9472   ac_status=$?
9473-  echo "$as_me:18471: \$? = $ac_status" >&5
9474+  echo "$as_me:18477: \$? = $ac_status" >&5
9475   (exit $ac_status); } &&
9476          { ac_try='test -s conftest$ac_exeext'
9477-  { (eval echo "$as_me:18474: \"$ac_try\"") >&5
9478+  { (eval echo "$as_me:18480: \"$ac_try\"") >&5
9479   (eval $ac_try) 2>&5
9480   ac_status=$?
9481-  echo "$as_me:18477: \$? = $ac_status" >&5
9482+  echo "$as_me:18483: \$? = $ac_status" >&5
9483   (exit $ac_status); }; }; then
9484   eval "$as_ac_var=yes"
9485 else
9486@@ -18484,7 +18490,7 @@
9487 fi
9488 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9489 fi
9490-echo "$as_me:18487: result: `eval echo '${'$as_ac_var'}'`" >&5
9491+echo "$as_me:18493: result: `eval echo '${'$as_ac_var'}'`" >&5
9492 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
9493 if test `eval echo '${'$as_ac_var'}'` = yes; then
9494   cat >>confdefs.h <<EOF
9495@@ -18494,7 +18500,7 @@
9496 fi
9497 done
9498
9499-echo "$as_me:18497: checking if getenv returns consistent values" >&5
9500+echo "$as_me:18503: checking if getenv returns consistent values" >&5
9501 echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6
9502 if test "${cf_cv_consistent_getenv+set}" = set; then
9503   echo $ECHO_N "(cached) $ECHO_C" >&6
9504@@ -18504,7 +18510,7 @@
9505   cf_cv_consistent_getenv=unknown
9506 else
9507   cat >conftest.$ac_ext <<_ACEOF
9508-#line 18507 "configure"
9509+#line 18513 "configure"
9510 #include "confdefs.h"
9511
9512 #include <stdlib.h>
9513@@ -18613,15 +18619,15 @@
9514
9515 _ACEOF
9516 rm -f conftest$ac_exeext
9517-if { (eval echo "$as_me:18616: \"$ac_link\"") >&5
9518+if { (eval echo "$as_me:18622: \"$ac_link\"") >&5
9519   (eval $ac_link) 2>&5
9520   ac_status=$?
9521-  echo "$as_me:18619: \$? = $ac_status" >&5
9522+  echo "$as_me:18625: \$? = $ac_status" >&5
9523   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
9524-  { (eval echo "$as_me:18621: \"$ac_try\"") >&5
9525+  { (eval echo "$as_me:18627: \"$ac_try\"") >&5
9526   (eval $ac_try) 2>&5
9527   ac_status=$?
9528-  echo "$as_me:18624: \$? = $ac_status" >&5
9529+  echo "$as_me:18630: \$? = $ac_status" >&5
9530   (exit $ac_status); }; }; then
9531   cf_cv_consistent_getenv=yes
9532 else
9533@@ -18634,7 +18640,7 @@
9534 fi
9535
9536 fi
9537-echo "$as_me:18637: result: $cf_cv_consistent_getenv" >&5
9538+echo "$as_me:18643: result: $cf_cv_consistent_getenv" >&5
9539 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
9540
9541 if test "x$cf_cv_consistent_getenv" = xno
9542@@ -18649,7 +18655,7 @@
9543 if test "x$cf_cv_consistent_getenv" = xno && \
9544 	test "x$cf_with_trace" = xyes
9545 then
9546-	{ echo "$as_me:18652: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
9547+	{ echo "$as_me:18658: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
9548 echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
9549 fi
9550
9551@@ -18657,7 +18663,7 @@
9552 # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
9553 if test "x$ISC" = xyes ; then
9554
9555-echo "$as_me:18660: checking for main in -lcposix" >&5
9556+echo "$as_me:18666: checking for main in -lcposix" >&5
9557 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
9558 if test "${ac_cv_lib_cposix_main+set}" = set; then
9559   echo $ECHO_N "(cached) $ECHO_C" >&6
9560@@ -18665,7 +18671,7 @@
9561   ac_check_lib_save_LIBS=$LIBS
9562 LIBS="-lcposix  $LIBS"
9563 cat >conftest.$ac_ext <<_ACEOF
9564-#line 18668 "configure"
9565+#line 18674 "configure"
9566 #include "confdefs.h"
9567
9568 int
9569@@ -18677,16 +18683,16 @@
9570 }
9571 _ACEOF
9572 rm -f conftest.$ac_objext conftest$ac_exeext
9573-if { (eval echo "$as_me:18680: \"$ac_link\"") >&5
9574+if { (eval echo "$as_me:18686: \"$ac_link\"") >&5
9575   (eval $ac_link) 2>&5
9576   ac_status=$?
9577-  echo "$as_me:18683: \$? = $ac_status" >&5
9578+  echo "$as_me:18689: \$? = $ac_status" >&5
9579   (exit $ac_status); } &&
9580          { ac_try='test -s conftest$ac_exeext'
9581-  { (eval echo "$as_me:18686: \"$ac_try\"") >&5
9582+  { (eval echo "$as_me:18692: \"$ac_try\"") >&5
9583   (eval $ac_try) 2>&5
9584   ac_status=$?
9585-  echo "$as_me:18689: \$? = $ac_status" >&5
9586+  echo "$as_me:18695: \$? = $ac_status" >&5
9587   (exit $ac_status); }; }; then
9588   ac_cv_lib_cposix_main=yes
9589 else
9590@@ -18697,7 +18703,7 @@
9591 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9592 LIBS=$ac_check_lib_save_LIBS
9593 fi
9594-echo "$as_me:18700: result: $ac_cv_lib_cposix_main" >&5
9595+echo "$as_me:18706: result: $ac_cv_lib_cposix_main" >&5
9596 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
9597 if test $ac_cv_lib_cposix_main = yes; then
9598   cat >>confdefs.h <<EOF
9599@@ -18708,7 +18714,7 @@
9600
9601 fi
9602
9603-	echo "$as_me:18711: checking for bzero in -linet" >&5
9604+	echo "$as_me:18717: checking for bzero in -linet" >&5
9605 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
9606 if test "${ac_cv_lib_inet_bzero+set}" = set; then
9607   echo $ECHO_N "(cached) $ECHO_C" >&6
9608@@ -18716,7 +18722,7 @@
9609   ac_check_lib_save_LIBS=$LIBS
9610 LIBS="-linet  $LIBS"
9611 cat >conftest.$ac_ext <<_ACEOF
9612-#line 18719 "configure"
9613+#line 18725 "configure"
9614 #include "confdefs.h"
9615
9616 /* Override any gcc2 internal prototype to avoid an error.  */
9617@@ -18735,16 +18741,16 @@
9618 }
9619 _ACEOF
9620 rm -f conftest.$ac_objext conftest$ac_exeext
9621-if { (eval echo "$as_me:18738: \"$ac_link\"") >&5
9622+if { (eval echo "$as_me:18744: \"$ac_link\"") >&5
9623   (eval $ac_link) 2>&5
9624   ac_status=$?
9625-  echo "$as_me:18741: \$? = $ac_status" >&5
9626+  echo "$as_me:18747: \$? = $ac_status" >&5
9627   (exit $ac_status); } &&
9628          { ac_try='test -s conftest$ac_exeext'
9629-  { (eval echo "$as_me:18744: \"$ac_try\"") >&5
9630+  { (eval echo "$as_me:18750: \"$ac_try\"") >&5
9631   (eval $ac_try) 2>&5
9632   ac_status=$?
9633-  echo "$as_me:18747: \$? = $ac_status" >&5
9634+  echo "$as_me:18753: \$? = $ac_status" >&5
9635   (exit $ac_status); }; }; then
9636   ac_cv_lib_inet_bzero=yes
9637 else
9638@@ -18755,7 +18761,7 @@
9639 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9640 LIBS=$ac_check_lib_save_LIBS
9641 fi
9642-echo "$as_me:18758: result: $ac_cv_lib_inet_bzero" >&5
9643+echo "$as_me:18764: result: $ac_cv_lib_inet_bzero" >&5
9644 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
9645 if test $ac_cv_lib_inet_bzero = yes; then
9646
9647@@ -18778,14 +18784,14 @@
9648 fi
9649 fi
9650
9651-echo "$as_me:18781: checking if sys/time.h works with sys/select.h" >&5
9652+echo "$as_me:18787: checking if sys/time.h works with sys/select.h" >&5
9653 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
9654 if test "${cf_cv_sys_time_select+set}" = set; then
9655   echo $ECHO_N "(cached) $ECHO_C" >&6
9656 else
9657
9658 cat >conftest.$ac_ext <<_ACEOF
9659-#line 18788 "configure"
9660+#line 18794 "configure"
9661 #include "confdefs.h"
9662
9663 #include <sys/types.h>
9664@@ -18805,16 +18811,16 @@
9665 }
9666 _ACEOF
9667 rm -f conftest.$ac_objext
9668-if { (eval echo "$as_me:18808: \"$ac_compile\"") >&5
9669+if { (eval echo "$as_me:18814: \"$ac_compile\"") >&5
9670   (eval $ac_compile) 2>&5
9671   ac_status=$?
9672-  echo "$as_me:18811: \$? = $ac_status" >&5
9673+  echo "$as_me:18817: \$? = $ac_status" >&5
9674   (exit $ac_status); } &&
9675          { ac_try='test -s conftest.$ac_objext'
9676-  { (eval echo "$as_me:18814: \"$ac_try\"") >&5
9677+  { (eval echo "$as_me:18820: \"$ac_try\"") >&5
9678   (eval $ac_try) 2>&5
9679   ac_status=$?
9680-  echo "$as_me:18817: \$? = $ac_status" >&5
9681+  echo "$as_me:18823: \$? = $ac_status" >&5
9682   (exit $ac_status); }; }; then
9683   cf_cv_sys_time_select=yes
9684 else
9685@@ -18826,7 +18832,7 @@
9686
9687 fi
9688
9689-echo "$as_me:18829: result: $cf_cv_sys_time_select" >&5
9690+echo "$as_me:18835: result: $cf_cv_sys_time_select" >&5
9691 echo "${ECHO_T}$cf_cv_sys_time_select" >&6
9692 test "$cf_cv_sys_time_select" = yes &&
9693 cat >>confdefs.h <<\EOF
9694@@ -18841,13 +18847,13 @@
9695 ac_compiler_gnu=$ac_cv_c_compiler_gnu
9696 ac_main_return=return
9697
9698-echo "$as_me:18844: checking for an ANSI C-conforming const" >&5
9699+echo "$as_me:18850: checking for an ANSI C-conforming const" >&5
9700 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
9701 if test "${ac_cv_c_const+set}" = set; then
9702   echo $ECHO_N "(cached) $ECHO_C" >&6
9703 else
9704   cat >conftest.$ac_ext <<_ACEOF
9705-#line 18850 "configure"
9706+#line 18856 "configure"
9707 #include "confdefs.h"
9708
9709 int
9710@@ -18905,16 +18911,16 @@
9711 }
9712 _ACEOF
9713 rm -f conftest.$ac_objext
9714-if { (eval echo "$as_me:18908: \"$ac_compile\"") >&5
9715+if { (eval echo "$as_me:18914: \"$ac_compile\"") >&5
9716   (eval $ac_compile) 2>&5
9717   ac_status=$?
9718-  echo "$as_me:18911: \$? = $ac_status" >&5
9719+  echo "$as_me:18917: \$? = $ac_status" >&5
9720   (exit $ac_status); } &&
9721          { ac_try='test -s conftest.$ac_objext'
9722-  { (eval echo "$as_me:18914: \"$ac_try\"") >&5
9723+  { (eval echo "$as_me:18920: \"$ac_try\"") >&5
9724   (eval $ac_try) 2>&5
9725   ac_status=$?
9726-  echo "$as_me:18917: \$? = $ac_status" >&5
9727+  echo "$as_me:18923: \$? = $ac_status" >&5
9728   (exit $ac_status); }; }; then
9729   ac_cv_c_const=yes
9730 else
9731@@ -18924,7 +18930,7 @@
9732 fi
9733 rm -f conftest.$ac_objext conftest.$ac_ext
9734 fi
9735-echo "$as_me:18927: result: $ac_cv_c_const" >&5
9736+echo "$as_me:18933: result: $ac_cv_c_const" >&5
9737 echo "${ECHO_T}$ac_cv_c_const" >&6
9738 if test $ac_cv_c_const = no; then
9739
9740@@ -18934,7 +18940,7 @@
9741
9742 fi
9743
9744-echo "$as_me:18937: checking for inline" >&5
9745+echo "$as_me:18943: checking for inline" >&5
9746 echo $ECHO_N "checking for inline... $ECHO_C" >&6
9747 if test "${ac_cv_c_inline+set}" = set; then
9748   echo $ECHO_N "(cached) $ECHO_C" >&6
9749@@ -18942,7 +18948,7 @@
9750   ac_cv_c_inline=no
9751 for ac_kw in inline __inline__ __inline; do
9752   cat >conftest.$ac_ext <<_ACEOF
9753-#line 18945 "configure"
9754+#line 18951 "configure"
9755 #include "confdefs.h"
9756 #ifndef __cplusplus
9757 static $ac_kw int static_foo () {return 0; }
9758@@ -18951,16 +18957,16 @@
9759
9760 _ACEOF
9761 rm -f conftest.$ac_objext
9762-if { (eval echo "$as_me:18954: \"$ac_compile\"") >&5
9763+if { (eval echo "$as_me:18960: \"$ac_compile\"") >&5
9764   (eval $ac_compile) 2>&5
9765   ac_status=$?
9766-  echo "$as_me:18957: \$? = $ac_status" >&5
9767+  echo "$as_me:18963: \$? = $ac_status" >&5
9768   (exit $ac_status); } &&
9769          { ac_try='test -s conftest.$ac_objext'
9770-  { (eval echo "$as_me:18960: \"$ac_try\"") >&5
9771+  { (eval echo "$as_me:18966: \"$ac_try\"") >&5
9772   (eval $ac_try) 2>&5
9773   ac_status=$?
9774-  echo "$as_me:18963: \$? = $ac_status" >&5
9775+  echo "$as_me:18969: \$? = $ac_status" >&5
9776   (exit $ac_status); }; }; then
9777   ac_cv_c_inline=$ac_kw; break
9778 else
9779@@ -18971,7 +18977,7 @@
9780 done
9781
9782 fi
9783-echo "$as_me:18974: result: $ac_cv_c_inline" >&5
9784+echo "$as_me:18980: result: $ac_cv_c_inline" >&5
9785 echo "${ECHO_T}$ac_cv_c_inline" >&6
9786 case $ac_cv_c_inline in
9787   inline | yes) ;;
9788@@ -18997,7 +19003,7 @@
9789 		:
9790 	elif test "$GCC" = yes
9791 	then
9792-		echo "$as_me:19000: checking if $CC supports options to tune inlining" >&5
9793+		echo "$as_me:19006: checking if $CC supports options to tune inlining" >&5
9794 echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
9795 if test "${cf_cv_gcc_inline+set}" = set; then
9796   echo $ECHO_N "(cached) $ECHO_C" >&6
9797@@ -19006,7 +19012,7 @@
9798 		cf_save_CFLAGS=$CFLAGS
9799 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
9800 		cat >conftest.$ac_ext <<_ACEOF
9801-#line 19009 "configure"
9802+#line 19015 "configure"
9803 #include "confdefs.h"
9804 inline int foo(void) { return 1; }
9805 int
9806@@ -19018,16 +19024,16 @@
9807 }
9808 _ACEOF
9809 rm -f conftest.$ac_objext
9810-if { (eval echo "$as_me:19021: \"$ac_compile\"") >&5
9811+if { (eval echo "$as_me:19027: \"$ac_compile\"") >&5
9812   (eval $ac_compile) 2>&5
9813   ac_status=$?
9814-  echo "$as_me:19024: \$? = $ac_status" >&5
9815+  echo "$as_me:19030: \$? = $ac_status" >&5
9816   (exit $ac_status); } &&
9817          { ac_try='test -s conftest.$ac_objext'
9818-  { (eval echo "$as_me:19027: \"$ac_try\"") >&5
9819+  { (eval echo "$as_me:19033: \"$ac_try\"") >&5
9820   (eval $ac_try) 2>&5
9821   ac_status=$?
9822-  echo "$as_me:19030: \$? = $ac_status" >&5
9823+  echo "$as_me:19036: \$? = $ac_status" >&5
9824   (exit $ac_status); }; }; then
9825   cf_cv_gcc_inline=yes
9826 else
9827@@ -19039,7 +19045,7 @@
9828 		CFLAGS=$cf_save_CFLAGS
9829
9830 fi
9831-echo "$as_me:19042: result: $cf_cv_gcc_inline" >&5
9832+echo "$as_me:19048: result: $cf_cv_gcc_inline" >&5
9833 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
9834 		if test "$cf_cv_gcc_inline" = yes ; then
9835
9836@@ -19145,7 +19151,7 @@
9837 	fi
9838 fi
9839
9840-echo "$as_me:19148: checking for signal global datatype" >&5
9841+echo "$as_me:19154: checking for signal global datatype" >&5
9842 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
9843 if test "${cf_cv_sig_atomic_t+set}" = set; then
9844   echo $ECHO_N "(cached) $ECHO_C" >&6
9845@@ -19157,7 +19163,7 @@
9846 		"int"
9847 	do
9848 	cat >conftest.$ac_ext <<_ACEOF
9849-#line 19160 "configure"
9850+#line 19166 "configure"
9851 #include "confdefs.h"
9852
9853 #include <sys/types.h>
9854@@ -19180,16 +19186,16 @@
9855 }
9856 _ACEOF
9857 rm -f conftest.$ac_objext
9858-if { (eval echo "$as_me:19183: \"$ac_compile\"") >&5
9859+if { (eval echo "$as_me:19189: \"$ac_compile\"") >&5
9860   (eval $ac_compile) 2>&5
9861   ac_status=$?
9862-  echo "$as_me:19186: \$? = $ac_status" >&5
9863+  echo "$as_me:19192: \$? = $ac_status" >&5
9864   (exit $ac_status); } &&
9865          { ac_try='test -s conftest.$ac_objext'
9866-  { (eval echo "$as_me:19189: \"$ac_try\"") >&5
9867+  { (eval echo "$as_me:19195: \"$ac_try\"") >&5
9868   (eval $ac_try) 2>&5
9869   ac_status=$?
9870-  echo "$as_me:19192: \$? = $ac_status" >&5
9871+  echo "$as_me:19198: \$? = $ac_status" >&5
9872   (exit $ac_status); }; }; then
9873   cf_cv_sig_atomic_t=$cf_type
9874 else
9875@@ -19203,7 +19209,7 @@
9876
9877 fi
9878
9879-echo "$as_me:19206: result: $cf_cv_sig_atomic_t" >&5
9880+echo "$as_me:19212: result: $cf_cv_sig_atomic_t" >&5
9881 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
9882 test "$cf_cv_sig_atomic_t" != no &&
9883 cat >>confdefs.h <<EOF
9884@@ -19212,7 +19218,7 @@
9885
9886 if test $NCURSES_CHTYPE = auto ; then
9887
9888-echo "$as_me:19215: checking for type of chtype" >&5
9889+echo "$as_me:19221: checking for type of chtype" >&5
9890 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
9891 if test "${cf_cv_typeof_chtype+set}" = set; then
9892   echo $ECHO_N "(cached) $ECHO_C" >&6
9893@@ -19222,7 +19228,7 @@
9894   cf_cv_typeof_chtype=long
9895 else
9896   cat >conftest.$ac_ext <<_ACEOF
9897-#line 19225 "configure"
9898+#line 19231 "configure"
9899 #include "confdefs.h"
9900
9901 #define WANT_BITS 31
9902@@ -19257,15 +19263,15 @@
9903
9904 _ACEOF
9905 rm -f conftest$ac_exeext
9906-if { (eval echo "$as_me:19260: \"$ac_link\"") >&5
9907+if { (eval echo "$as_me:19266: \"$ac_link\"") >&5
9908   (eval $ac_link) 2>&5
9909   ac_status=$?
9910-  echo "$as_me:19263: \$? = $ac_status" >&5
9911+  echo "$as_me:19269: \$? = $ac_status" >&5
9912   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
9913-  { (eval echo "$as_me:19265: \"$ac_try\"") >&5
9914+  { (eval echo "$as_me:19271: \"$ac_try\"") >&5
9915   (eval $ac_try) 2>&5
9916   ac_status=$?
9917-  echo "$as_me:19268: \$? = $ac_status" >&5
9918+  echo "$as_me:19274: \$? = $ac_status" >&5
9919   (exit $ac_status); }; }; then
9920   cf_cv_typeof_chtype=`cat cf_test.out`
9921 else
9922@@ -19280,7 +19286,7 @@
9923
9924 fi
9925
9926-echo "$as_me:19283: result: $cf_cv_typeof_chtype" >&5
9927+echo "$as_me:19289: result: $cf_cv_typeof_chtype" >&5
9928 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
9929
9930 cat >>confdefs.h <<EOF
9931@@ -19292,14 +19298,14 @@
9932 fi
9933 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
9934
9935-echo "$as_me:19295: checking if unsigned literals are legal" >&5
9936+echo "$as_me:19301: checking if unsigned literals are legal" >&5
9937 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
9938 if test "${cf_cv_unsigned_literals+set}" = set; then
9939   echo $ECHO_N "(cached) $ECHO_C" >&6
9940 else
9941
9942 	cat >conftest.$ac_ext <<_ACEOF
9943-#line 19302 "configure"
9944+#line 19308 "configure"
9945 #include "confdefs.h"
9946
9947 int
9948@@ -19311,16 +19317,16 @@
9949 }
9950 _ACEOF
9951 rm -f conftest.$ac_objext
9952-if { (eval echo "$as_me:19314: \"$ac_compile\"") >&5
9953+if { (eval echo "$as_me:19320: \"$ac_compile\"") >&5
9954   (eval $ac_compile) 2>&5
9955   ac_status=$?
9956-  echo "$as_me:19317: \$? = $ac_status" >&5
9957+  echo "$as_me:19323: \$? = $ac_status" >&5
9958   (exit $ac_status); } &&
9959          { ac_try='test -s conftest.$ac_objext'
9960-  { (eval echo "$as_me:19320: \"$ac_try\"") >&5
9961+  { (eval echo "$as_me:19326: \"$ac_try\"") >&5
9962   (eval $ac_try) 2>&5
9963   ac_status=$?
9964-  echo "$as_me:19323: \$? = $ac_status" >&5
9965+  echo "$as_me:19329: \$? = $ac_status" >&5
9966   (exit $ac_status); }; }; then
9967   cf_cv_unsigned_literals=yes
9968 else
9969@@ -19332,7 +19338,7 @@
9970
9971 fi
9972
9973-echo "$as_me:19335: result: $cf_cv_unsigned_literals" >&5
9974+echo "$as_me:19341: result: $cf_cv_unsigned_literals" >&5
9975 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
9976
9977 cf_cv_1UL="1"
9978@@ -19348,14 +19354,14 @@
9979
9980 ###	Checks for external-data
9981
9982-echo "$as_me:19351: checking if external errno is declared" >&5
9983+echo "$as_me:19357: checking if external errno is declared" >&5
9984 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
9985 if test "${cf_cv_dcl_errno+set}" = set; then
9986   echo $ECHO_N "(cached) $ECHO_C" >&6
9987 else
9988
9989 	cat >conftest.$ac_ext <<_ACEOF
9990-#line 19358 "configure"
9991+#line 19364 "configure"
9992 #include "confdefs.h"
9993
9994 #ifdef HAVE_STDLIB_H
9995@@ -19373,16 +19379,16 @@
9996 }
9997 _ACEOF
9998 rm -f conftest.$ac_objext
9999-if { (eval echo "$as_me:19376: \"$ac_compile\"") >&5
10000+if { (eval echo "$as_me:19382: \"$ac_compile\"") >&5
10001   (eval $ac_compile) 2>&5
10002   ac_status=$?
10003-  echo "$as_me:19379: \$? = $ac_status" >&5
10004+  echo "$as_me:19385: \$? = $ac_status" >&5
10005   (exit $ac_status); } &&
10006          { ac_try='test -s conftest.$ac_objext'
10007-  { (eval echo "$as_me:19382: \"$ac_try\"") >&5
10008+  { (eval echo "$as_me:19388: \"$ac_try\"") >&5
10009   (eval $ac_try) 2>&5
10010   ac_status=$?
10011-  echo "$as_me:19385: \$? = $ac_status" >&5
10012+  echo "$as_me:19391: \$? = $ac_status" >&5
10013   (exit $ac_status); }; }; then
10014   cf_cv_dcl_errno=yes
10015 else
10016@@ -19393,7 +19399,7 @@
10017 rm -f conftest.$ac_objext conftest.$ac_ext
10018
10019 fi
10020-echo "$as_me:19396: result: $cf_cv_dcl_errno" >&5
10021+echo "$as_me:19402: result: $cf_cv_dcl_errno" >&5
10022 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
10023
10024 if test "$cf_cv_dcl_errno" = no ; then
10025@@ -19408,14 +19414,14 @@
10026
10027 # It's possible (for near-UNIX clones) that the data doesn't exist
10028
10029-echo "$as_me:19411: checking if external errno exists" >&5
10030+echo "$as_me:19417: checking if external errno exists" >&5
10031 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
10032 if test "${cf_cv_have_errno+set}" = set; then
10033   echo $ECHO_N "(cached) $ECHO_C" >&6
10034 else
10035
10036 	cat >conftest.$ac_ext <<_ACEOF
10037-#line 19418 "configure"
10038+#line 19424 "configure"
10039 #include "confdefs.h"
10040
10041 #undef errno
10042@@ -19430,16 +19436,16 @@
10043 }
10044 _ACEOF
10045 rm -f conftest.$ac_objext conftest$ac_exeext
10046-if { (eval echo "$as_me:19433: \"$ac_link\"") >&5
10047+if { (eval echo "$as_me:19439: \"$ac_link\"") >&5
10048   (eval $ac_link) 2>&5
10049   ac_status=$?
10050-  echo "$as_me:19436: \$? = $ac_status" >&5
10051+  echo "$as_me:19442: \$? = $ac_status" >&5
10052   (exit $ac_status); } &&
10053          { ac_try='test -s conftest$ac_exeext'
10054-  { (eval echo "$as_me:19439: \"$ac_try\"") >&5
10055+  { (eval echo "$as_me:19445: \"$ac_try\"") >&5
10056   (eval $ac_try) 2>&5
10057   ac_status=$?
10058-  echo "$as_me:19442: \$? = $ac_status" >&5
10059+  echo "$as_me:19448: \$? = $ac_status" >&5
10060   (exit $ac_status); }; }; then
10061   cf_cv_have_errno=yes
10062 else
10063@@ -19450,7 +19456,7 @@
10064 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10065
10066 fi
10067-echo "$as_me:19453: result: $cf_cv_have_errno" >&5
10068+echo "$as_me:19459: result: $cf_cv_have_errno" >&5
10069 echo "${ECHO_T}$cf_cv_have_errno" >&6
10070
10071 if test "$cf_cv_have_errno" = yes ; then
10072@@ -19463,7 +19469,7 @@
10073
10074 fi
10075
10076-echo "$as_me:19466: checking if data-only library module links" >&5
10077+echo "$as_me:19472: checking if data-only library module links" >&5
10078 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
10079 if test "${cf_cv_link_dataonly+set}" = set; then
10080   echo $ECHO_N "(cached) $ECHO_C" >&6
10081@@ -19471,20 +19477,20 @@
10082
10083 	rm -f conftest.a
10084 	cat >conftest.$ac_ext <<EOF
10085-#line 19474 "configure"
10086+#line 19480 "configure"
10087 int	testdata[3] = { 123, 456, 789 };
10088 EOF
10089-	if { (eval echo "$as_me:19477: \"$ac_compile\"") >&5
10090+	if { (eval echo "$as_me:19483: \"$ac_compile\"") >&5
10091   (eval $ac_compile) 2>&5
10092   ac_status=$?
10093-  echo "$as_me:19480: \$? = $ac_status" >&5
10094+  echo "$as_me:19486: \$? = $ac_status" >&5
10095   (exit $ac_status); } ; then
10096 		mv conftest.o data.o && \
10097 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
10098 	fi
10099 	rm -f conftest.$ac_ext data.o
10100 	cat >conftest.$ac_ext <<EOF
10101-#line 19487 "configure"
10102+#line 19493 "configure"
10103 int	testfunc(void)
10104 {
10105 #if defined(NeXT)
10106@@ -19497,10 +19503,10 @@
10107 #endif
10108 }
10109 EOF
10110-	if { (eval echo "$as_me:19500: \"$ac_compile\"") >&5
10111+	if { (eval echo "$as_me:19506: \"$ac_compile\"") >&5
10112   (eval $ac_compile) 2>&5
10113   ac_status=$?
10114-  echo "$as_me:19503: \$? = $ac_status" >&5
10115+  echo "$as_me:19509: \$? = $ac_status" >&5
10116   (exit $ac_status); }; then
10117 		mv conftest.o func.o && \
10118 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
10119@@ -19513,7 +19519,7 @@
10120   cf_cv_link_dataonly=unknown
10121 else
10122   cat >conftest.$ac_ext <<_ACEOF
10123-#line 19516 "configure"
10124+#line 19522 "configure"
10125 #include "confdefs.h"
10126
10127 	int main(void)
10128@@ -19524,15 +19530,15 @@
10129
10130 _ACEOF
10131 rm -f conftest$ac_exeext
10132-if { (eval echo "$as_me:19527: \"$ac_link\"") >&5
10133+if { (eval echo "$as_me:19533: \"$ac_link\"") >&5
10134   (eval $ac_link) 2>&5
10135   ac_status=$?
10136-  echo "$as_me:19530: \$? = $ac_status" >&5
10137+  echo "$as_me:19536: \$? = $ac_status" >&5
10138   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
10139-  { (eval echo "$as_me:19532: \"$ac_try\"") >&5
10140+  { (eval echo "$as_me:19538: \"$ac_try\"") >&5
10141   (eval $ac_try) 2>&5
10142   ac_status=$?
10143-  echo "$as_me:19535: \$? = $ac_status" >&5
10144+  echo "$as_me:19541: \$? = $ac_status" >&5
10145   (exit $ac_status); }; }; then
10146   cf_cv_link_dataonly=yes
10147 else
10148@@ -19547,7 +19553,7 @@
10149
10150 fi
10151
10152-echo "$as_me:19550: result: $cf_cv_link_dataonly" >&5
10153+echo "$as_me:19556: result: $cf_cv_link_dataonly" >&5
10154 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
10155
10156 if test "$cf_cv_link_dataonly" = no ; then
10157@@ -19589,13 +19595,13 @@
10158
10159 do
10160 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
10161-echo "$as_me:19592: checking for $ac_func" >&5
10162+echo "$as_me:19598: checking for $ac_func" >&5
10163 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
10164 if eval "test \"\${$as_ac_var+set}\" = set"; then
10165   echo $ECHO_N "(cached) $ECHO_C" >&6
10166 else
10167   cat >conftest.$ac_ext <<_ACEOF
10168-#line 19598 "configure"
10169+#line 19604 "configure"
10170 #include "confdefs.h"
10171 #define $ac_func autoconf_temporary
10172 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
10173@@ -19626,16 +19632,16 @@
10174 }
10175 _ACEOF
10176 rm -f conftest.$ac_objext conftest$ac_exeext
10177-if { (eval echo "$as_me:19629: \"$ac_link\"") >&5
10178+if { (eval echo "$as_me:19635: \"$ac_link\"") >&5
10179   (eval $ac_link) 2>&5
10180   ac_status=$?
10181-  echo "$as_me:19632: \$? = $ac_status" >&5
10182+  echo "$as_me:19638: \$? = $ac_status" >&5
10183   (exit $ac_status); } &&
10184          { ac_try='test -s conftest$ac_exeext'
10185-  { (eval echo "$as_me:19635: \"$ac_try\"") >&5
10186+  { (eval echo "$as_me:19641: \"$ac_try\"") >&5
10187   (eval $ac_try) 2>&5
10188   ac_status=$?
10189-  echo "$as_me:19638: \$? = $ac_status" >&5
10190+  echo "$as_me:19644: \$? = $ac_status" >&5
10191   (exit $ac_status); }; }; then
10192   eval "$as_ac_var=yes"
10193 else
10194@@ -19645,7 +19651,7 @@
10195 fi
10196 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10197 fi
10198-echo "$as_me:19648: result: `eval echo '${'$as_ac_var'}'`" >&5
10199+echo "$as_me:19654: result: `eval echo '${'$as_ac_var'}'`" >&5
10200 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
10201 if test `eval echo '${'$as_ac_var'}'` = yes; then
10202   cat >>confdefs.h <<EOF
10203@@ -19657,7 +19663,7 @@
10204
10205 if test "x$ac_cv_func_getopt" = xno && \
10206    test "x$cf_with_progs$cf_with_tests" != xnono; then
10207-	{ { echo "$as_me:19660: error: getopt is required for building programs" >&5
10208+	{ { echo "$as_me:19666: error: getopt is required for building programs" >&5
10209 echo "$as_me: error: getopt is required for building programs" >&2;}
10210    { (exit 1); exit 1; }; }
10211 fi
10212@@ -19666,7 +19672,7 @@
10213 then
10214 	if test "x$ac_cv_func_vsnprintf" = xyes
10215 	then
10216-		{ echo "$as_me:19669: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
10217+		{ echo "$as_me:19675: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
10218 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
10219 	else
10220
10221@@ -19679,14 +19685,14 @@
10222
10223 if test "x$with_getcap" = "xyes" ; then
10224
10225-echo "$as_me:19682: checking for terminal-capability database functions" >&5
10226+echo "$as_me:19688: checking for terminal-capability database functions" >&5
10227 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
10228 if test "${cf_cv_cgetent+set}" = set; then
10229   echo $ECHO_N "(cached) $ECHO_C" >&6
10230 else
10231
10232 cat >conftest.$ac_ext <<_ACEOF
10233-#line 19689 "configure"
10234+#line 19695 "configure"
10235 #include "confdefs.h"
10236
10237 #include <stdlib.h>
10238@@ -19706,16 +19712,16 @@
10239 }
10240 _ACEOF
10241 rm -f conftest.$ac_objext conftest$ac_exeext
10242-if { (eval echo "$as_me:19709: \"$ac_link\"") >&5
10243+if { (eval echo "$as_me:19715: \"$ac_link\"") >&5
10244   (eval $ac_link) 2>&5
10245   ac_status=$?
10246-  echo "$as_me:19712: \$? = $ac_status" >&5
10247+  echo "$as_me:19718: \$? = $ac_status" >&5
10248   (exit $ac_status); } &&
10249          { ac_try='test -s conftest$ac_exeext'
10250-  { (eval echo "$as_me:19715: \"$ac_try\"") >&5
10251+  { (eval echo "$as_me:19721: \"$ac_try\"") >&5
10252   (eval $ac_try) 2>&5
10253   ac_status=$?
10254-  echo "$as_me:19718: \$? = $ac_status" >&5
10255+  echo "$as_me:19724: \$? = $ac_status" >&5
10256   (exit $ac_status); }; }; then
10257   cf_cv_cgetent=yes
10258 else
10259@@ -19726,7 +19732,7 @@
10260 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10261
10262 fi
10263-echo "$as_me:19729: result: $cf_cv_cgetent" >&5
10264+echo "$as_me:19735: result: $cf_cv_cgetent" >&5
10265 echo "${ECHO_T}$cf_cv_cgetent" >&6
10266
10267 if test "$cf_cv_cgetent" = yes
10268@@ -19736,14 +19742,14 @@
10269 #define HAVE_BSD_CGETENT 1
10270 EOF
10271
10272-echo "$as_me:19739: checking if cgetent uses const parameter" >&5
10273+echo "$as_me:19745: checking if cgetent uses const parameter" >&5
10274 echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
10275 if test "${cf_cv_cgetent_const+set}" = set; then
10276   echo $ECHO_N "(cached) $ECHO_C" >&6
10277 else
10278
10279 cat >conftest.$ac_ext <<_ACEOF
10280-#line 19746 "configure"
10281+#line 19752 "configure"
10282 #include "confdefs.h"
10283
10284 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
10285@@ -19766,16 +19772,16 @@
10286 }
10287 _ACEOF
10288 rm -f conftest.$ac_objext conftest$ac_exeext
10289-if { (eval echo "$as_me:19769: \"$ac_link\"") >&5
10290+if { (eval echo "$as_me:19775: \"$ac_link\"") >&5
10291   (eval $ac_link) 2>&5
10292   ac_status=$?
10293-  echo "$as_me:19772: \$? = $ac_status" >&5
10294+  echo "$as_me:19778: \$? = $ac_status" >&5
10295   (exit $ac_status); } &&
10296          { ac_try='test -s conftest$ac_exeext'
10297-  { (eval echo "$as_me:19775: \"$ac_try\"") >&5
10298+  { (eval echo "$as_me:19781: \"$ac_try\"") >&5
10299   (eval $ac_try) 2>&5
10300   ac_status=$?
10301-  echo "$as_me:19778: \$? = $ac_status" >&5
10302+  echo "$as_me:19784: \$? = $ac_status" >&5
10303   (exit $ac_status); }; }; then
10304   cf_cv_cgetent_const=yes
10305 else
10306@@ -19786,7 +19792,7 @@
10307 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10308
10309 fi
10310-echo "$as_me:19789: result: $cf_cv_cgetent_const" >&5
10311+echo "$as_me:19795: result: $cf_cv_cgetent_const" >&5
10312 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
10313 	if test "$cf_cv_cgetent_const" = yes
10314 	then
10315@@ -19800,14 +19806,14 @@
10316
10317 fi
10318
10319-echo "$as_me:19803: checking for isascii" >&5
10320+echo "$as_me:19809: checking for isascii" >&5
10321 echo $ECHO_N "checking for isascii... $ECHO_C" >&6
10322 if test "${cf_cv_have_isascii+set}" = set; then
10323   echo $ECHO_N "(cached) $ECHO_C" >&6
10324 else
10325
10326 	cat >conftest.$ac_ext <<_ACEOF
10327-#line 19810 "configure"
10328+#line 19816 "configure"
10329 #include "confdefs.h"
10330 #include <ctype.h>
10331 int
10332@@ -19819,16 +19825,16 @@
10333 }
10334 _ACEOF
10335 rm -f conftest.$ac_objext conftest$ac_exeext
10336-if { (eval echo "$as_me:19822: \"$ac_link\"") >&5
10337+if { (eval echo "$as_me:19828: \"$ac_link\"") >&5
10338   (eval $ac_link) 2>&5
10339   ac_status=$?
10340-  echo "$as_me:19825: \$? = $ac_status" >&5
10341+  echo "$as_me:19831: \$? = $ac_status" >&5
10342   (exit $ac_status); } &&
10343          { ac_try='test -s conftest$ac_exeext'
10344-  { (eval echo "$as_me:19828: \"$ac_try\"") >&5
10345+  { (eval echo "$as_me:19834: \"$ac_try\"") >&5
10346   (eval $ac_try) 2>&5
10347   ac_status=$?
10348-  echo "$as_me:19831: \$? = $ac_status" >&5
10349+  echo "$as_me:19837: \$? = $ac_status" >&5
10350   (exit $ac_status); }; }; then
10351   cf_cv_have_isascii=yes
10352 else
10353@@ -19839,7 +19845,7 @@
10354 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10355
10356 fi
10357-echo "$as_me:19842: result: $cf_cv_have_isascii" >&5
10358+echo "$as_me:19848: result: $cf_cv_have_isascii" >&5
10359 echo "${ECHO_T}$cf_cv_have_isascii" >&6
10360 test "$cf_cv_have_isascii" = yes &&
10361 cat >>confdefs.h <<\EOF
10362@@ -19847,10 +19853,10 @@
10363 EOF
10364
10365 if test "$ac_cv_func_sigaction" = yes; then
10366-echo "$as_me:19850: checking whether sigaction needs _POSIX_SOURCE" >&5
10367+echo "$as_me:19856: checking whether sigaction needs _POSIX_SOURCE" >&5
10368 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
10369 cat >conftest.$ac_ext <<_ACEOF
10370-#line 19853 "configure"
10371+#line 19859 "configure"
10372 #include "confdefs.h"
10373
10374 #include <sys/types.h>
10375@@ -19864,16 +19870,16 @@
10376 }
10377 _ACEOF
10378 rm -f conftest.$ac_objext
10379-if { (eval echo "$as_me:19867: \"$ac_compile\"") >&5
10380+if { (eval echo "$as_me:19873: \"$ac_compile\"") >&5
10381   (eval $ac_compile) 2>&5
10382   ac_status=$?
10383-  echo "$as_me:19870: \$? = $ac_status" >&5
10384+  echo "$as_me:19876: \$? = $ac_status" >&5
10385   (exit $ac_status); } &&
10386          { ac_try='test -s conftest.$ac_objext'
10387-  { (eval echo "$as_me:19873: \"$ac_try\"") >&5
10388+  { (eval echo "$as_me:19879: \"$ac_try\"") >&5
10389   (eval $ac_try) 2>&5
10390   ac_status=$?
10391-  echo "$as_me:19876: \$? = $ac_status" >&5
10392+  echo "$as_me:19882: \$? = $ac_status" >&5
10393   (exit $ac_status); }; }; then
10394   sigact_bad=no
10395 else
10396@@ -19881,7 +19887,7 @@
10397 cat conftest.$ac_ext >&5
10398
10399 cat >conftest.$ac_ext <<_ACEOF
10400-#line 19884 "configure"
10401+#line 19890 "configure"
10402 #include "confdefs.h"
10403
10404 #define _POSIX_SOURCE
10405@@ -19896,16 +19902,16 @@
10406 }
10407 _ACEOF
10408 rm -f conftest.$ac_objext
10409-if { (eval echo "$as_me:19899: \"$ac_compile\"") >&5
10410+if { (eval echo "$as_me:19905: \"$ac_compile\"") >&5
10411   (eval $ac_compile) 2>&5
10412   ac_status=$?
10413-  echo "$as_me:19902: \$? = $ac_status" >&5
10414+  echo "$as_me:19908: \$? = $ac_status" >&5
10415   (exit $ac_status); } &&
10416          { ac_try='test -s conftest.$ac_objext'
10417-  { (eval echo "$as_me:19905: \"$ac_try\"") >&5
10418+  { (eval echo "$as_me:19911: \"$ac_try\"") >&5
10419   (eval $ac_try) 2>&5
10420   ac_status=$?
10421-  echo "$as_me:19908: \$? = $ac_status" >&5
10422+  echo "$as_me:19914: \$? = $ac_status" >&5
10423   (exit $ac_status); }; }; then
10424   sigact_bad=yes
10425
10426@@ -19921,11 +19927,11 @@
10427 rm -f conftest.$ac_objext conftest.$ac_ext
10428 fi
10429 rm -f conftest.$ac_objext conftest.$ac_ext
10430-echo "$as_me:19924: result: $sigact_bad" >&5
10431+echo "$as_me:19930: result: $sigact_bad" >&5
10432 echo "${ECHO_T}$sigact_bad" >&6
10433 fi
10434
10435-echo "$as_me:19928: checking if nanosleep really works" >&5
10436+echo "$as_me:19934: checking if nanosleep really works" >&5
10437 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
10438 if test "${cf_cv_func_nanosleep+set}" = set; then
10439   echo $ECHO_N "(cached) $ECHO_C" >&6
10440@@ -19935,7 +19941,7 @@
10441   cf_cv_func_nanosleep=unknown
10442 else
10443   cat >conftest.$ac_ext <<_ACEOF
10444-#line 19938 "configure"
10445+#line 19944 "configure"
10446 #include "confdefs.h"
10447
10448 #include <stdio.h>
10449@@ -19960,15 +19966,15 @@
10450
10451 _ACEOF
10452 rm -f conftest$ac_exeext
10453-if { (eval echo "$as_me:19963: \"$ac_link\"") >&5
10454+if { (eval echo "$as_me:19969: \"$ac_link\"") >&5
10455   (eval $ac_link) 2>&5
10456   ac_status=$?
10457-  echo "$as_me:19966: \$? = $ac_status" >&5
10458+  echo "$as_me:19972: \$? = $ac_status" >&5
10459   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
10460-  { (eval echo "$as_me:19968: \"$ac_try\"") >&5
10461+  { (eval echo "$as_me:19974: \"$ac_try\"") >&5
10462   (eval $ac_try) 2>&5
10463   ac_status=$?
10464-  echo "$as_me:19971: \$? = $ac_status" >&5
10465+  echo "$as_me:19977: \$? = $ac_status" >&5
10466   (exit $ac_status); }; }; then
10467   cf_cv_func_nanosleep=yes
10468 else
10469@@ -19980,7 +19986,7 @@
10470 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
10471 fi
10472 fi
10473-echo "$as_me:19983: result: $cf_cv_func_nanosleep" >&5
10474+echo "$as_me:19989: result: $cf_cv_func_nanosleep" >&5
10475 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
10476
10477 test "$cf_cv_func_nanosleep" = "yes" &&
10478@@ -19997,23 +20003,23 @@
10479
10480 do
10481 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
10482-echo "$as_me:20000: checking for $ac_header" >&5
10483+echo "$as_me:20006: checking for $ac_header" >&5
10484 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
10485 if eval "test \"\${$as_ac_Header+set}\" = set"; then
10486   echo $ECHO_N "(cached) $ECHO_C" >&6
10487 else
10488   cat >conftest.$ac_ext <<_ACEOF
10489-#line 20006 "configure"
10490+#line 20012 "configure"
10491 #include "confdefs.h"
10492 #include <$ac_header>
10493 _ACEOF
10494-if { (eval echo "$as_me:20010: \"$ac_cpp conftest.$ac_ext\"") >&5
10495+if { (eval echo "$as_me:20016: \"$ac_cpp conftest.$ac_ext\"") >&5
10496   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
10497   ac_status=$?
10498   egrep -v '^ *\+' conftest.er1 >conftest.err
10499   rm -f conftest.er1
10500   cat conftest.err >&5
10501-  echo "$as_me:20016: \$? = $ac_status" >&5
10502+  echo "$as_me:20022: \$? = $ac_status" >&5
10503   (exit $ac_status); } >/dev/null; then
10504   if test -s conftest.err; then
10505     ac_cpp_err=$ac_c_preproc_warn_flag
10506@@ -20032,7 +20038,7 @@
10507 fi
10508 rm -f conftest.err conftest.$ac_ext
10509 fi
10510-echo "$as_me:20035: result: `eval echo '${'$as_ac_Header'}'`" >&5
10511+echo "$as_me:20041: result: `eval echo '${'$as_ac_Header'}'`" >&5
10512 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
10513 if test `eval echo '${'$as_ac_Header'}'` = yes; then
10514   cat >>confdefs.h <<EOF
10515@@ -20049,10 +20055,10 @@
10516 	(*)	termios_bad=maybe ;;
10517 	esac
10518 	if test "$termios_bad" = maybe ; then
10519-	echo "$as_me:20052: checking whether termios.h needs _POSIX_SOURCE" >&5
10520+	echo "$as_me:20058: checking whether termios.h needs _POSIX_SOURCE" >&5
10521 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
10522 	cat >conftest.$ac_ext <<_ACEOF
10523-#line 20055 "configure"
10524+#line 20061 "configure"
10525 #include "confdefs.h"
10526 #include <termios.h>
10527 int
10528@@ -20064,16 +20070,16 @@
10529 }
10530 _ACEOF
10531 rm -f conftest.$ac_objext
10532-if { (eval echo "$as_me:20067: \"$ac_compile\"") >&5
10533+if { (eval echo "$as_me:20073: \"$ac_compile\"") >&5
10534   (eval $ac_compile) 2>&5
10535   ac_status=$?
10536-  echo "$as_me:20070: \$? = $ac_status" >&5
10537+  echo "$as_me:20076: \$? = $ac_status" >&5
10538   (exit $ac_status); } &&
10539          { ac_try='test -s conftest.$ac_objext'
10540-  { (eval echo "$as_me:20073: \"$ac_try\"") >&5
10541+  { (eval echo "$as_me:20079: \"$ac_try\"") >&5
10542   (eval $ac_try) 2>&5
10543   ac_status=$?
10544-  echo "$as_me:20076: \$? = $ac_status" >&5
10545+  echo "$as_me:20082: \$? = $ac_status" >&5
10546   (exit $ac_status); }; }; then
10547   termios_bad=no
10548 else
10549@@ -20081,7 +20087,7 @@
10550 cat conftest.$ac_ext >&5
10551
10552 		cat >conftest.$ac_ext <<_ACEOF
10553-#line 20084 "configure"
10554+#line 20090 "configure"
10555 #include "confdefs.h"
10556
10557 #define _POSIX_SOURCE
10558@@ -20095,16 +20101,16 @@
10559 }
10560 _ACEOF
10561 rm -f conftest.$ac_objext
10562-if { (eval echo "$as_me:20098: \"$ac_compile\"") >&5
10563+if { (eval echo "$as_me:20104: \"$ac_compile\"") >&5
10564   (eval $ac_compile) 2>&5
10565   ac_status=$?
10566-  echo "$as_me:20101: \$? = $ac_status" >&5
10567+  echo "$as_me:20107: \$? = $ac_status" >&5
10568   (exit $ac_status); } &&
10569          { ac_try='test -s conftest.$ac_objext'
10570-  { (eval echo "$as_me:20104: \"$ac_try\"") >&5
10571+  { (eval echo "$as_me:20110: \"$ac_try\"") >&5
10572   (eval $ac_try) 2>&5
10573   ac_status=$?
10574-  echo "$as_me:20107: \$? = $ac_status" >&5
10575+  echo "$as_me:20113: \$? = $ac_status" >&5
10576   (exit $ac_status); }; }; then
10577   termios_bad=unknown
10578 else
10579@@ -20120,19 +20126,19 @@
10580
10581 fi
10582 rm -f conftest.$ac_objext conftest.$ac_ext
10583-	echo "$as_me:20123: result: $termios_bad" >&5
10584+	echo "$as_me:20129: result: $termios_bad" >&5
10585 echo "${ECHO_T}$termios_bad" >&6
10586 	fi
10587 fi
10588
10589-echo "$as_me:20128: checking for tcgetattr" >&5
10590+echo "$as_me:20134: checking for tcgetattr" >&5
10591 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
10592 if test "${cf_cv_have_tcgetattr+set}" = set; then
10593   echo $ECHO_N "(cached) $ECHO_C" >&6
10594 else
10595
10596 cat >conftest.$ac_ext <<_ACEOF
10597-#line 20135 "configure"
10598+#line 20141 "configure"
10599 #include "confdefs.h"
10600
10601 #include <sys/types.h>
10602@@ -20160,16 +20166,16 @@
10603 }
10604 _ACEOF
10605 rm -f conftest.$ac_objext conftest$ac_exeext
10606-if { (eval echo "$as_me:20163: \"$ac_link\"") >&5
10607+if { (eval echo "$as_me:20169: \"$ac_link\"") >&5
10608   (eval $ac_link) 2>&5
10609   ac_status=$?
10610-  echo "$as_me:20166: \$? = $ac_status" >&5
10611+  echo "$as_me:20172: \$? = $ac_status" >&5
10612   (exit $ac_status); } &&
10613          { ac_try='test -s conftest$ac_exeext'
10614-  { (eval echo "$as_me:20169: \"$ac_try\"") >&5
10615+  { (eval echo "$as_me:20175: \"$ac_try\"") >&5
10616   (eval $ac_try) 2>&5
10617   ac_status=$?
10618-  echo "$as_me:20172: \$? = $ac_status" >&5
10619+  echo "$as_me:20178: \$? = $ac_status" >&5
10620   (exit $ac_status); }; }; then
10621   cf_cv_have_tcgetattr=yes
10622 else
10623@@ -20179,21 +20185,21 @@
10624 fi
10625 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10626 fi
10627-echo "$as_me:20182: result: $cf_cv_have_tcgetattr" >&5
10628+echo "$as_me:20188: result: $cf_cv_have_tcgetattr" >&5
10629 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
10630 test "$cf_cv_have_tcgetattr" = yes &&
10631 cat >>confdefs.h <<\EOF
10632 #define HAVE_TCGETATTR 1
10633 EOF
10634
10635-echo "$as_me:20189: checking for vsscanf function or workaround" >&5
10636+echo "$as_me:20195: checking for vsscanf function or workaround" >&5
10637 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
10638 if test "${cf_cv_func_vsscanf+set}" = set; then
10639   echo $ECHO_N "(cached) $ECHO_C" >&6
10640 else
10641
10642 cat >conftest.$ac_ext <<_ACEOF
10643-#line 20196 "configure"
10644+#line 20202 "configure"
10645 #include "confdefs.h"
10646
10647 #include <stdarg.h>
10648@@ -20209,16 +20215,16 @@
10649 }
10650 _ACEOF
10651 rm -f conftest.$ac_objext conftest$ac_exeext
10652-if { (eval echo "$as_me:20212: \"$ac_link\"") >&5
10653+if { (eval echo "$as_me:20218: \"$ac_link\"") >&5
10654   (eval $ac_link) 2>&5
10655   ac_status=$?
10656-  echo "$as_me:20215: \$? = $ac_status" >&5
10657+  echo "$as_me:20221: \$? = $ac_status" >&5
10658   (exit $ac_status); } &&
10659          { ac_try='test -s conftest$ac_exeext'
10660-  { (eval echo "$as_me:20218: \"$ac_try\"") >&5
10661+  { (eval echo "$as_me:20224: \"$ac_try\"") >&5
10662   (eval $ac_try) 2>&5
10663   ac_status=$?
10664-  echo "$as_me:20221: \$? = $ac_status" >&5
10665+  echo "$as_me:20227: \$? = $ac_status" >&5
10666   (exit $ac_status); }; }; then
10667   cf_cv_func_vsscanf=vsscanf
10668 else
10669@@ -20226,7 +20232,7 @@
10670 cat conftest.$ac_ext >&5
10671
10672 cat >conftest.$ac_ext <<_ACEOF
10673-#line 20229 "configure"
10674+#line 20235 "configure"
10675 #include "confdefs.h"
10676
10677 #include <stdarg.h>
10678@@ -20248,16 +20254,16 @@
10679 }
10680 _ACEOF
10681 rm -f conftest.$ac_objext conftest$ac_exeext
10682-if { (eval echo "$as_me:20251: \"$ac_link\"") >&5
10683+if { (eval echo "$as_me:20257: \"$ac_link\"") >&5
10684   (eval $ac_link) 2>&5
10685   ac_status=$?
10686-  echo "$as_me:20254: \$? = $ac_status" >&5
10687+  echo "$as_me:20260: \$? = $ac_status" >&5
10688   (exit $ac_status); } &&
10689          { ac_try='test -s conftest$ac_exeext'
10690-  { (eval echo "$as_me:20257: \"$ac_try\"") >&5
10691+  { (eval echo "$as_me:20263: \"$ac_try\"") >&5
10692   (eval $ac_try) 2>&5
10693   ac_status=$?
10694-  echo "$as_me:20260: \$? = $ac_status" >&5
10695+  echo "$as_me:20266: \$? = $ac_status" >&5
10696   (exit $ac_status); }; }; then
10697   cf_cv_func_vsscanf=vfscanf
10698 else
10699@@ -20265,7 +20271,7 @@
10700 cat conftest.$ac_ext >&5
10701
10702 cat >conftest.$ac_ext <<_ACEOF
10703-#line 20268 "configure"
10704+#line 20274 "configure"
10705 #include "confdefs.h"
10706
10707 #include <stdarg.h>
10708@@ -20287,16 +20293,16 @@
10709 }
10710 _ACEOF
10711 rm -f conftest.$ac_objext conftest$ac_exeext
10712-if { (eval echo "$as_me:20290: \"$ac_link\"") >&5
10713+if { (eval echo "$as_me:20296: \"$ac_link\"") >&5
10714   (eval $ac_link) 2>&5
10715   ac_status=$?
10716-  echo "$as_me:20293: \$? = $ac_status" >&5
10717+  echo "$as_me:20299: \$? = $ac_status" >&5
10718   (exit $ac_status); } &&
10719          { ac_try='test -s conftest$ac_exeext'
10720-  { (eval echo "$as_me:20296: \"$ac_try\"") >&5
10721+  { (eval echo "$as_me:20302: \"$ac_try\"") >&5
10722   (eval $ac_try) 2>&5
10723   ac_status=$?
10724-  echo "$as_me:20299: \$? = $ac_status" >&5
10725+  echo "$as_me:20305: \$? = $ac_status" >&5
10726   (exit $ac_status); }; }; then
10727   cf_cv_func_vsscanf=_doscan
10728 else
10729@@ -20311,7 +20317,7 @@
10730 fi
10731 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10732 fi
10733-echo "$as_me:20314: result: $cf_cv_func_vsscanf" >&5
10734+echo "$as_me:20320: result: $cf_cv_func_vsscanf" >&5
10735 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
10736
10737 case $cf_cv_func_vsscanf in
10738@@ -20337,23 +20343,23 @@
10739
10740 do
10741 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
10742-echo "$as_me:20340: checking for $ac_header" >&5
10743+echo "$as_me:20346: checking for $ac_header" >&5
10744 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
10745 if eval "test \"\${$as_ac_Header+set}\" = set"; then
10746   echo $ECHO_N "(cached) $ECHO_C" >&6
10747 else
10748   cat >conftest.$ac_ext <<_ACEOF
10749-#line 20346 "configure"
10750+#line 20352 "configure"
10751 #include "confdefs.h"
10752 #include <$ac_header>
10753 _ACEOF
10754-if { (eval echo "$as_me:20350: \"$ac_cpp conftest.$ac_ext\"") >&5
10755+if { (eval echo "$as_me:20356: \"$ac_cpp conftest.$ac_ext\"") >&5
10756   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
10757   ac_status=$?
10758   egrep -v '^ *\+' conftest.er1 >conftest.err
10759   rm -f conftest.er1
10760   cat conftest.err >&5
10761-  echo "$as_me:20356: \$? = $ac_status" >&5
10762+  echo "$as_me:20362: \$? = $ac_status" >&5
10763   (exit $ac_status); } >/dev/null; then
10764   if test -s conftest.err; then
10765     ac_cpp_err=$ac_c_preproc_warn_flag
10766@@ -20372,7 +20378,7 @@
10767 fi
10768 rm -f conftest.err conftest.$ac_ext
10769 fi
10770-echo "$as_me:20375: result: `eval echo '${'$as_ac_Header'}'`" >&5
10771+echo "$as_me:20381: result: `eval echo '${'$as_ac_Header'}'`" >&5
10772 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
10773 if test `eval echo '${'$as_ac_Header'}'` = yes; then
10774   cat >>confdefs.h <<EOF
10775@@ -20382,7 +20388,7 @@
10776 fi
10777 done
10778
10779-echo "$as_me:20385: checking for working mkstemp" >&5
10780+echo "$as_me:20391: checking for working mkstemp" >&5
10781 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
10782 if test "${cf_cv_func_mkstemp+set}" = set; then
10783   echo $ECHO_N "(cached) $ECHO_C" >&6
10784@@ -20393,7 +20399,7 @@
10785   cf_cv_func_mkstemp=maybe
10786 else
10787   cat >conftest.$ac_ext <<_ACEOF
10788-#line 20396 "configure"
10789+#line 20402 "configure"
10790 #include "confdefs.h"
10791
10792 #include <sys/types.h>
10793@@ -20434,15 +20440,15 @@
10794
10795 _ACEOF
10796 rm -f conftest$ac_exeext
10797-if { (eval echo "$as_me:20437: \"$ac_link\"") >&5
10798+if { (eval echo "$as_me:20443: \"$ac_link\"") >&5
10799   (eval $ac_link) 2>&5
10800   ac_status=$?
10801-  echo "$as_me:20440: \$? = $ac_status" >&5
10802+  echo "$as_me:20446: \$? = $ac_status" >&5
10803   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
10804-  { (eval echo "$as_me:20442: \"$ac_try\"") >&5
10805+  { (eval echo "$as_me:20448: \"$ac_try\"") >&5
10806   (eval $ac_try) 2>&5
10807   ac_status=$?
10808-  echo "$as_me:20445: \$? = $ac_status" >&5
10809+  echo "$as_me:20451: \$? = $ac_status" >&5
10810   (exit $ac_status); }; }; then
10811   cf_cv_func_mkstemp=yes
10812
10813@@ -20457,16 +20463,16 @@
10814 fi
10815
10816 fi
10817-echo "$as_me:20460: result: $cf_cv_func_mkstemp" >&5
10818+echo "$as_me:20466: result: $cf_cv_func_mkstemp" >&5
10819 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
10820 if test "x$cf_cv_func_mkstemp" = xmaybe ; then
10821-	echo "$as_me:20463: checking for mkstemp" >&5
10822+	echo "$as_me:20469: checking for mkstemp" >&5
10823 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
10824 if test "${ac_cv_func_mkstemp+set}" = set; then
10825   echo $ECHO_N "(cached) $ECHO_C" >&6
10826 else
10827   cat >conftest.$ac_ext <<_ACEOF
10828-#line 20469 "configure"
10829+#line 20475 "configure"
10830 #include "confdefs.h"
10831 #define mkstemp autoconf_temporary
10832 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
10833@@ -20497,16 +20503,16 @@
10834 }
10835 _ACEOF
10836 rm -f conftest.$ac_objext conftest$ac_exeext
10837-if { (eval echo "$as_me:20500: \"$ac_link\"") >&5
10838+if { (eval echo "$as_me:20506: \"$ac_link\"") >&5
10839   (eval $ac_link) 2>&5
10840   ac_status=$?
10841-  echo "$as_me:20503: \$? = $ac_status" >&5
10842+  echo "$as_me:20509: \$? = $ac_status" >&5
10843   (exit $ac_status); } &&
10844          { ac_try='test -s conftest$ac_exeext'
10845-  { (eval echo "$as_me:20506: \"$ac_try\"") >&5
10846+  { (eval echo "$as_me:20512: \"$ac_try\"") >&5
10847   (eval $ac_try) 2>&5
10848   ac_status=$?
10849-  echo "$as_me:20509: \$? = $ac_status" >&5
10850+  echo "$as_me:20515: \$? = $ac_status" >&5
10851   (exit $ac_status); }; }; then
10852   ac_cv_func_mkstemp=yes
10853 else
10854@@ -20516,7 +20522,7 @@
10855 fi
10856 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10857 fi
10858-echo "$as_me:20519: result: $ac_cv_func_mkstemp" >&5
10859+echo "$as_me:20525: result: $ac_cv_func_mkstemp" >&5
10860 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
10861
10862 fi
10863@@ -20537,21 +20543,21 @@
10864 fi
10865
10866 if test "x$cross_compiling" = xyes ; then
10867-	{ echo "$as_me:20540: WARNING: cross compiling: assume setvbuf params not reversed" >&5
10868+	{ echo "$as_me:20546: WARNING: cross compiling: assume setvbuf params not reversed" >&5
10869 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
10870 else
10871-	echo "$as_me:20543: checking whether setvbuf arguments are reversed" >&5
10872+	echo "$as_me:20549: checking whether setvbuf arguments are reversed" >&5
10873 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
10874 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
10875   echo $ECHO_N "(cached) $ECHO_C" >&6
10876 else
10877   if test "$cross_compiling" = yes; then
10878-  { { echo "$as_me:20549: error: cannot run test program while cross compiling" >&5
10879+  { { echo "$as_me:20555: error: cannot run test program while cross compiling" >&5
10880 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
10881    { (exit 1); exit 1; }; }
10882 else
10883   cat >conftest.$ac_ext <<_ACEOF
10884-#line 20554 "configure"
10885+#line 20560 "configure"
10886 #include "confdefs.h"
10887 #include <stdio.h>
10888 /* If setvbuf has the reversed format, exit 0. */
10889@@ -20568,15 +20574,15 @@
10890 }
10891 _ACEOF
10892 rm -f conftest$ac_exeext
10893-if { (eval echo "$as_me:20571: \"$ac_link\"") >&5
10894+if { (eval echo "$as_me:20577: \"$ac_link\"") >&5
10895   (eval $ac_link) 2>&5
10896   ac_status=$?
10897-  echo "$as_me:20574: \$? = $ac_status" >&5
10898+  echo "$as_me:20580: \$? = $ac_status" >&5
10899   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
10900-  { (eval echo "$as_me:20576: \"$ac_try\"") >&5
10901+  { (eval echo "$as_me:20582: \"$ac_try\"") >&5
10902   (eval $ac_try) 2>&5
10903   ac_status=$?
10904-  echo "$as_me:20579: \$? = $ac_status" >&5
10905+  echo "$as_me:20585: \$? = $ac_status" >&5
10906   (exit $ac_status); }; }; then
10907   ac_cv_func_setvbuf_reversed=yes
10908 else
10909@@ -20589,7 +20595,7 @@
10910 fi
10911 rm -f core core.* *.core
10912 fi
10913-echo "$as_me:20592: result: $ac_cv_func_setvbuf_reversed" >&5
10914+echo "$as_me:20598: result: $ac_cv_func_setvbuf_reversed" >&5
10915 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
10916 if test $ac_cv_func_setvbuf_reversed = yes; then
10917
10918@@ -20600,13 +20606,13 @@
10919 fi
10920
10921 fi
10922-echo "$as_me:20603: checking for intptr_t" >&5
10923+echo "$as_me:20609: checking for intptr_t" >&5
10924 echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
10925 if test "${ac_cv_type_intptr_t+set}" = set; then
10926   echo $ECHO_N "(cached) $ECHO_C" >&6
10927 else
10928   cat >conftest.$ac_ext <<_ACEOF
10929-#line 20609 "configure"
10930+#line 20615 "configure"
10931 #include "confdefs.h"
10932 $ac_includes_default
10933 int
10934@@ -20621,16 +20627,16 @@
10935 }
10936 _ACEOF
10937 rm -f conftest.$ac_objext
10938-if { (eval echo "$as_me:20624: \"$ac_compile\"") >&5
10939+if { (eval echo "$as_me:20630: \"$ac_compile\"") >&5
10940   (eval $ac_compile) 2>&5
10941   ac_status=$?
10942-  echo "$as_me:20627: \$? = $ac_status" >&5
10943+  echo "$as_me:20633: \$? = $ac_status" >&5
10944   (exit $ac_status); } &&
10945          { ac_try='test -s conftest.$ac_objext'
10946-  { (eval echo "$as_me:20630: \"$ac_try\"") >&5
10947+  { (eval echo "$as_me:20636: \"$ac_try\"") >&5
10948   (eval $ac_try) 2>&5
10949   ac_status=$?
10950-  echo "$as_me:20633: \$? = $ac_status" >&5
10951+  echo "$as_me:20639: \$? = $ac_status" >&5
10952   (exit $ac_status); }; }; then
10953   ac_cv_type_intptr_t=yes
10954 else
10955@@ -20640,7 +20646,7 @@
10956 fi
10957 rm -f conftest.$ac_objext conftest.$ac_ext
10958 fi
10959-echo "$as_me:20643: result: $ac_cv_type_intptr_t" >&5
10960+echo "$as_me:20649: result: $ac_cv_type_intptr_t" >&5
10961 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
10962 if test $ac_cv_type_intptr_t = yes; then
10963   :
10964@@ -20652,13 +20658,13 @@
10965
10966 fi
10967
10968-echo "$as_me:20655: checking for ssize_t" >&5
10969+echo "$as_me:20661: checking for ssize_t" >&5
10970 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
10971 if test "${ac_cv_type_ssize_t+set}" = set; then
10972   echo $ECHO_N "(cached) $ECHO_C" >&6
10973 else
10974   cat >conftest.$ac_ext <<_ACEOF
10975-#line 20661 "configure"
10976+#line 20667 "configure"
10977 #include "confdefs.h"
10978 $ac_includes_default
10979 int
10980@@ -20673,16 +20679,16 @@
10981 }
10982 _ACEOF
10983 rm -f conftest.$ac_objext
10984-if { (eval echo "$as_me:20676: \"$ac_compile\"") >&5
10985+if { (eval echo "$as_me:20682: \"$ac_compile\"") >&5
10986   (eval $ac_compile) 2>&5
10987   ac_status=$?
10988-  echo "$as_me:20679: \$? = $ac_status" >&5
10989+  echo "$as_me:20685: \$? = $ac_status" >&5
10990   (exit $ac_status); } &&
10991          { ac_try='test -s conftest.$ac_objext'
10992-  { (eval echo "$as_me:20682: \"$ac_try\"") >&5
10993+  { (eval echo "$as_me:20688: \"$ac_try\"") >&5
10994   (eval $ac_try) 2>&5
10995   ac_status=$?
10996-  echo "$as_me:20685: \$? = $ac_status" >&5
10997+  echo "$as_me:20691: \$? = $ac_status" >&5
10998   (exit $ac_status); }; }; then
10999   ac_cv_type_ssize_t=yes
11000 else
11001@@ -20692,7 +20698,7 @@
11002 fi
11003 rm -f conftest.$ac_objext conftest.$ac_ext
11004 fi
11005-echo "$as_me:20695: result: $ac_cv_type_ssize_t" >&5
11006+echo "$as_me:20701: result: $ac_cv_type_ssize_t" >&5
11007 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
11008 if test $ac_cv_type_ssize_t = yes; then
11009   :
11010@@ -20704,14 +20710,14 @@
11011
11012 fi
11013
11014-echo "$as_me:20707: checking for type sigaction_t" >&5
11015+echo "$as_me:20713: checking for type sigaction_t" >&5
11016 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
11017 if test "${cf_cv_type_sigaction+set}" = set; then
11018   echo $ECHO_N "(cached) $ECHO_C" >&6
11019 else
11020
11021 	cat >conftest.$ac_ext <<_ACEOF
11022-#line 20714 "configure"
11023+#line 20720 "configure"
11024 #include "confdefs.h"
11025
11026 #include <signal.h>
11027@@ -20724,16 +20730,16 @@
11028 }
11029 _ACEOF
11030 rm -f conftest.$ac_objext
11031-if { (eval echo "$as_me:20727: \"$ac_compile\"") >&5
11032+if { (eval echo "$as_me:20733: \"$ac_compile\"") >&5
11033   (eval $ac_compile) 2>&5
11034   ac_status=$?
11035-  echo "$as_me:20730: \$? = $ac_status" >&5
11036+  echo "$as_me:20736: \$? = $ac_status" >&5
11037   (exit $ac_status); } &&
11038          { ac_try='test -s conftest.$ac_objext'
11039-  { (eval echo "$as_me:20733: \"$ac_try\"") >&5
11040+  { (eval echo "$as_me:20739: \"$ac_try\"") >&5
11041   (eval $ac_try) 2>&5
11042   ac_status=$?
11043-  echo "$as_me:20736: \$? = $ac_status" >&5
11044+  echo "$as_me:20742: \$? = $ac_status" >&5
11045   (exit $ac_status); }; }; then
11046   cf_cv_type_sigaction=yes
11047 else
11048@@ -20744,14 +20750,14 @@
11049 rm -f conftest.$ac_objext conftest.$ac_ext
11050 fi
11051
11052-echo "$as_me:20747: result: $cf_cv_type_sigaction" >&5
11053+echo "$as_me:20753: result: $cf_cv_type_sigaction" >&5
11054 echo "${ECHO_T}$cf_cv_type_sigaction" >&6
11055 test "$cf_cv_type_sigaction" = yes &&
11056 cat >>confdefs.h <<\EOF
11057 #define HAVE_TYPE_SIGACTION 1
11058 EOF
11059
11060-echo "$as_me:20754: checking declaration of size-change" >&5
11061+echo "$as_me:20760: checking declaration of size-change" >&5
11062 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
11063 if test "${cf_cv_sizechange+set}" = set; then
11064   echo $ECHO_N "(cached) $ECHO_C" >&6
11065@@ -20772,7 +20778,7 @@
11066
11067 	fi
11068 	cat >conftest.$ac_ext <<_ACEOF
11069-#line 20775 "configure"
11070+#line 20781 "configure"
11071 #include "confdefs.h"
11072 #include <sys/types.h>
11073 #ifdef HAVE_TERMIOS_H
11074@@ -20818,16 +20824,16 @@
11075 }
11076 _ACEOF
11077 rm -f conftest.$ac_objext
11078-if { (eval echo "$as_me:20821: \"$ac_compile\"") >&5
11079+if { (eval echo "$as_me:20827: \"$ac_compile\"") >&5
11080   (eval $ac_compile) 2>&5
11081   ac_status=$?
11082-  echo "$as_me:20824: \$? = $ac_status" >&5
11083+  echo "$as_me:20830: \$? = $ac_status" >&5
11084   (exit $ac_status); } &&
11085          { ac_try='test -s conftest.$ac_objext'
11086-  { (eval echo "$as_me:20827: \"$ac_try\"") >&5
11087+  { (eval echo "$as_me:20833: \"$ac_try\"") >&5
11088   (eval $ac_try) 2>&5
11089   ac_status=$?
11090-  echo "$as_me:20830: \$? = $ac_status" >&5
11091+  echo "$as_me:20836: \$? = $ac_status" >&5
11092   (exit $ac_status); }; }; then
11093   cf_cv_sizechange=yes
11094 else
11095@@ -20846,7 +20852,7 @@
11096 done
11097
11098 fi
11099-echo "$as_me:20849: result: $cf_cv_sizechange" >&5
11100+echo "$as_me:20855: result: $cf_cv_sizechange" >&5
11101 echo "${ECHO_T}$cf_cv_sizechange" >&6
11102 if test "$cf_cv_sizechange" != no ; then
11103
11104@@ -20864,13 +20870,13 @@
11105 	esac
11106 fi
11107
11108-echo "$as_me:20867: checking for memmove" >&5
11109+echo "$as_me:20873: checking for memmove" >&5
11110 echo $ECHO_N "checking for memmove... $ECHO_C" >&6
11111 if test "${ac_cv_func_memmove+set}" = set; then
11112   echo $ECHO_N "(cached) $ECHO_C" >&6
11113 else
11114   cat >conftest.$ac_ext <<_ACEOF
11115-#line 20873 "configure"
11116+#line 20879 "configure"
11117 #include "confdefs.h"
11118 #define memmove autoconf_temporary
11119 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
11120@@ -20901,16 +20907,16 @@
11121 }
11122 _ACEOF
11123 rm -f conftest.$ac_objext conftest$ac_exeext
11124-if { (eval echo "$as_me:20904: \"$ac_link\"") >&5
11125+if { (eval echo "$as_me:20910: \"$ac_link\"") >&5
11126   (eval $ac_link) 2>&5
11127   ac_status=$?
11128-  echo "$as_me:20907: \$? = $ac_status" >&5
11129+  echo "$as_me:20913: \$? = $ac_status" >&5
11130   (exit $ac_status); } &&
11131          { ac_try='test -s conftest$ac_exeext'
11132-  { (eval echo "$as_me:20910: \"$ac_try\"") >&5
11133+  { (eval echo "$as_me:20916: \"$ac_try\"") >&5
11134   (eval $ac_try) 2>&5
11135   ac_status=$?
11136-  echo "$as_me:20913: \$? = $ac_status" >&5
11137+  echo "$as_me:20919: \$? = $ac_status" >&5
11138   (exit $ac_status); }; }; then
11139   ac_cv_func_memmove=yes
11140 else
11141@@ -20920,19 +20926,19 @@
11142 fi
11143 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11144 fi
11145-echo "$as_me:20923: result: $ac_cv_func_memmove" >&5
11146+echo "$as_me:20929: result: $ac_cv_func_memmove" >&5
11147 echo "${ECHO_T}$ac_cv_func_memmove" >&6
11148 if test $ac_cv_func_memmove = yes; then
11149   :
11150 else
11151
11152-echo "$as_me:20929: checking for bcopy" >&5
11153+echo "$as_me:20935: checking for bcopy" >&5
11154 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
11155 if test "${ac_cv_func_bcopy+set}" = set; then
11156   echo $ECHO_N "(cached) $ECHO_C" >&6
11157 else
11158   cat >conftest.$ac_ext <<_ACEOF
11159-#line 20935 "configure"
11160+#line 20941 "configure"
11161 #include "confdefs.h"
11162 #define bcopy autoconf_temporary
11163 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
11164@@ -20963,16 +20969,16 @@
11165 }
11166 _ACEOF
11167 rm -f conftest.$ac_objext conftest$ac_exeext
11168-if { (eval echo "$as_me:20966: \"$ac_link\"") >&5
11169+if { (eval echo "$as_me:20972: \"$ac_link\"") >&5
11170   (eval $ac_link) 2>&5
11171   ac_status=$?
11172-  echo "$as_me:20969: \$? = $ac_status" >&5
11173+  echo "$as_me:20975: \$? = $ac_status" >&5
11174   (exit $ac_status); } &&
11175          { ac_try='test -s conftest$ac_exeext'
11176-  { (eval echo "$as_me:20972: \"$ac_try\"") >&5
11177+  { (eval echo "$as_me:20978: \"$ac_try\"") >&5
11178   (eval $ac_try) 2>&5
11179   ac_status=$?
11180-  echo "$as_me:20975: \$? = $ac_status" >&5
11181+  echo "$as_me:20981: \$? = $ac_status" >&5
11182   (exit $ac_status); }; }; then
11183   ac_cv_func_bcopy=yes
11184 else
11185@@ -20982,11 +20988,11 @@
11186 fi
11187 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11188 fi
11189-echo "$as_me:20985: result: $ac_cv_func_bcopy" >&5
11190+echo "$as_me:20991: result: $ac_cv_func_bcopy" >&5
11191 echo "${ECHO_T}$ac_cv_func_bcopy" >&6
11192 if test $ac_cv_func_bcopy = yes; then
11193
11194-	echo "$as_me:20989: checking if bcopy does overlapping moves" >&5
11195+	echo "$as_me:20995: checking if bcopy does overlapping moves" >&5
11196 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
11197 if test "${cf_cv_good_bcopy+set}" = set; then
11198   echo $ECHO_N "(cached) $ECHO_C" >&6
11199@@ -20996,7 +21002,7 @@
11200   cf_cv_good_bcopy=unknown
11201 else
11202   cat >conftest.$ac_ext <<_ACEOF
11203-#line 20999 "configure"
11204+#line 21005 "configure"
11205 #include "confdefs.h"
11206
11207 int main(void) {
11208@@ -21010,15 +21016,15 @@
11209
11210 _ACEOF
11211 rm -f conftest$ac_exeext
11212-if { (eval echo "$as_me:21013: \"$ac_link\"") >&5
11213+if { (eval echo "$as_me:21019: \"$ac_link\"") >&5
11214   (eval $ac_link) 2>&5
11215   ac_status=$?
11216-  echo "$as_me:21016: \$? = $ac_status" >&5
11217+  echo "$as_me:21022: \$? = $ac_status" >&5
11218   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11219-  { (eval echo "$as_me:21018: \"$ac_try\"") >&5
11220+  { (eval echo "$as_me:21024: \"$ac_try\"") >&5
11221   (eval $ac_try) 2>&5
11222   ac_status=$?
11223-  echo "$as_me:21021: \$? = $ac_status" >&5
11224+  echo "$as_me:21027: \$? = $ac_status" >&5
11225   (exit $ac_status); }; }; then
11226   cf_cv_good_bcopy=yes
11227 else
11228@@ -21031,7 +21037,7 @@
11229 fi
11230
11231 fi
11232-echo "$as_me:21034: result: $cf_cv_good_bcopy" >&5
11233+echo "$as_me:21040: result: $cf_cv_good_bcopy" >&5
11234 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
11235
11236 else
11237@@ -21058,13 +21064,13 @@
11238 for ac_func in posix_openpt
11239 do
11240 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
11241-echo "$as_me:21061: checking for $ac_func" >&5
11242+echo "$as_me:21067: checking for $ac_func" >&5
11243 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
11244 if eval "test \"\${$as_ac_var+set}\" = set"; then
11245   echo $ECHO_N "(cached) $ECHO_C" >&6
11246 else
11247   cat >conftest.$ac_ext <<_ACEOF
11248-#line 21067 "configure"
11249+#line 21073 "configure"
11250 #include "confdefs.h"
11251 #define $ac_func autoconf_temporary
11252 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
11253@@ -21095,16 +21101,16 @@
11254 }
11255 _ACEOF
11256 rm -f conftest.$ac_objext conftest$ac_exeext
11257-if { (eval echo "$as_me:21098: \"$ac_link\"") >&5
11258+if { (eval echo "$as_me:21104: \"$ac_link\"") >&5
11259   (eval $ac_link) 2>&5
11260   ac_status=$?
11261-  echo "$as_me:21101: \$? = $ac_status" >&5
11262+  echo "$as_me:21107: \$? = $ac_status" >&5
11263   (exit $ac_status); } &&
11264          { ac_try='test -s conftest$ac_exeext'
11265-  { (eval echo "$as_me:21104: \"$ac_try\"") >&5
11266+  { (eval echo "$as_me:21110: \"$ac_try\"") >&5
11267   (eval $ac_try) 2>&5
11268   ac_status=$?
11269-  echo "$as_me:21107: \$? = $ac_status" >&5
11270+  echo "$as_me:21113: \$? = $ac_status" >&5
11271   (exit $ac_status); }; }; then
11272   eval "$as_ac_var=yes"
11273 else
11274@@ -21114,7 +21120,7 @@
11275 fi
11276 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11277 fi
11278-echo "$as_me:21117: result: `eval echo '${'$as_ac_var'}'`" >&5
11279+echo "$as_me:21123: result: `eval echo '${'$as_ac_var'}'`" >&5
11280 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
11281 if test `eval echo '${'$as_ac_var'}'` = yes; then
11282   cat >>confdefs.h <<EOF
11283@@ -21124,7 +21130,7 @@
11284 fi
11285 done
11286  }
11287-echo "$as_me:21127: checking if poll really works" >&5
11288+echo "$as_me:21133: checking if poll really works" >&5
11289 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
11290 if test "${cf_cv_working_poll+set}" = set; then
11291   echo $ECHO_N "(cached) $ECHO_C" >&6
11292@@ -21134,7 +21140,7 @@
11293   cf_cv_working_poll=unknown
11294 else
11295   cat >conftest.$ac_ext <<_ACEOF
11296-#line 21137 "configure"
11297+#line 21143 "configure"
11298 #include "confdefs.h"
11299
11300 #include <stdlib.h>
11301@@ -21186,15 +21192,15 @@
11302 }
11303 _ACEOF
11304 rm -f conftest$ac_exeext
11305-if { (eval echo "$as_me:21189: \"$ac_link\"") >&5
11306+if { (eval echo "$as_me:21195: \"$ac_link\"") >&5
11307   (eval $ac_link) 2>&5
11308   ac_status=$?
11309-  echo "$as_me:21192: \$? = $ac_status" >&5
11310+  echo "$as_me:21198: \$? = $ac_status" >&5
11311   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11312-  { (eval echo "$as_me:21194: \"$ac_try\"") >&5
11313+  { (eval echo "$as_me:21200: \"$ac_try\"") >&5
11314   (eval $ac_try) 2>&5
11315   ac_status=$?
11316-  echo "$as_me:21197: \$? = $ac_status" >&5
11317+  echo "$as_me:21203: \$? = $ac_status" >&5
11318   (exit $ac_status); }; }; then
11319   cf_cv_working_poll=yes
11320 else
11321@@ -21206,21 +21212,21 @@
11322 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
11323 fi
11324 fi
11325-echo "$as_me:21209: result: $cf_cv_working_poll" >&5
11326+echo "$as_me:21215: result: $cf_cv_working_poll" >&5
11327 echo "${ECHO_T}$cf_cv_working_poll" >&6
11328 test "$cf_cv_working_poll" = "yes" &&
11329 cat >>confdefs.h <<\EOF
11330 #define HAVE_WORKING_POLL 1
11331 EOF
11332
11333-echo "$as_me:21216: checking for va_copy" >&5
11334+echo "$as_me:21222: checking for va_copy" >&5
11335 echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
11336 if test "${cf_cv_have_va_copy+set}" = set; then
11337   echo $ECHO_N "(cached) $ECHO_C" >&6
11338 else
11339
11340 cat >conftest.$ac_ext <<_ACEOF
11341-#line 21223 "configure"
11342+#line 21229 "configure"
11343 #include "confdefs.h"
11344
11345 #include <stdarg.h>
11346@@ -21237,16 +21243,16 @@
11347 }
11348 _ACEOF
11349 rm -f conftest.$ac_objext conftest$ac_exeext
11350-if { (eval echo "$as_me:21240: \"$ac_link\"") >&5
11351+if { (eval echo "$as_me:21246: \"$ac_link\"") >&5
11352   (eval $ac_link) 2>&5
11353   ac_status=$?
11354-  echo "$as_me:21243: \$? = $ac_status" >&5
11355+  echo "$as_me:21249: \$? = $ac_status" >&5
11356   (exit $ac_status); } &&
11357          { ac_try='test -s conftest$ac_exeext'
11358-  { (eval echo "$as_me:21246: \"$ac_try\"") >&5
11359+  { (eval echo "$as_me:21252: \"$ac_try\"") >&5
11360   (eval $ac_try) 2>&5
11361   ac_status=$?
11362-  echo "$as_me:21249: \$? = $ac_status" >&5
11363+  echo "$as_me:21255: \$? = $ac_status" >&5
11364   (exit $ac_status); }; }; then
11365   cf_cv_have_va_copy=yes
11366 else
11367@@ -21256,7 +21262,7 @@
11368 fi
11369 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11370 fi
11371-echo "$as_me:21259: result: $cf_cv_have_va_copy" >&5
11372+echo "$as_me:21265: result: $cf_cv_have_va_copy" >&5
11373 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
11374
11375 if test "$cf_cv_have_va_copy" = yes;
11376@@ -21268,14 +21274,14 @@
11377
11378 else # !cf_cv_have_va_copy
11379
11380-echo "$as_me:21271: checking for __va_copy" >&5
11381+echo "$as_me:21277: checking for __va_copy" >&5
11382 echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
11383 if test "${cf_cv_have___va_copy+set}" = set; then
11384   echo $ECHO_N "(cached) $ECHO_C" >&6
11385 else
11386
11387 cat >conftest.$ac_ext <<_ACEOF
11388-#line 21278 "configure"
11389+#line 21284 "configure"
11390 #include "confdefs.h"
11391
11392 #include <stdarg.h>
11393@@ -21292,16 +21298,16 @@
11394 }
11395 _ACEOF
11396 rm -f conftest.$ac_objext conftest$ac_exeext
11397-if { (eval echo "$as_me:21295: \"$ac_link\"") >&5
11398+if { (eval echo "$as_me:21301: \"$ac_link\"") >&5
11399   (eval $ac_link) 2>&5
11400   ac_status=$?
11401-  echo "$as_me:21298: \$? = $ac_status" >&5
11402+  echo "$as_me:21304: \$? = $ac_status" >&5
11403   (exit $ac_status); } &&
11404          { ac_try='test -s conftest$ac_exeext'
11405-  { (eval echo "$as_me:21301: \"$ac_try\"") >&5
11406+  { (eval echo "$as_me:21307: \"$ac_try\"") >&5
11407   (eval $ac_try) 2>&5
11408   ac_status=$?
11409-  echo "$as_me:21304: \$? = $ac_status" >&5
11410+  echo "$as_me:21310: \$? = $ac_status" >&5
11411   (exit $ac_status); }; }; then
11412   cf_cv_have___va_copy=yes
11413 else
11414@@ -21311,7 +21317,7 @@
11415 fi
11416 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11417 fi
11418-echo "$as_me:21314: result: $cf_cv_have___va_copy" >&5
11419+echo "$as_me:21320: result: $cf_cv_have___va_copy" >&5
11420 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
11421
11422 if test "$cf_cv_have___va_copy" = yes
11423@@ -21323,14 +21329,14 @@
11424
11425 else # !cf_cv_have___va_copy
11426
11427-echo "$as_me:21326: checking for __builtin_va_copy" >&5
11428+echo "$as_me:21332: checking for __builtin_va_copy" >&5
11429 echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
11430 if test "${cf_cv_have___builtin_va_copy+set}" = set; then
11431   echo $ECHO_N "(cached) $ECHO_C" >&6
11432 else
11433
11434 cat >conftest.$ac_ext <<_ACEOF
11435-#line 21333 "configure"
11436+#line 21339 "configure"
11437 #include "confdefs.h"
11438
11439 #include <stdarg.h>
11440@@ -21347,16 +21353,16 @@
11441 }
11442 _ACEOF
11443 rm -f conftest.$ac_objext conftest$ac_exeext
11444-if { (eval echo "$as_me:21350: \"$ac_link\"") >&5
11445+if { (eval echo "$as_me:21356: \"$ac_link\"") >&5
11446   (eval $ac_link) 2>&5
11447   ac_status=$?
11448-  echo "$as_me:21353: \$? = $ac_status" >&5
11449+  echo "$as_me:21359: \$? = $ac_status" >&5
11450   (exit $ac_status); } &&
11451          { ac_try='test -s conftest$ac_exeext'
11452-  { (eval echo "$as_me:21356: \"$ac_try\"") >&5
11453+  { (eval echo "$as_me:21362: \"$ac_try\"") >&5
11454   (eval $ac_try) 2>&5
11455   ac_status=$?
11456-  echo "$as_me:21359: \$? = $ac_status" >&5
11457+  echo "$as_me:21365: \$? = $ac_status" >&5
11458   (exit $ac_status); }; }; then
11459   cf_cv_have___builtin_va_copy=yes
11460 else
11461@@ -21366,7 +21372,7 @@
11462 fi
11463 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11464 fi
11465-echo "$as_me:21369: result: $cf_cv_have___builtin_va_copy" >&5
11466+echo "$as_me:21375: result: $cf_cv_have___builtin_va_copy" >&5
11467 echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
11468
11469 test "$cf_cv_have___builtin_va_copy" = yes &&
11470@@ -21384,14 +21390,14 @@
11471 	;;
11472
11473 (*)
11474-	echo "$as_me:21387: checking if we can simply copy va_list" >&5
11475+	echo "$as_me:21393: checking if we can simply copy va_list" >&5
11476 echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
11477 if test "${cf_cv_pointer_va_list+set}" = set; then
11478   echo $ECHO_N "(cached) $ECHO_C" >&6
11479 else
11480
11481 cat >conftest.$ac_ext <<_ACEOF
11482-#line 21394 "configure"
11483+#line 21400 "configure"
11484 #include "confdefs.h"
11485
11486 #include <stdarg.h>
11487@@ -21408,16 +21414,16 @@
11488 }
11489 _ACEOF
11490 rm -f conftest.$ac_objext conftest$ac_exeext
11491-if { (eval echo "$as_me:21411: \"$ac_link\"") >&5
11492+if { (eval echo "$as_me:21417: \"$ac_link\"") >&5
11493   (eval $ac_link) 2>&5
11494   ac_status=$?
11495-  echo "$as_me:21414: \$? = $ac_status" >&5
11496+  echo "$as_me:21420: \$? = $ac_status" >&5
11497   (exit $ac_status); } &&
11498          { ac_try='test -s conftest$ac_exeext'
11499-  { (eval echo "$as_me:21417: \"$ac_try\"") >&5
11500+  { (eval echo "$as_me:21423: \"$ac_try\"") >&5
11501   (eval $ac_try) 2>&5
11502   ac_status=$?
11503-  echo "$as_me:21420: \$? = $ac_status" >&5
11504+  echo "$as_me:21426: \$? = $ac_status" >&5
11505   (exit $ac_status); }; }; then
11506   cf_cv_pointer_va_list=yes
11507 else
11508@@ -21427,19 +21433,19 @@
11509 fi
11510 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11511 fi
11512-echo "$as_me:21430: result: $cf_cv_pointer_va_list" >&5
11513+echo "$as_me:21436: result: $cf_cv_pointer_va_list" >&5
11514 echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
11515
11516 	if test "$cf_cv_pointer_va_list" = no
11517 	then
11518-		echo "$as_me:21435: checking if we can copy va_list indirectly" >&5
11519+		echo "$as_me:21441: checking if we can copy va_list indirectly" >&5
11520 echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
11521 if test "${cf_cv_array_va_list+set}" = set; then
11522   echo $ECHO_N "(cached) $ECHO_C" >&6
11523 else
11524
11525 cat >conftest.$ac_ext <<_ACEOF
11526-#line 21442 "configure"
11527+#line 21448 "configure"
11528 #include "confdefs.h"
11529
11530 #include <stdarg.h>
11531@@ -21456,16 +21462,16 @@
11532 }
11533 _ACEOF
11534 rm -f conftest.$ac_objext conftest$ac_exeext
11535-if { (eval echo "$as_me:21459: \"$ac_link\"") >&5
11536+if { (eval echo "$as_me:21465: \"$ac_link\"") >&5
11537   (eval $ac_link) 2>&5
11538   ac_status=$?
11539-  echo "$as_me:21462: \$? = $ac_status" >&5
11540+  echo "$as_me:21468: \$? = $ac_status" >&5
11541   (exit $ac_status); } &&
11542          { ac_try='test -s conftest$ac_exeext'
11543-  { (eval echo "$as_me:21465: \"$ac_try\"") >&5
11544+  { (eval echo "$as_me:21471: \"$ac_try\"") >&5
11545   (eval $ac_try) 2>&5
11546   ac_status=$?
11547-  echo "$as_me:21468: \$? = $ac_status" >&5
11548+  echo "$as_me:21474: \$? = $ac_status" >&5
11549   (exit $ac_status); }; }; then
11550   cf_cv_array_va_list=yes
11551 else
11552@@ -21475,7 +21481,7 @@
11553 fi
11554 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11555 fi
11556-echo "$as_me:21478: result: $cf_cv_array_va_list" >&5
11557+echo "$as_me:21484: result: $cf_cv_array_va_list" >&5
11558 echo "${ECHO_T}$cf_cv_array_va_list" >&6
11559 		test "$cf_cv_array_va_list" = yes &&
11560 cat >>confdefs.h <<\EOF
11561@@ -21486,13 +21492,13 @@
11562 	;;
11563 esac
11564
11565-echo "$as_me:21489: checking for pid_t" >&5
11566+echo "$as_me:21495: checking for pid_t" >&5
11567 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
11568 if test "${ac_cv_type_pid_t+set}" = set; then
11569   echo $ECHO_N "(cached) $ECHO_C" >&6
11570 else
11571   cat >conftest.$ac_ext <<_ACEOF
11572-#line 21495 "configure"
11573+#line 21501 "configure"
11574 #include "confdefs.h"
11575 $ac_includes_default
11576 int
11577@@ -21507,16 +21513,16 @@
11578 }
11579 _ACEOF
11580 rm -f conftest.$ac_objext
11581-if { (eval echo "$as_me:21510: \"$ac_compile\"") >&5
11582+if { (eval echo "$as_me:21516: \"$ac_compile\"") >&5
11583   (eval $ac_compile) 2>&5
11584   ac_status=$?
11585-  echo "$as_me:21513: \$? = $ac_status" >&5
11586+  echo "$as_me:21519: \$? = $ac_status" >&5
11587   (exit $ac_status); } &&
11588          { ac_try='test -s conftest.$ac_objext'
11589-  { (eval echo "$as_me:21516: \"$ac_try\"") >&5
11590+  { (eval echo "$as_me:21522: \"$ac_try\"") >&5
11591   (eval $ac_try) 2>&5
11592   ac_status=$?
11593-  echo "$as_me:21519: \$? = $ac_status" >&5
11594+  echo "$as_me:21525: \$? = $ac_status" >&5
11595   (exit $ac_status); }; }; then
11596   ac_cv_type_pid_t=yes
11597 else
11598@@ -21526,7 +21532,7 @@
11599 fi
11600 rm -f conftest.$ac_objext conftest.$ac_ext
11601 fi
11602-echo "$as_me:21529: result: $ac_cv_type_pid_t" >&5
11603+echo "$as_me:21535: result: $ac_cv_type_pid_t" >&5
11604 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
11605 if test $ac_cv_type_pid_t = yes; then
11606   :
11607@@ -21541,23 +21547,23 @@
11608 for ac_header in unistd.h vfork.h
11609 do
11610 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
11611-echo "$as_me:21544: checking for $ac_header" >&5
11612+echo "$as_me:21550: checking for $ac_header" >&5
11613 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
11614 if eval "test \"\${$as_ac_Header+set}\" = set"; then
11615   echo $ECHO_N "(cached) $ECHO_C" >&6
11616 else
11617   cat >conftest.$ac_ext <<_ACEOF
11618-#line 21550 "configure"
11619+#line 21556 "configure"
11620 #include "confdefs.h"
11621 #include <$ac_header>
11622 _ACEOF
11623-if { (eval echo "$as_me:21554: \"$ac_cpp conftest.$ac_ext\"") >&5
11624+if { (eval echo "$as_me:21560: \"$ac_cpp conftest.$ac_ext\"") >&5
11625   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
11626   ac_status=$?
11627   egrep -v '^ *\+' conftest.er1 >conftest.err
11628   rm -f conftest.er1
11629   cat conftest.err >&5
11630-  echo "$as_me:21560: \$? = $ac_status" >&5
11631+  echo "$as_me:21566: \$? = $ac_status" >&5
11632   (exit $ac_status); } >/dev/null; then
11633   if test -s conftest.err; then
11634     ac_cpp_err=$ac_c_preproc_warn_flag
11635@@ -21576,7 +21582,7 @@
11636 fi
11637 rm -f conftest.err conftest.$ac_ext
11638 fi
11639-echo "$as_me:21579: result: `eval echo '${'$as_ac_Header'}'`" >&5
11640+echo "$as_me:21585: result: `eval echo '${'$as_ac_Header'}'`" >&5
11641 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
11642 if test `eval echo '${'$as_ac_Header'}'` = yes; then
11643   cat >>confdefs.h <<EOF
11644@@ -21589,13 +21595,13 @@
11645 for ac_func in fork vfork
11646 do
11647 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
11648-echo "$as_me:21592: checking for $ac_func" >&5
11649+echo "$as_me:21598: checking for $ac_func" >&5
11650 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
11651 if eval "test \"\${$as_ac_var+set}\" = set"; then
11652   echo $ECHO_N "(cached) $ECHO_C" >&6
11653 else
11654   cat >conftest.$ac_ext <<_ACEOF
11655-#line 21598 "configure"
11656+#line 21604 "configure"
11657 #include "confdefs.h"
11658 #define $ac_func autoconf_temporary
11659 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
11660@@ -21626,16 +21632,16 @@
11661 }
11662 _ACEOF
11663 rm -f conftest.$ac_objext conftest$ac_exeext
11664-if { (eval echo "$as_me:21629: \"$ac_link\"") >&5
11665+if { (eval echo "$as_me:21635: \"$ac_link\"") >&5
11666   (eval $ac_link) 2>&5
11667   ac_status=$?
11668-  echo "$as_me:21632: \$? = $ac_status" >&5
11669+  echo "$as_me:21638: \$? = $ac_status" >&5
11670   (exit $ac_status); } &&
11671          { ac_try='test -s conftest$ac_exeext'
11672-  { (eval echo "$as_me:21635: \"$ac_try\"") >&5
11673+  { (eval echo "$as_me:21641: \"$ac_try\"") >&5
11674   (eval $ac_try) 2>&5
11675   ac_status=$?
11676-  echo "$as_me:21638: \$? = $ac_status" >&5
11677+  echo "$as_me:21644: \$? = $ac_status" >&5
11678   (exit $ac_status); }; }; then
11679   eval "$as_ac_var=yes"
11680 else
11681@@ -21645,7 +21651,7 @@
11682 fi
11683 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11684 fi
11685-echo "$as_me:21648: result: `eval echo '${'$as_ac_var'}'`" >&5
11686+echo "$as_me:21654: result: `eval echo '${'$as_ac_var'}'`" >&5
11687 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
11688 if test `eval echo '${'$as_ac_var'}'` = yes; then
11689   cat >>confdefs.h <<EOF
11690@@ -21657,7 +21663,7 @@
11691
11692 ac_cv_func_fork_works=$ac_cv_func_fork
11693 if test "x$ac_cv_func_fork" = xyes; then
11694-  echo "$as_me:21660: checking for working fork" >&5
11695+  echo "$as_me:21666: checking for working fork" >&5
11696 echo $ECHO_N "checking for working fork... $ECHO_C" >&6
11697 if test "${ac_cv_func_fork_works+set}" = set; then
11698   echo $ECHO_N "(cached) $ECHO_C" >&6
11699@@ -21680,15 +21686,15 @@
11700       }
11701 _ACEOF
11702 rm -f conftest$ac_exeext
11703-if { (eval echo "$as_me:21683: \"$ac_link\"") >&5
11704+if { (eval echo "$as_me:21689: \"$ac_link\"") >&5
11705   (eval $ac_link) 2>&5
11706   ac_status=$?
11707-  echo "$as_me:21686: \$? = $ac_status" >&5
11708+  echo "$as_me:21692: \$? = $ac_status" >&5
11709   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11710-  { (eval echo "$as_me:21688: \"$ac_try\"") >&5
11711+  { (eval echo "$as_me:21694: \"$ac_try\"") >&5
11712   (eval $ac_try) 2>&5
11713   ac_status=$?
11714-  echo "$as_me:21691: \$? = $ac_status" >&5
11715+  echo "$as_me:21697: \$? = $ac_status" >&5
11716   (exit $ac_status); }; }; then
11717   ac_cv_func_fork_works=yes
11718 else
11719@@ -21700,7 +21706,7 @@
11720 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
11721 fi
11722 fi
11723-echo "$as_me:21703: result: $ac_cv_func_fork_works" >&5
11724+echo "$as_me:21709: result: $ac_cv_func_fork_works" >&5
11725 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
11726
11727 fi
11728@@ -21714,12 +21720,12 @@
11729       ac_cv_func_fork_works=yes
11730       ;;
11731   esac
11732-  { echo "$as_me:21717: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
11733+  { echo "$as_me:21723: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
11734 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
11735 fi
11736 ac_cv_func_vfork_works=$ac_cv_func_vfork
11737 if test "x$ac_cv_func_vfork" = xyes; then
11738-  echo "$as_me:21722: checking for working vfork" >&5
11739+  echo "$as_me:21728: checking for working vfork" >&5
11740 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
11741 if test "${ac_cv_func_vfork_works+set}" = set; then
11742   echo $ECHO_N "(cached) $ECHO_C" >&6
11743@@ -21728,7 +21734,7 @@
11744   ac_cv_func_vfork_works=cross
11745 else
11746   cat >conftest.$ac_ext <<_ACEOF
11747-#line 21731 "configure"
11748+#line 21737 "configure"
11749 #include "confdefs.h"
11750 /* Thanks to Paul Eggert for this test.  */
11751 #include <stdio.h>
11752@@ -21825,15 +21831,15 @@
11753 }
11754 _ACEOF
11755 rm -f conftest$ac_exeext
11756-if { (eval echo "$as_me:21828: \"$ac_link\"") >&5
11757+if { (eval echo "$as_me:21834: \"$ac_link\"") >&5
11758   (eval $ac_link) 2>&5
11759   ac_status=$?
11760-  echo "$as_me:21831: \$? = $ac_status" >&5
11761+  echo "$as_me:21837: \$? = $ac_status" >&5
11762   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11763-  { (eval echo "$as_me:21833: \"$ac_try\"") >&5
11764+  { (eval echo "$as_me:21839: \"$ac_try\"") >&5
11765   (eval $ac_try) 2>&5
11766   ac_status=$?
11767-  echo "$as_me:21836: \$? = $ac_status" >&5
11768+  echo "$as_me:21842: \$? = $ac_status" >&5
11769   (exit $ac_status); }; }; then
11770   ac_cv_func_vfork_works=yes
11771 else
11772@@ -21845,13 +21851,13 @@
11773 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
11774 fi
11775 fi
11776-echo "$as_me:21848: result: $ac_cv_func_vfork_works" >&5
11777+echo "$as_me:21854: result: $ac_cv_func_vfork_works" >&5
11778 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
11779
11780 fi;
11781 if test "x$ac_cv_func_fork_works" = xcross; then
11782   ac_cv_func_vfork_works=ac_cv_func_vfork
11783-  { echo "$as_me:21854: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
11784+  { echo "$as_me:21860: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
11785 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
11786 fi
11787
11788@@ -21876,7 +21882,7 @@
11789
11790 fi
11791
11792-echo "$as_me:21879: checking if fopen accepts explicit binary mode" >&5
11793+echo "$as_me:21885: checking if fopen accepts explicit binary mode" >&5
11794 echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
11795 if test "${cf_cv_fopen_bin_r+set}" = set; then
11796   echo $ECHO_N "(cached) $ECHO_C" >&6
11797@@ -21886,7 +21892,7 @@
11798   cf_cv_fopen_bin_r=unknown
11799 else
11800   cat >conftest.$ac_ext <<_ACEOF
11801-#line 21889 "configure"
11802+#line 21895 "configure"
11803 #include "confdefs.h"
11804
11805 #include <stdio.h>
11806@@ -21919,15 +21925,15 @@
11807
11808 _ACEOF
11809 rm -f conftest$ac_exeext
11810-if { (eval echo "$as_me:21922: \"$ac_link\"") >&5
11811+if { (eval echo "$as_me:21928: \"$ac_link\"") >&5
11812   (eval $ac_link) 2>&5
11813   ac_status=$?
11814-  echo "$as_me:21925: \$? = $ac_status" >&5
11815+  echo "$as_me:21931: \$? = $ac_status" >&5
11816   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11817-  { (eval echo "$as_me:21927: \"$ac_try\"") >&5
11818+  { (eval echo "$as_me:21933: \"$ac_try\"") >&5
11819   (eval $ac_try) 2>&5
11820   ac_status=$?
11821-  echo "$as_me:21930: \$? = $ac_status" >&5
11822+  echo "$as_me:21936: \$? = $ac_status" >&5
11823   (exit $ac_status); }; }; then
11824   cf_cv_fopen_bin_r=yes
11825 else
11826@@ -21940,15 +21946,16 @@
11827 fi
11828
11829 fi
11830-echo "$as_me:21943: result: $cf_cv_fopen_bin_r" >&5
11831+echo "$as_me:21949: result: $cf_cv_fopen_bin_r" >&5
11832 echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
11833-test "x$cf_cv_fopen_bin_r" != xno && cat >>confdefs.h <<\EOF
11834+test "x$cf_cv_fopen_bin_r" != xno &&
11835+cat >>confdefs.h <<\EOF
11836 #define USE_FOPEN_BIN_R 1
11837 EOF
11838
11839 # special check for test/ditto.c
11840
11841-echo "$as_me:21951: checking for openpty in -lutil" >&5
11842+echo "$as_me:21958: checking for openpty in -lutil" >&5
11843 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
11844 if test "${ac_cv_lib_util_openpty+set}" = set; then
11845   echo $ECHO_N "(cached) $ECHO_C" >&6
11846@@ -21956,7 +21963,7 @@
11847   ac_check_lib_save_LIBS=$LIBS
11848 LIBS="-lutil  $LIBS"
11849 cat >conftest.$ac_ext <<_ACEOF
11850-#line 21959 "configure"
11851+#line 21966 "configure"
11852 #include "confdefs.h"
11853
11854 /* Override any gcc2 internal prototype to avoid an error.  */
11855@@ -21975,16 +21982,16 @@
11856 }
11857 _ACEOF
11858 rm -f conftest.$ac_objext conftest$ac_exeext
11859-if { (eval echo "$as_me:21978: \"$ac_link\"") >&5
11860+if { (eval echo "$as_me:21985: \"$ac_link\"") >&5
11861   (eval $ac_link) 2>&5
11862   ac_status=$?
11863-  echo "$as_me:21981: \$? = $ac_status" >&5
11864+  echo "$as_me:21988: \$? = $ac_status" >&5
11865   (exit $ac_status); } &&
11866          { ac_try='test -s conftest$ac_exeext'
11867-  { (eval echo "$as_me:21984: \"$ac_try\"") >&5
11868+  { (eval echo "$as_me:21991: \"$ac_try\"") >&5
11869   (eval $ac_try) 2>&5
11870   ac_status=$?
11871-  echo "$as_me:21987: \$? = $ac_status" >&5
11872+  echo "$as_me:21994: \$? = $ac_status" >&5
11873   (exit $ac_status); }; }; then
11874   ac_cv_lib_util_openpty=yes
11875 else
11876@@ -21995,7 +22002,7 @@
11877 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11878 LIBS=$ac_check_lib_save_LIBS
11879 fi
11880-echo "$as_me:21998: result: $ac_cv_lib_util_openpty" >&5
11881+echo "$as_me:22005: result: $ac_cv_lib_util_openpty" >&5
11882 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
11883 if test $ac_cv_lib_util_openpty = yes; then
11884   cf_cv_lib_util=yes
11885@@ -22003,7 +22010,7 @@
11886   cf_cv_lib_util=no
11887 fi
11888
11889-echo "$as_me:22006: checking for openpty header" >&5
11890+echo "$as_me:22013: checking for openpty header" >&5
11891 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
11892 if test "${cf_cv_func_openpty+set}" = set; then
11893   echo $ECHO_N "(cached) $ECHO_C" >&6
11894@@ -22030,7 +22037,7 @@
11895 	for cf_header in pty.h libutil.h util.h
11896 	do
11897 	cat >conftest.$ac_ext <<_ACEOF
11898-#line 22033 "configure"
11899+#line 22040 "configure"
11900 #include "confdefs.h"
11901
11902 #include <$cf_header>
11903@@ -22047,16 +22054,16 @@
11904 }
11905 _ACEOF
11906 rm -f conftest.$ac_objext conftest$ac_exeext
11907-if { (eval echo "$as_me:22050: \"$ac_link\"") >&5
11908+if { (eval echo "$as_me:22057: \"$ac_link\"") >&5
11909   (eval $ac_link) 2>&5
11910   ac_status=$?
11911-  echo "$as_me:22053: \$? = $ac_status" >&5
11912+  echo "$as_me:22060: \$? = $ac_status" >&5
11913   (exit $ac_status); } &&
11914          { ac_try='test -s conftest$ac_exeext'
11915-  { (eval echo "$as_me:22056: \"$ac_try\"") >&5
11916+  { (eval echo "$as_me:22063: \"$ac_try\"") >&5
11917   (eval $ac_try) 2>&5
11918   ac_status=$?
11919-  echo "$as_me:22059: \$? = $ac_status" >&5
11920+  echo "$as_me:22066: \$? = $ac_status" >&5
11921   (exit $ac_status); }; }; then
11922
11923 		cf_cv_func_openpty=$cf_header
11924@@ -22074,7 +22081,7 @@
11925 	LIBS="$cf_save_LIBS"
11926
11927 fi
11928-echo "$as_me:22077: result: $cf_cv_func_openpty" >&5
11929+echo "$as_me:22084: result: $cf_cv_func_openpty" >&5
11930 echo "${ECHO_T}$cf_cv_func_openpty" >&6
11931
11932 if test "$cf_cv_func_openpty" != no ; then
11933@@ -22147,7 +22154,7 @@
11934 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
11935
11936 			  cat >conftest.$ac_ext <<_ACEOF
11937-#line 22150 "configure"
11938+#line 22157 "configure"
11939 #include "confdefs.h"
11940 #include <stdio.h>
11941 int
11942@@ -22159,16 +22166,16 @@
11943 }
11944 _ACEOF
11945 rm -f conftest.$ac_objext
11946-if { (eval echo "$as_me:22162: \"$ac_compile\"") >&5
11947+if { (eval echo "$as_me:22169: \"$ac_compile\"") >&5
11948   (eval $ac_compile) 2>&5
11949   ac_status=$?
11950-  echo "$as_me:22165: \$? = $ac_status" >&5
11951+  echo "$as_me:22172: \$? = $ac_status" >&5
11952   (exit $ac_status); } &&
11953          { ac_try='test -s conftest.$ac_objext'
11954-  { (eval echo "$as_me:22168: \"$ac_try\"") >&5
11955+  { (eval echo "$as_me:22175: \"$ac_try\"") >&5
11956   (eval $ac_try) 2>&5
11957   ac_status=$?
11958-  echo "$as_me:22171: \$? = $ac_status" >&5
11959+  echo "$as_me:22178: \$? = $ac_status" >&5
11960   (exit $ac_status); }; }; then
11961   :
11962 else
11963@@ -22185,7 +22192,7 @@
11964 		if test "$cf_have_incdir" = no ; then
11965 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
11966
11967-echo "${as_me:-configure}:22188: testing adding $cf_add_incdir to include-path ..." 1>&5
11968+echo "${as_me:-configure}:22195: testing adding $cf_add_incdir to include-path ..." 1>&5
11969
11970 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
11971
11972@@ -22221,7 +22228,7 @@
11973 			if test "$cf_have_libdir" = no ; then
11974 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
11975
11976-echo "${as_me:-configure}:22224: testing adding $cf_add_libdir to library-path ..." 1>&5
11977+echo "${as_me:-configure}:22231: testing adding $cf_add_libdir to library-path ..." 1>&5
11978
11979 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
11980 			fi
11981@@ -22232,7 +22239,7 @@
11982 	else
11983 		case "$with_hashed_db" in
11984 		(./*|../*|/*)
11985-			{ echo "$as_me:22235: WARNING: no such directory $with_hashed_db" >&5
11986+			{ echo "$as_me:22242: WARNING: no such directory $with_hashed_db" >&5
11987 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
11988 			;;
11989 		(*)
11990@@ -22304,7 +22311,7 @@
11991 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
11992
11993 			  cat >conftest.$ac_ext <<_ACEOF
11994-#line 22307 "configure"
11995+#line 22314 "configure"
11996 #include "confdefs.h"
11997 #include <stdio.h>
11998 int
11999@@ -22316,16 +22323,16 @@
12000 }
12001 _ACEOF
12002 rm -f conftest.$ac_objext
12003-if { (eval echo "$as_me:22319: \"$ac_compile\"") >&5
12004+if { (eval echo "$as_me:22326: \"$ac_compile\"") >&5
12005   (eval $ac_compile) 2>&5
12006   ac_status=$?
12007-  echo "$as_me:22322: \$? = $ac_status" >&5
12008+  echo "$as_me:22329: \$? = $ac_status" >&5
12009   (exit $ac_status); } &&
12010          { ac_try='test -s conftest.$ac_objext'
12011-  { (eval echo "$as_me:22325: \"$ac_try\"") >&5
12012+  { (eval echo "$as_me:22332: \"$ac_try\"") >&5
12013   (eval $ac_try) 2>&5
12014   ac_status=$?
12015-  echo "$as_me:22328: \$? = $ac_status" >&5
12016+  echo "$as_me:22335: \$? = $ac_status" >&5
12017   (exit $ac_status); }; }; then
12018   :
12019 else
12020@@ -22342,7 +22349,7 @@
12021 		if test "$cf_have_incdir" = no ; then
12022 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
12023
12024-echo "${as_me:-configure}:22345: testing adding $cf_add_incdir to include-path ..." 1>&5
12025+echo "${as_me:-configure}:22352: testing adding $cf_add_incdir to include-path ..." 1>&5
12026
12027 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
12028
12029@@ -22422,7 +22429,7 @@
12030 			if test "$cf_have_libdir" = no ; then
12031 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
12032
12033-echo "${as_me:-configure}:22425: testing adding $cf_add_libdir to library-path ..." 1>&5
12034+echo "${as_me:-configure}:22432: testing adding $cf_add_libdir to library-path ..." 1>&5
12035
12036 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
12037 			fi
12038@@ -22439,23 +22446,23 @@
12039 	fi
12040 esac
12041
12042-echo "$as_me:22442: checking for db.h" >&5
12043+echo "$as_me:22449: checking for db.h" >&5
12044 echo $ECHO_N "checking for db.h... $ECHO_C" >&6
12045 if test "${ac_cv_header_db_h+set}" = set; then
12046   echo $ECHO_N "(cached) $ECHO_C" >&6
12047 else
12048   cat >conftest.$ac_ext <<_ACEOF
12049-#line 22448 "configure"
12050+#line 22455 "configure"
12051 #include "confdefs.h"
12052 #include <db.h>
12053 _ACEOF
12054-if { (eval echo "$as_me:22452: \"$ac_cpp conftest.$ac_ext\"") >&5
12055+if { (eval echo "$as_me:22459: \"$ac_cpp conftest.$ac_ext\"") >&5
12056   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12057   ac_status=$?
12058   egrep -v '^ *\+' conftest.er1 >conftest.err
12059   rm -f conftest.er1
12060   cat conftest.err >&5
12061-  echo "$as_me:22458: \$? = $ac_status" >&5
12062+  echo "$as_me:22465: \$? = $ac_status" >&5
12063   (exit $ac_status); } >/dev/null; then
12064   if test -s conftest.err; then
12065     ac_cpp_err=$ac_c_preproc_warn_flag
12066@@ -22474,11 +22481,11 @@
12067 fi
12068 rm -f conftest.err conftest.$ac_ext
12069 fi
12070-echo "$as_me:22477: result: $ac_cv_header_db_h" >&5
12071+echo "$as_me:22484: result: $ac_cv_header_db_h" >&5
12072 echo "${ECHO_T}$ac_cv_header_db_h" >&6
12073 if test $ac_cv_header_db_h = yes; then
12074
12075-echo "$as_me:22481: checking for version of db" >&5
12076+echo "$as_me:22488: checking for version of db" >&5
12077 echo $ECHO_N "checking for version of db... $ECHO_C" >&6
12078 if test "${cf_cv_hashed_db_version+set}" = set; then
12079   echo $ECHO_N "(cached) $ECHO_C" >&6
12080@@ -22489,10 +22496,10 @@
12081 for cf_db_version in 1 2 3 4 5 6
12082 do
12083
12084-echo "${as_me:-configure}:22492: testing checking for db version $cf_db_version ..." 1>&5
12085+echo "${as_me:-configure}:22499: testing checking for db version $cf_db_version ..." 1>&5
12086
12087 	cat >conftest.$ac_ext <<_ACEOF
12088-#line 22495 "configure"
12089+#line 22502 "configure"
12090 #include "confdefs.h"
12091
12092 $ac_includes_default
12093@@ -22522,16 +22529,16 @@
12094 }
12095 _ACEOF
12096 rm -f conftest.$ac_objext
12097-if { (eval echo "$as_me:22525: \"$ac_compile\"") >&5
12098+if { (eval echo "$as_me:22532: \"$ac_compile\"") >&5
12099   (eval $ac_compile) 2>&5
12100   ac_status=$?
12101-  echo "$as_me:22528: \$? = $ac_status" >&5
12102+  echo "$as_me:22535: \$? = $ac_status" >&5
12103   (exit $ac_status); } &&
12104          { ac_try='test -s conftest.$ac_objext'
12105-  { (eval echo "$as_me:22531: \"$ac_try\"") >&5
12106+  { (eval echo "$as_me:22538: \"$ac_try\"") >&5
12107   (eval $ac_try) 2>&5
12108   ac_status=$?
12109-  echo "$as_me:22534: \$? = $ac_status" >&5
12110+  echo "$as_me:22541: \$? = $ac_status" >&5
12111   (exit $ac_status); }; }; then
12112
12113 	cf_cv_hashed_db_version=$cf_db_version
12114@@ -22545,16 +22552,16 @@
12115 done
12116
12117 fi
12118-echo "$as_me:22548: result: $cf_cv_hashed_db_version" >&5
12119+echo "$as_me:22555: result: $cf_cv_hashed_db_version" >&5
12120 echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
12121
12122 if test "$cf_cv_hashed_db_version" = unknown ; then
12123-	{ { echo "$as_me:22552: error: Cannot determine version of db" >&5
12124+	{ { echo "$as_me:22559: error: Cannot determine version of db" >&5
12125 echo "$as_me: error: Cannot determine version of db" >&2;}
12126    { (exit 1); exit 1; }; }
12127 else
12128
12129-echo "$as_me:22557: checking for db libraries" >&5
12130+echo "$as_me:22564: checking for db libraries" >&5
12131 echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
12132 if test "${cf_cv_hashed_db_libs+set}" = set; then
12133   echo $ECHO_N "(cached) $ECHO_C" >&6
12134@@ -22584,10 +22591,10 @@
12135
12136 	fi
12137
12138-echo "${as_me:-configure}:22587: testing checking for library "$cf_db_libs" ..." 1>&5
12139+echo "${as_me:-configure}:22594: testing checking for library "$cf_db_libs" ..." 1>&5
12140
12141 	cat >conftest.$ac_ext <<_ACEOF
12142-#line 22590 "configure"
12143+#line 22597 "configure"
12144 #include "confdefs.h"
12145
12146 $ac_includes_default
12147@@ -22642,16 +22649,16 @@
12148 }
12149 _ACEOF
12150 rm -f conftest.$ac_objext conftest$ac_exeext
12151-if { (eval echo "$as_me:22645: \"$ac_link\"") >&5
12152+if { (eval echo "$as_me:22652: \"$ac_link\"") >&5
12153   (eval $ac_link) 2>&5
12154   ac_status=$?
12155-  echo "$as_me:22648: \$? = $ac_status" >&5
12156+  echo "$as_me:22655: \$? = $ac_status" >&5
12157   (exit $ac_status); } &&
12158          { ac_try='test -s conftest$ac_exeext'
12159-  { (eval echo "$as_me:22651: \"$ac_try\"") >&5
12160+  { (eval echo "$as_me:22658: \"$ac_try\"") >&5
12161   (eval $ac_try) 2>&5
12162   ac_status=$?
12163-  echo "$as_me:22654: \$? = $ac_status" >&5
12164+  echo "$as_me:22661: \$? = $ac_status" >&5
12165   (exit $ac_status); }; }; then
12166
12167 	if test -n "$cf_db_libs" ; then
12168@@ -22671,11 +22678,11 @@
12169 done
12170
12171 fi
12172-echo "$as_me:22674: result: $cf_cv_hashed_db_libs" >&5
12173+echo "$as_me:22681: result: $cf_cv_hashed_db_libs" >&5
12174 echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
12175
12176 	if test "$cf_cv_hashed_db_libs" = unknown ; then
12177-		{ { echo "$as_me:22678: error: Cannot determine library for db" >&5
12178+		{ { echo "$as_me:22685: error: Cannot determine library for db" >&5
12179 echo "$as_me: error: Cannot determine library for db" >&2;}
12180    { (exit 1); exit 1; }; }
12181 	elif test "$cf_cv_hashed_db_libs" != default ; then
12182@@ -22701,7 +22708,7 @@
12183
12184 else
12185
12186-	{ { echo "$as_me:22704: error: Cannot find db.h" >&5
12187+	{ { echo "$as_me:22711: error: Cannot find db.h" >&5
12188 echo "$as_me: error: Cannot find db.h" >&2;}
12189    { (exit 1); exit 1; }; }
12190
12191@@ -22716,7 +22723,7 @@
12192
12193 # Just in case, check if the C compiler has a bool type.
12194
12195-echo "$as_me:22719: checking if we should include stdbool.h" >&5
12196+echo "$as_me:22726: checking if we should include stdbool.h" >&5
12197 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
12198
12199 if test "${cf_cv_header_stdbool_h+set}" = set; then
12200@@ -22724,7 +22731,7 @@
12201 else
12202
12203 	cat >conftest.$ac_ext <<_ACEOF
12204-#line 22727 "configure"
12205+#line 22734 "configure"
12206 #include "confdefs.h"
12207
12208 int
12209@@ -22736,23 +22743,23 @@
12210 }
12211 _ACEOF
12212 rm -f conftest.$ac_objext
12213-if { (eval echo "$as_me:22739: \"$ac_compile\"") >&5
12214+if { (eval echo "$as_me:22746: \"$ac_compile\"") >&5
12215   (eval $ac_compile) 2>&5
12216   ac_status=$?
12217-  echo "$as_me:22742: \$? = $ac_status" >&5
12218+  echo "$as_me:22749: \$? = $ac_status" >&5
12219   (exit $ac_status); } &&
12220          { ac_try='test -s conftest.$ac_objext'
12221-  { (eval echo "$as_me:22745: \"$ac_try\"") >&5
12222+  { (eval echo "$as_me:22752: \"$ac_try\"") >&5
12223   (eval $ac_try) 2>&5
12224   ac_status=$?
12225-  echo "$as_me:22748: \$? = $ac_status" >&5
12226+  echo "$as_me:22755: \$? = $ac_status" >&5
12227   (exit $ac_status); }; }; then
12228   cf_cv_header_stdbool_h=0
12229 else
12230   echo "$as_me: failed program was:" >&5
12231 cat conftest.$ac_ext >&5
12232 cat >conftest.$ac_ext <<_ACEOF
12233-#line 22755 "configure"
12234+#line 22762 "configure"
12235 #include "confdefs.h"
12236
12237 #ifndef __BEOS__
12238@@ -22768,16 +22775,16 @@
12239 }
12240 _ACEOF
12241 rm -f conftest.$ac_objext
12242-if { (eval echo "$as_me:22771: \"$ac_compile\"") >&5
12243+if { (eval echo "$as_me:22778: \"$ac_compile\"") >&5
12244   (eval $ac_compile) 2>&5
12245   ac_status=$?
12246-  echo "$as_me:22774: \$? = $ac_status" >&5
12247+  echo "$as_me:22781: \$? = $ac_status" >&5
12248   (exit $ac_status); } &&
12249          { ac_try='test -s conftest.$ac_objext'
12250-  { (eval echo "$as_me:22777: \"$ac_try\"") >&5
12251+  { (eval echo "$as_me:22784: \"$ac_try\"") >&5
12252   (eval $ac_try) 2>&5
12253   ac_status=$?
12254-  echo "$as_me:22780: \$? = $ac_status" >&5
12255+  echo "$as_me:22787: \$? = $ac_status" >&5
12256   (exit $ac_status); }; }; then
12257   cf_cv_header_stdbool_h=1
12258 else
12259@@ -22791,13 +22798,13 @@
12260 fi
12261
12262 if test "$cf_cv_header_stdbool_h" = 1
12263-then	echo "$as_me:22794: result: yes" >&5
12264+then	echo "$as_me:22801: result: yes" >&5
12265 echo "${ECHO_T}yes" >&6
12266-else	echo "$as_me:22796: result: no" >&5
12267+else	echo "$as_me:22803: result: no" >&5
12268 echo "${ECHO_T}no" >&6
12269 fi
12270
12271-echo "$as_me:22800: checking for builtin bool type" >&5
12272+echo "$as_me:22807: checking for builtin bool type" >&5
12273 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
12274
12275 if test "${cf_cv_cc_bool_type+set}" = set; then
12276@@ -22805,7 +22812,7 @@
12277 else
12278
12279 	cat >conftest.$ac_ext <<_ACEOF
12280-#line 22808 "configure"
12281+#line 22815 "configure"
12282 #include "confdefs.h"
12283
12284 #include <stdio.h>
12285@@ -22820,16 +22827,16 @@
12286 }
12287 _ACEOF
12288 rm -f conftest.$ac_objext
12289-if { (eval echo "$as_me:22823: \"$ac_compile\"") >&5
12290+if { (eval echo "$as_me:22830: \"$ac_compile\"") >&5
12291   (eval $ac_compile) 2>&5
12292   ac_status=$?
12293-  echo "$as_me:22826: \$? = $ac_status" >&5
12294+  echo "$as_me:22833: \$? = $ac_status" >&5
12295   (exit $ac_status); } &&
12296          { ac_try='test -s conftest.$ac_objext'
12297-  { (eval echo "$as_me:22829: \"$ac_try\"") >&5
12298+  { (eval echo "$as_me:22836: \"$ac_try\"") >&5
12299   (eval $ac_try) 2>&5
12300   ac_status=$?
12301-  echo "$as_me:22832: \$? = $ac_status" >&5
12302+  echo "$as_me:22839: \$? = $ac_status" >&5
12303   (exit $ac_status); }; }; then
12304   cf_cv_cc_bool_type=1
12305 else
12306@@ -22842,9 +22849,9 @@
12307 fi
12308
12309 if test "$cf_cv_cc_bool_type" = 1
12310-then	echo "$as_me:22845: result: yes" >&5
12311+then	echo "$as_me:22852: result: yes" >&5
12312 echo "${ECHO_T}yes" >&6
12313-else	echo "$as_me:22847: result: no" >&5
12314+else	echo "$as_me:22854: result: no" >&5
12315 echo "${ECHO_T}no" >&6
12316 fi
12317
12318@@ -22861,10 +22868,10 @@
12319
12320 	cf_save="$LIBS"
12321 	LIBS="$LIBS $CXXLIBS"
12322-	echo "$as_me:22864: checking if we already have C++ library" >&5
12323+	echo "$as_me:22871: checking if we already have C++ library" >&5
12324 echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
12325 	cat >conftest.$ac_ext <<_ACEOF
12326-#line 22867 "configure"
12327+#line 22874 "configure"
12328 #include "confdefs.h"
12329
12330 			#include <iostream>
12331@@ -22878,16 +22885,16 @@
12332 }
12333 _ACEOF
12334 rm -f conftest.$ac_objext conftest$ac_exeext
12335-if { (eval echo "$as_me:22881: \"$ac_link\"") >&5
12336+if { (eval echo "$as_me:22888: \"$ac_link\"") >&5
12337   (eval $ac_link) 2>&5
12338   ac_status=$?
12339-  echo "$as_me:22884: \$? = $ac_status" >&5
12340+  echo "$as_me:22891: \$? = $ac_status" >&5
12341   (exit $ac_status); } &&
12342          { ac_try='test -s conftest$ac_exeext'
12343-  { (eval echo "$as_me:22887: \"$ac_try\"") >&5
12344+  { (eval echo "$as_me:22894: \"$ac_try\"") >&5
12345   (eval $ac_try) 2>&5
12346   ac_status=$?
12347-  echo "$as_me:22890: \$? = $ac_status" >&5
12348+  echo "$as_me:22897: \$? = $ac_status" >&5
12349   (exit $ac_status); }; }; then
12350   cf_have_libstdcpp=yes
12351 else
12352@@ -22896,7 +22903,7 @@
12353 cf_have_libstdcpp=no
12354 fi
12355 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
12356-	echo "$as_me:22899: result: $cf_have_libstdcpp" >&5
12357+	echo "$as_me:22906: result: $cf_have_libstdcpp" >&5
12358 echo "${ECHO_T}$cf_have_libstdcpp" >&6
12359 	LIBS="$cf_save"
12360
12361@@ -22915,7 +22922,7 @@
12362 			;;
12363 		esac
12364
12365-		echo "$as_me:22918: checking for library $cf_stdcpp_libname" >&5
12366+		echo "$as_me:22925: checking for library $cf_stdcpp_libname" >&5
12367 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
12368 if test "${cf_cv_libstdcpp+set}" = set; then
12369   echo $ECHO_N "(cached) $ECHO_C" >&6
12370@@ -22941,7 +22948,7 @@
12371 LIBS="$cf_add_libs"
12372
12373 		cat >conftest.$ac_ext <<_ACEOF
12374-#line 22944 "configure"
12375+#line 22951 "configure"
12376 #include "confdefs.h"
12377
12378 				#include <iostream>
12379@@ -22955,16 +22962,16 @@
12380 }
12381 _ACEOF
12382 rm -f conftest.$ac_objext conftest$ac_exeext
12383-if { (eval echo "$as_me:22958: \"$ac_link\"") >&5
12384+if { (eval echo "$as_me:22965: \"$ac_link\"") >&5
12385   (eval $ac_link) 2>&5
12386   ac_status=$?
12387-  echo "$as_me:22961: \$? = $ac_status" >&5
12388+  echo "$as_me:22968: \$? = $ac_status" >&5
12389   (exit $ac_status); } &&
12390          { ac_try='test -s conftest$ac_exeext'
12391-  { (eval echo "$as_me:22964: \"$ac_try\"") >&5
12392+  { (eval echo "$as_me:22971: \"$ac_try\"") >&5
12393   (eval $ac_try) 2>&5
12394   ac_status=$?
12395-  echo "$as_me:22967: \$? = $ac_status" >&5
12396+  echo "$as_me:22974: \$? = $ac_status" >&5
12397   (exit $ac_status); }; }; then
12398   cf_cv_libstdcpp=yes
12399 else
12400@@ -22976,7 +22983,7 @@
12401 			LIBS="$cf_save"
12402
12403 fi
12404-echo "$as_me:22979: result: $cf_cv_libstdcpp" >&5
12405+echo "$as_me:22986: result: $cf_cv_libstdcpp" >&5
12406 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
12407 		test "$cf_cv_libstdcpp" = yes && {
12408 cf_add_libs="$CXXLIBS"
12409@@ -22998,7 +23005,7 @@
12410 	fi
12411 fi
12412
12413-	echo "$as_me:23001: checking whether $CXX understands -c and -o together" >&5
12414+	echo "$as_me:23008: checking whether $CXX understands -c and -o together" >&5
12415 echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
12416 if test "${cf_cv_prog_CXX_c_o+set}" = set; then
12417   echo $ECHO_N "(cached) $ECHO_C" >&6
12418@@ -23013,15 +23020,15 @@
12419 # We do the test twice because some compilers refuse to overwrite an
12420 # existing .o file with -o, though they will create one.
12421 ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
12422-if { (eval echo "$as_me:23016: \"$ac_try\"") >&5
12423+if { (eval echo "$as_me:23023: \"$ac_try\"") >&5
12424   (eval $ac_try) 2>&5
12425   ac_status=$?
12426-  echo "$as_me:23019: \$? = $ac_status" >&5
12427+  echo "$as_me:23026: \$? = $ac_status" >&5
12428   (exit $ac_status); } &&
12429-  test -f conftest2.$ac_objext && { (eval echo "$as_me:23021: \"$ac_try\"") >&5
12430+  test -f conftest2.$ac_objext && { (eval echo "$as_me:23028: \"$ac_try\"") >&5
12431   (eval $ac_try) 2>&5
12432   ac_status=$?
12433-  echo "$as_me:23024: \$? = $ac_status" >&5
12434+  echo "$as_me:23031: \$? = $ac_status" >&5
12435   (exit $ac_status); };
12436 then
12437   eval cf_cv_prog_CXX_c_o=yes
12438@@ -23032,10 +23039,10 @@
12439
12440 fi
12441 if test $cf_cv_prog_CXX_c_o = yes; then
12442-  echo "$as_me:23035: result: yes" >&5
12443+  echo "$as_me:23042: result: yes" >&5
12444 echo "${ECHO_T}yes" >&6
12445 else
12446-  echo "$as_me:23038: result: no" >&5
12447+  echo "$as_me:23045: result: no" >&5
12448 echo "${ECHO_T}no" >&6
12449 fi
12450
12451@@ -23055,7 +23062,7 @@
12452 	;;
12453 esac
12454 if test "$GXX" = yes; then
12455-	echo "$as_me:23058: checking for lib$cf_gpp_libname" >&5
12456+	echo "$as_me:23065: checking for lib$cf_gpp_libname" >&5
12457 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
12458 	cf_save="$LIBS"
12459
12460@@ -23076,7 +23083,7 @@
12461 LIBS="$cf_add_libs"
12462
12463 	cat >conftest.$ac_ext <<_ACEOF
12464-#line 23079 "configure"
12465+#line 23086 "configure"
12466 #include "confdefs.h"
12467
12468 #include <$cf_gpp_libname/builtin.h>
12469@@ -23090,16 +23097,16 @@
12470 }
12471 _ACEOF
12472 rm -f conftest.$ac_objext conftest$ac_exeext
12473-if { (eval echo "$as_me:23093: \"$ac_link\"") >&5
12474+if { (eval echo "$as_me:23100: \"$ac_link\"") >&5
12475   (eval $ac_link) 2>&5
12476   ac_status=$?
12477-  echo "$as_me:23096: \$? = $ac_status" >&5
12478+  echo "$as_me:23103: \$? = $ac_status" >&5
12479   (exit $ac_status); } &&
12480          { ac_try='test -s conftest$ac_exeext'
12481-  { (eval echo "$as_me:23099: \"$ac_try\"") >&5
12482+  { (eval echo "$as_me:23106: \"$ac_try\"") >&5
12483   (eval $ac_try) 2>&5
12484   ac_status=$?
12485-  echo "$as_me:23102: \$? = $ac_status" >&5
12486+  echo "$as_me:23109: \$? = $ac_status" >&5
12487   (exit $ac_status); }; }; then
12488   cf_cxx_library=yes
12489
12490@@ -23136,7 +23143,7 @@
12491   echo "$as_me: failed program was:" >&5
12492 cat conftest.$ac_ext >&5
12493 cat >conftest.$ac_ext <<_ACEOF
12494-#line 23139 "configure"
12495+#line 23146 "configure"
12496 #include "confdefs.h"
12497
12498 #include <builtin.h>
12499@@ -23150,16 +23157,16 @@
12500 }
12501 _ACEOF
12502 rm -f conftest.$ac_objext conftest$ac_exeext
12503-if { (eval echo "$as_me:23153: \"$ac_link\"") >&5
12504+if { (eval echo "$as_me:23160: \"$ac_link\"") >&5
12505   (eval $ac_link) 2>&5
12506   ac_status=$?
12507-  echo "$as_me:23156: \$? = $ac_status" >&5
12508+  echo "$as_me:23163: \$? = $ac_status" >&5
12509   (exit $ac_status); } &&
12510          { ac_try='test -s conftest$ac_exeext'
12511-  { (eval echo "$as_me:23159: \"$ac_try\"") >&5
12512+  { (eval echo "$as_me:23166: \"$ac_try\"") >&5
12513   (eval $ac_try) 2>&5
12514   ac_status=$?
12515-  echo "$as_me:23162: \$? = $ac_status" >&5
12516+  echo "$as_me:23169: \$? = $ac_status" >&5
12517   (exit $ac_status); }; }; then
12518   cf_cxx_library=yes
12519
12520@@ -23192,7 +23199,7 @@
12521 fi
12522 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
12523 	LIBS="$cf_save"
12524-	echo "$as_me:23195: result: $cf_cxx_library" >&5
12525+	echo "$as_me:23202: result: $cf_cxx_library" >&5
12526 echo "${ECHO_T}$cf_cxx_library" >&6
12527 fi
12528
12529@@ -23208,7 +23215,7 @@
12530 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
12531 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
12532 ac_main_return=return
12533-echo "$as_me:23211: checking how to run the C++ preprocessor" >&5
12534+echo "$as_me:23218: checking how to run the C++ preprocessor" >&5
12535 echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
12536 if test -z "$CXXCPP"; then
12537   if test "${ac_cv_prog_CXXCPP+set}" = set; then
12538@@ -23225,18 +23232,18 @@
12539   # On the NeXT, cc -E runs the code through the compiler's parser,
12540   # not just through cpp. "Syntax error" is here to catch this case.
12541   cat >conftest.$ac_ext <<_ACEOF
12542-#line 23228 "configure"
12543+#line 23235 "configure"
12544 #include "confdefs.h"
12545 #include <assert.h>
12546                      Syntax error
12547 _ACEOF
12548-if { (eval echo "$as_me:23233: \"$ac_cpp conftest.$ac_ext\"") >&5
12549+if { (eval echo "$as_me:23240: \"$ac_cpp conftest.$ac_ext\"") >&5
12550   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12551   ac_status=$?
12552   egrep -v '^ *\+' conftest.er1 >conftest.err
12553   rm -f conftest.er1
12554   cat conftest.err >&5
12555-  echo "$as_me:23239: \$? = $ac_status" >&5
12556+  echo "$as_me:23246: \$? = $ac_status" >&5
12557   (exit $ac_status); } >/dev/null; then
12558   if test -s conftest.err; then
12559     ac_cpp_err=$ac_cxx_preproc_warn_flag
12560@@ -23259,17 +23266,17 @@
12561   # OK, works on sane cases.  Now check whether non-existent headers
12562   # can be detected and how.
12563   cat >conftest.$ac_ext <<_ACEOF
12564-#line 23262 "configure"
12565+#line 23269 "configure"
12566 #include "confdefs.h"
12567 #include <ac_nonexistent.h>
12568 _ACEOF
12569-if { (eval echo "$as_me:23266: \"$ac_cpp conftest.$ac_ext\"") >&5
12570+if { (eval echo "$as_me:23273: \"$ac_cpp conftest.$ac_ext\"") >&5
12571   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12572   ac_status=$?
12573   egrep -v '^ *\+' conftest.er1 >conftest.err
12574   rm -f conftest.er1
12575   cat conftest.err >&5
12576-  echo "$as_me:23272: \$? = $ac_status" >&5
12577+  echo "$as_me:23279: \$? = $ac_status" >&5
12578   (exit $ac_status); } >/dev/null; then
12579   if test -s conftest.err; then
12580     ac_cpp_err=$ac_cxx_preproc_warn_flag
12581@@ -23306,7 +23313,7 @@
12582 else
12583   ac_cv_prog_CXXCPP=$CXXCPP
12584 fi
12585-echo "$as_me:23309: result: $CXXCPP" >&5
12586+echo "$as_me:23316: result: $CXXCPP" >&5
12587 echo "${ECHO_T}$CXXCPP" >&6
12588 ac_preproc_ok=false
12589 for ac_cxx_preproc_warn_flag in '' yes
12590@@ -23316,18 +23323,18 @@
12591   # On the NeXT, cc -E runs the code through the compiler's parser,
12592   # not just through cpp. "Syntax error" is here to catch this case.
12593   cat >conftest.$ac_ext <<_ACEOF
12594-#line 23319 "configure"
12595+#line 23326 "configure"
12596 #include "confdefs.h"
12597 #include <assert.h>
12598                      Syntax error
12599 _ACEOF
12600-if { (eval echo "$as_me:23324: \"$ac_cpp conftest.$ac_ext\"") >&5
12601+if { (eval echo "$as_me:23331: \"$ac_cpp conftest.$ac_ext\"") >&5
12602   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12603   ac_status=$?
12604   egrep -v '^ *\+' conftest.er1 >conftest.err
12605   rm -f conftest.er1
12606   cat conftest.err >&5
12607-  echo "$as_me:23330: \$? = $ac_status" >&5
12608+  echo "$as_me:23337: \$? = $ac_status" >&5
12609   (exit $ac_status); } >/dev/null; then
12610   if test -s conftest.err; then
12611     ac_cpp_err=$ac_cxx_preproc_warn_flag
12612@@ -23350,17 +23357,17 @@
12613   # OK, works on sane cases.  Now check whether non-existent headers
12614   # can be detected and how.
12615   cat >conftest.$ac_ext <<_ACEOF
12616-#line 23353 "configure"
12617+#line 23360 "configure"
12618 #include "confdefs.h"
12619 #include <ac_nonexistent.h>
12620 _ACEOF
12621-if { (eval echo "$as_me:23357: \"$ac_cpp conftest.$ac_ext\"") >&5
12622+if { (eval echo "$as_me:23364: \"$ac_cpp conftest.$ac_ext\"") >&5
12623   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12624   ac_status=$?
12625   egrep -v '^ *\+' conftest.er1 >conftest.err
12626   rm -f conftest.er1
12627   cat conftest.err >&5
12628-  echo "$as_me:23363: \$? = $ac_status" >&5
12629+  echo "$as_me:23370: \$? = $ac_status" >&5
12630   (exit $ac_status); } >/dev/null; then
12631   if test -s conftest.err; then
12632     ac_cpp_err=$ac_cxx_preproc_warn_flag
12633@@ -23388,7 +23395,7 @@
12634 if $ac_preproc_ok; then
12635   :
12636 else
12637-  { { echo "$as_me:23391: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
12638+  { { echo "$as_me:23398: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
12639 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
12640    { (exit 1); exit 1; }; }
12641 fi
12642@@ -23403,23 +23410,23 @@
12643 for ac_header in typeinfo
12644 do
12645 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
12646-echo "$as_me:23406: checking for $ac_header" >&5
12647+echo "$as_me:23413: checking for $ac_header" >&5
12648 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
12649 if eval "test \"\${$as_ac_Header+set}\" = set"; then
12650   echo $ECHO_N "(cached) $ECHO_C" >&6
12651 else
12652   cat >conftest.$ac_ext <<_ACEOF
12653-#line 23412 "configure"
12654+#line 23419 "configure"
12655 #include "confdefs.h"
12656 #include <$ac_header>
12657 _ACEOF
12658-if { (eval echo "$as_me:23416: \"$ac_cpp conftest.$ac_ext\"") >&5
12659+if { (eval echo "$as_me:23423: \"$ac_cpp conftest.$ac_ext\"") >&5
12660   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12661   ac_status=$?
12662   egrep -v '^ *\+' conftest.er1 >conftest.err
12663   rm -f conftest.er1
12664   cat conftest.err >&5
12665-  echo "$as_me:23422: \$? = $ac_status" >&5
12666+  echo "$as_me:23429: \$? = $ac_status" >&5
12667   (exit $ac_status); } >/dev/null; then
12668   if test -s conftest.err; then
12669     ac_cpp_err=$ac_cxx_preproc_warn_flag
12670@@ -23438,7 +23445,7 @@
12671 fi
12672 rm -f conftest.err conftest.$ac_ext
12673 fi
12674-echo "$as_me:23441: result: `eval echo '${'$as_ac_Header'}'`" >&5
12675+echo "$as_me:23448: result: `eval echo '${'$as_ac_Header'}'`" >&5
12676 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
12677 if test `eval echo '${'$as_ac_Header'}'` = yes; then
12678   cat >>confdefs.h <<EOF
12679@@ -23451,23 +23458,23 @@
12680 for ac_header in iostream
12681 do
12682 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
12683-echo "$as_me:23454: checking for $ac_header" >&5
12684+echo "$as_me:23461: checking for $ac_header" >&5
12685 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
12686 if eval "test \"\${$as_ac_Header+set}\" = set"; then
12687   echo $ECHO_N "(cached) $ECHO_C" >&6
12688 else
12689   cat >conftest.$ac_ext <<_ACEOF
12690-#line 23460 "configure"
12691+#line 23467 "configure"
12692 #include "confdefs.h"
12693 #include <$ac_header>
12694 _ACEOF
12695-if { (eval echo "$as_me:23464: \"$ac_cpp conftest.$ac_ext\"") >&5
12696+if { (eval echo "$as_me:23471: \"$ac_cpp conftest.$ac_ext\"") >&5
12697   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12698   ac_status=$?
12699   egrep -v '^ *\+' conftest.er1 >conftest.err
12700   rm -f conftest.er1
12701   cat conftest.err >&5
12702-  echo "$as_me:23470: \$? = $ac_status" >&5
12703+  echo "$as_me:23477: \$? = $ac_status" >&5
12704   (exit $ac_status); } >/dev/null; then
12705   if test -s conftest.err; then
12706     ac_cpp_err=$ac_cxx_preproc_warn_flag
12707@@ -23486,7 +23493,7 @@
12708 fi
12709 rm -f conftest.err conftest.$ac_ext
12710 fi
12711-echo "$as_me:23489: result: `eval echo '${'$as_ac_Header'}'`" >&5
12712+echo "$as_me:23496: result: `eval echo '${'$as_ac_Header'}'`" >&5
12713 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
12714 if test `eval echo '${'$as_ac_Header'}'` = yes; then
12715   cat >>confdefs.h <<EOF
12716@@ -23497,10 +23504,10 @@
12717 done
12718
12719 if test x"$ac_cv_header_iostream" = xyes ; then
12720-	echo "$as_me:23500: checking if iostream uses std-namespace" >&5
12721+	echo "$as_me:23507: checking if iostream uses std-namespace" >&5
12722 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
12723 	cat >conftest.$ac_ext <<_ACEOF
12724-#line 23503 "configure"
12725+#line 23510 "configure"
12726 #include "confdefs.h"
12727
12728 #include <iostream>
12729@@ -23517,16 +23524,16 @@
12730 }
12731 _ACEOF
12732 rm -f conftest.$ac_objext
12733-if { (eval echo "$as_me:23520: \"$ac_compile\"") >&5
12734+if { (eval echo "$as_me:23527: \"$ac_compile\"") >&5
12735   (eval $ac_compile) 2>&5
12736   ac_status=$?
12737-  echo "$as_me:23523: \$? = $ac_status" >&5
12738+  echo "$as_me:23530: \$? = $ac_status" >&5
12739   (exit $ac_status); } &&
12740          { ac_try='test -s conftest.$ac_objext'
12741-  { (eval echo "$as_me:23526: \"$ac_try\"") >&5
12742+  { (eval echo "$as_me:23533: \"$ac_try\"") >&5
12743   (eval $ac_try) 2>&5
12744   ac_status=$?
12745-  echo "$as_me:23529: \$? = $ac_status" >&5
12746+  echo "$as_me:23536: \$? = $ac_status" >&5
12747   (exit $ac_status); }; }; then
12748   cf_iostream_namespace=yes
12749 else
12750@@ -23535,7 +23542,7 @@
12751 cf_iostream_namespace=no
12752 fi
12753 rm -f conftest.$ac_objext conftest.$ac_ext
12754-	echo "$as_me:23538: result: $cf_iostream_namespace" >&5
12755+	echo "$as_me:23545: result: $cf_iostream_namespace" >&5
12756 echo "${ECHO_T}$cf_iostream_namespace" >&6
12757 	if test "$cf_iostream_namespace" = yes ; then
12758
12759@@ -23546,7 +23553,7 @@
12760 	fi
12761 fi
12762
12763-echo "$as_me:23549: checking if we should include stdbool.h" >&5
12764+echo "$as_me:23556: checking if we should include stdbool.h" >&5
12765 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
12766
12767 if test "${cf_cv_header_stdbool_h+set}" = set; then
12768@@ -23554,7 +23561,7 @@
12769 else
12770
12771 	cat >conftest.$ac_ext <<_ACEOF
12772-#line 23557 "configure"
12773+#line 23564 "configure"
12774 #include "confdefs.h"
12775
12776 int
12777@@ -23566,23 +23573,23 @@
12778 }
12779 _ACEOF
12780 rm -f conftest.$ac_objext
12781-if { (eval echo "$as_me:23569: \"$ac_compile\"") >&5
12782+if { (eval echo "$as_me:23576: \"$ac_compile\"") >&5
12783   (eval $ac_compile) 2>&5
12784   ac_status=$?
12785-  echo "$as_me:23572: \$? = $ac_status" >&5
12786+  echo "$as_me:23579: \$? = $ac_status" >&5
12787   (exit $ac_status); } &&
12788          { ac_try='test -s conftest.$ac_objext'
12789-  { (eval echo "$as_me:23575: \"$ac_try\"") >&5
12790+  { (eval echo "$as_me:23582: \"$ac_try\"") >&5
12791   (eval $ac_try) 2>&5
12792   ac_status=$?
12793-  echo "$as_me:23578: \$? = $ac_status" >&5
12794+  echo "$as_me:23585: \$? = $ac_status" >&5
12795   (exit $ac_status); }; }; then
12796   cf_cv_header_stdbool_h=0
12797 else
12798   echo "$as_me: failed program was:" >&5
12799 cat conftest.$ac_ext >&5
12800 cat >conftest.$ac_ext <<_ACEOF
12801-#line 23585 "configure"
12802+#line 23592 "configure"
12803 #include "confdefs.h"
12804
12805 #ifndef __BEOS__
12806@@ -23598,16 +23605,16 @@
12807 }
12808 _ACEOF
12809 rm -f conftest.$ac_objext
12810-if { (eval echo "$as_me:23601: \"$ac_compile\"") >&5
12811+if { (eval echo "$as_me:23608: \"$ac_compile\"") >&5
12812   (eval $ac_compile) 2>&5
12813   ac_status=$?
12814-  echo "$as_me:23604: \$? = $ac_status" >&5
12815+  echo "$as_me:23611: \$? = $ac_status" >&5
12816   (exit $ac_status); } &&
12817          { ac_try='test -s conftest.$ac_objext'
12818-  { (eval echo "$as_me:23607: \"$ac_try\"") >&5
12819+  { (eval echo "$as_me:23614: \"$ac_try\"") >&5
12820   (eval $ac_try) 2>&5
12821   ac_status=$?
12822-  echo "$as_me:23610: \$? = $ac_status" >&5
12823+  echo "$as_me:23617: \$? = $ac_status" >&5
12824   (exit $ac_status); }; }; then
12825   cf_cv_header_stdbool_h=1
12826 else
12827@@ -23621,13 +23628,13 @@
12828 fi
12829
12830 if test "$cf_cv_header_stdbool_h" = 1
12831-then	echo "$as_me:23624: result: yes" >&5
12832+then	echo "$as_me:23631: result: yes" >&5
12833 echo "${ECHO_T}yes" >&6
12834-else	echo "$as_me:23626: result: no" >&5
12835+else	echo "$as_me:23633: result: no" >&5
12836 echo "${ECHO_T}no" >&6
12837 fi
12838
12839-echo "$as_me:23630: checking for builtin bool type" >&5
12840+echo "$as_me:23637: checking for builtin bool type" >&5
12841 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
12842
12843 if test "${cf_cv_builtin_bool+set}" = set; then
12844@@ -23635,7 +23642,7 @@
12845 else
12846
12847 	cat >conftest.$ac_ext <<_ACEOF
12848-#line 23638 "configure"
12849+#line 23645 "configure"
12850 #include "confdefs.h"
12851
12852 #include <stdio.h>
12853@@ -23650,16 +23657,16 @@
12854 }
12855 _ACEOF
12856 rm -f conftest.$ac_objext
12857-if { (eval echo "$as_me:23653: \"$ac_compile\"") >&5
12858+if { (eval echo "$as_me:23660: \"$ac_compile\"") >&5
12859   (eval $ac_compile) 2>&5
12860   ac_status=$?
12861-  echo "$as_me:23656: \$? = $ac_status" >&5
12862+  echo "$as_me:23663: \$? = $ac_status" >&5
12863   (exit $ac_status); } &&
12864          { ac_try='test -s conftest.$ac_objext'
12865-  { (eval echo "$as_me:23659: \"$ac_try\"") >&5
12866+  { (eval echo "$as_me:23666: \"$ac_try\"") >&5
12867   (eval $ac_try) 2>&5
12868   ac_status=$?
12869-  echo "$as_me:23662: \$? = $ac_status" >&5
12870+  echo "$as_me:23669: \$? = $ac_status" >&5
12871   (exit $ac_status); }; }; then
12872   cf_cv_builtin_bool=1
12873 else
12874@@ -23672,13 +23679,13 @@
12875 fi
12876
12877 if test "$cf_cv_builtin_bool" = 1
12878-then	echo "$as_me:23675: result: yes" >&5
12879+then	echo "$as_me:23682: result: yes" >&5
12880 echo "${ECHO_T}yes" >&6
12881-else	echo "$as_me:23677: result: no" >&5
12882+else	echo "$as_me:23684: result: no" >&5
12883 echo "${ECHO_T}no" >&6
12884 fi
12885
12886-echo "$as_me:23681: checking for size of bool" >&5
12887+echo "$as_me:23688: checking for size of bool" >&5
12888 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
12889 if test "${cf_cv_type_of_bool+set}" = set; then
12890   echo $ECHO_N "(cached) $ECHO_C" >&6
12891@@ -23689,7 +23696,7 @@
12892   cf_cv_type_of_bool=unknown
12893 else
12894   cat >conftest.$ac_ext <<_ACEOF
12895-#line 23692 "configure"
12896+#line 23699 "configure"
12897 #include "confdefs.h"
12898
12899 #include <stdlib.h>
12900@@ -23731,15 +23738,15 @@
12901
12902 _ACEOF
12903 rm -f conftest$ac_exeext
12904-if { (eval echo "$as_me:23734: \"$ac_link\"") >&5
12905+if { (eval echo "$as_me:23741: \"$ac_link\"") >&5
12906   (eval $ac_link) 2>&5
12907   ac_status=$?
12908-  echo "$as_me:23737: \$? = $ac_status" >&5
12909+  echo "$as_me:23744: \$? = $ac_status" >&5
12910   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
12911-  { (eval echo "$as_me:23739: \"$ac_try\"") >&5
12912+  { (eval echo "$as_me:23746: \"$ac_try\"") >&5
12913   (eval $ac_try) 2>&5
12914   ac_status=$?
12915-  echo "$as_me:23742: \$? = $ac_status" >&5
12916+  echo "$as_me:23749: \$? = $ac_status" >&5
12917   (exit $ac_status); }; }; then
12918   cf_cv_type_of_bool=`cat cf_test.out`
12919 		 if test -z "$cf_cv_type_of_bool"; then
12920@@ -23757,18 +23764,18 @@
12921 fi
12922
12923 	rm -f cf_test.out
12924-echo "$as_me:23760: result: $cf_cv_type_of_bool" >&5
12925+echo "$as_me:23767: result: $cf_cv_type_of_bool" >&5
12926 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
12927 if test "$cf_cv_type_of_bool" = unknown ; then
12928 	case .$NCURSES_BOOL in
12929 	(.auto|.) NCURSES_BOOL=unsigned;;
12930 	esac
12931-	{ echo "$as_me:23766: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
12932+	{ echo "$as_me:23773: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
12933 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
12934 	cf_cv_type_of_bool=$NCURSES_BOOL
12935 fi
12936
12937-echo "$as_me:23771: checking for special defines needed for etip.h" >&5
12938+echo "$as_me:23778: checking for special defines needed for etip.h" >&5
12939 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
12940 cf_save_CXXFLAGS="$CXXFLAGS"
12941 cf_result="none"
12942@@ -23786,7 +23793,7 @@
12943 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
12944 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
12945 cat >conftest.$ac_ext <<_ACEOF
12946-#line 23789 "configure"
12947+#line 23796 "configure"
12948 #include "confdefs.h"
12949
12950 #include <etip.h.in>
12951@@ -23800,16 +23807,16 @@
12952 }
12953 _ACEOF
12954 rm -f conftest.$ac_objext
12955-if { (eval echo "$as_me:23803: \"$ac_compile\"") >&5
12956+if { (eval echo "$as_me:23810: \"$ac_compile\"") >&5
12957   (eval $ac_compile) 2>&5
12958   ac_status=$?
12959-  echo "$as_me:23806: \$? = $ac_status" >&5
12960+  echo "$as_me:23813: \$? = $ac_status" >&5
12961   (exit $ac_status); } &&
12962          { ac_try='test -s conftest.$ac_objext'
12963-  { (eval echo "$as_me:23809: \"$ac_try\"") >&5
12964+  { (eval echo "$as_me:23816: \"$ac_try\"") >&5
12965   (eval $ac_try) 2>&5
12966   ac_status=$?
12967-  echo "$as_me:23812: \$? = $ac_status" >&5
12968+  echo "$as_me:23819: \$? = $ac_status" >&5
12969   (exit $ac_status); }; }; then
12970
12971 	test -n "$cf_math" && cat >>confdefs.h <<EOF
12972@@ -23830,12 +23837,12 @@
12973 rm -f conftest.$ac_objext conftest.$ac_ext
12974 done
12975 done
12976-echo "$as_me:23833: result: $cf_result" >&5
12977+echo "$as_me:23840: result: $cf_result" >&5
12978 echo "${ECHO_T}$cf_result" >&6
12979 CXXFLAGS="$cf_save_CXXFLAGS"
12980
12981 if test -n "$CXX"; then
12982-echo "$as_me:23838: checking if $CXX accepts parameter initialization" >&5
12983+echo "$as_me:23845: checking if $CXX accepts parameter initialization" >&5
12984 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
12985 if test "${cf_cv_cpp_param_init+set}" = set; then
12986   echo $ECHO_N "(cached) $ECHO_C" >&6
12987@@ -23852,7 +23859,7 @@
12988   cf_cv_cpp_param_init=unknown
12989 else
12990   cat >conftest.$ac_ext <<_ACEOF
12991-#line 23855 "configure"
12992+#line 23862 "configure"
12993 #include "confdefs.h"
12994
12995 class TEST {
12996@@ -23871,15 +23878,15 @@
12997
12998 _ACEOF
12999 rm -f conftest$ac_exeext
13000-if { (eval echo "$as_me:23874: \"$ac_link\"") >&5
13001+if { (eval echo "$as_me:23881: \"$ac_link\"") >&5
13002   (eval $ac_link) 2>&5
13003   ac_status=$?
13004-  echo "$as_me:23877: \$? = $ac_status" >&5
13005+  echo "$as_me:23884: \$? = $ac_status" >&5
13006   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
13007-  { (eval echo "$as_me:23879: \"$ac_try\"") >&5
13008+  { (eval echo "$as_me:23886: \"$ac_try\"") >&5
13009   (eval $ac_try) 2>&5
13010   ac_status=$?
13011-  echo "$as_me:23882: \$? = $ac_status" >&5
13012+  echo "$as_me:23889: \$? = $ac_status" >&5
13013   (exit $ac_status); }; }; then
13014   cf_cv_cpp_param_init=yes
13015 else
13016@@ -23898,7 +23905,7 @@
13017 ac_main_return=return
13018
13019 fi
13020-echo "$as_me:23901: result: $cf_cv_cpp_param_init" >&5
13021+echo "$as_me:23908: result: $cf_cv_cpp_param_init" >&5
13022 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
13023 fi
13024 test "$cf_cv_cpp_param_init" = yes &&
13025@@ -23908,7 +23915,7 @@
13026
13027 if test -n "$CXX"; then
13028
13029-echo "$as_me:23911: checking if $CXX accepts static_cast" >&5
13030+echo "$as_me:23918: checking if $CXX accepts static_cast" >&5
13031 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
13032 if test "${cf_cv_cpp_static_cast+set}" = set; then
13033   echo $ECHO_N "(cached) $ECHO_C" >&6
13034@@ -23922,7 +23929,7 @@
13035 ac_main_return=return
13036
13037 	cat >conftest.$ac_ext <<_ACEOF
13038-#line 23925 "configure"
13039+#line 23932 "configure"
13040 #include "confdefs.h"
13041
13042 class NCursesPanel
13043@@ -23966,16 +23973,16 @@
13044 }
13045 _ACEOF
13046 rm -f conftest.$ac_objext
13047-if { (eval echo "$as_me:23969: \"$ac_compile\"") >&5
13048+if { (eval echo "$as_me:23976: \"$ac_compile\"") >&5
13049   (eval $ac_compile) 2>&5
13050   ac_status=$?
13051-  echo "$as_me:23972: \$? = $ac_status" >&5
13052+  echo "$as_me:23979: \$? = $ac_status" >&5
13053   (exit $ac_status); } &&
13054          { ac_try='test -s conftest.$ac_objext'
13055-  { (eval echo "$as_me:23975: \"$ac_try\"") >&5
13056+  { (eval echo "$as_me:23982: \"$ac_try\"") >&5
13057   (eval $ac_try) 2>&5
13058   ac_status=$?
13059-  echo "$as_me:23978: \$? = $ac_status" >&5
13060+  echo "$as_me:23985: \$? = $ac_status" >&5
13061   (exit $ac_status); }; }; then
13062   cf_cv_cpp_static_cast=yes
13063 else
13064@@ -23993,7 +24000,7 @@
13065 ac_main_return=return
13066
13067 fi
13068-echo "$as_me:23996: result: $cf_cv_cpp_static_cast" >&5
13069+echo "$as_me:24003: result: $cf_cv_cpp_static_cast" >&5
13070 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
13071
13072 fi
13073@@ -24042,7 +24049,7 @@
13074 	else
13075 		if test "$cf_cv_header_stdbool_h" = 1 ; then
13076
13077-echo "$as_me:24045: checking for size of bool" >&5
13078+echo "$as_me:24052: checking for size of bool" >&5
13079 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
13080 if test "${cf_cv_type_of_bool+set}" = set; then
13081   echo $ECHO_N "(cached) $ECHO_C" >&6
13082@@ -24053,7 +24060,7 @@
13083   cf_cv_type_of_bool=unknown
13084 else
13085   cat >conftest.$ac_ext <<_ACEOF
13086-#line 24056 "configure"
13087+#line 24063 "configure"
13088 #include "confdefs.h"
13089
13090 #include <stdlib.h>
13091@@ -24095,15 +24102,15 @@
13092
13093 _ACEOF
13094 rm -f conftest$ac_exeext
13095-if { (eval echo "$as_me:24098: \"$ac_link\"") >&5
13096+if { (eval echo "$as_me:24105: \"$ac_link\"") >&5
13097   (eval $ac_link) 2>&5
13098   ac_status=$?
13099-  echo "$as_me:24101: \$? = $ac_status" >&5
13100+  echo "$as_me:24108: \$? = $ac_status" >&5
13101   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
13102-  { (eval echo "$as_me:24103: \"$ac_try\"") >&5
13103+  { (eval echo "$as_me:24110: \"$ac_try\"") >&5
13104   (eval $ac_try) 2>&5
13105   ac_status=$?
13106-  echo "$as_me:24106: \$? = $ac_status" >&5
13107+  echo "$as_me:24113: \$? = $ac_status" >&5
13108   (exit $ac_status); }; }; then
13109   cf_cv_type_of_bool=`cat cf_test.out`
13110 		 if test -z "$cf_cv_type_of_bool"; then
13111@@ -24121,25 +24128,25 @@
13112 fi
13113
13114 	rm -f cf_test.out
13115-echo "$as_me:24124: result: $cf_cv_type_of_bool" >&5
13116+echo "$as_me:24131: result: $cf_cv_type_of_bool" >&5
13117 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
13118 if test "$cf_cv_type_of_bool" = unknown ; then
13119 	case .$NCURSES_BOOL in
13120 	(.auto|.) NCURSES_BOOL=unsigned;;
13121 	esac
13122-	{ echo "$as_me:24130: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
13123+	{ echo "$as_me:24137: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
13124 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
13125 	cf_cv_type_of_bool=$NCURSES_BOOL
13126 fi
13127
13128 		else
13129-			echo "$as_me:24136: checking for fallback type of bool" >&5
13130+			echo "$as_me:24143: checking for fallback type of bool" >&5
13131 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
13132 			case "$host_cpu" in
13133 			(i?86)	cf_cv_type_of_bool=char	;;
13134 			(*)	cf_cv_type_of_bool=int	;;
13135 			esac
13136-			echo "$as_me:24142: result: $cf_cv_type_of_bool" >&5
13137+			echo "$as_me:24149: result: $cf_cv_type_of_bool" >&5
13138 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
13139 		fi
13140 	fi
13141@@ -24168,7 +24175,7 @@
13142
13143 	if test "$cf_with_ada" != "no" ; then
13144 		if test "$with_libtool" != "no"; then
13145-			{ echo "$as_me:24171: WARNING: libtool does not support Ada - disabling feature" >&5
13146+			{ echo "$as_me:24178: WARNING: libtool does not support Ada - disabling feature" >&5
13147 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
13148 			cf_with_ada=no
13149 		fi
13150@@ -24185,7 +24192,7 @@
13151 	unset cf_TEMP_gnat
13152 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
13153 set dummy $cf_prog_gnat; ac_word=$2
13154-echo "$as_me:24188: checking for $ac_word" >&5
13155+echo "$as_me:24195: checking for $ac_word" >&5
13156 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
13157 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
13158   echo $ECHO_N "(cached) $ECHO_C" >&6
13159@@ -24202,7 +24209,7 @@
13160   test -z "$ac_dir" && ac_dir=.
13161   if $as_executable_p "$ac_dir/$ac_word"; then
13162    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
13163-   echo "$as_me:24205: found $ac_dir/$ac_word" >&5
13164+   echo "$as_me:24212: found $ac_dir/$ac_word" >&5
13165    break
13166 fi
13167 done
13168@@ -24214,40 +24221,40 @@
13169 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
13170
13171 if test -n "$cf_TEMP_gnat"; then
13172-  echo "$as_me:24217: result: $cf_TEMP_gnat" >&5
13173+  echo "$as_me:24224: result: $cf_TEMP_gnat" >&5
13174 echo "${ECHO_T}$cf_TEMP_gnat" >&6
13175 else
13176-  echo "$as_me:24220: result: no" >&5
13177+  echo "$as_me:24227: result: no" >&5
13178 echo "${ECHO_T}no" >&6
13179 fi
13180
13181 	eval cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat
13182
13183 	if test "x$cf_TEMP_gnat" != xno; then
13184-		unset cf_gnat_version
13185+		unset cf_cv_gnat_version
13186 		unset cf_TEMP_gnat
13187
13188-echo "$as_me:24230: checking for $cf_prog_gnat version" >&5
13189+echo "$as_me:24237: checking for $cf_prog_gnat version" >&5
13190 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
13191-if test "${cf_gnat_version+set}" = set; then
13192+if test "${cf_cv_gnat_version+set}" = set; then
13193   echo $ECHO_N "(cached) $ECHO_C" >&6
13194 else
13195
13196-cf_gnat_version=`$cf_prog_gnat --version 2>&1 | \
13197+cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \
13198 	grep '[0-9].[0-9][0-9]*' |\
13199 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
13200
13201 fi
13202-echo "$as_me:24241: result: $cf_gnat_version" >&5
13203-echo "${ECHO_T}$cf_gnat_version" >&6
13204-test -z "$cf_gnat_version" && cf_gnat_version=no
13205-eval cf_TEMP_gnat=$cf_gnat_version; unset cf_gnat_version
13206+echo "$as_me:24248: result: $cf_cv_gnat_version" >&5
13207+echo "${ECHO_T}$cf_cv_gnat_version" >&6
13208+test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
13209+eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
13210
13211 	fi
13212 	eval cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat
13213
13214 	unset cf_TEMP_gnat
13215-	unset cf_gnat_version
13216+	unset cf_cv_gnat_version
13217 	unset ac_cv_path_cf_TEMP_gnat
13218 done
13219
13220@@ -24267,7 +24274,7 @@
13221 			cd conftest.src
13222 			for cf_gprconfig in Ada C
13223 			do
13224-				echo "$as_me:24270: checking for gprconfig name for $cf_gprconfig" >&5
13225+				echo "$as_me:24277: checking for gprconfig name for $cf_gprconfig" >&5
13226 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
13227 				if test $cf_gprconfig = C
13228 				then
13229@@ -24286,10 +24293,10 @@
13230 				if test -n "$cf_gprconfig_value"
13231 				then
13232 					eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value
13233-					echo "$as_me:24289: result: $cf_gprconfig_value" >&5
13234+					echo "$as_me:24296: result: $cf_gprconfig_value" >&5
13235 echo "${ECHO_T}$cf_gprconfig_value" >&6
13236 				else
13237-					echo "$as_me:24292: result: missing" >&5
13238+					echo "$as_me:24299: result: missing" >&5
13239 echo "${ECHO_T}missing" >&6
13240 					cf_ada_config="#"
13241 					break
13242@@ -24302,35 +24309,35 @@
13243 	if test "x$cf_ada_config" != "x#"
13244 	then
13245
13246-echo "$as_me:24305: checking for gnat version" >&5
13247+echo "$as_me:24312: checking for gnat version" >&5
13248 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
13249-if test "${cf_gnat_version+set}" = set; then
13250+if test "${cf_cv_gnat_version+set}" = set; then
13251   echo $ECHO_N "(cached) $ECHO_C" >&6
13252 else
13253
13254-cf_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
13255+cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \
13256 	grep '[0-9].[0-9][0-9]*' |\
13257 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
13258
13259 fi
13260-echo "$as_me:24316: result: $cf_gnat_version" >&5
13261-echo "${ECHO_T}$cf_gnat_version" >&6
13262-test -z "$cf_gnat_version" && cf_gnat_version=no
13263+echo "$as_me:24323: result: $cf_cv_gnat_version" >&5
13264+echo "${ECHO_T}$cf_cv_gnat_version" >&6
13265+test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
13266
13267-case $cf_gnat_version in
13268+case $cf_cv_gnat_version in
13269 (3.1[1-9]*|3.[2-9]*|[4-9].*|20[0-9][0-9])
13270 	cf_cv_prog_gnat_correct=yes
13271 	;;
13272 (*)
13273-	{ echo "$as_me:24325: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
13274-echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
13275+	{ echo "$as_me:24332: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
13276+echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
13277 	cf_cv_prog_gnat_correct=no
13278 	;;
13279 esac
13280
13281 		# Extract the first word of "m4", so it can be a program name with args.
13282 set dummy m4; ac_word=$2
13283-echo "$as_me:24333: checking for $ac_word" >&5
13284+echo "$as_me:24340: checking for $ac_word" >&5
13285 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
13286 if test "${ac_cv_prog_M4_exists+set}" = set; then
13287   echo $ECHO_N "(cached) $ECHO_C" >&6
13288@@ -24345,7 +24352,7 @@
13289   test -z "$ac_dir" && ac_dir=.
13290   $as_executable_p "$ac_dir/$ac_word" || continue
13291 ac_cv_prog_M4_exists="yes"
13292-echo "$as_me:24348: found $ac_dir/$ac_word" >&5
13293+echo "$as_me:24355: found $ac_dir/$ac_word" >&5
13294 break
13295 done
13296
13297@@ -24354,20 +24361,20 @@
13298 fi
13299 M4_exists=$ac_cv_prog_M4_exists
13300 if test -n "$M4_exists"; then
13301-  echo "$as_me:24357: result: $M4_exists" >&5
13302+  echo "$as_me:24364: result: $M4_exists" >&5
13303 echo "${ECHO_T}$M4_exists" >&6
13304 else
13305-  echo "$as_me:24360: result: no" >&5
13306+  echo "$as_me:24367: result: no" >&5
13307 echo "${ECHO_T}no" >&6
13308 fi
13309
13310 		if test "$ac_cv_prog_M4_exists" = no; then
13311 			cf_cv_prog_gnat_correct=no
13312-			{ echo "$as_me:24366: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
13313+			{ echo "$as_me:24373: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
13314 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
13315 		fi
13316 		if test "$cf_cv_prog_gnat_correct" = yes; then
13317-			echo "$as_me:24370: checking if GNAT works" >&5
13318+			echo "$as_me:24377: checking if GNAT works" >&5
13319 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
13320
13321 rm -rf conftest* *~conftest*
13322@@ -24395,7 +24402,7 @@
13323 fi
13324 rm -rf conftest* *~conftest*
13325
13326-			echo "$as_me:24398: result: $cf_cv_prog_gnat_correct" >&5
13327+			echo "$as_me:24405: result: $cf_cv_prog_gnat_correct" >&5
13328 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
13329 		fi
13330 	else
13331@@ -24407,7 +24414,7 @@
13332
13333  	ADAFLAGS="$ADAFLAGS -gnatpn"
13334
13335-	echo "$as_me:24410: checking optimization options for ADAFLAGS" >&5
13336+	echo "$as_me:24417: checking optimization options for ADAFLAGS" >&5
13337 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
13338 	case "$CFLAGS" in
13339 	(*-g*)
13340@@ -24424,10 +24431,10 @@
13341
13342 		;;
13343 	esac
13344-	echo "$as_me:24427: result: $ADAFLAGS" >&5
13345+	echo "$as_me:24434: result: $ADAFLAGS" >&5
13346 echo "${ECHO_T}$ADAFLAGS" >&6
13347
13348-echo "$as_me:24430: checking if GNATPREP supports -T option" >&5
13349+echo "$as_me:24437: checking if GNATPREP supports -T option" >&5
13350 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
13351 if test "${cf_cv_gnatprep_opt_t+set}" = set; then
13352   echo $ECHO_N "(cached) $ECHO_C" >&6
13353@@ -24437,13 +24444,13 @@
13354 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
13355
13356 fi
13357-echo "$as_me:24440: result: $cf_cv_gnatprep_opt_t" >&5
13358+echo "$as_me:24447: result: $cf_cv_gnatprep_opt_t" >&5
13359 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
13360 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
13361
13362-echo "$as_me:24444: checking if GNAT supports generics" >&5
13363+echo "$as_me:24451: checking if GNAT supports generics" >&5
13364 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
13365-case $cf_gnat_version in
13366+case $cf_cv_gnat_version in
13367 (3.[1-9]*|[4-9].*)
13368 	cf_gnat_generics=yes
13369 	;;
13370@@ -24451,7 +24458,7 @@
13371 	cf_gnat_generics=no
13372 	;;
13373 esac
13374-echo "$as_me:24454: result: $cf_gnat_generics" >&5
13375+echo "$as_me:24461: result: $cf_gnat_generics" >&5
13376 echo "${ECHO_T}$cf_gnat_generics" >&6
13377
13378 if test "$cf_gnat_generics" = yes
13379@@ -24463,7 +24470,7 @@
13380 	cf_generic_objects=
13381 fi
13382
13383-echo "$as_me:24466: checking if GNAT supports SIGINT" >&5
13384+echo "$as_me:24473: checking if GNAT supports SIGINT" >&5
13385 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
13386 if test "${cf_cv_gnat_sigint+set}" = set; then
13387   echo $ECHO_N "(cached) $ECHO_C" >&6
13388@@ -24511,7 +24518,7 @@
13389 rm -rf conftest* *~conftest*
13390
13391 fi
13392-echo "$as_me:24514: result: $cf_cv_gnat_sigint" >&5
13393+echo "$as_me:24521: result: $cf_cv_gnat_sigint" >&5
13394 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
13395
13396 if test $cf_cv_gnat_sigint = yes ; then
13397@@ -24524,9 +24531,9 @@
13398 cf_gnat_projects=no
13399
13400 if test "$enable_gnat_projects" != no ; then
13401-echo "$as_me:24527: checking if GNAT supports project files" >&5
13402+echo "$as_me:24534: checking if GNAT supports project files" >&5
13403 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
13404-case $cf_gnat_version in
13405+case $cf_cv_gnat_version in
13406 (3.[0-9]*)
13407 	;;
13408 (*)
13409@@ -24587,15 +24594,15 @@
13410 	esac
13411 	;;
13412 esac
13413-echo "$as_me:24590: result: $cf_gnat_projects" >&5
13414+echo "$as_me:24597: result: $cf_gnat_projects" >&5
13415 echo "${ECHO_T}$cf_gnat_projects" >&6
13416 fi # enable_gnat_projects
13417
13418 if test $cf_gnat_projects = yes
13419 then
13420-	echo "$as_me:24596: checking if GNAT supports libraries" >&5
13421+	echo "$as_me:24603: checking if GNAT supports libraries" >&5
13422 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
13423-	echo "$as_me:24598: result: $cf_gnat_libraries" >&5
13424+	echo "$as_me:24605: result: $cf_gnat_libraries" >&5
13425 echo "${ECHO_T}$cf_gnat_libraries" >&6
13426 fi
13427
13428@@ -24615,7 +24622,7 @@
13429 	USE_GNAT_LIBRARIES="#"
13430 fi
13431
13432-echo "$as_me:24618: checking for ada-compiler" >&5
13433+echo "$as_me:24625: checking for ada-compiler" >&5
13434 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
13435
13436 # Check whether --with-ada-compiler or --without-ada-compiler was given.
13437@@ -24626,12 +24633,12 @@
13438   cf_ada_compiler=gnatmake
13439 fi;
13440
13441-echo "$as_me:24629: result: $cf_ada_compiler" >&5
13442+echo "$as_me:24636: result: $cf_ada_compiler" >&5
13443 echo "${ECHO_T}$cf_ada_compiler" >&6
13444
13445 			cf_ada_package=terminal_interface
13446
13447-echo "$as_me:24634: checking for ada-include" >&5
13448+echo "$as_me:24641: checking for ada-include" >&5
13449 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
13450
13451 # Check whether --with-ada-include or --without-ada-include was given.
13452@@ -24667,7 +24674,7 @@
13453 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
13454 	;;
13455 (*)
13456-	{ { echo "$as_me:24670: error: expected a pathname, not \"$withval\"" >&5
13457+	{ { echo "$as_me:24677: error: expected a pathname, not \"$withval\"" >&5
13458 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
13459    { (exit 1); exit 1; }; }
13460 	;;
13461@@ -24676,10 +24683,10 @@
13462 fi
13463 eval ADA_INCLUDE="$withval"
13464
13465-echo "$as_me:24679: result: $ADA_INCLUDE" >&5
13466+echo "$as_me:24686: result: $ADA_INCLUDE" >&5
13467 echo "${ECHO_T}$ADA_INCLUDE" >&6
13468
13469-echo "$as_me:24682: checking for ada-objects" >&5
13470+echo "$as_me:24689: checking for ada-objects" >&5
13471 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
13472
13473 # Check whether --with-ada-objects or --without-ada-objects was given.
13474@@ -24715,7 +24722,7 @@
13475 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
13476 	;;
13477 (*)
13478-	{ { echo "$as_me:24718: error: expected a pathname, not \"$withval\"" >&5
13479+	{ { echo "$as_me:24725: error: expected a pathname, not \"$withval\"" >&5
13480 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
13481    { (exit 1); exit 1; }; }
13482 	;;
13483@@ -24724,10 +24731,10 @@
13484 fi
13485 eval ADA_OBJECTS="$withval"
13486
13487-echo "$as_me:24727: result: $ADA_OBJECTS" >&5
13488+echo "$as_me:24734: result: $ADA_OBJECTS" >&5
13489 echo "${ECHO_T}$ADA_OBJECTS" >&6
13490
13491-echo "$as_me:24730: checking if an Ada95 shared-library should be built" >&5
13492+echo "$as_me:24737: checking if an Ada95 shared-library should be built" >&5
13493 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
13494
13495 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
13496@@ -24737,14 +24744,14 @@
13497 else
13498   with_ada_sharedlib=no
13499 fi;
13500-echo "$as_me:24740: result: $with_ada_sharedlib" >&5
13501+echo "$as_me:24747: result: $with_ada_sharedlib" >&5
13502 echo "${ECHO_T}$with_ada_sharedlib" >&6
13503
13504 if test "x$with_ada_sharedlib" != xno
13505 then
13506 	if test "x$cf_gnat_projects" != xyes
13507 	then
13508-		{ echo "$as_me:24747: WARNING: disabling shared-library since GNAT projects are not supported" >&5
13509+		{ echo "$as_me:24754: WARNING: disabling shared-library since GNAT projects are not supported" >&5
13510 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
13511 		with_ada_sharedlib=no
13512 	fi
13513@@ -24764,7 +24771,7 @@
13514
13515 			# allow the Ada binding to be renamed
13516
13517-echo "$as_me:24767: checking for ada-libname" >&5
13518+echo "$as_me:24774: checking for ada-libname" >&5
13519 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
13520
13521 # Check whether --with-ada-libname or --without-ada-libname was given.
13522@@ -24780,7 +24787,7 @@
13523 	;;
13524 esac
13525
13526-echo "$as_me:24783: result: $ADA_LIBNAME" >&5
13527+echo "$as_me:24790: result: $ADA_LIBNAME" >&5
13528 echo "${ECHO_T}$ADA_LIBNAME" >&6
13529
13530 		fi
13531@@ -24791,13 +24798,13 @@
13532
13533 # do this "late" to avoid conflict with header-checks
13534 if test "x$with_widec" = xyes ; then
13535-	echo "$as_me:24794: checking for wchar_t" >&5
13536+	echo "$as_me:24801: checking for wchar_t" >&5
13537 echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
13538 if test "${ac_cv_type_wchar_t+set}" = set; then
13539   echo $ECHO_N "(cached) $ECHO_C" >&6
13540 else
13541   cat >conftest.$ac_ext <<_ACEOF
13542-#line 24800 "configure"
13543+#line 24807 "configure"
13544 #include "confdefs.h"
13545 $ac_includes_default
13546 int
13547@@ -24812,16 +24819,16 @@
13548 }
13549 _ACEOF
13550 rm -f conftest.$ac_objext
13551-if { (eval echo "$as_me:24815: \"$ac_compile\"") >&5
13552+if { (eval echo "$as_me:24822: \"$ac_compile\"") >&5
13553   (eval $ac_compile) 2>&5
13554   ac_status=$?
13555-  echo "$as_me:24818: \$? = $ac_status" >&5
13556+  echo "$as_me:24825: \$? = $ac_status" >&5
13557   (exit $ac_status); } &&
13558          { ac_try='test -s conftest.$ac_objext'
13559-  { (eval echo "$as_me:24821: \"$ac_try\"") >&5
13560+  { (eval echo "$as_me:24828: \"$ac_try\"") >&5
13561   (eval $ac_try) 2>&5
13562   ac_status=$?
13563-  echo "$as_me:24824: \$? = $ac_status" >&5
13564+  echo "$as_me:24831: \$? = $ac_status" >&5
13565   (exit $ac_status); }; }; then
13566   ac_cv_type_wchar_t=yes
13567 else
13568@@ -24831,10 +24838,10 @@
13569 fi
13570 rm -f conftest.$ac_objext conftest.$ac_ext
13571 fi
13572-echo "$as_me:24834: result: $ac_cv_type_wchar_t" >&5
13573+echo "$as_me:24841: result: $ac_cv_type_wchar_t" >&5
13574 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
13575
13576-echo "$as_me:24837: checking size of wchar_t" >&5
13577+echo "$as_me:24844: checking size of wchar_t" >&5
13578 echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
13579 if test "${ac_cv_sizeof_wchar_t+set}" = set; then
13580   echo $ECHO_N "(cached) $ECHO_C" >&6
13581@@ -24843,7 +24850,7 @@
13582   if test "$cross_compiling" = yes; then
13583   # Depending upon the size, compute the lo and hi bounds.
13584 cat >conftest.$ac_ext <<_ACEOF
13585-#line 24846 "configure"
13586+#line 24853 "configure"
13587 #include "confdefs.h"
13588 $ac_includes_default
13589 int
13590@@ -24855,21 +24862,21 @@
13591 }
13592 _ACEOF
13593 rm -f conftest.$ac_objext
13594-if { (eval echo "$as_me:24858: \"$ac_compile\"") >&5
13595+if { (eval echo "$as_me:24865: \"$ac_compile\"") >&5
13596   (eval $ac_compile) 2>&5
13597   ac_status=$?
13598-  echo "$as_me:24861: \$? = $ac_status" >&5
13599+  echo "$as_me:24868: \$? = $ac_status" >&5
13600   (exit $ac_status); } &&
13601          { ac_try='test -s conftest.$ac_objext'
13602-  { (eval echo "$as_me:24864: \"$ac_try\"") >&5
13603+  { (eval echo "$as_me:24871: \"$ac_try\"") >&5
13604   (eval $ac_try) 2>&5
13605   ac_status=$?
13606-  echo "$as_me:24867: \$? = $ac_status" >&5
13607+  echo "$as_me:24874: \$? = $ac_status" >&5
13608   (exit $ac_status); }; }; then
13609   ac_lo=0 ac_mid=0
13610   while :; do
13611     cat >conftest.$ac_ext <<_ACEOF
13612-#line 24872 "configure"
13613+#line 24879 "configure"
13614 #include "confdefs.h"
13615 $ac_includes_default
13616 int
13617@@ -24881,16 +24888,16 @@
13618 }
13619 _ACEOF
13620 rm -f conftest.$ac_objext
13621-if { (eval echo "$as_me:24884: \"$ac_compile\"") >&5
13622+if { (eval echo "$as_me:24891: \"$ac_compile\"") >&5
13623   (eval $ac_compile) 2>&5
13624   ac_status=$?
13625-  echo "$as_me:24887: \$? = $ac_status" >&5
13626+  echo "$as_me:24894: \$? = $ac_status" >&5
13627   (exit $ac_status); } &&
13628          { ac_try='test -s conftest.$ac_objext'
13629-  { (eval echo "$as_me:24890: \"$ac_try\"") >&5
13630+  { (eval echo "$as_me:24897: \"$ac_try\"") >&5
13631   (eval $ac_try) 2>&5
13632   ac_status=$?
13633-  echo "$as_me:24893: \$? = $ac_status" >&5
13634+  echo "$as_me:24900: \$? = $ac_status" >&5
13635   (exit $ac_status); }; }; then
13636   ac_hi=$ac_mid; break
13637 else
13638@@ -24906,7 +24913,7 @@
13639 ac_hi=-1 ac_mid=-1
13640   while :; do
13641     cat >conftest.$ac_ext <<_ACEOF
13642-#line 24909 "configure"
13643+#line 24916 "configure"
13644 #include "confdefs.h"
13645 $ac_includes_default
13646 int
13647@@ -24918,16 +24925,16 @@
13648 }
13649 _ACEOF
13650 rm -f conftest.$ac_objext
13651-if { (eval echo "$as_me:24921: \"$ac_compile\"") >&5
13652+if { (eval echo "$as_me:24928: \"$ac_compile\"") >&5
13653   (eval $ac_compile) 2>&5
13654   ac_status=$?
13655-  echo "$as_me:24924: \$? = $ac_status" >&5
13656+  echo "$as_me:24931: \$? = $ac_status" >&5
13657   (exit $ac_status); } &&
13658          { ac_try='test -s conftest.$ac_objext'
13659-  { (eval echo "$as_me:24927: \"$ac_try\"") >&5
13660+  { (eval echo "$as_me:24934: \"$ac_try\"") >&5
13661   (eval $ac_try) 2>&5
13662   ac_status=$?
13663-  echo "$as_me:24930: \$? = $ac_status" >&5
13664+  echo "$as_me:24937: \$? = $ac_status" >&5
13665   (exit $ac_status); }; }; then
13666   ac_lo=$ac_mid; break
13667 else
13668@@ -24943,7 +24950,7 @@
13669 while test "x$ac_lo" != "x$ac_hi"; do
13670   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
13671   cat >conftest.$ac_ext <<_ACEOF
13672-#line 24946 "configure"
13673+#line 24953 "configure"
13674 #include "confdefs.h"
13675 $ac_includes_default
13676 int
13677@@ -24955,16 +24962,16 @@
13678 }
13679 _ACEOF
13680 rm -f conftest.$ac_objext
13681-if { (eval echo "$as_me:24958: \"$ac_compile\"") >&5
13682+if { (eval echo "$as_me:24965: \"$ac_compile\"") >&5
13683   (eval $ac_compile) 2>&5
13684   ac_status=$?
13685-  echo "$as_me:24961: \$? = $ac_status" >&5
13686+  echo "$as_me:24968: \$? = $ac_status" >&5
13687   (exit $ac_status); } &&
13688          { ac_try='test -s conftest.$ac_objext'
13689-  { (eval echo "$as_me:24964: \"$ac_try\"") >&5
13690+  { (eval echo "$as_me:24971: \"$ac_try\"") >&5
13691   (eval $ac_try) 2>&5
13692   ac_status=$?
13693-  echo "$as_me:24967: \$? = $ac_status" >&5
13694+  echo "$as_me:24974: \$? = $ac_status" >&5
13695   (exit $ac_status); }; }; then
13696   ac_hi=$ac_mid
13697 else
13698@@ -24977,12 +24984,12 @@
13699 ac_cv_sizeof_wchar_t=$ac_lo
13700 else
13701   if test "$cross_compiling" = yes; then
13702-  { { echo "$as_me:24980: error: cannot run test program while cross compiling" >&5
13703+  { { echo "$as_me:24987: error: cannot run test program while cross compiling" >&5
13704 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
13705    { (exit 1); exit 1; }; }
13706 else
13707   cat >conftest.$ac_ext <<_ACEOF
13708-#line 24985 "configure"
13709+#line 24992 "configure"
13710 #include "confdefs.h"
13711 $ac_includes_default
13712 int
13713@@ -24998,15 +25005,15 @@
13714 }
13715 _ACEOF
13716 rm -f conftest$ac_exeext
13717-if { (eval echo "$as_me:25001: \"$ac_link\"") >&5
13718+if { (eval echo "$as_me:25008: \"$ac_link\"") >&5
13719   (eval $ac_link) 2>&5
13720   ac_status=$?
13721-  echo "$as_me:25004: \$? = $ac_status" >&5
13722+  echo "$as_me:25011: \$? = $ac_status" >&5
13723   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
13724-  { (eval echo "$as_me:25006: \"$ac_try\"") >&5
13725+  { (eval echo "$as_me:25013: \"$ac_try\"") >&5
13726   (eval $ac_try) 2>&5
13727   ac_status=$?
13728-  echo "$as_me:25009: \$? = $ac_status" >&5
13729+  echo "$as_me:25016: \$? = $ac_status" >&5
13730   (exit $ac_status); }; }; then
13731   ac_cv_sizeof_wchar_t=`cat conftest.val`
13732 else
13733@@ -25022,7 +25029,7 @@
13734   ac_cv_sizeof_wchar_t=0
13735 fi
13736 fi
13737-echo "$as_me:25025: result: $ac_cv_sizeof_wchar_t" >&5
13738+echo "$as_me:25032: result: $ac_cv_sizeof_wchar_t" >&5
13739 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
13740 cat >>confdefs.h <<EOF
13741 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
13742@@ -25040,7 +25047,7 @@
13743 ### chooses to split module lists into libraries.
13744 ###
13745 ### (see CF_LIB_RULES).
13746-echo "$as_me:25043: checking for library subsets" >&5
13747+echo "$as_me:25050: checking for library subsets" >&5
13748 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
13749 LIB_SUBSETS=
13750
13751@@ -25082,7 +25089,7 @@
13752 test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
13753 test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
13754
13755-echo "$as_me:25085: result: $LIB_SUBSETS" >&5
13756+echo "$as_me:25092: result: $LIB_SUBSETS" >&5
13757 echo "${ECHO_T}$LIB_SUBSETS" >&6
13758
13759 ### Construct the list of include-directories to be generated
13760@@ -25113,7 +25120,7 @@
13761 fi
13762
13763 ### Build up pieces for makefile rules
13764-echo "$as_me:25116: checking default library suffix" >&5
13765+echo "$as_me:25123: checking default library suffix" >&5
13766 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
13767
13768 	case $DFT_LWR_MODEL in
13769@@ -25124,10 +25131,10 @@
13770 	(shared)  DFT_ARG_SUFFIX=''   ;;
13771 	esac
13772 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
13773-echo "$as_me:25127: result: $DFT_ARG_SUFFIX" >&5
13774+echo "$as_me:25134: result: $DFT_ARG_SUFFIX" >&5
13775 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
13776
13777-echo "$as_me:25130: checking default library-dependency suffix" >&5
13778+echo "$as_me:25137: checking default library-dependency suffix" >&5
13779 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
13780
13781 	case X$DFT_LWR_MODEL in
13782@@ -25185,10 +25192,10 @@
13783 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
13784 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
13785 	fi
13786-echo "$as_me:25188: result: $DFT_DEP_SUFFIX" >&5
13787+echo "$as_me:25195: result: $DFT_DEP_SUFFIX" >&5
13788 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
13789
13790-echo "$as_me:25191: checking default object directory" >&5
13791+echo "$as_me:25198: checking default object directory" >&5
13792 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
13793
13794 	case $DFT_LWR_MODEL in
13795@@ -25204,11 +25211,11 @@
13796 			DFT_OBJ_SUBDIR='obj_s' ;;
13797 		esac
13798 	esac
13799-echo "$as_me:25207: result: $DFT_OBJ_SUBDIR" >&5
13800+echo "$as_me:25214: result: $DFT_OBJ_SUBDIR" >&5
13801 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
13802
13803 if test "x$cf_with_cxx" = xyes ; then
13804-echo "$as_me:25211: checking c++ library-dependency suffix" >&5
13805+echo "$as_me:25218: checking c++ library-dependency suffix" >&5
13806 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
13807 if test "$with_libtool" != "no"; then
13808 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
13809@@ -25276,7 +25283,7 @@
13810 	fi
13811
13812 fi
13813-echo "$as_me:25279: result: $CXX_LIB_SUFFIX" >&5
13814+echo "$as_me:25286: result: $CXX_LIB_SUFFIX" >&5
13815 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
13816
13817 fi
13818@@ -25452,19 +25459,19 @@
13819
13820 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
13821 then
13822-	echo "$as_me:25455: checking if linker supports switching between static/dynamic" >&5
13823+	echo "$as_me:25462: checking if linker supports switching between static/dynamic" >&5
13824 echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
13825
13826 	rm -f libconftest.a
13827 	cat >conftest.$ac_ext <<EOF
13828-#line 25460 "configure"
13829+#line 25467 "configure"
13830 #include <stdio.h>
13831 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
13832 EOF
13833-	if { (eval echo "$as_me:25464: \"$ac_compile\"") >&5
13834+	if { (eval echo "$as_me:25471: \"$ac_compile\"") >&5
13835   (eval $ac_compile) 2>&5
13836   ac_status=$?
13837-  echo "$as_me:25467: \$? = $ac_status" >&5
13838+  echo "$as_me:25474: \$? = $ac_status" >&5
13839   (exit $ac_status); } ; then
13840 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
13841 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
13842@@ -25475,10 +25482,10 @@
13843
13844 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
13845 	cat >conftest.$ac_ext <<_ACEOF
13846-#line 25478 "configure"
13847+#line 25485 "configure"
13848 #include "confdefs.h"
13849
13850-#line 25481 "configure"
13851+#line 25488 "configure"
13852 #include <stdio.h>
13853 int cf_ldflags_static(FILE *fp);
13854
13855@@ -25493,16 +25500,16 @@
13856 }
13857 _ACEOF
13858 rm -f conftest.$ac_objext conftest$ac_exeext
13859-if { (eval echo "$as_me:25496: \"$ac_link\"") >&5
13860+if { (eval echo "$as_me:25503: \"$ac_link\"") >&5
13861   (eval $ac_link) 2>&5
13862   ac_status=$?
13863-  echo "$as_me:25499: \$? = $ac_status" >&5
13864+  echo "$as_me:25506: \$? = $ac_status" >&5
13865   (exit $ac_status); } &&
13866          { ac_try='test -s conftest$ac_exeext'
13867-  { (eval echo "$as_me:25502: \"$ac_try\"") >&5
13868+  { (eval echo "$as_me:25509: \"$ac_try\"") >&5
13869   (eval $ac_try) 2>&5
13870   ac_status=$?
13871-  echo "$as_me:25505: \$? = $ac_status" >&5
13872+  echo "$as_me:25512: \$? = $ac_status" >&5
13873   (exit $ac_status); }; }; then
13874
13875 	# some linkers simply ignore the -dynamic
13876@@ -25525,7 +25532,7 @@
13877 	rm -f libconftest.*
13878 	LIBS="$cf_save_LIBS"
13879
13880-	echo "$as_me:25528: result: $cf_ldflags_static" >&5
13881+	echo "$as_me:25535: result: $cf_ldflags_static" >&5
13882 echo "${ECHO_T}$cf_ldflags_static" >&6
13883
13884 	if test $cf_ldflags_static != yes
13885@@ -25541,7 +25548,7 @@
13886 	;;
13887 esac
13888
13889-echo "$as_me:25544: checking where we will install curses.h" >&5
13890+echo "$as_me:25551: checking where we will install curses.h" >&5
13891 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
13892
13893 includesubdir=
13894@@ -25551,7 +25558,7 @@
13895 then
13896 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
13897 fi
13898-echo "$as_me:25554: result: ${includedir}${includesubdir}" >&5
13899+echo "$as_me:25561: result: ${includedir}${includesubdir}" >&5
13900 echo "${ECHO_T}${includedir}${includesubdir}" >&6
13901
13902 ### Resolve a conflict between normal and wide-curses by forcing applications
13903@@ -25559,7 +25566,7 @@
13904 if test "$with_overwrite" != no ; then
13905 if test "$NCURSES_LIBUTF8" = 1 ; then
13906 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
13907-	{ echo "$as_me:25562: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
13908+	{ echo "$as_me:25569: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
13909 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
13910 fi
13911 fi
13912@@ -25577,7 +25584,7 @@
13913 ### Construct the list of subdirectories for which we'll customize makefiles
13914 ### with the appropriate compile-rules.
13915
13916-echo "$as_me:25580: checking for src modules" >&5
13917+echo "$as_me:25587: checking for src modules" >&5
13918 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
13919
13920 # dependencies and linker-arguments for test-programs
13921@@ -25642,7 +25649,7 @@
13922 		fi
13923 	fi
13924 done
13925-echo "$as_me:25645: result: $cf_cv_src_modules" >&5
13926+echo "$as_me:25652: result: $cf_cv_src_modules" >&5
13927 echo "${ECHO_T}$cf_cv_src_modules" >&6
13928
13929 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
13930@@ -25909,7 +25916,7 @@
13931 	(*-D_XOPEN_SOURCE_EXTENDED*)
13932 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
13933
13934-echo "${as_me:-configure}:25912: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
13935+echo "${as_me:-configure}:25919: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
13936
13937 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
13938 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
13939@@ -25920,7 +25927,7 @@
13940
13941 # Help to automatically enable the extended curses features when using either
13942 # the *-config or the ".pc" files by adding defines.
13943-echo "$as_me:25923: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
13944+echo "$as_me:25930: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
13945 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
13946 PKG_CFLAGS=
13947 for cf_loop1 in $CPPFLAGS_after_XOPEN
13948@@ -25936,7 +25943,7 @@
13949 	done
13950 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
13951 done
13952-echo "$as_me:25939: result: $PKG_CFLAGS" >&5
13953+echo "$as_me:25946: result: $PKG_CFLAGS" >&5
13954 echo "${ECHO_T}$PKG_CFLAGS" >&6
13955
13956 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
13957@@ -25997,7 +26004,7 @@
13958 	cf_filter_syms=$cf_dft_filter_syms
13959 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
13960
13961-echo "${as_me:-configure}:26000: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
13962+echo "${as_me:-configure}:26007: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
13963
13964 fi
13965
13966@@ -26024,7 +26031,7 @@
13967
13968 # This is used for the *-config script and *.pc data files.
13969
13970-echo "$as_me:26027: checking for linker search path" >&5
13971+echo "$as_me:26034: checking for linker search path" >&5
13972 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
13973 if test "${cf_cv_ld_searchpath+set}" = set; then
13974   echo $ECHO_N "(cached) $ECHO_C" >&6
13975@@ -26088,7 +26095,7 @@
13976 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
13977
13978 fi
13979-echo "$as_me:26091: result: $cf_cv_ld_searchpath" >&5
13980+echo "$as_me:26098: result: $cf_cv_ld_searchpath" >&5
13981 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
13982
13983 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
13984@@ -26178,7 +26185,7 @@
13985 : ${CONFIG_STATUS=./config.status}
13986 ac_clean_files_save=$ac_clean_files
13987 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
13988-{ echo "$as_me:26181: creating $CONFIG_STATUS" >&5
13989+{ echo "$as_me:26188: creating $CONFIG_STATUS" >&5
13990 echo "$as_me: creating $CONFIG_STATUS" >&6;}
13991 cat >$CONFIG_STATUS <<_ACEOF
13992 #! $SHELL
13993@@ -26354,7 +26361,7 @@
13994     echo "$ac_cs_version"; exit 0 ;;
13995   --he | --h)
13996     # Conflict between --help and --header
13997-    { { echo "$as_me:26357: error: ambiguous option: $1
13998+    { { echo "$as_me:26364: error: ambiguous option: $1
13999 Try \`$0 --help' for more information." >&5
14000 echo "$as_me: error: ambiguous option: $1
14001 Try \`$0 --help' for more information." >&2;}
14002@@ -26373,7 +26380,7 @@
14003     ac_need_defaults=false;;
14004
14005   # This is an error.
14006-  -*) { { echo "$as_me:26376: error: unrecognized option: $1
14007+  -*) { { echo "$as_me:26383: error: unrecognized option: $1
14008 Try \`$0 --help' for more information." >&5
14009 echo "$as_me: error: unrecognized option: $1
14010 Try \`$0 --help' for more information." >&2;}
14011@@ -26492,7 +26499,7 @@
14012   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
14013   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
14014   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
14015-  *) { { echo "$as_me:26495: error: invalid argument: $ac_config_target" >&5
14016+  *) { { echo "$as_me:26502: error: invalid argument: $ac_config_target" >&5
14017 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
14018    { (exit 1); exit 1; }; };;
14019   esac
14020@@ -26988,7 +26995,7 @@
14021   esac
14022
14023   if test x"$ac_file" != x-; then
14024-    { echo "$as_me:26991: creating $ac_file" >&5
14025+    { echo "$as_me:26998: creating $ac_file" >&5
14026 echo "$as_me: creating $ac_file" >&6;}
14027     rm -f "$ac_file"
14028   fi
14029@@ -27006,7 +27013,7 @@
14030       -) echo $tmp/stdin ;;
14031       [\\/$]*)
14032          # Absolute (can't be DOS-style, as IFS=:)
14033-         test -f "$f" || { { echo "$as_me:27009: error: cannot find input file: $f" >&5
14034+         test -f "$f" || { { echo "$as_me:27016: error: cannot find input file: $f" >&5
14035 echo "$as_me: error: cannot find input file: $f" >&2;}
14036    { (exit 1); exit 1; }; }
14037          echo $f;;
14038@@ -27019,7 +27026,7 @@
14039            echo $srcdir/$f
14040          else
14041            # /dev/null tree
14042-           { { echo "$as_me:27022: error: cannot find input file: $f" >&5
14043+           { { echo "$as_me:27029: error: cannot find input file: $f" >&5
14044 echo "$as_me: error: cannot find input file: $f" >&2;}
14045    { (exit 1); exit 1; }; }
14046          fi;;
14047@@ -27035,7 +27042,7 @@
14048       if test -n "$ac_seen"; then
14049         ac_used=`grep '@datarootdir@' $ac_item`
14050         if test -z "$ac_used"; then
14051-          { echo "$as_me:27038: WARNING: datarootdir was used implicitly but not set:
14052+          { echo "$as_me:27045: WARNING: datarootdir was used implicitly but not set:
14053 $ac_seen" >&5
14054 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
14055 $ac_seen" >&2;}
14056@@ -27044,7 +27051,7 @@
14057       fi
14058       ac_seen=`grep '${datarootdir}' $ac_item`
14059       if test -n "$ac_seen"; then
14060-        { echo "$as_me:27047: WARNING: datarootdir was used explicitly but not set:
14061+        { echo "$as_me:27054: WARNING: datarootdir was used explicitly but not set:
14062 $ac_seen" >&5
14063 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
14064 $ac_seen" >&2;}
14065@@ -27081,7 +27088,7 @@
14066             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
14067             if test -z "$ac_init"; then
14068               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
14069-              { echo "$as_me:27084: WARNING: Variable $ac_name is used but was not set:
14070+              { echo "$as_me:27091: WARNING: Variable $ac_name is used but was not set:
14071 $ac_seen" >&5
14072 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
14073 $ac_seen" >&2;}
14074@@ -27092,7 +27099,7 @@
14075     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
14076     if test -s $tmp/out; then
14077       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
14078-      { echo "$as_me:27095: WARNING: Some variables may not be substituted:
14079+      { echo "$as_me:27102: WARNING: Some variables may not be substituted:
14080 $ac_seen" >&5
14081 echo "$as_me: WARNING: Some variables may not be substituted:
14082 $ac_seen" >&2;}
14083@@ -27141,7 +27148,7 @@
14084   * )   ac_file_in=$ac_file.in ;;
14085   esac
14086
14087-  test x"$ac_file" != x- && { echo "$as_me:27144: creating $ac_file" >&5
14088+  test x"$ac_file" != x- && { echo "$as_me:27151: creating $ac_file" >&5
14089 echo "$as_me: creating $ac_file" >&6;}
14090
14091   # First look for the input files in the build tree, otherwise in the
14092@@ -27152,7 +27159,7 @@
14093       -) echo $tmp/stdin ;;
14094       [\\/$]*)
14095          # Absolute (can't be DOS-style, as IFS=:)
14096-         test -f "$f" || { { echo "$as_me:27155: error: cannot find input file: $f" >&5
14097+         test -f "$f" || { { echo "$as_me:27162: error: cannot find input file: $f" >&5
14098 echo "$as_me: error: cannot find input file: $f" >&2;}
14099    { (exit 1); exit 1; }; }
14100          echo $f;;
14101@@ -27165,7 +27172,7 @@
14102            echo $srcdir/$f
14103          else
14104            # /dev/null tree
14105-           { { echo "$as_me:27168: error: cannot find input file: $f" >&5
14106+           { { echo "$as_me:27175: error: cannot find input file: $f" >&5
14107 echo "$as_me: error: cannot find input file: $f" >&2;}
14108    { (exit 1); exit 1; }; }
14109          fi;;
14110@@ -27223,7 +27230,7 @@
14111   rm -f $tmp/in
14112   if test x"$ac_file" != x-; then
14113     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
14114-      { echo "$as_me:27226: $ac_file is unchanged" >&5
14115+      { echo "$as_me:27233: $ac_file is unchanged" >&5
14116 echo "$as_me: $ac_file is unchanged" >&6;}
14117     else
14118       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
14119@@ -27568,7 +27575,7 @@
14120 				(cygdll|msysdll|mingw)
14121 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
14122
14123-echo "${as_me:-configure}:27571: testing overriding CXX_MODEL to SHARED ..." 1>&5
14124+echo "${as_me:-configure}:27578: testing overriding CXX_MODEL to SHARED ..." 1>&5
14125
14126 					with_shared_cxx=yes
14127 					;;
14128Index: dist.mk
14129Prereq:  1.1321
14130--- ncurses-6.1-20191228+/dist.mk	2019-12-28 15:45:41.000000000 +0000
14131+++ ncurses-6.1-20200104/dist.mk	2020-01-05 01:33:20.000000000 +0000
14132@@ -1,5 +1,5 @@
14133 ##############################################################################
14134-# Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.                #
14135+# Copyright (c) 1998-2019,2020 Free Software Foundation, Inc.                #
14136 #                                                                            #
14137 # Permission is hereby granted, free of charge, to any person obtaining a    #
14138 # copy of this software and associated documentation files (the "Software"), #
14139@@ -25,7 +25,7 @@
14140 # use or other dealings in this Software without prior written               #
14141 # authorization.                                                             #
14142 ##############################################################################
14143-# $Id: dist.mk,v 1.1321 2019/12/28 15:45:41 tom Exp $
14144+# $Id: dist.mk,v 1.1323 2020/01/05 01:33:20 tom Exp $
14145 # Makefile for creating ncurses distributions.
14146 #
14147 # This only needs to be used directly as a makefile by developers, but
14148@@ -37,7 +37,7 @@
14149 # These define the major/minor/patch versions of ncurses.
14150 NCURSES_MAJOR = 6
14151 NCURSES_MINOR = 1
14152-NCURSES_PATCH = 20191228
14153+NCURSES_PATCH = 20200104
14154
14155 # We don't append the patch to the version, since this only applies to releases
14156 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
14157Index: package/debian-mingw/changelog
14158--- ncurses-6.1-20191228+/package/debian-mingw/changelog	2019-12-28 15:45:41.000000000 +0000
14159+++ ncurses-6.1-20200104/package/debian-mingw/changelog	2020-01-04 14:49:29.000000000 +0000
14160@@ -1,8 +1,8 @@
14161-ncurses6 (6.1+20191228) unstable; urgency=low
14162+ncurses6 (6.1+20200104) unstable; urgency=low
14163
14164   * latest weekly patch
14165
14166- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 24 Dec 2019 06:02:28 -0500
14167+ -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 31 Dec 2019 04:35:37 -0500
14168
14169 ncurses6 (5.9-20131005) unstable; urgency=low
14170
14171Index: package/debian-mingw/copyright
14172--- ncurses-6.1-20191228+/package/debian-mingw/copyright	2019-01-05 23:51:47.000000000 +0000
14173+++ ncurses-6.1-20200104/package/debian-mingw/copyright	2020-01-04 14:49:29.000000000 +0000
14174@@ -5,11 +5,11 @@
14175
14176 -------------------------------------------------------------------------------
14177 Files: *
14178-Copyright: 1998-2018,2019 Free Software Foundation, Inc.
14179+Copyright: 1998-2019,2020 Free Software Foundation, Inc.
14180 Licence: X11
14181
14182 Files: aclocal.m4 package
14183-Copyright: 1996-2018,2019 by Thomas E. Dickey
14184+Copyright: 1996-2019,2020 by Thomas E. Dickey
14185 Licence: X11
14186
14187 Files: doc/html/NCURSES-Programming-HOWTO.html
14188Index: package/debian-mingw64/changelog
14189--- ncurses-6.1-20191228+/package/debian-mingw64/changelog	2019-12-28 15:45:41.000000000 +0000
14190+++ ncurses-6.1-20200104/package/debian-mingw64/changelog	2020-01-04 14:49:29.000000000 +0000
14191@@ -1,8 +1,8 @@
14192-ncurses6 (6.1+20191228) unstable; urgency=low
14193+ncurses6 (6.1+20200104) unstable; urgency=low
14194
14195   * latest weekly patch
14196
14197- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 24 Dec 2019 06:02:28 -0500
14198+ -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 31 Dec 2019 04:35:37 -0500
14199
14200 ncurses6 (5.9-20131005) unstable; urgency=low
14201
14202Index: package/debian-mingw64/copyright
14203--- ncurses-6.1-20191228+/package/debian-mingw64/copyright	2019-01-05 23:51:47.000000000 +0000
14204+++ ncurses-6.1-20200104/package/debian-mingw64/copyright	2020-01-04 14:49:29.000000000 +0000
14205@@ -5,11 +5,11 @@
14206
14207 -------------------------------------------------------------------------------
14208 Files: *
14209-Copyright: 1998-2018,2019 Free Software Foundation, Inc.
14210+Copyright: 1998-2019,2020 Free Software Foundation, Inc.
14211 Licence: X11
14212
14213 Files: aclocal.m4 package
14214-Copyright: 1996-2018,2019 by Thomas E. Dickey
14215+Copyright: 1996-2019,2020 by Thomas E. Dickey
14216 Licence: X11
14217
14218 Files: doc/html/NCURSES-Programming-HOWTO.html
14219Index: package/debian/changelog
14220--- ncurses-6.1-20191228+/package/debian/changelog	2019-12-28 15:45:41.000000000 +0000
14221+++ ncurses-6.1-20200104/package/debian/changelog	2020-01-04 14:49:29.000000000 +0000
14222@@ -1,8 +1,8 @@
14223-ncurses6 (6.1+20191228) unstable; urgency=low
14224+ncurses6 (6.1+20200104) unstable; urgency=low
14225
14226   * latest weekly patch
14227
14228- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 24 Dec 2019 06:02:28 -0500
14229+ -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 31 Dec 2019 04:35:37 -0500
14230
14231 ncurses6 (5.9-20120608) unstable; urgency=low
14232
14233Index: package/debian/copyright
14234--- ncurses-6.1-20191228+/package/debian/copyright	2019-01-05 23:51:47.000000000 +0000
14235+++ ncurses-6.1-20200104/package/debian/copyright	2020-01-04 14:49:29.000000000 +0000
14236@@ -5,11 +5,11 @@
14237
14238 -------------------------------------------------------------------------------
14239 Files: *
14240-Copyright: 1998-2018,2019 Free Software Foundation, Inc.
14241+Copyright: 1998-2019,2020 Free Software Foundation, Inc.
14242 Licence: X11
14243
14244 Files: aclocal.m4 package
14245-Copyright: 1996-2018,2019 by Thomas E. Dickey
14246+Copyright: 1996-2019,2020 by Thomas E. Dickey
14247 Licence: X11
14248
14249 Files: doc/html/NCURSES-Programming-HOWTO.html
14250Index: package/mingw-ncurses.nsi
14251Prereq:  1.367
14252--- ncurses-6.1-20191228+/package/mingw-ncurses.nsi	2019-12-24 11:02:28.000000000 +0000
14253+++ ncurses-6.1-20200104/package/mingw-ncurses.nsi	2020-01-04 14:49:29.000000000 +0000
14254@@ -1,4 +1,4 @@
14255-; $Id: mingw-ncurses.nsi,v 1.367 2019/12/24 11:02:28 tom Exp $
14256+; $Id: mingw-ncurses.nsi,v 1.368 2020/01/04 14:49:29 tom Exp $
14257
14258 ; TODO add examples
14259 ; TODO bump ABI to 6
14260@@ -9,8 +9,8 @@
14261
14262 !define VERSION_MAJOR "6"
14263 !define VERSION_MINOR "1"
14264-!define VERSION_YYYY  "2019"
14265-!define VERSION_MMDD  "1228"
14266+!define VERSION_YYYY  "2020"
14267+!define VERSION_MMDD  "0104"
14268 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
14269
14270 !define MY_ABI   "5"
14271Index: package/mingw-ncurses.spec
14272--- ncurses-6.1-20191228+/package/mingw-ncurses.spec	2019-12-24 11:02:28.000000000 +0000
14273+++ ncurses-6.1-20200104/package/mingw-ncurses.spec	2020-01-04 14:49:29.000000000 +0000
14274@@ -3,7 +3,7 @@
14275 Summary: shared libraries for terminal handling
14276 Name: mingw32-ncurses6
14277 Version: 6.1
14278-Release: 20191228
14279+Release: 20200104
14280 License: X11
14281 Group: Development/Libraries
14282 Source: ncurses-%{version}-%{release}.tgz
14283Index: package/ncurses.spec
14284--- ncurses-6.1-20191228+/package/ncurses.spec	2019-12-24 14:48:17.000000000 +0000
14285+++ ncurses-6.1-20200104/package/ncurses.spec	2020-01-04 14:49:29.000000000 +0000
14286@@ -1,7 +1,7 @@
14287 Summary: shared libraries for terminal handling
14288 Name: ncurses6
14289 Version: 6.1
14290-Release: 20191228
14291+Release: 20200104
14292 License: X11
14293 Group: Development/Libraries
14294 Source: ncurses-%{version}-%{release}.tgz
14295Index: package/ncursest.spec
14296--- ncurses-6.1-20191228+/package/ncursest.spec	2019-12-24 14:59:53.000000000 +0000
14297+++ ncurses-6.1-20200104/package/ncursest.spec	2020-01-04 14:49:29.000000000 +0000
14298@@ -1,7 +1,7 @@
14299 Summary: Curses library with POSIX thread support.
14300 Name: ncursest6
14301 Version: 6.1
14302-Release: 20191228
14303+Release: 20200104
14304 License: X11
14305 Group: Development/Libraries
14306 Source: ncurses-%{version}-%{release}.tgz
14307Index: test/aclocal.m4
14308Prereq:  1.166
14309--- ncurses-6.1-20191228+/test/aclocal.m4	2019-11-02 20:55:33.000000000 +0000
14310+++ ncurses-6.1-20200104/test/aclocal.m4	2019-12-31 14:02:08.000000000 +0000
14311@@ -26,7 +26,7 @@
14312 dnl authorization.                                                           *
14313 dnl***************************************************************************
14314 dnl
14315-dnl $Id: aclocal.m4,v 1.166 2019/11/02 20:55:33 tom Exp $
14316+dnl $Id: aclocal.m4,v 1.168 2019/12/31 14:02:08 tom Exp $
14317 dnl
14318 dnl Author: Thomas E. Dickey
14319 dnl
14320@@ -1974,11 +1974,12 @@
14321 $1="[$]$1 $cf_header_path_list"
14322 ])dnl
14323 dnl ---------------------------------------------------------------------------
14324-dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
14325+dnl CF_HELP_MESSAGE version: 4 updated: 2019/12/31 08:53:54
14326 dnl ---------------
14327 dnl Insert text into the help-message, for readability, from AC_ARG_WITH.
14328 AC_DEFUN([CF_HELP_MESSAGE],
14329-[AC_DIVERT_HELP([$1])dnl
14330+[CF_ACVERSION_CHECK(2.53,[],[
14331+AC_DIVERT_HELP($1)])dnl
14332 ])dnl
14333 dnl ---------------------------------------------------------------------------
14334 dnl CF_INHERIT_SCRIPT version: 2 updated: 2003/03/01 23:50:42
14335@@ -3063,11 +3064,15 @@
14336
14337 ])dnl
14338 dnl ---------------------------------------------------------------------------
14339-dnl CF_PROG_CC version: 4 updated: 2014/07/12 18:57:58
14340+dnl CF_PROG_CC version: 5 updated: 2019/12/31 08:53:54
14341 dnl ----------
14342 dnl standard check for CC, plus followup sanity checks
14343 dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name
14344 AC_DEFUN([CF_PROG_CC],[
14345+CF_ACVERSION_CHECK(2.53,
14346+	[AC_MSG_WARN(this will incorrectly handle gnatgcc choice)
14347+	 AC_REQUIRE([AC_PROG_CC])],
14348+	[])
14349 ifelse($1,,[AC_PROG_CC],[AC_PROG_CC($1)])
14350 CF_GCC_VERSION
14351 CF_ACVERSION_CHECK(2.52,
14352@@ -3094,11 +3099,16 @@
14353 esac
14354 ])dnl
14355 dnl ---------------------------------------------------------------------------
14356-dnl CF_PROG_LINT version: 3 updated: 2016/05/22 15:25:54
14357+dnl CF_PROG_LINT version: 4 updated: 2019/11/20 18:55:37
14358 dnl ------------
14359 AC_DEFUN([CF_PROG_LINT],
14360 [
14361 AC_CHECK_PROGS(LINT, lint cppcheck splint)
14362+case "x$LINT" in
14363+(xcppcheck|x*/cppcheck)
14364+	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all"
14365+	;;
14366+esac
14367 AC_SUBST(LINT_OPTS)
14368 ])dnl
14369 dnl ---------------------------------------------------------------------------
14370@@ -3777,7 +3787,7 @@
14371 	[USE_VALGRIND])
14372 ])dnl
14373 dnl ---------------------------------------------------------------------------
14374-dnl CF_WITH_X11_RGB version: 1 updated: 2017/11/25 17:32:16
14375+dnl CF_WITH_X11_RGB version: 2 updated: 2019/12/31 08:53:54
14376 dnl ---------------
14377 dnl Handle configure option "--with-x11-rgb", setting these shell
14378 dnl variables:
14379@@ -3853,7 +3863,7 @@
14380
14381 AC_MSG_RESULT($RGB_PATH)
14382 AC_SUBST(RGB_PATH)
14383-AC_DEFINE_UNQUOTED(RGB_PATH,"$cf_path")
14384+AC_DEFINE_UNQUOTED(RGB_PATH,"$cf_path",[Define to the full pathname of rgb.txt])
14385
14386 no_x11_rgb=
14387 if test "$RGB_PATH" = no
14388Index: test/configure
14389--- ncurses-6.1-20191228+/test/configure	2019-11-02 20:55:58.000000000 +0000
14390+++ ncurses-6.1-20200104/test/configure	2019-12-31 14:02:40.000000000 +0000
14391@@ -2803,7 +2803,13 @@
14392   test -n "$LINT" && break
14393 done
14394
14395-echo "$as_me:2806: checking if filesystem supports mixed-case filenames" >&5
14396+case "x$LINT" in
14397+(xcppcheck|x*/cppcheck)
14398+	test -z "$LINT_OPTS" && LINT_OPTS="--enable=all"
14399+	;;
14400+esac
14401+
14402+echo "$as_me:2812: checking if filesystem supports mixed-case filenames" >&5
14403 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
14404 if test "${cf_cv_mixedcase+set}" = set; then
14405   echo $ECHO_N "(cached) $ECHO_C" >&6
14406@@ -2830,7 +2836,7 @@
14407 fi
14408
14409 fi
14410-echo "$as_me:2833: result: $cf_cv_mixedcase" >&5
14411+echo "$as_me:2839: result: $cf_cv_mixedcase" >&5
14412 echo "${ECHO_T}$cf_cv_mixedcase" >&6
14413 test "$cf_cv_mixedcase" = yes &&
14414 cat >>confdefs.h <<\EOF
14415@@ -2841,7 +2847,7 @@
14416 do
14417   # Extract the first word of "$ac_prog", so it can be a program name with args.
14418 set dummy $ac_prog; ac_word=$2
14419-echo "$as_me:2844: checking for $ac_word" >&5
14420+echo "$as_me:2850: checking for $ac_word" >&5
14421 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
14422 if test "${ac_cv_prog_CTAGS+set}" = set; then
14423   echo $ECHO_N "(cached) $ECHO_C" >&6
14424@@ -2856,7 +2862,7 @@
14425   test -z "$ac_dir" && ac_dir=.
14426   $as_executable_p "$ac_dir/$ac_word" || continue
14427 ac_cv_prog_CTAGS="$ac_prog"
14428-echo "$as_me:2859: found $ac_dir/$ac_word" >&5
14429+echo "$as_me:2865: found $ac_dir/$ac_word" >&5
14430 break
14431 done
14432
14433@@ -2864,10 +2870,10 @@
14434 fi
14435 CTAGS=$ac_cv_prog_CTAGS
14436 if test -n "$CTAGS"; then
14437-  echo "$as_me:2867: result: $CTAGS" >&5
14438+  echo "$as_me:2873: result: $CTAGS" >&5
14439 echo "${ECHO_T}$CTAGS" >&6
14440 else
14441-  echo "$as_me:2870: result: no" >&5
14442+  echo "$as_me:2876: result: no" >&5
14443 echo "${ECHO_T}no" >&6
14444 fi
14445
14446@@ -2878,7 +2884,7 @@
14447 do
14448   # Extract the first word of "$ac_prog", so it can be a program name with args.
14449 set dummy $ac_prog; ac_word=$2
14450-echo "$as_me:2881: checking for $ac_word" >&5
14451+echo "$as_me:2887: checking for $ac_word" >&5
14452 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
14453 if test "${ac_cv_prog_ETAGS+set}" = set; then
14454   echo $ECHO_N "(cached) $ECHO_C" >&6
14455@@ -2893,7 +2899,7 @@
14456   test -z "$ac_dir" && ac_dir=.
14457   $as_executable_p "$ac_dir/$ac_word" || continue
14458 ac_cv_prog_ETAGS="$ac_prog"
14459-echo "$as_me:2896: found $ac_dir/$ac_word" >&5
14460+echo "$as_me:2902: found $ac_dir/$ac_word" >&5
14461 break
14462 done
14463
14464@@ -2901,10 +2907,10 @@
14465 fi
14466 ETAGS=$ac_cv_prog_ETAGS
14467 if test -n "$ETAGS"; then
14468-  echo "$as_me:2904: result: $ETAGS" >&5
14469+  echo "$as_me:2910: result: $ETAGS" >&5
14470 echo "${ECHO_T}$ETAGS" >&6
14471 else
14472-  echo "$as_me:2907: result: no" >&5
14473+  echo "$as_me:2913: result: no" >&5
14474 echo "${ECHO_T}no" >&6
14475 fi
14476
14477@@ -2913,7 +2919,7 @@
14478
14479 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
14480 set dummy ${CTAGS:-ctags}; ac_word=$2
14481-echo "$as_me:2916: checking for $ac_word" >&5
14482+echo "$as_me:2922: checking for $ac_word" >&5
14483 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
14484 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
14485   echo $ECHO_N "(cached) $ECHO_C" >&6
14486@@ -2928,7 +2934,7 @@
14487   test -z "$ac_dir" && ac_dir=.
14488   $as_executable_p "$ac_dir/$ac_word" || continue
14489 ac_cv_prog_MAKE_LOWER_TAGS="yes"
14490-echo "$as_me:2931: found $ac_dir/$ac_word" >&5
14491+echo "$as_me:2937: found $ac_dir/$ac_word" >&5
14492 break
14493 done
14494
14495@@ -2937,17 +2943,17 @@
14496 fi
14497 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
14498 if test -n "$MAKE_LOWER_TAGS"; then
14499-  echo "$as_me:2940: result: $MAKE_LOWER_TAGS" >&5
14500+  echo "$as_me:2946: result: $MAKE_LOWER_TAGS" >&5
14501 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
14502 else
14503-  echo "$as_me:2943: result: no" >&5
14504+  echo "$as_me:2949: result: no" >&5
14505 echo "${ECHO_T}no" >&6
14506 fi
14507
14508 if test "$cf_cv_mixedcase" = yes ; then
14509 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
14510 set dummy ${ETAGS:-etags}; ac_word=$2
14511-echo "$as_me:2950: checking for $ac_word" >&5
14512+echo "$as_me:2956: checking for $ac_word" >&5
14513 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
14514 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
14515   echo $ECHO_N "(cached) $ECHO_C" >&6
14516@@ -2962,7 +2968,7 @@
14517   test -z "$ac_dir" && ac_dir=.
14518   $as_executable_p "$ac_dir/$ac_word" || continue
14519 ac_cv_prog_MAKE_UPPER_TAGS="yes"
14520-echo "$as_me:2965: found $ac_dir/$ac_word" >&5
14521+echo "$as_me:2971: found $ac_dir/$ac_word" >&5
14522 break
14523 done
14524
14525@@ -2971,10 +2977,10 @@
14526 fi
14527 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
14528 if test -n "$MAKE_UPPER_TAGS"; then
14529-  echo "$as_me:2974: result: $MAKE_UPPER_TAGS" >&5
14530+  echo "$as_me:2980: result: $MAKE_UPPER_TAGS" >&5
14531 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
14532 else
14533-  echo "$as_me:2977: result: no" >&5
14534+  echo "$as_me:2983: result: no" >&5
14535 echo "${ECHO_T}no" >&6
14536 fi
14537
14538@@ -2994,14 +3000,14 @@
14539 	MAKE_LOWER_TAGS="#"
14540 fi
14541
14542-echo "$as_me:2997: checking if -lm needed for math functions" >&5
14543+echo "$as_me:3003: checking if -lm needed for math functions" >&5
14544 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
14545 if test "${cf_cv_need_libm+set}" = set; then
14546   echo $ECHO_N "(cached) $ECHO_C" >&6
14547 else
14548
14549 	cat >conftest.$ac_ext <<_ACEOF
14550-#line 3004 "configure"
14551+#line 3010 "configure"
14552 #include "confdefs.h"
14553
14554 	#include <stdio.h>
14555@@ -3017,16 +3023,16 @@
14556 }
14557 _ACEOF
14558 rm -f conftest.$ac_objext conftest$ac_exeext
14559-if { (eval echo "$as_me:3020: \"$ac_link\"") >&5
14560+if { (eval echo "$as_me:3026: \"$ac_link\"") >&5
14561   (eval $ac_link) 2>&5
14562   ac_status=$?
14563-  echo "$as_me:3023: \$? = $ac_status" >&5
14564+  echo "$as_me:3029: \$? = $ac_status" >&5
14565   (exit $ac_status); } &&
14566          { ac_try='test -s conftest$ac_exeext'
14567-  { (eval echo "$as_me:3026: \"$ac_try\"") >&5
14568+  { (eval echo "$as_me:3032: \"$ac_try\"") >&5
14569   (eval $ac_try) 2>&5
14570   ac_status=$?
14571-  echo "$as_me:3029: \$? = $ac_status" >&5
14572+  echo "$as_me:3035: \$? = $ac_status" >&5
14573   (exit $ac_status); }; }; then
14574   cf_cv_need_libm=no
14575 else
14576@@ -3036,7 +3042,7 @@
14577 fi
14578 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
14579 fi
14580-echo "$as_me:3039: result: $cf_cv_need_libm" >&5
14581+echo "$as_me:3045: result: $cf_cv_need_libm" >&5
14582 echo "${ECHO_T}$cf_cv_need_libm" >&6
14583 if test "$cf_cv_need_libm" = yes
14584 then
14585@@ -3095,10 +3101,10 @@
14586 EOF
14587 if test "$GCC" = yes
14588 then
14589-	{ echo "$as_me:3098: checking for $CC __attribute__ directives..." >&5
14590+	{ echo "$as_me:3104: checking for $CC __attribute__ directives..." >&5
14591 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
14592 cat > conftest.$ac_ext <<EOF
14593-#line 3101 "${as_me:-configure}"
14594+#line 3107 "${as_me:-configure}"
14595 #include "confdefs.h"
14596 #include "conftest.h"
14597 #include "conftest.i"
14598@@ -3147,12 +3153,12 @@
14599 			;;
14600 		esac
14601
14602-		if { (eval echo "$as_me:3150: \"$ac_compile\"") >&5
14603+		if { (eval echo "$as_me:3156: \"$ac_compile\"") >&5
14604   (eval $ac_compile) 2>&5
14605   ac_status=$?
14606-  echo "$as_me:3153: \$? = $ac_status" >&5
14607+  echo "$as_me:3159: \$? = $ac_status" >&5
14608   (exit $ac_status); }; then
14609-			test -n "$verbose" && echo "$as_me:3155: result: ... $cf_attribute" >&5
14610+			test -n "$verbose" && echo "$as_me:3161: result: ... $cf_attribute" >&5
14611 echo "${ECHO_T}... $cf_attribute" >&6
14612 			cat conftest.h >>confdefs.h
14613 			case $cf_attribute in
14614@@ -3211,7 +3217,7 @@
14615 rm -rf conftest*
14616 fi
14617
14618-echo "$as_me:3214: checking if you want to work around bogus compiler/loader warnings" >&5
14619+echo "$as_me:3220: checking if you want to work around bogus compiler/loader warnings" >&5
14620 echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
14621
14622 # Check whether --enable-string-hacks or --disable-string-hacks was given.
14623@@ -3221,7 +3227,7 @@
14624 else
14625   with_string_hacks=no
14626 fi;
14627-echo "$as_me:3224: result: $with_string_hacks" >&5
14628+echo "$as_me:3230: result: $with_string_hacks" >&5
14629 echo "${ECHO_T}$with_string_hacks" >&6
14630
14631 if test "x$with_string_hacks" = "xyes"; then
14632@@ -3230,15 +3236,15 @@
14633 #define USE_STRING_HACKS 1
14634 EOF
14635
14636-	{ echo "$as_me:3233: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
14637+	{ echo "$as_me:3239: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
14638 echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
14639-	echo "$as_me:3235: checking for strlcat" >&5
14640+	echo "$as_me:3241: checking for strlcat" >&5
14641 echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
14642 if test "${ac_cv_func_strlcat+set}" = set; then
14643   echo $ECHO_N "(cached) $ECHO_C" >&6
14644 else
14645   cat >conftest.$ac_ext <<_ACEOF
14646-#line 3241 "configure"
14647+#line 3247 "configure"
14648 #include "confdefs.h"
14649 #define strlcat autoconf_temporary
14650 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
14651@@ -3269,16 +3275,16 @@
14652 }
14653 _ACEOF
14654 rm -f conftest.$ac_objext conftest$ac_exeext
14655-if { (eval echo "$as_me:3272: \"$ac_link\"") >&5
14656+if { (eval echo "$as_me:3278: \"$ac_link\"") >&5
14657   (eval $ac_link) 2>&5
14658   ac_status=$?
14659-  echo "$as_me:3275: \$? = $ac_status" >&5
14660+  echo "$as_me:3281: \$? = $ac_status" >&5
14661   (exit $ac_status); } &&
14662          { ac_try='test -s conftest$ac_exeext'
14663-  { (eval echo "$as_me:3278: \"$ac_try\"") >&5
14664+  { (eval echo "$as_me:3284: \"$ac_try\"") >&5
14665   (eval $ac_try) 2>&5
14666   ac_status=$?
14667-  echo "$as_me:3281: \$? = $ac_status" >&5
14668+  echo "$as_me:3287: \$? = $ac_status" >&5
14669   (exit $ac_status); }; }; then
14670   ac_cv_func_strlcat=yes
14671 else
14672@@ -3288,7 +3294,7 @@
14673 fi
14674 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
14675 fi
14676-echo "$as_me:3291: result: $ac_cv_func_strlcat" >&5
14677+echo "$as_me:3297: result: $ac_cv_func_strlcat" >&5
14678 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
14679 if test $ac_cv_func_strlcat = yes; then
14680
14681@@ -3298,7 +3304,7 @@
14682
14683 else
14684
14685-		echo "$as_me:3301: checking for strlcat in -lbsd" >&5
14686+		echo "$as_me:3307: checking for strlcat in -lbsd" >&5
14687 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
14688 if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
14689   echo $ECHO_N "(cached) $ECHO_C" >&6
14690@@ -3306,7 +3312,7 @@
14691   ac_check_lib_save_LIBS=$LIBS
14692 LIBS="-lbsd  $LIBS"
14693 cat >conftest.$ac_ext <<_ACEOF
14694-#line 3309 "configure"
14695+#line 3315 "configure"
14696 #include "confdefs.h"
14697
14698 /* Override any gcc2 internal prototype to avoid an error.  */
14699@@ -3325,16 +3331,16 @@
14700 }
14701 _ACEOF
14702 rm -f conftest.$ac_objext conftest$ac_exeext
14703-if { (eval echo "$as_me:3328: \"$ac_link\"") >&5
14704+if { (eval echo "$as_me:3334: \"$ac_link\"") >&5
14705   (eval $ac_link) 2>&5
14706   ac_status=$?
14707-  echo "$as_me:3331: \$? = $ac_status" >&5
14708+  echo "$as_me:3337: \$? = $ac_status" >&5
14709   (exit $ac_status); } &&
14710          { ac_try='test -s conftest$ac_exeext'
14711-  { (eval echo "$as_me:3334: \"$ac_try\"") >&5
14712+  { (eval echo "$as_me:3340: \"$ac_try\"") >&5
14713   (eval $ac_try) 2>&5
14714   ac_status=$?
14715-  echo "$as_me:3337: \$? = $ac_status" >&5
14716+  echo "$as_me:3343: \$? = $ac_status" >&5
14717   (exit $ac_status); }; }; then
14718   ac_cv_lib_bsd_strlcat=yes
14719 else
14720@@ -3345,7 +3351,7 @@
14721 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
14722 LIBS=$ac_check_lib_save_LIBS
14723 fi
14724-echo "$as_me:3348: result: $ac_cv_lib_bsd_strlcat" >&5
14725+echo "$as_me:3354: result: $ac_cv_lib_bsd_strlcat" >&5
14726 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
14727 if test $ac_cv_lib_bsd_strlcat = yes; then
14728
14729@@ -3368,23 +3374,23 @@
14730 for ac_header in bsd/string.h
14731 do
14732 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
14733-echo "$as_me:3371: checking for $ac_header" >&5
14734+echo "$as_me:3377: checking for $ac_header" >&5
14735 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
14736 if eval "test \"\${$as_ac_Header+set}\" = set"; then
14737   echo $ECHO_N "(cached) $ECHO_C" >&6
14738 else
14739   cat >conftest.$ac_ext <<_ACEOF
14740-#line 3377 "configure"
14741+#line 3383 "configure"
14742 #include "confdefs.h"
14743 #include <$ac_header>
14744 _ACEOF
14745-if { (eval echo "$as_me:3381: \"$ac_cpp conftest.$ac_ext\"") >&5
14746+if { (eval echo "$as_me:3387: \"$ac_cpp conftest.$ac_ext\"") >&5
14747   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
14748   ac_status=$?
14749   egrep -v '^ *\+' conftest.er1 >conftest.err
14750   rm -f conftest.er1
14751   cat conftest.err >&5
14752-  echo "$as_me:3387: \$? = $ac_status" >&5
14753+  echo "$as_me:3393: \$? = $ac_status" >&5
14754   (exit $ac_status); } >/dev/null; then
14755   if test -s conftest.err; then
14756     ac_cpp_err=$ac_c_preproc_warn_flag
14757@@ -3403,7 +3409,7 @@
14758 fi
14759 rm -f conftest.err conftest.$ac_ext
14760 fi
14761-echo "$as_me:3406: result: `eval echo '${'$as_ac_Header'}'`" >&5
14762+echo "$as_me:3412: result: `eval echo '${'$as_ac_Header'}'`" >&5
14763 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
14764 if test `eval echo '${'$as_ac_Header'}'` = yes; then
14765   cat >>confdefs.h <<EOF
14766@@ -3424,13 +3430,13 @@
14767 for ac_func in strlcpy snprintf
14768 do
14769 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
14770-echo "$as_me:3427: checking for $ac_func" >&5
14771+echo "$as_me:3433: checking for $ac_func" >&5
14772 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
14773 if eval "test \"\${$as_ac_var+set}\" = set"; then
14774   echo $ECHO_N "(cached) $ECHO_C" >&6
14775 else
14776   cat >conftest.$ac_ext <<_ACEOF
14777-#line 3433 "configure"
14778+#line 3439 "configure"
14779 #include "confdefs.h"
14780 #define $ac_func autoconf_temporary
14781 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
14782@@ -3461,16 +3467,16 @@
14783 }
14784 _ACEOF
14785 rm -f conftest.$ac_objext conftest$ac_exeext
14786-if { (eval echo "$as_me:3464: \"$ac_link\"") >&5
14787+if { (eval echo "$as_me:3470: \"$ac_link\"") >&5
14788   (eval $ac_link) 2>&5
14789   ac_status=$?
14790-  echo "$as_me:3467: \$? = $ac_status" >&5
14791+  echo "$as_me:3473: \$? = $ac_status" >&5
14792   (exit $ac_status); } &&
14793          { ac_try='test -s conftest$ac_exeext'
14794-  { (eval echo "$as_me:3470: \"$ac_try\"") >&5
14795+  { (eval echo "$as_me:3476: \"$ac_try\"") >&5
14796   (eval $ac_try) 2>&5
14797   ac_status=$?
14798-  echo "$as_me:3473: \$? = $ac_status" >&5
14799+  echo "$as_me:3479: \$? = $ac_status" >&5
14800   (exit $ac_status); }; }; then
14801   eval "$as_ac_var=yes"
14802 else
14803@@ -3480,7 +3486,7 @@
14804 fi
14805 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
14806 fi
14807-echo "$as_me:3483: result: `eval echo '${'$as_ac_var'}'`" >&5
14808+echo "$as_me:3489: result: `eval echo '${'$as_ac_var'}'`" >&5
14809 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
14810 if test `eval echo '${'$as_ac_var'}'` = yes; then
14811   cat >>confdefs.h <<EOF
14812@@ -3492,14 +3498,14 @@
14813
14814 fi
14815
14816-echo "$as_me:3495: checking if the POSIX test-macros are already defined" >&5
14817+echo "$as_me:3501: checking if the POSIX test-macros are already defined" >&5
14818 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
14819 if test "${cf_cv_posix_visible+set}" = set; then
14820   echo $ECHO_N "(cached) $ECHO_C" >&6
14821 else
14822
14823 cat >conftest.$ac_ext <<_ACEOF
14824-#line 3502 "configure"
14825+#line 3508 "configure"
14826 #include "confdefs.h"
14827 #include <stdio.h>
14828 int
14829@@ -3518,16 +3524,16 @@
14830 }
14831 _ACEOF
14832 rm -f conftest.$ac_objext
14833-if { (eval echo "$as_me:3521: \"$ac_compile\"") >&5
14834+if { (eval echo "$as_me:3527: \"$ac_compile\"") >&5
14835   (eval $ac_compile) 2>&5
14836   ac_status=$?
14837-  echo "$as_me:3524: \$? = $ac_status" >&5
14838+  echo "$as_me:3530: \$? = $ac_status" >&5
14839   (exit $ac_status); } &&
14840          { ac_try='test -s conftest.$ac_objext'
14841-  { (eval echo "$as_me:3527: \"$ac_try\"") >&5
14842+  { (eval echo "$as_me:3533: \"$ac_try\"") >&5
14843   (eval $ac_try) 2>&5
14844   ac_status=$?
14845-  echo "$as_me:3530: \$? = $ac_status" >&5
14846+  echo "$as_me:3536: \$? = $ac_status" >&5
14847   (exit $ac_status); }; }; then
14848   cf_cv_posix_visible=no
14849 else
14850@@ -3538,7 +3544,7 @@
14851 rm -f conftest.$ac_objext conftest.$ac_ext
14852
14853 fi
14854-echo "$as_me:3541: result: $cf_cv_posix_visible" >&5
14855+echo "$as_me:3547: result: $cf_cv_posix_visible" >&5
14856 echo "${ECHO_T}$cf_cv_posix_visible" >&6
14857
14858 if test "$cf_cv_posix_visible" = no; then
14859@@ -3583,14 +3589,14 @@
14860
14861 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
14862
14863-echo "$as_me:3586: checking if this is the GNU C library" >&5
14864+echo "$as_me:3592: checking if this is the GNU C library" >&5
14865 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
14866 if test "${cf_cv_gnu_library+set}" = set; then
14867   echo $ECHO_N "(cached) $ECHO_C" >&6
14868 else
14869
14870 cat >conftest.$ac_ext <<_ACEOF
14871-#line 3593 "configure"
14872+#line 3599 "configure"
14873 #include "confdefs.h"
14874 #include <sys/types.h>
14875 int
14876@@ -3609,16 +3615,16 @@
14877 }
14878 _ACEOF
14879 rm -f conftest.$ac_objext
14880-if { (eval echo "$as_me:3612: \"$ac_compile\"") >&5
14881+if { (eval echo "$as_me:3618: \"$ac_compile\"") >&5
14882   (eval $ac_compile) 2>&5
14883   ac_status=$?
14884-  echo "$as_me:3615: \$? = $ac_status" >&5
14885+  echo "$as_me:3621: \$? = $ac_status" >&5
14886   (exit $ac_status); } &&
14887          { ac_try='test -s conftest.$ac_objext'
14888-  { (eval echo "$as_me:3618: \"$ac_try\"") >&5
14889+  { (eval echo "$as_me:3624: \"$ac_try\"") >&5
14890   (eval $ac_try) 2>&5
14891   ac_status=$?
14892-  echo "$as_me:3621: \$? = $ac_status" >&5
14893+  echo "$as_me:3627: \$? = $ac_status" >&5
14894   (exit $ac_status); }; }; then
14895   cf_cv_gnu_library=yes
14896 else
14897@@ -3629,7 +3635,7 @@
14898 rm -f conftest.$ac_objext conftest.$ac_ext
14899
14900 fi
14901-echo "$as_me:3632: result: $cf_cv_gnu_library" >&5
14902+echo "$as_me:3638: result: $cf_cv_gnu_library" >&5
14903 echo "${ECHO_T}$cf_cv_gnu_library" >&6
14904
14905 if test x$cf_cv_gnu_library = xyes; then
14906@@ -3637,7 +3643,7 @@
14907 	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
14908 	# was changed to help a little.  newlib incorporated the change about 4
14909 	# years later.
14910-	echo "$as_me:3640: checking if _DEFAULT_SOURCE can be used as a basis" >&5
14911+	echo "$as_me:3646: checking if _DEFAULT_SOURCE can be used as a basis" >&5
14912 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
14913 if test "${cf_cv_gnu_library_219+set}" = set; then
14914   echo $ECHO_N "(cached) $ECHO_C" >&6
14915@@ -3649,7 +3655,7 @@
14916 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
14917
14918 		cat >conftest.$ac_ext <<_ACEOF
14919-#line 3652 "configure"
14920+#line 3658 "configure"
14921 #include "confdefs.h"
14922 #include <sys/types.h>
14923 int
14924@@ -3668,16 +3674,16 @@
14925 }
14926 _ACEOF
14927 rm -f conftest.$ac_objext
14928-if { (eval echo "$as_me:3671: \"$ac_compile\"") >&5
14929+if { (eval echo "$as_me:3677: \"$ac_compile\"") >&5
14930   (eval $ac_compile) 2>&5
14931   ac_status=$?
14932-  echo "$as_me:3674: \$? = $ac_status" >&5
14933+  echo "$as_me:3680: \$? = $ac_status" >&5
14934   (exit $ac_status); } &&
14935          { ac_try='test -s conftest.$ac_objext'
14936-  { (eval echo "$as_me:3677: \"$ac_try\"") >&5
14937+  { (eval echo "$as_me:3683: \"$ac_try\"") >&5
14938   (eval $ac_try) 2>&5
14939   ac_status=$?
14940-  echo "$as_me:3680: \$? = $ac_status" >&5
14941+  echo "$as_me:3686: \$? = $ac_status" >&5
14942   (exit $ac_status); }; }; then
14943   cf_cv_gnu_library_219=yes
14944 else
14945@@ -3689,12 +3695,12 @@
14946 		CPPFLAGS="$cf_save"
14947
14948 fi
14949-echo "$as_me:3692: result: $cf_cv_gnu_library_219" >&5
14950+echo "$as_me:3698: result: $cf_cv_gnu_library_219" >&5
14951 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
14952
14953 	if test "x$cf_cv_gnu_library_219" = xyes; then
14954 		cf_save="$CPPFLAGS"
14955-		echo "$as_me:3697: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
14956+		echo "$as_me:3703: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
14957 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
14958 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
14959   echo $ECHO_N "(cached) $ECHO_C" >&6
14960@@ -3799,7 +3805,7 @@
14961 fi
14962
14963 			cat >conftest.$ac_ext <<_ACEOF
14964-#line 3802 "configure"
14965+#line 3808 "configure"
14966 #include "confdefs.h"
14967
14968 				#include <limits.h>
14969@@ -3819,16 +3825,16 @@
14970 }
14971 _ACEOF
14972 rm -f conftest.$ac_objext
14973-if { (eval echo "$as_me:3822: \"$ac_compile\"") >&5
14974+if { (eval echo "$as_me:3828: \"$ac_compile\"") >&5
14975   (eval $ac_compile) 2>&5
14976   ac_status=$?
14977-  echo "$as_me:3825: \$? = $ac_status" >&5
14978+  echo "$as_me:3831: \$? = $ac_status" >&5
14979   (exit $ac_status); } &&
14980          { ac_try='test -s conftest.$ac_objext'
14981-  { (eval echo "$as_me:3828: \"$ac_try\"") >&5
14982+  { (eval echo "$as_me:3834: \"$ac_try\"") >&5
14983   (eval $ac_try) 2>&5
14984   ac_status=$?
14985-  echo "$as_me:3831: \$? = $ac_status" >&5
14986+  echo "$as_me:3837: \$? = $ac_status" >&5
14987   (exit $ac_status); }; }; then
14988   cf_cv_gnu_dftsrc_219=yes
14989 else
14990@@ -3839,7 +3845,7 @@
14991 rm -f conftest.$ac_objext conftest.$ac_ext
14992
14993 fi
14994-echo "$as_me:3842: result: $cf_cv_gnu_dftsrc_219" >&5
14995+echo "$as_me:3848: result: $cf_cv_gnu_dftsrc_219" >&5
14996 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
14997 		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
14998 	else
14999@@ -3848,14 +3854,14 @@
15000
15001 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
15002
15003-		echo "$as_me:3851: checking if we must define _GNU_SOURCE" >&5
15004+		echo "$as_me:3857: checking if we must define _GNU_SOURCE" >&5
15005 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
15006 if test "${cf_cv_gnu_source+set}" = set; then
15007   echo $ECHO_N "(cached) $ECHO_C" >&6
15008 else
15009
15010 		cat >conftest.$ac_ext <<_ACEOF
15011-#line 3858 "configure"
15012+#line 3864 "configure"
15013 #include "confdefs.h"
15014 #include <sys/types.h>
15015 int
15016@@ -3870,16 +3876,16 @@
15017 }
15018 _ACEOF
15019 rm -f conftest.$ac_objext
15020-if { (eval echo "$as_me:3873: \"$ac_compile\"") >&5
15021+if { (eval echo "$as_me:3879: \"$ac_compile\"") >&5
15022   (eval $ac_compile) 2>&5
15023   ac_status=$?
15024-  echo "$as_me:3876: \$? = $ac_status" >&5
15025+  echo "$as_me:3882: \$? = $ac_status" >&5
15026   (exit $ac_status); } &&
15027          { ac_try='test -s conftest.$ac_objext'
15028-  { (eval echo "$as_me:3879: \"$ac_try\"") >&5
15029+  { (eval echo "$as_me:3885: \"$ac_try\"") >&5
15030   (eval $ac_try) 2>&5
15031   ac_status=$?
15032-  echo "$as_me:3882: \$? = $ac_status" >&5
15033+  echo "$as_me:3888: \$? = $ac_status" >&5
15034   (exit $ac_status); }; }; then
15035   cf_cv_gnu_source=no
15036 else
15037@@ -3986,7 +3992,7 @@
15038 fi
15039
15040 			 cat >conftest.$ac_ext <<_ACEOF
15041-#line 3989 "configure"
15042+#line 3995 "configure"
15043 #include "confdefs.h"
15044 #include <sys/types.h>
15045 int
15046@@ -4001,16 +4007,16 @@
15047 }
15048 _ACEOF
15049 rm -f conftest.$ac_objext
15050-if { (eval echo "$as_me:4004: \"$ac_compile\"") >&5
15051+if { (eval echo "$as_me:4010: \"$ac_compile\"") >&5
15052   (eval $ac_compile) 2>&5
15053   ac_status=$?
15054-  echo "$as_me:4007: \$? = $ac_status" >&5
15055+  echo "$as_me:4013: \$? = $ac_status" >&5
15056   (exit $ac_status); } &&
15057          { ac_try='test -s conftest.$ac_objext'
15058-  { (eval echo "$as_me:4010: \"$ac_try\"") >&5
15059+  { (eval echo "$as_me:4016: \"$ac_try\"") >&5
15060   (eval $ac_try) 2>&5
15061   ac_status=$?
15062-  echo "$as_me:4013: \$? = $ac_status" >&5
15063+  echo "$as_me:4019: \$? = $ac_status" >&5
15064   (exit $ac_status); }; }; then
15065   cf_cv_gnu_source=no
15066 else
15067@@ -4025,12 +4031,12 @@
15068 rm -f conftest.$ac_objext conftest.$ac_ext
15069
15070 fi
15071-echo "$as_me:4028: result: $cf_cv_gnu_source" >&5
15072+echo "$as_me:4034: result: $cf_cv_gnu_source" >&5
15073 echo "${ECHO_T}$cf_cv_gnu_source" >&6
15074
15075 		if test "$cf_cv_gnu_source" = yes
15076 		then
15077-		echo "$as_me:4033: checking if we should also define _DEFAULT_SOURCE" >&5
15078+		echo "$as_me:4039: checking if we should also define _DEFAULT_SOURCE" >&5
15079 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
15080 if test "${cf_cv_default_source+set}" = set; then
15081   echo $ECHO_N "(cached) $ECHO_C" >&6
15082@@ -4040,7 +4046,7 @@
15083 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
15084
15085 			cat >conftest.$ac_ext <<_ACEOF
15086-#line 4043 "configure"
15087+#line 4049 "configure"
15088 #include "confdefs.h"
15089 #include <sys/types.h>
15090 int
15091@@ -4055,16 +4061,16 @@
15092 }
15093 _ACEOF
15094 rm -f conftest.$ac_objext
15095-if { (eval echo "$as_me:4058: \"$ac_compile\"") >&5
15096+if { (eval echo "$as_me:4064: \"$ac_compile\"") >&5
15097   (eval $ac_compile) 2>&5
15098   ac_status=$?
15099-  echo "$as_me:4061: \$? = $ac_status" >&5
15100+  echo "$as_me:4067: \$? = $ac_status" >&5
15101   (exit $ac_status); } &&
15102          { ac_try='test -s conftest.$ac_objext'
15103-  { (eval echo "$as_me:4064: \"$ac_try\"") >&5
15104+  { (eval echo "$as_me:4070: \"$ac_try\"") >&5
15105   (eval $ac_try) 2>&5
15106   ac_status=$?
15107-  echo "$as_me:4067: \$? = $ac_status" >&5
15108+  echo "$as_me:4073: \$? = $ac_status" >&5
15109   (exit $ac_status); }; }; then
15110   cf_cv_default_source=no
15111 else
15112@@ -4075,7 +4081,7 @@
15113 rm -f conftest.$ac_objext conftest.$ac_ext
15114
15115 fi
15116-echo "$as_me:4078: result: $cf_cv_default_source" >&5
15117+echo "$as_me:4084: result: $cf_cv_default_source" >&5
15118 echo "${ECHO_T}$cf_cv_default_source" >&6
15119 			if test "$cf_cv_default_source" = yes
15120 			then
15121@@ -4112,16 +4118,16 @@
15122 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
15123 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
15124
15125-echo "$as_me:4115: checking if we should define _POSIX_C_SOURCE" >&5
15126+echo "$as_me:4121: checking if we should define _POSIX_C_SOURCE" >&5
15127 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
15128 if test "${cf_cv_posix_c_source+set}" = set; then
15129   echo $ECHO_N "(cached) $ECHO_C" >&6
15130 else
15131
15132-echo "${as_me:-configure}:4121: testing if the symbol is already defined go no further ..." 1>&5
15133+echo "${as_me:-configure}:4127: testing if the symbol is already defined go no further ..." 1>&5
15134
15135 	cat >conftest.$ac_ext <<_ACEOF
15136-#line 4124 "configure"
15137+#line 4130 "configure"
15138 #include "confdefs.h"
15139 #include <sys/types.h>
15140 int
15141@@ -4136,16 +4142,16 @@
15142 }
15143 _ACEOF
15144 rm -f conftest.$ac_objext
15145-if { (eval echo "$as_me:4139: \"$ac_compile\"") >&5
15146+if { (eval echo "$as_me:4145: \"$ac_compile\"") >&5
15147   (eval $ac_compile) 2>&5
15148   ac_status=$?
15149-  echo "$as_me:4142: \$? = $ac_status" >&5
15150+  echo "$as_me:4148: \$? = $ac_status" >&5
15151   (exit $ac_status); } &&
15152          { ac_try='test -s conftest.$ac_objext'
15153-  { (eval echo "$as_me:4145: \"$ac_try\"") >&5
15154+  { (eval echo "$as_me:4151: \"$ac_try\"") >&5
15155   (eval $ac_try) 2>&5
15156   ac_status=$?
15157-  echo "$as_me:4148: \$? = $ac_status" >&5
15158+  echo "$as_me:4154: \$? = $ac_status" >&5
15159   (exit $ac_status); }; }; then
15160   cf_cv_posix_c_source=no
15161 else
15162@@ -4166,7 +4172,7 @@
15163 	 esac
15164 	 if test "$cf_want_posix_source" = yes ; then
15165 		cat >conftest.$ac_ext <<_ACEOF
15166-#line 4169 "configure"
15167+#line 4175 "configure"
15168 #include "confdefs.h"
15169 #include <sys/types.h>
15170 int
15171@@ -4181,16 +4187,16 @@
15172 }
15173 _ACEOF
15174 rm -f conftest.$ac_objext
15175-if { (eval echo "$as_me:4184: \"$ac_compile\"") >&5
15176+if { (eval echo "$as_me:4190: \"$ac_compile\"") >&5
15177   (eval $ac_compile) 2>&5
15178   ac_status=$?
15179-  echo "$as_me:4187: \$? = $ac_status" >&5
15180+  echo "$as_me:4193: \$? = $ac_status" >&5
15181   (exit $ac_status); } &&
15182          { ac_try='test -s conftest.$ac_objext'
15183-  { (eval echo "$as_me:4190: \"$ac_try\"") >&5
15184+  { (eval echo "$as_me:4196: \"$ac_try\"") >&5
15185   (eval $ac_try) 2>&5
15186   ac_status=$?
15187-  echo "$as_me:4193: \$? = $ac_status" >&5
15188+  echo "$as_me:4199: \$? = $ac_status" >&5
15189   (exit $ac_status); }; }; then
15190   :
15191 else
15192@@ -4201,7 +4207,7 @@
15193 rm -f conftest.$ac_objext conftest.$ac_ext
15194 	 fi
15195
15196-echo "${as_me:-configure}:4204: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
15197+echo "${as_me:-configure}:4210: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
15198
15199 	 CFLAGS="$cf_trim_CFLAGS"
15200 	 CPPFLAGS="$cf_trim_CPPFLAGS"
15201@@ -4209,10 +4215,10 @@
15202 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
15203 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
15204
15205-echo "${as_me:-configure}:4212: testing if the second compile does not leave our definition intact error ..." 1>&5
15206+echo "${as_me:-configure}:4218: testing if the second compile does not leave our definition intact error ..." 1>&5
15207
15208 	 cat >conftest.$ac_ext <<_ACEOF
15209-#line 4215 "configure"
15210+#line 4221 "configure"
15211 #include "confdefs.h"
15212 #include <sys/types.h>
15213 int
15214@@ -4227,16 +4233,16 @@
15215 }
15216 _ACEOF
15217 rm -f conftest.$ac_objext
15218-if { (eval echo "$as_me:4230: \"$ac_compile\"") >&5
15219+if { (eval echo "$as_me:4236: \"$ac_compile\"") >&5
15220   (eval $ac_compile) 2>&5
15221   ac_status=$?
15222-  echo "$as_me:4233: \$? = $ac_status" >&5
15223+  echo "$as_me:4239: \$? = $ac_status" >&5
15224   (exit $ac_status); } &&
15225          { ac_try='test -s conftest.$ac_objext'
15226-  { (eval echo "$as_me:4236: \"$ac_try\"") >&5
15227+  { (eval echo "$as_me:4242: \"$ac_try\"") >&5
15228   (eval $ac_try) 2>&5
15229   ac_status=$?
15230-  echo "$as_me:4239: \$? = $ac_status" >&5
15231+  echo "$as_me:4245: \$? = $ac_status" >&5
15232   (exit $ac_status); }; }; then
15233   :
15234 else
15235@@ -4252,7 +4258,7 @@
15236 rm -f conftest.$ac_objext conftest.$ac_ext
15237
15238 fi
15239-echo "$as_me:4255: result: $cf_cv_posix_c_source" >&5
15240+echo "$as_me:4261: result: $cf_cv_posix_c_source" >&5
15241 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
15242
15243 if test "$cf_cv_posix_c_source" != no ; then
15244@@ -4392,14 +4398,14 @@
15245 	;;
15246 (*)
15247
15248-echo "$as_me:4395: checking if we should define _XOPEN_SOURCE" >&5
15249+echo "$as_me:4401: checking if we should define _XOPEN_SOURCE" >&5
15250 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
15251 if test "${cf_cv_xopen_source+set}" = set; then
15252   echo $ECHO_N "(cached) $ECHO_C" >&6
15253 else
15254
15255 	cat >conftest.$ac_ext <<_ACEOF
15256-#line 4402 "configure"
15257+#line 4408 "configure"
15258 #include "confdefs.h"
15259
15260 #include <stdlib.h>
15261@@ -4418,16 +4424,16 @@
15262 }
15263 _ACEOF
15264 rm -f conftest.$ac_objext
15265-if { (eval echo "$as_me:4421: \"$ac_compile\"") >&5
15266+if { (eval echo "$as_me:4427: \"$ac_compile\"") >&5
15267   (eval $ac_compile) 2>&5
15268   ac_status=$?
15269-  echo "$as_me:4424: \$? = $ac_status" >&5
15270+  echo "$as_me:4430: \$? = $ac_status" >&5
15271   (exit $ac_status); } &&
15272          { ac_try='test -s conftest.$ac_objext'
15273-  { (eval echo "$as_me:4427: \"$ac_try\"") >&5
15274+  { (eval echo "$as_me:4433: \"$ac_try\"") >&5
15275   (eval $ac_try) 2>&5
15276   ac_status=$?
15277-  echo "$as_me:4430: \$? = $ac_status" >&5
15278+  echo "$as_me:4436: \$? = $ac_status" >&5
15279   (exit $ac_status); }; }; then
15280   cf_cv_xopen_source=no
15281 else
15282@@ -4439,7 +4445,7 @@
15283 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
15284
15285 	 cat >conftest.$ac_ext <<_ACEOF
15286-#line 4442 "configure"
15287+#line 4448 "configure"
15288 #include "confdefs.h"
15289
15290 #include <stdlib.h>
15291@@ -4458,16 +4464,16 @@
15292 }
15293 _ACEOF
15294 rm -f conftest.$ac_objext
15295-if { (eval echo "$as_me:4461: \"$ac_compile\"") >&5
15296+if { (eval echo "$as_me:4467: \"$ac_compile\"") >&5
15297   (eval $ac_compile) 2>&5
15298   ac_status=$?
15299-  echo "$as_me:4464: \$? = $ac_status" >&5
15300+  echo "$as_me:4470: \$? = $ac_status" >&5
15301   (exit $ac_status); } &&
15302          { ac_try='test -s conftest.$ac_objext'
15303-  { (eval echo "$as_me:4467: \"$ac_try\"") >&5
15304+  { (eval echo "$as_me:4473: \"$ac_try\"") >&5
15305   (eval $ac_try) 2>&5
15306   ac_status=$?
15307-  echo "$as_me:4470: \$? = $ac_status" >&5
15308+  echo "$as_me:4476: \$? = $ac_status" >&5
15309   (exit $ac_status); }; }; then
15310   cf_cv_xopen_source=no
15311 else
15312@@ -4482,7 +4488,7 @@
15313 rm -f conftest.$ac_objext conftest.$ac_ext
15314
15315 fi
15316-echo "$as_me:4485: result: $cf_cv_xopen_source" >&5
15317+echo "$as_me:4491: result: $cf_cv_xopen_source" >&5
15318 echo "${ECHO_T}$cf_cv_xopen_source" >&6
15319
15320 if test "$cf_cv_xopen_source" != no ; then
15321@@ -4612,16 +4618,16 @@
15322 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
15323 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
15324
15325-echo "$as_me:4615: checking if we should define _POSIX_C_SOURCE" >&5
15326+echo "$as_me:4621: checking if we should define _POSIX_C_SOURCE" >&5
15327 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
15328 if test "${cf_cv_posix_c_source+set}" = set; then
15329   echo $ECHO_N "(cached) $ECHO_C" >&6
15330 else
15331
15332-echo "${as_me:-configure}:4621: testing if the symbol is already defined go no further ..." 1>&5
15333+echo "${as_me:-configure}:4627: testing if the symbol is already defined go no further ..." 1>&5
15334
15335 	cat >conftest.$ac_ext <<_ACEOF
15336-#line 4624 "configure"
15337+#line 4630 "configure"
15338 #include "confdefs.h"
15339 #include <sys/types.h>
15340 int
15341@@ -4636,16 +4642,16 @@
15342 }
15343 _ACEOF
15344 rm -f conftest.$ac_objext
15345-if { (eval echo "$as_me:4639: \"$ac_compile\"") >&5
15346+if { (eval echo "$as_me:4645: \"$ac_compile\"") >&5
15347   (eval $ac_compile) 2>&5
15348   ac_status=$?
15349-  echo "$as_me:4642: \$? = $ac_status" >&5
15350+  echo "$as_me:4648: \$? = $ac_status" >&5
15351   (exit $ac_status); } &&
15352          { ac_try='test -s conftest.$ac_objext'
15353-  { (eval echo "$as_me:4645: \"$ac_try\"") >&5
15354+  { (eval echo "$as_me:4651: \"$ac_try\"") >&5
15355   (eval $ac_try) 2>&5
15356   ac_status=$?
15357-  echo "$as_me:4648: \$? = $ac_status" >&5
15358+  echo "$as_me:4654: \$? = $ac_status" >&5
15359   (exit $ac_status); }; }; then
15360   cf_cv_posix_c_source=no
15361 else
15362@@ -4666,7 +4672,7 @@
15363 	 esac
15364 	 if test "$cf_want_posix_source" = yes ; then
15365 		cat >conftest.$ac_ext <<_ACEOF
15366-#line 4669 "configure"
15367+#line 4675 "configure"
15368 #include "confdefs.h"
15369 #include <sys/types.h>
15370 int
15371@@ -4681,16 +4687,16 @@
15372 }
15373 _ACEOF
15374 rm -f conftest.$ac_objext
15375-if { (eval echo "$as_me:4684: \"$ac_compile\"") >&5
15376+if { (eval echo "$as_me:4690: \"$ac_compile\"") >&5
15377   (eval $ac_compile) 2>&5
15378   ac_status=$?
15379-  echo "$as_me:4687: \$? = $ac_status" >&5
15380+  echo "$as_me:4693: \$? = $ac_status" >&5
15381   (exit $ac_status); } &&
15382          { ac_try='test -s conftest.$ac_objext'
15383-  { (eval echo "$as_me:4690: \"$ac_try\"") >&5
15384+  { (eval echo "$as_me:4696: \"$ac_try\"") >&5
15385   (eval $ac_try) 2>&5
15386   ac_status=$?
15387-  echo "$as_me:4693: \$? = $ac_status" >&5
15388+  echo "$as_me:4699: \$? = $ac_status" >&5
15389   (exit $ac_status); }; }; then
15390   :
15391 else
15392@@ -4701,7 +4707,7 @@
15393 rm -f conftest.$ac_objext conftest.$ac_ext
15394 	 fi
15395
15396-echo "${as_me:-configure}:4704: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
15397+echo "${as_me:-configure}:4710: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
15398
15399 	 CFLAGS="$cf_trim_CFLAGS"
15400 	 CPPFLAGS="$cf_trim_CPPFLAGS"
15401@@ -4709,10 +4715,10 @@
15402 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
15403 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
15404
15405-echo "${as_me:-configure}:4712: testing if the second compile does not leave our definition intact error ..." 1>&5
15406+echo "${as_me:-configure}:4718: testing if the second compile does not leave our definition intact error ..." 1>&5
15407
15408 	 cat >conftest.$ac_ext <<_ACEOF
15409-#line 4715 "configure"
15410+#line 4721 "configure"
15411 #include "confdefs.h"
15412 #include <sys/types.h>
15413 int
15414@@ -4727,16 +4733,16 @@
15415 }
15416 _ACEOF
15417 rm -f conftest.$ac_objext
15418-if { (eval echo "$as_me:4730: \"$ac_compile\"") >&5
15419+if { (eval echo "$as_me:4736: \"$ac_compile\"") >&5
15420   (eval $ac_compile) 2>&5
15421   ac_status=$?
15422-  echo "$as_me:4733: \$? = $ac_status" >&5
15423+  echo "$as_me:4739: \$? = $ac_status" >&5
15424   (exit $ac_status); } &&
15425          { ac_try='test -s conftest.$ac_objext'
15426-  { (eval echo "$as_me:4736: \"$ac_try\"") >&5
15427+  { (eval echo "$as_me:4742: \"$ac_try\"") >&5
15428   (eval $ac_try) 2>&5
15429   ac_status=$?
15430-  echo "$as_me:4739: \$? = $ac_status" >&5
15431+  echo "$as_me:4745: \$? = $ac_status" >&5
15432   (exit $ac_status); }; }; then
15433   :
15434 else
15435@@ -4752,7 +4758,7 @@
15436 rm -f conftest.$ac_objext conftest.$ac_ext
15437
15438 fi
15439-echo "$as_me:4755: result: $cf_cv_posix_c_source" >&5
15440+echo "$as_me:4761: result: $cf_cv_posix_c_source" >&5
15441 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
15442
15443 if test "$cf_cv_posix_c_source" != no ; then
15444@@ -4946,7 +4952,7 @@
15445 if test -n "$cf_new_cflags" ; then
15446 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
15447
15448-echo "${as_me:-configure}:4949: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
15449+echo "${as_me:-configure}:4955: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
15450
15451 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
15452 	CFLAGS="${CFLAGS}$cf_new_cflags"
15453@@ -4956,7 +4962,7 @@
15454 if test -n "$cf_new_cppflags" ; then
15455 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
15456
15457-echo "${as_me:-configure}:4959: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
15458+echo "${as_me:-configure}:4965: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
15459
15460 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
15461 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
15462@@ -4966,7 +4972,7 @@
15463 if test -n "$cf_new_extra_cppflags" ; then
15464 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
15465
15466-echo "${as_me:-configure}:4969: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
15467+echo "${as_me:-configure}:4975: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
15468
15469 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
15470 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
15471@@ -4976,10 +4982,10 @@
15472 fi
15473
15474 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
15475-	echo "$as_me:4979: checking if _XOPEN_SOURCE really is set" >&5
15476+	echo "$as_me:4985: checking if _XOPEN_SOURCE really is set" >&5
15477 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
15478 	cat >conftest.$ac_ext <<_ACEOF
15479-#line 4982 "configure"
15480+#line 4988 "configure"
15481 #include "confdefs.h"
15482 #include <stdlib.h>
15483 int
15484@@ -4994,16 +5000,16 @@
15485 }
15486 _ACEOF
15487 rm -f conftest.$ac_objext
15488-if { (eval echo "$as_me:4997: \"$ac_compile\"") >&5
15489+if { (eval echo "$as_me:5003: \"$ac_compile\"") >&5
15490   (eval $ac_compile) 2>&5
15491   ac_status=$?
15492-  echo "$as_me:5000: \$? = $ac_status" >&5
15493+  echo "$as_me:5006: \$? = $ac_status" >&5
15494   (exit $ac_status); } &&
15495          { ac_try='test -s conftest.$ac_objext'
15496-  { (eval echo "$as_me:5003: \"$ac_try\"") >&5
15497+  { (eval echo "$as_me:5009: \"$ac_try\"") >&5
15498   (eval $ac_try) 2>&5
15499   ac_status=$?
15500-  echo "$as_me:5006: \$? = $ac_status" >&5
15501+  echo "$as_me:5012: \$? = $ac_status" >&5
15502   (exit $ac_status); }; }; then
15503   cf_XOPEN_SOURCE_set=yes
15504 else
15505@@ -5012,12 +5018,12 @@
15506 cf_XOPEN_SOURCE_set=no
15507 fi
15508 rm -f conftest.$ac_objext conftest.$ac_ext
15509-	echo "$as_me:5015: result: $cf_XOPEN_SOURCE_set" >&5
15510+	echo "$as_me:5021: result: $cf_XOPEN_SOURCE_set" >&5
15511 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
15512 	if test $cf_XOPEN_SOURCE_set = yes
15513 	then
15514 		cat >conftest.$ac_ext <<_ACEOF
15515-#line 5020 "configure"
15516+#line 5026 "configure"
15517 #include "confdefs.h"
15518 #include <stdlib.h>
15519 int
15520@@ -5032,16 +5038,16 @@
15521 }
15522 _ACEOF
15523 rm -f conftest.$ac_objext
15524-if { (eval echo "$as_me:5035: \"$ac_compile\"") >&5
15525+if { (eval echo "$as_me:5041: \"$ac_compile\"") >&5
15526   (eval $ac_compile) 2>&5
15527   ac_status=$?
15528-  echo "$as_me:5038: \$? = $ac_status" >&5
15529+  echo "$as_me:5044: \$? = $ac_status" >&5
15530   (exit $ac_status); } &&
15531          { ac_try='test -s conftest.$ac_objext'
15532-  { (eval echo "$as_me:5041: \"$ac_try\"") >&5
15533+  { (eval echo "$as_me:5047: \"$ac_try\"") >&5
15534   (eval $ac_try) 2>&5
15535   ac_status=$?
15536-  echo "$as_me:5044: \$? = $ac_status" >&5
15537+  echo "$as_me:5050: \$? = $ac_status" >&5
15538   (exit $ac_status); }; }; then
15539   cf_XOPEN_SOURCE_set_ok=yes
15540 else
15541@@ -5052,19 +5058,19 @@
15542 rm -f conftest.$ac_objext conftest.$ac_ext
15543 		if test $cf_XOPEN_SOURCE_set_ok = no
15544 		then
15545-			{ echo "$as_me:5055: WARNING: _XOPEN_SOURCE is lower than requested" >&5
15546+			{ echo "$as_me:5061: WARNING: _XOPEN_SOURCE is lower than requested" >&5
15547 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
15548 		fi
15549 	else
15550
15551-echo "$as_me:5060: checking if we should define _XOPEN_SOURCE" >&5
15552+echo "$as_me:5066: checking if we should define _XOPEN_SOURCE" >&5
15553 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
15554 if test "${cf_cv_xopen_source+set}" = set; then
15555   echo $ECHO_N "(cached) $ECHO_C" >&6
15556 else
15557
15558 	cat >conftest.$ac_ext <<_ACEOF
15559-#line 5067 "configure"
15560+#line 5073 "configure"
15561 #include "confdefs.h"
15562
15563 #include <stdlib.h>
15564@@ -5083,16 +5089,16 @@
15565 }
15566 _ACEOF
15567 rm -f conftest.$ac_objext
15568-if { (eval echo "$as_me:5086: \"$ac_compile\"") >&5
15569+if { (eval echo "$as_me:5092: \"$ac_compile\"") >&5
15570   (eval $ac_compile) 2>&5
15571   ac_status=$?
15572-  echo "$as_me:5089: \$? = $ac_status" >&5
15573+  echo "$as_me:5095: \$? = $ac_status" >&5
15574   (exit $ac_status); } &&
15575          { ac_try='test -s conftest.$ac_objext'
15576-  { (eval echo "$as_me:5092: \"$ac_try\"") >&5
15577+  { (eval echo "$as_me:5098: \"$ac_try\"") >&5
15578   (eval $ac_try) 2>&5
15579   ac_status=$?
15580-  echo "$as_me:5095: \$? = $ac_status" >&5
15581+  echo "$as_me:5101: \$? = $ac_status" >&5
15582   (exit $ac_status); }; }; then
15583   cf_cv_xopen_source=no
15584 else
15585@@ -5104,7 +5110,7 @@
15586 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
15587
15588 	 cat >conftest.$ac_ext <<_ACEOF
15589-#line 5107 "configure"
15590+#line 5113 "configure"
15591 #include "confdefs.h"
15592
15593 #include <stdlib.h>
15594@@ -5123,16 +5129,16 @@
15595 }
15596 _ACEOF
15597 rm -f conftest.$ac_objext
15598-if { (eval echo "$as_me:5126: \"$ac_compile\"") >&5
15599+if { (eval echo "$as_me:5132: \"$ac_compile\"") >&5
15600   (eval $ac_compile) 2>&5
15601   ac_status=$?
15602-  echo "$as_me:5129: \$? = $ac_status" >&5
15603+  echo "$as_me:5135: \$? = $ac_status" >&5
15604   (exit $ac_status); } &&
15605          { ac_try='test -s conftest.$ac_objext'
15606-  { (eval echo "$as_me:5132: \"$ac_try\"") >&5
15607+  { (eval echo "$as_me:5138: \"$ac_try\"") >&5
15608   (eval $ac_try) 2>&5
15609   ac_status=$?
15610-  echo "$as_me:5135: \$? = $ac_status" >&5
15611+  echo "$as_me:5141: \$? = $ac_status" >&5
15612   (exit $ac_status); }; }; then
15613   cf_cv_xopen_source=no
15614 else
15615@@ -5147,7 +5153,7 @@
15616 rm -f conftest.$ac_objext conftest.$ac_ext
15617
15618 fi
15619-echo "$as_me:5150: result: $cf_cv_xopen_source" >&5
15620+echo "$as_me:5156: result: $cf_cv_xopen_source" >&5
15621 echo "${ECHO_T}$cf_cv_xopen_source" >&6
15622
15623 if test "$cf_cv_xopen_source" != no ; then
15624@@ -5266,7 +5272,7 @@
15625 fi
15626 fi # cf_cv_posix_visible
15627
15628-echo "$as_me:5269: checking for signal global datatype" >&5
15629+echo "$as_me:5275: checking for signal global datatype" >&5
15630 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
15631 if test "${cf_cv_sig_atomic_t+set}" = set; then
15632   echo $ECHO_N "(cached) $ECHO_C" >&6
15633@@ -5278,7 +5284,7 @@
15634 		"int"
15635 	do
15636 	cat >conftest.$ac_ext <<_ACEOF
15637-#line 5281 "configure"
15638+#line 5287 "configure"
15639 #include "confdefs.h"
15640
15641 #include <sys/types.h>
15642@@ -5301,16 +5307,16 @@
15643 }
15644 _ACEOF
15645 rm -f conftest.$ac_objext
15646-if { (eval echo "$as_me:5304: \"$ac_compile\"") >&5
15647+if { (eval echo "$as_me:5310: \"$ac_compile\"") >&5
15648   (eval $ac_compile) 2>&5
15649   ac_status=$?
15650-  echo "$as_me:5307: \$? = $ac_status" >&5
15651+  echo "$as_me:5313: \$? = $ac_status" >&5
15652   (exit $ac_status); } &&
15653          { ac_try='test -s conftest.$ac_objext'
15654-  { (eval echo "$as_me:5310: \"$ac_try\"") >&5
15655+  { (eval echo "$as_me:5316: \"$ac_try\"") >&5
15656   (eval $ac_try) 2>&5
15657   ac_status=$?
15658-  echo "$as_me:5313: \$? = $ac_status" >&5
15659+  echo "$as_me:5319: \$? = $ac_status" >&5
15660   (exit $ac_status); }; }; then
15661   cf_cv_sig_atomic_t=$cf_type
15662 else
15663@@ -5324,7 +5330,7 @@
15664
15665 fi
15666
15667-echo "$as_me:5327: result: $cf_cv_sig_atomic_t" >&5
15668+echo "$as_me:5333: result: $cf_cv_sig_atomic_t" >&5
15669 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
15670 test "$cf_cv_sig_atomic_t" != no &&
15671 cat >>confdefs.h <<EOF
15672@@ -5333,14 +5339,14 @@
15673
15674 # Work around breakage on OS X
15675
15676-echo "$as_me:5336: checking if SIGWINCH is defined" >&5
15677+echo "$as_me:5342: checking if SIGWINCH is defined" >&5
15678 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
15679 if test "${cf_cv_define_sigwinch+set}" = set; then
15680   echo $ECHO_N "(cached) $ECHO_C" >&6
15681 else
15682
15683 	cat >conftest.$ac_ext <<_ACEOF
15684-#line 5343 "configure"
15685+#line 5349 "configure"
15686 #include "confdefs.h"
15687
15688 #include <sys/types.h>
15689@@ -5355,23 +5361,23 @@
15690 }
15691 _ACEOF
15692 rm -f conftest.$ac_objext
15693-if { (eval echo "$as_me:5358: \"$ac_compile\"") >&5
15694+if { (eval echo "$as_me:5364: \"$ac_compile\"") >&5
15695   (eval $ac_compile) 2>&5
15696   ac_status=$?
15697-  echo "$as_me:5361: \$? = $ac_status" >&5
15698+  echo "$as_me:5367: \$? = $ac_status" >&5
15699   (exit $ac_status); } &&
15700          { ac_try='test -s conftest.$ac_objext'
15701-  { (eval echo "$as_me:5364: \"$ac_try\"") >&5
15702+  { (eval echo "$as_me:5370: \"$ac_try\"") >&5
15703   (eval $ac_try) 2>&5
15704   ac_status=$?
15705-  echo "$as_me:5367: \$? = $ac_status" >&5
15706+  echo "$as_me:5373: \$? = $ac_status" >&5
15707   (exit $ac_status); }; }; then
15708   cf_cv_define_sigwinch=yes
15709 else
15710   echo "$as_me: failed program was:" >&5
15711 cat conftest.$ac_ext >&5
15712 cat >conftest.$ac_ext <<_ACEOF
15713-#line 5374 "configure"
15714+#line 5380 "configure"
15715 #include "confdefs.h"
15716
15717 #undef _XOPEN_SOURCE
15718@@ -5389,16 +5395,16 @@
15719 }
15720 _ACEOF
15721 rm -f conftest.$ac_objext
15722-if { (eval echo "$as_me:5392: \"$ac_compile\"") >&5
15723+if { (eval echo "$as_me:5398: \"$ac_compile\"") >&5
15724   (eval $ac_compile) 2>&5
15725   ac_status=$?
15726-  echo "$as_me:5395: \$? = $ac_status" >&5
15727+  echo "$as_me:5401: \$? = $ac_status" >&5
15728   (exit $ac_status); } &&
15729          { ac_try='test -s conftest.$ac_objext'
15730-  { (eval echo "$as_me:5398: \"$ac_try\"") >&5
15731+  { (eval echo "$as_me:5404: \"$ac_try\"") >&5
15732   (eval $ac_try) 2>&5
15733   ac_status=$?
15734-  echo "$as_me:5401: \$? = $ac_status" >&5
15735+  echo "$as_me:5407: \$? = $ac_status" >&5
15736   (exit $ac_status); }; }; then
15737   cf_cv_define_sigwinch=maybe
15738 else
15739@@ -5412,11 +5418,11 @@
15740 rm -f conftest.$ac_objext conftest.$ac_ext
15741
15742 fi
15743-echo "$as_me:5415: result: $cf_cv_define_sigwinch" >&5
15744+echo "$as_me:5421: result: $cf_cv_define_sigwinch" >&5
15745 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
15746
15747 if test "$cf_cv_define_sigwinch" = maybe ; then
15748-echo "$as_me:5419: checking for actual SIGWINCH definition" >&5
15749+echo "$as_me:5425: checking for actual SIGWINCH definition" >&5
15750 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
15751 if test "${cf_cv_fixup_sigwinch+set}" = set; then
15752   echo $ECHO_N "(cached) $ECHO_C" >&6
15753@@ -5427,7 +5433,7 @@
15754 while test $cf_sigwinch != 1
15755 do
15756 	cat >conftest.$ac_ext <<_ACEOF
15757-#line 5430 "configure"
15758+#line 5436 "configure"
15759 #include "confdefs.h"
15760
15761 #undef _XOPEN_SOURCE
15762@@ -5449,16 +5455,16 @@
15763 }
15764 _ACEOF
15765 rm -f conftest.$ac_objext
15766-if { (eval echo "$as_me:5452: \"$ac_compile\"") >&5
15767+if { (eval echo "$as_me:5458: \"$ac_compile\"") >&5
15768   (eval $ac_compile) 2>&5
15769   ac_status=$?
15770-  echo "$as_me:5455: \$? = $ac_status" >&5
15771+  echo "$as_me:5461: \$? = $ac_status" >&5
15772   (exit $ac_status); } &&
15773          { ac_try='test -s conftest.$ac_objext'
15774-  { (eval echo "$as_me:5458: \"$ac_try\"") >&5
15775+  { (eval echo "$as_me:5464: \"$ac_try\"") >&5
15776   (eval $ac_try) 2>&5
15777   ac_status=$?
15778-  echo "$as_me:5461: \$? = $ac_status" >&5
15779+  echo "$as_me:5467: \$? = $ac_status" >&5
15780   (exit $ac_status); }; }; then
15781   cf_cv_fixup_sigwinch=$cf_sigwinch
15782 	 break
15783@@ -5472,7 +5478,7 @@
15784 done
15785
15786 fi
15787-echo "$as_me:5475: result: $cf_cv_fixup_sigwinch" >&5
15788+echo "$as_me:5481: result: $cf_cv_fixup_sigwinch" >&5
15789 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
15790
15791 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
15792@@ -5482,13 +5488,13 @@
15793
15794 # Checks for CODESET support.
15795
15796-echo "$as_me:5485: checking for nl_langinfo and CODESET" >&5
15797+echo "$as_me:5491: checking for nl_langinfo and CODESET" >&5
15798 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
15799 if test "${am_cv_langinfo_codeset+set}" = set; then
15800   echo $ECHO_N "(cached) $ECHO_C" >&6
15801 else
15802   cat >conftest.$ac_ext <<_ACEOF
15803-#line 5491 "configure"
15804+#line 5497 "configure"
15805 #include "confdefs.h"
15806 #include <langinfo.h>
15807 int
15808@@ -5500,16 +5506,16 @@
15809 }
15810 _ACEOF
15811 rm -f conftest.$ac_objext conftest$ac_exeext
15812-if { (eval echo "$as_me:5503: \"$ac_link\"") >&5
15813+if { (eval echo "$as_me:5509: \"$ac_link\"") >&5
15814   (eval $ac_link) 2>&5
15815   ac_status=$?
15816-  echo "$as_me:5506: \$? = $ac_status" >&5
15817+  echo "$as_me:5512: \$? = $ac_status" >&5
15818   (exit $ac_status); } &&
15819          { ac_try='test -s conftest$ac_exeext'
15820-  { (eval echo "$as_me:5509: \"$ac_try\"") >&5
15821+  { (eval echo "$as_me:5515: \"$ac_try\"") >&5
15822   (eval $ac_try) 2>&5
15823   ac_status=$?
15824-  echo "$as_me:5512: \$? = $ac_status" >&5
15825+  echo "$as_me:5518: \$? = $ac_status" >&5
15826   (exit $ac_status); }; }; then
15827   am_cv_langinfo_codeset=yes
15828 else
15829@@ -5520,7 +5526,7 @@
15830 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
15831
15832 fi
15833-echo "$as_me:5523: result: $am_cv_langinfo_codeset" >&5
15834+echo "$as_me:5529: result: $am_cv_langinfo_codeset" >&5
15835 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
15836 	if test $am_cv_langinfo_codeset = yes; then
15837
15838@@ -5530,7 +5536,7 @@
15839
15840 	fi
15841
15842-echo "$as_me:5533: checking if you want to use pkg-config" >&5
15843+echo "$as_me:5539: checking if you want to use pkg-config" >&5
15844 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
15845
15846 # Check whether --with-pkg-config or --without-pkg-config was given.
15847@@ -5540,7 +5546,7 @@
15848 else
15849   cf_pkg_config=yes
15850 fi;
15851-echo "$as_me:5543: result: $cf_pkg_config" >&5
15852+echo "$as_me:5549: result: $cf_pkg_config" >&5
15853 echo "${ECHO_T}$cf_pkg_config" >&6
15854
15855 case $cf_pkg_config in
15856@@ -5552,7 +5558,7 @@
15857 if test -n "$ac_tool_prefix"; then
15858   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
15859 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
15860-echo "$as_me:5555: checking for $ac_word" >&5
15861+echo "$as_me:5561: checking for $ac_word" >&5
15862 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
15863 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
15864   echo $ECHO_N "(cached) $ECHO_C" >&6
15865@@ -5569,7 +5575,7 @@
15866   test -z "$ac_dir" && ac_dir=.
15867   if $as_executable_p "$ac_dir/$ac_word"; then
15868    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
15869-   echo "$as_me:5572: found $ac_dir/$ac_word" >&5
15870+   echo "$as_me:5578: found $ac_dir/$ac_word" >&5
15871    break
15872 fi
15873 done
15874@@ -5580,10 +5586,10 @@
15875 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
15876
15877 if test -n "$PKG_CONFIG"; then
15878-  echo "$as_me:5583: result: $PKG_CONFIG" >&5
15879+  echo "$as_me:5589: result: $PKG_CONFIG" >&5
15880 echo "${ECHO_T}$PKG_CONFIG" >&6
15881 else
15882-  echo "$as_me:5586: result: no" >&5
15883+  echo "$as_me:5592: result: no" >&5
15884 echo "${ECHO_T}no" >&6
15885 fi
15886
15887@@ -5592,7 +5598,7 @@
15888   ac_pt_PKG_CONFIG=$PKG_CONFIG
15889   # Extract the first word of "pkg-config", so it can be a program name with args.
15890 set dummy pkg-config; ac_word=$2
15891-echo "$as_me:5595: checking for $ac_word" >&5
15892+echo "$as_me:5601: checking for $ac_word" >&5
15893 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
15894 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
15895   echo $ECHO_N "(cached) $ECHO_C" >&6
15896@@ -5609,7 +5615,7 @@
15897   test -z "$ac_dir" && ac_dir=.
15898   if $as_executable_p "$ac_dir/$ac_word"; then
15899    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
15900-   echo "$as_me:5612: found $ac_dir/$ac_word" >&5
15901+   echo "$as_me:5618: found $ac_dir/$ac_word" >&5
15902    break
15903 fi
15904 done
15905@@ -5621,10 +5627,10 @@
15906 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
15907
15908 if test -n "$ac_pt_PKG_CONFIG"; then
15909-  echo "$as_me:5624: result: $ac_pt_PKG_CONFIG" >&5
15910+  echo "$as_me:5630: result: $ac_pt_PKG_CONFIG" >&5
15911 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
15912 else
15913-  echo "$as_me:5627: result: no" >&5
15914+  echo "$as_me:5633: result: no" >&5
15915 echo "${ECHO_T}no" >&6
15916 fi
15917
15918@@ -5667,18 +5673,18 @@
15919 	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
15920 	;;
15921 (*)
15922-	{ { echo "$as_me:5670: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
15923+	{ { echo "$as_me:5676: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
15924 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
15925    { (exit 1); exit 1; }; }
15926 	;;
15927 esac
15928
15929 elif test "x$cf_pkg_config" != xno ; then
15930-	{ echo "$as_me:5677: WARNING: pkg-config is not installed" >&5
15931+	{ echo "$as_me:5683: WARNING: pkg-config is not installed" >&5
15932 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
15933 fi
15934
15935-echo "$as_me:5681: checking if you want to see long compiling messages" >&5
15936+echo "$as_me:5687: checking if you want to see long compiling messages" >&5
15937 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
15938
15939 # Check whether --enable-echo or --disable-echo was given.
15940@@ -5712,10 +5718,10 @@
15941 	ECHO_CC=''
15942
15943 fi;
15944-echo "$as_me:5715: result: $enableval" >&5
15945+echo "$as_me:5721: result: $enableval" >&5
15946 echo "${ECHO_T}$enableval" >&6
15947
15948-echo "$as_me:5718: checking for ncurses wrap-prefix" >&5
15949+echo "$as_me:5724: checking for ncurses wrap-prefix" >&5
15950 echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6
15951
15952 # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given.
15953@@ -5725,10 +5731,10 @@
15954 else
15955   NCURSES_WRAP_PREFIX=_nc_
15956 fi;
15957-echo "$as_me:5728: result: $NCURSES_WRAP_PREFIX" >&5
15958+echo "$as_me:5734: result: $NCURSES_WRAP_PREFIX" >&5
15959 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
15960
15961-echo "$as_me:5731: checking if you want to check for wide-character functions" >&5
15962+echo "$as_me:5737: checking if you want to check for wide-character functions" >&5
15963 echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6
15964
15965 # Check whether --enable-widec or --disable-widec was given.
15966@@ -5745,10 +5751,10 @@
15967 	cf_enable_widec=yes
15968
15969 fi;
15970-echo "$as_me:5748: result: $cf_enable_widec" >&5
15971+echo "$as_me:5754: result: $cf_enable_widec" >&5
15972 echo "${ECHO_T}$cf_enable_widec" >&6
15973
15974-echo "$as_me:5751: checking for specific curses-directory" >&5
15975+echo "$as_me:5757: checking for specific curses-directory" >&5
15976 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
15977
15978 # Check whether --with-curses-dir or --without-curses-dir was given.
15979@@ -5758,7 +5764,7 @@
15980 else
15981   cf_cv_curses_dir=no
15982 fi;
15983-echo "$as_me:5761: result: $cf_cv_curses_dir" >&5
15984+echo "$as_me:5767: result: $cf_cv_curses_dir" >&5
15985 echo "${ECHO_T}$cf_cv_curses_dir" >&6
15986
15987 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
15988@@ -5789,7 +5795,7 @@
15989 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
15990 	;;
15991 (*)
15992-	{ { echo "$as_me:5792: error: expected a pathname, not \"$withval\"" >&5
15993+	{ { echo "$as_me:5798: error: expected a pathname, not \"$withval\"" >&5
15994 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
15995    { (exit 1); exit 1; }; }
15996 	;;
15997@@ -5825,7 +5831,7 @@
15998 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
15999
16000 			  cat >conftest.$ac_ext <<_ACEOF
16001-#line 5828 "configure"
16002+#line 5834 "configure"
16003 #include "confdefs.h"
16004 #include <stdio.h>
16005 int
16006@@ -5837,16 +5843,16 @@
16007 }
16008 _ACEOF
16009 rm -f conftest.$ac_objext
16010-if { (eval echo "$as_me:5840: \"$ac_compile\"") >&5
16011+if { (eval echo "$as_me:5846: \"$ac_compile\"") >&5
16012   (eval $ac_compile) 2>&5
16013   ac_status=$?
16014-  echo "$as_me:5843: \$? = $ac_status" >&5
16015+  echo "$as_me:5849: \$? = $ac_status" >&5
16016   (exit $ac_status); } &&
16017          { ac_try='test -s conftest.$ac_objext'
16018-  { (eval echo "$as_me:5846: \"$ac_try\"") >&5
16019+  { (eval echo "$as_me:5852: \"$ac_try\"") >&5
16020   (eval $ac_try) 2>&5
16021   ac_status=$?
16022-  echo "$as_me:5849: \$? = $ac_status" >&5
16023+  echo "$as_me:5855: \$? = $ac_status" >&5
16024   (exit $ac_status); }; }; then
16025   :
16026 else
16027@@ -5863,7 +5869,7 @@
16028 		if test "$cf_have_incdir" = no ; then
16029 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
16030
16031-echo "${as_me:-configure}:5866: testing adding $cf_add_incdir to include-path ..." 1>&5
16032+echo "${as_me:-configure}:5872: testing adding $cf_add_incdir to include-path ..." 1>&5
16033
16034 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
16035
16036@@ -5899,7 +5905,7 @@
16037 			if test "$cf_have_libdir" = no ; then
16038 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
16039
16040-echo "${as_me:-configure}:5902: testing adding $cf_add_libdir to library-path ..." 1>&5
16041+echo "${as_me:-configure}:5908: testing adding $cf_add_libdir to library-path ..." 1>&5
16042
16043 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
16044 			fi
16045@@ -5912,7 +5918,7 @@
16046
16047 cf_cv_screen=curses
16048
16049-echo "$as_me:5915: checking for specified curses library type" >&5
16050+echo "$as_me:5921: checking for specified curses library type" >&5
16051 echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6
16052
16053 # Check whether --with-screen or --without-screen was given.
16054@@ -5956,13 +5962,13 @@
16055 fi;
16056 fi;
16057
16058-echo "$as_me:5959: result: $cf_cv_screen" >&5
16059+echo "$as_me:5965: result: $cf_cv_screen" >&5
16060 echo "${ECHO_T}$cf_cv_screen" >&6
16061
16062 case $cf_cv_screen in
16063 (curses|curses_*)
16064
16065-echo "$as_me:5965: checking for extra include directories" >&5
16066+echo "$as_me:5971: checking for extra include directories" >&5
16067 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
16068 if test "${cf_cv_curses_incdir+set}" = set; then
16069   echo $ECHO_N "(cached) $ECHO_C" >&6
16070@@ -5988,7 +5994,7 @@
16071 esac
16072
16073 fi
16074-echo "$as_me:5991: result: $cf_cv_curses_incdir" >&5
16075+echo "$as_me:5997: result: $cf_cv_curses_incdir" >&5
16076 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
16077 if test "$cf_cv_curses_incdir" != no
16078 then
16079@@ -5998,7 +6004,7 @@
16080
16081 fi
16082
16083-echo "$as_me:6001: checking if we have identified curses headers" >&5
16084+echo "$as_me:6007: checking if we have identified curses headers" >&5
16085 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
16086 if test "${cf_cv_ncurses_header+set}" = set; then
16087   echo $ECHO_N "(cached) $ECHO_C" >&6
16088@@ -6010,7 +6016,7 @@
16089 	curses.h  ncurses/ncurses.h ncurses/curses.h
16090 do
16091 cat >conftest.$ac_ext <<_ACEOF
16092-#line 6013 "configure"
16093+#line 6019 "configure"
16094 #include "confdefs.h"
16095 #include <${cf_header}>
16096 int
16097@@ -6022,16 +6028,16 @@
16098 }
16099 _ACEOF
16100 rm -f conftest.$ac_objext
16101-if { (eval echo "$as_me:6025: \"$ac_compile\"") >&5
16102+if { (eval echo "$as_me:6031: \"$ac_compile\"") >&5
16103   (eval $ac_compile) 2>&5
16104   ac_status=$?
16105-  echo "$as_me:6028: \$? = $ac_status" >&5
16106+  echo "$as_me:6034: \$? = $ac_status" >&5
16107   (exit $ac_status); } &&
16108          { ac_try='test -s conftest.$ac_objext'
16109-  { (eval echo "$as_me:6031: \"$ac_try\"") >&5
16110+  { (eval echo "$as_me:6037: \"$ac_try\"") >&5
16111   (eval $ac_try) 2>&5
16112   ac_status=$?
16113-  echo "$as_me:6034: \$? = $ac_status" >&5
16114+  echo "$as_me:6040: \$? = $ac_status" >&5
16115   (exit $ac_status); }; }; then
16116   cf_cv_ncurses_header=$cf_header; break
16117 else
16118@@ -6042,11 +6048,11 @@
16119 done
16120
16121 fi
16122-echo "$as_me:6045: result: $cf_cv_ncurses_header" >&5
16123+echo "$as_me:6051: result: $cf_cv_ncurses_header" >&5
16124 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
16125
16126 if test "$cf_cv_ncurses_header" = none ; then
16127-	{ { echo "$as_me:6049: error: No curses header-files found" >&5
16128+	{ { echo "$as_me:6055: error: No curses header-files found" >&5
16129 echo "$as_me: error: No curses header-files found" >&2;}
16130    { (exit 1); exit 1; }; }
16131 fi
16132@@ -6056,23 +6062,23 @@
16133 for ac_header in $cf_cv_ncurses_header
16134 do
16135 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
16136-echo "$as_me:6059: checking for $ac_header" >&5
16137+echo "$as_me:6065: checking for $ac_header" >&5
16138 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
16139 if eval "test \"\${$as_ac_Header+set}\" = set"; then
16140   echo $ECHO_N "(cached) $ECHO_C" >&6
16141 else
16142   cat >conftest.$ac_ext <<_ACEOF
16143-#line 6065 "configure"
16144+#line 6071 "configure"
16145 #include "confdefs.h"
16146 #include <$ac_header>
16147 _ACEOF
16148-if { (eval echo "$as_me:6069: \"$ac_cpp conftest.$ac_ext\"") >&5
16149+if { (eval echo "$as_me:6075: \"$ac_cpp conftest.$ac_ext\"") >&5
16150   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
16151   ac_status=$?
16152   egrep -v '^ *\+' conftest.er1 >conftest.err
16153   rm -f conftest.er1
16154   cat conftest.err >&5
16155-  echo "$as_me:6075: \$? = $ac_status" >&5
16156+  echo "$as_me:6081: \$? = $ac_status" >&5
16157   (exit $ac_status); } >/dev/null; then
16158   if test -s conftest.err; then
16159     ac_cpp_err=$ac_c_preproc_warn_flag
16160@@ -6091,7 +6097,7 @@
16161 fi
16162 rm -f conftest.err conftest.$ac_ext
16163 fi
16164-echo "$as_me:6094: result: `eval echo '${'$as_ac_Header'}'`" >&5
16165+echo "$as_me:6100: result: `eval echo '${'$as_ac_Header'}'`" >&5
16166 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
16167 if test `eval echo '${'$as_ac_Header'}'` = yes; then
16168   cat >>confdefs.h <<EOF
16169@@ -6101,7 +6107,7 @@
16170 fi
16171 done
16172
16173-echo "$as_me:6104: checking for terminfo header" >&5
16174+echo "$as_me:6110: checking for terminfo header" >&5
16175 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
16176 if test "${cf_cv_term_header+set}" = set; then
16177   echo $ECHO_N "(cached) $ECHO_C" >&6
16178@@ -6119,7 +6125,7 @@
16179 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
16180 do
16181 cat >conftest.$ac_ext <<_ACEOF
16182-#line 6122 "configure"
16183+#line 6128 "configure"
16184 #include "confdefs.h"
16185 #include <stdio.h>
16186 #include <${cf_cv_ncurses_header:-curses.h}>
16187@@ -6134,16 +6140,16 @@
16188 }
16189 _ACEOF
16190 rm -f conftest.$ac_objext
16191-if { (eval echo "$as_me:6137: \"$ac_compile\"") >&5
16192+if { (eval echo "$as_me:6143: \"$ac_compile\"") >&5
16193   (eval $ac_compile) 2>&5
16194   ac_status=$?
16195-  echo "$as_me:6140: \$? = $ac_status" >&5
16196+  echo "$as_me:6146: \$? = $ac_status" >&5
16197   (exit $ac_status); } &&
16198          { ac_try='test -s conftest.$ac_objext'
16199-  { (eval echo "$as_me:6143: \"$ac_try\"") >&5
16200+  { (eval echo "$as_me:6149: \"$ac_try\"") >&5
16201   (eval $ac_try) 2>&5
16202   ac_status=$?
16203-  echo "$as_me:6146: \$? = $ac_status" >&5
16204+  echo "$as_me:6152: \$? = $ac_status" >&5
16205   (exit $ac_status); }; }; then
16206
16207 	cf_cv_term_header="$cf_test"
16208@@ -6159,7 +6165,7 @@
16209 done
16210
16211 fi
16212-echo "$as_me:6162: result: $cf_cv_term_header" >&5
16213+echo "$as_me:6168: result: $cf_cv_term_header" >&5
16214 echo "${ECHO_T}$cf_cv_term_header" >&6
16215
16216 # Set definitions to allow ifdef'ing to accommodate subdirectories
16217@@ -6191,7 +6197,7 @@
16218 	;;
16219 esac
16220
16221-echo "$as_me:6194: checking for ncurses version" >&5
16222+echo "$as_me:6200: checking for ncurses version" >&5
16223 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
16224 if test "${cf_cv_ncurses_version+set}" = set; then
16225   echo $ECHO_N "(cached) $ECHO_C" >&6
16226@@ -6217,10 +6223,10 @@
16227 #endif
16228 EOF
16229 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
16230-	{ (eval echo "$as_me:6220: \"$cf_try\"") >&5
16231+	{ (eval echo "$as_me:6226: \"$cf_try\"") >&5
16232   (eval $cf_try) 2>&5
16233   ac_status=$?
16234-  echo "$as_me:6223: \$? = $ac_status" >&5
16235+  echo "$as_me:6229: \$? = $ac_status" >&5
16236   (exit $ac_status); }
16237 	if test -f conftest.out ; then
16238 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
16239@@ -6230,7 +6236,7 @@
16240
16241 else
16242   cat >conftest.$ac_ext <<_ACEOF
16243-#line 6233 "configure"
16244+#line 6239 "configure"
16245 #include "confdefs.h"
16246
16247 #include <${cf_cv_ncurses_header:-curses.h}>
16248@@ -6255,15 +6261,15 @@
16249 }
16250 _ACEOF
16251 rm -f conftest$ac_exeext
16252-if { (eval echo "$as_me:6258: \"$ac_link\"") >&5
16253+if { (eval echo "$as_me:6264: \"$ac_link\"") >&5
16254   (eval $ac_link) 2>&5
16255   ac_status=$?
16256-  echo "$as_me:6261: \$? = $ac_status" >&5
16257+  echo "$as_me:6267: \$? = $ac_status" >&5
16258   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
16259-  { (eval echo "$as_me:6263: \"$ac_try\"") >&5
16260+  { (eval echo "$as_me:6269: \"$ac_try\"") >&5
16261   (eval $ac_try) 2>&5
16262   ac_status=$?
16263-  echo "$as_me:6266: \$? = $ac_status" >&5
16264+  echo "$as_me:6272: \$? = $ac_status" >&5
16265   (exit $ac_status); }; }; then
16266
16267 	cf_cv_ncurses_version=`cat $cf_tempfile`
16268@@ -6277,17 +6283,17 @@
16269 	rm -f $cf_tempfile
16270
16271 fi
16272-echo "$as_me:6280: result: $cf_cv_ncurses_version" >&5
16273+echo "$as_me:6286: result: $cf_cv_ncurses_version" >&5
16274 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
16275 test "$cf_cv_ncurses_version" = no ||
16276 cat >>confdefs.h <<\EOF
16277 #define NCURSES 1
16278 EOF
16279
16280-echo "$as_me:6287: checking if we have identified curses libraries" >&5
16281+echo "$as_me:6293: checking if we have identified curses libraries" >&5
16282 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
16283 cat >conftest.$ac_ext <<_ACEOF
16284-#line 6290 "configure"
16285+#line 6296 "configure"
16286 #include "confdefs.h"
16287 #include <${cf_cv_ncurses_header:-curses.h}>
16288 int
16289@@ -6299,16 +6305,16 @@
16290 }
16291 _ACEOF
16292 rm -f conftest.$ac_objext conftest$ac_exeext
16293-if { (eval echo "$as_me:6302: \"$ac_link\"") >&5
16294+if { (eval echo "$as_me:6308: \"$ac_link\"") >&5
16295   (eval $ac_link) 2>&5
16296   ac_status=$?
16297-  echo "$as_me:6305: \$? = $ac_status" >&5
16298+  echo "$as_me:6311: \$? = $ac_status" >&5
16299   (exit $ac_status); } &&
16300          { ac_try='test -s conftest$ac_exeext'
16301-  { (eval echo "$as_me:6308: \"$ac_try\"") >&5
16302+  { (eval echo "$as_me:6314: \"$ac_try\"") >&5
16303   (eval $ac_try) 2>&5
16304   ac_status=$?
16305-  echo "$as_me:6311: \$? = $ac_status" >&5
16306+  echo "$as_me:6317: \$? = $ac_status" >&5
16307   (exit $ac_status); }; }; then
16308   cf_result=yes
16309 else
16310@@ -6317,13 +6323,13 @@
16311 cf_result=no
16312 fi
16313 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
16314-echo "$as_me:6320: result: $cf_result" >&5
16315+echo "$as_me:6326: result: $cf_result" >&5
16316 echo "${ECHO_T}$cf_result" >&6
16317
16318 if test "$cf_result" = no ; then
16319 case $host_os in
16320 (freebsd*)
16321-	echo "$as_me:6326: checking for tgoto in -lmytinfo" >&5
16322+	echo "$as_me:6332: checking for tgoto in -lmytinfo" >&5
16323 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
16324 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
16325   echo $ECHO_N "(cached) $ECHO_C" >&6
16326@@ -6331,7 +6337,7 @@
16327   ac_check_lib_save_LIBS=$LIBS
16328 LIBS="-lmytinfo  $LIBS"
16329 cat >conftest.$ac_ext <<_ACEOF
16330-#line 6334 "configure"
16331+#line 6340 "configure"
16332 #include "confdefs.h"
16333
16334 /* Override any gcc2 internal prototype to avoid an error.  */
16335@@ -6350,16 +6356,16 @@
16336 }
16337 _ACEOF
16338 rm -f conftest.$ac_objext conftest$ac_exeext
16339-if { (eval echo "$as_me:6353: \"$ac_link\"") >&5
16340+if { (eval echo "$as_me:6359: \"$ac_link\"") >&5
16341   (eval $ac_link) 2>&5
16342   ac_status=$?
16343-  echo "$as_me:6356: \$? = $ac_status" >&5
16344+  echo "$as_me:6362: \$? = $ac_status" >&5
16345   (exit $ac_status); } &&
16346          { ac_try='test -s conftest$ac_exeext'
16347-  { (eval echo "$as_me:6359: \"$ac_try\"") >&5
16348+  { (eval echo "$as_me:6365: \"$ac_try\"") >&5
16349   (eval $ac_try) 2>&5
16350   ac_status=$?
16351-  echo "$as_me:6362: \$? = $ac_status" >&5
16352+  echo "$as_me:6368: \$? = $ac_status" >&5
16353   (exit $ac_status); }; }; then
16354   ac_cv_lib_mytinfo_tgoto=yes
16355 else
16356@@ -6370,7 +6376,7 @@
16357 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
16358 LIBS=$ac_check_lib_save_LIBS
16359 fi
16360-echo "$as_me:6373: result: $ac_cv_lib_mytinfo_tgoto" >&5
16361+echo "$as_me:6379: result: $ac_cv_lib_mytinfo_tgoto" >&5
16362 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
16363 if test $ac_cv_lib_mytinfo_tgoto = yes; then
16364
16365@@ -6400,7 +6406,7 @@
16366 	# term.h) for cur_colr
16367 	if test "x$cf_cv_screen" = "xcurses_colr"
16368 	then
16369-		echo "$as_me:6403: checking for initscr in -lcur_colr" >&5
16370+		echo "$as_me:6409: checking for initscr in -lcur_colr" >&5
16371 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
16372 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
16373   echo $ECHO_N "(cached) $ECHO_C" >&6
16374@@ -6408,7 +6414,7 @@
16375   ac_check_lib_save_LIBS=$LIBS
16376 LIBS="-lcur_colr  $LIBS"
16377 cat >conftest.$ac_ext <<_ACEOF
16378-#line 6411 "configure"
16379+#line 6417 "configure"
16380 #include "confdefs.h"
16381
16382 /* Override any gcc2 internal prototype to avoid an error.  */
16383@@ -6427,16 +6433,16 @@
16384 }
16385 _ACEOF
16386 rm -f conftest.$ac_objext conftest$ac_exeext
16387-if { (eval echo "$as_me:6430: \"$ac_link\"") >&5
16388+if { (eval echo "$as_me:6436: \"$ac_link\"") >&5
16389   (eval $ac_link) 2>&5
16390   ac_status=$?
16391-  echo "$as_me:6433: \$? = $ac_status" >&5
16392+  echo "$as_me:6439: \$? = $ac_status" >&5
16393   (exit $ac_status); } &&
16394          { ac_try='test -s conftest$ac_exeext'
16395-  { (eval echo "$as_me:6436: \"$ac_try\"") >&5
16396+  { (eval echo "$as_me:6442: \"$ac_try\"") >&5
16397   (eval $ac_try) 2>&5
16398   ac_status=$?
16399-  echo "$as_me:6439: \$? = $ac_status" >&5
16400+  echo "$as_me:6445: \$? = $ac_status" >&5
16401   (exit $ac_status); }; }; then
16402   ac_cv_lib_cur_colr_initscr=yes
16403 else
16404@@ -6447,7 +6453,7 @@
16405 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
16406 LIBS=$ac_check_lib_save_LIBS
16407 fi
16408-echo "$as_me:6450: result: $ac_cv_lib_cur_colr_initscr" >&5
16409+echo "$as_me:6456: result: $ac_cv_lib_cur_colr_initscr" >&5
16410 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
16411 if test $ac_cv_lib_cur_colr_initscr = yes; then
16412
16413@@ -6471,7 +6477,7 @@
16414
16415 else
16416
16417-		echo "$as_me:6474: checking for initscr in -lHcurses" >&5
16418+		echo "$as_me:6480: checking for initscr in -lHcurses" >&5
16419 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
16420 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
16421   echo $ECHO_N "(cached) $ECHO_C" >&6
16422@@ -6479,7 +6485,7 @@
16423   ac_check_lib_save_LIBS=$LIBS
16424 LIBS="-lHcurses  $LIBS"
16425 cat >conftest.$ac_ext <<_ACEOF
16426-#line 6482 "configure"
16427+#line 6488 "configure"
16428 #include "confdefs.h"
16429
16430 /* Override any gcc2 internal prototype to avoid an error.  */
16431@@ -6498,16 +6504,16 @@
16432 }
16433 _ACEOF
16434 rm -f conftest.$ac_objext conftest$ac_exeext
16435-if { (eval echo "$as_me:6501: \"$ac_link\"") >&5
16436+if { (eval echo "$as_me:6507: \"$ac_link\"") >&5
16437   (eval $ac_link) 2>&5
16438   ac_status=$?
16439-  echo "$as_me:6504: \$? = $ac_status" >&5
16440+  echo "$as_me:6510: \$? = $ac_status" >&5
16441   (exit $ac_status); } &&
16442          { ac_try='test -s conftest$ac_exeext'
16443-  { (eval echo "$as_me:6507: \"$ac_try\"") >&5
16444+  { (eval echo "$as_me:6513: \"$ac_try\"") >&5
16445   (eval $ac_try) 2>&5
16446   ac_status=$?
16447-  echo "$as_me:6510: \$? = $ac_status" >&5
16448+  echo "$as_me:6516: \$? = $ac_status" >&5
16449   (exit $ac_status); }; }; then
16450   ac_cv_lib_Hcurses_initscr=yes
16451 else
16452@@ -6518,7 +6524,7 @@
16453 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
16454 LIBS=$ac_check_lib_save_LIBS
16455 fi
16456-echo "$as_me:6521: result: $ac_cv_lib_Hcurses_initscr" >&5
16457+echo "$as_me:6527: result: $ac_cv_lib_Hcurses_initscr" >&5
16458 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
16459 if test $ac_cv_lib_Hcurses_initscr = yes; then
16460
16461@@ -6576,7 +6582,7 @@
16462 			if test "$cf_have_libdir" = no ; then
16463 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
16464
16465-echo "${as_me:-configure}:6579: testing adding $cf_add_libdir to library-path ..." 1>&5
16466+echo "${as_me:-configure}:6585: testing adding $cf_add_libdir to library-path ..." 1>&5
16467
16468 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
16469 			fi
16470@@ -6605,7 +6611,7 @@
16471 			if test "$cf_have_libdir" = no ; then
16472 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
16473
16474-echo "${as_me:-configure}:6608: testing adding $cf_add_libdir to library-path ..." 1>&5
16475+echo "${as_me:-configure}:6614: testing adding $cf_add_libdir to library-path ..." 1>&5
16476
16477 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
16478 			fi
16479@@ -6636,7 +6642,7 @@
16480 			if test "$cf_have_libdir" = no ; then
16481 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
16482
16483-echo "${as_me:-configure}:6639: testing adding $cf_add_libdir to library-path ..." 1>&5
16484+echo "${as_me:-configure}:6645: testing adding $cf_add_libdir to library-path ..." 1>&5
16485
16486 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
16487 			fi
16488@@ -6671,7 +6677,7 @@
16489 			if test "$cf_have_libdir" = no ; then
16490 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
16491
16492-echo "${as_me:-configure}:6674: testing adding $cf_add_libdir to library-path ..." 1>&5
16493+echo "${as_me:-configure}:6680: testing adding $cf_add_libdir to library-path ..." 1>&5
16494
16495 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
16496 			fi
16497@@ -6715,13 +6721,13 @@
16498 	# because it may be needed to link the test-case for initscr.
16499 	if test "x$cf_term_lib" = x
16500 	then
16501-		echo "$as_me:6718: checking for tgoto" >&5
16502+		echo "$as_me:6724: checking for tgoto" >&5
16503 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
16504 if test "${ac_cv_func_tgoto+set}" = set; then
16505   echo $ECHO_N "(cached) $ECHO_C" >&6
16506 else
16507   cat >conftest.$ac_ext <<_ACEOF
16508-#line 6724 "configure"
16509+#line 6730 "configure"
16510 #include "confdefs.h"
16511 #define tgoto autoconf_temporary
16512 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
16513@@ -6752,16 +6758,16 @@
16514 }
16515 _ACEOF
16516 rm -f conftest.$ac_objext conftest$ac_exeext
16517-if { (eval echo "$as_me:6755: \"$ac_link\"") >&5
16518+if { (eval echo "$as_me:6761: \"$ac_link\"") >&5
16519   (eval $ac_link) 2>&5
16520   ac_status=$?
16521-  echo "$as_me:6758: \$? = $ac_status" >&5
16522+  echo "$as_me:6764: \$? = $ac_status" >&5
16523   (exit $ac_status); } &&
16524          { ac_try='test -s conftest$ac_exeext'
16525-  { (eval echo "$as_me:6761: \"$ac_try\"") >&5
16526+  { (eval echo "$as_me:6767: \"$ac_try\"") >&5
16527   (eval $ac_try) 2>&5
16528   ac_status=$?
16529-  echo "$as_me:6764: \$? = $ac_status" >&5
16530+  echo "$as_me:6770: \$? = $ac_status" >&5
16531   (exit $ac_status); }; }; then
16532   ac_cv_func_tgoto=yes
16533 else
16534@@ -6771,7 +6777,7 @@
16535 fi
16536 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
16537 fi
16538-echo "$as_me:6774: result: $ac_cv_func_tgoto" >&5
16539+echo "$as_me:6780: result: $ac_cv_func_tgoto" >&5
16540 echo "${ECHO_T}$ac_cv_func_tgoto" >&6
16541 if test $ac_cv_func_tgoto = yes; then
16542   cf_term_lib=predefined
16543@@ -6780,7 +6786,7 @@
16544 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
16545 			do
16546 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
16547-echo "$as_me:6783: checking for tgoto in -l$cf_term_lib" >&5
16548+echo "$as_me:6789: checking for tgoto in -l$cf_term_lib" >&5
16549 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
16550 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
16551   echo $ECHO_N "(cached) $ECHO_C" >&6
16552@@ -6788,7 +6794,7 @@
16553   ac_check_lib_save_LIBS=$LIBS
16554 LIBS="-l$cf_term_lib  $LIBS"
16555 cat >conftest.$ac_ext <<_ACEOF
16556-#line 6791 "configure"
16557+#line 6797 "configure"
16558 #include "confdefs.h"
16559
16560 /* Override any gcc2 internal prototype to avoid an error.  */
16561@@ -6807,16 +6813,16 @@
16562 }
16563 _ACEOF
16564 rm -f conftest.$ac_objext conftest$ac_exeext
16565-if { (eval echo "$as_me:6810: \"$ac_link\"") >&5
16566+if { (eval echo "$as_me:6816: \"$ac_link\"") >&5
16567   (eval $ac_link) 2>&5
16568   ac_status=$?
16569-  echo "$as_me:6813: \$? = $ac_status" >&5
16570+  echo "$as_me:6819: \$? = $ac_status" >&5
16571   (exit $ac_status); } &&
16572          { ac_try='test -s conftest$ac_exeext'
16573-  { (eval echo "$as_me:6816: \"$ac_try\"") >&5
16574+  { (eval echo "$as_me:6822: \"$ac_try\"") >&5
16575   (eval $ac_try) 2>&5
16576   ac_status=$?
16577-  echo "$as_me:6819: \$? = $ac_status" >&5
16578+  echo "$as_me:6825: \$? = $ac_status" >&5
16579   (exit $ac_status); }; }; then
16580   eval "$as_ac_Lib=yes"
16581 else
16582@@ -6827,7 +6833,7 @@
16583 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
16584 LIBS=$ac_check_lib_save_LIBS
16585 fi
16586-echo "$as_me:6830: result: `eval echo '${'$as_ac_Lib'}'`" >&5
16587+echo "$as_me:6836: result: `eval echo '${'$as_ac_Lib'}'`" >&5
16588 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
16589 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
16590
16591@@ -6850,10 +6856,10 @@
16592 		do
16593 			LIBS="-l$cf_curs_lib $cf_save_LIBS"
16594 			if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then
16595-				echo "$as_me:6853: checking if we can link with $cf_curs_lib library" >&5
16596+				echo "$as_me:6859: checking if we can link with $cf_curs_lib library" >&5
16597 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
16598 				cat >conftest.$ac_ext <<_ACEOF
16599-#line 6856 "configure"
16600+#line 6862 "configure"
16601 #include "confdefs.h"
16602 #include <${cf_cv_ncurses_header:-curses.h}>
16603 int
16604@@ -6865,16 +6871,16 @@
16605 }
16606 _ACEOF
16607 rm -f conftest.$ac_objext conftest$ac_exeext
16608-if { (eval echo "$as_me:6868: \"$ac_link\"") >&5
16609+if { (eval echo "$as_me:6874: \"$ac_link\"") >&5
16610   (eval $ac_link) 2>&5
16611   ac_status=$?
16612-  echo "$as_me:6871: \$? = $ac_status" >&5
16613+  echo "$as_me:6877: \$? = $ac_status" >&5
16614   (exit $ac_status); } &&
16615          { ac_try='test -s conftest$ac_exeext'
16616-  { (eval echo "$as_me:6874: \"$ac_try\"") >&5
16617+  { (eval echo "$as_me:6880: \"$ac_try\"") >&5
16618   (eval $ac_try) 2>&5
16619   ac_status=$?
16620-  echo "$as_me:6877: \$? = $ac_status" >&5
16621+  echo "$as_me:6883: \$? = $ac_status" >&5
16622   (exit $ac_status); }; }; then
16623   cf_result=yes
16624 else
16625@@ -6883,16 +6889,16 @@
16626 cf_result=no
16627 fi
16628 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
16629-				echo "$as_me:6886: result: $cf_result" >&5
16630+				echo "$as_me:6892: result: $cf_result" >&5
16631 echo "${ECHO_T}$cf_result" >&6
16632 				test $cf_result = yes && break
16633 			elif test "$cf_curs_lib" = "$cf_term_lib" ; then
16634 				cf_result=no
16635 			elif test "$cf_term_lib" != predefined ; then
16636-				echo "$as_me:6892: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
16637+				echo "$as_me:6898: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
16638 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
16639 				cat >conftest.$ac_ext <<_ACEOF
16640-#line 6895 "configure"
16641+#line 6901 "configure"
16642 #include "confdefs.h"
16643 #include <${cf_cv_ncurses_header:-curses.h}>
16644 int
16645@@ -6904,16 +6910,16 @@
16646 }
16647 _ACEOF
16648 rm -f conftest.$ac_objext conftest$ac_exeext
16649-if { (eval echo "$as_me:6907: \"$ac_link\"") >&5
16650+if { (eval echo "$as_me:6913: \"$ac_link\"") >&5
16651   (eval $ac_link) 2>&5
16652   ac_status=$?
16653-  echo "$as_me:6910: \$? = $ac_status" >&5
16654+  echo "$as_me:6916: \$? = $ac_status" >&5
16655   (exit $ac_status); } &&
16656          { ac_try='test -s conftest$ac_exeext'
16657-  { (eval echo "$as_me:6913: \"$ac_try\"") >&5
16658+  { (eval echo "$as_me:6919: \"$ac_try\"") >&5
16659   (eval $ac_try) 2>&5
16660   ac_status=$?
16661-  echo "$as_me:6916: \$? = $ac_status" >&5
16662+  echo "$as_me:6922: \$? = $ac_status" >&5
16663   (exit $ac_status); }; }; then
16664   cf_result=no
16665 else
16666@@ -6922,7 +6928,7 @@
16667
16668 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
16669 					cat >conftest.$ac_ext <<_ACEOF
16670-#line 6925 "configure"
16671+#line 6931 "configure"
16672 #include "confdefs.h"
16673 #include <${cf_cv_ncurses_header:-curses.h}>
16674 int
16675@@ -6934,16 +6940,16 @@
16676 }
16677 _ACEOF
16678 rm -f conftest.$ac_objext conftest$ac_exeext
16679-if { (eval echo "$as_me:6937: \"$ac_link\"") >&5
16680+if { (eval echo "$as_me:6943: \"$ac_link\"") >&5
16681   (eval $ac_link) 2>&5
16682   ac_status=$?
16683-  echo "$as_me:6940: \$? = $ac_status" >&5
16684+  echo "$as_me:6946: \$? = $ac_status" >&5
16685   (exit $ac_status); } &&
16686          { ac_try='test -s conftest$ac_exeext'
16687-  { (eval echo "$as_me:6943: \"$ac_try\"") >&5
16688+  { (eval echo "$as_me:6949: \"$ac_try\"") >&5
16689   (eval $ac_try) 2>&5
16690   ac_status=$?
16691-  echo "$as_me:6946: \$? = $ac_status" >&5
16692+  echo "$as_me:6952: \$? = $ac_status" >&5
16693   (exit $ac_status); }; }; then
16694   cf_result=yes
16695 else
16696@@ -6955,13 +6961,13 @@
16697
16698 fi
16699 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
16700-				echo "$as_me:6958: result: $cf_result" >&5
16701+				echo "$as_me:6964: result: $cf_result" >&5
16702 echo "${ECHO_T}$cf_result" >&6
16703 				test $cf_result != error && break
16704 			fi
16705 		done
16706 	fi
16707-	test $cf_curs_lib = unknown && { { echo "$as_me:6964: error: no curses library found" >&5
16708+	test $cf_curs_lib = unknown && { { echo "$as_me:6970: error: no curses library found" >&5
16709 echo "$as_me: error: no curses library found" >&2;}
16710    { (exit 1); exit 1; }; }
16711 fi
16712@@ -6970,7 +6976,7 @@
16713 	;;
16714 (ncursesw*)
16715
16716-echo "$as_me:6973: checking for multibyte character support" >&5
16717+echo "$as_me:6979: checking for multibyte character support" >&5
16718 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
16719 if test "${cf_cv_utf8_lib+set}" = set; then
16720   echo $ECHO_N "(cached) $ECHO_C" >&6
16721@@ -6978,7 +6984,7 @@
16722
16723 	cf_save_LIBS="$LIBS"
16724 	cat >conftest.$ac_ext <<_ACEOF
16725-#line 6981 "configure"
16726+#line 6987 "configure"
16727 #include "confdefs.h"
16728
16729 #include <stdlib.h>
16730@@ -6991,16 +6997,16 @@
16731 }
16732 _ACEOF
16733 rm -f conftest.$ac_objext conftest$ac_exeext
16734-if { (eval echo "$as_me:6994: \"$ac_link\"") >&5
16735+if { (eval echo "$as_me:7000: \"$ac_link\"") >&5
16736   (eval $ac_link) 2>&5
16737   ac_status=$?
16738-  echo "$as_me:6997: \$? = $ac_status" >&5
16739+  echo "$as_me:7003: \$? = $ac_status" >&5
16740   (exit $ac_status); } &&
16741          { ac_try='test -s conftest$ac_exeext'
16742-  { (eval echo "$as_me:7000: \"$ac_try\"") >&5
16743+  { (eval echo "$as_me:7006: \"$ac_try\"") >&5
16744   (eval $ac_try) 2>&5
16745   ac_status=$?
16746-  echo "$as_me:7003: \$? = $ac_status" >&5
16747+  echo "$as_me:7009: \$? = $ac_status" >&5
16748   (exit $ac_status); }; }; then
16749   cf_cv_utf8_lib=yes
16750 else
16751@@ -7012,12 +7018,12 @@
16752 cf_cv_header_path_utf8=
16753 cf_cv_library_path_utf8=
16754
16755-echo "${as_me:-configure}:7015: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
16756+echo "${as_me:-configure}:7021: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
16757
16758 cf_save_LIBS="$LIBS"
16759
16760 cat >conftest.$ac_ext <<_ACEOF
16761-#line 7020 "configure"
16762+#line 7026 "configure"
16763 #include "confdefs.h"
16764
16765 #include <libutf8.h>
16766@@ -7030,16 +7036,16 @@
16767 }
16768 _ACEOF
16769 rm -f conftest.$ac_objext conftest$ac_exeext
16770-if { (eval echo "$as_me:7033: \"$ac_link\"") >&5
16771+if { (eval echo "$as_me:7039: \"$ac_link\"") >&5
16772   (eval $ac_link) 2>&5
16773   ac_status=$?
16774-  echo "$as_me:7036: \$? = $ac_status" >&5
16775+  echo "$as_me:7042: \$? = $ac_status" >&5
16776   (exit $ac_status); } &&
16777          { ac_try='test -s conftest$ac_exeext'
16778-  { (eval echo "$as_me:7039: \"$ac_try\"") >&5
16779+  { (eval echo "$as_me:7045: \"$ac_try\"") >&5
16780   (eval $ac_try) 2>&5
16781   ac_status=$?
16782-  echo "$as_me:7042: \$? = $ac_status" >&5
16783+  echo "$as_me:7048: \$? = $ac_status" >&5
16784   (exit $ac_status); }; }; then
16785
16786 	cf_cv_find_linkage_utf8=yes
16787@@ -7053,7 +7059,7 @@
16788 LIBS="-lutf8  $cf_save_LIBS"
16789
16790 cat >conftest.$ac_ext <<_ACEOF
16791-#line 7056 "configure"
16792+#line 7062 "configure"
16793 #include "confdefs.h"
16794
16795 #include <libutf8.h>
16796@@ -7066,16 +7072,16 @@
16797 }
16798 _ACEOF
16799 rm -f conftest.$ac_objext conftest$ac_exeext
16800-if { (eval echo "$as_me:7069: \"$ac_link\"") >&5
16801+if { (eval echo "$as_me:7075: \"$ac_link\"") >&5
16802   (eval $ac_link) 2>&5
16803   ac_status=$?
16804-  echo "$as_me:7072: \$? = $ac_status" >&5
16805+  echo "$as_me:7078: \$? = $ac_status" >&5
16806   (exit $ac_status); } &&
16807          { ac_try='test -s conftest$ac_exeext'
16808-  { (eval echo "$as_me:7075: \"$ac_try\"") >&5
16809+  { (eval echo "$as_me:7081: \"$ac_try\"") >&5
16810   (eval $ac_try) 2>&5
16811   ac_status=$?
16812-  echo "$as_me:7078: \$? = $ac_status" >&5
16813+  echo "$as_me:7084: \$? = $ac_status" >&5
16814   (exit $ac_status); }; }; then
16815
16816 	cf_cv_find_linkage_utf8=yes
16817@@ -7092,9 +7098,9 @@
16818
16819 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
16820
16821-echo "${as_me:-configure}:7095: testing find linkage for utf8 library ..." 1>&5
16822+echo "${as_me:-configure}:7101: testing find linkage for utf8 library ..." 1>&5
16823
16824-echo "${as_me:-configure}:7097: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
16825+echo "${as_me:-configure}:7103: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
16826
16827 	cf_save_CPPFLAGS="$CPPFLAGS"
16828 	cf_test_CPPFLAGS="$CPPFLAGS"
16829@@ -7185,7 +7191,7 @@
16830 		if test -d $cf_cv_header_path_utf8 ; then
16831 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
16832
16833-echo "${as_me:-configure}:7188: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
16834+echo "${as_me:-configure}:7194: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
16835
16836 			CPPFLAGS="$cf_save_CPPFLAGS"
16837
16838@@ -7193,7 +7199,7 @@
16839 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
16840
16841 			cat >conftest.$ac_ext <<_ACEOF
16842-#line 7196 "configure"
16843+#line 7202 "configure"
16844 #include "confdefs.h"
16845
16846 #include <libutf8.h>
16847@@ -7206,21 +7212,21 @@
16848 }
16849 _ACEOF
16850 rm -f conftest.$ac_objext
16851-if { (eval echo "$as_me:7209: \"$ac_compile\"") >&5
16852+if { (eval echo "$as_me:7215: \"$ac_compile\"") >&5
16853   (eval $ac_compile) 2>&5
16854   ac_status=$?
16855-  echo "$as_me:7212: \$? = $ac_status" >&5
16856+  echo "$as_me:7218: \$? = $ac_status" >&5
16857   (exit $ac_status); } &&
16858          { ac_try='test -s conftest.$ac_objext'
16859-  { (eval echo "$as_me:7215: \"$ac_try\"") >&5
16860+  { (eval echo "$as_me:7221: \"$ac_try\"") >&5
16861   (eval $ac_try) 2>&5
16862   ac_status=$?
16863-  echo "$as_me:7218: \$? = $ac_status" >&5
16864+  echo "$as_me:7224: \$? = $ac_status" >&5
16865   (exit $ac_status); }; }; then
16866
16867 				test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
16868
16869-echo "${as_me:-configure}:7223: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
16870+echo "${as_me:-configure}:7229: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
16871
16872 				cf_cv_find_linkage_utf8=maybe
16873 				cf_test_CPPFLAGS="$CPPFLAGS"
16874@@ -7238,7 +7244,7 @@
16875
16876 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
16877
16878-echo "${as_me:-configure}:7241: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
16879+echo "${as_me:-configure}:7247: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
16880
16881 		cf_save_LIBS="$LIBS"
16882 		cf_save_LDFLAGS="$LDFLAGS"
16883@@ -7313,13 +7319,13 @@
16884 				if test -d $cf_cv_library_path_utf8 ; then
16885 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
16886
16887-echo "${as_me:-configure}:7316: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
16888+echo "${as_me:-configure}:7322: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
16889
16890 					CPPFLAGS="$cf_test_CPPFLAGS"
16891 					LIBS="-lutf8  $cf_save_LIBS"
16892 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
16893 					cat >conftest.$ac_ext <<_ACEOF
16894-#line 7322 "configure"
16895+#line 7328 "configure"
16896 #include "confdefs.h"
16897
16898 #include <libutf8.h>
16899@@ -7332,21 +7338,21 @@
16900 }
16901 _ACEOF
16902 rm -f conftest.$ac_objext conftest$ac_exeext
16903-if { (eval echo "$as_me:7335: \"$ac_link\"") >&5
16904+if { (eval echo "$as_me:7341: \"$ac_link\"") >&5
16905   (eval $ac_link) 2>&5
16906   ac_status=$?
16907-  echo "$as_me:7338: \$? = $ac_status" >&5
16908+  echo "$as_me:7344: \$? = $ac_status" >&5
16909   (exit $ac_status); } &&
16910          { ac_try='test -s conftest$ac_exeext'
16911-  { (eval echo "$as_me:7341: \"$ac_try\"") >&5
16912+  { (eval echo "$as_me:7347: \"$ac_try\"") >&5
16913   (eval $ac_try) 2>&5
16914   ac_status=$?
16915-  echo "$as_me:7344: \$? = $ac_status" >&5
16916+  echo "$as_me:7350: \$? = $ac_status" >&5
16917   (exit $ac_status); }; }; then
16918
16919 					test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
16920
16921-echo "${as_me:-configure}:7349: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
16922+echo "${as_me:-configure}:7355: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
16923
16924 					cf_cv_find_linkage_utf8=yes
16925 					cf_cv_library_file_utf8="-lutf8"
16926@@ -7388,7 +7394,7 @@
16927 fi
16928 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
16929 fi
16930-echo "$as_me:7391: result: $cf_cv_utf8_lib" >&5
16931+echo "$as_me:7397: result: $cf_cv_utf8_lib" >&5
16932 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
16933
16934 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
16935@@ -7426,7 +7432,7 @@
16936 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
16937
16938 			  cat >conftest.$ac_ext <<_ACEOF
16939-#line 7429 "configure"
16940+#line 7435 "configure"
16941 #include "confdefs.h"
16942 #include <stdio.h>
16943 int
16944@@ -7438,16 +7444,16 @@
16945 }
16946 _ACEOF
16947 rm -f conftest.$ac_objext
16948-if { (eval echo "$as_me:7441: \"$ac_compile\"") >&5
16949+if { (eval echo "$as_me:7447: \"$ac_compile\"") >&5
16950   (eval $ac_compile) 2>&5
16951   ac_status=$?
16952-  echo "$as_me:7444: \$? = $ac_status" >&5
16953+  echo "$as_me:7450: \$? = $ac_status" >&5
16954   (exit $ac_status); } &&
16955          { ac_try='test -s conftest.$ac_objext'
16956-  { (eval echo "$as_me:7447: \"$ac_try\"") >&5
16957+  { (eval echo "$as_me:7453: \"$ac_try\"") >&5
16958   (eval $ac_try) 2>&5
16959   ac_status=$?
16960-  echo "$as_me:7450: \$? = $ac_status" >&5
16961+  echo "$as_me:7456: \$? = $ac_status" >&5
16962   (exit $ac_status); }; }; then
16963   :
16964 else
16965@@ -7464,7 +7470,7 @@
16966 		if test "$cf_have_incdir" = no ; then
16967 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
16968
16969-echo "${as_me:-configure}:7467: testing adding $cf_add_incdir to include-path ..." 1>&5
16970+echo "${as_me:-configure}:7473: testing adding $cf_add_incdir to include-path ..." 1>&5
16971
16972 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
16973
16974@@ -7500,7 +7506,7 @@
16975 			if test "$cf_have_libdir" = no ; then
16976 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
16977
16978-echo "${as_me:-configure}:7503: testing adding $cf_add_libdir to library-path ..." 1>&5
16979+echo "${as_me:-configure}:7509: testing adding $cf_add_libdir to library-path ..." 1>&5
16980
16981 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
16982 			fi
16983@@ -7530,13 +7536,13 @@
16984 cf_have_ncuconfig=no
16985
16986 if test "x${PKG_CONFIG:=none}" != xnone; then
16987-	echo "$as_me:7533: checking pkg-config for $cf_ncuconfig_root" >&5
16988+	echo "$as_me:7539: checking pkg-config for $cf_ncuconfig_root" >&5
16989 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
16990 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
16991-		echo "$as_me:7536: result: yes" >&5
16992+		echo "$as_me:7542: result: yes" >&5
16993 echo "${ECHO_T}yes" >&6
16994
16995-		echo "$as_me:7539: checking if the $cf_ncuconfig_root package files work" >&5
16996+		echo "$as_me:7545: checking if the $cf_ncuconfig_root package files work" >&5
16997 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
16998 		cf_have_ncuconfig=unknown
16999
17000@@ -7658,7 +7664,7 @@
17001 LIBS="$cf_add_libs"
17002
17003 		cat >conftest.$ac_ext <<_ACEOF
17004-#line 7661 "configure"
17005+#line 7667 "configure"
17006 #include "confdefs.h"
17007 #include <${cf_cv_ncurses_header:-curses.h}>
17008 int
17009@@ -7670,37 +7676,37 @@
17010 }
17011 _ACEOF
17012 rm -f conftest.$ac_objext conftest$ac_exeext
17013-if { (eval echo "$as_me:7673: \"$ac_link\"") >&5
17014+if { (eval echo "$as_me:7679: \"$ac_link\"") >&5
17015   (eval $ac_link) 2>&5
17016   ac_status=$?
17017-  echo "$as_me:7676: \$? = $ac_status" >&5
17018+  echo "$as_me:7682: \$? = $ac_status" >&5
17019   (exit $ac_status); } &&
17020          { ac_try='test -s conftest$ac_exeext'
17021-  { (eval echo "$as_me:7679: \"$ac_try\"") >&5
17022+  { (eval echo "$as_me:7685: \"$ac_try\"") >&5
17023   (eval $ac_try) 2>&5
17024   ac_status=$?
17025-  echo "$as_me:7682: \$? = $ac_status" >&5
17026+  echo "$as_me:7688: \$? = $ac_status" >&5
17027   (exit $ac_status); }; }; then
17028   if test "$cross_compiling" = yes; then
17029   cf_have_ncuconfig=maybe
17030 else
17031   cat >conftest.$ac_ext <<_ACEOF
17032-#line 7688 "configure"
17033+#line 7694 "configure"
17034 #include "confdefs.h"
17035 #include <${cf_cv_ncurses_header:-curses.h}>
17036 				int main(void)
17037 				{ char *xx = curses_version(); return (xx == 0); }
17038 _ACEOF
17039 rm -f conftest$ac_exeext
17040-if { (eval echo "$as_me:7695: \"$ac_link\"") >&5
17041+if { (eval echo "$as_me:7701: \"$ac_link\"") >&5
17042   (eval $ac_link) 2>&5
17043   ac_status=$?
17044-  echo "$as_me:7698: \$? = $ac_status" >&5
17045+  echo "$as_me:7704: \$? = $ac_status" >&5
17046   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
17047-  { (eval echo "$as_me:7700: \"$ac_try\"") >&5
17048+  { (eval echo "$as_me:7706: \"$ac_try\"") >&5
17049   (eval $ac_try) 2>&5
17050   ac_status=$?
17051-  echo "$as_me:7703: \$? = $ac_status" >&5
17052+  echo "$as_me:7709: \$? = $ac_status" >&5
17053   (exit $ac_status); }; }; then
17054   cf_have_ncuconfig=yes
17055 else
17056@@ -7717,7 +7723,7 @@
17057 cf_have_ncuconfig=no
17058 fi
17059 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
17060-		echo "$as_me:7720: result: $cf_have_ncuconfig" >&5
17061+		echo "$as_me:7726: result: $cf_have_ncuconfig" >&5
17062 echo "${ECHO_T}$cf_have_ncuconfig" >&6
17063 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
17064 		if test "$cf_have_ncuconfig" != "yes"
17065@@ -7733,7 +7739,7 @@
17066
17067 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
17068
17069-echo "$as_me:7736: checking for terminfo header" >&5
17070+echo "$as_me:7742: checking for terminfo header" >&5
17071 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
17072 if test "${cf_cv_term_header+set}" = set; then
17073   echo $ECHO_N "(cached) $ECHO_C" >&6
17074@@ -7751,7 +7757,7 @@
17075 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
17076 do
17077 cat >conftest.$ac_ext <<_ACEOF
17078-#line 7754 "configure"
17079+#line 7760 "configure"
17080 #include "confdefs.h"
17081 #include <stdio.h>
17082 #include <${cf_cv_ncurses_header:-curses.h}>
17083@@ -7766,16 +7772,16 @@
17084 }
17085 _ACEOF
17086 rm -f conftest.$ac_objext
17087-if { (eval echo "$as_me:7769: \"$ac_compile\"") >&5
17088+if { (eval echo "$as_me:7775: \"$ac_compile\"") >&5
17089   (eval $ac_compile) 2>&5
17090   ac_status=$?
17091-  echo "$as_me:7772: \$? = $ac_status" >&5
17092+  echo "$as_me:7778: \$? = $ac_status" >&5
17093   (exit $ac_status); } &&
17094          { ac_try='test -s conftest.$ac_objext'
17095-  { (eval echo "$as_me:7775: \"$ac_try\"") >&5
17096+  { (eval echo "$as_me:7781: \"$ac_try\"") >&5
17097   (eval $ac_try) 2>&5
17098   ac_status=$?
17099-  echo "$as_me:7778: \$? = $ac_status" >&5
17100+  echo "$as_me:7784: \$? = $ac_status" >&5
17101   (exit $ac_status); }; }; then
17102
17103 	cf_cv_term_header="$cf_test"
17104@@ -7791,7 +7797,7 @@
17105 done
17106
17107 fi
17108-echo "$as_me:7794: result: $cf_cv_term_header" >&5
17109+echo "$as_me:7800: result: $cf_cv_term_header" >&5
17110 echo "${ECHO_T}$cf_cv_term_header" >&6
17111
17112 # Set definitions to allow ifdef'ing to accommodate subdirectories
17113@@ -7826,7 +7832,7 @@
17114 		fi
17115
17116 	else
17117-		echo "$as_me:7829: result: no" >&5
17118+		echo "$as_me:7835: result: no" >&5
17119 echo "${ECHO_T}no" >&6
17120 		NCURSES_CONFIG_PKG=none
17121 	fi
17122@@ -7842,7 +7848,7 @@
17123   do
17124     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
17125 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
17126-echo "$as_me:7845: checking for $ac_word" >&5
17127+echo "$as_me:7851: checking for $ac_word" >&5
17128 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
17129 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
17130   echo $ECHO_N "(cached) $ECHO_C" >&6
17131@@ -7857,7 +7863,7 @@
17132   test -z "$ac_dir" && ac_dir=.
17133   $as_executable_p "$ac_dir/$ac_word" || continue
17134 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
17135-echo "$as_me:7860: found $ac_dir/$ac_word" >&5
17136+echo "$as_me:7866: found $ac_dir/$ac_word" >&5
17137 break
17138 done
17139
17140@@ -7865,10 +7871,10 @@
17141 fi
17142 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
17143 if test -n "$NCURSES_CONFIG"; then
17144-  echo "$as_me:7868: result: $NCURSES_CONFIG" >&5
17145+  echo "$as_me:7874: result: $NCURSES_CONFIG" >&5
17146 echo "${ECHO_T}$NCURSES_CONFIG" >&6
17147 else
17148-  echo "$as_me:7871: result: no" >&5
17149+  echo "$as_me:7877: result: no" >&5
17150 echo "${ECHO_T}no" >&6
17151 fi
17152
17153@@ -7881,7 +7887,7 @@
17154 do
17155   # Extract the first word of "$ac_prog", so it can be a program name with args.
17156 set dummy $ac_prog; ac_word=$2
17157-echo "$as_me:7884: checking for $ac_word" >&5
17158+echo "$as_me:7890: checking for $ac_word" >&5
17159 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
17160 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
17161   echo $ECHO_N "(cached) $ECHO_C" >&6
17162@@ -7896,7 +7902,7 @@
17163   test -z "$ac_dir" && ac_dir=.
17164   $as_executable_p "$ac_dir/$ac_word" || continue
17165 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
17166-echo "$as_me:7899: found $ac_dir/$ac_word" >&5
17167+echo "$as_me:7905: found $ac_dir/$ac_word" >&5
17168 break
17169 done
17170
17171@@ -7904,10 +7910,10 @@
17172 fi
17173 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
17174 if test -n "$ac_ct_NCURSES_CONFIG"; then
17175-  echo "$as_me:7907: result: $ac_ct_NCURSES_CONFIG" >&5
17176+  echo "$as_me:7913: result: $ac_ct_NCURSES_CONFIG" >&5
17177 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
17178 else
17179-  echo "$as_me:7910: result: no" >&5
17180+  echo "$as_me:7916: result: no" >&5
17181 echo "${ECHO_T}no" >&6
17182 fi
17183
17184@@ -8036,7 +8042,7 @@
17185
17186 		# even with config script, some packages use no-override for curses.h
17187
17188-echo "$as_me:8039: checking if we have identified curses headers" >&5
17189+echo "$as_me:8045: checking if we have identified curses headers" >&5
17190 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
17191 if test "${cf_cv_ncurses_header+set}" = set; then
17192   echo $ECHO_N "(cached) $ECHO_C" >&6
17193@@ -8048,7 +8054,7 @@
17194 	curses.h $cf_cv_screen/curses.h
17195 do
17196 cat >conftest.$ac_ext <<_ACEOF
17197-#line 8051 "configure"
17198+#line 8057 "configure"
17199 #include "confdefs.h"
17200 #include <${cf_header}>
17201 int
17202@@ -8060,16 +8066,16 @@
17203 }
17204 _ACEOF
17205 rm -f conftest.$ac_objext
17206-if { (eval echo "$as_me:8063: \"$ac_compile\"") >&5
17207+if { (eval echo "$as_me:8069: \"$ac_compile\"") >&5
17208   (eval $ac_compile) 2>&5
17209   ac_status=$?
17210-  echo "$as_me:8066: \$? = $ac_status" >&5
17211+  echo "$as_me:8072: \$? = $ac_status" >&5
17212   (exit $ac_status); } &&
17213          { ac_try='test -s conftest.$ac_objext'
17214-  { (eval echo "$as_me:8069: \"$ac_try\"") >&5
17215+  { (eval echo "$as_me:8075: \"$ac_try\"") >&5
17216   (eval $ac_try) 2>&5
17217   ac_status=$?
17218-  echo "$as_me:8072: \$? = $ac_status" >&5
17219+  echo "$as_me:8078: \$? = $ac_status" >&5
17220   (exit $ac_status); }; }; then
17221   cf_cv_ncurses_header=$cf_header; break
17222 else
17223@@ -8080,11 +8086,11 @@
17224 done
17225
17226 fi
17227-echo "$as_me:8083: result: $cf_cv_ncurses_header" >&5
17228+echo "$as_me:8089: result: $cf_cv_ncurses_header" >&5
17229 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
17230
17231 if test "$cf_cv_ncurses_header" = none ; then
17232-	{ { echo "$as_me:8087: error: No curses header-files found" >&5
17233+	{ { echo "$as_me:8093: error: No curses header-files found" >&5
17234 echo "$as_me: error: No curses header-files found" >&2;}
17235    { (exit 1); exit 1; }; }
17236 fi
17237@@ -8094,23 +8100,23 @@
17238 for ac_header in $cf_cv_ncurses_header
17239 do
17240 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
17241-echo "$as_me:8097: checking for $ac_header" >&5
17242+echo "$as_me:8103: checking for $ac_header" >&5
17243 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
17244 if eval "test \"\${$as_ac_Header+set}\" = set"; then
17245   echo $ECHO_N "(cached) $ECHO_C" >&6
17246 else
17247   cat >conftest.$ac_ext <<_ACEOF
17248-#line 8103 "configure"
17249+#line 8109 "configure"
17250 #include "confdefs.h"
17251 #include <$ac_header>
17252 _ACEOF
17253-if { (eval echo "$as_me:8107: \"$ac_cpp conftest.$ac_ext\"") >&5
17254+if { (eval echo "$as_me:8113: \"$ac_cpp conftest.$ac_ext\"") >&5
17255   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
17256   ac_status=$?
17257   egrep -v '^ *\+' conftest.er1 >conftest.err
17258   rm -f conftest.er1
17259   cat conftest.err >&5
17260-  echo "$as_me:8113: \$? = $ac_status" >&5
17261+  echo "$as_me:8119: \$? = $ac_status" >&5
17262   (exit $ac_status); } >/dev/null; then
17263   if test -s conftest.err; then
17264     ac_cpp_err=$ac_c_preproc_warn_flag
17265@@ -8129,7 +8135,7 @@
17266 fi
17267 rm -f conftest.err conftest.$ac_ext
17268 fi
17269-echo "$as_me:8132: result: `eval echo '${'$as_ac_Header'}'`" >&5
17270+echo "$as_me:8138: result: `eval echo '${'$as_ac_Header'}'`" >&5
17271 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
17272 if test `eval echo '${'$as_ac_Header'}'` = yes; then
17273   cat >>confdefs.h <<EOF
17274@@ -8185,7 +8191,7 @@
17275 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
17276
17277 			  cat >conftest.$ac_ext <<_ACEOF
17278-#line 8188 "configure"
17279+#line 8194 "configure"
17280 #include "confdefs.h"
17281 #include <stdio.h>
17282 int
17283@@ -8197,16 +8203,16 @@
17284 }
17285 _ACEOF
17286 rm -f conftest.$ac_objext
17287-if { (eval echo "$as_me:8200: \"$ac_compile\"") >&5
17288+if { (eval echo "$as_me:8206: \"$ac_compile\"") >&5
17289   (eval $ac_compile) 2>&5
17290   ac_status=$?
17291-  echo "$as_me:8203: \$? = $ac_status" >&5
17292+  echo "$as_me:8209: \$? = $ac_status" >&5
17293   (exit $ac_status); } &&
17294          { ac_try='test -s conftest.$ac_objext'
17295-  { (eval echo "$as_me:8206: \"$ac_try\"") >&5
17296+  { (eval echo "$as_me:8212: \"$ac_try\"") >&5
17297   (eval $ac_try) 2>&5
17298   ac_status=$?
17299-  echo "$as_me:8209: \$? = $ac_status" >&5
17300+  echo "$as_me:8215: \$? = $ac_status" >&5
17301   (exit $ac_status); }; }; then
17302   :
17303 else
17304@@ -8223,7 +8229,7 @@
17305 		if test "$cf_have_incdir" = no ; then
17306 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
17307
17308-echo "${as_me:-configure}:8226: testing adding $cf_add_incdir to include-path ..." 1>&5
17309+echo "${as_me:-configure}:8232: testing adding $cf_add_incdir to include-path ..." 1>&5
17310
17311 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
17312
17313@@ -8242,7 +8248,7 @@
17314
17315 }
17316
17317-echo "$as_me:8245: checking for $cf_ncuhdr_root header in include-path" >&5
17318+echo "$as_me:8251: checking for $cf_ncuhdr_root header in include-path" >&5
17319 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
17320 if test "${cf_cv_ncurses_h+set}" = set; then
17321   echo $ECHO_N "(cached) $ECHO_C" >&6
17322@@ -8254,7 +8260,7 @@
17323 	do
17324
17325 	cat >conftest.$ac_ext <<_ACEOF
17326-#line 8257 "configure"
17327+#line 8263 "configure"
17328 #include "confdefs.h"
17329
17330 #include <$cf_header>
17331@@ -8278,16 +8284,16 @@
17332 }
17333 _ACEOF
17334 rm -f conftest.$ac_objext
17335-if { (eval echo "$as_me:8281: \"$ac_compile\"") >&5
17336+if { (eval echo "$as_me:8287: \"$ac_compile\"") >&5
17337   (eval $ac_compile) 2>&5
17338   ac_status=$?
17339-  echo "$as_me:8284: \$? = $ac_status" >&5
17340+  echo "$as_me:8290: \$? = $ac_status" >&5
17341   (exit $ac_status); } &&
17342          { ac_try='test -s conftest.$ac_objext'
17343-  { (eval echo "$as_me:8287: \"$ac_try\"") >&5
17344+  { (eval echo "$as_me:8293: \"$ac_try\"") >&5
17345   (eval $ac_try) 2>&5
17346   ac_status=$?
17347-  echo "$as_me:8290: \$? = $ac_status" >&5
17348+  echo "$as_me:8296: \$? = $ac_status" >&5
17349   (exit $ac_status); }; }; then
17350   cf_cv_ncurses_h=$cf_header
17351
17352@@ -8302,14 +8308,14 @@
17353 	done
17354
17355 fi
17356-echo "$as_me:8305: result: $cf_cv_ncurses_h" >&5
17357+echo "$as_me:8311: result: $cf_cv_ncurses_h" >&5
17358 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
17359
17360 if test "$cf_cv_ncurses_h" != no ; then
17361 	cf_cv_ncurses_header=$cf_cv_ncurses_h
17362 else
17363
17364-echo "$as_me:8312: checking for $cf_ncuhdr_root include-path" >&5
17365+echo "$as_me:8318: checking for $cf_ncuhdr_root include-path" >&5
17366 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
17367 if test "${cf_cv_ncurses_h2+set}" = set; then
17368   echo $ECHO_N "(cached) $ECHO_C" >&6
17369@@ -8430,7 +8436,7 @@
17370 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
17371
17372 			  cat >conftest.$ac_ext <<_ACEOF
17373-#line 8433 "configure"
17374+#line 8439 "configure"
17375 #include "confdefs.h"
17376 #include <stdio.h>
17377 int
17378@@ -8442,16 +8448,16 @@
17379 }
17380 _ACEOF
17381 rm -f conftest.$ac_objext
17382-if { (eval echo "$as_me:8445: \"$ac_compile\"") >&5
17383+if { (eval echo "$as_me:8451: \"$ac_compile\"") >&5
17384   (eval $ac_compile) 2>&5
17385   ac_status=$?
17386-  echo "$as_me:8448: \$? = $ac_status" >&5
17387+  echo "$as_me:8454: \$? = $ac_status" >&5
17388   (exit $ac_status); } &&
17389          { ac_try='test -s conftest.$ac_objext'
17390-  { (eval echo "$as_me:8451: \"$ac_try\"") >&5
17391+  { (eval echo "$as_me:8457: \"$ac_try\"") >&5
17392   (eval $ac_try) 2>&5
17393   ac_status=$?
17394-  echo "$as_me:8454: \$? = $ac_status" >&5
17395+  echo "$as_me:8460: \$? = $ac_status" >&5
17396   (exit $ac_status); }; }; then
17397   :
17398 else
17399@@ -8468,7 +8474,7 @@
17400 		if test "$cf_have_incdir" = no ; then
17401 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
17402
17403-echo "${as_me:-configure}:8471: testing adding $cf_add_incdir to include-path ..." 1>&5
17404+echo "${as_me:-configure}:8477: testing adding $cf_add_incdir to include-path ..." 1>&5
17405
17406 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
17407
17408@@ -8491,7 +8497,7 @@
17409 		do
17410
17411 	cat >conftest.$ac_ext <<_ACEOF
17412-#line 8494 "configure"
17413+#line 8500 "configure"
17414 #include "confdefs.h"
17415
17416 #include <$cf_header>
17417@@ -8515,16 +8521,16 @@
17418 }
17419 _ACEOF
17420 rm -f conftest.$ac_objext
17421-if { (eval echo "$as_me:8518: \"$ac_compile\"") >&5
17422+if { (eval echo "$as_me:8524: \"$ac_compile\"") >&5
17423   (eval $ac_compile) 2>&5
17424   ac_status=$?
17425-  echo "$as_me:8521: \$? = $ac_status" >&5
17426+  echo "$as_me:8527: \$? = $ac_status" >&5
17427   (exit $ac_status); } &&
17428          { ac_try='test -s conftest.$ac_objext'
17429-  { (eval echo "$as_me:8524: \"$ac_try\"") >&5
17430+  { (eval echo "$as_me:8530: \"$ac_try\"") >&5
17431   (eval $ac_try) 2>&5
17432   ac_status=$?
17433-  echo "$as_me:8527: \$? = $ac_status" >&5
17434+  echo "$as_me:8533: \$? = $ac_status" >&5
17435   (exit $ac_status); }; }; then
17436   cf_cv_ncurses_h2=$cf_header
17437
17438@@ -8545,12 +8551,12 @@
17439 		CPPFLAGS="$cf_save2_CPPFLAGS"
17440 		test "$cf_cv_ncurses_h2" != no && break
17441 	done
17442-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8548: error: not found" >&5
17443+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8554: error: not found" >&5
17444 echo "$as_me: error: not found" >&2;}
17445    { (exit 1); exit 1; }; }
17446
17447 fi
17448-echo "$as_me:8553: result: $cf_cv_ncurses_h2" >&5
17449+echo "$as_me:8559: result: $cf_cv_ncurses_h2" >&5
17450 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
17451
17452 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
17453@@ -8586,7 +8592,7 @@
17454 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
17455
17456 			  cat >conftest.$ac_ext <<_ACEOF
17457-#line 8589 "configure"
17458+#line 8595 "configure"
17459 #include "confdefs.h"
17460 #include <stdio.h>
17461 int
17462@@ -8598,16 +8604,16 @@
17463 }
17464 _ACEOF
17465 rm -f conftest.$ac_objext
17466-if { (eval echo "$as_me:8601: \"$ac_compile\"") >&5
17467+if { (eval echo "$as_me:8607: \"$ac_compile\"") >&5
17468   (eval $ac_compile) 2>&5
17469   ac_status=$?
17470-  echo "$as_me:8604: \$? = $ac_status" >&5
17471+  echo "$as_me:8610: \$? = $ac_status" >&5
17472   (exit $ac_status); } &&
17473          { ac_try='test -s conftest.$ac_objext'
17474-  { (eval echo "$as_me:8607: \"$ac_try\"") >&5
17475+  { (eval echo "$as_me:8613: \"$ac_try\"") >&5
17476   (eval $ac_try) 2>&5
17477   ac_status=$?
17478-  echo "$as_me:8610: \$? = $ac_status" >&5
17479+  echo "$as_me:8616: \$? = $ac_status" >&5
17480   (exit $ac_status); }; }; then
17481   :
17482 else
17483@@ -8624,7 +8630,7 @@
17484 		if test "$cf_have_incdir" = no ; then
17485 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
17486
17487-echo "${as_me:-configure}:8627: testing adding $cf_add_incdir to include-path ..." 1>&5
17488+echo "${as_me:-configure}:8633: testing adding $cf_add_incdir to include-path ..." 1>&5
17489
17490 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
17491
17492@@ -8672,7 +8678,7 @@
17493 	;;
17494 esac
17495
17496-echo "$as_me:8675: checking for terminfo header" >&5
17497+echo "$as_me:8681: checking for terminfo header" >&5
17498 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
17499 if test "${cf_cv_term_header+set}" = set; then
17500   echo $ECHO_N "(cached) $ECHO_C" >&6
17501@@ -8690,7 +8696,7 @@
17502 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
17503 do
17504 cat >conftest.$ac_ext <<_ACEOF
17505-#line 8693 "configure"
17506+#line 8699 "configure"
17507 #include "confdefs.h"
17508 #include <stdio.h>
17509 #include <${cf_cv_ncurses_header:-curses.h}>
17510@@ -8705,16 +8711,16 @@
17511 }
17512 _ACEOF
17513 rm -f conftest.$ac_objext
17514-if { (eval echo "$as_me:8708: \"$ac_compile\"") >&5
17515+if { (eval echo "$as_me:8714: \"$ac_compile\"") >&5
17516   (eval $ac_compile) 2>&5
17517   ac_status=$?
17518-  echo "$as_me:8711: \$? = $ac_status" >&5
17519+  echo "$as_me:8717: \$? = $ac_status" >&5
17520   (exit $ac_status); } &&
17521          { ac_try='test -s conftest.$ac_objext'
17522-  { (eval echo "$as_me:8714: \"$ac_try\"") >&5
17523+  { (eval echo "$as_me:8720: \"$ac_try\"") >&5
17524   (eval $ac_try) 2>&5
17525   ac_status=$?
17526-  echo "$as_me:8717: \$? = $ac_status" >&5
17527+  echo "$as_me:8723: \$? = $ac_status" >&5
17528   (exit $ac_status); }; }; then
17529
17530 	cf_cv_term_header="$cf_test"
17531@@ -8730,7 +8736,7 @@
17532 done
17533
17534 fi
17535-echo "$as_me:8733: result: $cf_cv_term_header" >&5
17536+echo "$as_me:8739: result: $cf_cv_term_header" >&5
17537 echo "${ECHO_T}$cf_cv_term_header" >&6
17538
17539 # Set definitions to allow ifdef'ing to accommodate subdirectories
17540@@ -8768,7 +8774,7 @@
17541 #define NCURSES 1
17542 EOF
17543
17544-echo "$as_me:8771: checking for ncurses version" >&5
17545+echo "$as_me:8777: checking for ncurses version" >&5
17546 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
17547 if test "${cf_cv_ncurses_version+set}" = set; then
17548   echo $ECHO_N "(cached) $ECHO_C" >&6
17549@@ -8794,10 +8800,10 @@
17550 #endif
17551 EOF
17552 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
17553-	{ (eval echo "$as_me:8797: \"$cf_try\"") >&5
17554+	{ (eval echo "$as_me:8803: \"$cf_try\"") >&5
17555   (eval $cf_try) 2>&5
17556   ac_status=$?
17557-  echo "$as_me:8800: \$? = $ac_status" >&5
17558+  echo "$as_me:8806: \$? = $ac_status" >&5
17559   (exit $ac_status); }
17560 	if test -f conftest.out ; then
17561 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
17562@@ -8807,7 +8813,7 @@
17563
17564 else
17565   cat >conftest.$ac_ext <<_ACEOF
17566-#line 8810 "configure"
17567+#line 8816 "configure"
17568 #include "confdefs.h"
17569
17570 #include <${cf_cv_ncurses_header:-curses.h}>
17571@@ -8832,15 +8838,15 @@
17572 }
17573 _ACEOF
17574 rm -f conftest$ac_exeext
17575-if { (eval echo "$as_me:8835: \"$ac_link\"") >&5
17576+if { (eval echo "$as_me:8841: \"$ac_link\"") >&5
17577   (eval $ac_link) 2>&5
17578   ac_status=$?
17579-  echo "$as_me:8838: \$? = $ac_status" >&5
17580+  echo "$as_me:8844: \$? = $ac_status" >&5
17581   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
17582-  { (eval echo "$as_me:8840: \"$ac_try\"") >&5
17583+  { (eval echo "$as_me:8846: \"$ac_try\"") >&5
17584   (eval $ac_try) 2>&5
17585   ac_status=$?
17586-  echo "$as_me:8843: \$? = $ac_status" >&5
17587+  echo "$as_me:8849: \$? = $ac_status" >&5
17588   (exit $ac_status); }; }; then
17589
17590 	cf_cv_ncurses_version=`cat $cf_tempfile`
17591@@ -8854,7 +8860,7 @@
17592 	rm -f $cf_tempfile
17593
17594 fi
17595-echo "$as_me:8857: result: $cf_cv_ncurses_version" >&5
17596+echo "$as_me:8863: result: $cf_cv_ncurses_version" >&5
17597 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
17598 test "$cf_cv_ncurses_version" = no ||
17599 cat >>confdefs.h <<\EOF
17600@@ -8867,7 +8873,7 @@
17601 	# to link gpm.
17602 cf_ncurses_LIBS=""
17603 cf_ncurses_SAVE="$LIBS"
17604-echo "$as_me:8870: checking for Gpm_Open in -lgpm" >&5
17605+echo "$as_me:8876: checking for Gpm_Open in -lgpm" >&5
17606 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
17607 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
17608   echo $ECHO_N "(cached) $ECHO_C" >&6
17609@@ -8875,7 +8881,7 @@
17610   ac_check_lib_save_LIBS=$LIBS
17611 LIBS="-lgpm  $LIBS"
17612 cat >conftest.$ac_ext <<_ACEOF
17613-#line 8878 "configure"
17614+#line 8884 "configure"
17615 #include "confdefs.h"
17616
17617 /* Override any gcc2 internal prototype to avoid an error.  */
17618@@ -8894,16 +8900,16 @@
17619 }
17620 _ACEOF
17621 rm -f conftest.$ac_objext conftest$ac_exeext
17622-if { (eval echo "$as_me:8897: \"$ac_link\"") >&5
17623+if { (eval echo "$as_me:8903: \"$ac_link\"") >&5
17624   (eval $ac_link) 2>&5
17625   ac_status=$?
17626-  echo "$as_me:8900: \$? = $ac_status" >&5
17627+  echo "$as_me:8906: \$? = $ac_status" >&5
17628   (exit $ac_status); } &&
17629          { ac_try='test -s conftest$ac_exeext'
17630-  { (eval echo "$as_me:8903: \"$ac_try\"") >&5
17631+  { (eval echo "$as_me:8909: \"$ac_try\"") >&5
17632   (eval $ac_try) 2>&5
17633   ac_status=$?
17634-  echo "$as_me:8906: \$? = $ac_status" >&5
17635+  echo "$as_me:8912: \$? = $ac_status" >&5
17636   (exit $ac_status); }; }; then
17637   ac_cv_lib_gpm_Gpm_Open=yes
17638 else
17639@@ -8914,10 +8920,10 @@
17640 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
17641 LIBS=$ac_check_lib_save_LIBS
17642 fi
17643-echo "$as_me:8917: result: $ac_cv_lib_gpm_Gpm_Open" >&5
17644+echo "$as_me:8923: result: $ac_cv_lib_gpm_Gpm_Open" >&5
17645 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
17646 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
17647-  echo "$as_me:8920: checking for initscr in -lgpm" >&5
17648+  echo "$as_me:8926: checking for initscr in -lgpm" >&5
17649 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
17650 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
17651   echo $ECHO_N "(cached) $ECHO_C" >&6
17652@@ -8925,7 +8931,7 @@
17653   ac_check_lib_save_LIBS=$LIBS
17654 LIBS="-lgpm  $LIBS"
17655 cat >conftest.$ac_ext <<_ACEOF
17656-#line 8928 "configure"
17657+#line 8934 "configure"
17658 #include "confdefs.h"
17659
17660 /* Override any gcc2 internal prototype to avoid an error.  */
17661@@ -8944,16 +8950,16 @@
17662 }
17663 _ACEOF
17664 rm -f conftest.$ac_objext conftest$ac_exeext
17665-if { (eval echo "$as_me:8947: \"$ac_link\"") >&5
17666+if { (eval echo "$as_me:8953: \"$ac_link\"") >&5
17667   (eval $ac_link) 2>&5
17668   ac_status=$?
17669-  echo "$as_me:8950: \$? = $ac_status" >&5
17670+  echo "$as_me:8956: \$? = $ac_status" >&5
17671   (exit $ac_status); } &&
17672          { ac_try='test -s conftest$ac_exeext'
17673-  { (eval echo "$as_me:8953: \"$ac_try\"") >&5
17674+  { (eval echo "$as_me:8959: \"$ac_try\"") >&5
17675   (eval $ac_try) 2>&5
17676   ac_status=$?
17677-  echo "$as_me:8956: \$? = $ac_status" >&5
17678+  echo "$as_me:8962: \$? = $ac_status" >&5
17679   (exit $ac_status); }; }; then
17680   ac_cv_lib_gpm_initscr=yes
17681 else
17682@@ -8964,7 +8970,7 @@
17683 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
17684 LIBS=$ac_check_lib_save_LIBS
17685 fi
17686-echo "$as_me:8967: result: $ac_cv_lib_gpm_initscr" >&5
17687+echo "$as_me:8973: result: $ac_cv_lib_gpm_initscr" >&5
17688 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
17689 if test $ac_cv_lib_gpm_initscr = yes; then
17690   LIBS="$cf_ncurses_SAVE"
17691@@ -8979,7 +8985,7 @@
17692 	# This is only necessary if you are linking against an obsolete
17693 	# version of ncurses (but it should do no harm, since it's static).
17694 	if test "$cf_nculib_root" = ncurses ; then
17695-		echo "$as_me:8982: checking for tgoto in -lmytinfo" >&5
17696+		echo "$as_me:8988: checking for tgoto in -lmytinfo" >&5
17697 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
17698 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
17699   echo $ECHO_N "(cached) $ECHO_C" >&6
17700@@ -8987,7 +8993,7 @@
17701   ac_check_lib_save_LIBS=$LIBS
17702 LIBS="-lmytinfo  $LIBS"
17703 cat >conftest.$ac_ext <<_ACEOF
17704-#line 8990 "configure"
17705+#line 8996 "configure"
17706 #include "confdefs.h"
17707
17708 /* Override any gcc2 internal prototype to avoid an error.  */
17709@@ -9006,16 +9012,16 @@
17710 }
17711 _ACEOF
17712 rm -f conftest.$ac_objext conftest$ac_exeext
17713-if { (eval echo "$as_me:9009: \"$ac_link\"") >&5
17714+if { (eval echo "$as_me:9015: \"$ac_link\"") >&5
17715   (eval $ac_link) 2>&5
17716   ac_status=$?
17717-  echo "$as_me:9012: \$? = $ac_status" >&5
17718+  echo "$as_me:9018: \$? = $ac_status" >&5
17719   (exit $ac_status); } &&
17720          { ac_try='test -s conftest$ac_exeext'
17721-  { (eval echo "$as_me:9015: \"$ac_try\"") >&5
17722+  { (eval echo "$as_me:9021: \"$ac_try\"") >&5
17723   (eval $ac_try) 2>&5
17724   ac_status=$?
17725-  echo "$as_me:9018: \$? = $ac_status" >&5
17726+  echo "$as_me:9024: \$? = $ac_status" >&5
17727   (exit $ac_status); }; }; then
17728   ac_cv_lib_mytinfo_tgoto=yes
17729 else
17730@@ -9026,7 +9032,7 @@
17731 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
17732 LIBS=$ac_check_lib_save_LIBS
17733 fi
17734-echo "$as_me:9029: result: $ac_cv_lib_mytinfo_tgoto" >&5
17735+echo "$as_me:9035: result: $ac_cv_lib_mytinfo_tgoto" >&5
17736 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
17737 if test $ac_cv_lib_mytinfo_tgoto = yes; then
17738   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
17739@@ -9075,13 +9081,13 @@
17740
17741 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
17742 	cf_libdir=""
17743-	echo "$as_me:9078: checking for initscr" >&5
17744+	echo "$as_me:9084: checking for initscr" >&5
17745 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
17746 if test "${ac_cv_func_initscr+set}" = set; then
17747   echo $ECHO_N "(cached) $ECHO_C" >&6
17748 else
17749   cat >conftest.$ac_ext <<_ACEOF
17750-#line 9084 "configure"
17751+#line 9090 "configure"
17752 #include "confdefs.h"
17753 #define initscr autoconf_temporary
17754 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
17755@@ -9112,16 +9118,16 @@
17756 }
17757 _ACEOF
17758 rm -f conftest.$ac_objext conftest$ac_exeext
17759-if { (eval echo "$as_me:9115: \"$ac_link\"") >&5
17760+if { (eval echo "$as_me:9121: \"$ac_link\"") >&5
17761   (eval $ac_link) 2>&5
17762   ac_status=$?
17763-  echo "$as_me:9118: \$? = $ac_status" >&5
17764+  echo "$as_me:9124: \$? = $ac_status" >&5
17765   (exit $ac_status); } &&
17766          { ac_try='test -s conftest$ac_exeext'
17767-  { (eval echo "$as_me:9121: \"$ac_try\"") >&5
17768+  { (eval echo "$as_me:9127: \"$ac_try\"") >&5
17769   (eval $ac_try) 2>&5
17770   ac_status=$?
17771-  echo "$as_me:9124: \$? = $ac_status" >&5
17772+  echo "$as_me:9130: \$? = $ac_status" >&5
17773   (exit $ac_status); }; }; then
17774   ac_cv_func_initscr=yes
17775 else
17776@@ -9131,18 +9137,18 @@
17777 fi
17778 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
17779 fi
17780-echo "$as_me:9134: result: $ac_cv_func_initscr" >&5
17781+echo "$as_me:9140: result: $ac_cv_func_initscr" >&5
17782 echo "${ECHO_T}$ac_cv_func_initscr" >&6
17783 if test $ac_cv_func_initscr = yes; then
17784   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
17785 else
17786
17787 		cf_save_LIBS="$LIBS"
17788-		echo "$as_me:9141: checking for initscr in -l$cf_nculib_root" >&5
17789+		echo "$as_me:9147: checking for initscr in -l$cf_nculib_root" >&5
17790 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
17791 		LIBS="-l$cf_nculib_root $LIBS"
17792 		cat >conftest.$ac_ext <<_ACEOF
17793-#line 9145 "configure"
17794+#line 9151 "configure"
17795 #include "confdefs.h"
17796 #include <${cf_cv_ncurses_header:-curses.h}>
17797 int
17798@@ -9154,25 +9160,25 @@
17799 }
17800 _ACEOF
17801 rm -f conftest.$ac_objext conftest$ac_exeext
17802-if { (eval echo "$as_me:9157: \"$ac_link\"") >&5
17803+if { (eval echo "$as_me:9163: \"$ac_link\"") >&5
17804   (eval $ac_link) 2>&5
17805   ac_status=$?
17806-  echo "$as_me:9160: \$? = $ac_status" >&5
17807+  echo "$as_me:9166: \$? = $ac_status" >&5
17808   (exit $ac_status); } &&
17809          { ac_try='test -s conftest$ac_exeext'
17810-  { (eval echo "$as_me:9163: \"$ac_try\"") >&5
17811+  { (eval echo "$as_me:9169: \"$ac_try\"") >&5
17812   (eval $ac_try) 2>&5
17813   ac_status=$?
17814-  echo "$as_me:9166: \$? = $ac_status" >&5
17815+  echo "$as_me:9172: \$? = $ac_status" >&5
17816   (exit $ac_status); }; }; then
17817-  echo "$as_me:9168: result: yes" >&5
17818+  echo "$as_me:9174: result: yes" >&5
17819 echo "${ECHO_T}yes" >&6
17820 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
17821
17822 else
17823   echo "$as_me: failed program was:" >&5
17824 cat conftest.$ac_ext >&5
17825-echo "$as_me:9175: result: no" >&5
17826+echo "$as_me:9181: result: no" >&5
17827 echo "${ECHO_T}no" >&6
17828
17829 cf_search=
17830@@ -9240,11 +9246,11 @@
17831
17832 			for cf_libdir in $cf_search
17833 			do
17834-				echo "$as_me:9243: checking for -l$cf_nculib_root in $cf_libdir" >&5
17835+				echo "$as_me:9249: checking for -l$cf_nculib_root in $cf_libdir" >&5
17836 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
17837 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
17838 				cat >conftest.$ac_ext <<_ACEOF
17839-#line 9247 "configure"
17840+#line 9253 "configure"
17841 #include "confdefs.h"
17842 #include <${cf_cv_ncurses_header:-curses.h}>
17843 int
17844@@ -9256,25 +9262,25 @@
17845 }
17846 _ACEOF
17847 rm -f conftest.$ac_objext conftest$ac_exeext
17848-if { (eval echo "$as_me:9259: \"$ac_link\"") >&5
17849+if { (eval echo "$as_me:9265: \"$ac_link\"") >&5
17850   (eval $ac_link) 2>&5
17851   ac_status=$?
17852-  echo "$as_me:9262: \$? = $ac_status" >&5
17853+  echo "$as_me:9268: \$? = $ac_status" >&5
17854   (exit $ac_status); } &&
17855          { ac_try='test -s conftest$ac_exeext'
17856-  { (eval echo "$as_me:9265: \"$ac_try\"") >&5
17857+  { (eval echo "$as_me:9271: \"$ac_try\"") >&5
17858   (eval $ac_try) 2>&5
17859   ac_status=$?
17860-  echo "$as_me:9268: \$? = $ac_status" >&5
17861+  echo "$as_me:9274: \$? = $ac_status" >&5
17862   (exit $ac_status); }; }; then
17863-  echo "$as_me:9270: result: yes" >&5
17864+  echo "$as_me:9276: result: yes" >&5
17865 echo "${ECHO_T}yes" >&6
17866 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
17867 					 break
17868 else
17869   echo "$as_me: failed program was:" >&5
17870 cat conftest.$ac_ext >&5
17871-echo "$as_me:9277: result: no" >&5
17872+echo "$as_me:9283: result: no" >&5
17873 echo "${ECHO_T}no" >&6
17874 					 LIBS="$cf_save_LIBS"
17875 fi
17876@@ -9289,7 +9295,7 @@
17877 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
17878
17879 if test $cf_found_library = no ; then
17880-	{ { echo "$as_me:9292: error: Cannot link $cf_nculib_root library" >&5
17881+	{ { echo "$as_me:9298: error: Cannot link $cf_nculib_root library" >&5
17882 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
17883    { (exit 1); exit 1; }; }
17884 fi
17885@@ -9297,7 +9303,7 @@
17886 fi
17887
17888 if test -n "$cf_ncurses_LIBS" ; then
17889-	echo "$as_me:9300: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
17890+	echo "$as_me:9306: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
17891 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
17892 	cf_ncurses_SAVE="$LIBS"
17893 	for p in $cf_ncurses_LIBS ; do
17894@@ -9307,7 +9313,7 @@
17895 		fi
17896 	done
17897 	cat >conftest.$ac_ext <<_ACEOF
17898-#line 9310 "configure"
17899+#line 9316 "configure"
17900 #include "confdefs.h"
17901 #include <${cf_cv_ncurses_header:-curses.h}>
17902 int
17903@@ -9319,23 +9325,23 @@
17904 }
17905 _ACEOF
17906 rm -f conftest.$ac_objext conftest$ac_exeext
17907-if { (eval echo "$as_me:9322: \"$ac_link\"") >&5
17908+if { (eval echo "$as_me:9328: \"$ac_link\"") >&5
17909   (eval $ac_link) 2>&5
17910   ac_status=$?
17911-  echo "$as_me:9325: \$? = $ac_status" >&5
17912+  echo "$as_me:9331: \$? = $ac_status" >&5
17913   (exit $ac_status); } &&
17914          { ac_try='test -s conftest$ac_exeext'
17915-  { (eval echo "$as_me:9328: \"$ac_try\"") >&5
17916+  { (eval echo "$as_me:9334: \"$ac_try\"") >&5
17917   (eval $ac_try) 2>&5
17918   ac_status=$?
17919-  echo "$as_me:9331: \$? = $ac_status" >&5
17920+  echo "$as_me:9337: \$? = $ac_status" >&5
17921   (exit $ac_status); }; }; then
17922-  echo "$as_me:9333: result: yes" >&5
17923+  echo "$as_me:9339: result: yes" >&5
17924 echo "${ECHO_T}yes" >&6
17925 else
17926   echo "$as_me: failed program was:" >&5
17927 cat conftest.$ac_ext >&5
17928-echo "$as_me:9338: result: no" >&5
17929+echo "$as_me:9344: result: no" >&5
17930 echo "${ECHO_T}no" >&6
17931 		 LIBS="$cf_ncurses_SAVE"
17932 fi
17933@@ -9360,13 +9366,13 @@
17934 cf_have_ncuconfig=no
17935
17936 if test "x${PKG_CONFIG:=none}" != xnone; then
17937-	echo "$as_me:9363: checking pkg-config for $cf_ncuconfig_root" >&5
17938+	echo "$as_me:9369: checking pkg-config for $cf_ncuconfig_root" >&5
17939 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
17940 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
17941-		echo "$as_me:9366: result: yes" >&5
17942+		echo "$as_me:9372: result: yes" >&5
17943 echo "${ECHO_T}yes" >&6
17944
17945-		echo "$as_me:9369: checking if the $cf_ncuconfig_root package files work" >&5
17946+		echo "$as_me:9375: checking if the $cf_ncuconfig_root package files work" >&5
17947 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
17948 		cf_have_ncuconfig=unknown
17949
17950@@ -9488,7 +9494,7 @@
17951 LIBS="$cf_add_libs"
17952
17953 		cat >conftest.$ac_ext <<_ACEOF
17954-#line 9491 "configure"
17955+#line 9497 "configure"
17956 #include "confdefs.h"
17957 #include <${cf_cv_ncurses_header:-curses.h}>
17958 int
17959@@ -9500,37 +9506,37 @@
17960 }
17961 _ACEOF
17962 rm -f conftest.$ac_objext conftest$ac_exeext
17963-if { (eval echo "$as_me:9503: \"$ac_link\"") >&5
17964+if { (eval echo "$as_me:9509: \"$ac_link\"") >&5
17965   (eval $ac_link) 2>&5
17966   ac_status=$?
17967-  echo "$as_me:9506: \$? = $ac_status" >&5
17968+  echo "$as_me:9512: \$? = $ac_status" >&5
17969   (exit $ac_status); } &&
17970          { ac_try='test -s conftest$ac_exeext'
17971-  { (eval echo "$as_me:9509: \"$ac_try\"") >&5
17972+  { (eval echo "$as_me:9515: \"$ac_try\"") >&5
17973   (eval $ac_try) 2>&5
17974   ac_status=$?
17975-  echo "$as_me:9512: \$? = $ac_status" >&5
17976+  echo "$as_me:9518: \$? = $ac_status" >&5
17977   (exit $ac_status); }; }; then
17978   if test "$cross_compiling" = yes; then
17979   cf_have_ncuconfig=maybe
17980 else
17981   cat >conftest.$ac_ext <<_ACEOF
17982-#line 9518 "configure"
17983+#line 9524 "configure"
17984 #include "confdefs.h"
17985 #include <${cf_cv_ncurses_header:-curses.h}>
17986 				int main(void)
17987 				{ char *xx = curses_version(); return (xx == 0); }
17988 _ACEOF
17989 rm -f conftest$ac_exeext
17990-if { (eval echo "$as_me:9525: \"$ac_link\"") >&5
17991+if { (eval echo "$as_me:9531: \"$ac_link\"") >&5
17992   (eval $ac_link) 2>&5
17993   ac_status=$?
17994-  echo "$as_me:9528: \$? = $ac_status" >&5
17995+  echo "$as_me:9534: \$? = $ac_status" >&5
17996   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
17997-  { (eval echo "$as_me:9530: \"$ac_try\"") >&5
17998+  { (eval echo "$as_me:9536: \"$ac_try\"") >&5
17999   (eval $ac_try) 2>&5
18000   ac_status=$?
18001-  echo "$as_me:9533: \$? = $ac_status" >&5
18002+  echo "$as_me:9539: \$? = $ac_status" >&5
18003   (exit $ac_status); }; }; then
18004   cf_have_ncuconfig=yes
18005 else
18006@@ -9547,7 +9553,7 @@
18007 cf_have_ncuconfig=no
18008 fi
18009 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
18010-		echo "$as_me:9550: result: $cf_have_ncuconfig" >&5
18011+		echo "$as_me:9556: result: $cf_have_ncuconfig" >&5
18012 echo "${ECHO_T}$cf_have_ncuconfig" >&6
18013 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
18014 		if test "$cf_have_ncuconfig" != "yes"
18015@@ -9563,7 +9569,7 @@
18016
18017 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
18018
18019-echo "$as_me:9566: checking for terminfo header" >&5
18020+echo "$as_me:9572: checking for terminfo header" >&5
18021 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
18022 if test "${cf_cv_term_header+set}" = set; then
18023   echo $ECHO_N "(cached) $ECHO_C" >&6
18024@@ -9581,7 +9587,7 @@
18025 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
18026 do
18027 cat >conftest.$ac_ext <<_ACEOF
18028-#line 9584 "configure"
18029+#line 9590 "configure"
18030 #include "confdefs.h"
18031 #include <stdio.h>
18032 #include <${cf_cv_ncurses_header:-curses.h}>
18033@@ -9596,16 +9602,16 @@
18034 }
18035 _ACEOF
18036 rm -f conftest.$ac_objext
18037-if { (eval echo "$as_me:9599: \"$ac_compile\"") >&5
18038+if { (eval echo "$as_me:9605: \"$ac_compile\"") >&5
18039   (eval $ac_compile) 2>&5
18040   ac_status=$?
18041-  echo "$as_me:9602: \$? = $ac_status" >&5
18042+  echo "$as_me:9608: \$? = $ac_status" >&5
18043   (exit $ac_status); } &&
18044          { ac_try='test -s conftest.$ac_objext'
18045-  { (eval echo "$as_me:9605: \"$ac_try\"") >&5
18046+  { (eval echo "$as_me:9611: \"$ac_try\"") >&5
18047   (eval $ac_try) 2>&5
18048   ac_status=$?
18049-  echo "$as_me:9608: \$? = $ac_status" >&5
18050+  echo "$as_me:9614: \$? = $ac_status" >&5
18051   (exit $ac_status); }; }; then
18052
18053 	cf_cv_term_header="$cf_test"
18054@@ -9621,7 +9627,7 @@
18055 done
18056
18057 fi
18058-echo "$as_me:9624: result: $cf_cv_term_header" >&5
18059+echo "$as_me:9630: result: $cf_cv_term_header" >&5
18060 echo "${ECHO_T}$cf_cv_term_header" >&6
18061
18062 # Set definitions to allow ifdef'ing to accommodate subdirectories
18063@@ -9656,7 +9662,7 @@
18064 		fi
18065
18066 	else
18067-		echo "$as_me:9659: result: no" >&5
18068+		echo "$as_me:9665: result: no" >&5
18069 echo "${ECHO_T}no" >&6
18070 		NCURSES_CONFIG_PKG=none
18071 	fi
18072@@ -9672,7 +9678,7 @@
18073   do
18074     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
18075 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
18076-echo "$as_me:9675: checking for $ac_word" >&5
18077+echo "$as_me:9681: checking for $ac_word" >&5
18078 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
18079 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
18080   echo $ECHO_N "(cached) $ECHO_C" >&6
18081@@ -9687,7 +9693,7 @@
18082   test -z "$ac_dir" && ac_dir=.
18083   $as_executable_p "$ac_dir/$ac_word" || continue
18084 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
18085-echo "$as_me:9690: found $ac_dir/$ac_word" >&5
18086+echo "$as_me:9696: found $ac_dir/$ac_word" >&5
18087 break
18088 done
18089
18090@@ -9695,10 +9701,10 @@
18091 fi
18092 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
18093 if test -n "$NCURSES_CONFIG"; then
18094-  echo "$as_me:9698: result: $NCURSES_CONFIG" >&5
18095+  echo "$as_me:9704: result: $NCURSES_CONFIG" >&5
18096 echo "${ECHO_T}$NCURSES_CONFIG" >&6
18097 else
18098-  echo "$as_me:9701: result: no" >&5
18099+  echo "$as_me:9707: result: no" >&5
18100 echo "${ECHO_T}no" >&6
18101 fi
18102
18103@@ -9711,7 +9717,7 @@
18104 do
18105   # Extract the first word of "$ac_prog", so it can be a program name with args.
18106 set dummy $ac_prog; ac_word=$2
18107-echo "$as_me:9714: checking for $ac_word" >&5
18108+echo "$as_me:9720: checking for $ac_word" >&5
18109 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
18110 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
18111   echo $ECHO_N "(cached) $ECHO_C" >&6
18112@@ -9726,7 +9732,7 @@
18113   test -z "$ac_dir" && ac_dir=.
18114   $as_executable_p "$ac_dir/$ac_word" || continue
18115 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
18116-echo "$as_me:9729: found $ac_dir/$ac_word" >&5
18117+echo "$as_me:9735: found $ac_dir/$ac_word" >&5
18118 break
18119 done
18120
18121@@ -9734,10 +9740,10 @@
18122 fi
18123 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
18124 if test -n "$ac_ct_NCURSES_CONFIG"; then
18125-  echo "$as_me:9737: result: $ac_ct_NCURSES_CONFIG" >&5
18126+  echo "$as_me:9743: result: $ac_ct_NCURSES_CONFIG" >&5
18127 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
18128 else
18129-  echo "$as_me:9740: result: no" >&5
18130+  echo "$as_me:9746: result: no" >&5
18131 echo "${ECHO_T}no" >&6
18132 fi
18133
18134@@ -9866,7 +9872,7 @@
18135
18136 		# even with config script, some packages use no-override for curses.h
18137
18138-echo "$as_me:9869: checking if we have identified curses headers" >&5
18139+echo "$as_me:9875: checking if we have identified curses headers" >&5
18140 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
18141 if test "${cf_cv_ncurses_header+set}" = set; then
18142   echo $ECHO_N "(cached) $ECHO_C" >&6
18143@@ -9878,7 +9884,7 @@
18144 	curses.h $cf_cv_screen/curses.h
18145 do
18146 cat >conftest.$ac_ext <<_ACEOF
18147-#line 9881 "configure"
18148+#line 9887 "configure"
18149 #include "confdefs.h"
18150 #include <${cf_header}>
18151 int
18152@@ -9890,16 +9896,16 @@
18153 }
18154 _ACEOF
18155 rm -f conftest.$ac_objext
18156-if { (eval echo "$as_me:9893: \"$ac_compile\"") >&5
18157+if { (eval echo "$as_me:9899: \"$ac_compile\"") >&5
18158   (eval $ac_compile) 2>&5
18159   ac_status=$?
18160-  echo "$as_me:9896: \$? = $ac_status" >&5
18161+  echo "$as_me:9902: \$? = $ac_status" >&5
18162   (exit $ac_status); } &&
18163          { ac_try='test -s conftest.$ac_objext'
18164-  { (eval echo "$as_me:9899: \"$ac_try\"") >&5
18165+  { (eval echo "$as_me:9905: \"$ac_try\"") >&5
18166   (eval $ac_try) 2>&5
18167   ac_status=$?
18168-  echo "$as_me:9902: \$? = $ac_status" >&5
18169+  echo "$as_me:9908: \$? = $ac_status" >&5
18170   (exit $ac_status); }; }; then
18171   cf_cv_ncurses_header=$cf_header; break
18172 else
18173@@ -9910,11 +9916,11 @@
18174 done
18175
18176 fi
18177-echo "$as_me:9913: result: $cf_cv_ncurses_header" >&5
18178+echo "$as_me:9919: result: $cf_cv_ncurses_header" >&5
18179 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
18180
18181 if test "$cf_cv_ncurses_header" = none ; then
18182-	{ { echo "$as_me:9917: error: No curses header-files found" >&5
18183+	{ { echo "$as_me:9923: error: No curses header-files found" >&5
18184 echo "$as_me: error: No curses header-files found" >&2;}
18185    { (exit 1); exit 1; }; }
18186 fi
18187@@ -9924,23 +9930,23 @@
18188 for ac_header in $cf_cv_ncurses_header
18189 do
18190 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
18191-echo "$as_me:9927: checking for $ac_header" >&5
18192+echo "$as_me:9933: checking for $ac_header" >&5
18193 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
18194 if eval "test \"\${$as_ac_Header+set}\" = set"; then
18195   echo $ECHO_N "(cached) $ECHO_C" >&6
18196 else
18197   cat >conftest.$ac_ext <<_ACEOF
18198-#line 9933 "configure"
18199+#line 9939 "configure"
18200 #include "confdefs.h"
18201 #include <$ac_header>
18202 _ACEOF
18203-if { (eval echo "$as_me:9937: \"$ac_cpp conftest.$ac_ext\"") >&5
18204+if { (eval echo "$as_me:9943: \"$ac_cpp conftest.$ac_ext\"") >&5
18205   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
18206   ac_status=$?
18207   egrep -v '^ *\+' conftest.er1 >conftest.err
18208   rm -f conftest.er1
18209   cat conftest.err >&5
18210-  echo "$as_me:9943: \$? = $ac_status" >&5
18211+  echo "$as_me:9949: \$? = $ac_status" >&5
18212   (exit $ac_status); } >/dev/null; then
18213   if test -s conftest.err; then
18214     ac_cpp_err=$ac_c_preproc_warn_flag
18215@@ -9959,7 +9965,7 @@
18216 fi
18217 rm -f conftest.err conftest.$ac_ext
18218 fi
18219-echo "$as_me:9962: result: `eval echo '${'$as_ac_Header'}'`" >&5
18220+echo "$as_me:9968: result: `eval echo '${'$as_ac_Header'}'`" >&5
18221 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
18222 if test `eval echo '${'$as_ac_Header'}'` = yes; then
18223   cat >>confdefs.h <<EOF
18224@@ -10015,7 +10021,7 @@
18225 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
18226
18227 			  cat >conftest.$ac_ext <<_ACEOF
18228-#line 10018 "configure"
18229+#line 10024 "configure"
18230 #include "confdefs.h"
18231 #include <stdio.h>
18232 int
18233@@ -10027,16 +10033,16 @@
18234 }
18235 _ACEOF
18236 rm -f conftest.$ac_objext
18237-if { (eval echo "$as_me:10030: \"$ac_compile\"") >&5
18238+if { (eval echo "$as_me:10036: \"$ac_compile\"") >&5
18239   (eval $ac_compile) 2>&5
18240   ac_status=$?
18241-  echo "$as_me:10033: \$? = $ac_status" >&5
18242+  echo "$as_me:10039: \$? = $ac_status" >&5
18243   (exit $ac_status); } &&
18244          { ac_try='test -s conftest.$ac_objext'
18245-  { (eval echo "$as_me:10036: \"$ac_try\"") >&5
18246+  { (eval echo "$as_me:10042: \"$ac_try\"") >&5
18247   (eval $ac_try) 2>&5
18248   ac_status=$?
18249-  echo "$as_me:10039: \$? = $ac_status" >&5
18250+  echo "$as_me:10045: \$? = $ac_status" >&5
18251   (exit $ac_status); }; }; then
18252   :
18253 else
18254@@ -10053,7 +10059,7 @@
18255 		if test "$cf_have_incdir" = no ; then
18256 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
18257
18258-echo "${as_me:-configure}:10056: testing adding $cf_add_incdir to include-path ..." 1>&5
18259+echo "${as_me:-configure}:10062: testing adding $cf_add_incdir to include-path ..." 1>&5
18260
18261 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
18262
18263@@ -10072,7 +10078,7 @@
18264
18265 }
18266
18267-echo "$as_me:10075: checking for $cf_ncuhdr_root header in include-path" >&5
18268+echo "$as_me:10081: checking for $cf_ncuhdr_root header in include-path" >&5
18269 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
18270 if test "${cf_cv_ncurses_h+set}" = set; then
18271   echo $ECHO_N "(cached) $ECHO_C" >&6
18272@@ -10084,7 +10090,7 @@
18273 	do
18274
18275 	cat >conftest.$ac_ext <<_ACEOF
18276-#line 10087 "configure"
18277+#line 10093 "configure"
18278 #include "confdefs.h"
18279
18280 #include <$cf_header>
18281@@ -10108,16 +10114,16 @@
18282 }
18283 _ACEOF
18284 rm -f conftest.$ac_objext
18285-if { (eval echo "$as_me:10111: \"$ac_compile\"") >&5
18286+if { (eval echo "$as_me:10117: \"$ac_compile\"") >&5
18287   (eval $ac_compile) 2>&5
18288   ac_status=$?
18289-  echo "$as_me:10114: \$? = $ac_status" >&5
18290+  echo "$as_me:10120: \$? = $ac_status" >&5
18291   (exit $ac_status); } &&
18292          { ac_try='test -s conftest.$ac_objext'
18293-  { (eval echo "$as_me:10117: \"$ac_try\"") >&5
18294+  { (eval echo "$as_me:10123: \"$ac_try\"") >&5
18295   (eval $ac_try) 2>&5
18296   ac_status=$?
18297-  echo "$as_me:10120: \$? = $ac_status" >&5
18298+  echo "$as_me:10126: \$? = $ac_status" >&5
18299   (exit $ac_status); }; }; then
18300   cf_cv_ncurses_h=$cf_header
18301
18302@@ -10132,14 +10138,14 @@
18303 	done
18304
18305 fi
18306-echo "$as_me:10135: result: $cf_cv_ncurses_h" >&5
18307+echo "$as_me:10141: result: $cf_cv_ncurses_h" >&5
18308 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
18309
18310 if test "$cf_cv_ncurses_h" != no ; then
18311 	cf_cv_ncurses_header=$cf_cv_ncurses_h
18312 else
18313
18314-echo "$as_me:10142: checking for $cf_ncuhdr_root include-path" >&5
18315+echo "$as_me:10148: checking for $cf_ncuhdr_root include-path" >&5
18316 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
18317 if test "${cf_cv_ncurses_h2+set}" = set; then
18318   echo $ECHO_N "(cached) $ECHO_C" >&6
18319@@ -10260,7 +10266,7 @@
18320 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
18321
18322 			  cat >conftest.$ac_ext <<_ACEOF
18323-#line 10263 "configure"
18324+#line 10269 "configure"
18325 #include "confdefs.h"
18326 #include <stdio.h>
18327 int
18328@@ -10272,16 +10278,16 @@
18329 }
18330 _ACEOF
18331 rm -f conftest.$ac_objext
18332-if { (eval echo "$as_me:10275: \"$ac_compile\"") >&5
18333+if { (eval echo "$as_me:10281: \"$ac_compile\"") >&5
18334   (eval $ac_compile) 2>&5
18335   ac_status=$?
18336-  echo "$as_me:10278: \$? = $ac_status" >&5
18337+  echo "$as_me:10284: \$? = $ac_status" >&5
18338   (exit $ac_status); } &&
18339          { ac_try='test -s conftest.$ac_objext'
18340-  { (eval echo "$as_me:10281: \"$ac_try\"") >&5
18341+  { (eval echo "$as_me:10287: \"$ac_try\"") >&5
18342   (eval $ac_try) 2>&5
18343   ac_status=$?
18344-  echo "$as_me:10284: \$? = $ac_status" >&5
18345+  echo "$as_me:10290: \$? = $ac_status" >&5
18346   (exit $ac_status); }; }; then
18347   :
18348 else
18349@@ -10298,7 +10304,7 @@
18350 		if test "$cf_have_incdir" = no ; then
18351 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
18352
18353-echo "${as_me:-configure}:10301: testing adding $cf_add_incdir to include-path ..." 1>&5
18354+echo "${as_me:-configure}:10307: testing adding $cf_add_incdir to include-path ..." 1>&5
18355
18356 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
18357
18358@@ -10321,7 +10327,7 @@
18359 		do
18360
18361 	cat >conftest.$ac_ext <<_ACEOF
18362-#line 10324 "configure"
18363+#line 10330 "configure"
18364 #include "confdefs.h"
18365
18366 #include <$cf_header>
18367@@ -10345,16 +10351,16 @@
18368 }
18369 _ACEOF
18370 rm -f conftest.$ac_objext
18371-if { (eval echo "$as_me:10348: \"$ac_compile\"") >&5
18372+if { (eval echo "$as_me:10354: \"$ac_compile\"") >&5
18373   (eval $ac_compile) 2>&5
18374   ac_status=$?
18375-  echo "$as_me:10351: \$? = $ac_status" >&5
18376+  echo "$as_me:10357: \$? = $ac_status" >&5
18377   (exit $ac_status); } &&
18378          { ac_try='test -s conftest.$ac_objext'
18379-  { (eval echo "$as_me:10354: \"$ac_try\"") >&5
18380+  { (eval echo "$as_me:10360: \"$ac_try\"") >&5
18381   (eval $ac_try) 2>&5
18382   ac_status=$?
18383-  echo "$as_me:10357: \$? = $ac_status" >&5
18384+  echo "$as_me:10363: \$? = $ac_status" >&5
18385   (exit $ac_status); }; }; then
18386   cf_cv_ncurses_h2=$cf_header
18387
18388@@ -10375,12 +10381,12 @@
18389 		CPPFLAGS="$cf_save2_CPPFLAGS"
18390 		test "$cf_cv_ncurses_h2" != no && break
18391 	done
18392-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10378: error: not found" >&5
18393+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10384: error: not found" >&5
18394 echo "$as_me: error: not found" >&2;}
18395    { (exit 1); exit 1; }; }
18396
18397 fi
18398-echo "$as_me:10383: result: $cf_cv_ncurses_h2" >&5
18399+echo "$as_me:10389: result: $cf_cv_ncurses_h2" >&5
18400 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
18401
18402 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
18403@@ -10416,7 +10422,7 @@
18404 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
18405
18406 			  cat >conftest.$ac_ext <<_ACEOF
18407-#line 10419 "configure"
18408+#line 10425 "configure"
18409 #include "confdefs.h"
18410 #include <stdio.h>
18411 int
18412@@ -10428,16 +10434,16 @@
18413 }
18414 _ACEOF
18415 rm -f conftest.$ac_objext
18416-if { (eval echo "$as_me:10431: \"$ac_compile\"") >&5
18417+if { (eval echo "$as_me:10437: \"$ac_compile\"") >&5
18418   (eval $ac_compile) 2>&5
18419   ac_status=$?
18420-  echo "$as_me:10434: \$? = $ac_status" >&5
18421+  echo "$as_me:10440: \$? = $ac_status" >&5
18422   (exit $ac_status); } &&
18423          { ac_try='test -s conftest.$ac_objext'
18424-  { (eval echo "$as_me:10437: \"$ac_try\"") >&5
18425+  { (eval echo "$as_me:10443: \"$ac_try\"") >&5
18426   (eval $ac_try) 2>&5
18427   ac_status=$?
18428-  echo "$as_me:10440: \$? = $ac_status" >&5
18429+  echo "$as_me:10446: \$? = $ac_status" >&5
18430   (exit $ac_status); }; }; then
18431   :
18432 else
18433@@ -10454,7 +10460,7 @@
18434 		if test "$cf_have_incdir" = no ; then
18435 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
18436
18437-echo "${as_me:-configure}:10457: testing adding $cf_add_incdir to include-path ..." 1>&5
18438+echo "${as_me:-configure}:10463: testing adding $cf_add_incdir to include-path ..." 1>&5
18439
18440 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
18441
18442@@ -10502,7 +10508,7 @@
18443 	;;
18444 esac
18445
18446-echo "$as_me:10505: checking for terminfo header" >&5
18447+echo "$as_me:10511: checking for terminfo header" >&5
18448 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
18449 if test "${cf_cv_term_header+set}" = set; then
18450   echo $ECHO_N "(cached) $ECHO_C" >&6
18451@@ -10520,7 +10526,7 @@
18452 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
18453 do
18454 cat >conftest.$ac_ext <<_ACEOF
18455-#line 10523 "configure"
18456+#line 10529 "configure"
18457 #include "confdefs.h"
18458 #include <stdio.h>
18459 #include <${cf_cv_ncurses_header:-curses.h}>
18460@@ -10535,16 +10541,16 @@
18461 }
18462 _ACEOF
18463 rm -f conftest.$ac_objext
18464-if { (eval echo "$as_me:10538: \"$ac_compile\"") >&5
18465+if { (eval echo "$as_me:10544: \"$ac_compile\"") >&5
18466   (eval $ac_compile) 2>&5
18467   ac_status=$?
18468-  echo "$as_me:10541: \$? = $ac_status" >&5
18469+  echo "$as_me:10547: \$? = $ac_status" >&5
18470   (exit $ac_status); } &&
18471          { ac_try='test -s conftest.$ac_objext'
18472-  { (eval echo "$as_me:10544: \"$ac_try\"") >&5
18473+  { (eval echo "$as_me:10550: \"$ac_try\"") >&5
18474   (eval $ac_try) 2>&5
18475   ac_status=$?
18476-  echo "$as_me:10547: \$? = $ac_status" >&5
18477+  echo "$as_me:10553: \$? = $ac_status" >&5
18478   (exit $ac_status); }; }; then
18479
18480 	cf_cv_term_header="$cf_test"
18481@@ -10560,7 +10566,7 @@
18482 done
18483
18484 fi
18485-echo "$as_me:10563: result: $cf_cv_term_header" >&5
18486+echo "$as_me:10569: result: $cf_cv_term_header" >&5
18487 echo "${ECHO_T}$cf_cv_term_header" >&6
18488
18489 # Set definitions to allow ifdef'ing to accommodate subdirectories
18490@@ -10598,7 +10604,7 @@
18491 #define NCURSES 1
18492 EOF
18493
18494-echo "$as_me:10601: checking for ncurses version" >&5
18495+echo "$as_me:10607: checking for ncurses version" >&5
18496 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
18497 if test "${cf_cv_ncurses_version+set}" = set; then
18498   echo $ECHO_N "(cached) $ECHO_C" >&6
18499@@ -10624,10 +10630,10 @@
18500 #endif
18501 EOF
18502 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
18503-	{ (eval echo "$as_me:10627: \"$cf_try\"") >&5
18504+	{ (eval echo "$as_me:10633: \"$cf_try\"") >&5
18505   (eval $cf_try) 2>&5
18506   ac_status=$?
18507-  echo "$as_me:10630: \$? = $ac_status" >&5
18508+  echo "$as_me:10636: \$? = $ac_status" >&5
18509   (exit $ac_status); }
18510 	if test -f conftest.out ; then
18511 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
18512@@ -10637,7 +10643,7 @@
18513
18514 else
18515   cat >conftest.$ac_ext <<_ACEOF
18516-#line 10640 "configure"
18517+#line 10646 "configure"
18518 #include "confdefs.h"
18519
18520 #include <${cf_cv_ncurses_header:-curses.h}>
18521@@ -10662,15 +10668,15 @@
18522 }
18523 _ACEOF
18524 rm -f conftest$ac_exeext
18525-if { (eval echo "$as_me:10665: \"$ac_link\"") >&5
18526+if { (eval echo "$as_me:10671: \"$ac_link\"") >&5
18527   (eval $ac_link) 2>&5
18528   ac_status=$?
18529-  echo "$as_me:10668: \$? = $ac_status" >&5
18530+  echo "$as_me:10674: \$? = $ac_status" >&5
18531   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
18532-  { (eval echo "$as_me:10670: \"$ac_try\"") >&5
18533+  { (eval echo "$as_me:10676: \"$ac_try\"") >&5
18534   (eval $ac_try) 2>&5
18535   ac_status=$?
18536-  echo "$as_me:10673: \$? = $ac_status" >&5
18537+  echo "$as_me:10679: \$? = $ac_status" >&5
18538   (exit $ac_status); }; }; then
18539
18540 	cf_cv_ncurses_version=`cat $cf_tempfile`
18541@@ -10684,7 +10690,7 @@
18542 	rm -f $cf_tempfile
18543
18544 fi
18545-echo "$as_me:10687: result: $cf_cv_ncurses_version" >&5
18546+echo "$as_me:10693: result: $cf_cv_ncurses_version" >&5
18547 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
18548 test "$cf_cv_ncurses_version" = no ||
18549 cat >>confdefs.h <<\EOF
18550@@ -10697,7 +10703,7 @@
18551 	# to link gpm.
18552 cf_ncurses_LIBS=""
18553 cf_ncurses_SAVE="$LIBS"
18554-echo "$as_me:10700: checking for Gpm_Open in -lgpm" >&5
18555+echo "$as_me:10706: checking for Gpm_Open in -lgpm" >&5
18556 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
18557 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
18558   echo $ECHO_N "(cached) $ECHO_C" >&6
18559@@ -10705,7 +10711,7 @@
18560   ac_check_lib_save_LIBS=$LIBS
18561 LIBS="-lgpm  $LIBS"
18562 cat >conftest.$ac_ext <<_ACEOF
18563-#line 10708 "configure"
18564+#line 10714 "configure"
18565 #include "confdefs.h"
18566
18567 /* Override any gcc2 internal prototype to avoid an error.  */
18568@@ -10724,16 +10730,16 @@
18569 }
18570 _ACEOF
18571 rm -f conftest.$ac_objext conftest$ac_exeext
18572-if { (eval echo "$as_me:10727: \"$ac_link\"") >&5
18573+if { (eval echo "$as_me:10733: \"$ac_link\"") >&5
18574   (eval $ac_link) 2>&5
18575   ac_status=$?
18576-  echo "$as_me:10730: \$? = $ac_status" >&5
18577+  echo "$as_me:10736: \$? = $ac_status" >&5
18578   (exit $ac_status); } &&
18579          { ac_try='test -s conftest$ac_exeext'
18580-  { (eval echo "$as_me:10733: \"$ac_try\"") >&5
18581+  { (eval echo "$as_me:10739: \"$ac_try\"") >&5
18582   (eval $ac_try) 2>&5
18583   ac_status=$?
18584-  echo "$as_me:10736: \$? = $ac_status" >&5
18585+  echo "$as_me:10742: \$? = $ac_status" >&5
18586   (exit $ac_status); }; }; then
18587   ac_cv_lib_gpm_Gpm_Open=yes
18588 else
18589@@ -10744,10 +10750,10 @@
18590 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
18591 LIBS=$ac_check_lib_save_LIBS
18592 fi
18593-echo "$as_me:10747: result: $ac_cv_lib_gpm_Gpm_Open" >&5
18594+echo "$as_me:10753: result: $ac_cv_lib_gpm_Gpm_Open" >&5
18595 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
18596 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
18597-  echo "$as_me:10750: checking for initscr in -lgpm" >&5
18598+  echo "$as_me:10756: checking for initscr in -lgpm" >&5
18599 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
18600 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
18601   echo $ECHO_N "(cached) $ECHO_C" >&6
18602@@ -10755,7 +10761,7 @@
18603   ac_check_lib_save_LIBS=$LIBS
18604 LIBS="-lgpm  $LIBS"
18605 cat >conftest.$ac_ext <<_ACEOF
18606-#line 10758 "configure"
18607+#line 10764 "configure"
18608 #include "confdefs.h"
18609
18610 /* Override any gcc2 internal prototype to avoid an error.  */
18611@@ -10774,16 +10780,16 @@
18612 }
18613 _ACEOF
18614 rm -f conftest.$ac_objext conftest$ac_exeext
18615-if { (eval echo "$as_me:10777: \"$ac_link\"") >&5
18616+if { (eval echo "$as_me:10783: \"$ac_link\"") >&5
18617   (eval $ac_link) 2>&5
18618   ac_status=$?
18619-  echo "$as_me:10780: \$? = $ac_status" >&5
18620+  echo "$as_me:10786: \$? = $ac_status" >&5
18621   (exit $ac_status); } &&
18622          { ac_try='test -s conftest$ac_exeext'
18623-  { (eval echo "$as_me:10783: \"$ac_try\"") >&5
18624+  { (eval echo "$as_me:10789: \"$ac_try\"") >&5
18625   (eval $ac_try) 2>&5
18626   ac_status=$?
18627-  echo "$as_me:10786: \$? = $ac_status" >&5
18628+  echo "$as_me:10792: \$? = $ac_status" >&5
18629   (exit $ac_status); }; }; then
18630   ac_cv_lib_gpm_initscr=yes
18631 else
18632@@ -10794,7 +10800,7 @@
18633 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
18634 LIBS=$ac_check_lib_save_LIBS
18635 fi
18636-echo "$as_me:10797: result: $ac_cv_lib_gpm_initscr" >&5
18637+echo "$as_me:10803: result: $ac_cv_lib_gpm_initscr" >&5
18638 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
18639 if test $ac_cv_lib_gpm_initscr = yes; then
18640   LIBS="$cf_ncurses_SAVE"
18641@@ -10809,7 +10815,7 @@
18642 	# This is only necessary if you are linking against an obsolete
18643 	# version of ncurses (but it should do no harm, since it's static).
18644 	if test "$cf_nculib_root" = ncurses ; then
18645-		echo "$as_me:10812: checking for tgoto in -lmytinfo" >&5
18646+		echo "$as_me:10818: checking for tgoto in -lmytinfo" >&5
18647 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
18648 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
18649   echo $ECHO_N "(cached) $ECHO_C" >&6
18650@@ -10817,7 +10823,7 @@
18651   ac_check_lib_save_LIBS=$LIBS
18652 LIBS="-lmytinfo  $LIBS"
18653 cat >conftest.$ac_ext <<_ACEOF
18654-#line 10820 "configure"
18655+#line 10826 "configure"
18656 #include "confdefs.h"
18657
18658 /* Override any gcc2 internal prototype to avoid an error.  */
18659@@ -10836,16 +10842,16 @@
18660 }
18661 _ACEOF
18662 rm -f conftest.$ac_objext conftest$ac_exeext
18663-if { (eval echo "$as_me:10839: \"$ac_link\"") >&5
18664+if { (eval echo "$as_me:10845: \"$ac_link\"") >&5
18665   (eval $ac_link) 2>&5
18666   ac_status=$?
18667-  echo "$as_me:10842: \$? = $ac_status" >&5
18668+  echo "$as_me:10848: \$? = $ac_status" >&5
18669   (exit $ac_status); } &&
18670          { ac_try='test -s conftest$ac_exeext'
18671-  { (eval echo "$as_me:10845: \"$ac_try\"") >&5
18672+  { (eval echo "$as_me:10851: \"$ac_try\"") >&5
18673   (eval $ac_try) 2>&5
18674   ac_status=$?
18675-  echo "$as_me:10848: \$? = $ac_status" >&5
18676+  echo "$as_me:10854: \$? = $ac_status" >&5
18677   (exit $ac_status); }; }; then
18678   ac_cv_lib_mytinfo_tgoto=yes
18679 else
18680@@ -10856,7 +10862,7 @@
18681 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
18682 LIBS=$ac_check_lib_save_LIBS
18683 fi
18684-echo "$as_me:10859: result: $ac_cv_lib_mytinfo_tgoto" >&5
18685+echo "$as_me:10865: result: $ac_cv_lib_mytinfo_tgoto" >&5
18686 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
18687 if test $ac_cv_lib_mytinfo_tgoto = yes; then
18688   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
18689@@ -10905,13 +10911,13 @@
18690
18691 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
18692 	cf_libdir=""
18693-	echo "$as_me:10908: checking for initscr" >&5
18694+	echo "$as_me:10914: checking for initscr" >&5
18695 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
18696 if test "${ac_cv_func_initscr+set}" = set; then
18697   echo $ECHO_N "(cached) $ECHO_C" >&6
18698 else
18699   cat >conftest.$ac_ext <<_ACEOF
18700-#line 10914 "configure"
18701+#line 10920 "configure"
18702 #include "confdefs.h"
18703 #define initscr autoconf_temporary
18704 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
18705@@ -10942,16 +10948,16 @@
18706 }
18707 _ACEOF
18708 rm -f conftest.$ac_objext conftest$ac_exeext
18709-if { (eval echo "$as_me:10945: \"$ac_link\"") >&5
18710+if { (eval echo "$as_me:10951: \"$ac_link\"") >&5
18711   (eval $ac_link) 2>&5
18712   ac_status=$?
18713-  echo "$as_me:10948: \$? = $ac_status" >&5
18714+  echo "$as_me:10954: \$? = $ac_status" >&5
18715   (exit $ac_status); } &&
18716          { ac_try='test -s conftest$ac_exeext'
18717-  { (eval echo "$as_me:10951: \"$ac_try\"") >&5
18718+  { (eval echo "$as_me:10957: \"$ac_try\"") >&5
18719   (eval $ac_try) 2>&5
18720   ac_status=$?
18721-  echo "$as_me:10954: \$? = $ac_status" >&5
18722+  echo "$as_me:10960: \$? = $ac_status" >&5
18723   (exit $ac_status); }; }; then
18724   ac_cv_func_initscr=yes
18725 else
18726@@ -10961,18 +10967,18 @@
18727 fi
18728 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
18729 fi
18730-echo "$as_me:10964: result: $ac_cv_func_initscr" >&5
18731+echo "$as_me:10970: result: $ac_cv_func_initscr" >&5
18732 echo "${ECHO_T}$ac_cv_func_initscr" >&6
18733 if test $ac_cv_func_initscr = yes; then
18734   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
18735 else
18736
18737 		cf_save_LIBS="$LIBS"
18738-		echo "$as_me:10971: checking for initscr in -l$cf_nculib_root" >&5
18739+		echo "$as_me:10977: checking for initscr in -l$cf_nculib_root" >&5
18740 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
18741 		LIBS="-l$cf_nculib_root $LIBS"
18742 		cat >conftest.$ac_ext <<_ACEOF
18743-#line 10975 "configure"
18744+#line 10981 "configure"
18745 #include "confdefs.h"
18746 #include <${cf_cv_ncurses_header:-curses.h}>
18747 int
18748@@ -10984,25 +10990,25 @@
18749 }
18750 _ACEOF
18751 rm -f conftest.$ac_objext conftest$ac_exeext
18752-if { (eval echo "$as_me:10987: \"$ac_link\"") >&5
18753+if { (eval echo "$as_me:10993: \"$ac_link\"") >&5
18754   (eval $ac_link) 2>&5
18755   ac_status=$?
18756-  echo "$as_me:10990: \$? = $ac_status" >&5
18757+  echo "$as_me:10996: \$? = $ac_status" >&5
18758   (exit $ac_status); } &&
18759          { ac_try='test -s conftest$ac_exeext'
18760-  { (eval echo "$as_me:10993: \"$ac_try\"") >&5
18761+  { (eval echo "$as_me:10999: \"$ac_try\"") >&5
18762   (eval $ac_try) 2>&5
18763   ac_status=$?
18764-  echo "$as_me:10996: \$? = $ac_status" >&5
18765+  echo "$as_me:11002: \$? = $ac_status" >&5
18766   (exit $ac_status); }; }; then
18767-  echo "$as_me:10998: result: yes" >&5
18768+  echo "$as_me:11004: result: yes" >&5
18769 echo "${ECHO_T}yes" >&6
18770 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
18771
18772 else
18773   echo "$as_me: failed program was:" >&5
18774 cat conftest.$ac_ext >&5
18775-echo "$as_me:11005: result: no" >&5
18776+echo "$as_me:11011: result: no" >&5
18777 echo "${ECHO_T}no" >&6
18778
18779 cf_search=
18780@@ -11070,11 +11076,11 @@
18781
18782 			for cf_libdir in $cf_search
18783 			do
18784-				echo "$as_me:11073: checking for -l$cf_nculib_root in $cf_libdir" >&5
18785+				echo "$as_me:11079: checking for -l$cf_nculib_root in $cf_libdir" >&5
18786 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
18787 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
18788 				cat >conftest.$ac_ext <<_ACEOF
18789-#line 11077 "configure"
18790+#line 11083 "configure"
18791 #include "confdefs.h"
18792 #include <${cf_cv_ncurses_header:-curses.h}>
18793 int
18794@@ -11086,25 +11092,25 @@
18795 }
18796 _ACEOF
18797 rm -f conftest.$ac_objext conftest$ac_exeext
18798-if { (eval echo "$as_me:11089: \"$ac_link\"") >&5
18799+if { (eval echo "$as_me:11095: \"$ac_link\"") >&5
18800   (eval $ac_link) 2>&5
18801   ac_status=$?
18802-  echo "$as_me:11092: \$? = $ac_status" >&5
18803+  echo "$as_me:11098: \$? = $ac_status" >&5
18804   (exit $ac_status); } &&
18805          { ac_try='test -s conftest$ac_exeext'
18806-  { (eval echo "$as_me:11095: \"$ac_try\"") >&5
18807+  { (eval echo "$as_me:11101: \"$ac_try\"") >&5
18808   (eval $ac_try) 2>&5
18809   ac_status=$?
18810-  echo "$as_me:11098: \$? = $ac_status" >&5
18811+  echo "$as_me:11104: \$? = $ac_status" >&5
18812   (exit $ac_status); }; }; then
18813-  echo "$as_me:11100: result: yes" >&5
18814+  echo "$as_me:11106: result: yes" >&5
18815 echo "${ECHO_T}yes" >&6
18816 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
18817 					 break
18818 else
18819   echo "$as_me: failed program was:" >&5
18820 cat conftest.$ac_ext >&5
18821-echo "$as_me:11107: result: no" >&5
18822+echo "$as_me:11113: result: no" >&5
18823 echo "${ECHO_T}no" >&6
18824 					 LIBS="$cf_save_LIBS"
18825 fi
18826@@ -11119,7 +11125,7 @@
18827 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
18828
18829 if test $cf_found_library = no ; then
18830-	{ { echo "$as_me:11122: error: Cannot link $cf_nculib_root library" >&5
18831+	{ { echo "$as_me:11128: error: Cannot link $cf_nculib_root library" >&5
18832 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
18833    { (exit 1); exit 1; }; }
18834 fi
18835@@ -11127,7 +11133,7 @@
18836 fi
18837
18838 if test -n "$cf_ncurses_LIBS" ; then
18839-	echo "$as_me:11130: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
18840+	echo "$as_me:11136: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
18841 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
18842 	cf_ncurses_SAVE="$LIBS"
18843 	for p in $cf_ncurses_LIBS ; do
18844@@ -11137,7 +11143,7 @@
18845 		fi
18846 	done
18847 	cat >conftest.$ac_ext <<_ACEOF
18848-#line 11140 "configure"
18849+#line 11146 "configure"
18850 #include "confdefs.h"
18851 #include <${cf_cv_ncurses_header:-curses.h}>
18852 int
18853@@ -11149,23 +11155,23 @@
18854 }
18855 _ACEOF
18856 rm -f conftest.$ac_objext conftest$ac_exeext
18857-if { (eval echo "$as_me:11152: \"$ac_link\"") >&5
18858+if { (eval echo "$as_me:11158: \"$ac_link\"") >&5
18859   (eval $ac_link) 2>&5
18860   ac_status=$?
18861-  echo "$as_me:11155: \$? = $ac_status" >&5
18862+  echo "$as_me:11161: \$? = $ac_status" >&5
18863   (exit $ac_status); } &&
18864          { ac_try='test -s conftest$ac_exeext'
18865-  { (eval echo "$as_me:11158: \"$ac_try\"") >&5
18866+  { (eval echo "$as_me:11164: \"$ac_try\"") >&5
18867   (eval $ac_try) 2>&5
18868   ac_status=$?
18869-  echo "$as_me:11161: \$? = $ac_status" >&5
18870+  echo "$as_me:11167: \$? = $ac_status" >&5
18871   (exit $ac_status); }; }; then
18872-  echo "$as_me:11163: result: yes" >&5
18873+  echo "$as_me:11169: result: yes" >&5
18874 echo "${ECHO_T}yes" >&6
18875 else
18876   echo "$as_me: failed program was:" >&5
18877 cat conftest.$ac_ext >&5
18878-echo "$as_me:11168: result: no" >&5
18879+echo "$as_me:11174: result: no" >&5
18880 echo "${ECHO_T}no" >&6
18881 		 LIBS="$cf_ncurses_SAVE"
18882 fi
18883@@ -11185,7 +11191,7 @@
18884
18885 	;;
18886 (pdcurses)
18887-	echo "$as_me:11188: checking for X" >&5
18888+	echo "$as_me:11194: checking for X" >&5
18889 echo $ECHO_N "checking for X... $ECHO_C" >&6
18890
18891 # Check whether --with-x or --without-x was given.
18892@@ -11286,17 +11292,17 @@
18893   # Guess where to find include files, by looking for Intrinsic.h.
18894   # First, try using that file with no special directory specified.
18895   cat >conftest.$ac_ext <<_ACEOF
18896-#line 11289 "configure"
18897+#line 11295 "configure"
18898 #include "confdefs.h"
18899 #include <X11/Intrinsic.h>
18900 _ACEOF
18901-if { (eval echo "$as_me:11293: \"$ac_cpp conftest.$ac_ext\"") >&5
18902+if { (eval echo "$as_me:11299: \"$ac_cpp conftest.$ac_ext\"") >&5
18903   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
18904   ac_status=$?
18905   egrep -v '^ *\+' conftest.er1 >conftest.err
18906   rm -f conftest.er1
18907   cat conftest.err >&5
18908-  echo "$as_me:11299: \$? = $ac_status" >&5
18909+  echo "$as_me:11305: \$? = $ac_status" >&5
18910   (exit $ac_status); } >/dev/null; then
18911   if test -s conftest.err; then
18912     ac_cpp_err=$ac_c_preproc_warn_flag
18913@@ -11329,7 +11335,7 @@
18914   ac_save_LIBS=$LIBS
18915   LIBS="-lXt $LIBS"
18916   cat >conftest.$ac_ext <<_ACEOF
18917-#line 11332 "configure"
18918+#line 11338 "configure"
18919 #include "confdefs.h"
18920 #include <X11/Intrinsic.h>
18921 int
18922@@ -11341,16 +11347,16 @@
18923 }
18924 _ACEOF
18925 rm -f conftest.$ac_objext conftest$ac_exeext
18926-if { (eval echo "$as_me:11344: \"$ac_link\"") >&5
18927+if { (eval echo "$as_me:11350: \"$ac_link\"") >&5
18928   (eval $ac_link) 2>&5
18929   ac_status=$?
18930-  echo "$as_me:11347: \$? = $ac_status" >&5
18931+  echo "$as_me:11353: \$? = $ac_status" >&5
18932   (exit $ac_status); } &&
18933          { ac_try='test -s conftest$ac_exeext'
18934-  { (eval echo "$as_me:11350: \"$ac_try\"") >&5
18935+  { (eval echo "$as_me:11356: \"$ac_try\"") >&5
18936   (eval $ac_try) 2>&5
18937   ac_status=$?
18938-  echo "$as_me:11353: \$? = $ac_status" >&5
18939+  echo "$as_me:11359: \$? = $ac_status" >&5
18940   (exit $ac_status); }; }; then
18941   LIBS=$ac_save_LIBS
18942 # We can link X programs with no special library path.
18943@@ -11388,7 +11394,7 @@
18944 fi # $with_x != no
18945
18946 if test "$have_x" != yes; then
18947-  echo "$as_me:11391: result: $have_x" >&5
18948+  echo "$as_me:11397: result: $have_x" >&5
18949 echo "${ECHO_T}$have_x" >&6
18950   no_x=yes
18951 else
18952@@ -11398,7 +11404,7 @@
18953   # Update the cache value to reflect the command line values.
18954   ac_cv_have_x="have_x=yes \
18955 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
18956-  echo "$as_me:11401: result: libraries $x_libraries, headers $x_includes" >&5
18957+  echo "$as_me:11407: result: libraries $x_libraries, headers $x_includes" >&5
18958 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
18959 fi
18960
18961@@ -11422,11 +11428,11 @@
18962     # others require no space.  Words are not sufficient . . . .
18963     case `(uname -sr) 2>/dev/null` in
18964     "SunOS 5"*)
18965-      echo "$as_me:11425: checking whether -R must be followed by a space" >&5
18966+      echo "$as_me:11431: checking whether -R must be followed by a space" >&5
18967 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
18968       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
18969       cat >conftest.$ac_ext <<_ACEOF
18970-#line 11429 "configure"
18971+#line 11435 "configure"
18972 #include "confdefs.h"
18973
18974 int
18975@@ -11438,16 +11444,16 @@
18976 }
18977 _ACEOF
18978 rm -f conftest.$ac_objext conftest$ac_exeext
18979-if { (eval echo "$as_me:11441: \"$ac_link\"") >&5
18980+if { (eval echo "$as_me:11447: \"$ac_link\"") >&5
18981   (eval $ac_link) 2>&5
18982   ac_status=$?
18983-  echo "$as_me:11444: \$? = $ac_status" >&5
18984+  echo "$as_me:11450: \$? = $ac_status" >&5
18985   (exit $ac_status); } &&
18986          { ac_try='test -s conftest$ac_exeext'
18987-  { (eval echo "$as_me:11447: \"$ac_try\"") >&5
18988+  { (eval echo "$as_me:11453: \"$ac_try\"") >&5
18989   (eval $ac_try) 2>&5
18990   ac_status=$?
18991-  echo "$as_me:11450: \$? = $ac_status" >&5
18992+  echo "$as_me:11456: \$? = $ac_status" >&5
18993   (exit $ac_status); }; }; then
18994   ac_R_nospace=yes
18995 else
18996@@ -11457,13 +11463,13 @@
18997 fi
18998 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
18999       if test $ac_R_nospace = yes; then
19000-	echo "$as_me:11460: result: no" >&5
19001+	echo "$as_me:11466: result: no" >&5
19002 echo "${ECHO_T}no" >&6
19003 	X_LIBS="$X_LIBS -R$x_libraries"
19004       else
19005 	LIBS="$ac_xsave_LIBS -R $x_libraries"
19006 	cat >conftest.$ac_ext <<_ACEOF
19007-#line 11466 "configure"
19008+#line 11472 "configure"
19009 #include "confdefs.h"
19010
19011 int
19012@@ -11475,16 +11481,16 @@
19013 }
19014 _ACEOF
19015 rm -f conftest.$ac_objext conftest$ac_exeext
19016-if { (eval echo "$as_me:11478: \"$ac_link\"") >&5
19017+if { (eval echo "$as_me:11484: \"$ac_link\"") >&5
19018   (eval $ac_link) 2>&5
19019   ac_status=$?
19020-  echo "$as_me:11481: \$? = $ac_status" >&5
19021+  echo "$as_me:11487: \$? = $ac_status" >&5
19022   (exit $ac_status); } &&
19023          { ac_try='test -s conftest$ac_exeext'
19024-  { (eval echo "$as_me:11484: \"$ac_try\"") >&5
19025+  { (eval echo "$as_me:11490: \"$ac_try\"") >&5
19026   (eval $ac_try) 2>&5
19027   ac_status=$?
19028-  echo "$as_me:11487: \$? = $ac_status" >&5
19029+  echo "$as_me:11493: \$? = $ac_status" >&5
19030   (exit $ac_status); }; }; then
19031   ac_R_space=yes
19032 else
19033@@ -11494,11 +11500,11 @@
19034 fi
19035 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
19036 	if test $ac_R_space = yes; then
19037-	  echo "$as_me:11497: result: yes" >&5
19038+	  echo "$as_me:11503: result: yes" >&5
19039 echo "${ECHO_T}yes" >&6
19040 	  X_LIBS="$X_LIBS -R $x_libraries"
19041 	else
19042-	  echo "$as_me:11501: result: neither works" >&5
19043+	  echo "$as_me:11507: result: neither works" >&5
19044 echo "${ECHO_T}neither works" >&6
19045 	fi
19046       fi
19047@@ -11518,7 +11524,7 @@
19048     # the Alpha needs dnet_stub (dnet does not exist).
19049     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
19050     cat >conftest.$ac_ext <<_ACEOF
19051-#line 11521 "configure"
19052+#line 11527 "configure"
19053 #include "confdefs.h"
19054
19055 /* Override any gcc2 internal prototype to avoid an error.  */
19056@@ -11537,22 +11543,22 @@
19057 }
19058 _ACEOF
19059 rm -f conftest.$ac_objext conftest$ac_exeext
19060-if { (eval echo "$as_me:11540: \"$ac_link\"") >&5
19061+if { (eval echo "$as_me:11546: \"$ac_link\"") >&5
19062   (eval $ac_link) 2>&5
19063   ac_status=$?
19064-  echo "$as_me:11543: \$? = $ac_status" >&5
19065+  echo "$as_me:11549: \$? = $ac_status" >&5
19066   (exit $ac_status); } &&
19067          { ac_try='test -s conftest$ac_exeext'
19068-  { (eval echo "$as_me:11546: \"$ac_try\"") >&5
19069+  { (eval echo "$as_me:11552: \"$ac_try\"") >&5
19070   (eval $ac_try) 2>&5
19071   ac_status=$?
19072-  echo "$as_me:11549: \$? = $ac_status" >&5
19073+  echo "$as_me:11555: \$? = $ac_status" >&5
19074   (exit $ac_status); }; }; then
19075   :
19076 else
19077   echo "$as_me: failed program was:" >&5
19078 cat conftest.$ac_ext >&5
19079-echo "$as_me:11555: checking for dnet_ntoa in -ldnet" >&5
19080+echo "$as_me:11561: checking for dnet_ntoa in -ldnet" >&5
19081 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
19082 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
19083   echo $ECHO_N "(cached) $ECHO_C" >&6
19084@@ -11560,7 +11566,7 @@
19085   ac_check_lib_save_LIBS=$LIBS
19086 LIBS="-ldnet  $LIBS"
19087 cat >conftest.$ac_ext <<_ACEOF
19088-#line 11563 "configure"
19089+#line 11569 "configure"
19090 #include "confdefs.h"
19091
19092 /* Override any gcc2 internal prototype to avoid an error.  */
19093@@ -11579,16 +11585,16 @@
19094 }
19095 _ACEOF
19096 rm -f conftest.$ac_objext conftest$ac_exeext
19097-if { (eval echo "$as_me:11582: \"$ac_link\"") >&5
19098+if { (eval echo "$as_me:11588: \"$ac_link\"") >&5
19099   (eval $ac_link) 2>&5
19100   ac_status=$?
19101-  echo "$as_me:11585: \$? = $ac_status" >&5
19102+  echo "$as_me:11591: \$? = $ac_status" >&5
19103   (exit $ac_status); } &&
19104          { ac_try='test -s conftest$ac_exeext'
19105-  { (eval echo "$as_me:11588: \"$ac_try\"") >&5
19106+  { (eval echo "$as_me:11594: \"$ac_try\"") >&5
19107   (eval $ac_try) 2>&5
19108   ac_status=$?
19109-  echo "$as_me:11591: \$? = $ac_status" >&5
19110+  echo "$as_me:11597: \$? = $ac_status" >&5
19111   (exit $ac_status); }; }; then
19112   ac_cv_lib_dnet_dnet_ntoa=yes
19113 else
19114@@ -11599,14 +11605,14 @@
19115 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
19116 LIBS=$ac_check_lib_save_LIBS
19117 fi
19118-echo "$as_me:11602: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
19119+echo "$as_me:11608: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
19120 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
19121 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
19122   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
19123 fi
19124
19125     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
19126-      echo "$as_me:11609: checking for dnet_ntoa in -ldnet_stub" >&5
19127+      echo "$as_me:11615: checking for dnet_ntoa in -ldnet_stub" >&5
19128 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
19129 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
19130   echo $ECHO_N "(cached) $ECHO_C" >&6
19131@@ -11614,7 +11620,7 @@
19132   ac_check_lib_save_LIBS=$LIBS
19133 LIBS="-ldnet_stub  $LIBS"
19134 cat >conftest.$ac_ext <<_ACEOF
19135-#line 11617 "configure"
19136+#line 11623 "configure"
19137 #include "confdefs.h"
19138
19139 /* Override any gcc2 internal prototype to avoid an error.  */
19140@@ -11633,16 +11639,16 @@
19141 }
19142 _ACEOF
19143 rm -f conftest.$ac_objext conftest$ac_exeext
19144-if { (eval echo "$as_me:11636: \"$ac_link\"") >&5
19145+if { (eval echo "$as_me:11642: \"$ac_link\"") >&5
19146   (eval $ac_link) 2>&5
19147   ac_status=$?
19148-  echo "$as_me:11639: \$? = $ac_status" >&5
19149+  echo "$as_me:11645: \$? = $ac_status" >&5
19150   (exit $ac_status); } &&
19151          { ac_try='test -s conftest$ac_exeext'
19152-  { (eval echo "$as_me:11642: \"$ac_try\"") >&5
19153+  { (eval echo "$as_me:11648: \"$ac_try\"") >&5
19154   (eval $ac_try) 2>&5
19155   ac_status=$?
19156-  echo "$as_me:11645: \$? = $ac_status" >&5
19157+  echo "$as_me:11651: \$? = $ac_status" >&5
19158   (exit $ac_status); }; }; then
19159   ac_cv_lib_dnet_stub_dnet_ntoa=yes
19160 else
19161@@ -11653,7 +11659,7 @@
19162 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
19163 LIBS=$ac_check_lib_save_LIBS
19164 fi
19165-echo "$as_me:11656: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
19166+echo "$as_me:11662: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
19167 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
19168 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
19169   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
19170@@ -11672,13 +11678,13 @@
19171     # on Irix 5.2, according to T.E. Dickey.
19172     # The functions gethostbyname, getservbyname, and inet_addr are
19173     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
19174-    echo "$as_me:11675: checking for gethostbyname" >&5
19175+    echo "$as_me:11681: checking for gethostbyname" >&5
19176 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
19177 if test "${ac_cv_func_gethostbyname+set}" = set; then
19178   echo $ECHO_N "(cached) $ECHO_C" >&6
19179 else
19180   cat >conftest.$ac_ext <<_ACEOF
19181-#line 11681 "configure"
19182+#line 11687 "configure"
19183 #include "confdefs.h"
19184 #define gethostbyname autoconf_temporary
19185 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
19186@@ -11709,16 +11715,16 @@
19187 }
19188 _ACEOF
19189 rm -f conftest.$ac_objext conftest$ac_exeext
19190-if { (eval echo "$as_me:11712: \"$ac_link\"") >&5
19191+if { (eval echo "$as_me:11718: \"$ac_link\"") >&5
19192   (eval $ac_link) 2>&5
19193   ac_status=$?
19194-  echo "$as_me:11715: \$? = $ac_status" >&5
19195+  echo "$as_me:11721: \$? = $ac_status" >&5
19196   (exit $ac_status); } &&
19197          { ac_try='test -s conftest$ac_exeext'
19198-  { (eval echo "$as_me:11718: \"$ac_try\"") >&5
19199+  { (eval echo "$as_me:11724: \"$ac_try\"") >&5
19200   (eval $ac_try) 2>&5
19201   ac_status=$?
19202-  echo "$as_me:11721: \$? = $ac_status" >&5
19203+  echo "$as_me:11727: \$? = $ac_status" >&5
19204   (exit $ac_status); }; }; then
19205   ac_cv_func_gethostbyname=yes
19206 else
19207@@ -11728,11 +11734,11 @@
19208 fi
19209 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
19210 fi
19211-echo "$as_me:11731: result: $ac_cv_func_gethostbyname" >&5
19212+echo "$as_me:11737: result: $ac_cv_func_gethostbyname" >&5
19213 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
19214
19215     if test $ac_cv_func_gethostbyname = no; then
19216-      echo "$as_me:11735: checking for gethostbyname in -lnsl" >&5
19217+      echo "$as_me:11741: checking for gethostbyname in -lnsl" >&5
19218 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
19219 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
19220   echo $ECHO_N "(cached) $ECHO_C" >&6
19221@@ -11740,7 +11746,7 @@
19222   ac_check_lib_save_LIBS=$LIBS
19223 LIBS="-lnsl  $LIBS"
19224 cat >conftest.$ac_ext <<_ACEOF
19225-#line 11743 "configure"
19226+#line 11749 "configure"
19227 #include "confdefs.h"
19228
19229 /* Override any gcc2 internal prototype to avoid an error.  */
19230@@ -11759,16 +11765,16 @@
19231 }
19232 _ACEOF
19233 rm -f conftest.$ac_objext conftest$ac_exeext
19234-if { (eval echo "$as_me:11762: \"$ac_link\"") >&5
19235+if { (eval echo "$as_me:11768: \"$ac_link\"") >&5
19236   (eval $ac_link) 2>&5
19237   ac_status=$?
19238-  echo "$as_me:11765: \$? = $ac_status" >&5
19239+  echo "$as_me:11771: \$? = $ac_status" >&5
19240   (exit $ac_status); } &&
19241          { ac_try='test -s conftest$ac_exeext'
19242-  { (eval echo "$as_me:11768: \"$ac_try\"") >&5
19243+  { (eval echo "$as_me:11774: \"$ac_try\"") >&5
19244   (eval $ac_try) 2>&5
19245   ac_status=$?
19246-  echo "$as_me:11771: \$? = $ac_status" >&5
19247+  echo "$as_me:11777: \$? = $ac_status" >&5
19248   (exit $ac_status); }; }; then
19249   ac_cv_lib_nsl_gethostbyname=yes
19250 else
19251@@ -11779,14 +11785,14 @@
19252 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
19253 LIBS=$ac_check_lib_save_LIBS
19254 fi
19255-echo "$as_me:11782: result: $ac_cv_lib_nsl_gethostbyname" >&5
19256+echo "$as_me:11788: result: $ac_cv_lib_nsl_gethostbyname" >&5
19257 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
19258 if test $ac_cv_lib_nsl_gethostbyname = yes; then
19259   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
19260 fi
19261
19262       if test $ac_cv_lib_nsl_gethostbyname = no; then
19263-        echo "$as_me:11789: checking for gethostbyname in -lbsd" >&5
19264+        echo "$as_me:11795: checking for gethostbyname in -lbsd" >&5
19265 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
19266 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
19267   echo $ECHO_N "(cached) $ECHO_C" >&6
19268@@ -11794,7 +11800,7 @@
19269   ac_check_lib_save_LIBS=$LIBS
19270 LIBS="-lbsd  $LIBS"
19271 cat >conftest.$ac_ext <<_ACEOF
19272-#line 11797 "configure"
19273+#line 11803 "configure"
19274 #include "confdefs.h"
19275
19276 /* Override any gcc2 internal prototype to avoid an error.  */
19277@@ -11813,16 +11819,16 @@
19278 }
19279 _ACEOF
19280 rm -f conftest.$ac_objext conftest$ac_exeext
19281-if { (eval echo "$as_me:11816: \"$ac_link\"") >&5
19282+if { (eval echo "$as_me:11822: \"$ac_link\"") >&5
19283   (eval $ac_link) 2>&5
19284   ac_status=$?
19285-  echo "$as_me:11819: \$? = $ac_status" >&5
19286+  echo "$as_me:11825: \$? = $ac_status" >&5
19287   (exit $ac_status); } &&
19288          { ac_try='test -s conftest$ac_exeext'
19289-  { (eval echo "$as_me:11822: \"$ac_try\"") >&5
19290+  { (eval echo "$as_me:11828: \"$ac_try\"") >&5
19291   (eval $ac_try) 2>&5
19292   ac_status=$?
19293-  echo "$as_me:11825: \$? = $ac_status" >&5
19294+  echo "$as_me:11831: \$? = $ac_status" >&5
19295   (exit $ac_status); }; }; then
19296   ac_cv_lib_bsd_gethostbyname=yes
19297 else
19298@@ -11833,7 +11839,7 @@
19299 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
19300 LIBS=$ac_check_lib_save_LIBS
19301 fi
19302-echo "$as_me:11836: result: $ac_cv_lib_bsd_gethostbyname" >&5
19303+echo "$as_me:11842: result: $ac_cv_lib_bsd_gethostbyname" >&5
19304 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
19305 if test $ac_cv_lib_bsd_gethostbyname = yes; then
19306   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
19307@@ -11849,13 +11855,13 @@
19308     # variants that don't use the nameserver (or something).  -lsocket
19309     # must be given before -lnsl if both are needed.  We assume that
19310     # if connect needs -lnsl, so does gethostbyname.
19311-    echo "$as_me:11852: checking for connect" >&5
19312+    echo "$as_me:11858: checking for connect" >&5
19313 echo $ECHO_N "checking for connect... $ECHO_C" >&6
19314 if test "${ac_cv_func_connect+set}" = set; then
19315   echo $ECHO_N "(cached) $ECHO_C" >&6
19316 else
19317   cat >conftest.$ac_ext <<_ACEOF
19318-#line 11858 "configure"
19319+#line 11864 "configure"
19320 #include "confdefs.h"
19321 #define connect autoconf_temporary
19322 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
19323@@ -11886,16 +11892,16 @@
19324 }
19325 _ACEOF
19326 rm -f conftest.$ac_objext conftest$ac_exeext
19327-if { (eval echo "$as_me:11889: \"$ac_link\"") >&5
19328+if { (eval echo "$as_me:11895: \"$ac_link\"") >&5
19329   (eval $ac_link) 2>&5
19330   ac_status=$?
19331-  echo "$as_me:11892: \$? = $ac_status" >&5
19332+  echo "$as_me:11898: \$? = $ac_status" >&5
19333   (exit $ac_status); } &&
19334          { ac_try='test -s conftest$ac_exeext'
19335-  { (eval echo "$as_me:11895: \"$ac_try\"") >&5
19336+  { (eval echo "$as_me:11901: \"$ac_try\"") >&5
19337   (eval $ac_try) 2>&5
19338   ac_status=$?
19339-  echo "$as_me:11898: \$? = $ac_status" >&5
19340+  echo "$as_me:11904: \$? = $ac_status" >&5
19341   (exit $ac_status); }; }; then
19342   ac_cv_func_connect=yes
19343 else
19344@@ -11905,11 +11911,11 @@
19345 fi
19346 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
19347 fi
19348-echo "$as_me:11908: result: $ac_cv_func_connect" >&5
19349+echo "$as_me:11914: result: $ac_cv_func_connect" >&5
19350 echo "${ECHO_T}$ac_cv_func_connect" >&6
19351
19352     if test $ac_cv_func_connect = no; then
19353-      echo "$as_me:11912: checking for connect in -lsocket" >&5
19354+      echo "$as_me:11918: checking for connect in -lsocket" >&5
19355 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
19356 if test "${ac_cv_lib_socket_connect+set}" = set; then
19357   echo $ECHO_N "(cached) $ECHO_C" >&6
19358@@ -11917,7 +11923,7 @@
19359   ac_check_lib_save_LIBS=$LIBS
19360 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
19361 cat >conftest.$ac_ext <<_ACEOF
19362-#line 11920 "configure"
19363+#line 11926 "configure"
19364 #include "confdefs.h"
19365
19366 /* Override any gcc2 internal prototype to avoid an error.  */
19367@@ -11936,16 +11942,16 @@
19368 }
19369 _ACEOF
19370 rm -f conftest.$ac_objext conftest$ac_exeext
19371-if { (eval echo "$as_me:11939: \"$ac_link\"") >&5
19372+if { (eval echo "$as_me:11945: \"$ac_link\"") >&5
19373   (eval $ac_link) 2>&5
19374   ac_status=$?
19375-  echo "$as_me:11942: \$? = $ac_status" >&5
19376+  echo "$as_me:11948: \$? = $ac_status" >&5
19377   (exit $ac_status); } &&
19378          { ac_try='test -s conftest$ac_exeext'
19379-  { (eval echo "$as_me:11945: \"$ac_try\"") >&5
19380+  { (eval echo "$as_me:11951: \"$ac_try\"") >&5
19381   (eval $ac_try) 2>&5
19382   ac_status=$?
19383-  echo "$as_me:11948: \$? = $ac_status" >&5
19384+  echo "$as_me:11954: \$? = $ac_status" >&5
19385   (exit $ac_status); }; }; then
19386   ac_cv_lib_socket_connect=yes
19387 else
19388@@ -11956,7 +11962,7 @@
19389 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
19390 LIBS=$ac_check_lib_save_LIBS
19391 fi
19392-echo "$as_me:11959: result: $ac_cv_lib_socket_connect" >&5
19393+echo "$as_me:11965: result: $ac_cv_lib_socket_connect" >&5
19394 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
19395 if test $ac_cv_lib_socket_connect = yes; then
19396   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
19397@@ -11965,13 +11971,13 @@
19398     fi
19399
19400     # Guillermo Gomez says -lposix is necessary on A/UX.
19401-    echo "$as_me:11968: checking for remove" >&5
19402+    echo "$as_me:11974: checking for remove" >&5
19403 echo $ECHO_N "checking for remove... $ECHO_C" >&6
19404 if test "${ac_cv_func_remove+set}" = set; then
19405   echo $ECHO_N "(cached) $ECHO_C" >&6
19406 else
19407   cat >conftest.$ac_ext <<_ACEOF
19408-#line 11974 "configure"
19409+#line 11980 "configure"
19410 #include "confdefs.h"
19411 #define remove autoconf_temporary
19412 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
19413@@ -12002,16 +12008,16 @@
19414 }
19415 _ACEOF
19416 rm -f conftest.$ac_objext conftest$ac_exeext
19417-if { (eval echo "$as_me:12005: \"$ac_link\"") >&5
19418+if { (eval echo "$as_me:12011: \"$ac_link\"") >&5
19419   (eval $ac_link) 2>&5
19420   ac_status=$?
19421-  echo "$as_me:12008: \$? = $ac_status" >&5
19422+  echo "$as_me:12014: \$? = $ac_status" >&5
19423   (exit $ac_status); } &&
19424          { ac_try='test -s conftest$ac_exeext'
19425-  { (eval echo "$as_me:12011: \"$ac_try\"") >&5
19426+  { (eval echo "$as_me:12017: \"$ac_try\"") >&5
19427   (eval $ac_try) 2>&5
19428   ac_status=$?
19429-  echo "$as_me:12014: \$? = $ac_status" >&5
19430+  echo "$as_me:12020: \$? = $ac_status" >&5
19431   (exit $ac_status); }; }; then
19432   ac_cv_func_remove=yes
19433 else
19434@@ -12021,11 +12027,11 @@
19435 fi
19436 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
19437 fi
19438-echo "$as_me:12024: result: $ac_cv_func_remove" >&5
19439+echo "$as_me:12030: result: $ac_cv_func_remove" >&5
19440 echo "${ECHO_T}$ac_cv_func_remove" >&6
19441
19442     if test $ac_cv_func_remove = no; then
19443-      echo "$as_me:12028: checking for remove in -lposix" >&5
19444+      echo "$as_me:12034: checking for remove in -lposix" >&5
19445 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
19446 if test "${ac_cv_lib_posix_remove+set}" = set; then
19447   echo $ECHO_N "(cached) $ECHO_C" >&6
19448@@ -12033,7 +12039,7 @@
19449   ac_check_lib_save_LIBS=$LIBS
19450 LIBS="-lposix  $LIBS"
19451 cat >conftest.$ac_ext <<_ACEOF
19452-#line 12036 "configure"
19453+#line 12042 "configure"
19454 #include "confdefs.h"
19455
19456 /* Override any gcc2 internal prototype to avoid an error.  */
19457@@ -12052,16 +12058,16 @@
19458 }
19459 _ACEOF
19460 rm -f conftest.$ac_objext conftest$ac_exeext
19461-if { (eval echo "$as_me:12055: \"$ac_link\"") >&5
19462+if { (eval echo "$as_me:12061: \"$ac_link\"") >&5
19463   (eval $ac_link) 2>&5
19464   ac_status=$?
19465-  echo "$as_me:12058: \$? = $ac_status" >&5
19466+  echo "$as_me:12064: \$? = $ac_status" >&5
19467   (exit $ac_status); } &&
19468          { ac_try='test -s conftest$ac_exeext'
19469-  { (eval echo "$as_me:12061: \"$ac_try\"") >&5
19470+  { (eval echo "$as_me:12067: \"$ac_try\"") >&5
19471   (eval $ac_try) 2>&5
19472   ac_status=$?
19473-  echo "$as_me:12064: \$? = $ac_status" >&5
19474+  echo "$as_me:12070: \$? = $ac_status" >&5
19475   (exit $ac_status); }; }; then
19476   ac_cv_lib_posix_remove=yes
19477 else
19478@@ -12072,7 +12078,7 @@
19479 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
19480 LIBS=$ac_check_lib_save_LIBS
19481 fi
19482-echo "$as_me:12075: result: $ac_cv_lib_posix_remove" >&5
19483+echo "$as_me:12081: result: $ac_cv_lib_posix_remove" >&5
19484 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
19485 if test $ac_cv_lib_posix_remove = yes; then
19486   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
19487@@ -12081,13 +12087,13 @@
19488     fi
19489
19490     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
19491-    echo "$as_me:12084: checking for shmat" >&5
19492+    echo "$as_me:12090: checking for shmat" >&5
19493 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
19494 if test "${ac_cv_func_shmat+set}" = set; then
19495   echo $ECHO_N "(cached) $ECHO_C" >&6
19496 else
19497   cat >conftest.$ac_ext <<_ACEOF
19498-#line 12090 "configure"
19499+#line 12096 "configure"
19500 #include "confdefs.h"
19501 #define shmat autoconf_temporary
19502 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
19503@@ -12118,16 +12124,16 @@
19504 }
19505 _ACEOF
19506 rm -f conftest.$ac_objext conftest$ac_exeext
19507-if { (eval echo "$as_me:12121: \"$ac_link\"") >&5
19508+if { (eval echo "$as_me:12127: \"$ac_link\"") >&5
19509   (eval $ac_link) 2>&5
19510   ac_status=$?
19511-  echo "$as_me:12124: \$? = $ac_status" >&5
19512+  echo "$as_me:12130: \$? = $ac_status" >&5
19513   (exit $ac_status); } &&
19514          { ac_try='test -s conftest$ac_exeext'
19515-  { (eval echo "$as_me:12127: \"$ac_try\"") >&5
19516+  { (eval echo "$as_me:12133: \"$ac_try\"") >&5
19517   (eval $ac_try) 2>&5
19518   ac_status=$?
19519-  echo "$as_me:12130: \$? = $ac_status" >&5
19520+  echo "$as_me:12136: \$? = $ac_status" >&5
19521   (exit $ac_status); }; }; then
19522   ac_cv_func_shmat=yes
19523 else
19524@@ -12137,11 +12143,11 @@
19525 fi
19526 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
19527 fi
19528-echo "$as_me:12140: result: $ac_cv_func_shmat" >&5
19529+echo "$as_me:12146: result: $ac_cv_func_shmat" >&5
19530 echo "${ECHO_T}$ac_cv_func_shmat" >&6
19531
19532     if test $ac_cv_func_shmat = no; then
19533-      echo "$as_me:12144: checking for shmat in -lipc" >&5
19534+      echo "$as_me:12150: checking for shmat in -lipc" >&5
19535 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
19536 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
19537   echo $ECHO_N "(cached) $ECHO_C" >&6
19538@@ -12149,7 +12155,7 @@
19539   ac_check_lib_save_LIBS=$LIBS
19540 LIBS="-lipc  $LIBS"
19541 cat >conftest.$ac_ext <<_ACEOF
19542-#line 12152 "configure"
19543+#line 12158 "configure"
19544 #include "confdefs.h"
19545
19546 /* Override any gcc2 internal prototype to avoid an error.  */
19547@@ -12168,16 +12174,16 @@
19548 }
19549 _ACEOF
19550 rm -f conftest.$ac_objext conftest$ac_exeext
19551-if { (eval echo "$as_me:12171: \"$ac_link\"") >&5
19552+if { (eval echo "$as_me:12177: \"$ac_link\"") >&5
19553   (eval $ac_link) 2>&5
19554   ac_status=$?
19555-  echo "$as_me:12174: \$? = $ac_status" >&5
19556+  echo "$as_me:12180: \$? = $ac_status" >&5
19557   (exit $ac_status); } &&
19558          { ac_try='test -s conftest$ac_exeext'
19559-  { (eval echo "$as_me:12177: \"$ac_try\"") >&5
19560+  { (eval echo "$as_me:12183: \"$ac_try\"") >&5
19561   (eval $ac_try) 2>&5
19562   ac_status=$?
19563-  echo "$as_me:12180: \$? = $ac_status" >&5
19564+  echo "$as_me:12186: \$? = $ac_status" >&5
19565   (exit $ac_status); }; }; then
19566   ac_cv_lib_ipc_shmat=yes
19567 else
19568@@ -12188,7 +12194,7 @@
19569 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
19570 LIBS=$ac_check_lib_save_LIBS
19571 fi
19572-echo "$as_me:12191: result: $ac_cv_lib_ipc_shmat" >&5
19573+echo "$as_me:12197: result: $ac_cv_lib_ipc_shmat" >&5
19574 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
19575 if test $ac_cv_lib_ipc_shmat = yes; then
19576   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
19577@@ -12206,7 +12212,7 @@
19578   # These have to be linked with before -lX11, unlike the other
19579   # libraries we check for below, so use a different variable.
19580   # John Interrante, Karl Berry
19581-  echo "$as_me:12209: checking for IceConnectionNumber in -lICE" >&5
19582+  echo "$as_me:12215: checking for IceConnectionNumber in -lICE" >&5
19583 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
19584 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
19585   echo $ECHO_N "(cached) $ECHO_C" >&6
19586@@ -12214,7 +12220,7 @@
19587   ac_check_lib_save_LIBS=$LIBS
19588 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
19589 cat >conftest.$ac_ext <<_ACEOF
19590-#line 12217 "configure"
19591+#line 12223 "configure"
19592 #include "confdefs.h"
19593
19594 /* Override any gcc2 internal prototype to avoid an error.  */
19595@@ -12233,16 +12239,16 @@
19596 }
19597 _ACEOF
19598 rm -f conftest.$ac_objext conftest$ac_exeext
19599-if { (eval echo "$as_me:12236: \"$ac_link\"") >&5
19600+if { (eval echo "$as_me:12242: \"$ac_link\"") >&5
19601   (eval $ac_link) 2>&5
19602   ac_status=$?
19603-  echo "$as_me:12239: \$? = $ac_status" >&5
19604+  echo "$as_me:12245: \$? = $ac_status" >&5
19605   (exit $ac_status); } &&
19606          { ac_try='test -s conftest$ac_exeext'
19607-  { (eval echo "$as_me:12242: \"$ac_try\"") >&5
19608+  { (eval echo "$as_me:12248: \"$ac_try\"") >&5
19609   (eval $ac_try) 2>&5
19610   ac_status=$?
19611-  echo "$as_me:12245: \$? = $ac_status" >&5
19612+  echo "$as_me:12251: \$? = $ac_status" >&5
19613   (exit $ac_status); }; }; then
19614   ac_cv_lib_ICE_IceConnectionNumber=yes
19615 else
19616@@ -12253,7 +12259,7 @@
19617 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
19618 LIBS=$ac_check_lib_save_LIBS
19619 fi
19620-echo "$as_me:12256: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
19621+echo "$as_me:12262: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
19622 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
19623 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
19624   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
19625@@ -12265,7 +12271,7 @@
19626
19627 cf_x_athena=${cf_x_athena:-Xaw}
19628
19629-echo "$as_me:12268: checking if you want to link with Xaw 3d library" >&5
19630+echo "$as_me:12274: checking if you want to link with Xaw 3d library" >&5
19631 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
19632 withval=
19633
19634@@ -12276,14 +12282,14 @@
19635 fi;
19636 if test "$withval" = yes ; then
19637 	cf_x_athena=Xaw3d
19638-	echo "$as_me:12279: result: yes" >&5
19639+	echo "$as_me:12285: result: yes" >&5
19640 echo "${ECHO_T}yes" >&6
19641 else
19642-	echo "$as_me:12282: result: no" >&5
19643+	echo "$as_me:12288: result: no" >&5
19644 echo "${ECHO_T}no" >&6
19645 fi
19646
19647-echo "$as_me:12286: checking if you want to link with Xaw 3d xft library" >&5
19648+echo "$as_me:12292: checking if you want to link with Xaw 3d xft library" >&5
19649 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
19650 withval=
19651
19652@@ -12294,14 +12300,14 @@
19653 fi;
19654 if test "$withval" = yes ; then
19655 	cf_x_athena=Xaw3dxft
19656-	echo "$as_me:12297: result: yes" >&5
19657+	echo "$as_me:12303: result: yes" >&5
19658 echo "${ECHO_T}yes" >&6
19659 else
19660-	echo "$as_me:12300: result: no" >&5
19661+	echo "$as_me:12306: result: no" >&5
19662 echo "${ECHO_T}no" >&6
19663 fi
19664
19665-echo "$as_me:12304: checking if you want to link with neXT Athena library" >&5
19666+echo "$as_me:12310: checking if you want to link with neXT Athena library" >&5
19667 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
19668 withval=
19669
19670@@ -12312,14 +12318,14 @@
19671 fi;
19672 if test "$withval" = yes ; then
19673 	cf_x_athena=neXtaw
19674-	echo "$as_me:12315: result: yes" >&5
19675+	echo "$as_me:12321: result: yes" >&5
19676 echo "${ECHO_T}yes" >&6
19677 else
19678-	echo "$as_me:12318: result: no" >&5
19679+	echo "$as_me:12324: result: no" >&5
19680 echo "${ECHO_T}no" >&6
19681 fi
19682
19683-echo "$as_me:12322: checking if you want to link with Athena-Plus library" >&5
19684+echo "$as_me:12328: checking if you want to link with Athena-Plus library" >&5
19685 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
19686 withval=
19687
19688@@ -12330,10 +12336,10 @@
19689 fi;
19690 if test "$withval" = yes ; then
19691 	cf_x_athena=XawPlus
19692-	echo "$as_me:12333: result: yes" >&5
19693+	echo "$as_me:12339: result: yes" >&5
19694 echo "${ECHO_T}yes" >&6
19695 else
19696-	echo "$as_me:12336: result: no" >&5
19697+	echo "$as_me:12342: result: no" >&5
19698 echo "${ECHO_T}no" >&6
19699 fi
19700
19701@@ -12353,17 +12359,17 @@
19702 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
19703 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
19704
19705-echo "${as_me:-configure}:12356: testing found package $cf_athena_pkg ..." 1>&5
19706+echo "${as_me:-configure}:12362: testing found package $cf_athena_pkg ..." 1>&5
19707
19708 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
19709 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   $cf_athena_pkg 2>/dev/null`"
19710 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
19711
19712-echo "${as_me:-configure}:12362: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
19713+echo "${as_me:-configure}:12368: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
19714
19715 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
19716
19717-echo "${as_me:-configure}:12366: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
19718+echo "${as_me:-configure}:12372: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
19719
19720 cf_fix_cppflags=no
19721 cf_new_cflags=
19722@@ -12494,20 +12500,20 @@
19723 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
19724 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
19725
19726-echo "${as_me:-configure}:12497: testing ..trimmed $LIBS ..." 1>&5
19727+echo "${as_me:-configure}:12503: testing ..trimmed $LIBS ..." 1>&5
19728
19729 			;;
19730 		esac
19731 	done
19732
19733-echo "$as_me:12503: checking for usable $cf_x_athena/Xmu package" >&5
19734+echo "$as_me:12509: checking for usable $cf_x_athena/Xmu package" >&5
19735 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
19736 if test "${cf_cv_xaw_compat+set}" = set; then
19737   echo $ECHO_N "(cached) $ECHO_C" >&6
19738 else
19739
19740 cat >conftest.$ac_ext <<_ACEOF
19741-#line 12510 "configure"
19742+#line 12516 "configure"
19743 #include "confdefs.h"
19744
19745 #include <X11/Xmu/CharSet.h>
19746@@ -12523,16 +12529,16 @@
19747 }
19748 _ACEOF
19749 rm -f conftest.$ac_objext conftest$ac_exeext
19750-if { (eval echo "$as_me:12526: \"$ac_link\"") >&5
19751+if { (eval echo "$as_me:12532: \"$ac_link\"") >&5
19752   (eval $ac_link) 2>&5
19753   ac_status=$?
19754-  echo "$as_me:12529: \$? = $ac_status" >&5
19755+  echo "$as_me:12535: \$? = $ac_status" >&5
19756   (exit $ac_status); } &&
19757          { ac_try='test -s conftest$ac_exeext'
19758-  { (eval echo "$as_me:12532: \"$ac_try\"") >&5
19759+  { (eval echo "$as_me:12538: \"$ac_try\"") >&5
19760   (eval $ac_try) 2>&5
19761   ac_status=$?
19762-  echo "$as_me:12535: \$? = $ac_status" >&5
19763+  echo "$as_me:12541: \$? = $ac_status" >&5
19764   (exit $ac_status); }; }; then
19765   cf_cv_xaw_compat=yes
19766 else
19767@@ -12542,7 +12548,7 @@
19768 fi
19769 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
19770 fi
19771-echo "$as_me:12545: result: $cf_cv_xaw_compat" >&5
19772+echo "$as_me:12551: result: $cf_cv_xaw_compat" >&5
19773 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
19774
19775 			if test "$cf_cv_xaw_compat" = no
19776@@ -12554,7 +12560,7 @@
19777 				(*)
19778 					test -n "$verbose" && echo "	work around broken package" 1>&6
19779
19780-echo "${as_me:-configure}:12557: testing work around broken package ..." 1>&5
19781+echo "${as_me:-configure}:12563: testing work around broken package ..." 1>&5
19782
19783 					cf_save_xmu="$LIBS"
19784 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
19785@@ -12562,17 +12568,17 @@
19786 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
19787 	test -n "$verbose" && echo "	found package xmu" 1>&6
19788
19789-echo "${as_me:-configure}:12565: testing found package xmu ..." 1>&5
19790+echo "${as_me:-configure}:12571: testing found package xmu ..." 1>&5
19791
19792 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
19793 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xmu 2>/dev/null`"
19794 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
19795
19796-echo "${as_me:-configure}:12571: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
19797+echo "${as_me:-configure}:12577: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
19798
19799 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
19800
19801-echo "${as_me:-configure}:12575: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
19802+echo "${as_me:-configure}:12581: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
19803
19804 cf_fix_cppflags=no
19805 cf_new_cflags=
19806@@ -12692,12 +12698,12 @@
19807
19808 test -n "$verbose" && echo "	...before $LIBS" 1>&6
19809
19810-echo "${as_me:-configure}:12695: testing ...before $LIBS ..." 1>&5
19811+echo "${as_me:-configure}:12701: testing ...before $LIBS ..." 1>&5
19812
19813 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
19814 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
19815
19816-echo "${as_me:-configure}:12700: testing ...after  $LIBS ..." 1>&5
19817+echo "${as_me:-configure}:12706: testing ...after  $LIBS ..." 1>&5
19818
19819 else
19820 	cf_pkgconfig_incs=
19821@@ -12705,12 +12711,12 @@
19822
19823 test -n "$verbose" && echo "	...before $LIBS" 1>&6
19824
19825-echo "${as_me:-configure}:12708: testing ...before $LIBS ..." 1>&5
19826+echo "${as_me:-configure}:12714: testing ...before $LIBS ..." 1>&5
19827
19828 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
19829 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
19830
19831-echo "${as_me:-configure}:12713: testing ...after  $LIBS ..." 1>&5
19832+echo "${as_me:-configure}:12719: testing ...after  $LIBS ..." 1>&5
19833
19834 fi
19835
19836@@ -12721,7 +12727,7 @@
19837 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
19838 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
19839
19840-echo "${as_me:-configure}:12724: testing ..trimmed $LIBS ..." 1>&5
19841+echo "${as_me:-configure}:12730: testing ..trimmed $LIBS ..." 1>&5
19842
19843 			;;
19844 		esac
19845@@ -12746,17 +12752,17 @@
19846 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
19847 	test -n "$verbose" && echo "	found package Xext" 1>&6
19848
19849-echo "${as_me:-configure}:12749: testing found package Xext ..." 1>&5
19850+echo "${as_me:-configure}:12755: testing found package Xext ..." 1>&5
19851
19852 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
19853 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   Xext 2>/dev/null`"
19854 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
19855
19856-echo "${as_me:-configure}:12755: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
19857+echo "${as_me:-configure}:12761: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
19858
19859 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
19860
19861-echo "${as_me:-configure}:12759: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
19862+echo "${as_me:-configure}:12765: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
19863
19864 cf_fix_cppflags=no
19865 cf_new_cflags=
19866@@ -12877,7 +12883,7 @@
19867 	cf_pkgconfig_incs=
19868 	cf_pkgconfig_libs=
19869
19870-	echo "$as_me:12880: checking for XextCreateExtension in -lXext" >&5
19871+	echo "$as_me:12886: checking for XextCreateExtension in -lXext" >&5
19872 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
19873 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
19874   echo $ECHO_N "(cached) $ECHO_C" >&6
19875@@ -12885,7 +12891,7 @@
19876   ac_check_lib_save_LIBS=$LIBS
19877 LIBS="-lXext  $LIBS"
19878 cat >conftest.$ac_ext <<_ACEOF
19879-#line 12888 "configure"
19880+#line 12894 "configure"
19881 #include "confdefs.h"
19882
19883 /* Override any gcc2 internal prototype to avoid an error.  */
19884@@ -12904,16 +12910,16 @@
19885 }
19886 _ACEOF
19887 rm -f conftest.$ac_objext conftest$ac_exeext
19888-if { (eval echo "$as_me:12907: \"$ac_link\"") >&5
19889+if { (eval echo "$as_me:12913: \"$ac_link\"") >&5
19890   (eval $ac_link) 2>&5
19891   ac_status=$?
19892-  echo "$as_me:12910: \$? = $ac_status" >&5
19893+  echo "$as_me:12916: \$? = $ac_status" >&5
19894   (exit $ac_status); } &&
19895          { ac_try='test -s conftest$ac_exeext'
19896-  { (eval echo "$as_me:12913: \"$ac_try\"") >&5
19897+  { (eval echo "$as_me:12919: \"$ac_try\"") >&5
19898   (eval $ac_try) 2>&5
19899   ac_status=$?
19900-  echo "$as_me:12916: \$? = $ac_status" >&5
19901+  echo "$as_me:12922: \$? = $ac_status" >&5
19902   (exit $ac_status); }; }; then
19903   ac_cv_lib_Xext_XextCreateExtension=yes
19904 else
19905@@ -12924,7 +12930,7 @@
19906 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
19907 LIBS=$ac_check_lib_save_LIBS
19908 fi
19909-echo "$as_me:12927: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
19910+echo "$as_me:12933: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
19911 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
19912 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
19913
19914@@ -12960,17 +12966,17 @@
19915 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
19916 	test -n "$verbose" && echo "	found package x11" 1>&6
19917
19918-echo "${as_me:-configure}:12963: testing found package x11 ..." 1>&5
19919+echo "${as_me:-configure}:12969: testing found package x11 ..." 1>&5
19920
19921 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
19922 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
19923 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
19924
19925-echo "${as_me:-configure}:12969: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
19926+echo "${as_me:-configure}:12975: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
19927
19928 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
19929
19930-echo "${as_me:-configure}:12973: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
19931+echo "${as_me:-configure}:12979: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
19932
19933 cf_fix_cppflags=no
19934 cf_new_cflags=
19935@@ -13090,24 +13096,24 @@
19936 else
19937 	cf_pkgconfig_incs=
19938 	cf_pkgconfig_libs=
19939-	{ echo "$as_me:13093: WARNING: unable to find X11 library" >&5
19940+	{ echo "$as_me:13099: WARNING: unable to find X11 library" >&5
19941 echo "$as_me: WARNING: unable to find X11 library" >&2;}
19942 fi
19943
19944 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
19945 	test -n "$verbose" && echo "	found package ice" 1>&6
19946
19947-echo "${as_me:-configure}:13100: testing found package ice ..." 1>&5
19948+echo "${as_me:-configure}:13106: testing found package ice ..." 1>&5
19949
19950 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
19951 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
19952 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
19953
19954-echo "${as_me:-configure}:13106: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
19955+echo "${as_me:-configure}:13112: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
19956
19957 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
19958
19959-echo "${as_me:-configure}:13110: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
19960+echo "${as_me:-configure}:13116: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
19961
19962 cf_fix_cppflags=no
19963 cf_new_cflags=
19964@@ -13227,24 +13233,24 @@
19965 else
19966 	cf_pkgconfig_incs=
19967 	cf_pkgconfig_libs=
19968-	{ echo "$as_me:13230: WARNING: unable to find ICE library" >&5
19969+	{ echo "$as_me:13236: WARNING: unable to find ICE library" >&5
19970 echo "$as_me: WARNING: unable to find ICE library" >&2;}
19971 fi
19972
19973 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
19974 	test -n "$verbose" && echo "	found package sm" 1>&6
19975
19976-echo "${as_me:-configure}:13237: testing found package sm ..." 1>&5
19977+echo "${as_me:-configure}:13243: testing found package sm ..." 1>&5
19978
19979 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
19980 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
19981 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
19982
19983-echo "${as_me:-configure}:13243: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
19984+echo "${as_me:-configure}:13249: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
19985
19986 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
19987
19988-echo "${as_me:-configure}:13247: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
19989+echo "${as_me:-configure}:13253: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
19990
19991 cf_fix_cppflags=no
19992 cf_new_cflags=
19993@@ -13364,24 +13370,24 @@
19994 else
19995 	cf_pkgconfig_incs=
19996 	cf_pkgconfig_libs=
19997-	{ echo "$as_me:13367: WARNING: unable to find SM library" >&5
19998+	{ echo "$as_me:13373: WARNING: unable to find SM library" >&5
19999 echo "$as_me: WARNING: unable to find SM library" >&2;}
20000 fi
20001
20002 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
20003 	test -n "$verbose" && echo "	found package xt" 1>&6
20004
20005-echo "${as_me:-configure}:13374: testing found package xt ..." 1>&5
20006+echo "${as_me:-configure}:13380: testing found package xt ..." 1>&5
20007
20008 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
20009 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
20010 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
20011
20012-echo "${as_me:-configure}:13380: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
20013+echo "${as_me:-configure}:13386: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
20014
20015 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
20016
20017-echo "${as_me:-configure}:13384: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
20018+echo "${as_me:-configure}:13390: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
20019
20020 cf_fix_cppflags=no
20021 cf_new_cflags=
20022@@ -13501,7 +13507,7 @@
20023 else
20024 	cf_pkgconfig_incs=
20025 	cf_pkgconfig_libs=
20026-	{ echo "$as_me:13504: WARNING: unable to find Xt library" >&5
20027+	{ echo "$as_me:13510: WARNING: unable to find Xt library" >&5
20028 echo "$as_me: WARNING: unable to find Xt library" >&2;}
20029 fi
20030
20031@@ -13512,17 +13518,17 @@
20032 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
20033 	test -n "$verbose" && echo "	found package xt" 1>&6
20034
20035-echo "${as_me:-configure}:13515: testing found package xt ..." 1>&5
20036+echo "${as_me:-configure}:13521: testing found package xt ..." 1>&5
20037
20038 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
20039 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
20040 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
20041
20042-echo "${as_me:-configure}:13521: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
20043+echo "${as_me:-configure}:13527: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
20044
20045 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
20046
20047-echo "${as_me:-configure}:13525: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
20048+echo "${as_me:-configure}:13531: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
20049
20050 cf_fix_cppflags=no
20051 cf_new_cflags=
20052@@ -13643,14 +13649,14 @@
20053 		;;
20054 	(*)
20055 # we have an "xt" package, but it may omit Xt's dependency on X11
20056-echo "$as_me:13646: checking for usable X dependency" >&5
20057+echo "$as_me:13652: checking for usable X dependency" >&5
20058 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
20059 if test "${cf_cv_xt_x11_compat+set}" = set; then
20060   echo $ECHO_N "(cached) $ECHO_C" >&6
20061 else
20062
20063 cat >conftest.$ac_ext <<_ACEOF
20064-#line 13653 "configure"
20065+#line 13659 "configure"
20066 #include "confdefs.h"
20067
20068 #include <X11/Xlib.h>
20069@@ -13669,16 +13675,16 @@
20070 }
20071 _ACEOF
20072 rm -f conftest.$ac_objext conftest$ac_exeext
20073-if { (eval echo "$as_me:13672: \"$ac_link\"") >&5
20074+if { (eval echo "$as_me:13678: \"$ac_link\"") >&5
20075   (eval $ac_link) 2>&5
20076   ac_status=$?
20077-  echo "$as_me:13675: \$? = $ac_status" >&5
20078+  echo "$as_me:13681: \$? = $ac_status" >&5
20079   (exit $ac_status); } &&
20080          { ac_try='test -s conftest$ac_exeext'
20081-  { (eval echo "$as_me:13678: \"$ac_try\"") >&5
20082+  { (eval echo "$as_me:13684: \"$ac_try\"") >&5
20083   (eval $ac_try) 2>&5
20084   ac_status=$?
20085-  echo "$as_me:13681: \$? = $ac_status" >&5
20086+  echo "$as_me:13687: \$? = $ac_status" >&5
20087   (exit $ac_status); }; }; then
20088   cf_cv_xt_x11_compat=yes
20089 else
20090@@ -13688,30 +13694,30 @@
20091 fi
20092 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
20093 fi
20094-echo "$as_me:13691: result: $cf_cv_xt_x11_compat" >&5
20095+echo "$as_me:13697: result: $cf_cv_xt_x11_compat" >&5
20096 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
20097 		if test "$cf_cv_xt_x11_compat" = no
20098 		then
20099 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
20100
20101-echo "${as_me:-configure}:13697: testing work around broken X11 dependency ..." 1>&5
20102+echo "${as_me:-configure}:13703: testing work around broken X11 dependency ..." 1>&5
20103
20104 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
20105
20106 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
20107 	test -n "$verbose" && echo "	found package x11" 1>&6
20108
20109-echo "${as_me:-configure}:13704: testing found package x11 ..." 1>&5
20110+echo "${as_me:-configure}:13710: testing found package x11 ..." 1>&5
20111
20112 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
20113 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
20114 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
20115
20116-echo "${as_me:-configure}:13710: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
20117+echo "${as_me:-configure}:13716: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
20118
20119 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
20120
20121-echo "${as_me:-configure}:13714: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
20122+echo "${as_me:-configure}:13720: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
20123
20124 cf_fix_cppflags=no
20125 cf_new_cflags=
20126@@ -13834,12 +13840,12 @@
20127
20128 test -n "$verbose" && echo "	...before $LIBS" 1>&6
20129
20130-echo "${as_me:-configure}:13837: testing ...before $LIBS ..." 1>&5
20131+echo "${as_me:-configure}:13843: testing ...before $LIBS ..." 1>&5
20132
20133 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
20134 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
20135
20136-echo "${as_me:-configure}:13842: testing ...after  $LIBS ..." 1>&5
20137+echo "${as_me:-configure}:13848: testing ...after  $LIBS ..." 1>&5
20138
20139 fi
20140
20141@@ -13847,14 +13853,14 @@
20142 		;;
20143 	esac
20144
20145-echo "$as_me:13850: checking for usable X Toolkit package" >&5
20146+echo "$as_me:13856: checking for usable X Toolkit package" >&5
20147 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
20148 if test "${cf_cv_xt_ice_compat+set}" = set; then
20149   echo $ECHO_N "(cached) $ECHO_C" >&6
20150 else
20151
20152 cat >conftest.$ac_ext <<_ACEOF
20153-#line 13857 "configure"
20154+#line 13863 "configure"
20155 #include "confdefs.h"
20156
20157 #include <X11/Shell.h>
20158@@ -13869,16 +13875,16 @@
20159 }
20160 _ACEOF
20161 rm -f conftest.$ac_objext conftest$ac_exeext
20162-if { (eval echo "$as_me:13872: \"$ac_link\"") >&5
20163+if { (eval echo "$as_me:13878: \"$ac_link\"") >&5
20164   (eval $ac_link) 2>&5
20165   ac_status=$?
20166-  echo "$as_me:13875: \$? = $ac_status" >&5
20167+  echo "$as_me:13881: \$? = $ac_status" >&5
20168   (exit $ac_status); } &&
20169          { ac_try='test -s conftest$ac_exeext'
20170-  { (eval echo "$as_me:13878: \"$ac_try\"") >&5
20171+  { (eval echo "$as_me:13884: \"$ac_try\"") >&5
20172   (eval $ac_try) 2>&5
20173   ac_status=$?
20174-  echo "$as_me:13881: \$? = $ac_status" >&5
20175+  echo "$as_me:13887: \$? = $ac_status" >&5
20176   (exit $ac_status); }; }; then
20177   cf_cv_xt_ice_compat=yes
20178 else
20179@@ -13888,7 +13894,7 @@
20180 fi
20181 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
20182 fi
20183-echo "$as_me:13891: result: $cf_cv_xt_ice_compat" >&5
20184+echo "$as_me:13897: result: $cf_cv_xt_ice_compat" >&5
20185 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
20186
20187 	if test "$cf_cv_xt_ice_compat" = no
20188@@ -13902,22 +13908,22 @@
20189 			(*)
20190 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
20191
20192-echo "${as_me:-configure}:13905: testing work around broken ICE dependency ..." 1>&5
20193+echo "${as_me:-configure}:13911: testing work around broken ICE dependency ..." 1>&5
20194
20195 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
20196 	test -n "$verbose" && echo "	found package ice" 1>&6
20197
20198-echo "${as_me:-configure}:13910: testing found package ice ..." 1>&5
20199+echo "${as_me:-configure}:13916: testing found package ice ..." 1>&5
20200
20201 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
20202 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
20203 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
20204
20205-echo "${as_me:-configure}:13916: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
20206+echo "${as_me:-configure}:13922: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
20207
20208 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
20209
20210-echo "${as_me:-configure}:13920: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
20211+echo "${as_me:-configure}:13926: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
20212
20213 cf_fix_cppflags=no
20214 cf_new_cflags=
20215@@ -14036,17 +14042,17 @@
20216 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
20217 	test -n "$verbose" && echo "	found package sm" 1>&6
20218
20219-echo "${as_me:-configure}:14039: testing found package sm ..." 1>&5
20220+echo "${as_me:-configure}:14045: testing found package sm ..." 1>&5
20221
20222 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
20223 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
20224 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
20225
20226-echo "${as_me:-configure}:14045: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
20227+echo "${as_me:-configure}:14051: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
20228
20229 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
20230
20231-echo "${as_me:-configure}:14049: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
20232+echo "${as_me:-configure}:14055: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
20233
20234 cf_fix_cppflags=no
20235 cf_new_cflags=
20236@@ -14175,12 +14181,12 @@
20237
20238 test -n "$verbose" && echo "	...before $LIBS" 1>&6
20239
20240-echo "${as_me:-configure}:14178: testing ...before $LIBS ..." 1>&5
20241+echo "${as_me:-configure}:14184: testing ...before $LIBS ..." 1>&5
20242
20243 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
20244 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
20245
20246-echo "${as_me:-configure}:14183: testing ...after  $LIBS ..." 1>&5
20247+echo "${as_me:-configure}:14189: testing ...after  $LIBS ..." 1>&5
20248
20249 fi
20250
20251@@ -14200,7 +14206,7 @@
20252
20253 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
20254
20255-echo "${as_me:-configure}:14203: testing checking additions to CFLAGS ..." 1>&5
20256+echo "${as_me:-configure}:14209: testing checking additions to CFLAGS ..." 1>&5
20257
20258 cf_check_cflags="$CFLAGS"
20259 cf_check_cppflags="$CPPFLAGS"
20260@@ -14285,7 +14291,7 @@
20261 if test -n "$cf_new_cflags" ; then
20262 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
20263
20264-echo "${as_me:-configure}:14288: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
20265+echo "${as_me:-configure}:14294: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
20266
20267 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
20268 	CFLAGS="${CFLAGS}$cf_new_cflags"
20269@@ -14295,7 +14301,7 @@
20270 if test -n "$cf_new_cppflags" ; then
20271 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
20272
20273-echo "${as_me:-configure}:14298: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
20274+echo "${as_me:-configure}:14304: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
20275
20276 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
20277 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
20278@@ -14305,7 +14311,7 @@
20279 if test -n "$cf_new_extra_cppflags" ; then
20280 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
20281
20282-echo "${as_me:-configure}:14308: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
20283+echo "${as_me:-configure}:14314: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
20284
20285 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
20286 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
20287@@ -14314,7 +14320,7 @@
20288
20289 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
20290 cat >conftest.$ac_ext <<_ACEOF
20291-#line 14317 "configure"
20292+#line 14323 "configure"
20293 #include "confdefs.h"
20294 #include <stdio.h>
20295 int
20296@@ -14326,16 +14332,16 @@
20297 }
20298 _ACEOF
20299 rm -f conftest.$ac_objext conftest$ac_exeext
20300-if { (eval echo "$as_me:14329: \"$ac_link\"") >&5
20301+if { (eval echo "$as_me:14335: \"$ac_link\"") >&5
20302   (eval $ac_link) 2>&5
20303   ac_status=$?
20304-  echo "$as_me:14332: \$? = $ac_status" >&5
20305+  echo "$as_me:14338: \$? = $ac_status" >&5
20306   (exit $ac_status); } &&
20307          { ac_try='test -s conftest$ac_exeext'
20308-  { (eval echo "$as_me:14335: \"$ac_try\"") >&5
20309+  { (eval echo "$as_me:14341: \"$ac_try\"") >&5
20310   (eval $ac_try) 2>&5
20311   ac_status=$?
20312-  echo "$as_me:14338: \$? = $ac_status" >&5
20313+  echo "$as_me:14344: \$? = $ac_status" >&5
20314   (exit $ac_status); }; }; then
20315   :
20316 else
20317@@ -14343,12 +14349,12 @@
20318 cat conftest.$ac_ext >&5
20319 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
20320
20321-echo "${as_me:-configure}:14346: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
20322+echo "${as_me:-configure}:14352: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
20323
20324 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
20325 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
20326
20327-echo "${as_me:-configure}:14351: testing but keeping change to \$CPPFLAGS ..." 1>&5
20328+echo "${as_me:-configure}:14357: testing but keeping change to \$CPPFLAGS ..." 1>&5
20329
20330 	 fi
20331 	 CFLAGS="$cf_check_flags"
20332@@ -14356,13 +14362,13 @@
20333 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
20334 fi
20335
20336-	echo "$as_me:14359: checking for XOpenDisplay" >&5
20337+	echo "$as_me:14365: checking for XOpenDisplay" >&5
20338 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
20339 if test "${ac_cv_func_XOpenDisplay+set}" = set; then
20340   echo $ECHO_N "(cached) $ECHO_C" >&6
20341 else
20342   cat >conftest.$ac_ext <<_ACEOF
20343-#line 14365 "configure"
20344+#line 14371 "configure"
20345 #include "confdefs.h"
20346 #define XOpenDisplay autoconf_temporary
20347 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
20348@@ -14393,16 +14399,16 @@
20349 }
20350 _ACEOF
20351 rm -f conftest.$ac_objext conftest$ac_exeext
20352-if { (eval echo "$as_me:14396: \"$ac_link\"") >&5
20353+if { (eval echo "$as_me:14402: \"$ac_link\"") >&5
20354   (eval $ac_link) 2>&5
20355   ac_status=$?
20356-  echo "$as_me:14399: \$? = $ac_status" >&5
20357+  echo "$as_me:14405: \$? = $ac_status" >&5
20358   (exit $ac_status); } &&
20359          { ac_try='test -s conftest$ac_exeext'
20360-  { (eval echo "$as_me:14402: \"$ac_try\"") >&5
20361+  { (eval echo "$as_me:14408: \"$ac_try\"") >&5
20362   (eval $ac_try) 2>&5
20363   ac_status=$?
20364-  echo "$as_me:14405: \$? = $ac_status" >&5
20365+  echo "$as_me:14411: \$? = $ac_status" >&5
20366   (exit $ac_status); }; }; then
20367   ac_cv_func_XOpenDisplay=yes
20368 else
20369@@ -14412,13 +14418,13 @@
20370 fi
20371 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
20372 fi
20373-echo "$as_me:14415: result: $ac_cv_func_XOpenDisplay" >&5
20374+echo "$as_me:14421: result: $ac_cv_func_XOpenDisplay" >&5
20375 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
20376 if test $ac_cv_func_XOpenDisplay = yes; then
20377   :
20378 else
20379
20380-	echo "$as_me:14421: checking for XOpenDisplay in -lX11" >&5
20381+	echo "$as_me:14427: checking for XOpenDisplay in -lX11" >&5
20382 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
20383 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
20384   echo $ECHO_N "(cached) $ECHO_C" >&6
20385@@ -14426,7 +14432,7 @@
20386   ac_check_lib_save_LIBS=$LIBS
20387 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
20388 cat >conftest.$ac_ext <<_ACEOF
20389-#line 14429 "configure"
20390+#line 14435 "configure"
20391 #include "confdefs.h"
20392
20393 /* Override any gcc2 internal prototype to avoid an error.  */
20394@@ -14445,16 +14451,16 @@
20395 }
20396 _ACEOF
20397 rm -f conftest.$ac_objext conftest$ac_exeext
20398-if { (eval echo "$as_me:14448: \"$ac_link\"") >&5
20399+if { (eval echo "$as_me:14454: \"$ac_link\"") >&5
20400   (eval $ac_link) 2>&5
20401   ac_status=$?
20402-  echo "$as_me:14451: \$? = $ac_status" >&5
20403+  echo "$as_me:14457: \$? = $ac_status" >&5
20404   (exit $ac_status); } &&
20405          { ac_try='test -s conftest$ac_exeext'
20406-  { (eval echo "$as_me:14454: \"$ac_try\"") >&5
20407+  { (eval echo "$as_me:14460: \"$ac_try\"") >&5
20408   (eval $ac_try) 2>&5
20409   ac_status=$?
20410-  echo "$as_me:14457: \$? = $ac_status" >&5
20411+  echo "$as_me:14463: \$? = $ac_status" >&5
20412   (exit $ac_status); }; }; then
20413   ac_cv_lib_X11_XOpenDisplay=yes
20414 else
20415@@ -14465,7 +14471,7 @@
20416 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
20417 LIBS=$ac_check_lib_save_LIBS
20418 fi
20419-echo "$as_me:14468: result: $ac_cv_lib_X11_XOpenDisplay" >&5
20420+echo "$as_me:14474: result: $ac_cv_lib_X11_XOpenDisplay" >&5
20421 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
20422 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
20423
20424@@ -14489,13 +14495,13 @@
20425
20426 fi
20427
20428-	echo "$as_me:14492: checking for XtAppInitialize" >&5
20429+	echo "$as_me:14498: checking for XtAppInitialize" >&5
20430 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
20431 if test "${ac_cv_func_XtAppInitialize+set}" = set; then
20432   echo $ECHO_N "(cached) $ECHO_C" >&6
20433 else
20434   cat >conftest.$ac_ext <<_ACEOF
20435-#line 14498 "configure"
20436+#line 14504 "configure"
20437 #include "confdefs.h"
20438 #define XtAppInitialize autoconf_temporary
20439 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
20440@@ -14526,16 +14532,16 @@
20441 }
20442 _ACEOF
20443 rm -f conftest.$ac_objext conftest$ac_exeext
20444-if { (eval echo "$as_me:14529: \"$ac_link\"") >&5
20445+if { (eval echo "$as_me:14535: \"$ac_link\"") >&5
20446   (eval $ac_link) 2>&5
20447   ac_status=$?
20448-  echo "$as_me:14532: \$? = $ac_status" >&5
20449+  echo "$as_me:14538: \$? = $ac_status" >&5
20450   (exit $ac_status); } &&
20451          { ac_try='test -s conftest$ac_exeext'
20452-  { (eval echo "$as_me:14535: \"$ac_try\"") >&5
20453+  { (eval echo "$as_me:14541: \"$ac_try\"") >&5
20454   (eval $ac_try) 2>&5
20455   ac_status=$?
20456-  echo "$as_me:14538: \$? = $ac_status" >&5
20457+  echo "$as_me:14544: \$? = $ac_status" >&5
20458   (exit $ac_status); }; }; then
20459   ac_cv_func_XtAppInitialize=yes
20460 else
20461@@ -14545,13 +14551,13 @@
20462 fi
20463 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
20464 fi
20465-echo "$as_me:14548: result: $ac_cv_func_XtAppInitialize" >&5
20466+echo "$as_me:14554: result: $ac_cv_func_XtAppInitialize" >&5
20467 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
20468 if test $ac_cv_func_XtAppInitialize = yes; then
20469   :
20470 else
20471
20472-	echo "$as_me:14554: checking for XtAppInitialize in -lXt" >&5
20473+	echo "$as_me:14560: checking for XtAppInitialize in -lXt" >&5
20474 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
20475 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
20476   echo $ECHO_N "(cached) $ECHO_C" >&6
20477@@ -14559,7 +14565,7 @@
20478   ac_check_lib_save_LIBS=$LIBS
20479 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
20480 cat >conftest.$ac_ext <<_ACEOF
20481-#line 14562 "configure"
20482+#line 14568 "configure"
20483 #include "confdefs.h"
20484
20485 /* Override any gcc2 internal prototype to avoid an error.  */
20486@@ -14578,16 +14584,16 @@
20487 }
20488 _ACEOF
20489 rm -f conftest.$ac_objext conftest$ac_exeext
20490-if { (eval echo "$as_me:14581: \"$ac_link\"") >&5
20491+if { (eval echo "$as_me:14587: \"$ac_link\"") >&5
20492   (eval $ac_link) 2>&5
20493   ac_status=$?
20494-  echo "$as_me:14584: \$? = $ac_status" >&5
20495+  echo "$as_me:14590: \$? = $ac_status" >&5
20496   (exit $ac_status); } &&
20497          { ac_try='test -s conftest$ac_exeext'
20498-  { (eval echo "$as_me:14587: \"$ac_try\"") >&5
20499+  { (eval echo "$as_me:14593: \"$ac_try\"") >&5
20500   (eval $ac_try) 2>&5
20501   ac_status=$?
20502-  echo "$as_me:14590: \$? = $ac_status" >&5
20503+  echo "$as_me:14596: \$? = $ac_status" >&5
20504   (exit $ac_status); }; }; then
20505   ac_cv_lib_Xt_XtAppInitialize=yes
20506 else
20507@@ -14598,7 +14604,7 @@
20508 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
20509 LIBS=$ac_check_lib_save_LIBS
20510 fi
20511-echo "$as_me:14601: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
20512+echo "$as_me:14607: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
20513 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
20514 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
20515
20516@@ -14615,7 +14621,7 @@
20517 fi
20518
20519 if test $cf_have_X_LIBS = no ; then
20520-	{ echo "$as_me:14618: WARNING: Unable to successfully link X Toolkit library (-lXt) with
20521+	{ echo "$as_me:14624: WARNING: Unable to successfully link X Toolkit library (-lXt) with
20522 test program.  You will have to check and add the proper libraries by hand
20523 to makefile." >&5
20524 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
20525@@ -14641,14 +14647,14 @@
20526 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
20527 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
20528
20529-			echo "$as_me:14644: checking for $cf_test in $cf_path" >&5
20530+			echo "$as_me:14650: checking for $cf_test in $cf_path" >&5
20531 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
20532 		else
20533-			echo "$as_me:14647: checking for $cf_test" >&5
20534+			echo "$as_me:14653: checking for $cf_test" >&5
20535 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
20536 		fi
20537 		cat >conftest.$ac_ext <<_ACEOF
20538-#line 14651 "configure"
20539+#line 14657 "configure"
20540 #include "confdefs.h"
20541
20542 #include <X11/Intrinsic.h>
20543@@ -14662,16 +14668,16 @@
20544 }
20545 _ACEOF
20546 rm -f conftest.$ac_objext
20547-if { (eval echo "$as_me:14665: \"$ac_compile\"") >&5
20548+if { (eval echo "$as_me:14671: \"$ac_compile\"") >&5
20549   (eval $ac_compile) 2>&5
20550   ac_status=$?
20551-  echo "$as_me:14668: \$? = $ac_status" >&5
20552+  echo "$as_me:14674: \$? = $ac_status" >&5
20553   (exit $ac_status); } &&
20554          { ac_try='test -s conftest.$ac_objext'
20555-  { (eval echo "$as_me:14671: \"$ac_try\"") >&5
20556+  { (eval echo "$as_me:14677: \"$ac_try\"") >&5
20557   (eval $ac_try) 2>&5
20558   ac_status=$?
20559-  echo "$as_me:14674: \$? = $ac_status" >&5
20560+  echo "$as_me:14680: \$? = $ac_status" >&5
20561   (exit $ac_status); }; }; then
20562   cf_result=yes
20563 else
20564@@ -14680,7 +14686,7 @@
20565 cf_result=no
20566 fi
20567 rm -f conftest.$ac_objext conftest.$ac_ext
20568-		echo "$as_me:14683: result: $cf_result" >&5
20569+		echo "$as_me:14689: result: $cf_result" >&5
20570 echo "${ECHO_T}$cf_result" >&6
20571 		if test "$cf_result" = yes ; then
20572 			cf_x_athena_inc=$cf_path
20573@@ -14692,7 +14698,7 @@
20574 done
20575
20576 if test -z "$cf_x_athena_inc" ; then
20577-	{ echo "$as_me:14695: WARNING: Unable to successfully find Athena header files with test program" >&5
20578+	{ echo "$as_me:14701: WARNING: Unable to successfully find Athena header files with test program" >&5
20579 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
20580 elif test "$cf_x_athena_inc" != default ; then
20581
20582@@ -14741,7 +14747,7 @@
20583 done
20584 LIBS="$cf_add_libs"
20585
20586-				echo "$as_me:14744: checking for $cf_libs in $cf_path" >&5
20587+				echo "$as_me:14750: checking for $cf_libs in $cf_path" >&5
20588 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
20589 			else
20590
20591@@ -14761,11 +14767,11 @@
20592 done
20593 LIBS="$cf_add_libs"
20594
20595-				echo "$as_me:14764: checking for $cf_test in $cf_libs" >&5
20596+				echo "$as_me:14770: checking for $cf_test in $cf_libs" >&5
20597 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
20598 			fi
20599 			cat >conftest.$ac_ext <<_ACEOF
20600-#line 14768 "configure"
20601+#line 14774 "configure"
20602 #include "confdefs.h"
20603
20604 #include <X11/Intrinsic.h>
20605@@ -14781,16 +14787,16 @@
20606 }
20607 _ACEOF
20608 rm -f conftest.$ac_objext conftest$ac_exeext
20609-if { (eval echo "$as_me:14784: \"$ac_link\"") >&5
20610+if { (eval echo "$as_me:14790: \"$ac_link\"") >&5
20611   (eval $ac_link) 2>&5
20612   ac_status=$?
20613-  echo "$as_me:14787: \$? = $ac_status" >&5
20614+  echo "$as_me:14793: \$? = $ac_status" >&5
20615   (exit $ac_status); } &&
20616          { ac_try='test -s conftest$ac_exeext'
20617-  { (eval echo "$as_me:14790: \"$ac_try\"") >&5
20618+  { (eval echo "$as_me:14796: \"$ac_try\"") >&5
20619   (eval $ac_try) 2>&5
20620   ac_status=$?
20621-  echo "$as_me:14793: \$? = $ac_status" >&5
20622+  echo "$as_me:14799: \$? = $ac_status" >&5
20623   (exit $ac_status); }; }; then
20624   cf_result=yes
20625 else
20626@@ -14799,7 +14805,7 @@
20627 cf_result=no
20628 fi
20629 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
20630-			echo "$as_me:14802: result: $cf_result" >&5
20631+			echo "$as_me:14808: result: $cf_result" >&5
20632 echo "${ECHO_T}$cf_result" >&6
20633 			if test "$cf_result" = yes ; then
20634 				cf_x_athena_lib="$cf_libs"
20635@@ -14813,7 +14819,7 @@
20636 done
20637
20638 if test -z "$cf_x_athena_lib" ; then
20639-	{ { echo "$as_me:14816: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
20640+	{ { echo "$as_me:14822: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
20641 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
20642    { (exit 1); exit 1; }; }
20643 fi
20644@@ -14831,7 +14837,7 @@
20645   do
20646     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
20647 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
20648-echo "$as_me:14834: checking for $ac_word" >&5
20649+echo "$as_me:14840: checking for $ac_word" >&5
20650 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
20651 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
20652   echo $ECHO_N "(cached) $ECHO_C" >&6
20653@@ -14846,7 +14852,7 @@
20654   test -z "$ac_dir" && ac_dir=.
20655   $as_executable_p "$ac_dir/$ac_word" || continue
20656 ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
20657-echo "$as_me:14849: found $ac_dir/$ac_word" >&5
20658+echo "$as_me:14855: found $ac_dir/$ac_word" >&5
20659 break
20660 done
20661
20662@@ -14854,10 +14860,10 @@
20663 fi
20664 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
20665 if test -n "$XCURSES_CONFIG"; then
20666-  echo "$as_me:14857: result: $XCURSES_CONFIG" >&5
20667+  echo "$as_me:14863: result: $XCURSES_CONFIG" >&5
20668 echo "${ECHO_T}$XCURSES_CONFIG" >&6
20669 else
20670-  echo "$as_me:14860: result: no" >&5
20671+  echo "$as_me:14866: result: no" >&5
20672 echo "${ECHO_T}no" >&6
20673 fi
20674
20675@@ -14870,7 +14876,7 @@
20676 do
20677   # Extract the first word of "$ac_prog", so it can be a program name with args.
20678 set dummy $ac_prog; ac_word=$2
20679-echo "$as_me:14873: checking for $ac_word" >&5
20680+echo "$as_me:14879: checking for $ac_word" >&5
20681 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
20682 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
20683   echo $ECHO_N "(cached) $ECHO_C" >&6
20684@@ -14885,7 +14891,7 @@
20685   test -z "$ac_dir" && ac_dir=.
20686   $as_executable_p "$ac_dir/$ac_word" || continue
20687 ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
20688-echo "$as_me:14888: found $ac_dir/$ac_word" >&5
20689+echo "$as_me:14894: found $ac_dir/$ac_word" >&5
20690 break
20691 done
20692
20693@@ -14893,10 +14899,10 @@
20694 fi
20695 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
20696 if test -n "$ac_ct_XCURSES_CONFIG"; then
20697-  echo "$as_me:14896: result: $ac_ct_XCURSES_CONFIG" >&5
20698+  echo "$as_me:14902: result: $ac_ct_XCURSES_CONFIG" >&5
20699 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
20700 else
20701-  echo "$as_me:14899: result: no" >&5
20702+  echo "$as_me:14905: result: no" >&5
20703 echo "${ECHO_T}no" >&6
20704 fi
20705
20706@@ -15031,7 +15037,7 @@
20707
20708 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
20709
20710-echo "${as_me:-configure}:15034: testing checking additions to CFLAGS ..." 1>&5
20711+echo "${as_me:-configure}:15040: testing checking additions to CFLAGS ..." 1>&5
20712
20713 cf_check_cflags="$CFLAGS"
20714 cf_check_cppflags="$CPPFLAGS"
20715@@ -15116,7 +15122,7 @@
20716 if test -n "$cf_new_cflags" ; then
20717 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
20718
20719-echo "${as_me:-configure}:15119: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
20720+echo "${as_me:-configure}:15125: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
20721
20722 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
20723 	CFLAGS="${CFLAGS}$cf_new_cflags"
20724@@ -15126,7 +15132,7 @@
20725 if test -n "$cf_new_cppflags" ; then
20726 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
20727
20728-echo "${as_me:-configure}:15129: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
20729+echo "${as_me:-configure}:15135: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
20730
20731 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
20732 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
20733@@ -15136,7 +15142,7 @@
20734 if test -n "$cf_new_extra_cppflags" ; then
20735 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
20736
20737-echo "${as_me:-configure}:15139: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
20738+echo "${as_me:-configure}:15145: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
20739
20740 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
20741 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
20742@@ -15145,7 +15151,7 @@
20743
20744 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
20745 cat >conftest.$ac_ext <<_ACEOF
20746-#line 15148 "configure"
20747+#line 15154 "configure"
20748 #include "confdefs.h"
20749 #include <stdio.h>
20750 int
20751@@ -15157,16 +15163,16 @@
20752 }
20753 _ACEOF
20754 rm -f conftest.$ac_objext conftest$ac_exeext
20755-if { (eval echo "$as_me:15160: \"$ac_link\"") >&5
20756+if { (eval echo "$as_me:15166: \"$ac_link\"") >&5
20757   (eval $ac_link) 2>&5
20758   ac_status=$?
20759-  echo "$as_me:15163: \$? = $ac_status" >&5
20760+  echo "$as_me:15169: \$? = $ac_status" >&5
20761   (exit $ac_status); } &&
20762          { ac_try='test -s conftest$ac_exeext'
20763-  { (eval echo "$as_me:15166: \"$ac_try\"") >&5
20764+  { (eval echo "$as_me:15172: \"$ac_try\"") >&5
20765   (eval $ac_try) 2>&5
20766   ac_status=$?
20767-  echo "$as_me:15169: \$? = $ac_status" >&5
20768+  echo "$as_me:15175: \$? = $ac_status" >&5
20769   (exit $ac_status); }; }; then
20770   :
20771 else
20772@@ -15174,12 +15180,12 @@
20773 cat conftest.$ac_ext >&5
20774 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
20775
20776-echo "${as_me:-configure}:15177: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
20777+echo "${as_me:-configure}:15183: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
20778
20779 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
20780 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
20781
20782-echo "${as_me:-configure}:15182: testing but keeping change to \$CPPFLAGS ..." 1>&5
20783+echo "${as_me:-configure}:15188: testing but keeping change to \$CPPFLAGS ..." 1>&5
20784
20785 	 fi
20786 	 CFLAGS="$cf_check_flags"
20787@@ -15187,7 +15193,7 @@
20788 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
20789 fi
20790
20791-echo "$as_me:15190: checking for XOpenDisplay in -lX11" >&5
20792+echo "$as_me:15196: checking for XOpenDisplay in -lX11" >&5
20793 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
20794 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
20795   echo $ECHO_N "(cached) $ECHO_C" >&6
20796@@ -15195,7 +15201,7 @@
20797   ac_check_lib_save_LIBS=$LIBS
20798 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
20799 cat >conftest.$ac_ext <<_ACEOF
20800-#line 15198 "configure"
20801+#line 15204 "configure"
20802 #include "confdefs.h"
20803
20804 /* Override any gcc2 internal prototype to avoid an error.  */
20805@@ -15214,16 +15220,16 @@
20806 }
20807 _ACEOF
20808 rm -f conftest.$ac_objext conftest$ac_exeext
20809-if { (eval echo "$as_me:15217: \"$ac_link\"") >&5
20810+if { (eval echo "$as_me:15223: \"$ac_link\"") >&5
20811   (eval $ac_link) 2>&5
20812   ac_status=$?
20813-  echo "$as_me:15220: \$? = $ac_status" >&5
20814+  echo "$as_me:15226: \$? = $ac_status" >&5
20815   (exit $ac_status); } &&
20816          { ac_try='test -s conftest$ac_exeext'
20817-  { (eval echo "$as_me:15223: \"$ac_try\"") >&5
20818+  { (eval echo "$as_me:15229: \"$ac_try\"") >&5
20819   (eval $ac_try) 2>&5
20820   ac_status=$?
20821-  echo "$as_me:15226: \$? = $ac_status" >&5
20822+  echo "$as_me:15232: \$? = $ac_status" >&5
20823   (exit $ac_status); }; }; then
20824   ac_cv_lib_X11_XOpenDisplay=yes
20825 else
20826@@ -15234,7 +15240,7 @@
20827 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
20828 LIBS=$ac_check_lib_save_LIBS
20829 fi
20830-echo "$as_me:15237: result: $ac_cv_lib_X11_XOpenDisplay" >&5
20831+echo "$as_me:15243: result: $ac_cv_lib_X11_XOpenDisplay" >&5
20832 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
20833 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
20834
20835@@ -15256,7 +15262,7 @@
20836
20837 fi
20838
20839-echo "$as_me:15259: checking for XCurses library" >&5
20840+echo "$as_me:15265: checking for XCurses library" >&5
20841 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
20842 if test "${cf_cv_lib_XCurses+set}" = set; then
20843   echo $ECHO_N "(cached) $ECHO_C" >&6
20844@@ -15279,7 +15285,7 @@
20845 LIBS="$cf_add_libs"
20846
20847 cat >conftest.$ac_ext <<_ACEOF
20848-#line 15282 "configure"
20849+#line 15288 "configure"
20850 #include "confdefs.h"
20851
20852 #include <xcurses.h>
20853@@ -15294,16 +15300,16 @@
20854 }
20855 _ACEOF
20856 rm -f conftest.$ac_objext conftest$ac_exeext
20857-if { (eval echo "$as_me:15297: \"$ac_link\"") >&5
20858+if { (eval echo "$as_me:15303: \"$ac_link\"") >&5
20859   (eval $ac_link) 2>&5
20860   ac_status=$?
20861-  echo "$as_me:15300: \$? = $ac_status" >&5
20862+  echo "$as_me:15306: \$? = $ac_status" >&5
20863   (exit $ac_status); } &&
20864          { ac_try='test -s conftest$ac_exeext'
20865-  { (eval echo "$as_me:15303: \"$ac_try\"") >&5
20866+  { (eval echo "$as_me:15309: \"$ac_try\"") >&5
20867   (eval $ac_try) 2>&5
20868   ac_status=$?
20869-  echo "$as_me:15306: \$? = $ac_status" >&5
20870+  echo "$as_me:15312: \$? = $ac_status" >&5
20871   (exit $ac_status); }; }; then
20872   cf_cv_lib_XCurses=yes
20873 else
20874@@ -15314,7 +15320,7 @@
20875 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
20876
20877 fi
20878-echo "$as_me:15317: result: $cf_cv_lib_XCurses" >&5
20879+echo "$as_me:15323: result: $cf_cv_lib_XCurses" >&5
20880 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
20881
20882 fi
20883@@ -15329,23 +15335,23 @@
20884 #define XCURSES 1
20885 EOF
20886
20887-	echo "$as_me:15332: checking for xcurses.h" >&5
20888+	echo "$as_me:15338: checking for xcurses.h" >&5
20889 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
20890 if test "${ac_cv_header_xcurses_h+set}" = set; then
20891   echo $ECHO_N "(cached) $ECHO_C" >&6
20892 else
20893   cat >conftest.$ac_ext <<_ACEOF
20894-#line 15338 "configure"
20895+#line 15344 "configure"
20896 #include "confdefs.h"
20897 #include <xcurses.h>
20898 _ACEOF
20899-if { (eval echo "$as_me:15342: \"$ac_cpp conftest.$ac_ext\"") >&5
20900+if { (eval echo "$as_me:15348: \"$ac_cpp conftest.$ac_ext\"") >&5
20901   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
20902   ac_status=$?
20903   egrep -v '^ *\+' conftest.er1 >conftest.err
20904   rm -f conftest.er1
20905   cat conftest.err >&5
20906-  echo "$as_me:15348: \$? = $ac_status" >&5
20907+  echo "$as_me:15354: \$? = $ac_status" >&5
20908   (exit $ac_status); } >/dev/null; then
20909   if test -s conftest.err; then
20910     ac_cpp_err=$ac_c_preproc_warn_flag
20911@@ -15364,7 +15370,7 @@
20912 fi
20913 rm -f conftest.err conftest.$ac_ext
20914 fi
20915-echo "$as_me:15367: result: $ac_cv_header_xcurses_h" >&5
20916+echo "$as_me:15373: result: $ac_cv_header_xcurses_h" >&5
20917 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
20918 if test $ac_cv_header_xcurses_h = yes; then
20919
20920@@ -15375,14 +15381,14 @@
20921 fi
20922
20923 else
20924-	{ { echo "$as_me:15378: error: Cannot link with XCurses" >&5
20925+	{ { echo "$as_me:15384: error: Cannot link with XCurses" >&5
20926 echo "$as_me: error: Cannot link with XCurses" >&2;}
20927    { (exit 1); exit 1; }; }
20928 fi
20929
20930 	;;
20931 (*)
20932-	{ { echo "$as_me:15385: error: unexpected screen-value: $cf_cv_screen" >&5
20933+	{ { echo "$as_me:15391: error: unexpected screen-value: $cf_cv_screen" >&5
20934 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
20935    { (exit 1); exit 1; }; }
20936 	;;
20937@@ -15390,7 +15396,7 @@
20938
20939 : ${cf_nculib_root:=$cf_cv_screen}
20940 as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh`
20941-echo "$as_me:15393: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
20942+echo "$as_me:15399: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
20943 echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6
20944 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
20945   echo $ECHO_N "(cached) $ECHO_C" >&6
20946@@ -15398,7 +15404,7 @@
20947   ac_check_lib_save_LIBS=$LIBS
20948 LIBS="-l$cf_nculib_root  $LIBS"
20949 cat >conftest.$ac_ext <<_ACEOF
20950-#line 15401 "configure"
20951+#line 15407 "configure"
20952 #include "confdefs.h"
20953
20954 /* Override any gcc2 internal prototype to avoid an error.  */
20955@@ -15417,16 +15423,16 @@
20956 }
20957 _ACEOF
20958 rm -f conftest.$ac_objext conftest$ac_exeext
20959-if { (eval echo "$as_me:15420: \"$ac_link\"") >&5
20960+if { (eval echo "$as_me:15426: \"$ac_link\"") >&5
20961   (eval $ac_link) 2>&5
20962   ac_status=$?
20963-  echo "$as_me:15423: \$? = $ac_status" >&5
20964+  echo "$as_me:15429: \$? = $ac_status" >&5
20965   (exit $ac_status); } &&
20966          { ac_try='test -s conftest$ac_exeext'
20967-  { (eval echo "$as_me:15426: \"$ac_try\"") >&5
20968+  { (eval echo "$as_me:15432: \"$ac_try\"") >&5
20969   (eval $ac_try) 2>&5
20970   ac_status=$?
20971-  echo "$as_me:15429: \$? = $ac_status" >&5
20972+  echo "$as_me:15435: \$? = $ac_status" >&5
20973   (exit $ac_status); }; }; then
20974   eval "$as_ac_Lib=yes"
20975 else
20976@@ -15437,7 +15443,7 @@
20977 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
20978 LIBS=$ac_check_lib_save_LIBS
20979 fi
20980-echo "$as_me:15440: result: `eval echo '${'$as_ac_Lib'}'`" >&5
20981+echo "$as_me:15446: result: `eval echo '${'$as_ac_Lib'}'`" >&5
20982 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
20983 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
20984   cf_cv_ncurses_pthreads=yes
20985@@ -15472,7 +15478,7 @@
20986 	;;
20987 esac
20988
20989-echo "$as_me:15475: checking for X11 rgb file" >&5
20990+echo "$as_me:15481: checking for X11 rgb file" >&5
20991 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
20992
20993 # Check whether --with-x11-rgb or --without-x11-rgb was given.
20994@@ -15536,7 +15542,7 @@
20995 	cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
20996 	;;
20997 (*)
20998-	{ { echo "$as_me:15539: error: expected a pathname, not \"$cf_path\"" >&5
20999+	{ { echo "$as_me:15545: error: expected a pathname, not \"$cf_path\"" >&5
21000 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
21001    { (exit 1); exit 1; }; }
21002 	;;
21003@@ -15544,7 +15550,7 @@
21004
21005 fi
21006
21007-echo "$as_me:15547: result: $RGB_PATH" >&5
21008+echo "$as_me:15553: result: $RGB_PATH" >&5
21009 echo "${ECHO_T}$RGB_PATH" >&6
21010
21011 cat >>confdefs.h <<EOF
21012@@ -15585,7 +15591,7 @@
21013 	;;
21014 esac
21015
21016-echo "$as_me:15588: checking if you want to check for panel functions" >&5
21017+echo "$as_me:15594: checking if you want to check for panel functions" >&5
21018 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
21019
21020 # Check whether --enable-panel or --disable-panel was given.
21021@@ -15602,7 +15608,7 @@
21022 	cf_enable_panel=$cf_default_panel
21023
21024 fi;
21025-echo "$as_me:15605: result: $cf_enable_panel" >&5
21026+echo "$as_me:15611: result: $cf_enable_panel" >&5
21027 echo "${ECHO_T}$cf_enable_panel" >&6
21028 if test $cf_enable_panel = yes
21029 then
21030@@ -15613,13 +15619,13 @@
21031 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
21032 	:
21033 elif test "x${PKG_CONFIG:=none}" != xnone; then
21034-	echo "$as_me:15616: checking pkg-config for panel$cf_cv_libtype" >&5
21035+	echo "$as_me:15622: checking pkg-config for panel$cf_cv_libtype" >&5
21036 echo $ECHO_N "checking pkg-config for panel$cf_cv_libtype... $ECHO_C" >&6
21037 	if "$PKG_CONFIG" --exists panel$cf_cv_libtype ; then
21038-		echo "$as_me:15619: result: yes" >&5
21039+		echo "$as_me:15625: result: yes" >&5
21040 echo "${ECHO_T}yes" >&6
21041
21042-		echo "$as_me:15622: checking if the panel$cf_cv_libtype package files work" >&5
21043+		echo "$as_me:15628: checking if the panel$cf_cv_libtype package files work" >&5
21044 echo $ECHO_N "checking if the panel$cf_cv_libtype package files work... $ECHO_C" >&6
21045
21046 		cf_save_CPPFLAGS="$CPPFLAGS"
21047@@ -15740,7 +15746,7 @@
21048 LIBS="$cf_add_libs"
21049
21050 		cat >conftest.$ac_ext <<_ACEOF
21051-#line 15743 "configure"
21052+#line 15749 "configure"
21053 #include "confdefs.h"
21054 #include <panel.h>
21055 int
21056@@ -15752,37 +15758,37 @@
21057 }
21058 _ACEOF
21059 rm -f conftest.$ac_objext conftest$ac_exeext
21060-if { (eval echo "$as_me:15755: \"$ac_link\"") >&5
21061+if { (eval echo "$as_me:15761: \"$ac_link\"") >&5
21062   (eval $ac_link) 2>&5
21063   ac_status=$?
21064-  echo "$as_me:15758: \$? = $ac_status" >&5
21065+  echo "$as_me:15764: \$? = $ac_status" >&5
21066   (exit $ac_status); } &&
21067          { ac_try='test -s conftest$ac_exeext'
21068-  { (eval echo "$as_me:15761: \"$ac_try\"") >&5
21069+  { (eval echo "$as_me:15767: \"$ac_try\"") >&5
21070   (eval $ac_try) 2>&5
21071   ac_status=$?
21072-  echo "$as_me:15764: \$? = $ac_status" >&5
21073+  echo "$as_me:15770: \$? = $ac_status" >&5
21074   (exit $ac_status); }; }; then
21075   if test "$cross_compiling" = yes; then
21076   cf_have_curses_lib=maybe
21077 else
21078   cat >conftest.$ac_ext <<_ACEOF
21079-#line 15770 "configure"
21080+#line 15776 "configure"
21081 #include "confdefs.h"
21082 #include <panel.h>
21083 				int main(void)
21084 				{ (void) new_panel ( 0 ); return 0; }
21085 _ACEOF
21086 rm -f conftest$ac_exeext
21087-if { (eval echo "$as_me:15777: \"$ac_link\"") >&5
21088+if { (eval echo "$as_me:15783: \"$ac_link\"") >&5
21089   (eval $ac_link) 2>&5
21090   ac_status=$?
21091-  echo "$as_me:15780: \$? = $ac_status" >&5
21092+  echo "$as_me:15786: \$? = $ac_status" >&5
21093   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
21094-  { (eval echo "$as_me:15782: \"$ac_try\"") >&5
21095+  { (eval echo "$as_me:15788: \"$ac_try\"") >&5
21096   (eval $ac_try) 2>&5
21097   ac_status=$?
21098-  echo "$as_me:15785: \$? = $ac_status" >&5
21099+  echo "$as_me:15791: \$? = $ac_status" >&5
21100   (exit $ac_status); }; }; then
21101   cf_have_curses_lib=yes
21102 else
21103@@ -15799,7 +15805,7 @@
21104 cf_have_curses_lib=no
21105 fi
21106 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
21107-		echo "$as_me:15802: result: $cf_have_curses_lib" >&5
21108+		echo "$as_me:15808: result: $cf_have_curses_lib" >&5
21109 echo "${ECHO_T}$cf_have_curses_lib" >&6
21110 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
21111 		if test "$cf_have_curses_lib" != "yes"
21112@@ -15819,7 +15825,7 @@
21113 fi
21114 if test "$cf_have_curses_lib" = no; then
21115 	as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh`
21116-echo "$as_me:15822: checking for new_panel in -lpanel$cf_cv_libtype" >&5
21117+echo "$as_me:15828: checking for new_panel in -lpanel$cf_cv_libtype" >&5
21118 echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6
21119 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
21120   echo $ECHO_N "(cached) $ECHO_C" >&6
21121@@ -15827,7 +15833,7 @@
21122   ac_check_lib_save_LIBS=$LIBS
21123 LIBS="-lpanel$cf_cv_libtype  $LIBS"
21124 cat >conftest.$ac_ext <<_ACEOF
21125-#line 15830 "configure"
21126+#line 15836 "configure"
21127 #include "confdefs.h"
21128
21129 /* Override any gcc2 internal prototype to avoid an error.  */
21130@@ -15846,16 +15852,16 @@
21131 }
21132 _ACEOF
21133 rm -f conftest.$ac_objext conftest$ac_exeext
21134-if { (eval echo "$as_me:15849: \"$ac_link\"") >&5
21135+if { (eval echo "$as_me:15855: \"$ac_link\"") >&5
21136   (eval $ac_link) 2>&5
21137   ac_status=$?
21138-  echo "$as_me:15852: \$? = $ac_status" >&5
21139+  echo "$as_me:15858: \$? = $ac_status" >&5
21140   (exit $ac_status); } &&
21141          { ac_try='test -s conftest$ac_exeext'
21142-  { (eval echo "$as_me:15855: \"$ac_try\"") >&5
21143+  { (eval echo "$as_me:15861: \"$ac_try\"") >&5
21144   (eval $ac_try) 2>&5
21145   ac_status=$?
21146-  echo "$as_me:15858: \$? = $ac_status" >&5
21147+  echo "$as_me:15864: \$? = $ac_status" >&5
21148   (exit $ac_status); }; }; then
21149   eval "$as_ac_Lib=yes"
21150 else
21151@@ -15866,7 +15872,7 @@
21152 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
21153 LIBS=$ac_check_lib_save_LIBS
21154 fi
21155-echo "$as_me:15869: result: `eval echo '${'$as_ac_Lib'}'`" >&5
21156+echo "$as_me:15875: result: `eval echo '${'$as_ac_Lib'}'`" >&5
21157 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
21158 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
21159
21160@@ -15899,7 +15905,7 @@
21161 	cf_curses_headers="$cf_curses_headers panel.h"
21162 fi
21163
21164-echo "$as_me:15902: checking if you want to check for menu functions" >&5
21165+echo "$as_me:15908: checking if you want to check for menu functions" >&5
21166 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
21167
21168 # Check whether --enable-menu or --disable-menu was given.
21169@@ -15916,7 +15922,7 @@
21170 	cf_enable_menu=$cf_default_menu
21171
21172 fi;
21173-echo "$as_me:15919: result: $cf_enable_menu" >&5
21174+echo "$as_me:15925: result: $cf_enable_menu" >&5
21175 echo "${ECHO_T}$cf_enable_menu" >&6
21176 if test $cf_enable_menu = yes
21177 then
21178@@ -15925,14 +15931,14 @@
21179 		;;
21180 	(curses*)
21181
21182-echo "$as_me:15928: checking for NetBSD menu.h" >&5
21183+echo "$as_me:15934: checking for NetBSD menu.h" >&5
21184 echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
21185 if test "${cf_cv_netbsd_menu_h+set}" = set; then
21186   echo $ECHO_N "(cached) $ECHO_C" >&6
21187 else
21188
21189 cat >conftest.$ac_ext <<_ACEOF
21190-#line 15935 "configure"
21191+#line 15941 "configure"
21192 #include "confdefs.h"
21193
21194 #include <${cf_cv_ncurses_header:-curses.h}>
21195@@ -15950,16 +15956,16 @@
21196 }
21197 _ACEOF
21198 rm -f conftest.$ac_objext
21199-if { (eval echo "$as_me:15953: \"$ac_compile\"") >&5
21200+if { (eval echo "$as_me:15959: \"$ac_compile\"") >&5
21201   (eval $ac_compile) 2>&5
21202   ac_status=$?
21203-  echo "$as_me:15956: \$? = $ac_status" >&5
21204+  echo "$as_me:15962: \$? = $ac_status" >&5
21205   (exit $ac_status); } &&
21206          { ac_try='test -s conftest.$ac_objext'
21207-  { (eval echo "$as_me:15959: \"$ac_try\"") >&5
21208+  { (eval echo "$as_me:15965: \"$ac_try\"") >&5
21209   (eval $ac_try) 2>&5
21210   ac_status=$?
21211-  echo "$as_me:15962: \$? = $ac_status" >&5
21212+  echo "$as_me:15968: \$? = $ac_status" >&5
21213   (exit $ac_status); }; }; then
21214   cf_cv_netbsd_menu_h=yes
21215
21216@@ -15971,7 +15977,7 @@
21217 rm -f conftest.$ac_objext conftest.$ac_ext
21218
21219 fi
21220-echo "$as_me:15974: result: $cf_cv_netbsd_menu_h" >&5
21221+echo "$as_me:15980: result: $cf_cv_netbsd_menu_h" >&5
21222 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
21223
21224 test "$cf_cv_netbsd_menu_h" = yes &&
21225@@ -15988,13 +15994,13 @@
21226 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
21227 	:
21228 elif test "x${PKG_CONFIG:=none}" != xnone; then
21229-	echo "$as_me:15991: checking pkg-config for menu$cf_cv_libtype" >&5
21230+	echo "$as_me:15997: checking pkg-config for menu$cf_cv_libtype" >&5
21231 echo $ECHO_N "checking pkg-config for menu$cf_cv_libtype... $ECHO_C" >&6
21232 	if "$PKG_CONFIG" --exists menu$cf_cv_libtype ; then
21233-		echo "$as_me:15994: result: yes" >&5
21234+		echo "$as_me:16000: result: yes" >&5
21235 echo "${ECHO_T}yes" >&6
21236
21237-		echo "$as_me:15997: checking if the menu$cf_cv_libtype package files work" >&5
21238+		echo "$as_me:16003: checking if the menu$cf_cv_libtype package files work" >&5
21239 echo $ECHO_N "checking if the menu$cf_cv_libtype package files work... $ECHO_C" >&6
21240
21241 		cf_save_CPPFLAGS="$CPPFLAGS"
21242@@ -16115,7 +16121,7 @@
21243 LIBS="$cf_add_libs"
21244
21245 		cat >conftest.$ac_ext <<_ACEOF
21246-#line 16118 "configure"
21247+#line 16124 "configure"
21248 #include "confdefs.h"
21249 #include <menu.h>
21250 int
21251@@ -16127,37 +16133,37 @@
21252 }
21253 _ACEOF
21254 rm -f conftest.$ac_objext conftest$ac_exeext
21255-if { (eval echo "$as_me:16130: \"$ac_link\"") >&5
21256+if { (eval echo "$as_me:16136: \"$ac_link\"") >&5
21257   (eval $ac_link) 2>&5
21258   ac_status=$?
21259-  echo "$as_me:16133: \$? = $ac_status" >&5
21260+  echo "$as_me:16139: \$? = $ac_status" >&5
21261   (exit $ac_status); } &&
21262          { ac_try='test -s conftest$ac_exeext'
21263-  { (eval echo "$as_me:16136: \"$ac_try\"") >&5
21264+  { (eval echo "$as_me:16142: \"$ac_try\"") >&5
21265   (eval $ac_try) 2>&5
21266   ac_status=$?
21267-  echo "$as_me:16139: \$? = $ac_status" >&5
21268+  echo "$as_me:16145: \$? = $ac_status" >&5
21269   (exit $ac_status); }; }; then
21270   if test "$cross_compiling" = yes; then
21271   cf_have_curses_lib=maybe
21272 else
21273   cat >conftest.$ac_ext <<_ACEOF
21274-#line 16145 "configure"
21275+#line 16151 "configure"
21276 #include "confdefs.h"
21277 #include <menu.h>
21278 				int main(void)
21279 				{ (void) menu_driver ( 0,0 ); return 0; }
21280 _ACEOF
21281 rm -f conftest$ac_exeext
21282-if { (eval echo "$as_me:16152: \"$ac_link\"") >&5
21283+if { (eval echo "$as_me:16158: \"$ac_link\"") >&5
21284   (eval $ac_link) 2>&5
21285   ac_status=$?
21286-  echo "$as_me:16155: \$? = $ac_status" >&5
21287+  echo "$as_me:16161: \$? = $ac_status" >&5
21288   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
21289-  { (eval echo "$as_me:16157: \"$ac_try\"") >&5
21290+  { (eval echo "$as_me:16163: \"$ac_try\"") >&5
21291   (eval $ac_try) 2>&5
21292   ac_status=$?
21293-  echo "$as_me:16160: \$? = $ac_status" >&5
21294+  echo "$as_me:16166: \$? = $ac_status" >&5
21295   (exit $ac_status); }; }; then
21296   cf_have_curses_lib=yes
21297 else
21298@@ -16174,7 +16180,7 @@
21299 cf_have_curses_lib=no
21300 fi
21301 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
21302-		echo "$as_me:16177: result: $cf_have_curses_lib" >&5
21303+		echo "$as_me:16183: result: $cf_have_curses_lib" >&5
21304 echo "${ECHO_T}$cf_have_curses_lib" >&6
21305 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
21306 		if test "$cf_have_curses_lib" != "yes"
21307@@ -16194,7 +16200,7 @@
21308 fi
21309 if test "$cf_have_curses_lib" = no; then
21310 	as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh`
21311-echo "$as_me:16197: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
21312+echo "$as_me:16203: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
21313 echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6
21314 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
21315   echo $ECHO_N "(cached) $ECHO_C" >&6
21316@@ -16202,7 +16208,7 @@
21317   ac_check_lib_save_LIBS=$LIBS
21318 LIBS="-lmenu$cf_cv_libtype  $LIBS"
21319 cat >conftest.$ac_ext <<_ACEOF
21320-#line 16205 "configure"
21321+#line 16211 "configure"
21322 #include "confdefs.h"
21323
21324 /* Override any gcc2 internal prototype to avoid an error.  */
21325@@ -16221,16 +16227,16 @@
21326 }
21327 _ACEOF
21328 rm -f conftest.$ac_objext conftest$ac_exeext
21329-if { (eval echo "$as_me:16224: \"$ac_link\"") >&5
21330+if { (eval echo "$as_me:16230: \"$ac_link\"") >&5
21331   (eval $ac_link) 2>&5
21332   ac_status=$?
21333-  echo "$as_me:16227: \$? = $ac_status" >&5
21334+  echo "$as_me:16233: \$? = $ac_status" >&5
21335   (exit $ac_status); } &&
21336          { ac_try='test -s conftest$ac_exeext'
21337-  { (eval echo "$as_me:16230: \"$ac_try\"") >&5
21338+  { (eval echo "$as_me:16236: \"$ac_try\"") >&5
21339   (eval $ac_try) 2>&5
21340   ac_status=$?
21341-  echo "$as_me:16233: \$? = $ac_status" >&5
21342+  echo "$as_me:16239: \$? = $ac_status" >&5
21343   (exit $ac_status); }; }; then
21344   eval "$as_ac_Lib=yes"
21345 else
21346@@ -16241,7 +16247,7 @@
21347 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
21348 LIBS=$ac_check_lib_save_LIBS
21349 fi
21350-echo "$as_me:16244: result: `eval echo '${'$as_ac_Lib'}'`" >&5
21351+echo "$as_me:16250: result: `eval echo '${'$as_ac_Lib'}'`" >&5
21352 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
21353 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
21354
21355@@ -16274,7 +16280,7 @@
21356 	cf_curses_headers="$cf_curses_headers menu.h"
21357 fi
21358
21359-echo "$as_me:16277: checking if you want to check for form functions" >&5
21360+echo "$as_me:16283: checking if you want to check for form functions" >&5
21361 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
21362
21363 # Check whether --enable-form or --disable-form was given.
21364@@ -16291,7 +16297,7 @@
21365 	cf_enable_form=$cf_default_form
21366
21367 fi;
21368-echo "$as_me:16294: result: $cf_enable_form" >&5
21369+echo "$as_me:16300: result: $cf_enable_form" >&5
21370 echo "${ECHO_T}$cf_enable_form" >&6
21371 if test $cf_enable_form = yes
21372 then
21373@@ -16300,14 +16306,14 @@
21374 		;;
21375 	(curses*)
21376
21377-echo "$as_me:16303: checking for NetBSD form.h" >&5
21378+echo "$as_me:16309: checking for NetBSD form.h" >&5
21379 echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
21380 if test "${cf_cv_netbsd_form_h+set}" = set; then
21381   echo $ECHO_N "(cached) $ECHO_C" >&6
21382 else
21383
21384 cat >conftest.$ac_ext <<_ACEOF
21385-#line 16310 "configure"
21386+#line 16316 "configure"
21387 #include "confdefs.h"
21388
21389 #include <${cf_cv_ncurses_header:-curses.h}>
21390@@ -16326,16 +16332,16 @@
21391 }
21392 _ACEOF
21393 rm -f conftest.$ac_objext
21394-if { (eval echo "$as_me:16329: \"$ac_compile\"") >&5
21395+if { (eval echo "$as_me:16335: \"$ac_compile\"") >&5
21396   (eval $ac_compile) 2>&5
21397   ac_status=$?
21398-  echo "$as_me:16332: \$? = $ac_status" >&5
21399+  echo "$as_me:16338: \$? = $ac_status" >&5
21400   (exit $ac_status); } &&
21401          { ac_try='test -s conftest.$ac_objext'
21402-  { (eval echo "$as_me:16335: \"$ac_try\"") >&5
21403+  { (eval echo "$as_me:16341: \"$ac_try\"") >&5
21404   (eval $ac_try) 2>&5
21405   ac_status=$?
21406-  echo "$as_me:16338: \$? = $ac_status" >&5
21407+  echo "$as_me:16344: \$? = $ac_status" >&5
21408   (exit $ac_status); }; }; then
21409   cf_cv_netbsd_form_h=yes
21410
21411@@ -16347,7 +16353,7 @@
21412 rm -f conftest.$ac_objext conftest.$ac_ext
21413
21414 fi
21415-echo "$as_me:16350: result: $cf_cv_netbsd_form_h" >&5
21416+echo "$as_me:16356: result: $cf_cv_netbsd_form_h" >&5
21417 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
21418
21419 test "$cf_cv_netbsd_form_h" = yes &&
21420@@ -16364,13 +16370,13 @@
21421 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
21422 	:
21423 elif test "x${PKG_CONFIG:=none}" != xnone; then
21424-	echo "$as_me:16367: checking pkg-config for form$cf_cv_libtype" >&5
21425+	echo "$as_me:16373: checking pkg-config for form$cf_cv_libtype" >&5
21426 echo $ECHO_N "checking pkg-config for form$cf_cv_libtype... $ECHO_C" >&6
21427 	if "$PKG_CONFIG" --exists form$cf_cv_libtype ; then
21428-		echo "$as_me:16370: result: yes" >&5
21429+		echo "$as_me:16376: result: yes" >&5
21430 echo "${ECHO_T}yes" >&6
21431
21432-		echo "$as_me:16373: checking if the form$cf_cv_libtype package files work" >&5
21433+		echo "$as_me:16379: checking if the form$cf_cv_libtype package files work" >&5
21434 echo $ECHO_N "checking if the form$cf_cv_libtype package files work... $ECHO_C" >&6
21435
21436 		cf_save_CPPFLAGS="$CPPFLAGS"
21437@@ -16491,7 +16497,7 @@
21438 LIBS="$cf_add_libs"
21439
21440 		cat >conftest.$ac_ext <<_ACEOF
21441-#line 16494 "configure"
21442+#line 16500 "configure"
21443 #include "confdefs.h"
21444 #include <form.h>
21445 int
21446@@ -16503,37 +16509,37 @@
21447 }
21448 _ACEOF
21449 rm -f conftest.$ac_objext conftest$ac_exeext
21450-if { (eval echo "$as_me:16506: \"$ac_link\"") >&5
21451+if { (eval echo "$as_me:16512: \"$ac_link\"") >&5
21452   (eval $ac_link) 2>&5
21453   ac_status=$?
21454-  echo "$as_me:16509: \$? = $ac_status" >&5
21455+  echo "$as_me:16515: \$? = $ac_status" >&5
21456   (exit $ac_status); } &&
21457          { ac_try='test -s conftest$ac_exeext'
21458-  { (eval echo "$as_me:16512: \"$ac_try\"") >&5
21459+  { (eval echo "$as_me:16518: \"$ac_try\"") >&5
21460   (eval $ac_try) 2>&5
21461   ac_status=$?
21462-  echo "$as_me:16515: \$? = $ac_status" >&5
21463+  echo "$as_me:16521: \$? = $ac_status" >&5
21464   (exit $ac_status); }; }; then
21465   if test "$cross_compiling" = yes; then
21466   cf_have_curses_lib=maybe
21467 else
21468   cat >conftest.$ac_ext <<_ACEOF
21469-#line 16521 "configure"
21470+#line 16527 "configure"
21471 #include "confdefs.h"
21472 #include <form.h>
21473 				int main(void)
21474 				{ (void) form_driver ( 0,0 ); return 0; }
21475 _ACEOF
21476 rm -f conftest$ac_exeext
21477-if { (eval echo "$as_me:16528: \"$ac_link\"") >&5
21478+if { (eval echo "$as_me:16534: \"$ac_link\"") >&5
21479   (eval $ac_link) 2>&5
21480   ac_status=$?
21481-  echo "$as_me:16531: \$? = $ac_status" >&5
21482+  echo "$as_me:16537: \$? = $ac_status" >&5
21483   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
21484-  { (eval echo "$as_me:16533: \"$ac_try\"") >&5
21485+  { (eval echo "$as_me:16539: \"$ac_try\"") >&5
21486   (eval $ac_try) 2>&5
21487   ac_status=$?
21488-  echo "$as_me:16536: \$? = $ac_status" >&5
21489+  echo "$as_me:16542: \$? = $ac_status" >&5
21490   (exit $ac_status); }; }; then
21491   cf_have_curses_lib=yes
21492 else
21493@@ -16550,7 +16556,7 @@
21494 cf_have_curses_lib=no
21495 fi
21496 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
21497-		echo "$as_me:16553: result: $cf_have_curses_lib" >&5
21498+		echo "$as_me:16559: result: $cf_have_curses_lib" >&5
21499 echo "${ECHO_T}$cf_have_curses_lib" >&6
21500 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
21501 		if test "$cf_have_curses_lib" != "yes"
21502@@ -16570,7 +16576,7 @@
21503 fi
21504 if test "$cf_have_curses_lib" = no; then
21505 	as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh`
21506-echo "$as_me:16573: checking for form_driver in -lform$cf_cv_libtype" >&5
21507+echo "$as_me:16579: checking for form_driver in -lform$cf_cv_libtype" >&5
21508 echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6
21509 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
21510   echo $ECHO_N "(cached) $ECHO_C" >&6
21511@@ -16578,7 +16584,7 @@
21512   ac_check_lib_save_LIBS=$LIBS
21513 LIBS="-lform$cf_cv_libtype  $LIBS"
21514 cat >conftest.$ac_ext <<_ACEOF
21515-#line 16581 "configure"
21516+#line 16587 "configure"
21517 #include "confdefs.h"
21518
21519 /* Override any gcc2 internal prototype to avoid an error.  */
21520@@ -16597,16 +16603,16 @@
21521 }
21522 _ACEOF
21523 rm -f conftest.$ac_objext conftest$ac_exeext
21524-if { (eval echo "$as_me:16600: \"$ac_link\"") >&5
21525+if { (eval echo "$as_me:16606: \"$ac_link\"") >&5
21526   (eval $ac_link) 2>&5
21527   ac_status=$?
21528-  echo "$as_me:16603: \$? = $ac_status" >&5
21529+  echo "$as_me:16609: \$? = $ac_status" >&5
21530   (exit $ac_status); } &&
21531          { ac_try='test -s conftest$ac_exeext'
21532-  { (eval echo "$as_me:16606: \"$ac_try\"") >&5
21533+  { (eval echo "$as_me:16612: \"$ac_try\"") >&5
21534   (eval $ac_try) 2>&5
21535   ac_status=$?
21536-  echo "$as_me:16609: \$? = $ac_status" >&5
21537+  echo "$as_me:16615: \$? = $ac_status" >&5
21538   (exit $ac_status); }; }; then
21539   eval "$as_ac_Lib=yes"
21540 else
21541@@ -16617,7 +16623,7 @@
21542 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
21543 LIBS=$ac_check_lib_save_LIBS
21544 fi
21545-echo "$as_me:16620: result: `eval echo '${'$as_ac_Lib'}'`" >&5
21546+echo "$as_me:16626: result: `eval echo '${'$as_ac_Lib'}'`" >&5
21547 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
21548 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
21549
21550@@ -16655,23 +16661,23 @@
21551 for ac_header in $cf_curses_headers
21552 do
21553 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
21554-echo "$as_me:16658: checking for $ac_header" >&5
21555+echo "$as_me:16664: checking for $ac_header" >&5
21556 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
21557 if eval "test \"\${$as_ac_Header+set}\" = set"; then
21558   echo $ECHO_N "(cached) $ECHO_C" >&6
21559 else
21560   cat >conftest.$ac_ext <<_ACEOF
21561-#line 16664 "configure"
21562+#line 16670 "configure"
21563 #include "confdefs.h"
21564 #include <$ac_header>
21565 _ACEOF
21566-if { (eval echo "$as_me:16668: \"$ac_cpp conftest.$ac_ext\"") >&5
21567+if { (eval echo "$as_me:16674: \"$ac_cpp conftest.$ac_ext\"") >&5
21568   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
21569   ac_status=$?
21570   egrep -v '^ *\+' conftest.er1 >conftest.err
21571   rm -f conftest.er1
21572   cat conftest.err >&5
21573-  echo "$as_me:16674: \$? = $ac_status" >&5
21574+  echo "$as_me:16680: \$? = $ac_status" >&5
21575   (exit $ac_status); } >/dev/null; then
21576   if test -s conftest.err; then
21577     ac_cpp_err=$ac_c_preproc_warn_flag
21578@@ -16690,7 +16696,7 @@
21579 fi
21580 rm -f conftest.err conftest.$ac_ext
21581 fi
21582-echo "$as_me:16693: result: `eval echo '${'$as_ac_Header'}'`" >&5
21583+echo "$as_me:16699: result: `eval echo '${'$as_ac_Header'}'`" >&5
21584 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
21585 if test `eval echo '${'$as_ac_Header'}'` = yes; then
21586   cat >>confdefs.h <<EOF
21587@@ -16700,13 +16706,13 @@
21588 fi
21589 done
21590
21591-echo "$as_me:16703: checking for ANSI C header files" >&5
21592+echo "$as_me:16709: checking for ANSI C header files" >&5
21593 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
21594 if test "${ac_cv_header_stdc+set}" = set; then
21595   echo $ECHO_N "(cached) $ECHO_C" >&6
21596 else
21597   cat >conftest.$ac_ext <<_ACEOF
21598-#line 16709 "configure"
21599+#line 16715 "configure"
21600 #include "confdefs.h"
21601 #include <stdlib.h>
21602 #include <stdarg.h>
21603@@ -16714,13 +16720,13 @@
21604 #include <float.h>
21605
21606 _ACEOF
21607-if { (eval echo "$as_me:16717: \"$ac_cpp conftest.$ac_ext\"") >&5
21608+if { (eval echo "$as_me:16723: \"$ac_cpp conftest.$ac_ext\"") >&5
21609   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
21610   ac_status=$?
21611   egrep -v '^ *\+' conftest.er1 >conftest.err
21612   rm -f conftest.er1
21613   cat conftest.err >&5
21614-  echo "$as_me:16723: \$? = $ac_status" >&5
21615+  echo "$as_me:16729: \$? = $ac_status" >&5
21616   (exit $ac_status); } >/dev/null; then
21617   if test -s conftest.err; then
21618     ac_cpp_err=$ac_c_preproc_warn_flag
21619@@ -16742,7 +16748,7 @@
21620 if test $ac_cv_header_stdc = yes; then
21621   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
21622   cat >conftest.$ac_ext <<_ACEOF
21623-#line 16745 "configure"
21624+#line 16751 "configure"
21625 #include "confdefs.h"
21626 #include <string.h>
21627
21628@@ -16760,7 +16766,7 @@
21629 if test $ac_cv_header_stdc = yes; then
21630   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
21631   cat >conftest.$ac_ext <<_ACEOF
21632-#line 16763 "configure"
21633+#line 16769 "configure"
21634 #include "confdefs.h"
21635 #include <stdlib.h>
21636
21637@@ -16781,7 +16787,7 @@
21638   :
21639 else
21640   cat >conftest.$ac_ext <<_ACEOF
21641-#line 16784 "configure"
21642+#line 16790 "configure"
21643 #include "confdefs.h"
21644 #include <ctype.h>
21645 #if ((' ' & 0x0FF) == 0x020)
21646@@ -16807,15 +16813,15 @@
21647 }
21648 _ACEOF
21649 rm -f conftest$ac_exeext
21650-if { (eval echo "$as_me:16810: \"$ac_link\"") >&5
21651+if { (eval echo "$as_me:16816: \"$ac_link\"") >&5
21652   (eval $ac_link) 2>&5
21653   ac_status=$?
21654-  echo "$as_me:16813: \$? = $ac_status" >&5
21655+  echo "$as_me:16819: \$? = $ac_status" >&5
21656   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
21657-  { (eval echo "$as_me:16815: \"$ac_try\"") >&5
21658+  { (eval echo "$as_me:16821: \"$ac_try\"") >&5
21659   (eval $ac_try) 2>&5
21660   ac_status=$?
21661-  echo "$as_me:16818: \$? = $ac_status" >&5
21662+  echo "$as_me:16824: \$? = $ac_status" >&5
21663   (exit $ac_status); }; }; then
21664   :
21665 else
21666@@ -16828,7 +16834,7 @@
21667 fi
21668 fi
21669 fi
21670-echo "$as_me:16831: result: $ac_cv_header_stdc" >&5
21671+echo "$as_me:16837: result: $ac_cv_header_stdc" >&5
21672 echo "${ECHO_T}$ac_cv_header_stdc" >&6
21673 if test $ac_cv_header_stdc = yes; then
21674
21675@@ -16838,13 +16844,13 @@
21676
21677 fi
21678
21679-echo "$as_me:16841: checking whether time.h and sys/time.h may both be included" >&5
21680+echo "$as_me:16847: checking whether time.h and sys/time.h may both be included" >&5
21681 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
21682 if test "${ac_cv_header_time+set}" = set; then
21683   echo $ECHO_N "(cached) $ECHO_C" >&6
21684 else
21685   cat >conftest.$ac_ext <<_ACEOF
21686-#line 16847 "configure"
21687+#line 16853 "configure"
21688 #include "confdefs.h"
21689 #include <sys/types.h>
21690 #include <sys/time.h>
21691@@ -16860,16 +16866,16 @@
21692 }
21693 _ACEOF
21694 rm -f conftest.$ac_objext
21695-if { (eval echo "$as_me:16863: \"$ac_compile\"") >&5
21696+if { (eval echo "$as_me:16869: \"$ac_compile\"") >&5
21697   (eval $ac_compile) 2>&5
21698   ac_status=$?
21699-  echo "$as_me:16866: \$? = $ac_status" >&5
21700+  echo "$as_me:16872: \$? = $ac_status" >&5
21701   (exit $ac_status); } &&
21702          { ac_try='test -s conftest.$ac_objext'
21703-  { (eval echo "$as_me:16869: \"$ac_try\"") >&5
21704+  { (eval echo "$as_me:16875: \"$ac_try\"") >&5
21705   (eval $ac_try) 2>&5
21706   ac_status=$?
21707-  echo "$as_me:16872: \$? = $ac_status" >&5
21708+  echo "$as_me:16878: \$? = $ac_status" >&5
21709   (exit $ac_status); }; }; then
21710   ac_cv_header_time=yes
21711 else
21712@@ -16879,7 +16885,7 @@
21713 fi
21714 rm -f conftest.$ac_objext conftest.$ac_ext
21715 fi
21716-echo "$as_me:16882: result: $ac_cv_header_time" >&5
21717+echo "$as_me:16888: result: $ac_cv_header_time" >&5
21718 echo "${ECHO_T}$ac_cv_header_time" >&6
21719 if test $ac_cv_header_time = yes; then
21720
21721@@ -16903,23 +16909,23 @@
21722
21723 do
21724 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
21725-echo "$as_me:16906: checking for $ac_header" >&5
21726+echo "$as_me:16912: checking for $ac_header" >&5
21727 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
21728 if eval "test \"\${$as_ac_Header+set}\" = set"; then
21729   echo $ECHO_N "(cached) $ECHO_C" >&6
21730 else
21731   cat >conftest.$ac_ext <<_ACEOF
21732-#line 16912 "configure"
21733+#line 16918 "configure"
21734 #include "confdefs.h"
21735 #include <$ac_header>
21736 _ACEOF
21737-if { (eval echo "$as_me:16916: \"$ac_cpp conftest.$ac_ext\"") >&5
21738+if { (eval echo "$as_me:16922: \"$ac_cpp conftest.$ac_ext\"") >&5
21739   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
21740   ac_status=$?
21741   egrep -v '^ *\+' conftest.er1 >conftest.err
21742   rm -f conftest.er1
21743   cat conftest.err >&5
21744-  echo "$as_me:16922: \$? = $ac_status" >&5
21745+  echo "$as_me:16928: \$? = $ac_status" >&5
21746   (exit $ac_status); } >/dev/null; then
21747   if test -s conftest.err; then
21748     ac_cpp_err=$ac_c_preproc_warn_flag
21749@@ -16938,7 +16944,7 @@
21750 fi
21751 rm -f conftest.err conftest.$ac_ext
21752 fi
21753-echo "$as_me:16941: result: `eval echo '${'$as_ac_Header'}'`" >&5
21754+echo "$as_me:16947: result: `eval echo '${'$as_ac_Header'}'`" >&5
21755 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
21756 if test `eval echo '${'$as_ac_Header'}'` = yes; then
21757   cat >>confdefs.h <<EOF
21758@@ -16951,23 +16957,23 @@
21759 for ac_header in unistd.h getopt.h
21760 do
21761 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
21762-echo "$as_me:16954: checking for $ac_header" >&5
21763+echo "$as_me:16960: checking for $ac_header" >&5
21764 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
21765 if eval "test \"\${$as_ac_Header+set}\" = set"; then
21766   echo $ECHO_N "(cached) $ECHO_C" >&6
21767 else
21768   cat >conftest.$ac_ext <<_ACEOF
21769-#line 16960 "configure"
21770+#line 16966 "configure"
21771 #include "confdefs.h"
21772 #include <$ac_header>
21773 _ACEOF
21774-if { (eval echo "$as_me:16964: \"$ac_cpp conftest.$ac_ext\"") >&5
21775+if { (eval echo "$as_me:16970: \"$ac_cpp conftest.$ac_ext\"") >&5
21776   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
21777   ac_status=$?
21778   egrep -v '^ *\+' conftest.er1 >conftest.err
21779   rm -f conftest.er1
21780   cat conftest.err >&5
21781-  echo "$as_me:16970: \$? = $ac_status" >&5
21782+  echo "$as_me:16976: \$? = $ac_status" >&5
21783   (exit $ac_status); } >/dev/null; then
21784   if test -s conftest.err; then
21785     ac_cpp_err=$ac_c_preproc_warn_flag
21786@@ -16986,7 +16992,7 @@
21787 fi
21788 rm -f conftest.err conftest.$ac_ext
21789 fi
21790-echo "$as_me:16989: result: `eval echo '${'$as_ac_Header'}'`" >&5
21791+echo "$as_me:16995: result: `eval echo '${'$as_ac_Header'}'`" >&5
21792 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
21793 if test `eval echo '${'$as_ac_Header'}'` = yes; then
21794   cat >>confdefs.h <<EOF
21795@@ -16996,7 +17002,7 @@
21796 fi
21797 done
21798
21799-echo "$as_me:16999: checking for header declaring getopt variables" >&5
21800+echo "$as_me:17005: checking for header declaring getopt variables" >&5
21801 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
21802 if test "${cf_cv_getopt_header+set}" = set; then
21803   echo $ECHO_N "(cached) $ECHO_C" >&6
21804@@ -17006,7 +17012,7 @@
21805 for cf_header in stdio.h stdlib.h unistd.h getopt.h
21806 do
21807 cat >conftest.$ac_ext <<_ACEOF
21808-#line 17009 "configure"
21809+#line 17015 "configure"
21810 #include "confdefs.h"
21811
21812 #include <$cf_header>
21813@@ -17019,16 +17025,16 @@
21814 }
21815 _ACEOF
21816 rm -f conftest.$ac_objext
21817-if { (eval echo "$as_me:17022: \"$ac_compile\"") >&5
21818+if { (eval echo "$as_me:17028: \"$ac_compile\"") >&5
21819   (eval $ac_compile) 2>&5
21820   ac_status=$?
21821-  echo "$as_me:17025: \$? = $ac_status" >&5
21822+  echo "$as_me:17031: \$? = $ac_status" >&5
21823   (exit $ac_status); } &&
21824          { ac_try='test -s conftest.$ac_objext'
21825-  { (eval echo "$as_me:17028: \"$ac_try\"") >&5
21826+  { (eval echo "$as_me:17034: \"$ac_try\"") >&5
21827   (eval $ac_try) 2>&5
21828   ac_status=$?
21829-  echo "$as_me:17031: \$? = $ac_status" >&5
21830+  echo "$as_me:17037: \$? = $ac_status" >&5
21831   (exit $ac_status); }; }; then
21832   cf_cv_getopt_header=$cf_header
21833  break
21834@@ -17040,7 +17046,7 @@
21835 done
21836
21837 fi
21838-echo "$as_me:17043: result: $cf_cv_getopt_header" >&5
21839+echo "$as_me:17049: result: $cf_cv_getopt_header" >&5
21840 echo "${ECHO_T}$cf_cv_getopt_header" >&6
21841 if test $cf_cv_getopt_header != none ; then
21842
21843@@ -17065,13 +17071,13 @@
21844
21845 do
21846 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
21847-echo "$as_me:17068: checking for $ac_func" >&5
21848+echo "$as_me:17074: checking for $ac_func" >&5
21849 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
21850 if eval "test \"\${$as_ac_var+set}\" = set"; then
21851   echo $ECHO_N "(cached) $ECHO_C" >&6
21852 else
21853   cat >conftest.$ac_ext <<_ACEOF
21854-#line 17074 "configure"
21855+#line 17080 "configure"
21856 #include "confdefs.h"
21857 #define $ac_func autoconf_temporary
21858 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
21859@@ -17102,16 +17108,16 @@
21860 }
21861 _ACEOF
21862 rm -f conftest.$ac_objext conftest$ac_exeext
21863-if { (eval echo "$as_me:17105: \"$ac_link\"") >&5
21864+if { (eval echo "$as_me:17111: \"$ac_link\"") >&5
21865   (eval $ac_link) 2>&5
21866   ac_status=$?
21867-  echo "$as_me:17108: \$? = $ac_status" >&5
21868+  echo "$as_me:17114: \$? = $ac_status" >&5
21869   (exit $ac_status); } &&
21870          { ac_try='test -s conftest$ac_exeext'
21871-  { (eval echo "$as_me:17111: \"$ac_try\"") >&5
21872+  { (eval echo "$as_me:17117: \"$ac_try\"") >&5
21873   (eval $ac_try) 2>&5
21874   ac_status=$?
21875-  echo "$as_me:17114: \$? = $ac_status" >&5
21876+  echo "$as_me:17120: \$? = $ac_status" >&5
21877   (exit $ac_status); }; }; then
21878   eval "$as_ac_var=yes"
21879 else
21880@@ -17121,7 +17127,7 @@
21881 fi
21882 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
21883 fi
21884-echo "$as_me:17124: result: `eval echo '${'$as_ac_var'}'`" >&5
21885+echo "$as_me:17130: result: `eval echo '${'$as_ac_var'}'`" >&5
21886 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
21887 if test `eval echo '${'$as_ac_var'}'` = yes; then
21888   cat >>confdefs.h <<EOF
21889@@ -17132,14 +17138,14 @@
21890 done
21891
21892 # use a compile-check to work with ncurses*-config and subdirectory includes
21893-echo "$as_me:17135: checking if we can use termcap.h" >&5
21894+echo "$as_me:17141: checking if we can use termcap.h" >&5
21895 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
21896 if test "${cf_cv_have_termcap_h+set}" = set; then
21897   echo $ECHO_N "(cached) $ECHO_C" >&6
21898 else
21899
21900 	cat >conftest.$ac_ext <<_ACEOF
21901-#line 17142 "configure"
21902+#line 17148 "configure"
21903 #include "confdefs.h"
21904
21905 #include <curses.h>
21906@@ -17160,16 +17166,16 @@
21907 }
21908 _ACEOF
21909 rm -f conftest.$ac_objext
21910-if { (eval echo "$as_me:17163: \"$ac_compile\"") >&5
21911+if { (eval echo "$as_me:17169: \"$ac_compile\"") >&5
21912   (eval $ac_compile) 2>&5
21913   ac_status=$?
21914-  echo "$as_me:17166: \$? = $ac_status" >&5
21915+  echo "$as_me:17172: \$? = $ac_status" >&5
21916   (exit $ac_status); } &&
21917          { ac_try='test -s conftest.$ac_objext'
21918-  { (eval echo "$as_me:17169: \"$ac_try\"") >&5
21919+  { (eval echo "$as_me:17175: \"$ac_try\"") >&5
21920   (eval $ac_try) 2>&5
21921   ac_status=$?
21922-  echo "$as_me:17172: \$? = $ac_status" >&5
21923+  echo "$as_me:17178: \$? = $ac_status" >&5
21924   (exit $ac_status); }; }; then
21925   cf_cv_have_termcap_h=yes
21926 else
21927@@ -17179,23 +17185,24 @@
21928 fi
21929 rm -f conftest.$ac_objext conftest.$ac_ext
21930 fi
21931-echo "$as_me:17182: result: $cf_cv_have_termcap_h" >&5
21932+echo "$as_me:17188: result: $cf_cv_have_termcap_h" >&5
21933 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
21934 if test "x$cf_cv_have_termcap_h" = xyes
21935 then
21936-	cat >>confdefs.h <<\EOF
21937+
21938+cat >>confdefs.h <<\EOF
21939 #define HAVE_TERMCAP_H 1
21940 EOF
21941
21942 else
21943-echo "$as_me:17191: checking if we can use ncurses/termcap.h" >&5
21944+echo "$as_me:17198: checking if we can use ncurses/termcap.h" >&5
21945 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
21946 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
21947   echo $ECHO_N "(cached) $ECHO_C" >&6
21948 else
21949
21950 	cat >conftest.$ac_ext <<_ACEOF
21951-#line 17198 "configure"
21952+#line 17205 "configure"
21953 #include "confdefs.h"
21954
21955 #include <ncurses/curses.h>
21956@@ -17216,16 +17223,16 @@
21957 }
21958 _ACEOF
21959 rm -f conftest.$ac_objext
21960-if { (eval echo "$as_me:17219: \"$ac_compile\"") >&5
21961+if { (eval echo "$as_me:17226: \"$ac_compile\"") >&5
21962   (eval $ac_compile) 2>&5
21963   ac_status=$?
21964-  echo "$as_me:17222: \$? = $ac_status" >&5
21965+  echo "$as_me:17229: \$? = $ac_status" >&5
21966   (exit $ac_status); } &&
21967          { ac_try='test -s conftest.$ac_objext'
21968-  { (eval echo "$as_me:17225: \"$ac_try\"") >&5
21969+  { (eval echo "$as_me:17232: \"$ac_try\"") >&5
21970   (eval $ac_try) 2>&5
21971   ac_status=$?
21972-  echo "$as_me:17228: \$? = $ac_status" >&5
21973+  echo "$as_me:17235: \$? = $ac_status" >&5
21974   (exit $ac_status); }; }; then
21975   cf_cv_have_ncurses_termcap_h=yes
21976 else
21977@@ -17235,16 +17242,17 @@
21978 fi
21979 rm -f conftest.$ac_objext conftest.$ac_ext
21980 fi
21981-echo "$as_me:17238: result: $cf_cv_have_ncurses_termcap_h" >&5
21982+echo "$as_me:17245: result: $cf_cv_have_ncurses_termcap_h" >&5
21983 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
21984-test "x$cf_cv_have_ncurses_termcap_h" = xyes && cat >>confdefs.h <<\EOF
21985+test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
21986+cat >>confdefs.h <<\EOF
21987 #define HAVE_NCURSES_TERMCAP_H 1
21988 EOF
21989
21990 fi
21991
21992 if test "x$ac_cv_func_getopt" = xno; then
21993-	{ { echo "$as_me:17247: error: getopt is required for building programs" >&5
21994+	{ { echo "$as_me:17255: error: getopt is required for building programs" >&5
21995 echo "$as_me: error: getopt is required for building programs" >&2;}
21996    { (exit 1); exit 1; }; }
21997 fi
21998@@ -17263,13 +17271,13 @@
21999
22000 do
22001 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
22002-echo "$as_me:17266: checking for $ac_func" >&5
22003+echo "$as_me:17274: checking for $ac_func" >&5
22004 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
22005 if eval "test \"\${$as_ac_var+set}\" = set"; then
22006   echo $ECHO_N "(cached) $ECHO_C" >&6
22007 else
22008   cat >conftest.$ac_ext <<_ACEOF
22009-#line 17272 "configure"
22010+#line 17280 "configure"
22011 #include "confdefs.h"
22012 #define $ac_func autoconf_temporary
22013 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
22014@@ -17300,16 +17308,16 @@
22015 }
22016 _ACEOF
22017 rm -f conftest.$ac_objext conftest$ac_exeext
22018-if { (eval echo "$as_me:17303: \"$ac_link\"") >&5
22019+if { (eval echo "$as_me:17311: \"$ac_link\"") >&5
22020   (eval $ac_link) 2>&5
22021   ac_status=$?
22022-  echo "$as_me:17306: \$? = $ac_status" >&5
22023+  echo "$as_me:17314: \$? = $ac_status" >&5
22024   (exit $ac_status); } &&
22025          { ac_try='test -s conftest$ac_exeext'
22026-  { (eval echo "$as_me:17309: \"$ac_try\"") >&5
22027+  { (eval echo "$as_me:17317: \"$ac_try\"") >&5
22028   (eval $ac_try) 2>&5
22029   ac_status=$?
22030-  echo "$as_me:17312: \$? = $ac_status" >&5
22031+  echo "$as_me:17320: \$? = $ac_status" >&5
22032   (exit $ac_status); }; }; then
22033   eval "$as_ac_var=yes"
22034 else
22035@@ -17319,7 +17327,7 @@
22036 fi
22037 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
22038 fi
22039-echo "$as_me:17322: result: `eval echo '${'$as_ac_var'}'`" >&5
22040+echo "$as_me:17330: result: `eval echo '${'$as_ac_var'}'`" >&5
22041 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
22042 if test `eval echo '${'$as_ac_var'}'` = yes; then
22043   cat >>confdefs.h <<EOF
22044@@ -17331,7 +17339,7 @@
22045
22046 fi
22047
22048-echo "$as_me:17334: checking definition to turn on extended curses functions" >&5
22049+echo "$as_me:17342: checking definition to turn on extended curses functions" >&5
22050 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
22051 if test "${cf_cv_need_xopen_extension+set}" = set; then
22052   echo $ECHO_N "(cached) $ECHO_C" >&6
22053@@ -17339,7 +17347,7 @@
22054
22055 cf_cv_need_xopen_extension=unknown
22056 cat >conftest.$ac_ext <<_ACEOF
22057-#line 17342 "configure"
22058+#line 17350 "configure"
22059 #include "confdefs.h"
22060
22061 #include <stdlib.h>
22062@@ -17365,16 +17373,16 @@
22063 }
22064 _ACEOF
22065 rm -f conftest.$ac_objext conftest$ac_exeext
22066-if { (eval echo "$as_me:17368: \"$ac_link\"") >&5
22067+if { (eval echo "$as_me:17376: \"$ac_link\"") >&5
22068   (eval $ac_link) 2>&5
22069   ac_status=$?
22070-  echo "$as_me:17371: \$? = $ac_status" >&5
22071+  echo "$as_me:17379: \$? = $ac_status" >&5
22072   (exit $ac_status); } &&
22073          { ac_try='test -s conftest$ac_exeext'
22074-  { (eval echo "$as_me:17374: \"$ac_try\"") >&5
22075+  { (eval echo "$as_me:17382: \"$ac_try\"") >&5
22076   (eval $ac_try) 2>&5
22077   ac_status=$?
22078-  echo "$as_me:17377: \$? = $ac_status" >&5
22079+  echo "$as_me:17385: \$? = $ac_status" >&5
22080   (exit $ac_status); }; }; then
22081   cf_cv_need_xopen_extension=none
22082 else
22083@@ -17384,7 +17392,7 @@
22084 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
22085 	do
22086 		cat >conftest.$ac_ext <<_ACEOF
22087-#line 17387 "configure"
22088+#line 17395 "configure"
22089 #include "confdefs.h"
22090
22091 #define $cf_try_xopen_extension 1
22092@@ -17406,16 +17414,16 @@
22093 }
22094 _ACEOF
22095 rm -f conftest.$ac_objext conftest$ac_exeext
22096-if { (eval echo "$as_me:17409: \"$ac_link\"") >&5
22097+if { (eval echo "$as_me:17417: \"$ac_link\"") >&5
22098   (eval $ac_link) 2>&5
22099   ac_status=$?
22100-  echo "$as_me:17412: \$? = $ac_status" >&5
22101+  echo "$as_me:17420: \$? = $ac_status" >&5
22102   (exit $ac_status); } &&
22103          { ac_try='test -s conftest$ac_exeext'
22104-  { (eval echo "$as_me:17415: \"$ac_try\"") >&5
22105+  { (eval echo "$as_me:17423: \"$ac_try\"") >&5
22106   (eval $ac_try) 2>&5
22107   ac_status=$?
22108-  echo "$as_me:17418: \$? = $ac_status" >&5
22109+  echo "$as_me:17426: \$? = $ac_status" >&5
22110   (exit $ac_status); }; }; then
22111   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
22112 else
22113@@ -17429,7 +17437,7 @@
22114 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
22115
22116 fi
22117-echo "$as_me:17432: result: $cf_cv_need_xopen_extension" >&5
22118+echo "$as_me:17440: result: $cf_cv_need_xopen_extension" >&5
22119 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
22120
22121 case $cf_cv_need_xopen_extension in
22122@@ -17441,7 +17449,7 @@
22123 	;;
22124 esac
22125
22126-echo "$as_me:17444: checking for term.h" >&5
22127+echo "$as_me:17452: checking for term.h" >&5
22128 echo $ECHO_N "checking for term.h... $ECHO_C" >&6
22129 if test "${cf_cv_term_header+set}" = set; then
22130   echo $ECHO_N "(cached) $ECHO_C" >&6
22131@@ -17462,7 +17470,7 @@
22132 for cf_header in $cf_header_list
22133 do
22134 	cat >conftest.$ac_ext <<_ACEOF
22135-#line 17465 "configure"
22136+#line 17473 "configure"
22137 #include "confdefs.h"
22138
22139 #include <${cf_cv_ncurses_header:-curses.h}>
22140@@ -17476,16 +17484,16 @@
22141 }
22142 _ACEOF
22143 rm -f conftest.$ac_objext
22144-if { (eval echo "$as_me:17479: \"$ac_compile\"") >&5
22145+if { (eval echo "$as_me:17487: \"$ac_compile\"") >&5
22146   (eval $ac_compile) 2>&5
22147   ac_status=$?
22148-  echo "$as_me:17482: \$? = $ac_status" >&5
22149+  echo "$as_me:17490: \$? = $ac_status" >&5
22150   (exit $ac_status); } &&
22151          { ac_try='test -s conftest.$ac_objext'
22152-  { (eval echo "$as_me:17485: \"$ac_try\"") >&5
22153+  { (eval echo "$as_me:17493: \"$ac_try\"") >&5
22154   (eval $ac_try) 2>&5
22155   ac_status=$?
22156-  echo "$as_me:17488: \$? = $ac_status" >&5
22157+  echo "$as_me:17496: \$? = $ac_status" >&5
22158   (exit $ac_status); }; }; then
22159   cf_cv_term_header=$cf_header
22160 	 break
22161@@ -17504,7 +17512,7 @@
22162 	for cf_header in ncurses/term.h ncursesw/term.h
22163 	do
22164 		cat >conftest.$ac_ext <<_ACEOF
22165-#line 17507 "configure"
22166+#line 17515 "configure"
22167 #include "confdefs.h"
22168
22169 #include <${cf_cv_ncurses_header:-curses.h}>
22170@@ -17522,16 +17530,16 @@
22171 }
22172 _ACEOF
22173 rm -f conftest.$ac_objext
22174-if { (eval echo "$as_me:17525: \"$ac_compile\"") >&5
22175+if { (eval echo "$as_me:17533: \"$ac_compile\"") >&5
22176   (eval $ac_compile) 2>&5
22177   ac_status=$?
22178-  echo "$as_me:17528: \$? = $ac_status" >&5
22179+  echo "$as_me:17536: \$? = $ac_status" >&5
22180   (exit $ac_status); } &&
22181          { ac_try='test -s conftest.$ac_objext'
22182-  { (eval echo "$as_me:17531: \"$ac_try\"") >&5
22183+  { (eval echo "$as_me:17539: \"$ac_try\"") >&5
22184   (eval $ac_try) 2>&5
22185   ac_status=$?
22186-  echo "$as_me:17534: \$? = $ac_status" >&5
22187+  echo "$as_me:17542: \$? = $ac_status" >&5
22188   (exit $ac_status); }; }; then
22189   cf_cv_term_header=$cf_header
22190 			 break
22191@@ -17546,7 +17554,7 @@
22192 esac
22193
22194 fi
22195-echo "$as_me:17549: result: $cf_cv_term_header" >&5
22196+echo "$as_me:17557: result: $cf_cv_term_header" >&5
22197 echo "${ECHO_T}$cf_cv_term_header" >&6
22198
22199 case $cf_cv_term_header in
22200@@ -17573,7 +17581,7 @@
22201 	;;
22202 esac
22203
22204-echo "$as_me:17576: checking for unctrl.h" >&5
22205+echo "$as_me:17584: checking for unctrl.h" >&5
22206 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
22207 if test "${cf_cv_unctrl_header+set}" = set; then
22208   echo $ECHO_N "(cached) $ECHO_C" >&6
22209@@ -17594,7 +17602,7 @@
22210 for cf_header in $cf_header_list
22211 do
22212 	cat >conftest.$ac_ext <<_ACEOF
22213-#line 17597 "configure"
22214+#line 17605 "configure"
22215 #include "confdefs.h"
22216
22217 #include <${cf_cv_ncurses_header:-curses.h}>
22218@@ -17608,16 +17616,16 @@
22219 }
22220 _ACEOF
22221 rm -f conftest.$ac_objext
22222-if { (eval echo "$as_me:17611: \"$ac_compile\"") >&5
22223+if { (eval echo "$as_me:17619: \"$ac_compile\"") >&5
22224   (eval $ac_compile) 2>&5
22225   ac_status=$?
22226-  echo "$as_me:17614: \$? = $ac_status" >&5
22227+  echo "$as_me:17622: \$? = $ac_status" >&5
22228   (exit $ac_status); } &&
22229          { ac_try='test -s conftest.$ac_objext'
22230-  { (eval echo "$as_me:17617: \"$ac_try\"") >&5
22231+  { (eval echo "$as_me:17625: \"$ac_try\"") >&5
22232   (eval $ac_try) 2>&5
22233   ac_status=$?
22234-  echo "$as_me:17620: \$? = $ac_status" >&5
22235+  echo "$as_me:17628: \$? = $ac_status" >&5
22236   (exit $ac_status); }; }; then
22237   cf_cv_unctrl_header=$cf_header
22238 	 break
22239@@ -17630,12 +17638,12 @@
22240 done
22241
22242 fi
22243-echo "$as_me:17633: result: $cf_cv_unctrl_header" >&5
22244+echo "$as_me:17641: result: $cf_cv_unctrl_header" >&5
22245 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
22246
22247 case $cf_cv_unctrl_header in
22248 (no)
22249-	{ echo "$as_me:17638: WARNING: unctrl.h header not found" >&5
22250+	{ echo "$as_me:17646: WARNING: unctrl.h header not found" >&5
22251 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
22252 	;;
22253 esac
22254@@ -17724,10 +17732,10 @@
22255
22256 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
22257
22258-	echo "$as_me:17727: checking for ${cf_func}" >&5
22259+	echo "$as_me:17735: checking for ${cf_func}" >&5
22260 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
22261
22262-echo "${as_me:-configure}:17730: testing ${cf_func} ..." 1>&5
22263+echo "${as_me:-configure}:17738: testing ${cf_func} ..." 1>&5
22264
22265 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
22266   echo $ECHO_N "(cached) $ECHO_C" >&6
22267@@ -17736,7 +17744,7 @@
22268 		eval cf_result='$ac_cv_func_'$cf_func
22269 		if test ".$cf_result" != ".no"; then
22270 			cat >conftest.$ac_ext <<_ACEOF
22271-#line 17739 "configure"
22272+#line 17747 "configure"
22273 #include "confdefs.h"
22274
22275 #ifdef HAVE_XCURSES
22276@@ -17769,16 +17777,16 @@
22277 }
22278 _ACEOF
22279 rm -f conftest.$ac_objext conftest$ac_exeext
22280-if { (eval echo "$as_me:17772: \"$ac_link\"") >&5
22281+if { (eval echo "$as_me:17780: \"$ac_link\"") >&5
22282   (eval $ac_link) 2>&5
22283   ac_status=$?
22284-  echo "$as_me:17775: \$? = $ac_status" >&5
22285+  echo "$as_me:17783: \$? = $ac_status" >&5
22286   (exit $ac_status); } &&
22287          { ac_try='test -s conftest$ac_exeext'
22288-  { (eval echo "$as_me:17778: \"$ac_try\"") >&5
22289+  { (eval echo "$as_me:17786: \"$ac_try\"") >&5
22290   (eval $ac_try) 2>&5
22291   ac_status=$?
22292-  echo "$as_me:17781: \$? = $ac_status" >&5
22293+  echo "$as_me:17789: \$? = $ac_status" >&5
22294   (exit $ac_status); }; }; then
22295   cf_result=yes
22296 else
22297@@ -17794,7 +17802,7 @@
22298
22299 	# use the computed/retrieved cache-value:
22300 	eval 'cf_result=$cf_cv_func_'$cf_func
22301-	echo "$as_me:17797: result: $cf_result" >&5
22302+	echo "$as_me:17805: result: $cf_result" >&5
22303 echo "${ECHO_T}$cf_result" >&6
22304 	if test $cf_result != no; then
22305 		cat >>confdefs.h <<EOF
22306@@ -17809,10 +17817,10 @@
22307
22308 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
22309
22310-	echo "$as_me:17812: checking for ${cf_func}" >&5
22311+	echo "$as_me:17820: checking for ${cf_func}" >&5
22312 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
22313
22314-echo "${as_me:-configure}:17815: testing ${cf_func} ..." 1>&5
22315+echo "${as_me:-configure}:17823: testing ${cf_func} ..." 1>&5
22316
22317 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
22318   echo $ECHO_N "(cached) $ECHO_C" >&6
22319@@ -17821,7 +17829,7 @@
22320 		eval cf_result='$ac_cv_func_'$cf_func
22321 		if test ".$cf_result" != ".no"; then
22322 			cat >conftest.$ac_ext <<_ACEOF
22323-#line 17824 "configure"
22324+#line 17832 "configure"
22325 #include "confdefs.h"
22326
22327 #ifdef HAVE_XCURSES
22328@@ -17854,16 +17862,16 @@
22329 }
22330 _ACEOF
22331 rm -f conftest.$ac_objext conftest$ac_exeext
22332-if { (eval echo "$as_me:17857: \"$ac_link\"") >&5
22333+if { (eval echo "$as_me:17865: \"$ac_link\"") >&5
22334   (eval $ac_link) 2>&5
22335   ac_status=$?
22336-  echo "$as_me:17860: \$? = $ac_status" >&5
22337+  echo "$as_me:17868: \$? = $ac_status" >&5
22338   (exit $ac_status); } &&
22339          { ac_try='test -s conftest$ac_exeext'
22340-  { (eval echo "$as_me:17863: \"$ac_try\"") >&5
22341+  { (eval echo "$as_me:17871: \"$ac_try\"") >&5
22342   (eval $ac_try) 2>&5
22343   ac_status=$?
22344-  echo "$as_me:17866: \$? = $ac_status" >&5
22345+  echo "$as_me:17874: \$? = $ac_status" >&5
22346   (exit $ac_status); }; }; then
22347   cf_result=yes
22348 else
22349@@ -17879,7 +17887,7 @@
22350
22351 	# use the computed/retrieved cache-value:
22352 	eval 'cf_result=$cf_cv_func_'$cf_func
22353-	echo "$as_me:17882: result: $cf_result" >&5
22354+	echo "$as_me:17890: result: $cf_result" >&5
22355 echo "${ECHO_T}$cf_result" >&6
22356 	if test $cf_result != no; then
22357 		cat >>confdefs.h <<EOF
22358@@ -17903,7 +17911,7 @@
22359 				cf_return="return value"
22360 			fi
22361 			cat >conftest.$ac_ext <<_ACEOF
22362-#line 17906 "configure"
22363+#line 17914 "configure"
22364 #include "confdefs.h"
22365
22366 #include <${cf_cv_ncurses_header:-curses.h}>
22367@@ -17923,21 +17931,21 @@
22368 }
22369 _ACEOF
22370 rm -f conftest.$ac_objext
22371-if { (eval echo "$as_me:17926: \"$ac_compile\"") >&5
22372+if { (eval echo "$as_me:17934: \"$ac_compile\"") >&5
22373   (eval $ac_compile) 2>&5
22374   ac_status=$?
22375-  echo "$as_me:17929: \$? = $ac_status" >&5
22376+  echo "$as_me:17937: \$? = $ac_status" >&5
22377   (exit $ac_status); } &&
22378          { ac_try='test -s conftest.$ac_objext'
22379-  { (eval echo "$as_me:17932: \"$ac_try\"") >&5
22380+  { (eval echo "$as_me:17940: \"$ac_try\"") >&5
22381   (eval $ac_try) 2>&5
22382   ac_status=$?
22383-  echo "$as_me:17935: \$? = $ac_status" >&5
22384+  echo "$as_me:17943: \$? = $ac_status" >&5
22385   (exit $ac_status); }; }; then
22386
22387 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
22388
22389-echo "${as_me:-configure}:17940: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
22390+echo "${as_me:-configure}:17948: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
22391
22392 		cat >>confdefs.h <<EOF
22393 #define TPUTS_ARG               $cf_arg
22394@@ -17957,14 +17965,14 @@
22395 	done
22396 fi
22397
22398-echo "$as_me:17960: checking for ncurses extended functions" >&5
22399+echo "$as_me:17968: checking for ncurses extended functions" >&5
22400 echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
22401 if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
22402   echo $ECHO_N "(cached) $ECHO_C" >&6
22403 else
22404
22405 cat >conftest.$ac_ext <<_ACEOF
22406-#line 17967 "configure"
22407+#line 17975 "configure"
22408 #include "confdefs.h"
22409
22410 #include <${cf_cv_ncurses_header:-curses.h}>
22411@@ -17979,16 +17987,16 @@
22412 }
22413 _ACEOF
22414 rm -f conftest.$ac_objext
22415-if { (eval echo "$as_me:17982: \"$ac_compile\"") >&5
22416+if { (eval echo "$as_me:17990: \"$ac_compile\"") >&5
22417   (eval $ac_compile) 2>&5
22418   ac_status=$?
22419-  echo "$as_me:17985: \$? = $ac_status" >&5
22420+  echo "$as_me:17993: \$? = $ac_status" >&5
22421   (exit $ac_status); } &&
22422          { ac_try='test -s conftest.$ac_objext'
22423-  { (eval echo "$as_me:17988: \"$ac_try\"") >&5
22424+  { (eval echo "$as_me:17996: \"$ac_try\"") >&5
22425   (eval $ac_try) 2>&5
22426   ac_status=$?
22427-  echo "$as_me:17991: \$? = $ac_status" >&5
22428+  echo "$as_me:17999: \$? = $ac_status" >&5
22429   (exit $ac_status); }; }; then
22430   cf_cv_ncurses_ext_funcs=defined
22431 else
22432@@ -17996,7 +18004,7 @@
22433 cat conftest.$ac_ext >&5
22434
22435 cat >conftest.$ac_ext <<_ACEOF
22436-#line 17999 "configure"
22437+#line 18007 "configure"
22438 #include "confdefs.h"
22439
22440 #include <${cf_cv_ncurses_header:-curses.h}>
22441@@ -18021,16 +18029,16 @@
22442 }
22443 _ACEOF
22444 rm -f conftest.$ac_objext conftest$ac_exeext
22445-if { (eval echo "$as_me:18024: \"$ac_link\"") >&5
22446+if { (eval echo "$as_me:18032: \"$ac_link\"") >&5
22447   (eval $ac_link) 2>&5
22448   ac_status=$?
22449-  echo "$as_me:18027: \$? = $ac_status" >&5
22450+  echo "$as_me:18035: \$? = $ac_status" >&5
22451   (exit $ac_status); } &&
22452          { ac_try='test -s conftest$ac_exeext'
22453-  { (eval echo "$as_me:18030: \"$ac_try\"") >&5
22454+  { (eval echo "$as_me:18038: \"$ac_try\"") >&5
22455   (eval $ac_try) 2>&5
22456   ac_status=$?
22457-  echo "$as_me:18033: \$? = $ac_status" >&5
22458+  echo "$as_me:18041: \$? = $ac_status" >&5
22459   (exit $ac_status); }; }; then
22460   cf_cv_ncurses_ext_funcs=yes
22461 else
22462@@ -18044,7 +18052,7 @@
22463 rm -f conftest.$ac_objext conftest.$ac_ext
22464
22465 fi
22466-echo "$as_me:18047: result: $cf_cv_ncurses_ext_funcs" >&5
22467+echo "$as_me:18055: result: $cf_cv_ncurses_ext_funcs" >&5
22468 echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
22469 test "$cf_cv_ncurses_ext_funcs" = yes &&
22470 cat >>confdefs.h <<\EOF
22471@@ -18058,11 +18066,11 @@
22472 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
22473 	then
22474 		cf_define_xpg5=no
22475-		echo "$as_me:18061: checking if _XPG5 should be defined to enable wide-characters" >&5
22476+		echo "$as_me:18069: checking if _XPG5 should be defined to enable wide-characters" >&5
22477 echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
22478
22479 		cat >conftest.$ac_ext <<_ACEOF
22480-#line 18065 "configure"
22481+#line 18073 "configure"
22482 #include "confdefs.h"
22483
22484 #include <${cf_cv_ncurses_header:-curses.h}>
22485@@ -18075,16 +18083,16 @@
22486 }
22487 _ACEOF
22488 rm -f conftest.$ac_objext
22489-if { (eval echo "$as_me:18078: \"$ac_compile\"") >&5
22490+if { (eval echo "$as_me:18086: \"$ac_compile\"") >&5
22491   (eval $ac_compile) 2>&5
22492   ac_status=$?
22493-  echo "$as_me:18081: \$? = $ac_status" >&5
22494+  echo "$as_me:18089: \$? = $ac_status" >&5
22495   (exit $ac_status); } &&
22496          { ac_try='test -s conftest.$ac_objext'
22497-  { (eval echo "$as_me:18084: \"$ac_try\"") >&5
22498+  { (eval echo "$as_me:18092: \"$ac_try\"") >&5
22499   (eval $ac_try) 2>&5
22500   ac_status=$?
22501-  echo "$as_me:18087: \$? = $ac_status" >&5
22502+  echo "$as_me:18095: \$? = $ac_status" >&5
22503   (exit $ac_status); }; }; then
22504   :
22505 else
22506@@ -18093,7 +18101,7 @@
22507 cf_save_cppflags="$CPPFLAGS"
22508 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
22509 			 cat >conftest.$ac_ext <<_ACEOF
22510-#line 18096 "configure"
22511+#line 18104 "configure"
22512 #include "confdefs.h"
22513
22514 #include <${cf_cv_ncurses_header:-curses.h}>
22515@@ -18106,16 +18114,16 @@
22516 }
22517 _ACEOF
22518 rm -f conftest.$ac_objext
22519-if { (eval echo "$as_me:18109: \"$ac_compile\"") >&5
22520+if { (eval echo "$as_me:18117: \"$ac_compile\"") >&5
22521   (eval $ac_compile) 2>&5
22522   ac_status=$?
22523-  echo "$as_me:18112: \$? = $ac_status" >&5
22524+  echo "$as_me:18120: \$? = $ac_status" >&5
22525   (exit $ac_status); } &&
22526          { ac_try='test -s conftest.$ac_objext'
22527-  { (eval echo "$as_me:18115: \"$ac_try\"") >&5
22528+  { (eval echo "$as_me:18123: \"$ac_try\"") >&5
22529   (eval $ac_try) 2>&5
22530   ac_status=$?
22531-  echo "$as_me:18118: \$? = $ac_status" >&5
22532+  echo "$as_me:18126: \$? = $ac_status" >&5
22533   (exit $ac_status); }; }; then
22534   cf_define_xpg5=yes
22535 else
22536@@ -18126,7 +18134,7 @@
22537 			 CPPFLAGS="$cf_save_cppflags"
22538 fi
22539 rm -f conftest.$ac_objext conftest.$ac_ext
22540-		echo "$as_me:18129: result: $cf_define_xpg5" >&5
22541+		echo "$as_me:18137: result: $cf_define_xpg5" >&5
22542 echo "${ECHO_T}$cf_define_xpg5" >&6
22543
22544 		if test "$cf_define_xpg5" = yes
22545@@ -18135,14 +18143,14 @@
22546 		fi
22547 	fi
22548
22549-	echo "$as_me:18138: checking for wide-character functions" >&5
22550+	echo "$as_me:18146: checking for wide-character functions" >&5
22551 echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
22552 if test "${cf_cv_widechar_funcs+set}" = set; then
22553   echo $ECHO_N "(cached) $ECHO_C" >&6
22554 else
22555
22556 	cat >conftest.$ac_ext <<_ACEOF
22557-#line 18145 "configure"
22558+#line 18153 "configure"
22559 #include "confdefs.h"
22560
22561 #include <${cf_cv_ncurses_header:-curses.h}>
22562@@ -18159,16 +18167,16 @@
22563 }
22564 _ACEOF
22565 rm -f conftest.$ac_objext conftest$ac_exeext
22566-if { (eval echo "$as_me:18162: \"$ac_link\"") >&5
22567+if { (eval echo "$as_me:18170: \"$ac_link\"") >&5
22568   (eval $ac_link) 2>&5
22569   ac_status=$?
22570-  echo "$as_me:18165: \$? = $ac_status" >&5
22571+  echo "$as_me:18173: \$? = $ac_status" >&5
22572   (exit $ac_status); } &&
22573          { ac_try='test -s conftest$ac_exeext'
22574-  { (eval echo "$as_me:18168: \"$ac_try\"") >&5
22575+  { (eval echo "$as_me:18176: \"$ac_try\"") >&5
22576   (eval $ac_try) 2>&5
22577   ac_status=$?
22578-  echo "$as_me:18171: \$? = $ac_status" >&5
22579+  echo "$as_me:18179: \$? = $ac_status" >&5
22580   (exit $ac_status); }; }; then
22581   cf_cv_widechar_funcs=yes
22582 else
22583@@ -18179,7 +18187,7 @@
22584 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
22585
22586 fi
22587-echo "$as_me:18182: result: $cf_cv_widechar_funcs" >&5
22588+echo "$as_me:18190: result: $cf_cv_widechar_funcs" >&5
22589 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
22590 	if test "$cf_cv_widechar_funcs" != no ; then
22591
22592@@ -18200,14 +18208,14 @@
22593
22594 fi
22595
22596-echo "$as_me:18203: checking if $cf_cv_screen library uses pthreads" >&5
22597+echo "$as_me:18211: checking if $cf_cv_screen library uses pthreads" >&5
22598 echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
22599 if test "${cf_cv_use_pthreads+set}" = set; then
22600   echo $ECHO_N "(cached) $ECHO_C" >&6
22601 else
22602
22603 cat >conftest.$ac_ext <<_ACEOF
22604-#line 18210 "configure"
22605+#line 18218 "configure"
22606 #include "confdefs.h"
22607
22608 #include <${cf_cv_ncurses_header:-curses.h}>
22609@@ -18225,16 +18233,16 @@
22610 }
22611 _ACEOF
22612 rm -f conftest.$ac_objext conftest$ac_exeext
22613-if { (eval echo "$as_me:18228: \"$ac_link\"") >&5
22614+if { (eval echo "$as_me:18236: \"$ac_link\"") >&5
22615   (eval $ac_link) 2>&5
22616   ac_status=$?
22617-  echo "$as_me:18231: \$? = $ac_status" >&5
22618+  echo "$as_me:18239: \$? = $ac_status" >&5
22619   (exit $ac_status); } &&
22620          { ac_try='test -s conftest$ac_exeext'
22621-  { (eval echo "$as_me:18234: \"$ac_try\"") >&5
22622+  { (eval echo "$as_me:18242: \"$ac_try\"") >&5
22623   (eval $ac_try) 2>&5
22624   ac_status=$?
22625-  echo "$as_me:18237: \$? = $ac_status" >&5
22626+  echo "$as_me:18245: \$? = $ac_status" >&5
22627   (exit $ac_status); }; }; then
22628   cf_cv_use_pthreads=yes
22629 else
22630@@ -18245,20 +18253,21 @@
22631 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
22632
22633 fi
22634-echo "$as_me:18248: result: $cf_cv_use_pthreads" >&5
22635+echo "$as_me:18256: result: $cf_cv_use_pthreads" >&5
22636 echo "${ECHO_T}$cf_cv_use_pthreads" >&6
22637-test $cf_cv_use_pthreads = yes && cat >>confdefs.h <<\EOF
22638+test $cf_cv_use_pthreads = yes &&
22639+cat >>confdefs.h <<\EOF
22640 #define USE_PTHREADS 1
22641 EOF
22642
22643-echo "$as_me:18254: checking if sys/time.h works with sys/select.h" >&5
22644+echo "$as_me:18263: checking if sys/time.h works with sys/select.h" >&5
22645 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
22646 if test "${cf_cv_sys_time_select+set}" = set; then
22647   echo $ECHO_N "(cached) $ECHO_C" >&6
22648 else
22649
22650 cat >conftest.$ac_ext <<_ACEOF
22651-#line 18261 "configure"
22652+#line 18270 "configure"
22653 #include "confdefs.h"
22654
22655 #include <sys/types.h>
22656@@ -18278,16 +18287,16 @@
22657 }
22658 _ACEOF
22659 rm -f conftest.$ac_objext
22660-if { (eval echo "$as_me:18281: \"$ac_compile\"") >&5
22661+if { (eval echo "$as_me:18290: \"$ac_compile\"") >&5
22662   (eval $ac_compile) 2>&5
22663   ac_status=$?
22664-  echo "$as_me:18284: \$? = $ac_status" >&5
22665+  echo "$as_me:18293: \$? = $ac_status" >&5
22666   (exit $ac_status); } &&
22667          { ac_try='test -s conftest.$ac_objext'
22668-  { (eval echo "$as_me:18287: \"$ac_try\"") >&5
22669+  { (eval echo "$as_me:18296: \"$ac_try\"") >&5
22670   (eval $ac_try) 2>&5
22671   ac_status=$?
22672-  echo "$as_me:18290: \$? = $ac_status" >&5
22673+  echo "$as_me:18299: \$? = $ac_status" >&5
22674   (exit $ac_status); }; }; then
22675   cf_cv_sys_time_select=yes
22676 else
22677@@ -18299,7 +18308,7 @@
22678
22679 fi
22680
22681-echo "$as_me:18302: result: $cf_cv_sys_time_select" >&5
22682+echo "$as_me:18311: result: $cf_cv_sys_time_select" >&5
22683 echo "${ECHO_T}$cf_cv_sys_time_select" >&6
22684 test "$cf_cv_sys_time_select" = yes &&
22685 cat >>confdefs.h <<\EOF
22686@@ -18308,7 +18317,7 @@
22687
22688 # special check for test/ditto.c
22689
22690-echo "$as_me:18311: checking for openpty in -lutil" >&5
22691+echo "$as_me:18320: checking for openpty in -lutil" >&5
22692 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
22693 if test "${ac_cv_lib_util_openpty+set}" = set; then
22694   echo $ECHO_N "(cached) $ECHO_C" >&6
22695@@ -18316,7 +18325,7 @@
22696   ac_check_lib_save_LIBS=$LIBS
22697 LIBS="-lutil  $LIBS"
22698 cat >conftest.$ac_ext <<_ACEOF
22699-#line 18319 "configure"
22700+#line 18328 "configure"
22701 #include "confdefs.h"
22702
22703 /* Override any gcc2 internal prototype to avoid an error.  */
22704@@ -18335,16 +18344,16 @@
22705 }
22706 _ACEOF
22707 rm -f conftest.$ac_objext conftest$ac_exeext
22708-if { (eval echo "$as_me:18338: \"$ac_link\"") >&5
22709+if { (eval echo "$as_me:18347: \"$ac_link\"") >&5
22710   (eval $ac_link) 2>&5
22711   ac_status=$?
22712-  echo "$as_me:18341: \$? = $ac_status" >&5
22713+  echo "$as_me:18350: \$? = $ac_status" >&5
22714   (exit $ac_status); } &&
22715          { ac_try='test -s conftest$ac_exeext'
22716-  { (eval echo "$as_me:18344: \"$ac_try\"") >&5
22717+  { (eval echo "$as_me:18353: \"$ac_try\"") >&5
22718   (eval $ac_try) 2>&5
22719   ac_status=$?
22720-  echo "$as_me:18347: \$? = $ac_status" >&5
22721+  echo "$as_me:18356: \$? = $ac_status" >&5
22722   (exit $ac_status); }; }; then
22723   ac_cv_lib_util_openpty=yes
22724 else
22725@@ -18355,7 +18364,7 @@
22726 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
22727 LIBS=$ac_check_lib_save_LIBS
22728 fi
22729-echo "$as_me:18358: result: $ac_cv_lib_util_openpty" >&5
22730+echo "$as_me:18367: result: $ac_cv_lib_util_openpty" >&5
22731 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
22732 if test $ac_cv_lib_util_openpty = yes; then
22733   cf_cv_lib_util=yes
22734@@ -18363,7 +18372,7 @@
22735   cf_cv_lib_util=no
22736 fi
22737
22738-echo "$as_me:18366: checking for openpty header" >&5
22739+echo "$as_me:18375: checking for openpty header" >&5
22740 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
22741 if test "${cf_cv_func_openpty+set}" = set; then
22742   echo $ECHO_N "(cached) $ECHO_C" >&6
22743@@ -18390,7 +18399,7 @@
22744 	for cf_header in pty.h libutil.h util.h
22745 	do
22746 	cat >conftest.$ac_ext <<_ACEOF
22747-#line 18393 "configure"
22748+#line 18402 "configure"
22749 #include "confdefs.h"
22750
22751 #include <$cf_header>
22752@@ -18407,16 +18416,16 @@
22753 }
22754 _ACEOF
22755 rm -f conftest.$ac_objext conftest$ac_exeext
22756-if { (eval echo "$as_me:18410: \"$ac_link\"") >&5
22757+if { (eval echo "$as_me:18419: \"$ac_link\"") >&5
22758   (eval $ac_link) 2>&5
22759   ac_status=$?
22760-  echo "$as_me:18413: \$? = $ac_status" >&5
22761+  echo "$as_me:18422: \$? = $ac_status" >&5
22762   (exit $ac_status); } &&
22763          { ac_try='test -s conftest$ac_exeext'
22764-  { (eval echo "$as_me:18416: \"$ac_try\"") >&5
22765+  { (eval echo "$as_me:18425: \"$ac_try\"") >&5
22766   (eval $ac_try) 2>&5
22767   ac_status=$?
22768-  echo "$as_me:18419: \$? = $ac_status" >&5
22769+  echo "$as_me:18428: \$? = $ac_status" >&5
22770   (exit $ac_status); }; }; then
22771
22772 		cf_cv_func_openpty=$cf_header
22773@@ -18434,7 +18443,7 @@
22774 	LIBS="$cf_save_LIBS"
22775
22776 fi
22777-echo "$as_me:18437: result: $cf_cv_func_openpty" >&5
22778+echo "$as_me:18446: result: $cf_cv_func_openpty" >&5
22779 echo "${ECHO_T}$cf_cv_func_openpty" >&6
22780
22781 if test "$cf_cv_func_openpty" != no ; then
22782@@ -18468,7 +18477,7 @@
22783 	fi
22784 fi
22785
22786-echo "$as_me:18471: checking for function curses_version" >&5
22787+echo "$as_me:18480: checking for function curses_version" >&5
22788 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
22789 if test "${cf_cv_func_curses_version+set}" = set; then
22790   echo $ECHO_N "(cached) $ECHO_C" >&6
22791@@ -18478,7 +18487,7 @@
22792   cf_cv_func_curses_version=unknown
22793 else
22794   cat >conftest.$ac_ext <<_ACEOF
22795-#line 18481 "configure"
22796+#line 18490 "configure"
22797 #include "confdefs.h"
22798
22799 #include <${cf_cv_ncurses_header:-curses.h}>
22800@@ -18491,15 +18500,15 @@
22801
22802 _ACEOF
22803 rm -f conftest$ac_exeext
22804-if { (eval echo "$as_me:18494: \"$ac_link\"") >&5
22805+if { (eval echo "$as_me:18503: \"$ac_link\"") >&5
22806   (eval $ac_link) 2>&5
22807   ac_status=$?
22808-  echo "$as_me:18497: \$? = $ac_status" >&5
22809+  echo "$as_me:18506: \$? = $ac_status" >&5
22810   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
22811-  { (eval echo "$as_me:18499: \"$ac_try\"") >&5
22812+  { (eval echo "$as_me:18508: \"$ac_try\"") >&5
22813   (eval $ac_try) 2>&5
22814   ac_status=$?
22815-  echo "$as_me:18502: \$? = $ac_status" >&5
22816+  echo "$as_me:18511: \$? = $ac_status" >&5
22817   (exit $ac_status); }; }; then
22818   cf_cv_func_curses_version=yes
22819
22820@@ -18514,14 +18523,14 @@
22821 fi
22822 rm -f core
22823 fi
22824-echo "$as_me:18517: result: $cf_cv_func_curses_version" >&5
22825+echo "$as_me:18526: result: $cf_cv_func_curses_version" >&5
22826 echo "${ECHO_T}$cf_cv_func_curses_version" >&6
22827 test "$cf_cv_func_curses_version" = yes &&
22828 cat >>confdefs.h <<\EOF
22829 #define HAVE_CURSES_VERSION 1
22830 EOF
22831
22832-echo "$as_me:18524: checking for alternate character set array" >&5
22833+echo "$as_me:18533: checking for alternate character set array" >&5
22834 echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
22835 if test "${cf_cv_curses_acs_map+set}" = set; then
22836   echo $ECHO_N "(cached) $ECHO_C" >&6
22837@@ -18531,7 +18540,7 @@
22838 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
22839 do
22840 cat >conftest.$ac_ext <<_ACEOF
22841-#line 18534 "configure"
22842+#line 18543 "configure"
22843 #include "confdefs.h"
22844
22845 #include <${cf_cv_ncurses_header:-curses.h}>
22846@@ -18547,16 +18556,16 @@
22847 }
22848 _ACEOF
22849 rm -f conftest.$ac_objext conftest$ac_exeext
22850-if { (eval echo "$as_me:18550: \"$ac_link\"") >&5
22851+if { (eval echo "$as_me:18559: \"$ac_link\"") >&5
22852   (eval $ac_link) 2>&5
22853   ac_status=$?
22854-  echo "$as_me:18553: \$? = $ac_status" >&5
22855+  echo "$as_me:18562: \$? = $ac_status" >&5
22856   (exit $ac_status); } &&
22857          { ac_try='test -s conftest$ac_exeext'
22858-  { (eval echo "$as_me:18556: \"$ac_try\"") >&5
22859+  { (eval echo "$as_me:18565: \"$ac_try\"") >&5
22860   (eval $ac_try) 2>&5
22861   ac_status=$?
22862-  echo "$as_me:18559: \$? = $ac_status" >&5
22863+  echo "$as_me:18568: \$? = $ac_status" >&5
22864   (exit $ac_status); }; }; then
22865   cf_cv_curses_acs_map=$name; break
22866 else
22867@@ -18567,7 +18576,7 @@
22868 done
22869
22870 fi
22871-echo "$as_me:18570: result: $cf_cv_curses_acs_map" >&5
22872+echo "$as_me:18579: result: $cf_cv_curses_acs_map" >&5
22873 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
22874
22875 test "$cf_cv_curses_acs_map" != unknown &&
22876@@ -18577,7 +18586,7 @@
22877
22878 if test "$cf_enable_widec" = yes; then
22879
22880-echo "$as_me:18580: checking for wide alternate character set array" >&5
22881+echo "$as_me:18589: checking for wide alternate character set array" >&5
22882 echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
22883 if test "${cf_cv_curses_wacs_map+set}" = set; then
22884   echo $ECHO_N "(cached) $ECHO_C" >&6
22885@@ -18587,7 +18596,7 @@
22886 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
22887 	do
22888 	cat >conftest.$ac_ext <<_ACEOF
22889-#line 18590 "configure"
22890+#line 18599 "configure"
22891 #include "confdefs.h"
22892
22893 #ifndef _XOPEN_SOURCE_EXTENDED
22894@@ -18603,16 +18612,16 @@
22895 }
22896 _ACEOF
22897 rm -f conftest.$ac_objext conftest$ac_exeext
22898-if { (eval echo "$as_me:18606: \"$ac_link\"") >&5
22899+if { (eval echo "$as_me:18615: \"$ac_link\"") >&5
22900   (eval $ac_link) 2>&5
22901   ac_status=$?
22902-  echo "$as_me:18609: \$? = $ac_status" >&5
22903+  echo "$as_me:18618: \$? = $ac_status" >&5
22904   (exit $ac_status); } &&
22905          { ac_try='test -s conftest$ac_exeext'
22906-  { (eval echo "$as_me:18612: \"$ac_try\"") >&5
22907+  { (eval echo "$as_me:18621: \"$ac_try\"") >&5
22908   (eval $ac_try) 2>&5
22909   ac_status=$?
22910-  echo "$as_me:18615: \$? = $ac_status" >&5
22911+  echo "$as_me:18624: \$? = $ac_status" >&5
22912   (exit $ac_status); }; }; then
22913   cf_cv_curses_wacs_map=$name
22914 	 break
22915@@ -18623,7 +18632,7 @@
22916 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
22917 	done
22918 fi
22919-echo "$as_me:18626: result: $cf_cv_curses_wacs_map" >&5
22920+echo "$as_me:18635: result: $cf_cv_curses_wacs_map" >&5
22921 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
22922
22923 test "$cf_cv_curses_wacs_map" != unknown &&
22924@@ -18631,7 +18640,7 @@
22925 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
22926 EOF
22927
22928-echo "$as_me:18634: checking for wide alternate character constants" >&5
22929+echo "$as_me:18643: checking for wide alternate character constants" >&5
22930 echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
22931 if test "${cf_cv_curses_wacs_symbols+set}" = set; then
22932   echo $ECHO_N "(cached) $ECHO_C" >&6
22933@@ -18641,7 +18650,7 @@
22934 if test "$cf_cv_curses_wacs_map" != unknown
22935 then
22936 	cat >conftest.$ac_ext <<_ACEOF
22937-#line 18644 "configure"
22938+#line 18653 "configure"
22939 #include "confdefs.h"
22940
22941 #ifndef _XOPEN_SOURCE_EXTENDED
22942@@ -18658,16 +18667,16 @@
22943 }
22944 _ACEOF
22945 rm -f conftest.$ac_objext conftest$ac_exeext
22946-if { (eval echo "$as_me:18661: \"$ac_link\"") >&5
22947+if { (eval echo "$as_me:18670: \"$ac_link\"") >&5
22948   (eval $ac_link) 2>&5
22949   ac_status=$?
22950-  echo "$as_me:18664: \$? = $ac_status" >&5
22951+  echo "$as_me:18673: \$? = $ac_status" >&5
22952   (exit $ac_status); } &&
22953          { ac_try='test -s conftest$ac_exeext'
22954-  { (eval echo "$as_me:18667: \"$ac_try\"") >&5
22955+  { (eval echo "$as_me:18676: \"$ac_try\"") >&5
22956   (eval $ac_try) 2>&5
22957   ac_status=$?
22958-  echo "$as_me:18670: \$? = $ac_status" >&5
22959+  echo "$as_me:18679: \$? = $ac_status" >&5
22960   (exit $ac_status); }; }; then
22961   cf_cv_curses_wacs_symbols=yes
22962 else
22963@@ -18677,7 +18686,7 @@
22964 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
22965 else
22966 	cat >conftest.$ac_ext <<_ACEOF
22967-#line 18680 "configure"
22968+#line 18689 "configure"
22969 #include "confdefs.h"
22970
22971 #ifndef _XOPEN_SOURCE_EXTENDED
22972@@ -18693,16 +18702,16 @@
22973 }
22974 _ACEOF
22975 rm -f conftest.$ac_objext conftest$ac_exeext
22976-if { (eval echo "$as_me:18696: \"$ac_link\"") >&5
22977+if { (eval echo "$as_me:18705: \"$ac_link\"") >&5
22978   (eval $ac_link) 2>&5
22979   ac_status=$?
22980-  echo "$as_me:18699: \$? = $ac_status" >&5
22981+  echo "$as_me:18708: \$? = $ac_status" >&5
22982   (exit $ac_status); } &&
22983          { ac_try='test -s conftest$ac_exeext'
22984-  { (eval echo "$as_me:18702: \"$ac_try\"") >&5
22985+  { (eval echo "$as_me:18711: \"$ac_try\"") >&5
22986   (eval $ac_try) 2>&5
22987   ac_status=$?
22988-  echo "$as_me:18705: \$? = $ac_status" >&5
22989+  echo "$as_me:18714: \$? = $ac_status" >&5
22990   (exit $ac_status); }; }; then
22991   cf_cv_curses_wacs_symbols=yes
22992 else
22993@@ -18713,7 +18722,7 @@
22994 fi
22995
22996 fi
22997-echo "$as_me:18716: result: $cf_cv_curses_wacs_symbols" >&5
22998+echo "$as_me:18725: result: $cf_cv_curses_wacs_symbols" >&5
22999 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
23000
23001 test "$cf_cv_curses_wacs_symbols" != no &&
23002@@ -18723,10 +18732,10 @@
23003
23004 fi
23005
23006-echo "$as_me:18726: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
23007+echo "$as_me:18735: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
23008 echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
23009 cat >conftest.$ac_ext <<_ACEOF
23010-#line 18729 "configure"
23011+#line 18738 "configure"
23012 #include "confdefs.h"
23013
23014 #ifndef _XOPEN_SOURCE_EXTENDED
23015@@ -18744,16 +18753,16 @@
23016 }
23017 _ACEOF
23018 rm -f conftest.$ac_objext
23019-if { (eval echo "$as_me:18747: \"$ac_compile\"") >&5
23020+if { (eval echo "$as_me:18756: \"$ac_compile\"") >&5
23021   (eval $ac_compile) 2>&5
23022   ac_status=$?
23023-  echo "$as_me:18750: \$? = $ac_status" >&5
23024+  echo "$as_me:18759: \$? = $ac_status" >&5
23025   (exit $ac_status); } &&
23026          { ac_try='test -s conftest.$ac_objext'
23027-  { (eval echo "$as_me:18753: \"$ac_try\"") >&5
23028+  { (eval echo "$as_me:18762: \"$ac_try\"") >&5
23029   (eval $ac_try) 2>&5
23030   ac_status=$?
23031-  echo "$as_me:18756: \$? = $ac_status" >&5
23032+  echo "$as_me:18765: \$? = $ac_status" >&5
23033   (exit $ac_status); }; }; then
23034   cf_result=yes
23035 else
23036@@ -18762,7 +18771,7 @@
23037 cf_result=no
23038 fi
23039 rm -f conftest.$ac_objext conftest.$ac_ext
23040-echo "$as_me:18765: result: $cf_result" >&5
23041+echo "$as_me:18774: result: $cf_result" >&5
23042 echo "${ECHO_T}$cf_result" >&6
23043 if test $cf_result = yes ; then
23044
23045@@ -18783,14 +18792,14 @@
23046 if test "$cf_enable_widec" = yes; then
23047
23048 # This is needed on Tru64 5.0 to declare mbstate_t
23049-echo "$as_me:18786: checking if we must include wchar.h to declare mbstate_t" >&5
23050+echo "$as_me:18795: checking if we must include wchar.h to declare mbstate_t" >&5
23051 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
23052 if test "${cf_cv_mbstate_t+set}" = set; then
23053   echo $ECHO_N "(cached) $ECHO_C" >&6
23054 else
23055
23056 cat >conftest.$ac_ext <<_ACEOF
23057-#line 18793 "configure"
23058+#line 18802 "configure"
23059 #include "confdefs.h"
23060
23061 #include <stdlib.h>
23062@@ -18808,23 +18817,23 @@
23063 }
23064 _ACEOF
23065 rm -f conftest.$ac_objext
23066-if { (eval echo "$as_me:18811: \"$ac_compile\"") >&5
23067+if { (eval echo "$as_me:18820: \"$ac_compile\"") >&5
23068   (eval $ac_compile) 2>&5
23069   ac_status=$?
23070-  echo "$as_me:18814: \$? = $ac_status" >&5
23071+  echo "$as_me:18823: \$? = $ac_status" >&5
23072   (exit $ac_status); } &&
23073          { ac_try='test -s conftest.$ac_objext'
23074-  { (eval echo "$as_me:18817: \"$ac_try\"") >&5
23075+  { (eval echo "$as_me:18826: \"$ac_try\"") >&5
23076   (eval $ac_try) 2>&5
23077   ac_status=$?
23078-  echo "$as_me:18820: \$? = $ac_status" >&5
23079+  echo "$as_me:18829: \$? = $ac_status" >&5
23080   (exit $ac_status); }; }; then
23081   cf_cv_mbstate_t=no
23082 else
23083   echo "$as_me: failed program was:" >&5
23084 cat conftest.$ac_ext >&5
23085 cat >conftest.$ac_ext <<_ACEOF
23086-#line 18827 "configure"
23087+#line 18836 "configure"
23088 #include "confdefs.h"
23089
23090 #include <stdlib.h>
23091@@ -18843,16 +18852,16 @@
23092 }
23093 _ACEOF
23094 rm -f conftest.$ac_objext
23095-if { (eval echo "$as_me:18846: \"$ac_compile\"") >&5
23096+if { (eval echo "$as_me:18855: \"$ac_compile\"") >&5
23097   (eval $ac_compile) 2>&5
23098   ac_status=$?
23099-  echo "$as_me:18849: \$? = $ac_status" >&5
23100+  echo "$as_me:18858: \$? = $ac_status" >&5
23101   (exit $ac_status); } &&
23102          { ac_try='test -s conftest.$ac_objext'
23103-  { (eval echo "$as_me:18852: \"$ac_try\"") >&5
23104+  { (eval echo "$as_me:18861: \"$ac_try\"") >&5
23105   (eval $ac_try) 2>&5
23106   ac_status=$?
23107-  echo "$as_me:18855: \$? = $ac_status" >&5
23108+  echo "$as_me:18864: \$? = $ac_status" >&5
23109   (exit $ac_status); }; }; then
23110   cf_cv_mbstate_t=yes
23111 else
23112@@ -18864,7 +18873,7 @@
23113 fi
23114 rm -f conftest.$ac_objext conftest.$ac_ext
23115 fi
23116-echo "$as_me:18867: result: $cf_cv_mbstate_t" >&5
23117+echo "$as_me:18876: result: $cf_cv_mbstate_t" >&5
23118 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
23119
23120 if test "$cf_cv_mbstate_t" = yes ; then
23121@@ -18887,14 +18896,14 @@
23122 fi
23123
23124 # This is needed on Tru64 5.0 to declare wchar_t
23125-echo "$as_me:18890: checking if we must include wchar.h to declare wchar_t" >&5
23126+echo "$as_me:18899: checking if we must include wchar.h to declare wchar_t" >&5
23127 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
23128 if test "${cf_cv_wchar_t+set}" = set; then
23129   echo $ECHO_N "(cached) $ECHO_C" >&6
23130 else
23131
23132 cat >conftest.$ac_ext <<_ACEOF
23133-#line 18897 "configure"
23134+#line 18906 "configure"
23135 #include "confdefs.h"
23136
23137 #include <stdlib.h>
23138@@ -18912,23 +18921,23 @@
23139 }
23140 _ACEOF
23141 rm -f conftest.$ac_objext
23142-if { (eval echo "$as_me:18915: \"$ac_compile\"") >&5
23143+if { (eval echo "$as_me:18924: \"$ac_compile\"") >&5
23144   (eval $ac_compile) 2>&5
23145   ac_status=$?
23146-  echo "$as_me:18918: \$? = $ac_status" >&5
23147+  echo "$as_me:18927: \$? = $ac_status" >&5
23148   (exit $ac_status); } &&
23149          { ac_try='test -s conftest.$ac_objext'
23150-  { (eval echo "$as_me:18921: \"$ac_try\"") >&5
23151+  { (eval echo "$as_me:18930: \"$ac_try\"") >&5
23152   (eval $ac_try) 2>&5
23153   ac_status=$?
23154-  echo "$as_me:18924: \$? = $ac_status" >&5
23155+  echo "$as_me:18933: \$? = $ac_status" >&5
23156   (exit $ac_status); }; }; then
23157   cf_cv_wchar_t=no
23158 else
23159   echo "$as_me: failed program was:" >&5
23160 cat conftest.$ac_ext >&5
23161 cat >conftest.$ac_ext <<_ACEOF
23162-#line 18931 "configure"
23163+#line 18940 "configure"
23164 #include "confdefs.h"
23165
23166 #include <stdlib.h>
23167@@ -18947,16 +18956,16 @@
23168 }
23169 _ACEOF
23170 rm -f conftest.$ac_objext
23171-if { (eval echo "$as_me:18950: \"$ac_compile\"") >&5
23172+if { (eval echo "$as_me:18959: \"$ac_compile\"") >&5
23173   (eval $ac_compile) 2>&5
23174   ac_status=$?
23175-  echo "$as_me:18953: \$? = $ac_status" >&5
23176+  echo "$as_me:18962: \$? = $ac_status" >&5
23177   (exit $ac_status); } &&
23178          { ac_try='test -s conftest.$ac_objext'
23179-  { (eval echo "$as_me:18956: \"$ac_try\"") >&5
23180+  { (eval echo "$as_me:18965: \"$ac_try\"") >&5
23181   (eval $ac_try) 2>&5
23182   ac_status=$?
23183-  echo "$as_me:18959: \$? = $ac_status" >&5
23184+  echo "$as_me:18968: \$? = $ac_status" >&5
23185   (exit $ac_status); }; }; then
23186   cf_cv_wchar_t=yes
23187 else
23188@@ -18968,7 +18977,7 @@
23189 fi
23190 rm -f conftest.$ac_objext conftest.$ac_ext
23191 fi
23192-echo "$as_me:18971: result: $cf_cv_wchar_t" >&5
23193+echo "$as_me:18980: result: $cf_cv_wchar_t" >&5
23194 echo "${ECHO_T}$cf_cv_wchar_t" >&6
23195
23196 if test "$cf_cv_wchar_t" = yes ; then
23197@@ -18991,14 +19000,14 @@
23198 fi
23199
23200 # This is needed on Tru64 5.0 to declare wint_t
23201-echo "$as_me:18994: checking if we must include wchar.h to declare wint_t" >&5
23202+echo "$as_me:19003: checking if we must include wchar.h to declare wint_t" >&5
23203 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
23204 if test "${cf_cv_wint_t+set}" = set; then
23205   echo $ECHO_N "(cached) $ECHO_C" >&6
23206 else
23207
23208 cat >conftest.$ac_ext <<_ACEOF
23209-#line 19001 "configure"
23210+#line 19010 "configure"
23211 #include "confdefs.h"
23212
23213 #include <stdlib.h>
23214@@ -19016,23 +19025,23 @@
23215 }
23216 _ACEOF
23217 rm -f conftest.$ac_objext
23218-if { (eval echo "$as_me:19019: \"$ac_compile\"") >&5
23219+if { (eval echo "$as_me:19028: \"$ac_compile\"") >&5
23220   (eval $ac_compile) 2>&5
23221   ac_status=$?
23222-  echo "$as_me:19022: \$? = $ac_status" >&5
23223+  echo "$as_me:19031: \$? = $ac_status" >&5
23224   (exit $ac_status); } &&
23225          { ac_try='test -s conftest.$ac_objext'
23226-  { (eval echo "$as_me:19025: \"$ac_try\"") >&5
23227+  { (eval echo "$as_me:19034: \"$ac_try\"") >&5
23228   (eval $ac_try) 2>&5
23229   ac_status=$?
23230-  echo "$as_me:19028: \$? = $ac_status" >&5
23231+  echo "$as_me:19037: \$? = $ac_status" >&5
23232   (exit $ac_status); }; }; then
23233   cf_cv_wint_t=no
23234 else
23235   echo "$as_me: failed program was:" >&5
23236 cat conftest.$ac_ext >&5
23237 cat >conftest.$ac_ext <<_ACEOF
23238-#line 19035 "configure"
23239+#line 19044 "configure"
23240 #include "confdefs.h"
23241
23242 #include <stdlib.h>
23243@@ -19051,16 +19060,16 @@
23244 }
23245 _ACEOF
23246 rm -f conftest.$ac_objext
23247-if { (eval echo "$as_me:19054: \"$ac_compile\"") >&5
23248+if { (eval echo "$as_me:19063: \"$ac_compile\"") >&5
23249   (eval $ac_compile) 2>&5
23250   ac_status=$?
23251-  echo "$as_me:19057: \$? = $ac_status" >&5
23252+  echo "$as_me:19066: \$? = $ac_status" >&5
23253   (exit $ac_status); } &&
23254          { ac_try='test -s conftest.$ac_objext'
23255-  { (eval echo "$as_me:19060: \"$ac_try\"") >&5
23256+  { (eval echo "$as_me:19069: \"$ac_try\"") >&5
23257   (eval $ac_try) 2>&5
23258   ac_status=$?
23259-  echo "$as_me:19063: \$? = $ac_status" >&5
23260+  echo "$as_me:19072: \$? = $ac_status" >&5
23261   (exit $ac_status); }; }; then
23262   cf_cv_wint_t=yes
23263 else
23264@@ -19072,7 +19081,7 @@
23265 fi
23266 rm -f conftest.$ac_objext conftest.$ac_ext
23267 fi
23268-echo "$as_me:19075: result: $cf_cv_wint_t" >&5
23269+echo "$as_me:19084: result: $cf_cv_wint_t" >&5
23270 echo "${ECHO_T}$cf_cv_wint_t" >&6
23271
23272 if test "$cf_cv_wint_t" = yes ; then
23273@@ -19096,10 +19105,10 @@
23274
23275 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
23276
23277-echo "$as_me:19099: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
23278+echo "$as_me:19108: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
23279 echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
23280 cat >conftest.$ac_ext <<_ACEOF
23281-#line 19102 "configure"
23282+#line 19111 "configure"
23283 #include "confdefs.h"
23284
23285 #ifndef _XOPEN_SOURCE_EXTENDED
23286@@ -19117,16 +19126,16 @@
23287 }
23288 _ACEOF
23289 rm -f conftest.$ac_objext
23290-if { (eval echo "$as_me:19120: \"$ac_compile\"") >&5
23291+if { (eval echo "$as_me:19129: \"$ac_compile\"") >&5
23292   (eval $ac_compile) 2>&5
23293   ac_status=$?
23294-  echo "$as_me:19123: \$? = $ac_status" >&5
23295+  echo "$as_me:19132: \$? = $ac_status" >&5
23296   (exit $ac_status); } &&
23297          { ac_try='test -s conftest.$ac_objext'
23298-  { (eval echo "$as_me:19126: \"$ac_try\"") >&5
23299+  { (eval echo "$as_me:19135: \"$ac_try\"") >&5
23300   (eval $ac_try) 2>&5
23301   ac_status=$?
23302-  echo "$as_me:19129: \$? = $ac_status" >&5
23303+  echo "$as_me:19138: \$? = $ac_status" >&5
23304   (exit $ac_status); }; }; then
23305   cf_result=yes
23306 else
23307@@ -19135,7 +19144,7 @@
23308 cf_result=no
23309 fi
23310 rm -f conftest.$ac_objext conftest.$ac_ext
23311-echo "$as_me:19138: result: $cf_result" >&5
23312+echo "$as_me:19147: result: $cf_result" >&5
23313 echo "${ECHO_T}$cf_result" >&6
23314 if test $cf_result = yes ; then
23315
23316@@ -19157,10 +19166,10 @@
23317
23318 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
23319
23320-echo "$as_me:19160: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
23321+echo "$as_me:19169: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
23322 echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
23323 cat >conftest.$ac_ext <<_ACEOF
23324-#line 19163 "configure"
23325+#line 19172 "configure"
23326 #include "confdefs.h"
23327
23328 #ifndef _XOPEN_SOURCE_EXTENDED
23329@@ -19178,16 +19187,16 @@
23330 }
23331 _ACEOF
23332 rm -f conftest.$ac_objext
23333-if { (eval echo "$as_me:19181: \"$ac_compile\"") >&5
23334+if { (eval echo "$as_me:19190: \"$ac_compile\"") >&5
23335   (eval $ac_compile) 2>&5
23336   ac_status=$?
23337-  echo "$as_me:19184: \$? = $ac_status" >&5
23338+  echo "$as_me:19193: \$? = $ac_status" >&5
23339   (exit $ac_status); } &&
23340          { ac_try='test -s conftest.$ac_objext'
23341-  { (eval echo "$as_me:19187: \"$ac_try\"") >&5
23342+  { (eval echo "$as_me:19196: \"$ac_try\"") >&5
23343   (eval $ac_try) 2>&5
23344   ac_status=$?
23345-  echo "$as_me:19190: \$? = $ac_status" >&5
23346+  echo "$as_me:19199: \$? = $ac_status" >&5
23347   (exit $ac_status); }; }; then
23348   cf_result=yes
23349 else
23350@@ -19196,7 +19205,7 @@
23351 cf_result=no
23352 fi
23353 rm -f conftest.$ac_objext conftest.$ac_ext
23354-echo "$as_me:19199: result: $cf_result" >&5
23355+echo "$as_me:19208: result: $cf_result" >&5
23356 echo "${ECHO_T}$cf_result" >&6
23357 if test $cf_result = yes ; then
23358
23359@@ -19218,10 +19227,10 @@
23360
23361 	if test "$NCURSES_OK_WINT_T" = 0 ; then
23362
23363-echo "$as_me:19221: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
23364+echo "$as_me:19230: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
23365 echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
23366 cat >conftest.$ac_ext <<_ACEOF
23367-#line 19224 "configure"
23368+#line 19233 "configure"
23369 #include "confdefs.h"
23370
23371 #ifndef _XOPEN_SOURCE_EXTENDED
23372@@ -19239,16 +19248,16 @@
23373 }
23374 _ACEOF
23375 rm -f conftest.$ac_objext
23376-if { (eval echo "$as_me:19242: \"$ac_compile\"") >&5
23377+if { (eval echo "$as_me:19251: \"$ac_compile\"") >&5
23378   (eval $ac_compile) 2>&5
23379   ac_status=$?
23380-  echo "$as_me:19245: \$? = $ac_status" >&5
23381+  echo "$as_me:19254: \$? = $ac_status" >&5
23382   (exit $ac_status); } &&
23383          { ac_try='test -s conftest.$ac_objext'
23384-  { (eval echo "$as_me:19248: \"$ac_try\"") >&5
23385+  { (eval echo "$as_me:19257: \"$ac_try\"") >&5
23386   (eval $ac_try) 2>&5
23387   ac_status=$?
23388-  echo "$as_me:19251: \$? = $ac_status" >&5
23389+  echo "$as_me:19260: \$? = $ac_status" >&5
23390   (exit $ac_status); }; }; then
23391   cf_result=yes
23392 else
23393@@ -19257,7 +19266,7 @@
23394 cf_result=no
23395 fi
23396 rm -f conftest.$ac_objext conftest.$ac_ext
23397-echo "$as_me:19260: result: $cf_result" >&5
23398+echo "$as_me:19269: result: $cf_result" >&5
23399 echo "${ECHO_T}$cf_result" >&6
23400 if test $cf_result = yes ; then
23401
23402@@ -19286,11 +19295,11 @@
23403 boolfnames \
23404 ttytype
23405 do
23406-echo "$as_me:19289: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
23407+echo "$as_me:19298: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
23408 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
23409
23410 cat >conftest.$ac_ext <<_ACEOF
23411-#line 19293 "configure"
23412+#line 19302 "configure"
23413 #include "confdefs.h"
23414
23415 #ifdef HAVE_XCURSES
23416@@ -19318,16 +19327,16 @@
23417 }
23418 _ACEOF
23419 rm -f conftest.$ac_objext
23420-if { (eval echo "$as_me:19321: \"$ac_compile\"") >&5
23421+if { (eval echo "$as_me:19330: \"$ac_compile\"") >&5
23422   (eval $ac_compile) 2>&5
23423   ac_status=$?
23424-  echo "$as_me:19324: \$? = $ac_status" >&5
23425+  echo "$as_me:19333: \$? = $ac_status" >&5
23426   (exit $ac_status); } &&
23427          { ac_try='test -s conftest.$ac_objext'
23428-  { (eval echo "$as_me:19327: \"$ac_try\"") >&5
23429+  { (eval echo "$as_me:19336: \"$ac_try\"") >&5
23430   (eval $ac_try) 2>&5
23431   ac_status=$?
23432-  echo "$as_me:19330: \$? = $ac_status" >&5
23433+  echo "$as_me:19339: \$? = $ac_status" >&5
23434   (exit $ac_status); }; }; then
23435   cf_result=yes
23436
23437@@ -19337,7 +19346,7 @@
23438 cf_result=no
23439 fi
23440 rm -f conftest.$ac_objext conftest.$ac_ext
23441-echo "$as_me:19340: result: $cf_result" >&5
23442+echo "$as_me:19349: result: $cf_result" >&5
23443 echo "${ECHO_T}$cf_result" >&6
23444
23445 if test $cf_result = yes ; then
23446@@ -19349,14 +19358,14 @@
23447 EOF
23448
23449 else
23450-	echo "$as_me:19352: checking for data $cf_data in library" >&5
23451+	echo "$as_me:19361: checking for data $cf_data in library" >&5
23452 echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
23453 	# BSD linkers insist on making weak linkage, but resolve at runtime.
23454 	if test "$cross_compiling" = yes; then
23455
23456 	# cross-compiling
23457 	cat >conftest.$ac_ext <<_ACEOF
23458-#line 19359 "configure"
23459+#line 19368 "configure"
23460 #include "confdefs.h"
23461
23462 #ifdef HAVE_XCURSES
23463@@ -19389,16 +19398,16 @@
23464 }
23465 _ACEOF
23466 rm -f conftest.$ac_objext conftest$ac_exeext
23467-if { (eval echo "$as_me:19392: \"$ac_link\"") >&5
23468+if { (eval echo "$as_me:19401: \"$ac_link\"") >&5
23469   (eval $ac_link) 2>&5
23470   ac_status=$?
23471-  echo "$as_me:19395: \$? = $ac_status" >&5
23472+  echo "$as_me:19404: \$? = $ac_status" >&5
23473   (exit $ac_status); } &&
23474          { ac_try='test -s conftest$ac_exeext'
23475-  { (eval echo "$as_me:19398: \"$ac_try\"") >&5
23476+  { (eval echo "$as_me:19407: \"$ac_try\"") >&5
23477   (eval $ac_try) 2>&5
23478   ac_status=$?
23479-  echo "$as_me:19401: \$? = $ac_status" >&5
23480+  echo "$as_me:19410: \$? = $ac_status" >&5
23481   (exit $ac_status); }; }; then
23482   cf_result=yes
23483 else
23484@@ -19410,7 +19419,7 @@
23485
23486 else
23487   cat >conftest.$ac_ext <<_ACEOF
23488-#line 19413 "configure"
23489+#line 19422 "configure"
23490 #include "confdefs.h"
23491
23492 #ifdef HAVE_XCURSES
23493@@ -19436,15 +19445,15 @@
23494 }
23495 _ACEOF
23496 rm -f conftest$ac_exeext
23497-if { (eval echo "$as_me:19439: \"$ac_link\"") >&5
23498+if { (eval echo "$as_me:19448: \"$ac_link\"") >&5
23499   (eval $ac_link) 2>&5
23500   ac_status=$?
23501-  echo "$as_me:19442: \$? = $ac_status" >&5
23502+  echo "$as_me:19451: \$? = $ac_status" >&5
23503   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
23504-  { (eval echo "$as_me:19444: \"$ac_try\"") >&5
23505+  { (eval echo "$as_me:19453: \"$ac_try\"") >&5
23506   (eval $ac_try) 2>&5
23507   ac_status=$?
23508-  echo "$as_me:19447: \$? = $ac_status" >&5
23509+  echo "$as_me:19456: \$? = $ac_status" >&5
23510   (exit $ac_status); }; }; then
23511   cf_result=yes
23512
23513@@ -19456,7 +19465,7 @@
23514 fi
23515 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
23516 fi
23517-	echo "$as_me:19459: result: $cf_result" >&5
23518+	echo "$as_me:19468: result: $cf_result" >&5
23519 echo "${ECHO_T}$cf_result" >&6
23520 	if test $cf_result = yes ; then
23521
23522@@ -19473,7 +19482,7 @@
23523
23524 if ( test "$GCC" = yes || test "$GXX" = yes )
23525 then
23526-echo "$as_me:19476: checking if you want to turn on gcc warnings" >&5
23527+echo "$as_me:19485: checking if you want to turn on gcc warnings" >&5
23528 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
23529
23530 # Check whether --enable-warnings or --disable-warnings was given.
23531@@ -19490,7 +19499,7 @@
23532 	with_warnings=no
23533
23534 fi;
23535-echo "$as_me:19493: result: $with_warnings" >&5
23536+echo "$as_me:19502: result: $with_warnings" >&5
23537 echo "${ECHO_T}$with_warnings" >&6
23538 if test "$with_warnings" = "yes"
23539 then
23540@@ -19513,10 +19522,10 @@
23541 EOF
23542 if test "$GCC" = yes
23543 then
23544-	{ echo "$as_me:19516: checking for $CC __attribute__ directives..." >&5
23545+	{ echo "$as_me:19525: checking for $CC __attribute__ directives..." >&5
23546 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
23547 cat > conftest.$ac_ext <<EOF
23548-#line 19519 "${as_me:-configure}"
23549+#line 19528 "${as_me:-configure}"
23550 #include "confdefs.h"
23551 #include "conftest.h"
23552 #include "conftest.i"
23553@@ -19565,12 +19574,12 @@
23554 			;;
23555 		esac
23556
23557-		if { (eval echo "$as_me:19568: \"$ac_compile\"") >&5
23558+		if { (eval echo "$as_me:19577: \"$ac_compile\"") >&5
23559   (eval $ac_compile) 2>&5
23560   ac_status=$?
23561-  echo "$as_me:19571: \$? = $ac_status" >&5
23562+  echo "$as_me:19580: \$? = $ac_status" >&5
23563   (exit $ac_status); }; then
23564-			test -n "$verbose" && echo "$as_me:19573: result: ... $cf_attribute" >&5
23565+			test -n "$verbose" && echo "$as_me:19582: result: ... $cf_attribute" >&5
23566 echo "${ECHO_T}... $cf_attribute" >&6
23567 			cat conftest.h >>confdefs.h
23568 			case $cf_attribute in
23569@@ -19631,7 +19640,7 @@
23570
23571 if test "x$have_x" = xyes; then
23572 cat >conftest.$ac_ext <<_ACEOF
23573-#line 19634 "configure"
23574+#line 19643 "configure"
23575 #include "confdefs.h"
23576
23577 #include <stdlib.h>
23578@@ -19646,26 +19655,26 @@
23579 }
23580 _ACEOF
23581 rm -f conftest.$ac_objext
23582-if { (eval echo "$as_me:19649: \"$ac_compile\"") >&5
23583+if { (eval echo "$as_me:19658: \"$ac_compile\"") >&5
23584   (eval $ac_compile) 2>&5
23585   ac_status=$?
23586-  echo "$as_me:19652: \$? = $ac_status" >&5
23587+  echo "$as_me:19661: \$? = $ac_status" >&5
23588   (exit $ac_status); } &&
23589          { ac_try='test -s conftest.$ac_objext'
23590-  { (eval echo "$as_me:19655: \"$ac_try\"") >&5
23591+  { (eval echo "$as_me:19664: \"$ac_try\"") >&5
23592   (eval $ac_try) 2>&5
23593   ac_status=$?
23594-  echo "$as_me:19658: \$? = $ac_status" >&5
23595+  echo "$as_me:19667: \$? = $ac_status" >&5
23596   (exit $ac_status); }; }; then
23597
23598-echo "$as_me:19661: checking for X11/Xt const-feature" >&5
23599+echo "$as_me:19670: checking for X11/Xt const-feature" >&5
23600 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
23601 if test "${cf_cv_const_x_string+set}" = set; then
23602   echo $ECHO_N "(cached) $ECHO_C" >&6
23603 else
23604
23605 	cat >conftest.$ac_ext <<_ACEOF
23606-#line 19668 "configure"
23607+#line 19677 "configure"
23608 #include "confdefs.h"
23609
23610 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
23611@@ -19682,16 +19691,16 @@
23612 }
23613 _ACEOF
23614 rm -f conftest.$ac_objext
23615-if { (eval echo "$as_me:19685: \"$ac_compile\"") >&5
23616+if { (eval echo "$as_me:19694: \"$ac_compile\"") >&5
23617   (eval $ac_compile) 2>&5
23618   ac_status=$?
23619-  echo "$as_me:19688: \$? = $ac_status" >&5
23620+  echo "$as_me:19697: \$? = $ac_status" >&5
23621   (exit $ac_status); } &&
23622          { ac_try='test -s conftest.$ac_objext'
23623-  { (eval echo "$as_me:19691: \"$ac_try\"") >&5
23624+  { (eval echo "$as_me:19700: \"$ac_try\"") >&5
23625   (eval $ac_try) 2>&5
23626   ac_status=$?
23627-  echo "$as_me:19694: \$? = $ac_status" >&5
23628+  echo "$as_me:19703: \$? = $ac_status" >&5
23629   (exit $ac_status); }; }; then
23630
23631 			cf_cv_const_x_string=no
23632@@ -19706,7 +19715,7 @@
23633 rm -f conftest.$ac_objext conftest.$ac_ext
23634
23635 fi
23636-echo "$as_me:19709: result: $cf_cv_const_x_string" >&5
23637+echo "$as_me:19718: result: $cf_cv_const_x_string" >&5
23638 echo "${ECHO_T}$cf_cv_const_x_string" >&6
23639
23640 case $cf_cv_const_x_string in
23641@@ -19731,7 +19740,7 @@
23642 rm -f conftest.$ac_objext conftest.$ac_ext
23643  fi
23644 cat > conftest.$ac_ext <<EOF
23645-#line 19734 "${as_me:-configure}"
23646+#line 19743 "${as_me:-configure}"
23647 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
23648 EOF
23649 if test "$INTEL_COMPILER" = yes
23650@@ -19747,7 +19756,7 @@
23651 # remark #981: operands are evaluated in unspecified order
23652 # warning #279: controlling expression is constant
23653
23654-	{ echo "$as_me:19750: checking for $CC warning options..." >&5
23655+	{ echo "$as_me:19759: checking for $CC warning options..." >&5
23656 echo "$as_me: checking for $CC warning options..." >&6;}
23657 	cf_save_CFLAGS="$CFLAGS"
23658 	EXTRA_CFLAGS="-Wall"
23659@@ -19763,12 +19772,12 @@
23660 		wd981
23661 	do
23662 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
23663-		if { (eval echo "$as_me:19766: \"$ac_compile\"") >&5
23664+		if { (eval echo "$as_me:19775: \"$ac_compile\"") >&5
23665   (eval $ac_compile) 2>&5
23666   ac_status=$?
23667-  echo "$as_me:19769: \$? = $ac_status" >&5
23668+  echo "$as_me:19778: \$? = $ac_status" >&5
23669   (exit $ac_status); }; then
23670-			test -n "$verbose" && echo "$as_me:19771: result: ... -$cf_opt" >&5
23671+			test -n "$verbose" && echo "$as_me:19780: result: ... -$cf_opt" >&5
23672 echo "${ECHO_T}... -$cf_opt" >&6
23673 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
23674 		fi
23675@@ -19776,7 +19785,7 @@
23676 	CFLAGS="$cf_save_CFLAGS"
23677 elif test "$GCC" = yes
23678 then
23679-	{ echo "$as_me:19779: checking for $CC warning options..." >&5
23680+	{ echo "$as_me:19788: checking for $CC warning options..." >&5
23681 echo "$as_me: checking for $CC warning options..." >&6;}
23682 	cf_save_CFLAGS="$CFLAGS"
23683 	EXTRA_CFLAGS=
23684@@ -19800,12 +19809,12 @@
23685 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
23686 	do
23687 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
23688-		if { (eval echo "$as_me:19803: \"$ac_compile\"") >&5
23689+		if { (eval echo "$as_me:19812: \"$ac_compile\"") >&5
23690   (eval $ac_compile) 2>&5
23691   ac_status=$?
23692-  echo "$as_me:19806: \$? = $ac_status" >&5
23693+  echo "$as_me:19815: \$? = $ac_status" >&5
23694   (exit $ac_status); }; then
23695-			test -n "$verbose" && echo "$as_me:19808: result: ... -$cf_opt" >&5
23696+			test -n "$verbose" && echo "$as_me:19817: result: ... -$cf_opt" >&5
23697 echo "${ECHO_T}... -$cf_opt" >&6
23698 			case $cf_opt in
23699 			(Winline)
23700@@ -19813,7 +19822,7 @@
23701 				([34].*)
23702 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
23703
23704-echo "${as_me:-configure}:19816: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
23705+echo "${as_me:-configure}:19825: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
23706
23707 					continue;;
23708 				esac
23709@@ -19823,7 +19832,7 @@
23710 				([12].*)
23711 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
23712
23713-echo "${as_me:-configure}:19826: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
23714+echo "${as_me:-configure}:19835: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
23715
23716 					continue;;
23717 				esac
23718@@ -19839,7 +19848,7 @@
23719 fi
23720 fi
23721
23722-echo "$as_me:19842: checking if you want to use dmalloc for testing" >&5
23723+echo "$as_me:19851: checking if you want to use dmalloc for testing" >&5
23724 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
23725
23726 # Check whether --with-dmalloc or --without-dmalloc was given.
23727@@ -19856,7 +19865,7 @@
23728 else
23729   with_dmalloc=
23730 fi;
23731-echo "$as_me:19859: result: ${with_dmalloc:-no}" >&5
23732+echo "$as_me:19868: result: ${with_dmalloc:-no}" >&5
23733 echo "${ECHO_T}${with_dmalloc:-no}" >&6
23734
23735 case .$with_cflags in
23736@@ -19970,23 +19979,23 @@
23737 esac
23738
23739 if test "$with_dmalloc" = yes ; then
23740-	echo "$as_me:19973: checking for dmalloc.h" >&5
23741+	echo "$as_me:19982: checking for dmalloc.h" >&5
23742 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
23743 if test "${ac_cv_header_dmalloc_h+set}" = set; then
23744   echo $ECHO_N "(cached) $ECHO_C" >&6
23745 else
23746   cat >conftest.$ac_ext <<_ACEOF
23747-#line 19979 "configure"
23748+#line 19988 "configure"
23749 #include "confdefs.h"
23750 #include <dmalloc.h>
23751 _ACEOF
23752-if { (eval echo "$as_me:19983: \"$ac_cpp conftest.$ac_ext\"") >&5
23753+if { (eval echo "$as_me:19992: \"$ac_cpp conftest.$ac_ext\"") >&5
23754   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
23755   ac_status=$?
23756   egrep -v '^ *\+' conftest.er1 >conftest.err
23757   rm -f conftest.er1
23758   cat conftest.err >&5
23759-  echo "$as_me:19989: \$? = $ac_status" >&5
23760+  echo "$as_me:19998: \$? = $ac_status" >&5
23761   (exit $ac_status); } >/dev/null; then
23762   if test -s conftest.err; then
23763     ac_cpp_err=$ac_c_preproc_warn_flag
23764@@ -20005,11 +20014,11 @@
23765 fi
23766 rm -f conftest.err conftest.$ac_ext
23767 fi
23768-echo "$as_me:20008: result: $ac_cv_header_dmalloc_h" >&5
23769+echo "$as_me:20017: result: $ac_cv_header_dmalloc_h" >&5
23770 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
23771 if test $ac_cv_header_dmalloc_h = yes; then
23772
23773-echo "$as_me:20012: checking for dmalloc_debug in -ldmalloc" >&5
23774+echo "$as_me:20021: checking for dmalloc_debug in -ldmalloc" >&5
23775 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
23776 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
23777   echo $ECHO_N "(cached) $ECHO_C" >&6
23778@@ -20017,7 +20026,7 @@
23779   ac_check_lib_save_LIBS=$LIBS
23780 LIBS="-ldmalloc  $LIBS"
23781 cat >conftest.$ac_ext <<_ACEOF
23782-#line 20020 "configure"
23783+#line 20029 "configure"
23784 #include "confdefs.h"
23785
23786 /* Override any gcc2 internal prototype to avoid an error.  */
23787@@ -20036,16 +20045,16 @@
23788 }
23789 _ACEOF
23790 rm -f conftest.$ac_objext conftest$ac_exeext
23791-if { (eval echo "$as_me:20039: \"$ac_link\"") >&5
23792+if { (eval echo "$as_me:20048: \"$ac_link\"") >&5
23793   (eval $ac_link) 2>&5
23794   ac_status=$?
23795-  echo "$as_me:20042: \$? = $ac_status" >&5
23796+  echo "$as_me:20051: \$? = $ac_status" >&5
23797   (exit $ac_status); } &&
23798          { ac_try='test -s conftest$ac_exeext'
23799-  { (eval echo "$as_me:20045: \"$ac_try\"") >&5
23800+  { (eval echo "$as_me:20054: \"$ac_try\"") >&5
23801   (eval $ac_try) 2>&5
23802   ac_status=$?
23803-  echo "$as_me:20048: \$? = $ac_status" >&5
23804+  echo "$as_me:20057: \$? = $ac_status" >&5
23805   (exit $ac_status); }; }; then
23806   ac_cv_lib_dmalloc_dmalloc_debug=yes
23807 else
23808@@ -20056,7 +20065,7 @@
23809 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
23810 LIBS=$ac_check_lib_save_LIBS
23811 fi
23812-echo "$as_me:20059: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
23813+echo "$as_me:20068: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
23814 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
23815 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
23816   cat >>confdefs.h <<EOF
23817@@ -20071,7 +20080,7 @@
23818
23819 fi
23820
23821-echo "$as_me:20074: checking if you want to use dbmalloc for testing" >&5
23822+echo "$as_me:20083: checking if you want to use dbmalloc for testing" >&5
23823 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
23824
23825 # Check whether --with-dbmalloc or --without-dbmalloc was given.
23826@@ -20088,7 +20097,7 @@
23827 else
23828   with_dbmalloc=
23829 fi;
23830-echo "$as_me:20091: result: ${with_dbmalloc:-no}" >&5
23831+echo "$as_me:20100: result: ${with_dbmalloc:-no}" >&5
23832 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
23833
23834 case .$with_cflags in
23835@@ -20202,23 +20211,23 @@
23836 esac
23837
23838 if test "$with_dbmalloc" = yes ; then
23839-	echo "$as_me:20205: checking for dbmalloc.h" >&5
23840+	echo "$as_me:20214: checking for dbmalloc.h" >&5
23841 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
23842 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
23843   echo $ECHO_N "(cached) $ECHO_C" >&6
23844 else
23845   cat >conftest.$ac_ext <<_ACEOF
23846-#line 20211 "configure"
23847+#line 20220 "configure"
23848 #include "confdefs.h"
23849 #include <dbmalloc.h>
23850 _ACEOF
23851-if { (eval echo "$as_me:20215: \"$ac_cpp conftest.$ac_ext\"") >&5
23852+if { (eval echo "$as_me:20224: \"$ac_cpp conftest.$ac_ext\"") >&5
23853   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
23854   ac_status=$?
23855   egrep -v '^ *\+' conftest.er1 >conftest.err
23856   rm -f conftest.er1
23857   cat conftest.err >&5
23858-  echo "$as_me:20221: \$? = $ac_status" >&5
23859+  echo "$as_me:20230: \$? = $ac_status" >&5
23860   (exit $ac_status); } >/dev/null; then
23861   if test -s conftest.err; then
23862     ac_cpp_err=$ac_c_preproc_warn_flag
23863@@ -20237,11 +20246,11 @@
23864 fi
23865 rm -f conftest.err conftest.$ac_ext
23866 fi
23867-echo "$as_me:20240: result: $ac_cv_header_dbmalloc_h" >&5
23868+echo "$as_me:20249: result: $ac_cv_header_dbmalloc_h" >&5
23869 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
23870 if test $ac_cv_header_dbmalloc_h = yes; then
23871
23872-echo "$as_me:20244: checking for debug_malloc in -ldbmalloc" >&5
23873+echo "$as_me:20253: checking for debug_malloc in -ldbmalloc" >&5
23874 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
23875 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
23876   echo $ECHO_N "(cached) $ECHO_C" >&6
23877@@ -20249,7 +20258,7 @@
23878   ac_check_lib_save_LIBS=$LIBS
23879 LIBS="-ldbmalloc  $LIBS"
23880 cat >conftest.$ac_ext <<_ACEOF
23881-#line 20252 "configure"
23882+#line 20261 "configure"
23883 #include "confdefs.h"
23884
23885 /* Override any gcc2 internal prototype to avoid an error.  */
23886@@ -20268,16 +20277,16 @@
23887 }
23888 _ACEOF
23889 rm -f conftest.$ac_objext conftest$ac_exeext
23890-if { (eval echo "$as_me:20271: \"$ac_link\"") >&5
23891+if { (eval echo "$as_me:20280: \"$ac_link\"") >&5
23892   (eval $ac_link) 2>&5
23893   ac_status=$?
23894-  echo "$as_me:20274: \$? = $ac_status" >&5
23895+  echo "$as_me:20283: \$? = $ac_status" >&5
23896   (exit $ac_status); } &&
23897          { ac_try='test -s conftest$ac_exeext'
23898-  { (eval echo "$as_me:20277: \"$ac_try\"") >&5
23899+  { (eval echo "$as_me:20286: \"$ac_try\"") >&5
23900   (eval $ac_try) 2>&5
23901   ac_status=$?
23902-  echo "$as_me:20280: \$? = $ac_status" >&5
23903+  echo "$as_me:20289: \$? = $ac_status" >&5
23904   (exit $ac_status); }; }; then
23905   ac_cv_lib_dbmalloc_debug_malloc=yes
23906 else
23907@@ -20288,7 +20297,7 @@
23908 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
23909 LIBS=$ac_check_lib_save_LIBS
23910 fi
23911-echo "$as_me:20291: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
23912+echo "$as_me:20300: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
23913 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
23914 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
23915   cat >>confdefs.h <<EOF
23916@@ -20303,7 +20312,7 @@
23917
23918 fi
23919
23920-echo "$as_me:20306: checking if you want to use valgrind for testing" >&5
23921+echo "$as_me:20315: checking if you want to use valgrind for testing" >&5
23922 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
23923
23924 # Check whether --with-valgrind or --without-valgrind was given.
23925@@ -20320,7 +20329,7 @@
23926 else
23927   with_valgrind=
23928 fi;
23929-echo "$as_me:20323: result: ${with_valgrind:-no}" >&5
23930+echo "$as_me:20332: result: ${with_valgrind:-no}" >&5
23931 echo "${ECHO_T}${with_valgrind:-no}" >&6
23932
23933 case .$with_cflags in
23934@@ -20433,7 +20442,7 @@
23935 	;;
23936 esac
23937
23938-echo "$as_me:20436: checking if you want to perform memory-leak testing" >&5
23939+echo "$as_me:20445: checking if you want to perform memory-leak testing" >&5
23940 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
23941
23942 # Check whether --enable-leaks or --disable-leaks was given.
23943@@ -20443,7 +20452,7 @@
23944 else
23945   : ${with_no_leaks:=no}
23946 fi;
23947-echo "$as_me:20446: result: $with_no_leaks" >&5
23948+echo "$as_me:20455: result: $with_no_leaks" >&5
23949 echo "${ECHO_T}$with_no_leaks" >&6
23950
23951 if test "$with_no_leaks" = yes ; then
23952@@ -20461,7 +20470,7 @@
23953 LD_RPATH_OPT=
23954 if test "x$cf_cv_enable_rpath" != xno
23955 then
23956-	echo "$as_me:20464: checking for an rpath option" >&5
23957+	echo "$as_me:20473: checking for an rpath option" >&5
23958 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
23959 	case $cf_cv_system_name in
23960 	(irix*)
23961@@ -20492,12 +20501,12 @@
23962 	(*)
23963 		;;
23964 	esac
23965-	echo "$as_me:20495: result: $LD_RPATH_OPT" >&5
23966+	echo "$as_me:20504: result: $LD_RPATH_OPT" >&5
23967 echo "${ECHO_T}$LD_RPATH_OPT" >&6
23968
23969 	case "x$LD_RPATH_OPT" in
23970 	(x-R*)
23971-		echo "$as_me:20500: checking if we need a space after rpath option" >&5
23972+		echo "$as_me:20509: checking if we need a space after rpath option" >&5
23973 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
23974 		cf_save_LIBS="$LIBS"
23975
23976@@ -20518,7 +20527,7 @@
23977 LIBS="$cf_add_libs"
23978
23979 		cat >conftest.$ac_ext <<_ACEOF
23980-#line 20521 "configure"
23981+#line 20530 "configure"
23982 #include "confdefs.h"
23983
23984 int
23985@@ -20530,16 +20539,16 @@
23986 }
23987 _ACEOF
23988 rm -f conftest.$ac_objext conftest$ac_exeext
23989-if { (eval echo "$as_me:20533: \"$ac_link\"") >&5
23990+if { (eval echo "$as_me:20542: \"$ac_link\"") >&5
23991   (eval $ac_link) 2>&5
23992   ac_status=$?
23993-  echo "$as_me:20536: \$? = $ac_status" >&5
23994+  echo "$as_me:20545: \$? = $ac_status" >&5
23995   (exit $ac_status); } &&
23996          { ac_try='test -s conftest$ac_exeext'
23997-  { (eval echo "$as_me:20539: \"$ac_try\"") >&5
23998+  { (eval echo "$as_me:20548: \"$ac_try\"") >&5
23999   (eval $ac_try) 2>&5
24000   ac_status=$?
24001-  echo "$as_me:20542: \$? = $ac_status" >&5
24002+  echo "$as_me:20551: \$? = $ac_status" >&5
24003   (exit $ac_status); }; }; then
24004   cf_rpath_space=no
24005 else
24006@@ -20549,14 +20558,14 @@
24007 fi
24008 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
24009 		LIBS="$cf_save_LIBS"
24010-		echo "$as_me:20552: result: $cf_rpath_space" >&5
24011+		echo "$as_me:20561: result: $cf_rpath_space" >&5
24012 echo "${ECHO_T}$cf_rpath_space" >&6
24013 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
24014 		;;
24015 	esac
24016 fi
24017
24018-echo "$as_me:20559: checking if rpath-hack should be disabled" >&5
24019+echo "$as_me:20568: checking if rpath-hack should be disabled" >&5
24020 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
24021
24022 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
24023@@ -20573,21 +20582,21 @@
24024 	cf_disable_rpath_hack=no
24025
24026 fi;
24027-echo "$as_me:20576: result: $cf_disable_rpath_hack" >&5
24028+echo "$as_me:20585: result: $cf_disable_rpath_hack" >&5
24029 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
24030 if test "$cf_disable_rpath_hack" = no ; then
24031
24032-echo "$as_me:20580: checking for updated LDFLAGS" >&5
24033+echo "$as_me:20589: checking for updated LDFLAGS" >&5
24034 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
24035 if test -n "$LD_RPATH_OPT" ; then
24036-	echo "$as_me:20583: result: maybe" >&5
24037+	echo "$as_me:20592: result: maybe" >&5
24038 echo "${ECHO_T}maybe" >&6
24039
24040 	for ac_prog in ldd
24041 do
24042   # Extract the first word of "$ac_prog", so it can be a program name with args.
24043 set dummy $ac_prog; ac_word=$2
24044-echo "$as_me:20590: checking for $ac_word" >&5
24045+echo "$as_me:20599: checking for $ac_word" >&5
24046 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
24047 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
24048   echo $ECHO_N "(cached) $ECHO_C" >&6
24049@@ -20602,7 +20611,7 @@
24050   test -z "$ac_dir" && ac_dir=.
24051   $as_executable_p "$ac_dir/$ac_word" || continue
24052 ac_cv_prog_cf_ldd_prog="$ac_prog"
24053-echo "$as_me:20605: found $ac_dir/$ac_word" >&5
24054+echo "$as_me:20614: found $ac_dir/$ac_word" >&5
24055 break
24056 done
24057
24058@@ -20610,10 +20619,10 @@
24059 fi
24060 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
24061 if test -n "$cf_ldd_prog"; then
24062-  echo "$as_me:20613: result: $cf_ldd_prog" >&5
24063+  echo "$as_me:20622: result: $cf_ldd_prog" >&5
24064 echo "${ECHO_T}$cf_ldd_prog" >&6
24065 else
24066-  echo "$as_me:20616: result: no" >&5
24067+  echo "$as_me:20625: result: no" >&5
24068 echo "${ECHO_T}no" >&6
24069 fi
24070
24071@@ -20627,7 +20636,7 @@
24072 		cf_rpath_oops=
24073
24074 cat >conftest.$ac_ext <<_ACEOF
24075-#line 20630 "configure"
24076+#line 20639 "configure"
24077 #include "confdefs.h"
24078 #include <stdio.h>
24079 int
24080@@ -20639,16 +20648,16 @@
24081 }
24082 _ACEOF
24083 rm -f conftest.$ac_objext conftest$ac_exeext
24084-if { (eval echo "$as_me:20642: \"$ac_link\"") >&5
24085+if { (eval echo "$as_me:20651: \"$ac_link\"") >&5
24086   (eval $ac_link) 2>&5
24087   ac_status=$?
24088-  echo "$as_me:20645: \$? = $ac_status" >&5
24089+  echo "$as_me:20654: \$? = $ac_status" >&5
24090   (exit $ac_status); } &&
24091          { ac_try='test -s conftest$ac_exeext'
24092-  { (eval echo "$as_me:20648: \"$ac_try\"") >&5
24093+  { (eval echo "$as_me:20657: \"$ac_try\"") >&5
24094   (eval $ac_try) 2>&5
24095   ac_status=$?
24096-  echo "$as_me:20651: \$? = $ac_status" >&5
24097+  echo "$as_me:20660: \$? = $ac_status" >&5
24098   (exit $ac_status); }; }; then
24099   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
24100 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
24101@@ -20676,7 +20685,7 @@
24102 					then
24103 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
24104
24105-echo "${as_me:-configure}:20679: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
24106+echo "${as_me:-configure}:20688: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
24107
24108 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
24109 						break
24110@@ -20688,11 +20697,11 @@
24111
24112 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
24113
24114-echo "${as_me:-configure}:20691: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
24115+echo "${as_me:-configure}:20700: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
24116
24117 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
24118
24119-echo "${as_me:-configure}:20695: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
24120+echo "${as_me:-configure}:20704: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
24121
24122 cf_rpath_dst=
24123 for cf_rpath_src in $LDFLAGS
24124@@ -20729,7 +20738,7 @@
24125 			then
24126 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
24127
24128-echo "${as_me:-configure}:20732: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
24129+echo "${as_me:-configure}:20741: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
24130
24131 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
24132 			fi
24133@@ -20742,11 +20751,11 @@
24134
24135 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
24136
24137-echo "${as_me:-configure}:20745: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
24138+echo "${as_me:-configure}:20754: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
24139
24140 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
24141
24142-echo "${as_me:-configure}:20749: testing ...checking LIBS $LIBS ..." 1>&5
24143+echo "${as_me:-configure}:20758: testing ...checking LIBS $LIBS ..." 1>&5
24144
24145 cf_rpath_dst=
24146 for cf_rpath_src in $LIBS
24147@@ -20783,7 +20792,7 @@
24148 			then
24149 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
24150
24151-echo "${as_me:-configure}:20786: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
24152+echo "${as_me:-configure}:20795: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
24153
24154 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
24155 			fi
24156@@ -20796,14 +20805,14 @@
24157
24158 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
24159
24160-echo "${as_me:-configure}:20799: testing ...checked LIBS $LIBS ..." 1>&5
24161+echo "${as_me:-configure}:20808: testing ...checked LIBS $LIBS ..." 1>&5
24162
24163 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
24164
24165-echo "${as_me:-configure}:20803: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
24166+echo "${as_me:-configure}:20812: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
24167
24168 else
24169-	echo "$as_me:20806: result: no" >&5
24170+	echo "$as_me:20815: result: no" >&5
24171 echo "${ECHO_T}no" >&6
24172 fi
24173
24174@@ -20893,7 +20902,7 @@
24175 : ${CONFIG_STATUS=./config.status}
24176 ac_clean_files_save=$ac_clean_files
24177 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
24178-{ echo "$as_me:20896: creating $CONFIG_STATUS" >&5
24179+{ echo "$as_me:20905: creating $CONFIG_STATUS" >&5
24180 echo "$as_me: creating $CONFIG_STATUS" >&6;}
24181 cat >$CONFIG_STATUS <<_ACEOF
24182 #! $SHELL
24183@@ -21069,7 +21078,7 @@
24184     echo "$ac_cs_version"; exit 0 ;;
24185   --he | --h)
24186     # Conflict between --help and --header
24187-    { { echo "$as_me:21072: error: ambiguous option: $1
24188+    { { echo "$as_me:21081: error: ambiguous option: $1
24189 Try \`$0 --help' for more information." >&5
24190 echo "$as_me: error: ambiguous option: $1
24191 Try \`$0 --help' for more information." >&2;}
24192@@ -21088,7 +21097,7 @@
24193     ac_need_defaults=false;;
24194
24195   # This is an error.
24196-  -*) { { echo "$as_me:21091: error: unrecognized option: $1
24197+  -*) { { echo "$as_me:21100: error: unrecognized option: $1
24198 Try \`$0 --help' for more information." >&5
24199 echo "$as_me: error: unrecognized option: $1
24200 Try \`$0 --help' for more information." >&2;}
24201@@ -21138,7 +21147,7 @@
24202   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
24203   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
24204   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
24205-  *) { { echo "$as_me:21141: error: invalid argument: $ac_config_target" >&5
24206+  *) { { echo "$as_me:21150: error: invalid argument: $ac_config_target" >&5
24207 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
24208    { (exit 1); exit 1; }; };;
24209   esac
24210@@ -21434,7 +21443,7 @@
24211   esac
24212
24213   if test x"$ac_file" != x-; then
24214-    { echo "$as_me:21437: creating $ac_file" >&5
24215+    { echo "$as_me:21446: creating $ac_file" >&5
24216 echo "$as_me: creating $ac_file" >&6;}
24217     rm -f "$ac_file"
24218   fi
24219@@ -21452,7 +21461,7 @@
24220       -) echo $tmp/stdin ;;
24221       [\\/$]*)
24222          # Absolute (can't be DOS-style, as IFS=:)
24223-         test -f "$f" || { { echo "$as_me:21455: error: cannot find input file: $f" >&5
24224+         test -f "$f" || { { echo "$as_me:21464: error: cannot find input file: $f" >&5
24225 echo "$as_me: error: cannot find input file: $f" >&2;}
24226    { (exit 1); exit 1; }; }
24227          echo $f;;
24228@@ -21465,7 +21474,7 @@
24229            echo $srcdir/$f
24230          else
24231            # /dev/null tree
24232-           { { echo "$as_me:21468: error: cannot find input file: $f" >&5
24233+           { { echo "$as_me:21477: error: cannot find input file: $f" >&5
24234 echo "$as_me: error: cannot find input file: $f" >&2;}
24235    { (exit 1); exit 1; }; }
24236          fi;;
24237@@ -21481,7 +21490,7 @@
24238       if test -n "$ac_seen"; then
24239         ac_used=`grep '@datarootdir@' $ac_item`
24240         if test -z "$ac_used"; then
24241-          { echo "$as_me:21484: WARNING: datarootdir was used implicitly but not set:
24242+          { echo "$as_me:21493: WARNING: datarootdir was used implicitly but not set:
24243 $ac_seen" >&5
24244 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
24245 $ac_seen" >&2;}
24246@@ -21490,7 +21499,7 @@
24247       fi
24248       ac_seen=`grep '${datarootdir}' $ac_item`
24249       if test -n "$ac_seen"; then
24250-        { echo "$as_me:21493: WARNING: datarootdir was used explicitly but not set:
24251+        { echo "$as_me:21502: WARNING: datarootdir was used explicitly but not set:
24252 $ac_seen" >&5
24253 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
24254 $ac_seen" >&2;}
24255@@ -21527,7 +21536,7 @@
24256             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
24257             if test -z "$ac_init"; then
24258               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
24259-              { echo "$as_me:21530: WARNING: Variable $ac_name is used but was not set:
24260+              { echo "$as_me:21539: WARNING: Variable $ac_name is used but was not set:
24261 $ac_seen" >&5
24262 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
24263 $ac_seen" >&2;}
24264@@ -21538,7 +21547,7 @@
24265     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
24266     if test -s $tmp/out; then
24267       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
24268-      { echo "$as_me:21541: WARNING: Some variables may not be substituted:
24269+      { echo "$as_me:21550: WARNING: Some variables may not be substituted:
24270 $ac_seen" >&5
24271 echo "$as_me: WARNING: Some variables may not be substituted:
24272 $ac_seen" >&2;}
24273@@ -21587,7 +21596,7 @@
24274   * )   ac_file_in=$ac_file.in ;;
24275   esac
24276
24277-  test x"$ac_file" != x- && { echo "$as_me:21590: creating $ac_file" >&5
24278+  test x"$ac_file" != x- && { echo "$as_me:21599: creating $ac_file" >&5
24279 echo "$as_me: creating $ac_file" >&6;}
24280
24281   # First look for the input files in the build tree, otherwise in the
24282@@ -21598,7 +21607,7 @@
24283       -) echo $tmp/stdin ;;
24284       [\\/$]*)
24285          # Absolute (can't be DOS-style, as IFS=:)
24286-         test -f "$f" || { { echo "$as_me:21601: error: cannot find input file: $f" >&5
24287+         test -f "$f" || { { echo "$as_me:21610: error: cannot find input file: $f" >&5
24288 echo "$as_me: error: cannot find input file: $f" >&2;}
24289    { (exit 1); exit 1; }; }
24290          echo $f;;
24291@@ -21611,7 +21620,7 @@
24292            echo $srcdir/$f
24293          else
24294            # /dev/null tree
24295-           { { echo "$as_me:21614: error: cannot find input file: $f" >&5
24296+           { { echo "$as_me:21623: error: cannot find input file: $f" >&5
24297 echo "$as_me: error: cannot find input file: $f" >&2;}
24298    { (exit 1); exit 1; }; }
24299          fi;;
24300@@ -21669,7 +21678,7 @@
24301   rm -f $tmp/in
24302   if test x"$ac_file" != x-; then
24303     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
24304-      { echo "$as_me:21672: $ac_file is unchanged" >&5
24305+      { echo "$as_me:21681: $ac_file is unchanged" >&5
24306 echo "$as_me: $ac_file is unchanged" >&6;}
24307     else
24308       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
24309Index: test/configure.in
24310Prereq:  1.154
24311--- ncurses-6.1-20191228+/test/configure.in	2019-04-13 22:51:52.000000000 +0000
24312+++ ncurses-6.1-20200104/test/configure.in	2019-12-31 09:42:42.000000000 +0000
24313@@ -28,7 +28,7 @@
24314 dnl
24315 dnl Author: Thomas E. Dickey 1996-on
24316 dnl
24317-dnl $Id: configure.in,v 1.154 2019/04/13 22:51:52 tom Exp $
24318+dnl $Id: configure.in,v 1.155 2019/12/31 09:42:42 tom Exp $
24319 dnl This is a simple configuration-script for the ncurses test programs that
24320 dnl allows the test-directory to be separately configured against a reference
24321 dnl system (i.e., sysvr4 curses)
24322@@ -271,7 +271,7 @@
24323 	[cf_cv_have_termcap_h=no])])
24324 if test "x$cf_cv_have_termcap_h" = xyes
24325 then
24326-	AC_DEFINE(HAVE_TERMCAP_H)
24327+	AC_DEFINE(HAVE_TERMCAP_H,1,[Define to 1 if we can use termcap.h])
24328 else
24329 AC_CACHE_CHECK(if we can use ncurses/termcap.h,cf_cv_have_ncurses_termcap_h,[
24330 	AC_TRY_COMPILE([
24331@@ -287,7 +287,7 @@
24332 	[return 0;],
24333 	[cf_cv_have_ncurses_termcap_h=yes],
24334 	[cf_cv_have_ncurses_termcap_h=no])])
24335-test "x$cf_cv_have_ncurses_termcap_h" = xyes && AC_DEFINE(HAVE_NCURSES_TERMCAP_H)
24336+test "x$cf_cv_have_ncurses_termcap_h" = xyes && AC_DEFINE(HAVE_NCURSES_TERMCAP_H,1,[Define to 1 if we can use ncurses/termcap.h])
24337 fi
24338
24339 if test "x$ac_cv_func_getopt" = xno; then
24340@@ -426,7 +426,7 @@
24341 	[cf_cv_use_pthreads=yes],
24342 	[cf_cv_use_pthreads=no])
24343 ])
24344-test $cf_cv_use_pthreads = yes && AC_DEFINE(USE_PTHREADS)
24345+test $cf_cv_use_pthreads = yes && AC_DEFINE(USE_PTHREADS,1,[Define to 1 if $cf_cv_screen library uses pthreads])
24346
24347 CF_SYS_TIME_SELECT
24348
24349Index: test/package/debian-mingw/copyright
24350--- ncurses-6.1-20191228+/test/package/debian-mingw/copyright	2019-01-05 23:51:47.000000000 +0000
24351+++ ncurses-6.1-20200104/test/package/debian-mingw/copyright	2020-01-04 14:49:29.000000000 +0000
24352@@ -4,11 +4,11 @@
24353
24354 -------------------------------------------------------------------------------
24355 Files: *
24356-Copyright: 1998-2018,2019 Free Software Foundation, Inc.
24357+Copyright: 1998-2019,2020 Free Software Foundation, Inc.
24358 Licence: X11
24359
24360 Files: aclocal.m4 package
24361-Copyright: 2003-2018,2019 by Thomas E. Dickey
24362+Copyright: 2003-2019,2020 by Thomas E. Dickey
24363 Licence: X11
24364
24365     Permission is hereby granted, free of charge, to any person obtaining a
24366Index: test/package/debian-mingw64/copyright
24367--- ncurses-6.1-20191228+/test/package/debian-mingw64/copyright	2019-01-05 23:51:47.000000000 +0000
24368+++ ncurses-6.1-20200104/test/package/debian-mingw64/copyright	2020-01-04 14:49:29.000000000 +0000
24369@@ -4,11 +4,11 @@
24370
24371 -------------------------------------------------------------------------------
24372 Files: *
24373-Copyright: 1998-2018,2019 Free Software Foundation, Inc.
24374+Copyright: 1998-2019,2020 Free Software Foundation, Inc.
24375 Licence: X11
24376
24377 Files: aclocal.m4 package
24378-Copyright: 2003-2018,2019 by Thomas E. Dickey
24379+Copyright: 2003-2019,2020 by Thomas E. Dickey
24380 Licence: X11
24381
24382     Permission is hereby granted, free of charge, to any person obtaining a
24383Index: test/package/debian/copyright
24384--- ncurses-6.1-20191228+/test/package/debian/copyright	2019-01-05 23:51:47.000000000 +0000
24385+++ ncurses-6.1-20200104/test/package/debian/copyright	2020-01-04 14:49:29.000000000 +0000
24386@@ -4,11 +4,11 @@
24387
24388 -------------------------------------------------------------------------------
24389 Files: *
24390-Copyright: 1998-2018,2019 Free Software Foundation, Inc.
24391+Copyright: 1998-2019,2020 Free Software Foundation, Inc.
24392 Licence: X11
24393
24394 Files: aclocal.m4 package
24395-Copyright: 2003-2018,2019 by Thomas E. Dickey
24396+Copyright: 2003-2019,2020 by Thomas E. Dickey
24397 Licence: X11
24398
24399     Permission is hereby granted, free of charge, to any person obtaining a
24400