1# ncurses 6.1 - patch 20200111 - 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-20200111.patch.gz
14# patch by Thomas E. Dickey <dickey@invisible-island.net>
15# created  Sun Jan 12 02:31:09 UTC 2020
16# ------------------------------------------------------------------------------
17# Ada95/aclocal.m4                 |  119 ++
18# Ada95/configure                  |  531 +++++-----
19# Ada95/configure.in               |   14
20# NEWS                             |   10
21# VERSION                          |    2
22# aclocal.m4                       |   59 -
23# config.guess                     |   13
24# config.sub                       |   27
25# configure                        | 1933 ++++++++++++++++++-------------------
26# configure.in                     |   14
27# dist.mk                          |    4
28# package/debian-mingw/changelog   |    4
29# package/debian-mingw64/changelog |    4
30# package/debian/changelog         |    4
31# package/mingw-ncurses.nsi        |    4
32# package/mingw-ncurses.spec       |    2
33# package/ncurses.spec             |    2
34# package/ncursest.spec            |    2
35# test/aclocal.m4                  |  106 +-
36# test/configure                   | 1734 +++++++++++++++++----------------
37# test/configure.in                |    7
38# 21 files changed, 2450 insertions(+), 2145 deletions(-)
39# ------------------------------------------------------------------------------
40Index: Ada95/aclocal.m4
41Prereq:  1.148
42--- ncurses-6.1-20200104+/Ada95/aclocal.m4	2019-12-31 14:00:55.000000000 +0000
43+++ ncurses-6.1-20200111/Ada95/aclocal.m4	2020-01-11 23:42:04.000000000 +0000
44@@ -1,5 +1,5 @@
45 dnl***************************************************************************
46-dnl Copyright (c) 2010-2018,2019 Free Software Foundation, Inc.              *
47+dnl Copyright (c) 2010-2019,2020 Free Software Foundation, Inc.              *
48 dnl                                                                          *
49 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
50 dnl copy of this software and associated documentation files (the            *
51@@ -28,14 +28,16 @@
52 dnl
53 dnl Author: Thomas E. Dickey
54 dnl
55-dnl $Id: aclocal.m4,v 1.148 2019/12/31 14:00:55 tom Exp $
56+dnl $Id: aclocal.m4,v 1.151 2020/01/11 23:42:04 tom Exp $
57 dnl Macros used in NCURSES Ada95 auto-configuration script.
58 dnl
59 dnl These macros are maintained separately from NCURSES.  The copyright on
60 dnl this file applies to the aggregation of macros and does not affect use of
61 dnl these macros in other applications.
62 dnl
63-dnl See https://invisible-island.net/autoconf/ for additional information.
64+dnl See these pages for additional information:
65+dnl		https://invisible-island.net/autoconf/
66+dnl		https://invisible-island.net/autoconf/my-autoconf.html
67 dnl
68 dnl ---------------------------------------------------------------------------
69 dnl ---------------------------------------------------------------------------
70@@ -726,7 +728,7 @@
71 fi
72 ])
73 dnl ---------------------------------------------------------------------------
74-dnl CF_CONST_X_STRING version: 1 updated: 2019/04/08 17:50:29
75+dnl CF_CONST_X_STRING version: 3 updated: 2020/01/11 18:39:22
76 dnl -----------------
77 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
78 dnl character-strings.
79@@ -747,6 +749,10 @@
80 dnl compiler that String is const.
81 AC_DEFUN([CF_CONST_X_STRING],
82 [
83+AC_REQUIRE([AC_PATH_XTRA])
84+
85+CF_SAVE_XTRA_FLAGS([CF_CONST_X_STRING])
86+
87 AC_TRY_COMPILE(
88 [
89 #include <stdlib.h>
90@@ -768,6 +774,68 @@
91 		])
92 ])
93
94+CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING])
95+
96+case $cf_cv_const_x_string in
97+(no)
98+	CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
99+	;;
100+(*)
101+	CF_APPEND_TEXT(CPPFLAGS,-D_CONST_X_STRING)
102+	;;
103+esac
104+
105+])
106+])dnl
107+dnl ---------------------------------------------------------------------------
108+dnl CF_CONST_X_STRING version: 3 updated: 2020/01/11 18:39:22
109+dnl -----------------
110+dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
111+dnl character-strings.
112+dnl
113+dnl It is ambiguous because the specification accommodated the pre-ANSI
114+dnl compilers bundled by more than one vendor in lieu of providing a standard C
115+dnl compiler other than by costly add-ons.  Because of this, the specification
116+dnl did not take into account the use of const for telling the compiler that
117+dnl string literals would be in readonly memory.
118+dnl
119+dnl As a workaround, one could (starting with X11R5) define XTSTRINGDEFINES, to
120+dnl let the compiler decide how to represent Xt's strings which were #define'd.
121+dnl That does not solve the problem of using the block of Xt's strings which
122+dnl are compiled into the library (and is less efficient than one might want).
123+dnl
124+dnl Xt specification 7 introduces the _CONST_X_STRING symbol which is used both
125+dnl when compiling the library and compiling using the library, to tell the
126+dnl compiler that String is const.
127+AC_DEFUN([CF_CONST_X_STRING],
128+[
129+AC_REQUIRE([AC_PATH_XTRA])
130+
131+CF_SAVE_XTRA_FLAGS([CF_CONST_X_STRING])
132+
133+AC_TRY_COMPILE(
134+[
135+#include <stdlib.h>
136+#include <X11/Intrinsic.h>
137+],
138+[String foo = malloc(1)],[
139+
140+AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
141+	AC_TRY_COMPILE(
142+		[
143+#define _CONST_X_STRING	/* X11R7.8 (perhaps) */
144+#undef  XTSTRINGDEFINES	/* X11R5 and later */
145+#include <stdlib.h>
146+#include <X11/Intrinsic.h>
147+		],[String foo = malloc(1); *foo = 0],[
148+			cf_cv_const_x_string=no
149+		],[
150+			cf_cv_const_x_string=yes
151+		])
152+])
153+
154+CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING])
155+
156 case $cf_cv_const_x_string in
157 (no)
158 	CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
159@@ -1187,12 +1255,13 @@
160 CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
161 ])dnl
162 dnl ---------------------------------------------------------------------------
163-dnl CF_GCC_WARNINGS version: 36 updated: 2019/09/07 13:38:36
164+dnl CF_GCC_WARNINGS version: 37 updated: 2020/01/05 20:04:12
165 dnl ---------------
166 dnl Check if the compiler supports useful warning options.  There's a few that
167 dnl we don't use, simply because they're too noisy:
168 dnl
169 dnl	-Wconversion (useful in older versions of gcc, but not in gcc 2.7.x)
170+dnl	-Winline (usually not worthwhile)
171 dnl	-Wredundant-decls (system headers make this too noisy)
172 dnl	-Wtraditional (combines too many unrelated messages, only a few useful)
173 dnl	-Wwrite-strings (too noisy, but should review occasionally).  This
174@@ -1248,7 +1317,7 @@
175 		fi
176 	done
177 	CFLAGS="$cf_save_CFLAGS"
178-elif test "$GCC" = yes
179+elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
180 then
181 	AC_CHECKING([for $CC warning options])
182 	cf_save_CFLAGS="$CFLAGS"
183@@ -1270,7 +1339,7 @@
184 		Wpointer-arith \
185 		Wshadow \
186 		Wstrict-prototypes \
187-		Wundef $cf_gcc_warnings $cf_warn_CONST $1
188+		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST $1
189 	do
190 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
191 		if AC_TRY_EVAL(ac_compile); then
192@@ -3328,6 +3397,42 @@
193 $1=`echo "$2" | sed -e 's/-l$3[[ 	]]//g' -e 's/-l$3[$]//'`
194 ])dnl
195 dnl ---------------------------------------------------------------------------
196+dnl CF_RESTORE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:47:45
197+dnl ---------------------
198+dnl Restore flags saved in CF_SAVE_XTRA_FLAGS
199+dnl $1 = name of current macro
200+define([CF_RESTORE_XTRA_FLAGS],
201+[
202+LIBS="$cf_save_LIBS_$1"
203+CFLAGS="$cf_save_CFLAGS_$1"
204+CPPFLAGS="$cf_save_CPPFLAGS_$1"
205+])dnl
206+dnl ---------------------------------------------------------------------------
207+dnl CF_SAVE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:46:44
208+dnl ------------------
209+dnl Use this macro to save CFLAGS/CPPFLAGS/LIBS before checks against X headers
210+dnl and libraries which do not update those variables.
211+dnl
212+dnl $1 = name of current macro
213+define([CF_SAVE_XTRA_FLAGS],
214+[
215+cf_save_LIBS_$1="$LIBS"
216+cf_save_CFLAGS_$1="$CFLAGS"
217+cf_save_CPPFLAGS_$1="$CPPFLAGS"
218+LIBS="$LIBS ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}"
219+for cf_X_CFLAGS in $X_CFLAGS
220+do
221+	case "x$cf_X_CFLAGS" in
222+	x-[[IUD]]*)
223+		CPPFLAGS="$CPPFLAGS $cf_X_CFLAGS"
224+		;;
225+	*)
226+		CFLAGS="$CFLAGS $cf_X_CFLAGS"
227+		;;
228+	esac
229+done
230+])dnl
231+dnl ---------------------------------------------------------------------------
232 dnl CF_SHARED_OPTS version: 93 updated: 2018/08/18 16:36:35
233 dnl --------------
234 dnl --------------
235Index: Ada95/configure
236--- ncurses-6.1-20200104+/Ada95/configure	2019-12-31 14:01:23.000000000 +0000
237+++ ncurses-6.1-20200111/Ada95/configure	2020-01-11 23:43:11.000000000 +0000
238@@ -1,7 +1,7 @@
239 #! /bin/sh
240-# From configure.in Revision: 1.73 .
241+# From configure.in Revision: 1.74 .
242 # Guess values for system-dependent variables and create Makefiles.
243-# Generated by Autoconf 2.52.20190901.
244+# Generated by Autoconf 2.52.20200111.
245 #
246 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
247 # Free Software Foundation, Inc.
248@@ -818,7 +818,7 @@
249 running configure, to aid debugging if configure makes a mistake.
250
251 It was created by $as_me, which was
252-generated by GNU Autoconf 2.52.20190901.  Invocation command line was
253+generated by GNU Autoconf 2.52.20200111.  Invocation command line was
254
255   $ $0 $@
256
257@@ -13818,8 +13818,25 @@
258  	ADAFLAGS="$ADAFLAGS -gnatg"
259
260 if test "x$have_x" = xyes; then
261+
262+cf_save_LIBS_CF_CONST_X_STRING="$LIBS"
263+cf_save_CFLAGS_CF_CONST_X_STRING="$CFLAGS"
264+cf_save_CPPFLAGS_CF_CONST_X_STRING="$CPPFLAGS"
265+LIBS="$LIBS ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}"
266+for cf_X_CFLAGS in $X_CFLAGS
267+do
268+	case "x$cf_X_CFLAGS" in
269+	x-[IUD]*)
270+		CPPFLAGS="$CPPFLAGS $cf_X_CFLAGS"
271+		;;
272+	*)
273+		CFLAGS="$CFLAGS $cf_X_CFLAGS"
274+		;;
275+	esac
276+done
277+
278 cat >conftest.$ac_ext <<_ACEOF
279-#line 13822 "configure"
280+#line 13839 "configure"
281 #include "confdefs.h"
282
283 #include <stdlib.h>
284@@ -13834,26 +13851,26 @@
285 }
286 _ACEOF
287 rm -f conftest.$ac_objext
288-if { (eval echo "$as_me:13837: \"$ac_compile\"") >&5
289+if { (eval echo "$as_me:13854: \"$ac_compile\"") >&5
290   (eval $ac_compile) 2>&5
291   ac_status=$?
292-  echo "$as_me:13840: \$? = $ac_status" >&5
293+  echo "$as_me:13857: \$? = $ac_status" >&5
294   (exit $ac_status); } &&
295          { ac_try='test -s conftest.$ac_objext'
296-  { (eval echo "$as_me:13843: \"$ac_try\"") >&5
297+  { (eval echo "$as_me:13860: \"$ac_try\"") >&5
298   (eval $ac_try) 2>&5
299   ac_status=$?
300-  echo "$as_me:13846: \$? = $ac_status" >&5
301+  echo "$as_me:13863: \$? = $ac_status" >&5
302   (exit $ac_status); }; }; then
303
304-echo "$as_me:13849: checking for X11/Xt const-feature" >&5
305+echo "$as_me:13866: checking for X11/Xt const-feature" >&5
306 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
307 if test "${cf_cv_const_x_string+set}" = set; then
308   echo $ECHO_N "(cached) $ECHO_C" >&6
309 else
310
311 	cat >conftest.$ac_ext <<_ACEOF
312-#line 13856 "configure"
313+#line 13873 "configure"
314 #include "confdefs.h"
315
316 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
317@@ -13870,16 +13887,16 @@
318 }
319 _ACEOF
320 rm -f conftest.$ac_objext
321-if { (eval echo "$as_me:13873: \"$ac_compile\"") >&5
322+if { (eval echo "$as_me:13890: \"$ac_compile\"") >&5
323   (eval $ac_compile) 2>&5
324   ac_status=$?
325-  echo "$as_me:13876: \$? = $ac_status" >&5
326+  echo "$as_me:13893: \$? = $ac_status" >&5
327   (exit $ac_status); } &&
328          { ac_try='test -s conftest.$ac_objext'
329-  { (eval echo "$as_me:13879: \"$ac_try\"") >&5
330+  { (eval echo "$as_me:13896: \"$ac_try\"") >&5
331   (eval $ac_try) 2>&5
332   ac_status=$?
333-  echo "$as_me:13882: \$? = $ac_status" >&5
334+  echo "$as_me:13899: \$? = $ac_status" >&5
335   (exit $ac_status); }; }; then
336
337 			cf_cv_const_x_string=no
338@@ -13894,9 +13911,13 @@
339 rm -f conftest.$ac_objext conftest.$ac_ext
340
341 fi
342-echo "$as_me:13897: result: $cf_cv_const_x_string" >&5
343+echo "$as_me:13914: result: $cf_cv_const_x_string" >&5
344 echo "${ECHO_T}$cf_cv_const_x_string" >&6
345
346+LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
347+CFLAGS="$cf_save_CFLAGS_CF_CONST_X_STRING"
348+CPPFLAGS="$cf_save_CPPFLAGS_CF_CONST_X_STRING"
349+
350 case $cf_cv_const_x_string in
351 (no)
352
353@@ -13919,7 +13940,7 @@
354 rm -f conftest.$ac_objext conftest.$ac_ext
355  fi
356 cat > conftest.$ac_ext <<EOF
357-#line 13922 "${as_me:-configure}"
358+#line 13943 "${as_me:-configure}"
359 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
360 EOF
361 if test "$INTEL_COMPILER" = yes
362@@ -13935,7 +13956,7 @@
363 # remark #981: operands are evaluated in unspecified order
364 # warning #279: controlling expression is constant
365
366-	{ echo "$as_me:13938: checking for $CC warning options..." >&5
367+	{ echo "$as_me:13959: checking for $CC warning options..." >&5
368 echo "$as_me: checking for $CC warning options..." >&6;}
369 	cf_save_CFLAGS="$CFLAGS"
370 	EXTRA_CFLAGS="-Wall"
371@@ -13951,20 +13972,20 @@
372 		wd981
373 	do
374 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
375-		if { (eval echo "$as_me:13954: \"$ac_compile\"") >&5
376+		if { (eval echo "$as_me:13975: \"$ac_compile\"") >&5
377   (eval $ac_compile) 2>&5
378   ac_status=$?
379-  echo "$as_me:13957: \$? = $ac_status" >&5
380+  echo "$as_me:13978: \$? = $ac_status" >&5
381   (exit $ac_status); }; then
382-			test -n "$verbose" && echo "$as_me:13959: result: ... -$cf_opt" >&5
383+			test -n "$verbose" && echo "$as_me:13980: result: ... -$cf_opt" >&5
384 echo "${ECHO_T}... -$cf_opt" >&6
385 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
386 		fi
387 	done
388 	CFLAGS="$cf_save_CFLAGS"
389-elif test "$GCC" = yes
390+elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
391 then
392-	{ echo "$as_me:13967: checking for $CC warning options..." >&5
393+	{ echo "$as_me:13988: checking for $CC warning options..." >&5
394 echo "$as_me: checking for $CC warning options..." >&6;}
395 	cf_save_CFLAGS="$CFLAGS"
396 	EXTRA_CFLAGS=
397@@ -13985,15 +14006,15 @@
398 		Wpointer-arith \
399 		Wshadow \
400 		Wstrict-prototypes \
401-		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
402+		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
403 	do
404 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
405-		if { (eval echo "$as_me:13991: \"$ac_compile\"") >&5
406+		if { (eval echo "$as_me:14012: \"$ac_compile\"") >&5
407   (eval $ac_compile) 2>&5
408   ac_status=$?
409-  echo "$as_me:13994: \$? = $ac_status" >&5
410+  echo "$as_me:14015: \$? = $ac_status" >&5
411   (exit $ac_status); }; then
412-			test -n "$verbose" && echo "$as_me:13996: result: ... -$cf_opt" >&5
413+			test -n "$verbose" && echo "$as_me:14017: result: ... -$cf_opt" >&5
414 echo "${ECHO_T}... -$cf_opt" >&6
415 			case $cf_opt in
416 			(Winline)
417@@ -14001,7 +14022,7 @@
418 				([34].*)
419 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
420
421-echo "${as_me:-configure}:14004: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
422+echo "${as_me:-configure}:14025: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
423
424 					continue;;
425 				esac
426@@ -14011,7 +14032,7 @@
427 				([12].*)
428 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
429
430-echo "${as_me:-configure}:14014: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
431+echo "${as_me:-configure}:14035: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
432
433 					continue;;
434 				esac
435@@ -14044,10 +14065,10 @@
436 EOF
437 if test "$GCC" = yes
438 then
439-	{ echo "$as_me:14047: checking for $CC __attribute__ directives..." >&5
440+	{ echo "$as_me:14068: checking for $CC __attribute__ directives..." >&5
441 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
442 cat > conftest.$ac_ext <<EOF
443-#line 14050 "${as_me:-configure}"
444+#line 14071 "${as_me:-configure}"
445 #include "confdefs.h"
446 #include "conftest.h"
447 #include "conftest.i"
448@@ -14096,12 +14117,12 @@
449 			;;
450 		esac
451
452-		if { (eval echo "$as_me:14099: \"$ac_compile\"") >&5
453+		if { (eval echo "$as_me:14120: \"$ac_compile\"") >&5
454   (eval $ac_compile) 2>&5
455   ac_status=$?
456-  echo "$as_me:14102: \$? = $ac_status" >&5
457+  echo "$as_me:14123: \$? = $ac_status" >&5
458   (exit $ac_status); }; then
459-			test -n "$verbose" && echo "$as_me:14104: result: ... $cf_attribute" >&5
460+			test -n "$verbose" && echo "$as_me:14125: result: ... $cf_attribute" >&5
461 echo "${ECHO_T}... $cf_attribute" >&6
462 			cat conftest.h >>confdefs.h
463 			case $cf_attribute in
464@@ -14161,7 +14182,7 @@
465 fi
466
467 ###	use option --enable-assertions to turn on generation of assertion code
468-echo "$as_me:14164: checking if you want to enable runtime assertions" >&5
469+echo "$as_me:14185: checking if you want to enable runtime assertions" >&5
470 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
471
472 # Check whether --enable-assertions or --disable-assertions was given.
473@@ -14171,7 +14192,7 @@
474 else
475   with_assertions=no
476 fi;
477-echo "$as_me:14174: result: $with_assertions" >&5
478+echo "$as_me:14195: result: $with_assertions" >&5
479 echo "${ECHO_T}$with_assertions" >&6
480 if test -n "$GCC"
481 then
482@@ -14224,7 +14245,7 @@
483 	;;
484 esac
485
486-echo "$as_me:14227: checking whether to add trace feature to all models" >&5
487+echo "$as_me:14248: checking whether to add trace feature to all models" >&5
488 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
489
490 # Check whether --with-trace or --without-trace was given.
491@@ -14234,7 +14255,7 @@
492 else
493   cf_with_trace=$cf_all_traces
494 fi;
495-echo "$as_me:14237: result: $cf_with_trace" >&5
496+echo "$as_me:14258: result: $cf_with_trace" >&5
497 echo "${ECHO_T}$cf_with_trace" >&6
498
499 if test "$cf_with_trace" = yes ; then
500@@ -14342,7 +14363,7 @@
501 	ADA_TRACE=FALSE
502 fi
503
504-echo "$as_me:14345: checking if we want to use GNAT projects" >&5
505+echo "$as_me:14366: checking if we want to use GNAT projects" >&5
506 echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
507
508 # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
509@@ -14359,7 +14380,7 @@
510 	enable_gnat_projects=yes
511
512 fi;
513-echo "$as_me:14362: result: $enable_gnat_projects" >&5
514+echo "$as_me:14383: result: $enable_gnat_projects" >&5
515 echo "${ECHO_T}$enable_gnat_projects" >&6
516
517 ###	Checks for libraries.
518@@ -14367,13 +14388,13 @@
519 (*mingw32*)
520 	;;
521 (*)
522-echo "$as_me:14370: checking for gettimeofday" >&5
523+echo "$as_me:14391: checking for gettimeofday" >&5
524 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
525 if test "${ac_cv_func_gettimeofday+set}" = set; then
526   echo $ECHO_N "(cached) $ECHO_C" >&6
527 else
528   cat >conftest.$ac_ext <<_ACEOF
529-#line 14376 "configure"
530+#line 14397 "configure"
531 #include "confdefs.h"
532 #define gettimeofday autoconf_temporary
533 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
534@@ -14404,16 +14425,16 @@
535 }
536 _ACEOF
537 rm -f conftest.$ac_objext conftest$ac_exeext
538-if { (eval echo "$as_me:14407: \"$ac_link\"") >&5
539+if { (eval echo "$as_me:14428: \"$ac_link\"") >&5
540   (eval $ac_link) 2>&5
541   ac_status=$?
542-  echo "$as_me:14410: \$? = $ac_status" >&5
543+  echo "$as_me:14431: \$? = $ac_status" >&5
544   (exit $ac_status); } &&
545          { ac_try='test -s conftest$ac_exeext'
546-  { (eval echo "$as_me:14413: \"$ac_try\"") >&5
547+  { (eval echo "$as_me:14434: \"$ac_try\"") >&5
548   (eval $ac_try) 2>&5
549   ac_status=$?
550-  echo "$as_me:14416: \$? = $ac_status" >&5
551+  echo "$as_me:14437: \$? = $ac_status" >&5
552   (exit $ac_status); }; }; then
553   ac_cv_func_gettimeofday=yes
554 else
555@@ -14423,7 +14444,7 @@
556 fi
557 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
558 fi
559-echo "$as_me:14426: result: $ac_cv_func_gettimeofday" >&5
560+echo "$as_me:14447: result: $ac_cv_func_gettimeofday" >&5
561 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
562 if test $ac_cv_func_gettimeofday = yes; then
563   cat >>confdefs.h <<\EOF
564@@ -14432,7 +14453,7 @@
565
566 else
567
568-echo "$as_me:14435: checking for gettimeofday in -lbsd" >&5
569+echo "$as_me:14456: checking for gettimeofday in -lbsd" >&5
570 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
571 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
572   echo $ECHO_N "(cached) $ECHO_C" >&6
573@@ -14440,7 +14461,7 @@
574   ac_check_lib_save_LIBS=$LIBS
575 LIBS="-lbsd  $LIBS"
576 cat >conftest.$ac_ext <<_ACEOF
577-#line 14443 "configure"
578+#line 14464 "configure"
579 #include "confdefs.h"
580
581 /* Override any gcc2 internal prototype to avoid an error.  */
582@@ -14459,16 +14480,16 @@
583 }
584 _ACEOF
585 rm -f conftest.$ac_objext conftest$ac_exeext
586-if { (eval echo "$as_me:14462: \"$ac_link\"") >&5
587+if { (eval echo "$as_me:14483: \"$ac_link\"") >&5
588   (eval $ac_link) 2>&5
589   ac_status=$?
590-  echo "$as_me:14465: \$? = $ac_status" >&5
591+  echo "$as_me:14486: \$? = $ac_status" >&5
592   (exit $ac_status); } &&
593          { ac_try='test -s conftest$ac_exeext'
594-  { (eval echo "$as_me:14468: \"$ac_try\"") >&5
595+  { (eval echo "$as_me:14489: \"$ac_try\"") >&5
596   (eval $ac_try) 2>&5
597   ac_status=$?
598-  echo "$as_me:14471: \$? = $ac_status" >&5
599+  echo "$as_me:14492: \$? = $ac_status" >&5
600   (exit $ac_status); }; }; then
601   ac_cv_lib_bsd_gettimeofday=yes
602 else
603@@ -14479,7 +14500,7 @@
604 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
605 LIBS=$ac_check_lib_save_LIBS
606 fi
607-echo "$as_me:14482: result: $ac_cv_lib_bsd_gettimeofday" >&5
608+echo "$as_me:14503: result: $ac_cv_lib_bsd_gettimeofday" >&5
609 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
610 if test $ac_cv_lib_bsd_gettimeofday = yes; then
611
612@@ -14495,13 +14516,13 @@
613 esac
614
615 ###	Checks for header files.
616-echo "$as_me:14498: checking for ANSI C header files" >&5
617+echo "$as_me:14519: checking for ANSI C header files" >&5
618 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
619 if test "${ac_cv_header_stdc+set}" = set; then
620   echo $ECHO_N "(cached) $ECHO_C" >&6
621 else
622   cat >conftest.$ac_ext <<_ACEOF
623-#line 14504 "configure"
624+#line 14525 "configure"
625 #include "confdefs.h"
626 #include <stdlib.h>
627 #include <stdarg.h>
628@@ -14509,13 +14530,13 @@
629 #include <float.h>
630
631 _ACEOF
632-if { (eval echo "$as_me:14512: \"$ac_cpp conftest.$ac_ext\"") >&5
633+if { (eval echo "$as_me:14533: \"$ac_cpp conftest.$ac_ext\"") >&5
634   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
635   ac_status=$?
636   egrep -v '^ *\+' conftest.er1 >conftest.err
637   rm -f conftest.er1
638   cat conftest.err >&5
639-  echo "$as_me:14518: \$? = $ac_status" >&5
640+  echo "$as_me:14539: \$? = $ac_status" >&5
641   (exit $ac_status); } >/dev/null; then
642   if test -s conftest.err; then
643     ac_cpp_err=$ac_c_preproc_warn_flag
644@@ -14537,7 +14558,7 @@
645 if test $ac_cv_header_stdc = yes; then
646   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
647   cat >conftest.$ac_ext <<_ACEOF
648-#line 14540 "configure"
649+#line 14561 "configure"
650 #include "confdefs.h"
651 #include <string.h>
652
653@@ -14555,7 +14576,7 @@
654 if test $ac_cv_header_stdc = yes; then
655   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
656   cat >conftest.$ac_ext <<_ACEOF
657-#line 14558 "configure"
658+#line 14579 "configure"
659 #include "confdefs.h"
660 #include <stdlib.h>
661
662@@ -14576,7 +14597,7 @@
663   :
664 else
665   cat >conftest.$ac_ext <<_ACEOF
666-#line 14579 "configure"
667+#line 14600 "configure"
668 #include "confdefs.h"
669 #include <ctype.h>
670 #if ((' ' & 0x0FF) == 0x020)
671@@ -14602,15 +14623,15 @@
672 }
673 _ACEOF
674 rm -f conftest$ac_exeext
675-if { (eval echo "$as_me:14605: \"$ac_link\"") >&5
676+if { (eval echo "$as_me:14626: \"$ac_link\"") >&5
677   (eval $ac_link) 2>&5
678   ac_status=$?
679-  echo "$as_me:14608: \$? = $ac_status" >&5
680+  echo "$as_me:14629: \$? = $ac_status" >&5
681   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
682-  { (eval echo "$as_me:14610: \"$ac_try\"") >&5
683+  { (eval echo "$as_me:14631: \"$ac_try\"") >&5
684   (eval $ac_try) 2>&5
685   ac_status=$?
686-  echo "$as_me:14613: \$? = $ac_status" >&5
687+  echo "$as_me:14634: \$? = $ac_status" >&5
688   (exit $ac_status); }; }; then
689   :
690 else
691@@ -14623,7 +14644,7 @@
692 fi
693 fi
694 fi
695-echo "$as_me:14626: result: $ac_cv_header_stdc" >&5
696+echo "$as_me:14647: result: $ac_cv_header_stdc" >&5
697 echo "${ECHO_T}$ac_cv_header_stdc" >&6
698 if test $ac_cv_header_stdc = yes; then
699
700@@ -14639,28 +14660,28 @@
701                   inttypes.h stdint.h unistd.h
702 do
703 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
704-echo "$as_me:14642: checking for $ac_header" >&5
705+echo "$as_me:14663: checking for $ac_header" >&5
706 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
707 if eval "test \"\${$as_ac_Header+set}\" = set"; then
708   echo $ECHO_N "(cached) $ECHO_C" >&6
709 else
710   cat >conftest.$ac_ext <<_ACEOF
711-#line 14648 "configure"
712+#line 14669 "configure"
713 #include "confdefs.h"
714 $ac_includes_default
715 #include <$ac_header>
716 _ACEOF
717 rm -f conftest.$ac_objext
718-if { (eval echo "$as_me:14654: \"$ac_compile\"") >&5
719+if { (eval echo "$as_me:14675: \"$ac_compile\"") >&5
720   (eval $ac_compile) 2>&5
721   ac_status=$?
722-  echo "$as_me:14657: \$? = $ac_status" >&5
723+  echo "$as_me:14678: \$? = $ac_status" >&5
724   (exit $ac_status); } &&
725          { ac_try='test -s conftest.$ac_objext'
726-  { (eval echo "$as_me:14660: \"$ac_try\"") >&5
727+  { (eval echo "$as_me:14681: \"$ac_try\"") >&5
728   (eval $ac_try) 2>&5
729   ac_status=$?
730-  echo "$as_me:14663: \$? = $ac_status" >&5
731+  echo "$as_me:14684: \$? = $ac_status" >&5
732   (exit $ac_status); }; }; then
733   eval "$as_ac_Header=yes"
734 else
735@@ -14670,7 +14691,7 @@
736 fi
737 rm -f conftest.$ac_objext conftest.$ac_ext
738 fi
739-echo "$as_me:14673: result: `eval echo '${'$as_ac_Header'}'`" >&5
740+echo "$as_me:14694: result: `eval echo '${'$as_ac_Header'}'`" >&5
741 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
742 if test `eval echo '${'$as_ac_Header'}'` = yes; then
743   cat >>confdefs.h <<EOF
744@@ -14680,13 +14701,13 @@
745 fi
746 done
747
748-echo "$as_me:14683: checking for signed char" >&5
749+echo "$as_me:14704: checking for signed char" >&5
750 echo $ECHO_N "checking for signed char... $ECHO_C" >&6
751 if test "${ac_cv_type_signed_char+set}" = set; then
752   echo $ECHO_N "(cached) $ECHO_C" >&6
753 else
754   cat >conftest.$ac_ext <<_ACEOF
755-#line 14689 "configure"
756+#line 14710 "configure"
757 #include "confdefs.h"
758 $ac_includes_default
759 int
760@@ -14701,16 +14722,16 @@
761 }
762 _ACEOF
763 rm -f conftest.$ac_objext
764-if { (eval echo "$as_me:14704: \"$ac_compile\"") >&5
765+if { (eval echo "$as_me:14725: \"$ac_compile\"") >&5
766   (eval $ac_compile) 2>&5
767   ac_status=$?
768-  echo "$as_me:14707: \$? = $ac_status" >&5
769+  echo "$as_me:14728: \$? = $ac_status" >&5
770   (exit $ac_status); } &&
771          { ac_try='test -s conftest.$ac_objext'
772-  { (eval echo "$as_me:14710: \"$ac_try\"") >&5
773+  { (eval echo "$as_me:14731: \"$ac_try\"") >&5
774   (eval $ac_try) 2>&5
775   ac_status=$?
776-  echo "$as_me:14713: \$? = $ac_status" >&5
777+  echo "$as_me:14734: \$? = $ac_status" >&5
778   (exit $ac_status); }; }; then
779   ac_cv_type_signed_char=yes
780 else
781@@ -14720,10 +14741,10 @@
782 fi
783 rm -f conftest.$ac_objext conftest.$ac_ext
784 fi
785-echo "$as_me:14723: result: $ac_cv_type_signed_char" >&5
786+echo "$as_me:14744: result: $ac_cv_type_signed_char" >&5
787 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
788
789-echo "$as_me:14726: checking size of signed char" >&5
790+echo "$as_me:14747: checking size of signed char" >&5
791 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
792 if test "${ac_cv_sizeof_signed_char+set}" = set; then
793   echo $ECHO_N "(cached) $ECHO_C" >&6
794@@ -14732,7 +14753,7 @@
795   if test "$cross_compiling" = yes; then
796   # Depending upon the size, compute the lo and hi bounds.
797 cat >conftest.$ac_ext <<_ACEOF
798-#line 14735 "configure"
799+#line 14756 "configure"
800 #include "confdefs.h"
801 $ac_includes_default
802 int
803@@ -14744,21 +14765,21 @@
804 }
805 _ACEOF
806 rm -f conftest.$ac_objext
807-if { (eval echo "$as_me:14747: \"$ac_compile\"") >&5
808+if { (eval echo "$as_me:14768: \"$ac_compile\"") >&5
809   (eval $ac_compile) 2>&5
810   ac_status=$?
811-  echo "$as_me:14750: \$? = $ac_status" >&5
812+  echo "$as_me:14771: \$? = $ac_status" >&5
813   (exit $ac_status); } &&
814          { ac_try='test -s conftest.$ac_objext'
815-  { (eval echo "$as_me:14753: \"$ac_try\"") >&5
816+  { (eval echo "$as_me:14774: \"$ac_try\"") >&5
817   (eval $ac_try) 2>&5
818   ac_status=$?
819-  echo "$as_me:14756: \$? = $ac_status" >&5
820+  echo "$as_me:14777: \$? = $ac_status" >&5
821   (exit $ac_status); }; }; then
822   ac_lo=0 ac_mid=0
823   while :; do
824     cat >conftest.$ac_ext <<_ACEOF
825-#line 14761 "configure"
826+#line 14782 "configure"
827 #include "confdefs.h"
828 $ac_includes_default
829 int
830@@ -14770,16 +14791,16 @@
831 }
832 _ACEOF
833 rm -f conftest.$ac_objext
834-if { (eval echo "$as_me:14773: \"$ac_compile\"") >&5
835+if { (eval echo "$as_me:14794: \"$ac_compile\"") >&5
836   (eval $ac_compile) 2>&5
837   ac_status=$?
838-  echo "$as_me:14776: \$? = $ac_status" >&5
839+  echo "$as_me:14797: \$? = $ac_status" >&5
840   (exit $ac_status); } &&
841          { ac_try='test -s conftest.$ac_objext'
842-  { (eval echo "$as_me:14779: \"$ac_try\"") >&5
843+  { (eval echo "$as_me:14800: \"$ac_try\"") >&5
844   (eval $ac_try) 2>&5
845   ac_status=$?
846-  echo "$as_me:14782: \$? = $ac_status" >&5
847+  echo "$as_me:14803: \$? = $ac_status" >&5
848   (exit $ac_status); }; }; then
849   ac_hi=$ac_mid; break
850 else
851@@ -14795,7 +14816,7 @@
852 ac_hi=-1 ac_mid=-1
853   while :; do
854     cat >conftest.$ac_ext <<_ACEOF
855-#line 14798 "configure"
856+#line 14819 "configure"
857 #include "confdefs.h"
858 $ac_includes_default
859 int
860@@ -14807,16 +14828,16 @@
861 }
862 _ACEOF
863 rm -f conftest.$ac_objext
864-if { (eval echo "$as_me:14810: \"$ac_compile\"") >&5
865+if { (eval echo "$as_me:14831: \"$ac_compile\"") >&5
866   (eval $ac_compile) 2>&5
867   ac_status=$?
868-  echo "$as_me:14813: \$? = $ac_status" >&5
869+  echo "$as_me:14834: \$? = $ac_status" >&5
870   (exit $ac_status); } &&
871          { ac_try='test -s conftest.$ac_objext'
872-  { (eval echo "$as_me:14816: \"$ac_try\"") >&5
873+  { (eval echo "$as_me:14837: \"$ac_try\"") >&5
874   (eval $ac_try) 2>&5
875   ac_status=$?
876-  echo "$as_me:14819: \$? = $ac_status" >&5
877+  echo "$as_me:14840: \$? = $ac_status" >&5
878   (exit $ac_status); }; }; then
879   ac_lo=$ac_mid; break
880 else
881@@ -14832,7 +14853,7 @@
882 while test "x$ac_lo" != "x$ac_hi"; do
883   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
884   cat >conftest.$ac_ext <<_ACEOF
885-#line 14835 "configure"
886+#line 14856 "configure"
887 #include "confdefs.h"
888 $ac_includes_default
889 int
890@@ -14844,16 +14865,16 @@
891 }
892 _ACEOF
893 rm -f conftest.$ac_objext
894-if { (eval echo "$as_me:14847: \"$ac_compile\"") >&5
895+if { (eval echo "$as_me:14868: \"$ac_compile\"") >&5
896   (eval $ac_compile) 2>&5
897   ac_status=$?
898-  echo "$as_me:14850: \$? = $ac_status" >&5
899+  echo "$as_me:14871: \$? = $ac_status" >&5
900   (exit $ac_status); } &&
901          { ac_try='test -s conftest.$ac_objext'
902-  { (eval echo "$as_me:14853: \"$ac_try\"") >&5
903+  { (eval echo "$as_me:14874: \"$ac_try\"") >&5
904   (eval $ac_try) 2>&5
905   ac_status=$?
906-  echo "$as_me:14856: \$? = $ac_status" >&5
907+  echo "$as_me:14877: \$? = $ac_status" >&5
908   (exit $ac_status); }; }; then
909   ac_hi=$ac_mid
910 else
911@@ -14866,12 +14887,12 @@
912 ac_cv_sizeof_signed_char=$ac_lo
913 else
914   if test "$cross_compiling" = yes; then
915-  { { echo "$as_me:14869: error: cannot run test program while cross compiling" >&5
916+  { { echo "$as_me:14890: error: cannot run test program while cross compiling" >&5
917 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
918    { (exit 1); exit 1; }; }
919 else
920   cat >conftest.$ac_ext <<_ACEOF
921-#line 14874 "configure"
922+#line 14895 "configure"
923 #include "confdefs.h"
924 $ac_includes_default
925 int
926@@ -14887,15 +14908,15 @@
927 }
928 _ACEOF
929 rm -f conftest$ac_exeext
930-if { (eval echo "$as_me:14890: \"$ac_link\"") >&5
931+if { (eval echo "$as_me:14911: \"$ac_link\"") >&5
932   (eval $ac_link) 2>&5
933   ac_status=$?
934-  echo "$as_me:14893: \$? = $ac_status" >&5
935+  echo "$as_me:14914: \$? = $ac_status" >&5
936   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
937-  { (eval echo "$as_me:14895: \"$ac_try\"") >&5
938+  { (eval echo "$as_me:14916: \"$ac_try\"") >&5
939   (eval $ac_try) 2>&5
940   ac_status=$?
941-  echo "$as_me:14898: \$? = $ac_status" >&5
942+  echo "$as_me:14919: \$? = $ac_status" >&5
943   (exit $ac_status); }; }; then
944   ac_cv_sizeof_signed_char=`cat conftest.val`
945 else
946@@ -14911,19 +14932,19 @@
947   ac_cv_sizeof_signed_char=0
948 fi
949 fi
950-echo "$as_me:14914: result: $ac_cv_sizeof_signed_char" >&5
951+echo "$as_me:14935: result: $ac_cv_sizeof_signed_char" >&5
952 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
953 cat >>confdefs.h <<EOF
954 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
955 EOF
956
957-echo "$as_me:14920: checking for ANSI C header files" >&5
958+echo "$as_me:14941: checking for ANSI C header files" >&5
959 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
960 if test "${ac_cv_header_stdc+set}" = set; then
961   echo $ECHO_N "(cached) $ECHO_C" >&6
962 else
963   cat >conftest.$ac_ext <<_ACEOF
964-#line 14926 "configure"
965+#line 14947 "configure"
966 #include "confdefs.h"
967 #include <stdlib.h>
968 #include <stdarg.h>
969@@ -14931,13 +14952,13 @@
970 #include <float.h>
971
972 _ACEOF
973-if { (eval echo "$as_me:14934: \"$ac_cpp conftest.$ac_ext\"") >&5
974+if { (eval echo "$as_me:14955: \"$ac_cpp conftest.$ac_ext\"") >&5
975   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
976   ac_status=$?
977   egrep -v '^ *\+' conftest.er1 >conftest.err
978   rm -f conftest.er1
979   cat conftest.err >&5
980-  echo "$as_me:14940: \$? = $ac_status" >&5
981+  echo "$as_me:14961: \$? = $ac_status" >&5
982   (exit $ac_status); } >/dev/null; then
983   if test -s conftest.err; then
984     ac_cpp_err=$ac_c_preproc_warn_flag
985@@ -14959,7 +14980,7 @@
986 if test $ac_cv_header_stdc = yes; then
987   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
988   cat >conftest.$ac_ext <<_ACEOF
989-#line 14962 "configure"
990+#line 14983 "configure"
991 #include "confdefs.h"
992 #include <string.h>
993
994@@ -14977,7 +14998,7 @@
995 if test $ac_cv_header_stdc = yes; then
996   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
997   cat >conftest.$ac_ext <<_ACEOF
998-#line 14980 "configure"
999+#line 15001 "configure"
1000 #include "confdefs.h"
1001 #include <stdlib.h>
1002
1003@@ -14998,7 +15019,7 @@
1004   :
1005 else
1006   cat >conftest.$ac_ext <<_ACEOF
1007-#line 15001 "configure"
1008+#line 15022 "configure"
1009 #include "confdefs.h"
1010 #include <ctype.h>
1011 #if ((' ' & 0x0FF) == 0x020)
1012@@ -15024,15 +15045,15 @@
1013 }
1014 _ACEOF
1015 rm -f conftest$ac_exeext
1016-if { (eval echo "$as_me:15027: \"$ac_link\"") >&5
1017+if { (eval echo "$as_me:15048: \"$ac_link\"") >&5
1018   (eval $ac_link) 2>&5
1019   ac_status=$?
1020-  echo "$as_me:15030: \$? = $ac_status" >&5
1021+  echo "$as_me:15051: \$? = $ac_status" >&5
1022   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
1023-  { (eval echo "$as_me:15032: \"$ac_try\"") >&5
1024+  { (eval echo "$as_me:15053: \"$ac_try\"") >&5
1025   (eval $ac_try) 2>&5
1026   ac_status=$?
1027-  echo "$as_me:15035: \$? = $ac_status" >&5
1028+  echo "$as_me:15056: \$? = $ac_status" >&5
1029   (exit $ac_status); }; }; then
1030   :
1031 else
1032@@ -15045,7 +15066,7 @@
1033 fi
1034 fi
1035 fi
1036-echo "$as_me:15048: result: $ac_cv_header_stdc" >&5
1037+echo "$as_me:15069: result: $ac_cv_header_stdc" >&5
1038 echo "${ECHO_T}$ac_cv_header_stdc" >&6
1039 if test $ac_cv_header_stdc = yes; then
1040
1041@@ -15058,13 +15079,13 @@
1042 ac_header_dirent=no
1043 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
1044   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
1045-echo "$as_me:15061: checking for $ac_hdr that defines DIR" >&5
1046+echo "$as_me:15082: checking for $ac_hdr that defines DIR" >&5
1047 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
1048 if eval "test \"\${$as_ac_Header+set}\" = set"; then
1049   echo $ECHO_N "(cached) $ECHO_C" >&6
1050 else
1051   cat >conftest.$ac_ext <<_ACEOF
1052-#line 15067 "configure"
1053+#line 15088 "configure"
1054 #include "confdefs.h"
1055 #include <sys/types.h>
1056 #include <$ac_hdr>
1057@@ -15079,16 +15100,16 @@
1058 }
1059 _ACEOF
1060 rm -f conftest.$ac_objext
1061-if { (eval echo "$as_me:15082: \"$ac_compile\"") >&5
1062+if { (eval echo "$as_me:15103: \"$ac_compile\"") >&5
1063   (eval $ac_compile) 2>&5
1064   ac_status=$?
1065-  echo "$as_me:15085: \$? = $ac_status" >&5
1066+  echo "$as_me:15106: \$? = $ac_status" >&5
1067   (exit $ac_status); } &&
1068          { ac_try='test -s conftest.$ac_objext'
1069-  { (eval echo "$as_me:15088: \"$ac_try\"") >&5
1070+  { (eval echo "$as_me:15109: \"$ac_try\"") >&5
1071   (eval $ac_try) 2>&5
1072   ac_status=$?
1073-  echo "$as_me:15091: \$? = $ac_status" >&5
1074+  echo "$as_me:15112: \$? = $ac_status" >&5
1075   (exit $ac_status); }; }; then
1076   eval "$as_ac_Header=yes"
1077 else
1078@@ -15098,7 +15119,7 @@
1079 fi
1080 rm -f conftest.$ac_objext conftest.$ac_ext
1081 fi
1082-echo "$as_me:15101: result: `eval echo '${'$as_ac_Header'}'`" >&5
1083+echo "$as_me:15122: result: `eval echo '${'$as_ac_Header'}'`" >&5
1084 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
1085 if test `eval echo '${'$as_ac_Header'}'` = yes; then
1086   cat >>confdefs.h <<EOF
1087@@ -15111,7 +15132,7 @@
1088 done
1089 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
1090 if test $ac_header_dirent = dirent.h; then
1091-  echo "$as_me:15114: checking for opendir in -ldir" >&5
1092+  echo "$as_me:15135: checking for opendir in -ldir" >&5
1093 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
1094 if test "${ac_cv_lib_dir_opendir+set}" = set; then
1095   echo $ECHO_N "(cached) $ECHO_C" >&6
1096@@ -15119,7 +15140,7 @@
1097   ac_check_lib_save_LIBS=$LIBS
1098 LIBS="-ldir  $LIBS"
1099 cat >conftest.$ac_ext <<_ACEOF
1100-#line 15122 "configure"
1101+#line 15143 "configure"
1102 #include "confdefs.h"
1103
1104 /* Override any gcc2 internal prototype to avoid an error.  */
1105@@ -15138,16 +15159,16 @@
1106 }
1107 _ACEOF
1108 rm -f conftest.$ac_objext conftest$ac_exeext
1109-if { (eval echo "$as_me:15141: \"$ac_link\"") >&5
1110+if { (eval echo "$as_me:15162: \"$ac_link\"") >&5
1111   (eval $ac_link) 2>&5
1112   ac_status=$?
1113-  echo "$as_me:15144: \$? = $ac_status" >&5
1114+  echo "$as_me:15165: \$? = $ac_status" >&5
1115   (exit $ac_status); } &&
1116          { ac_try='test -s conftest$ac_exeext'
1117-  { (eval echo "$as_me:15147: \"$ac_try\"") >&5
1118+  { (eval echo "$as_me:15168: \"$ac_try\"") >&5
1119   (eval $ac_try) 2>&5
1120   ac_status=$?
1121-  echo "$as_me:15150: \$? = $ac_status" >&5
1122+  echo "$as_me:15171: \$? = $ac_status" >&5
1123   (exit $ac_status); }; }; then
1124   ac_cv_lib_dir_opendir=yes
1125 else
1126@@ -15158,14 +15179,14 @@
1127 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1128 LIBS=$ac_check_lib_save_LIBS
1129 fi
1130-echo "$as_me:15161: result: $ac_cv_lib_dir_opendir" >&5
1131+echo "$as_me:15182: result: $ac_cv_lib_dir_opendir" >&5
1132 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
1133 if test $ac_cv_lib_dir_opendir = yes; then
1134   LIBS="$LIBS -ldir"
1135 fi
1136
1137 else
1138-  echo "$as_me:15168: checking for opendir in -lx" >&5
1139+  echo "$as_me:15189: checking for opendir in -lx" >&5
1140 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
1141 if test "${ac_cv_lib_x_opendir+set}" = set; then
1142   echo $ECHO_N "(cached) $ECHO_C" >&6
1143@@ -15173,7 +15194,7 @@
1144   ac_check_lib_save_LIBS=$LIBS
1145 LIBS="-lx  $LIBS"
1146 cat >conftest.$ac_ext <<_ACEOF
1147-#line 15176 "configure"
1148+#line 15197 "configure"
1149 #include "confdefs.h"
1150
1151 /* Override any gcc2 internal prototype to avoid an error.  */
1152@@ -15192,16 +15213,16 @@
1153 }
1154 _ACEOF
1155 rm -f conftest.$ac_objext conftest$ac_exeext
1156-if { (eval echo "$as_me:15195: \"$ac_link\"") >&5
1157+if { (eval echo "$as_me:15216: \"$ac_link\"") >&5
1158   (eval $ac_link) 2>&5
1159   ac_status=$?
1160-  echo "$as_me:15198: \$? = $ac_status" >&5
1161+  echo "$as_me:15219: \$? = $ac_status" >&5
1162   (exit $ac_status); } &&
1163          { ac_try='test -s conftest$ac_exeext'
1164-  { (eval echo "$as_me:15201: \"$ac_try\"") >&5
1165+  { (eval echo "$as_me:15222: \"$ac_try\"") >&5
1166   (eval $ac_try) 2>&5
1167   ac_status=$?
1168-  echo "$as_me:15204: \$? = $ac_status" >&5
1169+  echo "$as_me:15225: \$? = $ac_status" >&5
1170   (exit $ac_status); }; }; then
1171   ac_cv_lib_x_opendir=yes
1172 else
1173@@ -15212,7 +15233,7 @@
1174 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1175 LIBS=$ac_check_lib_save_LIBS
1176 fi
1177-echo "$as_me:15215: result: $ac_cv_lib_x_opendir" >&5
1178+echo "$as_me:15236: result: $ac_cv_lib_x_opendir" >&5
1179 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
1180 if test $ac_cv_lib_x_opendir = yes; then
1181   LIBS="$LIBS -lx"
1182@@ -15220,13 +15241,13 @@
1183
1184 fi
1185
1186-echo "$as_me:15223: checking whether time.h and sys/time.h may both be included" >&5
1187+echo "$as_me:15244: checking whether time.h and sys/time.h may both be included" >&5
1188 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
1189 if test "${ac_cv_header_time+set}" = set; then
1190   echo $ECHO_N "(cached) $ECHO_C" >&6
1191 else
1192   cat >conftest.$ac_ext <<_ACEOF
1193-#line 15229 "configure"
1194+#line 15250 "configure"
1195 #include "confdefs.h"
1196 #include <sys/types.h>
1197 #include <sys/time.h>
1198@@ -15242,16 +15263,16 @@
1199 }
1200 _ACEOF
1201 rm -f conftest.$ac_objext
1202-if { (eval echo "$as_me:15245: \"$ac_compile\"") >&5
1203+if { (eval echo "$as_me:15266: \"$ac_compile\"") >&5
1204   (eval $ac_compile) 2>&5
1205   ac_status=$?
1206-  echo "$as_me:15248: \$? = $ac_status" >&5
1207+  echo "$as_me:15269: \$? = $ac_status" >&5
1208   (exit $ac_status); } &&
1209          { ac_try='test -s conftest.$ac_objext'
1210-  { (eval echo "$as_me:15251: \"$ac_try\"") >&5
1211+  { (eval echo "$as_me:15272: \"$ac_try\"") >&5
1212   (eval $ac_try) 2>&5
1213   ac_status=$?
1214-  echo "$as_me:15254: \$? = $ac_status" >&5
1215+  echo "$as_me:15275: \$? = $ac_status" >&5
1216   (exit $ac_status); }; }; then
1217   ac_cv_header_time=yes
1218 else
1219@@ -15261,7 +15282,7 @@
1220 fi
1221 rm -f conftest.$ac_objext conftest.$ac_ext
1222 fi
1223-echo "$as_me:15264: result: $ac_cv_header_time" >&5
1224+echo "$as_me:15285: result: $ac_cv_header_time" >&5
1225 echo "${ECHO_T}$ac_cv_header_time" >&6
1226 if test $ac_cv_header_time = yes; then
1227
1228@@ -15279,13 +15300,13 @@
1229 ac_compiler_gnu=$ac_cv_c_compiler_gnu
1230 ac_main_return=return
1231
1232-echo "$as_me:15282: checking for an ANSI C-conforming const" >&5
1233+echo "$as_me:15303: checking for an ANSI C-conforming const" >&5
1234 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
1235 if test "${ac_cv_c_const+set}" = set; then
1236   echo $ECHO_N "(cached) $ECHO_C" >&6
1237 else
1238   cat >conftest.$ac_ext <<_ACEOF
1239-#line 15288 "configure"
1240+#line 15309 "configure"
1241 #include "confdefs.h"
1242
1243 int
1244@@ -15343,16 +15364,16 @@
1245 }
1246 _ACEOF
1247 rm -f conftest.$ac_objext
1248-if { (eval echo "$as_me:15346: \"$ac_compile\"") >&5
1249+if { (eval echo "$as_me:15367: \"$ac_compile\"") >&5
1250   (eval $ac_compile) 2>&5
1251   ac_status=$?
1252-  echo "$as_me:15349: \$? = $ac_status" >&5
1253+  echo "$as_me:15370: \$? = $ac_status" >&5
1254   (exit $ac_status); } &&
1255          { ac_try='test -s conftest.$ac_objext'
1256-  { (eval echo "$as_me:15352: \"$ac_try\"") >&5
1257+  { (eval echo "$as_me:15373: \"$ac_try\"") >&5
1258   (eval $ac_try) 2>&5
1259   ac_status=$?
1260-  echo "$as_me:15355: \$? = $ac_status" >&5
1261+  echo "$as_me:15376: \$? = $ac_status" >&5
1262   (exit $ac_status); }; }; then
1263   ac_cv_c_const=yes
1264 else
1265@@ -15362,7 +15383,7 @@
1266 fi
1267 rm -f conftest.$ac_objext conftest.$ac_ext
1268 fi
1269-echo "$as_me:15365: result: $ac_cv_c_const" >&5
1270+echo "$as_me:15386: result: $ac_cv_c_const" >&5
1271 echo "${ECHO_T}$ac_cv_c_const" >&6
1272 if test $ac_cv_c_const = no; then
1273
1274@@ -15374,7 +15395,7 @@
1275
1276 ###	Checks for external-data
1277
1278-echo "$as_me:15377: checking if data-only library module links" >&5
1279+echo "$as_me:15398: checking if data-only library module links" >&5
1280 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
1281 if test "${cf_cv_link_dataonly+set}" = set; then
1282   echo $ECHO_N "(cached) $ECHO_C" >&6
1283@@ -15382,20 +15403,20 @@
1284
1285 	rm -f conftest.a
1286 	cat >conftest.$ac_ext <<EOF
1287-#line 15385 "configure"
1288+#line 15406 "configure"
1289 int	testdata[3] = { 123, 456, 789 };
1290 EOF
1291-	if { (eval echo "$as_me:15388: \"$ac_compile\"") >&5
1292+	if { (eval echo "$as_me:15409: \"$ac_compile\"") >&5
1293   (eval $ac_compile) 2>&5
1294   ac_status=$?
1295-  echo "$as_me:15391: \$? = $ac_status" >&5
1296+  echo "$as_me:15412: \$? = $ac_status" >&5
1297   (exit $ac_status); } ; then
1298 		mv conftest.o data.o && \
1299 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
1300 	fi
1301 	rm -f conftest.$ac_ext data.o
1302 	cat >conftest.$ac_ext <<EOF
1303-#line 15398 "configure"
1304+#line 15419 "configure"
1305 int	testfunc(void)
1306 {
1307 #if defined(NeXT)
1308@@ -15408,10 +15429,10 @@
1309 #endif
1310 }
1311 EOF
1312-	if { (eval echo "$as_me:15411: \"$ac_compile\"") >&5
1313+	if { (eval echo "$as_me:15432: \"$ac_compile\"") >&5
1314   (eval $ac_compile) 2>&5
1315   ac_status=$?
1316-  echo "$as_me:15414: \$? = $ac_status" >&5
1317+  echo "$as_me:15435: \$? = $ac_status" >&5
1318   (exit $ac_status); }; then
1319 		mv conftest.o func.o && \
1320 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
1321@@ -15424,7 +15445,7 @@
1322   cf_cv_link_dataonly=unknown
1323 else
1324   cat >conftest.$ac_ext <<_ACEOF
1325-#line 15427 "configure"
1326+#line 15448 "configure"
1327 #include "confdefs.h"
1328
1329 	int main(void)
1330@@ -15435,15 +15456,15 @@
1331
1332 _ACEOF
1333 rm -f conftest$ac_exeext
1334-if { (eval echo "$as_me:15438: \"$ac_link\"") >&5
1335+if { (eval echo "$as_me:15459: \"$ac_link\"") >&5
1336   (eval $ac_link) 2>&5
1337   ac_status=$?
1338-  echo "$as_me:15441: \$? = $ac_status" >&5
1339+  echo "$as_me:15462: \$? = $ac_status" >&5
1340   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
1341-  { (eval echo "$as_me:15443: \"$ac_try\"") >&5
1342+  { (eval echo "$as_me:15464: \"$ac_try\"") >&5
1343   (eval $ac_try) 2>&5
1344   ac_status=$?
1345-  echo "$as_me:15446: \$? = $ac_status" >&5
1346+  echo "$as_me:15467: \$? = $ac_status" >&5
1347   (exit $ac_status); }; }; then
1348   cf_cv_link_dataonly=yes
1349 else
1350@@ -15458,7 +15479,7 @@
1351
1352 fi
1353
1354-echo "$as_me:15461: result: $cf_cv_link_dataonly" >&5
1355+echo "$as_me:15482: result: $cf_cv_link_dataonly" >&5
1356 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
1357
1358 if test "$cf_cv_link_dataonly" = no ; then
1359@@ -15477,23 +15498,23 @@
1360
1361 do
1362 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
1363-echo "$as_me:15480: checking for $ac_header" >&5
1364+echo "$as_me:15501: checking for $ac_header" >&5
1365 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
1366 if eval "test \"\${$as_ac_Header+set}\" = set"; then
1367   echo $ECHO_N "(cached) $ECHO_C" >&6
1368 else
1369   cat >conftest.$ac_ext <<_ACEOF
1370-#line 15486 "configure"
1371+#line 15507 "configure"
1372 #include "confdefs.h"
1373 #include <$ac_header>
1374 _ACEOF
1375-if { (eval echo "$as_me:15490: \"$ac_cpp conftest.$ac_ext\"") >&5
1376+if { (eval echo "$as_me:15511: \"$ac_cpp conftest.$ac_ext\"") >&5
1377   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
1378   ac_status=$?
1379   egrep -v '^ *\+' conftest.er1 >conftest.err
1380   rm -f conftest.er1
1381   cat conftest.err >&5
1382-  echo "$as_me:15496: \$? = $ac_status" >&5
1383+  echo "$as_me:15517: \$? = $ac_status" >&5
1384   (exit $ac_status); } >/dev/null; then
1385   if test -s conftest.err; then
1386     ac_cpp_err=$ac_c_preproc_warn_flag
1387@@ -15512,7 +15533,7 @@
1388 fi
1389 rm -f conftest.err conftest.$ac_ext
1390 fi
1391-echo "$as_me:15515: result: `eval echo '${'$as_ac_Header'}'`" >&5
1392+echo "$as_me:15536: result: `eval echo '${'$as_ac_Header'}'`" >&5
1393 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
1394 if test `eval echo '${'$as_ac_Header'}'` = yes; then
1395   cat >>confdefs.h <<EOF
1396@@ -15522,7 +15543,7 @@
1397 fi
1398 done
1399
1400-echo "$as_me:15525: checking for working mkstemp" >&5
1401+echo "$as_me:15546: checking for working mkstemp" >&5
1402 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
1403 if test "${cf_cv_func_mkstemp+set}" = set; then
1404   echo $ECHO_N "(cached) $ECHO_C" >&6
1405@@ -15533,7 +15554,7 @@
1406   cf_cv_func_mkstemp=maybe
1407 else
1408   cat >conftest.$ac_ext <<_ACEOF
1409-#line 15536 "configure"
1410+#line 15557 "configure"
1411 #include "confdefs.h"
1412
1413 #include <sys/types.h>
1414@@ -15574,15 +15595,15 @@
1415
1416 _ACEOF
1417 rm -f conftest$ac_exeext
1418-if { (eval echo "$as_me:15577: \"$ac_link\"") >&5
1419+if { (eval echo "$as_me:15598: \"$ac_link\"") >&5
1420   (eval $ac_link) 2>&5
1421   ac_status=$?
1422-  echo "$as_me:15580: \$? = $ac_status" >&5
1423+  echo "$as_me:15601: \$? = $ac_status" >&5
1424   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
1425-  { (eval echo "$as_me:15582: \"$ac_try\"") >&5
1426+  { (eval echo "$as_me:15603: \"$ac_try\"") >&5
1427   (eval $ac_try) 2>&5
1428   ac_status=$?
1429-  echo "$as_me:15585: \$? = $ac_status" >&5
1430+  echo "$as_me:15606: \$? = $ac_status" >&5
1431   (exit $ac_status); }; }; then
1432   cf_cv_func_mkstemp=yes
1433
1434@@ -15597,16 +15618,16 @@
1435 fi
1436
1437 fi
1438-echo "$as_me:15600: result: $cf_cv_func_mkstemp" >&5
1439+echo "$as_me:15621: result: $cf_cv_func_mkstemp" >&5
1440 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
1441 if test "x$cf_cv_func_mkstemp" = xmaybe ; then
1442-	echo "$as_me:15603: checking for mkstemp" >&5
1443+	echo "$as_me:15624: checking for mkstemp" >&5
1444 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
1445 if test "${ac_cv_func_mkstemp+set}" = set; then
1446   echo $ECHO_N "(cached) $ECHO_C" >&6
1447 else
1448   cat >conftest.$ac_ext <<_ACEOF
1449-#line 15609 "configure"
1450+#line 15630 "configure"
1451 #include "confdefs.h"
1452 #define mkstemp autoconf_temporary
1453 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
1454@@ -15637,16 +15658,16 @@
1455 }
1456 _ACEOF
1457 rm -f conftest.$ac_objext conftest$ac_exeext
1458-if { (eval echo "$as_me:15640: \"$ac_link\"") >&5
1459+if { (eval echo "$as_me:15661: \"$ac_link\"") >&5
1460   (eval $ac_link) 2>&5
1461   ac_status=$?
1462-  echo "$as_me:15643: \$? = $ac_status" >&5
1463+  echo "$as_me:15664: \$? = $ac_status" >&5
1464   (exit $ac_status); } &&
1465          { ac_try='test -s conftest$ac_exeext'
1466-  { (eval echo "$as_me:15646: \"$ac_try\"") >&5
1467+  { (eval echo "$as_me:15667: \"$ac_try\"") >&5
1468   (eval $ac_try) 2>&5
1469   ac_status=$?
1470-  echo "$as_me:15649: \$? = $ac_status" >&5
1471+  echo "$as_me:15670: \$? = $ac_status" >&5
1472   (exit $ac_status); }; }; then
1473   ac_cv_func_mkstemp=yes
1474 else
1475@@ -15656,7 +15677,7 @@
1476 fi
1477 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1478 fi
1479-echo "$as_me:15659: result: $ac_cv_func_mkstemp" >&5
1480+echo "$as_me:15680: result: $ac_cv_func_mkstemp" >&5
1481 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
1482
1483 fi
1484@@ -15685,7 +15706,7 @@
1485 	unset cf_TEMP_gnat
1486 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
1487 set dummy $cf_prog_gnat; ac_word=$2
1488-echo "$as_me:15688: checking for $ac_word" >&5
1489+echo "$as_me:15709: checking for $ac_word" >&5
1490 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1491 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
1492   echo $ECHO_N "(cached) $ECHO_C" >&6
1493@@ -15702,7 +15723,7 @@
1494   test -z "$ac_dir" && ac_dir=.
1495   if $as_executable_p "$ac_dir/$ac_word"; then
1496    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
1497-   echo "$as_me:15705: found $ac_dir/$ac_word" >&5
1498+   echo "$as_me:15726: found $ac_dir/$ac_word" >&5
1499    break
1500 fi
1501 done
1502@@ -15714,10 +15735,10 @@
1503 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
1504
1505 if test -n "$cf_TEMP_gnat"; then
1506-  echo "$as_me:15717: result: $cf_TEMP_gnat" >&5
1507+  echo "$as_me:15738: result: $cf_TEMP_gnat" >&5
1508 echo "${ECHO_T}$cf_TEMP_gnat" >&6
1509 else
1510-  echo "$as_me:15720: result: no" >&5
1511+  echo "$as_me:15741: result: no" >&5
1512 echo "${ECHO_T}no" >&6
1513 fi
1514
1515@@ -15727,7 +15748,7 @@
1516 		unset cf_cv_gnat_version
1517 		unset cf_TEMP_gnat
1518
1519-echo "$as_me:15730: checking for $cf_prog_gnat version" >&5
1520+echo "$as_me:15751: checking for $cf_prog_gnat version" >&5
1521 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
1522 if test "${cf_cv_gnat_version+set}" = set; then
1523   echo $ECHO_N "(cached) $ECHO_C" >&6
1524@@ -15738,7 +15759,7 @@
1525 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
1526
1527 fi
1528-echo "$as_me:15741: result: $cf_cv_gnat_version" >&5
1529+echo "$as_me:15762: result: $cf_cv_gnat_version" >&5
1530 echo "${ECHO_T}$cf_cv_gnat_version" >&6
1531 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
1532 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
1533@@ -15767,7 +15788,7 @@
1534 			cd conftest.src
1535 			for cf_gprconfig in Ada C
1536 			do
1537-				echo "$as_me:15770: checking for gprconfig name for $cf_gprconfig" >&5
1538+				echo "$as_me:15791: checking for gprconfig name for $cf_gprconfig" >&5
1539 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
1540 				if test $cf_gprconfig = C
1541 				then
1542@@ -15786,10 +15807,10 @@
1543 				if test -n "$cf_gprconfig_value"
1544 				then
1545 					eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value
1546-					echo "$as_me:15789: result: $cf_gprconfig_value" >&5
1547+					echo "$as_me:15810: result: $cf_gprconfig_value" >&5
1548 echo "${ECHO_T}$cf_gprconfig_value" >&6
1549 				else
1550-					echo "$as_me:15792: result: missing" >&5
1551+					echo "$as_me:15813: result: missing" >&5
1552 echo "${ECHO_T}missing" >&6
1553 					cf_ada_config="#"
1554 					break
1555@@ -15802,7 +15823,7 @@
1556 	if test "x$cf_ada_config" != "x#"
1557 	then
1558
1559-echo "$as_me:15805: checking for gnat version" >&5
1560+echo "$as_me:15826: checking for gnat version" >&5
1561 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
1562 if test "${cf_cv_gnat_version+set}" = set; then
1563   echo $ECHO_N "(cached) $ECHO_C" >&6
1564@@ -15813,7 +15834,7 @@
1565 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
1566
1567 fi
1568-echo "$as_me:15816: result: $cf_cv_gnat_version" >&5
1569+echo "$as_me:15837: result: $cf_cv_gnat_version" >&5
1570 echo "${ECHO_T}$cf_cv_gnat_version" >&6
1571 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
1572
1573@@ -15822,7 +15843,7 @@
1574 	cf_cv_prog_gnat_correct=yes
1575 	;;
1576 (*)
1577-	{ echo "$as_me:15825: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
1578+	{ echo "$as_me:15846: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
1579 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
1580 	cf_cv_prog_gnat_correct=no
1581 	;;
1582@@ -15830,7 +15851,7 @@
1583
1584 		# Extract the first word of "m4", so it can be a program name with args.
1585 set dummy m4; ac_word=$2
1586-echo "$as_me:15833: checking for $ac_word" >&5
1587+echo "$as_me:15854: checking for $ac_word" >&5
1588 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1589 if test "${ac_cv_prog_M4_exists+set}" = set; then
1590   echo $ECHO_N "(cached) $ECHO_C" >&6
1591@@ -15845,7 +15866,7 @@
1592   test -z "$ac_dir" && ac_dir=.
1593   $as_executable_p "$ac_dir/$ac_word" || continue
1594 ac_cv_prog_M4_exists="yes"
1595-echo "$as_me:15848: found $ac_dir/$ac_word" >&5
1596+echo "$as_me:15869: found $ac_dir/$ac_word" >&5
1597 break
1598 done
1599
1600@@ -15854,20 +15875,20 @@
1601 fi
1602 M4_exists=$ac_cv_prog_M4_exists
1603 if test -n "$M4_exists"; then
1604-  echo "$as_me:15857: result: $M4_exists" >&5
1605+  echo "$as_me:15878: result: $M4_exists" >&5
1606 echo "${ECHO_T}$M4_exists" >&6
1607 else
1608-  echo "$as_me:15860: result: no" >&5
1609+  echo "$as_me:15881: result: no" >&5
1610 echo "${ECHO_T}no" >&6
1611 fi
1612
1613 		if test "$ac_cv_prog_M4_exists" = no; then
1614 			cf_cv_prog_gnat_correct=no
1615-			{ echo "$as_me:15866: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
1616+			{ echo "$as_me:15887: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
1617 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
1618 		fi
1619 		if test "$cf_cv_prog_gnat_correct" = yes; then
1620-			echo "$as_me:15870: checking if GNAT works" >&5
1621+			echo "$as_me:15891: checking if GNAT works" >&5
1622 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
1623
1624 rm -rf conftest* *~conftest*
1625@@ -15895,7 +15916,7 @@
1626 fi
1627 rm -rf conftest* *~conftest*
1628
1629-			echo "$as_me:15898: result: $cf_cv_prog_gnat_correct" >&5
1630+			echo "$as_me:15919: result: $cf_cv_prog_gnat_correct" >&5
1631 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
1632 		fi
1633 	else
1634@@ -15905,7 +15926,7 @@
1635
1636 	if test	"$cf_cv_prog_gnat_correct" = yes; then
1637
1638-	echo "$as_me:15908: checking optimization options for ADAFLAGS" >&5
1639+	echo "$as_me:15929: checking optimization options for ADAFLAGS" >&5
1640 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
1641 	case "$CFLAGS" in
1642 	(*-g*)
1643@@ -15922,10 +15943,10 @@
1644
1645 		;;
1646 	esac
1647-	echo "$as_me:15925: result: $ADAFLAGS" >&5
1648+	echo "$as_me:15946: result: $ADAFLAGS" >&5
1649 echo "${ECHO_T}$ADAFLAGS" >&6
1650
1651-echo "$as_me:15928: checking if GNATPREP supports -T option" >&5
1652+echo "$as_me:15949: checking if GNATPREP supports -T option" >&5
1653 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
1654 if test "${cf_cv_gnatprep_opt_t+set}" = set; then
1655   echo $ECHO_N "(cached) $ECHO_C" >&6
1656@@ -15935,11 +15956,11 @@
1657 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
1658
1659 fi
1660-echo "$as_me:15938: result: $cf_cv_gnatprep_opt_t" >&5
1661+echo "$as_me:15959: result: $cf_cv_gnatprep_opt_t" >&5
1662 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
1663 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
1664
1665-echo "$as_me:15942: checking if GNAT supports generics" >&5
1666+echo "$as_me:15963: checking if GNAT supports generics" >&5
1667 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
1668 case $cf_cv_gnat_version in
1669 (3.[1-9]*|[4-9].*)
1670@@ -15949,7 +15970,7 @@
1671 	cf_gnat_generics=no
1672 	;;
1673 esac
1674-echo "$as_me:15952: result: $cf_gnat_generics" >&5
1675+echo "$as_me:15973: result: $cf_gnat_generics" >&5
1676 echo "${ECHO_T}$cf_gnat_generics" >&6
1677
1678 if test "$cf_gnat_generics" = yes
1679@@ -15961,7 +15982,7 @@
1680 	cf_generic_objects=
1681 fi
1682
1683-echo "$as_me:15964: checking if GNAT supports SIGINT" >&5
1684+echo "$as_me:15985: checking if GNAT supports SIGINT" >&5
1685 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
1686 if test "${cf_cv_gnat_sigint+set}" = set; then
1687   echo $ECHO_N "(cached) $ECHO_C" >&6
1688@@ -16009,7 +16030,7 @@
1689 rm -rf conftest* *~conftest*
1690
1691 fi
1692-echo "$as_me:16012: result: $cf_cv_gnat_sigint" >&5
1693+echo "$as_me:16033: result: $cf_cv_gnat_sigint" >&5
1694 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
1695
1696 if test $cf_cv_gnat_sigint = yes ; then
1697@@ -16022,7 +16043,7 @@
1698 cf_gnat_projects=no
1699
1700 if test "$enable_gnat_projects" != no ; then
1701-echo "$as_me:16025: checking if GNAT supports project files" >&5
1702+echo "$as_me:16046: checking if GNAT supports project files" >&5
1703 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
1704 case $cf_cv_gnat_version in
1705 (3.[0-9]*)
1706@@ -16085,15 +16106,15 @@
1707 	esac
1708 	;;
1709 esac
1710-echo "$as_me:16088: result: $cf_gnat_projects" >&5
1711+echo "$as_me:16109: result: $cf_gnat_projects" >&5
1712 echo "${ECHO_T}$cf_gnat_projects" >&6
1713 fi # enable_gnat_projects
1714
1715 if test $cf_gnat_projects = yes
1716 then
1717-	echo "$as_me:16094: checking if GNAT supports libraries" >&5
1718+	echo "$as_me:16115: checking if GNAT supports libraries" >&5
1719 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
1720-	echo "$as_me:16096: result: $cf_gnat_libraries" >&5
1721+	echo "$as_me:16117: result: $cf_gnat_libraries" >&5
1722 echo "${ECHO_T}$cf_gnat_libraries" >&6
1723 fi
1724
1725@@ -16113,7 +16134,7 @@
1726 	USE_GNAT_LIBRARIES="#"
1727 fi
1728
1729-echo "$as_me:16116: checking for ada-compiler" >&5
1730+echo "$as_me:16137: checking for ada-compiler" >&5
1731 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
1732
1733 # Check whether --with-ada-compiler or --without-ada-compiler was given.
1734@@ -16124,12 +16145,12 @@
1735   cf_ada_compiler=gnatmake
1736 fi;
1737
1738-echo "$as_me:16127: result: $cf_ada_compiler" >&5
1739+echo "$as_me:16148: result: $cf_ada_compiler" >&5
1740 echo "${ECHO_T}$cf_ada_compiler" >&6
1741
1742 		cf_ada_package=terminal_interface
1743
1744-echo "$as_me:16132: checking for ada-include" >&5
1745+echo "$as_me:16153: checking for ada-include" >&5
1746 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
1747
1748 # Check whether --with-ada-include or --without-ada-include was given.
1749@@ -16165,7 +16186,7 @@
1750 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
1751 	;;
1752 (*)
1753-	{ { echo "$as_me:16168: error: expected a pathname, not \"$withval\"" >&5
1754+	{ { echo "$as_me:16189: error: expected a pathname, not \"$withval\"" >&5
1755 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
1756    { (exit 1); exit 1; }; }
1757 	;;
1758@@ -16174,10 +16195,10 @@
1759 fi
1760 eval ADA_INCLUDE="$withval"
1761
1762-echo "$as_me:16177: result: $ADA_INCLUDE" >&5
1763+echo "$as_me:16198: result: $ADA_INCLUDE" >&5
1764 echo "${ECHO_T}$ADA_INCLUDE" >&6
1765
1766-echo "$as_me:16180: checking for ada-objects" >&5
1767+echo "$as_me:16201: checking for ada-objects" >&5
1768 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
1769
1770 # Check whether --with-ada-objects or --without-ada-objects was given.
1771@@ -16213,7 +16234,7 @@
1772 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
1773 	;;
1774 (*)
1775-	{ { echo "$as_me:16216: error: expected a pathname, not \"$withval\"" >&5
1776+	{ { echo "$as_me:16237: error: expected a pathname, not \"$withval\"" >&5
1777 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
1778    { (exit 1); exit 1; }; }
1779 	;;
1780@@ -16222,10 +16243,10 @@
1781 fi
1782 eval ADA_OBJECTS="$withval"
1783
1784-echo "$as_me:16225: result: $ADA_OBJECTS" >&5
1785+echo "$as_me:16246: result: $ADA_OBJECTS" >&5
1786 echo "${ECHO_T}$ADA_OBJECTS" >&6
1787
1788-echo "$as_me:16228: checking if an Ada95 shared-library should be built" >&5
1789+echo "$as_me:16249: checking if an Ada95 shared-library should be built" >&5
1790 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
1791
1792 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
1793@@ -16235,14 +16256,14 @@
1794 else
1795   with_ada_sharedlib=no
1796 fi;
1797-echo "$as_me:16238: result: $with_ada_sharedlib" >&5
1798+echo "$as_me:16259: result: $with_ada_sharedlib" >&5
1799 echo "${ECHO_T}$with_ada_sharedlib" >&6
1800
1801 if test "x$with_ada_sharedlib" != xno
1802 then
1803 	if test "x$cf_gnat_projects" != xyes
1804 	then
1805-		{ echo "$as_me:16245: WARNING: disabling shared-library since GNAT projects are not supported" >&5
1806+		{ echo "$as_me:16266: WARNING: disabling shared-library since GNAT projects are not supported" >&5
1807 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
1808 		with_ada_sharedlib=no
1809 	fi
1810@@ -16262,7 +16283,7 @@
1811
1812 		# allow the Ada binding to be renamed
1813
1814-echo "$as_me:16265: checking for ada-libname" >&5
1815+echo "$as_me:16286: checking for ada-libname" >&5
1816 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
1817
1818 # Check whether --with-ada-libname or --without-ada-libname was given.
1819@@ -16278,16 +16299,16 @@
1820 	;;
1821 esac
1822
1823-echo "$as_me:16281: result: $ADA_LIBNAME" >&5
1824+echo "$as_me:16302: result: $ADA_LIBNAME" >&5
1825 echo "${ECHO_T}$ADA_LIBNAME" >&6
1826
1827 	else
1828-		{ { echo "$as_me:16285: error: No usable Ada compiler found" >&5
1829+		{ { echo "$as_me:16306: error: No usable Ada compiler found" >&5
1830 echo "$as_me: error: No usable Ada compiler found" >&2;}
1831    { (exit 1); exit 1; }; }
1832 	fi
1833 else
1834-	{ { echo "$as_me:16290: error: The Ada compiler is needed for this package" >&5
1835+	{ { echo "$as_me:16311: error: The Ada compiler is needed for this package" >&5
1836 echo "$as_me: error: The Ada compiler is needed for this package" >&2;}
1837    { (exit 1); exit 1; }; }
1838 fi
1839@@ -16327,7 +16348,7 @@
1840 fi
1841
1842 ### Build up pieces for makefile rules
1843-echo "$as_me:16330: checking default library suffix" >&5
1844+echo "$as_me:16351: checking default library suffix" >&5
1845 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
1846
1847 	case $DFT_LWR_MODEL in
1848@@ -16338,10 +16359,10 @@
1849 	(shared)  DFT_ARG_SUFFIX=''   ;;
1850 	esac
1851 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
1852-echo "$as_me:16341: result: $DFT_ARG_SUFFIX" >&5
1853+echo "$as_me:16362: result: $DFT_ARG_SUFFIX" >&5
1854 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
1855
1856-echo "$as_me:16344: checking default library-dependency suffix" >&5
1857+echo "$as_me:16365: checking default library-dependency suffix" >&5
1858 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
1859
1860 	case X$DFT_LWR_MODEL in
1861@@ -16399,10 +16420,10 @@
1862 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
1863 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
1864 	fi
1865-echo "$as_me:16402: result: $DFT_DEP_SUFFIX" >&5
1866+echo "$as_me:16423: result: $DFT_DEP_SUFFIX" >&5
1867 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
1868
1869-echo "$as_me:16405: checking default object directory" >&5
1870+echo "$as_me:16426: checking default object directory" >&5
1871 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
1872
1873 	case $DFT_LWR_MODEL in
1874@@ -16418,7 +16439,7 @@
1875 			DFT_OBJ_SUBDIR='obj_s' ;;
1876 		esac
1877 	esac
1878-echo "$as_me:16421: result: $DFT_OBJ_SUBDIR" >&5
1879+echo "$as_me:16442: result: $DFT_OBJ_SUBDIR" >&5
1880 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
1881
1882 ### Set up low-level terminfo dependencies for makefiles.
1883@@ -16660,7 +16681,7 @@
1884 : ${CONFIG_STATUS=./config.status}
1885 ac_clean_files_save=$ac_clean_files
1886 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
1887-{ echo "$as_me:16663: creating $CONFIG_STATUS" >&5
1888+{ echo "$as_me:16684: creating $CONFIG_STATUS" >&5
1889 echo "$as_me: creating $CONFIG_STATUS" >&6;}
1890 cat >$CONFIG_STATUS <<_ACEOF
1891 #! $SHELL
1892@@ -16792,7 +16813,7 @@
1893 cat >>$CONFIG_STATUS <<EOF
1894 ac_cs_version="\\
1895 config.status
1896-configured by $0, generated by GNU Autoconf 2.52.20190901,
1897+configured by $0, generated by GNU Autoconf 2.52.20200111,
1898   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
1899
1900 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
1901@@ -16836,7 +16857,7 @@
1902     echo "$ac_cs_version"; exit 0 ;;
1903   --he | --h)
1904     # Conflict between --help and --header
1905-    { { echo "$as_me:16839: error: ambiguous option: $1
1906+    { { echo "$as_me:16860: error: ambiguous option: $1
1907 Try \`$0 --help' for more information." >&5
1908 echo "$as_me: error: ambiguous option: $1
1909 Try \`$0 --help' for more information." >&2;}
1910@@ -16855,7 +16876,7 @@
1911     ac_need_defaults=false;;
1912
1913   # This is an error.
1914-  -*) { { echo "$as_me:16858: error: unrecognized option: $1
1915+  -*) { { echo "$as_me:16879: error: unrecognized option: $1
1916 Try \`$0 --help' for more information." >&5
1917 echo "$as_me: error: unrecognized option: $1
1918 Try \`$0 --help' for more information." >&2;}
1919@@ -16874,7 +16895,7 @@
1920 ## Running config.status.  ##
1921 ## ----------------------- ##
1922
1923-This file was extended by $as_me 2.52.20190901, executed with
1924+This file was extended by $as_me 2.52.20200111, executed with
1925   CONFIG_FILES    = $CONFIG_FILES
1926   CONFIG_HEADERS  = $CONFIG_HEADERS
1927   CONFIG_LINKS    = $CONFIG_LINKS
1928@@ -16927,7 +16948,7 @@
1929   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
1930   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
1931   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
1932-  *) { { echo "$as_me:16930: error: invalid argument: $ac_config_target" >&5
1933+  *) { { echo "$as_me:16951: error: invalid argument: $ac_config_target" >&5
1934 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
1935    { (exit 1); exit 1; }; };;
1936   esac
1937@@ -17279,7 +17300,7 @@
1938   esac
1939
1940   if test x"$ac_file" != x-; then
1941-    { echo "$as_me:17282: creating $ac_file" >&5
1942+    { echo "$as_me:17303: creating $ac_file" >&5
1943 echo "$as_me: creating $ac_file" >&6;}
1944     rm -f "$ac_file"
1945   fi
1946@@ -17297,7 +17318,7 @@
1947       -) echo $tmp/stdin ;;
1948       [\\/$]*)
1949          # Absolute (can't be DOS-style, as IFS=:)
1950-         test -f "$f" || { { echo "$as_me:17300: error: cannot find input file: $f" >&5
1951+         test -f "$f" || { { echo "$as_me:17321: error: cannot find input file: $f" >&5
1952 echo "$as_me: error: cannot find input file: $f" >&2;}
1953    { (exit 1); exit 1; }; }
1954          echo $f;;
1955@@ -17310,7 +17331,7 @@
1956            echo $srcdir/$f
1957          else
1958            # /dev/null tree
1959-           { { echo "$as_me:17313: error: cannot find input file: $f" >&5
1960+           { { echo "$as_me:17334: error: cannot find input file: $f" >&5
1961 echo "$as_me: error: cannot find input file: $f" >&2;}
1962    { (exit 1); exit 1; }; }
1963          fi;;
1964@@ -17326,7 +17347,7 @@
1965       if test -n "$ac_seen"; then
1966         ac_used=`grep '@datarootdir@' $ac_item`
1967         if test -z "$ac_used"; then
1968-          { echo "$as_me:17329: WARNING: datarootdir was used implicitly but not set:
1969+          { echo "$as_me:17350: WARNING: datarootdir was used implicitly but not set:
1970 $ac_seen" >&5
1971 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
1972 $ac_seen" >&2;}
1973@@ -17335,7 +17356,7 @@
1974       fi
1975       ac_seen=`grep '${datarootdir}' $ac_item`
1976       if test -n "$ac_seen"; then
1977-        { echo "$as_me:17338: WARNING: datarootdir was used explicitly but not set:
1978+        { echo "$as_me:17359: WARNING: datarootdir was used explicitly but not set:
1979 $ac_seen" >&5
1980 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
1981 $ac_seen" >&2;}
1982@@ -17372,7 +17393,7 @@
1983             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
1984             if test -z "$ac_init"; then
1985               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
1986-              { echo "$as_me:17375: WARNING: Variable $ac_name is used but was not set:
1987+              { echo "$as_me:17396: WARNING: Variable $ac_name is used but was not set:
1988 $ac_seen" >&5
1989 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
1990 $ac_seen" >&2;}
1991@@ -17383,7 +17404,7 @@
1992     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
1993     if test -s $tmp/out; then
1994       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
1995-      { echo "$as_me:17386: WARNING: Some variables may not be substituted:
1996+      { echo "$as_me:17407: WARNING: Some variables may not be substituted:
1997 $ac_seen" >&5
1998 echo "$as_me: WARNING: Some variables may not be substituted:
1999 $ac_seen" >&2;}
2000@@ -17432,7 +17453,7 @@
2001   * )   ac_file_in=$ac_file.in ;;
2002   esac
2003
2004-  test x"$ac_file" != x- && { echo "$as_me:17435: creating $ac_file" >&5
2005+  test x"$ac_file" != x- && { echo "$as_me:17456: creating $ac_file" >&5
2006 echo "$as_me: creating $ac_file" >&6;}
2007
2008   # First look for the input files in the build tree, otherwise in the
2009@@ -17443,7 +17464,7 @@
2010       -) echo $tmp/stdin ;;
2011       [\\/$]*)
2012          # Absolute (can't be DOS-style, as IFS=:)
2013-         test -f "$f" || { { echo "$as_me:17446: error: cannot find input file: $f" >&5
2014+         test -f "$f" || { { echo "$as_me:17467: error: cannot find input file: $f" >&5
2015 echo "$as_me: error: cannot find input file: $f" >&2;}
2016    { (exit 1); exit 1; }; }
2017          echo $f;;
2018@@ -17456,7 +17477,7 @@
2019            echo $srcdir/$f
2020          else
2021            # /dev/null tree
2022-           { { echo "$as_me:17459: error: cannot find input file: $f" >&5
2023+           { { echo "$as_me:17480: error: cannot find input file: $f" >&5
2024 echo "$as_me: error: cannot find input file: $f" >&2;}
2025    { (exit 1); exit 1; }; }
2026          fi;;
2027@@ -17514,7 +17535,7 @@
2028   rm -f $tmp/in
2029   if test x"$ac_file" != x-; then
2030     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
2031-      { echo "$as_me:17517: $ac_file is unchanged" >&5
2032+      { echo "$as_me:17538: $ac_file is unchanged" >&5
2033 echo "$as_me: $ac_file is unchanged" >&6;}
2034     else
2035       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
2036Index: Ada95/configure.in
2037Prereq:  1.73
2038--- ncurses-6.1-20200104+/Ada95/configure.in	2019-09-14 19:33:07.000000000 +0000
2039+++ ncurses-6.1-20200111/Ada95/configure.in	2020-01-11 23:33:38.000000000 +0000
2040@@ -1,5 +1,5 @@
2041 dnl***************************************************************************
2042-dnl Copyright (c) 2010-2018,2019 Free Software Foundation, Inc.              *
2043+dnl Copyright (c) 2010-2019,2020 Free Software Foundation, Inc.              *
2044 dnl                                                                          *
2045 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
2046 dnl copy of this software and associated documentation files (the            *
2047@@ -28,17 +28,21 @@
2048 dnl
2049 dnl Author: Thomas E. Dickey
2050 dnl
2051-dnl $Id: configure.in,v 1.73 2019/09/14 19:33:07 tom Exp $
2052+dnl $Id: configure.in,v 1.74 2020/01/11 23:33:38 tom Exp $
2053 dnl Process this file with autoconf to produce a configure script.
2054 dnl
2055-dnl See https://invisible-island.net/autoconf/ for additional information.
2056+dnl For additional information, see
2057+dnl     https://invisible-island.net/autoconf/
2058+dnl     https://invisible-island.net/autoconf/my-autoconf.html
2059 dnl
2060 dnl ---------------------------------------------------------------------------
2061-AC_PREREQ(2.52.20030208)
2062-AC_REVISION($Revision: 1.73 $)
2063+AC_PREREQ(2.52.20200111)
2064+AC_REVISION($Revision: 1.74 $)
2065 AC_INIT(gen/gen.c)
2066 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
2067
2068+AC_DEFUN([AC_PATH_XTRA],[])dnl ignore dependencies on this
2069+
2070 CF_TOP_BUILDDIR
2071
2072 CF_HELP_MESSAGE(General Options:)
2073Index: NEWS
2074Prereq:  1.3424
2075--- ncurses-6.1-20200104+/NEWS	2019-12-31 10:59:47.000000000 +0000
2076+++ ncurses-6.1-20200111/NEWS	2020-01-12 00:20:47.000000000 +0000
2077@@ -1,5 +1,5 @@
2078 -------------------------------------------------------------------------------
2079--- Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.               --
2080+-- Copyright (c) 1998-2019,2020 Free Software Foundation, Inc.               --
2081 --                                                                           --
2082 -- Permission is hereby granted, free of charge, to any person obtaining a   --
2083 -- copy of this software and associated documentation files (the             --
2084@@ -25,7 +25,7 @@
2085 -- sale, use or other dealings in this Software without prior written        --
2086 -- authorization.                                                            --
2087 -------------------------------------------------------------------------------
2088--- $Id: NEWS,v 1.3424 2019/12/31 10:59:47 tom Exp $
2089+-- $Id: NEWS,v 1.3428 2020/01/12 00:20:47 tom Exp $
2090 -------------------------------------------------------------------------------
2091
2092 This is a log of changes that ncurses has gone through since Zeyd started
2093@@ -45,6 +45,12 @@
2094 Changes through 1.9.9e did not credit all contributions;
2095 it is not possible to add this information.
2096
2097+20200111
2098+	+ improve configure macros which check for the X11/Intrinsic.h header,
2099+	  to accommodate recent MacOS changes.
2100+	+ suppress gcc's -Winline warning; it has not been useful for some time
2101+	+ update config.guess, config.sub
2102+
2103 20200104
2104 	+ modify a couple of macros in aclocal.m4 to allow autoconf 2.69 to
2105 	  "work", to help illustrate discussion in
2106Index: VERSION
2107--- ncurses-6.1-20200104+/VERSION	2020-01-04 14:49:29.000000000 +0000
2108+++ ncurses-6.1-20200111/VERSION	2020-01-11 10:59:50.000000000 +0000
2109@@ -1 +1 @@
2110-5:0:10	6.1	20200104
2111+5:0:10	6.1	20200111
2112Index: aclocal.m4
2113Prereq:  1.889
2114--- ncurses-6.1-20200104+/aclocal.m4	2019-12-31 13:58:42.000000000 +0000
2115+++ ncurses-6.1-20200111/aclocal.m4	2020-01-12 00:10:43.000000000 +0000
2116@@ -1,5 +1,5 @@
2117 dnl***************************************************************************
2118-dnl Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
2119+dnl Copyright (c) 1998-2019,2020 Free Software Foundation, Inc.              *
2120 dnl                                                                          *
2121 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
2122 dnl copy of this software and associated documentation files (the            *
2123@@ -28,14 +28,16 @@
2124 dnl
2125 dnl Author: Thomas E. Dickey 1995-on
2126 dnl
2127-dnl $Id: aclocal.m4,v 1.889 2019/12/31 13:58:42 tom Exp $
2128+dnl $Id: aclocal.m4,v 1.892 2020/01/12 00:10:43 tom Exp $
2129 dnl Macros used in NCURSES auto-configuration script.
2130 dnl
2131 dnl These macros are maintained separately from NCURSES.  The copyright on
2132 dnl this file applies to the aggregation of macros and does not affect use of
2133 dnl these macros in other applications.
2134 dnl
2135-dnl See https://invisible-island.net/autoconf/ for additional information.
2136+dnl See these pages for additional information:
2137+dnl		https://invisible-island.net/autoconf/
2138+dnl		https://invisible-island.net/autoconf/my-autoconf.html
2139 dnl
2140 dnl ---------------------------------------------------------------------------
2141 dnl ---------------------------------------------------------------------------
2142@@ -1424,7 +1426,7 @@
2143 fi
2144 ])
2145 dnl ---------------------------------------------------------------------------
2146-dnl CF_CONST_X_STRING version: 1 updated: 2019/04/08 17:50:29
2147+dnl CF_CONST_X_STRING version: 3 updated: 2020/01/11 18:39:22
2148 dnl -----------------
2149 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
2150 dnl character-strings.
2151@@ -1445,6 +1447,10 @@
2152 dnl compiler that String is const.
2153 AC_DEFUN([CF_CONST_X_STRING],
2154 [
2155+AC_REQUIRE([AC_PATH_XTRA])
2156+
2157+CF_SAVE_XTRA_FLAGS([CF_CONST_X_STRING])
2158+
2159 AC_TRY_COMPILE(
2160 [
2161 #include <stdlib.h>
2162@@ -1466,6 +1472,8 @@
2163 		])
2164 ])
2165
2166+CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING])
2167+
2168 case $cf_cv_const_x_string in
2169 (no)
2170 	CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
2171@@ -2572,12 +2580,13 @@
2172 CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
2173 ])dnl
2174 dnl ---------------------------------------------------------------------------
2175-dnl CF_GCC_WARNINGS version: 36 updated: 2019/09/07 13:38:36
2176+dnl CF_GCC_WARNINGS version: 37 updated: 2020/01/05 20:04:12
2177 dnl ---------------
2178 dnl Check if the compiler supports useful warning options.  There's a few that
2179 dnl we don't use, simply because they're too noisy:
2180 dnl
2181 dnl	-Wconversion (useful in older versions of gcc, but not in gcc 2.7.x)
2182+dnl	-Winline (usually not worthwhile)
2183 dnl	-Wredundant-decls (system headers make this too noisy)
2184 dnl	-Wtraditional (combines too many unrelated messages, only a few useful)
2185 dnl	-Wwrite-strings (too noisy, but should review occasionally).  This
2186@@ -2633,7 +2642,7 @@
2187 		fi
2188 	done
2189 	CFLAGS="$cf_save_CFLAGS"
2190-elif test "$GCC" = yes
2191+elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
2192 then
2193 	AC_CHECKING([for $CC warning options])
2194 	cf_save_CFLAGS="$CFLAGS"
2195@@ -2655,7 +2664,7 @@
2196 		Wpointer-arith \
2197 		Wshadow \
2198 		Wstrict-prototypes \
2199-		Wundef $cf_gcc_warnings $cf_warn_CONST $1
2200+		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST $1
2201 	do
2202 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
2203 		if AC_TRY_EVAL(ac_compile); then
2204@@ -6347,6 +6356,17 @@
2205 $1=`echo "$2" | sed -e 's/-l$3[[ 	]]//g' -e 's/-l$3[$]//'`
2206 ])dnl
2207 dnl ---------------------------------------------------------------------------
2208+dnl CF_RESTORE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:47:45
2209+dnl ---------------------
2210+dnl Restore flags saved in CF_SAVE_XTRA_FLAGS
2211+dnl $1 = name of current macro
2212+define([CF_RESTORE_XTRA_FLAGS],
2213+[
2214+LIBS="$cf_save_LIBS_$1"
2215+CFLAGS="$cf_save_CFLAGS_$1"
2216+CPPFLAGS="$cf_save_CPPFLAGS_$1"
2217+])dnl
2218+dnl ---------------------------------------------------------------------------
2219 dnl CF_RPATH_HACK version: 11 updated: 2013/09/01 13:02:00
2220 dnl -------------
2221 AC_DEFUN([CF_RPATH_HACK],
2222@@ -6464,6 +6484,31 @@
2223 AC_SUBST(EXTRA_LDFLAGS)
2224 ])dnl
2225 dnl ---------------------------------------------------------------------------
2226+dnl CF_SAVE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:46:44
2227+dnl ------------------
2228+dnl Use this macro to save CFLAGS/CPPFLAGS/LIBS before checks against X headers
2229+dnl and libraries which do not update those variables.
2230+dnl
2231+dnl $1 = name of current macro
2232+define([CF_SAVE_XTRA_FLAGS],
2233+[
2234+cf_save_LIBS_$1="$LIBS"
2235+cf_save_CFLAGS_$1="$CFLAGS"
2236+cf_save_CPPFLAGS_$1="$CPPFLAGS"
2237+LIBS="$LIBS ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}"
2238+for cf_X_CFLAGS in $X_CFLAGS
2239+do
2240+	case "x$cf_X_CFLAGS" in
2241+	x-[[IUD]]*)
2242+		CPPFLAGS="$CPPFLAGS $cf_X_CFLAGS"
2243+		;;
2244+	*)
2245+		CFLAGS="$CFLAGS $cf_X_CFLAGS"
2246+		;;
2247+	esac
2248+done
2249+])dnl
2250+dnl ---------------------------------------------------------------------------
2251 dnl CF_SHARED_OPTS version: 93 updated: 2018/08/18 16:36:35
2252 dnl --------------
2253 dnl --------------
2254Index: config.guess
2255--- ncurses-6.1-20200104+/config.guess	2019-06-10 13:36:57.000000000 +0000
2256+++ ncurses-6.1-20200111/config.guess	2019-12-21 02:01:01.000000000 +0000
2257@@ -2,7 +2,7 @@
2258 # Attempt to guess a canonical system name.
2259 #   Copyright 1992-2019 Free Software Foundation, Inc.
2260
2261-timestamp='2019-06-10'
2262+timestamp='2019-12-21'
2263
2264 # This file is free software; you can redistribute it and/or modify it
2265 # under the terms of the GNU General Public License as published by
2266@@ -99,6 +99,8 @@
2267 trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
2268
2269 set_cc_for_build() {
2270+    # prevent multiple calls if $tmp is already set
2271+    test "$tmp" && return 0
2272     : "${TMPDIR=/tmp}"
2273     # shellcheck disable=SC2039
2274     { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
2275@@ -274,12 +276,15 @@
2276     *:Sortix:*:*)
2277 	echo "$UNAME_MACHINE"-unknown-sortix
2278 	exit ;;
2279+    *:Twizzler:*:*)
2280+	echo "$UNAME_MACHINE"-unknown-twizzler
2281+	exit ;;
2282     *:Redox:*:*)
2283 	echo "$UNAME_MACHINE"-unknown-redox
2284 	exit ;;
2285     mips:OSF1:*.*)
2286-        echo mips-dec-osf1
2287-        exit ;;
2288+	echo mips-dec-osf1
2289+	exit ;;
2290     alpha:OSF1:*:*)
2291 	case $UNAME_RELEASE in
2292 	*4.0)
2293@@ -921,7 +926,7 @@
2294 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
2295 	exit ;;
2296     alpha:Linux:*:*)
2297-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
2298+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
2299 	  EV5)   UNAME_MACHINE=alphaev5 ;;
2300 	  EV56)  UNAME_MACHINE=alphaev56 ;;
2301 	  PCA56) UNAME_MACHINE=alphapca56 ;;
2302Index: config.sub
2303--- ncurses-6.1-20200104+/config.sub	2019-05-23 01:27:51.000000000 +0000
2304+++ ncurses-6.1-20200111/config.sub	2019-09-11 23:56:40.000000000 +0000
2305@@ -2,7 +2,7 @@
2306 # Configuration validation subroutine script.
2307 #   Copyright 1992-2019 Free Software Foundation, Inc.
2308
2309-timestamp='2019-05-23'
2310+timestamp='2019-06-30'
2311
2312 # This file is free software; you can redistribute it and/or modify it
2313 # under the terms of the GNU General Public License as published by
2314@@ -337,17 +337,14 @@
2315 				basic_machine=m88k-harris
2316 				os=sysv3
2317 				;;
2318-			hp300)
2319+			hp300 | hp300hpux)
2320 				basic_machine=m68k-hp
2321+				os=hpux
2322 				;;
2323 			hp300bsd)
2324 				basic_machine=m68k-hp
2325 				os=bsd
2326 				;;
2327-			hp300hpux)
2328-				basic_machine=m68k-hp
2329-				os=hpux
2330-				;;
2331 			hppaosf)
2332 				basic_machine=hppa1.1-hp
2333 				os=osf
2334@@ -360,10 +357,6 @@
2335 				basic_machine=i386-mach
2336 				os=mach
2337 				;;
2338-			vsta)
2339-				basic_machine=i386-pc
2340-				os=vsta
2341-				;;
2342 			isi68 | isi)
2343 				basic_machine=m68k-isi
2344 				os=sysv
2345@@ -612,6 +605,10 @@
2346 				basic_machine=vax-dec
2347 				os=vms
2348 				;;
2349+			vsta)
2350+				basic_machine=i386-pc
2351+				os=vsta
2352+				;;
2353 			vxworks960)
2354 				basic_machine=i960-wrs
2355 				os=vxworks
2356@@ -1346,11 +1343,11 @@
2357 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
2358 	     | sym* | kopensolaris* | plan9* \
2359 	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
2360-	     | aos* | aros* | cloudabi* | sortix* \
2361+	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
2362 	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
2363 	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
2364 	     | knetbsd* | mirbsd* | netbsd* \
2365-	     | bitrig* | openbsd* | solidbsd* | libertybsd* \
2366+	     | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \
2367 	     | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
2368 	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
2369 	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
2370@@ -1368,7 +1365,8 @@
2371 	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
2372 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
2373 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
2374-	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi*)
2375+	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
2376+	     | nsk* | powerunix)
2377 	# Remember, each alternative MUST END IN *, to match a version number.
2378 		;;
2379 	qnx*)
2380@@ -1452,9 +1450,6 @@
2381 	ns2)
2382 		os=nextstep2
2383 		;;
2384-	nsk*)
2385-		os=nsk
2386-		;;
2387 	# Preserve the version number of sinix5.
2388 	sinix5.*)
2389 		os=`echo $os | sed -e 's|sinix|sysv|'`
2390Index: configure
2391--- ncurses-6.1-20200104+/configure	2019-12-31 13:59:02.000000000 +0000
2392+++ ncurses-6.1-20200111/configure	2020-01-12 00:10:58.000000000 +0000
2393@@ -1,7 +1,7 @@
2394 #! /bin/sh
2395-# From configure.in Revision: 1.691 .
2396+# From configure.in Revision: 1.693 .
2397 # Guess values for system-dependent variables and create Makefiles.
2398-# Generated by Autoconf 2.52.20190901.
2399+# Generated by Autoconf 2.52.20200111.
2400 #
2401 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
2402 # Free Software Foundation, Inc.
2403@@ -932,7 +932,7 @@
2404 running configure, to aid debugging if configure makes a mistake.
2405
2406 It was created by $as_me, which was
2407-generated by GNU Autoconf 2.52.20190901.  Invocation command line was
2408+generated by GNU Autoconf 2.52.20200111.  Invocation command line was
2409
2410   $ $0 $@
2411
2412@@ -15455,8 +15455,25 @@
2413  	ADAFLAGS="$ADAFLAGS -gnatg"
2414
2415 if test "x$have_x" = xyes; then
2416+
2417+cf_save_LIBS_CF_CONST_X_STRING="$LIBS"
2418+cf_save_CFLAGS_CF_CONST_X_STRING="$CFLAGS"
2419+cf_save_CPPFLAGS_CF_CONST_X_STRING="$CPPFLAGS"
2420+LIBS="$LIBS ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}"
2421+for cf_X_CFLAGS in $X_CFLAGS
2422+do
2423+	case "x$cf_X_CFLAGS" in
2424+	x-[IUD]*)
2425+		CPPFLAGS="$CPPFLAGS $cf_X_CFLAGS"
2426+		;;
2427+	*)
2428+		CFLAGS="$CFLAGS $cf_X_CFLAGS"
2429+		;;
2430+	esac
2431+done
2432+
2433 cat >conftest.$ac_ext <<_ACEOF
2434-#line 15459 "configure"
2435+#line 15476 "configure"
2436 #include "confdefs.h"
2437
2438 #include <stdlib.h>
2439@@ -15471,26 +15488,26 @@
2440 }
2441 _ACEOF
2442 rm -f conftest.$ac_objext
2443-if { (eval echo "$as_me:15474: \"$ac_compile\"") >&5
2444+if { (eval echo "$as_me:15491: \"$ac_compile\"") >&5
2445   (eval $ac_compile) 2>&5
2446   ac_status=$?
2447-  echo "$as_me:15477: \$? = $ac_status" >&5
2448+  echo "$as_me:15494: \$? = $ac_status" >&5
2449   (exit $ac_status); } &&
2450          { ac_try='test -s conftest.$ac_objext'
2451-  { (eval echo "$as_me:15480: \"$ac_try\"") >&5
2452+  { (eval echo "$as_me:15497: \"$ac_try\"") >&5
2453   (eval $ac_try) 2>&5
2454   ac_status=$?
2455-  echo "$as_me:15483: \$? = $ac_status" >&5
2456+  echo "$as_me:15500: \$? = $ac_status" >&5
2457   (exit $ac_status); }; }; then
2458
2459-echo "$as_me:15486: checking for X11/Xt const-feature" >&5
2460+echo "$as_me:15503: checking for X11/Xt const-feature" >&5
2461 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
2462 if test "${cf_cv_const_x_string+set}" = set; then
2463   echo $ECHO_N "(cached) $ECHO_C" >&6
2464 else
2465
2466 	cat >conftest.$ac_ext <<_ACEOF
2467-#line 15493 "configure"
2468+#line 15510 "configure"
2469 #include "confdefs.h"
2470
2471 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
2472@@ -15507,16 +15524,16 @@
2473 }
2474 _ACEOF
2475 rm -f conftest.$ac_objext
2476-if { (eval echo "$as_me:15510: \"$ac_compile\"") >&5
2477+if { (eval echo "$as_me:15527: \"$ac_compile\"") >&5
2478   (eval $ac_compile) 2>&5
2479   ac_status=$?
2480-  echo "$as_me:15513: \$? = $ac_status" >&5
2481+  echo "$as_me:15530: \$? = $ac_status" >&5
2482   (exit $ac_status); } &&
2483          { ac_try='test -s conftest.$ac_objext'
2484-  { (eval echo "$as_me:15516: \"$ac_try\"") >&5
2485+  { (eval echo "$as_me:15533: \"$ac_try\"") >&5
2486   (eval $ac_try) 2>&5
2487   ac_status=$?
2488-  echo "$as_me:15519: \$? = $ac_status" >&5
2489+  echo "$as_me:15536: \$? = $ac_status" >&5
2490   (exit $ac_status); }; }; then
2491
2492 			cf_cv_const_x_string=no
2493@@ -15531,9 +15548,13 @@
2494 rm -f conftest.$ac_objext conftest.$ac_ext
2495
2496 fi
2497-echo "$as_me:15534: result: $cf_cv_const_x_string" >&5
2498+echo "$as_me:15551: result: $cf_cv_const_x_string" >&5
2499 echo "${ECHO_T}$cf_cv_const_x_string" >&6
2500
2501+LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
2502+CFLAGS="$cf_save_CFLAGS_CF_CONST_X_STRING"
2503+CPPFLAGS="$cf_save_CPPFLAGS_CF_CONST_X_STRING"
2504+
2505 case $cf_cv_const_x_string in
2506 (no)
2507
2508@@ -15556,7 +15577,7 @@
2509 rm -f conftest.$ac_objext conftest.$ac_ext
2510  fi
2511 cat > conftest.$ac_ext <<EOF
2512-#line 15559 "${as_me:-configure}"
2513+#line 15580 "${as_me:-configure}"
2514 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
2515 EOF
2516 if test "$INTEL_COMPILER" = yes
2517@@ -15572,7 +15593,7 @@
2518 # remark #981: operands are evaluated in unspecified order
2519 # warning #279: controlling expression is constant
2520
2521-	{ echo "$as_me:15575: checking for $CC warning options..." >&5
2522+	{ echo "$as_me:15596: checking for $CC warning options..." >&5
2523 echo "$as_me: checking for $CC warning options..." >&6;}
2524 	cf_save_CFLAGS="$CFLAGS"
2525 	EXTRA_CFLAGS="-Wall"
2526@@ -15588,20 +15609,20 @@
2527 		wd981
2528 	do
2529 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
2530-		if { (eval echo "$as_me:15591: \"$ac_compile\"") >&5
2531+		if { (eval echo "$as_me:15612: \"$ac_compile\"") >&5
2532   (eval $ac_compile) 2>&5
2533   ac_status=$?
2534-  echo "$as_me:15594: \$? = $ac_status" >&5
2535+  echo "$as_me:15615: \$? = $ac_status" >&5
2536   (exit $ac_status); }; then
2537-			test -n "$verbose" && echo "$as_me:15596: result: ... -$cf_opt" >&5
2538+			test -n "$verbose" && echo "$as_me:15617: result: ... -$cf_opt" >&5
2539 echo "${ECHO_T}... -$cf_opt" >&6
2540 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
2541 		fi
2542 	done
2543 	CFLAGS="$cf_save_CFLAGS"
2544-elif test "$GCC" = yes
2545+elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
2546 then
2547-	{ echo "$as_me:15604: checking for $CC warning options..." >&5
2548+	{ echo "$as_me:15625: checking for $CC warning options..." >&5
2549 echo "$as_me: checking for $CC warning options..." >&6;}
2550 	cf_save_CFLAGS="$CFLAGS"
2551 	EXTRA_CFLAGS=
2552@@ -15622,15 +15643,15 @@
2553 		Wpointer-arith \
2554 		Wshadow \
2555 		Wstrict-prototypes \
2556-		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
2557+		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
2558 	do
2559 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
2560-		if { (eval echo "$as_me:15628: \"$ac_compile\"") >&5
2561+		if { (eval echo "$as_me:15649: \"$ac_compile\"") >&5
2562   (eval $ac_compile) 2>&5
2563   ac_status=$?
2564-  echo "$as_me:15631: \$? = $ac_status" >&5
2565+  echo "$as_me:15652: \$? = $ac_status" >&5
2566   (exit $ac_status); }; then
2567-			test -n "$verbose" && echo "$as_me:15633: result: ... -$cf_opt" >&5
2568+			test -n "$verbose" && echo "$as_me:15654: result: ... -$cf_opt" >&5
2569 echo "${ECHO_T}... -$cf_opt" >&6
2570 			case $cf_opt in
2571 			(Winline)
2572@@ -15638,7 +15659,7 @@
2573 				([34].*)
2574 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
2575
2576-echo "${as_me:-configure}:15641: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
2577+echo "${as_me:-configure}:15662: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
2578
2579 					continue;;
2580 				esac
2581@@ -15648,7 +15669,7 @@
2582 				([12].*)
2583 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
2584
2585-echo "${as_me:-configure}:15651: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
2586+echo "${as_me:-configure}:15672: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
2587
2588 					continue;;
2589 				esac
2590@@ -15668,12 +15689,12 @@
2591 if test "$GCC" = yes ; then
2592 	case $host_os in
2593 	(linux*|gnu*)
2594-		echo "$as_me:15671: checking if this is really Intel C++ compiler" >&5
2595+		echo "$as_me:15692: checking if this is really Intel C++ compiler" >&5
2596 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
2597 		cf_save_CFLAGS="$CXXFLAGS"
2598 		CXXFLAGS="$CXXFLAGS -no-gcc"
2599 		cat >conftest.$ac_ext <<_ACEOF
2600-#line 15676 "configure"
2601+#line 15697 "configure"
2602 #include "confdefs.h"
2603
2604 int
2605@@ -15690,16 +15711,16 @@
2606 }
2607 _ACEOF
2608 rm -f conftest.$ac_objext
2609-if { (eval echo "$as_me:15693: \"$ac_compile\"") >&5
2610+if { (eval echo "$as_me:15714: \"$ac_compile\"") >&5
2611   (eval $ac_compile) 2>&5
2612   ac_status=$?
2613-  echo "$as_me:15696: \$? = $ac_status" >&5
2614+  echo "$as_me:15717: \$? = $ac_status" >&5
2615   (exit $ac_status); } &&
2616          { ac_try='test -s conftest.$ac_objext'
2617-  { (eval echo "$as_me:15699: \"$ac_try\"") >&5
2618+  { (eval echo "$as_me:15720: \"$ac_try\"") >&5
2619   (eval $ac_try) 2>&5
2620   ac_status=$?
2621-  echo "$as_me:15702: \$? = $ac_status" >&5
2622+  echo "$as_me:15723: \$? = $ac_status" >&5
2623   (exit $ac_status); }; }; then
2624   INTEL_CPLUSPLUS=yes
2625 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
2626@@ -15710,7 +15731,7 @@
2627 fi
2628 rm -f conftest.$ac_objext conftest.$ac_ext
2629 		CXXFLAGS="$cf_save_CFLAGS"
2630-		echo "$as_me:15713: result: $INTEL_CPLUSPLUS" >&5
2631+		echo "$as_me:15734: result: $INTEL_CPLUSPLUS" >&5
2632 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
2633 		;;
2634 	esac
2635@@ -15719,12 +15740,12 @@
2636 CLANG_CPLUSPLUS=no
2637
2638 if test "$GCC" = yes ; then
2639-	echo "$as_me:15722: checking if this is really Clang C++ compiler" >&5
2640+	echo "$as_me:15743: checking if this is really Clang C++ compiler" >&5
2641 echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
2642 	cf_save_CFLAGS="$CXXFLAGS"
2643 	CXXFLAGS="$CXXFLAGS -Qunused-arguments"
2644 	cat >conftest.$ac_ext <<_ACEOF
2645-#line 15727 "configure"
2646+#line 15748 "configure"
2647 #include "confdefs.h"
2648
2649 int
2650@@ -15741,16 +15762,16 @@
2651 }
2652 _ACEOF
2653 rm -f conftest.$ac_objext
2654-if { (eval echo "$as_me:15744: \"$ac_compile\"") >&5
2655+if { (eval echo "$as_me:15765: \"$ac_compile\"") >&5
2656   (eval $ac_compile) 2>&5
2657   ac_status=$?
2658-  echo "$as_me:15747: \$? = $ac_status" >&5
2659+  echo "$as_me:15768: \$? = $ac_status" >&5
2660   (exit $ac_status); } &&
2661          { ac_try='test -s conftest.$ac_objext'
2662-  { (eval echo "$as_me:15750: \"$ac_try\"") >&5
2663+  { (eval echo "$as_me:15771: \"$ac_try\"") >&5
2664   (eval $ac_try) 2>&5
2665   ac_status=$?
2666-  echo "$as_me:15753: \$? = $ac_status" >&5
2667+  echo "$as_me:15774: \$? = $ac_status" >&5
2668   (exit $ac_status); }; }; then
2669   CLANG_CPLUSPLUS=yes
2670 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
2671@@ -15761,7 +15782,7 @@
2672 fi
2673 rm -f conftest.$ac_objext conftest.$ac_ext
2674 	CXXFLAGS="$cf_save_CFLAGS"
2675-	echo "$as_me:15764: result: $CLANG_CPLUSPLUS" >&5
2676+	echo "$as_me:15785: result: $CLANG_CPLUSPLUS" >&5
2677 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
2678 fi
2679
2680@@ -15773,7 +15794,7 @@
2681 ac_main_return=return
2682
2683 cat > conftest.$ac_ext <<EOF
2684-#line 15776 "configure"
2685+#line 15797 "configure"
2686 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
2687 EOF
2688
2689@@ -15791,7 +15812,7 @@
2690 # remark #981: operands are evaluated in unspecified order
2691 # warning #269: invalid format string conversion
2692
2693-	{ echo "$as_me:15794: checking for $CC warning options..." >&5
2694+	{ echo "$as_me:15815: checking for $CC warning options..." >&5
2695 echo "$as_me: checking for $CC warning options..." >&6;}
2696 	cf_save_CXXFLAGS="$CXXFLAGS"
2697 	EXTRA_CXXFLAGS="-Wall"
2698@@ -15808,12 +15829,12 @@
2699 		wd981
2700 	do
2701 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
2702-		if { (eval echo "$as_me:15811: \"$ac_compile\"") >&5
2703+		if { (eval echo "$as_me:15832: \"$ac_compile\"") >&5
2704   (eval $ac_compile) 2>&5
2705   ac_status=$?
2706-  echo "$as_me:15814: \$? = $ac_status" >&5
2707+  echo "$as_me:15835: \$? = $ac_status" >&5
2708   (exit $ac_status); }; then
2709-			test -n "$verbose" && echo "$as_me:15816: result: ... -$cf_opt" >&5
2710+			test -n "$verbose" && echo "$as_me:15837: result: ... -$cf_opt" >&5
2711 echo "${ECHO_T}... -$cf_opt" >&6
2712 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
2713 		fi
2714@@ -15822,7 +15843,7 @@
2715
2716 elif test "$GXX" = yes
2717 then
2718-	{ echo "$as_me:15825: checking for $CXX warning options..." >&5
2719+	{ echo "$as_me:15846: checking for $CXX warning options..." >&5
2720 echo "$as_me: checking for $CXX warning options..." >&6;}
2721 	cf_save_CXXFLAGS="$CXXFLAGS"
2722 	EXTRA_CXXFLAGS="-W -Wall"
2723@@ -15852,16 +15873,16 @@
2724 		Wundef $cf_gxx_extra_warnings Wno-unused
2725 	do
2726 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
2727-		if { (eval echo "$as_me:15855: \"$ac_compile\"") >&5
2728+		if { (eval echo "$as_me:15876: \"$ac_compile\"") >&5
2729   (eval $ac_compile) 2>&5
2730   ac_status=$?
2731-  echo "$as_me:15858: \$? = $ac_status" >&5
2732+  echo "$as_me:15879: \$? = $ac_status" >&5
2733   (exit $ac_status); }; then
2734-			test -n "$verbose" && echo "$as_me:15860: result: ... -$cf_opt" >&5
2735+			test -n "$verbose" && echo "$as_me:15881: result: ... -$cf_opt" >&5
2736 echo "${ECHO_T}... -$cf_opt" >&6
2737 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
2738 		else
2739-			test -n "$verbose" && echo "$as_me:15864: result: ... no -$cf_opt" >&5
2740+			test -n "$verbose" && echo "$as_me:15885: result: ... no -$cf_opt" >&5
2741 echo "${ECHO_T}... no -$cf_opt" >&6
2742 		fi
2743 	done
2744@@ -15897,10 +15918,10 @@
2745 EOF
2746 if test "$GCC" = yes
2747 then
2748-	{ echo "$as_me:15900: checking for $CC __attribute__ directives..." >&5
2749+	{ echo "$as_me:15921: checking for $CC __attribute__ directives..." >&5
2750 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
2751 cat > conftest.$ac_ext <<EOF
2752-#line 15903 "${as_me:-configure}"
2753+#line 15924 "${as_me:-configure}"
2754 #include "confdefs.h"
2755 #include "conftest.h"
2756 #include "conftest.i"
2757@@ -15949,12 +15970,12 @@
2758 			;;
2759 		esac
2760
2761-		if { (eval echo "$as_me:15952: \"$ac_compile\"") >&5
2762+		if { (eval echo "$as_me:15973: \"$ac_compile\"") >&5
2763   (eval $ac_compile) 2>&5
2764   ac_status=$?
2765-  echo "$as_me:15955: \$? = $ac_status" >&5
2766+  echo "$as_me:15976: \$? = $ac_status" >&5
2767   (exit $ac_status); }; then
2768-			test -n "$verbose" && echo "$as_me:15957: result: ... $cf_attribute" >&5
2769+			test -n "$verbose" && echo "$as_me:15978: result: ... $cf_attribute" >&5
2770 echo "${ECHO_T}... $cf_attribute" >&6
2771 			cat conftest.h >>confdefs.h
2772 			case $cf_attribute in
2773@@ -16013,7 +16034,7 @@
2774 rm -rf conftest*
2775 fi
2776
2777-echo "$as_me:16016: checking if you want to work around bogus compiler/loader warnings" >&5
2778+echo "$as_me:16037: checking if you want to work around bogus compiler/loader warnings" >&5
2779 echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
2780
2781 # Check whether --enable-string-hacks or --disable-string-hacks was given.
2782@@ -16023,7 +16044,7 @@
2783 else
2784   with_string_hacks=no
2785 fi;
2786-echo "$as_me:16026: result: $with_string_hacks" >&5
2787+echo "$as_me:16047: result: $with_string_hacks" >&5
2788 echo "${ECHO_T}$with_string_hacks" >&6
2789
2790 if test "x$with_string_hacks" = "xyes"; then
2791@@ -16032,15 +16053,15 @@
2792 #define USE_STRING_HACKS 1
2793 EOF
2794
2795-	{ echo "$as_me:16035: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
2796+	{ echo "$as_me:16056: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
2797 echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
2798-	echo "$as_me:16037: checking for strlcat" >&5
2799+	echo "$as_me:16058: checking for strlcat" >&5
2800 echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
2801 if test "${ac_cv_func_strlcat+set}" = set; then
2802   echo $ECHO_N "(cached) $ECHO_C" >&6
2803 else
2804   cat >conftest.$ac_ext <<_ACEOF
2805-#line 16043 "configure"
2806+#line 16064 "configure"
2807 #include "confdefs.h"
2808 #define strlcat autoconf_temporary
2809 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
2810@@ -16071,16 +16092,16 @@
2811 }
2812 _ACEOF
2813 rm -f conftest.$ac_objext conftest$ac_exeext
2814-if { (eval echo "$as_me:16074: \"$ac_link\"") >&5
2815+if { (eval echo "$as_me:16095: \"$ac_link\"") >&5
2816   (eval $ac_link) 2>&5
2817   ac_status=$?
2818-  echo "$as_me:16077: \$? = $ac_status" >&5
2819+  echo "$as_me:16098: \$? = $ac_status" >&5
2820   (exit $ac_status); } &&
2821          { ac_try='test -s conftest$ac_exeext'
2822-  { (eval echo "$as_me:16080: \"$ac_try\"") >&5
2823+  { (eval echo "$as_me:16101: \"$ac_try\"") >&5
2824   (eval $ac_try) 2>&5
2825   ac_status=$?
2826-  echo "$as_me:16083: \$? = $ac_status" >&5
2827+  echo "$as_me:16104: \$? = $ac_status" >&5
2828   (exit $ac_status); }; }; then
2829   ac_cv_func_strlcat=yes
2830 else
2831@@ -16090,7 +16111,7 @@
2832 fi
2833 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2834 fi
2835-echo "$as_me:16093: result: $ac_cv_func_strlcat" >&5
2836+echo "$as_me:16114: result: $ac_cv_func_strlcat" >&5
2837 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
2838 if test $ac_cv_func_strlcat = yes; then
2839
2840@@ -16100,7 +16121,7 @@
2841
2842 else
2843
2844-		echo "$as_me:16103: checking for strlcat in -lbsd" >&5
2845+		echo "$as_me:16124: checking for strlcat in -lbsd" >&5
2846 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
2847 if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
2848   echo $ECHO_N "(cached) $ECHO_C" >&6
2849@@ -16108,7 +16129,7 @@
2850   ac_check_lib_save_LIBS=$LIBS
2851 LIBS="-lbsd  $LIBS"
2852 cat >conftest.$ac_ext <<_ACEOF
2853-#line 16111 "configure"
2854+#line 16132 "configure"
2855 #include "confdefs.h"
2856
2857 /* Override any gcc2 internal prototype to avoid an error.  */
2858@@ -16127,16 +16148,16 @@
2859 }
2860 _ACEOF
2861 rm -f conftest.$ac_objext conftest$ac_exeext
2862-if { (eval echo "$as_me:16130: \"$ac_link\"") >&5
2863+if { (eval echo "$as_me:16151: \"$ac_link\"") >&5
2864   (eval $ac_link) 2>&5
2865   ac_status=$?
2866-  echo "$as_me:16133: \$? = $ac_status" >&5
2867+  echo "$as_me:16154: \$? = $ac_status" >&5
2868   (exit $ac_status); } &&
2869          { ac_try='test -s conftest$ac_exeext'
2870-  { (eval echo "$as_me:16136: \"$ac_try\"") >&5
2871+  { (eval echo "$as_me:16157: \"$ac_try\"") >&5
2872   (eval $ac_try) 2>&5
2873   ac_status=$?
2874-  echo "$as_me:16139: \$? = $ac_status" >&5
2875+  echo "$as_me:16160: \$? = $ac_status" >&5
2876   (exit $ac_status); }; }; then
2877   ac_cv_lib_bsd_strlcat=yes
2878 else
2879@@ -16147,7 +16168,7 @@
2880 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2881 LIBS=$ac_check_lib_save_LIBS
2882 fi
2883-echo "$as_me:16150: result: $ac_cv_lib_bsd_strlcat" >&5
2884+echo "$as_me:16171: result: $ac_cv_lib_bsd_strlcat" >&5
2885 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
2886 if test $ac_cv_lib_bsd_strlcat = yes; then
2887
2888@@ -16170,23 +16191,23 @@
2889 for ac_header in bsd/string.h
2890 do
2891 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
2892-echo "$as_me:16173: checking for $ac_header" >&5
2893+echo "$as_me:16194: checking for $ac_header" >&5
2894 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
2895 if eval "test \"\${$as_ac_Header+set}\" = set"; then
2896   echo $ECHO_N "(cached) $ECHO_C" >&6
2897 else
2898   cat >conftest.$ac_ext <<_ACEOF
2899-#line 16179 "configure"
2900+#line 16200 "configure"
2901 #include "confdefs.h"
2902 #include <$ac_header>
2903 _ACEOF
2904-if { (eval echo "$as_me:16183: \"$ac_cpp conftest.$ac_ext\"") >&5
2905+if { (eval echo "$as_me:16204: \"$ac_cpp conftest.$ac_ext\"") >&5
2906   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
2907   ac_status=$?
2908   egrep -v '^ *\+' conftest.er1 >conftest.err
2909   rm -f conftest.er1
2910   cat conftest.err >&5
2911-  echo "$as_me:16189: \$? = $ac_status" >&5
2912+  echo "$as_me:16210: \$? = $ac_status" >&5
2913   (exit $ac_status); } >/dev/null; then
2914   if test -s conftest.err; then
2915     ac_cpp_err=$ac_c_preproc_warn_flag
2916@@ -16205,7 +16226,7 @@
2917 fi
2918 rm -f conftest.err conftest.$ac_ext
2919 fi
2920-echo "$as_me:16208: result: `eval echo '${'$as_ac_Header'}'`" >&5
2921+echo "$as_me:16229: result: `eval echo '${'$as_ac_Header'}'`" >&5
2922 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
2923 if test `eval echo '${'$as_ac_Header'}'` = yes; then
2924   cat >>confdefs.h <<EOF
2925@@ -16226,13 +16247,13 @@
2926 for ac_func in strlcpy snprintf
2927 do
2928 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
2929-echo "$as_me:16229: checking for $ac_func" >&5
2930+echo "$as_me:16250: checking for $ac_func" >&5
2931 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
2932 if eval "test \"\${$as_ac_var+set}\" = set"; then
2933   echo $ECHO_N "(cached) $ECHO_C" >&6
2934 else
2935   cat >conftest.$ac_ext <<_ACEOF
2936-#line 16235 "configure"
2937+#line 16256 "configure"
2938 #include "confdefs.h"
2939 #define $ac_func autoconf_temporary
2940 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
2941@@ -16263,16 +16284,16 @@
2942 }
2943 _ACEOF
2944 rm -f conftest.$ac_objext conftest$ac_exeext
2945-if { (eval echo "$as_me:16266: \"$ac_link\"") >&5
2946+if { (eval echo "$as_me:16287: \"$ac_link\"") >&5
2947   (eval $ac_link) 2>&5
2948   ac_status=$?
2949-  echo "$as_me:16269: \$? = $ac_status" >&5
2950+  echo "$as_me:16290: \$? = $ac_status" >&5
2951   (exit $ac_status); } &&
2952          { ac_try='test -s conftest$ac_exeext'
2953-  { (eval echo "$as_me:16272: \"$ac_try\"") >&5
2954+  { (eval echo "$as_me:16293: \"$ac_try\"") >&5
2955   (eval $ac_try) 2>&5
2956   ac_status=$?
2957-  echo "$as_me:16275: \$? = $ac_status" >&5
2958+  echo "$as_me:16296: \$? = $ac_status" >&5
2959   (exit $ac_status); }; }; then
2960   eval "$as_ac_var=yes"
2961 else
2962@@ -16282,7 +16303,7 @@
2963 fi
2964 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2965 fi
2966-echo "$as_me:16285: result: `eval echo '${'$as_ac_var'}'`" >&5
2967+echo "$as_me:16306: result: `eval echo '${'$as_ac_var'}'`" >&5
2968 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
2969 if test `eval echo '${'$as_ac_var'}'` = yes; then
2970   cat >>confdefs.h <<EOF
2971@@ -16295,7 +16316,7 @@
2972 fi
2973
2974 ###	use option --enable-assertions to turn on generation of assertion code
2975-echo "$as_me:16298: checking if you want to enable runtime assertions" >&5
2976+echo "$as_me:16319: checking if you want to enable runtime assertions" >&5
2977 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
2978
2979 # Check whether --enable-assertions or --disable-assertions was given.
2980@@ -16305,7 +16326,7 @@
2981 else
2982   with_assertions=no
2983 fi;
2984-echo "$as_me:16308: result: $with_assertions" >&5
2985+echo "$as_me:16329: result: $with_assertions" >&5
2986 echo "${ECHO_T}$with_assertions" >&6
2987 if test -n "$GCC"
2988 then
2989@@ -16321,7 +16342,7 @@
2990
2991 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
2992
2993-echo "$as_me:16324: checking if you want to use dmalloc for testing" >&5
2994+echo "$as_me:16345: checking if you want to use dmalloc for testing" >&5
2995 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
2996
2997 # Check whether --with-dmalloc or --without-dmalloc was given.
2998@@ -16338,7 +16359,7 @@
2999 else
3000   with_dmalloc=
3001 fi;
3002-echo "$as_me:16341: result: ${with_dmalloc:-no}" >&5
3003+echo "$as_me:16362: result: ${with_dmalloc:-no}" >&5
3004 echo "${ECHO_T}${with_dmalloc:-no}" >&6
3005
3006 case .$with_cflags in
3007@@ -16452,23 +16473,23 @@
3008 esac
3009
3010 if test "$with_dmalloc" = yes ; then
3011-	echo "$as_me:16455: checking for dmalloc.h" >&5
3012+	echo "$as_me:16476: checking for dmalloc.h" >&5
3013 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
3014 if test "${ac_cv_header_dmalloc_h+set}" = set; then
3015   echo $ECHO_N "(cached) $ECHO_C" >&6
3016 else
3017   cat >conftest.$ac_ext <<_ACEOF
3018-#line 16461 "configure"
3019+#line 16482 "configure"
3020 #include "confdefs.h"
3021 #include <dmalloc.h>
3022 _ACEOF
3023-if { (eval echo "$as_me:16465: \"$ac_cpp conftest.$ac_ext\"") >&5
3024+if { (eval echo "$as_me:16486: \"$ac_cpp conftest.$ac_ext\"") >&5
3025   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
3026   ac_status=$?
3027   egrep -v '^ *\+' conftest.er1 >conftest.err
3028   rm -f conftest.er1
3029   cat conftest.err >&5
3030-  echo "$as_me:16471: \$? = $ac_status" >&5
3031+  echo "$as_me:16492: \$? = $ac_status" >&5
3032   (exit $ac_status); } >/dev/null; then
3033   if test -s conftest.err; then
3034     ac_cpp_err=$ac_c_preproc_warn_flag
3035@@ -16487,11 +16508,11 @@
3036 fi
3037 rm -f conftest.err conftest.$ac_ext
3038 fi
3039-echo "$as_me:16490: result: $ac_cv_header_dmalloc_h" >&5
3040+echo "$as_me:16511: result: $ac_cv_header_dmalloc_h" >&5
3041 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
3042 if test $ac_cv_header_dmalloc_h = yes; then
3043
3044-echo "$as_me:16494: checking for dmalloc_debug in -ldmalloc" >&5
3045+echo "$as_me:16515: checking for dmalloc_debug in -ldmalloc" >&5
3046 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
3047 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
3048   echo $ECHO_N "(cached) $ECHO_C" >&6
3049@@ -16499,7 +16520,7 @@
3050   ac_check_lib_save_LIBS=$LIBS
3051 LIBS="-ldmalloc  $LIBS"
3052 cat >conftest.$ac_ext <<_ACEOF
3053-#line 16502 "configure"
3054+#line 16523 "configure"
3055 #include "confdefs.h"
3056
3057 /* Override any gcc2 internal prototype to avoid an error.  */
3058@@ -16518,16 +16539,16 @@
3059 }
3060 _ACEOF
3061 rm -f conftest.$ac_objext conftest$ac_exeext
3062-if { (eval echo "$as_me:16521: \"$ac_link\"") >&5
3063+if { (eval echo "$as_me:16542: \"$ac_link\"") >&5
3064   (eval $ac_link) 2>&5
3065   ac_status=$?
3066-  echo "$as_me:16524: \$? = $ac_status" >&5
3067+  echo "$as_me:16545: \$? = $ac_status" >&5
3068   (exit $ac_status); } &&
3069          { ac_try='test -s conftest$ac_exeext'
3070-  { (eval echo "$as_me:16527: \"$ac_try\"") >&5
3071+  { (eval echo "$as_me:16548: \"$ac_try\"") >&5
3072   (eval $ac_try) 2>&5
3073   ac_status=$?
3074-  echo "$as_me:16530: \$? = $ac_status" >&5
3075+  echo "$as_me:16551: \$? = $ac_status" >&5
3076   (exit $ac_status); }; }; then
3077   ac_cv_lib_dmalloc_dmalloc_debug=yes
3078 else
3079@@ -16538,7 +16559,7 @@
3080 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3081 LIBS=$ac_check_lib_save_LIBS
3082 fi
3083-echo "$as_me:16541: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
3084+echo "$as_me:16562: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
3085 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
3086 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
3087   cat >>confdefs.h <<EOF
3088@@ -16553,7 +16574,7 @@
3089
3090 fi
3091
3092-echo "$as_me:16556: checking if you want to use dbmalloc for testing" >&5
3093+echo "$as_me:16577: checking if you want to use dbmalloc for testing" >&5
3094 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
3095
3096 # Check whether --with-dbmalloc or --without-dbmalloc was given.
3097@@ -16570,7 +16591,7 @@
3098 else
3099   with_dbmalloc=
3100 fi;
3101-echo "$as_me:16573: result: ${with_dbmalloc:-no}" >&5
3102+echo "$as_me:16594: result: ${with_dbmalloc:-no}" >&5
3103 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
3104
3105 case .$with_cflags in
3106@@ -16684,23 +16705,23 @@
3107 esac
3108
3109 if test "$with_dbmalloc" = yes ; then
3110-	echo "$as_me:16687: checking for dbmalloc.h" >&5
3111+	echo "$as_me:16708: checking for dbmalloc.h" >&5
3112 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
3113 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
3114   echo $ECHO_N "(cached) $ECHO_C" >&6
3115 else
3116   cat >conftest.$ac_ext <<_ACEOF
3117-#line 16693 "configure"
3118+#line 16714 "configure"
3119 #include "confdefs.h"
3120 #include <dbmalloc.h>
3121 _ACEOF
3122-if { (eval echo "$as_me:16697: \"$ac_cpp conftest.$ac_ext\"") >&5
3123+if { (eval echo "$as_me:16718: \"$ac_cpp conftest.$ac_ext\"") >&5
3124   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
3125   ac_status=$?
3126   egrep -v '^ *\+' conftest.er1 >conftest.err
3127   rm -f conftest.er1
3128   cat conftest.err >&5
3129-  echo "$as_me:16703: \$? = $ac_status" >&5
3130+  echo "$as_me:16724: \$? = $ac_status" >&5
3131   (exit $ac_status); } >/dev/null; then
3132   if test -s conftest.err; then
3133     ac_cpp_err=$ac_c_preproc_warn_flag
3134@@ -16719,11 +16740,11 @@
3135 fi
3136 rm -f conftest.err conftest.$ac_ext
3137 fi
3138-echo "$as_me:16722: result: $ac_cv_header_dbmalloc_h" >&5
3139+echo "$as_me:16743: result: $ac_cv_header_dbmalloc_h" >&5
3140 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
3141 if test $ac_cv_header_dbmalloc_h = yes; then
3142
3143-echo "$as_me:16726: checking for debug_malloc in -ldbmalloc" >&5
3144+echo "$as_me:16747: checking for debug_malloc in -ldbmalloc" >&5
3145 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
3146 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
3147   echo $ECHO_N "(cached) $ECHO_C" >&6
3148@@ -16731,7 +16752,7 @@
3149   ac_check_lib_save_LIBS=$LIBS
3150 LIBS="-ldbmalloc  $LIBS"
3151 cat >conftest.$ac_ext <<_ACEOF
3152-#line 16734 "configure"
3153+#line 16755 "configure"
3154 #include "confdefs.h"
3155
3156 /* Override any gcc2 internal prototype to avoid an error.  */
3157@@ -16750,16 +16771,16 @@
3158 }
3159 _ACEOF
3160 rm -f conftest.$ac_objext conftest$ac_exeext
3161-if { (eval echo "$as_me:16753: \"$ac_link\"") >&5
3162+if { (eval echo "$as_me:16774: \"$ac_link\"") >&5
3163   (eval $ac_link) 2>&5
3164   ac_status=$?
3165-  echo "$as_me:16756: \$? = $ac_status" >&5
3166+  echo "$as_me:16777: \$? = $ac_status" >&5
3167   (exit $ac_status); } &&
3168          { ac_try='test -s conftest$ac_exeext'
3169-  { (eval echo "$as_me:16759: \"$ac_try\"") >&5
3170+  { (eval echo "$as_me:16780: \"$ac_try\"") >&5
3171   (eval $ac_try) 2>&5
3172   ac_status=$?
3173-  echo "$as_me:16762: \$? = $ac_status" >&5
3174+  echo "$as_me:16783: \$? = $ac_status" >&5
3175   (exit $ac_status); }; }; then
3176   ac_cv_lib_dbmalloc_debug_malloc=yes
3177 else
3178@@ -16770,7 +16791,7 @@
3179 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3180 LIBS=$ac_check_lib_save_LIBS
3181 fi
3182-echo "$as_me:16773: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
3183+echo "$as_me:16794: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
3184 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
3185 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
3186   cat >>confdefs.h <<EOF
3187@@ -16785,7 +16806,7 @@
3188
3189 fi
3190
3191-echo "$as_me:16788: checking if you want to use valgrind for testing" >&5
3192+echo "$as_me:16809: checking if you want to use valgrind for testing" >&5
3193 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
3194
3195 # Check whether --with-valgrind or --without-valgrind was given.
3196@@ -16802,7 +16823,7 @@
3197 else
3198   with_valgrind=
3199 fi;
3200-echo "$as_me:16805: result: ${with_valgrind:-no}" >&5
3201+echo "$as_me:16826: result: ${with_valgrind:-no}" >&5
3202 echo "${ECHO_T}${with_valgrind:-no}" >&6
3203
3204 case .$with_cflags in
3205@@ -16915,7 +16936,7 @@
3206 	;;
3207 esac
3208
3209-echo "$as_me:16918: checking if you want to perform memory-leak testing" >&5
3210+echo "$as_me:16939: checking if you want to perform memory-leak testing" >&5
3211 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
3212
3213 # Check whether --enable-leaks or --disable-leaks was given.
3214@@ -16925,7 +16946,7 @@
3215 else
3216   : ${with_no_leaks:=no}
3217 fi;
3218-echo "$as_me:16928: result: $with_no_leaks" >&5
3219+echo "$as_me:16949: result: $with_no_leaks" >&5
3220 echo "${ECHO_T}$with_no_leaks" >&6
3221
3222 if test "$with_no_leaks" = yes ; then
3223@@ -16977,7 +16998,7 @@
3224 	;;
3225 esac
3226
3227-echo "$as_me:16980: checking whether to add trace feature to all models" >&5
3228+echo "$as_me:17001: checking whether to add trace feature to all models" >&5
3229 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
3230
3231 # Check whether --with-trace or --without-trace was given.
3232@@ -16987,7 +17008,7 @@
3233 else
3234   cf_with_trace=$cf_all_traces
3235 fi;
3236-echo "$as_me:16990: result: $cf_with_trace" >&5
3237+echo "$as_me:17011: result: $cf_with_trace" >&5
3238 echo "${ECHO_T}$cf_with_trace" >&6
3239
3240 if test "x$cf_with_trace" = xyes ; then
3241@@ -17101,7 +17122,7 @@
3242 	ADA_TRACE=FALSE
3243 fi
3244
3245-echo "$as_me:17104: checking if we want to use GNAT projects" >&5
3246+echo "$as_me:17125: checking if we want to use GNAT projects" >&5
3247 echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
3248
3249 # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
3250@@ -17118,7 +17139,7 @@
3251 	enable_gnat_projects=yes
3252
3253 fi;
3254-echo "$as_me:17121: result: $enable_gnat_projects" >&5
3255+echo "$as_me:17142: result: $enable_gnat_projects" >&5
3256 echo "${ECHO_T}$enable_gnat_projects" >&6
3257
3258 ###	Checks for libraries.
3259@@ -17128,13 +17149,13 @@
3260 	# Note: WINVER may be a problem with Windows 10
3261 	;;
3262 (*)
3263-echo "$as_me:17131: checking for gettimeofday" >&5
3264+echo "$as_me:17152: checking for gettimeofday" >&5
3265 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
3266 if test "${ac_cv_func_gettimeofday+set}" = set; then
3267   echo $ECHO_N "(cached) $ECHO_C" >&6
3268 else
3269   cat >conftest.$ac_ext <<_ACEOF
3270-#line 17137 "configure"
3271+#line 17158 "configure"
3272 #include "confdefs.h"
3273 #define gettimeofday autoconf_temporary
3274 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
3275@@ -17165,16 +17186,16 @@
3276 }
3277 _ACEOF
3278 rm -f conftest.$ac_objext conftest$ac_exeext
3279-if { (eval echo "$as_me:17168: \"$ac_link\"") >&5
3280+if { (eval echo "$as_me:17189: \"$ac_link\"") >&5
3281   (eval $ac_link) 2>&5
3282   ac_status=$?
3283-  echo "$as_me:17171: \$? = $ac_status" >&5
3284+  echo "$as_me:17192: \$? = $ac_status" >&5
3285   (exit $ac_status); } &&
3286          { ac_try='test -s conftest$ac_exeext'
3287-  { (eval echo "$as_me:17174: \"$ac_try\"") >&5
3288+  { (eval echo "$as_me:17195: \"$ac_try\"") >&5
3289   (eval $ac_try) 2>&5
3290   ac_status=$?
3291-  echo "$as_me:17177: \$? = $ac_status" >&5
3292+  echo "$as_me:17198: \$? = $ac_status" >&5
3293   (exit $ac_status); }; }; then
3294   ac_cv_func_gettimeofday=yes
3295 else
3296@@ -17184,7 +17205,7 @@
3297 fi
3298 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3299 fi
3300-echo "$as_me:17187: result: $ac_cv_func_gettimeofday" >&5
3301+echo "$as_me:17208: result: $ac_cv_func_gettimeofday" >&5
3302 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
3303 if test $ac_cv_func_gettimeofday = yes; then
3304
3305@@ -17194,7 +17215,7 @@
3306
3307 else
3308
3309-echo "$as_me:17197: checking for gettimeofday in -lbsd" >&5
3310+echo "$as_me:17218: checking for gettimeofday in -lbsd" >&5
3311 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
3312 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
3313   echo $ECHO_N "(cached) $ECHO_C" >&6
3314@@ -17202,7 +17223,7 @@
3315   ac_check_lib_save_LIBS=$LIBS
3316 LIBS="-lbsd  $LIBS"
3317 cat >conftest.$ac_ext <<_ACEOF
3318-#line 17205 "configure"
3319+#line 17226 "configure"
3320 #include "confdefs.h"
3321
3322 /* Override any gcc2 internal prototype to avoid an error.  */
3323@@ -17221,16 +17242,16 @@
3324 }
3325 _ACEOF
3326 rm -f conftest.$ac_objext conftest$ac_exeext
3327-if { (eval echo "$as_me:17224: \"$ac_link\"") >&5
3328+if { (eval echo "$as_me:17245: \"$ac_link\"") >&5
3329   (eval $ac_link) 2>&5
3330   ac_status=$?
3331-  echo "$as_me:17227: \$? = $ac_status" >&5
3332+  echo "$as_me:17248: \$? = $ac_status" >&5
3333   (exit $ac_status); } &&
3334          { ac_try='test -s conftest$ac_exeext'
3335-  { (eval echo "$as_me:17230: \"$ac_try\"") >&5
3336+  { (eval echo "$as_me:17251: \"$ac_try\"") >&5
3337   (eval $ac_try) 2>&5
3338   ac_status=$?
3339-  echo "$as_me:17233: \$? = $ac_status" >&5
3340+  echo "$as_me:17254: \$? = $ac_status" >&5
3341   (exit $ac_status); }; }; then
3342   ac_cv_lib_bsd_gettimeofday=yes
3343 else
3344@@ -17241,7 +17262,7 @@
3345 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3346 LIBS=$ac_check_lib_save_LIBS
3347 fi
3348-echo "$as_me:17244: result: $ac_cv_lib_bsd_gettimeofday" >&5
3349+echo "$as_me:17265: result: $ac_cv_lib_bsd_gettimeofday" >&5
3350 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
3351 if test $ac_cv_lib_bsd_gettimeofday = yes; then
3352
3353@@ -17271,14 +17292,14 @@
3354 	;;
3355 esac
3356
3357-echo "$as_me:17274: checking if -lm needed for math functions" >&5
3358+echo "$as_me:17295: checking if -lm needed for math functions" >&5
3359 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
3360 if test "${cf_cv_need_libm+set}" = set; then
3361   echo $ECHO_N "(cached) $ECHO_C" >&6
3362 else
3363
3364 	cat >conftest.$ac_ext <<_ACEOF
3365-#line 17281 "configure"
3366+#line 17302 "configure"
3367 #include "confdefs.h"
3368
3369 	#include <stdio.h>
3370@@ -17294,16 +17315,16 @@
3371 }
3372 _ACEOF
3373 rm -f conftest.$ac_objext conftest$ac_exeext
3374-if { (eval echo "$as_me:17297: \"$ac_link\"") >&5
3375+if { (eval echo "$as_me:17318: \"$ac_link\"") >&5
3376   (eval $ac_link) 2>&5
3377   ac_status=$?
3378-  echo "$as_me:17300: \$? = $ac_status" >&5
3379+  echo "$as_me:17321: \$? = $ac_status" >&5
3380   (exit $ac_status); } &&
3381          { ac_try='test -s conftest$ac_exeext'
3382-  { (eval echo "$as_me:17303: \"$ac_try\"") >&5
3383+  { (eval echo "$as_me:17324: \"$ac_try\"") >&5
3384   (eval $ac_try) 2>&5
3385   ac_status=$?
3386-  echo "$as_me:17306: \$? = $ac_status" >&5
3387+  echo "$as_me:17327: \$? = $ac_status" >&5
3388   (exit $ac_status); }; }; then
3389   cf_cv_need_libm=no
3390 else
3391@@ -17313,7 +17334,7 @@
3392 fi
3393 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3394 fi
3395-echo "$as_me:17316: result: $cf_cv_need_libm" >&5
3396+echo "$as_me:17337: result: $cf_cv_need_libm" >&5
3397 echo "${ECHO_T}$cf_cv_need_libm" >&6
3398 if test "$cf_cv_need_libm" = yes
3399 then
3400@@ -17321,13 +17342,13 @@
3401 fi
3402
3403 ###	Checks for header files.
3404-echo "$as_me:17324: checking for ANSI C header files" >&5
3405+echo "$as_me:17345: checking for ANSI C header files" >&5
3406 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
3407 if test "${ac_cv_header_stdc+set}" = set; then
3408   echo $ECHO_N "(cached) $ECHO_C" >&6
3409 else
3410   cat >conftest.$ac_ext <<_ACEOF
3411-#line 17330 "configure"
3412+#line 17351 "configure"
3413 #include "confdefs.h"
3414 #include <stdlib.h>
3415 #include <stdarg.h>
3416@@ -17335,13 +17356,13 @@
3417 #include <float.h>
3418
3419 _ACEOF
3420-if { (eval echo "$as_me:17338: \"$ac_cpp conftest.$ac_ext\"") >&5
3421+if { (eval echo "$as_me:17359: \"$ac_cpp conftest.$ac_ext\"") >&5
3422   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
3423   ac_status=$?
3424   egrep -v '^ *\+' conftest.er1 >conftest.err
3425   rm -f conftest.er1
3426   cat conftest.err >&5
3427-  echo "$as_me:17344: \$? = $ac_status" >&5
3428+  echo "$as_me:17365: \$? = $ac_status" >&5
3429   (exit $ac_status); } >/dev/null; then
3430   if test -s conftest.err; then
3431     ac_cpp_err=$ac_c_preproc_warn_flag
3432@@ -17363,7 +17384,7 @@
3433 if test $ac_cv_header_stdc = yes; then
3434   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
3435   cat >conftest.$ac_ext <<_ACEOF
3436-#line 17366 "configure"
3437+#line 17387 "configure"
3438 #include "confdefs.h"
3439 #include <string.h>
3440
3441@@ -17381,7 +17402,7 @@
3442 if test $ac_cv_header_stdc = yes; then
3443   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
3444   cat >conftest.$ac_ext <<_ACEOF
3445-#line 17384 "configure"
3446+#line 17405 "configure"
3447 #include "confdefs.h"
3448 #include <stdlib.h>
3449
3450@@ -17402,7 +17423,7 @@
3451   :
3452 else
3453   cat >conftest.$ac_ext <<_ACEOF
3454-#line 17405 "configure"
3455+#line 17426 "configure"
3456 #include "confdefs.h"
3457 #include <ctype.h>
3458 #if ((' ' & 0x0FF) == 0x020)
3459@@ -17428,15 +17449,15 @@
3460 }
3461 _ACEOF
3462 rm -f conftest$ac_exeext
3463-if { (eval echo "$as_me:17431: \"$ac_link\"") >&5
3464+if { (eval echo "$as_me:17452: \"$ac_link\"") >&5
3465   (eval $ac_link) 2>&5
3466   ac_status=$?
3467-  echo "$as_me:17434: \$? = $ac_status" >&5
3468+  echo "$as_me:17455: \$? = $ac_status" >&5
3469   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
3470-  { (eval echo "$as_me:17436: \"$ac_try\"") >&5
3471+  { (eval echo "$as_me:17457: \"$ac_try\"") >&5
3472   (eval $ac_try) 2>&5
3473   ac_status=$?
3474-  echo "$as_me:17439: \$? = $ac_status" >&5
3475+  echo "$as_me:17460: \$? = $ac_status" >&5
3476   (exit $ac_status); }; }; then
3477   :
3478 else
3479@@ -17449,7 +17470,7 @@
3480 fi
3481 fi
3482 fi
3483-echo "$as_me:17452: result: $ac_cv_header_stdc" >&5
3484+echo "$as_me:17473: result: $ac_cv_header_stdc" >&5
3485 echo "${ECHO_T}$ac_cv_header_stdc" >&6
3486 if test $ac_cv_header_stdc = yes; then
3487
3488@@ -17462,13 +17483,13 @@
3489 ac_header_dirent=no
3490 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
3491   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
3492-echo "$as_me:17465: checking for $ac_hdr that defines DIR" >&5
3493+echo "$as_me:17486: checking for $ac_hdr that defines DIR" >&5
3494 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
3495 if eval "test \"\${$as_ac_Header+set}\" = set"; then
3496   echo $ECHO_N "(cached) $ECHO_C" >&6
3497 else
3498   cat >conftest.$ac_ext <<_ACEOF
3499-#line 17471 "configure"
3500+#line 17492 "configure"
3501 #include "confdefs.h"
3502 #include <sys/types.h>
3503 #include <$ac_hdr>
3504@@ -17483,16 +17504,16 @@
3505 }
3506 _ACEOF
3507 rm -f conftest.$ac_objext
3508-if { (eval echo "$as_me:17486: \"$ac_compile\"") >&5
3509+if { (eval echo "$as_me:17507: \"$ac_compile\"") >&5
3510   (eval $ac_compile) 2>&5
3511   ac_status=$?
3512-  echo "$as_me:17489: \$? = $ac_status" >&5
3513+  echo "$as_me:17510: \$? = $ac_status" >&5
3514   (exit $ac_status); } &&
3515          { ac_try='test -s conftest.$ac_objext'
3516-  { (eval echo "$as_me:17492: \"$ac_try\"") >&5
3517+  { (eval echo "$as_me:17513: \"$ac_try\"") >&5
3518   (eval $ac_try) 2>&5
3519   ac_status=$?
3520-  echo "$as_me:17495: \$? = $ac_status" >&5
3521+  echo "$as_me:17516: \$? = $ac_status" >&5
3522   (exit $ac_status); }; }; then
3523   eval "$as_ac_Header=yes"
3524 else
3525@@ -17502,7 +17523,7 @@
3526 fi
3527 rm -f conftest.$ac_objext conftest.$ac_ext
3528 fi
3529-echo "$as_me:17505: result: `eval echo '${'$as_ac_Header'}'`" >&5
3530+echo "$as_me:17526: result: `eval echo '${'$as_ac_Header'}'`" >&5
3531 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
3532 if test `eval echo '${'$as_ac_Header'}'` = yes; then
3533   cat >>confdefs.h <<EOF
3534@@ -17515,7 +17536,7 @@
3535 done
3536 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
3537 if test $ac_header_dirent = dirent.h; then
3538-  echo "$as_me:17518: checking for opendir in -ldir" >&5
3539+  echo "$as_me:17539: checking for opendir in -ldir" >&5
3540 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
3541 if test "${ac_cv_lib_dir_opendir+set}" = set; then
3542   echo $ECHO_N "(cached) $ECHO_C" >&6
3543@@ -17523,7 +17544,7 @@
3544   ac_check_lib_save_LIBS=$LIBS
3545 LIBS="-ldir  $LIBS"
3546 cat >conftest.$ac_ext <<_ACEOF
3547-#line 17526 "configure"
3548+#line 17547 "configure"
3549 #include "confdefs.h"
3550
3551 /* Override any gcc2 internal prototype to avoid an error.  */
3552@@ -17542,16 +17563,16 @@
3553 }
3554 _ACEOF
3555 rm -f conftest.$ac_objext conftest$ac_exeext
3556-if { (eval echo "$as_me:17545: \"$ac_link\"") >&5
3557+if { (eval echo "$as_me:17566: \"$ac_link\"") >&5
3558   (eval $ac_link) 2>&5
3559   ac_status=$?
3560-  echo "$as_me:17548: \$? = $ac_status" >&5
3561+  echo "$as_me:17569: \$? = $ac_status" >&5
3562   (exit $ac_status); } &&
3563          { ac_try='test -s conftest$ac_exeext'
3564-  { (eval echo "$as_me:17551: \"$ac_try\"") >&5
3565+  { (eval echo "$as_me:17572: \"$ac_try\"") >&5
3566   (eval $ac_try) 2>&5
3567   ac_status=$?
3568-  echo "$as_me:17554: \$? = $ac_status" >&5
3569+  echo "$as_me:17575: \$? = $ac_status" >&5
3570   (exit $ac_status); }; }; then
3571   ac_cv_lib_dir_opendir=yes
3572 else
3573@@ -17562,14 +17583,14 @@
3574 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3575 LIBS=$ac_check_lib_save_LIBS
3576 fi
3577-echo "$as_me:17565: result: $ac_cv_lib_dir_opendir" >&5
3578+echo "$as_me:17586: result: $ac_cv_lib_dir_opendir" >&5
3579 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
3580 if test $ac_cv_lib_dir_opendir = yes; then
3581   LIBS="$LIBS -ldir"
3582 fi
3583
3584 else
3585-  echo "$as_me:17572: checking for opendir in -lx" >&5
3586+  echo "$as_me:17593: checking for opendir in -lx" >&5
3587 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
3588 if test "${ac_cv_lib_x_opendir+set}" = set; then
3589   echo $ECHO_N "(cached) $ECHO_C" >&6
3590@@ -17577,7 +17598,7 @@
3591   ac_check_lib_save_LIBS=$LIBS
3592 LIBS="-lx  $LIBS"
3593 cat >conftest.$ac_ext <<_ACEOF
3594-#line 17580 "configure"
3595+#line 17601 "configure"
3596 #include "confdefs.h"
3597
3598 /* Override any gcc2 internal prototype to avoid an error.  */
3599@@ -17596,16 +17617,16 @@
3600 }
3601 _ACEOF
3602 rm -f conftest.$ac_objext conftest$ac_exeext
3603-if { (eval echo "$as_me:17599: \"$ac_link\"") >&5
3604+if { (eval echo "$as_me:17620: \"$ac_link\"") >&5
3605   (eval $ac_link) 2>&5
3606   ac_status=$?
3607-  echo "$as_me:17602: \$? = $ac_status" >&5
3608+  echo "$as_me:17623: \$? = $ac_status" >&5
3609   (exit $ac_status); } &&
3610          { ac_try='test -s conftest$ac_exeext'
3611-  { (eval echo "$as_me:17605: \"$ac_try\"") >&5
3612+  { (eval echo "$as_me:17626: \"$ac_try\"") >&5
3613   (eval $ac_try) 2>&5
3614   ac_status=$?
3615-  echo "$as_me:17608: \$? = $ac_status" >&5
3616+  echo "$as_me:17629: \$? = $ac_status" >&5
3617   (exit $ac_status); }; }; then
3618   ac_cv_lib_x_opendir=yes
3619 else
3620@@ -17616,7 +17637,7 @@
3621 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3622 LIBS=$ac_check_lib_save_LIBS
3623 fi
3624-echo "$as_me:17619: result: $ac_cv_lib_x_opendir" >&5
3625+echo "$as_me:17640: result: $ac_cv_lib_x_opendir" >&5
3626 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
3627 if test $ac_cv_lib_x_opendir = yes; then
3628   LIBS="$LIBS -lx"
3629@@ -17624,13 +17645,13 @@
3630
3631 fi
3632
3633-echo "$as_me:17627: checking whether time.h and sys/time.h may both be included" >&5
3634+echo "$as_me:17648: checking whether time.h and sys/time.h may both be included" >&5
3635 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
3636 if test "${ac_cv_header_time+set}" = set; then
3637   echo $ECHO_N "(cached) $ECHO_C" >&6
3638 else
3639   cat >conftest.$ac_ext <<_ACEOF
3640-#line 17633 "configure"
3641+#line 17654 "configure"
3642 #include "confdefs.h"
3643 #include <sys/types.h>
3644 #include <sys/time.h>
3645@@ -17646,16 +17667,16 @@
3646 }
3647 _ACEOF
3648 rm -f conftest.$ac_objext
3649-if { (eval echo "$as_me:17649: \"$ac_compile\"") >&5
3650+if { (eval echo "$as_me:17670: \"$ac_compile\"") >&5
3651   (eval $ac_compile) 2>&5
3652   ac_status=$?
3653-  echo "$as_me:17652: \$? = $ac_status" >&5
3654+  echo "$as_me:17673: \$? = $ac_status" >&5
3655   (exit $ac_status); } &&
3656          { ac_try='test -s conftest.$ac_objext'
3657-  { (eval echo "$as_me:17655: \"$ac_try\"") >&5
3658+  { (eval echo "$as_me:17676: \"$ac_try\"") >&5
3659   (eval $ac_try) 2>&5
3660   ac_status=$?
3661-  echo "$as_me:17658: \$? = $ac_status" >&5
3662+  echo "$as_me:17679: \$? = $ac_status" >&5
3663   (exit $ac_status); }; }; then
3664   ac_cv_header_time=yes
3665 else
3666@@ -17665,7 +17686,7 @@
3667 fi
3668 rm -f conftest.$ac_objext conftest.$ac_ext
3669 fi
3670-echo "$as_me:17668: result: $ac_cv_header_time" >&5
3671+echo "$as_me:17689: result: $ac_cv_header_time" >&5
3672 echo "${ECHO_T}$ac_cv_header_time" >&6
3673 if test $ac_cv_header_time = yes; then
3674
3675@@ -17684,13 +17705,13 @@
3676 	;;
3677 esac
3678
3679-echo "$as_me:17687: checking for regcomp" >&5
3680+echo "$as_me:17708: checking for regcomp" >&5
3681 echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
3682 if test "${ac_cv_func_regcomp+set}" = set; then
3683   echo $ECHO_N "(cached) $ECHO_C" >&6
3684 else
3685   cat >conftest.$ac_ext <<_ACEOF
3686-#line 17693 "configure"
3687+#line 17714 "configure"
3688 #include "confdefs.h"
3689 #define regcomp autoconf_temporary
3690 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
3691@@ -17721,16 +17742,16 @@
3692 }
3693 _ACEOF
3694 rm -f conftest.$ac_objext conftest$ac_exeext
3695-if { (eval echo "$as_me:17724: \"$ac_link\"") >&5
3696+if { (eval echo "$as_me:17745: \"$ac_link\"") >&5
3697   (eval $ac_link) 2>&5
3698   ac_status=$?
3699-  echo "$as_me:17727: \$? = $ac_status" >&5
3700+  echo "$as_me:17748: \$? = $ac_status" >&5
3701   (exit $ac_status); } &&
3702          { ac_try='test -s conftest$ac_exeext'
3703-  { (eval echo "$as_me:17730: \"$ac_try\"") >&5
3704+  { (eval echo "$as_me:17751: \"$ac_try\"") >&5
3705   (eval $ac_try) 2>&5
3706   ac_status=$?
3707-  echo "$as_me:17733: \$? = $ac_status" >&5
3708+  echo "$as_me:17754: \$? = $ac_status" >&5
3709   (exit $ac_status); }; }; then
3710   ac_cv_func_regcomp=yes
3711 else
3712@@ -17740,7 +17761,7 @@
3713 fi
3714 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3715 fi
3716-echo "$as_me:17743: result: $ac_cv_func_regcomp" >&5
3717+echo "$as_me:17764: result: $ac_cv_func_regcomp" >&5
3718 echo "${ECHO_T}$ac_cv_func_regcomp" >&6
3719 if test $ac_cv_func_regcomp = yes; then
3720   cf_regex_func=regcomp
3721@@ -17749,7 +17770,7 @@
3722 	for cf_regex_lib in $cf_regex_libs
3723 	do
3724 		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
3725-echo "$as_me:17752: checking for regcomp in -l$cf_regex_lib" >&5
3726+echo "$as_me:17773: checking for regcomp in -l$cf_regex_lib" >&5
3727 echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
3728 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
3729   echo $ECHO_N "(cached) $ECHO_C" >&6
3730@@ -17757,7 +17778,7 @@
3731   ac_check_lib_save_LIBS=$LIBS
3732 LIBS="-l$cf_regex_lib  $LIBS"
3733 cat >conftest.$ac_ext <<_ACEOF
3734-#line 17760 "configure"
3735+#line 17781 "configure"
3736 #include "confdefs.h"
3737
3738 /* Override any gcc2 internal prototype to avoid an error.  */
3739@@ -17776,16 +17797,16 @@
3740 }
3741 _ACEOF
3742 rm -f conftest.$ac_objext conftest$ac_exeext
3743-if { (eval echo "$as_me:17779: \"$ac_link\"") >&5
3744+if { (eval echo "$as_me:17800: \"$ac_link\"") >&5
3745   (eval $ac_link) 2>&5
3746   ac_status=$?
3747-  echo "$as_me:17782: \$? = $ac_status" >&5
3748+  echo "$as_me:17803: \$? = $ac_status" >&5
3749   (exit $ac_status); } &&
3750          { ac_try='test -s conftest$ac_exeext'
3751-  { (eval echo "$as_me:17785: \"$ac_try\"") >&5
3752+  { (eval echo "$as_me:17806: \"$ac_try\"") >&5
3753   (eval $ac_try) 2>&5
3754   ac_status=$?
3755-  echo "$as_me:17788: \$? = $ac_status" >&5
3756+  echo "$as_me:17809: \$? = $ac_status" >&5
3757   (exit $ac_status); }; }; then
3758   eval "$as_ac_Lib=yes"
3759 else
3760@@ -17796,7 +17817,7 @@
3761 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3762 LIBS=$ac_check_lib_save_LIBS
3763 fi
3764-echo "$as_me:17799: result: `eval echo '${'$as_ac_Lib'}'`" >&5
3765+echo "$as_me:17820: result: `eval echo '${'$as_ac_Lib'}'`" >&5
3766 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
3767 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
3768
3769@@ -17825,13 +17846,13 @@
3770 fi
3771
3772 if test "$cf_regex_func" = no ; then
3773-	echo "$as_me:17828: checking for compile" >&5
3774+	echo "$as_me:17849: checking for compile" >&5
3775 echo $ECHO_N "checking for compile... $ECHO_C" >&6
3776 if test "${ac_cv_func_compile+set}" = set; then
3777   echo $ECHO_N "(cached) $ECHO_C" >&6
3778 else
3779   cat >conftest.$ac_ext <<_ACEOF
3780-#line 17834 "configure"
3781+#line 17855 "configure"
3782 #include "confdefs.h"
3783 #define compile autoconf_temporary
3784 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
3785@@ -17862,16 +17883,16 @@
3786 }
3787 _ACEOF
3788 rm -f conftest.$ac_objext conftest$ac_exeext
3789-if { (eval echo "$as_me:17865: \"$ac_link\"") >&5
3790+if { (eval echo "$as_me:17886: \"$ac_link\"") >&5
3791   (eval $ac_link) 2>&5
3792   ac_status=$?
3793-  echo "$as_me:17868: \$? = $ac_status" >&5
3794+  echo "$as_me:17889: \$? = $ac_status" >&5
3795   (exit $ac_status); } &&
3796          { ac_try='test -s conftest$ac_exeext'
3797-  { (eval echo "$as_me:17871: \"$ac_try\"") >&5
3798+  { (eval echo "$as_me:17892: \"$ac_try\"") >&5
3799   (eval $ac_try) 2>&5
3800   ac_status=$?
3801-  echo "$as_me:17874: \$? = $ac_status" >&5
3802+  echo "$as_me:17895: \$? = $ac_status" >&5
3803   (exit $ac_status); }; }; then
3804   ac_cv_func_compile=yes
3805 else
3806@@ -17881,13 +17902,13 @@
3807 fi
3808 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3809 fi
3810-echo "$as_me:17884: result: $ac_cv_func_compile" >&5
3811+echo "$as_me:17905: result: $ac_cv_func_compile" >&5
3812 echo "${ECHO_T}$ac_cv_func_compile" >&6
3813 if test $ac_cv_func_compile = yes; then
3814   cf_regex_func=compile
3815 else
3816
3817-		echo "$as_me:17890: checking for compile in -lgen" >&5
3818+		echo "$as_me:17911: checking for compile in -lgen" >&5
3819 echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
3820 if test "${ac_cv_lib_gen_compile+set}" = set; then
3821   echo $ECHO_N "(cached) $ECHO_C" >&6
3822@@ -17895,7 +17916,7 @@
3823   ac_check_lib_save_LIBS=$LIBS
3824 LIBS="-lgen  $LIBS"
3825 cat >conftest.$ac_ext <<_ACEOF
3826-#line 17898 "configure"
3827+#line 17919 "configure"
3828 #include "confdefs.h"
3829
3830 /* Override any gcc2 internal prototype to avoid an error.  */
3831@@ -17914,16 +17935,16 @@
3832 }
3833 _ACEOF
3834 rm -f conftest.$ac_objext conftest$ac_exeext
3835-if { (eval echo "$as_me:17917: \"$ac_link\"") >&5
3836+if { (eval echo "$as_me:17938: \"$ac_link\"") >&5
3837   (eval $ac_link) 2>&5
3838   ac_status=$?
3839-  echo "$as_me:17920: \$? = $ac_status" >&5
3840+  echo "$as_me:17941: \$? = $ac_status" >&5
3841   (exit $ac_status); } &&
3842          { ac_try='test -s conftest$ac_exeext'
3843-  { (eval echo "$as_me:17923: \"$ac_try\"") >&5
3844+  { (eval echo "$as_me:17944: \"$ac_try\"") >&5
3845   (eval $ac_try) 2>&5
3846   ac_status=$?
3847-  echo "$as_me:17926: \$? = $ac_status" >&5
3848+  echo "$as_me:17947: \$? = $ac_status" >&5
3849   (exit $ac_status); }; }; then
3850   ac_cv_lib_gen_compile=yes
3851 else
3852@@ -17934,7 +17955,7 @@
3853 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3854 LIBS=$ac_check_lib_save_LIBS
3855 fi
3856-echo "$as_me:17937: result: $ac_cv_lib_gen_compile" >&5
3857+echo "$as_me:17958: result: $ac_cv_lib_gen_compile" >&5
3858 echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
3859 if test $ac_cv_lib_gen_compile = yes; then
3860
3861@@ -17962,11 +17983,11 @@
3862 fi
3863
3864 if test "$cf_regex_func" = no ; then
3865-	{ echo "$as_me:17965: WARNING: cannot find regular expression library" >&5
3866+	{ echo "$as_me:17986: WARNING: cannot find regular expression library" >&5
3867 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
3868 fi
3869
3870-echo "$as_me:17969: checking for regular-expression headers" >&5
3871+echo "$as_me:17990: checking for regular-expression headers" >&5
3872 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
3873 if test "${cf_cv_regex_hdrs+set}" = set; then
3874   echo $ECHO_N "(cached) $ECHO_C" >&6
3875@@ -17978,7 +17999,7 @@
3876 	for cf_regex_hdr in regexp.h regexpr.h
3877 	do
3878 		cat >conftest.$ac_ext <<_ACEOF
3879-#line 17981 "configure"
3880+#line 18002 "configure"
3881 #include "confdefs.h"
3882 #include <$cf_regex_hdr>
3883 int
3884@@ -17993,16 +18014,16 @@
3885 }
3886 _ACEOF
3887 rm -f conftest.$ac_objext conftest$ac_exeext
3888-if { (eval echo "$as_me:17996: \"$ac_link\"") >&5
3889+if { (eval echo "$as_me:18017: \"$ac_link\"") >&5
3890   (eval $ac_link) 2>&5
3891   ac_status=$?
3892-  echo "$as_me:17999: \$? = $ac_status" >&5
3893+  echo "$as_me:18020: \$? = $ac_status" >&5
3894   (exit $ac_status); } &&
3895          { ac_try='test -s conftest$ac_exeext'
3896-  { (eval echo "$as_me:18002: \"$ac_try\"") >&5
3897+  { (eval echo "$as_me:18023: \"$ac_try\"") >&5
3898   (eval $ac_try) 2>&5
3899   ac_status=$?
3900-  echo "$as_me:18005: \$? = $ac_status" >&5
3901+  echo "$as_me:18026: \$? = $ac_status" >&5
3902   (exit $ac_status); }; }; then
3903
3904 			cf_cv_regex_hdrs=$cf_regex_hdr
3905@@ -18019,7 +18040,7 @@
3906 	for cf_regex_hdr in regex.h
3907 	do
3908 		cat >conftest.$ac_ext <<_ACEOF
3909-#line 18022 "configure"
3910+#line 18043 "configure"
3911 #include "confdefs.h"
3912 #include <sys/types.h>
3913 #include <$cf_regex_hdr>
3914@@ -18037,16 +18058,16 @@
3915 }
3916 _ACEOF
3917 rm -f conftest.$ac_objext conftest$ac_exeext
3918-if { (eval echo "$as_me:18040: \"$ac_link\"") >&5
3919+if { (eval echo "$as_me:18061: \"$ac_link\"") >&5
3920   (eval $ac_link) 2>&5
3921   ac_status=$?
3922-  echo "$as_me:18043: \$? = $ac_status" >&5
3923+  echo "$as_me:18064: \$? = $ac_status" >&5
3924   (exit $ac_status); } &&
3925          { ac_try='test -s conftest$ac_exeext'
3926-  { (eval echo "$as_me:18046: \"$ac_try\"") >&5
3927+  { (eval echo "$as_me:18067: \"$ac_try\"") >&5
3928   (eval $ac_try) 2>&5
3929   ac_status=$?
3930-  echo "$as_me:18049: \$? = $ac_status" >&5
3931+  echo "$as_me:18070: \$? = $ac_status" >&5
3932   (exit $ac_status); }; }; then
3933
3934 			cf_cv_regex_hdrs=$cf_regex_hdr
3935@@ -18062,11 +18083,11 @@
3936 esac
3937
3938 fi
3939-echo "$as_me:18065: result: $cf_cv_regex_hdrs" >&5
3940+echo "$as_me:18086: result: $cf_cv_regex_hdrs" >&5
3941 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
3942
3943 case $cf_cv_regex_hdrs in
3944-	(no)		{ echo "$as_me:18069: WARNING: no regular expression header found" >&5
3945+	(no)		{ echo "$as_me:18090: WARNING: no regular expression header found" >&5
3946 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
3947 	(regex.h)
3948 cat >>confdefs.h <<\EOF
3949@@ -18105,23 +18126,23 @@
3950
3951 do
3952 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
3953-echo "$as_me:18108: checking for $ac_header" >&5
3954+echo "$as_me:18129: checking for $ac_header" >&5
3955 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
3956 if eval "test \"\${$as_ac_Header+set}\" = set"; then
3957   echo $ECHO_N "(cached) $ECHO_C" >&6
3958 else
3959   cat >conftest.$ac_ext <<_ACEOF
3960-#line 18114 "configure"
3961+#line 18135 "configure"
3962 #include "confdefs.h"
3963 #include <$ac_header>
3964 _ACEOF
3965-if { (eval echo "$as_me:18118: \"$ac_cpp conftest.$ac_ext\"") >&5
3966+if { (eval echo "$as_me:18139: \"$ac_cpp conftest.$ac_ext\"") >&5
3967   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
3968   ac_status=$?
3969   egrep -v '^ *\+' conftest.er1 >conftest.err
3970   rm -f conftest.er1
3971   cat conftest.err >&5
3972-  echo "$as_me:18124: \$? = $ac_status" >&5
3973+  echo "$as_me:18145: \$? = $ac_status" >&5
3974   (exit $ac_status); } >/dev/null; then
3975   if test -s conftest.err; then
3976     ac_cpp_err=$ac_c_preproc_warn_flag
3977@@ -18140,7 +18161,7 @@
3978 fi
3979 rm -f conftest.err conftest.$ac_ext
3980 fi
3981-echo "$as_me:18143: result: `eval echo '${'$as_ac_Header'}'`" >&5
3982+echo "$as_me:18164: result: `eval echo '${'$as_ac_Header'}'`" >&5
3983 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
3984 if test `eval echo '${'$as_ac_Header'}'` = yes; then
3985   cat >>confdefs.h <<EOF
3986@@ -18153,23 +18174,23 @@
3987 for ac_header in unistd.h getopt.h
3988 do
3989 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
3990-echo "$as_me:18156: checking for $ac_header" >&5
3991+echo "$as_me:18177: checking for $ac_header" >&5
3992 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
3993 if eval "test \"\${$as_ac_Header+set}\" = set"; then
3994   echo $ECHO_N "(cached) $ECHO_C" >&6
3995 else
3996   cat >conftest.$ac_ext <<_ACEOF
3997-#line 18162 "configure"
3998+#line 18183 "configure"
3999 #include "confdefs.h"
4000 #include <$ac_header>
4001 _ACEOF
4002-if { (eval echo "$as_me:18166: \"$ac_cpp conftest.$ac_ext\"") >&5
4003+if { (eval echo "$as_me:18187: \"$ac_cpp conftest.$ac_ext\"") >&5
4004   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
4005   ac_status=$?
4006   egrep -v '^ *\+' conftest.er1 >conftest.err
4007   rm -f conftest.er1
4008   cat conftest.err >&5
4009-  echo "$as_me:18172: \$? = $ac_status" >&5
4010+  echo "$as_me:18193: \$? = $ac_status" >&5
4011   (exit $ac_status); } >/dev/null; then
4012   if test -s conftest.err; then
4013     ac_cpp_err=$ac_c_preproc_warn_flag
4014@@ -18188,7 +18209,7 @@
4015 fi
4016 rm -f conftest.err conftest.$ac_ext
4017 fi
4018-echo "$as_me:18191: result: `eval echo '${'$as_ac_Header'}'`" >&5
4019+echo "$as_me:18212: result: `eval echo '${'$as_ac_Header'}'`" >&5
4020 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
4021 if test `eval echo '${'$as_ac_Header'}'` = yes; then
4022   cat >>confdefs.h <<EOF
4023@@ -18198,7 +18219,7 @@
4024 fi
4025 done
4026
4027-echo "$as_me:18201: checking for header declaring getopt variables" >&5
4028+echo "$as_me:18222: checking for header declaring getopt variables" >&5
4029 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
4030 if test "${cf_cv_getopt_header+set}" = set; then
4031   echo $ECHO_N "(cached) $ECHO_C" >&6
4032@@ -18208,7 +18229,7 @@
4033 for cf_header in stdio.h stdlib.h unistd.h getopt.h
4034 do
4035 cat >conftest.$ac_ext <<_ACEOF
4036-#line 18211 "configure"
4037+#line 18232 "configure"
4038 #include "confdefs.h"
4039
4040 #include <$cf_header>
4041@@ -18221,16 +18242,16 @@
4042 }
4043 _ACEOF
4044 rm -f conftest.$ac_objext
4045-if { (eval echo "$as_me:18224: \"$ac_compile\"") >&5
4046+if { (eval echo "$as_me:18245: \"$ac_compile\"") >&5
4047   (eval $ac_compile) 2>&5
4048   ac_status=$?
4049-  echo "$as_me:18227: \$? = $ac_status" >&5
4050+  echo "$as_me:18248: \$? = $ac_status" >&5
4051   (exit $ac_status); } &&
4052          { ac_try='test -s conftest.$ac_objext'
4053-  { (eval echo "$as_me:18230: \"$ac_try\"") >&5
4054+  { (eval echo "$as_me:18251: \"$ac_try\"") >&5
4055   (eval $ac_try) 2>&5
4056   ac_status=$?
4057-  echo "$as_me:18233: \$? = $ac_status" >&5
4058+  echo "$as_me:18254: \$? = $ac_status" >&5
4059   (exit $ac_status); }; }; then
4060   cf_cv_getopt_header=$cf_header
4061  break
4062@@ -18242,7 +18263,7 @@
4063 done
4064
4065 fi
4066-echo "$as_me:18245: result: $cf_cv_getopt_header" >&5
4067+echo "$as_me:18266: result: $cf_cv_getopt_header" >&5
4068 echo "${ECHO_T}$cf_cv_getopt_header" >&6
4069 if test $cf_cv_getopt_header != none ; then
4070
4071@@ -18259,14 +18280,14 @@
4072
4073 fi
4074
4075-echo "$as_me:18262: checking if external environ is declared" >&5
4076+echo "$as_me:18283: checking if external environ is declared" >&5
4077 echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
4078 if test "${cf_cv_dcl_environ+set}" = set; then
4079   echo $ECHO_N "(cached) $ECHO_C" >&6
4080 else
4081
4082     cat >conftest.$ac_ext <<_ACEOF
4083-#line 18269 "configure"
4084+#line 18290 "configure"
4085 #include "confdefs.h"
4086
4087 #ifdef HAVE_STDLIB_H
4088@@ -18282,16 +18303,16 @@
4089 }
4090 _ACEOF
4091 rm -f conftest.$ac_objext
4092-if { (eval echo "$as_me:18285: \"$ac_compile\"") >&5
4093+if { (eval echo "$as_me:18306: \"$ac_compile\"") >&5
4094   (eval $ac_compile) 2>&5
4095   ac_status=$?
4096-  echo "$as_me:18288: \$? = $ac_status" >&5
4097+  echo "$as_me:18309: \$? = $ac_status" >&5
4098   (exit $ac_status); } &&
4099          { ac_try='test -s conftest.$ac_objext'
4100-  { (eval echo "$as_me:18291: \"$ac_try\"") >&5
4101+  { (eval echo "$as_me:18312: \"$ac_try\"") >&5
4102   (eval $ac_try) 2>&5
4103   ac_status=$?
4104-  echo "$as_me:18294: \$? = $ac_status" >&5
4105+  echo "$as_me:18315: \$? = $ac_status" >&5
4106   (exit $ac_status); }; }; then
4107   cf_cv_dcl_environ=yes
4108 else
4109@@ -18302,7 +18323,7 @@
4110 rm -f conftest.$ac_objext conftest.$ac_ext
4111
4112 fi
4113-echo "$as_me:18305: result: $cf_cv_dcl_environ" >&5
4114+echo "$as_me:18326: result: $cf_cv_dcl_environ" >&5
4115 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
4116
4117 if test "$cf_cv_dcl_environ" = no ; then
4118@@ -18317,14 +18338,14 @@
4119
4120 # It's possible (for near-UNIX clones) that the data doesn't exist
4121
4122-echo "$as_me:18320: checking if external environ exists" >&5
4123+echo "$as_me:18341: checking if external environ exists" >&5
4124 echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
4125 if test "${cf_cv_have_environ+set}" = set; then
4126   echo $ECHO_N "(cached) $ECHO_C" >&6
4127 else
4128
4129 	cat >conftest.$ac_ext <<_ACEOF
4130-#line 18327 "configure"
4131+#line 18348 "configure"
4132 #include "confdefs.h"
4133
4134 #undef environ
4135@@ -18339,16 +18360,16 @@
4136 }
4137 _ACEOF
4138 rm -f conftest.$ac_objext conftest$ac_exeext
4139-if { (eval echo "$as_me:18342: \"$ac_link\"") >&5
4140+if { (eval echo "$as_me:18363: \"$ac_link\"") >&5
4141   (eval $ac_link) 2>&5
4142   ac_status=$?
4143-  echo "$as_me:18345: \$? = $ac_status" >&5
4144+  echo "$as_me:18366: \$? = $ac_status" >&5
4145   (exit $ac_status); } &&
4146          { ac_try='test -s conftest$ac_exeext'
4147-  { (eval echo "$as_me:18348: \"$ac_try\"") >&5
4148+  { (eval echo "$as_me:18369: \"$ac_try\"") >&5
4149   (eval $ac_try) 2>&5
4150   ac_status=$?
4151-  echo "$as_me:18351: \$? = $ac_status" >&5
4152+  echo "$as_me:18372: \$? = $ac_status" >&5
4153   (exit $ac_status); }; }; then
4154   cf_cv_have_environ=yes
4155 else
4156@@ -18359,7 +18380,7 @@
4157 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4158
4159 fi
4160-echo "$as_me:18362: result: $cf_cv_have_environ" >&5
4161+echo "$as_me:18383: result: $cf_cv_have_environ" >&5
4162 echo "${ECHO_T}$cf_cv_have_environ" >&6
4163
4164 if test "$cf_cv_have_environ" = yes ; then
4165@@ -18372,13 +18393,13 @@
4166
4167 fi
4168
4169-echo "$as_me:18375: checking for getenv" >&5
4170+echo "$as_me:18396: checking for getenv" >&5
4171 echo $ECHO_N "checking for getenv... $ECHO_C" >&6
4172 if test "${ac_cv_func_getenv+set}" = set; then
4173   echo $ECHO_N "(cached) $ECHO_C" >&6
4174 else
4175   cat >conftest.$ac_ext <<_ACEOF
4176-#line 18381 "configure"
4177+#line 18402 "configure"
4178 #include "confdefs.h"
4179 #define getenv autoconf_temporary
4180 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
4181@@ -18409,16 +18430,16 @@
4182 }
4183 _ACEOF
4184 rm -f conftest.$ac_objext conftest$ac_exeext
4185-if { (eval echo "$as_me:18412: \"$ac_link\"") >&5
4186+if { (eval echo "$as_me:18433: \"$ac_link\"") >&5
4187   (eval $ac_link) 2>&5
4188   ac_status=$?
4189-  echo "$as_me:18415: \$? = $ac_status" >&5
4190+  echo "$as_me:18436: \$? = $ac_status" >&5
4191   (exit $ac_status); } &&
4192          { ac_try='test -s conftest$ac_exeext'
4193-  { (eval echo "$as_me:18418: \"$ac_try\"") >&5
4194+  { (eval echo "$as_me:18439: \"$ac_try\"") >&5
4195   (eval $ac_try) 2>&5
4196   ac_status=$?
4197-  echo "$as_me:18421: \$? = $ac_status" >&5
4198+  echo "$as_me:18442: \$? = $ac_status" >&5
4199   (exit $ac_status); }; }; then
4200   ac_cv_func_getenv=yes
4201 else
4202@@ -18428,19 +18449,19 @@
4203 fi
4204 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4205 fi
4206-echo "$as_me:18431: result: $ac_cv_func_getenv" >&5
4207+echo "$as_me:18452: result: $ac_cv_func_getenv" >&5
4208 echo "${ECHO_T}$ac_cv_func_getenv" >&6
4209
4210 for ac_func in putenv setenv strdup
4211 do
4212 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
4213-echo "$as_me:18437: checking for $ac_func" >&5
4214+echo "$as_me:18458: checking for $ac_func" >&5
4215 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
4216 if eval "test \"\${$as_ac_var+set}\" = set"; then
4217   echo $ECHO_N "(cached) $ECHO_C" >&6
4218 else
4219   cat >conftest.$ac_ext <<_ACEOF
4220-#line 18443 "configure"
4221+#line 18464 "configure"
4222 #include "confdefs.h"
4223 #define $ac_func autoconf_temporary
4224 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
4225@@ -18471,16 +18492,16 @@
4226 }
4227 _ACEOF
4228 rm -f conftest.$ac_objext conftest$ac_exeext
4229-if { (eval echo "$as_me:18474: \"$ac_link\"") >&5
4230+if { (eval echo "$as_me:18495: \"$ac_link\"") >&5
4231   (eval $ac_link) 2>&5
4232   ac_status=$?
4233-  echo "$as_me:18477: \$? = $ac_status" >&5
4234+  echo "$as_me:18498: \$? = $ac_status" >&5
4235   (exit $ac_status); } &&
4236          { ac_try='test -s conftest$ac_exeext'
4237-  { (eval echo "$as_me:18480: \"$ac_try\"") >&5
4238+  { (eval echo "$as_me:18501: \"$ac_try\"") >&5
4239   (eval $ac_try) 2>&5
4240   ac_status=$?
4241-  echo "$as_me:18483: \$? = $ac_status" >&5
4242+  echo "$as_me:18504: \$? = $ac_status" >&5
4243   (exit $ac_status); }; }; then
4244   eval "$as_ac_var=yes"
4245 else
4246@@ -18490,7 +18511,7 @@
4247 fi
4248 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4249 fi
4250-echo "$as_me:18493: result: `eval echo '${'$as_ac_var'}'`" >&5
4251+echo "$as_me:18514: result: `eval echo '${'$as_ac_var'}'`" >&5
4252 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
4253 if test `eval echo '${'$as_ac_var'}'` = yes; then
4254   cat >>confdefs.h <<EOF
4255@@ -18500,7 +18521,7 @@
4256 fi
4257 done
4258
4259-echo "$as_me:18503: checking if getenv returns consistent values" >&5
4260+echo "$as_me:18524: checking if getenv returns consistent values" >&5
4261 echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6
4262 if test "${cf_cv_consistent_getenv+set}" = set; then
4263   echo $ECHO_N "(cached) $ECHO_C" >&6
4264@@ -18510,7 +18531,7 @@
4265   cf_cv_consistent_getenv=unknown
4266 else
4267   cat >conftest.$ac_ext <<_ACEOF
4268-#line 18513 "configure"
4269+#line 18534 "configure"
4270 #include "confdefs.h"
4271
4272 #include <stdlib.h>
4273@@ -18619,15 +18640,15 @@
4274
4275 _ACEOF
4276 rm -f conftest$ac_exeext
4277-if { (eval echo "$as_me:18622: \"$ac_link\"") >&5
4278+if { (eval echo "$as_me:18643: \"$ac_link\"") >&5
4279   (eval $ac_link) 2>&5
4280   ac_status=$?
4281-  echo "$as_me:18625: \$? = $ac_status" >&5
4282+  echo "$as_me:18646: \$? = $ac_status" >&5
4283   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
4284-  { (eval echo "$as_me:18627: \"$ac_try\"") >&5
4285+  { (eval echo "$as_me:18648: \"$ac_try\"") >&5
4286   (eval $ac_try) 2>&5
4287   ac_status=$?
4288-  echo "$as_me:18630: \$? = $ac_status" >&5
4289+  echo "$as_me:18651: \$? = $ac_status" >&5
4290   (exit $ac_status); }; }; then
4291   cf_cv_consistent_getenv=yes
4292 else
4293@@ -18640,7 +18661,7 @@
4294 fi
4295
4296 fi
4297-echo "$as_me:18643: result: $cf_cv_consistent_getenv" >&5
4298+echo "$as_me:18664: result: $cf_cv_consistent_getenv" >&5
4299 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
4300
4301 if test "x$cf_cv_consistent_getenv" = xno
4302@@ -18655,7 +18676,7 @@
4303 if test "x$cf_cv_consistent_getenv" = xno && \
4304 	test "x$cf_with_trace" = xyes
4305 then
4306-	{ echo "$as_me:18658: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
4307+	{ echo "$as_me:18679: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
4308 echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
4309 fi
4310
4311@@ -18663,7 +18684,7 @@
4312 # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
4313 if test "x$ISC" = xyes ; then
4314
4315-echo "$as_me:18666: checking for main in -lcposix" >&5
4316+echo "$as_me:18687: checking for main in -lcposix" >&5
4317 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
4318 if test "${ac_cv_lib_cposix_main+set}" = set; then
4319   echo $ECHO_N "(cached) $ECHO_C" >&6
4320@@ -18671,7 +18692,7 @@
4321   ac_check_lib_save_LIBS=$LIBS
4322 LIBS="-lcposix  $LIBS"
4323 cat >conftest.$ac_ext <<_ACEOF
4324-#line 18674 "configure"
4325+#line 18695 "configure"
4326 #include "confdefs.h"
4327
4328 int
4329@@ -18683,16 +18704,16 @@
4330 }
4331 _ACEOF
4332 rm -f conftest.$ac_objext conftest$ac_exeext
4333-if { (eval echo "$as_me:18686: \"$ac_link\"") >&5
4334+if { (eval echo "$as_me:18707: \"$ac_link\"") >&5
4335   (eval $ac_link) 2>&5
4336   ac_status=$?
4337-  echo "$as_me:18689: \$? = $ac_status" >&5
4338+  echo "$as_me:18710: \$? = $ac_status" >&5
4339   (exit $ac_status); } &&
4340          { ac_try='test -s conftest$ac_exeext'
4341-  { (eval echo "$as_me:18692: \"$ac_try\"") >&5
4342+  { (eval echo "$as_me:18713: \"$ac_try\"") >&5
4343   (eval $ac_try) 2>&5
4344   ac_status=$?
4345-  echo "$as_me:18695: \$? = $ac_status" >&5
4346+  echo "$as_me:18716: \$? = $ac_status" >&5
4347   (exit $ac_status); }; }; then
4348   ac_cv_lib_cposix_main=yes
4349 else
4350@@ -18703,7 +18724,7 @@
4351 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4352 LIBS=$ac_check_lib_save_LIBS
4353 fi
4354-echo "$as_me:18706: result: $ac_cv_lib_cposix_main" >&5
4355+echo "$as_me:18727: result: $ac_cv_lib_cposix_main" >&5
4356 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
4357 if test $ac_cv_lib_cposix_main = yes; then
4358   cat >>confdefs.h <<EOF
4359@@ -18714,7 +18735,7 @@
4360
4361 fi
4362
4363-	echo "$as_me:18717: checking for bzero in -linet" >&5
4364+	echo "$as_me:18738: checking for bzero in -linet" >&5
4365 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
4366 if test "${ac_cv_lib_inet_bzero+set}" = set; then
4367   echo $ECHO_N "(cached) $ECHO_C" >&6
4368@@ -18722,7 +18743,7 @@
4369   ac_check_lib_save_LIBS=$LIBS
4370 LIBS="-linet  $LIBS"
4371 cat >conftest.$ac_ext <<_ACEOF
4372-#line 18725 "configure"
4373+#line 18746 "configure"
4374 #include "confdefs.h"
4375
4376 /* Override any gcc2 internal prototype to avoid an error.  */
4377@@ -18741,16 +18762,16 @@
4378 }
4379 _ACEOF
4380 rm -f conftest.$ac_objext conftest$ac_exeext
4381-if { (eval echo "$as_me:18744: \"$ac_link\"") >&5
4382+if { (eval echo "$as_me:18765: \"$ac_link\"") >&5
4383   (eval $ac_link) 2>&5
4384   ac_status=$?
4385-  echo "$as_me:18747: \$? = $ac_status" >&5
4386+  echo "$as_me:18768: \$? = $ac_status" >&5
4387   (exit $ac_status); } &&
4388          { ac_try='test -s conftest$ac_exeext'
4389-  { (eval echo "$as_me:18750: \"$ac_try\"") >&5
4390+  { (eval echo "$as_me:18771: \"$ac_try\"") >&5
4391   (eval $ac_try) 2>&5
4392   ac_status=$?
4393-  echo "$as_me:18753: \$? = $ac_status" >&5
4394+  echo "$as_me:18774: \$? = $ac_status" >&5
4395   (exit $ac_status); }; }; then
4396   ac_cv_lib_inet_bzero=yes
4397 else
4398@@ -18761,7 +18782,7 @@
4399 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4400 LIBS=$ac_check_lib_save_LIBS
4401 fi
4402-echo "$as_me:18764: result: $ac_cv_lib_inet_bzero" >&5
4403+echo "$as_me:18785: result: $ac_cv_lib_inet_bzero" >&5
4404 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
4405 if test $ac_cv_lib_inet_bzero = yes; then
4406
4407@@ -18784,14 +18805,14 @@
4408 fi
4409 fi
4410
4411-echo "$as_me:18787: checking if sys/time.h works with sys/select.h" >&5
4412+echo "$as_me:18808: checking if sys/time.h works with sys/select.h" >&5
4413 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
4414 if test "${cf_cv_sys_time_select+set}" = set; then
4415   echo $ECHO_N "(cached) $ECHO_C" >&6
4416 else
4417
4418 cat >conftest.$ac_ext <<_ACEOF
4419-#line 18794 "configure"
4420+#line 18815 "configure"
4421 #include "confdefs.h"
4422
4423 #include <sys/types.h>
4424@@ -18811,16 +18832,16 @@
4425 }
4426 _ACEOF
4427 rm -f conftest.$ac_objext
4428-if { (eval echo "$as_me:18814: \"$ac_compile\"") >&5
4429+if { (eval echo "$as_me:18835: \"$ac_compile\"") >&5
4430   (eval $ac_compile) 2>&5
4431   ac_status=$?
4432-  echo "$as_me:18817: \$? = $ac_status" >&5
4433+  echo "$as_me:18838: \$? = $ac_status" >&5
4434   (exit $ac_status); } &&
4435          { ac_try='test -s conftest.$ac_objext'
4436-  { (eval echo "$as_me:18820: \"$ac_try\"") >&5
4437+  { (eval echo "$as_me:18841: \"$ac_try\"") >&5
4438   (eval $ac_try) 2>&5
4439   ac_status=$?
4440-  echo "$as_me:18823: \$? = $ac_status" >&5
4441+  echo "$as_me:18844: \$? = $ac_status" >&5
4442   (exit $ac_status); }; }; then
4443   cf_cv_sys_time_select=yes
4444 else
4445@@ -18832,7 +18853,7 @@
4446
4447 fi
4448
4449-echo "$as_me:18835: result: $cf_cv_sys_time_select" >&5
4450+echo "$as_me:18856: result: $cf_cv_sys_time_select" >&5
4451 echo "${ECHO_T}$cf_cv_sys_time_select" >&6
4452 test "$cf_cv_sys_time_select" = yes &&
4453 cat >>confdefs.h <<\EOF
4454@@ -18847,13 +18868,13 @@
4455 ac_compiler_gnu=$ac_cv_c_compiler_gnu
4456 ac_main_return=return
4457
4458-echo "$as_me:18850: checking for an ANSI C-conforming const" >&5
4459+echo "$as_me:18871: checking for an ANSI C-conforming const" >&5
4460 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
4461 if test "${ac_cv_c_const+set}" = set; then
4462   echo $ECHO_N "(cached) $ECHO_C" >&6
4463 else
4464   cat >conftest.$ac_ext <<_ACEOF
4465-#line 18856 "configure"
4466+#line 18877 "configure"
4467 #include "confdefs.h"
4468
4469 int
4470@@ -18911,16 +18932,16 @@
4471 }
4472 _ACEOF
4473 rm -f conftest.$ac_objext
4474-if { (eval echo "$as_me:18914: \"$ac_compile\"") >&5
4475+if { (eval echo "$as_me:18935: \"$ac_compile\"") >&5
4476   (eval $ac_compile) 2>&5
4477   ac_status=$?
4478-  echo "$as_me:18917: \$? = $ac_status" >&5
4479+  echo "$as_me:18938: \$? = $ac_status" >&5
4480   (exit $ac_status); } &&
4481          { ac_try='test -s conftest.$ac_objext'
4482-  { (eval echo "$as_me:18920: \"$ac_try\"") >&5
4483+  { (eval echo "$as_me:18941: \"$ac_try\"") >&5
4484   (eval $ac_try) 2>&5
4485   ac_status=$?
4486-  echo "$as_me:18923: \$? = $ac_status" >&5
4487+  echo "$as_me:18944: \$? = $ac_status" >&5
4488   (exit $ac_status); }; }; then
4489   ac_cv_c_const=yes
4490 else
4491@@ -18930,7 +18951,7 @@
4492 fi
4493 rm -f conftest.$ac_objext conftest.$ac_ext
4494 fi
4495-echo "$as_me:18933: result: $ac_cv_c_const" >&5
4496+echo "$as_me:18954: result: $ac_cv_c_const" >&5
4497 echo "${ECHO_T}$ac_cv_c_const" >&6
4498 if test $ac_cv_c_const = no; then
4499
4500@@ -18940,7 +18961,7 @@
4501
4502 fi
4503
4504-echo "$as_me:18943: checking for inline" >&5
4505+echo "$as_me:18964: checking for inline" >&5
4506 echo $ECHO_N "checking for inline... $ECHO_C" >&6
4507 if test "${ac_cv_c_inline+set}" = set; then
4508   echo $ECHO_N "(cached) $ECHO_C" >&6
4509@@ -18948,7 +18969,7 @@
4510   ac_cv_c_inline=no
4511 for ac_kw in inline __inline__ __inline; do
4512   cat >conftest.$ac_ext <<_ACEOF
4513-#line 18951 "configure"
4514+#line 18972 "configure"
4515 #include "confdefs.h"
4516 #ifndef __cplusplus
4517 static $ac_kw int static_foo () {return 0; }
4518@@ -18957,16 +18978,16 @@
4519
4520 _ACEOF
4521 rm -f conftest.$ac_objext
4522-if { (eval echo "$as_me:18960: \"$ac_compile\"") >&5
4523+if { (eval echo "$as_me:18981: \"$ac_compile\"") >&5
4524   (eval $ac_compile) 2>&5
4525   ac_status=$?
4526-  echo "$as_me:18963: \$? = $ac_status" >&5
4527+  echo "$as_me:18984: \$? = $ac_status" >&5
4528   (exit $ac_status); } &&
4529          { ac_try='test -s conftest.$ac_objext'
4530-  { (eval echo "$as_me:18966: \"$ac_try\"") >&5
4531+  { (eval echo "$as_me:18987: \"$ac_try\"") >&5
4532   (eval $ac_try) 2>&5
4533   ac_status=$?
4534-  echo "$as_me:18969: \$? = $ac_status" >&5
4535+  echo "$as_me:18990: \$? = $ac_status" >&5
4536   (exit $ac_status); }; }; then
4537   ac_cv_c_inline=$ac_kw; break
4538 else
4539@@ -18977,7 +18998,7 @@
4540 done
4541
4542 fi
4543-echo "$as_me:18980: result: $ac_cv_c_inline" >&5
4544+echo "$as_me:19001: result: $ac_cv_c_inline" >&5
4545 echo "${ECHO_T}$ac_cv_c_inline" >&6
4546 case $ac_cv_c_inline in
4547   inline | yes) ;;
4548@@ -19003,7 +19024,7 @@
4549 		:
4550 	elif test "$GCC" = yes
4551 	then
4552-		echo "$as_me:19006: checking if $CC supports options to tune inlining" >&5
4553+		echo "$as_me:19027: checking if $CC supports options to tune inlining" >&5
4554 echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
4555 if test "${cf_cv_gcc_inline+set}" = set; then
4556   echo $ECHO_N "(cached) $ECHO_C" >&6
4557@@ -19012,7 +19033,7 @@
4558 		cf_save_CFLAGS=$CFLAGS
4559 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
4560 		cat >conftest.$ac_ext <<_ACEOF
4561-#line 19015 "configure"
4562+#line 19036 "configure"
4563 #include "confdefs.h"
4564 inline int foo(void) { return 1; }
4565 int
4566@@ -19024,16 +19045,16 @@
4567 }
4568 _ACEOF
4569 rm -f conftest.$ac_objext
4570-if { (eval echo "$as_me:19027: \"$ac_compile\"") >&5
4571+if { (eval echo "$as_me:19048: \"$ac_compile\"") >&5
4572   (eval $ac_compile) 2>&5
4573   ac_status=$?
4574-  echo "$as_me:19030: \$? = $ac_status" >&5
4575+  echo "$as_me:19051: \$? = $ac_status" >&5
4576   (exit $ac_status); } &&
4577          { ac_try='test -s conftest.$ac_objext'
4578-  { (eval echo "$as_me:19033: \"$ac_try\"") >&5
4579+  { (eval echo "$as_me:19054: \"$ac_try\"") >&5
4580   (eval $ac_try) 2>&5
4581   ac_status=$?
4582-  echo "$as_me:19036: \$? = $ac_status" >&5
4583+  echo "$as_me:19057: \$? = $ac_status" >&5
4584   (exit $ac_status); }; }; then
4585   cf_cv_gcc_inline=yes
4586 else
4587@@ -19045,7 +19066,7 @@
4588 		CFLAGS=$cf_save_CFLAGS
4589
4590 fi
4591-echo "$as_me:19048: result: $cf_cv_gcc_inline" >&5
4592+echo "$as_me:19069: result: $cf_cv_gcc_inline" >&5
4593 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
4594 		if test "$cf_cv_gcc_inline" = yes ; then
4595
4596@@ -19151,7 +19172,7 @@
4597 	fi
4598 fi
4599
4600-echo "$as_me:19154: checking for signal global datatype" >&5
4601+echo "$as_me:19175: checking for signal global datatype" >&5
4602 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
4603 if test "${cf_cv_sig_atomic_t+set}" = set; then
4604   echo $ECHO_N "(cached) $ECHO_C" >&6
4605@@ -19163,7 +19184,7 @@
4606 		"int"
4607 	do
4608 	cat >conftest.$ac_ext <<_ACEOF
4609-#line 19166 "configure"
4610+#line 19187 "configure"
4611 #include "confdefs.h"
4612
4613 #include <sys/types.h>
4614@@ -19186,16 +19207,16 @@
4615 }
4616 _ACEOF
4617 rm -f conftest.$ac_objext
4618-if { (eval echo "$as_me:19189: \"$ac_compile\"") >&5
4619+if { (eval echo "$as_me:19210: \"$ac_compile\"") >&5
4620   (eval $ac_compile) 2>&5
4621   ac_status=$?
4622-  echo "$as_me:19192: \$? = $ac_status" >&5
4623+  echo "$as_me:19213: \$? = $ac_status" >&5
4624   (exit $ac_status); } &&
4625          { ac_try='test -s conftest.$ac_objext'
4626-  { (eval echo "$as_me:19195: \"$ac_try\"") >&5
4627+  { (eval echo "$as_me:19216: \"$ac_try\"") >&5
4628   (eval $ac_try) 2>&5
4629   ac_status=$?
4630-  echo "$as_me:19198: \$? = $ac_status" >&5
4631+  echo "$as_me:19219: \$? = $ac_status" >&5
4632   (exit $ac_status); }; }; then
4633   cf_cv_sig_atomic_t=$cf_type
4634 else
4635@@ -19209,7 +19230,7 @@
4636
4637 fi
4638
4639-echo "$as_me:19212: result: $cf_cv_sig_atomic_t" >&5
4640+echo "$as_me:19233: result: $cf_cv_sig_atomic_t" >&5
4641 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
4642 test "$cf_cv_sig_atomic_t" != no &&
4643 cat >>confdefs.h <<EOF
4644@@ -19218,7 +19239,7 @@
4645
4646 if test $NCURSES_CHTYPE = auto ; then
4647
4648-echo "$as_me:19221: checking for type of chtype" >&5
4649+echo "$as_me:19242: checking for type of chtype" >&5
4650 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
4651 if test "${cf_cv_typeof_chtype+set}" = set; then
4652   echo $ECHO_N "(cached) $ECHO_C" >&6
4653@@ -19228,7 +19249,7 @@
4654   cf_cv_typeof_chtype=long
4655 else
4656   cat >conftest.$ac_ext <<_ACEOF
4657-#line 19231 "configure"
4658+#line 19252 "configure"
4659 #include "confdefs.h"
4660
4661 #define WANT_BITS 31
4662@@ -19263,15 +19284,15 @@
4663
4664 _ACEOF
4665 rm -f conftest$ac_exeext
4666-if { (eval echo "$as_me:19266: \"$ac_link\"") >&5
4667+if { (eval echo "$as_me:19287: \"$ac_link\"") >&5
4668   (eval $ac_link) 2>&5
4669   ac_status=$?
4670-  echo "$as_me:19269: \$? = $ac_status" >&5
4671+  echo "$as_me:19290: \$? = $ac_status" >&5
4672   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
4673-  { (eval echo "$as_me:19271: \"$ac_try\"") >&5
4674+  { (eval echo "$as_me:19292: \"$ac_try\"") >&5
4675   (eval $ac_try) 2>&5
4676   ac_status=$?
4677-  echo "$as_me:19274: \$? = $ac_status" >&5
4678+  echo "$as_me:19295: \$? = $ac_status" >&5
4679   (exit $ac_status); }; }; then
4680   cf_cv_typeof_chtype=`cat cf_test.out`
4681 else
4682@@ -19286,7 +19307,7 @@
4683
4684 fi
4685
4686-echo "$as_me:19289: result: $cf_cv_typeof_chtype" >&5
4687+echo "$as_me:19310: result: $cf_cv_typeof_chtype" >&5
4688 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
4689
4690 cat >>confdefs.h <<EOF
4691@@ -19298,14 +19319,14 @@
4692 fi
4693 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
4694
4695-echo "$as_me:19301: checking if unsigned literals are legal" >&5
4696+echo "$as_me:19322: checking if unsigned literals are legal" >&5
4697 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
4698 if test "${cf_cv_unsigned_literals+set}" = set; then
4699   echo $ECHO_N "(cached) $ECHO_C" >&6
4700 else
4701
4702 	cat >conftest.$ac_ext <<_ACEOF
4703-#line 19308 "configure"
4704+#line 19329 "configure"
4705 #include "confdefs.h"
4706
4707 int
4708@@ -19317,16 +19338,16 @@
4709 }
4710 _ACEOF
4711 rm -f conftest.$ac_objext
4712-if { (eval echo "$as_me:19320: \"$ac_compile\"") >&5
4713+if { (eval echo "$as_me:19341: \"$ac_compile\"") >&5
4714   (eval $ac_compile) 2>&5
4715   ac_status=$?
4716-  echo "$as_me:19323: \$? = $ac_status" >&5
4717+  echo "$as_me:19344: \$? = $ac_status" >&5
4718   (exit $ac_status); } &&
4719          { ac_try='test -s conftest.$ac_objext'
4720-  { (eval echo "$as_me:19326: \"$ac_try\"") >&5
4721+  { (eval echo "$as_me:19347: \"$ac_try\"") >&5
4722   (eval $ac_try) 2>&5
4723   ac_status=$?
4724-  echo "$as_me:19329: \$? = $ac_status" >&5
4725+  echo "$as_me:19350: \$? = $ac_status" >&5
4726   (exit $ac_status); }; }; then
4727   cf_cv_unsigned_literals=yes
4728 else
4729@@ -19338,7 +19359,7 @@
4730
4731 fi
4732
4733-echo "$as_me:19341: result: $cf_cv_unsigned_literals" >&5
4734+echo "$as_me:19362: result: $cf_cv_unsigned_literals" >&5
4735 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
4736
4737 cf_cv_1UL="1"
4738@@ -19354,14 +19375,14 @@
4739
4740 ###	Checks for external-data
4741
4742-echo "$as_me:19357: checking if external errno is declared" >&5
4743+echo "$as_me:19378: checking if external errno is declared" >&5
4744 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
4745 if test "${cf_cv_dcl_errno+set}" = set; then
4746   echo $ECHO_N "(cached) $ECHO_C" >&6
4747 else
4748
4749 	cat >conftest.$ac_ext <<_ACEOF
4750-#line 19364 "configure"
4751+#line 19385 "configure"
4752 #include "confdefs.h"
4753
4754 #ifdef HAVE_STDLIB_H
4755@@ -19379,16 +19400,16 @@
4756 }
4757 _ACEOF
4758 rm -f conftest.$ac_objext
4759-if { (eval echo "$as_me:19382: \"$ac_compile\"") >&5
4760+if { (eval echo "$as_me:19403: \"$ac_compile\"") >&5
4761   (eval $ac_compile) 2>&5
4762   ac_status=$?
4763-  echo "$as_me:19385: \$? = $ac_status" >&5
4764+  echo "$as_me:19406: \$? = $ac_status" >&5
4765   (exit $ac_status); } &&
4766          { ac_try='test -s conftest.$ac_objext'
4767-  { (eval echo "$as_me:19388: \"$ac_try\"") >&5
4768+  { (eval echo "$as_me:19409: \"$ac_try\"") >&5
4769   (eval $ac_try) 2>&5
4770   ac_status=$?
4771-  echo "$as_me:19391: \$? = $ac_status" >&5
4772+  echo "$as_me:19412: \$? = $ac_status" >&5
4773   (exit $ac_status); }; }; then
4774   cf_cv_dcl_errno=yes
4775 else
4776@@ -19399,7 +19420,7 @@
4777 rm -f conftest.$ac_objext conftest.$ac_ext
4778
4779 fi
4780-echo "$as_me:19402: result: $cf_cv_dcl_errno" >&5
4781+echo "$as_me:19423: result: $cf_cv_dcl_errno" >&5
4782 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
4783
4784 if test "$cf_cv_dcl_errno" = no ; then
4785@@ -19414,14 +19435,14 @@
4786
4787 # It's possible (for near-UNIX clones) that the data doesn't exist
4788
4789-echo "$as_me:19417: checking if external errno exists" >&5
4790+echo "$as_me:19438: checking if external errno exists" >&5
4791 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
4792 if test "${cf_cv_have_errno+set}" = set; then
4793   echo $ECHO_N "(cached) $ECHO_C" >&6
4794 else
4795
4796 	cat >conftest.$ac_ext <<_ACEOF
4797-#line 19424 "configure"
4798+#line 19445 "configure"
4799 #include "confdefs.h"
4800
4801 #undef errno
4802@@ -19436,16 +19457,16 @@
4803 }
4804 _ACEOF
4805 rm -f conftest.$ac_objext conftest$ac_exeext
4806-if { (eval echo "$as_me:19439: \"$ac_link\"") >&5
4807+if { (eval echo "$as_me:19460: \"$ac_link\"") >&5
4808   (eval $ac_link) 2>&5
4809   ac_status=$?
4810-  echo "$as_me:19442: \$? = $ac_status" >&5
4811+  echo "$as_me:19463: \$? = $ac_status" >&5
4812   (exit $ac_status); } &&
4813          { ac_try='test -s conftest$ac_exeext'
4814-  { (eval echo "$as_me:19445: \"$ac_try\"") >&5
4815+  { (eval echo "$as_me:19466: \"$ac_try\"") >&5
4816   (eval $ac_try) 2>&5
4817   ac_status=$?
4818-  echo "$as_me:19448: \$? = $ac_status" >&5
4819+  echo "$as_me:19469: \$? = $ac_status" >&5
4820   (exit $ac_status); }; }; then
4821   cf_cv_have_errno=yes
4822 else
4823@@ -19456,7 +19477,7 @@
4824 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4825
4826 fi
4827-echo "$as_me:19459: result: $cf_cv_have_errno" >&5
4828+echo "$as_me:19480: result: $cf_cv_have_errno" >&5
4829 echo "${ECHO_T}$cf_cv_have_errno" >&6
4830
4831 if test "$cf_cv_have_errno" = yes ; then
4832@@ -19469,7 +19490,7 @@
4833
4834 fi
4835
4836-echo "$as_me:19472: checking if data-only library module links" >&5
4837+echo "$as_me:19493: checking if data-only library module links" >&5
4838 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
4839 if test "${cf_cv_link_dataonly+set}" = set; then
4840   echo $ECHO_N "(cached) $ECHO_C" >&6
4841@@ -19477,20 +19498,20 @@
4842
4843 	rm -f conftest.a
4844 	cat >conftest.$ac_ext <<EOF
4845-#line 19480 "configure"
4846+#line 19501 "configure"
4847 int	testdata[3] = { 123, 456, 789 };
4848 EOF
4849-	if { (eval echo "$as_me:19483: \"$ac_compile\"") >&5
4850+	if { (eval echo "$as_me:19504: \"$ac_compile\"") >&5
4851   (eval $ac_compile) 2>&5
4852   ac_status=$?
4853-  echo "$as_me:19486: \$? = $ac_status" >&5
4854+  echo "$as_me:19507: \$? = $ac_status" >&5
4855   (exit $ac_status); } ; then
4856 		mv conftest.o data.o && \
4857 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
4858 	fi
4859 	rm -f conftest.$ac_ext data.o
4860 	cat >conftest.$ac_ext <<EOF
4861-#line 19493 "configure"
4862+#line 19514 "configure"
4863 int	testfunc(void)
4864 {
4865 #if defined(NeXT)
4866@@ -19503,10 +19524,10 @@
4867 #endif
4868 }
4869 EOF
4870-	if { (eval echo "$as_me:19506: \"$ac_compile\"") >&5
4871+	if { (eval echo "$as_me:19527: \"$ac_compile\"") >&5
4872   (eval $ac_compile) 2>&5
4873   ac_status=$?
4874-  echo "$as_me:19509: \$? = $ac_status" >&5
4875+  echo "$as_me:19530: \$? = $ac_status" >&5
4876   (exit $ac_status); }; then
4877 		mv conftest.o func.o && \
4878 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
4879@@ -19519,7 +19540,7 @@
4880   cf_cv_link_dataonly=unknown
4881 else
4882   cat >conftest.$ac_ext <<_ACEOF
4883-#line 19522 "configure"
4884+#line 19543 "configure"
4885 #include "confdefs.h"
4886
4887 	int main(void)
4888@@ -19530,15 +19551,15 @@
4889
4890 _ACEOF
4891 rm -f conftest$ac_exeext
4892-if { (eval echo "$as_me:19533: \"$ac_link\"") >&5
4893+if { (eval echo "$as_me:19554: \"$ac_link\"") >&5
4894   (eval $ac_link) 2>&5
4895   ac_status=$?
4896-  echo "$as_me:19536: \$? = $ac_status" >&5
4897+  echo "$as_me:19557: \$? = $ac_status" >&5
4898   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
4899-  { (eval echo "$as_me:19538: \"$ac_try\"") >&5
4900+  { (eval echo "$as_me:19559: \"$ac_try\"") >&5
4901   (eval $ac_try) 2>&5
4902   ac_status=$?
4903-  echo "$as_me:19541: \$? = $ac_status" >&5
4904+  echo "$as_me:19562: \$? = $ac_status" >&5
4905   (exit $ac_status); }; }; then
4906   cf_cv_link_dataonly=yes
4907 else
4908@@ -19553,7 +19574,7 @@
4909
4910 fi
4911
4912-echo "$as_me:19556: result: $cf_cv_link_dataonly" >&5
4913+echo "$as_me:19577: result: $cf_cv_link_dataonly" >&5
4914 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
4915
4916 if test "$cf_cv_link_dataonly" = no ; then
4917@@ -19595,13 +19616,13 @@
4918
4919 do
4920 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
4921-echo "$as_me:19598: checking for $ac_func" >&5
4922+echo "$as_me:19619: checking for $ac_func" >&5
4923 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
4924 if eval "test \"\${$as_ac_var+set}\" = set"; then
4925   echo $ECHO_N "(cached) $ECHO_C" >&6
4926 else
4927   cat >conftest.$ac_ext <<_ACEOF
4928-#line 19604 "configure"
4929+#line 19625 "configure"
4930 #include "confdefs.h"
4931 #define $ac_func autoconf_temporary
4932 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
4933@@ -19632,16 +19653,16 @@
4934 }
4935 _ACEOF
4936 rm -f conftest.$ac_objext conftest$ac_exeext
4937-if { (eval echo "$as_me:19635: \"$ac_link\"") >&5
4938+if { (eval echo "$as_me:19656: \"$ac_link\"") >&5
4939   (eval $ac_link) 2>&5
4940   ac_status=$?
4941-  echo "$as_me:19638: \$? = $ac_status" >&5
4942+  echo "$as_me:19659: \$? = $ac_status" >&5
4943   (exit $ac_status); } &&
4944          { ac_try='test -s conftest$ac_exeext'
4945-  { (eval echo "$as_me:19641: \"$ac_try\"") >&5
4946+  { (eval echo "$as_me:19662: \"$ac_try\"") >&5
4947   (eval $ac_try) 2>&5
4948   ac_status=$?
4949-  echo "$as_me:19644: \$? = $ac_status" >&5
4950+  echo "$as_me:19665: \$? = $ac_status" >&5
4951   (exit $ac_status); }; }; then
4952   eval "$as_ac_var=yes"
4953 else
4954@@ -19651,7 +19672,7 @@
4955 fi
4956 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4957 fi
4958-echo "$as_me:19654: result: `eval echo '${'$as_ac_var'}'`" >&5
4959+echo "$as_me:19675: result: `eval echo '${'$as_ac_var'}'`" >&5
4960 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
4961 if test `eval echo '${'$as_ac_var'}'` = yes; then
4962   cat >>confdefs.h <<EOF
4963@@ -19663,7 +19684,7 @@
4964
4965 if test "x$ac_cv_func_getopt" = xno && \
4966    test "x$cf_with_progs$cf_with_tests" != xnono; then
4967-	{ { echo "$as_me:19666: error: getopt is required for building programs" >&5
4968+	{ { echo "$as_me:19687: error: getopt is required for building programs" >&5
4969 echo "$as_me: error: getopt is required for building programs" >&2;}
4970    { (exit 1); exit 1; }; }
4971 fi
4972@@ -19672,7 +19693,7 @@
4973 then
4974 	if test "x$ac_cv_func_vsnprintf" = xyes
4975 	then
4976-		{ echo "$as_me:19675: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
4977+		{ echo "$as_me:19696: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
4978 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
4979 	else
4980
4981@@ -19685,14 +19706,14 @@
4982
4983 if test "x$with_getcap" = "xyes" ; then
4984
4985-echo "$as_me:19688: checking for terminal-capability database functions" >&5
4986+echo "$as_me:19709: checking for terminal-capability database functions" >&5
4987 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
4988 if test "${cf_cv_cgetent+set}" = set; then
4989   echo $ECHO_N "(cached) $ECHO_C" >&6
4990 else
4991
4992 cat >conftest.$ac_ext <<_ACEOF
4993-#line 19695 "configure"
4994+#line 19716 "configure"
4995 #include "confdefs.h"
4996
4997 #include <stdlib.h>
4998@@ -19712,16 +19733,16 @@
4999 }
5000 _ACEOF
5001 rm -f conftest.$ac_objext conftest$ac_exeext
5002-if { (eval echo "$as_me:19715: \"$ac_link\"") >&5
5003+if { (eval echo "$as_me:19736: \"$ac_link\"") >&5
5004   (eval $ac_link) 2>&5
5005   ac_status=$?
5006-  echo "$as_me:19718: \$? = $ac_status" >&5
5007+  echo "$as_me:19739: \$? = $ac_status" >&5
5008   (exit $ac_status); } &&
5009          { ac_try='test -s conftest$ac_exeext'
5010-  { (eval echo "$as_me:19721: \"$ac_try\"") >&5
5011+  { (eval echo "$as_me:19742: \"$ac_try\"") >&5
5012   (eval $ac_try) 2>&5
5013   ac_status=$?
5014-  echo "$as_me:19724: \$? = $ac_status" >&5
5015+  echo "$as_me:19745: \$? = $ac_status" >&5
5016   (exit $ac_status); }; }; then
5017   cf_cv_cgetent=yes
5018 else
5019@@ -19732,7 +19753,7 @@
5020 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5021
5022 fi
5023-echo "$as_me:19735: result: $cf_cv_cgetent" >&5
5024+echo "$as_me:19756: result: $cf_cv_cgetent" >&5
5025 echo "${ECHO_T}$cf_cv_cgetent" >&6
5026
5027 if test "$cf_cv_cgetent" = yes
5028@@ -19742,14 +19763,14 @@
5029 #define HAVE_BSD_CGETENT 1
5030 EOF
5031
5032-echo "$as_me:19745: checking if cgetent uses const parameter" >&5
5033+echo "$as_me:19766: checking if cgetent uses const parameter" >&5
5034 echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
5035 if test "${cf_cv_cgetent_const+set}" = set; then
5036   echo $ECHO_N "(cached) $ECHO_C" >&6
5037 else
5038
5039 cat >conftest.$ac_ext <<_ACEOF
5040-#line 19752 "configure"
5041+#line 19773 "configure"
5042 #include "confdefs.h"
5043
5044 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
5045@@ -19772,16 +19793,16 @@
5046 }
5047 _ACEOF
5048 rm -f conftest.$ac_objext conftest$ac_exeext
5049-if { (eval echo "$as_me:19775: \"$ac_link\"") >&5
5050+if { (eval echo "$as_me:19796: \"$ac_link\"") >&5
5051   (eval $ac_link) 2>&5
5052   ac_status=$?
5053-  echo "$as_me:19778: \$? = $ac_status" >&5
5054+  echo "$as_me:19799: \$? = $ac_status" >&5
5055   (exit $ac_status); } &&
5056          { ac_try='test -s conftest$ac_exeext'
5057-  { (eval echo "$as_me:19781: \"$ac_try\"") >&5
5058+  { (eval echo "$as_me:19802: \"$ac_try\"") >&5
5059   (eval $ac_try) 2>&5
5060   ac_status=$?
5061-  echo "$as_me:19784: \$? = $ac_status" >&5
5062+  echo "$as_me:19805: \$? = $ac_status" >&5
5063   (exit $ac_status); }; }; then
5064   cf_cv_cgetent_const=yes
5065 else
5066@@ -19792,7 +19813,7 @@
5067 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5068
5069 fi
5070-echo "$as_me:19795: result: $cf_cv_cgetent_const" >&5
5071+echo "$as_me:19816: result: $cf_cv_cgetent_const" >&5
5072 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
5073 	if test "$cf_cv_cgetent_const" = yes
5074 	then
5075@@ -19806,14 +19827,14 @@
5076
5077 fi
5078
5079-echo "$as_me:19809: checking for isascii" >&5
5080+echo "$as_me:19830: checking for isascii" >&5
5081 echo $ECHO_N "checking for isascii... $ECHO_C" >&6
5082 if test "${cf_cv_have_isascii+set}" = set; then
5083   echo $ECHO_N "(cached) $ECHO_C" >&6
5084 else
5085
5086 	cat >conftest.$ac_ext <<_ACEOF
5087-#line 19816 "configure"
5088+#line 19837 "configure"
5089 #include "confdefs.h"
5090 #include <ctype.h>
5091 int
5092@@ -19825,16 +19846,16 @@
5093 }
5094 _ACEOF
5095 rm -f conftest.$ac_objext conftest$ac_exeext
5096-if { (eval echo "$as_me:19828: \"$ac_link\"") >&5
5097+if { (eval echo "$as_me:19849: \"$ac_link\"") >&5
5098   (eval $ac_link) 2>&5
5099   ac_status=$?
5100-  echo "$as_me:19831: \$? = $ac_status" >&5
5101+  echo "$as_me:19852: \$? = $ac_status" >&5
5102   (exit $ac_status); } &&
5103          { ac_try='test -s conftest$ac_exeext'
5104-  { (eval echo "$as_me:19834: \"$ac_try\"") >&5
5105+  { (eval echo "$as_me:19855: \"$ac_try\"") >&5
5106   (eval $ac_try) 2>&5
5107   ac_status=$?
5108-  echo "$as_me:19837: \$? = $ac_status" >&5
5109+  echo "$as_me:19858: \$? = $ac_status" >&5
5110   (exit $ac_status); }; }; then
5111   cf_cv_have_isascii=yes
5112 else
5113@@ -19845,7 +19866,7 @@
5114 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5115
5116 fi
5117-echo "$as_me:19848: result: $cf_cv_have_isascii" >&5
5118+echo "$as_me:19869: result: $cf_cv_have_isascii" >&5
5119 echo "${ECHO_T}$cf_cv_have_isascii" >&6
5120 test "$cf_cv_have_isascii" = yes &&
5121 cat >>confdefs.h <<\EOF
5122@@ -19853,10 +19874,10 @@
5123 EOF
5124
5125 if test "$ac_cv_func_sigaction" = yes; then
5126-echo "$as_me:19856: checking whether sigaction needs _POSIX_SOURCE" >&5
5127+echo "$as_me:19877: checking whether sigaction needs _POSIX_SOURCE" >&5
5128 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
5129 cat >conftest.$ac_ext <<_ACEOF
5130-#line 19859 "configure"
5131+#line 19880 "configure"
5132 #include "confdefs.h"
5133
5134 #include <sys/types.h>
5135@@ -19870,16 +19891,16 @@
5136 }
5137 _ACEOF
5138 rm -f conftest.$ac_objext
5139-if { (eval echo "$as_me:19873: \"$ac_compile\"") >&5
5140+if { (eval echo "$as_me:19894: \"$ac_compile\"") >&5
5141   (eval $ac_compile) 2>&5
5142   ac_status=$?
5143-  echo "$as_me:19876: \$? = $ac_status" >&5
5144+  echo "$as_me:19897: \$? = $ac_status" >&5
5145   (exit $ac_status); } &&
5146          { ac_try='test -s conftest.$ac_objext'
5147-  { (eval echo "$as_me:19879: \"$ac_try\"") >&5
5148+  { (eval echo "$as_me:19900: \"$ac_try\"") >&5
5149   (eval $ac_try) 2>&5
5150   ac_status=$?
5151-  echo "$as_me:19882: \$? = $ac_status" >&5
5152+  echo "$as_me:19903: \$? = $ac_status" >&5
5153   (exit $ac_status); }; }; then
5154   sigact_bad=no
5155 else
5156@@ -19887,7 +19908,7 @@
5157 cat conftest.$ac_ext >&5
5158
5159 cat >conftest.$ac_ext <<_ACEOF
5160-#line 19890 "configure"
5161+#line 19911 "configure"
5162 #include "confdefs.h"
5163
5164 #define _POSIX_SOURCE
5165@@ -19902,16 +19923,16 @@
5166 }
5167 _ACEOF
5168 rm -f conftest.$ac_objext
5169-if { (eval echo "$as_me:19905: \"$ac_compile\"") >&5
5170+if { (eval echo "$as_me:19926: \"$ac_compile\"") >&5
5171   (eval $ac_compile) 2>&5
5172   ac_status=$?
5173-  echo "$as_me:19908: \$? = $ac_status" >&5
5174+  echo "$as_me:19929: \$? = $ac_status" >&5
5175   (exit $ac_status); } &&
5176          { ac_try='test -s conftest.$ac_objext'
5177-  { (eval echo "$as_me:19911: \"$ac_try\"") >&5
5178+  { (eval echo "$as_me:19932: \"$ac_try\"") >&5
5179   (eval $ac_try) 2>&5
5180   ac_status=$?
5181-  echo "$as_me:19914: \$? = $ac_status" >&5
5182+  echo "$as_me:19935: \$? = $ac_status" >&5
5183   (exit $ac_status); }; }; then
5184   sigact_bad=yes
5185
5186@@ -19927,11 +19948,11 @@
5187 rm -f conftest.$ac_objext conftest.$ac_ext
5188 fi
5189 rm -f conftest.$ac_objext conftest.$ac_ext
5190-echo "$as_me:19930: result: $sigact_bad" >&5
5191+echo "$as_me:19951: result: $sigact_bad" >&5
5192 echo "${ECHO_T}$sigact_bad" >&6
5193 fi
5194
5195-echo "$as_me:19934: checking if nanosleep really works" >&5
5196+echo "$as_me:19955: checking if nanosleep really works" >&5
5197 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
5198 if test "${cf_cv_func_nanosleep+set}" = set; then
5199   echo $ECHO_N "(cached) $ECHO_C" >&6
5200@@ -19941,7 +19962,7 @@
5201   cf_cv_func_nanosleep=unknown
5202 else
5203   cat >conftest.$ac_ext <<_ACEOF
5204-#line 19944 "configure"
5205+#line 19965 "configure"
5206 #include "confdefs.h"
5207
5208 #include <stdio.h>
5209@@ -19966,15 +19987,15 @@
5210
5211 _ACEOF
5212 rm -f conftest$ac_exeext
5213-if { (eval echo "$as_me:19969: \"$ac_link\"") >&5
5214+if { (eval echo "$as_me:19990: \"$ac_link\"") >&5
5215   (eval $ac_link) 2>&5
5216   ac_status=$?
5217-  echo "$as_me:19972: \$? = $ac_status" >&5
5218+  echo "$as_me:19993: \$? = $ac_status" >&5
5219   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
5220-  { (eval echo "$as_me:19974: \"$ac_try\"") >&5
5221+  { (eval echo "$as_me:19995: \"$ac_try\"") >&5
5222   (eval $ac_try) 2>&5
5223   ac_status=$?
5224-  echo "$as_me:19977: \$? = $ac_status" >&5
5225+  echo "$as_me:19998: \$? = $ac_status" >&5
5226   (exit $ac_status); }; }; then
5227   cf_cv_func_nanosleep=yes
5228 else
5229@@ -19986,7 +20007,7 @@
5230 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
5231 fi
5232 fi
5233-echo "$as_me:19989: result: $cf_cv_func_nanosleep" >&5
5234+echo "$as_me:20010: result: $cf_cv_func_nanosleep" >&5
5235 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
5236
5237 test "$cf_cv_func_nanosleep" = "yes" &&
5238@@ -20003,23 +20024,23 @@
5239
5240 do
5241 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
5242-echo "$as_me:20006: checking for $ac_header" >&5
5243+echo "$as_me:20027: checking for $ac_header" >&5
5244 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
5245 if eval "test \"\${$as_ac_Header+set}\" = set"; then
5246   echo $ECHO_N "(cached) $ECHO_C" >&6
5247 else
5248   cat >conftest.$ac_ext <<_ACEOF
5249-#line 20012 "configure"
5250+#line 20033 "configure"
5251 #include "confdefs.h"
5252 #include <$ac_header>
5253 _ACEOF
5254-if { (eval echo "$as_me:20016: \"$ac_cpp conftest.$ac_ext\"") >&5
5255+if { (eval echo "$as_me:20037: \"$ac_cpp conftest.$ac_ext\"") >&5
5256   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
5257   ac_status=$?
5258   egrep -v '^ *\+' conftest.er1 >conftest.err
5259   rm -f conftest.er1
5260   cat conftest.err >&5
5261-  echo "$as_me:20022: \$? = $ac_status" >&5
5262+  echo "$as_me:20043: \$? = $ac_status" >&5
5263   (exit $ac_status); } >/dev/null; then
5264   if test -s conftest.err; then
5265     ac_cpp_err=$ac_c_preproc_warn_flag
5266@@ -20038,7 +20059,7 @@
5267 fi
5268 rm -f conftest.err conftest.$ac_ext
5269 fi
5270-echo "$as_me:20041: result: `eval echo '${'$as_ac_Header'}'`" >&5
5271+echo "$as_me:20062: result: `eval echo '${'$as_ac_Header'}'`" >&5
5272 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
5273 if test `eval echo '${'$as_ac_Header'}'` = yes; then
5274   cat >>confdefs.h <<EOF
5275@@ -20055,10 +20076,10 @@
5276 	(*)	termios_bad=maybe ;;
5277 	esac
5278 	if test "$termios_bad" = maybe ; then
5279-	echo "$as_me:20058: checking whether termios.h needs _POSIX_SOURCE" >&5
5280+	echo "$as_me:20079: checking whether termios.h needs _POSIX_SOURCE" >&5
5281 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
5282 	cat >conftest.$ac_ext <<_ACEOF
5283-#line 20061 "configure"
5284+#line 20082 "configure"
5285 #include "confdefs.h"
5286 #include <termios.h>
5287 int
5288@@ -20070,16 +20091,16 @@
5289 }
5290 _ACEOF
5291 rm -f conftest.$ac_objext
5292-if { (eval echo "$as_me:20073: \"$ac_compile\"") >&5
5293+if { (eval echo "$as_me:20094: \"$ac_compile\"") >&5
5294   (eval $ac_compile) 2>&5
5295   ac_status=$?
5296-  echo "$as_me:20076: \$? = $ac_status" >&5
5297+  echo "$as_me:20097: \$? = $ac_status" >&5
5298   (exit $ac_status); } &&
5299          { ac_try='test -s conftest.$ac_objext'
5300-  { (eval echo "$as_me:20079: \"$ac_try\"") >&5
5301+  { (eval echo "$as_me:20100: \"$ac_try\"") >&5
5302   (eval $ac_try) 2>&5
5303   ac_status=$?
5304-  echo "$as_me:20082: \$? = $ac_status" >&5
5305+  echo "$as_me:20103: \$? = $ac_status" >&5
5306   (exit $ac_status); }; }; then
5307   termios_bad=no
5308 else
5309@@ -20087,7 +20108,7 @@
5310 cat conftest.$ac_ext >&5
5311
5312 		cat >conftest.$ac_ext <<_ACEOF
5313-#line 20090 "configure"
5314+#line 20111 "configure"
5315 #include "confdefs.h"
5316
5317 #define _POSIX_SOURCE
5318@@ -20101,16 +20122,16 @@
5319 }
5320 _ACEOF
5321 rm -f conftest.$ac_objext
5322-if { (eval echo "$as_me:20104: \"$ac_compile\"") >&5
5323+if { (eval echo "$as_me:20125: \"$ac_compile\"") >&5
5324   (eval $ac_compile) 2>&5
5325   ac_status=$?
5326-  echo "$as_me:20107: \$? = $ac_status" >&5
5327+  echo "$as_me:20128: \$? = $ac_status" >&5
5328   (exit $ac_status); } &&
5329          { ac_try='test -s conftest.$ac_objext'
5330-  { (eval echo "$as_me:20110: \"$ac_try\"") >&5
5331+  { (eval echo "$as_me:20131: \"$ac_try\"") >&5
5332   (eval $ac_try) 2>&5
5333   ac_status=$?
5334-  echo "$as_me:20113: \$? = $ac_status" >&5
5335+  echo "$as_me:20134: \$? = $ac_status" >&5
5336   (exit $ac_status); }; }; then
5337   termios_bad=unknown
5338 else
5339@@ -20126,19 +20147,19 @@
5340
5341 fi
5342 rm -f conftest.$ac_objext conftest.$ac_ext
5343-	echo "$as_me:20129: result: $termios_bad" >&5
5344+	echo "$as_me:20150: result: $termios_bad" >&5
5345 echo "${ECHO_T}$termios_bad" >&6
5346 	fi
5347 fi
5348
5349-echo "$as_me:20134: checking for tcgetattr" >&5
5350+echo "$as_me:20155: checking for tcgetattr" >&5
5351 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
5352 if test "${cf_cv_have_tcgetattr+set}" = set; then
5353   echo $ECHO_N "(cached) $ECHO_C" >&6
5354 else
5355
5356 cat >conftest.$ac_ext <<_ACEOF
5357-#line 20141 "configure"
5358+#line 20162 "configure"
5359 #include "confdefs.h"
5360
5361 #include <sys/types.h>
5362@@ -20166,16 +20187,16 @@
5363 }
5364 _ACEOF
5365 rm -f conftest.$ac_objext conftest$ac_exeext
5366-if { (eval echo "$as_me:20169: \"$ac_link\"") >&5
5367+if { (eval echo "$as_me:20190: \"$ac_link\"") >&5
5368   (eval $ac_link) 2>&5
5369   ac_status=$?
5370-  echo "$as_me:20172: \$? = $ac_status" >&5
5371+  echo "$as_me:20193: \$? = $ac_status" >&5
5372   (exit $ac_status); } &&
5373          { ac_try='test -s conftest$ac_exeext'
5374-  { (eval echo "$as_me:20175: \"$ac_try\"") >&5
5375+  { (eval echo "$as_me:20196: \"$ac_try\"") >&5
5376   (eval $ac_try) 2>&5
5377   ac_status=$?
5378-  echo "$as_me:20178: \$? = $ac_status" >&5
5379+  echo "$as_me:20199: \$? = $ac_status" >&5
5380   (exit $ac_status); }; }; then
5381   cf_cv_have_tcgetattr=yes
5382 else
5383@@ -20185,21 +20206,21 @@
5384 fi
5385 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5386 fi
5387-echo "$as_me:20188: result: $cf_cv_have_tcgetattr" >&5
5388+echo "$as_me:20209: result: $cf_cv_have_tcgetattr" >&5
5389 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
5390 test "$cf_cv_have_tcgetattr" = yes &&
5391 cat >>confdefs.h <<\EOF
5392 #define HAVE_TCGETATTR 1
5393 EOF
5394
5395-echo "$as_me:20195: checking for vsscanf function or workaround" >&5
5396+echo "$as_me:20216: checking for vsscanf function or workaround" >&5
5397 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
5398 if test "${cf_cv_func_vsscanf+set}" = set; then
5399   echo $ECHO_N "(cached) $ECHO_C" >&6
5400 else
5401
5402 cat >conftest.$ac_ext <<_ACEOF
5403-#line 20202 "configure"
5404+#line 20223 "configure"
5405 #include "confdefs.h"
5406
5407 #include <stdarg.h>
5408@@ -20215,16 +20236,16 @@
5409 }
5410 _ACEOF
5411 rm -f conftest.$ac_objext conftest$ac_exeext
5412-if { (eval echo "$as_me:20218: \"$ac_link\"") >&5
5413+if { (eval echo "$as_me:20239: \"$ac_link\"") >&5
5414   (eval $ac_link) 2>&5
5415   ac_status=$?
5416-  echo "$as_me:20221: \$? = $ac_status" >&5
5417+  echo "$as_me:20242: \$? = $ac_status" >&5
5418   (exit $ac_status); } &&
5419          { ac_try='test -s conftest$ac_exeext'
5420-  { (eval echo "$as_me:20224: \"$ac_try\"") >&5
5421+  { (eval echo "$as_me:20245: \"$ac_try\"") >&5
5422   (eval $ac_try) 2>&5
5423   ac_status=$?
5424-  echo "$as_me:20227: \$? = $ac_status" >&5
5425+  echo "$as_me:20248: \$? = $ac_status" >&5
5426   (exit $ac_status); }; }; then
5427   cf_cv_func_vsscanf=vsscanf
5428 else
5429@@ -20232,7 +20253,7 @@
5430 cat conftest.$ac_ext >&5
5431
5432 cat >conftest.$ac_ext <<_ACEOF
5433-#line 20235 "configure"
5434+#line 20256 "configure"
5435 #include "confdefs.h"
5436
5437 #include <stdarg.h>
5438@@ -20254,16 +20275,16 @@
5439 }
5440 _ACEOF
5441 rm -f conftest.$ac_objext conftest$ac_exeext
5442-if { (eval echo "$as_me:20257: \"$ac_link\"") >&5
5443+if { (eval echo "$as_me:20278: \"$ac_link\"") >&5
5444   (eval $ac_link) 2>&5
5445   ac_status=$?
5446-  echo "$as_me:20260: \$? = $ac_status" >&5
5447+  echo "$as_me:20281: \$? = $ac_status" >&5
5448   (exit $ac_status); } &&
5449          { ac_try='test -s conftest$ac_exeext'
5450-  { (eval echo "$as_me:20263: \"$ac_try\"") >&5
5451+  { (eval echo "$as_me:20284: \"$ac_try\"") >&5
5452   (eval $ac_try) 2>&5
5453   ac_status=$?
5454-  echo "$as_me:20266: \$? = $ac_status" >&5
5455+  echo "$as_me:20287: \$? = $ac_status" >&5
5456   (exit $ac_status); }; }; then
5457   cf_cv_func_vsscanf=vfscanf
5458 else
5459@@ -20271,7 +20292,7 @@
5460 cat conftest.$ac_ext >&5
5461
5462 cat >conftest.$ac_ext <<_ACEOF
5463-#line 20274 "configure"
5464+#line 20295 "configure"
5465 #include "confdefs.h"
5466
5467 #include <stdarg.h>
5468@@ -20293,16 +20314,16 @@
5469 }
5470 _ACEOF
5471 rm -f conftest.$ac_objext conftest$ac_exeext
5472-if { (eval echo "$as_me:20296: \"$ac_link\"") >&5
5473+if { (eval echo "$as_me:20317: \"$ac_link\"") >&5
5474   (eval $ac_link) 2>&5
5475   ac_status=$?
5476-  echo "$as_me:20299: \$? = $ac_status" >&5
5477+  echo "$as_me:20320: \$? = $ac_status" >&5
5478   (exit $ac_status); } &&
5479          { ac_try='test -s conftest$ac_exeext'
5480-  { (eval echo "$as_me:20302: \"$ac_try\"") >&5
5481+  { (eval echo "$as_me:20323: \"$ac_try\"") >&5
5482   (eval $ac_try) 2>&5
5483   ac_status=$?
5484-  echo "$as_me:20305: \$? = $ac_status" >&5
5485+  echo "$as_me:20326: \$? = $ac_status" >&5
5486   (exit $ac_status); }; }; then
5487   cf_cv_func_vsscanf=_doscan
5488 else
5489@@ -20317,7 +20338,7 @@
5490 fi
5491 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5492 fi
5493-echo "$as_me:20320: result: $cf_cv_func_vsscanf" >&5
5494+echo "$as_me:20341: result: $cf_cv_func_vsscanf" >&5
5495 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
5496
5497 case $cf_cv_func_vsscanf in
5498@@ -20343,23 +20364,23 @@
5499
5500 do
5501 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
5502-echo "$as_me:20346: checking for $ac_header" >&5
5503+echo "$as_me:20367: checking for $ac_header" >&5
5504 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
5505 if eval "test \"\${$as_ac_Header+set}\" = set"; then
5506   echo $ECHO_N "(cached) $ECHO_C" >&6
5507 else
5508   cat >conftest.$ac_ext <<_ACEOF
5509-#line 20352 "configure"
5510+#line 20373 "configure"
5511 #include "confdefs.h"
5512 #include <$ac_header>
5513 _ACEOF
5514-if { (eval echo "$as_me:20356: \"$ac_cpp conftest.$ac_ext\"") >&5
5515+if { (eval echo "$as_me:20377: \"$ac_cpp conftest.$ac_ext\"") >&5
5516   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
5517   ac_status=$?
5518   egrep -v '^ *\+' conftest.er1 >conftest.err
5519   rm -f conftest.er1
5520   cat conftest.err >&5
5521-  echo "$as_me:20362: \$? = $ac_status" >&5
5522+  echo "$as_me:20383: \$? = $ac_status" >&5
5523   (exit $ac_status); } >/dev/null; then
5524   if test -s conftest.err; then
5525     ac_cpp_err=$ac_c_preproc_warn_flag
5526@@ -20378,7 +20399,7 @@
5527 fi
5528 rm -f conftest.err conftest.$ac_ext
5529 fi
5530-echo "$as_me:20381: result: `eval echo '${'$as_ac_Header'}'`" >&5
5531+echo "$as_me:20402: result: `eval echo '${'$as_ac_Header'}'`" >&5
5532 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
5533 if test `eval echo '${'$as_ac_Header'}'` = yes; then
5534   cat >>confdefs.h <<EOF
5535@@ -20388,7 +20409,7 @@
5536 fi
5537 done
5538
5539-echo "$as_me:20391: checking for working mkstemp" >&5
5540+echo "$as_me:20412: checking for working mkstemp" >&5
5541 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
5542 if test "${cf_cv_func_mkstemp+set}" = set; then
5543   echo $ECHO_N "(cached) $ECHO_C" >&6
5544@@ -20399,7 +20420,7 @@
5545   cf_cv_func_mkstemp=maybe
5546 else
5547   cat >conftest.$ac_ext <<_ACEOF
5548-#line 20402 "configure"
5549+#line 20423 "configure"
5550 #include "confdefs.h"
5551
5552 #include <sys/types.h>
5553@@ -20440,15 +20461,15 @@
5554
5555 _ACEOF
5556 rm -f conftest$ac_exeext
5557-if { (eval echo "$as_me:20443: \"$ac_link\"") >&5
5558+if { (eval echo "$as_me:20464: \"$ac_link\"") >&5
5559   (eval $ac_link) 2>&5
5560   ac_status=$?
5561-  echo "$as_me:20446: \$? = $ac_status" >&5
5562+  echo "$as_me:20467: \$? = $ac_status" >&5
5563   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
5564-  { (eval echo "$as_me:20448: \"$ac_try\"") >&5
5565+  { (eval echo "$as_me:20469: \"$ac_try\"") >&5
5566   (eval $ac_try) 2>&5
5567   ac_status=$?
5568-  echo "$as_me:20451: \$? = $ac_status" >&5
5569+  echo "$as_me:20472: \$? = $ac_status" >&5
5570   (exit $ac_status); }; }; then
5571   cf_cv_func_mkstemp=yes
5572
5573@@ -20463,16 +20484,16 @@
5574 fi
5575
5576 fi
5577-echo "$as_me:20466: result: $cf_cv_func_mkstemp" >&5
5578+echo "$as_me:20487: result: $cf_cv_func_mkstemp" >&5
5579 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
5580 if test "x$cf_cv_func_mkstemp" = xmaybe ; then
5581-	echo "$as_me:20469: checking for mkstemp" >&5
5582+	echo "$as_me:20490: checking for mkstemp" >&5
5583 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
5584 if test "${ac_cv_func_mkstemp+set}" = set; then
5585   echo $ECHO_N "(cached) $ECHO_C" >&6
5586 else
5587   cat >conftest.$ac_ext <<_ACEOF
5588-#line 20475 "configure"
5589+#line 20496 "configure"
5590 #include "confdefs.h"
5591 #define mkstemp autoconf_temporary
5592 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
5593@@ -20503,16 +20524,16 @@
5594 }
5595 _ACEOF
5596 rm -f conftest.$ac_objext conftest$ac_exeext
5597-if { (eval echo "$as_me:20506: \"$ac_link\"") >&5
5598+if { (eval echo "$as_me:20527: \"$ac_link\"") >&5
5599   (eval $ac_link) 2>&5
5600   ac_status=$?
5601-  echo "$as_me:20509: \$? = $ac_status" >&5
5602+  echo "$as_me:20530: \$? = $ac_status" >&5
5603   (exit $ac_status); } &&
5604          { ac_try='test -s conftest$ac_exeext'
5605-  { (eval echo "$as_me:20512: \"$ac_try\"") >&5
5606+  { (eval echo "$as_me:20533: \"$ac_try\"") >&5
5607   (eval $ac_try) 2>&5
5608   ac_status=$?
5609-  echo "$as_me:20515: \$? = $ac_status" >&5
5610+  echo "$as_me:20536: \$? = $ac_status" >&5
5611   (exit $ac_status); }; }; then
5612   ac_cv_func_mkstemp=yes
5613 else
5614@@ -20522,7 +20543,7 @@
5615 fi
5616 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5617 fi
5618-echo "$as_me:20525: result: $ac_cv_func_mkstemp" >&5
5619+echo "$as_me:20546: result: $ac_cv_func_mkstemp" >&5
5620 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
5621
5622 fi
5623@@ -20543,21 +20564,21 @@
5624 fi
5625
5626 if test "x$cross_compiling" = xyes ; then
5627-	{ echo "$as_me:20546: WARNING: cross compiling: assume setvbuf params not reversed" >&5
5628+	{ echo "$as_me:20567: WARNING: cross compiling: assume setvbuf params not reversed" >&5
5629 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
5630 else
5631-	echo "$as_me:20549: checking whether setvbuf arguments are reversed" >&5
5632+	echo "$as_me:20570: checking whether setvbuf arguments are reversed" >&5
5633 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
5634 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
5635   echo $ECHO_N "(cached) $ECHO_C" >&6
5636 else
5637   if test "$cross_compiling" = yes; then
5638-  { { echo "$as_me:20555: error: cannot run test program while cross compiling" >&5
5639+  { { echo "$as_me:20576: error: cannot run test program while cross compiling" >&5
5640 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
5641    { (exit 1); exit 1; }; }
5642 else
5643   cat >conftest.$ac_ext <<_ACEOF
5644-#line 20560 "configure"
5645+#line 20581 "configure"
5646 #include "confdefs.h"
5647 #include <stdio.h>
5648 /* If setvbuf has the reversed format, exit 0. */
5649@@ -20574,15 +20595,15 @@
5650 }
5651 _ACEOF
5652 rm -f conftest$ac_exeext
5653-if { (eval echo "$as_me:20577: \"$ac_link\"") >&5
5654+if { (eval echo "$as_me:20598: \"$ac_link\"") >&5
5655   (eval $ac_link) 2>&5
5656   ac_status=$?
5657-  echo "$as_me:20580: \$? = $ac_status" >&5
5658+  echo "$as_me:20601: \$? = $ac_status" >&5
5659   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
5660-  { (eval echo "$as_me:20582: \"$ac_try\"") >&5
5661+  { (eval echo "$as_me:20603: \"$ac_try\"") >&5
5662   (eval $ac_try) 2>&5
5663   ac_status=$?
5664-  echo "$as_me:20585: \$? = $ac_status" >&5
5665+  echo "$as_me:20606: \$? = $ac_status" >&5
5666   (exit $ac_status); }; }; then
5667   ac_cv_func_setvbuf_reversed=yes
5668 else
5669@@ -20595,7 +20616,7 @@
5670 fi
5671 rm -f core core.* *.core
5672 fi
5673-echo "$as_me:20598: result: $ac_cv_func_setvbuf_reversed" >&5
5674+echo "$as_me:20619: result: $ac_cv_func_setvbuf_reversed" >&5
5675 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
5676 if test $ac_cv_func_setvbuf_reversed = yes; then
5677
5678@@ -20606,13 +20627,13 @@
5679 fi
5680
5681 fi
5682-echo "$as_me:20609: checking for intptr_t" >&5
5683+echo "$as_me:20630: checking for intptr_t" >&5
5684 echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
5685 if test "${ac_cv_type_intptr_t+set}" = set; then
5686   echo $ECHO_N "(cached) $ECHO_C" >&6
5687 else
5688   cat >conftest.$ac_ext <<_ACEOF
5689-#line 20615 "configure"
5690+#line 20636 "configure"
5691 #include "confdefs.h"
5692 $ac_includes_default
5693 int
5694@@ -20627,16 +20648,16 @@
5695 }
5696 _ACEOF
5697 rm -f conftest.$ac_objext
5698-if { (eval echo "$as_me:20630: \"$ac_compile\"") >&5
5699+if { (eval echo "$as_me:20651: \"$ac_compile\"") >&5
5700   (eval $ac_compile) 2>&5
5701   ac_status=$?
5702-  echo "$as_me:20633: \$? = $ac_status" >&5
5703+  echo "$as_me:20654: \$? = $ac_status" >&5
5704   (exit $ac_status); } &&
5705          { ac_try='test -s conftest.$ac_objext'
5706-  { (eval echo "$as_me:20636: \"$ac_try\"") >&5
5707+  { (eval echo "$as_me:20657: \"$ac_try\"") >&5
5708   (eval $ac_try) 2>&5
5709   ac_status=$?
5710-  echo "$as_me:20639: \$? = $ac_status" >&5
5711+  echo "$as_me:20660: \$? = $ac_status" >&5
5712   (exit $ac_status); }; }; then
5713   ac_cv_type_intptr_t=yes
5714 else
5715@@ -20646,7 +20667,7 @@
5716 fi
5717 rm -f conftest.$ac_objext conftest.$ac_ext
5718 fi
5719-echo "$as_me:20649: result: $ac_cv_type_intptr_t" >&5
5720+echo "$as_me:20670: result: $ac_cv_type_intptr_t" >&5
5721 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
5722 if test $ac_cv_type_intptr_t = yes; then
5723   :
5724@@ -20658,13 +20679,13 @@
5725
5726 fi
5727
5728-echo "$as_me:20661: checking for ssize_t" >&5
5729+echo "$as_me:20682: checking for ssize_t" >&5
5730 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
5731 if test "${ac_cv_type_ssize_t+set}" = set; then
5732   echo $ECHO_N "(cached) $ECHO_C" >&6
5733 else
5734   cat >conftest.$ac_ext <<_ACEOF
5735-#line 20667 "configure"
5736+#line 20688 "configure"
5737 #include "confdefs.h"
5738 $ac_includes_default
5739 int
5740@@ -20679,16 +20700,16 @@
5741 }
5742 _ACEOF
5743 rm -f conftest.$ac_objext
5744-if { (eval echo "$as_me:20682: \"$ac_compile\"") >&5
5745+if { (eval echo "$as_me:20703: \"$ac_compile\"") >&5
5746   (eval $ac_compile) 2>&5
5747   ac_status=$?
5748-  echo "$as_me:20685: \$? = $ac_status" >&5
5749+  echo "$as_me:20706: \$? = $ac_status" >&5
5750   (exit $ac_status); } &&
5751          { ac_try='test -s conftest.$ac_objext'
5752-  { (eval echo "$as_me:20688: \"$ac_try\"") >&5
5753+  { (eval echo "$as_me:20709: \"$ac_try\"") >&5
5754   (eval $ac_try) 2>&5
5755   ac_status=$?
5756-  echo "$as_me:20691: \$? = $ac_status" >&5
5757+  echo "$as_me:20712: \$? = $ac_status" >&5
5758   (exit $ac_status); }; }; then
5759   ac_cv_type_ssize_t=yes
5760 else
5761@@ -20698,7 +20719,7 @@
5762 fi
5763 rm -f conftest.$ac_objext conftest.$ac_ext
5764 fi
5765-echo "$as_me:20701: result: $ac_cv_type_ssize_t" >&5
5766+echo "$as_me:20722: result: $ac_cv_type_ssize_t" >&5
5767 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
5768 if test $ac_cv_type_ssize_t = yes; then
5769   :
5770@@ -20710,14 +20731,14 @@
5771
5772 fi
5773
5774-echo "$as_me:20713: checking for type sigaction_t" >&5
5775+echo "$as_me:20734: checking for type sigaction_t" >&5
5776 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
5777 if test "${cf_cv_type_sigaction+set}" = set; then
5778   echo $ECHO_N "(cached) $ECHO_C" >&6
5779 else
5780
5781 	cat >conftest.$ac_ext <<_ACEOF
5782-#line 20720 "configure"
5783+#line 20741 "configure"
5784 #include "confdefs.h"
5785
5786 #include <signal.h>
5787@@ -20730,16 +20751,16 @@
5788 }
5789 _ACEOF
5790 rm -f conftest.$ac_objext
5791-if { (eval echo "$as_me:20733: \"$ac_compile\"") >&5
5792+if { (eval echo "$as_me:20754: \"$ac_compile\"") >&5
5793   (eval $ac_compile) 2>&5
5794   ac_status=$?
5795-  echo "$as_me:20736: \$? = $ac_status" >&5
5796+  echo "$as_me:20757: \$? = $ac_status" >&5
5797   (exit $ac_status); } &&
5798          { ac_try='test -s conftest.$ac_objext'
5799-  { (eval echo "$as_me:20739: \"$ac_try\"") >&5
5800+  { (eval echo "$as_me:20760: \"$ac_try\"") >&5
5801   (eval $ac_try) 2>&5
5802   ac_status=$?
5803-  echo "$as_me:20742: \$? = $ac_status" >&5
5804+  echo "$as_me:20763: \$? = $ac_status" >&5
5805   (exit $ac_status); }; }; then
5806   cf_cv_type_sigaction=yes
5807 else
5808@@ -20750,14 +20771,14 @@
5809 rm -f conftest.$ac_objext conftest.$ac_ext
5810 fi
5811
5812-echo "$as_me:20753: result: $cf_cv_type_sigaction" >&5
5813+echo "$as_me:20774: result: $cf_cv_type_sigaction" >&5
5814 echo "${ECHO_T}$cf_cv_type_sigaction" >&6
5815 test "$cf_cv_type_sigaction" = yes &&
5816 cat >>confdefs.h <<\EOF
5817 #define HAVE_TYPE_SIGACTION 1
5818 EOF
5819
5820-echo "$as_me:20760: checking declaration of size-change" >&5
5821+echo "$as_me:20781: checking declaration of size-change" >&5
5822 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
5823 if test "${cf_cv_sizechange+set}" = set; then
5824   echo $ECHO_N "(cached) $ECHO_C" >&6
5825@@ -20778,7 +20799,7 @@
5826
5827 	fi
5828 	cat >conftest.$ac_ext <<_ACEOF
5829-#line 20781 "configure"
5830+#line 20802 "configure"
5831 #include "confdefs.h"
5832 #include <sys/types.h>
5833 #ifdef HAVE_TERMIOS_H
5834@@ -20824,16 +20845,16 @@
5835 }
5836 _ACEOF
5837 rm -f conftest.$ac_objext
5838-if { (eval echo "$as_me:20827: \"$ac_compile\"") >&5
5839+if { (eval echo "$as_me:20848: \"$ac_compile\"") >&5
5840   (eval $ac_compile) 2>&5
5841   ac_status=$?
5842-  echo "$as_me:20830: \$? = $ac_status" >&5
5843+  echo "$as_me:20851: \$? = $ac_status" >&5
5844   (exit $ac_status); } &&
5845          { ac_try='test -s conftest.$ac_objext'
5846-  { (eval echo "$as_me:20833: \"$ac_try\"") >&5
5847+  { (eval echo "$as_me:20854: \"$ac_try\"") >&5
5848   (eval $ac_try) 2>&5
5849   ac_status=$?
5850-  echo "$as_me:20836: \$? = $ac_status" >&5
5851+  echo "$as_me:20857: \$? = $ac_status" >&5
5852   (exit $ac_status); }; }; then
5853   cf_cv_sizechange=yes
5854 else
5855@@ -20852,7 +20873,7 @@
5856 done
5857
5858 fi
5859-echo "$as_me:20855: result: $cf_cv_sizechange" >&5
5860+echo "$as_me:20876: result: $cf_cv_sizechange" >&5
5861 echo "${ECHO_T}$cf_cv_sizechange" >&6
5862 if test "$cf_cv_sizechange" != no ; then
5863
5864@@ -20870,13 +20891,13 @@
5865 	esac
5866 fi
5867
5868-echo "$as_me:20873: checking for memmove" >&5
5869+echo "$as_me:20894: checking for memmove" >&5
5870 echo $ECHO_N "checking for memmove... $ECHO_C" >&6
5871 if test "${ac_cv_func_memmove+set}" = set; then
5872   echo $ECHO_N "(cached) $ECHO_C" >&6
5873 else
5874   cat >conftest.$ac_ext <<_ACEOF
5875-#line 20879 "configure"
5876+#line 20900 "configure"
5877 #include "confdefs.h"
5878 #define memmove autoconf_temporary
5879 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
5880@@ -20907,16 +20928,16 @@
5881 }
5882 _ACEOF
5883 rm -f conftest.$ac_objext conftest$ac_exeext
5884-if { (eval echo "$as_me:20910: \"$ac_link\"") >&5
5885+if { (eval echo "$as_me:20931: \"$ac_link\"") >&5
5886   (eval $ac_link) 2>&5
5887   ac_status=$?
5888-  echo "$as_me:20913: \$? = $ac_status" >&5
5889+  echo "$as_me:20934: \$? = $ac_status" >&5
5890   (exit $ac_status); } &&
5891          { ac_try='test -s conftest$ac_exeext'
5892-  { (eval echo "$as_me:20916: \"$ac_try\"") >&5
5893+  { (eval echo "$as_me:20937: \"$ac_try\"") >&5
5894   (eval $ac_try) 2>&5
5895   ac_status=$?
5896-  echo "$as_me:20919: \$? = $ac_status" >&5
5897+  echo "$as_me:20940: \$? = $ac_status" >&5
5898   (exit $ac_status); }; }; then
5899   ac_cv_func_memmove=yes
5900 else
5901@@ -20926,19 +20947,19 @@
5902 fi
5903 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5904 fi
5905-echo "$as_me:20929: result: $ac_cv_func_memmove" >&5
5906+echo "$as_me:20950: result: $ac_cv_func_memmove" >&5
5907 echo "${ECHO_T}$ac_cv_func_memmove" >&6
5908 if test $ac_cv_func_memmove = yes; then
5909   :
5910 else
5911
5912-echo "$as_me:20935: checking for bcopy" >&5
5913+echo "$as_me:20956: checking for bcopy" >&5
5914 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
5915 if test "${ac_cv_func_bcopy+set}" = set; then
5916   echo $ECHO_N "(cached) $ECHO_C" >&6
5917 else
5918   cat >conftest.$ac_ext <<_ACEOF
5919-#line 20941 "configure"
5920+#line 20962 "configure"
5921 #include "confdefs.h"
5922 #define bcopy autoconf_temporary
5923 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
5924@@ -20969,16 +20990,16 @@
5925 }
5926 _ACEOF
5927 rm -f conftest.$ac_objext conftest$ac_exeext
5928-if { (eval echo "$as_me:20972: \"$ac_link\"") >&5
5929+if { (eval echo "$as_me:20993: \"$ac_link\"") >&5
5930   (eval $ac_link) 2>&5
5931   ac_status=$?
5932-  echo "$as_me:20975: \$? = $ac_status" >&5
5933+  echo "$as_me:20996: \$? = $ac_status" >&5
5934   (exit $ac_status); } &&
5935          { ac_try='test -s conftest$ac_exeext'
5936-  { (eval echo "$as_me:20978: \"$ac_try\"") >&5
5937+  { (eval echo "$as_me:20999: \"$ac_try\"") >&5
5938   (eval $ac_try) 2>&5
5939   ac_status=$?
5940-  echo "$as_me:20981: \$? = $ac_status" >&5
5941+  echo "$as_me:21002: \$? = $ac_status" >&5
5942   (exit $ac_status); }; }; then
5943   ac_cv_func_bcopy=yes
5944 else
5945@@ -20988,11 +21009,11 @@
5946 fi
5947 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5948 fi
5949-echo "$as_me:20991: result: $ac_cv_func_bcopy" >&5
5950+echo "$as_me:21012: result: $ac_cv_func_bcopy" >&5
5951 echo "${ECHO_T}$ac_cv_func_bcopy" >&6
5952 if test $ac_cv_func_bcopy = yes; then
5953
5954-	echo "$as_me:20995: checking if bcopy does overlapping moves" >&5
5955+	echo "$as_me:21016: checking if bcopy does overlapping moves" >&5
5956 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
5957 if test "${cf_cv_good_bcopy+set}" = set; then
5958   echo $ECHO_N "(cached) $ECHO_C" >&6
5959@@ -21002,7 +21023,7 @@
5960   cf_cv_good_bcopy=unknown
5961 else
5962   cat >conftest.$ac_ext <<_ACEOF
5963-#line 21005 "configure"
5964+#line 21026 "configure"
5965 #include "confdefs.h"
5966
5967 int main(void) {
5968@@ -21016,15 +21037,15 @@
5969
5970 _ACEOF
5971 rm -f conftest$ac_exeext
5972-if { (eval echo "$as_me:21019: \"$ac_link\"") >&5
5973+if { (eval echo "$as_me:21040: \"$ac_link\"") >&5
5974   (eval $ac_link) 2>&5
5975   ac_status=$?
5976-  echo "$as_me:21022: \$? = $ac_status" >&5
5977+  echo "$as_me:21043: \$? = $ac_status" >&5
5978   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
5979-  { (eval echo "$as_me:21024: \"$ac_try\"") >&5
5980+  { (eval echo "$as_me:21045: \"$ac_try\"") >&5
5981   (eval $ac_try) 2>&5
5982   ac_status=$?
5983-  echo "$as_me:21027: \$? = $ac_status" >&5
5984+  echo "$as_me:21048: \$? = $ac_status" >&5
5985   (exit $ac_status); }; }; then
5986   cf_cv_good_bcopy=yes
5987 else
5988@@ -21037,7 +21058,7 @@
5989 fi
5990
5991 fi
5992-echo "$as_me:21040: result: $cf_cv_good_bcopy" >&5
5993+echo "$as_me:21061: result: $cf_cv_good_bcopy" >&5
5994 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
5995
5996 else
5997@@ -21064,13 +21085,13 @@
5998 for ac_func in posix_openpt
5999 do
6000 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
6001-echo "$as_me:21067: checking for $ac_func" >&5
6002+echo "$as_me:21088: checking for $ac_func" >&5
6003 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
6004 if eval "test \"\${$as_ac_var+set}\" = set"; then
6005   echo $ECHO_N "(cached) $ECHO_C" >&6
6006 else
6007   cat >conftest.$ac_ext <<_ACEOF
6008-#line 21073 "configure"
6009+#line 21094 "configure"
6010 #include "confdefs.h"
6011 #define $ac_func autoconf_temporary
6012 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
6013@@ -21101,16 +21122,16 @@
6014 }
6015 _ACEOF
6016 rm -f conftest.$ac_objext conftest$ac_exeext
6017-if { (eval echo "$as_me:21104: \"$ac_link\"") >&5
6018+if { (eval echo "$as_me:21125: \"$ac_link\"") >&5
6019   (eval $ac_link) 2>&5
6020   ac_status=$?
6021-  echo "$as_me:21107: \$? = $ac_status" >&5
6022+  echo "$as_me:21128: \$? = $ac_status" >&5
6023   (exit $ac_status); } &&
6024          { ac_try='test -s conftest$ac_exeext'
6025-  { (eval echo "$as_me:21110: \"$ac_try\"") >&5
6026+  { (eval echo "$as_me:21131: \"$ac_try\"") >&5
6027   (eval $ac_try) 2>&5
6028   ac_status=$?
6029-  echo "$as_me:21113: \$? = $ac_status" >&5
6030+  echo "$as_me:21134: \$? = $ac_status" >&5
6031   (exit $ac_status); }; }; then
6032   eval "$as_ac_var=yes"
6033 else
6034@@ -21120,7 +21141,7 @@
6035 fi
6036 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6037 fi
6038-echo "$as_me:21123: result: `eval echo '${'$as_ac_var'}'`" >&5
6039+echo "$as_me:21144: result: `eval echo '${'$as_ac_var'}'`" >&5
6040 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
6041 if test `eval echo '${'$as_ac_var'}'` = yes; then
6042   cat >>confdefs.h <<EOF
6043@@ -21130,7 +21151,7 @@
6044 fi
6045 done
6046  }
6047-echo "$as_me:21133: checking if poll really works" >&5
6048+echo "$as_me:21154: checking if poll really works" >&5
6049 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
6050 if test "${cf_cv_working_poll+set}" = set; then
6051   echo $ECHO_N "(cached) $ECHO_C" >&6
6052@@ -21140,7 +21161,7 @@
6053   cf_cv_working_poll=unknown
6054 else
6055   cat >conftest.$ac_ext <<_ACEOF
6056-#line 21143 "configure"
6057+#line 21164 "configure"
6058 #include "confdefs.h"
6059
6060 #include <stdlib.h>
6061@@ -21192,15 +21213,15 @@
6062 }
6063 _ACEOF
6064 rm -f conftest$ac_exeext
6065-if { (eval echo "$as_me:21195: \"$ac_link\"") >&5
6066+if { (eval echo "$as_me:21216: \"$ac_link\"") >&5
6067   (eval $ac_link) 2>&5
6068   ac_status=$?
6069-  echo "$as_me:21198: \$? = $ac_status" >&5
6070+  echo "$as_me:21219: \$? = $ac_status" >&5
6071   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
6072-  { (eval echo "$as_me:21200: \"$ac_try\"") >&5
6073+  { (eval echo "$as_me:21221: \"$ac_try\"") >&5
6074   (eval $ac_try) 2>&5
6075   ac_status=$?
6076-  echo "$as_me:21203: \$? = $ac_status" >&5
6077+  echo "$as_me:21224: \$? = $ac_status" >&5
6078   (exit $ac_status); }; }; then
6079   cf_cv_working_poll=yes
6080 else
6081@@ -21212,21 +21233,21 @@
6082 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
6083 fi
6084 fi
6085-echo "$as_me:21215: result: $cf_cv_working_poll" >&5
6086+echo "$as_me:21236: result: $cf_cv_working_poll" >&5
6087 echo "${ECHO_T}$cf_cv_working_poll" >&6
6088 test "$cf_cv_working_poll" = "yes" &&
6089 cat >>confdefs.h <<\EOF
6090 #define HAVE_WORKING_POLL 1
6091 EOF
6092
6093-echo "$as_me:21222: checking for va_copy" >&5
6094+echo "$as_me:21243: checking for va_copy" >&5
6095 echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
6096 if test "${cf_cv_have_va_copy+set}" = set; then
6097   echo $ECHO_N "(cached) $ECHO_C" >&6
6098 else
6099
6100 cat >conftest.$ac_ext <<_ACEOF
6101-#line 21229 "configure"
6102+#line 21250 "configure"
6103 #include "confdefs.h"
6104
6105 #include <stdarg.h>
6106@@ -21243,16 +21264,16 @@
6107 }
6108 _ACEOF
6109 rm -f conftest.$ac_objext conftest$ac_exeext
6110-if { (eval echo "$as_me:21246: \"$ac_link\"") >&5
6111+if { (eval echo "$as_me:21267: \"$ac_link\"") >&5
6112   (eval $ac_link) 2>&5
6113   ac_status=$?
6114-  echo "$as_me:21249: \$? = $ac_status" >&5
6115+  echo "$as_me:21270: \$? = $ac_status" >&5
6116   (exit $ac_status); } &&
6117          { ac_try='test -s conftest$ac_exeext'
6118-  { (eval echo "$as_me:21252: \"$ac_try\"") >&5
6119+  { (eval echo "$as_me:21273: \"$ac_try\"") >&5
6120   (eval $ac_try) 2>&5
6121   ac_status=$?
6122-  echo "$as_me:21255: \$? = $ac_status" >&5
6123+  echo "$as_me:21276: \$? = $ac_status" >&5
6124   (exit $ac_status); }; }; then
6125   cf_cv_have_va_copy=yes
6126 else
6127@@ -21262,7 +21283,7 @@
6128 fi
6129 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6130 fi
6131-echo "$as_me:21265: result: $cf_cv_have_va_copy" >&5
6132+echo "$as_me:21286: result: $cf_cv_have_va_copy" >&5
6133 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
6134
6135 if test "$cf_cv_have_va_copy" = yes;
6136@@ -21274,14 +21295,14 @@
6137
6138 else # !cf_cv_have_va_copy
6139
6140-echo "$as_me:21277: checking for __va_copy" >&5
6141+echo "$as_me:21298: checking for __va_copy" >&5
6142 echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
6143 if test "${cf_cv_have___va_copy+set}" = set; then
6144   echo $ECHO_N "(cached) $ECHO_C" >&6
6145 else
6146
6147 cat >conftest.$ac_ext <<_ACEOF
6148-#line 21284 "configure"
6149+#line 21305 "configure"
6150 #include "confdefs.h"
6151
6152 #include <stdarg.h>
6153@@ -21298,16 +21319,16 @@
6154 }
6155 _ACEOF
6156 rm -f conftest.$ac_objext conftest$ac_exeext
6157-if { (eval echo "$as_me:21301: \"$ac_link\"") >&5
6158+if { (eval echo "$as_me:21322: \"$ac_link\"") >&5
6159   (eval $ac_link) 2>&5
6160   ac_status=$?
6161-  echo "$as_me:21304: \$? = $ac_status" >&5
6162+  echo "$as_me:21325: \$? = $ac_status" >&5
6163   (exit $ac_status); } &&
6164          { ac_try='test -s conftest$ac_exeext'
6165-  { (eval echo "$as_me:21307: \"$ac_try\"") >&5
6166+  { (eval echo "$as_me:21328: \"$ac_try\"") >&5
6167   (eval $ac_try) 2>&5
6168   ac_status=$?
6169-  echo "$as_me:21310: \$? = $ac_status" >&5
6170+  echo "$as_me:21331: \$? = $ac_status" >&5
6171   (exit $ac_status); }; }; then
6172   cf_cv_have___va_copy=yes
6173 else
6174@@ -21317,7 +21338,7 @@
6175 fi
6176 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6177 fi
6178-echo "$as_me:21320: result: $cf_cv_have___va_copy" >&5
6179+echo "$as_me:21341: result: $cf_cv_have___va_copy" >&5
6180 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
6181
6182 if test "$cf_cv_have___va_copy" = yes
6183@@ -21329,14 +21350,14 @@
6184
6185 else # !cf_cv_have___va_copy
6186
6187-echo "$as_me:21332: checking for __builtin_va_copy" >&5
6188+echo "$as_me:21353: checking for __builtin_va_copy" >&5
6189 echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
6190 if test "${cf_cv_have___builtin_va_copy+set}" = set; then
6191   echo $ECHO_N "(cached) $ECHO_C" >&6
6192 else
6193
6194 cat >conftest.$ac_ext <<_ACEOF
6195-#line 21339 "configure"
6196+#line 21360 "configure"
6197 #include "confdefs.h"
6198
6199 #include <stdarg.h>
6200@@ -21353,16 +21374,16 @@
6201 }
6202 _ACEOF
6203 rm -f conftest.$ac_objext conftest$ac_exeext
6204-if { (eval echo "$as_me:21356: \"$ac_link\"") >&5
6205+if { (eval echo "$as_me:21377: \"$ac_link\"") >&5
6206   (eval $ac_link) 2>&5
6207   ac_status=$?
6208-  echo "$as_me:21359: \$? = $ac_status" >&5
6209+  echo "$as_me:21380: \$? = $ac_status" >&5
6210   (exit $ac_status); } &&
6211          { ac_try='test -s conftest$ac_exeext'
6212-  { (eval echo "$as_me:21362: \"$ac_try\"") >&5
6213+  { (eval echo "$as_me:21383: \"$ac_try\"") >&5
6214   (eval $ac_try) 2>&5
6215   ac_status=$?
6216-  echo "$as_me:21365: \$? = $ac_status" >&5
6217+  echo "$as_me:21386: \$? = $ac_status" >&5
6218   (exit $ac_status); }; }; then
6219   cf_cv_have___builtin_va_copy=yes
6220 else
6221@@ -21372,7 +21393,7 @@
6222 fi
6223 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6224 fi
6225-echo "$as_me:21375: result: $cf_cv_have___builtin_va_copy" >&5
6226+echo "$as_me:21396: result: $cf_cv_have___builtin_va_copy" >&5
6227 echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
6228
6229 test "$cf_cv_have___builtin_va_copy" = yes &&
6230@@ -21390,14 +21411,14 @@
6231 	;;
6232
6233 (*)
6234-	echo "$as_me:21393: checking if we can simply copy va_list" >&5
6235+	echo "$as_me:21414: checking if we can simply copy va_list" >&5
6236 echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
6237 if test "${cf_cv_pointer_va_list+set}" = set; then
6238   echo $ECHO_N "(cached) $ECHO_C" >&6
6239 else
6240
6241 cat >conftest.$ac_ext <<_ACEOF
6242-#line 21400 "configure"
6243+#line 21421 "configure"
6244 #include "confdefs.h"
6245
6246 #include <stdarg.h>
6247@@ -21414,16 +21435,16 @@
6248 }
6249 _ACEOF
6250 rm -f conftest.$ac_objext conftest$ac_exeext
6251-if { (eval echo "$as_me:21417: \"$ac_link\"") >&5
6252+if { (eval echo "$as_me:21438: \"$ac_link\"") >&5
6253   (eval $ac_link) 2>&5
6254   ac_status=$?
6255-  echo "$as_me:21420: \$? = $ac_status" >&5
6256+  echo "$as_me:21441: \$? = $ac_status" >&5
6257   (exit $ac_status); } &&
6258          { ac_try='test -s conftest$ac_exeext'
6259-  { (eval echo "$as_me:21423: \"$ac_try\"") >&5
6260+  { (eval echo "$as_me:21444: \"$ac_try\"") >&5
6261   (eval $ac_try) 2>&5
6262   ac_status=$?
6263-  echo "$as_me:21426: \$? = $ac_status" >&5
6264+  echo "$as_me:21447: \$? = $ac_status" >&5
6265   (exit $ac_status); }; }; then
6266   cf_cv_pointer_va_list=yes
6267 else
6268@@ -21433,19 +21454,19 @@
6269 fi
6270 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6271 fi
6272-echo "$as_me:21436: result: $cf_cv_pointer_va_list" >&5
6273+echo "$as_me:21457: result: $cf_cv_pointer_va_list" >&5
6274 echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
6275
6276 	if test "$cf_cv_pointer_va_list" = no
6277 	then
6278-		echo "$as_me:21441: checking if we can copy va_list indirectly" >&5
6279+		echo "$as_me:21462: checking if we can copy va_list indirectly" >&5
6280 echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
6281 if test "${cf_cv_array_va_list+set}" = set; then
6282   echo $ECHO_N "(cached) $ECHO_C" >&6
6283 else
6284
6285 cat >conftest.$ac_ext <<_ACEOF
6286-#line 21448 "configure"
6287+#line 21469 "configure"
6288 #include "confdefs.h"
6289
6290 #include <stdarg.h>
6291@@ -21462,16 +21483,16 @@
6292 }
6293 _ACEOF
6294 rm -f conftest.$ac_objext conftest$ac_exeext
6295-if { (eval echo "$as_me:21465: \"$ac_link\"") >&5
6296+if { (eval echo "$as_me:21486: \"$ac_link\"") >&5
6297   (eval $ac_link) 2>&5
6298   ac_status=$?
6299-  echo "$as_me:21468: \$? = $ac_status" >&5
6300+  echo "$as_me:21489: \$? = $ac_status" >&5
6301   (exit $ac_status); } &&
6302          { ac_try='test -s conftest$ac_exeext'
6303-  { (eval echo "$as_me:21471: \"$ac_try\"") >&5
6304+  { (eval echo "$as_me:21492: \"$ac_try\"") >&5
6305   (eval $ac_try) 2>&5
6306   ac_status=$?
6307-  echo "$as_me:21474: \$? = $ac_status" >&5
6308+  echo "$as_me:21495: \$? = $ac_status" >&5
6309   (exit $ac_status); }; }; then
6310   cf_cv_array_va_list=yes
6311 else
6312@@ -21481,7 +21502,7 @@
6313 fi
6314 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6315 fi
6316-echo "$as_me:21484: result: $cf_cv_array_va_list" >&5
6317+echo "$as_me:21505: result: $cf_cv_array_va_list" >&5
6318 echo "${ECHO_T}$cf_cv_array_va_list" >&6
6319 		test "$cf_cv_array_va_list" = yes &&
6320 cat >>confdefs.h <<\EOF
6321@@ -21492,13 +21513,13 @@
6322 	;;
6323 esac
6324
6325-echo "$as_me:21495: checking for pid_t" >&5
6326+echo "$as_me:21516: checking for pid_t" >&5
6327 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
6328 if test "${ac_cv_type_pid_t+set}" = set; then
6329   echo $ECHO_N "(cached) $ECHO_C" >&6
6330 else
6331   cat >conftest.$ac_ext <<_ACEOF
6332-#line 21501 "configure"
6333+#line 21522 "configure"
6334 #include "confdefs.h"
6335 $ac_includes_default
6336 int
6337@@ -21513,16 +21534,16 @@
6338 }
6339 _ACEOF
6340 rm -f conftest.$ac_objext
6341-if { (eval echo "$as_me:21516: \"$ac_compile\"") >&5
6342+if { (eval echo "$as_me:21537: \"$ac_compile\"") >&5
6343   (eval $ac_compile) 2>&5
6344   ac_status=$?
6345-  echo "$as_me:21519: \$? = $ac_status" >&5
6346+  echo "$as_me:21540: \$? = $ac_status" >&5
6347   (exit $ac_status); } &&
6348          { ac_try='test -s conftest.$ac_objext'
6349-  { (eval echo "$as_me:21522: \"$ac_try\"") >&5
6350+  { (eval echo "$as_me:21543: \"$ac_try\"") >&5
6351   (eval $ac_try) 2>&5
6352   ac_status=$?
6353-  echo "$as_me:21525: \$? = $ac_status" >&5
6354+  echo "$as_me:21546: \$? = $ac_status" >&5
6355   (exit $ac_status); }; }; then
6356   ac_cv_type_pid_t=yes
6357 else
6358@@ -21532,7 +21553,7 @@
6359 fi
6360 rm -f conftest.$ac_objext conftest.$ac_ext
6361 fi
6362-echo "$as_me:21535: result: $ac_cv_type_pid_t" >&5
6363+echo "$as_me:21556: result: $ac_cv_type_pid_t" >&5
6364 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
6365 if test $ac_cv_type_pid_t = yes; then
6366   :
6367@@ -21547,23 +21568,23 @@
6368 for ac_header in unistd.h vfork.h
6369 do
6370 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
6371-echo "$as_me:21550: checking for $ac_header" >&5
6372+echo "$as_me:21571: checking for $ac_header" >&5
6373 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
6374 if eval "test \"\${$as_ac_Header+set}\" = set"; then
6375   echo $ECHO_N "(cached) $ECHO_C" >&6
6376 else
6377   cat >conftest.$ac_ext <<_ACEOF
6378-#line 21556 "configure"
6379+#line 21577 "configure"
6380 #include "confdefs.h"
6381 #include <$ac_header>
6382 _ACEOF
6383-if { (eval echo "$as_me:21560: \"$ac_cpp conftest.$ac_ext\"") >&5
6384+if { (eval echo "$as_me:21581: \"$ac_cpp conftest.$ac_ext\"") >&5
6385   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
6386   ac_status=$?
6387   egrep -v '^ *\+' conftest.er1 >conftest.err
6388   rm -f conftest.er1
6389   cat conftest.err >&5
6390-  echo "$as_me:21566: \$? = $ac_status" >&5
6391+  echo "$as_me:21587: \$? = $ac_status" >&5
6392   (exit $ac_status); } >/dev/null; then
6393   if test -s conftest.err; then
6394     ac_cpp_err=$ac_c_preproc_warn_flag
6395@@ -21582,7 +21603,7 @@
6396 fi
6397 rm -f conftest.err conftest.$ac_ext
6398 fi
6399-echo "$as_me:21585: result: `eval echo '${'$as_ac_Header'}'`" >&5
6400+echo "$as_me:21606: result: `eval echo '${'$as_ac_Header'}'`" >&5
6401 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
6402 if test `eval echo '${'$as_ac_Header'}'` = yes; then
6403   cat >>confdefs.h <<EOF
6404@@ -21595,13 +21616,13 @@
6405 for ac_func in fork vfork
6406 do
6407 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
6408-echo "$as_me:21598: checking for $ac_func" >&5
6409+echo "$as_me:21619: checking for $ac_func" >&5
6410 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
6411 if eval "test \"\${$as_ac_var+set}\" = set"; then
6412   echo $ECHO_N "(cached) $ECHO_C" >&6
6413 else
6414   cat >conftest.$ac_ext <<_ACEOF
6415-#line 21604 "configure"
6416+#line 21625 "configure"
6417 #include "confdefs.h"
6418 #define $ac_func autoconf_temporary
6419 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
6420@@ -21632,16 +21653,16 @@
6421 }
6422 _ACEOF
6423 rm -f conftest.$ac_objext conftest$ac_exeext
6424-if { (eval echo "$as_me:21635: \"$ac_link\"") >&5
6425+if { (eval echo "$as_me:21656: \"$ac_link\"") >&5
6426   (eval $ac_link) 2>&5
6427   ac_status=$?
6428-  echo "$as_me:21638: \$? = $ac_status" >&5
6429+  echo "$as_me:21659: \$? = $ac_status" >&5
6430   (exit $ac_status); } &&
6431          { ac_try='test -s conftest$ac_exeext'
6432-  { (eval echo "$as_me:21641: \"$ac_try\"") >&5
6433+  { (eval echo "$as_me:21662: \"$ac_try\"") >&5
6434   (eval $ac_try) 2>&5
6435   ac_status=$?
6436-  echo "$as_me:21644: \$? = $ac_status" >&5
6437+  echo "$as_me:21665: \$? = $ac_status" >&5
6438   (exit $ac_status); }; }; then
6439   eval "$as_ac_var=yes"
6440 else
6441@@ -21651,7 +21672,7 @@
6442 fi
6443 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6444 fi
6445-echo "$as_me:21654: result: `eval echo '${'$as_ac_var'}'`" >&5
6446+echo "$as_me:21675: result: `eval echo '${'$as_ac_var'}'`" >&5
6447 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
6448 if test `eval echo '${'$as_ac_var'}'` = yes; then
6449   cat >>confdefs.h <<EOF
6450@@ -21663,7 +21684,7 @@
6451
6452 ac_cv_func_fork_works=$ac_cv_func_fork
6453 if test "x$ac_cv_func_fork" = xyes; then
6454-  echo "$as_me:21666: checking for working fork" >&5
6455+  echo "$as_me:21687: checking for working fork" >&5
6456 echo $ECHO_N "checking for working fork... $ECHO_C" >&6
6457 if test "${ac_cv_func_fork_works+set}" = set; then
6458   echo $ECHO_N "(cached) $ECHO_C" >&6
6459@@ -21686,15 +21707,15 @@
6460       }
6461 _ACEOF
6462 rm -f conftest$ac_exeext
6463-if { (eval echo "$as_me:21689: \"$ac_link\"") >&5
6464+if { (eval echo "$as_me:21710: \"$ac_link\"") >&5
6465   (eval $ac_link) 2>&5
6466   ac_status=$?
6467-  echo "$as_me:21692: \$? = $ac_status" >&5
6468+  echo "$as_me:21713: \$? = $ac_status" >&5
6469   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
6470-  { (eval echo "$as_me:21694: \"$ac_try\"") >&5
6471+  { (eval echo "$as_me:21715: \"$ac_try\"") >&5
6472   (eval $ac_try) 2>&5
6473   ac_status=$?
6474-  echo "$as_me:21697: \$? = $ac_status" >&5
6475+  echo "$as_me:21718: \$? = $ac_status" >&5
6476   (exit $ac_status); }; }; then
6477   ac_cv_func_fork_works=yes
6478 else
6479@@ -21706,7 +21727,7 @@
6480 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
6481 fi
6482 fi
6483-echo "$as_me:21709: result: $ac_cv_func_fork_works" >&5
6484+echo "$as_me:21730: result: $ac_cv_func_fork_works" >&5
6485 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
6486
6487 fi
6488@@ -21720,12 +21741,12 @@
6489       ac_cv_func_fork_works=yes
6490       ;;
6491   esac
6492-  { echo "$as_me:21723: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
6493+  { echo "$as_me:21744: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
6494 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
6495 fi
6496 ac_cv_func_vfork_works=$ac_cv_func_vfork
6497 if test "x$ac_cv_func_vfork" = xyes; then
6498-  echo "$as_me:21728: checking for working vfork" >&5
6499+  echo "$as_me:21749: checking for working vfork" >&5
6500 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
6501 if test "${ac_cv_func_vfork_works+set}" = set; then
6502   echo $ECHO_N "(cached) $ECHO_C" >&6
6503@@ -21734,7 +21755,7 @@
6504   ac_cv_func_vfork_works=cross
6505 else
6506   cat >conftest.$ac_ext <<_ACEOF
6507-#line 21737 "configure"
6508+#line 21758 "configure"
6509 #include "confdefs.h"
6510 /* Thanks to Paul Eggert for this test.  */
6511 #include <stdio.h>
6512@@ -21831,15 +21852,15 @@
6513 }
6514 _ACEOF
6515 rm -f conftest$ac_exeext
6516-if { (eval echo "$as_me:21834: \"$ac_link\"") >&5
6517+if { (eval echo "$as_me:21855: \"$ac_link\"") >&5
6518   (eval $ac_link) 2>&5
6519   ac_status=$?
6520-  echo "$as_me:21837: \$? = $ac_status" >&5
6521+  echo "$as_me:21858: \$? = $ac_status" >&5
6522   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
6523-  { (eval echo "$as_me:21839: \"$ac_try\"") >&5
6524+  { (eval echo "$as_me:21860: \"$ac_try\"") >&5
6525   (eval $ac_try) 2>&5
6526   ac_status=$?
6527-  echo "$as_me:21842: \$? = $ac_status" >&5
6528+  echo "$as_me:21863: \$? = $ac_status" >&5
6529   (exit $ac_status); }; }; then
6530   ac_cv_func_vfork_works=yes
6531 else
6532@@ -21851,13 +21872,13 @@
6533 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
6534 fi
6535 fi
6536-echo "$as_me:21854: result: $ac_cv_func_vfork_works" >&5
6537+echo "$as_me:21875: result: $ac_cv_func_vfork_works" >&5
6538 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
6539
6540 fi;
6541 if test "x$ac_cv_func_fork_works" = xcross; then
6542   ac_cv_func_vfork_works=ac_cv_func_vfork
6543-  { echo "$as_me:21860: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
6544+  { echo "$as_me:21881: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
6545 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
6546 fi
6547
6548@@ -21882,7 +21903,7 @@
6549
6550 fi
6551
6552-echo "$as_me:21885: checking if fopen accepts explicit binary mode" >&5
6553+echo "$as_me:21906: checking if fopen accepts explicit binary mode" >&5
6554 echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
6555 if test "${cf_cv_fopen_bin_r+set}" = set; then
6556   echo $ECHO_N "(cached) $ECHO_C" >&6
6557@@ -21892,7 +21913,7 @@
6558   cf_cv_fopen_bin_r=unknown
6559 else
6560   cat >conftest.$ac_ext <<_ACEOF
6561-#line 21895 "configure"
6562+#line 21916 "configure"
6563 #include "confdefs.h"
6564
6565 #include <stdio.h>
6566@@ -21925,15 +21946,15 @@
6567
6568 _ACEOF
6569 rm -f conftest$ac_exeext
6570-if { (eval echo "$as_me:21928: \"$ac_link\"") >&5
6571+if { (eval echo "$as_me:21949: \"$ac_link\"") >&5
6572   (eval $ac_link) 2>&5
6573   ac_status=$?
6574-  echo "$as_me:21931: \$? = $ac_status" >&5
6575+  echo "$as_me:21952: \$? = $ac_status" >&5
6576   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
6577-  { (eval echo "$as_me:21933: \"$ac_try\"") >&5
6578+  { (eval echo "$as_me:21954: \"$ac_try\"") >&5
6579   (eval $ac_try) 2>&5
6580   ac_status=$?
6581-  echo "$as_me:21936: \$? = $ac_status" >&5
6582+  echo "$as_me:21957: \$? = $ac_status" >&5
6583   (exit $ac_status); }; }; then
6584   cf_cv_fopen_bin_r=yes
6585 else
6586@@ -21946,7 +21967,7 @@
6587 fi
6588
6589 fi
6590-echo "$as_me:21949: result: $cf_cv_fopen_bin_r" >&5
6591+echo "$as_me:21970: result: $cf_cv_fopen_bin_r" >&5
6592 echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
6593 test "x$cf_cv_fopen_bin_r" != xno &&
6594 cat >>confdefs.h <<\EOF
6595@@ -21955,7 +21976,7 @@
6596
6597 # special check for test/ditto.c
6598
6599-echo "$as_me:21958: checking for openpty in -lutil" >&5
6600+echo "$as_me:21979: checking for openpty in -lutil" >&5
6601 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
6602 if test "${ac_cv_lib_util_openpty+set}" = set; then
6603   echo $ECHO_N "(cached) $ECHO_C" >&6
6604@@ -21963,7 +21984,7 @@
6605   ac_check_lib_save_LIBS=$LIBS
6606 LIBS="-lutil  $LIBS"
6607 cat >conftest.$ac_ext <<_ACEOF
6608-#line 21966 "configure"
6609+#line 21987 "configure"
6610 #include "confdefs.h"
6611
6612 /* Override any gcc2 internal prototype to avoid an error.  */
6613@@ -21982,16 +22003,16 @@
6614 }
6615 _ACEOF
6616 rm -f conftest.$ac_objext conftest$ac_exeext
6617-if { (eval echo "$as_me:21985: \"$ac_link\"") >&5
6618+if { (eval echo "$as_me:22006: \"$ac_link\"") >&5
6619   (eval $ac_link) 2>&5
6620   ac_status=$?
6621-  echo "$as_me:21988: \$? = $ac_status" >&5
6622+  echo "$as_me:22009: \$? = $ac_status" >&5
6623   (exit $ac_status); } &&
6624          { ac_try='test -s conftest$ac_exeext'
6625-  { (eval echo "$as_me:21991: \"$ac_try\"") >&5
6626+  { (eval echo "$as_me:22012: \"$ac_try\"") >&5
6627   (eval $ac_try) 2>&5
6628   ac_status=$?
6629-  echo "$as_me:21994: \$? = $ac_status" >&5
6630+  echo "$as_me:22015: \$? = $ac_status" >&5
6631   (exit $ac_status); }; }; then
6632   ac_cv_lib_util_openpty=yes
6633 else
6634@@ -22002,7 +22023,7 @@
6635 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6636 LIBS=$ac_check_lib_save_LIBS
6637 fi
6638-echo "$as_me:22005: result: $ac_cv_lib_util_openpty" >&5
6639+echo "$as_me:22026: result: $ac_cv_lib_util_openpty" >&5
6640 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
6641 if test $ac_cv_lib_util_openpty = yes; then
6642   cf_cv_lib_util=yes
6643@@ -22010,7 +22031,7 @@
6644   cf_cv_lib_util=no
6645 fi
6646
6647-echo "$as_me:22013: checking for openpty header" >&5
6648+echo "$as_me:22034: checking for openpty header" >&5
6649 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
6650 if test "${cf_cv_func_openpty+set}" = set; then
6651   echo $ECHO_N "(cached) $ECHO_C" >&6
6652@@ -22037,7 +22058,7 @@
6653 	for cf_header in pty.h libutil.h util.h
6654 	do
6655 	cat >conftest.$ac_ext <<_ACEOF
6656-#line 22040 "configure"
6657+#line 22061 "configure"
6658 #include "confdefs.h"
6659
6660 #include <$cf_header>
6661@@ -22054,16 +22075,16 @@
6662 }
6663 _ACEOF
6664 rm -f conftest.$ac_objext conftest$ac_exeext
6665-if { (eval echo "$as_me:22057: \"$ac_link\"") >&5
6666+if { (eval echo "$as_me:22078: \"$ac_link\"") >&5
6667   (eval $ac_link) 2>&5
6668   ac_status=$?
6669-  echo "$as_me:22060: \$? = $ac_status" >&5
6670+  echo "$as_me:22081: \$? = $ac_status" >&5
6671   (exit $ac_status); } &&
6672          { ac_try='test -s conftest$ac_exeext'
6673-  { (eval echo "$as_me:22063: \"$ac_try\"") >&5
6674+  { (eval echo "$as_me:22084: \"$ac_try\"") >&5
6675   (eval $ac_try) 2>&5
6676   ac_status=$?
6677-  echo "$as_me:22066: \$? = $ac_status" >&5
6678+  echo "$as_me:22087: \$? = $ac_status" >&5
6679   (exit $ac_status); }; }; then
6680
6681 		cf_cv_func_openpty=$cf_header
6682@@ -22081,7 +22102,7 @@
6683 	LIBS="$cf_save_LIBS"
6684
6685 fi
6686-echo "$as_me:22084: result: $cf_cv_func_openpty" >&5
6687+echo "$as_me:22105: result: $cf_cv_func_openpty" >&5
6688 echo "${ECHO_T}$cf_cv_func_openpty" >&6
6689
6690 if test "$cf_cv_func_openpty" != no ; then
6691@@ -22154,7 +22175,7 @@
6692 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
6693
6694 			  cat >conftest.$ac_ext <<_ACEOF
6695-#line 22157 "configure"
6696+#line 22178 "configure"
6697 #include "confdefs.h"
6698 #include <stdio.h>
6699 int
6700@@ -22166,16 +22187,16 @@
6701 }
6702 _ACEOF
6703 rm -f conftest.$ac_objext
6704-if { (eval echo "$as_me:22169: \"$ac_compile\"") >&5
6705+if { (eval echo "$as_me:22190: \"$ac_compile\"") >&5
6706   (eval $ac_compile) 2>&5
6707   ac_status=$?
6708-  echo "$as_me:22172: \$? = $ac_status" >&5
6709+  echo "$as_me:22193: \$? = $ac_status" >&5
6710   (exit $ac_status); } &&
6711          { ac_try='test -s conftest.$ac_objext'
6712-  { (eval echo "$as_me:22175: \"$ac_try\"") >&5
6713+  { (eval echo "$as_me:22196: \"$ac_try\"") >&5
6714   (eval $ac_try) 2>&5
6715   ac_status=$?
6716-  echo "$as_me:22178: \$? = $ac_status" >&5
6717+  echo "$as_me:22199: \$? = $ac_status" >&5
6718   (exit $ac_status); }; }; then
6719   :
6720 else
6721@@ -22192,7 +22213,7 @@
6722 		if test "$cf_have_incdir" = no ; then
6723 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
6724
6725-echo "${as_me:-configure}:22195: testing adding $cf_add_incdir to include-path ..." 1>&5
6726+echo "${as_me:-configure}:22216: testing adding $cf_add_incdir to include-path ..." 1>&5
6727
6728 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
6729
6730@@ -22228,7 +22249,7 @@
6731 			if test "$cf_have_libdir" = no ; then
6732 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
6733
6734-echo "${as_me:-configure}:22231: testing adding $cf_add_libdir to library-path ..." 1>&5
6735+echo "${as_me:-configure}:22252: testing adding $cf_add_libdir to library-path ..." 1>&5
6736
6737 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
6738 			fi
6739@@ -22239,7 +22260,7 @@
6740 	else
6741 		case "$with_hashed_db" in
6742 		(./*|../*|/*)
6743-			{ echo "$as_me:22242: WARNING: no such directory $with_hashed_db" >&5
6744+			{ echo "$as_me:22263: WARNING: no such directory $with_hashed_db" >&5
6745 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
6746 			;;
6747 		(*)
6748@@ -22311,7 +22332,7 @@
6749 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
6750
6751 			  cat >conftest.$ac_ext <<_ACEOF
6752-#line 22314 "configure"
6753+#line 22335 "configure"
6754 #include "confdefs.h"
6755 #include <stdio.h>
6756 int
6757@@ -22323,16 +22344,16 @@
6758 }
6759 _ACEOF
6760 rm -f conftest.$ac_objext
6761-if { (eval echo "$as_me:22326: \"$ac_compile\"") >&5
6762+if { (eval echo "$as_me:22347: \"$ac_compile\"") >&5
6763   (eval $ac_compile) 2>&5
6764   ac_status=$?
6765-  echo "$as_me:22329: \$? = $ac_status" >&5
6766+  echo "$as_me:22350: \$? = $ac_status" >&5
6767   (exit $ac_status); } &&
6768          { ac_try='test -s conftest.$ac_objext'
6769-  { (eval echo "$as_me:22332: \"$ac_try\"") >&5
6770+  { (eval echo "$as_me:22353: \"$ac_try\"") >&5
6771   (eval $ac_try) 2>&5
6772   ac_status=$?
6773-  echo "$as_me:22335: \$? = $ac_status" >&5
6774+  echo "$as_me:22356: \$? = $ac_status" >&5
6775   (exit $ac_status); }; }; then
6776   :
6777 else
6778@@ -22349,7 +22370,7 @@
6779 		if test "$cf_have_incdir" = no ; then
6780 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
6781
6782-echo "${as_me:-configure}:22352: testing adding $cf_add_incdir to include-path ..." 1>&5
6783+echo "${as_me:-configure}:22373: testing adding $cf_add_incdir to include-path ..." 1>&5
6784
6785 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
6786
6787@@ -22429,7 +22450,7 @@
6788 			if test "$cf_have_libdir" = no ; then
6789 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
6790
6791-echo "${as_me:-configure}:22432: testing adding $cf_add_libdir to library-path ..." 1>&5
6792+echo "${as_me:-configure}:22453: testing adding $cf_add_libdir to library-path ..." 1>&5
6793
6794 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
6795 			fi
6796@@ -22446,23 +22467,23 @@
6797 	fi
6798 esac
6799
6800-echo "$as_me:22449: checking for db.h" >&5
6801+echo "$as_me:22470: checking for db.h" >&5
6802 echo $ECHO_N "checking for db.h... $ECHO_C" >&6
6803 if test "${ac_cv_header_db_h+set}" = set; then
6804   echo $ECHO_N "(cached) $ECHO_C" >&6
6805 else
6806   cat >conftest.$ac_ext <<_ACEOF
6807-#line 22455 "configure"
6808+#line 22476 "configure"
6809 #include "confdefs.h"
6810 #include <db.h>
6811 _ACEOF
6812-if { (eval echo "$as_me:22459: \"$ac_cpp conftest.$ac_ext\"") >&5
6813+if { (eval echo "$as_me:22480: \"$ac_cpp conftest.$ac_ext\"") >&5
6814   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
6815   ac_status=$?
6816   egrep -v '^ *\+' conftest.er1 >conftest.err
6817   rm -f conftest.er1
6818   cat conftest.err >&5
6819-  echo "$as_me:22465: \$? = $ac_status" >&5
6820+  echo "$as_me:22486: \$? = $ac_status" >&5
6821   (exit $ac_status); } >/dev/null; then
6822   if test -s conftest.err; then
6823     ac_cpp_err=$ac_c_preproc_warn_flag
6824@@ -22481,11 +22502,11 @@
6825 fi
6826 rm -f conftest.err conftest.$ac_ext
6827 fi
6828-echo "$as_me:22484: result: $ac_cv_header_db_h" >&5
6829+echo "$as_me:22505: result: $ac_cv_header_db_h" >&5
6830 echo "${ECHO_T}$ac_cv_header_db_h" >&6
6831 if test $ac_cv_header_db_h = yes; then
6832
6833-echo "$as_me:22488: checking for version of db" >&5
6834+echo "$as_me:22509: checking for version of db" >&5
6835 echo $ECHO_N "checking for version of db... $ECHO_C" >&6
6836 if test "${cf_cv_hashed_db_version+set}" = set; then
6837   echo $ECHO_N "(cached) $ECHO_C" >&6
6838@@ -22496,10 +22517,10 @@
6839 for cf_db_version in 1 2 3 4 5 6
6840 do
6841
6842-echo "${as_me:-configure}:22499: testing checking for db version $cf_db_version ..." 1>&5
6843+echo "${as_me:-configure}:22520: testing checking for db version $cf_db_version ..." 1>&5
6844
6845 	cat >conftest.$ac_ext <<_ACEOF
6846-#line 22502 "configure"
6847+#line 22523 "configure"
6848 #include "confdefs.h"
6849
6850 $ac_includes_default
6851@@ -22529,16 +22550,16 @@
6852 }
6853 _ACEOF
6854 rm -f conftest.$ac_objext
6855-if { (eval echo "$as_me:22532: \"$ac_compile\"") >&5
6856+if { (eval echo "$as_me:22553: \"$ac_compile\"") >&5
6857   (eval $ac_compile) 2>&5
6858   ac_status=$?
6859-  echo "$as_me:22535: \$? = $ac_status" >&5
6860+  echo "$as_me:22556: \$? = $ac_status" >&5
6861   (exit $ac_status); } &&
6862          { ac_try='test -s conftest.$ac_objext'
6863-  { (eval echo "$as_me:22538: \"$ac_try\"") >&5
6864+  { (eval echo "$as_me:22559: \"$ac_try\"") >&5
6865   (eval $ac_try) 2>&5
6866   ac_status=$?
6867-  echo "$as_me:22541: \$? = $ac_status" >&5
6868+  echo "$as_me:22562: \$? = $ac_status" >&5
6869   (exit $ac_status); }; }; then
6870
6871 	cf_cv_hashed_db_version=$cf_db_version
6872@@ -22552,16 +22573,16 @@
6873 done
6874
6875 fi
6876-echo "$as_me:22555: result: $cf_cv_hashed_db_version" >&5
6877+echo "$as_me:22576: result: $cf_cv_hashed_db_version" >&5
6878 echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
6879
6880 if test "$cf_cv_hashed_db_version" = unknown ; then
6881-	{ { echo "$as_me:22559: error: Cannot determine version of db" >&5
6882+	{ { echo "$as_me:22580: error: Cannot determine version of db" >&5
6883 echo "$as_me: error: Cannot determine version of db" >&2;}
6884    { (exit 1); exit 1; }; }
6885 else
6886
6887-echo "$as_me:22564: checking for db libraries" >&5
6888+echo "$as_me:22585: checking for db libraries" >&5
6889 echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
6890 if test "${cf_cv_hashed_db_libs+set}" = set; then
6891   echo $ECHO_N "(cached) $ECHO_C" >&6
6892@@ -22591,10 +22612,10 @@
6893
6894 	fi
6895
6896-echo "${as_me:-configure}:22594: testing checking for library "$cf_db_libs" ..." 1>&5
6897+echo "${as_me:-configure}:22615: testing checking for library "$cf_db_libs" ..." 1>&5
6898
6899 	cat >conftest.$ac_ext <<_ACEOF
6900-#line 22597 "configure"
6901+#line 22618 "configure"
6902 #include "confdefs.h"
6903
6904 $ac_includes_default
6905@@ -22649,16 +22670,16 @@
6906 }
6907 _ACEOF
6908 rm -f conftest.$ac_objext conftest$ac_exeext
6909-if { (eval echo "$as_me:22652: \"$ac_link\"") >&5
6910+if { (eval echo "$as_me:22673: \"$ac_link\"") >&5
6911   (eval $ac_link) 2>&5
6912   ac_status=$?
6913-  echo "$as_me:22655: \$? = $ac_status" >&5
6914+  echo "$as_me:22676: \$? = $ac_status" >&5
6915   (exit $ac_status); } &&
6916          { ac_try='test -s conftest$ac_exeext'
6917-  { (eval echo "$as_me:22658: \"$ac_try\"") >&5
6918+  { (eval echo "$as_me:22679: \"$ac_try\"") >&5
6919   (eval $ac_try) 2>&5
6920   ac_status=$?
6921-  echo "$as_me:22661: \$? = $ac_status" >&5
6922+  echo "$as_me:22682: \$? = $ac_status" >&5
6923   (exit $ac_status); }; }; then
6924
6925 	if test -n "$cf_db_libs" ; then
6926@@ -22678,11 +22699,11 @@
6927 done
6928
6929 fi
6930-echo "$as_me:22681: result: $cf_cv_hashed_db_libs" >&5
6931+echo "$as_me:22702: result: $cf_cv_hashed_db_libs" >&5
6932 echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
6933
6934 	if test "$cf_cv_hashed_db_libs" = unknown ; then
6935-		{ { echo "$as_me:22685: error: Cannot determine library for db" >&5
6936+		{ { echo "$as_me:22706: error: Cannot determine library for db" >&5
6937 echo "$as_me: error: Cannot determine library for db" >&2;}
6938    { (exit 1); exit 1; }; }
6939 	elif test "$cf_cv_hashed_db_libs" != default ; then
6940@@ -22708,7 +22729,7 @@
6941
6942 else
6943
6944-	{ { echo "$as_me:22711: error: Cannot find db.h" >&5
6945+	{ { echo "$as_me:22732: error: Cannot find db.h" >&5
6946 echo "$as_me: error: Cannot find db.h" >&2;}
6947    { (exit 1); exit 1; }; }
6948
6949@@ -22723,7 +22744,7 @@
6950
6951 # Just in case, check if the C compiler has a bool type.
6952
6953-echo "$as_me:22726: checking if we should include stdbool.h" >&5
6954+echo "$as_me:22747: checking if we should include stdbool.h" >&5
6955 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
6956
6957 if test "${cf_cv_header_stdbool_h+set}" = set; then
6958@@ -22731,7 +22752,7 @@
6959 else
6960
6961 	cat >conftest.$ac_ext <<_ACEOF
6962-#line 22734 "configure"
6963+#line 22755 "configure"
6964 #include "confdefs.h"
6965
6966 int
6967@@ -22743,23 +22764,23 @@
6968 }
6969 _ACEOF
6970 rm -f conftest.$ac_objext
6971-if { (eval echo "$as_me:22746: \"$ac_compile\"") >&5
6972+if { (eval echo "$as_me:22767: \"$ac_compile\"") >&5
6973   (eval $ac_compile) 2>&5
6974   ac_status=$?
6975-  echo "$as_me:22749: \$? = $ac_status" >&5
6976+  echo "$as_me:22770: \$? = $ac_status" >&5
6977   (exit $ac_status); } &&
6978          { ac_try='test -s conftest.$ac_objext'
6979-  { (eval echo "$as_me:22752: \"$ac_try\"") >&5
6980+  { (eval echo "$as_me:22773: \"$ac_try\"") >&5
6981   (eval $ac_try) 2>&5
6982   ac_status=$?
6983-  echo "$as_me:22755: \$? = $ac_status" >&5
6984+  echo "$as_me:22776: \$? = $ac_status" >&5
6985   (exit $ac_status); }; }; then
6986   cf_cv_header_stdbool_h=0
6987 else
6988   echo "$as_me: failed program was:" >&5
6989 cat conftest.$ac_ext >&5
6990 cat >conftest.$ac_ext <<_ACEOF
6991-#line 22762 "configure"
6992+#line 22783 "configure"
6993 #include "confdefs.h"
6994
6995 #ifndef __BEOS__
6996@@ -22775,16 +22796,16 @@
6997 }
6998 _ACEOF
6999 rm -f conftest.$ac_objext
7000-if { (eval echo "$as_me:22778: \"$ac_compile\"") >&5
7001+if { (eval echo "$as_me:22799: \"$ac_compile\"") >&5
7002   (eval $ac_compile) 2>&5
7003   ac_status=$?
7004-  echo "$as_me:22781: \$? = $ac_status" >&5
7005+  echo "$as_me:22802: \$? = $ac_status" >&5
7006   (exit $ac_status); } &&
7007          { ac_try='test -s conftest.$ac_objext'
7008-  { (eval echo "$as_me:22784: \"$ac_try\"") >&5
7009+  { (eval echo "$as_me:22805: \"$ac_try\"") >&5
7010   (eval $ac_try) 2>&5
7011   ac_status=$?
7012-  echo "$as_me:22787: \$? = $ac_status" >&5
7013+  echo "$as_me:22808: \$? = $ac_status" >&5
7014   (exit $ac_status); }; }; then
7015   cf_cv_header_stdbool_h=1
7016 else
7017@@ -22798,13 +22819,13 @@
7018 fi
7019
7020 if test "$cf_cv_header_stdbool_h" = 1
7021-then	echo "$as_me:22801: result: yes" >&5
7022+then	echo "$as_me:22822: result: yes" >&5
7023 echo "${ECHO_T}yes" >&6
7024-else	echo "$as_me:22803: result: no" >&5
7025+else	echo "$as_me:22824: result: no" >&5
7026 echo "${ECHO_T}no" >&6
7027 fi
7028
7029-echo "$as_me:22807: checking for builtin bool type" >&5
7030+echo "$as_me:22828: checking for builtin bool type" >&5
7031 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
7032
7033 if test "${cf_cv_cc_bool_type+set}" = set; then
7034@@ -22812,7 +22833,7 @@
7035 else
7036
7037 	cat >conftest.$ac_ext <<_ACEOF
7038-#line 22815 "configure"
7039+#line 22836 "configure"
7040 #include "confdefs.h"
7041
7042 #include <stdio.h>
7043@@ -22827,16 +22848,16 @@
7044 }
7045 _ACEOF
7046 rm -f conftest.$ac_objext
7047-if { (eval echo "$as_me:22830: \"$ac_compile\"") >&5
7048+if { (eval echo "$as_me:22851: \"$ac_compile\"") >&5
7049   (eval $ac_compile) 2>&5
7050   ac_status=$?
7051-  echo "$as_me:22833: \$? = $ac_status" >&5
7052+  echo "$as_me:22854: \$? = $ac_status" >&5
7053   (exit $ac_status); } &&
7054          { ac_try='test -s conftest.$ac_objext'
7055-  { (eval echo "$as_me:22836: \"$ac_try\"") >&5
7056+  { (eval echo "$as_me:22857: \"$ac_try\"") >&5
7057   (eval $ac_try) 2>&5
7058   ac_status=$?
7059-  echo "$as_me:22839: \$? = $ac_status" >&5
7060+  echo "$as_me:22860: \$? = $ac_status" >&5
7061   (exit $ac_status); }; }; then
7062   cf_cv_cc_bool_type=1
7063 else
7064@@ -22849,9 +22870,9 @@
7065 fi
7066
7067 if test "$cf_cv_cc_bool_type" = 1
7068-then	echo "$as_me:22852: result: yes" >&5
7069+then	echo "$as_me:22873: result: yes" >&5
7070 echo "${ECHO_T}yes" >&6
7071-else	echo "$as_me:22854: result: no" >&5
7072+else	echo "$as_me:22875: result: no" >&5
7073 echo "${ECHO_T}no" >&6
7074 fi
7075
7076@@ -22868,10 +22889,10 @@
7077
7078 	cf_save="$LIBS"
7079 	LIBS="$LIBS $CXXLIBS"
7080-	echo "$as_me:22871: checking if we already have C++ library" >&5
7081+	echo "$as_me:22892: checking if we already have C++ library" >&5
7082 echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
7083 	cat >conftest.$ac_ext <<_ACEOF
7084-#line 22874 "configure"
7085+#line 22895 "configure"
7086 #include "confdefs.h"
7087
7088 			#include <iostream>
7089@@ -22885,16 +22906,16 @@
7090 }
7091 _ACEOF
7092 rm -f conftest.$ac_objext conftest$ac_exeext
7093-if { (eval echo "$as_me:22888: \"$ac_link\"") >&5
7094+if { (eval echo "$as_me:22909: \"$ac_link\"") >&5
7095   (eval $ac_link) 2>&5
7096   ac_status=$?
7097-  echo "$as_me:22891: \$? = $ac_status" >&5
7098+  echo "$as_me:22912: \$? = $ac_status" >&5
7099   (exit $ac_status); } &&
7100          { ac_try='test -s conftest$ac_exeext'
7101-  { (eval echo "$as_me:22894: \"$ac_try\"") >&5
7102+  { (eval echo "$as_me:22915: \"$ac_try\"") >&5
7103   (eval $ac_try) 2>&5
7104   ac_status=$?
7105-  echo "$as_me:22897: \$? = $ac_status" >&5
7106+  echo "$as_me:22918: \$? = $ac_status" >&5
7107   (exit $ac_status); }; }; then
7108   cf_have_libstdcpp=yes
7109 else
7110@@ -22903,7 +22924,7 @@
7111 cf_have_libstdcpp=no
7112 fi
7113 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
7114-	echo "$as_me:22906: result: $cf_have_libstdcpp" >&5
7115+	echo "$as_me:22927: result: $cf_have_libstdcpp" >&5
7116 echo "${ECHO_T}$cf_have_libstdcpp" >&6
7117 	LIBS="$cf_save"
7118
7119@@ -22922,7 +22943,7 @@
7120 			;;
7121 		esac
7122
7123-		echo "$as_me:22925: checking for library $cf_stdcpp_libname" >&5
7124+		echo "$as_me:22946: checking for library $cf_stdcpp_libname" >&5
7125 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
7126 if test "${cf_cv_libstdcpp+set}" = set; then
7127   echo $ECHO_N "(cached) $ECHO_C" >&6
7128@@ -22948,7 +22969,7 @@
7129 LIBS="$cf_add_libs"
7130
7131 		cat >conftest.$ac_ext <<_ACEOF
7132-#line 22951 "configure"
7133+#line 22972 "configure"
7134 #include "confdefs.h"
7135
7136 				#include <iostream>
7137@@ -22962,16 +22983,16 @@
7138 }
7139 _ACEOF
7140 rm -f conftest.$ac_objext conftest$ac_exeext
7141-if { (eval echo "$as_me:22965: \"$ac_link\"") >&5
7142+if { (eval echo "$as_me:22986: \"$ac_link\"") >&5
7143   (eval $ac_link) 2>&5
7144   ac_status=$?
7145-  echo "$as_me:22968: \$? = $ac_status" >&5
7146+  echo "$as_me:22989: \$? = $ac_status" >&5
7147   (exit $ac_status); } &&
7148          { ac_try='test -s conftest$ac_exeext'
7149-  { (eval echo "$as_me:22971: \"$ac_try\"") >&5
7150+  { (eval echo "$as_me:22992: \"$ac_try\"") >&5
7151   (eval $ac_try) 2>&5
7152   ac_status=$?
7153-  echo "$as_me:22974: \$? = $ac_status" >&5
7154+  echo "$as_me:22995: \$? = $ac_status" >&5
7155   (exit $ac_status); }; }; then
7156   cf_cv_libstdcpp=yes
7157 else
7158@@ -22983,7 +23004,7 @@
7159 			LIBS="$cf_save"
7160
7161 fi
7162-echo "$as_me:22986: result: $cf_cv_libstdcpp" >&5
7163+echo "$as_me:23007: result: $cf_cv_libstdcpp" >&5
7164 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
7165 		test "$cf_cv_libstdcpp" = yes && {
7166 cf_add_libs="$CXXLIBS"
7167@@ -23005,7 +23026,7 @@
7168 	fi
7169 fi
7170
7171-	echo "$as_me:23008: checking whether $CXX understands -c and -o together" >&5
7172+	echo "$as_me:23029: checking whether $CXX understands -c and -o together" >&5
7173 echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
7174 if test "${cf_cv_prog_CXX_c_o+set}" = set; then
7175   echo $ECHO_N "(cached) $ECHO_C" >&6
7176@@ -23020,15 +23041,15 @@
7177 # We do the test twice because some compilers refuse to overwrite an
7178 # existing .o file with -o, though they will create one.
7179 ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
7180-if { (eval echo "$as_me:23023: \"$ac_try\"") >&5
7181+if { (eval echo "$as_me:23044: \"$ac_try\"") >&5
7182   (eval $ac_try) 2>&5
7183   ac_status=$?
7184-  echo "$as_me:23026: \$? = $ac_status" >&5
7185+  echo "$as_me:23047: \$? = $ac_status" >&5
7186   (exit $ac_status); } &&
7187-  test -f conftest2.$ac_objext && { (eval echo "$as_me:23028: \"$ac_try\"") >&5
7188+  test -f conftest2.$ac_objext && { (eval echo "$as_me:23049: \"$ac_try\"") >&5
7189   (eval $ac_try) 2>&5
7190   ac_status=$?
7191-  echo "$as_me:23031: \$? = $ac_status" >&5
7192+  echo "$as_me:23052: \$? = $ac_status" >&5
7193   (exit $ac_status); };
7194 then
7195   eval cf_cv_prog_CXX_c_o=yes
7196@@ -23039,10 +23060,10 @@
7197
7198 fi
7199 if test $cf_cv_prog_CXX_c_o = yes; then
7200-  echo "$as_me:23042: result: yes" >&5
7201+  echo "$as_me:23063: result: yes" >&5
7202 echo "${ECHO_T}yes" >&6
7203 else
7204-  echo "$as_me:23045: result: no" >&5
7205+  echo "$as_me:23066: result: no" >&5
7206 echo "${ECHO_T}no" >&6
7207 fi
7208
7209@@ -23062,7 +23083,7 @@
7210 	;;
7211 esac
7212 if test "$GXX" = yes; then
7213-	echo "$as_me:23065: checking for lib$cf_gpp_libname" >&5
7214+	echo "$as_me:23086: checking for lib$cf_gpp_libname" >&5
7215 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
7216 	cf_save="$LIBS"
7217
7218@@ -23083,7 +23104,7 @@
7219 LIBS="$cf_add_libs"
7220
7221 	cat >conftest.$ac_ext <<_ACEOF
7222-#line 23086 "configure"
7223+#line 23107 "configure"
7224 #include "confdefs.h"
7225
7226 #include <$cf_gpp_libname/builtin.h>
7227@@ -23097,16 +23118,16 @@
7228 }
7229 _ACEOF
7230 rm -f conftest.$ac_objext conftest$ac_exeext
7231-if { (eval echo "$as_me:23100: \"$ac_link\"") >&5
7232+if { (eval echo "$as_me:23121: \"$ac_link\"") >&5
7233   (eval $ac_link) 2>&5
7234   ac_status=$?
7235-  echo "$as_me:23103: \$? = $ac_status" >&5
7236+  echo "$as_me:23124: \$? = $ac_status" >&5
7237   (exit $ac_status); } &&
7238          { ac_try='test -s conftest$ac_exeext'
7239-  { (eval echo "$as_me:23106: \"$ac_try\"") >&5
7240+  { (eval echo "$as_me:23127: \"$ac_try\"") >&5
7241   (eval $ac_try) 2>&5
7242   ac_status=$?
7243-  echo "$as_me:23109: \$? = $ac_status" >&5
7244+  echo "$as_me:23130: \$? = $ac_status" >&5
7245   (exit $ac_status); }; }; then
7246   cf_cxx_library=yes
7247
7248@@ -23143,7 +23164,7 @@
7249   echo "$as_me: failed program was:" >&5
7250 cat conftest.$ac_ext >&5
7251 cat >conftest.$ac_ext <<_ACEOF
7252-#line 23146 "configure"
7253+#line 23167 "configure"
7254 #include "confdefs.h"
7255
7256 #include <builtin.h>
7257@@ -23157,16 +23178,16 @@
7258 }
7259 _ACEOF
7260 rm -f conftest.$ac_objext conftest$ac_exeext
7261-if { (eval echo "$as_me:23160: \"$ac_link\"") >&5
7262+if { (eval echo "$as_me:23181: \"$ac_link\"") >&5
7263   (eval $ac_link) 2>&5
7264   ac_status=$?
7265-  echo "$as_me:23163: \$? = $ac_status" >&5
7266+  echo "$as_me:23184: \$? = $ac_status" >&5
7267   (exit $ac_status); } &&
7268          { ac_try='test -s conftest$ac_exeext'
7269-  { (eval echo "$as_me:23166: \"$ac_try\"") >&5
7270+  { (eval echo "$as_me:23187: \"$ac_try\"") >&5
7271   (eval $ac_try) 2>&5
7272   ac_status=$?
7273-  echo "$as_me:23169: \$? = $ac_status" >&5
7274+  echo "$as_me:23190: \$? = $ac_status" >&5
7275   (exit $ac_status); }; }; then
7276   cf_cxx_library=yes
7277
7278@@ -23199,7 +23220,7 @@
7279 fi
7280 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
7281 	LIBS="$cf_save"
7282-	echo "$as_me:23202: result: $cf_cxx_library" >&5
7283+	echo "$as_me:23223: result: $cf_cxx_library" >&5
7284 echo "${ECHO_T}$cf_cxx_library" >&6
7285 fi
7286
7287@@ -23215,7 +23236,7 @@
7288 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7289 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
7290 ac_main_return=return
7291-echo "$as_me:23218: checking how to run the C++ preprocessor" >&5
7292+echo "$as_me:23239: checking how to run the C++ preprocessor" >&5
7293 echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
7294 if test -z "$CXXCPP"; then
7295   if test "${ac_cv_prog_CXXCPP+set}" = set; then
7296@@ -23232,18 +23253,18 @@
7297   # On the NeXT, cc -E runs the code through the compiler's parser,
7298   # not just through cpp. "Syntax error" is here to catch this case.
7299   cat >conftest.$ac_ext <<_ACEOF
7300-#line 23235 "configure"
7301+#line 23256 "configure"
7302 #include "confdefs.h"
7303 #include <assert.h>
7304                      Syntax error
7305 _ACEOF
7306-if { (eval echo "$as_me:23240: \"$ac_cpp conftest.$ac_ext\"") >&5
7307+if { (eval echo "$as_me:23261: \"$ac_cpp conftest.$ac_ext\"") >&5
7308   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7309   ac_status=$?
7310   egrep -v '^ *\+' conftest.er1 >conftest.err
7311   rm -f conftest.er1
7312   cat conftest.err >&5
7313-  echo "$as_me:23246: \$? = $ac_status" >&5
7314+  echo "$as_me:23267: \$? = $ac_status" >&5
7315   (exit $ac_status); } >/dev/null; then
7316   if test -s conftest.err; then
7317     ac_cpp_err=$ac_cxx_preproc_warn_flag
7318@@ -23266,17 +23287,17 @@
7319   # OK, works on sane cases.  Now check whether non-existent headers
7320   # can be detected and how.
7321   cat >conftest.$ac_ext <<_ACEOF
7322-#line 23269 "configure"
7323+#line 23290 "configure"
7324 #include "confdefs.h"
7325 #include <ac_nonexistent.h>
7326 _ACEOF
7327-if { (eval echo "$as_me:23273: \"$ac_cpp conftest.$ac_ext\"") >&5
7328+if { (eval echo "$as_me:23294: \"$ac_cpp conftest.$ac_ext\"") >&5
7329   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7330   ac_status=$?
7331   egrep -v '^ *\+' conftest.er1 >conftest.err
7332   rm -f conftest.er1
7333   cat conftest.err >&5
7334-  echo "$as_me:23279: \$? = $ac_status" >&5
7335+  echo "$as_me:23300: \$? = $ac_status" >&5
7336   (exit $ac_status); } >/dev/null; then
7337   if test -s conftest.err; then
7338     ac_cpp_err=$ac_cxx_preproc_warn_flag
7339@@ -23313,7 +23334,7 @@
7340 else
7341   ac_cv_prog_CXXCPP=$CXXCPP
7342 fi
7343-echo "$as_me:23316: result: $CXXCPP" >&5
7344+echo "$as_me:23337: result: $CXXCPP" >&5
7345 echo "${ECHO_T}$CXXCPP" >&6
7346 ac_preproc_ok=false
7347 for ac_cxx_preproc_warn_flag in '' yes
7348@@ -23323,18 +23344,18 @@
7349   # On the NeXT, cc -E runs the code through the compiler's parser,
7350   # not just through cpp. "Syntax error" is here to catch this case.
7351   cat >conftest.$ac_ext <<_ACEOF
7352-#line 23326 "configure"
7353+#line 23347 "configure"
7354 #include "confdefs.h"
7355 #include <assert.h>
7356                      Syntax error
7357 _ACEOF
7358-if { (eval echo "$as_me:23331: \"$ac_cpp conftest.$ac_ext\"") >&5
7359+if { (eval echo "$as_me:23352: \"$ac_cpp conftest.$ac_ext\"") >&5
7360   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7361   ac_status=$?
7362   egrep -v '^ *\+' conftest.er1 >conftest.err
7363   rm -f conftest.er1
7364   cat conftest.err >&5
7365-  echo "$as_me:23337: \$? = $ac_status" >&5
7366+  echo "$as_me:23358: \$? = $ac_status" >&5
7367   (exit $ac_status); } >/dev/null; then
7368   if test -s conftest.err; then
7369     ac_cpp_err=$ac_cxx_preproc_warn_flag
7370@@ -23357,17 +23378,17 @@
7371   # OK, works on sane cases.  Now check whether non-existent headers
7372   # can be detected and how.
7373   cat >conftest.$ac_ext <<_ACEOF
7374-#line 23360 "configure"
7375+#line 23381 "configure"
7376 #include "confdefs.h"
7377 #include <ac_nonexistent.h>
7378 _ACEOF
7379-if { (eval echo "$as_me:23364: \"$ac_cpp conftest.$ac_ext\"") >&5
7380+if { (eval echo "$as_me:23385: \"$ac_cpp conftest.$ac_ext\"") >&5
7381   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7382   ac_status=$?
7383   egrep -v '^ *\+' conftest.er1 >conftest.err
7384   rm -f conftest.er1
7385   cat conftest.err >&5
7386-  echo "$as_me:23370: \$? = $ac_status" >&5
7387+  echo "$as_me:23391: \$? = $ac_status" >&5
7388   (exit $ac_status); } >/dev/null; then
7389   if test -s conftest.err; then
7390     ac_cpp_err=$ac_cxx_preproc_warn_flag
7391@@ -23395,7 +23416,7 @@
7392 if $ac_preproc_ok; then
7393   :
7394 else
7395-  { { echo "$as_me:23398: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
7396+  { { echo "$as_me:23419: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
7397 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
7398    { (exit 1); exit 1; }; }
7399 fi
7400@@ -23410,23 +23431,23 @@
7401 for ac_header in typeinfo
7402 do
7403 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
7404-echo "$as_me:23413: checking for $ac_header" >&5
7405+echo "$as_me:23434: checking for $ac_header" >&5
7406 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
7407 if eval "test \"\${$as_ac_Header+set}\" = set"; then
7408   echo $ECHO_N "(cached) $ECHO_C" >&6
7409 else
7410   cat >conftest.$ac_ext <<_ACEOF
7411-#line 23419 "configure"
7412+#line 23440 "configure"
7413 #include "confdefs.h"
7414 #include <$ac_header>
7415 _ACEOF
7416-if { (eval echo "$as_me:23423: \"$ac_cpp conftest.$ac_ext\"") >&5
7417+if { (eval echo "$as_me:23444: \"$ac_cpp conftest.$ac_ext\"") >&5
7418   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7419   ac_status=$?
7420   egrep -v '^ *\+' conftest.er1 >conftest.err
7421   rm -f conftest.er1
7422   cat conftest.err >&5
7423-  echo "$as_me:23429: \$? = $ac_status" >&5
7424+  echo "$as_me:23450: \$? = $ac_status" >&5
7425   (exit $ac_status); } >/dev/null; then
7426   if test -s conftest.err; then
7427     ac_cpp_err=$ac_cxx_preproc_warn_flag
7428@@ -23445,7 +23466,7 @@
7429 fi
7430 rm -f conftest.err conftest.$ac_ext
7431 fi
7432-echo "$as_me:23448: result: `eval echo '${'$as_ac_Header'}'`" >&5
7433+echo "$as_me:23469: result: `eval echo '${'$as_ac_Header'}'`" >&5
7434 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
7435 if test `eval echo '${'$as_ac_Header'}'` = yes; then
7436   cat >>confdefs.h <<EOF
7437@@ -23458,23 +23479,23 @@
7438 for ac_header in iostream
7439 do
7440 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
7441-echo "$as_me:23461: checking for $ac_header" >&5
7442+echo "$as_me:23482: checking for $ac_header" >&5
7443 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
7444 if eval "test \"\${$as_ac_Header+set}\" = set"; then
7445   echo $ECHO_N "(cached) $ECHO_C" >&6
7446 else
7447   cat >conftest.$ac_ext <<_ACEOF
7448-#line 23467 "configure"
7449+#line 23488 "configure"
7450 #include "confdefs.h"
7451 #include <$ac_header>
7452 _ACEOF
7453-if { (eval echo "$as_me:23471: \"$ac_cpp conftest.$ac_ext\"") >&5
7454+if { (eval echo "$as_me:23492: \"$ac_cpp conftest.$ac_ext\"") >&5
7455   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7456   ac_status=$?
7457   egrep -v '^ *\+' conftest.er1 >conftest.err
7458   rm -f conftest.er1
7459   cat conftest.err >&5
7460-  echo "$as_me:23477: \$? = $ac_status" >&5
7461+  echo "$as_me:23498: \$? = $ac_status" >&5
7462   (exit $ac_status); } >/dev/null; then
7463   if test -s conftest.err; then
7464     ac_cpp_err=$ac_cxx_preproc_warn_flag
7465@@ -23493,7 +23514,7 @@
7466 fi
7467 rm -f conftest.err conftest.$ac_ext
7468 fi
7469-echo "$as_me:23496: result: `eval echo '${'$as_ac_Header'}'`" >&5
7470+echo "$as_me:23517: result: `eval echo '${'$as_ac_Header'}'`" >&5
7471 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
7472 if test `eval echo '${'$as_ac_Header'}'` = yes; then
7473   cat >>confdefs.h <<EOF
7474@@ -23504,10 +23525,10 @@
7475 done
7476
7477 if test x"$ac_cv_header_iostream" = xyes ; then
7478-	echo "$as_me:23507: checking if iostream uses std-namespace" >&5
7479+	echo "$as_me:23528: checking if iostream uses std-namespace" >&5
7480 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
7481 	cat >conftest.$ac_ext <<_ACEOF
7482-#line 23510 "configure"
7483+#line 23531 "configure"
7484 #include "confdefs.h"
7485
7486 #include <iostream>
7487@@ -23524,16 +23545,16 @@
7488 }
7489 _ACEOF
7490 rm -f conftest.$ac_objext
7491-if { (eval echo "$as_me:23527: \"$ac_compile\"") >&5
7492+if { (eval echo "$as_me:23548: \"$ac_compile\"") >&5
7493   (eval $ac_compile) 2>&5
7494   ac_status=$?
7495-  echo "$as_me:23530: \$? = $ac_status" >&5
7496+  echo "$as_me:23551: \$? = $ac_status" >&5
7497   (exit $ac_status); } &&
7498          { ac_try='test -s conftest.$ac_objext'
7499-  { (eval echo "$as_me:23533: \"$ac_try\"") >&5
7500+  { (eval echo "$as_me:23554: \"$ac_try\"") >&5
7501   (eval $ac_try) 2>&5
7502   ac_status=$?
7503-  echo "$as_me:23536: \$? = $ac_status" >&5
7504+  echo "$as_me:23557: \$? = $ac_status" >&5
7505   (exit $ac_status); }; }; then
7506   cf_iostream_namespace=yes
7507 else
7508@@ -23542,7 +23563,7 @@
7509 cf_iostream_namespace=no
7510 fi
7511 rm -f conftest.$ac_objext conftest.$ac_ext
7512-	echo "$as_me:23545: result: $cf_iostream_namespace" >&5
7513+	echo "$as_me:23566: result: $cf_iostream_namespace" >&5
7514 echo "${ECHO_T}$cf_iostream_namespace" >&6
7515 	if test "$cf_iostream_namespace" = yes ; then
7516
7517@@ -23553,7 +23574,7 @@
7518 	fi
7519 fi
7520
7521-echo "$as_me:23556: checking if we should include stdbool.h" >&5
7522+echo "$as_me:23577: checking if we should include stdbool.h" >&5
7523 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
7524
7525 if test "${cf_cv_header_stdbool_h+set}" = set; then
7526@@ -23561,7 +23582,7 @@
7527 else
7528
7529 	cat >conftest.$ac_ext <<_ACEOF
7530-#line 23564 "configure"
7531+#line 23585 "configure"
7532 #include "confdefs.h"
7533
7534 int
7535@@ -23573,23 +23594,23 @@
7536 }
7537 _ACEOF
7538 rm -f conftest.$ac_objext
7539-if { (eval echo "$as_me:23576: \"$ac_compile\"") >&5
7540+if { (eval echo "$as_me:23597: \"$ac_compile\"") >&5
7541   (eval $ac_compile) 2>&5
7542   ac_status=$?
7543-  echo "$as_me:23579: \$? = $ac_status" >&5
7544+  echo "$as_me:23600: \$? = $ac_status" >&5
7545   (exit $ac_status); } &&
7546          { ac_try='test -s conftest.$ac_objext'
7547-  { (eval echo "$as_me:23582: \"$ac_try\"") >&5
7548+  { (eval echo "$as_me:23603: \"$ac_try\"") >&5
7549   (eval $ac_try) 2>&5
7550   ac_status=$?
7551-  echo "$as_me:23585: \$? = $ac_status" >&5
7552+  echo "$as_me:23606: \$? = $ac_status" >&5
7553   (exit $ac_status); }; }; then
7554   cf_cv_header_stdbool_h=0
7555 else
7556   echo "$as_me: failed program was:" >&5
7557 cat conftest.$ac_ext >&5
7558 cat >conftest.$ac_ext <<_ACEOF
7559-#line 23592 "configure"
7560+#line 23613 "configure"
7561 #include "confdefs.h"
7562
7563 #ifndef __BEOS__
7564@@ -23605,16 +23626,16 @@
7565 }
7566 _ACEOF
7567 rm -f conftest.$ac_objext
7568-if { (eval echo "$as_me:23608: \"$ac_compile\"") >&5
7569+if { (eval echo "$as_me:23629: \"$ac_compile\"") >&5
7570   (eval $ac_compile) 2>&5
7571   ac_status=$?
7572-  echo "$as_me:23611: \$? = $ac_status" >&5
7573+  echo "$as_me:23632: \$? = $ac_status" >&5
7574   (exit $ac_status); } &&
7575          { ac_try='test -s conftest.$ac_objext'
7576-  { (eval echo "$as_me:23614: \"$ac_try\"") >&5
7577+  { (eval echo "$as_me:23635: \"$ac_try\"") >&5
7578   (eval $ac_try) 2>&5
7579   ac_status=$?
7580-  echo "$as_me:23617: \$? = $ac_status" >&5
7581+  echo "$as_me:23638: \$? = $ac_status" >&5
7582   (exit $ac_status); }; }; then
7583   cf_cv_header_stdbool_h=1
7584 else
7585@@ -23628,13 +23649,13 @@
7586 fi
7587
7588 if test "$cf_cv_header_stdbool_h" = 1
7589-then	echo "$as_me:23631: result: yes" >&5
7590+then	echo "$as_me:23652: result: yes" >&5
7591 echo "${ECHO_T}yes" >&6
7592-else	echo "$as_me:23633: result: no" >&5
7593+else	echo "$as_me:23654: result: no" >&5
7594 echo "${ECHO_T}no" >&6
7595 fi
7596
7597-echo "$as_me:23637: checking for builtin bool type" >&5
7598+echo "$as_me:23658: checking for builtin bool type" >&5
7599 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
7600
7601 if test "${cf_cv_builtin_bool+set}" = set; then
7602@@ -23642,7 +23663,7 @@
7603 else
7604
7605 	cat >conftest.$ac_ext <<_ACEOF
7606-#line 23645 "configure"
7607+#line 23666 "configure"
7608 #include "confdefs.h"
7609
7610 #include <stdio.h>
7611@@ -23657,16 +23678,16 @@
7612 }
7613 _ACEOF
7614 rm -f conftest.$ac_objext
7615-if { (eval echo "$as_me:23660: \"$ac_compile\"") >&5
7616+if { (eval echo "$as_me:23681: \"$ac_compile\"") >&5
7617   (eval $ac_compile) 2>&5
7618   ac_status=$?
7619-  echo "$as_me:23663: \$? = $ac_status" >&5
7620+  echo "$as_me:23684: \$? = $ac_status" >&5
7621   (exit $ac_status); } &&
7622          { ac_try='test -s conftest.$ac_objext'
7623-  { (eval echo "$as_me:23666: \"$ac_try\"") >&5
7624+  { (eval echo "$as_me:23687: \"$ac_try\"") >&5
7625   (eval $ac_try) 2>&5
7626   ac_status=$?
7627-  echo "$as_me:23669: \$? = $ac_status" >&5
7628+  echo "$as_me:23690: \$? = $ac_status" >&5
7629   (exit $ac_status); }; }; then
7630   cf_cv_builtin_bool=1
7631 else
7632@@ -23679,13 +23700,13 @@
7633 fi
7634
7635 if test "$cf_cv_builtin_bool" = 1
7636-then	echo "$as_me:23682: result: yes" >&5
7637+then	echo "$as_me:23703: result: yes" >&5
7638 echo "${ECHO_T}yes" >&6
7639-else	echo "$as_me:23684: result: no" >&5
7640+else	echo "$as_me:23705: result: no" >&5
7641 echo "${ECHO_T}no" >&6
7642 fi
7643
7644-echo "$as_me:23688: checking for size of bool" >&5
7645+echo "$as_me:23709: checking for size of bool" >&5
7646 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
7647 if test "${cf_cv_type_of_bool+set}" = set; then
7648   echo $ECHO_N "(cached) $ECHO_C" >&6
7649@@ -23696,7 +23717,7 @@
7650   cf_cv_type_of_bool=unknown
7651 else
7652   cat >conftest.$ac_ext <<_ACEOF
7653-#line 23699 "configure"
7654+#line 23720 "configure"
7655 #include "confdefs.h"
7656
7657 #include <stdlib.h>
7658@@ -23738,15 +23759,15 @@
7659
7660 _ACEOF
7661 rm -f conftest$ac_exeext
7662-if { (eval echo "$as_me:23741: \"$ac_link\"") >&5
7663+if { (eval echo "$as_me:23762: \"$ac_link\"") >&5
7664   (eval $ac_link) 2>&5
7665   ac_status=$?
7666-  echo "$as_me:23744: \$? = $ac_status" >&5
7667+  echo "$as_me:23765: \$? = $ac_status" >&5
7668   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
7669-  { (eval echo "$as_me:23746: \"$ac_try\"") >&5
7670+  { (eval echo "$as_me:23767: \"$ac_try\"") >&5
7671   (eval $ac_try) 2>&5
7672   ac_status=$?
7673-  echo "$as_me:23749: \$? = $ac_status" >&5
7674+  echo "$as_me:23770: \$? = $ac_status" >&5
7675   (exit $ac_status); }; }; then
7676   cf_cv_type_of_bool=`cat cf_test.out`
7677 		 if test -z "$cf_cv_type_of_bool"; then
7678@@ -23764,18 +23785,18 @@
7679 fi
7680
7681 	rm -f cf_test.out
7682-echo "$as_me:23767: result: $cf_cv_type_of_bool" >&5
7683+echo "$as_me:23788: result: $cf_cv_type_of_bool" >&5
7684 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
7685 if test "$cf_cv_type_of_bool" = unknown ; then
7686 	case .$NCURSES_BOOL in
7687 	(.auto|.) NCURSES_BOOL=unsigned;;
7688 	esac
7689-	{ echo "$as_me:23773: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
7690+	{ echo "$as_me:23794: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
7691 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
7692 	cf_cv_type_of_bool=$NCURSES_BOOL
7693 fi
7694
7695-echo "$as_me:23778: checking for special defines needed for etip.h" >&5
7696+echo "$as_me:23799: checking for special defines needed for etip.h" >&5
7697 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
7698 cf_save_CXXFLAGS="$CXXFLAGS"
7699 cf_result="none"
7700@@ -23793,7 +23814,7 @@
7701 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
7702 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
7703 cat >conftest.$ac_ext <<_ACEOF
7704-#line 23796 "configure"
7705+#line 23817 "configure"
7706 #include "confdefs.h"
7707
7708 #include <etip.h.in>
7709@@ -23807,16 +23828,16 @@
7710 }
7711 _ACEOF
7712 rm -f conftest.$ac_objext
7713-if { (eval echo "$as_me:23810: \"$ac_compile\"") >&5
7714+if { (eval echo "$as_me:23831: \"$ac_compile\"") >&5
7715   (eval $ac_compile) 2>&5
7716   ac_status=$?
7717-  echo "$as_me:23813: \$? = $ac_status" >&5
7718+  echo "$as_me:23834: \$? = $ac_status" >&5
7719   (exit $ac_status); } &&
7720          { ac_try='test -s conftest.$ac_objext'
7721-  { (eval echo "$as_me:23816: \"$ac_try\"") >&5
7722+  { (eval echo "$as_me:23837: \"$ac_try\"") >&5
7723   (eval $ac_try) 2>&5
7724   ac_status=$?
7725-  echo "$as_me:23819: \$? = $ac_status" >&5
7726+  echo "$as_me:23840: \$? = $ac_status" >&5
7727   (exit $ac_status); }; }; then
7728
7729 	test -n "$cf_math" && cat >>confdefs.h <<EOF
7730@@ -23837,12 +23858,12 @@
7731 rm -f conftest.$ac_objext conftest.$ac_ext
7732 done
7733 done
7734-echo "$as_me:23840: result: $cf_result" >&5
7735+echo "$as_me:23861: result: $cf_result" >&5
7736 echo "${ECHO_T}$cf_result" >&6
7737 CXXFLAGS="$cf_save_CXXFLAGS"
7738
7739 if test -n "$CXX"; then
7740-echo "$as_me:23845: checking if $CXX accepts parameter initialization" >&5
7741+echo "$as_me:23866: checking if $CXX accepts parameter initialization" >&5
7742 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
7743 if test "${cf_cv_cpp_param_init+set}" = set; then
7744   echo $ECHO_N "(cached) $ECHO_C" >&6
7745@@ -23859,7 +23880,7 @@
7746   cf_cv_cpp_param_init=unknown
7747 else
7748   cat >conftest.$ac_ext <<_ACEOF
7749-#line 23862 "configure"
7750+#line 23883 "configure"
7751 #include "confdefs.h"
7752
7753 class TEST {
7754@@ -23878,15 +23899,15 @@
7755
7756 _ACEOF
7757 rm -f conftest$ac_exeext
7758-if { (eval echo "$as_me:23881: \"$ac_link\"") >&5
7759+if { (eval echo "$as_me:23902: \"$ac_link\"") >&5
7760   (eval $ac_link) 2>&5
7761   ac_status=$?
7762-  echo "$as_me:23884: \$? = $ac_status" >&5
7763+  echo "$as_me:23905: \$? = $ac_status" >&5
7764   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
7765-  { (eval echo "$as_me:23886: \"$ac_try\"") >&5
7766+  { (eval echo "$as_me:23907: \"$ac_try\"") >&5
7767   (eval $ac_try) 2>&5
7768   ac_status=$?
7769-  echo "$as_me:23889: \$? = $ac_status" >&5
7770+  echo "$as_me:23910: \$? = $ac_status" >&5
7771   (exit $ac_status); }; }; then
7772   cf_cv_cpp_param_init=yes
7773 else
7774@@ -23905,7 +23926,7 @@
7775 ac_main_return=return
7776
7777 fi
7778-echo "$as_me:23908: result: $cf_cv_cpp_param_init" >&5
7779+echo "$as_me:23929: result: $cf_cv_cpp_param_init" >&5
7780 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
7781 fi
7782 test "$cf_cv_cpp_param_init" = yes &&
7783@@ -23915,7 +23936,7 @@
7784
7785 if test -n "$CXX"; then
7786
7787-echo "$as_me:23918: checking if $CXX accepts static_cast" >&5
7788+echo "$as_me:23939: checking if $CXX accepts static_cast" >&5
7789 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
7790 if test "${cf_cv_cpp_static_cast+set}" = set; then
7791   echo $ECHO_N "(cached) $ECHO_C" >&6
7792@@ -23929,7 +23950,7 @@
7793 ac_main_return=return
7794
7795 	cat >conftest.$ac_ext <<_ACEOF
7796-#line 23932 "configure"
7797+#line 23953 "configure"
7798 #include "confdefs.h"
7799
7800 class NCursesPanel
7801@@ -23973,16 +23994,16 @@
7802 }
7803 _ACEOF
7804 rm -f conftest.$ac_objext
7805-if { (eval echo "$as_me:23976: \"$ac_compile\"") >&5
7806+if { (eval echo "$as_me:23997: \"$ac_compile\"") >&5
7807   (eval $ac_compile) 2>&5
7808   ac_status=$?
7809-  echo "$as_me:23979: \$? = $ac_status" >&5
7810+  echo "$as_me:24000: \$? = $ac_status" >&5
7811   (exit $ac_status); } &&
7812          { ac_try='test -s conftest.$ac_objext'
7813-  { (eval echo "$as_me:23982: \"$ac_try\"") >&5
7814+  { (eval echo "$as_me:24003: \"$ac_try\"") >&5
7815   (eval $ac_try) 2>&5
7816   ac_status=$?
7817-  echo "$as_me:23985: \$? = $ac_status" >&5
7818+  echo "$as_me:24006: \$? = $ac_status" >&5
7819   (exit $ac_status); }; }; then
7820   cf_cv_cpp_static_cast=yes
7821 else
7822@@ -24000,7 +24021,7 @@
7823 ac_main_return=return
7824
7825 fi
7826-echo "$as_me:24003: result: $cf_cv_cpp_static_cast" >&5
7827+echo "$as_me:24024: result: $cf_cv_cpp_static_cast" >&5
7828 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
7829
7830 fi
7831@@ -24049,7 +24070,7 @@
7832 	else
7833 		if test "$cf_cv_header_stdbool_h" = 1 ; then
7834
7835-echo "$as_me:24052: checking for size of bool" >&5
7836+echo "$as_me:24073: checking for size of bool" >&5
7837 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
7838 if test "${cf_cv_type_of_bool+set}" = set; then
7839   echo $ECHO_N "(cached) $ECHO_C" >&6
7840@@ -24060,7 +24081,7 @@
7841   cf_cv_type_of_bool=unknown
7842 else
7843   cat >conftest.$ac_ext <<_ACEOF
7844-#line 24063 "configure"
7845+#line 24084 "configure"
7846 #include "confdefs.h"
7847
7848 #include <stdlib.h>
7849@@ -24102,15 +24123,15 @@
7850
7851 _ACEOF
7852 rm -f conftest$ac_exeext
7853-if { (eval echo "$as_me:24105: \"$ac_link\"") >&5
7854+if { (eval echo "$as_me:24126: \"$ac_link\"") >&5
7855   (eval $ac_link) 2>&5
7856   ac_status=$?
7857-  echo "$as_me:24108: \$? = $ac_status" >&5
7858+  echo "$as_me:24129: \$? = $ac_status" >&5
7859   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
7860-  { (eval echo "$as_me:24110: \"$ac_try\"") >&5
7861+  { (eval echo "$as_me:24131: \"$ac_try\"") >&5
7862   (eval $ac_try) 2>&5
7863   ac_status=$?
7864-  echo "$as_me:24113: \$? = $ac_status" >&5
7865+  echo "$as_me:24134: \$? = $ac_status" >&5
7866   (exit $ac_status); }; }; then
7867   cf_cv_type_of_bool=`cat cf_test.out`
7868 		 if test -z "$cf_cv_type_of_bool"; then
7869@@ -24128,25 +24149,25 @@
7870 fi
7871
7872 	rm -f cf_test.out
7873-echo "$as_me:24131: result: $cf_cv_type_of_bool" >&5
7874+echo "$as_me:24152: result: $cf_cv_type_of_bool" >&5
7875 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
7876 if test "$cf_cv_type_of_bool" = unknown ; then
7877 	case .$NCURSES_BOOL in
7878 	(.auto|.) NCURSES_BOOL=unsigned;;
7879 	esac
7880-	{ echo "$as_me:24137: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
7881+	{ echo "$as_me:24158: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
7882 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
7883 	cf_cv_type_of_bool=$NCURSES_BOOL
7884 fi
7885
7886 		else
7887-			echo "$as_me:24143: checking for fallback type of bool" >&5
7888+			echo "$as_me:24164: checking for fallback type of bool" >&5
7889 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
7890 			case "$host_cpu" in
7891 			(i?86)	cf_cv_type_of_bool=char	;;
7892 			(*)	cf_cv_type_of_bool=int	;;
7893 			esac
7894-			echo "$as_me:24149: result: $cf_cv_type_of_bool" >&5
7895+			echo "$as_me:24170: result: $cf_cv_type_of_bool" >&5
7896 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
7897 		fi
7898 	fi
7899@@ -24175,7 +24196,7 @@
7900
7901 	if test "$cf_with_ada" != "no" ; then
7902 		if test "$with_libtool" != "no"; then
7903-			{ echo "$as_me:24178: WARNING: libtool does not support Ada - disabling feature" >&5
7904+			{ echo "$as_me:24199: WARNING: libtool does not support Ada - disabling feature" >&5
7905 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
7906 			cf_with_ada=no
7907 		fi
7908@@ -24192,7 +24213,7 @@
7909 	unset cf_TEMP_gnat
7910 	# Extract the first word of "$cf_prog_gnat", so it can be a program name with args.
7911 set dummy $cf_prog_gnat; ac_word=$2
7912-echo "$as_me:24195: checking for $ac_word" >&5
7913+echo "$as_me:24216: checking for $ac_word" >&5
7914 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
7915 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then
7916   echo $ECHO_N "(cached) $ECHO_C" >&6
7917@@ -24209,7 +24230,7 @@
7918   test -z "$ac_dir" && ac_dir=.
7919   if $as_executable_p "$ac_dir/$ac_word"; then
7920    ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word"
7921-   echo "$as_me:24212: found $ac_dir/$ac_word" >&5
7922+   echo "$as_me:24233: found $ac_dir/$ac_word" >&5
7923    break
7924 fi
7925 done
7926@@ -24221,10 +24242,10 @@
7927 cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat
7928
7929 if test -n "$cf_TEMP_gnat"; then
7930-  echo "$as_me:24224: result: $cf_TEMP_gnat" >&5
7931+  echo "$as_me:24245: result: $cf_TEMP_gnat" >&5
7932 echo "${ECHO_T}$cf_TEMP_gnat" >&6
7933 else
7934-  echo "$as_me:24227: result: no" >&5
7935+  echo "$as_me:24248: result: no" >&5
7936 echo "${ECHO_T}no" >&6
7937 fi
7938
7939@@ -24234,7 +24255,7 @@
7940 		unset cf_cv_gnat_version
7941 		unset cf_TEMP_gnat
7942
7943-echo "$as_me:24237: checking for $cf_prog_gnat version" >&5
7944+echo "$as_me:24258: checking for $cf_prog_gnat version" >&5
7945 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6
7946 if test "${cf_cv_gnat_version+set}" = set; then
7947   echo $ECHO_N "(cached) $ECHO_C" >&6
7948@@ -24245,7 +24266,7 @@
7949 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
7950
7951 fi
7952-echo "$as_me:24248: result: $cf_cv_gnat_version" >&5
7953+echo "$as_me:24269: result: $cf_cv_gnat_version" >&5
7954 echo "${ECHO_T}$cf_cv_gnat_version" >&6
7955 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
7956 eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version
7957@@ -24274,7 +24295,7 @@
7958 			cd conftest.src
7959 			for cf_gprconfig in Ada C
7960 			do
7961-				echo "$as_me:24277: checking for gprconfig name for $cf_gprconfig" >&5
7962+				echo "$as_me:24298: checking for gprconfig name for $cf_gprconfig" >&5
7963 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
7964 				if test $cf_gprconfig = C
7965 				then
7966@@ -24293,10 +24314,10 @@
7967 				if test -n "$cf_gprconfig_value"
7968 				then
7969 					eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value
7970-					echo "$as_me:24296: result: $cf_gprconfig_value" >&5
7971+					echo "$as_me:24317: result: $cf_gprconfig_value" >&5
7972 echo "${ECHO_T}$cf_gprconfig_value" >&6
7973 				else
7974-					echo "$as_me:24299: result: missing" >&5
7975+					echo "$as_me:24320: result: missing" >&5
7976 echo "${ECHO_T}missing" >&6
7977 					cf_ada_config="#"
7978 					break
7979@@ -24309,7 +24330,7 @@
7980 	if test "x$cf_ada_config" != "x#"
7981 	then
7982
7983-echo "$as_me:24312: checking for gnat version" >&5
7984+echo "$as_me:24333: checking for gnat version" >&5
7985 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
7986 if test "${cf_cv_gnat_version+set}" = set; then
7987   echo $ECHO_N "(cached) $ECHO_C" >&6
7988@@ -24320,7 +24341,7 @@
7989 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
7990
7991 fi
7992-echo "$as_me:24323: result: $cf_cv_gnat_version" >&5
7993+echo "$as_me:24344: result: $cf_cv_gnat_version" >&5
7994 echo "${ECHO_T}$cf_cv_gnat_version" >&6
7995 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no
7996
7997@@ -24329,7 +24350,7 @@
7998 	cf_cv_prog_gnat_correct=yes
7999 	;;
8000 (*)
8001-	{ echo "$as_me:24332: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
8002+	{ echo "$as_me:24353: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
8003 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
8004 	cf_cv_prog_gnat_correct=no
8005 	;;
8006@@ -24337,7 +24358,7 @@
8007
8008 		# Extract the first word of "m4", so it can be a program name with args.
8009 set dummy m4; ac_word=$2
8010-echo "$as_me:24340: checking for $ac_word" >&5
8011+echo "$as_me:24361: checking for $ac_word" >&5
8012 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8013 if test "${ac_cv_prog_M4_exists+set}" = set; then
8014   echo $ECHO_N "(cached) $ECHO_C" >&6
8015@@ -24352,7 +24373,7 @@
8016   test -z "$ac_dir" && ac_dir=.
8017   $as_executable_p "$ac_dir/$ac_word" || continue
8018 ac_cv_prog_M4_exists="yes"
8019-echo "$as_me:24355: found $ac_dir/$ac_word" >&5
8020+echo "$as_me:24376: found $ac_dir/$ac_word" >&5
8021 break
8022 done
8023
8024@@ -24361,20 +24382,20 @@
8025 fi
8026 M4_exists=$ac_cv_prog_M4_exists
8027 if test -n "$M4_exists"; then
8028-  echo "$as_me:24364: result: $M4_exists" >&5
8029+  echo "$as_me:24385: result: $M4_exists" >&5
8030 echo "${ECHO_T}$M4_exists" >&6
8031 else
8032-  echo "$as_me:24367: result: no" >&5
8033+  echo "$as_me:24388: result: no" >&5
8034 echo "${ECHO_T}no" >&6
8035 fi
8036
8037 		if test "$ac_cv_prog_M4_exists" = no; then
8038 			cf_cv_prog_gnat_correct=no
8039-			{ echo "$as_me:24373: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
8040+			{ echo "$as_me:24394: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5
8041 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;}
8042 		fi
8043 		if test "$cf_cv_prog_gnat_correct" = yes; then
8044-			echo "$as_me:24377: checking if GNAT works" >&5
8045+			echo "$as_me:24398: checking if GNAT works" >&5
8046 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
8047
8048 rm -rf conftest* *~conftest*
8049@@ -24402,7 +24423,7 @@
8050 fi
8051 rm -rf conftest* *~conftest*
8052
8053-			echo "$as_me:24405: result: $cf_cv_prog_gnat_correct" >&5
8054+			echo "$as_me:24426: result: $cf_cv_prog_gnat_correct" >&5
8055 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
8056 		fi
8057 	else
8058@@ -24414,7 +24435,7 @@
8059
8060  	ADAFLAGS="$ADAFLAGS -gnatpn"
8061
8062-	echo "$as_me:24417: checking optimization options for ADAFLAGS" >&5
8063+	echo "$as_me:24438: checking optimization options for ADAFLAGS" >&5
8064 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
8065 	case "$CFLAGS" in
8066 	(*-g*)
8067@@ -24431,10 +24452,10 @@
8068
8069 		;;
8070 	esac
8071-	echo "$as_me:24434: result: $ADAFLAGS" >&5
8072+	echo "$as_me:24455: result: $ADAFLAGS" >&5
8073 echo "${ECHO_T}$ADAFLAGS" >&6
8074
8075-echo "$as_me:24437: checking if GNATPREP supports -T option" >&5
8076+echo "$as_me:24458: checking if GNATPREP supports -T option" >&5
8077 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
8078 if test "${cf_cv_gnatprep_opt_t+set}" = set; then
8079   echo $ECHO_N "(cached) $ECHO_C" >&6
8080@@ -24444,11 +24465,11 @@
8081 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
8082
8083 fi
8084-echo "$as_me:24447: result: $cf_cv_gnatprep_opt_t" >&5
8085+echo "$as_me:24468: result: $cf_cv_gnatprep_opt_t" >&5
8086 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
8087 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
8088
8089-echo "$as_me:24451: checking if GNAT supports generics" >&5
8090+echo "$as_me:24472: checking if GNAT supports generics" >&5
8091 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
8092 case $cf_cv_gnat_version in
8093 (3.[1-9]*|[4-9].*)
8094@@ -24458,7 +24479,7 @@
8095 	cf_gnat_generics=no
8096 	;;
8097 esac
8098-echo "$as_me:24461: result: $cf_gnat_generics" >&5
8099+echo "$as_me:24482: result: $cf_gnat_generics" >&5
8100 echo "${ECHO_T}$cf_gnat_generics" >&6
8101
8102 if test "$cf_gnat_generics" = yes
8103@@ -24470,7 +24491,7 @@
8104 	cf_generic_objects=
8105 fi
8106
8107-echo "$as_me:24473: checking if GNAT supports SIGINT" >&5
8108+echo "$as_me:24494: checking if GNAT supports SIGINT" >&5
8109 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
8110 if test "${cf_cv_gnat_sigint+set}" = set; then
8111   echo $ECHO_N "(cached) $ECHO_C" >&6
8112@@ -24518,7 +24539,7 @@
8113 rm -rf conftest* *~conftest*
8114
8115 fi
8116-echo "$as_me:24521: result: $cf_cv_gnat_sigint" >&5
8117+echo "$as_me:24542: result: $cf_cv_gnat_sigint" >&5
8118 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
8119
8120 if test $cf_cv_gnat_sigint = yes ; then
8121@@ -24531,7 +24552,7 @@
8122 cf_gnat_projects=no
8123
8124 if test "$enable_gnat_projects" != no ; then
8125-echo "$as_me:24534: checking if GNAT supports project files" >&5
8126+echo "$as_me:24555: checking if GNAT supports project files" >&5
8127 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
8128 case $cf_cv_gnat_version in
8129 (3.[0-9]*)
8130@@ -24594,15 +24615,15 @@
8131 	esac
8132 	;;
8133 esac
8134-echo "$as_me:24597: result: $cf_gnat_projects" >&5
8135+echo "$as_me:24618: result: $cf_gnat_projects" >&5
8136 echo "${ECHO_T}$cf_gnat_projects" >&6
8137 fi # enable_gnat_projects
8138
8139 if test $cf_gnat_projects = yes
8140 then
8141-	echo "$as_me:24603: checking if GNAT supports libraries" >&5
8142+	echo "$as_me:24624: checking if GNAT supports libraries" >&5
8143 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
8144-	echo "$as_me:24605: result: $cf_gnat_libraries" >&5
8145+	echo "$as_me:24626: result: $cf_gnat_libraries" >&5
8146 echo "${ECHO_T}$cf_gnat_libraries" >&6
8147 fi
8148
8149@@ -24622,7 +24643,7 @@
8150 	USE_GNAT_LIBRARIES="#"
8151 fi
8152
8153-echo "$as_me:24625: checking for ada-compiler" >&5
8154+echo "$as_me:24646: checking for ada-compiler" >&5
8155 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
8156
8157 # Check whether --with-ada-compiler or --without-ada-compiler was given.
8158@@ -24633,12 +24654,12 @@
8159   cf_ada_compiler=gnatmake
8160 fi;
8161
8162-echo "$as_me:24636: result: $cf_ada_compiler" >&5
8163+echo "$as_me:24657: result: $cf_ada_compiler" >&5
8164 echo "${ECHO_T}$cf_ada_compiler" >&6
8165
8166 			cf_ada_package=terminal_interface
8167
8168-echo "$as_me:24641: checking for ada-include" >&5
8169+echo "$as_me:24662: checking for ada-include" >&5
8170 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
8171
8172 # Check whether --with-ada-include or --without-ada-include was given.
8173@@ -24674,7 +24695,7 @@
8174 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
8175 	;;
8176 (*)
8177-	{ { echo "$as_me:24677: error: expected a pathname, not \"$withval\"" >&5
8178+	{ { echo "$as_me:24698: error: expected a pathname, not \"$withval\"" >&5
8179 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
8180    { (exit 1); exit 1; }; }
8181 	;;
8182@@ -24683,10 +24704,10 @@
8183 fi
8184 eval ADA_INCLUDE="$withval"
8185
8186-echo "$as_me:24686: result: $ADA_INCLUDE" >&5
8187+echo "$as_me:24707: result: $ADA_INCLUDE" >&5
8188 echo "${ECHO_T}$ADA_INCLUDE" >&6
8189
8190-echo "$as_me:24689: checking for ada-objects" >&5
8191+echo "$as_me:24710: checking for ada-objects" >&5
8192 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
8193
8194 # Check whether --with-ada-objects or --without-ada-objects was given.
8195@@ -24722,7 +24743,7 @@
8196 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
8197 	;;
8198 (*)
8199-	{ { echo "$as_me:24725: error: expected a pathname, not \"$withval\"" >&5
8200+	{ { echo "$as_me:24746: error: expected a pathname, not \"$withval\"" >&5
8201 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
8202    { (exit 1); exit 1; }; }
8203 	;;
8204@@ -24731,10 +24752,10 @@
8205 fi
8206 eval ADA_OBJECTS="$withval"
8207
8208-echo "$as_me:24734: result: $ADA_OBJECTS" >&5
8209+echo "$as_me:24755: result: $ADA_OBJECTS" >&5
8210 echo "${ECHO_T}$ADA_OBJECTS" >&6
8211
8212-echo "$as_me:24737: checking if an Ada95 shared-library should be built" >&5
8213+echo "$as_me:24758: checking if an Ada95 shared-library should be built" >&5
8214 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
8215
8216 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
8217@@ -24744,14 +24765,14 @@
8218 else
8219   with_ada_sharedlib=no
8220 fi;
8221-echo "$as_me:24747: result: $with_ada_sharedlib" >&5
8222+echo "$as_me:24768: result: $with_ada_sharedlib" >&5
8223 echo "${ECHO_T}$with_ada_sharedlib" >&6
8224
8225 if test "x$with_ada_sharedlib" != xno
8226 then
8227 	if test "x$cf_gnat_projects" != xyes
8228 	then
8229-		{ echo "$as_me:24754: WARNING: disabling shared-library since GNAT projects are not supported" >&5
8230+		{ echo "$as_me:24775: WARNING: disabling shared-library since GNAT projects are not supported" >&5
8231 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
8232 		with_ada_sharedlib=no
8233 	fi
8234@@ -24771,7 +24792,7 @@
8235
8236 			# allow the Ada binding to be renamed
8237
8238-echo "$as_me:24774: checking for ada-libname" >&5
8239+echo "$as_me:24795: checking for ada-libname" >&5
8240 echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6
8241
8242 # Check whether --with-ada-libname or --without-ada-libname was given.
8243@@ -24787,7 +24808,7 @@
8244 	;;
8245 esac
8246
8247-echo "$as_me:24790: result: $ADA_LIBNAME" >&5
8248+echo "$as_me:24811: result: $ADA_LIBNAME" >&5
8249 echo "${ECHO_T}$ADA_LIBNAME" >&6
8250
8251 		fi
8252@@ -24798,13 +24819,13 @@
8253
8254 # do this "late" to avoid conflict with header-checks
8255 if test "x$with_widec" = xyes ; then
8256-	echo "$as_me:24801: checking for wchar_t" >&5
8257+	echo "$as_me:24822: checking for wchar_t" >&5
8258 echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
8259 if test "${ac_cv_type_wchar_t+set}" = set; then
8260   echo $ECHO_N "(cached) $ECHO_C" >&6
8261 else
8262   cat >conftest.$ac_ext <<_ACEOF
8263-#line 24807 "configure"
8264+#line 24828 "configure"
8265 #include "confdefs.h"
8266 $ac_includes_default
8267 int
8268@@ -24819,16 +24840,16 @@
8269 }
8270 _ACEOF
8271 rm -f conftest.$ac_objext
8272-if { (eval echo "$as_me:24822: \"$ac_compile\"") >&5
8273+if { (eval echo "$as_me:24843: \"$ac_compile\"") >&5
8274   (eval $ac_compile) 2>&5
8275   ac_status=$?
8276-  echo "$as_me:24825: \$? = $ac_status" >&5
8277+  echo "$as_me:24846: \$? = $ac_status" >&5
8278   (exit $ac_status); } &&
8279          { ac_try='test -s conftest.$ac_objext'
8280-  { (eval echo "$as_me:24828: \"$ac_try\"") >&5
8281+  { (eval echo "$as_me:24849: \"$ac_try\"") >&5
8282   (eval $ac_try) 2>&5
8283   ac_status=$?
8284-  echo "$as_me:24831: \$? = $ac_status" >&5
8285+  echo "$as_me:24852: \$? = $ac_status" >&5
8286   (exit $ac_status); }; }; then
8287   ac_cv_type_wchar_t=yes
8288 else
8289@@ -24838,10 +24859,10 @@
8290 fi
8291 rm -f conftest.$ac_objext conftest.$ac_ext
8292 fi
8293-echo "$as_me:24841: result: $ac_cv_type_wchar_t" >&5
8294+echo "$as_me:24862: result: $ac_cv_type_wchar_t" >&5
8295 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
8296
8297-echo "$as_me:24844: checking size of wchar_t" >&5
8298+echo "$as_me:24865: checking size of wchar_t" >&5
8299 echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
8300 if test "${ac_cv_sizeof_wchar_t+set}" = set; then
8301   echo $ECHO_N "(cached) $ECHO_C" >&6
8302@@ -24850,7 +24871,7 @@
8303   if test "$cross_compiling" = yes; then
8304   # Depending upon the size, compute the lo and hi bounds.
8305 cat >conftest.$ac_ext <<_ACEOF
8306-#line 24853 "configure"
8307+#line 24874 "configure"
8308 #include "confdefs.h"
8309 $ac_includes_default
8310 int
8311@@ -24862,21 +24883,21 @@
8312 }
8313 _ACEOF
8314 rm -f conftest.$ac_objext
8315-if { (eval echo "$as_me:24865: \"$ac_compile\"") >&5
8316+if { (eval echo "$as_me:24886: \"$ac_compile\"") >&5
8317   (eval $ac_compile) 2>&5
8318   ac_status=$?
8319-  echo "$as_me:24868: \$? = $ac_status" >&5
8320+  echo "$as_me:24889: \$? = $ac_status" >&5
8321   (exit $ac_status); } &&
8322          { ac_try='test -s conftest.$ac_objext'
8323-  { (eval echo "$as_me:24871: \"$ac_try\"") >&5
8324+  { (eval echo "$as_me:24892: \"$ac_try\"") >&5
8325   (eval $ac_try) 2>&5
8326   ac_status=$?
8327-  echo "$as_me:24874: \$? = $ac_status" >&5
8328+  echo "$as_me:24895: \$? = $ac_status" >&5
8329   (exit $ac_status); }; }; then
8330   ac_lo=0 ac_mid=0
8331   while :; do
8332     cat >conftest.$ac_ext <<_ACEOF
8333-#line 24879 "configure"
8334+#line 24900 "configure"
8335 #include "confdefs.h"
8336 $ac_includes_default
8337 int
8338@@ -24888,16 +24909,16 @@
8339 }
8340 _ACEOF
8341 rm -f conftest.$ac_objext
8342-if { (eval echo "$as_me:24891: \"$ac_compile\"") >&5
8343+if { (eval echo "$as_me:24912: \"$ac_compile\"") >&5
8344   (eval $ac_compile) 2>&5
8345   ac_status=$?
8346-  echo "$as_me:24894: \$? = $ac_status" >&5
8347+  echo "$as_me:24915: \$? = $ac_status" >&5
8348   (exit $ac_status); } &&
8349          { ac_try='test -s conftest.$ac_objext'
8350-  { (eval echo "$as_me:24897: \"$ac_try\"") >&5
8351+  { (eval echo "$as_me:24918: \"$ac_try\"") >&5
8352   (eval $ac_try) 2>&5
8353   ac_status=$?
8354-  echo "$as_me:24900: \$? = $ac_status" >&5
8355+  echo "$as_me:24921: \$? = $ac_status" >&5
8356   (exit $ac_status); }; }; then
8357   ac_hi=$ac_mid; break
8358 else
8359@@ -24913,7 +24934,7 @@
8360 ac_hi=-1 ac_mid=-1
8361   while :; do
8362     cat >conftest.$ac_ext <<_ACEOF
8363-#line 24916 "configure"
8364+#line 24937 "configure"
8365 #include "confdefs.h"
8366 $ac_includes_default
8367 int
8368@@ -24925,16 +24946,16 @@
8369 }
8370 _ACEOF
8371 rm -f conftest.$ac_objext
8372-if { (eval echo "$as_me:24928: \"$ac_compile\"") >&5
8373+if { (eval echo "$as_me:24949: \"$ac_compile\"") >&5
8374   (eval $ac_compile) 2>&5
8375   ac_status=$?
8376-  echo "$as_me:24931: \$? = $ac_status" >&5
8377+  echo "$as_me:24952: \$? = $ac_status" >&5
8378   (exit $ac_status); } &&
8379          { ac_try='test -s conftest.$ac_objext'
8380-  { (eval echo "$as_me:24934: \"$ac_try\"") >&5
8381+  { (eval echo "$as_me:24955: \"$ac_try\"") >&5
8382   (eval $ac_try) 2>&5
8383   ac_status=$?
8384-  echo "$as_me:24937: \$? = $ac_status" >&5
8385+  echo "$as_me:24958: \$? = $ac_status" >&5
8386   (exit $ac_status); }; }; then
8387   ac_lo=$ac_mid; break
8388 else
8389@@ -24950,7 +24971,7 @@
8390 while test "x$ac_lo" != "x$ac_hi"; do
8391   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
8392   cat >conftest.$ac_ext <<_ACEOF
8393-#line 24953 "configure"
8394+#line 24974 "configure"
8395 #include "confdefs.h"
8396 $ac_includes_default
8397 int
8398@@ -24962,16 +24983,16 @@
8399 }
8400 _ACEOF
8401 rm -f conftest.$ac_objext
8402-if { (eval echo "$as_me:24965: \"$ac_compile\"") >&5
8403+if { (eval echo "$as_me:24986: \"$ac_compile\"") >&5
8404   (eval $ac_compile) 2>&5
8405   ac_status=$?
8406-  echo "$as_me:24968: \$? = $ac_status" >&5
8407+  echo "$as_me:24989: \$? = $ac_status" >&5
8408   (exit $ac_status); } &&
8409          { ac_try='test -s conftest.$ac_objext'
8410-  { (eval echo "$as_me:24971: \"$ac_try\"") >&5
8411+  { (eval echo "$as_me:24992: \"$ac_try\"") >&5
8412   (eval $ac_try) 2>&5
8413   ac_status=$?
8414-  echo "$as_me:24974: \$? = $ac_status" >&5
8415+  echo "$as_me:24995: \$? = $ac_status" >&5
8416   (exit $ac_status); }; }; then
8417   ac_hi=$ac_mid
8418 else
8419@@ -24984,12 +25005,12 @@
8420 ac_cv_sizeof_wchar_t=$ac_lo
8421 else
8422   if test "$cross_compiling" = yes; then
8423-  { { echo "$as_me:24987: error: cannot run test program while cross compiling" >&5
8424+  { { echo "$as_me:25008: error: cannot run test program while cross compiling" >&5
8425 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
8426    { (exit 1); exit 1; }; }
8427 else
8428   cat >conftest.$ac_ext <<_ACEOF
8429-#line 24992 "configure"
8430+#line 25013 "configure"
8431 #include "confdefs.h"
8432 $ac_includes_default
8433 int
8434@@ -25005,15 +25026,15 @@
8435 }
8436 _ACEOF
8437 rm -f conftest$ac_exeext
8438-if { (eval echo "$as_me:25008: \"$ac_link\"") >&5
8439+if { (eval echo "$as_me:25029: \"$ac_link\"") >&5
8440   (eval $ac_link) 2>&5
8441   ac_status=$?
8442-  echo "$as_me:25011: \$? = $ac_status" >&5
8443+  echo "$as_me:25032: \$? = $ac_status" >&5
8444   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
8445-  { (eval echo "$as_me:25013: \"$ac_try\"") >&5
8446+  { (eval echo "$as_me:25034: \"$ac_try\"") >&5
8447   (eval $ac_try) 2>&5
8448   ac_status=$?
8449-  echo "$as_me:25016: \$? = $ac_status" >&5
8450+  echo "$as_me:25037: \$? = $ac_status" >&5
8451   (exit $ac_status); }; }; then
8452   ac_cv_sizeof_wchar_t=`cat conftest.val`
8453 else
8454@@ -25029,7 +25050,7 @@
8455   ac_cv_sizeof_wchar_t=0
8456 fi
8457 fi
8458-echo "$as_me:25032: result: $ac_cv_sizeof_wchar_t" >&5
8459+echo "$as_me:25053: result: $ac_cv_sizeof_wchar_t" >&5
8460 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
8461 cat >>confdefs.h <<EOF
8462 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
8463@@ -25047,7 +25068,7 @@
8464 ### chooses to split module lists into libraries.
8465 ###
8466 ### (see CF_LIB_RULES).
8467-echo "$as_me:25050: checking for library subsets" >&5
8468+echo "$as_me:25071: checking for library subsets" >&5
8469 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
8470 LIB_SUBSETS=
8471
8472@@ -25089,7 +25110,7 @@
8473 test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
8474 test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
8475
8476-echo "$as_me:25092: result: $LIB_SUBSETS" >&5
8477+echo "$as_me:25113: result: $LIB_SUBSETS" >&5
8478 echo "${ECHO_T}$LIB_SUBSETS" >&6
8479
8480 ### Construct the list of include-directories to be generated
8481@@ -25120,7 +25141,7 @@
8482 fi
8483
8484 ### Build up pieces for makefile rules
8485-echo "$as_me:25123: checking default library suffix" >&5
8486+echo "$as_me:25144: checking default library suffix" >&5
8487 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
8488
8489 	case $DFT_LWR_MODEL in
8490@@ -25131,10 +25152,10 @@
8491 	(shared)  DFT_ARG_SUFFIX=''   ;;
8492 	esac
8493 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
8494-echo "$as_me:25134: result: $DFT_ARG_SUFFIX" >&5
8495+echo "$as_me:25155: result: $DFT_ARG_SUFFIX" >&5
8496 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
8497
8498-echo "$as_me:25137: checking default library-dependency suffix" >&5
8499+echo "$as_me:25158: checking default library-dependency suffix" >&5
8500 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
8501
8502 	case X$DFT_LWR_MODEL in
8503@@ -25192,10 +25213,10 @@
8504 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
8505 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
8506 	fi
8507-echo "$as_me:25195: result: $DFT_DEP_SUFFIX" >&5
8508+echo "$as_me:25216: result: $DFT_DEP_SUFFIX" >&5
8509 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
8510
8511-echo "$as_me:25198: checking default object directory" >&5
8512+echo "$as_me:25219: checking default object directory" >&5
8513 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
8514
8515 	case $DFT_LWR_MODEL in
8516@@ -25211,11 +25232,11 @@
8517 			DFT_OBJ_SUBDIR='obj_s' ;;
8518 		esac
8519 	esac
8520-echo "$as_me:25214: result: $DFT_OBJ_SUBDIR" >&5
8521+echo "$as_me:25235: result: $DFT_OBJ_SUBDIR" >&5
8522 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
8523
8524 if test "x$cf_with_cxx" = xyes ; then
8525-echo "$as_me:25218: checking c++ library-dependency suffix" >&5
8526+echo "$as_me:25239: checking c++ library-dependency suffix" >&5
8527 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
8528 if test "$with_libtool" != "no"; then
8529 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
8530@@ -25283,7 +25304,7 @@
8531 	fi
8532
8533 fi
8534-echo "$as_me:25286: result: $CXX_LIB_SUFFIX" >&5
8535+echo "$as_me:25307: result: $CXX_LIB_SUFFIX" >&5
8536 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
8537
8538 fi
8539@@ -25459,19 +25480,19 @@
8540
8541 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
8542 then
8543-	echo "$as_me:25462: checking if linker supports switching between static/dynamic" >&5
8544+	echo "$as_me:25483: checking if linker supports switching between static/dynamic" >&5
8545 echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
8546
8547 	rm -f libconftest.a
8548 	cat >conftest.$ac_ext <<EOF
8549-#line 25467 "configure"
8550+#line 25488 "configure"
8551 #include <stdio.h>
8552 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
8553 EOF
8554-	if { (eval echo "$as_me:25471: \"$ac_compile\"") >&5
8555+	if { (eval echo "$as_me:25492: \"$ac_compile\"") >&5
8556   (eval $ac_compile) 2>&5
8557   ac_status=$?
8558-  echo "$as_me:25474: \$? = $ac_status" >&5
8559+  echo "$as_me:25495: \$? = $ac_status" >&5
8560   (exit $ac_status); } ; then
8561 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
8562 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
8563@@ -25482,10 +25503,10 @@
8564
8565 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
8566 	cat >conftest.$ac_ext <<_ACEOF
8567-#line 25485 "configure"
8568+#line 25506 "configure"
8569 #include "confdefs.h"
8570
8571-#line 25488 "configure"
8572+#line 25509 "configure"
8573 #include <stdio.h>
8574 int cf_ldflags_static(FILE *fp);
8575
8576@@ -25500,16 +25521,16 @@
8577 }
8578 _ACEOF
8579 rm -f conftest.$ac_objext conftest$ac_exeext
8580-if { (eval echo "$as_me:25503: \"$ac_link\"") >&5
8581+if { (eval echo "$as_me:25524: \"$ac_link\"") >&5
8582   (eval $ac_link) 2>&5
8583   ac_status=$?
8584-  echo "$as_me:25506: \$? = $ac_status" >&5
8585+  echo "$as_me:25527: \$? = $ac_status" >&5
8586   (exit $ac_status); } &&
8587          { ac_try='test -s conftest$ac_exeext'
8588-  { (eval echo "$as_me:25509: \"$ac_try\"") >&5
8589+  { (eval echo "$as_me:25530: \"$ac_try\"") >&5
8590   (eval $ac_try) 2>&5
8591   ac_status=$?
8592-  echo "$as_me:25512: \$? = $ac_status" >&5
8593+  echo "$as_me:25533: \$? = $ac_status" >&5
8594   (exit $ac_status); }; }; then
8595
8596 	# some linkers simply ignore the -dynamic
8597@@ -25532,7 +25553,7 @@
8598 	rm -f libconftest.*
8599 	LIBS="$cf_save_LIBS"
8600
8601-	echo "$as_me:25535: result: $cf_ldflags_static" >&5
8602+	echo "$as_me:25556: result: $cf_ldflags_static" >&5
8603 echo "${ECHO_T}$cf_ldflags_static" >&6
8604
8605 	if test $cf_ldflags_static != yes
8606@@ -25548,7 +25569,7 @@
8607 	;;
8608 esac
8609
8610-echo "$as_me:25551: checking where we will install curses.h" >&5
8611+echo "$as_me:25572: checking where we will install curses.h" >&5
8612 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
8613
8614 includesubdir=
8615@@ -25558,7 +25579,7 @@
8616 then
8617 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
8618 fi
8619-echo "$as_me:25561: result: ${includedir}${includesubdir}" >&5
8620+echo "$as_me:25582: result: ${includedir}${includesubdir}" >&5
8621 echo "${ECHO_T}${includedir}${includesubdir}" >&6
8622
8623 ### Resolve a conflict between normal and wide-curses by forcing applications
8624@@ -25566,7 +25587,7 @@
8625 if test "$with_overwrite" != no ; then
8626 if test "$NCURSES_LIBUTF8" = 1 ; then
8627 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
8628-	{ echo "$as_me:25569: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
8629+	{ echo "$as_me:25590: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
8630 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
8631 fi
8632 fi
8633@@ -25584,7 +25605,7 @@
8634 ### Construct the list of subdirectories for which we'll customize makefiles
8635 ### with the appropriate compile-rules.
8636
8637-echo "$as_me:25587: checking for src modules" >&5
8638+echo "$as_me:25608: checking for src modules" >&5
8639 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
8640
8641 # dependencies and linker-arguments for test-programs
8642@@ -25649,7 +25670,7 @@
8643 		fi
8644 	fi
8645 done
8646-echo "$as_me:25652: result: $cf_cv_src_modules" >&5
8647+echo "$as_me:25673: result: $cf_cv_src_modules" >&5
8648 echo "${ECHO_T}$cf_cv_src_modules" >&6
8649
8650 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
8651@@ -25916,7 +25937,7 @@
8652 	(*-D_XOPEN_SOURCE_EXTENDED*)
8653 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
8654
8655-echo "${as_me:-configure}:25919: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
8656+echo "${as_me:-configure}:25940: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
8657
8658 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
8659 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
8660@@ -25927,7 +25948,7 @@
8661
8662 # Help to automatically enable the extended curses features when using either
8663 # the *-config or the ".pc" files by adding defines.
8664-echo "$as_me:25930: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
8665+echo "$as_me:25951: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
8666 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
8667 PKG_CFLAGS=
8668 for cf_loop1 in $CPPFLAGS_after_XOPEN
8669@@ -25943,7 +25964,7 @@
8670 	done
8671 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
8672 done
8673-echo "$as_me:25946: result: $PKG_CFLAGS" >&5
8674+echo "$as_me:25967: result: $PKG_CFLAGS" >&5
8675 echo "${ECHO_T}$PKG_CFLAGS" >&6
8676
8677 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
8678@@ -26004,7 +26025,7 @@
8679 	cf_filter_syms=$cf_dft_filter_syms
8680 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
8681
8682-echo "${as_me:-configure}:26007: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
8683+echo "${as_me:-configure}:26028: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
8684
8685 fi
8686
8687@@ -26031,7 +26052,7 @@
8688
8689 # This is used for the *-config script and *.pc data files.
8690
8691-echo "$as_me:26034: checking for linker search path" >&5
8692+echo "$as_me:26055: checking for linker search path" >&5
8693 echo $ECHO_N "checking for linker search path... $ECHO_C" >&6
8694 if test "${cf_cv_ld_searchpath+set}" = set; then
8695   echo $ECHO_N "(cached) $ECHO_C" >&6
8696@@ -26095,7 +26116,7 @@
8697 test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
8698
8699 fi
8700-echo "$as_me:26098: result: $cf_cv_ld_searchpath" >&5
8701+echo "$as_me:26119: result: $cf_cv_ld_searchpath" >&5
8702 echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
8703
8704 LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
8705@@ -26185,7 +26206,7 @@
8706 : ${CONFIG_STATUS=./config.status}
8707 ac_clean_files_save=$ac_clean_files
8708 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
8709-{ echo "$as_me:26188: creating $CONFIG_STATUS" >&5
8710+{ echo "$as_me:26209: creating $CONFIG_STATUS" >&5
8711 echo "$as_me: creating $CONFIG_STATUS" >&6;}
8712 cat >$CONFIG_STATUS <<_ACEOF
8713 #! $SHELL
8714@@ -26317,7 +26338,7 @@
8715 cat >>$CONFIG_STATUS <<EOF
8716 ac_cs_version="\\
8717 config.status
8718-configured by $0, generated by GNU Autoconf 2.52.20190901,
8719+configured by $0, generated by GNU Autoconf 2.52.20200111,
8720   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
8721
8722 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
8723@@ -26361,7 +26382,7 @@
8724     echo "$ac_cs_version"; exit 0 ;;
8725   --he | --h)
8726     # Conflict between --help and --header
8727-    { { echo "$as_me:26364: error: ambiguous option: $1
8728+    { { echo "$as_me:26385: error: ambiguous option: $1
8729 Try \`$0 --help' for more information." >&5
8730 echo "$as_me: error: ambiguous option: $1
8731 Try \`$0 --help' for more information." >&2;}
8732@@ -26380,7 +26401,7 @@
8733     ac_need_defaults=false;;
8734
8735   # This is an error.
8736-  -*) { { echo "$as_me:26383: error: unrecognized option: $1
8737+  -*) { { echo "$as_me:26404: error: unrecognized option: $1
8738 Try \`$0 --help' for more information." >&5
8739 echo "$as_me: error: unrecognized option: $1
8740 Try \`$0 --help' for more information." >&2;}
8741@@ -26399,7 +26420,7 @@
8742 ## Running config.status.  ##
8743 ## ----------------------- ##
8744
8745-This file was extended by $as_me 2.52.20190901, executed with
8746+This file was extended by $as_me 2.52.20200111, executed with
8747   CONFIG_FILES    = $CONFIG_FILES
8748   CONFIG_HEADERS  = $CONFIG_HEADERS
8749   CONFIG_LINKS    = $CONFIG_LINKS
8750@@ -26499,7 +26520,7 @@
8751   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
8752   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
8753   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
8754-  *) { { echo "$as_me:26502: error: invalid argument: $ac_config_target" >&5
8755+  *) { { echo "$as_me:26523: error: invalid argument: $ac_config_target" >&5
8756 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
8757    { (exit 1); exit 1; }; };;
8758   esac
8759@@ -26995,7 +27016,7 @@
8760   esac
8761
8762   if test x"$ac_file" != x-; then
8763-    { echo "$as_me:26998: creating $ac_file" >&5
8764+    { echo "$as_me:27019: creating $ac_file" >&5
8765 echo "$as_me: creating $ac_file" >&6;}
8766     rm -f "$ac_file"
8767   fi
8768@@ -27013,7 +27034,7 @@
8769       -) echo $tmp/stdin ;;
8770       [\\/$]*)
8771          # Absolute (can't be DOS-style, as IFS=:)
8772-         test -f "$f" || { { echo "$as_me:27016: error: cannot find input file: $f" >&5
8773+         test -f "$f" || { { echo "$as_me:27037: error: cannot find input file: $f" >&5
8774 echo "$as_me: error: cannot find input file: $f" >&2;}
8775    { (exit 1); exit 1; }; }
8776          echo $f;;
8777@@ -27026,7 +27047,7 @@
8778            echo $srcdir/$f
8779          else
8780            # /dev/null tree
8781-           { { echo "$as_me:27029: error: cannot find input file: $f" >&5
8782+           { { echo "$as_me:27050: error: cannot find input file: $f" >&5
8783 echo "$as_me: error: cannot find input file: $f" >&2;}
8784    { (exit 1); exit 1; }; }
8785          fi;;
8786@@ -27042,7 +27063,7 @@
8787       if test -n "$ac_seen"; then
8788         ac_used=`grep '@datarootdir@' $ac_item`
8789         if test -z "$ac_used"; then
8790-          { echo "$as_me:27045: WARNING: datarootdir was used implicitly but not set:
8791+          { echo "$as_me:27066: WARNING: datarootdir was used implicitly but not set:
8792 $ac_seen" >&5
8793 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
8794 $ac_seen" >&2;}
8795@@ -27051,7 +27072,7 @@
8796       fi
8797       ac_seen=`grep '${datarootdir}' $ac_item`
8798       if test -n "$ac_seen"; then
8799-        { echo "$as_me:27054: WARNING: datarootdir was used explicitly but not set:
8800+        { echo "$as_me:27075: WARNING: datarootdir was used explicitly but not set:
8801 $ac_seen" >&5
8802 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
8803 $ac_seen" >&2;}
8804@@ -27088,7 +27109,7 @@
8805             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
8806             if test -z "$ac_init"; then
8807               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
8808-              { echo "$as_me:27091: WARNING: Variable $ac_name is used but was not set:
8809+              { echo "$as_me:27112: WARNING: Variable $ac_name is used but was not set:
8810 $ac_seen" >&5
8811 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
8812 $ac_seen" >&2;}
8813@@ -27099,7 +27120,7 @@
8814     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
8815     if test -s $tmp/out; then
8816       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
8817-      { echo "$as_me:27102: WARNING: Some variables may not be substituted:
8818+      { echo "$as_me:27123: WARNING: Some variables may not be substituted:
8819 $ac_seen" >&5
8820 echo "$as_me: WARNING: Some variables may not be substituted:
8821 $ac_seen" >&2;}
8822@@ -27148,7 +27169,7 @@
8823   * )   ac_file_in=$ac_file.in ;;
8824   esac
8825
8826-  test x"$ac_file" != x- && { echo "$as_me:27151: creating $ac_file" >&5
8827+  test x"$ac_file" != x- && { echo "$as_me:27172: creating $ac_file" >&5
8828 echo "$as_me: creating $ac_file" >&6;}
8829
8830   # First look for the input files in the build tree, otherwise in the
8831@@ -27159,7 +27180,7 @@
8832       -) echo $tmp/stdin ;;
8833       [\\/$]*)
8834          # Absolute (can't be DOS-style, as IFS=:)
8835-         test -f "$f" || { { echo "$as_me:27162: error: cannot find input file: $f" >&5
8836+         test -f "$f" || { { echo "$as_me:27183: error: cannot find input file: $f" >&5
8837 echo "$as_me: error: cannot find input file: $f" >&2;}
8838    { (exit 1); exit 1; }; }
8839          echo $f;;
8840@@ -27172,7 +27193,7 @@
8841            echo $srcdir/$f
8842          else
8843            # /dev/null tree
8844-           { { echo "$as_me:27175: error: cannot find input file: $f" >&5
8845+           { { echo "$as_me:27196: error: cannot find input file: $f" >&5
8846 echo "$as_me: error: cannot find input file: $f" >&2;}
8847    { (exit 1); exit 1; }; }
8848          fi;;
8849@@ -27230,7 +27251,7 @@
8850   rm -f $tmp/in
8851   if test x"$ac_file" != x-; then
8852     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
8853-      { echo "$as_me:27233: $ac_file is unchanged" >&5
8854+      { echo "$as_me:27254: $ac_file is unchanged" >&5
8855 echo "$as_me: $ac_file is unchanged" >&6;}
8856     else
8857       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
8858@@ -27575,7 +27596,7 @@
8859 				(cygdll|msysdll|mingw)
8860 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
8861
8862-echo "${as_me:-configure}:27578: testing overriding CXX_MODEL to SHARED ..." 1>&5
8863+echo "${as_me:-configure}:27599: testing overriding CXX_MODEL to SHARED ..." 1>&5
8864
8865 					with_shared_cxx=yes
8866 					;;
8867Index: configure.in
8868Prereq:  1.691
8869--- ncurses-6.1-20200104+/configure.in	2019-11-16 15:54:47.000000000 +0000
8870+++ ncurses-6.1-20200111/configure.in	2020-01-11 23:27:16.000000000 +0000
8871@@ -1,5 +1,5 @@
8872 dnl***************************************************************************
8873-dnl Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
8874+dnl Copyright (c) 1998-2019,2020 Free Software Foundation, Inc.              *
8875 dnl                                                                          *
8876 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
8877 dnl copy of this software and associated documentation files (the            *
8878@@ -28,17 +28,21 @@
8879 dnl
8880 dnl Author: Thomas E. Dickey 1995-on
8881 dnl
8882-dnl $Id: configure.in,v 1.691 2019/11/16 15:54:47 tom Exp $
8883+dnl $Id: configure.in,v 1.693 2020/01/11 23:27:16 tom Exp $
8884 dnl Process this file with autoconf to produce a configure script.
8885 dnl
8886-dnl See https://invisible-island.net/autoconf/ for additional information.
8887+dnl For additional information, see
8888+dnl     https://invisible-island.net/autoconf/
8889+dnl     https://invisible-island.net/autoconf/my-autoconf.html
8890 dnl
8891 dnl ---------------------------------------------------------------------------
8892-AC_PREREQ(2.52.20170501)
8893-AC_REVISION($Revision: 1.691 $)
8894+AC_PREREQ(2.52.20200111)
8895+AC_REVISION($Revision: 1.693 $)
8896 AC_INIT(ncurses/base/lib_initscr.c)
8897 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
8898
8899+AC_DEFUN([AC_PATH_XTRA],[])dnl ignore dependencies on this
8900+
8901 CF_TOP_BUILDDIR
8902 CF_SUBST_NCURSES_VERSION
8903 CF_VERSION_INFO(NCURSES,ncurses)
8904Index: dist.mk
8905Prereq:  1.1323
8906--- ncurses-6.1-20200104+/dist.mk	2020-01-05 01:33:20.000000000 +0000
8907+++ ncurses-6.1-20200111/dist.mk	2020-01-11 10:59:50.000000000 +0000
8908@@ -25,7 +25,7 @@
8909 # use or other dealings in this Software without prior written               #
8910 # authorization.                                                             #
8911 ##############################################################################
8912-# $Id: dist.mk,v 1.1323 2020/01/05 01:33:20 tom Exp $
8913+# $Id: dist.mk,v 1.1324 2020/01/11 10:59:50 tom Exp $
8914 # Makefile for creating ncurses distributions.
8915 #
8916 # This only needs to be used directly as a makefile by developers, but
8917@@ -37,7 +37,7 @@
8918 # These define the major/minor/patch versions of ncurses.
8919 NCURSES_MAJOR = 6
8920 NCURSES_MINOR = 1
8921-NCURSES_PATCH = 20200104
8922+NCURSES_PATCH = 20200111
8923
8924 # We don't append the patch to the version, since this only applies to releases
8925 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
8926Index: package/debian-mingw/changelog
8927--- ncurses-6.1-20200104+/package/debian-mingw/changelog	2020-01-04 14:49:29.000000000 +0000
8928+++ ncurses-6.1-20200111/package/debian-mingw/changelog	2020-01-11 10:59:50.000000000 +0000
8929@@ -1,8 +1,8 @@
8930-ncurses6 (6.1+20200104) unstable; urgency=low
8931+ncurses6 (6.1+20200111) unstable; urgency=low
8932
8933   * latest weekly patch
8934
8935- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 31 Dec 2019 04:35:37 -0500
8936+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 Jan 2020 05:59:50 -0500
8937
8938 ncurses6 (5.9-20131005) unstable; urgency=low
8939
8940Index: package/debian-mingw64/changelog
8941--- ncurses-6.1-20200104+/package/debian-mingw64/changelog	2020-01-04 14:49:29.000000000 +0000
8942+++ ncurses-6.1-20200111/package/debian-mingw64/changelog	2020-01-11 10:59:50.000000000 +0000
8943@@ -1,8 +1,8 @@
8944-ncurses6 (6.1+20200104) unstable; urgency=low
8945+ncurses6 (6.1+20200111) unstable; urgency=low
8946
8947   * latest weekly patch
8948
8949- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 31 Dec 2019 04:35:37 -0500
8950+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 Jan 2020 05:59:50 -0500
8951
8952 ncurses6 (5.9-20131005) unstable; urgency=low
8953
8954Index: package/debian/changelog
8955--- ncurses-6.1-20200104+/package/debian/changelog	2020-01-04 14:49:29.000000000 +0000
8956+++ ncurses-6.1-20200111/package/debian/changelog	2020-01-11 10:59:50.000000000 +0000
8957@@ -1,8 +1,8 @@
8958-ncurses6 (6.1+20200104) unstable; urgency=low
8959+ncurses6 (6.1+20200111) unstable; urgency=low
8960
8961   * latest weekly patch
8962
8963- -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 31 Dec 2019 04:35:37 -0500
8964+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 11 Jan 2020 05:59:50 -0500
8965
8966 ncurses6 (5.9-20120608) unstable; urgency=low
8967
8968Index: package/mingw-ncurses.nsi
8969Prereq:  1.368
8970--- ncurses-6.1-20200104+/package/mingw-ncurses.nsi	2020-01-04 14:49:29.000000000 +0000
8971+++ ncurses-6.1-20200111/package/mingw-ncurses.nsi	2020-01-11 10:59:50.000000000 +0000
8972@@ -1,4 +1,4 @@
8973-; $Id: mingw-ncurses.nsi,v 1.368 2020/01/04 14:49:29 tom Exp $
8974+; $Id: mingw-ncurses.nsi,v 1.369 2020/01/11 10:59:50 tom Exp $
8975
8976 ; TODO add examples
8977 ; TODO bump ABI to 6
8978@@ -10,7 +10,7 @@
8979 !define VERSION_MAJOR "6"
8980 !define VERSION_MINOR "1"
8981 !define VERSION_YYYY  "2020"
8982-!define VERSION_MMDD  "0104"
8983+!define VERSION_MMDD  "0111"
8984 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
8985
8986 !define MY_ABI   "5"
8987Index: package/mingw-ncurses.spec
8988--- ncurses-6.1-20200104+/package/mingw-ncurses.spec	2020-01-04 14:49:29.000000000 +0000
8989+++ ncurses-6.1-20200111/package/mingw-ncurses.spec	2020-01-11 10:59:50.000000000 +0000
8990@@ -3,7 +3,7 @@
8991 Summary: shared libraries for terminal handling
8992 Name: mingw32-ncurses6
8993 Version: 6.1
8994-Release: 20200104
8995+Release: 20200111
8996 License: X11
8997 Group: Development/Libraries
8998 Source: ncurses-%{version}-%{release}.tgz
8999Index: package/ncurses.spec
9000--- ncurses-6.1-20200104+/package/ncurses.spec	2020-01-04 14:49:29.000000000 +0000
9001+++ ncurses-6.1-20200111/package/ncurses.spec	2020-01-11 10:59:50.000000000 +0000
9002@@ -1,7 +1,7 @@
9003 Summary: shared libraries for terminal handling
9004 Name: ncurses6
9005 Version: 6.1
9006-Release: 20200104
9007+Release: 20200111
9008 License: X11
9009 Group: Development/Libraries
9010 Source: ncurses-%{version}-%{release}.tgz
9011Index: package/ncursest.spec
9012--- ncurses-6.1-20200104+/package/ncursest.spec	2020-01-04 14:49:29.000000000 +0000
9013+++ ncurses-6.1-20200111/package/ncursest.spec	2020-01-11 10:59:50.000000000 +0000
9014@@ -1,7 +1,7 @@
9015 Summary: Curses library with POSIX thread support.
9016 Name: ncursest6
9017 Version: 6.1
9018-Release: 20200104
9019+Release: 20200111
9020 License: X11
9021 Group: Development/Libraries
9022 Source: ncurses-%{version}-%{release}.tgz
9023Index: test/aclocal.m4
9024Prereq:  1.168
9025--- ncurses-6.1-20200104+/test/aclocal.m4	2019-12-31 14:02:08.000000000 +0000
9026+++ ncurses-6.1-20200111/test/aclocal.m4	2020-01-12 00:01:40.000000000 +0000
9027@@ -1,5 +1,5 @@
9028 dnl***************************************************************************
9029-dnl Copyright (c) 2003-2018,2019 Free Software Foundation, Inc.              *
9030+dnl Copyright (c) 2003-2019,2020 Free Software Foundation, Inc.              *
9031 dnl                                                                          *
9032 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
9033 dnl copy of this software and associated documentation files (the            *
9034@@ -26,7 +26,7 @@
9035 dnl authorization.                                                           *
9036 dnl***************************************************************************
9037 dnl
9038-dnl $Id: aclocal.m4,v 1.168 2019/12/31 14:02:08 tom Exp $
9039+dnl $Id: aclocal.m4,v 1.169 2020/01/12 00:01:40 tom Exp $
9040 dnl
9041 dnl Author: Thomas E. Dickey
9042 dnl
9043@@ -36,7 +36,9 @@
9044 dnl this file applies to the aggregation of macros and does not affect use of
9045 dnl these macros in other applications.
9046 dnl
9047-dnl See http://invisible-island.net/autoconf/ for additional information.
9048+dnl See these pages for additional information:
9049+dnl		https://invisible-island.net/autoconf/
9050+dnl		https://invisible-island.net/autoconf/my-autoconf.html
9051 dnl
9052 dnl ---------------------------------------------------------------------------
9053 dnl ---------------------------------------------------------------------------
9054@@ -597,7 +599,7 @@
9055 fi
9056 ])
9057 dnl ---------------------------------------------------------------------------
9058-dnl CF_CONST_X_STRING version: 1 updated: 2019/04/08 17:50:29
9059+dnl CF_CONST_X_STRING version: 3 updated: 2020/01/11 18:39:22
9060 dnl -----------------
9061 dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
9062 dnl character-strings.
9063@@ -618,6 +620,10 @@
9064 dnl compiler that String is const.
9065 AC_DEFUN([CF_CONST_X_STRING],
9066 [
9067+AC_REQUIRE([AC_PATH_XTRA])
9068+
9069+CF_SAVE_XTRA_FLAGS([CF_CONST_X_STRING])
9070+
9071 AC_TRY_COMPILE(
9072 [
9073 #include <stdlib.h>
9074@@ -639,6 +645,8 @@
9075 		])
9076 ])
9077
9078+CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING])
9079+
9080 case $cf_cv_const_x_string in
9081 (no)
9082 	CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
9083@@ -1677,12 +1685,13 @@
9084 CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
9085 ])dnl
9086 dnl ---------------------------------------------------------------------------
9087-dnl CF_GCC_WARNINGS version: 36 updated: 2019/09/07 13:38:36
9088+dnl CF_GCC_WARNINGS version: 37 updated: 2020/01/05 20:04:12
9089 dnl ---------------
9090 dnl Check if the compiler supports useful warning options.  There's a few that
9091 dnl we don't use, simply because they're too noisy:
9092 dnl
9093 dnl	-Wconversion (useful in older versions of gcc, but not in gcc 2.7.x)
9094+dnl	-Winline (usually not worthwhile)
9095 dnl	-Wredundant-decls (system headers make this too noisy)
9096 dnl	-Wtraditional (combines too many unrelated messages, only a few useful)
9097 dnl	-Wwrite-strings (too noisy, but should review occasionally).  This
9098@@ -1738,7 +1747,7 @@
9099 		fi
9100 	done
9101 	CFLAGS="$cf_save_CFLAGS"
9102-elif test "$GCC" = yes
9103+elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
9104 then
9105 	AC_CHECKING([for $CC warning options])
9106 	cf_save_CFLAGS="$CFLAGS"
9107@@ -1760,7 +1769,7 @@
9108 		Wpointer-arith \
9109 		Wshadow \
9110 		Wstrict-prototypes \
9111-		Wundef $cf_gcc_warnings $cf_warn_CONST $1
9112+		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST $1
9113 	do
9114 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
9115 		if AC_TRY_EVAL(ac_compile); then
9116@@ -3129,6 +3138,17 @@
9117 		-e 's/-[[UD]]'"$3"'\(=[[^ 	]]*\)\?[$]//g'`
9118 ])dnl
9119 dnl ---------------------------------------------------------------------------
9120+dnl CF_RESTORE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:47:45
9121+dnl ---------------------
9122+dnl Restore flags saved in CF_SAVE_XTRA_FLAGS
9123+dnl $1 = name of current macro
9124+define([CF_RESTORE_XTRA_FLAGS],
9125+[
9126+LIBS="$cf_save_LIBS_$1"
9127+CFLAGS="$cf_save_CFLAGS_$1"
9128+CPPFLAGS="$cf_save_CPPFLAGS_$1"
9129+])dnl
9130+dnl ---------------------------------------------------------------------------
9131 dnl CF_RPATH_HACK version: 11 updated: 2013/09/01 13:02:00
9132 dnl -------------
9133 AC_DEFUN([CF_RPATH_HACK],
9134@@ -3246,6 +3266,31 @@
9135 AC_SUBST(EXTRA_LDFLAGS)
9136 ])dnl
9137 dnl ---------------------------------------------------------------------------
9138+dnl CF_SAVE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:46:44
9139+dnl ------------------
9140+dnl Use this macro to save CFLAGS/CPPFLAGS/LIBS before checks against X headers
9141+dnl and libraries which do not update those variables.
9142+dnl
9143+dnl $1 = name of current macro
9144+define([CF_SAVE_XTRA_FLAGS],
9145+[
9146+cf_save_LIBS_$1="$LIBS"
9147+cf_save_CFLAGS_$1="$CFLAGS"
9148+cf_save_CPPFLAGS_$1="$CPPFLAGS"
9149+LIBS="$LIBS ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}"
9150+for cf_X_CFLAGS in $X_CFLAGS
9151+do
9152+	case "x$cf_X_CFLAGS" in
9153+	x-[[IUD]]*)
9154+		CPPFLAGS="$CPPFLAGS $cf_X_CFLAGS"
9155+		;;
9156+	*)
9157+		CFLAGS="$CFLAGS $cf_X_CFLAGS"
9158+		;;
9159+	esac
9160+done
9161+])dnl
9162+dnl ---------------------------------------------------------------------------
9163 dnl CF_SIGWINCH version: 2 updated: 2019/03/23 19:54:44
9164 dnl -----------
9165 dnl Use this macro after CF_XOPEN_SOURCE, but do not require it (not all
9166@@ -4171,12 +4216,13 @@
9167 fi
9168 ])dnl
9169 dnl ---------------------------------------------------------------------------
9170-dnl CF_X_ATHENA_CPPFLAGS version: 6 updated: 2018/06/20 20:23:13
9171+dnl CF_X_ATHENA_CPPFLAGS version: 7 updated: 2020/01/11 17:15:41
9172 dnl --------------------
9173 dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
9174 dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
9175 AC_DEFUN([CF_X_ATHENA_CPPFLAGS],
9176 [
9177+AC_REQUIRE([AC_PATH_XTRA])
9178 cf_x_athena_root=ifelse([$1],,Xaw,[$1])
9179 cf_x_athena_inc=""
9180
9181@@ -4187,10 +4233,9 @@
9182 	/usr/local
9183 do
9184 	if test -z "$cf_x_athena_inc" ; then
9185-		cf_save="$CPPFLAGS"
9186+		CF_SAVE_XTRA_FLAGS([CF_X_ATHENA_CPPFLAGS])
9187 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
9188 		if test $cf_path != default ; then
9189-			CPPFLAGS="$cf_save"
9190 			CF_APPEND_TEXT(CPPFLAGS,-I$cf_path/include)
9191 			AC_MSG_CHECKING(for $cf_test in $cf_path)
9192 		else
9193@@ -4202,11 +4247,10 @@
9194 			[cf_result=yes],
9195 			[cf_result=no])
9196 		AC_MSG_RESULT($cf_result)
9197+		CF_RESTORE_XTRA_FLAGS([CF_X_ATHENA_CPPFLAGS])
9198 		if test "$cf_result" = yes ; then
9199 			cf_x_athena_inc=$cf_path
9200 			break
9201-		else
9202-			CPPFLAGS="$cf_save"
9203 		fi
9204 	fi
9205 done
9206@@ -4219,7 +4263,7 @@
9207 fi
9208 ])
9209 dnl ---------------------------------------------------------------------------
9210-dnl CF_X_ATHENA_LIBS version: 12 updated: 2011/07/17 19:55:02
9211+dnl CF_X_ATHENA_LIBS version: 13 updated: 2020/01/11 18:16:10
9212 dnl ----------------
9213 dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
9214 dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
9215@@ -4244,29 +4288,26 @@
9216 		"-l$cf_lib -lXpm -lXmu" \
9217 		"-l${cf_lib}_s -lXmu_s"
9218 	do
9219-		if test -z "$cf_x_athena_lib" ; then
9220-			cf_save="$LIBS"
9221-			cf_test=XawSimpleMenuAddGlobalActions
9222-			if test $cf_path != default ; then
9223-				CF_ADD_LIBS(-L$cf_path/lib $cf_libs)
9224-				AC_MSG_CHECKING(for $cf_libs in $cf_path)
9225-			else
9226-				CF_ADD_LIBS($cf_libs)
9227-				AC_MSG_CHECKING(for $cf_test in $cf_libs)
9228-			fi
9229-			AC_TRY_LINK([
9230+		test -n "$cf_x_athena_lib" && break
9231+
9232+		CF_SAVE_XTRA_FLAGS([CF_X_ATHENA_LIBS])
9233+		cf_test=XawSimpleMenuAddGlobalActions
9234+		test "$cf_path" != default && cf_libs="-L$cf_path/lib $cf_libs"
9235+		CF_ADD_LIBS($cf_libs)
9236+		AC_MSG_CHECKING(for $cf_test in $cf_libs)
9237+		AC_TRY_LINK([
9238 #include <X11/Intrinsic.h>
9239 #include <X11/$cf_x_athena_root/SimpleMenu.h>
9240 ],[
9241 $cf_test((XtAppContext) 0)],
9242-				[cf_result=yes],
9243-				[cf_result=no])
9244-			AC_MSG_RESULT($cf_result)
9245-			if test "$cf_result" = yes ; then
9246-				cf_x_athena_lib="$cf_libs"
9247-				break
9248-			fi
9249-			LIBS="$cf_save"
9250+			[cf_result=yes],
9251+			[cf_result=no])
9252+		AC_MSG_RESULT($cf_result)
9253+		CF_RESTORE_XTRA_FLAGS([CF_X_ATHENA_LIBS])
9254+
9255+		if test "$cf_result" = yes ; then
9256+			cf_x_athena_lib="$cf_libs"
9257+			break
9258 		fi
9259 	done # cf_libs
9260 		test -n "$cf_x_athena_lib" && break
9261@@ -4278,6 +4319,7 @@
9262 [Unable to successfully link Athena library (-l$cf_x_athena_root) with test program])
9263 fi
9264
9265+CF_ADD_LIBS($cf_x_athena_lib)
9266 CF_UPPER(cf_x_athena_LIBS,HAVE_LIB_$cf_x_athena)
9267 AC_DEFINE_UNQUOTED($cf_x_athena_LIBS)
9268 ])
9269Index: test/configure
9270--- ncurses-6.1-20200104+/test/configure	2019-12-31 14:02:40.000000000 +0000
9271+++ ncurses-6.1-20200111/test/configure	2020-01-12 00:02:42.000000000 +0000
9272@@ -1,6 +1,6 @@
9273 #! /bin/sh
9274 # Guess values for system-dependent variables and create Makefiles.
9275-# Generated by Autoconf 2.52.20190901.
9276+# Generated by Autoconf 2.52.20200111.
9277 #
9278 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
9279 # Free Software Foundation, Inc.
9280@@ -765,7 +765,7 @@
9281 running configure, to aid debugging if configure makes a mistake.
9282
9283 It was created by $as_me, which was
9284-generated by GNU Autoconf 2.52.20190901.  Invocation command line was
9285+generated by GNU Autoconf 2.52.20200111.  Invocation command line was
9286
9287   $ $0 $@
9288
9289@@ -11256,6 +11256,9 @@
9290 /usr/X11R5/include
9291 /usr/X11R4/include
9292
9293+/opt/local/include
9294+/opt/X11/include
9295+
9296 /usr/include/X11
9297 /usr/include/X11R7
9298 /usr/include/X11R6
9299@@ -11292,17 +11295,17 @@
9300   # Guess where to find include files, by looking for Intrinsic.h.
9301   # First, try using that file with no special directory specified.
9302   cat >conftest.$ac_ext <<_ACEOF
9303-#line 11295 "configure"
9304+#line 11298 "configure"
9305 #include "confdefs.h"
9306 #include <X11/Intrinsic.h>
9307 _ACEOF
9308-if { (eval echo "$as_me:11299: \"$ac_cpp conftest.$ac_ext\"") >&5
9309+if { (eval echo "$as_me:11302: \"$ac_cpp conftest.$ac_ext\"") >&5
9310   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
9311   ac_status=$?
9312   egrep -v '^ *\+' conftest.er1 >conftest.err
9313   rm -f conftest.er1
9314   cat conftest.err >&5
9315-  echo "$as_me:11305: \$? = $ac_status" >&5
9316+  echo "$as_me:11308: \$? = $ac_status" >&5
9317   (exit $ac_status); } >/dev/null; then
9318   if test -s conftest.err; then
9319     ac_cpp_err=$ac_c_preproc_warn_flag
9320@@ -11335,7 +11338,7 @@
9321   ac_save_LIBS=$LIBS
9322   LIBS="-lXt $LIBS"
9323   cat >conftest.$ac_ext <<_ACEOF
9324-#line 11338 "configure"
9325+#line 11341 "configure"
9326 #include "confdefs.h"
9327 #include <X11/Intrinsic.h>
9328 int
9329@@ -11347,16 +11350,16 @@
9330 }
9331 _ACEOF
9332 rm -f conftest.$ac_objext conftest$ac_exeext
9333-if { (eval echo "$as_me:11350: \"$ac_link\"") >&5
9334+if { (eval echo "$as_me:11353: \"$ac_link\"") >&5
9335   (eval $ac_link) 2>&5
9336   ac_status=$?
9337-  echo "$as_me:11353: \$? = $ac_status" >&5
9338+  echo "$as_me:11356: \$? = $ac_status" >&5
9339   (exit $ac_status); } &&
9340          { ac_try='test -s conftest$ac_exeext'
9341-  { (eval echo "$as_me:11356: \"$ac_try\"") >&5
9342+  { (eval echo "$as_me:11359: \"$ac_try\"") >&5
9343   (eval $ac_try) 2>&5
9344   ac_status=$?
9345-  echo "$as_me:11359: \$? = $ac_status" >&5
9346+  echo "$as_me:11362: \$? = $ac_status" >&5
9347   (exit $ac_status); }; }; then
9348   LIBS=$ac_save_LIBS
9349 # We can link X programs with no special library path.
9350@@ -11394,7 +11397,7 @@
9351 fi # $with_x != no
9352
9353 if test "$have_x" != yes; then
9354-  echo "$as_me:11397: result: $have_x" >&5
9355+  echo "$as_me:11400: result: $have_x" >&5
9356 echo "${ECHO_T}$have_x" >&6
9357   no_x=yes
9358 else
9359@@ -11404,7 +11407,7 @@
9360   # Update the cache value to reflect the command line values.
9361   ac_cv_have_x="have_x=yes \
9362 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
9363-  echo "$as_me:11407: result: libraries $x_libraries, headers $x_includes" >&5
9364+  echo "$as_me:11410: result: libraries $x_libraries, headers $x_includes" >&5
9365 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
9366 fi
9367
9368@@ -11428,11 +11431,11 @@
9369     # others require no space.  Words are not sufficient . . . .
9370     case `(uname -sr) 2>/dev/null` in
9371     "SunOS 5"*)
9372-      echo "$as_me:11431: checking whether -R must be followed by a space" >&5
9373+      echo "$as_me:11434: checking whether -R must be followed by a space" >&5
9374 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
9375       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
9376       cat >conftest.$ac_ext <<_ACEOF
9377-#line 11435 "configure"
9378+#line 11438 "configure"
9379 #include "confdefs.h"
9380
9381 int
9382@@ -11444,16 +11447,16 @@
9383 }
9384 _ACEOF
9385 rm -f conftest.$ac_objext conftest$ac_exeext
9386-if { (eval echo "$as_me:11447: \"$ac_link\"") >&5
9387+if { (eval echo "$as_me:11450: \"$ac_link\"") >&5
9388   (eval $ac_link) 2>&5
9389   ac_status=$?
9390-  echo "$as_me:11450: \$? = $ac_status" >&5
9391+  echo "$as_me:11453: \$? = $ac_status" >&5
9392   (exit $ac_status); } &&
9393          { ac_try='test -s conftest$ac_exeext'
9394-  { (eval echo "$as_me:11453: \"$ac_try\"") >&5
9395+  { (eval echo "$as_me:11456: \"$ac_try\"") >&5
9396   (eval $ac_try) 2>&5
9397   ac_status=$?
9398-  echo "$as_me:11456: \$? = $ac_status" >&5
9399+  echo "$as_me:11459: \$? = $ac_status" >&5
9400   (exit $ac_status); }; }; then
9401   ac_R_nospace=yes
9402 else
9403@@ -11463,13 +11466,13 @@
9404 fi
9405 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9406       if test $ac_R_nospace = yes; then
9407-	echo "$as_me:11466: result: no" >&5
9408+	echo "$as_me:11469: result: no" >&5
9409 echo "${ECHO_T}no" >&6
9410 	X_LIBS="$X_LIBS -R$x_libraries"
9411       else
9412 	LIBS="$ac_xsave_LIBS -R $x_libraries"
9413 	cat >conftest.$ac_ext <<_ACEOF
9414-#line 11472 "configure"
9415+#line 11475 "configure"
9416 #include "confdefs.h"
9417
9418 int
9419@@ -11481,16 +11484,16 @@
9420 }
9421 _ACEOF
9422 rm -f conftest.$ac_objext conftest$ac_exeext
9423-if { (eval echo "$as_me:11484: \"$ac_link\"") >&5
9424+if { (eval echo "$as_me:11487: \"$ac_link\"") >&5
9425   (eval $ac_link) 2>&5
9426   ac_status=$?
9427-  echo "$as_me:11487: \$? = $ac_status" >&5
9428+  echo "$as_me:11490: \$? = $ac_status" >&5
9429   (exit $ac_status); } &&
9430          { ac_try='test -s conftest$ac_exeext'
9431-  { (eval echo "$as_me:11490: \"$ac_try\"") >&5
9432+  { (eval echo "$as_me:11493: \"$ac_try\"") >&5
9433   (eval $ac_try) 2>&5
9434   ac_status=$?
9435-  echo "$as_me:11493: \$? = $ac_status" >&5
9436+  echo "$as_me:11496: \$? = $ac_status" >&5
9437   (exit $ac_status); }; }; then
9438   ac_R_space=yes
9439 else
9440@@ -11500,11 +11503,11 @@
9441 fi
9442 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9443 	if test $ac_R_space = yes; then
9444-	  echo "$as_me:11503: result: yes" >&5
9445+	  echo "$as_me:11506: result: yes" >&5
9446 echo "${ECHO_T}yes" >&6
9447 	  X_LIBS="$X_LIBS -R $x_libraries"
9448 	else
9449-	  echo "$as_me:11507: result: neither works" >&5
9450+	  echo "$as_me:11510: result: neither works" >&5
9451 echo "${ECHO_T}neither works" >&6
9452 	fi
9453       fi
9454@@ -11524,7 +11527,7 @@
9455     # the Alpha needs dnet_stub (dnet does not exist).
9456     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
9457     cat >conftest.$ac_ext <<_ACEOF
9458-#line 11527 "configure"
9459+#line 11530 "configure"
9460 #include "confdefs.h"
9461
9462 /* Override any gcc2 internal prototype to avoid an error.  */
9463@@ -11543,22 +11546,22 @@
9464 }
9465 _ACEOF
9466 rm -f conftest.$ac_objext conftest$ac_exeext
9467-if { (eval echo "$as_me:11546: \"$ac_link\"") >&5
9468+if { (eval echo "$as_me:11549: \"$ac_link\"") >&5
9469   (eval $ac_link) 2>&5
9470   ac_status=$?
9471-  echo "$as_me:11549: \$? = $ac_status" >&5
9472+  echo "$as_me:11552: \$? = $ac_status" >&5
9473   (exit $ac_status); } &&
9474          { ac_try='test -s conftest$ac_exeext'
9475-  { (eval echo "$as_me:11552: \"$ac_try\"") >&5
9476+  { (eval echo "$as_me:11555: \"$ac_try\"") >&5
9477   (eval $ac_try) 2>&5
9478   ac_status=$?
9479-  echo "$as_me:11555: \$? = $ac_status" >&5
9480+  echo "$as_me:11558: \$? = $ac_status" >&5
9481   (exit $ac_status); }; }; then
9482   :
9483 else
9484   echo "$as_me: failed program was:" >&5
9485 cat conftest.$ac_ext >&5
9486-echo "$as_me:11561: checking for dnet_ntoa in -ldnet" >&5
9487+echo "$as_me:11564: checking for dnet_ntoa in -ldnet" >&5
9488 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
9489 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
9490   echo $ECHO_N "(cached) $ECHO_C" >&6
9491@@ -11566,7 +11569,7 @@
9492   ac_check_lib_save_LIBS=$LIBS
9493 LIBS="-ldnet  $LIBS"
9494 cat >conftest.$ac_ext <<_ACEOF
9495-#line 11569 "configure"
9496+#line 11572 "configure"
9497 #include "confdefs.h"
9498
9499 /* Override any gcc2 internal prototype to avoid an error.  */
9500@@ -11585,16 +11588,16 @@
9501 }
9502 _ACEOF
9503 rm -f conftest.$ac_objext conftest$ac_exeext
9504-if { (eval echo "$as_me:11588: \"$ac_link\"") >&5
9505+if { (eval echo "$as_me:11591: \"$ac_link\"") >&5
9506   (eval $ac_link) 2>&5
9507   ac_status=$?
9508-  echo "$as_me:11591: \$? = $ac_status" >&5
9509+  echo "$as_me:11594: \$? = $ac_status" >&5
9510   (exit $ac_status); } &&
9511          { ac_try='test -s conftest$ac_exeext'
9512-  { (eval echo "$as_me:11594: \"$ac_try\"") >&5
9513+  { (eval echo "$as_me:11597: \"$ac_try\"") >&5
9514   (eval $ac_try) 2>&5
9515   ac_status=$?
9516-  echo "$as_me:11597: \$? = $ac_status" >&5
9517+  echo "$as_me:11600: \$? = $ac_status" >&5
9518   (exit $ac_status); }; }; then
9519   ac_cv_lib_dnet_dnet_ntoa=yes
9520 else
9521@@ -11605,14 +11608,14 @@
9522 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9523 LIBS=$ac_check_lib_save_LIBS
9524 fi
9525-echo "$as_me:11608: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
9526+echo "$as_me:11611: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
9527 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
9528 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
9529   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
9530 fi
9531
9532     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
9533-      echo "$as_me:11615: checking for dnet_ntoa in -ldnet_stub" >&5
9534+      echo "$as_me:11618: checking for dnet_ntoa in -ldnet_stub" >&5
9535 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
9536 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
9537   echo $ECHO_N "(cached) $ECHO_C" >&6
9538@@ -11620,7 +11623,7 @@
9539   ac_check_lib_save_LIBS=$LIBS
9540 LIBS="-ldnet_stub  $LIBS"
9541 cat >conftest.$ac_ext <<_ACEOF
9542-#line 11623 "configure"
9543+#line 11626 "configure"
9544 #include "confdefs.h"
9545
9546 /* Override any gcc2 internal prototype to avoid an error.  */
9547@@ -11639,16 +11642,16 @@
9548 }
9549 _ACEOF
9550 rm -f conftest.$ac_objext conftest$ac_exeext
9551-if { (eval echo "$as_me:11642: \"$ac_link\"") >&5
9552+if { (eval echo "$as_me:11645: \"$ac_link\"") >&5
9553   (eval $ac_link) 2>&5
9554   ac_status=$?
9555-  echo "$as_me:11645: \$? = $ac_status" >&5
9556+  echo "$as_me:11648: \$? = $ac_status" >&5
9557   (exit $ac_status); } &&
9558          { ac_try='test -s conftest$ac_exeext'
9559-  { (eval echo "$as_me:11648: \"$ac_try\"") >&5
9560+  { (eval echo "$as_me:11651: \"$ac_try\"") >&5
9561   (eval $ac_try) 2>&5
9562   ac_status=$?
9563-  echo "$as_me:11651: \$? = $ac_status" >&5
9564+  echo "$as_me:11654: \$? = $ac_status" >&5
9565   (exit $ac_status); }; }; then
9566   ac_cv_lib_dnet_stub_dnet_ntoa=yes
9567 else
9568@@ -11659,7 +11662,7 @@
9569 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9570 LIBS=$ac_check_lib_save_LIBS
9571 fi
9572-echo "$as_me:11662: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
9573+echo "$as_me:11665: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
9574 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
9575 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
9576   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
9577@@ -11678,13 +11681,13 @@
9578     # on Irix 5.2, according to T.E. Dickey.
9579     # The functions gethostbyname, getservbyname, and inet_addr are
9580     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
9581-    echo "$as_me:11681: checking for gethostbyname" >&5
9582+    echo "$as_me:11684: checking for gethostbyname" >&5
9583 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
9584 if test "${ac_cv_func_gethostbyname+set}" = set; then
9585   echo $ECHO_N "(cached) $ECHO_C" >&6
9586 else
9587   cat >conftest.$ac_ext <<_ACEOF
9588-#line 11687 "configure"
9589+#line 11690 "configure"
9590 #include "confdefs.h"
9591 #define gethostbyname autoconf_temporary
9592 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
9593@@ -11715,16 +11718,16 @@
9594 }
9595 _ACEOF
9596 rm -f conftest.$ac_objext conftest$ac_exeext
9597-if { (eval echo "$as_me:11718: \"$ac_link\"") >&5
9598+if { (eval echo "$as_me:11721: \"$ac_link\"") >&5
9599   (eval $ac_link) 2>&5
9600   ac_status=$?
9601-  echo "$as_me:11721: \$? = $ac_status" >&5
9602+  echo "$as_me:11724: \$? = $ac_status" >&5
9603   (exit $ac_status); } &&
9604          { ac_try='test -s conftest$ac_exeext'
9605-  { (eval echo "$as_me:11724: \"$ac_try\"") >&5
9606+  { (eval echo "$as_me:11727: \"$ac_try\"") >&5
9607   (eval $ac_try) 2>&5
9608   ac_status=$?
9609-  echo "$as_me:11727: \$? = $ac_status" >&5
9610+  echo "$as_me:11730: \$? = $ac_status" >&5
9611   (exit $ac_status); }; }; then
9612   ac_cv_func_gethostbyname=yes
9613 else
9614@@ -11734,11 +11737,11 @@
9615 fi
9616 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9617 fi
9618-echo "$as_me:11737: result: $ac_cv_func_gethostbyname" >&5
9619+echo "$as_me:11740: result: $ac_cv_func_gethostbyname" >&5
9620 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
9621
9622     if test $ac_cv_func_gethostbyname = no; then
9623-      echo "$as_me:11741: checking for gethostbyname in -lnsl" >&5
9624+      echo "$as_me:11744: checking for gethostbyname in -lnsl" >&5
9625 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
9626 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
9627   echo $ECHO_N "(cached) $ECHO_C" >&6
9628@@ -11746,7 +11749,7 @@
9629   ac_check_lib_save_LIBS=$LIBS
9630 LIBS="-lnsl  $LIBS"
9631 cat >conftest.$ac_ext <<_ACEOF
9632-#line 11749 "configure"
9633+#line 11752 "configure"
9634 #include "confdefs.h"
9635
9636 /* Override any gcc2 internal prototype to avoid an error.  */
9637@@ -11765,16 +11768,16 @@
9638 }
9639 _ACEOF
9640 rm -f conftest.$ac_objext conftest$ac_exeext
9641-if { (eval echo "$as_me:11768: \"$ac_link\"") >&5
9642+if { (eval echo "$as_me:11771: \"$ac_link\"") >&5
9643   (eval $ac_link) 2>&5
9644   ac_status=$?
9645-  echo "$as_me:11771: \$? = $ac_status" >&5
9646+  echo "$as_me:11774: \$? = $ac_status" >&5
9647   (exit $ac_status); } &&
9648          { ac_try='test -s conftest$ac_exeext'
9649-  { (eval echo "$as_me:11774: \"$ac_try\"") >&5
9650+  { (eval echo "$as_me:11777: \"$ac_try\"") >&5
9651   (eval $ac_try) 2>&5
9652   ac_status=$?
9653-  echo "$as_me:11777: \$? = $ac_status" >&5
9654+  echo "$as_me:11780: \$? = $ac_status" >&5
9655   (exit $ac_status); }; }; then
9656   ac_cv_lib_nsl_gethostbyname=yes
9657 else
9658@@ -11785,14 +11788,14 @@
9659 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9660 LIBS=$ac_check_lib_save_LIBS
9661 fi
9662-echo "$as_me:11788: result: $ac_cv_lib_nsl_gethostbyname" >&5
9663+echo "$as_me:11791: result: $ac_cv_lib_nsl_gethostbyname" >&5
9664 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
9665 if test $ac_cv_lib_nsl_gethostbyname = yes; then
9666   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
9667 fi
9668
9669       if test $ac_cv_lib_nsl_gethostbyname = no; then
9670-        echo "$as_me:11795: checking for gethostbyname in -lbsd" >&5
9671+        echo "$as_me:11798: checking for gethostbyname in -lbsd" >&5
9672 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
9673 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
9674   echo $ECHO_N "(cached) $ECHO_C" >&6
9675@@ -11800,7 +11803,7 @@
9676   ac_check_lib_save_LIBS=$LIBS
9677 LIBS="-lbsd  $LIBS"
9678 cat >conftest.$ac_ext <<_ACEOF
9679-#line 11803 "configure"
9680+#line 11806 "configure"
9681 #include "confdefs.h"
9682
9683 /* Override any gcc2 internal prototype to avoid an error.  */
9684@@ -11819,16 +11822,16 @@
9685 }
9686 _ACEOF
9687 rm -f conftest.$ac_objext conftest$ac_exeext
9688-if { (eval echo "$as_me:11822: \"$ac_link\"") >&5
9689+if { (eval echo "$as_me:11825: \"$ac_link\"") >&5
9690   (eval $ac_link) 2>&5
9691   ac_status=$?
9692-  echo "$as_me:11825: \$? = $ac_status" >&5
9693+  echo "$as_me:11828: \$? = $ac_status" >&5
9694   (exit $ac_status); } &&
9695          { ac_try='test -s conftest$ac_exeext'
9696-  { (eval echo "$as_me:11828: \"$ac_try\"") >&5
9697+  { (eval echo "$as_me:11831: \"$ac_try\"") >&5
9698   (eval $ac_try) 2>&5
9699   ac_status=$?
9700-  echo "$as_me:11831: \$? = $ac_status" >&5
9701+  echo "$as_me:11834: \$? = $ac_status" >&5
9702   (exit $ac_status); }; }; then
9703   ac_cv_lib_bsd_gethostbyname=yes
9704 else
9705@@ -11839,7 +11842,7 @@
9706 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9707 LIBS=$ac_check_lib_save_LIBS
9708 fi
9709-echo "$as_me:11842: result: $ac_cv_lib_bsd_gethostbyname" >&5
9710+echo "$as_me:11845: result: $ac_cv_lib_bsd_gethostbyname" >&5
9711 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
9712 if test $ac_cv_lib_bsd_gethostbyname = yes; then
9713   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
9714@@ -11855,13 +11858,13 @@
9715     # variants that don't use the nameserver (or something).  -lsocket
9716     # must be given before -lnsl if both are needed.  We assume that
9717     # if connect needs -lnsl, so does gethostbyname.
9718-    echo "$as_me:11858: checking for connect" >&5
9719+    echo "$as_me:11861: checking for connect" >&5
9720 echo $ECHO_N "checking for connect... $ECHO_C" >&6
9721 if test "${ac_cv_func_connect+set}" = set; then
9722   echo $ECHO_N "(cached) $ECHO_C" >&6
9723 else
9724   cat >conftest.$ac_ext <<_ACEOF
9725-#line 11864 "configure"
9726+#line 11867 "configure"
9727 #include "confdefs.h"
9728 #define connect autoconf_temporary
9729 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
9730@@ -11892,16 +11895,16 @@
9731 }
9732 _ACEOF
9733 rm -f conftest.$ac_objext conftest$ac_exeext
9734-if { (eval echo "$as_me:11895: \"$ac_link\"") >&5
9735+if { (eval echo "$as_me:11898: \"$ac_link\"") >&5
9736   (eval $ac_link) 2>&5
9737   ac_status=$?
9738-  echo "$as_me:11898: \$? = $ac_status" >&5
9739+  echo "$as_me:11901: \$? = $ac_status" >&5
9740   (exit $ac_status); } &&
9741          { ac_try='test -s conftest$ac_exeext'
9742-  { (eval echo "$as_me:11901: \"$ac_try\"") >&5
9743+  { (eval echo "$as_me:11904: \"$ac_try\"") >&5
9744   (eval $ac_try) 2>&5
9745   ac_status=$?
9746-  echo "$as_me:11904: \$? = $ac_status" >&5
9747+  echo "$as_me:11907: \$? = $ac_status" >&5
9748   (exit $ac_status); }; }; then
9749   ac_cv_func_connect=yes
9750 else
9751@@ -11911,11 +11914,11 @@
9752 fi
9753 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9754 fi
9755-echo "$as_me:11914: result: $ac_cv_func_connect" >&5
9756+echo "$as_me:11917: result: $ac_cv_func_connect" >&5
9757 echo "${ECHO_T}$ac_cv_func_connect" >&6
9758
9759     if test $ac_cv_func_connect = no; then
9760-      echo "$as_me:11918: checking for connect in -lsocket" >&5
9761+      echo "$as_me:11921: checking for connect in -lsocket" >&5
9762 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
9763 if test "${ac_cv_lib_socket_connect+set}" = set; then
9764   echo $ECHO_N "(cached) $ECHO_C" >&6
9765@@ -11923,7 +11926,7 @@
9766   ac_check_lib_save_LIBS=$LIBS
9767 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
9768 cat >conftest.$ac_ext <<_ACEOF
9769-#line 11926 "configure"
9770+#line 11929 "configure"
9771 #include "confdefs.h"
9772
9773 /* Override any gcc2 internal prototype to avoid an error.  */
9774@@ -11942,16 +11945,16 @@
9775 }
9776 _ACEOF
9777 rm -f conftest.$ac_objext conftest$ac_exeext
9778-if { (eval echo "$as_me:11945: \"$ac_link\"") >&5
9779+if { (eval echo "$as_me:11948: \"$ac_link\"") >&5
9780   (eval $ac_link) 2>&5
9781   ac_status=$?
9782-  echo "$as_me:11948: \$? = $ac_status" >&5
9783+  echo "$as_me:11951: \$? = $ac_status" >&5
9784   (exit $ac_status); } &&
9785          { ac_try='test -s conftest$ac_exeext'
9786-  { (eval echo "$as_me:11951: \"$ac_try\"") >&5
9787+  { (eval echo "$as_me:11954: \"$ac_try\"") >&5
9788   (eval $ac_try) 2>&5
9789   ac_status=$?
9790-  echo "$as_me:11954: \$? = $ac_status" >&5
9791+  echo "$as_me:11957: \$? = $ac_status" >&5
9792   (exit $ac_status); }; }; then
9793   ac_cv_lib_socket_connect=yes
9794 else
9795@@ -11962,7 +11965,7 @@
9796 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9797 LIBS=$ac_check_lib_save_LIBS
9798 fi
9799-echo "$as_me:11965: result: $ac_cv_lib_socket_connect" >&5
9800+echo "$as_me:11968: result: $ac_cv_lib_socket_connect" >&5
9801 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
9802 if test $ac_cv_lib_socket_connect = yes; then
9803   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
9804@@ -11971,13 +11974,13 @@
9805     fi
9806
9807     # Guillermo Gomez says -lposix is necessary on A/UX.
9808-    echo "$as_me:11974: checking for remove" >&5
9809+    echo "$as_me:11977: checking for remove" >&5
9810 echo $ECHO_N "checking for remove... $ECHO_C" >&6
9811 if test "${ac_cv_func_remove+set}" = set; then
9812   echo $ECHO_N "(cached) $ECHO_C" >&6
9813 else
9814   cat >conftest.$ac_ext <<_ACEOF
9815-#line 11980 "configure"
9816+#line 11983 "configure"
9817 #include "confdefs.h"
9818 #define remove autoconf_temporary
9819 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
9820@@ -12008,16 +12011,16 @@
9821 }
9822 _ACEOF
9823 rm -f conftest.$ac_objext conftest$ac_exeext
9824-if { (eval echo "$as_me:12011: \"$ac_link\"") >&5
9825+if { (eval echo "$as_me:12014: \"$ac_link\"") >&5
9826   (eval $ac_link) 2>&5
9827   ac_status=$?
9828-  echo "$as_me:12014: \$? = $ac_status" >&5
9829+  echo "$as_me:12017: \$? = $ac_status" >&5
9830   (exit $ac_status); } &&
9831          { ac_try='test -s conftest$ac_exeext'
9832-  { (eval echo "$as_me:12017: \"$ac_try\"") >&5
9833+  { (eval echo "$as_me:12020: \"$ac_try\"") >&5
9834   (eval $ac_try) 2>&5
9835   ac_status=$?
9836-  echo "$as_me:12020: \$? = $ac_status" >&5
9837+  echo "$as_me:12023: \$? = $ac_status" >&5
9838   (exit $ac_status); }; }; then
9839   ac_cv_func_remove=yes
9840 else
9841@@ -12027,11 +12030,11 @@
9842 fi
9843 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9844 fi
9845-echo "$as_me:12030: result: $ac_cv_func_remove" >&5
9846+echo "$as_me:12033: result: $ac_cv_func_remove" >&5
9847 echo "${ECHO_T}$ac_cv_func_remove" >&6
9848
9849     if test $ac_cv_func_remove = no; then
9850-      echo "$as_me:12034: checking for remove in -lposix" >&5
9851+      echo "$as_me:12037: checking for remove in -lposix" >&5
9852 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
9853 if test "${ac_cv_lib_posix_remove+set}" = set; then
9854   echo $ECHO_N "(cached) $ECHO_C" >&6
9855@@ -12039,7 +12042,7 @@
9856   ac_check_lib_save_LIBS=$LIBS
9857 LIBS="-lposix  $LIBS"
9858 cat >conftest.$ac_ext <<_ACEOF
9859-#line 12042 "configure"
9860+#line 12045 "configure"
9861 #include "confdefs.h"
9862
9863 /* Override any gcc2 internal prototype to avoid an error.  */
9864@@ -12058,16 +12061,16 @@
9865 }
9866 _ACEOF
9867 rm -f conftest.$ac_objext conftest$ac_exeext
9868-if { (eval echo "$as_me:12061: \"$ac_link\"") >&5
9869+if { (eval echo "$as_me:12064: \"$ac_link\"") >&5
9870   (eval $ac_link) 2>&5
9871   ac_status=$?
9872-  echo "$as_me:12064: \$? = $ac_status" >&5
9873+  echo "$as_me:12067: \$? = $ac_status" >&5
9874   (exit $ac_status); } &&
9875          { ac_try='test -s conftest$ac_exeext'
9876-  { (eval echo "$as_me:12067: \"$ac_try\"") >&5
9877+  { (eval echo "$as_me:12070: \"$ac_try\"") >&5
9878   (eval $ac_try) 2>&5
9879   ac_status=$?
9880-  echo "$as_me:12070: \$? = $ac_status" >&5
9881+  echo "$as_me:12073: \$? = $ac_status" >&5
9882   (exit $ac_status); }; }; then
9883   ac_cv_lib_posix_remove=yes
9884 else
9885@@ -12078,7 +12081,7 @@
9886 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9887 LIBS=$ac_check_lib_save_LIBS
9888 fi
9889-echo "$as_me:12081: result: $ac_cv_lib_posix_remove" >&5
9890+echo "$as_me:12084: result: $ac_cv_lib_posix_remove" >&5
9891 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
9892 if test $ac_cv_lib_posix_remove = yes; then
9893   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
9894@@ -12087,13 +12090,13 @@
9895     fi
9896
9897     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
9898-    echo "$as_me:12090: checking for shmat" >&5
9899+    echo "$as_me:12093: checking for shmat" >&5
9900 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
9901 if test "${ac_cv_func_shmat+set}" = set; then
9902   echo $ECHO_N "(cached) $ECHO_C" >&6
9903 else
9904   cat >conftest.$ac_ext <<_ACEOF
9905-#line 12096 "configure"
9906+#line 12099 "configure"
9907 #include "confdefs.h"
9908 #define shmat autoconf_temporary
9909 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
9910@@ -12124,16 +12127,16 @@
9911 }
9912 _ACEOF
9913 rm -f conftest.$ac_objext conftest$ac_exeext
9914-if { (eval echo "$as_me:12127: \"$ac_link\"") >&5
9915+if { (eval echo "$as_me:12130: \"$ac_link\"") >&5
9916   (eval $ac_link) 2>&5
9917   ac_status=$?
9918-  echo "$as_me:12130: \$? = $ac_status" >&5
9919+  echo "$as_me:12133: \$? = $ac_status" >&5
9920   (exit $ac_status); } &&
9921          { ac_try='test -s conftest$ac_exeext'
9922-  { (eval echo "$as_me:12133: \"$ac_try\"") >&5
9923+  { (eval echo "$as_me:12136: \"$ac_try\"") >&5
9924   (eval $ac_try) 2>&5
9925   ac_status=$?
9926-  echo "$as_me:12136: \$? = $ac_status" >&5
9927+  echo "$as_me:12139: \$? = $ac_status" >&5
9928   (exit $ac_status); }; }; then
9929   ac_cv_func_shmat=yes
9930 else
9931@@ -12143,11 +12146,11 @@
9932 fi
9933 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9934 fi
9935-echo "$as_me:12146: result: $ac_cv_func_shmat" >&5
9936+echo "$as_me:12149: result: $ac_cv_func_shmat" >&5
9937 echo "${ECHO_T}$ac_cv_func_shmat" >&6
9938
9939     if test $ac_cv_func_shmat = no; then
9940-      echo "$as_me:12150: checking for shmat in -lipc" >&5
9941+      echo "$as_me:12153: checking for shmat in -lipc" >&5
9942 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
9943 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
9944   echo $ECHO_N "(cached) $ECHO_C" >&6
9945@@ -12155,7 +12158,7 @@
9946   ac_check_lib_save_LIBS=$LIBS
9947 LIBS="-lipc  $LIBS"
9948 cat >conftest.$ac_ext <<_ACEOF
9949-#line 12158 "configure"
9950+#line 12161 "configure"
9951 #include "confdefs.h"
9952
9953 /* Override any gcc2 internal prototype to avoid an error.  */
9954@@ -12174,16 +12177,16 @@
9955 }
9956 _ACEOF
9957 rm -f conftest.$ac_objext conftest$ac_exeext
9958-if { (eval echo "$as_me:12177: \"$ac_link\"") >&5
9959+if { (eval echo "$as_me:12180: \"$ac_link\"") >&5
9960   (eval $ac_link) 2>&5
9961   ac_status=$?
9962-  echo "$as_me:12180: \$? = $ac_status" >&5
9963+  echo "$as_me:12183: \$? = $ac_status" >&5
9964   (exit $ac_status); } &&
9965          { ac_try='test -s conftest$ac_exeext'
9966-  { (eval echo "$as_me:12183: \"$ac_try\"") >&5
9967+  { (eval echo "$as_me:12186: \"$ac_try\"") >&5
9968   (eval $ac_try) 2>&5
9969   ac_status=$?
9970-  echo "$as_me:12186: \$? = $ac_status" >&5
9971+  echo "$as_me:12189: \$? = $ac_status" >&5
9972   (exit $ac_status); }; }; then
9973   ac_cv_lib_ipc_shmat=yes
9974 else
9975@@ -12194,7 +12197,7 @@
9976 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9977 LIBS=$ac_check_lib_save_LIBS
9978 fi
9979-echo "$as_me:12197: result: $ac_cv_lib_ipc_shmat" >&5
9980+echo "$as_me:12200: result: $ac_cv_lib_ipc_shmat" >&5
9981 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
9982 if test $ac_cv_lib_ipc_shmat = yes; then
9983   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
9984@@ -12212,7 +12215,7 @@
9985   # These have to be linked with before -lX11, unlike the other
9986   # libraries we check for below, so use a different variable.
9987   # John Interrante, Karl Berry
9988-  echo "$as_me:12215: checking for IceConnectionNumber in -lICE" >&5
9989+  echo "$as_me:12218: checking for IceConnectionNumber in -lICE" >&5
9990 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
9991 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
9992   echo $ECHO_N "(cached) $ECHO_C" >&6
9993@@ -12220,7 +12223,7 @@
9994   ac_check_lib_save_LIBS=$LIBS
9995 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
9996 cat >conftest.$ac_ext <<_ACEOF
9997-#line 12223 "configure"
9998+#line 12226 "configure"
9999 #include "confdefs.h"
10000
10001 /* Override any gcc2 internal prototype to avoid an error.  */
10002@@ -12239,16 +12242,16 @@
10003 }
10004 _ACEOF
10005 rm -f conftest.$ac_objext conftest$ac_exeext
10006-if { (eval echo "$as_me:12242: \"$ac_link\"") >&5
10007+if { (eval echo "$as_me:12245: \"$ac_link\"") >&5
10008   (eval $ac_link) 2>&5
10009   ac_status=$?
10010-  echo "$as_me:12245: \$? = $ac_status" >&5
10011+  echo "$as_me:12248: \$? = $ac_status" >&5
10012   (exit $ac_status); } &&
10013          { ac_try='test -s conftest$ac_exeext'
10014-  { (eval echo "$as_me:12248: \"$ac_try\"") >&5
10015+  { (eval echo "$as_me:12251: \"$ac_try\"") >&5
10016   (eval $ac_try) 2>&5
10017   ac_status=$?
10018-  echo "$as_me:12251: \$? = $ac_status" >&5
10019+  echo "$as_me:12254: \$? = $ac_status" >&5
10020   (exit $ac_status); }; }; then
10021   ac_cv_lib_ICE_IceConnectionNumber=yes
10022 else
10023@@ -12259,7 +12262,7 @@
10024 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10025 LIBS=$ac_check_lib_save_LIBS
10026 fi
10027-echo "$as_me:12262: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
10028+echo "$as_me:12265: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
10029 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
10030 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
10031   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
10032@@ -12271,7 +12274,7 @@
10033
10034 cf_x_athena=${cf_x_athena:-Xaw}
10035
10036-echo "$as_me:12274: checking if you want to link with Xaw 3d library" >&5
10037+echo "$as_me:12277: checking if you want to link with Xaw 3d library" >&5
10038 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
10039 withval=
10040
10041@@ -12282,14 +12285,14 @@
10042 fi;
10043 if test "$withval" = yes ; then
10044 	cf_x_athena=Xaw3d
10045-	echo "$as_me:12285: result: yes" >&5
10046+	echo "$as_me:12288: result: yes" >&5
10047 echo "${ECHO_T}yes" >&6
10048 else
10049-	echo "$as_me:12288: result: no" >&5
10050+	echo "$as_me:12291: result: no" >&5
10051 echo "${ECHO_T}no" >&6
10052 fi
10053
10054-echo "$as_me:12292: checking if you want to link with Xaw 3d xft library" >&5
10055+echo "$as_me:12295: checking if you want to link with Xaw 3d xft library" >&5
10056 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
10057 withval=
10058
10059@@ -12300,14 +12303,14 @@
10060 fi;
10061 if test "$withval" = yes ; then
10062 	cf_x_athena=Xaw3dxft
10063-	echo "$as_me:12303: result: yes" >&5
10064+	echo "$as_me:12306: result: yes" >&5
10065 echo "${ECHO_T}yes" >&6
10066 else
10067-	echo "$as_me:12306: result: no" >&5
10068+	echo "$as_me:12309: result: no" >&5
10069 echo "${ECHO_T}no" >&6
10070 fi
10071
10072-echo "$as_me:12310: checking if you want to link with neXT Athena library" >&5
10073+echo "$as_me:12313: checking if you want to link with neXT Athena library" >&5
10074 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
10075 withval=
10076
10077@@ -12318,14 +12321,14 @@
10078 fi;
10079 if test "$withval" = yes ; then
10080 	cf_x_athena=neXtaw
10081-	echo "$as_me:12321: result: yes" >&5
10082+	echo "$as_me:12324: result: yes" >&5
10083 echo "${ECHO_T}yes" >&6
10084 else
10085-	echo "$as_me:12324: result: no" >&5
10086+	echo "$as_me:12327: result: no" >&5
10087 echo "${ECHO_T}no" >&6
10088 fi
10089
10090-echo "$as_me:12328: checking if you want to link with Athena-Plus library" >&5
10091+echo "$as_me:12331: checking if you want to link with Athena-Plus library" >&5
10092 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
10093 withval=
10094
10095@@ -12336,10 +12339,10 @@
10096 fi;
10097 if test "$withval" = yes ; then
10098 	cf_x_athena=XawPlus
10099-	echo "$as_me:12339: result: yes" >&5
10100+	echo "$as_me:12342: result: yes" >&5
10101 echo "${ECHO_T}yes" >&6
10102 else
10103-	echo "$as_me:12342: result: no" >&5
10104+	echo "$as_me:12345: result: no" >&5
10105 echo "${ECHO_T}no" >&6
10106 fi
10107
10108@@ -12359,17 +12362,17 @@
10109 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
10110 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
10111
10112-echo "${as_me:-configure}:12362: testing found package $cf_athena_pkg ..." 1>&5
10113+echo "${as_me:-configure}:12365: testing found package $cf_athena_pkg ..." 1>&5
10114
10115 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
10116 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   $cf_athena_pkg 2>/dev/null`"
10117 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
10118
10119-echo "${as_me:-configure}:12368: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10120+echo "${as_me:-configure}:12371: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10121
10122 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
10123
10124-echo "${as_me:-configure}:12372: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
10125+echo "${as_me:-configure}:12375: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
10126
10127 cf_fix_cppflags=no
10128 cf_new_cflags=
10129@@ -12500,20 +12503,20 @@
10130 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
10131 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
10132
10133-echo "${as_me:-configure}:12503: testing ..trimmed $LIBS ..." 1>&5
10134+echo "${as_me:-configure}:12506: testing ..trimmed $LIBS ..." 1>&5
10135
10136 			;;
10137 		esac
10138 	done
10139
10140-echo "$as_me:12509: checking for usable $cf_x_athena/Xmu package" >&5
10141+echo "$as_me:12512: checking for usable $cf_x_athena/Xmu package" >&5
10142 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
10143 if test "${cf_cv_xaw_compat+set}" = set; then
10144   echo $ECHO_N "(cached) $ECHO_C" >&6
10145 else
10146
10147 cat >conftest.$ac_ext <<_ACEOF
10148-#line 12516 "configure"
10149+#line 12519 "configure"
10150 #include "confdefs.h"
10151
10152 #include <X11/Xmu/CharSet.h>
10153@@ -12529,16 +12532,16 @@
10154 }
10155 _ACEOF
10156 rm -f conftest.$ac_objext conftest$ac_exeext
10157-if { (eval echo "$as_me:12532: \"$ac_link\"") >&5
10158+if { (eval echo "$as_me:12535: \"$ac_link\"") >&5
10159   (eval $ac_link) 2>&5
10160   ac_status=$?
10161-  echo "$as_me:12535: \$? = $ac_status" >&5
10162+  echo "$as_me:12538: \$? = $ac_status" >&5
10163   (exit $ac_status); } &&
10164          { ac_try='test -s conftest$ac_exeext'
10165-  { (eval echo "$as_me:12538: \"$ac_try\"") >&5
10166+  { (eval echo "$as_me:12541: \"$ac_try\"") >&5
10167   (eval $ac_try) 2>&5
10168   ac_status=$?
10169-  echo "$as_me:12541: \$? = $ac_status" >&5
10170+  echo "$as_me:12544: \$? = $ac_status" >&5
10171   (exit $ac_status); }; }; then
10172   cf_cv_xaw_compat=yes
10173 else
10174@@ -12548,7 +12551,7 @@
10175 fi
10176 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10177 fi
10178-echo "$as_me:12551: result: $cf_cv_xaw_compat" >&5
10179+echo "$as_me:12554: result: $cf_cv_xaw_compat" >&5
10180 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
10181
10182 			if test "$cf_cv_xaw_compat" = no
10183@@ -12560,7 +12563,7 @@
10184 				(*)
10185 					test -n "$verbose" && echo "	work around broken package" 1>&6
10186
10187-echo "${as_me:-configure}:12563: testing work around broken package ..." 1>&5
10188+echo "${as_me:-configure}:12566: testing work around broken package ..." 1>&5
10189
10190 					cf_save_xmu="$LIBS"
10191 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
10192@@ -12568,17 +12571,17 @@
10193 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
10194 	test -n "$verbose" && echo "	found package xmu" 1>&6
10195
10196-echo "${as_me:-configure}:12571: testing found package xmu ..." 1>&5
10197+echo "${as_me:-configure}:12574: testing found package xmu ..." 1>&5
10198
10199 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
10200 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xmu 2>/dev/null`"
10201 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
10202
10203-echo "${as_me:-configure}:12577: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10204+echo "${as_me:-configure}:12580: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10205
10206 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
10207
10208-echo "${as_me:-configure}:12581: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
10209+echo "${as_me:-configure}:12584: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
10210
10211 cf_fix_cppflags=no
10212 cf_new_cflags=
10213@@ -12698,12 +12701,12 @@
10214
10215 test -n "$verbose" && echo "	...before $LIBS" 1>&6
10216
10217-echo "${as_me:-configure}:12701: testing ...before $LIBS ..." 1>&5
10218+echo "${as_me:-configure}:12704: testing ...before $LIBS ..." 1>&5
10219
10220 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
10221 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
10222
10223-echo "${as_me:-configure}:12706: testing ...after  $LIBS ..." 1>&5
10224+echo "${as_me:-configure}:12709: testing ...after  $LIBS ..." 1>&5
10225
10226 else
10227 	cf_pkgconfig_incs=
10228@@ -12711,12 +12714,12 @@
10229
10230 test -n "$verbose" && echo "	...before $LIBS" 1>&6
10231
10232-echo "${as_me:-configure}:12714: testing ...before $LIBS ..." 1>&5
10233+echo "${as_me:-configure}:12717: testing ...before $LIBS ..." 1>&5
10234
10235 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
10236 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
10237
10238-echo "${as_me:-configure}:12719: testing ...after  $LIBS ..." 1>&5
10239+echo "${as_me:-configure}:12722: testing ...after  $LIBS ..." 1>&5
10240
10241 fi
10242
10243@@ -12727,7 +12730,7 @@
10244 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
10245 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
10246
10247-echo "${as_me:-configure}:12730: testing ..trimmed $LIBS ..." 1>&5
10248+echo "${as_me:-configure}:12733: testing ..trimmed $LIBS ..." 1>&5
10249
10250 			;;
10251 		esac
10252@@ -12752,17 +12755,17 @@
10253 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
10254 	test -n "$verbose" && echo "	found package Xext" 1>&6
10255
10256-echo "${as_me:-configure}:12755: testing found package Xext ..." 1>&5
10257+echo "${as_me:-configure}:12758: testing found package Xext ..." 1>&5
10258
10259 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
10260 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   Xext 2>/dev/null`"
10261 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
10262
10263-echo "${as_me:-configure}:12761: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10264+echo "${as_me:-configure}:12764: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10265
10266 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
10267
10268-echo "${as_me:-configure}:12765: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
10269+echo "${as_me:-configure}:12768: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
10270
10271 cf_fix_cppflags=no
10272 cf_new_cflags=
10273@@ -12883,7 +12886,7 @@
10274 	cf_pkgconfig_incs=
10275 	cf_pkgconfig_libs=
10276
10277-	echo "$as_me:12886: checking for XextCreateExtension in -lXext" >&5
10278+	echo "$as_me:12889: checking for XextCreateExtension in -lXext" >&5
10279 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
10280 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
10281   echo $ECHO_N "(cached) $ECHO_C" >&6
10282@@ -12891,7 +12894,7 @@
10283   ac_check_lib_save_LIBS=$LIBS
10284 LIBS="-lXext  $LIBS"
10285 cat >conftest.$ac_ext <<_ACEOF
10286-#line 12894 "configure"
10287+#line 12897 "configure"
10288 #include "confdefs.h"
10289
10290 /* Override any gcc2 internal prototype to avoid an error.  */
10291@@ -12910,16 +12913,16 @@
10292 }
10293 _ACEOF
10294 rm -f conftest.$ac_objext conftest$ac_exeext
10295-if { (eval echo "$as_me:12913: \"$ac_link\"") >&5
10296+if { (eval echo "$as_me:12916: \"$ac_link\"") >&5
10297   (eval $ac_link) 2>&5
10298   ac_status=$?
10299-  echo "$as_me:12916: \$? = $ac_status" >&5
10300+  echo "$as_me:12919: \$? = $ac_status" >&5
10301   (exit $ac_status); } &&
10302          { ac_try='test -s conftest$ac_exeext'
10303-  { (eval echo "$as_me:12919: \"$ac_try\"") >&5
10304+  { (eval echo "$as_me:12922: \"$ac_try\"") >&5
10305   (eval $ac_try) 2>&5
10306   ac_status=$?
10307-  echo "$as_me:12922: \$? = $ac_status" >&5
10308+  echo "$as_me:12925: \$? = $ac_status" >&5
10309   (exit $ac_status); }; }; then
10310   ac_cv_lib_Xext_XextCreateExtension=yes
10311 else
10312@@ -12930,7 +12933,7 @@
10313 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10314 LIBS=$ac_check_lib_save_LIBS
10315 fi
10316-echo "$as_me:12933: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
10317+echo "$as_me:12936: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
10318 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
10319 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
10320
10321@@ -12966,17 +12969,17 @@
10322 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
10323 	test -n "$verbose" && echo "	found package x11" 1>&6
10324
10325-echo "${as_me:-configure}:12969: testing found package x11 ..." 1>&5
10326+echo "${as_me:-configure}:12972: testing found package x11 ..." 1>&5
10327
10328 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
10329 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
10330 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
10331
10332-echo "${as_me:-configure}:12975: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10333+echo "${as_me:-configure}:12978: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10334
10335 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
10336
10337-echo "${as_me:-configure}:12979: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
10338+echo "${as_me:-configure}:12982: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
10339
10340 cf_fix_cppflags=no
10341 cf_new_cflags=
10342@@ -13096,24 +13099,24 @@
10343 else
10344 	cf_pkgconfig_incs=
10345 	cf_pkgconfig_libs=
10346-	{ echo "$as_me:13099: WARNING: unable to find X11 library" >&5
10347+	{ echo "$as_me:13102: WARNING: unable to find X11 library" >&5
10348 echo "$as_me: WARNING: unable to find X11 library" >&2;}
10349 fi
10350
10351 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
10352 	test -n "$verbose" && echo "	found package ice" 1>&6
10353
10354-echo "${as_me:-configure}:13106: testing found package ice ..." 1>&5
10355+echo "${as_me:-configure}:13109: testing found package ice ..." 1>&5
10356
10357 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
10358 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
10359 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
10360
10361-echo "${as_me:-configure}:13112: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10362+echo "${as_me:-configure}:13115: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10363
10364 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
10365
10366-echo "${as_me:-configure}:13116: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
10367+echo "${as_me:-configure}:13119: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
10368
10369 cf_fix_cppflags=no
10370 cf_new_cflags=
10371@@ -13233,24 +13236,24 @@
10372 else
10373 	cf_pkgconfig_incs=
10374 	cf_pkgconfig_libs=
10375-	{ echo "$as_me:13236: WARNING: unable to find ICE library" >&5
10376+	{ echo "$as_me:13239: WARNING: unable to find ICE library" >&5
10377 echo "$as_me: WARNING: unable to find ICE library" >&2;}
10378 fi
10379
10380 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
10381 	test -n "$verbose" && echo "	found package sm" 1>&6
10382
10383-echo "${as_me:-configure}:13243: testing found package sm ..." 1>&5
10384+echo "${as_me:-configure}:13246: testing found package sm ..." 1>&5
10385
10386 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
10387 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
10388 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
10389
10390-echo "${as_me:-configure}:13249: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10391+echo "${as_me:-configure}:13252: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10392
10393 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
10394
10395-echo "${as_me:-configure}:13253: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
10396+echo "${as_me:-configure}:13256: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
10397
10398 cf_fix_cppflags=no
10399 cf_new_cflags=
10400@@ -13370,24 +13373,24 @@
10401 else
10402 	cf_pkgconfig_incs=
10403 	cf_pkgconfig_libs=
10404-	{ echo "$as_me:13373: WARNING: unable to find SM library" >&5
10405+	{ echo "$as_me:13376: WARNING: unable to find SM library" >&5
10406 echo "$as_me: WARNING: unable to find SM library" >&2;}
10407 fi
10408
10409 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
10410 	test -n "$verbose" && echo "	found package xt" 1>&6
10411
10412-echo "${as_me:-configure}:13380: testing found package xt ..." 1>&5
10413+echo "${as_me:-configure}:13383: testing found package xt ..." 1>&5
10414
10415 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
10416 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
10417 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
10418
10419-echo "${as_me:-configure}:13386: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10420+echo "${as_me:-configure}:13389: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10421
10422 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
10423
10424-echo "${as_me:-configure}:13390: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
10425+echo "${as_me:-configure}:13393: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
10426
10427 cf_fix_cppflags=no
10428 cf_new_cflags=
10429@@ -13507,7 +13510,7 @@
10430 else
10431 	cf_pkgconfig_incs=
10432 	cf_pkgconfig_libs=
10433-	{ echo "$as_me:13510: WARNING: unable to find Xt library" >&5
10434+	{ echo "$as_me:13513: WARNING: unable to find Xt library" >&5
10435 echo "$as_me: WARNING: unable to find Xt library" >&2;}
10436 fi
10437
10438@@ -13518,17 +13521,17 @@
10439 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
10440 	test -n "$verbose" && echo "	found package xt" 1>&6
10441
10442-echo "${as_me:-configure}:13521: testing found package xt ..." 1>&5
10443+echo "${as_me:-configure}:13524: testing found package xt ..." 1>&5
10444
10445 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
10446 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
10447 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
10448
10449-echo "${as_me:-configure}:13527: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10450+echo "${as_me:-configure}:13530: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10451
10452 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
10453
10454-echo "${as_me:-configure}:13531: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
10455+echo "${as_me:-configure}:13534: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
10456
10457 cf_fix_cppflags=no
10458 cf_new_cflags=
10459@@ -13649,14 +13652,14 @@
10460 		;;
10461 	(*)
10462 # we have an "xt" package, but it may omit Xt's dependency on X11
10463-echo "$as_me:13652: checking for usable X dependency" >&5
10464+echo "$as_me:13655: checking for usable X dependency" >&5
10465 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
10466 if test "${cf_cv_xt_x11_compat+set}" = set; then
10467   echo $ECHO_N "(cached) $ECHO_C" >&6
10468 else
10469
10470 cat >conftest.$ac_ext <<_ACEOF
10471-#line 13659 "configure"
10472+#line 13662 "configure"
10473 #include "confdefs.h"
10474
10475 #include <X11/Xlib.h>
10476@@ -13675,16 +13678,16 @@
10477 }
10478 _ACEOF
10479 rm -f conftest.$ac_objext conftest$ac_exeext
10480-if { (eval echo "$as_me:13678: \"$ac_link\"") >&5
10481+if { (eval echo "$as_me:13681: \"$ac_link\"") >&5
10482   (eval $ac_link) 2>&5
10483   ac_status=$?
10484-  echo "$as_me:13681: \$? = $ac_status" >&5
10485+  echo "$as_me:13684: \$? = $ac_status" >&5
10486   (exit $ac_status); } &&
10487          { ac_try='test -s conftest$ac_exeext'
10488-  { (eval echo "$as_me:13684: \"$ac_try\"") >&5
10489+  { (eval echo "$as_me:13687: \"$ac_try\"") >&5
10490   (eval $ac_try) 2>&5
10491   ac_status=$?
10492-  echo "$as_me:13687: \$? = $ac_status" >&5
10493+  echo "$as_me:13690: \$? = $ac_status" >&5
10494   (exit $ac_status); }; }; then
10495   cf_cv_xt_x11_compat=yes
10496 else
10497@@ -13694,30 +13697,30 @@
10498 fi
10499 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10500 fi
10501-echo "$as_me:13697: result: $cf_cv_xt_x11_compat" >&5
10502+echo "$as_me:13700: result: $cf_cv_xt_x11_compat" >&5
10503 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
10504 		if test "$cf_cv_xt_x11_compat" = no
10505 		then
10506 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
10507
10508-echo "${as_me:-configure}:13703: testing work around broken X11 dependency ..." 1>&5
10509+echo "${as_me:-configure}:13706: testing work around broken X11 dependency ..." 1>&5
10510
10511 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
10512
10513 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
10514 	test -n "$verbose" && echo "	found package x11" 1>&6
10515
10516-echo "${as_me:-configure}:13710: testing found package x11 ..." 1>&5
10517+echo "${as_me:-configure}:13713: testing found package x11 ..." 1>&5
10518
10519 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
10520 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
10521 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
10522
10523-echo "${as_me:-configure}:13716: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10524+echo "${as_me:-configure}:13719: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10525
10526 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
10527
10528-echo "${as_me:-configure}:13720: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
10529+echo "${as_me:-configure}:13723: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
10530
10531 cf_fix_cppflags=no
10532 cf_new_cflags=
10533@@ -13840,12 +13843,12 @@
10534
10535 test -n "$verbose" && echo "	...before $LIBS" 1>&6
10536
10537-echo "${as_me:-configure}:13843: testing ...before $LIBS ..." 1>&5
10538+echo "${as_me:-configure}:13846: testing ...before $LIBS ..." 1>&5
10539
10540 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
10541 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
10542
10543-echo "${as_me:-configure}:13848: testing ...after  $LIBS ..." 1>&5
10544+echo "${as_me:-configure}:13851: testing ...after  $LIBS ..." 1>&5
10545
10546 fi
10547
10548@@ -13853,14 +13856,14 @@
10549 		;;
10550 	esac
10551
10552-echo "$as_me:13856: checking for usable X Toolkit package" >&5
10553+echo "$as_me:13859: checking for usable X Toolkit package" >&5
10554 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
10555 if test "${cf_cv_xt_ice_compat+set}" = set; then
10556   echo $ECHO_N "(cached) $ECHO_C" >&6
10557 else
10558
10559 cat >conftest.$ac_ext <<_ACEOF
10560-#line 13863 "configure"
10561+#line 13866 "configure"
10562 #include "confdefs.h"
10563
10564 #include <X11/Shell.h>
10565@@ -13875,16 +13878,16 @@
10566 }
10567 _ACEOF
10568 rm -f conftest.$ac_objext conftest$ac_exeext
10569-if { (eval echo "$as_me:13878: \"$ac_link\"") >&5
10570+if { (eval echo "$as_me:13881: \"$ac_link\"") >&5
10571   (eval $ac_link) 2>&5
10572   ac_status=$?
10573-  echo "$as_me:13881: \$? = $ac_status" >&5
10574+  echo "$as_me:13884: \$? = $ac_status" >&5
10575   (exit $ac_status); } &&
10576          { ac_try='test -s conftest$ac_exeext'
10577-  { (eval echo "$as_me:13884: \"$ac_try\"") >&5
10578+  { (eval echo "$as_me:13887: \"$ac_try\"") >&5
10579   (eval $ac_try) 2>&5
10580   ac_status=$?
10581-  echo "$as_me:13887: \$? = $ac_status" >&5
10582+  echo "$as_me:13890: \$? = $ac_status" >&5
10583   (exit $ac_status); }; }; then
10584   cf_cv_xt_ice_compat=yes
10585 else
10586@@ -13894,7 +13897,7 @@
10587 fi
10588 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10589 fi
10590-echo "$as_me:13897: result: $cf_cv_xt_ice_compat" >&5
10591+echo "$as_me:13900: result: $cf_cv_xt_ice_compat" >&5
10592 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
10593
10594 	if test "$cf_cv_xt_ice_compat" = no
10595@@ -13908,22 +13911,22 @@
10596 			(*)
10597 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
10598
10599-echo "${as_me:-configure}:13911: testing work around broken ICE dependency ..." 1>&5
10600+echo "${as_me:-configure}:13914: testing work around broken ICE dependency ..." 1>&5
10601
10602 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
10603 	test -n "$verbose" && echo "	found package ice" 1>&6
10604
10605-echo "${as_me:-configure}:13916: testing found package ice ..." 1>&5
10606+echo "${as_me:-configure}:13919: testing found package ice ..." 1>&5
10607
10608 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
10609 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
10610 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
10611
10612-echo "${as_me:-configure}:13922: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10613+echo "${as_me:-configure}:13925: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10614
10615 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
10616
10617-echo "${as_me:-configure}:13926: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
10618+echo "${as_me:-configure}:13929: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
10619
10620 cf_fix_cppflags=no
10621 cf_new_cflags=
10622@@ -14042,17 +14045,17 @@
10623 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
10624 	test -n "$verbose" && echo "	found package sm" 1>&6
10625
10626-echo "${as_me:-configure}:14045: testing found package sm ..." 1>&5
10627+echo "${as_me:-configure}:14048: testing found package sm ..." 1>&5
10628
10629 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
10630 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
10631 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
10632
10633-echo "${as_me:-configure}:14051: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10634+echo "${as_me:-configure}:14054: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
10635
10636 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
10637
10638-echo "${as_me:-configure}:14055: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
10639+echo "${as_me:-configure}:14058: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
10640
10641 cf_fix_cppflags=no
10642 cf_new_cflags=
10643@@ -14181,12 +14184,12 @@
10644
10645 test -n "$verbose" && echo "	...before $LIBS" 1>&6
10646
10647-echo "${as_me:-configure}:14184: testing ...before $LIBS ..." 1>&5
10648+echo "${as_me:-configure}:14187: testing ...before $LIBS ..." 1>&5
10649
10650 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
10651 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
10652
10653-echo "${as_me:-configure}:14189: testing ...after  $LIBS ..." 1>&5
10654+echo "${as_me:-configure}:14192: testing ...after  $LIBS ..." 1>&5
10655
10656 fi
10657
10658@@ -14206,7 +14209,7 @@
10659
10660 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
10661
10662-echo "${as_me:-configure}:14209: testing checking additions to CFLAGS ..." 1>&5
10663+echo "${as_me:-configure}:14212: testing checking additions to CFLAGS ..." 1>&5
10664
10665 cf_check_cflags="$CFLAGS"
10666 cf_check_cppflags="$CPPFLAGS"
10667@@ -14291,7 +14294,7 @@
10668 if test -n "$cf_new_cflags" ; then
10669 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
10670
10671-echo "${as_me:-configure}:14294: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
10672+echo "${as_me:-configure}:14297: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
10673
10674 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
10675 	CFLAGS="${CFLAGS}$cf_new_cflags"
10676@@ -14301,7 +14304,7 @@
10677 if test -n "$cf_new_cppflags" ; then
10678 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
10679
10680-echo "${as_me:-configure}:14304: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
10681+echo "${as_me:-configure}:14307: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
10682
10683 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
10684 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
10685@@ -14311,7 +14314,7 @@
10686 if test -n "$cf_new_extra_cppflags" ; then
10687 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
10688
10689-echo "${as_me:-configure}:14314: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
10690+echo "${as_me:-configure}:14317: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
10691
10692 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
10693 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
10694@@ -14320,7 +14323,7 @@
10695
10696 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
10697 cat >conftest.$ac_ext <<_ACEOF
10698-#line 14323 "configure"
10699+#line 14326 "configure"
10700 #include "confdefs.h"
10701 #include <stdio.h>
10702 int
10703@@ -14332,16 +14335,16 @@
10704 }
10705 _ACEOF
10706 rm -f conftest.$ac_objext conftest$ac_exeext
10707-if { (eval echo "$as_me:14335: \"$ac_link\"") >&5
10708+if { (eval echo "$as_me:14338: \"$ac_link\"") >&5
10709   (eval $ac_link) 2>&5
10710   ac_status=$?
10711-  echo "$as_me:14338: \$? = $ac_status" >&5
10712+  echo "$as_me:14341: \$? = $ac_status" >&5
10713   (exit $ac_status); } &&
10714          { ac_try='test -s conftest$ac_exeext'
10715-  { (eval echo "$as_me:14341: \"$ac_try\"") >&5
10716+  { (eval echo "$as_me:14344: \"$ac_try\"") >&5
10717   (eval $ac_try) 2>&5
10718   ac_status=$?
10719-  echo "$as_me:14344: \$? = $ac_status" >&5
10720+  echo "$as_me:14347: \$? = $ac_status" >&5
10721   (exit $ac_status); }; }; then
10722   :
10723 else
10724@@ -14349,12 +14352,12 @@
10725 cat conftest.$ac_ext >&5
10726 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
10727
10728-echo "${as_me:-configure}:14352: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
10729+echo "${as_me:-configure}:14355: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
10730
10731 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
10732 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
10733
10734-echo "${as_me:-configure}:14357: testing but keeping change to \$CPPFLAGS ..." 1>&5
10735+echo "${as_me:-configure}:14360: testing but keeping change to \$CPPFLAGS ..." 1>&5
10736
10737 	 fi
10738 	 CFLAGS="$cf_check_flags"
10739@@ -14362,13 +14365,13 @@
10740 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10741 fi
10742
10743-	echo "$as_me:14365: checking for XOpenDisplay" >&5
10744+	echo "$as_me:14368: checking for XOpenDisplay" >&5
10745 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
10746 if test "${ac_cv_func_XOpenDisplay+set}" = set; then
10747   echo $ECHO_N "(cached) $ECHO_C" >&6
10748 else
10749   cat >conftest.$ac_ext <<_ACEOF
10750-#line 14371 "configure"
10751+#line 14374 "configure"
10752 #include "confdefs.h"
10753 #define XOpenDisplay autoconf_temporary
10754 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
10755@@ -14399,16 +14402,16 @@
10756 }
10757 _ACEOF
10758 rm -f conftest.$ac_objext conftest$ac_exeext
10759-if { (eval echo "$as_me:14402: \"$ac_link\"") >&5
10760+if { (eval echo "$as_me:14405: \"$ac_link\"") >&5
10761   (eval $ac_link) 2>&5
10762   ac_status=$?
10763-  echo "$as_me:14405: \$? = $ac_status" >&5
10764+  echo "$as_me:14408: \$? = $ac_status" >&5
10765   (exit $ac_status); } &&
10766          { ac_try='test -s conftest$ac_exeext'
10767-  { (eval echo "$as_me:14408: \"$ac_try\"") >&5
10768+  { (eval echo "$as_me:14411: \"$ac_try\"") >&5
10769   (eval $ac_try) 2>&5
10770   ac_status=$?
10771-  echo "$as_me:14411: \$? = $ac_status" >&5
10772+  echo "$as_me:14414: \$? = $ac_status" >&5
10773   (exit $ac_status); }; }; then
10774   ac_cv_func_XOpenDisplay=yes
10775 else
10776@@ -14418,13 +14421,13 @@
10777 fi
10778 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10779 fi
10780-echo "$as_me:14421: result: $ac_cv_func_XOpenDisplay" >&5
10781+echo "$as_me:14424: result: $ac_cv_func_XOpenDisplay" >&5
10782 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
10783 if test $ac_cv_func_XOpenDisplay = yes; then
10784   :
10785 else
10786
10787-	echo "$as_me:14427: checking for XOpenDisplay in -lX11" >&5
10788+	echo "$as_me:14430: checking for XOpenDisplay in -lX11" >&5
10789 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
10790 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
10791   echo $ECHO_N "(cached) $ECHO_C" >&6
10792@@ -14432,7 +14435,7 @@
10793   ac_check_lib_save_LIBS=$LIBS
10794 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
10795 cat >conftest.$ac_ext <<_ACEOF
10796-#line 14435 "configure"
10797+#line 14438 "configure"
10798 #include "confdefs.h"
10799
10800 /* Override any gcc2 internal prototype to avoid an error.  */
10801@@ -14451,16 +14454,16 @@
10802 }
10803 _ACEOF
10804 rm -f conftest.$ac_objext conftest$ac_exeext
10805-if { (eval echo "$as_me:14454: \"$ac_link\"") >&5
10806+if { (eval echo "$as_me:14457: \"$ac_link\"") >&5
10807   (eval $ac_link) 2>&5
10808   ac_status=$?
10809-  echo "$as_me:14457: \$? = $ac_status" >&5
10810+  echo "$as_me:14460: \$? = $ac_status" >&5
10811   (exit $ac_status); } &&
10812          { ac_try='test -s conftest$ac_exeext'
10813-  { (eval echo "$as_me:14460: \"$ac_try\"") >&5
10814+  { (eval echo "$as_me:14463: \"$ac_try\"") >&5
10815   (eval $ac_try) 2>&5
10816   ac_status=$?
10817-  echo "$as_me:14463: \$? = $ac_status" >&5
10818+  echo "$as_me:14466: \$? = $ac_status" >&5
10819   (exit $ac_status); }; }; then
10820   ac_cv_lib_X11_XOpenDisplay=yes
10821 else
10822@@ -14471,7 +14474,7 @@
10823 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10824 LIBS=$ac_check_lib_save_LIBS
10825 fi
10826-echo "$as_me:14474: result: $ac_cv_lib_X11_XOpenDisplay" >&5
10827+echo "$as_me:14477: result: $ac_cv_lib_X11_XOpenDisplay" >&5
10828 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
10829 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
10830
10831@@ -14495,13 +14498,13 @@
10832
10833 fi
10834
10835-	echo "$as_me:14498: checking for XtAppInitialize" >&5
10836+	echo "$as_me:14501: checking for XtAppInitialize" >&5
10837 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
10838 if test "${ac_cv_func_XtAppInitialize+set}" = set; then
10839   echo $ECHO_N "(cached) $ECHO_C" >&6
10840 else
10841   cat >conftest.$ac_ext <<_ACEOF
10842-#line 14504 "configure"
10843+#line 14507 "configure"
10844 #include "confdefs.h"
10845 #define XtAppInitialize autoconf_temporary
10846 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
10847@@ -14532,16 +14535,16 @@
10848 }
10849 _ACEOF
10850 rm -f conftest.$ac_objext conftest$ac_exeext
10851-if { (eval echo "$as_me:14535: \"$ac_link\"") >&5
10852+if { (eval echo "$as_me:14538: \"$ac_link\"") >&5
10853   (eval $ac_link) 2>&5
10854   ac_status=$?
10855-  echo "$as_me:14538: \$? = $ac_status" >&5
10856+  echo "$as_me:14541: \$? = $ac_status" >&5
10857   (exit $ac_status); } &&
10858          { ac_try='test -s conftest$ac_exeext'
10859-  { (eval echo "$as_me:14541: \"$ac_try\"") >&5
10860+  { (eval echo "$as_me:14544: \"$ac_try\"") >&5
10861   (eval $ac_try) 2>&5
10862   ac_status=$?
10863-  echo "$as_me:14544: \$? = $ac_status" >&5
10864+  echo "$as_me:14547: \$? = $ac_status" >&5
10865   (exit $ac_status); }; }; then
10866   ac_cv_func_XtAppInitialize=yes
10867 else
10868@@ -14551,13 +14554,13 @@
10869 fi
10870 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10871 fi
10872-echo "$as_me:14554: result: $ac_cv_func_XtAppInitialize" >&5
10873+echo "$as_me:14557: result: $ac_cv_func_XtAppInitialize" >&5
10874 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
10875 if test $ac_cv_func_XtAppInitialize = yes; then
10876   :
10877 else
10878
10879-	echo "$as_me:14560: checking for XtAppInitialize in -lXt" >&5
10880+	echo "$as_me:14563: checking for XtAppInitialize in -lXt" >&5
10881 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
10882 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
10883   echo $ECHO_N "(cached) $ECHO_C" >&6
10884@@ -14565,7 +14568,7 @@
10885   ac_check_lib_save_LIBS=$LIBS
10886 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
10887 cat >conftest.$ac_ext <<_ACEOF
10888-#line 14568 "configure"
10889+#line 14571 "configure"
10890 #include "confdefs.h"
10891
10892 /* Override any gcc2 internal prototype to avoid an error.  */
10893@@ -14584,16 +14587,16 @@
10894 }
10895 _ACEOF
10896 rm -f conftest.$ac_objext conftest$ac_exeext
10897-if { (eval echo "$as_me:14587: \"$ac_link\"") >&5
10898+if { (eval echo "$as_me:14590: \"$ac_link\"") >&5
10899   (eval $ac_link) 2>&5
10900   ac_status=$?
10901-  echo "$as_me:14590: \$? = $ac_status" >&5
10902+  echo "$as_me:14593: \$? = $ac_status" >&5
10903   (exit $ac_status); } &&
10904          { ac_try='test -s conftest$ac_exeext'
10905-  { (eval echo "$as_me:14593: \"$ac_try\"") >&5
10906+  { (eval echo "$as_me:14596: \"$ac_try\"") >&5
10907   (eval $ac_try) 2>&5
10908   ac_status=$?
10909-  echo "$as_me:14596: \$? = $ac_status" >&5
10910+  echo "$as_me:14599: \$? = $ac_status" >&5
10911   (exit $ac_status); }; }; then
10912   ac_cv_lib_Xt_XtAppInitialize=yes
10913 else
10914@@ -14604,7 +14607,7 @@
10915 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10916 LIBS=$ac_check_lib_save_LIBS
10917 fi
10918-echo "$as_me:14607: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
10919+echo "$as_me:14610: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
10920 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
10921 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
10922
10923@@ -14621,7 +14624,7 @@
10924 fi
10925
10926 if test $cf_have_X_LIBS = no ; then
10927-	{ echo "$as_me:14624: WARNING: Unable to successfully link X Toolkit library (-lXt) with
10928+	{ echo "$as_me:14627: WARNING: Unable to successfully link X Toolkit library (-lXt) with
10929 test program.  You will have to check and add the proper libraries by hand
10930 to makefile." >&5
10931 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
10932@@ -14639,22 +14642,37 @@
10933 	/usr/local
10934 do
10935 	if test -z "$cf_x_athena_inc" ; then
10936-		cf_save="$CPPFLAGS"
10937+
10938+cf_save_LIBS_CF_X_ATHENA_CPPFLAGS="$LIBS"
10939+cf_save_CFLAGS_CF_X_ATHENA_CPPFLAGS="$CFLAGS"
10940+cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS="$CPPFLAGS"
10941+LIBS="$LIBS ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}"
10942+for cf_X_CFLAGS in $X_CFLAGS
10943+do
10944+	case "x$cf_X_CFLAGS" in
10945+	x-[IUD]*)
10946+		CPPFLAGS="$CPPFLAGS $cf_X_CFLAGS"
10947+		;;
10948+	*)
10949+		CFLAGS="$CFLAGS $cf_X_CFLAGS"
10950+		;;
10951+	esac
10952+done
10953+
10954 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
10955 		if test $cf_path != default ; then
10956-			CPPFLAGS="$cf_save"
10957
10958 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
10959 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
10960
10961-			echo "$as_me:14650: checking for $cf_test in $cf_path" >&5
10962+			echo "$as_me:14668: checking for $cf_test in $cf_path" >&5
10963 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
10964 		else
10965-			echo "$as_me:14653: checking for $cf_test" >&5
10966+			echo "$as_me:14671: checking for $cf_test" >&5
10967 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
10968 		fi
10969 		cat >conftest.$ac_ext <<_ACEOF
10970-#line 14657 "configure"
10971+#line 14675 "configure"
10972 #include "confdefs.h"
10973
10974 #include <X11/Intrinsic.h>
10975@@ -14668,16 +14686,16 @@
10976 }
10977 _ACEOF
10978 rm -f conftest.$ac_objext
10979-if { (eval echo "$as_me:14671: \"$ac_compile\"") >&5
10980+if { (eval echo "$as_me:14689: \"$ac_compile\"") >&5
10981   (eval $ac_compile) 2>&5
10982   ac_status=$?
10983-  echo "$as_me:14674: \$? = $ac_status" >&5
10984+  echo "$as_me:14692: \$? = $ac_status" >&5
10985   (exit $ac_status); } &&
10986          { ac_try='test -s conftest.$ac_objext'
10987-  { (eval echo "$as_me:14677: \"$ac_try\"") >&5
10988+  { (eval echo "$as_me:14695: \"$ac_try\"") >&5
10989   (eval $ac_try) 2>&5
10990   ac_status=$?
10991-  echo "$as_me:14680: \$? = $ac_status" >&5
10992+  echo "$as_me:14698: \$? = $ac_status" >&5
10993   (exit $ac_status); }; }; then
10994   cf_result=yes
10995 else
10996@@ -14686,19 +14704,22 @@
10997 cf_result=no
10998 fi
10999 rm -f conftest.$ac_objext conftest.$ac_ext
11000-		echo "$as_me:14689: result: $cf_result" >&5
11001+		echo "$as_me:14707: result: $cf_result" >&5
11002 echo "${ECHO_T}$cf_result" >&6
11003+
11004+LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
11005+CFLAGS="$cf_save_CFLAGS_CF_X_ATHENA_CPPFLAGS"
11006+CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS"
11007+
11008 		if test "$cf_result" = yes ; then
11009 			cf_x_athena_inc=$cf_path
11010 			break
11011-		else
11012-			CPPFLAGS="$cf_save"
11013 		fi
11014 	fi
11015 done
11016
11017 if test -z "$cf_x_athena_inc" ; then
11018-	{ echo "$as_me:14701: WARNING: Unable to successfully find Athena header files with test program" >&5
11019+	{ echo "$as_me:14722: WARNING: Unable to successfully find Athena header files with test program" >&5
11020 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
11021 elif test "$cf_x_athena_inc" != default ; then
11022
11023@@ -14726,30 +14747,26 @@
11024 		"-l$cf_lib -lXpm -lXmu" \
11025 		"-l${cf_lib}_s -lXmu_s"
11026 	do
11027-		if test -z "$cf_x_athena_lib" ; then
11028-			cf_save="$LIBS"
11029-			cf_test=XawSimpleMenuAddGlobalActions
11030-			if test $cf_path != default ; then
11031+		test -n "$cf_x_athena_lib" && break
11032
11033-cf_add_libs="$LIBS"
11034-# reverse order
11035-cf_add_0lib=
11036-for cf_add_1lib in -L$cf_path/lib $cf_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
11037-# filter duplicates
11038-for cf_add_1lib in $cf_add_0lib; do
11039-	for cf_add_2lib in $cf_add_libs; do
11040-		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
11041-			cf_add_1lib=
11042-			break
11043-		fi
11044-	done
11045-	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
11046+cf_save_LIBS_CF_X_ATHENA_LIBS="$LIBS"
11047+cf_save_CFLAGS_CF_X_ATHENA_LIBS="$CFLAGS"
11048+cf_save_CPPFLAGS_CF_X_ATHENA_LIBS="$CPPFLAGS"
11049+LIBS="$LIBS ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}"
11050+for cf_X_CFLAGS in $X_CFLAGS
11051+do
11052+	case "x$cf_X_CFLAGS" in
11053+	x-[IUD]*)
11054+		CPPFLAGS="$CPPFLAGS $cf_X_CFLAGS"
11055+		;;
11056+	*)
11057+		CFLAGS="$CFLAGS $cf_X_CFLAGS"
11058+		;;
11059+	esac
11060 done
11061-LIBS="$cf_add_libs"
11062
11063-				echo "$as_me:14750: checking for $cf_libs in $cf_path" >&5
11064-echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
11065-			else
11066+		cf_test=XawSimpleMenuAddGlobalActions
11067+		test "$cf_path" != default && cf_libs="-L$cf_path/lib $cf_libs"
11068
11069 cf_add_libs="$LIBS"
11070 # reverse order
11071@@ -14767,11 +14784,10 @@
11072 done
11073 LIBS="$cf_add_libs"
11074
11075-				echo "$as_me:14770: checking for $cf_test in $cf_libs" >&5
11076+		echo "$as_me:14787: checking for $cf_test in $cf_libs" >&5
11077 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
11078-			fi
11079-			cat >conftest.$ac_ext <<_ACEOF
11080-#line 14774 "configure"
11081+		cat >conftest.$ac_ext <<_ACEOF
11082+#line 14790 "configure"
11083 #include "confdefs.h"
11084
11085 #include <X11/Intrinsic.h>
11086@@ -14787,16 +14803,16 @@
11087 }
11088 _ACEOF
11089 rm -f conftest.$ac_objext conftest$ac_exeext
11090-if { (eval echo "$as_me:14790: \"$ac_link\"") >&5
11091+if { (eval echo "$as_me:14806: \"$ac_link\"") >&5
11092   (eval $ac_link) 2>&5
11093   ac_status=$?
11094-  echo "$as_me:14793: \$? = $ac_status" >&5
11095+  echo "$as_me:14809: \$? = $ac_status" >&5
11096   (exit $ac_status); } &&
11097          { ac_try='test -s conftest$ac_exeext'
11098-  { (eval echo "$as_me:14796: \"$ac_try\"") >&5
11099+  { (eval echo "$as_me:14812: \"$ac_try\"") >&5
11100   (eval $ac_try) 2>&5
11101   ac_status=$?
11102-  echo "$as_me:14799: \$? = $ac_status" >&5
11103+  echo "$as_me:14815: \$? = $ac_status" >&5
11104   (exit $ac_status); }; }; then
11105   cf_result=yes
11106 else
11107@@ -14805,13 +14821,16 @@
11108 cf_result=no
11109 fi
11110 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11111-			echo "$as_me:14808: result: $cf_result" >&5
11112+		echo "$as_me:14824: result: $cf_result" >&5
11113 echo "${ECHO_T}$cf_result" >&6
11114-			if test "$cf_result" = yes ; then
11115-				cf_x_athena_lib="$cf_libs"
11116-				break
11117-			fi
11118-			LIBS="$cf_save"
11119+
11120+LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
11121+CFLAGS="$cf_save_CFLAGS_CF_X_ATHENA_LIBS"
11122+CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS"
11123+
11124+		if test "$cf_result" = yes ; then
11125+			cf_x_athena_lib="$cf_libs"
11126+			break
11127 		fi
11128 	done # cf_libs
11129 		test -n "$cf_x_athena_lib" && break
11130@@ -14819,11 +14838,27 @@
11131 done
11132
11133 if test -z "$cf_x_athena_lib" ; then
11134-	{ { echo "$as_me:14822: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
11135+	{ { echo "$as_me:14841: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
11136 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
11137    { (exit 1); exit 1; }; }
11138 fi
11139
11140+cf_add_libs="$LIBS"
11141+# reverse order
11142+cf_add_0lib=
11143+for cf_add_1lib in $cf_x_athena_lib; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done
11144+# filter duplicates
11145+for cf_add_1lib in $cf_add_0lib; do
11146+	for cf_add_2lib in $cf_add_libs; do
11147+		if test "x$cf_add_1lib" = "x$cf_add_2lib"; then
11148+			cf_add_1lib=
11149+			break
11150+		fi
11151+	done
11152+	test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs"
11153+done
11154+LIBS="$cf_add_libs"
11155+
11156 cf_x_athena_LIBS=`echo "HAVE_LIB_$cf_x_athena" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
11157
11158 cat >>confdefs.h <<EOF
11159@@ -14837,7 +14872,7 @@
11160   do
11161     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
11162 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
11163-echo "$as_me:14840: checking for $ac_word" >&5
11164+echo "$as_me:14875: checking for $ac_word" >&5
11165 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
11166 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
11167   echo $ECHO_N "(cached) $ECHO_C" >&6
11168@@ -14852,7 +14887,7 @@
11169   test -z "$ac_dir" && ac_dir=.
11170   $as_executable_p "$ac_dir/$ac_word" || continue
11171 ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
11172-echo "$as_me:14855: found $ac_dir/$ac_word" >&5
11173+echo "$as_me:14890: found $ac_dir/$ac_word" >&5
11174 break
11175 done
11176
11177@@ -14860,10 +14895,10 @@
11178 fi
11179 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
11180 if test -n "$XCURSES_CONFIG"; then
11181-  echo "$as_me:14863: result: $XCURSES_CONFIG" >&5
11182+  echo "$as_me:14898: result: $XCURSES_CONFIG" >&5
11183 echo "${ECHO_T}$XCURSES_CONFIG" >&6
11184 else
11185-  echo "$as_me:14866: result: no" >&5
11186+  echo "$as_me:14901: result: no" >&5
11187 echo "${ECHO_T}no" >&6
11188 fi
11189
11190@@ -14876,7 +14911,7 @@
11191 do
11192   # Extract the first word of "$ac_prog", so it can be a program name with args.
11193 set dummy $ac_prog; ac_word=$2
11194-echo "$as_me:14879: checking for $ac_word" >&5
11195+echo "$as_me:14914: checking for $ac_word" >&5
11196 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
11197 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
11198   echo $ECHO_N "(cached) $ECHO_C" >&6
11199@@ -14891,7 +14926,7 @@
11200   test -z "$ac_dir" && ac_dir=.
11201   $as_executable_p "$ac_dir/$ac_word" || continue
11202 ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
11203-echo "$as_me:14894: found $ac_dir/$ac_word" >&5
11204+echo "$as_me:14929: found $ac_dir/$ac_word" >&5
11205 break
11206 done
11207
11208@@ -14899,10 +14934,10 @@
11209 fi
11210 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
11211 if test -n "$ac_ct_XCURSES_CONFIG"; then
11212-  echo "$as_me:14902: result: $ac_ct_XCURSES_CONFIG" >&5
11213+  echo "$as_me:14937: result: $ac_ct_XCURSES_CONFIG" >&5
11214 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
11215 else
11216-  echo "$as_me:14905: result: no" >&5
11217+  echo "$as_me:14940: result: no" >&5
11218 echo "${ECHO_T}no" >&6
11219 fi
11220
11221@@ -15037,7 +15072,7 @@
11222
11223 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
11224
11225-echo "${as_me:-configure}:15040: testing checking additions to CFLAGS ..." 1>&5
11226+echo "${as_me:-configure}:15075: testing checking additions to CFLAGS ..." 1>&5
11227
11228 cf_check_cflags="$CFLAGS"
11229 cf_check_cppflags="$CPPFLAGS"
11230@@ -15122,7 +15157,7 @@
11231 if test -n "$cf_new_cflags" ; then
11232 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
11233
11234-echo "${as_me:-configure}:15125: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
11235+echo "${as_me:-configure}:15160: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
11236
11237 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
11238 	CFLAGS="${CFLAGS}$cf_new_cflags"
11239@@ -15132,7 +15167,7 @@
11240 if test -n "$cf_new_cppflags" ; then
11241 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
11242
11243-echo "${as_me:-configure}:15135: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
11244+echo "${as_me:-configure}:15170: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
11245
11246 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
11247 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
11248@@ -15142,7 +15177,7 @@
11249 if test -n "$cf_new_extra_cppflags" ; then
11250 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
11251
11252-echo "${as_me:-configure}:15145: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
11253+echo "${as_me:-configure}:15180: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
11254
11255 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
11256 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
11257@@ -15151,7 +15186,7 @@
11258
11259 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
11260 cat >conftest.$ac_ext <<_ACEOF
11261-#line 15154 "configure"
11262+#line 15189 "configure"
11263 #include "confdefs.h"
11264 #include <stdio.h>
11265 int
11266@@ -15163,16 +15198,16 @@
11267 }
11268 _ACEOF
11269 rm -f conftest.$ac_objext conftest$ac_exeext
11270-if { (eval echo "$as_me:15166: \"$ac_link\"") >&5
11271+if { (eval echo "$as_me:15201: \"$ac_link\"") >&5
11272   (eval $ac_link) 2>&5
11273   ac_status=$?
11274-  echo "$as_me:15169: \$? = $ac_status" >&5
11275+  echo "$as_me:15204: \$? = $ac_status" >&5
11276   (exit $ac_status); } &&
11277          { ac_try='test -s conftest$ac_exeext'
11278-  { (eval echo "$as_me:15172: \"$ac_try\"") >&5
11279+  { (eval echo "$as_me:15207: \"$ac_try\"") >&5
11280   (eval $ac_try) 2>&5
11281   ac_status=$?
11282-  echo "$as_me:15175: \$? = $ac_status" >&5
11283+  echo "$as_me:15210: \$? = $ac_status" >&5
11284   (exit $ac_status); }; }; then
11285   :
11286 else
11287@@ -15180,12 +15215,12 @@
11288 cat conftest.$ac_ext >&5
11289 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
11290
11291-echo "${as_me:-configure}:15183: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
11292+echo "${as_me:-configure}:15218: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
11293
11294 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
11295 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
11296
11297-echo "${as_me:-configure}:15188: testing but keeping change to \$CPPFLAGS ..." 1>&5
11298+echo "${as_me:-configure}:15223: testing but keeping change to \$CPPFLAGS ..." 1>&5
11299
11300 	 fi
11301 	 CFLAGS="$cf_check_flags"
11302@@ -15193,7 +15228,7 @@
11303 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11304 fi
11305
11306-echo "$as_me:15196: checking for XOpenDisplay in -lX11" >&5
11307+echo "$as_me:15231: checking for XOpenDisplay in -lX11" >&5
11308 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
11309 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
11310   echo $ECHO_N "(cached) $ECHO_C" >&6
11311@@ -15201,7 +15236,7 @@
11312   ac_check_lib_save_LIBS=$LIBS
11313 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
11314 cat >conftest.$ac_ext <<_ACEOF
11315-#line 15204 "configure"
11316+#line 15239 "configure"
11317 #include "confdefs.h"
11318
11319 /* Override any gcc2 internal prototype to avoid an error.  */
11320@@ -15220,16 +15255,16 @@
11321 }
11322 _ACEOF
11323 rm -f conftest.$ac_objext conftest$ac_exeext
11324-if { (eval echo "$as_me:15223: \"$ac_link\"") >&5
11325+if { (eval echo "$as_me:15258: \"$ac_link\"") >&5
11326   (eval $ac_link) 2>&5
11327   ac_status=$?
11328-  echo "$as_me:15226: \$? = $ac_status" >&5
11329+  echo "$as_me:15261: \$? = $ac_status" >&5
11330   (exit $ac_status); } &&
11331          { ac_try='test -s conftest$ac_exeext'
11332-  { (eval echo "$as_me:15229: \"$ac_try\"") >&5
11333+  { (eval echo "$as_me:15264: \"$ac_try\"") >&5
11334   (eval $ac_try) 2>&5
11335   ac_status=$?
11336-  echo "$as_me:15232: \$? = $ac_status" >&5
11337+  echo "$as_me:15267: \$? = $ac_status" >&5
11338   (exit $ac_status); }; }; then
11339   ac_cv_lib_X11_XOpenDisplay=yes
11340 else
11341@@ -15240,7 +15275,7 @@
11342 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11343 LIBS=$ac_check_lib_save_LIBS
11344 fi
11345-echo "$as_me:15243: result: $ac_cv_lib_X11_XOpenDisplay" >&5
11346+echo "$as_me:15278: result: $ac_cv_lib_X11_XOpenDisplay" >&5
11347 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
11348 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
11349
11350@@ -15262,7 +15297,7 @@
11351
11352 fi
11353
11354-echo "$as_me:15265: checking for XCurses library" >&5
11355+echo "$as_me:15300: checking for XCurses library" >&5
11356 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
11357 if test "${cf_cv_lib_XCurses+set}" = set; then
11358   echo $ECHO_N "(cached) $ECHO_C" >&6
11359@@ -15285,7 +15320,7 @@
11360 LIBS="$cf_add_libs"
11361
11362 cat >conftest.$ac_ext <<_ACEOF
11363-#line 15288 "configure"
11364+#line 15323 "configure"
11365 #include "confdefs.h"
11366
11367 #include <xcurses.h>
11368@@ -15300,16 +15335,16 @@
11369 }
11370 _ACEOF
11371 rm -f conftest.$ac_objext conftest$ac_exeext
11372-if { (eval echo "$as_me:15303: \"$ac_link\"") >&5
11373+if { (eval echo "$as_me:15338: \"$ac_link\"") >&5
11374   (eval $ac_link) 2>&5
11375   ac_status=$?
11376-  echo "$as_me:15306: \$? = $ac_status" >&5
11377+  echo "$as_me:15341: \$? = $ac_status" >&5
11378   (exit $ac_status); } &&
11379          { ac_try='test -s conftest$ac_exeext'
11380-  { (eval echo "$as_me:15309: \"$ac_try\"") >&5
11381+  { (eval echo "$as_me:15344: \"$ac_try\"") >&5
11382   (eval $ac_try) 2>&5
11383   ac_status=$?
11384-  echo "$as_me:15312: \$? = $ac_status" >&5
11385+  echo "$as_me:15347: \$? = $ac_status" >&5
11386   (exit $ac_status); }; }; then
11387   cf_cv_lib_XCurses=yes
11388 else
11389@@ -15320,7 +15355,7 @@
11390 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11391
11392 fi
11393-echo "$as_me:15323: result: $cf_cv_lib_XCurses" >&5
11394+echo "$as_me:15358: result: $cf_cv_lib_XCurses" >&5
11395 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
11396
11397 fi
11398@@ -15335,23 +15370,23 @@
11399 #define XCURSES 1
11400 EOF
11401
11402-	echo "$as_me:15338: checking for xcurses.h" >&5
11403+	echo "$as_me:15373: checking for xcurses.h" >&5
11404 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
11405 if test "${ac_cv_header_xcurses_h+set}" = set; then
11406   echo $ECHO_N "(cached) $ECHO_C" >&6
11407 else
11408   cat >conftest.$ac_ext <<_ACEOF
11409-#line 15344 "configure"
11410+#line 15379 "configure"
11411 #include "confdefs.h"
11412 #include <xcurses.h>
11413 _ACEOF
11414-if { (eval echo "$as_me:15348: \"$ac_cpp conftest.$ac_ext\"") >&5
11415+if { (eval echo "$as_me:15383: \"$ac_cpp conftest.$ac_ext\"") >&5
11416   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
11417   ac_status=$?
11418   egrep -v '^ *\+' conftest.er1 >conftest.err
11419   rm -f conftest.er1
11420   cat conftest.err >&5
11421-  echo "$as_me:15354: \$? = $ac_status" >&5
11422+  echo "$as_me:15389: \$? = $ac_status" >&5
11423   (exit $ac_status); } >/dev/null; then
11424   if test -s conftest.err; then
11425     ac_cpp_err=$ac_c_preproc_warn_flag
11426@@ -15370,7 +15405,7 @@
11427 fi
11428 rm -f conftest.err conftest.$ac_ext
11429 fi
11430-echo "$as_me:15373: result: $ac_cv_header_xcurses_h" >&5
11431+echo "$as_me:15408: result: $ac_cv_header_xcurses_h" >&5
11432 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
11433 if test $ac_cv_header_xcurses_h = yes; then
11434
11435@@ -15381,14 +15416,14 @@
11436 fi
11437
11438 else
11439-	{ { echo "$as_me:15384: error: Cannot link with XCurses" >&5
11440+	{ { echo "$as_me:15419: error: Cannot link with XCurses" >&5
11441 echo "$as_me: error: Cannot link with XCurses" >&2;}
11442    { (exit 1); exit 1; }; }
11443 fi
11444
11445 	;;
11446 (*)
11447-	{ { echo "$as_me:15391: error: unexpected screen-value: $cf_cv_screen" >&5
11448+	{ { echo "$as_me:15426: error: unexpected screen-value: $cf_cv_screen" >&5
11449 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
11450    { (exit 1); exit 1; }; }
11451 	;;
11452@@ -15396,7 +15431,7 @@
11453
11454 : ${cf_nculib_root:=$cf_cv_screen}
11455 as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh`
11456-echo "$as_me:15399: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
11457+echo "$as_me:15434: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
11458 echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6
11459 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
11460   echo $ECHO_N "(cached) $ECHO_C" >&6
11461@@ -15404,7 +15439,7 @@
11462   ac_check_lib_save_LIBS=$LIBS
11463 LIBS="-l$cf_nculib_root  $LIBS"
11464 cat >conftest.$ac_ext <<_ACEOF
11465-#line 15407 "configure"
11466+#line 15442 "configure"
11467 #include "confdefs.h"
11468
11469 /* Override any gcc2 internal prototype to avoid an error.  */
11470@@ -15423,16 +15458,16 @@
11471 }
11472 _ACEOF
11473 rm -f conftest.$ac_objext conftest$ac_exeext
11474-if { (eval echo "$as_me:15426: \"$ac_link\"") >&5
11475+if { (eval echo "$as_me:15461: \"$ac_link\"") >&5
11476   (eval $ac_link) 2>&5
11477   ac_status=$?
11478-  echo "$as_me:15429: \$? = $ac_status" >&5
11479+  echo "$as_me:15464: \$? = $ac_status" >&5
11480   (exit $ac_status); } &&
11481          { ac_try='test -s conftest$ac_exeext'
11482-  { (eval echo "$as_me:15432: \"$ac_try\"") >&5
11483+  { (eval echo "$as_me:15467: \"$ac_try\"") >&5
11484   (eval $ac_try) 2>&5
11485   ac_status=$?
11486-  echo "$as_me:15435: \$? = $ac_status" >&5
11487+  echo "$as_me:15470: \$? = $ac_status" >&5
11488   (exit $ac_status); }; }; then
11489   eval "$as_ac_Lib=yes"
11490 else
11491@@ -15443,7 +15478,7 @@
11492 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11493 LIBS=$ac_check_lib_save_LIBS
11494 fi
11495-echo "$as_me:15446: result: `eval echo '${'$as_ac_Lib'}'`" >&5
11496+echo "$as_me:15481: result: `eval echo '${'$as_ac_Lib'}'`" >&5
11497 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
11498 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
11499   cf_cv_ncurses_pthreads=yes
11500@@ -15478,7 +15513,7 @@
11501 	;;
11502 esac
11503
11504-echo "$as_me:15481: checking for X11 rgb file" >&5
11505+echo "$as_me:15516: checking for X11 rgb file" >&5
11506 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
11507
11508 # Check whether --with-x11-rgb or --without-x11-rgb was given.
11509@@ -15542,7 +15577,7 @@
11510 	cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
11511 	;;
11512 (*)
11513-	{ { echo "$as_me:15545: error: expected a pathname, not \"$cf_path\"" >&5
11514+	{ { echo "$as_me:15580: error: expected a pathname, not \"$cf_path\"" >&5
11515 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
11516    { (exit 1); exit 1; }; }
11517 	;;
11518@@ -15550,7 +15585,7 @@
11519
11520 fi
11521
11522-echo "$as_me:15553: result: $RGB_PATH" >&5
11523+echo "$as_me:15588: result: $RGB_PATH" >&5
11524 echo "${ECHO_T}$RGB_PATH" >&6
11525
11526 cat >>confdefs.h <<EOF
11527@@ -15591,7 +15626,7 @@
11528 	;;
11529 esac
11530
11531-echo "$as_me:15594: checking if you want to check for panel functions" >&5
11532+echo "$as_me:15629: checking if you want to check for panel functions" >&5
11533 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
11534
11535 # Check whether --enable-panel or --disable-panel was given.
11536@@ -15608,7 +15643,7 @@
11537 	cf_enable_panel=$cf_default_panel
11538
11539 fi;
11540-echo "$as_me:15611: result: $cf_enable_panel" >&5
11541+echo "$as_me:15646: result: $cf_enable_panel" >&5
11542 echo "${ECHO_T}$cf_enable_panel" >&6
11543 if test $cf_enable_panel = yes
11544 then
11545@@ -15619,13 +15654,13 @@
11546 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
11547 	:
11548 elif test "x${PKG_CONFIG:=none}" != xnone; then
11549-	echo "$as_me:15622: checking pkg-config for panel$cf_cv_libtype" >&5
11550+	echo "$as_me:15657: checking pkg-config for panel$cf_cv_libtype" >&5
11551 echo $ECHO_N "checking pkg-config for panel$cf_cv_libtype... $ECHO_C" >&6
11552 	if "$PKG_CONFIG" --exists panel$cf_cv_libtype ; then
11553-		echo "$as_me:15625: result: yes" >&5
11554+		echo "$as_me:15660: result: yes" >&5
11555 echo "${ECHO_T}yes" >&6
11556
11557-		echo "$as_me:15628: checking if the panel$cf_cv_libtype package files work" >&5
11558+		echo "$as_me:15663: checking if the panel$cf_cv_libtype package files work" >&5
11559 echo $ECHO_N "checking if the panel$cf_cv_libtype package files work... $ECHO_C" >&6
11560
11561 		cf_save_CPPFLAGS="$CPPFLAGS"
11562@@ -15746,7 +15781,7 @@
11563 LIBS="$cf_add_libs"
11564
11565 		cat >conftest.$ac_ext <<_ACEOF
11566-#line 15749 "configure"
11567+#line 15784 "configure"
11568 #include "confdefs.h"
11569 #include <panel.h>
11570 int
11571@@ -15758,37 +15793,37 @@
11572 }
11573 _ACEOF
11574 rm -f conftest.$ac_objext conftest$ac_exeext
11575-if { (eval echo "$as_me:15761: \"$ac_link\"") >&5
11576+if { (eval echo "$as_me:15796: \"$ac_link\"") >&5
11577   (eval $ac_link) 2>&5
11578   ac_status=$?
11579-  echo "$as_me:15764: \$? = $ac_status" >&5
11580+  echo "$as_me:15799: \$? = $ac_status" >&5
11581   (exit $ac_status); } &&
11582          { ac_try='test -s conftest$ac_exeext'
11583-  { (eval echo "$as_me:15767: \"$ac_try\"") >&5
11584+  { (eval echo "$as_me:15802: \"$ac_try\"") >&5
11585   (eval $ac_try) 2>&5
11586   ac_status=$?
11587-  echo "$as_me:15770: \$? = $ac_status" >&5
11588+  echo "$as_me:15805: \$? = $ac_status" >&5
11589   (exit $ac_status); }; }; then
11590   if test "$cross_compiling" = yes; then
11591   cf_have_curses_lib=maybe
11592 else
11593   cat >conftest.$ac_ext <<_ACEOF
11594-#line 15776 "configure"
11595+#line 15811 "configure"
11596 #include "confdefs.h"
11597 #include <panel.h>
11598 				int main(void)
11599 				{ (void) new_panel ( 0 ); return 0; }
11600 _ACEOF
11601 rm -f conftest$ac_exeext
11602-if { (eval echo "$as_me:15783: \"$ac_link\"") >&5
11603+if { (eval echo "$as_me:15818: \"$ac_link\"") >&5
11604   (eval $ac_link) 2>&5
11605   ac_status=$?
11606-  echo "$as_me:15786: \$? = $ac_status" >&5
11607+  echo "$as_me:15821: \$? = $ac_status" >&5
11608   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11609-  { (eval echo "$as_me:15788: \"$ac_try\"") >&5
11610+  { (eval echo "$as_me:15823: \"$ac_try\"") >&5
11611   (eval $ac_try) 2>&5
11612   ac_status=$?
11613-  echo "$as_me:15791: \$? = $ac_status" >&5
11614+  echo "$as_me:15826: \$? = $ac_status" >&5
11615   (exit $ac_status); }; }; then
11616   cf_have_curses_lib=yes
11617 else
11618@@ -15805,7 +15840,7 @@
11619 cf_have_curses_lib=no
11620 fi
11621 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11622-		echo "$as_me:15808: result: $cf_have_curses_lib" >&5
11623+		echo "$as_me:15843: result: $cf_have_curses_lib" >&5
11624 echo "${ECHO_T}$cf_have_curses_lib" >&6
11625 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
11626 		if test "$cf_have_curses_lib" != "yes"
11627@@ -15825,7 +15860,7 @@
11628 fi
11629 if test "$cf_have_curses_lib" = no; then
11630 	as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh`
11631-echo "$as_me:15828: checking for new_panel in -lpanel$cf_cv_libtype" >&5
11632+echo "$as_me:15863: checking for new_panel in -lpanel$cf_cv_libtype" >&5
11633 echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6
11634 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
11635   echo $ECHO_N "(cached) $ECHO_C" >&6
11636@@ -15833,7 +15868,7 @@
11637   ac_check_lib_save_LIBS=$LIBS
11638 LIBS="-lpanel$cf_cv_libtype  $LIBS"
11639 cat >conftest.$ac_ext <<_ACEOF
11640-#line 15836 "configure"
11641+#line 15871 "configure"
11642 #include "confdefs.h"
11643
11644 /* Override any gcc2 internal prototype to avoid an error.  */
11645@@ -15852,16 +15887,16 @@
11646 }
11647 _ACEOF
11648 rm -f conftest.$ac_objext conftest$ac_exeext
11649-if { (eval echo "$as_me:15855: \"$ac_link\"") >&5
11650+if { (eval echo "$as_me:15890: \"$ac_link\"") >&5
11651   (eval $ac_link) 2>&5
11652   ac_status=$?
11653-  echo "$as_me:15858: \$? = $ac_status" >&5
11654+  echo "$as_me:15893: \$? = $ac_status" >&5
11655   (exit $ac_status); } &&
11656          { ac_try='test -s conftest$ac_exeext'
11657-  { (eval echo "$as_me:15861: \"$ac_try\"") >&5
11658+  { (eval echo "$as_me:15896: \"$ac_try\"") >&5
11659   (eval $ac_try) 2>&5
11660   ac_status=$?
11661-  echo "$as_me:15864: \$? = $ac_status" >&5
11662+  echo "$as_me:15899: \$? = $ac_status" >&5
11663   (exit $ac_status); }; }; then
11664   eval "$as_ac_Lib=yes"
11665 else
11666@@ -15872,7 +15907,7 @@
11667 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11668 LIBS=$ac_check_lib_save_LIBS
11669 fi
11670-echo "$as_me:15875: result: `eval echo '${'$as_ac_Lib'}'`" >&5
11671+echo "$as_me:15910: result: `eval echo '${'$as_ac_Lib'}'`" >&5
11672 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
11673 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
11674
11675@@ -15905,7 +15940,7 @@
11676 	cf_curses_headers="$cf_curses_headers panel.h"
11677 fi
11678
11679-echo "$as_me:15908: checking if you want to check for menu functions" >&5
11680+echo "$as_me:15943: checking if you want to check for menu functions" >&5
11681 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
11682
11683 # Check whether --enable-menu or --disable-menu was given.
11684@@ -15922,7 +15957,7 @@
11685 	cf_enable_menu=$cf_default_menu
11686
11687 fi;
11688-echo "$as_me:15925: result: $cf_enable_menu" >&5
11689+echo "$as_me:15960: result: $cf_enable_menu" >&5
11690 echo "${ECHO_T}$cf_enable_menu" >&6
11691 if test $cf_enable_menu = yes
11692 then
11693@@ -15931,14 +15966,14 @@
11694 		;;
11695 	(curses*)
11696
11697-echo "$as_me:15934: checking for NetBSD menu.h" >&5
11698+echo "$as_me:15969: checking for NetBSD menu.h" >&5
11699 echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
11700 if test "${cf_cv_netbsd_menu_h+set}" = set; then
11701   echo $ECHO_N "(cached) $ECHO_C" >&6
11702 else
11703
11704 cat >conftest.$ac_ext <<_ACEOF
11705-#line 15941 "configure"
11706+#line 15976 "configure"
11707 #include "confdefs.h"
11708
11709 #include <${cf_cv_ncurses_header:-curses.h}>
11710@@ -15956,16 +15991,16 @@
11711 }
11712 _ACEOF
11713 rm -f conftest.$ac_objext
11714-if { (eval echo "$as_me:15959: \"$ac_compile\"") >&5
11715+if { (eval echo "$as_me:15994: \"$ac_compile\"") >&5
11716   (eval $ac_compile) 2>&5
11717   ac_status=$?
11718-  echo "$as_me:15962: \$? = $ac_status" >&5
11719+  echo "$as_me:15997: \$? = $ac_status" >&5
11720   (exit $ac_status); } &&
11721          { ac_try='test -s conftest.$ac_objext'
11722-  { (eval echo "$as_me:15965: \"$ac_try\"") >&5
11723+  { (eval echo "$as_me:16000: \"$ac_try\"") >&5
11724   (eval $ac_try) 2>&5
11725   ac_status=$?
11726-  echo "$as_me:15968: \$? = $ac_status" >&5
11727+  echo "$as_me:16003: \$? = $ac_status" >&5
11728   (exit $ac_status); }; }; then
11729   cf_cv_netbsd_menu_h=yes
11730
11731@@ -15977,7 +16012,7 @@
11732 rm -f conftest.$ac_objext conftest.$ac_ext
11733
11734 fi
11735-echo "$as_me:15980: result: $cf_cv_netbsd_menu_h" >&5
11736+echo "$as_me:16015: result: $cf_cv_netbsd_menu_h" >&5
11737 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
11738
11739 test "$cf_cv_netbsd_menu_h" = yes &&
11740@@ -15994,13 +16029,13 @@
11741 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
11742 	:
11743 elif test "x${PKG_CONFIG:=none}" != xnone; then
11744-	echo "$as_me:15997: checking pkg-config for menu$cf_cv_libtype" >&5
11745+	echo "$as_me:16032: checking pkg-config for menu$cf_cv_libtype" >&5
11746 echo $ECHO_N "checking pkg-config for menu$cf_cv_libtype... $ECHO_C" >&6
11747 	if "$PKG_CONFIG" --exists menu$cf_cv_libtype ; then
11748-		echo "$as_me:16000: result: yes" >&5
11749+		echo "$as_me:16035: result: yes" >&5
11750 echo "${ECHO_T}yes" >&6
11751
11752-		echo "$as_me:16003: checking if the menu$cf_cv_libtype package files work" >&5
11753+		echo "$as_me:16038: checking if the menu$cf_cv_libtype package files work" >&5
11754 echo $ECHO_N "checking if the menu$cf_cv_libtype package files work... $ECHO_C" >&6
11755
11756 		cf_save_CPPFLAGS="$CPPFLAGS"
11757@@ -16121,7 +16156,7 @@
11758 LIBS="$cf_add_libs"
11759
11760 		cat >conftest.$ac_ext <<_ACEOF
11761-#line 16124 "configure"
11762+#line 16159 "configure"
11763 #include "confdefs.h"
11764 #include <menu.h>
11765 int
11766@@ -16133,37 +16168,37 @@
11767 }
11768 _ACEOF
11769 rm -f conftest.$ac_objext conftest$ac_exeext
11770-if { (eval echo "$as_me:16136: \"$ac_link\"") >&5
11771+if { (eval echo "$as_me:16171: \"$ac_link\"") >&5
11772   (eval $ac_link) 2>&5
11773   ac_status=$?
11774-  echo "$as_me:16139: \$? = $ac_status" >&5
11775+  echo "$as_me:16174: \$? = $ac_status" >&5
11776   (exit $ac_status); } &&
11777          { ac_try='test -s conftest$ac_exeext'
11778-  { (eval echo "$as_me:16142: \"$ac_try\"") >&5
11779+  { (eval echo "$as_me:16177: \"$ac_try\"") >&5
11780   (eval $ac_try) 2>&5
11781   ac_status=$?
11782-  echo "$as_me:16145: \$? = $ac_status" >&5
11783+  echo "$as_me:16180: \$? = $ac_status" >&5
11784   (exit $ac_status); }; }; then
11785   if test "$cross_compiling" = yes; then
11786   cf_have_curses_lib=maybe
11787 else
11788   cat >conftest.$ac_ext <<_ACEOF
11789-#line 16151 "configure"
11790+#line 16186 "configure"
11791 #include "confdefs.h"
11792 #include <menu.h>
11793 				int main(void)
11794 				{ (void) menu_driver ( 0,0 ); return 0; }
11795 _ACEOF
11796 rm -f conftest$ac_exeext
11797-if { (eval echo "$as_me:16158: \"$ac_link\"") >&5
11798+if { (eval echo "$as_me:16193: \"$ac_link\"") >&5
11799   (eval $ac_link) 2>&5
11800   ac_status=$?
11801-  echo "$as_me:16161: \$? = $ac_status" >&5
11802+  echo "$as_me:16196: \$? = $ac_status" >&5
11803   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11804-  { (eval echo "$as_me:16163: \"$ac_try\"") >&5
11805+  { (eval echo "$as_me:16198: \"$ac_try\"") >&5
11806   (eval $ac_try) 2>&5
11807   ac_status=$?
11808-  echo "$as_me:16166: \$? = $ac_status" >&5
11809+  echo "$as_me:16201: \$? = $ac_status" >&5
11810   (exit $ac_status); }; }; then
11811   cf_have_curses_lib=yes
11812 else
11813@@ -16180,7 +16215,7 @@
11814 cf_have_curses_lib=no
11815 fi
11816 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11817-		echo "$as_me:16183: result: $cf_have_curses_lib" >&5
11818+		echo "$as_me:16218: result: $cf_have_curses_lib" >&5
11819 echo "${ECHO_T}$cf_have_curses_lib" >&6
11820 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
11821 		if test "$cf_have_curses_lib" != "yes"
11822@@ -16200,7 +16235,7 @@
11823 fi
11824 if test "$cf_have_curses_lib" = no; then
11825 	as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh`
11826-echo "$as_me:16203: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
11827+echo "$as_me:16238: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
11828 echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6
11829 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
11830   echo $ECHO_N "(cached) $ECHO_C" >&6
11831@@ -16208,7 +16243,7 @@
11832   ac_check_lib_save_LIBS=$LIBS
11833 LIBS="-lmenu$cf_cv_libtype  $LIBS"
11834 cat >conftest.$ac_ext <<_ACEOF
11835-#line 16211 "configure"
11836+#line 16246 "configure"
11837 #include "confdefs.h"
11838
11839 /* Override any gcc2 internal prototype to avoid an error.  */
11840@@ -16227,16 +16262,16 @@
11841 }
11842 _ACEOF
11843 rm -f conftest.$ac_objext conftest$ac_exeext
11844-if { (eval echo "$as_me:16230: \"$ac_link\"") >&5
11845+if { (eval echo "$as_me:16265: \"$ac_link\"") >&5
11846   (eval $ac_link) 2>&5
11847   ac_status=$?
11848-  echo "$as_me:16233: \$? = $ac_status" >&5
11849+  echo "$as_me:16268: \$? = $ac_status" >&5
11850   (exit $ac_status); } &&
11851          { ac_try='test -s conftest$ac_exeext'
11852-  { (eval echo "$as_me:16236: \"$ac_try\"") >&5
11853+  { (eval echo "$as_me:16271: \"$ac_try\"") >&5
11854   (eval $ac_try) 2>&5
11855   ac_status=$?
11856-  echo "$as_me:16239: \$? = $ac_status" >&5
11857+  echo "$as_me:16274: \$? = $ac_status" >&5
11858   (exit $ac_status); }; }; then
11859   eval "$as_ac_Lib=yes"
11860 else
11861@@ -16247,7 +16282,7 @@
11862 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11863 LIBS=$ac_check_lib_save_LIBS
11864 fi
11865-echo "$as_me:16250: result: `eval echo '${'$as_ac_Lib'}'`" >&5
11866+echo "$as_me:16285: result: `eval echo '${'$as_ac_Lib'}'`" >&5
11867 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
11868 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
11869
11870@@ -16280,7 +16315,7 @@
11871 	cf_curses_headers="$cf_curses_headers menu.h"
11872 fi
11873
11874-echo "$as_me:16283: checking if you want to check for form functions" >&5
11875+echo "$as_me:16318: checking if you want to check for form functions" >&5
11876 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
11877
11878 # Check whether --enable-form or --disable-form was given.
11879@@ -16297,7 +16332,7 @@
11880 	cf_enable_form=$cf_default_form
11881
11882 fi;
11883-echo "$as_me:16300: result: $cf_enable_form" >&5
11884+echo "$as_me:16335: result: $cf_enable_form" >&5
11885 echo "${ECHO_T}$cf_enable_form" >&6
11886 if test $cf_enable_form = yes
11887 then
11888@@ -16306,14 +16341,14 @@
11889 		;;
11890 	(curses*)
11891
11892-echo "$as_me:16309: checking for NetBSD form.h" >&5
11893+echo "$as_me:16344: checking for NetBSD form.h" >&5
11894 echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
11895 if test "${cf_cv_netbsd_form_h+set}" = set; then
11896   echo $ECHO_N "(cached) $ECHO_C" >&6
11897 else
11898
11899 cat >conftest.$ac_ext <<_ACEOF
11900-#line 16316 "configure"
11901+#line 16351 "configure"
11902 #include "confdefs.h"
11903
11904 #include <${cf_cv_ncurses_header:-curses.h}>
11905@@ -16332,16 +16367,16 @@
11906 }
11907 _ACEOF
11908 rm -f conftest.$ac_objext
11909-if { (eval echo "$as_me:16335: \"$ac_compile\"") >&5
11910+if { (eval echo "$as_me:16370: \"$ac_compile\"") >&5
11911   (eval $ac_compile) 2>&5
11912   ac_status=$?
11913-  echo "$as_me:16338: \$? = $ac_status" >&5
11914+  echo "$as_me:16373: \$? = $ac_status" >&5
11915   (exit $ac_status); } &&
11916          { ac_try='test -s conftest.$ac_objext'
11917-  { (eval echo "$as_me:16341: \"$ac_try\"") >&5
11918+  { (eval echo "$as_me:16376: \"$ac_try\"") >&5
11919   (eval $ac_try) 2>&5
11920   ac_status=$?
11921-  echo "$as_me:16344: \$? = $ac_status" >&5
11922+  echo "$as_me:16379: \$? = $ac_status" >&5
11923   (exit $ac_status); }; }; then
11924   cf_cv_netbsd_form_h=yes
11925
11926@@ -16353,7 +16388,7 @@
11927 rm -f conftest.$ac_objext conftest.$ac_ext
11928
11929 fi
11930-echo "$as_me:16356: result: $cf_cv_netbsd_form_h" >&5
11931+echo "$as_me:16391: result: $cf_cv_netbsd_form_h" >&5
11932 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
11933
11934 test "$cf_cv_netbsd_form_h" = yes &&
11935@@ -16370,13 +16405,13 @@
11936 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
11937 	:
11938 elif test "x${PKG_CONFIG:=none}" != xnone; then
11939-	echo "$as_me:16373: checking pkg-config for form$cf_cv_libtype" >&5
11940+	echo "$as_me:16408: checking pkg-config for form$cf_cv_libtype" >&5
11941 echo $ECHO_N "checking pkg-config for form$cf_cv_libtype... $ECHO_C" >&6
11942 	if "$PKG_CONFIG" --exists form$cf_cv_libtype ; then
11943-		echo "$as_me:16376: result: yes" >&5
11944+		echo "$as_me:16411: result: yes" >&5
11945 echo "${ECHO_T}yes" >&6
11946
11947-		echo "$as_me:16379: checking if the form$cf_cv_libtype package files work" >&5
11948+		echo "$as_me:16414: checking if the form$cf_cv_libtype package files work" >&5
11949 echo $ECHO_N "checking if the form$cf_cv_libtype package files work... $ECHO_C" >&6
11950
11951 		cf_save_CPPFLAGS="$CPPFLAGS"
11952@@ -16497,7 +16532,7 @@
11953 LIBS="$cf_add_libs"
11954
11955 		cat >conftest.$ac_ext <<_ACEOF
11956-#line 16500 "configure"
11957+#line 16535 "configure"
11958 #include "confdefs.h"
11959 #include <form.h>
11960 int
11961@@ -16509,37 +16544,37 @@
11962 }
11963 _ACEOF
11964 rm -f conftest.$ac_objext conftest$ac_exeext
11965-if { (eval echo "$as_me:16512: \"$ac_link\"") >&5
11966+if { (eval echo "$as_me:16547: \"$ac_link\"") >&5
11967   (eval $ac_link) 2>&5
11968   ac_status=$?
11969-  echo "$as_me:16515: \$? = $ac_status" >&5
11970+  echo "$as_me:16550: \$? = $ac_status" >&5
11971   (exit $ac_status); } &&
11972          { ac_try='test -s conftest$ac_exeext'
11973-  { (eval echo "$as_me:16518: \"$ac_try\"") >&5
11974+  { (eval echo "$as_me:16553: \"$ac_try\"") >&5
11975   (eval $ac_try) 2>&5
11976   ac_status=$?
11977-  echo "$as_me:16521: \$? = $ac_status" >&5
11978+  echo "$as_me:16556: \$? = $ac_status" >&5
11979   (exit $ac_status); }; }; then
11980   if test "$cross_compiling" = yes; then
11981   cf_have_curses_lib=maybe
11982 else
11983   cat >conftest.$ac_ext <<_ACEOF
11984-#line 16527 "configure"
11985+#line 16562 "configure"
11986 #include "confdefs.h"
11987 #include <form.h>
11988 				int main(void)
11989 				{ (void) form_driver ( 0,0 ); return 0; }
11990 _ACEOF
11991 rm -f conftest$ac_exeext
11992-if { (eval echo "$as_me:16534: \"$ac_link\"") >&5
11993+if { (eval echo "$as_me:16569: \"$ac_link\"") >&5
11994   (eval $ac_link) 2>&5
11995   ac_status=$?
11996-  echo "$as_me:16537: \$? = $ac_status" >&5
11997+  echo "$as_me:16572: \$? = $ac_status" >&5
11998   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11999-  { (eval echo "$as_me:16539: \"$ac_try\"") >&5
12000+  { (eval echo "$as_me:16574: \"$ac_try\"") >&5
12001   (eval $ac_try) 2>&5
12002   ac_status=$?
12003-  echo "$as_me:16542: \$? = $ac_status" >&5
12004+  echo "$as_me:16577: \$? = $ac_status" >&5
12005   (exit $ac_status); }; }; then
12006   cf_have_curses_lib=yes
12007 else
12008@@ -16556,7 +16591,7 @@
12009 cf_have_curses_lib=no
12010 fi
12011 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
12012-		echo "$as_me:16559: result: $cf_have_curses_lib" >&5
12013+		echo "$as_me:16594: result: $cf_have_curses_lib" >&5
12014 echo "${ECHO_T}$cf_have_curses_lib" >&6
12015 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
12016 		if test "$cf_have_curses_lib" != "yes"
12017@@ -16576,7 +16611,7 @@
12018 fi
12019 if test "$cf_have_curses_lib" = no; then
12020 	as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh`
12021-echo "$as_me:16579: checking for form_driver in -lform$cf_cv_libtype" >&5
12022+echo "$as_me:16614: checking for form_driver in -lform$cf_cv_libtype" >&5
12023 echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6
12024 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
12025   echo $ECHO_N "(cached) $ECHO_C" >&6
12026@@ -16584,7 +16619,7 @@
12027   ac_check_lib_save_LIBS=$LIBS
12028 LIBS="-lform$cf_cv_libtype  $LIBS"
12029 cat >conftest.$ac_ext <<_ACEOF
12030-#line 16587 "configure"
12031+#line 16622 "configure"
12032 #include "confdefs.h"
12033
12034 /* Override any gcc2 internal prototype to avoid an error.  */
12035@@ -16603,16 +16638,16 @@
12036 }
12037 _ACEOF
12038 rm -f conftest.$ac_objext conftest$ac_exeext
12039-if { (eval echo "$as_me:16606: \"$ac_link\"") >&5
12040+if { (eval echo "$as_me:16641: \"$ac_link\"") >&5
12041   (eval $ac_link) 2>&5
12042   ac_status=$?
12043-  echo "$as_me:16609: \$? = $ac_status" >&5
12044+  echo "$as_me:16644: \$? = $ac_status" >&5
12045   (exit $ac_status); } &&
12046          { ac_try='test -s conftest$ac_exeext'
12047-  { (eval echo "$as_me:16612: \"$ac_try\"") >&5
12048+  { (eval echo "$as_me:16647: \"$ac_try\"") >&5
12049   (eval $ac_try) 2>&5
12050   ac_status=$?
12051-  echo "$as_me:16615: \$? = $ac_status" >&5
12052+  echo "$as_me:16650: \$? = $ac_status" >&5
12053   (exit $ac_status); }; }; then
12054   eval "$as_ac_Lib=yes"
12055 else
12056@@ -16623,7 +16658,7 @@
12057 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
12058 LIBS=$ac_check_lib_save_LIBS
12059 fi
12060-echo "$as_me:16626: result: `eval echo '${'$as_ac_Lib'}'`" >&5
12061+echo "$as_me:16661: result: `eval echo '${'$as_ac_Lib'}'`" >&5
12062 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
12063 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
12064
12065@@ -16661,23 +16696,23 @@
12066 for ac_header in $cf_curses_headers
12067 do
12068 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
12069-echo "$as_me:16664: checking for $ac_header" >&5
12070+echo "$as_me:16699: checking for $ac_header" >&5
12071 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
12072 if eval "test \"\${$as_ac_Header+set}\" = set"; then
12073   echo $ECHO_N "(cached) $ECHO_C" >&6
12074 else
12075   cat >conftest.$ac_ext <<_ACEOF
12076-#line 16670 "configure"
12077+#line 16705 "configure"
12078 #include "confdefs.h"
12079 #include <$ac_header>
12080 _ACEOF
12081-if { (eval echo "$as_me:16674: \"$ac_cpp conftest.$ac_ext\"") >&5
12082+if { (eval echo "$as_me:16709: \"$ac_cpp conftest.$ac_ext\"") >&5
12083   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12084   ac_status=$?
12085   egrep -v '^ *\+' conftest.er1 >conftest.err
12086   rm -f conftest.er1
12087   cat conftest.err >&5
12088-  echo "$as_me:16680: \$? = $ac_status" >&5
12089+  echo "$as_me:16715: \$? = $ac_status" >&5
12090   (exit $ac_status); } >/dev/null; then
12091   if test -s conftest.err; then
12092     ac_cpp_err=$ac_c_preproc_warn_flag
12093@@ -16696,7 +16731,7 @@
12094 fi
12095 rm -f conftest.err conftest.$ac_ext
12096 fi
12097-echo "$as_me:16699: result: `eval echo '${'$as_ac_Header'}'`" >&5
12098+echo "$as_me:16734: result: `eval echo '${'$as_ac_Header'}'`" >&5
12099 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
12100 if test `eval echo '${'$as_ac_Header'}'` = yes; then
12101   cat >>confdefs.h <<EOF
12102@@ -16706,13 +16741,13 @@
12103 fi
12104 done
12105
12106-echo "$as_me:16709: checking for ANSI C header files" >&5
12107+echo "$as_me:16744: checking for ANSI C header files" >&5
12108 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
12109 if test "${ac_cv_header_stdc+set}" = set; then
12110   echo $ECHO_N "(cached) $ECHO_C" >&6
12111 else
12112   cat >conftest.$ac_ext <<_ACEOF
12113-#line 16715 "configure"
12114+#line 16750 "configure"
12115 #include "confdefs.h"
12116 #include <stdlib.h>
12117 #include <stdarg.h>
12118@@ -16720,13 +16755,13 @@
12119 #include <float.h>
12120
12121 _ACEOF
12122-if { (eval echo "$as_me:16723: \"$ac_cpp conftest.$ac_ext\"") >&5
12123+if { (eval echo "$as_me:16758: \"$ac_cpp conftest.$ac_ext\"") >&5
12124   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12125   ac_status=$?
12126   egrep -v '^ *\+' conftest.er1 >conftest.err
12127   rm -f conftest.er1
12128   cat conftest.err >&5
12129-  echo "$as_me:16729: \$? = $ac_status" >&5
12130+  echo "$as_me:16764: \$? = $ac_status" >&5
12131   (exit $ac_status); } >/dev/null; then
12132   if test -s conftest.err; then
12133     ac_cpp_err=$ac_c_preproc_warn_flag
12134@@ -16748,7 +16783,7 @@
12135 if test $ac_cv_header_stdc = yes; then
12136   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
12137   cat >conftest.$ac_ext <<_ACEOF
12138-#line 16751 "configure"
12139+#line 16786 "configure"
12140 #include "confdefs.h"
12141 #include <string.h>
12142
12143@@ -16766,7 +16801,7 @@
12144 if test $ac_cv_header_stdc = yes; then
12145   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
12146   cat >conftest.$ac_ext <<_ACEOF
12147-#line 16769 "configure"
12148+#line 16804 "configure"
12149 #include "confdefs.h"
12150 #include <stdlib.h>
12151
12152@@ -16787,7 +16822,7 @@
12153   :
12154 else
12155   cat >conftest.$ac_ext <<_ACEOF
12156-#line 16790 "configure"
12157+#line 16825 "configure"
12158 #include "confdefs.h"
12159 #include <ctype.h>
12160 #if ((' ' & 0x0FF) == 0x020)
12161@@ -16813,15 +16848,15 @@
12162 }
12163 _ACEOF
12164 rm -f conftest$ac_exeext
12165-if { (eval echo "$as_me:16816: \"$ac_link\"") >&5
12166+if { (eval echo "$as_me:16851: \"$ac_link\"") >&5
12167   (eval $ac_link) 2>&5
12168   ac_status=$?
12169-  echo "$as_me:16819: \$? = $ac_status" >&5
12170+  echo "$as_me:16854: \$? = $ac_status" >&5
12171   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
12172-  { (eval echo "$as_me:16821: \"$ac_try\"") >&5
12173+  { (eval echo "$as_me:16856: \"$ac_try\"") >&5
12174   (eval $ac_try) 2>&5
12175   ac_status=$?
12176-  echo "$as_me:16824: \$? = $ac_status" >&5
12177+  echo "$as_me:16859: \$? = $ac_status" >&5
12178   (exit $ac_status); }; }; then
12179   :
12180 else
12181@@ -16834,7 +16869,7 @@
12182 fi
12183 fi
12184 fi
12185-echo "$as_me:16837: result: $ac_cv_header_stdc" >&5
12186+echo "$as_me:16872: result: $ac_cv_header_stdc" >&5
12187 echo "${ECHO_T}$ac_cv_header_stdc" >&6
12188 if test $ac_cv_header_stdc = yes; then
12189
12190@@ -16844,13 +16879,13 @@
12191
12192 fi
12193
12194-echo "$as_me:16847: checking whether time.h and sys/time.h may both be included" >&5
12195+echo "$as_me:16882: checking whether time.h and sys/time.h may both be included" >&5
12196 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
12197 if test "${ac_cv_header_time+set}" = set; then
12198   echo $ECHO_N "(cached) $ECHO_C" >&6
12199 else
12200   cat >conftest.$ac_ext <<_ACEOF
12201-#line 16853 "configure"
12202+#line 16888 "configure"
12203 #include "confdefs.h"
12204 #include <sys/types.h>
12205 #include <sys/time.h>
12206@@ -16866,16 +16901,16 @@
12207 }
12208 _ACEOF
12209 rm -f conftest.$ac_objext
12210-if { (eval echo "$as_me:16869: \"$ac_compile\"") >&5
12211+if { (eval echo "$as_me:16904: \"$ac_compile\"") >&5
12212   (eval $ac_compile) 2>&5
12213   ac_status=$?
12214-  echo "$as_me:16872: \$? = $ac_status" >&5
12215+  echo "$as_me:16907: \$? = $ac_status" >&5
12216   (exit $ac_status); } &&
12217          { ac_try='test -s conftest.$ac_objext'
12218-  { (eval echo "$as_me:16875: \"$ac_try\"") >&5
12219+  { (eval echo "$as_me:16910: \"$ac_try\"") >&5
12220   (eval $ac_try) 2>&5
12221   ac_status=$?
12222-  echo "$as_me:16878: \$? = $ac_status" >&5
12223+  echo "$as_me:16913: \$? = $ac_status" >&5
12224   (exit $ac_status); }; }; then
12225   ac_cv_header_time=yes
12226 else
12227@@ -16885,7 +16920,7 @@
12228 fi
12229 rm -f conftest.$ac_objext conftest.$ac_ext
12230 fi
12231-echo "$as_me:16888: result: $ac_cv_header_time" >&5
12232+echo "$as_me:16923: result: $ac_cv_header_time" >&5
12233 echo "${ECHO_T}$ac_cv_header_time" >&6
12234 if test $ac_cv_header_time = yes; then
12235
12236@@ -16909,23 +16944,23 @@
12237
12238 do
12239 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
12240-echo "$as_me:16912: checking for $ac_header" >&5
12241+echo "$as_me:16947: checking for $ac_header" >&5
12242 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
12243 if eval "test \"\${$as_ac_Header+set}\" = set"; then
12244   echo $ECHO_N "(cached) $ECHO_C" >&6
12245 else
12246   cat >conftest.$ac_ext <<_ACEOF
12247-#line 16918 "configure"
12248+#line 16953 "configure"
12249 #include "confdefs.h"
12250 #include <$ac_header>
12251 _ACEOF
12252-if { (eval echo "$as_me:16922: \"$ac_cpp conftest.$ac_ext\"") >&5
12253+if { (eval echo "$as_me:16957: \"$ac_cpp conftest.$ac_ext\"") >&5
12254   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12255   ac_status=$?
12256   egrep -v '^ *\+' conftest.er1 >conftest.err
12257   rm -f conftest.er1
12258   cat conftest.err >&5
12259-  echo "$as_me:16928: \$? = $ac_status" >&5
12260+  echo "$as_me:16963: \$? = $ac_status" >&5
12261   (exit $ac_status); } >/dev/null; then
12262   if test -s conftest.err; then
12263     ac_cpp_err=$ac_c_preproc_warn_flag
12264@@ -16944,7 +16979,7 @@
12265 fi
12266 rm -f conftest.err conftest.$ac_ext
12267 fi
12268-echo "$as_me:16947: result: `eval echo '${'$as_ac_Header'}'`" >&5
12269+echo "$as_me:16982: result: `eval echo '${'$as_ac_Header'}'`" >&5
12270 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
12271 if test `eval echo '${'$as_ac_Header'}'` = yes; then
12272   cat >>confdefs.h <<EOF
12273@@ -16957,23 +16992,23 @@
12274 for ac_header in unistd.h getopt.h
12275 do
12276 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
12277-echo "$as_me:16960: checking for $ac_header" >&5
12278+echo "$as_me:16995: checking for $ac_header" >&5
12279 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
12280 if eval "test \"\${$as_ac_Header+set}\" = set"; then
12281   echo $ECHO_N "(cached) $ECHO_C" >&6
12282 else
12283   cat >conftest.$ac_ext <<_ACEOF
12284-#line 16966 "configure"
12285+#line 17001 "configure"
12286 #include "confdefs.h"
12287 #include <$ac_header>
12288 _ACEOF
12289-if { (eval echo "$as_me:16970: \"$ac_cpp conftest.$ac_ext\"") >&5
12290+if { (eval echo "$as_me:17005: \"$ac_cpp conftest.$ac_ext\"") >&5
12291   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12292   ac_status=$?
12293   egrep -v '^ *\+' conftest.er1 >conftest.err
12294   rm -f conftest.er1
12295   cat conftest.err >&5
12296-  echo "$as_me:16976: \$? = $ac_status" >&5
12297+  echo "$as_me:17011: \$? = $ac_status" >&5
12298   (exit $ac_status); } >/dev/null; then
12299   if test -s conftest.err; then
12300     ac_cpp_err=$ac_c_preproc_warn_flag
12301@@ -16992,7 +17027,7 @@
12302 fi
12303 rm -f conftest.err conftest.$ac_ext
12304 fi
12305-echo "$as_me:16995: result: `eval echo '${'$as_ac_Header'}'`" >&5
12306+echo "$as_me:17030: result: `eval echo '${'$as_ac_Header'}'`" >&5
12307 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
12308 if test `eval echo '${'$as_ac_Header'}'` = yes; then
12309   cat >>confdefs.h <<EOF
12310@@ -17002,7 +17037,7 @@
12311 fi
12312 done
12313
12314-echo "$as_me:17005: checking for header declaring getopt variables" >&5
12315+echo "$as_me:17040: checking for header declaring getopt variables" >&5
12316 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
12317 if test "${cf_cv_getopt_header+set}" = set; then
12318   echo $ECHO_N "(cached) $ECHO_C" >&6
12319@@ -17012,7 +17047,7 @@
12320 for cf_header in stdio.h stdlib.h unistd.h getopt.h
12321 do
12322 cat >conftest.$ac_ext <<_ACEOF
12323-#line 17015 "configure"
12324+#line 17050 "configure"
12325 #include "confdefs.h"
12326
12327 #include <$cf_header>
12328@@ -17025,16 +17060,16 @@
12329 }
12330 _ACEOF
12331 rm -f conftest.$ac_objext
12332-if { (eval echo "$as_me:17028: \"$ac_compile\"") >&5
12333+if { (eval echo "$as_me:17063: \"$ac_compile\"") >&5
12334   (eval $ac_compile) 2>&5
12335   ac_status=$?
12336-  echo "$as_me:17031: \$? = $ac_status" >&5
12337+  echo "$as_me:17066: \$? = $ac_status" >&5
12338   (exit $ac_status); } &&
12339          { ac_try='test -s conftest.$ac_objext'
12340-  { (eval echo "$as_me:17034: \"$ac_try\"") >&5
12341+  { (eval echo "$as_me:17069: \"$ac_try\"") >&5
12342   (eval $ac_try) 2>&5
12343   ac_status=$?
12344-  echo "$as_me:17037: \$? = $ac_status" >&5
12345+  echo "$as_me:17072: \$? = $ac_status" >&5
12346   (exit $ac_status); }; }; then
12347   cf_cv_getopt_header=$cf_header
12348  break
12349@@ -17046,7 +17081,7 @@
12350 done
12351
12352 fi
12353-echo "$as_me:17049: result: $cf_cv_getopt_header" >&5
12354+echo "$as_me:17084: result: $cf_cv_getopt_header" >&5
12355 echo "${ECHO_T}$cf_cv_getopt_header" >&6
12356 if test $cf_cv_getopt_header != none ; then
12357
12358@@ -17071,13 +17106,13 @@
12359
12360 do
12361 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
12362-echo "$as_me:17074: checking for $ac_func" >&5
12363+echo "$as_me:17109: checking for $ac_func" >&5
12364 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
12365 if eval "test \"\${$as_ac_var+set}\" = set"; then
12366   echo $ECHO_N "(cached) $ECHO_C" >&6
12367 else
12368   cat >conftest.$ac_ext <<_ACEOF
12369-#line 17080 "configure"
12370+#line 17115 "configure"
12371 #include "confdefs.h"
12372 #define $ac_func autoconf_temporary
12373 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
12374@@ -17108,16 +17143,16 @@
12375 }
12376 _ACEOF
12377 rm -f conftest.$ac_objext conftest$ac_exeext
12378-if { (eval echo "$as_me:17111: \"$ac_link\"") >&5
12379+if { (eval echo "$as_me:17146: \"$ac_link\"") >&5
12380   (eval $ac_link) 2>&5
12381   ac_status=$?
12382-  echo "$as_me:17114: \$? = $ac_status" >&5
12383+  echo "$as_me:17149: \$? = $ac_status" >&5
12384   (exit $ac_status); } &&
12385          { ac_try='test -s conftest$ac_exeext'
12386-  { (eval echo "$as_me:17117: \"$ac_try\"") >&5
12387+  { (eval echo "$as_me:17152: \"$ac_try\"") >&5
12388   (eval $ac_try) 2>&5
12389   ac_status=$?
12390-  echo "$as_me:17120: \$? = $ac_status" >&5
12391+  echo "$as_me:17155: \$? = $ac_status" >&5
12392   (exit $ac_status); }; }; then
12393   eval "$as_ac_var=yes"
12394 else
12395@@ -17127,7 +17162,7 @@
12396 fi
12397 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
12398 fi
12399-echo "$as_me:17130: result: `eval echo '${'$as_ac_var'}'`" >&5
12400+echo "$as_me:17165: result: `eval echo '${'$as_ac_var'}'`" >&5
12401 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
12402 if test `eval echo '${'$as_ac_var'}'` = yes; then
12403   cat >>confdefs.h <<EOF
12404@@ -17138,14 +17173,14 @@
12405 done
12406
12407 # use a compile-check to work with ncurses*-config and subdirectory includes
12408-echo "$as_me:17141: checking if we can use termcap.h" >&5
12409+echo "$as_me:17176: checking if we can use termcap.h" >&5
12410 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
12411 if test "${cf_cv_have_termcap_h+set}" = set; then
12412   echo $ECHO_N "(cached) $ECHO_C" >&6
12413 else
12414
12415 	cat >conftest.$ac_ext <<_ACEOF
12416-#line 17148 "configure"
12417+#line 17183 "configure"
12418 #include "confdefs.h"
12419
12420 #include <curses.h>
12421@@ -17166,16 +17201,16 @@
12422 }
12423 _ACEOF
12424 rm -f conftest.$ac_objext
12425-if { (eval echo "$as_me:17169: \"$ac_compile\"") >&5
12426+if { (eval echo "$as_me:17204: \"$ac_compile\"") >&5
12427   (eval $ac_compile) 2>&5
12428   ac_status=$?
12429-  echo "$as_me:17172: \$? = $ac_status" >&5
12430+  echo "$as_me:17207: \$? = $ac_status" >&5
12431   (exit $ac_status); } &&
12432          { ac_try='test -s conftest.$ac_objext'
12433-  { (eval echo "$as_me:17175: \"$ac_try\"") >&5
12434+  { (eval echo "$as_me:17210: \"$ac_try\"") >&5
12435   (eval $ac_try) 2>&5
12436   ac_status=$?
12437-  echo "$as_me:17178: \$? = $ac_status" >&5
12438+  echo "$as_me:17213: \$? = $ac_status" >&5
12439   (exit $ac_status); }; }; then
12440   cf_cv_have_termcap_h=yes
12441 else
12442@@ -17185,7 +17220,7 @@
12443 fi
12444 rm -f conftest.$ac_objext conftest.$ac_ext
12445 fi
12446-echo "$as_me:17188: result: $cf_cv_have_termcap_h" >&5
12447+echo "$as_me:17223: result: $cf_cv_have_termcap_h" >&5
12448 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
12449 if test "x$cf_cv_have_termcap_h" = xyes
12450 then
12451@@ -17195,14 +17230,14 @@
12452 EOF
12453
12454 else
12455-echo "$as_me:17198: checking if we can use ncurses/termcap.h" >&5
12456+echo "$as_me:17233: checking if we can use ncurses/termcap.h" >&5
12457 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
12458 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
12459   echo $ECHO_N "(cached) $ECHO_C" >&6
12460 else
12461
12462 	cat >conftest.$ac_ext <<_ACEOF
12463-#line 17205 "configure"
12464+#line 17240 "configure"
12465 #include "confdefs.h"
12466
12467 #include <ncurses/curses.h>
12468@@ -17223,16 +17258,16 @@
12469 }
12470 _ACEOF
12471 rm -f conftest.$ac_objext
12472-if { (eval echo "$as_me:17226: \"$ac_compile\"") >&5
12473+if { (eval echo "$as_me:17261: \"$ac_compile\"") >&5
12474   (eval $ac_compile) 2>&5
12475   ac_status=$?
12476-  echo "$as_me:17229: \$? = $ac_status" >&5
12477+  echo "$as_me:17264: \$? = $ac_status" >&5
12478   (exit $ac_status); } &&
12479          { ac_try='test -s conftest.$ac_objext'
12480-  { (eval echo "$as_me:17232: \"$ac_try\"") >&5
12481+  { (eval echo "$as_me:17267: \"$ac_try\"") >&5
12482   (eval $ac_try) 2>&5
12483   ac_status=$?
12484-  echo "$as_me:17235: \$? = $ac_status" >&5
12485+  echo "$as_me:17270: \$? = $ac_status" >&5
12486   (exit $ac_status); }; }; then
12487   cf_cv_have_ncurses_termcap_h=yes
12488 else
12489@@ -17242,7 +17277,7 @@
12490 fi
12491 rm -f conftest.$ac_objext conftest.$ac_ext
12492 fi
12493-echo "$as_me:17245: result: $cf_cv_have_ncurses_termcap_h" >&5
12494+echo "$as_me:17280: result: $cf_cv_have_ncurses_termcap_h" >&5
12495 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
12496 test "x$cf_cv_have_ncurses_termcap_h" = xyes &&
12497 cat >>confdefs.h <<\EOF
12498@@ -17252,7 +17287,7 @@
12499 fi
12500
12501 if test "x$ac_cv_func_getopt" = xno; then
12502-	{ { echo "$as_me:17255: error: getopt is required for building programs" >&5
12503+	{ { echo "$as_me:17290: error: getopt is required for building programs" >&5
12504 echo "$as_me: error: getopt is required for building programs" >&2;}
12505    { (exit 1); exit 1; }; }
12506 fi
12507@@ -17271,13 +17306,13 @@
12508
12509 do
12510 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
12511-echo "$as_me:17274: checking for $ac_func" >&5
12512+echo "$as_me:17309: checking for $ac_func" >&5
12513 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
12514 if eval "test \"\${$as_ac_var+set}\" = set"; then
12515   echo $ECHO_N "(cached) $ECHO_C" >&6
12516 else
12517   cat >conftest.$ac_ext <<_ACEOF
12518-#line 17280 "configure"
12519+#line 17315 "configure"
12520 #include "confdefs.h"
12521 #define $ac_func autoconf_temporary
12522 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
12523@@ -17308,16 +17343,16 @@
12524 }
12525 _ACEOF
12526 rm -f conftest.$ac_objext conftest$ac_exeext
12527-if { (eval echo "$as_me:17311: \"$ac_link\"") >&5
12528+if { (eval echo "$as_me:17346: \"$ac_link\"") >&5
12529   (eval $ac_link) 2>&5
12530   ac_status=$?
12531-  echo "$as_me:17314: \$? = $ac_status" >&5
12532+  echo "$as_me:17349: \$? = $ac_status" >&5
12533   (exit $ac_status); } &&
12534          { ac_try='test -s conftest$ac_exeext'
12535-  { (eval echo "$as_me:17317: \"$ac_try\"") >&5
12536+  { (eval echo "$as_me:17352: \"$ac_try\"") >&5
12537   (eval $ac_try) 2>&5
12538   ac_status=$?
12539-  echo "$as_me:17320: \$? = $ac_status" >&5
12540+  echo "$as_me:17355: \$? = $ac_status" >&5
12541   (exit $ac_status); }; }; then
12542   eval "$as_ac_var=yes"
12543 else
12544@@ -17327,7 +17362,7 @@
12545 fi
12546 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
12547 fi
12548-echo "$as_me:17330: result: `eval echo '${'$as_ac_var'}'`" >&5
12549+echo "$as_me:17365: result: `eval echo '${'$as_ac_var'}'`" >&5
12550 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
12551 if test `eval echo '${'$as_ac_var'}'` = yes; then
12552   cat >>confdefs.h <<EOF
12553@@ -17339,7 +17374,7 @@
12554
12555 fi
12556
12557-echo "$as_me:17342: checking definition to turn on extended curses functions" >&5
12558+echo "$as_me:17377: checking definition to turn on extended curses functions" >&5
12559 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
12560 if test "${cf_cv_need_xopen_extension+set}" = set; then
12561   echo $ECHO_N "(cached) $ECHO_C" >&6
12562@@ -17347,7 +17382,7 @@
12563
12564 cf_cv_need_xopen_extension=unknown
12565 cat >conftest.$ac_ext <<_ACEOF
12566-#line 17350 "configure"
12567+#line 17385 "configure"
12568 #include "confdefs.h"
12569
12570 #include <stdlib.h>
12571@@ -17373,16 +17408,16 @@
12572 }
12573 _ACEOF
12574 rm -f conftest.$ac_objext conftest$ac_exeext
12575-if { (eval echo "$as_me:17376: \"$ac_link\"") >&5
12576+if { (eval echo "$as_me:17411: \"$ac_link\"") >&5
12577   (eval $ac_link) 2>&5
12578   ac_status=$?
12579-  echo "$as_me:17379: \$? = $ac_status" >&5
12580+  echo "$as_me:17414: \$? = $ac_status" >&5
12581   (exit $ac_status); } &&
12582          { ac_try='test -s conftest$ac_exeext'
12583-  { (eval echo "$as_me:17382: \"$ac_try\"") >&5
12584+  { (eval echo "$as_me:17417: \"$ac_try\"") >&5
12585   (eval $ac_try) 2>&5
12586   ac_status=$?
12587-  echo "$as_me:17385: \$? = $ac_status" >&5
12588+  echo "$as_me:17420: \$? = $ac_status" >&5
12589   (exit $ac_status); }; }; then
12590   cf_cv_need_xopen_extension=none
12591 else
12592@@ -17392,7 +17427,7 @@
12593 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
12594 	do
12595 		cat >conftest.$ac_ext <<_ACEOF
12596-#line 17395 "configure"
12597+#line 17430 "configure"
12598 #include "confdefs.h"
12599
12600 #define $cf_try_xopen_extension 1
12601@@ -17414,16 +17449,16 @@
12602 }
12603 _ACEOF
12604 rm -f conftest.$ac_objext conftest$ac_exeext
12605-if { (eval echo "$as_me:17417: \"$ac_link\"") >&5
12606+if { (eval echo "$as_me:17452: \"$ac_link\"") >&5
12607   (eval $ac_link) 2>&5
12608   ac_status=$?
12609-  echo "$as_me:17420: \$? = $ac_status" >&5
12610+  echo "$as_me:17455: \$? = $ac_status" >&5
12611   (exit $ac_status); } &&
12612          { ac_try='test -s conftest$ac_exeext'
12613-  { (eval echo "$as_me:17423: \"$ac_try\"") >&5
12614+  { (eval echo "$as_me:17458: \"$ac_try\"") >&5
12615   (eval $ac_try) 2>&5
12616   ac_status=$?
12617-  echo "$as_me:17426: \$? = $ac_status" >&5
12618+  echo "$as_me:17461: \$? = $ac_status" >&5
12619   (exit $ac_status); }; }; then
12620   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
12621 else
12622@@ -17437,7 +17472,7 @@
12623 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
12624
12625 fi
12626-echo "$as_me:17440: result: $cf_cv_need_xopen_extension" >&5
12627+echo "$as_me:17475: result: $cf_cv_need_xopen_extension" >&5
12628 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
12629
12630 case $cf_cv_need_xopen_extension in
12631@@ -17449,7 +17484,7 @@
12632 	;;
12633 esac
12634
12635-echo "$as_me:17452: checking for term.h" >&5
12636+echo "$as_me:17487: checking for term.h" >&5
12637 echo $ECHO_N "checking for term.h... $ECHO_C" >&6
12638 if test "${cf_cv_term_header+set}" = set; then
12639   echo $ECHO_N "(cached) $ECHO_C" >&6
12640@@ -17470,7 +17505,7 @@
12641 for cf_header in $cf_header_list
12642 do
12643 	cat >conftest.$ac_ext <<_ACEOF
12644-#line 17473 "configure"
12645+#line 17508 "configure"
12646 #include "confdefs.h"
12647
12648 #include <${cf_cv_ncurses_header:-curses.h}>
12649@@ -17484,16 +17519,16 @@
12650 }
12651 _ACEOF
12652 rm -f conftest.$ac_objext
12653-if { (eval echo "$as_me:17487: \"$ac_compile\"") >&5
12654+if { (eval echo "$as_me:17522: \"$ac_compile\"") >&5
12655   (eval $ac_compile) 2>&5
12656   ac_status=$?
12657-  echo "$as_me:17490: \$? = $ac_status" >&5
12658+  echo "$as_me:17525: \$? = $ac_status" >&5
12659   (exit $ac_status); } &&
12660          { ac_try='test -s conftest.$ac_objext'
12661-  { (eval echo "$as_me:17493: \"$ac_try\"") >&5
12662+  { (eval echo "$as_me:17528: \"$ac_try\"") >&5
12663   (eval $ac_try) 2>&5
12664   ac_status=$?
12665-  echo "$as_me:17496: \$? = $ac_status" >&5
12666+  echo "$as_me:17531: \$? = $ac_status" >&5
12667   (exit $ac_status); }; }; then
12668   cf_cv_term_header=$cf_header
12669 	 break
12670@@ -17512,7 +17547,7 @@
12671 	for cf_header in ncurses/term.h ncursesw/term.h
12672 	do
12673 		cat >conftest.$ac_ext <<_ACEOF
12674-#line 17515 "configure"
12675+#line 17550 "configure"
12676 #include "confdefs.h"
12677
12678 #include <${cf_cv_ncurses_header:-curses.h}>
12679@@ -17530,16 +17565,16 @@
12680 }
12681 _ACEOF
12682 rm -f conftest.$ac_objext
12683-if { (eval echo "$as_me:17533: \"$ac_compile\"") >&5
12684+if { (eval echo "$as_me:17568: \"$ac_compile\"") >&5
12685   (eval $ac_compile) 2>&5
12686   ac_status=$?
12687-  echo "$as_me:17536: \$? = $ac_status" >&5
12688+  echo "$as_me:17571: \$? = $ac_status" >&5
12689   (exit $ac_status); } &&
12690          { ac_try='test -s conftest.$ac_objext'
12691-  { (eval echo "$as_me:17539: \"$ac_try\"") >&5
12692+  { (eval echo "$as_me:17574: \"$ac_try\"") >&5
12693   (eval $ac_try) 2>&5
12694   ac_status=$?
12695-  echo "$as_me:17542: \$? = $ac_status" >&5
12696+  echo "$as_me:17577: \$? = $ac_status" >&5
12697   (exit $ac_status); }; }; then
12698   cf_cv_term_header=$cf_header
12699 			 break
12700@@ -17554,7 +17589,7 @@
12701 esac
12702
12703 fi
12704-echo "$as_me:17557: result: $cf_cv_term_header" >&5
12705+echo "$as_me:17592: result: $cf_cv_term_header" >&5
12706 echo "${ECHO_T}$cf_cv_term_header" >&6
12707
12708 case $cf_cv_term_header in
12709@@ -17581,7 +17616,7 @@
12710 	;;
12711 esac
12712
12713-echo "$as_me:17584: checking for unctrl.h" >&5
12714+echo "$as_me:17619: checking for unctrl.h" >&5
12715 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
12716 if test "${cf_cv_unctrl_header+set}" = set; then
12717   echo $ECHO_N "(cached) $ECHO_C" >&6
12718@@ -17602,7 +17637,7 @@
12719 for cf_header in $cf_header_list
12720 do
12721 	cat >conftest.$ac_ext <<_ACEOF
12722-#line 17605 "configure"
12723+#line 17640 "configure"
12724 #include "confdefs.h"
12725
12726 #include <${cf_cv_ncurses_header:-curses.h}>
12727@@ -17616,16 +17651,16 @@
12728 }
12729 _ACEOF
12730 rm -f conftest.$ac_objext
12731-if { (eval echo "$as_me:17619: \"$ac_compile\"") >&5
12732+if { (eval echo "$as_me:17654: \"$ac_compile\"") >&5
12733   (eval $ac_compile) 2>&5
12734   ac_status=$?
12735-  echo "$as_me:17622: \$? = $ac_status" >&5
12736+  echo "$as_me:17657: \$? = $ac_status" >&5
12737   (exit $ac_status); } &&
12738          { ac_try='test -s conftest.$ac_objext'
12739-  { (eval echo "$as_me:17625: \"$ac_try\"") >&5
12740+  { (eval echo "$as_me:17660: \"$ac_try\"") >&5
12741   (eval $ac_try) 2>&5
12742   ac_status=$?
12743-  echo "$as_me:17628: \$? = $ac_status" >&5
12744+  echo "$as_me:17663: \$? = $ac_status" >&5
12745   (exit $ac_status); }; }; then
12746   cf_cv_unctrl_header=$cf_header
12747 	 break
12748@@ -17638,12 +17673,12 @@
12749 done
12750
12751 fi
12752-echo "$as_me:17641: result: $cf_cv_unctrl_header" >&5
12753+echo "$as_me:17676: result: $cf_cv_unctrl_header" >&5
12754 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
12755
12756 case $cf_cv_unctrl_header in
12757 (no)
12758-	{ echo "$as_me:17646: WARNING: unctrl.h header not found" >&5
12759+	{ echo "$as_me:17681: WARNING: unctrl.h header not found" >&5
12760 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
12761 	;;
12762 esac
12763@@ -17732,10 +17767,10 @@
12764
12765 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
12766
12767-	echo "$as_me:17735: checking for ${cf_func}" >&5
12768+	echo "$as_me:17770: checking for ${cf_func}" >&5
12769 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
12770
12771-echo "${as_me:-configure}:17738: testing ${cf_func} ..." 1>&5
12772+echo "${as_me:-configure}:17773: testing ${cf_func} ..." 1>&5
12773
12774 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
12775   echo $ECHO_N "(cached) $ECHO_C" >&6
12776@@ -17744,7 +17779,7 @@
12777 		eval cf_result='$ac_cv_func_'$cf_func
12778 		if test ".$cf_result" != ".no"; then
12779 			cat >conftest.$ac_ext <<_ACEOF
12780-#line 17747 "configure"
12781+#line 17782 "configure"
12782 #include "confdefs.h"
12783
12784 #ifdef HAVE_XCURSES
12785@@ -17777,16 +17812,16 @@
12786 }
12787 _ACEOF
12788 rm -f conftest.$ac_objext conftest$ac_exeext
12789-if { (eval echo "$as_me:17780: \"$ac_link\"") >&5
12790+if { (eval echo "$as_me:17815: \"$ac_link\"") >&5
12791   (eval $ac_link) 2>&5
12792   ac_status=$?
12793-  echo "$as_me:17783: \$? = $ac_status" >&5
12794+  echo "$as_me:17818: \$? = $ac_status" >&5
12795   (exit $ac_status); } &&
12796          { ac_try='test -s conftest$ac_exeext'
12797-  { (eval echo "$as_me:17786: \"$ac_try\"") >&5
12798+  { (eval echo "$as_me:17821: \"$ac_try\"") >&5
12799   (eval $ac_try) 2>&5
12800   ac_status=$?
12801-  echo "$as_me:17789: \$? = $ac_status" >&5
12802+  echo "$as_me:17824: \$? = $ac_status" >&5
12803   (exit $ac_status); }; }; then
12804   cf_result=yes
12805 else
12806@@ -17802,7 +17837,7 @@
12807
12808 	# use the computed/retrieved cache-value:
12809 	eval 'cf_result=$cf_cv_func_'$cf_func
12810-	echo "$as_me:17805: result: $cf_result" >&5
12811+	echo "$as_me:17840: result: $cf_result" >&5
12812 echo "${ECHO_T}$cf_result" >&6
12813 	if test $cf_result != no; then
12814 		cat >>confdefs.h <<EOF
12815@@ -17817,10 +17852,10 @@
12816
12817 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
12818
12819-	echo "$as_me:17820: checking for ${cf_func}" >&5
12820+	echo "$as_me:17855: checking for ${cf_func}" >&5
12821 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
12822
12823-echo "${as_me:-configure}:17823: testing ${cf_func} ..." 1>&5
12824+echo "${as_me:-configure}:17858: testing ${cf_func} ..." 1>&5
12825
12826 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
12827   echo $ECHO_N "(cached) $ECHO_C" >&6
12828@@ -17829,7 +17864,7 @@
12829 		eval cf_result='$ac_cv_func_'$cf_func
12830 		if test ".$cf_result" != ".no"; then
12831 			cat >conftest.$ac_ext <<_ACEOF
12832-#line 17832 "configure"
12833+#line 17867 "configure"
12834 #include "confdefs.h"
12835
12836 #ifdef HAVE_XCURSES
12837@@ -17862,16 +17897,16 @@
12838 }
12839 _ACEOF
12840 rm -f conftest.$ac_objext conftest$ac_exeext
12841-if { (eval echo "$as_me:17865: \"$ac_link\"") >&5
12842+if { (eval echo "$as_me:17900: \"$ac_link\"") >&5
12843   (eval $ac_link) 2>&5
12844   ac_status=$?
12845-  echo "$as_me:17868: \$? = $ac_status" >&5
12846+  echo "$as_me:17903: \$? = $ac_status" >&5
12847   (exit $ac_status); } &&
12848          { ac_try='test -s conftest$ac_exeext'
12849-  { (eval echo "$as_me:17871: \"$ac_try\"") >&5
12850+  { (eval echo "$as_me:17906: \"$ac_try\"") >&5
12851   (eval $ac_try) 2>&5
12852   ac_status=$?
12853-  echo "$as_me:17874: \$? = $ac_status" >&5
12854+  echo "$as_me:17909: \$? = $ac_status" >&5
12855   (exit $ac_status); }; }; then
12856   cf_result=yes
12857 else
12858@@ -17887,7 +17922,7 @@
12859
12860 	# use the computed/retrieved cache-value:
12861 	eval 'cf_result=$cf_cv_func_'$cf_func
12862-	echo "$as_me:17890: result: $cf_result" >&5
12863+	echo "$as_me:17925: result: $cf_result" >&5
12864 echo "${ECHO_T}$cf_result" >&6
12865 	if test $cf_result != no; then
12866 		cat >>confdefs.h <<EOF
12867@@ -17911,7 +17946,7 @@
12868 				cf_return="return value"
12869 			fi
12870 			cat >conftest.$ac_ext <<_ACEOF
12871-#line 17914 "configure"
12872+#line 17949 "configure"
12873 #include "confdefs.h"
12874
12875 #include <${cf_cv_ncurses_header:-curses.h}>
12876@@ -17931,21 +17966,21 @@
12877 }
12878 _ACEOF
12879 rm -f conftest.$ac_objext
12880-if { (eval echo "$as_me:17934: \"$ac_compile\"") >&5
12881+if { (eval echo "$as_me:17969: \"$ac_compile\"") >&5
12882   (eval $ac_compile) 2>&5
12883   ac_status=$?
12884-  echo "$as_me:17937: \$? = $ac_status" >&5
12885+  echo "$as_me:17972: \$? = $ac_status" >&5
12886   (exit $ac_status); } &&
12887          { ac_try='test -s conftest.$ac_objext'
12888-  { (eval echo "$as_me:17940: \"$ac_try\"") >&5
12889+  { (eval echo "$as_me:17975: \"$ac_try\"") >&5
12890   (eval $ac_try) 2>&5
12891   ac_status=$?
12892-  echo "$as_me:17943: \$? = $ac_status" >&5
12893+  echo "$as_me:17978: \$? = $ac_status" >&5
12894   (exit $ac_status); }; }; then
12895
12896 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
12897
12898-echo "${as_me:-configure}:17948: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
12899+echo "${as_me:-configure}:17983: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
12900
12901 		cat >>confdefs.h <<EOF
12902 #define TPUTS_ARG               $cf_arg
12903@@ -17965,14 +18000,14 @@
12904 	done
12905 fi
12906
12907-echo "$as_me:17968: checking for ncurses extended functions" >&5
12908+echo "$as_me:18003: checking for ncurses extended functions" >&5
12909 echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
12910 if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
12911   echo $ECHO_N "(cached) $ECHO_C" >&6
12912 else
12913
12914 cat >conftest.$ac_ext <<_ACEOF
12915-#line 17975 "configure"
12916+#line 18010 "configure"
12917 #include "confdefs.h"
12918
12919 #include <${cf_cv_ncurses_header:-curses.h}>
12920@@ -17987,16 +18022,16 @@
12921 }
12922 _ACEOF
12923 rm -f conftest.$ac_objext
12924-if { (eval echo "$as_me:17990: \"$ac_compile\"") >&5
12925+if { (eval echo "$as_me:18025: \"$ac_compile\"") >&5
12926   (eval $ac_compile) 2>&5
12927   ac_status=$?
12928-  echo "$as_me:17993: \$? = $ac_status" >&5
12929+  echo "$as_me:18028: \$? = $ac_status" >&5
12930   (exit $ac_status); } &&
12931          { ac_try='test -s conftest.$ac_objext'
12932-  { (eval echo "$as_me:17996: \"$ac_try\"") >&5
12933+  { (eval echo "$as_me:18031: \"$ac_try\"") >&5
12934   (eval $ac_try) 2>&5
12935   ac_status=$?
12936-  echo "$as_me:17999: \$? = $ac_status" >&5
12937+  echo "$as_me:18034: \$? = $ac_status" >&5
12938   (exit $ac_status); }; }; then
12939   cf_cv_ncurses_ext_funcs=defined
12940 else
12941@@ -18004,7 +18039,7 @@
12942 cat conftest.$ac_ext >&5
12943
12944 cat >conftest.$ac_ext <<_ACEOF
12945-#line 18007 "configure"
12946+#line 18042 "configure"
12947 #include "confdefs.h"
12948
12949 #include <${cf_cv_ncurses_header:-curses.h}>
12950@@ -18029,16 +18064,16 @@
12951 }
12952 _ACEOF
12953 rm -f conftest.$ac_objext conftest$ac_exeext
12954-if { (eval echo "$as_me:18032: \"$ac_link\"") >&5
12955+if { (eval echo "$as_me:18067: \"$ac_link\"") >&5
12956   (eval $ac_link) 2>&5
12957   ac_status=$?
12958-  echo "$as_me:18035: \$? = $ac_status" >&5
12959+  echo "$as_me:18070: \$? = $ac_status" >&5
12960   (exit $ac_status); } &&
12961          { ac_try='test -s conftest$ac_exeext'
12962-  { (eval echo "$as_me:18038: \"$ac_try\"") >&5
12963+  { (eval echo "$as_me:18073: \"$ac_try\"") >&5
12964   (eval $ac_try) 2>&5
12965   ac_status=$?
12966-  echo "$as_me:18041: \$? = $ac_status" >&5
12967+  echo "$as_me:18076: \$? = $ac_status" >&5
12968   (exit $ac_status); }; }; then
12969   cf_cv_ncurses_ext_funcs=yes
12970 else
12971@@ -18052,7 +18087,7 @@
12972 rm -f conftest.$ac_objext conftest.$ac_ext
12973
12974 fi
12975-echo "$as_me:18055: result: $cf_cv_ncurses_ext_funcs" >&5
12976+echo "$as_me:18090: result: $cf_cv_ncurses_ext_funcs" >&5
12977 echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
12978 test "$cf_cv_ncurses_ext_funcs" = yes &&
12979 cat >>confdefs.h <<\EOF
12980@@ -18066,11 +18101,11 @@
12981 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
12982 	then
12983 		cf_define_xpg5=no
12984-		echo "$as_me:18069: checking if _XPG5 should be defined to enable wide-characters" >&5
12985+		echo "$as_me:18104: checking if _XPG5 should be defined to enable wide-characters" >&5
12986 echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
12987
12988 		cat >conftest.$ac_ext <<_ACEOF
12989-#line 18073 "configure"
12990+#line 18108 "configure"
12991 #include "confdefs.h"
12992
12993 #include <${cf_cv_ncurses_header:-curses.h}>
12994@@ -18083,16 +18118,16 @@
12995 }
12996 _ACEOF
12997 rm -f conftest.$ac_objext
12998-if { (eval echo "$as_me:18086: \"$ac_compile\"") >&5
12999+if { (eval echo "$as_me:18121: \"$ac_compile\"") >&5
13000   (eval $ac_compile) 2>&5
13001   ac_status=$?
13002-  echo "$as_me:18089: \$? = $ac_status" >&5
13003+  echo "$as_me:18124: \$? = $ac_status" >&5
13004   (exit $ac_status); } &&
13005          { ac_try='test -s conftest.$ac_objext'
13006-  { (eval echo "$as_me:18092: \"$ac_try\"") >&5
13007+  { (eval echo "$as_me:18127: \"$ac_try\"") >&5
13008   (eval $ac_try) 2>&5
13009   ac_status=$?
13010-  echo "$as_me:18095: \$? = $ac_status" >&5
13011+  echo "$as_me:18130: \$? = $ac_status" >&5
13012   (exit $ac_status); }; }; then
13013   :
13014 else
13015@@ -18101,7 +18136,7 @@
13016 cf_save_cppflags="$CPPFLAGS"
13017 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
13018 			 cat >conftest.$ac_ext <<_ACEOF
13019-#line 18104 "configure"
13020+#line 18139 "configure"
13021 #include "confdefs.h"
13022
13023 #include <${cf_cv_ncurses_header:-curses.h}>
13024@@ -18114,16 +18149,16 @@
13025 }
13026 _ACEOF
13027 rm -f conftest.$ac_objext
13028-if { (eval echo "$as_me:18117: \"$ac_compile\"") >&5
13029+if { (eval echo "$as_me:18152: \"$ac_compile\"") >&5
13030   (eval $ac_compile) 2>&5
13031   ac_status=$?
13032-  echo "$as_me:18120: \$? = $ac_status" >&5
13033+  echo "$as_me:18155: \$? = $ac_status" >&5
13034   (exit $ac_status); } &&
13035          { ac_try='test -s conftest.$ac_objext'
13036-  { (eval echo "$as_me:18123: \"$ac_try\"") >&5
13037+  { (eval echo "$as_me:18158: \"$ac_try\"") >&5
13038   (eval $ac_try) 2>&5
13039   ac_status=$?
13040-  echo "$as_me:18126: \$? = $ac_status" >&5
13041+  echo "$as_me:18161: \$? = $ac_status" >&5
13042   (exit $ac_status); }; }; then
13043   cf_define_xpg5=yes
13044 else
13045@@ -18134,7 +18169,7 @@
13046 			 CPPFLAGS="$cf_save_cppflags"
13047 fi
13048 rm -f conftest.$ac_objext conftest.$ac_ext
13049-		echo "$as_me:18137: result: $cf_define_xpg5" >&5
13050+		echo "$as_me:18172: result: $cf_define_xpg5" >&5
13051 echo "${ECHO_T}$cf_define_xpg5" >&6
13052
13053 		if test "$cf_define_xpg5" = yes
13054@@ -18143,14 +18178,14 @@
13055 		fi
13056 	fi
13057
13058-	echo "$as_me:18146: checking for wide-character functions" >&5
13059+	echo "$as_me:18181: checking for wide-character functions" >&5
13060 echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
13061 if test "${cf_cv_widechar_funcs+set}" = set; then
13062   echo $ECHO_N "(cached) $ECHO_C" >&6
13063 else
13064
13065 	cat >conftest.$ac_ext <<_ACEOF
13066-#line 18153 "configure"
13067+#line 18188 "configure"
13068 #include "confdefs.h"
13069
13070 #include <${cf_cv_ncurses_header:-curses.h}>
13071@@ -18167,16 +18202,16 @@
13072 }
13073 _ACEOF
13074 rm -f conftest.$ac_objext conftest$ac_exeext
13075-if { (eval echo "$as_me:18170: \"$ac_link\"") >&5
13076+if { (eval echo "$as_me:18205: \"$ac_link\"") >&5
13077   (eval $ac_link) 2>&5
13078   ac_status=$?
13079-  echo "$as_me:18173: \$? = $ac_status" >&5
13080+  echo "$as_me:18208: \$? = $ac_status" >&5
13081   (exit $ac_status); } &&
13082          { ac_try='test -s conftest$ac_exeext'
13083-  { (eval echo "$as_me:18176: \"$ac_try\"") >&5
13084+  { (eval echo "$as_me:18211: \"$ac_try\"") >&5
13085   (eval $ac_try) 2>&5
13086   ac_status=$?
13087-  echo "$as_me:18179: \$? = $ac_status" >&5
13088+  echo "$as_me:18214: \$? = $ac_status" >&5
13089   (exit $ac_status); }; }; then
13090   cf_cv_widechar_funcs=yes
13091 else
13092@@ -18187,7 +18222,7 @@
13093 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
13094
13095 fi
13096-echo "$as_me:18190: result: $cf_cv_widechar_funcs" >&5
13097+echo "$as_me:18225: result: $cf_cv_widechar_funcs" >&5
13098 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
13099 	if test "$cf_cv_widechar_funcs" != no ; then
13100
13101@@ -18208,14 +18243,14 @@
13102
13103 fi
13104
13105-echo "$as_me:18211: checking if $cf_cv_screen library uses pthreads" >&5
13106+echo "$as_me:18246: checking if $cf_cv_screen library uses pthreads" >&5
13107 echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
13108 if test "${cf_cv_use_pthreads+set}" = set; then
13109   echo $ECHO_N "(cached) $ECHO_C" >&6
13110 else
13111
13112 cat >conftest.$ac_ext <<_ACEOF
13113-#line 18218 "configure"
13114+#line 18253 "configure"
13115 #include "confdefs.h"
13116
13117 #include <${cf_cv_ncurses_header:-curses.h}>
13118@@ -18233,16 +18268,16 @@
13119 }
13120 _ACEOF
13121 rm -f conftest.$ac_objext conftest$ac_exeext
13122-if { (eval echo "$as_me:18236: \"$ac_link\"") >&5
13123+if { (eval echo "$as_me:18271: \"$ac_link\"") >&5
13124   (eval $ac_link) 2>&5
13125   ac_status=$?
13126-  echo "$as_me:18239: \$? = $ac_status" >&5
13127+  echo "$as_me:18274: \$? = $ac_status" >&5
13128   (exit $ac_status); } &&
13129          { ac_try='test -s conftest$ac_exeext'
13130-  { (eval echo "$as_me:18242: \"$ac_try\"") >&5
13131+  { (eval echo "$as_me:18277: \"$ac_try\"") >&5
13132   (eval $ac_try) 2>&5
13133   ac_status=$?
13134-  echo "$as_me:18245: \$? = $ac_status" >&5
13135+  echo "$as_me:18280: \$? = $ac_status" >&5
13136   (exit $ac_status); }; }; then
13137   cf_cv_use_pthreads=yes
13138 else
13139@@ -18253,21 +18288,21 @@
13140 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
13141
13142 fi
13143-echo "$as_me:18256: result: $cf_cv_use_pthreads" >&5
13144+echo "$as_me:18291: result: $cf_cv_use_pthreads" >&5
13145 echo "${ECHO_T}$cf_cv_use_pthreads" >&6
13146 test $cf_cv_use_pthreads = yes &&
13147 cat >>confdefs.h <<\EOF
13148 #define USE_PTHREADS 1
13149 EOF
13150
13151-echo "$as_me:18263: checking if sys/time.h works with sys/select.h" >&5
13152+echo "$as_me:18298: checking if sys/time.h works with sys/select.h" >&5
13153 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
13154 if test "${cf_cv_sys_time_select+set}" = set; then
13155   echo $ECHO_N "(cached) $ECHO_C" >&6
13156 else
13157
13158 cat >conftest.$ac_ext <<_ACEOF
13159-#line 18270 "configure"
13160+#line 18305 "configure"
13161 #include "confdefs.h"
13162
13163 #include <sys/types.h>
13164@@ -18287,16 +18322,16 @@
13165 }
13166 _ACEOF
13167 rm -f conftest.$ac_objext
13168-if { (eval echo "$as_me:18290: \"$ac_compile\"") >&5
13169+if { (eval echo "$as_me:18325: \"$ac_compile\"") >&5
13170   (eval $ac_compile) 2>&5
13171   ac_status=$?
13172-  echo "$as_me:18293: \$? = $ac_status" >&5
13173+  echo "$as_me:18328: \$? = $ac_status" >&5
13174   (exit $ac_status); } &&
13175          { ac_try='test -s conftest.$ac_objext'
13176-  { (eval echo "$as_me:18296: \"$ac_try\"") >&5
13177+  { (eval echo "$as_me:18331: \"$ac_try\"") >&5
13178   (eval $ac_try) 2>&5
13179   ac_status=$?
13180-  echo "$as_me:18299: \$? = $ac_status" >&5
13181+  echo "$as_me:18334: \$? = $ac_status" >&5
13182   (exit $ac_status); }; }; then
13183   cf_cv_sys_time_select=yes
13184 else
13185@@ -18308,7 +18343,7 @@
13186
13187 fi
13188
13189-echo "$as_me:18311: result: $cf_cv_sys_time_select" >&5
13190+echo "$as_me:18346: result: $cf_cv_sys_time_select" >&5
13191 echo "${ECHO_T}$cf_cv_sys_time_select" >&6
13192 test "$cf_cv_sys_time_select" = yes &&
13193 cat >>confdefs.h <<\EOF
13194@@ -18317,7 +18352,7 @@
13195
13196 # special check for test/ditto.c
13197
13198-echo "$as_me:18320: checking for openpty in -lutil" >&5
13199+echo "$as_me:18355: checking for openpty in -lutil" >&5
13200 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
13201 if test "${ac_cv_lib_util_openpty+set}" = set; then
13202   echo $ECHO_N "(cached) $ECHO_C" >&6
13203@@ -18325,7 +18360,7 @@
13204   ac_check_lib_save_LIBS=$LIBS
13205 LIBS="-lutil  $LIBS"
13206 cat >conftest.$ac_ext <<_ACEOF
13207-#line 18328 "configure"
13208+#line 18363 "configure"
13209 #include "confdefs.h"
13210
13211 /* Override any gcc2 internal prototype to avoid an error.  */
13212@@ -18344,16 +18379,16 @@
13213 }
13214 _ACEOF
13215 rm -f conftest.$ac_objext conftest$ac_exeext
13216-if { (eval echo "$as_me:18347: \"$ac_link\"") >&5
13217+if { (eval echo "$as_me:18382: \"$ac_link\"") >&5
13218   (eval $ac_link) 2>&5
13219   ac_status=$?
13220-  echo "$as_me:18350: \$? = $ac_status" >&5
13221+  echo "$as_me:18385: \$? = $ac_status" >&5
13222   (exit $ac_status); } &&
13223          { ac_try='test -s conftest$ac_exeext'
13224-  { (eval echo "$as_me:18353: \"$ac_try\"") >&5
13225+  { (eval echo "$as_me:18388: \"$ac_try\"") >&5
13226   (eval $ac_try) 2>&5
13227   ac_status=$?
13228-  echo "$as_me:18356: \$? = $ac_status" >&5
13229+  echo "$as_me:18391: \$? = $ac_status" >&5
13230   (exit $ac_status); }; }; then
13231   ac_cv_lib_util_openpty=yes
13232 else
13233@@ -18364,7 +18399,7 @@
13234 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
13235 LIBS=$ac_check_lib_save_LIBS
13236 fi
13237-echo "$as_me:18367: result: $ac_cv_lib_util_openpty" >&5
13238+echo "$as_me:18402: result: $ac_cv_lib_util_openpty" >&5
13239 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
13240 if test $ac_cv_lib_util_openpty = yes; then
13241   cf_cv_lib_util=yes
13242@@ -18372,7 +18407,7 @@
13243   cf_cv_lib_util=no
13244 fi
13245
13246-echo "$as_me:18375: checking for openpty header" >&5
13247+echo "$as_me:18410: checking for openpty header" >&5
13248 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
13249 if test "${cf_cv_func_openpty+set}" = set; then
13250   echo $ECHO_N "(cached) $ECHO_C" >&6
13251@@ -18399,7 +18434,7 @@
13252 	for cf_header in pty.h libutil.h util.h
13253 	do
13254 	cat >conftest.$ac_ext <<_ACEOF
13255-#line 18402 "configure"
13256+#line 18437 "configure"
13257 #include "confdefs.h"
13258
13259 #include <$cf_header>
13260@@ -18416,16 +18451,16 @@
13261 }
13262 _ACEOF
13263 rm -f conftest.$ac_objext conftest$ac_exeext
13264-if { (eval echo "$as_me:18419: \"$ac_link\"") >&5
13265+if { (eval echo "$as_me:18454: \"$ac_link\"") >&5
13266   (eval $ac_link) 2>&5
13267   ac_status=$?
13268-  echo "$as_me:18422: \$? = $ac_status" >&5
13269+  echo "$as_me:18457: \$? = $ac_status" >&5
13270   (exit $ac_status); } &&
13271          { ac_try='test -s conftest$ac_exeext'
13272-  { (eval echo "$as_me:18425: \"$ac_try\"") >&5
13273+  { (eval echo "$as_me:18460: \"$ac_try\"") >&5
13274   (eval $ac_try) 2>&5
13275   ac_status=$?
13276-  echo "$as_me:18428: \$? = $ac_status" >&5
13277+  echo "$as_me:18463: \$? = $ac_status" >&5
13278   (exit $ac_status); }; }; then
13279
13280 		cf_cv_func_openpty=$cf_header
13281@@ -18443,7 +18478,7 @@
13282 	LIBS="$cf_save_LIBS"
13283
13284 fi
13285-echo "$as_me:18446: result: $cf_cv_func_openpty" >&5
13286+echo "$as_me:18481: result: $cf_cv_func_openpty" >&5
13287 echo "${ECHO_T}$cf_cv_func_openpty" >&6
13288
13289 if test "$cf_cv_func_openpty" != no ; then
13290@@ -18477,7 +18512,7 @@
13291 	fi
13292 fi
13293
13294-echo "$as_me:18480: checking for function curses_version" >&5
13295+echo "$as_me:18515: checking for function curses_version" >&5
13296 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
13297 if test "${cf_cv_func_curses_version+set}" = set; then
13298   echo $ECHO_N "(cached) $ECHO_C" >&6
13299@@ -18487,7 +18522,7 @@
13300   cf_cv_func_curses_version=unknown
13301 else
13302   cat >conftest.$ac_ext <<_ACEOF
13303-#line 18490 "configure"
13304+#line 18525 "configure"
13305 #include "confdefs.h"
13306
13307 #include <${cf_cv_ncurses_header:-curses.h}>
13308@@ -18500,15 +18535,15 @@
13309
13310 _ACEOF
13311 rm -f conftest$ac_exeext
13312-if { (eval echo "$as_me:18503: \"$ac_link\"") >&5
13313+if { (eval echo "$as_me:18538: \"$ac_link\"") >&5
13314   (eval $ac_link) 2>&5
13315   ac_status=$?
13316-  echo "$as_me:18506: \$? = $ac_status" >&5
13317+  echo "$as_me:18541: \$? = $ac_status" >&5
13318   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
13319-  { (eval echo "$as_me:18508: \"$ac_try\"") >&5
13320+  { (eval echo "$as_me:18543: \"$ac_try\"") >&5
13321   (eval $ac_try) 2>&5
13322   ac_status=$?
13323-  echo "$as_me:18511: \$? = $ac_status" >&5
13324+  echo "$as_me:18546: \$? = $ac_status" >&5
13325   (exit $ac_status); }; }; then
13326   cf_cv_func_curses_version=yes
13327
13328@@ -18523,14 +18558,14 @@
13329 fi
13330 rm -f core
13331 fi
13332-echo "$as_me:18526: result: $cf_cv_func_curses_version" >&5
13333+echo "$as_me:18561: result: $cf_cv_func_curses_version" >&5
13334 echo "${ECHO_T}$cf_cv_func_curses_version" >&6
13335 test "$cf_cv_func_curses_version" = yes &&
13336 cat >>confdefs.h <<\EOF
13337 #define HAVE_CURSES_VERSION 1
13338 EOF
13339
13340-echo "$as_me:18533: checking for alternate character set array" >&5
13341+echo "$as_me:18568: checking for alternate character set array" >&5
13342 echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
13343 if test "${cf_cv_curses_acs_map+set}" = set; then
13344   echo $ECHO_N "(cached) $ECHO_C" >&6
13345@@ -18540,7 +18575,7 @@
13346 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
13347 do
13348 cat >conftest.$ac_ext <<_ACEOF
13349-#line 18543 "configure"
13350+#line 18578 "configure"
13351 #include "confdefs.h"
13352
13353 #include <${cf_cv_ncurses_header:-curses.h}>
13354@@ -18556,16 +18591,16 @@
13355 }
13356 _ACEOF
13357 rm -f conftest.$ac_objext conftest$ac_exeext
13358-if { (eval echo "$as_me:18559: \"$ac_link\"") >&5
13359+if { (eval echo "$as_me:18594: \"$ac_link\"") >&5
13360   (eval $ac_link) 2>&5
13361   ac_status=$?
13362-  echo "$as_me:18562: \$? = $ac_status" >&5
13363+  echo "$as_me:18597: \$? = $ac_status" >&5
13364   (exit $ac_status); } &&
13365          { ac_try='test -s conftest$ac_exeext'
13366-  { (eval echo "$as_me:18565: \"$ac_try\"") >&5
13367+  { (eval echo "$as_me:18600: \"$ac_try\"") >&5
13368   (eval $ac_try) 2>&5
13369   ac_status=$?
13370-  echo "$as_me:18568: \$? = $ac_status" >&5
13371+  echo "$as_me:18603: \$? = $ac_status" >&5
13372   (exit $ac_status); }; }; then
13373   cf_cv_curses_acs_map=$name; break
13374 else
13375@@ -18576,7 +18611,7 @@
13376 done
13377
13378 fi
13379-echo "$as_me:18579: result: $cf_cv_curses_acs_map" >&5
13380+echo "$as_me:18614: result: $cf_cv_curses_acs_map" >&5
13381 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
13382
13383 test "$cf_cv_curses_acs_map" != unknown &&
13384@@ -18586,7 +18621,7 @@
13385
13386 if test "$cf_enable_widec" = yes; then
13387
13388-echo "$as_me:18589: checking for wide alternate character set array" >&5
13389+echo "$as_me:18624: checking for wide alternate character set array" >&5
13390 echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
13391 if test "${cf_cv_curses_wacs_map+set}" = set; then
13392   echo $ECHO_N "(cached) $ECHO_C" >&6
13393@@ -18596,7 +18631,7 @@
13394 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
13395 	do
13396 	cat >conftest.$ac_ext <<_ACEOF
13397-#line 18599 "configure"
13398+#line 18634 "configure"
13399 #include "confdefs.h"
13400
13401 #ifndef _XOPEN_SOURCE_EXTENDED
13402@@ -18612,16 +18647,16 @@
13403 }
13404 _ACEOF
13405 rm -f conftest.$ac_objext conftest$ac_exeext
13406-if { (eval echo "$as_me:18615: \"$ac_link\"") >&5
13407+if { (eval echo "$as_me:18650: \"$ac_link\"") >&5
13408   (eval $ac_link) 2>&5
13409   ac_status=$?
13410-  echo "$as_me:18618: \$? = $ac_status" >&5
13411+  echo "$as_me:18653: \$? = $ac_status" >&5
13412   (exit $ac_status); } &&
13413          { ac_try='test -s conftest$ac_exeext'
13414-  { (eval echo "$as_me:18621: \"$ac_try\"") >&5
13415+  { (eval echo "$as_me:18656: \"$ac_try\"") >&5
13416   (eval $ac_try) 2>&5
13417   ac_status=$?
13418-  echo "$as_me:18624: \$? = $ac_status" >&5
13419+  echo "$as_me:18659: \$? = $ac_status" >&5
13420   (exit $ac_status); }; }; then
13421   cf_cv_curses_wacs_map=$name
13422 	 break
13423@@ -18632,7 +18667,7 @@
13424 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
13425 	done
13426 fi
13427-echo "$as_me:18635: result: $cf_cv_curses_wacs_map" >&5
13428+echo "$as_me:18670: result: $cf_cv_curses_wacs_map" >&5
13429 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
13430
13431 test "$cf_cv_curses_wacs_map" != unknown &&
13432@@ -18640,7 +18675,7 @@
13433 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
13434 EOF
13435
13436-echo "$as_me:18643: checking for wide alternate character constants" >&5
13437+echo "$as_me:18678: checking for wide alternate character constants" >&5
13438 echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
13439 if test "${cf_cv_curses_wacs_symbols+set}" = set; then
13440   echo $ECHO_N "(cached) $ECHO_C" >&6
13441@@ -18650,7 +18685,7 @@
13442 if test "$cf_cv_curses_wacs_map" != unknown
13443 then
13444 	cat >conftest.$ac_ext <<_ACEOF
13445-#line 18653 "configure"
13446+#line 18688 "configure"
13447 #include "confdefs.h"
13448
13449 #ifndef _XOPEN_SOURCE_EXTENDED
13450@@ -18667,16 +18702,16 @@
13451 }
13452 _ACEOF
13453 rm -f conftest.$ac_objext conftest$ac_exeext
13454-if { (eval echo "$as_me:18670: \"$ac_link\"") >&5
13455+if { (eval echo "$as_me:18705: \"$ac_link\"") >&5
13456   (eval $ac_link) 2>&5
13457   ac_status=$?
13458-  echo "$as_me:18673: \$? = $ac_status" >&5
13459+  echo "$as_me:18708: \$? = $ac_status" >&5
13460   (exit $ac_status); } &&
13461          { ac_try='test -s conftest$ac_exeext'
13462-  { (eval echo "$as_me:18676: \"$ac_try\"") >&5
13463+  { (eval echo "$as_me:18711: \"$ac_try\"") >&5
13464   (eval $ac_try) 2>&5
13465   ac_status=$?
13466-  echo "$as_me:18679: \$? = $ac_status" >&5
13467+  echo "$as_me:18714: \$? = $ac_status" >&5
13468   (exit $ac_status); }; }; then
13469   cf_cv_curses_wacs_symbols=yes
13470 else
13471@@ -18686,7 +18721,7 @@
13472 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
13473 else
13474 	cat >conftest.$ac_ext <<_ACEOF
13475-#line 18689 "configure"
13476+#line 18724 "configure"
13477 #include "confdefs.h"
13478
13479 #ifndef _XOPEN_SOURCE_EXTENDED
13480@@ -18702,16 +18737,16 @@
13481 }
13482 _ACEOF
13483 rm -f conftest.$ac_objext conftest$ac_exeext
13484-if { (eval echo "$as_me:18705: \"$ac_link\"") >&5
13485+if { (eval echo "$as_me:18740: \"$ac_link\"") >&5
13486   (eval $ac_link) 2>&5
13487   ac_status=$?
13488-  echo "$as_me:18708: \$? = $ac_status" >&5
13489+  echo "$as_me:18743: \$? = $ac_status" >&5
13490   (exit $ac_status); } &&
13491          { ac_try='test -s conftest$ac_exeext'
13492-  { (eval echo "$as_me:18711: \"$ac_try\"") >&5
13493+  { (eval echo "$as_me:18746: \"$ac_try\"") >&5
13494   (eval $ac_try) 2>&5
13495   ac_status=$?
13496-  echo "$as_me:18714: \$? = $ac_status" >&5
13497+  echo "$as_me:18749: \$? = $ac_status" >&5
13498   (exit $ac_status); }; }; then
13499   cf_cv_curses_wacs_symbols=yes
13500 else
13501@@ -18722,7 +18757,7 @@
13502 fi
13503
13504 fi
13505-echo "$as_me:18725: result: $cf_cv_curses_wacs_symbols" >&5
13506+echo "$as_me:18760: result: $cf_cv_curses_wacs_symbols" >&5
13507 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
13508
13509 test "$cf_cv_curses_wacs_symbols" != no &&
13510@@ -18732,10 +18767,10 @@
13511
13512 fi
13513
13514-echo "$as_me:18735: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
13515+echo "$as_me:18770: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
13516 echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
13517 cat >conftest.$ac_ext <<_ACEOF
13518-#line 18738 "configure"
13519+#line 18773 "configure"
13520 #include "confdefs.h"
13521
13522 #ifndef _XOPEN_SOURCE_EXTENDED
13523@@ -18753,16 +18788,16 @@
13524 }
13525 _ACEOF
13526 rm -f conftest.$ac_objext
13527-if { (eval echo "$as_me:18756: \"$ac_compile\"") >&5
13528+if { (eval echo "$as_me:18791: \"$ac_compile\"") >&5
13529   (eval $ac_compile) 2>&5
13530   ac_status=$?
13531-  echo "$as_me:18759: \$? = $ac_status" >&5
13532+  echo "$as_me:18794: \$? = $ac_status" >&5
13533   (exit $ac_status); } &&
13534          { ac_try='test -s conftest.$ac_objext'
13535-  { (eval echo "$as_me:18762: \"$ac_try\"") >&5
13536+  { (eval echo "$as_me:18797: \"$ac_try\"") >&5
13537   (eval $ac_try) 2>&5
13538   ac_status=$?
13539-  echo "$as_me:18765: \$? = $ac_status" >&5
13540+  echo "$as_me:18800: \$? = $ac_status" >&5
13541   (exit $ac_status); }; }; then
13542   cf_result=yes
13543 else
13544@@ -18771,7 +18806,7 @@
13545 cf_result=no
13546 fi
13547 rm -f conftest.$ac_objext conftest.$ac_ext
13548-echo "$as_me:18774: result: $cf_result" >&5
13549+echo "$as_me:18809: result: $cf_result" >&5
13550 echo "${ECHO_T}$cf_result" >&6
13551 if test $cf_result = yes ; then
13552
13553@@ -18792,14 +18827,14 @@
13554 if test "$cf_enable_widec" = yes; then
13555
13556 # This is needed on Tru64 5.0 to declare mbstate_t
13557-echo "$as_me:18795: checking if we must include wchar.h to declare mbstate_t" >&5
13558+echo "$as_me:18830: checking if we must include wchar.h to declare mbstate_t" >&5
13559 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
13560 if test "${cf_cv_mbstate_t+set}" = set; then
13561   echo $ECHO_N "(cached) $ECHO_C" >&6
13562 else
13563
13564 cat >conftest.$ac_ext <<_ACEOF
13565-#line 18802 "configure"
13566+#line 18837 "configure"
13567 #include "confdefs.h"
13568
13569 #include <stdlib.h>
13570@@ -18817,23 +18852,23 @@
13571 }
13572 _ACEOF
13573 rm -f conftest.$ac_objext
13574-if { (eval echo "$as_me:18820: \"$ac_compile\"") >&5
13575+if { (eval echo "$as_me:18855: \"$ac_compile\"") >&5
13576   (eval $ac_compile) 2>&5
13577   ac_status=$?
13578-  echo "$as_me:18823: \$? = $ac_status" >&5
13579+  echo "$as_me:18858: \$? = $ac_status" >&5
13580   (exit $ac_status); } &&
13581          { ac_try='test -s conftest.$ac_objext'
13582-  { (eval echo "$as_me:18826: \"$ac_try\"") >&5
13583+  { (eval echo "$as_me:18861: \"$ac_try\"") >&5
13584   (eval $ac_try) 2>&5
13585   ac_status=$?
13586-  echo "$as_me:18829: \$? = $ac_status" >&5
13587+  echo "$as_me:18864: \$? = $ac_status" >&5
13588   (exit $ac_status); }; }; then
13589   cf_cv_mbstate_t=no
13590 else
13591   echo "$as_me: failed program was:" >&5
13592 cat conftest.$ac_ext >&5
13593 cat >conftest.$ac_ext <<_ACEOF
13594-#line 18836 "configure"
13595+#line 18871 "configure"
13596 #include "confdefs.h"
13597
13598 #include <stdlib.h>
13599@@ -18852,16 +18887,16 @@
13600 }
13601 _ACEOF
13602 rm -f conftest.$ac_objext
13603-if { (eval echo "$as_me:18855: \"$ac_compile\"") >&5
13604+if { (eval echo "$as_me:18890: \"$ac_compile\"") >&5
13605   (eval $ac_compile) 2>&5
13606   ac_status=$?
13607-  echo "$as_me:18858: \$? = $ac_status" >&5
13608+  echo "$as_me:18893: \$? = $ac_status" >&5
13609   (exit $ac_status); } &&
13610          { ac_try='test -s conftest.$ac_objext'
13611-  { (eval echo "$as_me:18861: \"$ac_try\"") >&5
13612+  { (eval echo "$as_me:18896: \"$ac_try\"") >&5
13613   (eval $ac_try) 2>&5
13614   ac_status=$?
13615-  echo "$as_me:18864: \$? = $ac_status" >&5
13616+  echo "$as_me:18899: \$? = $ac_status" >&5
13617   (exit $ac_status); }; }; then
13618   cf_cv_mbstate_t=yes
13619 else
13620@@ -18873,7 +18908,7 @@
13621 fi
13622 rm -f conftest.$ac_objext conftest.$ac_ext
13623 fi
13624-echo "$as_me:18876: result: $cf_cv_mbstate_t" >&5
13625+echo "$as_me:18911: result: $cf_cv_mbstate_t" >&5
13626 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
13627
13628 if test "$cf_cv_mbstate_t" = yes ; then
13629@@ -18896,14 +18931,14 @@
13630 fi
13631
13632 # This is needed on Tru64 5.0 to declare wchar_t
13633-echo "$as_me:18899: checking if we must include wchar.h to declare wchar_t" >&5
13634+echo "$as_me:18934: checking if we must include wchar.h to declare wchar_t" >&5
13635 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
13636 if test "${cf_cv_wchar_t+set}" = set; then
13637   echo $ECHO_N "(cached) $ECHO_C" >&6
13638 else
13639
13640 cat >conftest.$ac_ext <<_ACEOF
13641-#line 18906 "configure"
13642+#line 18941 "configure"
13643 #include "confdefs.h"
13644
13645 #include <stdlib.h>
13646@@ -18921,23 +18956,23 @@
13647 }
13648 _ACEOF
13649 rm -f conftest.$ac_objext
13650-if { (eval echo "$as_me:18924: \"$ac_compile\"") >&5
13651+if { (eval echo "$as_me:18959: \"$ac_compile\"") >&5
13652   (eval $ac_compile) 2>&5
13653   ac_status=$?
13654-  echo "$as_me:18927: \$? = $ac_status" >&5
13655+  echo "$as_me:18962: \$? = $ac_status" >&5
13656   (exit $ac_status); } &&
13657          { ac_try='test -s conftest.$ac_objext'
13658-  { (eval echo "$as_me:18930: \"$ac_try\"") >&5
13659+  { (eval echo "$as_me:18965: \"$ac_try\"") >&5
13660   (eval $ac_try) 2>&5
13661   ac_status=$?
13662-  echo "$as_me:18933: \$? = $ac_status" >&5
13663+  echo "$as_me:18968: \$? = $ac_status" >&5
13664   (exit $ac_status); }; }; then
13665   cf_cv_wchar_t=no
13666 else
13667   echo "$as_me: failed program was:" >&5
13668 cat conftest.$ac_ext >&5
13669 cat >conftest.$ac_ext <<_ACEOF
13670-#line 18940 "configure"
13671+#line 18975 "configure"
13672 #include "confdefs.h"
13673
13674 #include <stdlib.h>
13675@@ -18956,16 +18991,16 @@
13676 }
13677 _ACEOF
13678 rm -f conftest.$ac_objext
13679-if { (eval echo "$as_me:18959: \"$ac_compile\"") >&5
13680+if { (eval echo "$as_me:18994: \"$ac_compile\"") >&5
13681   (eval $ac_compile) 2>&5
13682   ac_status=$?
13683-  echo "$as_me:18962: \$? = $ac_status" >&5
13684+  echo "$as_me:18997: \$? = $ac_status" >&5
13685   (exit $ac_status); } &&
13686          { ac_try='test -s conftest.$ac_objext'
13687-  { (eval echo "$as_me:18965: \"$ac_try\"") >&5
13688+  { (eval echo "$as_me:19000: \"$ac_try\"") >&5
13689   (eval $ac_try) 2>&5
13690   ac_status=$?
13691-  echo "$as_me:18968: \$? = $ac_status" >&5
13692+  echo "$as_me:19003: \$? = $ac_status" >&5
13693   (exit $ac_status); }; }; then
13694   cf_cv_wchar_t=yes
13695 else
13696@@ -18977,7 +19012,7 @@
13697 fi
13698 rm -f conftest.$ac_objext conftest.$ac_ext
13699 fi
13700-echo "$as_me:18980: result: $cf_cv_wchar_t" >&5
13701+echo "$as_me:19015: result: $cf_cv_wchar_t" >&5
13702 echo "${ECHO_T}$cf_cv_wchar_t" >&6
13703
13704 if test "$cf_cv_wchar_t" = yes ; then
13705@@ -19000,14 +19035,14 @@
13706 fi
13707
13708 # This is needed on Tru64 5.0 to declare wint_t
13709-echo "$as_me:19003: checking if we must include wchar.h to declare wint_t" >&5
13710+echo "$as_me:19038: checking if we must include wchar.h to declare wint_t" >&5
13711 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
13712 if test "${cf_cv_wint_t+set}" = set; then
13713   echo $ECHO_N "(cached) $ECHO_C" >&6
13714 else
13715
13716 cat >conftest.$ac_ext <<_ACEOF
13717-#line 19010 "configure"
13718+#line 19045 "configure"
13719 #include "confdefs.h"
13720
13721 #include <stdlib.h>
13722@@ -19025,23 +19060,23 @@
13723 }
13724 _ACEOF
13725 rm -f conftest.$ac_objext
13726-if { (eval echo "$as_me:19028: \"$ac_compile\"") >&5
13727+if { (eval echo "$as_me:19063: \"$ac_compile\"") >&5
13728   (eval $ac_compile) 2>&5
13729   ac_status=$?
13730-  echo "$as_me:19031: \$? = $ac_status" >&5
13731+  echo "$as_me:19066: \$? = $ac_status" >&5
13732   (exit $ac_status); } &&
13733          { ac_try='test -s conftest.$ac_objext'
13734-  { (eval echo "$as_me:19034: \"$ac_try\"") >&5
13735+  { (eval echo "$as_me:19069: \"$ac_try\"") >&5
13736   (eval $ac_try) 2>&5
13737   ac_status=$?
13738-  echo "$as_me:19037: \$? = $ac_status" >&5
13739+  echo "$as_me:19072: \$? = $ac_status" >&5
13740   (exit $ac_status); }; }; then
13741   cf_cv_wint_t=no
13742 else
13743   echo "$as_me: failed program was:" >&5
13744 cat conftest.$ac_ext >&5
13745 cat >conftest.$ac_ext <<_ACEOF
13746-#line 19044 "configure"
13747+#line 19079 "configure"
13748 #include "confdefs.h"
13749
13750 #include <stdlib.h>
13751@@ -19060,16 +19095,16 @@
13752 }
13753 _ACEOF
13754 rm -f conftest.$ac_objext
13755-if { (eval echo "$as_me:19063: \"$ac_compile\"") >&5
13756+if { (eval echo "$as_me:19098: \"$ac_compile\"") >&5
13757   (eval $ac_compile) 2>&5
13758   ac_status=$?
13759-  echo "$as_me:19066: \$? = $ac_status" >&5
13760+  echo "$as_me:19101: \$? = $ac_status" >&5
13761   (exit $ac_status); } &&
13762          { ac_try='test -s conftest.$ac_objext'
13763-  { (eval echo "$as_me:19069: \"$ac_try\"") >&5
13764+  { (eval echo "$as_me:19104: \"$ac_try\"") >&5
13765   (eval $ac_try) 2>&5
13766   ac_status=$?
13767-  echo "$as_me:19072: \$? = $ac_status" >&5
13768+  echo "$as_me:19107: \$? = $ac_status" >&5
13769   (exit $ac_status); }; }; then
13770   cf_cv_wint_t=yes
13771 else
13772@@ -19081,7 +19116,7 @@
13773 fi
13774 rm -f conftest.$ac_objext conftest.$ac_ext
13775 fi
13776-echo "$as_me:19084: result: $cf_cv_wint_t" >&5
13777+echo "$as_me:19119: result: $cf_cv_wint_t" >&5
13778 echo "${ECHO_T}$cf_cv_wint_t" >&6
13779
13780 if test "$cf_cv_wint_t" = yes ; then
13781@@ -19105,10 +19140,10 @@
13782
13783 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
13784
13785-echo "$as_me:19108: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
13786+echo "$as_me:19143: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
13787 echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
13788 cat >conftest.$ac_ext <<_ACEOF
13789-#line 19111 "configure"
13790+#line 19146 "configure"
13791 #include "confdefs.h"
13792
13793 #ifndef _XOPEN_SOURCE_EXTENDED
13794@@ -19126,16 +19161,16 @@
13795 }
13796 _ACEOF
13797 rm -f conftest.$ac_objext
13798-if { (eval echo "$as_me:19129: \"$ac_compile\"") >&5
13799+if { (eval echo "$as_me:19164: \"$ac_compile\"") >&5
13800   (eval $ac_compile) 2>&5
13801   ac_status=$?
13802-  echo "$as_me:19132: \$? = $ac_status" >&5
13803+  echo "$as_me:19167: \$? = $ac_status" >&5
13804   (exit $ac_status); } &&
13805          { ac_try='test -s conftest.$ac_objext'
13806-  { (eval echo "$as_me:19135: \"$ac_try\"") >&5
13807+  { (eval echo "$as_me:19170: \"$ac_try\"") >&5
13808   (eval $ac_try) 2>&5
13809   ac_status=$?
13810-  echo "$as_me:19138: \$? = $ac_status" >&5
13811+  echo "$as_me:19173: \$? = $ac_status" >&5
13812   (exit $ac_status); }; }; then
13813   cf_result=yes
13814 else
13815@@ -19144,7 +19179,7 @@
13816 cf_result=no
13817 fi
13818 rm -f conftest.$ac_objext conftest.$ac_ext
13819-echo "$as_me:19147: result: $cf_result" >&5
13820+echo "$as_me:19182: result: $cf_result" >&5
13821 echo "${ECHO_T}$cf_result" >&6
13822 if test $cf_result = yes ; then
13823
13824@@ -19166,10 +19201,10 @@
13825
13826 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
13827
13828-echo "$as_me:19169: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
13829+echo "$as_me:19204: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
13830 echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
13831 cat >conftest.$ac_ext <<_ACEOF
13832-#line 19172 "configure"
13833+#line 19207 "configure"
13834 #include "confdefs.h"
13835
13836 #ifndef _XOPEN_SOURCE_EXTENDED
13837@@ -19187,16 +19222,16 @@
13838 }
13839 _ACEOF
13840 rm -f conftest.$ac_objext
13841-if { (eval echo "$as_me:19190: \"$ac_compile\"") >&5
13842+if { (eval echo "$as_me:19225: \"$ac_compile\"") >&5
13843   (eval $ac_compile) 2>&5
13844   ac_status=$?
13845-  echo "$as_me:19193: \$? = $ac_status" >&5
13846+  echo "$as_me:19228: \$? = $ac_status" >&5
13847   (exit $ac_status); } &&
13848          { ac_try='test -s conftest.$ac_objext'
13849-  { (eval echo "$as_me:19196: \"$ac_try\"") >&5
13850+  { (eval echo "$as_me:19231: \"$ac_try\"") >&5
13851   (eval $ac_try) 2>&5
13852   ac_status=$?
13853-  echo "$as_me:19199: \$? = $ac_status" >&5
13854+  echo "$as_me:19234: \$? = $ac_status" >&5
13855   (exit $ac_status); }; }; then
13856   cf_result=yes
13857 else
13858@@ -19205,7 +19240,7 @@
13859 cf_result=no
13860 fi
13861 rm -f conftest.$ac_objext conftest.$ac_ext
13862-echo "$as_me:19208: result: $cf_result" >&5
13863+echo "$as_me:19243: result: $cf_result" >&5
13864 echo "${ECHO_T}$cf_result" >&6
13865 if test $cf_result = yes ; then
13866
13867@@ -19227,10 +19262,10 @@
13868
13869 	if test "$NCURSES_OK_WINT_T" = 0 ; then
13870
13871-echo "$as_me:19230: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
13872+echo "$as_me:19265: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
13873 echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
13874 cat >conftest.$ac_ext <<_ACEOF
13875-#line 19233 "configure"
13876+#line 19268 "configure"
13877 #include "confdefs.h"
13878
13879 #ifndef _XOPEN_SOURCE_EXTENDED
13880@@ -19248,16 +19283,16 @@
13881 }
13882 _ACEOF
13883 rm -f conftest.$ac_objext
13884-if { (eval echo "$as_me:19251: \"$ac_compile\"") >&5
13885+if { (eval echo "$as_me:19286: \"$ac_compile\"") >&5
13886   (eval $ac_compile) 2>&5
13887   ac_status=$?
13888-  echo "$as_me:19254: \$? = $ac_status" >&5
13889+  echo "$as_me:19289: \$? = $ac_status" >&5
13890   (exit $ac_status); } &&
13891          { ac_try='test -s conftest.$ac_objext'
13892-  { (eval echo "$as_me:19257: \"$ac_try\"") >&5
13893+  { (eval echo "$as_me:19292: \"$ac_try\"") >&5
13894   (eval $ac_try) 2>&5
13895   ac_status=$?
13896-  echo "$as_me:19260: \$? = $ac_status" >&5
13897+  echo "$as_me:19295: \$? = $ac_status" >&5
13898   (exit $ac_status); }; }; then
13899   cf_result=yes
13900 else
13901@@ -19266,7 +19301,7 @@
13902 cf_result=no
13903 fi
13904 rm -f conftest.$ac_objext conftest.$ac_ext
13905-echo "$as_me:19269: result: $cf_result" >&5
13906+echo "$as_me:19304: result: $cf_result" >&5
13907 echo "${ECHO_T}$cf_result" >&6
13908 if test $cf_result = yes ; then
13909
13910@@ -19295,11 +19330,11 @@
13911 boolfnames \
13912 ttytype
13913 do
13914-echo "$as_me:19298: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
13915+echo "$as_me:19333: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
13916 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
13917
13918 cat >conftest.$ac_ext <<_ACEOF
13919-#line 19302 "configure"
13920+#line 19337 "configure"
13921 #include "confdefs.h"
13922
13923 #ifdef HAVE_XCURSES
13924@@ -19327,16 +19362,16 @@
13925 }
13926 _ACEOF
13927 rm -f conftest.$ac_objext
13928-if { (eval echo "$as_me:19330: \"$ac_compile\"") >&5
13929+if { (eval echo "$as_me:19365: \"$ac_compile\"") >&5
13930   (eval $ac_compile) 2>&5
13931   ac_status=$?
13932-  echo "$as_me:19333: \$? = $ac_status" >&5
13933+  echo "$as_me:19368: \$? = $ac_status" >&5
13934   (exit $ac_status); } &&
13935          { ac_try='test -s conftest.$ac_objext'
13936-  { (eval echo "$as_me:19336: \"$ac_try\"") >&5
13937+  { (eval echo "$as_me:19371: \"$ac_try\"") >&5
13938   (eval $ac_try) 2>&5
13939   ac_status=$?
13940-  echo "$as_me:19339: \$? = $ac_status" >&5
13941+  echo "$as_me:19374: \$? = $ac_status" >&5
13942   (exit $ac_status); }; }; then
13943   cf_result=yes
13944
13945@@ -19346,7 +19381,7 @@
13946 cf_result=no
13947 fi
13948 rm -f conftest.$ac_objext conftest.$ac_ext
13949-echo "$as_me:19349: result: $cf_result" >&5
13950+echo "$as_me:19384: result: $cf_result" >&5
13951 echo "${ECHO_T}$cf_result" >&6
13952
13953 if test $cf_result = yes ; then
13954@@ -19358,14 +19393,14 @@
13955 EOF
13956
13957 else
13958-	echo "$as_me:19361: checking for data $cf_data in library" >&5
13959+	echo "$as_me:19396: checking for data $cf_data in library" >&5
13960 echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
13961 	# BSD linkers insist on making weak linkage, but resolve at runtime.
13962 	if test "$cross_compiling" = yes; then
13963
13964 	# cross-compiling
13965 	cat >conftest.$ac_ext <<_ACEOF
13966-#line 19368 "configure"
13967+#line 19403 "configure"
13968 #include "confdefs.h"
13969
13970 #ifdef HAVE_XCURSES
13971@@ -19398,16 +19433,16 @@
13972 }
13973 _ACEOF
13974 rm -f conftest.$ac_objext conftest$ac_exeext
13975-if { (eval echo "$as_me:19401: \"$ac_link\"") >&5
13976+if { (eval echo "$as_me:19436: \"$ac_link\"") >&5
13977   (eval $ac_link) 2>&5
13978   ac_status=$?
13979-  echo "$as_me:19404: \$? = $ac_status" >&5
13980+  echo "$as_me:19439: \$? = $ac_status" >&5
13981   (exit $ac_status); } &&
13982          { ac_try='test -s conftest$ac_exeext'
13983-  { (eval echo "$as_me:19407: \"$ac_try\"") >&5
13984+  { (eval echo "$as_me:19442: \"$ac_try\"") >&5
13985   (eval $ac_try) 2>&5
13986   ac_status=$?
13987-  echo "$as_me:19410: \$? = $ac_status" >&5
13988+  echo "$as_me:19445: \$? = $ac_status" >&5
13989   (exit $ac_status); }; }; then
13990   cf_result=yes
13991 else
13992@@ -19419,7 +19454,7 @@
13993
13994 else
13995   cat >conftest.$ac_ext <<_ACEOF
13996-#line 19422 "configure"
13997+#line 19457 "configure"
13998 #include "confdefs.h"
13999
14000 #ifdef HAVE_XCURSES
14001@@ -19445,15 +19480,15 @@
14002 }
14003 _ACEOF
14004 rm -f conftest$ac_exeext
14005-if { (eval echo "$as_me:19448: \"$ac_link\"") >&5
14006+if { (eval echo "$as_me:19483: \"$ac_link\"") >&5
14007   (eval $ac_link) 2>&5
14008   ac_status=$?
14009-  echo "$as_me:19451: \$? = $ac_status" >&5
14010+  echo "$as_me:19486: \$? = $ac_status" >&5
14011   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
14012-  { (eval echo "$as_me:19453: \"$ac_try\"") >&5
14013+  { (eval echo "$as_me:19488: \"$ac_try\"") >&5
14014   (eval $ac_try) 2>&5
14015   ac_status=$?
14016-  echo "$as_me:19456: \$? = $ac_status" >&5
14017+  echo "$as_me:19491: \$? = $ac_status" >&5
14018   (exit $ac_status); }; }; then
14019   cf_result=yes
14020
14021@@ -19465,7 +19500,7 @@
14022 fi
14023 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
14024 fi
14025-	echo "$as_me:19468: result: $cf_result" >&5
14026+	echo "$as_me:19503: result: $cf_result" >&5
14027 echo "${ECHO_T}$cf_result" >&6
14028 	if test $cf_result = yes ; then
14029
14030@@ -19482,7 +19517,7 @@
14031
14032 if ( test "$GCC" = yes || test "$GXX" = yes )
14033 then
14034-echo "$as_me:19485: checking if you want to turn on gcc warnings" >&5
14035+echo "$as_me:19520: checking if you want to turn on gcc warnings" >&5
14036 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
14037
14038 # Check whether --enable-warnings or --disable-warnings was given.
14039@@ -19499,7 +19534,7 @@
14040 	with_warnings=no
14041
14042 fi;
14043-echo "$as_me:19502: result: $with_warnings" >&5
14044+echo "$as_me:19537: result: $with_warnings" >&5
14045 echo "${ECHO_T}$with_warnings" >&6
14046 if test "$with_warnings" = "yes"
14047 then
14048@@ -19522,10 +19557,10 @@
14049 EOF
14050 if test "$GCC" = yes
14051 then
14052-	{ echo "$as_me:19525: checking for $CC __attribute__ directives..." >&5
14053+	{ echo "$as_me:19560: checking for $CC __attribute__ directives..." >&5
14054 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
14055 cat > conftest.$ac_ext <<EOF
14056-#line 19528 "${as_me:-configure}"
14057+#line 19563 "${as_me:-configure}"
14058 #include "confdefs.h"
14059 #include "conftest.h"
14060 #include "conftest.i"
14061@@ -19574,12 +19609,12 @@
14062 			;;
14063 		esac
14064
14065-		if { (eval echo "$as_me:19577: \"$ac_compile\"") >&5
14066+		if { (eval echo "$as_me:19612: \"$ac_compile\"") >&5
14067   (eval $ac_compile) 2>&5
14068   ac_status=$?
14069-  echo "$as_me:19580: \$? = $ac_status" >&5
14070+  echo "$as_me:19615: \$? = $ac_status" >&5
14071   (exit $ac_status); }; then
14072-			test -n "$verbose" && echo "$as_me:19582: result: ... $cf_attribute" >&5
14073+			test -n "$verbose" && echo "$as_me:19617: result: ... $cf_attribute" >&5
14074 echo "${ECHO_T}... $cf_attribute" >&6
14075 			cat conftest.h >>confdefs.h
14076 			case $cf_attribute in
14077@@ -19639,8 +19674,25 @@
14078 fi
14079
14080 if test "x$have_x" = xyes; then
14081+
14082+cf_save_LIBS_CF_CONST_X_STRING="$LIBS"
14083+cf_save_CFLAGS_CF_CONST_X_STRING="$CFLAGS"
14084+cf_save_CPPFLAGS_CF_CONST_X_STRING="$CPPFLAGS"
14085+LIBS="$LIBS ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}"
14086+for cf_X_CFLAGS in $X_CFLAGS
14087+do
14088+	case "x$cf_X_CFLAGS" in
14089+	x-[IUD]*)
14090+		CPPFLAGS="$CPPFLAGS $cf_X_CFLAGS"
14091+		;;
14092+	*)
14093+		CFLAGS="$CFLAGS $cf_X_CFLAGS"
14094+		;;
14095+	esac
14096+done
14097+
14098 cat >conftest.$ac_ext <<_ACEOF
14099-#line 19643 "configure"
14100+#line 19695 "configure"
14101 #include "confdefs.h"
14102
14103 #include <stdlib.h>
14104@@ -19655,26 +19707,26 @@
14105 }
14106 _ACEOF
14107 rm -f conftest.$ac_objext
14108-if { (eval echo "$as_me:19658: \"$ac_compile\"") >&5
14109+if { (eval echo "$as_me:19710: \"$ac_compile\"") >&5
14110   (eval $ac_compile) 2>&5
14111   ac_status=$?
14112-  echo "$as_me:19661: \$? = $ac_status" >&5
14113+  echo "$as_me:19713: \$? = $ac_status" >&5
14114   (exit $ac_status); } &&
14115          { ac_try='test -s conftest.$ac_objext'
14116-  { (eval echo "$as_me:19664: \"$ac_try\"") >&5
14117+  { (eval echo "$as_me:19716: \"$ac_try\"") >&5
14118   (eval $ac_try) 2>&5
14119   ac_status=$?
14120-  echo "$as_me:19667: \$? = $ac_status" >&5
14121+  echo "$as_me:19719: \$? = $ac_status" >&5
14122   (exit $ac_status); }; }; then
14123
14124-echo "$as_me:19670: checking for X11/Xt const-feature" >&5
14125+echo "$as_me:19722: checking for X11/Xt const-feature" >&5
14126 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
14127 if test "${cf_cv_const_x_string+set}" = set; then
14128   echo $ECHO_N "(cached) $ECHO_C" >&6
14129 else
14130
14131 	cat >conftest.$ac_ext <<_ACEOF
14132-#line 19677 "configure"
14133+#line 19729 "configure"
14134 #include "confdefs.h"
14135
14136 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
14137@@ -19691,16 +19743,16 @@
14138 }
14139 _ACEOF
14140 rm -f conftest.$ac_objext
14141-if { (eval echo "$as_me:19694: \"$ac_compile\"") >&5
14142+if { (eval echo "$as_me:19746: \"$ac_compile\"") >&5
14143   (eval $ac_compile) 2>&5
14144   ac_status=$?
14145-  echo "$as_me:19697: \$? = $ac_status" >&5
14146+  echo "$as_me:19749: \$? = $ac_status" >&5
14147   (exit $ac_status); } &&
14148          { ac_try='test -s conftest.$ac_objext'
14149-  { (eval echo "$as_me:19700: \"$ac_try\"") >&5
14150+  { (eval echo "$as_me:19752: \"$ac_try\"") >&5
14151   (eval $ac_try) 2>&5
14152   ac_status=$?
14153-  echo "$as_me:19703: \$? = $ac_status" >&5
14154+  echo "$as_me:19755: \$? = $ac_status" >&5
14155   (exit $ac_status); }; }; then
14156
14157 			cf_cv_const_x_string=no
14158@@ -19715,9 +19767,13 @@
14159 rm -f conftest.$ac_objext conftest.$ac_ext
14160
14161 fi
14162-echo "$as_me:19718: result: $cf_cv_const_x_string" >&5
14163+echo "$as_me:19770: result: $cf_cv_const_x_string" >&5
14164 echo "${ECHO_T}$cf_cv_const_x_string" >&6
14165
14166+LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
14167+CFLAGS="$cf_save_CFLAGS_CF_CONST_X_STRING"
14168+CPPFLAGS="$cf_save_CPPFLAGS_CF_CONST_X_STRING"
14169+
14170 case $cf_cv_const_x_string in
14171 (no)
14172
14173@@ -19740,7 +19796,7 @@
14174 rm -f conftest.$ac_objext conftest.$ac_ext
14175  fi
14176 cat > conftest.$ac_ext <<EOF
14177-#line 19743 "${as_me:-configure}"
14178+#line 19799 "${as_me:-configure}"
14179 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
14180 EOF
14181 if test "$INTEL_COMPILER" = yes
14182@@ -19756,7 +19812,7 @@
14183 # remark #981: operands are evaluated in unspecified order
14184 # warning #279: controlling expression is constant
14185
14186-	{ echo "$as_me:19759: checking for $CC warning options..." >&5
14187+	{ echo "$as_me:19815: checking for $CC warning options..." >&5
14188 echo "$as_me: checking for $CC warning options..." >&6;}
14189 	cf_save_CFLAGS="$CFLAGS"
14190 	EXTRA_CFLAGS="-Wall"
14191@@ -19772,20 +19828,20 @@
14192 		wd981
14193 	do
14194 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
14195-		if { (eval echo "$as_me:19775: \"$ac_compile\"") >&5
14196+		if { (eval echo "$as_me:19831: \"$ac_compile\"") >&5
14197   (eval $ac_compile) 2>&5
14198   ac_status=$?
14199-  echo "$as_me:19778: \$? = $ac_status" >&5
14200+  echo "$as_me:19834: \$? = $ac_status" >&5
14201   (exit $ac_status); }; then
14202-			test -n "$verbose" && echo "$as_me:19780: result: ... -$cf_opt" >&5
14203+			test -n "$verbose" && echo "$as_me:19836: result: ... -$cf_opt" >&5
14204 echo "${ECHO_T}... -$cf_opt" >&6
14205 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
14206 		fi
14207 	done
14208 	CFLAGS="$cf_save_CFLAGS"
14209-elif test "$GCC" = yes
14210+elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
14211 then
14212-	{ echo "$as_me:19788: checking for $CC warning options..." >&5
14213+	{ echo "$as_me:19844: checking for $CC warning options..." >&5
14214 echo "$as_me: checking for $CC warning options..." >&6;}
14215 	cf_save_CFLAGS="$CFLAGS"
14216 	EXTRA_CFLAGS=
14217@@ -19806,15 +19862,15 @@
14218 		Wpointer-arith \
14219 		Wshadow \
14220 		Wstrict-prototypes \
14221-		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
14222+		Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
14223 	do
14224 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
14225-		if { (eval echo "$as_me:19812: \"$ac_compile\"") >&5
14226+		if { (eval echo "$as_me:19868: \"$ac_compile\"") >&5
14227   (eval $ac_compile) 2>&5
14228   ac_status=$?
14229-  echo "$as_me:19815: \$? = $ac_status" >&5
14230+  echo "$as_me:19871: \$? = $ac_status" >&5
14231   (exit $ac_status); }; then
14232-			test -n "$verbose" && echo "$as_me:19817: result: ... -$cf_opt" >&5
14233+			test -n "$verbose" && echo "$as_me:19873: result: ... -$cf_opt" >&5
14234 echo "${ECHO_T}... -$cf_opt" >&6
14235 			case $cf_opt in
14236 			(Winline)
14237@@ -19822,7 +19878,7 @@
14238 				([34].*)
14239 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
14240
14241-echo "${as_me:-configure}:19825: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
14242+echo "${as_me:-configure}:19881: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
14243
14244 					continue;;
14245 				esac
14246@@ -19832,7 +19888,7 @@
14247 				([12].*)
14248 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
14249
14250-echo "${as_me:-configure}:19835: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
14251+echo "${as_me:-configure}:19891: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
14252
14253 					continue;;
14254 				esac
14255@@ -19848,7 +19904,7 @@
14256 fi
14257 fi
14258
14259-echo "$as_me:19851: checking if you want to use dmalloc for testing" >&5
14260+echo "$as_me:19907: checking if you want to use dmalloc for testing" >&5
14261 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
14262
14263 # Check whether --with-dmalloc or --without-dmalloc was given.
14264@@ -19865,7 +19921,7 @@
14265 else
14266   with_dmalloc=
14267 fi;
14268-echo "$as_me:19868: result: ${with_dmalloc:-no}" >&5
14269+echo "$as_me:19924: result: ${with_dmalloc:-no}" >&5
14270 echo "${ECHO_T}${with_dmalloc:-no}" >&6
14271
14272 case .$with_cflags in
14273@@ -19979,23 +20035,23 @@
14274 esac
14275
14276 if test "$with_dmalloc" = yes ; then
14277-	echo "$as_me:19982: checking for dmalloc.h" >&5
14278+	echo "$as_me:20038: checking for dmalloc.h" >&5
14279 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
14280 if test "${ac_cv_header_dmalloc_h+set}" = set; then
14281   echo $ECHO_N "(cached) $ECHO_C" >&6
14282 else
14283   cat >conftest.$ac_ext <<_ACEOF
14284-#line 19988 "configure"
14285+#line 20044 "configure"
14286 #include "confdefs.h"
14287 #include <dmalloc.h>
14288 _ACEOF
14289-if { (eval echo "$as_me:19992: \"$ac_cpp conftest.$ac_ext\"") >&5
14290+if { (eval echo "$as_me:20048: \"$ac_cpp conftest.$ac_ext\"") >&5
14291   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
14292   ac_status=$?
14293   egrep -v '^ *\+' conftest.er1 >conftest.err
14294   rm -f conftest.er1
14295   cat conftest.err >&5
14296-  echo "$as_me:19998: \$? = $ac_status" >&5
14297+  echo "$as_me:20054: \$? = $ac_status" >&5
14298   (exit $ac_status); } >/dev/null; then
14299   if test -s conftest.err; then
14300     ac_cpp_err=$ac_c_preproc_warn_flag
14301@@ -20014,11 +20070,11 @@
14302 fi
14303 rm -f conftest.err conftest.$ac_ext
14304 fi
14305-echo "$as_me:20017: result: $ac_cv_header_dmalloc_h" >&5
14306+echo "$as_me:20073: result: $ac_cv_header_dmalloc_h" >&5
14307 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
14308 if test $ac_cv_header_dmalloc_h = yes; then
14309
14310-echo "$as_me:20021: checking for dmalloc_debug in -ldmalloc" >&5
14311+echo "$as_me:20077: checking for dmalloc_debug in -ldmalloc" >&5
14312 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
14313 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
14314   echo $ECHO_N "(cached) $ECHO_C" >&6
14315@@ -20026,7 +20082,7 @@
14316   ac_check_lib_save_LIBS=$LIBS
14317 LIBS="-ldmalloc  $LIBS"
14318 cat >conftest.$ac_ext <<_ACEOF
14319-#line 20029 "configure"
14320+#line 20085 "configure"
14321 #include "confdefs.h"
14322
14323 /* Override any gcc2 internal prototype to avoid an error.  */
14324@@ -20045,16 +20101,16 @@
14325 }
14326 _ACEOF
14327 rm -f conftest.$ac_objext conftest$ac_exeext
14328-if { (eval echo "$as_me:20048: \"$ac_link\"") >&5
14329+if { (eval echo "$as_me:20104: \"$ac_link\"") >&5
14330   (eval $ac_link) 2>&5
14331   ac_status=$?
14332-  echo "$as_me:20051: \$? = $ac_status" >&5
14333+  echo "$as_me:20107: \$? = $ac_status" >&5
14334   (exit $ac_status); } &&
14335          { ac_try='test -s conftest$ac_exeext'
14336-  { (eval echo "$as_me:20054: \"$ac_try\"") >&5
14337+  { (eval echo "$as_me:20110: \"$ac_try\"") >&5
14338   (eval $ac_try) 2>&5
14339   ac_status=$?
14340-  echo "$as_me:20057: \$? = $ac_status" >&5
14341+  echo "$as_me:20113: \$? = $ac_status" >&5
14342   (exit $ac_status); }; }; then
14343   ac_cv_lib_dmalloc_dmalloc_debug=yes
14344 else
14345@@ -20065,7 +20121,7 @@
14346 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
14347 LIBS=$ac_check_lib_save_LIBS
14348 fi
14349-echo "$as_me:20068: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
14350+echo "$as_me:20124: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
14351 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
14352 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
14353   cat >>confdefs.h <<EOF
14354@@ -20080,7 +20136,7 @@
14355
14356 fi
14357
14358-echo "$as_me:20083: checking if you want to use dbmalloc for testing" >&5
14359+echo "$as_me:20139: checking if you want to use dbmalloc for testing" >&5
14360 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
14361
14362 # Check whether --with-dbmalloc or --without-dbmalloc was given.
14363@@ -20097,7 +20153,7 @@
14364 else
14365   with_dbmalloc=
14366 fi;
14367-echo "$as_me:20100: result: ${with_dbmalloc:-no}" >&5
14368+echo "$as_me:20156: result: ${with_dbmalloc:-no}" >&5
14369 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
14370
14371 case .$with_cflags in
14372@@ -20211,23 +20267,23 @@
14373 esac
14374
14375 if test "$with_dbmalloc" = yes ; then
14376-	echo "$as_me:20214: checking for dbmalloc.h" >&5
14377+	echo "$as_me:20270: checking for dbmalloc.h" >&5
14378 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
14379 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
14380   echo $ECHO_N "(cached) $ECHO_C" >&6
14381 else
14382   cat >conftest.$ac_ext <<_ACEOF
14383-#line 20220 "configure"
14384+#line 20276 "configure"
14385 #include "confdefs.h"
14386 #include <dbmalloc.h>
14387 _ACEOF
14388-if { (eval echo "$as_me:20224: \"$ac_cpp conftest.$ac_ext\"") >&5
14389+if { (eval echo "$as_me:20280: \"$ac_cpp conftest.$ac_ext\"") >&5
14390   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
14391   ac_status=$?
14392   egrep -v '^ *\+' conftest.er1 >conftest.err
14393   rm -f conftest.er1
14394   cat conftest.err >&5
14395-  echo "$as_me:20230: \$? = $ac_status" >&5
14396+  echo "$as_me:20286: \$? = $ac_status" >&5
14397   (exit $ac_status); } >/dev/null; then
14398   if test -s conftest.err; then
14399     ac_cpp_err=$ac_c_preproc_warn_flag
14400@@ -20246,11 +20302,11 @@
14401 fi
14402 rm -f conftest.err conftest.$ac_ext
14403 fi
14404-echo "$as_me:20249: result: $ac_cv_header_dbmalloc_h" >&5
14405+echo "$as_me:20305: result: $ac_cv_header_dbmalloc_h" >&5
14406 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
14407 if test $ac_cv_header_dbmalloc_h = yes; then
14408
14409-echo "$as_me:20253: checking for debug_malloc in -ldbmalloc" >&5
14410+echo "$as_me:20309: checking for debug_malloc in -ldbmalloc" >&5
14411 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
14412 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
14413   echo $ECHO_N "(cached) $ECHO_C" >&6
14414@@ -20258,7 +20314,7 @@
14415   ac_check_lib_save_LIBS=$LIBS
14416 LIBS="-ldbmalloc  $LIBS"
14417 cat >conftest.$ac_ext <<_ACEOF
14418-#line 20261 "configure"
14419+#line 20317 "configure"
14420 #include "confdefs.h"
14421
14422 /* Override any gcc2 internal prototype to avoid an error.  */
14423@@ -20277,16 +20333,16 @@
14424 }
14425 _ACEOF
14426 rm -f conftest.$ac_objext conftest$ac_exeext
14427-if { (eval echo "$as_me:20280: \"$ac_link\"") >&5
14428+if { (eval echo "$as_me:20336: \"$ac_link\"") >&5
14429   (eval $ac_link) 2>&5
14430   ac_status=$?
14431-  echo "$as_me:20283: \$? = $ac_status" >&5
14432+  echo "$as_me:20339: \$? = $ac_status" >&5
14433   (exit $ac_status); } &&
14434          { ac_try='test -s conftest$ac_exeext'
14435-  { (eval echo "$as_me:20286: \"$ac_try\"") >&5
14436+  { (eval echo "$as_me:20342: \"$ac_try\"") >&5
14437   (eval $ac_try) 2>&5
14438   ac_status=$?
14439-  echo "$as_me:20289: \$? = $ac_status" >&5
14440+  echo "$as_me:20345: \$? = $ac_status" >&5
14441   (exit $ac_status); }; }; then
14442   ac_cv_lib_dbmalloc_debug_malloc=yes
14443 else
14444@@ -20297,7 +20353,7 @@
14445 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
14446 LIBS=$ac_check_lib_save_LIBS
14447 fi
14448-echo "$as_me:20300: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
14449+echo "$as_me:20356: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
14450 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
14451 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
14452   cat >>confdefs.h <<EOF
14453@@ -20312,7 +20368,7 @@
14454
14455 fi
14456
14457-echo "$as_me:20315: checking if you want to use valgrind for testing" >&5
14458+echo "$as_me:20371: checking if you want to use valgrind for testing" >&5
14459 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
14460
14461 # Check whether --with-valgrind or --without-valgrind was given.
14462@@ -20329,7 +20385,7 @@
14463 else
14464   with_valgrind=
14465 fi;
14466-echo "$as_me:20332: result: ${with_valgrind:-no}" >&5
14467+echo "$as_me:20388: result: ${with_valgrind:-no}" >&5
14468 echo "${ECHO_T}${with_valgrind:-no}" >&6
14469
14470 case .$with_cflags in
14471@@ -20442,7 +20498,7 @@
14472 	;;
14473 esac
14474
14475-echo "$as_me:20445: checking if you want to perform memory-leak testing" >&5
14476+echo "$as_me:20501: checking if you want to perform memory-leak testing" >&5
14477 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
14478
14479 # Check whether --enable-leaks or --disable-leaks was given.
14480@@ -20452,7 +20508,7 @@
14481 else
14482   : ${with_no_leaks:=no}
14483 fi;
14484-echo "$as_me:20455: result: $with_no_leaks" >&5
14485+echo "$as_me:20511: result: $with_no_leaks" >&5
14486 echo "${ECHO_T}$with_no_leaks" >&6
14487
14488 if test "$with_no_leaks" = yes ; then
14489@@ -20470,7 +20526,7 @@
14490 LD_RPATH_OPT=
14491 if test "x$cf_cv_enable_rpath" != xno
14492 then
14493-	echo "$as_me:20473: checking for an rpath option" >&5
14494+	echo "$as_me:20529: checking for an rpath option" >&5
14495 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
14496 	case $cf_cv_system_name in
14497 	(irix*)
14498@@ -20501,12 +20557,12 @@
14499 	(*)
14500 		;;
14501 	esac
14502-	echo "$as_me:20504: result: $LD_RPATH_OPT" >&5
14503+	echo "$as_me:20560: result: $LD_RPATH_OPT" >&5
14504 echo "${ECHO_T}$LD_RPATH_OPT" >&6
14505
14506 	case "x$LD_RPATH_OPT" in
14507 	(x-R*)
14508-		echo "$as_me:20509: checking if we need a space after rpath option" >&5
14509+		echo "$as_me:20565: checking if we need a space after rpath option" >&5
14510 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
14511 		cf_save_LIBS="$LIBS"
14512
14513@@ -20527,7 +20583,7 @@
14514 LIBS="$cf_add_libs"
14515
14516 		cat >conftest.$ac_ext <<_ACEOF
14517-#line 20530 "configure"
14518+#line 20586 "configure"
14519 #include "confdefs.h"
14520
14521 int
14522@@ -20539,16 +20595,16 @@
14523 }
14524 _ACEOF
14525 rm -f conftest.$ac_objext conftest$ac_exeext
14526-if { (eval echo "$as_me:20542: \"$ac_link\"") >&5
14527+if { (eval echo "$as_me:20598: \"$ac_link\"") >&5
14528   (eval $ac_link) 2>&5
14529   ac_status=$?
14530-  echo "$as_me:20545: \$? = $ac_status" >&5
14531+  echo "$as_me:20601: \$? = $ac_status" >&5
14532   (exit $ac_status); } &&
14533          { ac_try='test -s conftest$ac_exeext'
14534-  { (eval echo "$as_me:20548: \"$ac_try\"") >&5
14535+  { (eval echo "$as_me:20604: \"$ac_try\"") >&5
14536   (eval $ac_try) 2>&5
14537   ac_status=$?
14538-  echo "$as_me:20551: \$? = $ac_status" >&5
14539+  echo "$as_me:20607: \$? = $ac_status" >&5
14540   (exit $ac_status); }; }; then
14541   cf_rpath_space=no
14542 else
14543@@ -20558,14 +20614,14 @@
14544 fi
14545 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
14546 		LIBS="$cf_save_LIBS"
14547-		echo "$as_me:20561: result: $cf_rpath_space" >&5
14548+		echo "$as_me:20617: result: $cf_rpath_space" >&5
14549 echo "${ECHO_T}$cf_rpath_space" >&6
14550 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
14551 		;;
14552 	esac
14553 fi
14554
14555-echo "$as_me:20568: checking if rpath-hack should be disabled" >&5
14556+echo "$as_me:20624: checking if rpath-hack should be disabled" >&5
14557 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
14558
14559 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
14560@@ -20582,21 +20638,21 @@
14561 	cf_disable_rpath_hack=no
14562
14563 fi;
14564-echo "$as_me:20585: result: $cf_disable_rpath_hack" >&5
14565+echo "$as_me:20641: result: $cf_disable_rpath_hack" >&5
14566 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
14567 if test "$cf_disable_rpath_hack" = no ; then
14568
14569-echo "$as_me:20589: checking for updated LDFLAGS" >&5
14570+echo "$as_me:20645: checking for updated LDFLAGS" >&5
14571 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
14572 if test -n "$LD_RPATH_OPT" ; then
14573-	echo "$as_me:20592: result: maybe" >&5
14574+	echo "$as_me:20648: result: maybe" >&5
14575 echo "${ECHO_T}maybe" >&6
14576
14577 	for ac_prog in ldd
14578 do
14579   # Extract the first word of "$ac_prog", so it can be a program name with args.
14580 set dummy $ac_prog; ac_word=$2
14581-echo "$as_me:20599: checking for $ac_word" >&5
14582+echo "$as_me:20655: checking for $ac_word" >&5
14583 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
14584 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
14585   echo $ECHO_N "(cached) $ECHO_C" >&6
14586@@ -20611,7 +20667,7 @@
14587   test -z "$ac_dir" && ac_dir=.
14588   $as_executable_p "$ac_dir/$ac_word" || continue
14589 ac_cv_prog_cf_ldd_prog="$ac_prog"
14590-echo "$as_me:20614: found $ac_dir/$ac_word" >&5
14591+echo "$as_me:20670: found $ac_dir/$ac_word" >&5
14592 break
14593 done
14594
14595@@ -20619,10 +20675,10 @@
14596 fi
14597 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
14598 if test -n "$cf_ldd_prog"; then
14599-  echo "$as_me:20622: result: $cf_ldd_prog" >&5
14600+  echo "$as_me:20678: result: $cf_ldd_prog" >&5
14601 echo "${ECHO_T}$cf_ldd_prog" >&6
14602 else
14603-  echo "$as_me:20625: result: no" >&5
14604+  echo "$as_me:20681: result: no" >&5
14605 echo "${ECHO_T}no" >&6
14606 fi
14607
14608@@ -20636,7 +20692,7 @@
14609 		cf_rpath_oops=
14610
14611 cat >conftest.$ac_ext <<_ACEOF
14612-#line 20639 "configure"
14613+#line 20695 "configure"
14614 #include "confdefs.h"
14615 #include <stdio.h>
14616 int
14617@@ -20648,16 +20704,16 @@
14618 }
14619 _ACEOF
14620 rm -f conftest.$ac_objext conftest$ac_exeext
14621-if { (eval echo "$as_me:20651: \"$ac_link\"") >&5
14622+if { (eval echo "$as_me:20707: \"$ac_link\"") >&5
14623   (eval $ac_link) 2>&5
14624   ac_status=$?
14625-  echo "$as_me:20654: \$? = $ac_status" >&5
14626+  echo "$as_me:20710: \$? = $ac_status" >&5
14627   (exit $ac_status); } &&
14628          { ac_try='test -s conftest$ac_exeext'
14629-  { (eval echo "$as_me:20657: \"$ac_try\"") >&5
14630+  { (eval echo "$as_me:20713: \"$ac_try\"") >&5
14631   (eval $ac_try) 2>&5
14632   ac_status=$?
14633-  echo "$as_me:20660: \$? = $ac_status" >&5
14634+  echo "$as_me:20716: \$? = $ac_status" >&5
14635   (exit $ac_status); }; }; then
14636   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
14637 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
14638@@ -20685,7 +20741,7 @@
14639 					then
14640 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
14641
14642-echo "${as_me:-configure}:20688: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
14643+echo "${as_me:-configure}:20744: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
14644
14645 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
14646 						break
14647@@ -20697,11 +20753,11 @@
14648
14649 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
14650
14651-echo "${as_me:-configure}:20700: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
14652+echo "${as_me:-configure}:20756: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
14653
14654 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
14655
14656-echo "${as_me:-configure}:20704: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
14657+echo "${as_me:-configure}:20760: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
14658
14659 cf_rpath_dst=
14660 for cf_rpath_src in $LDFLAGS
14661@@ -20738,7 +20794,7 @@
14662 			then
14663 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
14664
14665-echo "${as_me:-configure}:20741: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
14666+echo "${as_me:-configure}:20797: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
14667
14668 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
14669 			fi
14670@@ -20751,11 +20807,11 @@
14671
14672 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
14673
14674-echo "${as_me:-configure}:20754: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
14675+echo "${as_me:-configure}:20810: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
14676
14677 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
14678
14679-echo "${as_me:-configure}:20758: testing ...checking LIBS $LIBS ..." 1>&5
14680+echo "${as_me:-configure}:20814: testing ...checking LIBS $LIBS ..." 1>&5
14681
14682 cf_rpath_dst=
14683 for cf_rpath_src in $LIBS
14684@@ -20792,7 +20848,7 @@
14685 			then
14686 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
14687
14688-echo "${as_me:-configure}:20795: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
14689+echo "${as_me:-configure}:20851: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
14690
14691 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
14692 			fi
14693@@ -20805,14 +20861,14 @@
14694
14695 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
14696
14697-echo "${as_me:-configure}:20808: testing ...checked LIBS $LIBS ..." 1>&5
14698+echo "${as_me:-configure}:20864: testing ...checked LIBS $LIBS ..." 1>&5
14699
14700 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
14701
14702-echo "${as_me:-configure}:20812: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
14703+echo "${as_me:-configure}:20868: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
14704
14705 else
14706-	echo "$as_me:20815: result: no" >&5
14707+	echo "$as_me:20871: result: no" >&5
14708 echo "${ECHO_T}no" >&6
14709 fi
14710
14711@@ -20902,7 +20958,7 @@
14712 : ${CONFIG_STATUS=./config.status}
14713 ac_clean_files_save=$ac_clean_files
14714 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
14715-{ echo "$as_me:20905: creating $CONFIG_STATUS" >&5
14716+{ echo "$as_me:20961: creating $CONFIG_STATUS" >&5
14717 echo "$as_me: creating $CONFIG_STATUS" >&6;}
14718 cat >$CONFIG_STATUS <<_ACEOF
14719 #! $SHELL
14720@@ -21034,7 +21090,7 @@
14721 cat >>$CONFIG_STATUS <<EOF
14722 ac_cs_version="\\
14723 config.status
14724-configured by $0, generated by GNU Autoconf 2.52.20190901,
14725+configured by $0, generated by GNU Autoconf 2.52.20200111,
14726   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
14727
14728 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
14729@@ -21078,7 +21134,7 @@
14730     echo "$ac_cs_version"; exit 0 ;;
14731   --he | --h)
14732     # Conflict between --help and --header
14733-    { { echo "$as_me:21081: error: ambiguous option: $1
14734+    { { echo "$as_me:21137: error: ambiguous option: $1
14735 Try \`$0 --help' for more information." >&5
14736 echo "$as_me: error: ambiguous option: $1
14737 Try \`$0 --help' for more information." >&2;}
14738@@ -21097,7 +21153,7 @@
14739     ac_need_defaults=false;;
14740
14741   # This is an error.
14742-  -*) { { echo "$as_me:21100: error: unrecognized option: $1
14743+  -*) { { echo "$as_me:21156: error: unrecognized option: $1
14744 Try \`$0 --help' for more information." >&5
14745 echo "$as_me: error: unrecognized option: $1
14746 Try \`$0 --help' for more information." >&2;}
14747@@ -21116,7 +21172,7 @@
14748 ## Running config.status.  ##
14749 ## ----------------------- ##
14750
14751-This file was extended by $as_me 2.52.20190901, executed with
14752+This file was extended by $as_me 2.52.20200111, executed with
14753   CONFIG_FILES    = $CONFIG_FILES
14754   CONFIG_HEADERS  = $CONFIG_HEADERS
14755   CONFIG_LINKS    = $CONFIG_LINKS
14756@@ -21147,7 +21203,7 @@
14757   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
14758   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
14759   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
14760-  *) { { echo "$as_me:21150: error: invalid argument: $ac_config_target" >&5
14761+  *) { { echo "$as_me:21206: error: invalid argument: $ac_config_target" >&5
14762 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
14763    { (exit 1); exit 1; }; };;
14764   esac
14765@@ -21443,7 +21499,7 @@
14766   esac
14767
14768   if test x"$ac_file" != x-; then
14769-    { echo "$as_me:21446: creating $ac_file" >&5
14770+    { echo "$as_me:21502: creating $ac_file" >&5
14771 echo "$as_me: creating $ac_file" >&6;}
14772     rm -f "$ac_file"
14773   fi
14774@@ -21461,7 +21517,7 @@
14775       -) echo $tmp/stdin ;;
14776       [\\/$]*)
14777          # Absolute (can't be DOS-style, as IFS=:)
14778-         test -f "$f" || { { echo "$as_me:21464: error: cannot find input file: $f" >&5
14779+         test -f "$f" || { { echo "$as_me:21520: error: cannot find input file: $f" >&5
14780 echo "$as_me: error: cannot find input file: $f" >&2;}
14781    { (exit 1); exit 1; }; }
14782          echo $f;;
14783@@ -21474,7 +21530,7 @@
14784            echo $srcdir/$f
14785          else
14786            # /dev/null tree
14787-           { { echo "$as_me:21477: error: cannot find input file: $f" >&5
14788+           { { echo "$as_me:21533: error: cannot find input file: $f" >&5
14789 echo "$as_me: error: cannot find input file: $f" >&2;}
14790    { (exit 1); exit 1; }; }
14791          fi;;
14792@@ -21490,7 +21546,7 @@
14793       if test -n "$ac_seen"; then
14794         ac_used=`grep '@datarootdir@' $ac_item`
14795         if test -z "$ac_used"; then
14796-          { echo "$as_me:21493: WARNING: datarootdir was used implicitly but not set:
14797+          { echo "$as_me:21549: WARNING: datarootdir was used implicitly but not set:
14798 $ac_seen" >&5
14799 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
14800 $ac_seen" >&2;}
14801@@ -21499,7 +21555,7 @@
14802       fi
14803       ac_seen=`grep '${datarootdir}' $ac_item`
14804       if test -n "$ac_seen"; then
14805-        { echo "$as_me:21502: WARNING: datarootdir was used explicitly but not set:
14806+        { echo "$as_me:21558: WARNING: datarootdir was used explicitly but not set:
14807 $ac_seen" >&5
14808 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
14809 $ac_seen" >&2;}
14810@@ -21536,7 +21592,7 @@
14811             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
14812             if test -z "$ac_init"; then
14813               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
14814-              { echo "$as_me:21539: WARNING: Variable $ac_name is used but was not set:
14815+              { echo "$as_me:21595: WARNING: Variable $ac_name is used but was not set:
14816 $ac_seen" >&5
14817 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
14818 $ac_seen" >&2;}
14819@@ -21547,7 +21603,7 @@
14820     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
14821     if test -s $tmp/out; then
14822       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
14823-      { echo "$as_me:21550: WARNING: Some variables may not be substituted:
14824+      { echo "$as_me:21606: WARNING: Some variables may not be substituted:
14825 $ac_seen" >&5
14826 echo "$as_me: WARNING: Some variables may not be substituted:
14827 $ac_seen" >&2;}
14828@@ -21596,7 +21652,7 @@
14829   * )   ac_file_in=$ac_file.in ;;
14830   esac
14831
14832-  test x"$ac_file" != x- && { echo "$as_me:21599: creating $ac_file" >&5
14833+  test x"$ac_file" != x- && { echo "$as_me:21655: creating $ac_file" >&5
14834 echo "$as_me: creating $ac_file" >&6;}
14835
14836   # First look for the input files in the build tree, otherwise in the
14837@@ -21607,7 +21663,7 @@
14838       -) echo $tmp/stdin ;;
14839       [\\/$]*)
14840          # Absolute (can't be DOS-style, as IFS=:)
14841-         test -f "$f" || { { echo "$as_me:21610: error: cannot find input file: $f" >&5
14842+         test -f "$f" || { { echo "$as_me:21666: error: cannot find input file: $f" >&5
14843 echo "$as_me: error: cannot find input file: $f" >&2;}
14844    { (exit 1); exit 1; }; }
14845          echo $f;;
14846@@ -21620,7 +21676,7 @@
14847            echo $srcdir/$f
14848          else
14849            # /dev/null tree
14850-           { { echo "$as_me:21623: error: cannot find input file: $f" >&5
14851+           { { echo "$as_me:21679: error: cannot find input file: $f" >&5
14852 echo "$as_me: error: cannot find input file: $f" >&2;}
14853    { (exit 1); exit 1; }; }
14854          fi;;
14855@@ -21678,7 +21734,7 @@
14856   rm -f $tmp/in
14857   if test x"$ac_file" != x-; then
14858     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
14859-      { echo "$as_me:21681: $ac_file is unchanged" >&5
14860+      { echo "$as_me:21737: $ac_file is unchanged" >&5
14861 echo "$as_me: $ac_file is unchanged" >&6;}
14862     else
14863       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
14864Index: test/configure.in
14865Prereq:  1.155
14866--- ncurses-6.1-20200104+/test/configure.in	2019-12-31 09:42:42.000000000 +0000
14867+++ ncurses-6.1-20200111/test/configure.in	2020-01-12 00:00:16.000000000 +0000
14868@@ -1,5 +1,5 @@
14869 dnl***************************************************************************
14870-dnl Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
14871+dnl Copyright (c) 1998-2019,2020 Free Software Foundation, Inc.              *
14872 dnl                                                                          *
14873 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
14874 dnl copy of this software and associated documentation files (the            *
14875@@ -28,7 +28,7 @@
14876 dnl
14877 dnl Author: Thomas E. Dickey 1996-on
14878 dnl
14879-dnl $Id: configure.in,v 1.155 2019/12/31 09:42:42 tom Exp $
14880+dnl $Id: configure.in,v 1.156 2020/01/12 00:00:16 tom Exp $
14881 dnl This is a simple configuration-script for the ncurses test programs that
14882 dnl allows the test-directory to be separately configured against a reference
14883 dnl system (i.e., sysvr4 curses)
14884@@ -38,9 +38,10 @@
14885 dnl
14886 dnl For additional information, see
14887 dnl		https://invisible-island.net/autoconf/
14888+dnl		https://invisible-island.net/autoconf/my-autoconf.html
14889 dnl		https://invisible-island.net/ncurses/ncurses-examples.html
14890 dnl ---------------------------------------------------------------------------
14891-AC_PREREQ(2.52.20170501)
14892+AC_PREREQ(2.52.20200111)
14893 AC_INIT(ncurses.c)
14894 AC_CONFIG_HEADER(ncurses_cfg.h:ncurses_tst.hin)
14895
14896