1# ncurses 6.1 - patch 20190630 - 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-20190630.patch.gz
14# patch by Thomas E. Dickey <dickey@invisible-island.net>
15# created  Sun Jun 30 23:48:04 UTC 2019
16# ------------------------------------------------------------------------------
17# INSTALL                          |   18
18# NEWS                             |   11
19# VERSION                          |    2
20# aclocal.m4                       |   73
21# configure                        | 4805 +++++++++++++++++++------------------
22# configure.in                     |   30
23# dist.mk                          |    4
24# misc/run_tic.in                  |    6
25# misc/terminfo.src                |  855 +++---
26# ncurses/Makefile.in              |    7
27# ncurses/tinfo/MKfallback.sh      |   11
28# ncurses/tinfo/write_entry.c      |    7
29# package/debian-mingw/changelog   |    4
30# package/debian-mingw/rules       |    2
31# package/debian-mingw64/changelog |    4
32# package/debian-mingw64/rules     |    2
33# package/debian/changelog         |    4
34# package/mingw-ncurses.nsi        |    4
35# package/mingw-ncurses.spec       |    7
36# package/ncurses.spec             |    2
37# package/ncursest.spec            |    2
38# progs/tic.c                      |    7
39# 22 files changed, 3173 insertions(+), 2694 deletions(-)
40# ------------------------------------------------------------------------------
41Index: INSTALL
42Prereq:  1.212
43--- ncurses-6.1-20190623+/INSTALL	2019-01-19 17:42:30.000000000 +0000
44+++ ncurses-6.1-20190630/INSTALL	2019-06-30 15:28:56.000000000 +0000
45@@ -25,7 +25,7 @@
46 -- sale, use or other dealings in this Software without prior written        --
47 -- authorization.                                                            --
48 -------------------------------------------------------------------------------
49--- $Id: INSTALL,v 1.212 2019/01/19 17:42:30 tom Exp $
50+-- $Id: INSTALL,v 1.213 2019/06/30 15:28:56 tom Exp $
51 ---------------------------------------------------------------------
52              How to install Ncurses/Terminfo on your system
53 ---------------------------------------------------------------------
54@@ -903,6 +903,8 @@
55 	Specify a list of fallback terminal descriptions which will be
56 	compiled into the ncurses library.  See CONFIGURING FALLBACK ENTRIES.
57
58+	See also "--with-tic-path" and "--with-infocmp-path".
59+
60     --with-gpm
61 	use Alessandro Rubini's GPM library to provide mouse support on the
62 	Linux console.  Prior to ncurses 5.5, this introduced a dependency on
63@@ -954,6 +956,10 @@
64
65 	See also the --enable-getcap option.
66
67+    --with-infocmp-path[=XXX]
68+	Use this option to override the automatic detection of tic in your
69+	$PATH when building fallbacks (see "--with-fallbacks").
70+
71     --with-install-prefix=XXX
72 	Allows you to specify an alternate location for installing ncurses
73 	after building it.  The value you specify is prepended to the "real"
74@@ -1173,6 +1179,10 @@
75 	Specify a search-list of termcap files which will be compiled into the
76 	ncurses library (default:  /etc/termcap:/usr/share/misc/termcap)
77
78+    --with-tic-path[=XXX]
79+	Use this option to override the automatic detection of tic in your
80+	$PATH when building fallbacks (see "--with-fallbacks").
81+
82     --with-ticlib[=XXX]
83 	When building the ncurses library, build a separate library for
84 	the modules that are used only by the utility programs.  Normally
85@@ -2120,9 +2130,10 @@
86 			$TERMINFO \
87 			../misc/terminfo.src \
88 			`which tic` \
89+			`which infocmp` \
90 			linux vt100 xterm >fallback.c
91
92-	The first three parameters of the script are normally supplied by
93+	The first four parameters of the script are normally supplied by
94 	the configured makefiles via the "--with-fallbacks" option.  They
95 	are
96
97@@ -2130,6 +2141,8 @@
98 		2) the source for the terminfo entries
99 		3) the location of the tic program, used to create a terminfo
100 		   database.
101+		4) the location of the infocmp program, used to print a terminfo
102+		   description.
103
104 	Then just rebuild and reinstall the library as you would normally.
105 	You can restore the default empty fallback list with
106@@ -2138,6 +2151,7 @@
107 			$TERMINFO \
108 			../misc/terminfo.src \
109 			`which tic` \
110+			`which infocmp` \
111 			>fallback.c
112
113 	The overhead for an empty fallback list is one trivial stub function.
114Index: NEWS
115Prereq:  1.3337
116--- ncurses-6.1-20190623+/NEWS	2019-06-23 21:18:23.000000000 +0000
117+++ ncurses-6.1-20190630/NEWS	2019-06-30 10:45:10.000000000 +0000
118@@ -25,7 +25,7 @@
119 -- sale, use or other dealings in this Software without prior written        --
120 -- authorization.                                                            --
121 -------------------------------------------------------------------------------
122--- $Id: NEWS,v 1.3337 2019/06/23 21:18:23 tom Exp $
123+-- $Id: NEWS,v 1.3342 2019/06/30 10:45:10 tom Exp $
124 -------------------------------------------------------------------------------
125
126 This is a log of changes that ncurses has gone through since Zeyd started
127@@ -45,6 +45,15 @@
128 Changes through 1.9.9e did not credit all contributions;
129 it is not possible to add this information.
130
131+20190630
132+	+ add --with-tic-path and --with-infocmp-path to work around problems
133+	  building fallback source using pre-6.0 tic/infocmp.
134+	+ add a check in tic for paired indn/rin
135+	+ correct a buffer-limit in write_entry.c for systems that use caseless
136+	  filenames.
137+	+ add ms-terminal -TD
138+	+ add vscode, vscode-direct -TD
139+
140 20190623
141 	+ improve the tabs.1 manual page to distinguish the PWB/Unix and 7th
142 	  Edition versions of the tabs utility.
143Index: VERSION
144--- ncurses-6.1-20190623+/VERSION	2019-06-23 15:31:40.000000000 +0000
145+++ ncurses-6.1-20190630/VERSION	2019-06-30 01:30:19.000000000 +0000
146@@ -1 +1 @@
147-5:0:10	6.1	20190623
148+5:0:10	6.1	20190630
149Index: aclocal.m4
150Prereq:  1.869
151--- ncurses-6.1-20190623+/aclocal.m4	2019-06-23 19:53:31.000000000 +0000
152+++ ncurses-6.1-20190630/aclocal.m4	2019-06-30 23:46:29.000000000 +0000
153@@ -28,7 +28,7 @@
154 dnl
155 dnl Author: Thomas E. Dickey 1995-on
156 dnl
157-dnl $Id: aclocal.m4,v 1.869 2019/06/23 19:53:31 tom Exp $
158+dnl $Id: aclocal.m4,v 1.876 2019/06/30 23:46:29 tom Exp $
159 dnl Macros used in NCURSES auto-configuration script.
160 dnl
161 dnl These macros are maintained separately from NCURSES.  The copyright on
162@@ -5606,6 +5606,51 @@
163 	AC_MSG_RESULT($PATH_SEPARATOR)
164 ])dnl
165 dnl ---------------------------------------------------------------------------
166+dnl CF_PATH_PROG version: 10 updated: 2019/06/30 19:44:43
167+dnl ------------
168+dnl Check for a given program, defining corresponding symbol.
169+dnl	$1 = environment variable, which is suffixed by "_PATH" in the #define.
170+dnl	$2 = program name to find.
171+dnl	$3 = optional list of additional program names to test.
172+dnl $4 = $PATH
173+dnl
174+dnl If there is more than one token in the result, #define the remaining tokens
175+dnl to $1_ARGS.  We need this for 'install' in particular.
176+dnl
177+dnl FIXME: we should allow this to be overridden by environment variables
178+dnl
179+AC_DEFUN([CF_PATH_PROG],[
180+AC_REQUIRE([CF_PATHSEP])
181+test -z "[$]$1" && $1=$2
182+AC_PATH_PROGS($1,[$]$1 $2 ifelse($3,,,$3),[$]$1, ifelse($4,,,$4))
183+
184+cf_path_prog=""
185+cf_path_args=""
186+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
187+for cf_temp in $ac_cv_path_$1
188+do
189+	if test -z "$cf_path_prog" ; then
190+		if test "$with_full_paths" = yes ; then
191+			CF_PATH_SYNTAX(cf_temp,break)
192+			cf_path_prog="$cf_temp"
193+		else
194+			cf_path_prog="`basename $cf_temp`"
195+		fi
196+	elif test -z "$cf_path_args" ; then
197+		cf_path_args="$cf_temp"
198+	else
199+		cf_path_args="$cf_path_args $cf_temp"
200+	fi
201+done
202+IFS="$cf_save_ifs"
203+
204+if test -n "$cf_path_prog" ; then
205+	CF_MSG_LOG(defining path for ${cf_path_prog})
206+	AC_DEFINE_UNQUOTED($1_PATH,"$cf_path_prog",Define to pathname $1)
207+	test -n "$cf_path_args" && AC_DEFINE_UNQUOTED($1_ARGS,"$cf_path_args",Define to provide args for $1)
208+fi
209+])dnl
210+dnl ---------------------------------------------------------------------------
211 dnl CF_PATH_SYNTAX version: 16 updated: 2015/04/18 08:56:57
212 dnl --------------
213 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
214@@ -8317,6 +8362,32 @@
215 AC_SUBST(PKG_CONFIG_LIBDIR)
216 ])dnl
217 dnl ---------------------------------------------------------------------------
218+dnl CF_WITH_PATH_PROG version: 1 updated: 2019/06/30 19:44:43
219+dnl -----------------
220+dnl Check for a given program, like CF_PATH_PROG, but allow override using a
221+dnl "--with-xxx" option.
222+dnl
223+dnl Parameters:
224+dnl		$1 = environment variable to set/update
225+dnl		$2 = program name
226+dnl		$3 = help-text
227+dnl		$4 = $PATH
228+AC_DEFUN([CF_WITH_PATH_PROG],[
229+AC_ARG_WITH($2-path,
230+	[  --with-$2-path=XXX     specify path of $2 ifelse($3,,,$3)],
231+	[AC_MSG_CHECKING(for $2 program ifelse($3,,,$3))
232+		$1=$withval
233+		AC_MSG_RESULT([$]$1)
234+		CF_PATH_SYNTAX($1)
235+	],
236+	[CF_PATH_PROG($1,$2,,ifelse($4,,,$4))
237+		if test -z "[$]$1"
238+		then
239+			AC_MSG_WARN(no $2 program found ifelse($3,,,$3))
240+		fi
241+	])
242+])
243+dnl ---------------------------------------------------------------------------
244 dnl CF_WITH_PTHREAD version: 7 updated: 2015/04/18 08:56:57
245 dnl ---------------
246 dnl Check for POSIX thread library.
247Index: configure
248--- ncurses-6.1-20190623+/configure	2019-06-23 21:27:11.000000000 +0000
249+++ ncurses-6.1-20190630/configure	2019-06-30 15:34:11.000000000 +0000
250@@ -1,5 +1,5 @@
251 #! /bin/sh
252-# From configure.in Revision: 1.682 .
253+# From configure.in Revision: 1.688 .
254 # Guess values for system-dependent variables and create Makefiles.
255 # Generated by Autoconf 2.52.20181006.
256 #
257@@ -767,6 +767,8 @@
258   --with-database=XXX     specify terminfo source to install
259   --with-hashed-db        specify hashed-database library
260   --with-fallbacks=XXX    specify list of fallback terminal descriptions
261+  --with-tic-path=XXX     specify path of tic for fallbacks
262+  --with-infocmp-path=XXX     specify path of infocmp for fallbacks
263   --without-xterm-new     specify if xterm terminfo should be old version
264   --with-xterm-kbs=XXX    specify if xterm backspace sends BS or DEL
265   --with-terminfo-dirs=XXX specify list of terminfo directories (default: DATADIR/terminfo)
266@@ -1053,7 +1055,7 @@
267 fi
268 for ac_site_file in $CONFIG_SITE; do
269   if test -r "$ac_site_file"; then
270-    { echo "$as_me:1056: loading site script $ac_site_file" >&5
271+    { echo "$as_me:1058: loading site script $ac_site_file" >&5
272 echo "$as_me: loading site script $ac_site_file" >&6;}
273     cat "$ac_site_file" >&5
274     . "$ac_site_file"
275@@ -1064,7 +1066,7 @@
276   # Some versions of bash will fail to source /dev/null (special
277   # files actually), so we avoid doing that.
278   if test -f "$cache_file"; then
279-    { echo "$as_me:1067: loading cache $cache_file" >&5
280+    { echo "$as_me:1069: loading cache $cache_file" >&5
281 echo "$as_me: loading cache $cache_file" >&6;}
282     case $cache_file in
283       [\\/]* | ?:[\\/]* ) . $cache_file;;
284@@ -1072,7 +1074,7 @@
285     esac
286   fi
287 else
288-  { echo "$as_me:1075: creating cache $cache_file" >&5
289+  { echo "$as_me:1077: creating cache $cache_file" >&5
290 echo "$as_me: creating cache $cache_file" >&6;}
291   >$cache_file
292 fi
293@@ -1088,21 +1090,21 @@
294   eval ac_new_val="\$ac_env_${ac_var}_value"
295   case $ac_old_set,$ac_new_set in
296     set,)
297-      { echo "$as_me:1091: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
298+      { echo "$as_me:1093: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
299 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
300       ac_cache_corrupted=: ;;
301     ,set)
302-      { echo "$as_me:1095: error: \`$ac_var' was not set in the previous run" >&5
303+      { echo "$as_me:1097: error: \`$ac_var' was not set in the previous run" >&5
304 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
305       ac_cache_corrupted=: ;;
306     ,);;
307     *)
308       if test "x$ac_old_val" != "x$ac_new_val"; then
309-        { echo "$as_me:1101: error: \`$ac_var' has changed since the previous run:" >&5
310+        { echo "$as_me:1103: error: \`$ac_var' has changed since the previous run:" >&5
311 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
312-        { echo "$as_me:1103:   former value:  $ac_old_val" >&5
313+        { echo "$as_me:1105:   former value:  $ac_old_val" >&5
314 echo "$as_me:   former value:  $ac_old_val" >&2;}
315-        { echo "$as_me:1105:   current value: $ac_new_val" >&5
316+        { echo "$as_me:1107:   current value: $ac_new_val" >&5
317 echo "$as_me:   current value: $ac_new_val" >&2;}
318         ac_cache_corrupted=:
319       fi;;
320@@ -1121,9 +1123,9 @@
321   fi
322 done
323 if $ac_cache_corrupted; then
324-  { echo "$as_me:1124: error: changes in the environment can compromise the build" >&5
325+  { echo "$as_me:1126: error: changes in the environment can compromise the build" >&5
326 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
327-  { { echo "$as_me:1126: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
328+  { { echo "$as_me:1128: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
329 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
330    { (exit 1); exit 1; }; }
331 fi
332@@ -1144,10 +1146,10 @@
333 echo "#! $SHELL" >conftest.sh
334 echo  "exit 0"   >>conftest.sh
335 chmod +x conftest.sh
336-if { (echo "$as_me:1147: PATH=\".;.\"; conftest.sh") >&5
337+if { (echo "$as_me:1149: PATH=\".;.\"; conftest.sh") >&5
338   (PATH=".;."; conftest.sh) 2>&5
339   ac_status=$?
340-  echo "$as_me:1150: \$? = $ac_status" >&5
341+  echo "$as_me:1152: \$? = $ac_status" >&5
342   (exit $ac_status); }; then
343   ac_path_separator=';'
344 else
345@@ -1160,7 +1162,7 @@
346
347 top_builddir=`pwd`
348
349-echo "$as_me:1163: checking for egrep" >&5
350+echo "$as_me:1165: checking for egrep" >&5
351 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
352 if test "${ac_cv_prog_egrep+set}" = set; then
353   echo $ECHO_N "(cached) $ECHO_C" >&6
354@@ -1170,11 +1172,11 @@
355 		else ac_cv_prog_egrep='egrep'
356 	fi
357 fi
358-echo "$as_me:1173: result: $ac_cv_prog_egrep" >&5
359+echo "$as_me:1175: result: $ac_cv_prog_egrep" >&5
360 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
361 	EGREP=$ac_cv_prog_egrep
362
363-	test -z "$EGREP" && { { echo "$as_me:1177: error: No egrep program found" >&5
364+	test -z "$EGREP" && { { echo "$as_me:1179: error: No egrep program found" >&5
365 echo "$as_me: error: No egrep program found" >&2;}
366    { (exit 1); exit 1; }; }
367
368@@ -1184,11 +1186,11 @@
369 cf_cv_abi_version=${NCURSES_MAJOR}
370 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
371 cf_cv_timestamp=`date`
372-echo "$as_me:1187: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
373+echo "$as_me:1189: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
374 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
375
376 if test -f $srcdir/VERSION ; then
377-	echo "$as_me:1191: checking for package version" >&5
378+	echo "$as_me:1193: checking for package version" >&5
379 echo $ECHO_N "checking for package version... $ECHO_C" >&6
380
381 	# if there are not enough fields, cut returns the last one...
382@@ -1200,39 +1202,39 @@
383 	VERSION="$cf_field1"
384
385 	VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'`
386-	test -z "$VERSION_MAJOR" && { { echo "$as_me:1203: error: missing major-version" >&5
387+	test -z "$VERSION_MAJOR" && { { echo "$as_me:1205: error: missing major-version" >&5
388 echo "$as_me: error: missing major-version" >&2;}
389    { (exit 1); exit 1; }; }
390
391 	VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'`
392-	test -z "$VERSION_MINOR" && { { echo "$as_me:1208: error: missing minor-version" >&5
393+	test -z "$VERSION_MINOR" && { { echo "$as_me:1210: error: missing minor-version" >&5
394 echo "$as_me: error: missing minor-version" >&2;}
395    { (exit 1); exit 1; }; }
396
397-	echo "$as_me:1212: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
398+	echo "$as_me:1214: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5
399 echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6
400
401-	echo "$as_me:1215: checking for package patch date" >&5
402+	echo "$as_me:1217: checking for package patch date" >&5
403 echo $ECHO_N "checking for package patch date... $ECHO_C" >&6
404 	VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'`
405 	case .$VERSION_PATCH in
406 	(.)
407-		{ { echo "$as_me:1220: error: missing patch-date $VERSION_PATCH" >&5
408+		{ { echo "$as_me:1222: error: missing patch-date $VERSION_PATCH" >&5
409 echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;}
410    { (exit 1); exit 1; }; }
411 		;;
412 	(.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9])
413 		;;
414 	(*)
415-		{ { echo "$as_me:1227: error: illegal patch-date $VERSION_PATCH" >&5
416+		{ { echo "$as_me:1229: error: illegal patch-date $VERSION_PATCH" >&5
417 echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;}
418    { (exit 1); exit 1; }; }
419 		;;
420 	esac
421-	echo "$as_me:1232: result: $VERSION_PATCH" >&5
422+	echo "$as_me:1234: result: $VERSION_PATCH" >&5
423 echo "${ECHO_T}$VERSION_PATCH" >&6
424 else
425-	{ { echo "$as_me:1235: error: did not find $srcdir/VERSION" >&5
426+	{ { echo "$as_me:1237: error: did not find $srcdir/VERSION" >&5
427 echo "$as_me: error: did not find $srcdir/VERSION" >&2;}
428    { (exit 1); exit 1; }; }
429 fi
430@@ -1240,19 +1242,19 @@
431 # show the actual data that we have for versions:
432 test -n "$verbose" && echo "	ABI VERSION $VERSION" 1>&6
433
434-echo "${as_me:-configure}:1243: testing ABI VERSION $VERSION ..." 1>&5
435+echo "${as_me:-configure}:1245: testing ABI VERSION $VERSION ..." 1>&5
436
437 test -n "$verbose" && echo "	VERSION_MAJOR $VERSION_MAJOR" 1>&6
438
439-echo "${as_me:-configure}:1247: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
440+echo "${as_me:-configure}:1249: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5
441
442 test -n "$verbose" && echo "	VERSION_MINOR $VERSION_MINOR" 1>&6
443
444-echo "${as_me:-configure}:1251: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
445+echo "${as_me:-configure}:1253: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5
446
447 test -n "$verbose" && echo "	VERSION_PATCH $VERSION_PATCH" 1>&6
448
449-echo "${as_me:-configure}:1255: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
450+echo "${as_me:-configure}:1257: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5
451
452 	cf_PACKAGE=NCURSES
453 	PACKAGE=ncurses
454@@ -1276,7 +1278,7 @@
455 # Check whether --with-rel-version or --without-rel-version was given.
456 if test "${with_rel_version+set}" = set; then
457   withval="$with_rel_version"
458-  { echo "$as_me:1279: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
459+  { echo "$as_me:1281: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
460 echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
461  cf_cv_rel_version=$withval
462 fi;
463@@ -1289,13 +1291,13 @@
464   ([0-9]*)
465  	;;
466   (*)
467-	{ { echo "$as_me:1292: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
468+	{ { echo "$as_me:1294: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
469 echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
470    { (exit 1); exit 1; }; }
471  	;;
472   esac
473 else
474-  { { echo "$as_me:1298: error: Release major-version value is empty" >&5
475+  { { echo "$as_me:1300: error: Release major-version value is empty" >&5
476 echo "$as_me: error: Release major-version value is empty" >&2;}
477    { (exit 1); exit 1; }; }
478 fi
479@@ -1305,13 +1307,13 @@
480   ([0-9]*)
481  	;;
482   (*)
483-	{ { echo "$as_me:1308: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
484+	{ { echo "$as_me:1310: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
485 echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
486    { (exit 1); exit 1; }; }
487  	;;
488   esac
489 else
490-  { { echo "$as_me:1314: error: Release minor-version value is empty" >&5
491+  { { echo "$as_me:1316: error: Release minor-version value is empty" >&5
492 echo "$as_me: error: Release minor-version value is empty" >&2;}
493    { (exit 1); exit 1; }; }
494 fi
495@@ -1324,7 +1326,7 @@
496
497 	if test "x$cf_cv_abi_version" != "x$withval"
498 	then
499-		{ echo "$as_me:1327: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
500+		{ echo "$as_me:1329: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
501 echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
502 		case $cf_cv_rel_version in
503 		(5.*)
504@@ -1343,13 +1345,13 @@
505   ([0-9]*)
506  	;;
507   (*)
508-	{ { echo "$as_me:1346: error: ABI version is not a number: $cf_cv_abi_version" >&5
509+	{ { echo "$as_me:1348: error: ABI version is not a number: $cf_cv_abi_version" >&5
510 echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
511    { (exit 1); exit 1; }; }
512  	;;
513   esac
514 else
515-  { { echo "$as_me:1352: error: ABI version value is empty" >&5
516+  { { echo "$as_me:1354: error: ABI version value is empty" >&5
517 echo "$as_me: error: ABI version value is empty" >&2;}
518    { (exit 1); exit 1; }; }
519 fi
520@@ -1380,7 +1382,7 @@
521   fi
522 done
523 if test -z "$ac_aux_dir"; then
524-  { { echo "$as_me:1383: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
525+  { { echo "$as_me:1385: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
526 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
527    { (exit 1); exit 1; }; }
528 fi
529@@ -1390,11 +1392,11 @@
530
531 # Make sure we can run config.sub.
532 $ac_config_sub sun4 >/dev/null 2>&1 ||
533-  { { echo "$as_me:1393: error: cannot run $ac_config_sub" >&5
534+  { { echo "$as_me:1395: error: cannot run $ac_config_sub" >&5
535 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
536    { (exit 1); exit 1; }; }
537
538-echo "$as_me:1397: checking build system type" >&5
539+echo "$as_me:1399: checking build system type" >&5
540 echo $ECHO_N "checking build system type... $ECHO_C" >&6
541 if test "${ac_cv_build+set}" = set; then
542   echo $ECHO_N "(cached) $ECHO_C" >&6
543@@ -1403,23 +1405,23 @@
544 test -z "$ac_cv_build_alias" &&
545   ac_cv_build_alias=`$ac_config_guess`
546 test -z "$ac_cv_build_alias" &&
547-  { { echo "$as_me:1406: error: cannot guess build type; you must specify one" >&5
548+  { { echo "$as_me:1408: error: cannot guess build type; you must specify one" >&5
549 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
550    { (exit 1); exit 1; }; }
551 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
552-  { { echo "$as_me:1410: error: $ac_config_sub $ac_cv_build_alias failed." >&5
553+  { { echo "$as_me:1412: error: $ac_config_sub $ac_cv_build_alias failed." >&5
554 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
555    { (exit 1); exit 1; }; }
556
557 fi
558-echo "$as_me:1415: result: $ac_cv_build" >&5
559+echo "$as_me:1417: result: $ac_cv_build" >&5
560 echo "${ECHO_T}$ac_cv_build" >&6
561 build=$ac_cv_build
562 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
563 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
564 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
565
566-echo "$as_me:1422: checking host system type" >&5
567+echo "$as_me:1424: checking host system type" >&5
568 echo $ECHO_N "checking host system type... $ECHO_C" >&6
569 if test "${ac_cv_host+set}" = set; then
570   echo $ECHO_N "(cached) $ECHO_C" >&6
571@@ -1428,12 +1430,12 @@
572 test -z "$ac_cv_host_alias" &&
573   ac_cv_host_alias=$ac_cv_build_alias
574 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
575-  { { echo "$as_me:1431: error: $ac_config_sub $ac_cv_host_alias failed" >&5
576+  { { echo "$as_me:1433: error: $ac_config_sub $ac_cv_host_alias failed" >&5
577 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
578    { (exit 1); exit 1; }; }
579
580 fi
581-echo "$as_me:1436: result: $ac_cv_host" >&5
582+echo "$as_me:1438: result: $ac_cv_host" >&5
583 echo "${ECHO_T}$ac_cv_host" >&6
584 host=$ac_cv_host
585 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
586@@ -1441,7 +1443,7 @@
587 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
588
589 if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
590-	echo "$as_me:1444: checking target system type" >&5
591+	echo "$as_me:1446: checking target system type" >&5
592 echo $ECHO_N "checking target system type... $ECHO_C" >&6
593 if test "${ac_cv_target+set}" = set; then
594   echo $ECHO_N "(cached) $ECHO_C" >&6
595@@ -1450,12 +1452,12 @@
596 test "x$ac_cv_target_alias" = "x" &&
597   ac_cv_target_alias=$ac_cv_host_alias
598 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
599-  { { echo "$as_me:1453: error: $ac_config_sub $ac_cv_target_alias failed" >&5
600+  { { echo "$as_me:1455: error: $ac_config_sub $ac_cv_target_alias failed" >&5
601 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
602    { (exit 1); exit 1; }; }
603
604 fi
605-echo "$as_me:1458: result: $ac_cv_target" >&5
606+echo "$as_me:1460: result: $ac_cv_target" >&5
607 echo "${ECHO_T}$ac_cv_target" >&6
608 target=$ac_cv_target
609 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
610@@ -1487,13 +1489,13 @@
611 fi
612
613 test -z "$system_name" && system_name="$cf_cv_system_name"
614-test -n "$cf_cv_system_name" && echo "$as_me:1490: result: Configuring for $cf_cv_system_name" >&5
615+test -n "$cf_cv_system_name" && echo "$as_me:1492: result: Configuring for $cf_cv_system_name" >&5
616 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
617
618 if test ".$system_name" != ".$cf_cv_system_name" ; then
619-	echo "$as_me:1494: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
620+	echo "$as_me:1496: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
621 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
622-	{ { echo "$as_me:1496: error: \"Please remove config.cache and try again.\"" >&5
623+	{ { echo "$as_me:1498: error: \"Please remove config.cache and try again.\"" >&5
624 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
625    { (exit 1); exit 1; }; }
626 fi
627@@ -1501,7 +1503,7 @@
628 # Check whether --with-system-type or --without-system-type was given.
629 if test "${with_system_type+set}" = set; then
630   withval="$with_system_type"
631-  { echo "$as_me:1504: WARNING: overriding system type to $withval" >&5
632+  { echo "$as_me:1506: WARNING: overriding system type to $withval" >&5
633 echo "$as_me: WARNING: overriding system type to $withval" >&2;}
634 	cf_cv_system_name=$withval
635 	host_os=$withval
636@@ -1513,7 +1515,7 @@
637
638 ###	Default install-location
639
640-echo "$as_me:1516: checking for prefix" >&5
641+echo "$as_me:1518: checking for prefix" >&5
642 echo $ECHO_N "checking for prefix... $ECHO_C" >&6
643 if test "x$prefix" = "xNONE" ; then
644 	case "$cf_cv_system_name" in
645@@ -1525,11 +1527,11 @@
646 		;;
647 	esac
648 fi
649-echo "$as_me:1528: result: $prefix" >&5
650+echo "$as_me:1530: result: $prefix" >&5
651 echo "${ECHO_T}$prefix" >&6
652
653 if test "x$prefix" = "xNONE" ; then
654-echo "$as_me:1532: checking for default include-directory" >&5
655+echo "$as_me:1534: checking for default include-directory" >&5
656 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
657 test -n "$verbose" && echo 1>&6
658 for cf_symbol in \
659@@ -1552,7 +1554,7 @@
660 	fi
661 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
662 done
663-echo "$as_me:1555: result: $includedir" >&5
664+echo "$as_me:1557: result: $includedir" >&5
665 echo "${ECHO_T}$includedir" >&6
666 fi
667
668@@ -1615,7 +1617,7 @@
669   do
670     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
671 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
672-echo "$as_me:1618: checking for $ac_word" >&5
673+echo "$as_me:1620: checking for $ac_word" >&5
674 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
675 if test "${ac_cv_prog_CC+set}" = set; then
676   echo $ECHO_N "(cached) $ECHO_C" >&6
677@@ -1630,7 +1632,7 @@
678   test -z "$ac_dir" && ac_dir=.
679   $as_executable_p "$ac_dir/$ac_word" || continue
680 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
681-echo "$as_me:1633: found $ac_dir/$ac_word" >&5
682+echo "$as_me:1635: found $ac_dir/$ac_word" >&5
683 break
684 done
685
686@@ -1638,10 +1640,10 @@
687 fi
688 CC=$ac_cv_prog_CC
689 if test -n "$CC"; then
690-  echo "$as_me:1641: result: $CC" >&5
691+  echo "$as_me:1643: result: $CC" >&5
692 echo "${ECHO_T}$CC" >&6
693 else
694-  echo "$as_me:1644: result: no" >&5
695+  echo "$as_me:1646: result: no" >&5
696 echo "${ECHO_T}no" >&6
697 fi
698
699@@ -1654,7 +1656,7 @@
700 do
701   # Extract the first word of "$ac_prog", so it can be a program name with args.
702 set dummy $ac_prog; ac_word=$2
703-echo "$as_me:1657: checking for $ac_word" >&5
704+echo "$as_me:1659: checking for $ac_word" >&5
705 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
706 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
707   echo $ECHO_N "(cached) $ECHO_C" >&6
708@@ -1669,7 +1671,7 @@
709   test -z "$ac_dir" && ac_dir=.
710   $as_executable_p "$ac_dir/$ac_word" || continue
711 ac_cv_prog_ac_ct_CC="$ac_prog"
712-echo "$as_me:1672: found $ac_dir/$ac_word" >&5
713+echo "$as_me:1674: found $ac_dir/$ac_word" >&5
714 break
715 done
716
717@@ -1677,10 +1679,10 @@
718 fi
719 ac_ct_CC=$ac_cv_prog_ac_ct_CC
720 if test -n "$ac_ct_CC"; then
721-  echo "$as_me:1680: result: $ac_ct_CC" >&5
722+  echo "$as_me:1682: result: $ac_ct_CC" >&5
723 echo "${ECHO_T}$ac_ct_CC" >&6
724 else
725-  echo "$as_me:1683: result: no" >&5
726+  echo "$as_me:1685: result: no" >&5
727 echo "${ECHO_T}no" >&6
728 fi
729
730@@ -1690,32 +1692,32 @@
731   CC=$ac_ct_CC
732 fi
733
734-test -z "$CC" && { { echo "$as_me:1693: error: no acceptable cc found in \$PATH" >&5
735+test -z "$CC" && { { echo "$as_me:1695: error: no acceptable cc found in \$PATH" >&5
736 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
737    { (exit 1); exit 1; }; }
738
739 # Provide some information about the compiler.
740-echo "$as_me:1698:" \
741+echo "$as_me:1700:" \
742      "checking for C compiler version" >&5
743 ac_compiler=`set X $ac_compile; echo $2`
744-{ (eval echo "$as_me:1701: \"$ac_compiler --version </dev/null >&5\"") >&5
745+{ (eval echo "$as_me:1703: \"$ac_compiler --version </dev/null >&5\"") >&5
746   (eval $ac_compiler --version </dev/null >&5) 2>&5
747   ac_status=$?
748-  echo "$as_me:1704: \$? = $ac_status" >&5
749+  echo "$as_me:1706: \$? = $ac_status" >&5
750   (exit $ac_status); }
751-{ (eval echo "$as_me:1706: \"$ac_compiler -v </dev/null >&5\"") >&5
752+{ (eval echo "$as_me:1708: \"$ac_compiler -v </dev/null >&5\"") >&5
753   (eval $ac_compiler -v </dev/null >&5) 2>&5
754   ac_status=$?
755-  echo "$as_me:1709: \$? = $ac_status" >&5
756+  echo "$as_me:1711: \$? = $ac_status" >&5
757   (exit $ac_status); }
758-{ (eval echo "$as_me:1711: \"$ac_compiler -V </dev/null >&5\"") >&5
759+{ (eval echo "$as_me:1713: \"$ac_compiler -V </dev/null >&5\"") >&5
760   (eval $ac_compiler -V </dev/null >&5) 2>&5
761   ac_status=$?
762-  echo "$as_me:1714: \$? = $ac_status" >&5
763+  echo "$as_me:1716: \$? = $ac_status" >&5
764   (exit $ac_status); }
765
766 cat >conftest.$ac_ext <<_ACEOF
767-#line 1718 "configure"
768+#line 1720 "configure"
769 #include "confdefs.h"
770
771 int
772@@ -1731,13 +1733,13 @@
773 # Try to create an executable without -o first, disregard a.out.
774 # It will help us diagnose broken compilers, and finding out an intuition
775 # of exeext.
776-echo "$as_me:1734: checking for C compiler default output" >&5
777+echo "$as_me:1736: checking for C compiler default output" >&5
778 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
779 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
780-if { (eval echo "$as_me:1737: \"$ac_link_default\"") >&5
781+if { (eval echo "$as_me:1739: \"$ac_link_default\"") >&5
782   (eval $ac_link_default) 2>&5
783   ac_status=$?
784-  echo "$as_me:1740: \$? = $ac_status" >&5
785+  echo "$as_me:1742: \$? = $ac_status" >&5
786   (exit $ac_status); }; then
787   # Find the output, starting from the most likely.  This scheme is
788 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
789@@ -1760,34 +1762,34 @@
790 else
791   echo "$as_me: failed program was:" >&5
792 cat conftest.$ac_ext >&5
793-{ { echo "$as_me:1763: error: C compiler cannot create executables" >&5
794+{ { echo "$as_me:1765: error: C compiler cannot create executables" >&5
795 echo "$as_me: error: C compiler cannot create executables" >&2;}
796    { (exit 77); exit 77; }; }
797 fi
798
799 ac_exeext=$ac_cv_exeext
800-echo "$as_me:1769: result: $ac_file" >&5
801+echo "$as_me:1771: result: $ac_file" >&5
802 echo "${ECHO_T}$ac_file" >&6
803
804 # Check the compiler produces executables we can run.  If not, either
805 # the compiler is broken, or we cross compile.
806-echo "$as_me:1774: checking whether the C compiler works" >&5
807+echo "$as_me:1776: checking whether the C compiler works" >&5
808 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
809 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
810 # If not cross compiling, check that we can run a simple program.
811 if test "$cross_compiling" != yes; then
812   if { ac_try='./$ac_file'
813-  { (eval echo "$as_me:1780: \"$ac_try\"") >&5
814+  { (eval echo "$as_me:1782: \"$ac_try\"") >&5
815   (eval $ac_try) 2>&5
816   ac_status=$?
817-  echo "$as_me:1783: \$? = $ac_status" >&5
818+  echo "$as_me:1785: \$? = $ac_status" >&5
819   (exit $ac_status); }; }; then
820     cross_compiling=no
821   else
822     if test "$cross_compiling" = maybe; then
823 	cross_compiling=yes
824     else
825-	{ { echo "$as_me:1790: error: cannot run C compiled programs.
826+	{ { echo "$as_me:1792: error: cannot run C compiled programs.
827 If you meant to cross compile, use \`--host'." >&5
828 echo "$as_me: error: cannot run C compiled programs.
829 If you meant to cross compile, use \`--host'." >&2;}
830@@ -1795,24 +1797,24 @@
831     fi
832   fi
833 fi
834-echo "$as_me:1798: result: yes" >&5
835+echo "$as_me:1800: result: yes" >&5
836 echo "${ECHO_T}yes" >&6
837
838 rm -f a.out a.exe conftest$ac_cv_exeext
839 ac_clean_files=$ac_clean_files_save
840 # Check the compiler produces executables we can run.  If not, either
841 # the compiler is broken, or we cross compile.
842-echo "$as_me:1805: checking whether we are cross compiling" >&5
843+echo "$as_me:1807: checking whether we are cross compiling" >&5
844 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
845-echo "$as_me:1807: result: $cross_compiling" >&5
846+echo "$as_me:1809: result: $cross_compiling" >&5
847 echo "${ECHO_T}$cross_compiling" >&6
848
849-echo "$as_me:1810: checking for executable suffix" >&5
850+echo "$as_me:1812: checking for executable suffix" >&5
851 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
852-if { (eval echo "$as_me:1812: \"$ac_link\"") >&5
853+if { (eval echo "$as_me:1814: \"$ac_link\"") >&5
854   (eval $ac_link) 2>&5
855   ac_status=$?
856-  echo "$as_me:1815: \$? = $ac_status" >&5
857+  echo "$as_me:1817: \$? = $ac_status" >&5
858   (exit $ac_status); }; then
859   # If both `conftest.exe' and `conftest' are `present' (well, observable)
860 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
861@@ -1828,25 +1830,25 @@
862   esac
863 done
864 else
865-  { { echo "$as_me:1831: error: cannot compute EXEEXT: cannot compile and link" >&5
866+  { { echo "$as_me:1833: error: cannot compute EXEEXT: cannot compile and link" >&5
867 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
868    { (exit 1); exit 1; }; }
869 fi
870
871 rm -f conftest$ac_cv_exeext
872-echo "$as_me:1837: result: $ac_cv_exeext" >&5
873+echo "$as_me:1839: result: $ac_cv_exeext" >&5
874 echo "${ECHO_T}$ac_cv_exeext" >&6
875
876 rm -f conftest.$ac_ext
877 EXEEXT=$ac_cv_exeext
878 ac_exeext=$EXEEXT
879-echo "$as_me:1843: checking for object suffix" >&5
880+echo "$as_me:1845: checking for object suffix" >&5
881 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
882 if test "${ac_cv_objext+set}" = set; then
883   echo $ECHO_N "(cached) $ECHO_C" >&6
884 else
885   cat >conftest.$ac_ext <<_ACEOF
886-#line 1849 "configure"
887+#line 1851 "configure"
888 #include "confdefs.h"
889
890 int
891@@ -1858,10 +1860,10 @@
892 }
893 _ACEOF
894 rm -f conftest.o conftest.obj
895-if { (eval echo "$as_me:1861: \"$ac_compile\"") >&5
896+if { (eval echo "$as_me:1863: \"$ac_compile\"") >&5
897   (eval $ac_compile) 2>&5
898   ac_status=$?
899-  echo "$as_me:1864: \$? = $ac_status" >&5
900+  echo "$as_me:1866: \$? = $ac_status" >&5
901   (exit $ac_status); }; then
902   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
903   case $ac_file in
904@@ -1873,24 +1875,24 @@
905 else
906   echo "$as_me: failed program was:" >&5
907 cat conftest.$ac_ext >&5
908-{ { echo "$as_me:1876: error: cannot compute OBJEXT: cannot compile" >&5
909+{ { echo "$as_me:1878: error: cannot compute OBJEXT: cannot compile" >&5
910 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
911    { (exit 1); exit 1; }; }
912 fi
913
914 rm -f conftest.$ac_cv_objext conftest.$ac_ext
915 fi
916-echo "$as_me:1883: result: $ac_cv_objext" >&5
917+echo "$as_me:1885: result: $ac_cv_objext" >&5
918 echo "${ECHO_T}$ac_cv_objext" >&6
919 OBJEXT=$ac_cv_objext
920 ac_objext=$OBJEXT
921-echo "$as_me:1887: checking whether we are using the GNU C compiler" >&5
922+echo "$as_me:1889: checking whether we are using the GNU C compiler" >&5
923 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
924 if test "${ac_cv_c_compiler_gnu+set}" = set; then
925   echo $ECHO_N "(cached) $ECHO_C" >&6
926 else
927   cat >conftest.$ac_ext <<_ACEOF
928-#line 1893 "configure"
929+#line 1895 "configure"
930 #include "confdefs.h"
931
932 int
933@@ -1905,16 +1907,16 @@
934 }
935 _ACEOF
936 rm -f conftest.$ac_objext
937-if { (eval echo "$as_me:1908: \"$ac_compile\"") >&5
938+if { (eval echo "$as_me:1910: \"$ac_compile\"") >&5
939   (eval $ac_compile) 2>&5
940   ac_status=$?
941-  echo "$as_me:1911: \$? = $ac_status" >&5
942+  echo "$as_me:1913: \$? = $ac_status" >&5
943   (exit $ac_status); } &&
944          { ac_try='test -s conftest.$ac_objext'
945-  { (eval echo "$as_me:1914: \"$ac_try\"") >&5
946+  { (eval echo "$as_me:1916: \"$ac_try\"") >&5
947   (eval $ac_try) 2>&5
948   ac_status=$?
949-  echo "$as_me:1917: \$? = $ac_status" >&5
950+  echo "$as_me:1919: \$? = $ac_status" >&5
951   (exit $ac_status); }; }; then
952   ac_compiler_gnu=yes
953 else
954@@ -1926,19 +1928,19 @@
955 ac_cv_c_compiler_gnu=$ac_compiler_gnu
956
957 fi
958-echo "$as_me:1929: result: $ac_cv_c_compiler_gnu" >&5
959+echo "$as_me:1931: result: $ac_cv_c_compiler_gnu" >&5
960 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
961 GCC=`test $ac_compiler_gnu = yes && echo yes`
962 ac_test_CFLAGS=${CFLAGS+set}
963 ac_save_CFLAGS=$CFLAGS
964 CFLAGS="-g"
965-echo "$as_me:1935: checking whether $CC accepts -g" >&5
966+echo "$as_me:1937: checking whether $CC accepts -g" >&5
967 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
968 if test "${ac_cv_prog_cc_g+set}" = set; then
969   echo $ECHO_N "(cached) $ECHO_C" >&6
970 else
971   cat >conftest.$ac_ext <<_ACEOF
972-#line 1941 "configure"
973+#line 1943 "configure"
974 #include "confdefs.h"
975
976 int
977@@ -1950,16 +1952,16 @@
978 }
979 _ACEOF
980 rm -f conftest.$ac_objext
981-if { (eval echo "$as_me:1953: \"$ac_compile\"") >&5
982+if { (eval echo "$as_me:1955: \"$ac_compile\"") >&5
983   (eval $ac_compile) 2>&5
984   ac_status=$?
985-  echo "$as_me:1956: \$? = $ac_status" >&5
986+  echo "$as_me:1958: \$? = $ac_status" >&5
987   (exit $ac_status); } &&
988          { ac_try='test -s conftest.$ac_objext'
989-  { (eval echo "$as_me:1959: \"$ac_try\"") >&5
990+  { (eval echo "$as_me:1961: \"$ac_try\"") >&5
991   (eval $ac_try) 2>&5
992   ac_status=$?
993-  echo "$as_me:1962: \$? = $ac_status" >&5
994+  echo "$as_me:1964: \$? = $ac_status" >&5
995   (exit $ac_status); }; }; then
996   ac_cv_prog_cc_g=yes
997 else
998@@ -1969,7 +1971,7 @@
999 fi
1000 rm -f conftest.$ac_objext conftest.$ac_ext
1001 fi
1002-echo "$as_me:1972: result: $ac_cv_prog_cc_g" >&5
1003+echo "$as_me:1974: result: $ac_cv_prog_cc_g" >&5
1004 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
1005 if test "$ac_test_CFLAGS" = set; then
1006   CFLAGS=$ac_save_CFLAGS
1007@@ -1996,16 +1998,16 @@
1008 #endif
1009 _ACEOF
1010 rm -f conftest.$ac_objext
1011-if { (eval echo "$as_me:1999: \"$ac_compile\"") >&5
1012+if { (eval echo "$as_me:2001: \"$ac_compile\"") >&5
1013   (eval $ac_compile) 2>&5
1014   ac_status=$?
1015-  echo "$as_me:2002: \$? = $ac_status" >&5
1016+  echo "$as_me:2004: \$? = $ac_status" >&5
1017   (exit $ac_status); } &&
1018          { ac_try='test -s conftest.$ac_objext'
1019-  { (eval echo "$as_me:2005: \"$ac_try\"") >&5
1020+  { (eval echo "$as_me:2007: \"$ac_try\"") >&5
1021   (eval $ac_try) 2>&5
1022   ac_status=$?
1023-  echo "$as_me:2008: \$? = $ac_status" >&5
1024+  echo "$as_me:2010: \$? = $ac_status" >&5
1025   (exit $ac_status); }; }; then
1026   for ac_declaration in \
1027    ''\
1028@@ -2017,7 +2019,7 @@
1029    'void exit (int);'
1030 do
1031   cat >conftest.$ac_ext <<_ACEOF
1032-#line 2020 "configure"
1033+#line 2022 "configure"
1034 #include "confdefs.h"
1035 #include <stdlib.h>
1036 $ac_declaration
1037@@ -2030,16 +2032,16 @@
1038 }
1039 _ACEOF
1040 rm -f conftest.$ac_objext
1041-if { (eval echo "$as_me:2033: \"$ac_compile\"") >&5
1042+if { (eval echo "$as_me:2035: \"$ac_compile\"") >&5
1043   (eval $ac_compile) 2>&5
1044   ac_status=$?
1045-  echo "$as_me:2036: \$? = $ac_status" >&5
1046+  echo "$as_me:2038: \$? = $ac_status" >&5
1047   (exit $ac_status); } &&
1048          { ac_try='test -s conftest.$ac_objext'
1049-  { (eval echo "$as_me:2039: \"$ac_try\"") >&5
1050+  { (eval echo "$as_me:2041: \"$ac_try\"") >&5
1051   (eval $ac_try) 2>&5
1052   ac_status=$?
1053-  echo "$as_me:2042: \$? = $ac_status" >&5
1054+  echo "$as_me:2044: \$? = $ac_status" >&5
1055   (exit $ac_status); }; }; then
1056   :
1057 else
1058@@ -2049,7 +2051,7 @@
1059 fi
1060 rm -f conftest.$ac_objext conftest.$ac_ext
1061   cat >conftest.$ac_ext <<_ACEOF
1062-#line 2052 "configure"
1063+#line 2054 "configure"
1064 #include "confdefs.h"
1065 $ac_declaration
1066 int
1067@@ -2061,16 +2063,16 @@
1068 }
1069 _ACEOF
1070 rm -f conftest.$ac_objext
1071-if { (eval echo "$as_me:2064: \"$ac_compile\"") >&5
1072+if { (eval echo "$as_me:2066: \"$ac_compile\"") >&5
1073   (eval $ac_compile) 2>&5
1074   ac_status=$?
1075-  echo "$as_me:2067: \$? = $ac_status" >&5
1076+  echo "$as_me:2069: \$? = $ac_status" >&5
1077   (exit $ac_status); } &&
1078          { ac_try='test -s conftest.$ac_objext'
1079-  { (eval echo "$as_me:2070: \"$ac_try\"") >&5
1080+  { (eval echo "$as_me:2072: \"$ac_try\"") >&5
1081   (eval $ac_try) 2>&5
1082   ac_status=$?
1083-  echo "$as_me:2073: \$? = $ac_status" >&5
1084+  echo "$as_me:2075: \$? = $ac_status" >&5
1085   (exit $ac_status); }; }; then
1086   break
1087 else
1088@@ -2100,15 +2102,15 @@
1089
1090 GCC_VERSION=none
1091 if test "$GCC" = yes ; then
1092-	echo "$as_me:2103: checking version of $CC" >&5
1093+	echo "$as_me:2105: checking version of $CC" >&5
1094 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
1095 	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
1096 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
1097-	echo "$as_me:2107: result: $GCC_VERSION" >&5
1098+	echo "$as_me:2109: result: $GCC_VERSION" >&5
1099 echo "${ECHO_T}$GCC_VERSION" >&6
1100 fi
1101
1102-echo "$as_me:2111: checking for $CC option to accept ANSI C" >&5
1103+echo "$as_me:2113: checking for $CC option to accept ANSI C" >&5
1104 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
1105 if test "${ac_cv_prog_cc_stdc+set}" = set; then
1106   echo $ECHO_N "(cached) $ECHO_C" >&6
1107@@ -2116,7 +2118,7 @@
1108   ac_cv_prog_cc_stdc=no
1109 ac_save_CC=$CC
1110 cat >conftest.$ac_ext <<_ACEOF
1111-#line 2119 "configure"
1112+#line 2121 "configure"
1113 #include "confdefs.h"
1114 #include <stdarg.h>
1115 #include <stdio.h>
1116@@ -2165,16 +2167,16 @@
1117 do
1118   CC="$ac_save_CC $ac_arg"
1119   rm -f conftest.$ac_objext
1120-if { (eval echo "$as_me:2168: \"$ac_compile\"") >&5
1121+if { (eval echo "$as_me:2170: \"$ac_compile\"") >&5
1122   (eval $ac_compile) 2>&5
1123   ac_status=$?
1124-  echo "$as_me:2171: \$? = $ac_status" >&5
1125+  echo "$as_me:2173: \$? = $ac_status" >&5
1126   (exit $ac_status); } &&
1127          { ac_try='test -s conftest.$ac_objext'
1128-  { (eval echo "$as_me:2174: \"$ac_try\"") >&5
1129+  { (eval echo "$as_me:2176: \"$ac_try\"") >&5
1130   (eval $ac_try) 2>&5
1131   ac_status=$?
1132-  echo "$as_me:2177: \$? = $ac_status" >&5
1133+  echo "$as_me:2179: \$? = $ac_status" >&5
1134   (exit $ac_status); }; }; then
1135   ac_cv_prog_cc_stdc=$ac_arg
1136 break
1137@@ -2191,10 +2193,10 @@
1138
1139 case "x$ac_cv_prog_cc_stdc" in
1140   x|xno)
1141-    echo "$as_me:2194: result: none needed" >&5
1142+    echo "$as_me:2196: result: none needed" >&5
1143 echo "${ECHO_T}none needed" >&6 ;;
1144   *)
1145-    echo "$as_me:2197: result: $ac_cv_prog_cc_stdc" >&5
1146+    echo "$as_me:2199: result: $ac_cv_prog_cc_stdc" >&5
1147 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
1148     CC="$CC $ac_cv_prog_cc_stdc" ;;
1149 esac
1150@@ -2202,13 +2204,13 @@
1151 # This should have been defined by AC_PROG_CC
1152 : ${CC:=cc}
1153
1154-echo "$as_me:2205: checking \$CFLAGS variable" >&5
1155+echo "$as_me:2207: checking \$CFLAGS variable" >&5
1156 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
1157 case "x$CFLAGS" in
1158 (*-[IUD]*)
1159-	echo "$as_me:2209: result: broken" >&5
1160+	echo "$as_me:2211: result: broken" >&5
1161 echo "${ECHO_T}broken" >&6
1162-	{ echo "$as_me:2211: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
1163+	{ echo "$as_me:2213: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
1164 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
1165 	cf_flags="$CFLAGS"
1166 	CFLAGS=
1167@@ -2316,18 +2318,18 @@
1168 	done
1169 	;;
1170 (*)
1171-	echo "$as_me:2319: result: ok" >&5
1172+	echo "$as_me:2321: result: ok" >&5
1173 echo "${ECHO_T}ok" >&6
1174 	;;
1175 esac
1176
1177-echo "$as_me:2324: checking \$CC variable" >&5
1178+echo "$as_me:2326: checking \$CC variable" >&5
1179 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
1180 case "$CC" in
1181 (*[\ \	]-*)
1182-	echo "$as_me:2328: result: broken" >&5
1183+	echo "$as_me:2330: result: broken" >&5
1184 echo "${ECHO_T}broken" >&6
1185-	{ echo "$as_me:2330: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
1186+	{ echo "$as_me:2332: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
1187 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
1188 	# humor him...
1189 	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
1190@@ -2444,19 +2446,19 @@
1191 	done
1192 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
1193
1194-echo "${as_me:-configure}:2447: testing resulting CC: '$CC' ..." 1>&5
1195+echo "${as_me:-configure}:2449: testing resulting CC: '$CC' ..." 1>&5
1196
1197 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
1198
1199-echo "${as_me:-configure}:2451: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
1200+echo "${as_me:-configure}:2453: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
1201
1202 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
1203
1204-echo "${as_me:-configure}:2455: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
1205+echo "${as_me:-configure}:2457: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
1206
1207 	;;
1208 (*)
1209-	echo "$as_me:2459: result: ok" >&5
1210+	echo "$as_me:2461: result: ok" >&5
1211 echo "${ECHO_T}ok" >&6
1212 	;;
1213 esac
1214@@ -2467,7 +2469,7 @@
1215 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1216 ac_compiler_gnu=$ac_cv_c_compiler_gnu
1217 ac_main_return=return
1218-echo "$as_me:2470: checking how to run the C preprocessor" >&5
1219+echo "$as_me:2472: checking how to run the C preprocessor" >&5
1220 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
1221 # On Suns, sometimes $CPP names a directory.
1222 if test -n "$CPP" && test -d "$CPP"; then
1223@@ -2488,18 +2490,18 @@
1224   # On the NeXT, cc -E runs the code through the compiler's parser,
1225   # not just through cpp. "Syntax error" is here to catch this case.
1226   cat >conftest.$ac_ext <<_ACEOF
1227-#line 2491 "configure"
1228+#line 2493 "configure"
1229 #include "confdefs.h"
1230 #include <assert.h>
1231                      Syntax error
1232 _ACEOF
1233-if { (eval echo "$as_me:2496: \"$ac_cpp conftest.$ac_ext\"") >&5
1234+if { (eval echo "$as_me:2498: \"$ac_cpp conftest.$ac_ext\"") >&5
1235   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
1236   ac_status=$?
1237   egrep -v '^ *\+' conftest.er1 >conftest.err
1238   rm -f conftest.er1
1239   cat conftest.err >&5
1240-  echo "$as_me:2502: \$? = $ac_status" >&5
1241+  echo "$as_me:2504: \$? = $ac_status" >&5
1242   (exit $ac_status); } >/dev/null; then
1243   if test -s conftest.err; then
1244     ac_cpp_err=$ac_c_preproc_warn_flag
1245@@ -2522,17 +2524,17 @@
1246   # OK, works on sane cases.  Now check whether non-existent headers
1247   # can be detected and how.
1248   cat >conftest.$ac_ext <<_ACEOF
1249-#line 2525 "configure"
1250+#line 2527 "configure"
1251 #include "confdefs.h"
1252 #include <ac_nonexistent.h>
1253 _ACEOF
1254-if { (eval echo "$as_me:2529: \"$ac_cpp conftest.$ac_ext\"") >&5
1255+if { (eval echo "$as_me:2531: \"$ac_cpp conftest.$ac_ext\"") >&5
1256   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
1257   ac_status=$?
1258   egrep -v '^ *\+' conftest.er1 >conftest.err
1259   rm -f conftest.er1
1260   cat conftest.err >&5
1261-  echo "$as_me:2535: \$? = $ac_status" >&5
1262+  echo "$as_me:2537: \$? = $ac_status" >&5
1263   (exit $ac_status); } >/dev/null; then
1264   if test -s conftest.err; then
1265     ac_cpp_err=$ac_c_preproc_warn_flag
1266@@ -2569,7 +2571,7 @@
1267 else
1268   ac_cv_prog_CPP=$CPP
1269 fi
1270-echo "$as_me:2572: result: $CPP" >&5
1271+echo "$as_me:2574: result: $CPP" >&5
1272 echo "${ECHO_T}$CPP" >&6
1273 ac_preproc_ok=false
1274 for ac_c_preproc_warn_flag in '' yes
1275@@ -2579,18 +2581,18 @@
1276   # On the NeXT, cc -E runs the code through the compiler's parser,
1277   # not just through cpp. "Syntax error" is here to catch this case.
1278   cat >conftest.$ac_ext <<_ACEOF
1279-#line 2582 "configure"
1280+#line 2584 "configure"
1281 #include "confdefs.h"
1282 #include <assert.h>
1283                      Syntax error
1284 _ACEOF
1285-if { (eval echo "$as_me:2587: \"$ac_cpp conftest.$ac_ext\"") >&5
1286+if { (eval echo "$as_me:2589: \"$ac_cpp conftest.$ac_ext\"") >&5
1287   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
1288   ac_status=$?
1289   egrep -v '^ *\+' conftest.er1 >conftest.err
1290   rm -f conftest.er1
1291   cat conftest.err >&5
1292-  echo "$as_me:2593: \$? = $ac_status" >&5
1293+  echo "$as_me:2595: \$? = $ac_status" >&5
1294   (exit $ac_status); } >/dev/null; then
1295   if test -s conftest.err; then
1296     ac_cpp_err=$ac_c_preproc_warn_flag
1297@@ -2613,17 +2615,17 @@
1298   # OK, works on sane cases.  Now check whether non-existent headers
1299   # can be detected and how.
1300   cat >conftest.$ac_ext <<_ACEOF
1301-#line 2616 "configure"
1302+#line 2618 "configure"
1303 #include "confdefs.h"
1304 #include <ac_nonexistent.h>
1305 _ACEOF
1306-if { (eval echo "$as_me:2620: \"$ac_cpp conftest.$ac_ext\"") >&5
1307+if { (eval echo "$as_me:2622: \"$ac_cpp conftest.$ac_ext\"") >&5
1308   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
1309   ac_status=$?
1310   egrep -v '^ *\+' conftest.er1 >conftest.err
1311   rm -f conftest.er1
1312   cat conftest.err >&5
1313-  echo "$as_me:2626: \$? = $ac_status" >&5
1314+  echo "$as_me:2628: \$? = $ac_status" >&5
1315   (exit $ac_status); } >/dev/null; then
1316   if test -s conftest.err; then
1317     ac_cpp_err=$ac_c_preproc_warn_flag
1318@@ -2651,7 +2653,7 @@
1319 if $ac_preproc_ok; then
1320   :
1321 else
1322-  { { echo "$as_me:2654: error: C preprocessor \"$CPP\" fails sanity check" >&5
1323+  { { echo "$as_me:2656: error: C preprocessor \"$CPP\" fails sanity check" >&5
1324 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
1325    { (exit 1); exit 1; }; }
1326 fi
1327@@ -2664,14 +2666,14 @@
1328 ac_main_return=return
1329
1330 if test $ac_cv_c_compiler_gnu = yes; then
1331-    echo "$as_me:2667: checking whether $CC needs -traditional" >&5
1332+    echo "$as_me:2669: checking whether $CC needs -traditional" >&5
1333 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
1334 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
1335   echo $ECHO_N "(cached) $ECHO_C" >&6
1336 else
1337     ac_pattern="Autoconf.*'x'"
1338   cat >conftest.$ac_ext <<_ACEOF
1339-#line 2674 "configure"
1340+#line 2676 "configure"
1341 #include "confdefs.h"
1342 #include <sgtty.h>
1343 int Autoconf = TIOCGETP;
1344@@ -2686,7 +2688,7 @@
1345
1346   if test $ac_cv_prog_gcc_traditional = no; then
1347     cat >conftest.$ac_ext <<_ACEOF
1348-#line 2689 "configure"
1349+#line 2691 "configure"
1350 #include "confdefs.h"
1351 #include <termio.h>
1352 int Autoconf = TCGETA;
1353@@ -2699,14 +2701,14 @@
1354
1355   fi
1356 fi
1357-echo "$as_me:2702: result: $ac_cv_prog_gcc_traditional" >&5
1358+echo "$as_me:2704: result: $ac_cv_prog_gcc_traditional" >&5
1359 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
1360   if test $ac_cv_prog_gcc_traditional = yes; then
1361     CC="$CC -traditional"
1362   fi
1363 fi
1364
1365-echo "$as_me:2709: checking whether $CC understands -c and -o together" >&5
1366+echo "$as_me:2711: checking whether $CC understands -c and -o together" >&5
1367 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
1368 if test "${cf_cv_prog_CC_c_o+set}" = set; then
1369   echo $ECHO_N "(cached) $ECHO_C" >&6
1370@@ -2721,15 +2723,15 @@
1371 # We do the test twice because some compilers refuse to overwrite an
1372 # existing .o file with -o, though they will create one.
1373 ac_try='$CC $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
1374-if { (eval echo "$as_me:2724: \"$ac_try\"") >&5
1375+if { (eval echo "$as_me:2726: \"$ac_try\"") >&5
1376   (eval $ac_try) 2>&5
1377   ac_status=$?
1378-  echo "$as_me:2727: \$? = $ac_status" >&5
1379+  echo "$as_me:2729: \$? = $ac_status" >&5
1380   (exit $ac_status); } &&
1381-  test -f conftest2.$ac_objext && { (eval echo "$as_me:2729: \"$ac_try\"") >&5
1382+  test -f conftest2.$ac_objext && { (eval echo "$as_me:2731: \"$ac_try\"") >&5
1383   (eval $ac_try) 2>&5
1384   ac_status=$?
1385-  echo "$as_me:2732: \$? = $ac_status" >&5
1386+  echo "$as_me:2734: \$? = $ac_status" >&5
1387   (exit $ac_status); };
1388 then
1389   eval cf_cv_prog_CC_c_o=yes
1390@@ -2740,10 +2742,10 @@
1391
1392 fi
1393 if test $cf_cv_prog_CC_c_o = yes; then
1394-  echo "$as_me:2743: result: yes" >&5
1395+  echo "$as_me:2745: result: yes" >&5
1396 echo "${ECHO_T}yes" >&6
1397 else
1398-  echo "$as_me:2746: result: no" >&5
1399+  echo "$as_me:2748: result: no" >&5
1400 echo "${ECHO_T}no" >&6
1401 fi
1402
1403@@ -2757,7 +2759,7 @@
1404 	(*) LDPATH=$PATH:/sbin:/usr/sbin
1405 		# Extract the first word of "ldconfig", so it can be a program name with args.
1406 set dummy ldconfig; ac_word=$2
1407-echo "$as_me:2760: checking for $ac_word" >&5
1408+echo "$as_me:2762: checking for $ac_word" >&5
1409 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1410 if test "${ac_cv_path_LDCONFIG+set}" = set; then
1411   echo $ECHO_N "(cached) $ECHO_C" >&6
1412@@ -2774,7 +2776,7 @@
1413   test -z "$ac_dir" && ac_dir=.
1414   if $as_executable_p "$ac_dir/$ac_word"; then
1415    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
1416-   echo "$as_me:2777: found $ac_dir/$ac_word" >&5
1417+   echo "$as_me:2779: found $ac_dir/$ac_word" >&5
1418    break
1419 fi
1420 done
1421@@ -2785,10 +2787,10 @@
1422 LDCONFIG=$ac_cv_path_LDCONFIG
1423
1424 if test -n "$LDCONFIG"; then
1425-  echo "$as_me:2788: result: $LDCONFIG" >&5
1426+  echo "$as_me:2790: result: $LDCONFIG" >&5
1427 echo "${ECHO_T}$LDCONFIG" >&6
1428 else
1429-  echo "$as_me:2791: result: no" >&5
1430+  echo "$as_me:2793: result: no" >&5
1431 echo "${ECHO_T}no" >&6
1432 fi
1433
1434@@ -2796,7 +2798,7 @@
1435 	esac
1436 fi
1437
1438-echo "$as_me:2799: checking if you want to ensure bool is consistent with C++" >&5
1439+echo "$as_me:2801: checking if you want to ensure bool is consistent with C++" >&5
1440 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
1441
1442 # Check whether --with-cxx or --without-cxx was given.
1443@@ -2806,7 +2808,7 @@
1444 else
1445   cf_with_cxx=yes
1446 fi;
1447-echo "$as_me:2809: result: $cf_with_cxx" >&5
1448+echo "$as_me:2811: result: $cf_with_cxx" >&5
1449 echo "${ECHO_T}$cf_with_cxx" >&6
1450 if test "X$cf_with_cxx" = Xno ; then
1451 	CXX=""
1452@@ -2824,7 +2826,7 @@
1453   do
1454     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1455 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1456-echo "$as_me:2827: checking for $ac_word" >&5
1457+echo "$as_me:2829: checking for $ac_word" >&5
1458 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1459 if test "${ac_cv_prog_CXX+set}" = set; then
1460   echo $ECHO_N "(cached) $ECHO_C" >&6
1461@@ -2839,7 +2841,7 @@
1462   test -z "$ac_dir" && ac_dir=.
1463   $as_executable_p "$ac_dir/$ac_word" || continue
1464 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
1465-echo "$as_me:2842: found $ac_dir/$ac_word" >&5
1466+echo "$as_me:2844: found $ac_dir/$ac_word" >&5
1467 break
1468 done
1469
1470@@ -2847,10 +2849,10 @@
1471 fi
1472 CXX=$ac_cv_prog_CXX
1473 if test -n "$CXX"; then
1474-  echo "$as_me:2850: result: $CXX" >&5
1475+  echo "$as_me:2852: result: $CXX" >&5
1476 echo "${ECHO_T}$CXX" >&6
1477 else
1478-  echo "$as_me:2853: result: no" >&5
1479+  echo "$as_me:2855: result: no" >&5
1480 echo "${ECHO_T}no" >&6
1481 fi
1482
1483@@ -2863,7 +2865,7 @@
1484 do
1485   # Extract the first word of "$ac_prog", so it can be a program name with args.
1486 set dummy $ac_prog; ac_word=$2
1487-echo "$as_me:2866: checking for $ac_word" >&5
1488+echo "$as_me:2868: checking for $ac_word" >&5
1489 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1490 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
1491   echo $ECHO_N "(cached) $ECHO_C" >&6
1492@@ -2878,7 +2880,7 @@
1493   test -z "$ac_dir" && ac_dir=.
1494   $as_executable_p "$ac_dir/$ac_word" || continue
1495 ac_cv_prog_ac_ct_CXX="$ac_prog"
1496-echo "$as_me:2881: found $ac_dir/$ac_word" >&5
1497+echo "$as_me:2883: found $ac_dir/$ac_word" >&5
1498 break
1499 done
1500
1501@@ -2886,10 +2888,10 @@
1502 fi
1503 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
1504 if test -n "$ac_ct_CXX"; then
1505-  echo "$as_me:2889: result: $ac_ct_CXX" >&5
1506+  echo "$as_me:2891: result: $ac_ct_CXX" >&5
1507 echo "${ECHO_T}$ac_ct_CXX" >&6
1508 else
1509-  echo "$as_me:2892: result: no" >&5
1510+  echo "$as_me:2894: result: no" >&5
1511 echo "${ECHO_T}no" >&6
1512 fi
1513
1514@@ -2901,32 +2903,32 @@
1515 fi
1516
1517 # Provide some information about the compiler.
1518-echo "$as_me:2904:" \
1519+echo "$as_me:2906:" \
1520      "checking for C++ compiler version" >&5
1521 ac_compiler=`set X $ac_compile; echo $2`
1522-{ (eval echo "$as_me:2907: \"$ac_compiler --version </dev/null >&5\"") >&5
1523+{ (eval echo "$as_me:2909: \"$ac_compiler --version </dev/null >&5\"") >&5
1524   (eval $ac_compiler --version </dev/null >&5) 2>&5
1525   ac_status=$?
1526-  echo "$as_me:2910: \$? = $ac_status" >&5
1527+  echo "$as_me:2912: \$? = $ac_status" >&5
1528   (exit $ac_status); }
1529-{ (eval echo "$as_me:2912: \"$ac_compiler -v </dev/null >&5\"") >&5
1530+{ (eval echo "$as_me:2914: \"$ac_compiler -v </dev/null >&5\"") >&5
1531   (eval $ac_compiler -v </dev/null >&5) 2>&5
1532   ac_status=$?
1533-  echo "$as_me:2915: \$? = $ac_status" >&5
1534+  echo "$as_me:2917: \$? = $ac_status" >&5
1535   (exit $ac_status); }
1536-{ (eval echo "$as_me:2917: \"$ac_compiler -V </dev/null >&5\"") >&5
1537+{ (eval echo "$as_me:2919: \"$ac_compiler -V </dev/null >&5\"") >&5
1538   (eval $ac_compiler -V </dev/null >&5) 2>&5
1539   ac_status=$?
1540-  echo "$as_me:2920: \$? = $ac_status" >&5
1541+  echo "$as_me:2922: \$? = $ac_status" >&5
1542   (exit $ac_status); }
1543
1544-echo "$as_me:2923: checking whether we are using the GNU C++ compiler" >&5
1545+echo "$as_me:2925: checking whether we are using the GNU C++ compiler" >&5
1546 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
1547 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
1548   echo $ECHO_N "(cached) $ECHO_C" >&6
1549 else
1550   cat >conftest.$ac_ext <<_ACEOF
1551-#line 2929 "configure"
1552+#line 2931 "configure"
1553 #include "confdefs.h"
1554
1555 int
1556@@ -2941,16 +2943,16 @@
1557 }
1558 _ACEOF
1559 rm -f conftest.$ac_objext
1560-if { (eval echo "$as_me:2944: \"$ac_compile\"") >&5
1561+if { (eval echo "$as_me:2946: \"$ac_compile\"") >&5
1562   (eval $ac_compile) 2>&5
1563   ac_status=$?
1564-  echo "$as_me:2947: \$? = $ac_status" >&5
1565+  echo "$as_me:2949: \$? = $ac_status" >&5
1566   (exit $ac_status); } &&
1567          { ac_try='test -s conftest.$ac_objext'
1568-  { (eval echo "$as_me:2950: \"$ac_try\"") >&5
1569+  { (eval echo "$as_me:2952: \"$ac_try\"") >&5
1570   (eval $ac_try) 2>&5
1571   ac_status=$?
1572-  echo "$as_me:2953: \$? = $ac_status" >&5
1573+  echo "$as_me:2955: \$? = $ac_status" >&5
1574   (exit $ac_status); }; }; then
1575   ac_compiler_gnu=yes
1576 else
1577@@ -2962,19 +2964,19 @@
1578 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
1579
1580 fi
1581-echo "$as_me:2965: result: $ac_cv_cxx_compiler_gnu" >&5
1582+echo "$as_me:2967: result: $ac_cv_cxx_compiler_gnu" >&5
1583 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
1584 GXX=`test $ac_compiler_gnu = yes && echo yes`
1585 ac_test_CXXFLAGS=${CXXFLAGS+set}
1586 ac_save_CXXFLAGS=$CXXFLAGS
1587 CXXFLAGS="-g"
1588-echo "$as_me:2971: checking whether $CXX accepts -g" >&5
1589+echo "$as_me:2973: checking whether $CXX accepts -g" >&5
1590 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
1591 if test "${ac_cv_prog_cxx_g+set}" = set; then
1592   echo $ECHO_N "(cached) $ECHO_C" >&6
1593 else
1594   cat >conftest.$ac_ext <<_ACEOF
1595-#line 2977 "configure"
1596+#line 2979 "configure"
1597 #include "confdefs.h"
1598
1599 int
1600@@ -2986,16 +2988,16 @@
1601 }
1602 _ACEOF
1603 rm -f conftest.$ac_objext
1604-if { (eval echo "$as_me:2989: \"$ac_compile\"") >&5
1605+if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5
1606   (eval $ac_compile) 2>&5
1607   ac_status=$?
1608-  echo "$as_me:2992: \$? = $ac_status" >&5
1609+  echo "$as_me:2994: \$? = $ac_status" >&5
1610   (exit $ac_status); } &&
1611          { ac_try='test -s conftest.$ac_objext'
1612-  { (eval echo "$as_me:2995: \"$ac_try\"") >&5
1613+  { (eval echo "$as_me:2997: \"$ac_try\"") >&5
1614   (eval $ac_try) 2>&5
1615   ac_status=$?
1616-  echo "$as_me:2998: \$? = $ac_status" >&5
1617+  echo "$as_me:3000: \$? = $ac_status" >&5
1618   (exit $ac_status); }; }; then
1619   ac_cv_prog_cxx_g=yes
1620 else
1621@@ -3005,7 +3007,7 @@
1622 fi
1623 rm -f conftest.$ac_objext conftest.$ac_ext
1624 fi
1625-echo "$as_me:3008: result: $ac_cv_prog_cxx_g" >&5
1626+echo "$as_me:3010: result: $ac_cv_prog_cxx_g" >&5
1627 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
1628 if test "$ac_test_CXXFLAGS" = set; then
1629   CXXFLAGS=$ac_save_CXXFLAGS
1630@@ -3032,7 +3034,7 @@
1631    'void exit (int);'
1632 do
1633   cat >conftest.$ac_ext <<_ACEOF
1634-#line 3035 "configure"
1635+#line 3037 "configure"
1636 #include "confdefs.h"
1637 #include <stdlib.h>
1638 $ac_declaration
1639@@ -3045,16 +3047,16 @@
1640 }
1641 _ACEOF
1642 rm -f conftest.$ac_objext
1643-if { (eval echo "$as_me:3048: \"$ac_compile\"") >&5
1644+if { (eval echo "$as_me:3050: \"$ac_compile\"") >&5
1645   (eval $ac_compile) 2>&5
1646   ac_status=$?
1647-  echo "$as_me:3051: \$? = $ac_status" >&5
1648+  echo "$as_me:3053: \$? = $ac_status" >&5
1649   (exit $ac_status); } &&
1650          { ac_try='test -s conftest.$ac_objext'
1651-  { (eval echo "$as_me:3054: \"$ac_try\"") >&5
1652+  { (eval echo "$as_me:3056: \"$ac_try\"") >&5
1653   (eval $ac_try) 2>&5
1654   ac_status=$?
1655-  echo "$as_me:3057: \$? = $ac_status" >&5
1656+  echo "$as_me:3059: \$? = $ac_status" >&5
1657   (exit $ac_status); }; }; then
1658   :
1659 else
1660@@ -3064,7 +3066,7 @@
1661 fi
1662 rm -f conftest.$ac_objext conftest.$ac_ext
1663   cat >conftest.$ac_ext <<_ACEOF
1664-#line 3067 "configure"
1665+#line 3069 "configure"
1666 #include "confdefs.h"
1667 $ac_declaration
1668 int
1669@@ -3076,16 +3078,16 @@
1670 }
1671 _ACEOF
1672 rm -f conftest.$ac_objext
1673-if { (eval echo "$as_me:3079: \"$ac_compile\"") >&5
1674+if { (eval echo "$as_me:3081: \"$ac_compile\"") >&5
1675   (eval $ac_compile) 2>&5
1676   ac_status=$?
1677-  echo "$as_me:3082: \$? = $ac_status" >&5
1678+  echo "$as_me:3084: \$? = $ac_status" >&5
1679   (exit $ac_status); } &&
1680          { ac_try='test -s conftest.$ac_objext'
1681-  { (eval echo "$as_me:3085: \"$ac_try\"") >&5
1682+  { (eval echo "$as_me:3087: \"$ac_try\"") >&5
1683   (eval $ac_try) 2>&5
1684   ac_status=$?
1685-  echo "$as_me:3088: \$? = $ac_status" >&5
1686+  echo "$as_me:3090: \$? = $ac_status" >&5
1687   (exit $ac_status); }; }; then
1688   break
1689 else
1690@@ -3119,7 +3121,7 @@
1691 	then
1692 		# Several of the C++ configurations do not work, particularly when
1693 		# cross-compiling (20140913 -TD)
1694-		echo "$as_me:3122: checking if $CXX works" >&5
1695+		echo "$as_me:3124: checking if $CXX works" >&5
1696 echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
1697
1698 		save_CPPFLAGS="$CPPFLAGS"
1699@@ -3127,7 +3129,7 @@
1700 		CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
1701
1702 cat >conftest.$ac_ext <<_ACEOF
1703-#line 3130 "configure"
1704+#line 3132 "configure"
1705 #include "confdefs.h"
1706
1707 #include <stdlib.h>
1708@@ -3144,16 +3146,16 @@
1709 }
1710 _ACEOF
1711 rm -f conftest.$ac_objext
1712-if { (eval echo "$as_me:3147: \"$ac_compile\"") >&5
1713+if { (eval echo "$as_me:3149: \"$ac_compile\"") >&5
1714   (eval $ac_compile) 2>&5
1715   ac_status=$?
1716-  echo "$as_me:3150: \$? = $ac_status" >&5
1717+  echo "$as_me:3152: \$? = $ac_status" >&5
1718   (exit $ac_status); } &&
1719          { ac_try='test -s conftest.$ac_objext'
1720-  { (eval echo "$as_me:3153: \"$ac_try\"") >&5
1721+  { (eval echo "$as_me:3155: \"$ac_try\"") >&5
1722   (eval $ac_try) 2>&5
1723   ac_status=$?
1724-  echo "$as_me:3156: \$? = $ac_status" >&5
1725+  echo "$as_me:3158: \$? = $ac_status" >&5
1726   (exit $ac_status); }; }; then
1727   cf_cxx_works=yes
1728 else
1729@@ -3164,11 +3166,11 @@
1730 rm -f conftest.$ac_objext conftest.$ac_ext
1731 		CPPFLAGS="$save_CPPFLAGS"
1732
1733-		echo "$as_me:3167: result: $cf_cxx_works" >&5
1734+		echo "$as_me:3169: result: $cf_cxx_works" >&5
1735 echo "${ECHO_T}$cf_cxx_works" >&6
1736 		if test "x$cf_cxx_works" = xno
1737 		then
1738-			{ echo "$as_me:3171: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
1739+			{ echo "$as_me:3173: WARNING: Ignore $CXX, since it cannot compile hello-world." >&5
1740 echo "$as_me: WARNING: Ignore $CXX, since it cannot compile hello-world." >&2;}
1741 			cf_with_cxx=no; CXX=""; GXX="";
1742 		fi
1743@@ -3184,7 +3186,7 @@
1744 	if test "$CXX" = "g++" ; then
1745 		# Extract the first word of "g++", so it can be a program name with args.
1746 set dummy g++; ac_word=$2
1747-echo "$as_me:3187: checking for $ac_word" >&5
1748+echo "$as_me:3189: checking for $ac_word" >&5
1749 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1750 if test "${ac_cv_path_CXX+set}" = set; then
1751   echo $ECHO_N "(cached) $ECHO_C" >&6
1752@@ -3201,7 +3203,7 @@
1753   test -z "$ac_dir" && ac_dir=.
1754   if $as_executable_p "$ac_dir/$ac_word"; then
1755    ac_cv_path_CXX="$ac_dir/$ac_word"
1756-   echo "$as_me:3204: found $ac_dir/$ac_word" >&5
1757+   echo "$as_me:3206: found $ac_dir/$ac_word" >&5
1758    break
1759 fi
1760 done
1761@@ -3212,17 +3214,17 @@
1762 CXX=$ac_cv_path_CXX
1763
1764 if test -n "$CXX"; then
1765-  echo "$as_me:3215: result: $CXX" >&5
1766+  echo "$as_me:3217: result: $CXX" >&5
1767 echo "${ECHO_T}$CXX" >&6
1768 else
1769-  echo "$as_me:3218: result: no" >&5
1770+  echo "$as_me:3220: result: no" >&5
1771 echo "${ECHO_T}no" >&6
1772 fi
1773
1774 	fi
1775 	case "x$CXX" in
1776 	(x|xg++)
1777-		{ echo "$as_me:3225: WARNING: You don't have any C++ compiler, too bad" >&5
1778+		{ echo "$as_me:3227: WARNING: You don't have any C++ compiler, too bad" >&5
1779 echo "$as_me: WARNING: You don't have any C++ compiler, too bad" >&2;}
1780 		cf_with_cxx=no; CXX=""; GXX="";
1781 		;;
1782@@ -3231,7 +3233,7 @@
1783
1784 GXX_VERSION=none
1785 if test "$GXX" = yes; then
1786-	echo "$as_me:3234: checking version of ${CXX:-g++}" >&5
1787+	echo "$as_me:3236: checking version of ${CXX:-g++}" >&5
1788 echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6
1789 	GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
1790 	if test -z "$GXX_VERSION"
1791@@ -3239,7 +3241,7 @@
1792 		GXX_VERSION=unknown
1793 		GXX=no
1794 	fi
1795-	echo "$as_me:3242: result: $GXX_VERSION" >&5
1796+	echo "$as_me:3244: result: $GXX_VERSION" >&5
1797 echo "${ECHO_T}$GXX_VERSION" >&6
1798 fi
1799
1800@@ -3247,12 +3249,12 @@
1801 (1*|2.[0-6]*)
1802 	# GXX=""; CXX=""; ac_cv_prog_gxx=no
1803 	# cf_cxx_library=no
1804-	{ echo "$as_me:3250: WARNING: templates do not work" >&5
1805+	{ echo "$as_me:3252: WARNING: templates do not work" >&5
1806 echo "$as_me: WARNING: templates do not work" >&2;}
1807 	;;
1808 esac
1809
1810-echo "$as_me:3255: checking if you want to build C++ binding and demo" >&5
1811+echo "$as_me:3257: checking if you want to build C++ binding and demo" >&5
1812 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
1813
1814 # Check whether --with-cxx-binding or --without-cxx-binding was given.
1815@@ -3262,15 +3264,15 @@
1816 else
1817   cf_with_cxx_binding=$cf_with_cxx
1818 fi;
1819-echo "$as_me:3265: result: $cf_with_cxx_binding" >&5
1820+echo "$as_me:3267: result: $cf_with_cxx_binding" >&5
1821 echo "${ECHO_T}$cf_with_cxx_binding" >&6
1822
1823-echo "$as_me:3268: checking if you want to build with Ada95" >&5
1824+echo "$as_me:3270: checking if you want to build with Ada95" >&5
1825 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
1826-echo "$as_me:3270: result: $cf_with_ada" >&5
1827+echo "$as_me:3272: result: $cf_with_ada" >&5
1828 echo "${ECHO_T}$cf_with_ada" >&6
1829
1830-echo "$as_me:3273: checking if you want to install terminal database" >&5
1831+echo "$as_me:3275: checking if you want to install terminal database" >&5
1832 echo $ECHO_N "checking if you want to install terminal database... $ECHO_C" >&6
1833
1834 # Check whether --enable-db-install or --disable-db-install was given.
1835@@ -3280,10 +3282,10 @@
1836 else
1837   cf_with_db_install=yes
1838 fi;
1839-echo "$as_me:3283: result: $cf_with_db_install" >&5
1840+echo "$as_me:3285: result: $cf_with_db_install" >&5
1841 echo "${ECHO_T}$cf_with_db_install" >&6
1842
1843-echo "$as_me:3286: checking if you want to install manpages" >&5
1844+echo "$as_me:3288: checking if you want to install manpages" >&5
1845 echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6
1846
1847 # Check whether --with-manpages or --without-manpages was given.
1848@@ -3293,10 +3295,10 @@
1849 else
1850   cf_with_manpages=yes
1851 fi;
1852-echo "$as_me:3296: result: $cf_with_manpages" >&5
1853+echo "$as_me:3298: result: $cf_with_manpages" >&5
1854 echo "${ECHO_T}$cf_with_manpages" >&6
1855
1856-echo "$as_me:3299: checking if you want to build programs such as tic" >&5
1857+echo "$as_me:3301: checking if you want to build programs such as tic" >&5
1858 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
1859
1860 # Check whether --with-progs or --without-progs was given.
1861@@ -3306,18 +3308,18 @@
1862 else
1863   cf_with_progs=yes
1864 fi;
1865-echo "$as_me:3309: result: $cf_with_progs" >&5
1866+echo "$as_me:3311: result: $cf_with_progs" >&5
1867 echo "${ECHO_T}$cf_with_progs" >&6
1868
1869 if test -f $srcdir/tack/tack.h; then
1870 	if test "x$cross_compiling" = xyes ; then
1871 		test -n "$verbose" && echo "	ignoring tack because we are cross-compiling" 1>&6
1872
1873-echo "${as_me:-configure}:3316: testing ignoring tack because we are cross-compiling ..." 1>&5
1874+echo "${as_me:-configure}:3318: testing ignoring tack because we are cross-compiling ..." 1>&5
1875
1876 		cf_with_tack=no
1877 	else
1878-		echo "$as_me:3320: checking if you want to build the tack program" >&5
1879+		echo "$as_me:3322: checking if you want to build the tack program" >&5
1880 echo $ECHO_N "checking if you want to build the tack program... $ECHO_C" >&6
1881
1882 # Check whether --with-tack or --without-tack was given.
1883@@ -3327,14 +3329,14 @@
1884 else
1885   cf_with_tack=$cf_with_progs
1886 fi;
1887-		echo "$as_me:3330: result: $cf_with_tack" >&5
1888+		echo "$as_me:3332: result: $cf_with_tack" >&5
1889 echo "${ECHO_T}$cf_with_tack" >&6
1890 	fi
1891 else
1892 	cf_with_tack=no
1893 fi
1894
1895-echo "$as_me:3337: checking if you want to build test-programs" >&5
1896+echo "$as_me:3339: checking if you want to build test-programs" >&5
1897 echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6
1898
1899 # Check whether --with-tests or --without-tests was given.
1900@@ -3344,10 +3346,10 @@
1901 else
1902   cf_with_tests=yes
1903 fi;
1904-echo "$as_me:3347: result: $cf_with_tests" >&5
1905+echo "$as_me:3349: result: $cf_with_tests" >&5
1906 echo "${ECHO_T}$cf_with_tests" >&6
1907
1908-echo "$as_me:3350: checking if you wish to install curses.h" >&5
1909+echo "$as_me:3352: checking if you wish to install curses.h" >&5
1910 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
1911
1912 # Check whether --with-curses-h or --without-curses-h was given.
1913@@ -3357,7 +3359,7 @@
1914 else
1915   with_curses_h=yes
1916 fi;
1917-echo "$as_me:3360: result: $with_curses_h" >&5
1918+echo "$as_me:3362: result: $with_curses_h" >&5
1919 echo "${ECHO_T}$with_curses_h" >&6
1920
1921 modules_to_build="ncurses"
1922@@ -3382,7 +3384,7 @@
1923 do
1924   # Extract the first word of "$ac_prog", so it can be a program name with args.
1925 set dummy $ac_prog; ac_word=$2
1926-echo "$as_me:3385: checking for $ac_word" >&5
1927+echo "$as_me:3387: checking for $ac_word" >&5
1928 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1929 if test "${ac_cv_prog_AWK+set}" = set; then
1930   echo $ECHO_N "(cached) $ECHO_C" >&6
1931@@ -3397,7 +3399,7 @@
1932   test -z "$ac_dir" && ac_dir=.
1933   $as_executable_p "$ac_dir/$ac_word" || continue
1934 ac_cv_prog_AWK="$ac_prog"
1935-echo "$as_me:3400: found $ac_dir/$ac_word" >&5
1936+echo "$as_me:3402: found $ac_dir/$ac_word" >&5
1937 break
1938 done
1939
1940@@ -3405,21 +3407,21 @@
1941 fi
1942 AWK=$ac_cv_prog_AWK
1943 if test -n "$AWK"; then
1944-  echo "$as_me:3408: result: $AWK" >&5
1945+  echo "$as_me:3410: result: $AWK" >&5
1946 echo "${ECHO_T}$AWK" >&6
1947 else
1948-  echo "$as_me:3411: result: no" >&5
1949+  echo "$as_me:3413: result: no" >&5
1950 echo "${ECHO_T}no" >&6
1951 fi
1952
1953   test -n "$AWK" && break
1954 done
1955
1956-test -z "$AWK" && { { echo "$as_me:3418: error: No awk program found" >&5
1957+test -z "$AWK" && { { echo "$as_me:3420: error: No awk program found" >&5
1958 echo "$as_me: error: No awk program found" >&2;}
1959    { (exit 1); exit 1; }; }
1960
1961-echo "$as_me:3422: checking for egrep" >&5
1962+echo "$as_me:3424: checking for egrep" >&5
1963 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
1964 if test "${ac_cv_prog_egrep+set}" = set; then
1965   echo $ECHO_N "(cached) $ECHO_C" >&6
1966@@ -3429,11 +3431,11 @@
1967 		else ac_cv_prog_egrep='egrep'
1968 	fi
1969 fi
1970-echo "$as_me:3432: result: $ac_cv_prog_egrep" >&5
1971+echo "$as_me:3434: result: $ac_cv_prog_egrep" >&5
1972 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
1973 	EGREP=$ac_cv_prog_egrep
1974
1975-	test -z "$EGREP" && { { echo "$as_me:3436: error: No egrep program found" >&5
1976+	test -z "$EGREP" && { { echo "$as_me:3438: error: No egrep program found" >&5
1977 echo "$as_me: error: No egrep program found" >&2;}
1978    { (exit 1); exit 1; }; }
1979
1980@@ -3449,7 +3451,7 @@
1981 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
1982 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
1983 # ./install, which can be erroneously created by make from ./install.sh.
1984-echo "$as_me:3452: checking for a BSD compatible install" >&5
1985+echo "$as_me:3454: checking for a BSD compatible install" >&5
1986 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
1987 if test -z "$INSTALL"; then
1988 if test "${ac_cv_path_install+set}" = set; then
1989@@ -3498,7 +3500,7 @@
1990     INSTALL=$ac_install_sh
1991   fi
1992 fi
1993-echo "$as_me:3501: result: $INSTALL" >&5
1994+echo "$as_me:3503: result: $INSTALL" >&5
1995 echo "${ECHO_T}$INSTALL" >&6
1996
1997 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
1998@@ -3523,7 +3525,7 @@
1999 do
2000   # Extract the first word of "$ac_prog", so it can be a program name with args.
2001 set dummy $ac_prog; ac_word=$2
2002-echo "$as_me:3526: checking for $ac_word" >&5
2003+echo "$as_me:3528: checking for $ac_word" >&5
2004 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2005 if test "${ac_cv_prog_LINT+set}" = set; then
2006   echo $ECHO_N "(cached) $ECHO_C" >&6
2007@@ -3538,7 +3540,7 @@
2008   test -z "$ac_dir" && ac_dir=.
2009   $as_executable_p "$ac_dir/$ac_word" || continue
2010 ac_cv_prog_LINT="$ac_prog"
2011-echo "$as_me:3541: found $ac_dir/$ac_word" >&5
2012+echo "$as_me:3543: found $ac_dir/$ac_word" >&5
2013 break
2014 done
2015
2016@@ -3546,28 +3548,28 @@
2017 fi
2018 LINT=$ac_cv_prog_LINT
2019 if test -n "$LINT"; then
2020-  echo "$as_me:3549: result: $LINT" >&5
2021+  echo "$as_me:3551: result: $LINT" >&5
2022 echo "${ECHO_T}$LINT" >&6
2023 else
2024-  echo "$as_me:3552: result: no" >&5
2025+  echo "$as_me:3554: result: no" >&5
2026 echo "${ECHO_T}no" >&6
2027 fi
2028
2029   test -n "$LINT" && break
2030 done
2031
2032-echo "$as_me:3559: checking whether ln -s works" >&5
2033+echo "$as_me:3561: checking whether ln -s works" >&5
2034 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
2035 LN_S=$as_ln_s
2036 if test "$LN_S" = "ln -s"; then
2037-  echo "$as_me:3563: result: yes" >&5
2038+  echo "$as_me:3565: result: yes" >&5
2039 echo "${ECHO_T}yes" >&6
2040 else
2041-  echo "$as_me:3566: result: no, using $LN_S" >&5
2042+  echo "$as_me:3568: result: no, using $LN_S" >&5
2043 echo "${ECHO_T}no, using $LN_S" >&6
2044 fi
2045
2046-echo "$as_me:3570: checking if $LN_S -f options work" >&5
2047+echo "$as_me:3572: checking if $LN_S -f options work" >&5
2048 echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6
2049
2050 rm -f conf$$.src conf$$dst
2051@@ -3579,12 +3581,12 @@
2052 	cf_prog_ln_sf=no
2053 fi
2054 rm -f conf$$.dst conf$$src
2055-echo "$as_me:3582: result: $cf_prog_ln_sf" >&5
2056+echo "$as_me:3584: result: $cf_prog_ln_sf" >&5
2057 echo "${ECHO_T}$cf_prog_ln_sf" >&6
2058
2059 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
2060
2061-echo "$as_me:3587: checking for long file names" >&5
2062+echo "$as_me:3589: checking for long file names" >&5
2063 echo $ECHO_N "checking for long file names... $ECHO_C" >&6
2064 if test "${ac_cv_sys_long_file_names+set}" = set; then
2065   echo $ECHO_N "(cached) $ECHO_C" >&6
2066@@ -3623,7 +3625,7 @@
2067   rm -rf $ac_xdir 2>/dev/null
2068 done
2069 fi
2070-echo "$as_me:3626: result: $ac_cv_sys_long_file_names" >&5
2071+echo "$as_me:3628: result: $ac_cv_sys_long_file_names" >&5
2072 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
2073 if test $ac_cv_sys_long_file_names = yes; then
2074
2075@@ -3642,7 +3644,7 @@
2076   withval="$with_config_suffix"
2077   case "x$withval" in
2078 	(xyes|xno)
2079-		{ echo "$as_me:3645: WARNING: expected a value for config-suffix option" >&5
2080+		{ echo "$as_me:3647: WARNING: expected a value for config-suffix option" >&5
2081 echo "$as_me: WARNING: expected a value for config-suffix option" >&2;}
2082 		;;
2083 	(*)	cf_config_suffix="$withval"
2084@@ -3652,7 +3654,7 @@
2085
2086 # If we find pkg-config, check if we should install the ".pc" files.
2087
2088-echo "$as_me:3655: checking if you want to use pkg-config" >&5
2089+echo "$as_me:3657: checking if you want to use pkg-config" >&5
2090 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
2091
2092 # Check whether --with-pkg-config or --without-pkg-config was given.
2093@@ -3662,7 +3664,7 @@
2094 else
2095   cf_pkg_config=yes
2096 fi;
2097-echo "$as_me:3665: result: $cf_pkg_config" >&5
2098+echo "$as_me:3667: result: $cf_pkg_config" >&5
2099 echo "${ECHO_T}$cf_pkg_config" >&6
2100
2101 case $cf_pkg_config in
2102@@ -3674,7 +3676,7 @@
2103 if test -n "$ac_tool_prefix"; then
2104   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
2105 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
2106-echo "$as_me:3677: checking for $ac_word" >&5
2107+echo "$as_me:3679: checking for $ac_word" >&5
2108 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2109 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
2110   echo $ECHO_N "(cached) $ECHO_C" >&6
2111@@ -3691,7 +3693,7 @@
2112   test -z "$ac_dir" && ac_dir=.
2113   if $as_executable_p "$ac_dir/$ac_word"; then
2114    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
2115-   echo "$as_me:3694: found $ac_dir/$ac_word" >&5
2116+   echo "$as_me:3696: found $ac_dir/$ac_word" >&5
2117    break
2118 fi
2119 done
2120@@ -3702,10 +3704,10 @@
2121 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
2122
2123 if test -n "$PKG_CONFIG"; then
2124-  echo "$as_me:3705: result: $PKG_CONFIG" >&5
2125+  echo "$as_me:3707: result: $PKG_CONFIG" >&5
2126 echo "${ECHO_T}$PKG_CONFIG" >&6
2127 else
2128-  echo "$as_me:3708: result: no" >&5
2129+  echo "$as_me:3710: result: no" >&5
2130 echo "${ECHO_T}no" >&6
2131 fi
2132
2133@@ -3714,7 +3716,7 @@
2134   ac_pt_PKG_CONFIG=$PKG_CONFIG
2135   # Extract the first word of "pkg-config", so it can be a program name with args.
2136 set dummy pkg-config; ac_word=$2
2137-echo "$as_me:3717: checking for $ac_word" >&5
2138+echo "$as_me:3719: checking for $ac_word" >&5
2139 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2140 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
2141   echo $ECHO_N "(cached) $ECHO_C" >&6
2142@@ -3731,7 +3733,7 @@
2143   test -z "$ac_dir" && ac_dir=.
2144   if $as_executable_p "$ac_dir/$ac_word"; then
2145    ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
2146-   echo "$as_me:3734: found $ac_dir/$ac_word" >&5
2147+   echo "$as_me:3736: found $ac_dir/$ac_word" >&5
2148    break
2149 fi
2150 done
2151@@ -3743,10 +3745,10 @@
2152 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
2153
2154 if test -n "$ac_pt_PKG_CONFIG"; then
2155-  echo "$as_me:3746: result: $ac_pt_PKG_CONFIG" >&5
2156+  echo "$as_me:3748: result: $ac_pt_PKG_CONFIG" >&5
2157 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
2158 else
2159-  echo "$as_me:3749: result: no" >&5
2160+  echo "$as_me:3751: result: no" >&5
2161 echo "${ECHO_T}no" >&6
2162 fi
2163
2164@@ -3789,24 +3791,24 @@
2165 	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
2166 	;;
2167 (*)
2168-	{ { echo "$as_me:3792: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
2169+	{ { echo "$as_me:3794: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
2170 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
2171    { (exit 1); exit 1; }; }
2172 	;;
2173 esac
2174
2175 elif test "x$cf_pkg_config" != xno ; then
2176-	{ echo "$as_me:3799: WARNING: pkg-config is not installed" >&5
2177+	{ echo "$as_me:3801: WARNING: pkg-config is not installed" >&5
2178 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
2179 fi
2180
2181 case $PKG_CONFIG in
2182 (no|none|yes)
2183-	echo "$as_me:3805: checking for pkg-config library directory" >&5
2184+	echo "$as_me:3807: checking for pkg-config library directory" >&5
2185 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6
2186 	;;
2187 (*)
2188-	echo "$as_me:3809: checking for $PKG_CONFIG library directory" >&5
2189+	echo "$as_me:3811: checking for $PKG_CONFIG library directory" >&5
2190 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6
2191 	;;
2192 esac
2193@@ -3861,18 +3863,18 @@
2194
2195 	test -n "$verbose" && echo "	list..." 1>&6
2196
2197-echo "${as_me:-configure}:3864: testing list... ..." 1>&5
2198+echo "${as_me:-configure}:3866: testing list... ..." 1>&5
2199
2200 	for cf_config in $cf_search_path
2201 	do
2202 		test -n "$verbose" && echo "	checking $cf_config/pkgconfig" 1>&6
2203
2204-echo "${as_me:-configure}:3870: testing checking $cf_config/pkgconfig ..." 1>&5
2205+echo "${as_me:-configure}:3872: testing checking $cf_config/pkgconfig ..." 1>&5
2206
2207 		if test -d $cf_config/pkgconfig
2208 		then
2209 			PKG_CONFIG_LIBDIR=$cf_config/pkgconfig
2210-			echo "$as_me:3875: checking done" >&5
2211+			echo "$as_me:3877: checking done" >&5
2212 echo $ECHO_N "checking done... $ECHO_C" >&6
2213 			break
2214 		fi
2215@@ -3883,16 +3885,16 @@
2216 esac
2217
2218 if test "x$PKG_CONFIG_LIBDIR" != xno ; then
2219-	echo "$as_me:3886: result: $PKG_CONFIG_LIBDIR" >&5
2220+	echo "$as_me:3888: result: $PKG_CONFIG_LIBDIR" >&5
2221 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6
2222 fi
2223
2224 if test "x$PKG_CONFIG" != xnone
2225 then
2226-	echo "$as_me:3892: checking if we should install .pc files for $PKG_CONFIG" >&5
2227+	echo "$as_me:3894: checking if we should install .pc files for $PKG_CONFIG" >&5
2228 echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
2229 else
2230-	echo "$as_me:3895: checking if we should install .pc files" >&5
2231+	echo "$as_me:3897: checking if we should install .pc files" >&5
2232 echo $ECHO_N "checking if we should install .pc files... $ECHO_C" >&6
2233 fi
2234
2235@@ -3903,7 +3905,7 @@
2236 else
2237   enable_pc_files=no
2238 fi;
2239-echo "$as_me:3906: result: $enable_pc_files" >&5
2240+echo "$as_me:3908: result: $enable_pc_files" >&5
2241 echo "${ECHO_T}$enable_pc_files" >&6
2242
2243 if test "x$enable_pc_files" != xno
2244@@ -3911,7 +3913,7 @@
2245 	MAKE_PC_FILES=
2246 	case "x$PKG_CONFIG_LIBDIR" in
2247 	(xno|xyes)
2248-		{ echo "$as_me:3914: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
2249+		{ echo "$as_me:3916: WARNING: no PKG_CONFIG_LIBDIR was found" >&5
2250 echo "$as_me: WARNING: no PKG_CONFIG_LIBDIR was found" >&2;}
2251 		;;
2252 	(*)
2253@@ -3941,7 +3943,7 @@
2254 	PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%`
2255 	;;
2256 (*)
2257-	{ { echo "$as_me:3944: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
2258+	{ { echo "$as_me:3946: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5
2259 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;}
2260    { (exit 1); exit 1; }; }
2261 	;;
2262@@ -3955,7 +3957,7 @@
2263
2264 if test -z "$MAKE_PC_FILES"
2265 then
2266-	echo "$as_me:3958: checking for suffix to add to pc-files" >&5
2267+	echo "$as_me:3960: checking for suffix to add to pc-files" >&5
2268 echo $ECHO_N "checking for suffix to add to pc-files... $ECHO_C" >&6
2269
2270 # Check whether --with-pc-suffix or --without-pc-suffix was given.
2271@@ -3970,13 +3972,13 @@
2272 	esac
2273 fi;
2274 	test -z "$PC_MODULE_SUFFIX" && PC_MODULE_SUFFIX=none
2275-	echo "$as_me:3973: result: $PC_MODULE_SUFFIX" >&5
2276+	echo "$as_me:3975: result: $PC_MODULE_SUFFIX" >&5
2277 echo "${ECHO_T}$PC_MODULE_SUFFIX" >&6
2278 	test "$PC_MODULE_SUFFIX" = none && PC_MODULE_SUFFIX=
2279
2280 fi
2281
2282-echo "$as_me:3979: checking if we should assume mixed-case filenames" >&5
2283+echo "$as_me:3981: checking if we should assume mixed-case filenames" >&5
2284 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
2285
2286 # Check whether --enable-mixed-case or --disable-mixed-case was given.
2287@@ -3986,11 +3988,11 @@
2288 else
2289   enable_mixedcase=auto
2290 fi;
2291-echo "$as_me:3989: result: $enable_mixedcase" >&5
2292+echo "$as_me:3991: result: $enable_mixedcase" >&5
2293 echo "${ECHO_T}$enable_mixedcase" >&6
2294 if test "$enable_mixedcase" = "auto" ; then
2295
2296-echo "$as_me:3993: checking if filesystem supports mixed-case filenames" >&5
2297+echo "$as_me:3995: checking if filesystem supports mixed-case filenames" >&5
2298 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
2299 if test "${cf_cv_mixedcase+set}" = set; then
2300   echo $ECHO_N "(cached) $ECHO_C" >&6
2301@@ -4017,7 +4019,7 @@
2302 fi
2303
2304 fi
2305-echo "$as_me:4020: result: $cf_cv_mixedcase" >&5
2306+echo "$as_me:4022: result: $cf_cv_mixedcase" >&5
2307 echo "${ECHO_T}$cf_cv_mixedcase" >&6
2308 test "$cf_cv_mixedcase" = yes &&
2309 cat >>confdefs.h <<\EOF
2310@@ -4036,7 +4038,7 @@
2311 fi
2312
2313 # do this after mixed-case option (tags/TAGS is not as important as tic).
2314-echo "$as_me:4039: checking whether ${MAKE-make} sets \${MAKE}" >&5
2315+echo "$as_me:4041: checking whether ${MAKE-make} sets \${MAKE}" >&5
2316 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
2317 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
2318 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
2319@@ -4056,11 +4058,11 @@
2320 rm -f conftest.make
2321 fi
2322 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
2323-  echo "$as_me:4059: result: yes" >&5
2324+  echo "$as_me:4061: result: yes" >&5
2325 echo "${ECHO_T}yes" >&6
2326   SET_MAKE=
2327 else
2328-  echo "$as_me:4063: result: no" >&5
2329+  echo "$as_me:4065: result: no" >&5
2330 echo "${ECHO_T}no" >&6
2331   SET_MAKE="MAKE=${MAKE-make}"
2332 fi
2333@@ -4069,7 +4071,7 @@
2334 do
2335   # Extract the first word of "$ac_prog", so it can be a program name with args.
2336 set dummy $ac_prog; ac_word=$2
2337-echo "$as_me:4072: checking for $ac_word" >&5
2338+echo "$as_me:4074: checking for $ac_word" >&5
2339 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2340 if test "${ac_cv_prog_CTAGS+set}" = set; then
2341   echo $ECHO_N "(cached) $ECHO_C" >&6
2342@@ -4084,7 +4086,7 @@
2343   test -z "$ac_dir" && ac_dir=.
2344   $as_executable_p "$ac_dir/$ac_word" || continue
2345 ac_cv_prog_CTAGS="$ac_prog"
2346-echo "$as_me:4087: found $ac_dir/$ac_word" >&5
2347+echo "$as_me:4089: found $ac_dir/$ac_word" >&5
2348 break
2349 done
2350
2351@@ -4092,10 +4094,10 @@
2352 fi
2353 CTAGS=$ac_cv_prog_CTAGS
2354 if test -n "$CTAGS"; then
2355-  echo "$as_me:4095: result: $CTAGS" >&5
2356+  echo "$as_me:4097: result: $CTAGS" >&5
2357 echo "${ECHO_T}$CTAGS" >&6
2358 else
2359-  echo "$as_me:4098: result: no" >&5
2360+  echo "$as_me:4100: result: no" >&5
2361 echo "${ECHO_T}no" >&6
2362 fi
2363
2364@@ -4106,7 +4108,7 @@
2365 do
2366   # Extract the first word of "$ac_prog", so it can be a program name with args.
2367 set dummy $ac_prog; ac_word=$2
2368-echo "$as_me:4109: checking for $ac_word" >&5
2369+echo "$as_me:4111: checking for $ac_word" >&5
2370 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2371 if test "${ac_cv_prog_ETAGS+set}" = set; then
2372   echo $ECHO_N "(cached) $ECHO_C" >&6
2373@@ -4121,7 +4123,7 @@
2374   test -z "$ac_dir" && ac_dir=.
2375   $as_executable_p "$ac_dir/$ac_word" || continue
2376 ac_cv_prog_ETAGS="$ac_prog"
2377-echo "$as_me:4124: found $ac_dir/$ac_word" >&5
2378+echo "$as_me:4126: found $ac_dir/$ac_word" >&5
2379 break
2380 done
2381
2382@@ -4129,10 +4131,10 @@
2383 fi
2384 ETAGS=$ac_cv_prog_ETAGS
2385 if test -n "$ETAGS"; then
2386-  echo "$as_me:4132: result: $ETAGS" >&5
2387+  echo "$as_me:4134: result: $ETAGS" >&5
2388 echo "${ECHO_T}$ETAGS" >&6
2389 else
2390-  echo "$as_me:4135: result: no" >&5
2391+  echo "$as_me:4137: result: no" >&5
2392 echo "${ECHO_T}no" >&6
2393 fi
2394
2395@@ -4141,7 +4143,7 @@
2396
2397 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
2398 set dummy ${CTAGS:-ctags}; ac_word=$2
2399-echo "$as_me:4144: checking for $ac_word" >&5
2400+echo "$as_me:4146: checking for $ac_word" >&5
2401 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2402 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
2403   echo $ECHO_N "(cached) $ECHO_C" >&6
2404@@ -4156,7 +4158,7 @@
2405   test -z "$ac_dir" && ac_dir=.
2406   $as_executable_p "$ac_dir/$ac_word" || continue
2407 ac_cv_prog_MAKE_LOWER_TAGS="yes"
2408-echo "$as_me:4159: found $ac_dir/$ac_word" >&5
2409+echo "$as_me:4161: found $ac_dir/$ac_word" >&5
2410 break
2411 done
2412
2413@@ -4165,17 +4167,17 @@
2414 fi
2415 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
2416 if test -n "$MAKE_LOWER_TAGS"; then
2417-  echo "$as_me:4168: result: $MAKE_LOWER_TAGS" >&5
2418+  echo "$as_me:4170: result: $MAKE_LOWER_TAGS" >&5
2419 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
2420 else
2421-  echo "$as_me:4171: result: no" >&5
2422+  echo "$as_me:4173: result: no" >&5
2423 echo "${ECHO_T}no" >&6
2424 fi
2425
2426 if test "$cf_cv_mixedcase" = yes ; then
2427 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
2428 set dummy ${ETAGS:-etags}; ac_word=$2
2429-echo "$as_me:4178: checking for $ac_word" >&5
2430+echo "$as_me:4180: checking for $ac_word" >&5
2431 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2432 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
2433   echo $ECHO_N "(cached) $ECHO_C" >&6
2434@@ -4190,7 +4192,7 @@
2435   test -z "$ac_dir" && ac_dir=.
2436   $as_executable_p "$ac_dir/$ac_word" || continue
2437 ac_cv_prog_MAKE_UPPER_TAGS="yes"
2438-echo "$as_me:4193: found $ac_dir/$ac_word" >&5
2439+echo "$as_me:4195: found $ac_dir/$ac_word" >&5
2440 break
2441 done
2442
2443@@ -4199,10 +4201,10 @@
2444 fi
2445 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
2446 if test -n "$MAKE_UPPER_TAGS"; then
2447-  echo "$as_me:4202: result: $MAKE_UPPER_TAGS" >&5
2448+  echo "$as_me:4204: result: $MAKE_UPPER_TAGS" >&5
2449 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
2450 else
2451-  echo "$as_me:4205: result: no" >&5
2452+  echo "$as_me:4207: result: no" >&5
2453 echo "${ECHO_T}no" >&6
2454 fi
2455
2456@@ -4222,7 +4224,7 @@
2457 	MAKE_LOWER_TAGS="#"
2458 fi
2459
2460-echo "$as_me:4225: checking for makeflags variable" >&5
2461+echo "$as_me:4227: checking for makeflags variable" >&5
2462 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
2463 if test "${cf_cv_makeflags+set}" = set; then
2464   echo $ECHO_N "(cached) $ECHO_C" >&6
2465@@ -4252,7 +4254,7 @@
2466 			;;
2467 		(*)
2468
2469-echo "${as_me:-configure}:4255: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
2470+echo "${as_me:-configure}:4257: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
2471
2472 			;;
2473 		esac
2474@@ -4260,13 +4262,13 @@
2475 	rm -f cf_makeflags.tmp
2476
2477 fi
2478-echo "$as_me:4263: result: $cf_cv_makeflags" >&5
2479+echo "$as_me:4265: result: $cf_cv_makeflags" >&5
2480 echo "${ECHO_T}$cf_cv_makeflags" >&6
2481
2482 if test -n "$ac_tool_prefix"; then
2483   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
2484 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
2485-echo "$as_me:4269: checking for $ac_word" >&5
2486+echo "$as_me:4271: checking for $ac_word" >&5
2487 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2488 if test "${ac_cv_prog_RANLIB+set}" = set; then
2489   echo $ECHO_N "(cached) $ECHO_C" >&6
2490@@ -4281,7 +4283,7 @@
2491   test -z "$ac_dir" && ac_dir=.
2492   $as_executable_p "$ac_dir/$ac_word" || continue
2493 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
2494-echo "$as_me:4284: found $ac_dir/$ac_word" >&5
2495+echo "$as_me:4286: found $ac_dir/$ac_word" >&5
2496 break
2497 done
2498
2499@@ -4289,10 +4291,10 @@
2500 fi
2501 RANLIB=$ac_cv_prog_RANLIB
2502 if test -n "$RANLIB"; then
2503-  echo "$as_me:4292: result: $RANLIB" >&5
2504+  echo "$as_me:4294: result: $RANLIB" >&5
2505 echo "${ECHO_T}$RANLIB" >&6
2506 else
2507-  echo "$as_me:4295: result: no" >&5
2508+  echo "$as_me:4297: result: no" >&5
2509 echo "${ECHO_T}no" >&6
2510 fi
2511
2512@@ -4301,7 +4303,7 @@
2513   ac_ct_RANLIB=$RANLIB
2514   # Extract the first word of "ranlib", so it can be a program name with args.
2515 set dummy ranlib; ac_word=$2
2516-echo "$as_me:4304: checking for $ac_word" >&5
2517+echo "$as_me:4306: checking for $ac_word" >&5
2518 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2519 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
2520   echo $ECHO_N "(cached) $ECHO_C" >&6
2521@@ -4316,7 +4318,7 @@
2522   test -z "$ac_dir" && ac_dir=.
2523   $as_executable_p "$ac_dir/$ac_word" || continue
2524 ac_cv_prog_ac_ct_RANLIB="ranlib"
2525-echo "$as_me:4319: found $ac_dir/$ac_word" >&5
2526+echo "$as_me:4321: found $ac_dir/$ac_word" >&5
2527 break
2528 done
2529
2530@@ -4325,10 +4327,10 @@
2531 fi
2532 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
2533 if test -n "$ac_ct_RANLIB"; then
2534-  echo "$as_me:4328: result: $ac_ct_RANLIB" >&5
2535+  echo "$as_me:4330: result: $ac_ct_RANLIB" >&5
2536 echo "${ECHO_T}$ac_ct_RANLIB" >&6
2537 else
2538-  echo "$as_me:4331: result: no" >&5
2539+  echo "$as_me:4333: result: no" >&5
2540 echo "${ECHO_T}no" >&6
2541 fi
2542
2543@@ -4340,7 +4342,7 @@
2544 if test -n "$ac_tool_prefix"; then
2545   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
2546 set dummy ${ac_tool_prefix}ld; ac_word=$2
2547-echo "$as_me:4343: checking for $ac_word" >&5
2548+echo "$as_me:4345: checking for $ac_word" >&5
2549 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2550 if test "${ac_cv_prog_LD+set}" = set; then
2551   echo $ECHO_N "(cached) $ECHO_C" >&6
2552@@ -4355,7 +4357,7 @@
2553   test -z "$ac_dir" && ac_dir=.
2554   $as_executable_p "$ac_dir/$ac_word" || continue
2555 ac_cv_prog_LD="${ac_tool_prefix}ld"
2556-echo "$as_me:4358: found $ac_dir/$ac_word" >&5
2557+echo "$as_me:4360: found $ac_dir/$ac_word" >&5
2558 break
2559 done
2560
2561@@ -4363,10 +4365,10 @@
2562 fi
2563 LD=$ac_cv_prog_LD
2564 if test -n "$LD"; then
2565-  echo "$as_me:4366: result: $LD" >&5
2566+  echo "$as_me:4368: result: $LD" >&5
2567 echo "${ECHO_T}$LD" >&6
2568 else
2569-  echo "$as_me:4369: result: no" >&5
2570+  echo "$as_me:4371: result: no" >&5
2571 echo "${ECHO_T}no" >&6
2572 fi
2573
2574@@ -4375,7 +4377,7 @@
2575   ac_ct_LD=$LD
2576   # Extract the first word of "ld", so it can be a program name with args.
2577 set dummy ld; ac_word=$2
2578-echo "$as_me:4378: checking for $ac_word" >&5
2579+echo "$as_me:4380: checking for $ac_word" >&5
2580 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2581 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
2582   echo $ECHO_N "(cached) $ECHO_C" >&6
2583@@ -4390,7 +4392,7 @@
2584   test -z "$ac_dir" && ac_dir=.
2585   $as_executable_p "$ac_dir/$ac_word" || continue
2586 ac_cv_prog_ac_ct_LD="ld"
2587-echo "$as_me:4393: found $ac_dir/$ac_word" >&5
2588+echo "$as_me:4395: found $ac_dir/$ac_word" >&5
2589 break
2590 done
2591
2592@@ -4399,10 +4401,10 @@
2593 fi
2594 ac_ct_LD=$ac_cv_prog_ac_ct_LD
2595 if test -n "$ac_ct_LD"; then
2596-  echo "$as_me:4402: result: $ac_ct_LD" >&5
2597+  echo "$as_me:4404: result: $ac_ct_LD" >&5
2598 echo "${ECHO_T}$ac_ct_LD" >&6
2599 else
2600-  echo "$as_me:4405: result: no" >&5
2601+  echo "$as_me:4407: result: no" >&5
2602 echo "${ECHO_T}no" >&6
2603 fi
2604
2605@@ -4414,7 +4416,7 @@
2606 if test -n "$ac_tool_prefix"; then
2607   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
2608 set dummy ${ac_tool_prefix}ar; ac_word=$2
2609-echo "$as_me:4417: checking for $ac_word" >&5
2610+echo "$as_me:4419: checking for $ac_word" >&5
2611 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2612 if test "${ac_cv_prog_AR+set}" = set; then
2613   echo $ECHO_N "(cached) $ECHO_C" >&6
2614@@ -4429,7 +4431,7 @@
2615   test -z "$ac_dir" && ac_dir=.
2616   $as_executable_p "$ac_dir/$ac_word" || continue
2617 ac_cv_prog_AR="${ac_tool_prefix}ar"
2618-echo "$as_me:4432: found $ac_dir/$ac_word" >&5
2619+echo "$as_me:4434: found $ac_dir/$ac_word" >&5
2620 break
2621 done
2622
2623@@ -4437,10 +4439,10 @@
2624 fi
2625 AR=$ac_cv_prog_AR
2626 if test -n "$AR"; then
2627-  echo "$as_me:4440: result: $AR" >&5
2628+  echo "$as_me:4442: result: $AR" >&5
2629 echo "${ECHO_T}$AR" >&6
2630 else
2631-  echo "$as_me:4443: result: no" >&5
2632+  echo "$as_me:4445: result: no" >&5
2633 echo "${ECHO_T}no" >&6
2634 fi
2635
2636@@ -4449,7 +4451,7 @@
2637   ac_ct_AR=$AR
2638   # Extract the first word of "ar", so it can be a program name with args.
2639 set dummy ar; ac_word=$2
2640-echo "$as_me:4452: checking for $ac_word" >&5
2641+echo "$as_me:4454: checking for $ac_word" >&5
2642 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2643 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
2644   echo $ECHO_N "(cached) $ECHO_C" >&6
2645@@ -4464,7 +4466,7 @@
2646   test -z "$ac_dir" && ac_dir=.
2647   $as_executable_p "$ac_dir/$ac_word" || continue
2648 ac_cv_prog_ac_ct_AR="ar"
2649-echo "$as_me:4467: found $ac_dir/$ac_word" >&5
2650+echo "$as_me:4469: found $ac_dir/$ac_word" >&5
2651 break
2652 done
2653
2654@@ -4473,10 +4475,10 @@
2655 fi
2656 ac_ct_AR=$ac_cv_prog_ac_ct_AR
2657 if test -n "$ac_ct_AR"; then
2658-  echo "$as_me:4476: result: $ac_ct_AR" >&5
2659+  echo "$as_me:4478: result: $ac_ct_AR" >&5
2660 echo "${ECHO_T}$ac_ct_AR" >&6
2661 else
2662-  echo "$as_me:4479: result: no" >&5
2663+  echo "$as_me:4481: result: no" >&5
2664 echo "${ECHO_T}no" >&6
2665 fi
2666
2667@@ -4488,7 +4490,7 @@
2668 if test -n "$ac_tool_prefix"; then
2669   # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
2670 set dummy ${ac_tool_prefix}nm; ac_word=$2
2671-echo "$as_me:4491: checking for $ac_word" >&5
2672+echo "$as_me:4493: checking for $ac_word" >&5
2673 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2674 if test "${ac_cv_prog_NM+set}" = set; then
2675   echo $ECHO_N "(cached) $ECHO_C" >&6
2676@@ -4503,7 +4505,7 @@
2677   test -z "$ac_dir" && ac_dir=.
2678   $as_executable_p "$ac_dir/$ac_word" || continue
2679 ac_cv_prog_NM="${ac_tool_prefix}nm"
2680-echo "$as_me:4506: found $ac_dir/$ac_word" >&5
2681+echo "$as_me:4508: found $ac_dir/$ac_word" >&5
2682 break
2683 done
2684
2685@@ -4511,10 +4513,10 @@
2686 fi
2687 NM=$ac_cv_prog_NM
2688 if test -n "$NM"; then
2689-  echo "$as_me:4514: result: $NM" >&5
2690+  echo "$as_me:4516: result: $NM" >&5
2691 echo "${ECHO_T}$NM" >&6
2692 else
2693-  echo "$as_me:4517: result: no" >&5
2694+  echo "$as_me:4519: result: no" >&5
2695 echo "${ECHO_T}no" >&6
2696 fi
2697
2698@@ -4523,7 +4525,7 @@
2699   ac_ct_NM=$NM
2700   # Extract the first word of "nm", so it can be a program name with args.
2701 set dummy nm; ac_word=$2
2702-echo "$as_me:4526: checking for $ac_word" >&5
2703+echo "$as_me:4528: checking for $ac_word" >&5
2704 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2705 if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
2706   echo $ECHO_N "(cached) $ECHO_C" >&6
2707@@ -4538,7 +4540,7 @@
2708   test -z "$ac_dir" && ac_dir=.
2709   $as_executable_p "$ac_dir/$ac_word" || continue
2710 ac_cv_prog_ac_ct_NM="nm"
2711-echo "$as_me:4541: found $ac_dir/$ac_word" >&5
2712+echo "$as_me:4543: found $ac_dir/$ac_word" >&5
2713 break
2714 done
2715
2716@@ -4547,10 +4549,10 @@
2717 fi
2718 ac_ct_NM=$ac_cv_prog_ac_ct_NM
2719 if test -n "$ac_ct_NM"; then
2720-  echo "$as_me:4550: result: $ac_ct_NM" >&5
2721+  echo "$as_me:4552: result: $ac_ct_NM" >&5
2722 echo "${ECHO_T}$ac_ct_NM" >&6
2723 else
2724-  echo "$as_me:4553: result: no" >&5
2725+  echo "$as_me:4555: result: no" >&5
2726 echo "${ECHO_T}no" >&6
2727 fi
2728
2729@@ -4562,7 +4564,7 @@
2730 if test -n "$ac_tool_prefix"; then
2731   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
2732 set dummy ${ac_tool_prefix}ar; ac_word=$2
2733-echo "$as_me:4565: checking for $ac_word" >&5
2734+echo "$as_me:4567: checking for $ac_word" >&5
2735 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2736 if test "${ac_cv_prog_AR+set}" = set; then
2737   echo $ECHO_N "(cached) $ECHO_C" >&6
2738@@ -4577,7 +4579,7 @@
2739   test -z "$ac_dir" && ac_dir=.
2740   $as_executable_p "$ac_dir/$ac_word" || continue
2741 ac_cv_prog_AR="${ac_tool_prefix}ar"
2742-echo "$as_me:4580: found $ac_dir/$ac_word" >&5
2743+echo "$as_me:4582: found $ac_dir/$ac_word" >&5
2744 break
2745 done
2746
2747@@ -4585,10 +4587,10 @@
2748 fi
2749 AR=$ac_cv_prog_AR
2750 if test -n "$AR"; then
2751-  echo "$as_me:4588: result: $AR" >&5
2752+  echo "$as_me:4590: result: $AR" >&5
2753 echo "${ECHO_T}$AR" >&6
2754 else
2755-  echo "$as_me:4591: result: no" >&5
2756+  echo "$as_me:4593: result: no" >&5
2757 echo "${ECHO_T}no" >&6
2758 fi
2759
2760@@ -4597,7 +4599,7 @@
2761   ac_ct_AR=$AR
2762   # Extract the first word of "ar", so it can be a program name with args.
2763 set dummy ar; ac_word=$2
2764-echo "$as_me:4600: checking for $ac_word" >&5
2765+echo "$as_me:4602: checking for $ac_word" >&5
2766 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2767 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
2768   echo $ECHO_N "(cached) $ECHO_C" >&6
2769@@ -4612,7 +4614,7 @@
2770   test -z "$ac_dir" && ac_dir=.
2771   $as_executable_p "$ac_dir/$ac_word" || continue
2772 ac_cv_prog_ac_ct_AR="ar"
2773-echo "$as_me:4615: found $ac_dir/$ac_word" >&5
2774+echo "$as_me:4617: found $ac_dir/$ac_word" >&5
2775 break
2776 done
2777
2778@@ -4621,10 +4623,10 @@
2779 fi
2780 ac_ct_AR=$ac_cv_prog_ac_ct_AR
2781 if test -n "$ac_ct_AR"; then
2782-  echo "$as_me:4624: result: $ac_ct_AR" >&5
2783+  echo "$as_me:4626: result: $ac_ct_AR" >&5
2784 echo "${ECHO_T}$ac_ct_AR" >&6
2785 else
2786-  echo "$as_me:4627: result: no" >&5
2787+  echo "$as_me:4629: result: no" >&5
2788 echo "${ECHO_T}no" >&6
2789 fi
2790
2791@@ -4633,7 +4635,7 @@
2792   AR="$ac_cv_prog_AR"
2793 fi
2794
2795-echo "$as_me:4636: checking for options to update archives" >&5
2796+echo "$as_me:4638: checking for options to update archives" >&5
2797 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
2798 if test "${cf_cv_ar_flags+set}" = set; then
2799   echo $ECHO_N "(cached) $ECHO_C" >&6
2800@@ -4656,13 +4658,13 @@
2801 		rm -f conftest.a
2802
2803 		cat >conftest.$ac_ext <<EOF
2804-#line 4659 "configure"
2805+#line 4661 "configure"
2806 int	testdata[3] = { 123, 456, 789 };
2807 EOF
2808-		if { (eval echo "$as_me:4662: \"$ac_compile\"") >&5
2809+		if { (eval echo "$as_me:4664: \"$ac_compile\"") >&5
2810   (eval $ac_compile) 2>&5
2811   ac_status=$?
2812-  echo "$as_me:4665: \$? = $ac_status" >&5
2813+  echo "$as_me:4667: \$? = $ac_status" >&5
2814   (exit $ac_status); } ; then
2815 			echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
2816 			$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
2817@@ -4673,7 +4675,7 @@
2818 		else
2819 			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
2820
2821-echo "${as_me:-configure}:4676: testing cannot compile test-program ..." 1>&5
2822+echo "${as_me:-configure}:4678: testing cannot compile test-program ..." 1>&5
2823
2824 			break
2825 		fi
2826@@ -4681,7 +4683,7 @@
2827 	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
2828
2829 fi
2830-echo "$as_me:4684: result: $cf_cv_ar_flags" >&5
2831+echo "$as_me:4686: result: $cf_cv_ar_flags" >&5
2832 echo "${ECHO_T}$cf_cv_ar_flags" >&6
2833
2834 if test -n "$ARFLAGS" ; then
2835@@ -4692,7 +4694,7 @@
2836 	ARFLAGS=$cf_cv_ar_flags
2837 fi
2838
2839-echo "$as_me:4695: checking if you have specified an install-prefix" >&5
2840+echo "$as_me:4697: checking if you have specified an install-prefix" >&5
2841 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
2842
2843 # Check whether --with-install-prefix or --without-install-prefix was given.
2844@@ -4705,7 +4707,7 @@
2845 		;;
2846 	esac
2847 fi;
2848-echo "$as_me:4708: result: $DESTDIR" >&5
2849+echo "$as_me:4710: result: $DESTDIR" >&5
2850 echo "${ECHO_T}$DESTDIR" >&6
2851
2852 ###############################################################################
2853@@ -4733,7 +4735,7 @@
2854 do
2855   # Extract the first word of "$ac_prog", so it can be a program name with args.
2856 set dummy $ac_prog; ac_word=$2
2857-echo "$as_me:4736: checking for $ac_word" >&5
2858+echo "$as_me:4738: checking for $ac_word" >&5
2859 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2860 if test "${ac_cv_prog_BUILD_CC+set}" = set; then
2861   echo $ECHO_N "(cached) $ECHO_C" >&6
2862@@ -4748,7 +4750,7 @@
2863   test -z "$ac_dir" && ac_dir=.
2864   $as_executable_p "$ac_dir/$ac_word" || continue
2865 ac_cv_prog_BUILD_CC="$ac_prog"
2866-echo "$as_me:4751: found $ac_dir/$ac_word" >&5
2867+echo "$as_me:4753: found $ac_dir/$ac_word" >&5
2868 break
2869 done
2870
2871@@ -4756,10 +4758,10 @@
2872 fi
2873 BUILD_CC=$ac_cv_prog_BUILD_CC
2874 if test -n "$BUILD_CC"; then
2875-  echo "$as_me:4759: result: $BUILD_CC" >&5
2876+  echo "$as_me:4761: result: $BUILD_CC" >&5
2877 echo "${ECHO_T}$BUILD_CC" >&6
2878 else
2879-  echo "$as_me:4762: result: no" >&5
2880+  echo "$as_me:4764: result: no" >&5
2881 echo "${ECHO_T}no" >&6
2882 fi
2883
2884@@ -4768,12 +4770,12 @@
2885 test -n "$BUILD_CC" || BUILD_CC="none"
2886
2887 fi;
2888-	echo "$as_me:4771: checking for native build C compiler" >&5
2889+	echo "$as_me:4773: checking for native build C compiler" >&5
2890 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
2891-	echo "$as_me:4773: result: $BUILD_CC" >&5
2892+	echo "$as_me:4775: result: $BUILD_CC" >&5
2893 echo "${ECHO_T}$BUILD_CC" >&6
2894
2895-	echo "$as_me:4776: checking for native build C preprocessor" >&5
2896+	echo "$as_me:4778: checking for native build C preprocessor" >&5
2897 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
2898
2899 # Check whether --with-build-cpp or --without-build-cpp was given.
2900@@ -4783,10 +4785,10 @@
2901 else
2902   BUILD_CPP='${BUILD_CC} -E'
2903 fi;
2904-	echo "$as_me:4786: result: $BUILD_CPP" >&5
2905+	echo "$as_me:4788: result: $BUILD_CPP" >&5
2906 echo "${ECHO_T}$BUILD_CPP" >&6
2907
2908-	echo "$as_me:4789: checking for native build C flags" >&5
2909+	echo "$as_me:4791: checking for native build C flags" >&5
2910 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
2911
2912 # Check whether --with-build-cflags or --without-build-cflags was given.
2913@@ -4794,10 +4796,10 @@
2914   withval="$with_build_cflags"
2915   BUILD_CFLAGS="$withval"
2916 fi;
2917-	echo "$as_me:4797: result: $BUILD_CFLAGS" >&5
2918+	echo "$as_me:4799: result: $BUILD_CFLAGS" >&5
2919 echo "${ECHO_T}$BUILD_CFLAGS" >&6
2920
2921-	echo "$as_me:4800: checking for native build C preprocessor-flags" >&5
2922+	echo "$as_me:4802: checking for native build C preprocessor-flags" >&5
2923 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
2924
2925 # Check whether --with-build-cppflags or --without-build-cppflags was given.
2926@@ -4805,10 +4807,10 @@
2927   withval="$with_build_cppflags"
2928   BUILD_CPPFLAGS="$withval"
2929 fi;
2930-	echo "$as_me:4808: result: $BUILD_CPPFLAGS" >&5
2931+	echo "$as_me:4810: result: $BUILD_CPPFLAGS" >&5
2932 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
2933
2934-	echo "$as_me:4811: checking for native build linker-flags" >&5
2935+	echo "$as_me:4813: checking for native build linker-flags" >&5
2936 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
2937
2938 # Check whether --with-build-ldflags or --without-build-ldflags was given.
2939@@ -4816,10 +4818,10 @@
2940   withval="$with_build_ldflags"
2941   BUILD_LDFLAGS="$withval"
2942 fi;
2943-	echo "$as_me:4819: result: $BUILD_LDFLAGS" >&5
2944+	echo "$as_me:4821: result: $BUILD_LDFLAGS" >&5
2945 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
2946
2947-	echo "$as_me:4822: checking for native build linker-libraries" >&5
2948+	echo "$as_me:4824: checking for native build linker-libraries" >&5
2949 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
2950
2951 # Check whether --with-build-libs or --without-build-libs was given.
2952@@ -4827,7 +4829,7 @@
2953   withval="$with_build_libs"
2954   BUILD_LIBS="$withval"
2955 fi;
2956-	echo "$as_me:4830: result: $BUILD_LIBS" >&5
2957+	echo "$as_me:4832: result: $BUILD_LIBS" >&5
2958 echo "${ECHO_T}$BUILD_LIBS" >&6
2959
2960 	# this assumes we're on Unix.
2961@@ -4837,7 +4839,7 @@
2962 	: ${BUILD_CC:='${CC}'}
2963
2964 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
2965-		{ { echo "$as_me:4840: error: Cross-build requires two compilers.
2966+		{ { echo "$as_me:4842: error: Cross-build requires two compilers.
2967 Use --with-build-cc to specify the native compiler." >&5
2968 echo "$as_me: error: Cross-build requires two compilers.
2969 Use --with-build-cc to specify the native compiler." >&2;}
2970@@ -4862,7 +4864,7 @@
2971 ### shared, for example.
2972 cf_list_models=""
2973
2974-echo "$as_me:4865: checking if libtool -version-number should be used" >&5
2975+echo "$as_me:4867: checking if libtool -version-number should be used" >&5
2976 echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6
2977
2978 # Check whether --enable-libtool-version or --disable-libtool-version was given.
2979@@ -4879,7 +4881,7 @@
2980 	cf_libtool_version=yes
2981
2982 fi;
2983-echo "$as_me:4882: result: $cf_libtool_version" >&5
2984+echo "$as_me:4884: result: $cf_libtool_version" >&5
2985 echo "${ECHO_T}$cf_libtool_version" >&6
2986
2987 if test "$cf_libtool_version" = yes ; then
2988@@ -4888,25 +4890,25 @@
2989 	LIBTOOL_VERSION="-version-info"
2990 	case "x$VERSION" in
2991 	(x)
2992-		{ echo "$as_me:4891: WARNING: VERSION was not set" >&5
2993+		{ echo "$as_me:4893: WARNING: VERSION was not set" >&5
2994 echo "$as_me: WARNING: VERSION was not set" >&2;}
2995 		;;
2996 	(x*.*.*)
2997 		ABI_VERSION="$VERSION"
2998 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
2999
3000-echo "${as_me:-configure}:4898: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
3001+echo "${as_me:-configure}:4900: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
3002
3003 		;;
3004 	(x*:*:*)
3005 		ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'`
3006 		test -n "$verbose" && echo "	ABI_VERSION: $ABI_VERSION" 1>&6
3007
3008-echo "${as_me:-configure}:4905: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
3009+echo "${as_me:-configure}:4907: testing ABI_VERSION: $ABI_VERSION ..." 1>&5
3010
3011 		;;
3012 	(*)
3013-		{ echo "$as_me:4909: WARNING: unexpected VERSION value: $VERSION" >&5
3014+		{ echo "$as_me:4911: WARNING: unexpected VERSION value: $VERSION" >&5
3015 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;}
3016 		;;
3017 	esac
3018@@ -4928,7 +4930,7 @@
3019 LIB_INSTALL=
3020 LIB_UNINSTALL=
3021
3022-echo "$as_me:4931: checking if you want to build libraries with libtool" >&5
3023+echo "$as_me:4933: checking if you want to build libraries with libtool" >&5
3024 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
3025
3026 # Check whether --with-libtool or --without-libtool was given.
3027@@ -4938,7 +4940,7 @@
3028 else
3029   with_libtool=no
3030 fi;
3031-echo "$as_me:4941: result: $with_libtool" >&5
3032+echo "$as_me:4943: result: $with_libtool" >&5
3033 echo "${ECHO_T}$with_libtool" >&6
3034 if test "$with_libtool" != "no"; then
3035
3036@@ -4969,7 +4971,7 @@
3037 	with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
3038 	;;
3039 (*)
3040-	{ { echo "$as_me:4972: error: expected a pathname, not \"$with_libtool\"" >&5
3041+	{ { echo "$as_me:4974: error: expected a pathname, not \"$with_libtool\"" >&5
3042 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
3043    { (exit 1); exit 1; }; }
3044 	;;
3045@@ -4982,7 +4984,7 @@
3046   do
3047     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
3048 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3049-echo "$as_me:4985: checking for $ac_word" >&5
3050+echo "$as_me:4987: checking for $ac_word" >&5
3051 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
3052 if test "${ac_cv_prog_LIBTOOL+set}" = set; then
3053   echo $ECHO_N "(cached) $ECHO_C" >&6
3054@@ -4997,7 +4999,7 @@
3055   test -z "$ac_dir" && ac_dir=.
3056   $as_executable_p "$ac_dir/$ac_word" || continue
3057 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
3058-echo "$as_me:5000: found $ac_dir/$ac_word" >&5
3059+echo "$as_me:5002: found $ac_dir/$ac_word" >&5
3060 break
3061 done
3062
3063@@ -5005,10 +5007,10 @@
3064 fi
3065 LIBTOOL=$ac_cv_prog_LIBTOOL
3066 if test -n "$LIBTOOL"; then
3067-  echo "$as_me:5008: result: $LIBTOOL" >&5
3068+  echo "$as_me:5010: result: $LIBTOOL" >&5
3069 echo "${ECHO_T}$LIBTOOL" >&6
3070 else
3071-  echo "$as_me:5011: result: no" >&5
3072+  echo "$as_me:5013: result: no" >&5
3073 echo "${ECHO_T}no" >&6
3074 fi
3075
3076@@ -5021,7 +5023,7 @@
3077 do
3078   # Extract the first word of "$ac_prog", so it can be a program name with args.
3079 set dummy $ac_prog; ac_word=$2
3080-echo "$as_me:5024: checking for $ac_word" >&5
3081+echo "$as_me:5026: checking for $ac_word" >&5
3082 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
3083 if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
3084   echo $ECHO_N "(cached) $ECHO_C" >&6
3085@@ -5036,7 +5038,7 @@
3086   test -z "$ac_dir" && ac_dir=.
3087   $as_executable_p "$ac_dir/$ac_word" || continue
3088 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
3089-echo "$as_me:5039: found $ac_dir/$ac_word" >&5
3090+echo "$as_me:5041: found $ac_dir/$ac_word" >&5
3091 break
3092 done
3093
3094@@ -5044,10 +5046,10 @@
3095 fi
3096 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
3097 if test -n "$ac_ct_LIBTOOL"; then
3098-  echo "$as_me:5047: result: $ac_ct_LIBTOOL" >&5
3099+  echo "$as_me:5049: result: $ac_ct_LIBTOOL" >&5
3100 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
3101 else
3102-  echo "$as_me:5050: result: no" >&5
3103+  echo "$as_me:5052: result: no" >&5
3104 echo "${ECHO_T}no" >&6
3105 fi
3106
3107@@ -5078,7 +5080,7 @@
3108   do
3109     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
3110 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3111-echo "$as_me:5081: checking for $ac_word" >&5
3112+echo "$as_me:5083: checking for $ac_word" >&5
3113 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
3114 if test "${ac_cv_prog_LIBTOOL+set}" = set; then
3115   echo $ECHO_N "(cached) $ECHO_C" >&6
3116@@ -5093,7 +5095,7 @@
3117   test -z "$ac_dir" && ac_dir=.
3118   $as_executable_p "$ac_dir/$ac_word" || continue
3119 ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
3120-echo "$as_me:5096: found $ac_dir/$ac_word" >&5
3121+echo "$as_me:5098: found $ac_dir/$ac_word" >&5
3122 break
3123 done
3124
3125@@ -5101,10 +5103,10 @@
3126 fi
3127 LIBTOOL=$ac_cv_prog_LIBTOOL
3128 if test -n "$LIBTOOL"; then
3129-  echo "$as_me:5104: result: $LIBTOOL" >&5
3130+  echo "$as_me:5106: result: $LIBTOOL" >&5
3131 echo "${ECHO_T}$LIBTOOL" >&6
3132 else
3133-  echo "$as_me:5107: result: no" >&5
3134+  echo "$as_me:5109: result: no" >&5
3135 echo "${ECHO_T}no" >&6
3136 fi
3137
3138@@ -5117,7 +5119,7 @@
3139 do
3140   # Extract the first word of "$ac_prog", so it can be a program name with args.
3141 set dummy $ac_prog; ac_word=$2
3142-echo "$as_me:5120: checking for $ac_word" >&5
3143+echo "$as_me:5122: checking for $ac_word" >&5
3144 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
3145 if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
3146   echo $ECHO_N "(cached) $ECHO_C" >&6
3147@@ -5132,7 +5134,7 @@
3148   test -z "$ac_dir" && ac_dir=.
3149   $as_executable_p "$ac_dir/$ac_word" || continue
3150 ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
3151-echo "$as_me:5135: found $ac_dir/$ac_word" >&5
3152+echo "$as_me:5137: found $ac_dir/$ac_word" >&5
3153 break
3154 done
3155
3156@@ -5140,10 +5142,10 @@
3157 fi
3158 ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
3159 if test -n "$ac_ct_LIBTOOL"; then
3160-  echo "$as_me:5143: result: $ac_ct_LIBTOOL" >&5
3161+  echo "$as_me:5145: result: $ac_ct_LIBTOOL" >&5
3162 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6
3163 else
3164-  echo "$as_me:5146: result: no" >&5
3165+  echo "$as_me:5148: result: no" >&5
3166 echo "${ECHO_T}no" >&6
3167 fi
3168
3169@@ -5165,7 +5167,7 @@
3170 		fi
3171 	fi
3172 	if test -z "$LIBTOOL" ; then
3173-		{ { echo "$as_me:5168: error: Cannot find libtool" >&5
3174+		{ { echo "$as_me:5170: error: Cannot find libtool" >&5
3175 echo "$as_me: error: Cannot find libtool" >&2;}
3176    { (exit 1); exit 1; }; }
3177 	fi
3178@@ -5181,7 +5183,7 @@
3179
3180 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
3181 then
3182-	echo "$as_me:5184: checking version of $LIBTOOL" >&5
3183+	echo "$as_me:5186: checking version of $LIBTOOL" >&5
3184 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6
3185
3186 if test -n "$LIBTOOL" && test "$LIBTOOL" != none
3187@@ -5192,15 +5194,15 @@
3188 fi
3189 test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
3190
3191-	echo "$as_me:5195: result: $cf_cv_libtool_version" >&5
3192+	echo "$as_me:5197: result: $cf_cv_libtool_version" >&5
3193 echo "${ECHO_T}$cf_cv_libtool_version" >&6
3194 	if test -z "$cf_cv_libtool_version" ; then
3195-		{ { echo "$as_me:5198: error: This is not GNU libtool" >&5
3196+		{ { echo "$as_me:5200: error: This is not GNU libtool" >&5
3197 echo "$as_me: error: This is not GNU libtool" >&2;}
3198    { (exit 1); exit 1; }; }
3199 	fi
3200 else
3201-	{ { echo "$as_me:5203: error: GNU libtool has not been found" >&5
3202+	{ { echo "$as_me:5205: error: GNU libtool has not been found" >&5
3203 echo "$as_me: error: GNU libtool has not been found" >&2;}
3204    { (exit 1); exit 1; }; }
3205 fi
3206@@ -5236,7 +5238,7 @@
3207
3208 else
3209
3210-echo "$as_me:5239: checking if you want to build shared libraries" >&5
3211+echo "$as_me:5241: checking if you want to build shared libraries" >&5
3212 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
3213
3214 # Check whether --with-shared or --without-shared was given.
3215@@ -5246,11 +5248,11 @@
3216 else
3217   with_shared=no
3218 fi;
3219-echo "$as_me:5249: result: $with_shared" >&5
3220+echo "$as_me:5251: result: $with_shared" >&5
3221 echo "${ECHO_T}$with_shared" >&6
3222 test "x$with_shared" = "xyes" && cf_list_models="$cf_list_models shared"
3223
3224-echo "$as_me:5253: checking if you want to build static libraries" >&5
3225+echo "$as_me:5255: checking if you want to build static libraries" >&5
3226 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
3227
3228 # Check whether --with-normal or --without-normal was given.
3229@@ -5260,11 +5262,11 @@
3230 else
3231   with_normal=yes
3232 fi;
3233-echo "$as_me:5263: result: $with_normal" >&5
3234+echo "$as_me:5265: result: $with_normal" >&5
3235 echo "${ECHO_T}$with_normal" >&6
3236 test "x$with_normal" = "xyes" && cf_list_models="$cf_list_models normal"
3237
3238-echo "$as_me:5267: checking if you want to build debug libraries" >&5
3239+echo "$as_me:5269: checking if you want to build debug libraries" >&5
3240 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
3241
3242 # Check whether --with-debug or --without-debug was given.
3243@@ -5274,11 +5276,11 @@
3244 else
3245   with_debug=yes
3246 fi;
3247-echo "$as_me:5277: result: $with_debug" >&5
3248+echo "$as_me:5279: result: $with_debug" >&5
3249 echo "${ECHO_T}$with_debug" >&6
3250 test "x$with_debug" = "xyes" && cf_list_models="$cf_list_models debug"
3251
3252-echo "$as_me:5281: checking if you want to build profiling libraries" >&5
3253+echo "$as_me:5283: checking if you want to build profiling libraries" >&5
3254 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
3255
3256 # Check whether --with-profile or --without-profile was given.
3257@@ -5288,7 +5290,7 @@
3258 else
3259   with_profile=no
3260 fi;
3261-echo "$as_me:5291: result: $with_profile" >&5
3262+echo "$as_me:5293: result: $with_profile" >&5
3263 echo "${ECHO_T}$with_profile" >&6
3264 test "x$with_profile" = "xyes" && cf_list_models="$cf_list_models profile"
3265
3266@@ -5296,7 +5298,7 @@
3267
3268 if test "X$cf_with_cxx_binding" != Xno; then
3269 if test "x$with_shared" = "xyes"; then
3270-echo "$as_me:5299: checking if you want to build C++ shared libraries" >&5
3271+echo "$as_me:5301: checking if you want to build C++ shared libraries" >&5
3272 echo $ECHO_N "checking if you want to build C++ shared libraries... $ECHO_C" >&6
3273
3274 # Check whether --with-cxx-shared or --without-cxx-shared was given.
3275@@ -5306,26 +5308,26 @@
3276 else
3277   with_shared_cxx=no
3278 fi;
3279-echo "$as_me:5309: result: $with_shared_cxx" >&5
3280+echo "$as_me:5311: result: $with_shared_cxx" >&5
3281 echo "${ECHO_T}$with_shared_cxx" >&6
3282 fi
3283 fi
3284
3285 ###############################################################################
3286
3287-echo "$as_me:5316: checking for specified models" >&5
3288+echo "$as_me:5318: checking for specified models" >&5
3289 echo $ECHO_N "checking for specified models... $ECHO_C" >&6
3290 test -z "$cf_list_models" && cf_list_models=normal
3291 test "$with_libtool" != "no" && cf_list_models=libtool
3292-echo "$as_me:5320: result: $cf_list_models" >&5
3293+echo "$as_me:5322: result: $cf_list_models" >&5
3294 echo "${ECHO_T}$cf_list_models" >&6
3295
3296 ### Use the first model as the default, and save its suffix for use in building
3297 ### up test-applications.
3298-echo "$as_me:5325: checking for default model" >&5
3299+echo "$as_me:5327: checking for default model" >&5
3300 echo $ECHO_N "checking for default model... $ECHO_C" >&6
3301 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
3302-echo "$as_me:5328: result: $DFT_LWR_MODEL" >&5
3303+echo "$as_me:5330: result: $DFT_LWR_MODEL" >&5
3304 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
3305
3306 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
3307@@ -5339,7 +5341,7 @@
3308 LIB_DIR=../lib
3309 LIB_2ND=../../lib
3310
3311-echo "$as_me:5342: checking if you want to have a library-prefix" >&5
3312+echo "$as_me:5344: checking if you want to have a library-prefix" >&5
3313 echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6
3314
3315 # Check whether --with-lib-prefix or --without-lib-prefix was given.
3316@@ -5349,7 +5351,7 @@
3317 else
3318   with_lib_prefix=auto
3319 fi;
3320-echo "$as_me:5352: result: $with_lib_prefix" >&5
3321+echo "$as_me:5354: result: $with_lib_prefix" >&5
3322 echo "${ECHO_T}$with_lib_prefix" >&6
3323
3324 if test $with_lib_prefix = auto
3325@@ -5377,19 +5379,19 @@
3326
3327 LIB_SUFFIX=
3328
3329-	echo "$as_me:5380: checking for PATH separator" >&5
3330+	echo "$as_me:5382: checking for PATH separator" >&5
3331 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
3332 	case $cf_cv_system_name in
3333 	(os2*)	PATH_SEPARATOR=';'  ;;
3334 	(*)	${PATH_SEPARATOR:=':'}  ;;
3335 	esac
3336
3337-	echo "$as_me:5387: result: $PATH_SEPARATOR" >&5
3338+	echo "$as_me:5389: result: $PATH_SEPARATOR" >&5
3339 echo "${ECHO_T}$PATH_SEPARATOR" >&6
3340
3341 ###############################################################################
3342
3343-echo "$as_me:5392: checking if you want to build a separate terminfo library" >&5
3344+echo "$as_me:5394: checking if you want to build a separate terminfo library" >&5
3345 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
3346
3347 # Check whether --with-termlib or --without-termlib was given.
3348@@ -5399,10 +5401,10 @@
3349 else
3350   with_termlib=no
3351 fi;
3352-echo "$as_me:5402: result: $with_termlib" >&5
3353+echo "$as_me:5404: result: $with_termlib" >&5
3354 echo "${ECHO_T}$with_termlib" >&6
3355
3356-echo "$as_me:5405: checking if you want to build a separate tic library" >&5
3357+echo "$as_me:5407: checking if you want to build a separate tic library" >&5
3358 echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
3359
3360 # Check whether --with-ticlib or --without-ticlib was given.
3361@@ -5412,7 +5414,7 @@
3362 else
3363   with_ticlib=no
3364 fi;
3365-echo "$as_me:5415: result: $with_ticlib" >&5
3366+echo "$as_me:5417: result: $with_ticlib" >&5
3367 echo "${ECHO_T}$with_ticlib" >&6
3368
3369 if test X"$CC_G_OPT" = X"" ; then
3370@@ -5425,7 +5427,7 @@
3371 	test -n "$GXX" && test "x${ac_cv_prog_cxx_g}" != xyes && CXX_G_OPT=''
3372 fi
3373
3374-echo "$as_me:5428: checking for default loader flags" >&5
3375+echo "$as_me:5430: checking for default loader flags" >&5
3376 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
3377 case $DFT_LWR_MODEL in
3378 (libtool) LD_MODEL=''   ;;
3379@@ -5434,13 +5436,13 @@
3380 (profile) LD_MODEL='-pg';;
3381 (shared)  LD_MODEL=''   ;;
3382 esac
3383-echo "$as_me:5437: result: $LD_MODEL" >&5
3384+echo "$as_me:5439: result: $LD_MODEL" >&5
3385 echo "${ECHO_T}$LD_MODEL" >&6
3386
3387 case $DFT_LWR_MODEL in
3388 (shared)
3389
3390-echo "$as_me:5443: checking if rpath option should be used" >&5
3391+echo "$as_me:5445: checking if rpath option should be used" >&5
3392 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
3393
3394 # Check whether --enable-rpath or --disable-rpath was given.
3395@@ -5450,10 +5452,10 @@
3396 else
3397   cf_cv_enable_rpath=no
3398 fi;
3399-echo "$as_me:5453: result: $cf_cv_enable_rpath" >&5
3400+echo "$as_me:5455: result: $cf_cv_enable_rpath" >&5
3401 echo "${ECHO_T}$cf_cv_enable_rpath" >&6
3402
3403-echo "$as_me:5456: checking if shared libraries should be relinked during install" >&5
3404+echo "$as_me:5458: checking if shared libraries should be relinked during install" >&5
3405 echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
3406
3407 # Check whether --enable-relink or --disable-relink was given.
3408@@ -5463,7 +5465,7 @@
3409 else
3410   cf_cv_do_relink=yes
3411 fi;
3412-echo "$as_me:5466: result: $cf_cv_do_relink" >&5
3413+echo "$as_me:5468: result: $cf_cv_do_relink" >&5
3414 echo "${ECHO_T}$cf_cv_do_relink" >&6
3415 	;;
3416 esac
3417@@ -5474,7 +5476,7 @@
3418 LD_RPATH_OPT=
3419 if test "x$cf_cv_enable_rpath" != xno
3420 then
3421-	echo "$as_me:5477: checking for an rpath option" >&5
3422+	echo "$as_me:5479: checking for an rpath option" >&5
3423 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
3424 	case $cf_cv_system_name in
3425 	(irix*)
3426@@ -5505,12 +5507,12 @@
3427 	(*)
3428 		;;
3429 	esac
3430-	echo "$as_me:5508: result: $LD_RPATH_OPT" >&5
3431+	echo "$as_me:5510: result: $LD_RPATH_OPT" >&5
3432 echo "${ECHO_T}$LD_RPATH_OPT" >&6
3433
3434 	case "x$LD_RPATH_OPT" in
3435 	(x-R*)
3436-		echo "$as_me:5513: checking if we need a space after rpath option" >&5
3437+		echo "$as_me:5515: checking if we need a space after rpath option" >&5
3438 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
3439 		cf_save_LIBS="$LIBS"
3440
3441@@ -5531,7 +5533,7 @@
3442 LIBS="$cf_add_libs"
3443
3444 		cat >conftest.$ac_ext <<_ACEOF
3445-#line 5534 "configure"
3446+#line 5536 "configure"
3447 #include "confdefs.h"
3448
3449 int
3450@@ -5543,16 +5545,16 @@
3451 }
3452 _ACEOF
3453 rm -f conftest.$ac_objext conftest$ac_exeext
3454-if { (eval echo "$as_me:5546: \"$ac_link\"") >&5
3455+if { (eval echo "$as_me:5548: \"$ac_link\"") >&5
3456   (eval $ac_link) 2>&5
3457   ac_status=$?
3458-  echo "$as_me:5549: \$? = $ac_status" >&5
3459+  echo "$as_me:5551: \$? = $ac_status" >&5
3460   (exit $ac_status); } &&
3461          { ac_try='test -s conftest$ac_exeext'
3462-  { (eval echo "$as_me:5552: \"$ac_try\"") >&5
3463+  { (eval echo "$as_me:5554: \"$ac_try\"") >&5
3464   (eval $ac_try) 2>&5
3465   ac_status=$?
3466-  echo "$as_me:5555: \$? = $ac_status" >&5
3467+  echo "$as_me:5557: \$? = $ac_status" >&5
3468   (exit $ac_status); }; }; then
3469   cf_rpath_space=no
3470 else
3471@@ -5562,7 +5564,7 @@
3472 fi
3473 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3474 		LIBS="$cf_save_LIBS"
3475-		echo "$as_me:5565: result: $cf_rpath_space" >&5
3476+		echo "$as_me:5567: result: $cf_rpath_space" >&5
3477 echo "${ECHO_T}$cf_rpath_space" >&6
3478 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
3479 		;;
3480@@ -5584,7 +5586,7 @@
3481 	cf_ld_rpath_opt=
3482 	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
3483
3484-	echo "$as_me:5587: checking if release/abi version should be used for shared libs" >&5
3485+	echo "$as_me:5589: checking if release/abi version should be used for shared libs" >&5
3486 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
3487
3488 # Check whether --with-shlib-version or --without-shlib-version was given.
3489@@ -5599,9 +5601,9 @@
3490 		cf_cv_shlib_version=$withval
3491 		;;
3492 	(*)
3493-		echo "$as_me:5602: result: $withval" >&5
3494+		echo "$as_me:5604: result: $withval" >&5
3495 echo "${ECHO_T}$withval" >&6
3496-		{ { echo "$as_me:5604: error: option value must be one of: rel, abi, or auto" >&5
3497+		{ { echo "$as_me:5606: error: option value must be one of: rel, abi, or auto" >&5
3498 echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;}
3499    { (exit 1); exit 1; }; }
3500 		;;
3501@@ -5610,7 +5612,7 @@
3502 else
3503   cf_cv_shlib_version=auto
3504 fi;
3505-	echo "$as_me:5613: result: $cf_cv_shlib_version" >&5
3506+	echo "$as_me:5615: result: $cf_cv_shlib_version" >&5
3507 echo "${ECHO_T}$cf_cv_shlib_version" >&6
3508
3509 	cf_cv_rm_so_locs=no
3510@@ -5633,14 +5635,14 @@
3511
3512 	if test "$cf_try_fPIC" = yes
3513 	then
3514-		echo "$as_me:5636: checking which $CC option to use" >&5
3515+		echo "$as_me:5638: checking which $CC option to use" >&5
3516 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
3517 		cf_save_CFLAGS="$CFLAGS"
3518 		for CC_SHARED_OPTS in -fPIC -fpic ''
3519 		do
3520 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
3521 			cat >conftest.$ac_ext <<_ACEOF
3522-#line 5643 "configure"
3523+#line 5645 "configure"
3524 #include "confdefs.h"
3525 #include <stdio.h>
3526 int
3527@@ -5652,16 +5654,16 @@
3528 }
3529 _ACEOF
3530 rm -f conftest.$ac_objext
3531-if { (eval echo "$as_me:5655: \"$ac_compile\"") >&5
3532+if { (eval echo "$as_me:5657: \"$ac_compile\"") >&5
3533   (eval $ac_compile) 2>&5
3534   ac_status=$?
3535-  echo "$as_me:5658: \$? = $ac_status" >&5
3536+  echo "$as_me:5660: \$? = $ac_status" >&5
3537   (exit $ac_status); } &&
3538          { ac_try='test -s conftest.$ac_objext'
3539-  { (eval echo "$as_me:5661: \"$ac_try\"") >&5
3540+  { (eval echo "$as_me:5663: \"$ac_try\"") >&5
3541   (eval $ac_try) 2>&5
3542   ac_status=$?
3543-  echo "$as_me:5664: \$? = $ac_status" >&5
3544+  echo "$as_me:5666: \$? = $ac_status" >&5
3545   (exit $ac_status); }; }; then
3546   break
3547 else
3548@@ -5670,7 +5672,7 @@
3549 fi
3550 rm -f conftest.$ac_objext conftest.$ac_ext
3551 		done
3552-		echo "$as_me:5673: result: $CC_SHARED_OPTS" >&5
3553+		echo "$as_me:5675: result: $CC_SHARED_OPTS" >&5
3554 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
3555 		CFLAGS="$cf_save_CFLAGS"
3556 	fi
3557@@ -5741,7 +5743,7 @@
3558 		MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
3559 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
3560 		cf_cv_shlib_version_infix=yes
3561-		echo "$as_me:5744: checking if ld -search_paths_first works" >&5
3562+		echo "$as_me:5746: checking if ld -search_paths_first works" >&5
3563 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
3564 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
3565   echo $ECHO_N "(cached) $ECHO_C" >&6
3566@@ -5750,7 +5752,7 @@
3567 			cf_save_LDFLAGS=$LDFLAGS
3568 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
3569 			cat >conftest.$ac_ext <<_ACEOF
3570-#line 5753 "configure"
3571+#line 5755 "configure"
3572 #include "confdefs.h"
3573
3574 int
3575@@ -5762,16 +5764,16 @@
3576 }
3577 _ACEOF
3578 rm -f conftest.$ac_objext conftest$ac_exeext
3579-if { (eval echo "$as_me:5765: \"$ac_link\"") >&5
3580+if { (eval echo "$as_me:5767: \"$ac_link\"") >&5
3581   (eval $ac_link) 2>&5
3582   ac_status=$?
3583-  echo "$as_me:5768: \$? = $ac_status" >&5
3584+  echo "$as_me:5770: \$? = $ac_status" >&5
3585   (exit $ac_status); } &&
3586          { ac_try='test -s conftest$ac_exeext'
3587-  { (eval echo "$as_me:5771: \"$ac_try\"") >&5
3588+  { (eval echo "$as_me:5773: \"$ac_try\"") >&5
3589   (eval $ac_try) 2>&5
3590   ac_status=$?
3591-  echo "$as_me:5774: \$? = $ac_status" >&5
3592+  echo "$as_me:5776: \$? = $ac_status" >&5
3593   (exit $ac_status); }; }; then
3594   cf_cv_ldflags_search_paths_first=yes
3595 else
3596@@ -5782,7 +5784,7 @@
3597 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3598 				LDFLAGS=$cf_save_LDFLAGS
3599 fi
3600-echo "$as_me:5785: result: $cf_cv_ldflags_search_paths_first" >&5
3601+echo "$as_me:5787: result: $cf_cv_ldflags_search_paths_first" >&5
3602 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
3603 		if test $cf_cv_ldflags_search_paths_first = yes; then
3604 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
3605@@ -6007,7 +6009,7 @@
3606 			do
3607 				CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
3608 				cat >conftest.$ac_ext <<_ACEOF
3609-#line 6010 "configure"
3610+#line 6012 "configure"
3611 #include "confdefs.h"
3612 #include <stdio.h>
3613 int
3614@@ -6019,16 +6021,16 @@
3615 }
3616 _ACEOF
3617 rm -f conftest.$ac_objext
3618-if { (eval echo "$as_me:6022: \"$ac_compile\"") >&5
3619+if { (eval echo "$as_me:6024: \"$ac_compile\"") >&5
3620   (eval $ac_compile) 2>&5
3621   ac_status=$?
3622-  echo "$as_me:6025: \$? = $ac_status" >&5
3623+  echo "$as_me:6027: \$? = $ac_status" >&5
3624   (exit $ac_status); } &&
3625          { ac_try='test -s conftest.$ac_objext'
3626-  { (eval echo "$as_me:6028: \"$ac_try\"") >&5
3627+  { (eval echo "$as_me:6030: \"$ac_try\"") >&5
3628   (eval $ac_try) 2>&5
3629   ac_status=$?
3630-  echo "$as_me:6031: \$? = $ac_status" >&5
3631+  echo "$as_me:6033: \$? = $ac_status" >&5
3632   (exit $ac_status); }; }; then
3633   break
3634 else
3635@@ -6065,7 +6067,7 @@
3636 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
3637 			;;
3638 		(*)
3639-			{ echo "$as_me:6068: WARNING: ignored --with-shlib-version" >&5
3640+			{ echo "$as_me:6070: WARNING: ignored --with-shlib-version" >&5
3641 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
3642 			;;
3643 		esac
3644@@ -6075,7 +6077,7 @@
3645 	if test -n "$cf_try_cflags"
3646 	then
3647 cat > conftest.$ac_ext <<EOF
3648-#line 6078 "${as_me:-configure}"
3649+#line 6080 "${as_me:-configure}"
3650 #include <stdio.h>
3651 int main(int argc, char *argv[])
3652 {
3653@@ -6087,18 +6089,18 @@
3654 		for cf_opt in $cf_try_cflags
3655 		do
3656 			CFLAGS="$cf_save_CFLAGS -$cf_opt"
3657-			echo "$as_me:6090: checking if CFLAGS option -$cf_opt works" >&5
3658+			echo "$as_me:6092: checking if CFLAGS option -$cf_opt works" >&5
3659 echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6
3660-			if { (eval echo "$as_me:6092: \"$ac_compile\"") >&5
3661+			if { (eval echo "$as_me:6094: \"$ac_compile\"") >&5
3662   (eval $ac_compile) 2>&5
3663   ac_status=$?
3664-  echo "$as_me:6095: \$? = $ac_status" >&5
3665+  echo "$as_me:6097: \$? = $ac_status" >&5
3666   (exit $ac_status); }; then
3667-				echo "$as_me:6097: result: yes" >&5
3668+				echo "$as_me:6099: result: yes" >&5
3669 echo "${ECHO_T}yes" >&6
3670 				cf_save_CFLAGS="$CFLAGS"
3671 			else
3672-				echo "$as_me:6101: result: no" >&5
3673+				echo "$as_me:6103: result: no" >&5
3674 echo "${ECHO_T}no" >&6
3675 			fi
3676 		done
3677@@ -6113,17 +6115,17 @@
3678
3679 	test -n "$verbose" && echo "	CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6
3680
3681-echo "${as_me:-configure}:6116: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
3682+echo "${as_me:-configure}:6118: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5
3683
3684 	test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
3685
3686-echo "${as_me:-configure}:6120: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
3687+echo "${as_me:-configure}:6122: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
3688
3689 for model in $cf_list_models; do
3690 	case $model in
3691 	(libtool)
3692
3693-echo "$as_me:6126: checking for additional libtool options" >&5
3694+echo "$as_me:6128: checking for additional libtool options" >&5
3695 echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6
3696
3697 # Check whether --with-libtool-opts or --without-libtool-opts was given.
3698@@ -6133,7 +6135,7 @@
3699 else
3700   with_libtool_opts=no
3701 fi;
3702-echo "$as_me:6136: result: $with_libtool_opts" >&5
3703+echo "$as_me:6138: result: $with_libtool_opts" >&5
3704 echo "${ECHO_T}$with_libtool_opts" >&6
3705
3706 case .$with_libtool_opts in
3707@@ -6144,7 +6146,7 @@
3708 	;;
3709 esac
3710
3711-echo "$as_me:6147: checking if exported-symbols file should be used" >&5
3712+echo "$as_me:6149: checking if exported-symbols file should be used" >&5
3713 echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6
3714
3715 # Check whether --with-export-syms or --without-export-syms was given.
3716@@ -6159,7 +6161,7 @@
3717 	with_export_syms='${top_srcdir}/package/${PACKAGE}.sym'
3718
3719 fi
3720-echo "$as_me:6162: result: $with_export_syms" >&5
3721+echo "$as_me:6164: result: $with_export_syms" >&5
3722 echo "${ECHO_T}$with_export_syms" >&6
3723 if test "x$with_export_syms" != xno
3724 then
3725@@ -6170,15 +6172,15 @@
3726 		;;
3727 	(shared)
3728 		if test "$CC_SHARED_OPTS" = "unknown"; then
3729-			{ { echo "$as_me:6173: error: Shared libraries are not supported in this version" >&5
3730+			{ { echo "$as_me:6175: error: Shared libraries are not supported in this version" >&5
3731 echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
3732    { (exit 1); exit 1; }; }
3733 		fi
3734 		# workaround for inept transition to PIE vs PIC...
3735-		echo "$as_me:6178: checking if current CFLAGS link properly" >&5
3736+		echo "$as_me:6180: checking if current CFLAGS link properly" >&5
3737 echo $ECHO_N "checking if current CFLAGS link properly... $ECHO_C" >&6
3738 		cat >conftest.$ac_ext <<_ACEOF
3739-#line 6181 "configure"
3740+#line 6183 "configure"
3741 #include "confdefs.h"
3742 #include <stdio.h>
3743 int
3744@@ -6190,16 +6192,16 @@
3745 }
3746 _ACEOF
3747 rm -f conftest.$ac_objext conftest$ac_exeext
3748-if { (eval echo "$as_me:6193: \"$ac_link\"") >&5
3749+if { (eval echo "$as_me:6195: \"$ac_link\"") >&5
3750   (eval $ac_link) 2>&5
3751   ac_status=$?
3752-  echo "$as_me:6196: \$? = $ac_status" >&5
3753+  echo "$as_me:6198: \$? = $ac_status" >&5
3754   (exit $ac_status); } &&
3755          { ac_try='test -s conftest$ac_exeext'
3756-  { (eval echo "$as_me:6199: \"$ac_try\"") >&5
3757+  { (eval echo "$as_me:6201: \"$ac_try\"") >&5
3758   (eval $ac_try) 2>&5
3759   ac_status=$?
3760-  echo "$as_me:6202: \$? = $ac_status" >&5
3761+  echo "$as_me:6204: \$? = $ac_status" >&5
3762   (exit $ac_status); }; }; then
3763   cf_cflags_work=yes
3764 else
3765@@ -6208,18 +6210,18 @@
3766 cf_cflags_work=no
3767 fi
3768 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3769-		echo "$as_me:6211: result: $cf_cflags_work" >&5
3770+		echo "$as_me:6213: result: $cf_cflags_work" >&5
3771 echo "${ECHO_T}$cf_cflags_work" >&6
3772 		if test "$cf_cflags_work" = no
3773 		then
3774 			test -n "$verbose" && echo "	try to work around by appending shared-options" 1>&6
3775
3776-echo "${as_me:-configure}:6217: testing try to work around by appending shared-options ..." 1>&5
3777+echo "${as_me:-configure}:6219: testing try to work around by appending shared-options ..." 1>&5
3778
3779 			CFLAGS="$CFLAGS $CC_SHARED_OPTS"
3780 		fi
3781
3782-echo "$as_me:6222: checking if versioned-symbols file should be used" >&5
3783+echo "$as_me:6224: checking if versioned-symbols file should be used" >&5
3784 echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6
3785
3786 # Check whether --with-versioned-syms or --without-versioned-syms was given.
3787@@ -6237,18 +6239,18 @@
3788 (xno)
3789 	;;
3790 (x/*)
3791-	test -f "$with_versioned_syms" || { { echo "$as_me:6240: error: expected a filename: $with_versioned_syms" >&5
3792+	test -f "$with_versioned_syms" || { { echo "$as_me:6242: error: expected a filename: $with_versioned_syms" >&5
3793 echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
3794    { (exit 1); exit 1; }; }
3795 	;;
3796 (*)
3797-	test -f "$with_versioned_syms" || { { echo "$as_me:6245: error: expected a filename: $with_versioned_syms" >&5
3798+	test -f "$with_versioned_syms" || { { echo "$as_me:6247: error: expected a filename: $with_versioned_syms" >&5
3799 echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;}
3800    { (exit 1); exit 1; }; }
3801 	with_versioned_syms=`pwd`/"$with_versioned_syms"
3802 	;;
3803 esac
3804-echo "$as_me:6251: result: $with_versioned_syms" >&5
3805+echo "$as_me:6253: result: $with_versioned_syms" >&5
3806 echo "${ECHO_T}$with_versioned_syms" >&6
3807
3808 RESULTING_SYMS=
3809@@ -6264,7 +6266,7 @@
3810 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"`
3811 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
3812
3813-echo "${as_me:-configure}:6267: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
3814+echo "${as_me:-configure}:6269: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
3815
3816 		;;
3817 	(*-dy\ *)
3818@@ -6272,11 +6274,11 @@
3819 		MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"`
3820 		test -n "$verbose" && echo "	MK_SHARED_LIB:  $MK_SHARED_LIB" 1>&6
3821
3822-echo "${as_me:-configure}:6275: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
3823+echo "${as_me:-configure}:6277: testing MK_SHARED_LIB:  $MK_SHARED_LIB ..." 1>&5
3824
3825 		;;
3826 	(*)
3827-		{ echo "$as_me:6279: WARNING: this system does not support versioned-symbols" >&5
3828+		{ echo "$as_me:6281: WARNING: this system does not support versioned-symbols" >&5
3829 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;}
3830 		;;
3831 	esac
3832@@ -6288,7 +6290,7 @@
3833 	# symbols.
3834 	if test "x$VERSIONED_SYMS" != "x"
3835 	then
3836-		echo "$as_me:6291: checking if wildcards can be used to selectively omit symbols" >&5
3837+		echo "$as_me:6293: checking if wildcards can be used to selectively omit symbols" >&5
3838 echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6
3839 		WILDCARD_SYMS=no
3840
3841@@ -6325,7 +6327,7 @@
3842 } submodule_1.0;
3843 EOF
3844 		cat >conftest.$ac_ext <<EOF
3845-#line 6328 "configure"
3846+#line 6330 "configure"
3847 int	_ismissing(void) { return 1; }
3848 int	_localf1(void) { return 1; }
3849 int	_localf2(void) { return 2; }
3850@@ -6356,7 +6358,7 @@
3851 			cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ 	][DT][ 	]'`
3852 			test -n "$cf_missing" && WILDCARD_SYMS=yes
3853 		fi
3854-		echo "$as_me:6359: result: $WILDCARD_SYMS" >&5
3855+		echo "$as_me:6361: result: $WILDCARD_SYMS" >&5
3856 echo "${ECHO_T}$WILDCARD_SYMS" >&6
3857 		rm -f conftest.*
3858 	fi
3859@@ -6369,7 +6371,7 @@
3860 ### Checks for special libraries, must be done up-front.
3861 SHLIB_LIST=""
3862
3863-echo "$as_me:6372: checking if you want to link with the GPM mouse library" >&5
3864+echo "$as_me:6374: checking if you want to link with the GPM mouse library" >&5
3865 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
3866
3867 # Check whether --with-gpm or --without-gpm was given.
3868@@ -6379,27 +6381,27 @@
3869 else
3870   with_gpm=maybe
3871 fi;
3872-echo "$as_me:6382: result: $with_gpm" >&5
3873+echo "$as_me:6384: result: $with_gpm" >&5
3874 echo "${ECHO_T}$with_gpm" >&6
3875
3876 if test "$with_gpm" != no ; then
3877-	echo "$as_me:6386: checking for gpm.h" >&5
3878+	echo "$as_me:6388: checking for gpm.h" >&5
3879 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
3880 if test "${ac_cv_header_gpm_h+set}" = set; then
3881   echo $ECHO_N "(cached) $ECHO_C" >&6
3882 else
3883   cat >conftest.$ac_ext <<_ACEOF
3884-#line 6392 "configure"
3885+#line 6394 "configure"
3886 #include "confdefs.h"
3887 #include <gpm.h>
3888 _ACEOF
3889-if { (eval echo "$as_me:6396: \"$ac_cpp conftest.$ac_ext\"") >&5
3890+if { (eval echo "$as_me:6398: \"$ac_cpp conftest.$ac_ext\"") >&5
3891   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
3892   ac_status=$?
3893   egrep -v '^ *\+' conftest.er1 >conftest.err
3894   rm -f conftest.er1
3895   cat conftest.err >&5
3896-  echo "$as_me:6402: \$? = $ac_status" >&5
3897+  echo "$as_me:6404: \$? = $ac_status" >&5
3898   (exit $ac_status); } >/dev/null; then
3899   if test -s conftest.err; then
3900     ac_cpp_err=$ac_c_preproc_warn_flag
3901@@ -6418,7 +6420,7 @@
3902 fi
3903 rm -f conftest.err conftest.$ac_ext
3904 fi
3905-echo "$as_me:6421: result: $ac_cv_header_gpm_h" >&5
3906+echo "$as_me:6423: result: $ac_cv_header_gpm_h" >&5
3907 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
3908 if test $ac_cv_header_gpm_h = yes; then
3909
3910@@ -6429,7 +6431,7 @@
3911 		if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
3912 			test -n "$verbose" && echo "	assuming we really have GPM library" 1>&6
3913
3914-echo "${as_me:-configure}:6432: testing assuming we really have GPM library ..." 1>&5
3915+echo "${as_me:-configure}:6434: testing assuming we really have GPM library ..." 1>&5
3916
3917 cat >>confdefs.h <<\EOF
3918 #define HAVE_LIBGPM 1
3919@@ -6437,7 +6439,7 @@
3920
3921 			with_gpm=yes
3922 		else
3923-			echo "$as_me:6440: checking for Gpm_Open in -lgpm" >&5
3924+			echo "$as_me:6442: checking for Gpm_Open in -lgpm" >&5
3925 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
3926 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
3927   echo $ECHO_N "(cached) $ECHO_C" >&6
3928@@ -6445,7 +6447,7 @@
3929   ac_check_lib_save_LIBS=$LIBS
3930 LIBS="-lgpm  $LIBS"
3931 cat >conftest.$ac_ext <<_ACEOF
3932-#line 6448 "configure"
3933+#line 6450 "configure"
3934 #include "confdefs.h"
3935
3936 /* Override any gcc2 internal prototype to avoid an error.  */
3937@@ -6464,16 +6466,16 @@
3938 }
3939 _ACEOF
3940 rm -f conftest.$ac_objext conftest$ac_exeext
3941-if { (eval echo "$as_me:6467: \"$ac_link\"") >&5
3942+if { (eval echo "$as_me:6469: \"$ac_link\"") >&5
3943   (eval $ac_link) 2>&5
3944   ac_status=$?
3945-  echo "$as_me:6470: \$? = $ac_status" >&5
3946+  echo "$as_me:6472: \$? = $ac_status" >&5
3947   (exit $ac_status); } &&
3948          { ac_try='test -s conftest$ac_exeext'
3949-  { (eval echo "$as_me:6473: \"$ac_try\"") >&5
3950+  { (eval echo "$as_me:6475: \"$ac_try\"") >&5
3951   (eval $ac_try) 2>&5
3952   ac_status=$?
3953-  echo "$as_me:6476: \$? = $ac_status" >&5
3954+  echo "$as_me:6478: \$? = $ac_status" >&5
3955   (exit $ac_status); }; }; then
3956   ac_cv_lib_gpm_Gpm_Open=yes
3957 else
3958@@ -6484,18 +6486,18 @@
3959 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3960 LIBS=$ac_check_lib_save_LIBS
3961 fi
3962-echo "$as_me:6487: result: $ac_cv_lib_gpm_Gpm_Open" >&5
3963+echo "$as_me:6489: result: $ac_cv_lib_gpm_Gpm_Open" >&5
3964 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
3965 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
3966   with_gpm=yes
3967 else
3968
3969 				if test "$with_gpm" = maybe; then
3970-					{ echo "$as_me:6494: WARNING: Cannot link with GPM library" >&5
3971+					{ echo "$as_me:6496: WARNING: Cannot link with GPM library" >&5
3972 echo "$as_me: WARNING: Cannot link with GPM library" >&2;}
3973 					with_gpm=no
3974 				else
3975-					{ { echo "$as_me:6498: error: Cannot link with GPM library" >&5
3976+					{ { echo "$as_me:6500: error: Cannot link with GPM library" >&5
3977 echo "$as_me: error: Cannot link with GPM library" >&2;}
3978    { (exit 1); exit 1; }; }
3979 				fi
3980@@ -6506,7 +6508,7 @@
3981
3982 else
3983
3984-		test "$with_gpm" != maybe && { echo "$as_me:6509: WARNING: Cannot find GPM header" >&5
3985+		test "$with_gpm" != maybe && { echo "$as_me:6511: WARNING: Cannot find GPM header" >&5
3986 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
3987 		with_gpm=no
3988
3989@@ -6515,7 +6517,7 @@
3990 fi
3991
3992 if test "$with_gpm" != no ; then
3993-	echo "$as_me:6518: checking if you want to load GPM dynamically" >&5
3994+	echo "$as_me:6520: checking if you want to load GPM dynamically" >&5
3995 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
3996
3997 # Check whether --with-dlsym or --without-dlsym was given.
3998@@ -6525,18 +6527,18 @@
3999 else
4000   with_dlsym=yes
4001 fi;
4002-	echo "$as_me:6528: result: $with_dlsym" >&5
4003+	echo "$as_me:6530: result: $with_dlsym" >&5
4004 echo "${ECHO_T}$with_dlsym" >&6
4005 	if test "x$with_dlsym" = xyes ; then
4006
4007 cf_have_dlsym=no
4008-echo "$as_me:6533: checking for dlsym" >&5
4009+echo "$as_me:6535: checking for dlsym" >&5
4010 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
4011 if test "${ac_cv_func_dlsym+set}" = set; then
4012   echo $ECHO_N "(cached) $ECHO_C" >&6
4013 else
4014   cat >conftest.$ac_ext <<_ACEOF
4015-#line 6539 "configure"
4016+#line 6541 "configure"
4017 #include "confdefs.h"
4018 #define dlsym autoconf_temporary
4019 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
4020@@ -6567,16 +6569,16 @@
4021 }
4022 _ACEOF
4023 rm -f conftest.$ac_objext conftest$ac_exeext
4024-if { (eval echo "$as_me:6570: \"$ac_link\"") >&5
4025+if { (eval echo "$as_me:6572: \"$ac_link\"") >&5
4026   (eval $ac_link) 2>&5
4027   ac_status=$?
4028-  echo "$as_me:6573: \$? = $ac_status" >&5
4029+  echo "$as_me:6575: \$? = $ac_status" >&5
4030   (exit $ac_status); } &&
4031          { ac_try='test -s conftest$ac_exeext'
4032-  { (eval echo "$as_me:6576: \"$ac_try\"") >&5
4033+  { (eval echo "$as_me:6578: \"$ac_try\"") >&5
4034   (eval $ac_try) 2>&5
4035   ac_status=$?
4036-  echo "$as_me:6579: \$? = $ac_status" >&5
4037+  echo "$as_me:6581: \$? = $ac_status" >&5
4038   (exit $ac_status); }; }; then
4039   ac_cv_func_dlsym=yes
4040 else
4041@@ -6586,14 +6588,14 @@
4042 fi
4043 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4044 fi
4045-echo "$as_me:6589: result: $ac_cv_func_dlsym" >&5
4046+echo "$as_me:6591: result: $ac_cv_func_dlsym" >&5
4047 echo "${ECHO_T}$ac_cv_func_dlsym" >&6
4048 if test $ac_cv_func_dlsym = yes; then
4049   cf_have_dlsym=yes
4050 else
4051
4052 cf_have_libdl=no
4053-echo "$as_me:6596: checking for dlsym in -ldl" >&5
4054+echo "$as_me:6598: checking for dlsym in -ldl" >&5
4055 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
4056 if test "${ac_cv_lib_dl_dlsym+set}" = set; then
4057   echo $ECHO_N "(cached) $ECHO_C" >&6
4058@@ -6601,7 +6603,7 @@
4059   ac_check_lib_save_LIBS=$LIBS
4060 LIBS="-ldl  $LIBS"
4061 cat >conftest.$ac_ext <<_ACEOF
4062-#line 6604 "configure"
4063+#line 6606 "configure"
4064 #include "confdefs.h"
4065
4066 /* Override any gcc2 internal prototype to avoid an error.  */
4067@@ -6620,16 +6622,16 @@
4068 }
4069 _ACEOF
4070 rm -f conftest.$ac_objext conftest$ac_exeext
4071-if { (eval echo "$as_me:6623: \"$ac_link\"") >&5
4072+if { (eval echo "$as_me:6625: \"$ac_link\"") >&5
4073   (eval $ac_link) 2>&5
4074   ac_status=$?
4075-  echo "$as_me:6626: \$? = $ac_status" >&5
4076+  echo "$as_me:6628: \$? = $ac_status" >&5
4077   (exit $ac_status); } &&
4078          { ac_try='test -s conftest$ac_exeext'
4079-  { (eval echo "$as_me:6629: \"$ac_try\"") >&5
4080+  { (eval echo "$as_me:6631: \"$ac_try\"") >&5
4081   (eval $ac_try) 2>&5
4082   ac_status=$?
4083-  echo "$as_me:6632: \$? = $ac_status" >&5
4084+  echo "$as_me:6634: \$? = $ac_status" >&5
4085   (exit $ac_status); }; }; then
4086   ac_cv_lib_dl_dlsym=yes
4087 else
4088@@ -6640,7 +6642,7 @@
4089 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4090 LIBS=$ac_check_lib_save_LIBS
4091 fi
4092-echo "$as_me:6643: result: $ac_cv_lib_dl_dlsym" >&5
4093+echo "$as_me:6645: result: $ac_cv_lib_dl_dlsym" >&5
4094 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
4095 if test $ac_cv_lib_dl_dlsym = yes; then
4096
4097@@ -6669,10 +6671,10 @@
4098 LIBS="$cf_add_libs"
4099  }
4100
4101-	echo "$as_me:6672: checking whether able to link to dl*() functions" >&5
4102+	echo "$as_me:6674: checking whether able to link to dl*() functions" >&5
4103 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
4104 	cat >conftest.$ac_ext <<_ACEOF
4105-#line 6675 "configure"
4106+#line 6677 "configure"
4107 #include "confdefs.h"
4108 #include <dlfcn.h>
4109 int
4110@@ -6690,16 +6692,16 @@
4111 }
4112 _ACEOF
4113 rm -f conftest.$ac_objext conftest$ac_exeext
4114-if { (eval echo "$as_me:6693: \"$ac_link\"") >&5
4115+if { (eval echo "$as_me:6695: \"$ac_link\"") >&5
4116   (eval $ac_link) 2>&5
4117   ac_status=$?
4118-  echo "$as_me:6696: \$? = $ac_status" >&5
4119+  echo "$as_me:6698: \$? = $ac_status" >&5
4120   (exit $ac_status); } &&
4121          { ac_try='test -s conftest$ac_exeext'
4122-  { (eval echo "$as_me:6699: \"$ac_try\"") >&5
4123+  { (eval echo "$as_me:6701: \"$ac_try\"") >&5
4124   (eval $ac_try) 2>&5
4125   ac_status=$?
4126-  echo "$as_me:6702: \$? = $ac_status" >&5
4127+  echo "$as_me:6704: \$? = $ac_status" >&5
4128   (exit $ac_status); }; }; then
4129
4130 cat >>confdefs.h <<\EOF
4131@@ -6710,15 +6712,15 @@
4132   echo "$as_me: failed program was:" >&5
4133 cat conftest.$ac_ext >&5
4134
4135-		{ { echo "$as_me:6713: error: Cannot link test program for libdl" >&5
4136+		{ { echo "$as_me:6715: error: Cannot link test program for libdl" >&5
4137 echo "$as_me: error: Cannot link test program for libdl" >&2;}
4138    { (exit 1); exit 1; }; }
4139 fi
4140 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4141-	echo "$as_me:6718: result: ok" >&5
4142+	echo "$as_me:6720: result: ok" >&5
4143 echo "${ECHO_T}ok" >&6
4144 else
4145-	{ { echo "$as_me:6721: error: Cannot find dlsym function" >&5
4146+	{ { echo "$as_me:6723: error: Cannot find dlsym function" >&5
4147 echo "$as_me: error: Cannot find dlsym function" >&2;}
4148    { (exit 1); exit 1; }; }
4149 fi
4150@@ -6726,12 +6728,12 @@
4151 		if test "x$with_gpm" != xyes ; then
4152 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
4153
4154-echo "${as_me:-configure}:6729: testing assuming soname for gpm is $with_gpm ..." 1>&5
4155+echo "${as_me:-configure}:6731: testing assuming soname for gpm is $with_gpm ..." 1>&5
4156
4157 			cf_cv_gpm_soname="$with_gpm"
4158 		else
4159
4160-echo "$as_me:6734: checking for soname of gpm library" >&5
4161+echo "$as_me:6736: checking for soname of gpm library" >&5
4162 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
4163 if test "${cf_cv_gpm_soname+set}" = set; then
4164   echo $ECHO_N "(cached) $ECHO_C" >&6
4165@@ -6765,15 +6767,15 @@
4166 done
4167 LIBS="$cf_add_libs"
4168
4169-	if { (eval echo "$as_me:6768: \"$ac_compile\"") >&5
4170+	if { (eval echo "$as_me:6770: \"$ac_compile\"") >&5
4171   (eval $ac_compile) 2>&5
4172   ac_status=$?
4173-  echo "$as_me:6771: \$? = $ac_status" >&5
4174+  echo "$as_me:6773: \$? = $ac_status" >&5
4175   (exit $ac_status); } ; then
4176-		if { (eval echo "$as_me:6773: \"$ac_link\"") >&5
4177+		if { (eval echo "$as_me:6775: \"$ac_link\"") >&5
4178   (eval $ac_link) 2>&5
4179   ac_status=$?
4180-  echo "$as_me:6776: \$? = $ac_status" >&5
4181+  echo "$as_me:6778: \$? = $ac_status" >&5
4182   (exit $ac_status); } ; then
4183 			cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
4184 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
4185@@ -6784,7 +6786,7 @@
4186 fi
4187
4188 fi
4189-echo "$as_me:6787: result: $cf_cv_gpm_soname" >&5
4190+echo "$as_me:6789: result: $cf_cv_gpm_soname" >&5
4191 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
4192
4193 		fi
4194@@ -6852,7 +6854,7 @@
4195 #define HAVE_LIBGPM 1
4196 EOF
4197
4198-echo "$as_me:6855: checking for Gpm_Wgetch in -lgpm" >&5
4199+echo "$as_me:6857: checking for Gpm_Wgetch in -lgpm" >&5
4200 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
4201 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
4202   echo $ECHO_N "(cached) $ECHO_C" >&6
4203@@ -6860,7 +6862,7 @@
4204   ac_check_lib_save_LIBS=$LIBS
4205 LIBS="-lgpm  $LIBS"
4206 cat >conftest.$ac_ext <<_ACEOF
4207-#line 6863 "configure"
4208+#line 6865 "configure"
4209 #include "confdefs.h"
4210
4211 /* Override any gcc2 internal prototype to avoid an error.  */
4212@@ -6879,16 +6881,16 @@
4213 }
4214 _ACEOF
4215 rm -f conftest.$ac_objext conftest$ac_exeext
4216-if { (eval echo "$as_me:6882: \"$ac_link\"") >&5
4217+if { (eval echo "$as_me:6884: \"$ac_link\"") >&5
4218   (eval $ac_link) 2>&5
4219   ac_status=$?
4220-  echo "$as_me:6885: \$? = $ac_status" >&5
4221+  echo "$as_me:6887: \$? = $ac_status" >&5
4222   (exit $ac_status); } &&
4223          { ac_try='test -s conftest$ac_exeext'
4224-  { (eval echo "$as_me:6888: \"$ac_try\"") >&5
4225+  { (eval echo "$as_me:6890: \"$ac_try\"") >&5
4226   (eval $ac_try) 2>&5
4227   ac_status=$?
4228-  echo "$as_me:6891: \$? = $ac_status" >&5
4229+  echo "$as_me:6893: \$? = $ac_status" >&5
4230   (exit $ac_status); }; }; then
4231   ac_cv_lib_gpm_Gpm_Wgetch=yes
4232 else
4233@@ -6899,11 +6901,11 @@
4234 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4235 LIBS=$ac_check_lib_save_LIBS
4236 fi
4237-echo "$as_me:6902: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
4238+echo "$as_me:6904: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
4239 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
4240 if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
4241
4242-echo "$as_me:6906: checking if GPM is weakly bound to curses library" >&5
4243+echo "$as_me:6908: checking if GPM is weakly bound to curses library" >&5
4244 echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
4245 if test "${cf_cv_check_gpm_wgetch+set}" = set; then
4246   echo $ECHO_N "(cached) $ECHO_C" >&6
4247@@ -6927,15 +6929,15 @@
4248 	# to rely on the static library, noting that some packagers may not
4249 	# include it.
4250 	LIBS="-static -lgpm -dynamic $LIBS"
4251-	if { (eval echo "$as_me:6930: \"$ac_compile\"") >&5
4252+	if { (eval echo "$as_me:6932: \"$ac_compile\"") >&5
4253   (eval $ac_compile) 2>&5
4254   ac_status=$?
4255-  echo "$as_me:6933: \$? = $ac_status" >&5
4256+  echo "$as_me:6935: \$? = $ac_status" >&5
4257   (exit $ac_status); } ; then
4258-		if { (eval echo "$as_me:6935: \"$ac_link\"") >&5
4259+		if { (eval echo "$as_me:6937: \"$ac_link\"") >&5
4260   (eval $ac_link) 2>&5
4261   ac_status=$?
4262-  echo "$as_me:6938: \$? = $ac_status" >&5
4263+  echo "$as_me:6940: \$? = $ac_status" >&5
4264   (exit $ac_status); } ; then
4265 			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
4266 			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
4267@@ -6947,11 +6949,11 @@
4268 fi
4269
4270 fi
4271-echo "$as_me:6950: result: $cf_cv_check_gpm_wgetch" >&5
4272+echo "$as_me:6952: result: $cf_cv_check_gpm_wgetch" >&5
4273 echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
4274
4275 if test "$cf_cv_check_gpm_wgetch" != yes ; then
4276-	{ echo "$as_me:6954: WARNING: GPM library is already linked with curses - read the FAQ" >&5
4277+	{ echo "$as_me:6956: WARNING: GPM library is already linked with curses - read the FAQ" >&5
4278 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
4279 fi
4280
4281@@ -6959,7 +6961,7 @@
4282
4283 fi
4284
4285-echo "$as_me:6962: checking if you want to use PCRE2 for regular-expressions" >&5
4286+echo "$as_me:6964: checking if you want to use PCRE2 for regular-expressions" >&5
4287 echo $ECHO_N "checking if you want to use PCRE2 for regular-expressions... $ECHO_C" >&6
4288
4289 # Check whether --with-pcre2 or --without-pcre2 was given.
4290@@ -6968,7 +6970,7 @@
4291
4292 fi;
4293 test -z "$with_pcre2" && with_pcre2=no
4294-echo "$as_me:6971: result: $with_pcre2" >&5
4295+echo "$as_me:6973: result: $with_pcre2" >&5
4296 echo "${ECHO_T}$with_pcre2" >&6
4297
4298 if test "x$with_pcre2" != xno ; then
4299@@ -6976,17 +6978,17 @@
4300 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre2; then
4301 	test -n "$verbose" && echo "	found package libpcre2" 1>&6
4302
4303-echo "${as_me:-configure}:6979: testing found package libpcre2 ..." 1>&5
4304+echo "${as_me:-configure}:6981: testing found package libpcre2 ..." 1>&5
4305
4306 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre2 2>/dev/null`"
4307 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   libpcre2 2>/dev/null`"
4308 	test -n "$verbose" && echo "	package libpcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6
4309
4310-echo "${as_me:-configure}:6985: testing package libpcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
4311+echo "${as_me:-configure}:6987: testing package libpcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
4312
4313 	test -n "$verbose" && echo "	package libpcre2 LIBS: $cf_pkgconfig_libs" 1>&6
4314
4315-echo "${as_me:-configure}:6989: testing package libpcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
4316+echo "${as_me:-configure}:6991: testing package libpcre2 LIBS: $cf_pkgconfig_libs ..." 1>&5
4317
4318 cf_fix_cppflags=no
4319 cf_new_cflags=
4320@@ -7110,17 +7112,17 @@
4321 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre; then
4322 	test -n "$verbose" && echo "	found package libpcre" 1>&6
4323
4324-echo "${as_me:-configure}:7113: testing found package libpcre ..." 1>&5
4325+echo "${as_me:-configure}:7115: testing found package libpcre ..." 1>&5
4326
4327 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre 2>/dev/null`"
4328 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   libpcre 2>/dev/null`"
4329 	test -n "$verbose" && echo "	package libpcre CFLAGS: $cf_pkgconfig_incs" 1>&6
4330
4331-echo "${as_me:-configure}:7119: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5
4332+echo "${as_me:-configure}:7121: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5
4333
4334 	test -n "$verbose" && echo "	package libpcre LIBS: $cf_pkgconfig_libs" 1>&6
4335
4336-echo "${as_me:-configure}:7123: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
4337+echo "${as_me:-configure}:7125: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5
4338
4339 cf_fix_cppflags=no
4340 cf_new_cflags=
4341@@ -7241,7 +7243,7 @@
4342 	cf_pkgconfig_incs=
4343 	cf_pkgconfig_libs=
4344
4345-			{ { echo "$as_me:7244: error: Cannot find PCRE2 library" >&5
4346+			{ { echo "$as_me:7246: error: Cannot find PCRE2 library" >&5
4347 echo "$as_me: error: Cannot find PCRE2 library" >&2;}
4348    { (exit 1); exit 1; }; }
4349 fi
4350@@ -7257,7 +7259,7 @@
4351 	(*pcre2-posix*|*pcreposix*)
4352 		;;
4353 	(*)
4354-		echo "$as_me:7260: checking for regcomp in -lpcre2-posix" >&5
4355+		echo "$as_me:7262: checking for regcomp in -lpcre2-posix" >&5
4356 echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6
4357 if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then
4358   echo $ECHO_N "(cached) $ECHO_C" >&6
4359@@ -7265,7 +7267,7 @@
4360   ac_check_lib_save_LIBS=$LIBS
4361 LIBS="-lpcre2-posix  $LIBS"
4362 cat >conftest.$ac_ext <<_ACEOF
4363-#line 7268 "configure"
4364+#line 7270 "configure"
4365 #include "confdefs.h"
4366
4367 /* Override any gcc2 internal prototype to avoid an error.  */
4368@@ -7284,16 +7286,16 @@
4369 }
4370 _ACEOF
4371 rm -f conftest.$ac_objext conftest$ac_exeext
4372-if { (eval echo "$as_me:7287: \"$ac_link\"") >&5
4373+if { (eval echo "$as_me:7289: \"$ac_link\"") >&5
4374   (eval $ac_link) 2>&5
4375   ac_status=$?
4376-  echo "$as_me:7290: \$? = $ac_status" >&5
4377+  echo "$as_me:7292: \$? = $ac_status" >&5
4378   (exit $ac_status); } &&
4379          { ac_try='test -s conftest$ac_exeext'
4380-  { (eval echo "$as_me:7293: \"$ac_try\"") >&5
4381+  { (eval echo "$as_me:7295: \"$ac_try\"") >&5
4382   (eval $ac_try) 2>&5
4383   ac_status=$?
4384-  echo "$as_me:7296: \$? = $ac_status" >&5
4385+  echo "$as_me:7298: \$? = $ac_status" >&5
4386   (exit $ac_status); }; }; then
4387   ac_cv_lib_pcre2_posix_regcomp=yes
4388 else
4389@@ -7304,7 +7306,7 @@
4390 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4391 LIBS=$ac_check_lib_save_LIBS
4392 fi
4393-echo "$as_me:7307: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
4394+echo "$as_me:7309: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
4395 echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6
4396 if test $ac_cv_lib_pcre2_posix_regcomp = yes; then
4397
4398@@ -7325,7 +7327,7 @@
4399 LIBS="$cf_add_libs"
4400
4401 else
4402-  echo "$as_me:7328: checking for regcomp in -lpcreposix" >&5
4403+  echo "$as_me:7330: checking for regcomp in -lpcreposix" >&5
4404 echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6
4405 if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then
4406   echo $ECHO_N "(cached) $ECHO_C" >&6
4407@@ -7333,7 +7335,7 @@
4408   ac_check_lib_save_LIBS=$LIBS
4409 LIBS="-lpcreposix  $LIBS"
4410 cat >conftest.$ac_ext <<_ACEOF
4411-#line 7336 "configure"
4412+#line 7338 "configure"
4413 #include "confdefs.h"
4414
4415 /* Override any gcc2 internal prototype to avoid an error.  */
4416@@ -7352,16 +7354,16 @@
4417 }
4418 _ACEOF
4419 rm -f conftest.$ac_objext conftest$ac_exeext
4420-if { (eval echo "$as_me:7355: \"$ac_link\"") >&5
4421+if { (eval echo "$as_me:7357: \"$ac_link\"") >&5
4422   (eval $ac_link) 2>&5
4423   ac_status=$?
4424-  echo "$as_me:7358: \$? = $ac_status" >&5
4425+  echo "$as_me:7360: \$? = $ac_status" >&5
4426   (exit $ac_status); } &&
4427          { ac_try='test -s conftest$ac_exeext'
4428-  { (eval echo "$as_me:7361: \"$ac_try\"") >&5
4429+  { (eval echo "$as_me:7363: \"$ac_try\"") >&5
4430   (eval $ac_try) 2>&5
4431   ac_status=$?
4432-  echo "$as_me:7364: \$? = $ac_status" >&5
4433+  echo "$as_me:7366: \$? = $ac_status" >&5
4434   (exit $ac_status); }; }; then
4435   ac_cv_lib_pcreposix_regcomp=yes
4436 else
4437@@ -7372,7 +7374,7 @@
4438 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4439 LIBS=$ac_check_lib_save_LIBS
4440 fi
4441-echo "$as_me:7375: result: $ac_cv_lib_pcreposix_regcomp" >&5
4442+echo "$as_me:7377: result: $ac_cv_lib_pcreposix_regcomp" >&5
4443 echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6
4444 if test $ac_cv_lib_pcreposix_regcomp = yes; then
4445
4446@@ -7393,7 +7395,7 @@
4447 LIBS="$cf_add_libs"
4448
4449 else
4450-  { { echo "$as_me:7396: error: Cannot find PCRE2 POSIX library" >&5
4451+  { { echo "$as_me:7398: error: Cannot find PCRE2 POSIX library" >&5
4452 echo "$as_me: error: Cannot find PCRE2 POSIX library" >&2;}
4453    { (exit 1); exit 1; }; }
4454 fi
4455@@ -7408,23 +7410,23 @@
4456 for ac_header in pcre2-posix.h pcreposix.h
4457 do
4458 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
4459-echo "$as_me:7411: checking for $ac_header" >&5
4460+echo "$as_me:7413: checking for $ac_header" >&5
4461 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
4462 if eval "test \"\${$as_ac_Header+set}\" = set"; then
4463   echo $ECHO_N "(cached) $ECHO_C" >&6
4464 else
4465   cat >conftest.$ac_ext <<_ACEOF
4466-#line 7417 "configure"
4467+#line 7419 "configure"
4468 #include "confdefs.h"
4469 #include <$ac_header>
4470 _ACEOF
4471-if { (eval echo "$as_me:7421: \"$ac_cpp conftest.$ac_ext\"") >&5
4472+if { (eval echo "$as_me:7423: \"$ac_cpp conftest.$ac_ext\"") >&5
4473   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
4474   ac_status=$?
4475   egrep -v '^ *\+' conftest.er1 >conftest.err
4476   rm -f conftest.er1
4477   cat conftest.err >&5
4478-  echo "$as_me:7427: \$? = $ac_status" >&5
4479+  echo "$as_me:7429: \$? = $ac_status" >&5
4480   (exit $ac_status); } >/dev/null; then
4481   if test -s conftest.err; then
4482     ac_cpp_err=$ac_c_preproc_warn_flag
4483@@ -7443,7 +7445,7 @@
4484 fi
4485 rm -f conftest.err conftest.$ac_ext
4486 fi
4487-echo "$as_me:7446: result: `eval echo '${'$as_ac_Header'}'`" >&5
4488+echo "$as_me:7448: result: `eval echo '${'$as_ac_Header'}'`" >&5
4489 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
4490 if test `eval echo '${'$as_ac_Header'}'` = yes; then
4491   cat >>confdefs.h <<EOF
4492@@ -7457,7 +7459,7 @@
4493
4494 # not everyone has "test -c"
4495 if test -c /dev/sysmouse 2>/dev/null ; then
4496-echo "$as_me:7460: checking if you want to use sysmouse" >&5
4497+echo "$as_me:7462: checking if you want to use sysmouse" >&5
4498 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
4499
4500 # Check whether --with-sysmouse or --without-sysmouse was given.
4501@@ -7469,7 +7471,7 @@
4502 fi;
4503 	if test "$cf_with_sysmouse" != no ; then
4504 	cat >conftest.$ac_ext <<_ACEOF
4505-#line 7472 "configure"
4506+#line 7474 "configure"
4507 #include "confdefs.h"
4508
4509 #include <osreldate.h>
4510@@ -7492,16 +7494,16 @@
4511 }
4512 _ACEOF
4513 rm -f conftest.$ac_objext
4514-if { (eval echo "$as_me:7495: \"$ac_compile\"") >&5
4515+if { (eval echo "$as_me:7497: \"$ac_compile\"") >&5
4516   (eval $ac_compile) 2>&5
4517   ac_status=$?
4518-  echo "$as_me:7498: \$? = $ac_status" >&5
4519+  echo "$as_me:7500: \$? = $ac_status" >&5
4520   (exit $ac_status); } &&
4521          { ac_try='test -s conftest.$ac_objext'
4522-  { (eval echo "$as_me:7501: \"$ac_try\"") >&5
4523+  { (eval echo "$as_me:7503: \"$ac_try\"") >&5
4524   (eval $ac_try) 2>&5
4525   ac_status=$?
4526-  echo "$as_me:7504: \$? = $ac_status" >&5
4527+  echo "$as_me:7506: \$? = $ac_status" >&5
4528   (exit $ac_status); }; }; then
4529   cf_with_sysmouse=yes
4530 else
4531@@ -7511,7 +7513,7 @@
4532 fi
4533 rm -f conftest.$ac_objext conftest.$ac_ext
4534 	fi
4535-echo "$as_me:7514: result: $cf_with_sysmouse" >&5
4536+echo "$as_me:7516: result: $cf_with_sysmouse" >&5
4537 echo "${ECHO_T}$cf_with_sysmouse" >&6
4538 test "$cf_with_sysmouse" = yes &&
4539 cat >>confdefs.h <<\EOF
4540@@ -7521,7 +7523,7 @@
4541 fi
4542
4543 # pretend that ncurses==ncursesw==ncursest
4544-echo "$as_me:7524: checking if you want to disable library suffixes" >&5
4545+echo "$as_me:7526: checking if you want to disable library suffixes" >&5
4546 echo $ECHO_N "checking if you want to disable library suffixes... $ECHO_C" >&6
4547
4548 # Check whether --enable-lib-suffixes or --disable-lib-suffixes was given.
4549@@ -7538,13 +7540,13 @@
4550 	disable_lib_suffixes=no
4551
4552 fi;
4553-echo "$as_me:7541: result: $disable_lib_suffixes" >&5
4554+echo "$as_me:7543: result: $disable_lib_suffixes" >&5
4555 echo "${ECHO_T}$disable_lib_suffixes" >&6
4556
4557 ### If we're building with rpath, try to link non-standard libs that way too.
4558 if test "$DFT_LWR_MODEL" = "shared" && test "x$cf_cv_enable_rpath" != xno; then
4559
4560-echo "$as_me:7547: checking if rpath-hack should be disabled" >&5
4561+echo "$as_me:7549: checking if rpath-hack should be disabled" >&5
4562 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
4563
4564 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
4565@@ -7561,21 +7563,21 @@
4566 	cf_disable_rpath_hack=no
4567
4568 fi;
4569-echo "$as_me:7564: result: $cf_disable_rpath_hack" >&5
4570+echo "$as_me:7566: result: $cf_disable_rpath_hack" >&5
4571 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
4572 if test "$cf_disable_rpath_hack" = no ; then
4573
4574-echo "$as_me:7568: checking for updated LDFLAGS" >&5
4575+echo "$as_me:7570: checking for updated LDFLAGS" >&5
4576 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
4577 if test -n "$LD_RPATH_OPT" ; then
4578-	echo "$as_me:7571: result: maybe" >&5
4579+	echo "$as_me:7573: result: maybe" >&5
4580 echo "${ECHO_T}maybe" >&6
4581
4582 	for ac_prog in ldd
4583 do
4584   # Extract the first word of "$ac_prog", so it can be a program name with args.
4585 set dummy $ac_prog; ac_word=$2
4586-echo "$as_me:7578: checking for $ac_word" >&5
4587+echo "$as_me:7580: checking for $ac_word" >&5
4588 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
4589 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
4590   echo $ECHO_N "(cached) $ECHO_C" >&6
4591@@ -7590,7 +7592,7 @@
4592   test -z "$ac_dir" && ac_dir=.
4593   $as_executable_p "$ac_dir/$ac_word" || continue
4594 ac_cv_prog_cf_ldd_prog="$ac_prog"
4595-echo "$as_me:7593: found $ac_dir/$ac_word" >&5
4596+echo "$as_me:7595: found $ac_dir/$ac_word" >&5
4597 break
4598 done
4599
4600@@ -7598,10 +7600,10 @@
4601 fi
4602 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
4603 if test -n "$cf_ldd_prog"; then
4604-  echo "$as_me:7601: result: $cf_ldd_prog" >&5
4605+  echo "$as_me:7603: result: $cf_ldd_prog" >&5
4606 echo "${ECHO_T}$cf_ldd_prog" >&6
4607 else
4608-  echo "$as_me:7604: result: no" >&5
4609+  echo "$as_me:7606: result: no" >&5
4610 echo "${ECHO_T}no" >&6
4611 fi
4612
4613@@ -7615,7 +7617,7 @@
4614 		cf_rpath_oops=
4615
4616 cat >conftest.$ac_ext <<_ACEOF
4617-#line 7618 "configure"
4618+#line 7620 "configure"
4619 #include "confdefs.h"
4620 #include <stdio.h>
4621 int
4622@@ -7627,16 +7629,16 @@
4623 }
4624 _ACEOF
4625 rm -f conftest.$ac_objext conftest$ac_exeext
4626-if { (eval echo "$as_me:7630: \"$ac_link\"") >&5
4627+if { (eval echo "$as_me:7632: \"$ac_link\"") >&5
4628   (eval $ac_link) 2>&5
4629   ac_status=$?
4630-  echo "$as_me:7633: \$? = $ac_status" >&5
4631+  echo "$as_me:7635: \$? = $ac_status" >&5
4632   (exit $ac_status); } &&
4633          { ac_try='test -s conftest$ac_exeext'
4634-  { (eval echo "$as_me:7636: \"$ac_try\"") >&5
4635+  { (eval echo "$as_me:7638: \"$ac_try\"") >&5
4636   (eval $ac_try) 2>&5
4637   ac_status=$?
4638-  echo "$as_me:7639: \$? = $ac_status" >&5
4639+  echo "$as_me:7641: \$? = $ac_status" >&5
4640   (exit $ac_status); }; }; then
4641   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
4642 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
4643@@ -7664,7 +7666,7 @@
4644 					then
4645 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
4646
4647-echo "${as_me:-configure}:7667: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
4648+echo "${as_me:-configure}:7669: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
4649
4650 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
4651 						break
4652@@ -7676,11 +7678,11 @@
4653
4654 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
4655
4656-echo "${as_me:-configure}:7679: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
4657+echo "${as_me:-configure}:7681: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
4658
4659 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
4660
4661-echo "${as_me:-configure}:7683: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
4662+echo "${as_me:-configure}:7685: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
4663
4664 cf_rpath_dst=
4665 for cf_rpath_src in $LDFLAGS
4666@@ -7717,7 +7719,7 @@
4667 			then
4668 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
4669
4670-echo "${as_me:-configure}:7720: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
4671+echo "${as_me:-configure}:7722: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
4672
4673 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
4674 			fi
4675@@ -7730,11 +7732,11 @@
4676
4677 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
4678
4679-echo "${as_me:-configure}:7733: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
4680+echo "${as_me:-configure}:7735: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
4681
4682 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
4683
4684-echo "${as_me:-configure}:7737: testing ...checking LIBS $LIBS ..." 1>&5
4685+echo "${as_me:-configure}:7739: testing ...checking LIBS $LIBS ..." 1>&5
4686
4687 cf_rpath_dst=
4688 for cf_rpath_src in $LIBS
4689@@ -7771,7 +7773,7 @@
4690 			then
4691 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
4692
4693-echo "${as_me:-configure}:7774: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
4694+echo "${as_me:-configure}:7776: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
4695
4696 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
4697 			fi
4698@@ -7784,14 +7786,14 @@
4699
4700 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
4701
4702-echo "${as_me:-configure}:7787: testing ...checked LIBS $LIBS ..." 1>&5
4703+echo "${as_me:-configure}:7789: testing ...checked LIBS $LIBS ..." 1>&5
4704
4705 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
4706
4707-echo "${as_me:-configure}:7791: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
4708+echo "${as_me:-configure}:7793: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
4709
4710 else
4711-	echo "$as_me:7794: result: no" >&5
4712+	echo "$as_me:7796: result: no" >&5
4713 echo "${ECHO_T}no" >&6
4714 fi
4715
4716@@ -7802,7 +7804,7 @@
4717 ###############################################################################
4718
4719 ###	use option --with-extra-suffix to append suffix to headers and libraries
4720-echo "$as_me:7805: checking if you wish to append extra suffix to header/library paths" >&5
4721+echo "$as_me:7807: checking if you wish to append extra suffix to header/library paths" >&5
4722 echo $ECHO_N "checking if you wish to append extra suffix to header/library paths... $ECHO_C" >&6
4723 EXTRA_SUFFIX=
4724
4725@@ -7821,11 +7823,11 @@
4726 	esac
4727
4728 fi;
4729-echo "$as_me:7824: result: $EXTRA_SUFFIX" >&5
4730+echo "$as_me:7826: result: $EXTRA_SUFFIX" >&5
4731 echo "${ECHO_T}$EXTRA_SUFFIX" >&6
4732
4733 ###	use option --disable-overwrite to leave out the link to -lcurses
4734-echo "$as_me:7828: checking if you wish to install ncurses overwriting curses" >&5
4735+echo "$as_me:7830: checking if you wish to install ncurses overwriting curses" >&5
4736 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
4737
4738 # Check whether --enable-overwrite or --disable-overwrite was given.
4739@@ -7835,10 +7837,10 @@
4740 else
4741   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
4742 fi;
4743-echo "$as_me:7838: result: $with_overwrite" >&5
4744+echo "$as_me:7840: result: $with_overwrite" >&5
4745 echo "${ECHO_T}$with_overwrite" >&6
4746
4747-echo "$as_me:7841: checking if external terminfo-database is used" >&5
4748+echo "$as_me:7843: checking if external terminfo-database is used" >&5
4749 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
4750
4751 # Check whether --enable-database or --disable-database was given.
4752@@ -7848,7 +7850,7 @@
4753 else
4754   use_database=yes
4755 fi;
4756-echo "$as_me:7851: result: $use_database" >&5
4757+echo "$as_me:7853: result: $use_database" >&5
4758 echo "${ECHO_T}$use_database" >&6
4759
4760 case $host_os in
4761@@ -7864,7 +7866,7 @@
4762 if test "$use_database" != no ; then
4763 	NCURSES_USE_DATABASE=1
4764
4765-	echo "$as_me:7867: checking which terminfo source-file will be installed" >&5
4766+	echo "$as_me:7869: checking which terminfo source-file will be installed" >&5
4767 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
4768
4769 # Check whether --with-database or --without-database was given.
4770@@ -7872,10 +7874,10 @@
4771   withval="$with_database"
4772   TERMINFO_SRC=$withval
4773 fi;
4774-	echo "$as_me:7875: result: $TERMINFO_SRC" >&5
4775+	echo "$as_me:7877: result: $TERMINFO_SRC" >&5
4776 echo "${ECHO_T}$TERMINFO_SRC" >&6
4777
4778-	echo "$as_me:7878: checking whether to use hashed database instead of directory/tree" >&5
4779+	echo "$as_me:7880: checking whether to use hashed database instead of directory/tree" >&5
4780 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
4781
4782 # Check whether --with-hashed-db or --without-hashed-db was given.
4783@@ -7885,13 +7887,13 @@
4784 else
4785   with_hashed_db=no
4786 fi;
4787-	echo "$as_me:7888: result: $with_hashed_db" >&5
4788+	echo "$as_me:7890: result: $with_hashed_db" >&5
4789 echo "${ECHO_T}$with_hashed_db" >&6
4790 else
4791 	with_hashed_db=no
4792 fi
4793
4794-echo "$as_me:7894: checking for list of fallback descriptions" >&5
4795+echo "$as_me:7896: checking for list of fallback descriptions" >&5
4796 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
4797
4798 # Check whether --with-fallbacks or --without-fallbacks was given.
4799@@ -7901,7 +7903,7 @@
4800 else
4801   with_fallback=
4802 fi;
4803-echo "$as_me:7904: result: $with_fallback" >&5
4804+echo "$as_me:7906: result: $with_fallback" >&5
4805 echo "${ECHO_T}$with_fallback" >&6
4806
4807 case ".$with_fallback" in
4808@@ -7909,7 +7911,7 @@
4809 	FALLBACK_LIST=
4810 	;;
4811 (.yes)
4812-	{ echo "$as_me:7912: WARNING: expected a list of terminal descriptions" >&5
4813+	{ echo "$as_me:7914: WARNING: expected a list of terminal descriptions" >&5
4814 echo "$as_me: WARNING: expected a list of terminal descriptions" >&2;}
4815 	;;
4816 (*)
4817@@ -7920,7 +7922,336 @@
4818 USE_FALLBACKS=
4819 test -z "$FALLBACK_LIST" && USE_FALLBACKS="#"
4820
4821-echo "$as_me:7923: checking if you want modern xterm or antique" >&5
4822+# The fallback feature in ncurses relies upon tic/infocmp outside the build
4823+# tree for generating the terminal descriptions that will be compiled into the
4824+# library.  If your toolchain is old, it may not handle current terminal
4825+# databases.  Use configure-options to point to the tools which will be used,
4826+# rather than the first ones found on the $PATH.
4827+if test -n "$FALLBACK_LIST"
4828+then
4829+
4830+# Check whether --with-tic-path or --without-tic-path was given.
4831+if test "${with_tic_path+set}" = set; then
4832+  withval="$with_tic_path"
4833+  echo "$as_me:7936: checking for tic program for fallbacks" >&5
4834+echo $ECHO_N "checking for tic program for fallbacks... $ECHO_C" >&6
4835+		TIC=$withval
4836+		echo "$as_me:7939: result: $TIC" >&5
4837+echo "${ECHO_T}$TIC" >&6
4838+
4839+if test "x$prefix" != xNONE; then
4840+	cf_path_syntax="$prefix"
4841+else
4842+	cf_path_syntax="$ac_default_prefix"
4843+fi
4844+
4845+case ".$TIC" in
4846+(.\$\(*\)*|.\'*\'*)
4847+	;;
4848+(..|./*|.\\*)
4849+	;;
4850+(.[a-zA-Z]:[\\/]*) # OS/2 EMX
4851+	;;
4852+(.\${*prefix}*|.\${*dir}*)
4853+	eval TIC="$TIC"
4854+	case ".$TIC" in
4855+	(.NONE/*)
4856+		TIC=`echo $TIC | sed -e s%NONE%$cf_path_syntax%`
4857+		;;
4858+	esac
4859+	;;
4860+(.no|.NONE/*)
4861+	TIC=`echo $TIC | sed -e s%NONE%$cf_path_syntax%`
4862+	;;
4863+(*)
4864+	{ { echo "$as_me:7967: error: expected a pathname, not \"$TIC\"" >&5
4865+echo "$as_me: error: expected a pathname, not \"$TIC\"" >&2;}
4866+   { (exit 1); exit 1; }; }
4867+	;;
4868+esac
4869+
4870+else
4871+
4872+test -z "$TIC" && TIC=tic
4873+for ac_prog in $TIC tic
4874+do
4875+  # Extract the first word of "$ac_prog", so it can be a program name with args.
4876+set dummy $ac_prog; ac_word=$2
4877+echo "$as_me:7980: checking for $ac_word" >&5
4878+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
4879+if test "${ac_cv_path_TIC+set}" = set; then
4880+  echo $ECHO_N "(cached) $ECHO_C" >&6
4881+else
4882+  case $TIC in
4883+  [\\/]* | ?:[\\/]*)
4884+  ac_cv_path_TIC="$TIC" # Let the user override the test with a path.
4885+  ;;
4886+  *)
4887+  ac_save_IFS=$IFS; IFS=$ac_path_separator
4888+ac_dummy="$PATH:/usr/local/ncurses/bin"
4889+for ac_dir in $ac_dummy; do
4890+  IFS=$ac_save_IFS
4891+  test -z "$ac_dir" && ac_dir=.
4892+  if $as_executable_p "$ac_dir/$ac_word"; then
4893+   ac_cv_path_TIC="$ac_dir/$ac_word"
4894+   echo "$as_me:7997: found $ac_dir/$ac_word" >&5
4895+   break
4896+fi
4897+done
4898+
4899+  ;;
4900+esac
4901+fi
4902+TIC=$ac_cv_path_TIC
4903+
4904+if test -n "$TIC"; then
4905+  echo "$as_me:8008: result: $TIC" >&5
4906+echo "${ECHO_T}$TIC" >&6
4907+else
4908+  echo "$as_me:8011: result: no" >&5
4909+echo "${ECHO_T}no" >&6
4910+fi
4911+
4912+  test -n "$TIC" && break
4913+done
4914+test -n "$TIC" || TIC="$TIC"
4915+
4916+cf_path_prog=""
4917+cf_path_args=""
4918+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
4919+for cf_temp in $ac_cv_path_TIC
4920+do
4921+	if test -z "$cf_path_prog" ; then
4922+		if test "$with_full_paths" = yes ; then
4923+
4924+if test "x$prefix" != xNONE; then
4925+	cf_path_syntax="$prefix"
4926+else
4927+	cf_path_syntax="$ac_default_prefix"
4928+fi
4929+
4930+case ".$cf_temp" in
4931+(.\$\(*\)*|.\'*\'*)
4932+	;;
4933+(..|./*|.\\*)
4934+	;;
4935+(.[a-zA-Z]:[\\/]*) # OS/2 EMX
4936+	;;
4937+(.\${*prefix}*|.\${*dir}*)
4938+	eval cf_temp="$cf_temp"
4939+	case ".$cf_temp" in
4940+	(.NONE/*)
4941+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
4942+		;;
4943+	esac
4944+	;;
4945+(.no|.NONE/*)
4946+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
4947+	;;
4948+(*)
4949+	break
4950+	;;
4951+esac
4952+
4953+			cf_path_prog="$cf_temp"
4954+		else
4955+			cf_path_prog="`basename $cf_temp`"
4956+		fi
4957+	elif test -z "$cf_path_args" ; then
4958+		cf_path_args="$cf_temp"
4959+	else
4960+		cf_path_args="$cf_path_args $cf_temp"
4961+	fi
4962+done
4963+IFS="$cf_save_ifs"
4964+
4965+if test -n "$cf_path_prog" ; then
4966+
4967+echo "${as_me:-configure}:8070: testing defining path for ${cf_path_prog} ..." 1>&5
4968+
4969+cat >>confdefs.h <<EOF
4970+#define TIC_PATH "$cf_path_prog"
4971+EOF
4972+
4973+	test -n "$cf_path_args" &&
4974+cat >>confdefs.h <<EOF
4975+#define TIC_ARGS "$cf_path_args"
4976+EOF
4977+
4978+fi
4979+
4980+		if test -z "$TIC"
4981+		then
4982+			{ echo "$as_me:8085: WARNING: no tic program found for fallbacks" >&5
4983+echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
4984+		fi
4985+
4986+fi;
4987+
4988+# Check whether --with-infocmp-path or --without-infocmp-path was given.
4989+if test "${with_infocmp_path+set}" = set; then
4990+  withval="$with_infocmp_path"
4991+  echo "$as_me:8094: checking for infocmp program for fallbacks" >&5
4992+echo $ECHO_N "checking for infocmp program for fallbacks... $ECHO_C" >&6
4993+		INFOCMP=$withval
4994+		echo "$as_me:8097: result: $INFOCMP" >&5
4995+echo "${ECHO_T}$INFOCMP" >&6
4996+
4997+if test "x$prefix" != xNONE; then
4998+	cf_path_syntax="$prefix"
4999+else
5000+	cf_path_syntax="$ac_default_prefix"
5001+fi
5002+
5003+case ".$INFOCMP" in
5004+(.\$\(*\)*|.\'*\'*)
5005+	;;
5006+(..|./*|.\\*)
5007+	;;
5008+(.[a-zA-Z]:[\\/]*) # OS/2 EMX
5009+	;;
5010+(.\${*prefix}*|.\${*dir}*)
5011+	eval INFOCMP="$INFOCMP"
5012+	case ".$INFOCMP" in
5013+	(.NONE/*)
5014+		INFOCMP=`echo $INFOCMP | sed -e s%NONE%$cf_path_syntax%`
5015+		;;
5016+	esac
5017+	;;
5018+(.no|.NONE/*)
5019+	INFOCMP=`echo $INFOCMP | sed -e s%NONE%$cf_path_syntax%`
5020+	;;
5021+(*)
5022+	{ { echo "$as_me:8125: error: expected a pathname, not \"$INFOCMP\"" >&5
5023+echo "$as_me: error: expected a pathname, not \"$INFOCMP\"" >&2;}
5024+   { (exit 1); exit 1; }; }
5025+	;;
5026+esac
5027+
5028+else
5029+
5030+test -z "$INFOCMP" && INFOCMP=infocmp
5031+for ac_prog in $INFOCMP infocmp
5032+do
5033+  # Extract the first word of "$ac_prog", so it can be a program name with args.
5034+set dummy $ac_prog; ac_word=$2
5035+echo "$as_me:8138: checking for $ac_word" >&5
5036+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5037+if test "${ac_cv_path_INFOCMP+set}" = set; then
5038+  echo $ECHO_N "(cached) $ECHO_C" >&6
5039+else
5040+  case $INFOCMP in
5041+  [\\/]* | ?:[\\/]*)
5042+  ac_cv_path_INFOCMP="$INFOCMP" # Let the user override the test with a path.
5043+  ;;
5044+  *)
5045+  ac_save_IFS=$IFS; IFS=$ac_path_separator
5046+ac_dummy="$PATH:/usr/local/ncurses/bin"
5047+for ac_dir in $ac_dummy; do
5048+  IFS=$ac_save_IFS
5049+  test -z "$ac_dir" && ac_dir=.
5050+  if $as_executable_p "$ac_dir/$ac_word"; then
5051+   ac_cv_path_INFOCMP="$ac_dir/$ac_word"
5052+   echo "$as_me:8155: found $ac_dir/$ac_word" >&5
5053+   break
5054+fi
5055+done
5056+
5057+  ;;
5058+esac
5059+fi
5060+INFOCMP=$ac_cv_path_INFOCMP
5061+
5062+if test -n "$INFOCMP"; then
5063+  echo "$as_me:8166: result: $INFOCMP" >&5
5064+echo "${ECHO_T}$INFOCMP" >&6
5065+else
5066+  echo "$as_me:8169: result: no" >&5
5067+echo "${ECHO_T}no" >&6
5068+fi
5069+
5070+  test -n "$INFOCMP" && break
5071+done
5072+test -n "$INFOCMP" || INFOCMP="$INFOCMP"
5073+
5074+cf_path_prog=""
5075+cf_path_args=""
5076+IFS="${IFS:- 	}"; cf_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR"
5077+for cf_temp in $ac_cv_path_INFOCMP
5078+do
5079+	if test -z "$cf_path_prog" ; then
5080+		if test "$with_full_paths" = yes ; then
5081+
5082+if test "x$prefix" != xNONE; then
5083+	cf_path_syntax="$prefix"
5084+else
5085+	cf_path_syntax="$ac_default_prefix"
5086+fi
5087+
5088+case ".$cf_temp" in
5089+(.\$\(*\)*|.\'*\'*)
5090+	;;
5091+(..|./*|.\\*)
5092+	;;
5093+(.[a-zA-Z]:[\\/]*) # OS/2 EMX
5094+	;;
5095+(.\${*prefix}*|.\${*dir}*)
5096+	eval cf_temp="$cf_temp"
5097+	case ".$cf_temp" in
5098+	(.NONE/*)
5099+		cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
5100+		;;
5101+	esac
5102+	;;
5103+(.no|.NONE/*)
5104+	cf_temp=`echo $cf_temp | sed -e s%NONE%$cf_path_syntax%`
5105+	;;
5106+(*)
5107+	break
5108+	;;
5109+esac
5110+
5111+			cf_path_prog="$cf_temp"
5112+		else
5113+			cf_path_prog="`basename $cf_temp`"
5114+		fi
5115+	elif test -z "$cf_path_args" ; then
5116+		cf_path_args="$cf_temp"
5117+	else
5118+		cf_path_args="$cf_path_args $cf_temp"
5119+	fi
5120+done
5121+IFS="$cf_save_ifs"
5122+
5123+if test -n "$cf_path_prog" ; then
5124+
5125+echo "${as_me:-configure}:8228: testing defining path for ${cf_path_prog} ..." 1>&5
5126+
5127+cat >>confdefs.h <<EOF
5128+#define INFOCMP_PATH "$cf_path_prog"
5129+EOF
5130+
5131+	test -n "$cf_path_args" &&
5132+cat >>confdefs.h <<EOF
5133+#define INFOCMP_ARGS "$cf_path_args"
5134+EOF
5135+
5136+fi
5137+
5138+		if test -z "$INFOCMP"
5139+		then
5140+			{ echo "$as_me:8243: WARNING: no infocmp program found for fallbacks" >&5
5141+echo "$as_me: WARNING: no infocmp program found for fallbacks" >&2;}
5142+		fi
5143+
5144+fi;
5145+
5146+else
5147+	: ${TIC:=tic}
5148+	: ${INFOCMP:=infocmp}
5149+fi
5150+
5151+echo "$as_me:8254: checking if you want modern xterm or antique" >&5
5152 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
5153
5154 # Check whether --with-xterm-new or --without-xterm-new was given.
5155@@ -7934,11 +8265,11 @@
5156 (no) with_xterm_new=xterm-old;;
5157 (*)	 with_xterm_new=xterm-new;;
5158 esac
5159-echo "$as_me:7937: result: $with_xterm_new" >&5
5160+echo "$as_me:8268: result: $with_xterm_new" >&5
5161 echo "${ECHO_T}$with_xterm_new" >&6
5162 WHICH_XTERM=$with_xterm_new
5163
5164-echo "$as_me:7941: checking if xterm backspace sends BS or DEL" >&5
5165+echo "$as_me:8272: checking if xterm backspace sends BS or DEL" >&5
5166 echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6
5167
5168 # Check whether --with-xterm-kbs or --without-xterm-kbs was given.
5169@@ -7959,7 +8290,7 @@
5170 	with_xterm_kbs=$withval
5171 	;;
5172 esac
5173-echo "$as_me:7962: result: $with_xterm_kbs" >&5
5174+echo "$as_me:8293: result: $with_xterm_kbs" >&5
5175 echo "${ECHO_T}$with_xterm_kbs" >&6
5176 XTERM_KBS=$with_xterm_kbs
5177
5178@@ -7969,7 +8300,7 @@
5179 	MAKE_TERMINFO="#"
5180 else
5181
5182-echo "$as_me:7972: checking for list of terminfo directories" >&5
5183+echo "$as_me:8303: checking for list of terminfo directories" >&5
5184 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
5185
5186 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
5187@@ -8009,7 +8340,7 @@
5188 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
5189 	;;
5190 (*)
5191-	{ { echo "$as_me:8012: error: expected a pathname, not \"$cf_src_path\"" >&5
5192+	{ { echo "$as_me:8343: error: expected a pathname, not \"$cf_src_path\"" >&5
5193 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
5194    { (exit 1); exit 1; }; }
5195 	;;
5196@@ -8032,7 +8363,7 @@
5197 	;;
5198 esac
5199
5200-echo "$as_me:8035: result: $TERMINFO_DIRS" >&5
5201+echo "$as_me:8366: result: $TERMINFO_DIRS" >&5
5202 echo "${ECHO_T}$TERMINFO_DIRS" >&6
5203 test -n "$TERMINFO_DIRS" &&
5204 cat >>confdefs.h <<EOF
5205@@ -8041,13 +8372,13 @@
5206
5207 case "x$TERMINFO" in
5208 x???:*)
5209-	{ echo "$as_me:8044: WARNING: ignoring non-directory/file TERMINFO value" >&5
5210+	{ echo "$as_me:8375: WARNING: ignoring non-directory/file TERMINFO value" >&5
5211 echo "$as_me: WARNING: ignoring non-directory/file TERMINFO value" >&2;}
5212 	unset TERMINFO
5213 	;;
5214 esac
5215
5216-echo "$as_me:8050: checking for default terminfo directory" >&5
5217+echo "$as_me:8381: checking for default terminfo directory" >&5
5218 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
5219
5220 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
5221@@ -8083,7 +8414,7 @@
5222 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
5223 	;;
5224 (*)
5225-	{ { echo "$as_me:8086: error: expected a pathname, not \"$withval\"" >&5
5226+	{ { echo "$as_me:8417: error: expected a pathname, not \"$withval\"" >&5
5227 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
5228    { (exit 1); exit 1; }; }
5229 	;;
5230@@ -8092,7 +8423,7 @@
5231 fi
5232 eval TERMINFO="$withval"
5233
5234-echo "$as_me:8095: result: $TERMINFO" >&5
5235+echo "$as_me:8426: result: $TERMINFO" >&5
5236 echo "${ECHO_T}$TERMINFO" >&6
5237
5238 cat >>confdefs.h <<EOF
5239@@ -8103,7 +8434,7 @@
5240
5241 ###	use option --disable-big-core to make tic run on small machines
5242 ###	We need 4Mb, check if we can allocate 50% more than that.
5243-echo "$as_me:8106: checking if big-core option selected" >&5
5244+echo "$as_me:8437: checking if big-core option selected" >&5
5245 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
5246
5247 # Check whether --enable-big-core or --disable-big-core was given.
5248@@ -8115,7 +8446,7 @@
5249   with_big_core=no
5250 else
5251   cat >conftest.$ac_ext <<_ACEOF
5252-#line 8118 "configure"
5253+#line 8449 "configure"
5254 #include "confdefs.h"
5255
5256 #include <stdlib.h>
5257@@ -8129,15 +8460,15 @@
5258 }
5259 _ACEOF
5260 rm -f conftest$ac_exeext
5261-if { (eval echo "$as_me:8132: \"$ac_link\"") >&5
5262+if { (eval echo "$as_me:8463: \"$ac_link\"") >&5
5263   (eval $ac_link) 2>&5
5264   ac_status=$?
5265-  echo "$as_me:8135: \$? = $ac_status" >&5
5266+  echo "$as_me:8466: \$? = $ac_status" >&5
5267   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
5268-  { (eval echo "$as_me:8137: \"$ac_try\"") >&5
5269+  { (eval echo "$as_me:8468: \"$ac_try\"") >&5
5270   (eval $ac_try) 2>&5
5271   ac_status=$?
5272-  echo "$as_me:8140: \$? = $ac_status" >&5
5273+  echo "$as_me:8471: \$? = $ac_status" >&5
5274   (exit $ac_status); }; }; then
5275   with_big_core=yes
5276 else
5277@@ -8149,7 +8480,7 @@
5278 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
5279 fi
5280 fi;
5281-echo "$as_me:8152: result: $with_big_core" >&5
5282+echo "$as_me:8483: result: $with_big_core" >&5
5283 echo "${ECHO_T}$with_big_core" >&6
5284 test "x$with_big_core" = "xyes" &&
5285 cat >>confdefs.h <<\EOF
5286@@ -8159,7 +8490,7 @@
5287 ### ISO C only guarantees 512-char strings, we have tables which load faster
5288 ### when constructed using "big" strings.  More than the C compiler, the awk
5289 ### program is a limit on most vendor UNIX systems.  Check that we can build.
5290-echo "$as_me:8162: checking if big-strings option selected" >&5
5291+echo "$as_me:8493: checking if big-strings option selected" >&5
5292 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
5293
5294 # Check whether --enable-big-strings or --disable-big-strings was given.
5295@@ -8183,14 +8514,14 @@
5296 	esac
5297
5298 fi;
5299-echo "$as_me:8186: result: $with_big_strings" >&5
5300+echo "$as_me:8517: result: $with_big_strings" >&5
5301 echo "${ECHO_T}$with_big_strings" >&6
5302
5303 USE_BIG_STRINGS=0
5304 test "x$with_big_strings" = "xyes" && USE_BIG_STRINGS=1
5305
5306 ###	use option --enable-termcap to compile in the termcap fallback support
5307-echo "$as_me:8193: checking if you want termcap-fallback support" >&5
5308+echo "$as_me:8524: checking if you want termcap-fallback support" >&5
5309 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
5310
5311 # Check whether --enable-termcap or --disable-termcap was given.
5312@@ -8200,14 +8531,14 @@
5313 else
5314   with_termcap=no
5315 fi;
5316-echo "$as_me:8203: result: $with_termcap" >&5
5317+echo "$as_me:8534: result: $with_termcap" >&5
5318 echo "${ECHO_T}$with_termcap" >&6
5319
5320 NCURSES_USE_TERMCAP=0
5321 if test "x$with_termcap" != "xyes" ; then
5322 	if test "$use_database" = no ; then
5323 		if test -z "$with_fallback" ; then
5324-			{ { echo "$as_me:8210: error: You have disabled the database w/o specifying fallbacks" >&5
5325+			{ { echo "$as_me:8541: error: You have disabled the database w/o specifying fallbacks" >&5
5326 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
5327    { (exit 1); exit 1; }; }
5328 		fi
5329@@ -8220,13 +8551,13 @@
5330 else
5331
5332 	if test "$with_ticlib" != no ; then
5333-		{ { echo "$as_me:8223: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
5334+		{ { echo "$as_me:8554: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
5335 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
5336    { (exit 1); exit 1; }; }
5337 	fi
5338
5339 	NCURSES_USE_TERMCAP=1
5340-	echo "$as_me:8229: checking for list of termcap files" >&5
5341+	echo "$as_me:8560: checking for list of termcap files" >&5
5342 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
5343
5344 # Check whether --with-termpath or --without-termpath was given.
5345@@ -8266,7 +8597,7 @@
5346 	cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
5347 	;;
5348 (*)
5349-	{ { echo "$as_me:8269: error: expected a pathname, not \"$cf_src_path\"" >&5
5350+	{ { echo "$as_me:8600: error: expected a pathname, not \"$cf_src_path\"" >&5
5351 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
5352    { (exit 1); exit 1; }; }
5353 	;;
5354@@ -8289,7 +8620,7 @@
5355 	;;
5356 esac
5357
5358-	echo "$as_me:8292: result: $TERMPATH" >&5
5359+	echo "$as_me:8623: result: $TERMPATH" >&5
5360 echo "${ECHO_T}$TERMPATH" >&6
5361 	test -n "$TERMPATH" &&
5362 cat >>confdefs.h <<EOF
5363@@ -8297,7 +8628,7 @@
5364 EOF
5365
5366 	###	use option --enable-getcap to use a hacked getcap for reading termcaps
5367-	echo "$as_me:8300: checking if fast termcap-loader is needed" >&5
5368+	echo "$as_me:8631: checking if fast termcap-loader is needed" >&5
5369 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
5370
5371 # Check whether --enable-getcap or --disable-getcap was given.
5372@@ -8307,14 +8638,14 @@
5373 else
5374   with_getcap=no
5375 fi;
5376-	echo "$as_me:8310: result: $with_getcap" >&5
5377+	echo "$as_me:8641: result: $with_getcap" >&5
5378 echo "${ECHO_T}$with_getcap" >&6
5379 	test "x$with_getcap" = "xyes" &&
5380 cat >>confdefs.h <<\EOF
5381 #define USE_GETCAP 1
5382 EOF
5383
5384-	echo "$as_me:8317: checking if translated termcaps will be cached in ~/.terminfo" >&5
5385+	echo "$as_me:8648: checking if translated termcaps will be cached in ~/.terminfo" >&5
5386 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
5387
5388 # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
5389@@ -8324,7 +8655,7 @@
5390 else
5391   with_getcap_cache=no
5392 fi;
5393-	echo "$as_me:8327: result: $with_getcap_cache" >&5
5394+	echo "$as_me:8658: result: $with_getcap_cache" >&5
5395 echo "${ECHO_T}$with_getcap_cache" >&6
5396 	test "x$with_getcap_cache" = "xyes" &&
5397 cat >>confdefs.h <<\EOF
5398@@ -8334,7 +8665,7 @@
5399 fi
5400
5401 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
5402-echo "$as_me:8337: checking if ~/.terminfo is wanted" >&5
5403+echo "$as_me:8668: checking if ~/.terminfo is wanted" >&5
5404 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
5405
5406 # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
5407@@ -8344,14 +8675,14 @@
5408 else
5409   with_home_terminfo=yes
5410 fi;
5411-echo "$as_me:8347: result: $with_home_terminfo" >&5
5412+echo "$as_me:8678: result: $with_home_terminfo" >&5
5413 echo "${ECHO_T}$with_home_terminfo" >&6
5414 test "x$with_home_terminfo" = "xyes" &&
5415 cat >>confdefs.h <<\EOF
5416 #define USE_HOME_TERMINFO 1
5417 EOF
5418
5419-echo "$as_me:8354: checking if you want to use restricted environment when running as root" >&5
5420+echo "$as_me:8685: checking if you want to use restricted environment when running as root" >&5
5421 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
5422
5423 # Check whether --enable-root-environ or --disable-root-environ was given.
5424@@ -8361,7 +8692,7 @@
5425 else
5426   with_root_environ=yes
5427 fi;
5428-echo "$as_me:8364: result: $with_root_environ" >&5
5429+echo "$as_me:8695: result: $with_root_environ" >&5
5430 echo "${ECHO_T}$with_root_environ" >&6
5431 test "x$with_root_environ" = xyes &&
5432 cat >>confdefs.h <<\EOF
5433@@ -8376,23 +8707,23 @@
5434
5435 do
5436 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
5437-echo "$as_me:8379: checking for $ac_header" >&5
5438+echo "$as_me:8710: checking for $ac_header" >&5
5439 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
5440 if eval "test \"\${$as_ac_Header+set}\" = set"; then
5441   echo $ECHO_N "(cached) $ECHO_C" >&6
5442 else
5443   cat >conftest.$ac_ext <<_ACEOF
5444-#line 8385 "configure"
5445+#line 8716 "configure"
5446 #include "confdefs.h"
5447 #include <$ac_header>
5448 _ACEOF
5449-if { (eval echo "$as_me:8389: \"$ac_cpp conftest.$ac_ext\"") >&5
5450+if { (eval echo "$as_me:8720: \"$ac_cpp conftest.$ac_ext\"") >&5
5451   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
5452   ac_status=$?
5453   egrep -v '^ *\+' conftest.er1 >conftest.err
5454   rm -f conftest.er1
5455   cat conftest.err >&5
5456-  echo "$as_me:8395: \$? = $ac_status" >&5
5457+  echo "$as_me:8726: \$? = $ac_status" >&5
5458   (exit $ac_status); } >/dev/null; then
5459   if test -s conftest.err; then
5460     ac_cpp_err=$ac_c_preproc_warn_flag
5461@@ -8411,7 +8742,7 @@
5462 fi
5463 rm -f conftest.err conftest.$ac_ext
5464 fi
5465-echo "$as_me:8414: result: `eval echo '${'$as_ac_Header'}'`" >&5
5466+echo "$as_me:8745: result: `eval echo '${'$as_ac_Header'}'`" >&5
5467 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
5468 if test `eval echo '${'$as_ac_Header'}'` = yes; then
5469   cat >>confdefs.h <<EOF
5470@@ -8426,13 +8757,13 @@
5471 	unlink
5472 do
5473 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
5474-echo "$as_me:8429: checking for $ac_func" >&5
5475+echo "$as_me:8760: checking for $ac_func" >&5
5476 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
5477 if eval "test \"\${$as_ac_var+set}\" = set"; then
5478   echo $ECHO_N "(cached) $ECHO_C" >&6
5479 else
5480   cat >conftest.$ac_ext <<_ACEOF
5481-#line 8435 "configure"
5482+#line 8766 "configure"
5483 #include "confdefs.h"
5484 #define $ac_func autoconf_temporary
5485 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
5486@@ -8463,16 +8794,16 @@
5487 }
5488 _ACEOF
5489 rm -f conftest.$ac_objext conftest$ac_exeext
5490-if { (eval echo "$as_me:8466: \"$ac_link\"") >&5
5491+if { (eval echo "$as_me:8797: \"$ac_link\"") >&5
5492   (eval $ac_link) 2>&5
5493   ac_status=$?
5494-  echo "$as_me:8469: \$? = $ac_status" >&5
5495+  echo "$as_me:8800: \$? = $ac_status" >&5
5496   (exit $ac_status); } &&
5497          { ac_try='test -s conftest$ac_exeext'
5498-  { (eval echo "$as_me:8472: \"$ac_try\"") >&5
5499+  { (eval echo "$as_me:8803: \"$ac_try\"") >&5
5500   (eval $ac_try) 2>&5
5501   ac_status=$?
5502-  echo "$as_me:8475: \$? = $ac_status" >&5
5503+  echo "$as_me:8806: \$? = $ac_status" >&5
5504   (exit $ac_status); }; }; then
5505   eval "$as_ac_var=yes"
5506 else
5507@@ -8482,7 +8813,7 @@
5508 fi
5509 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5510 fi
5511-echo "$as_me:8485: result: `eval echo '${'$as_ac_var'}'`" >&5
5512+echo "$as_me:8816: result: `eval echo '${'$as_ac_var'}'`" >&5
5513 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
5514 if test `eval echo '${'$as_ac_var'}'` = yes; then
5515   cat >>confdefs.h <<EOF
5516@@ -8499,13 +8830,13 @@
5517 		symlink
5518 do
5519 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
5520-echo "$as_me:8502: checking for $ac_func" >&5
5521+echo "$as_me:8833: checking for $ac_func" >&5
5522 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
5523 if eval "test \"\${$as_ac_var+set}\" = set"; then
5524   echo $ECHO_N "(cached) $ECHO_C" >&6
5525 else
5526   cat >conftest.$ac_ext <<_ACEOF
5527-#line 8508 "configure"
5528+#line 8839 "configure"
5529 #include "confdefs.h"
5530 #define $ac_func autoconf_temporary
5531 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
5532@@ -8536,16 +8867,16 @@
5533 }
5534 _ACEOF
5535 rm -f conftest.$ac_objext conftest$ac_exeext
5536-if { (eval echo "$as_me:8539: \"$ac_link\"") >&5
5537+if { (eval echo "$as_me:8870: \"$ac_link\"") >&5
5538   (eval $ac_link) 2>&5
5539   ac_status=$?
5540-  echo "$as_me:8542: \$? = $ac_status" >&5
5541+  echo "$as_me:8873: \$? = $ac_status" >&5
5542   (exit $ac_status); } &&
5543          { ac_try='test -s conftest$ac_exeext'
5544-  { (eval echo "$as_me:8545: \"$ac_try\"") >&5
5545+  { (eval echo "$as_me:8876: \"$ac_try\"") >&5
5546   (eval $ac_try) 2>&5
5547   ac_status=$?
5548-  echo "$as_me:8548: \$? = $ac_status" >&5
5549+  echo "$as_me:8879: \$? = $ac_status" >&5
5550   (exit $ac_status); }; }; then
5551   eval "$as_ac_var=yes"
5552 else
5553@@ -8555,7 +8886,7 @@
5554 fi
5555 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5556 fi
5557-echo "$as_me:8558: result: `eval echo '${'$as_ac_var'}'`" >&5
5558+echo "$as_me:8889: result: `eval echo '${'$as_ac_var'}'`" >&5
5559 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
5560 if test `eval echo '${'$as_ac_var'}'` = yes; then
5561   cat >>confdefs.h <<EOF
5562@@ -8566,7 +8897,7 @@
5563 done
5564
5565 else
5566-	echo "$as_me:8569: checking if link/symlink functions work" >&5
5567+	echo "$as_me:8900: checking if link/symlink functions work" >&5
5568 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
5569 if test "${cf_cv_link_funcs+set}" = set; then
5570   echo $ECHO_N "(cached) $ECHO_C" >&6
5571@@ -8579,7 +8910,7 @@
5572 			eval 'ac_cv_func_'$cf_func'=error'
5573 else
5574   cat >conftest.$ac_ext <<_ACEOF
5575-#line 8582 "configure"
5576+#line 8913 "configure"
5577 #include "confdefs.h"
5578
5579 #include <sys/types.h>
5580@@ -8609,15 +8940,15 @@
5581
5582 _ACEOF
5583 rm -f conftest$ac_exeext
5584-if { (eval echo "$as_me:8612: \"$ac_link\"") >&5
5585+if { (eval echo "$as_me:8943: \"$ac_link\"") >&5
5586   (eval $ac_link) 2>&5
5587   ac_status=$?
5588-  echo "$as_me:8615: \$? = $ac_status" >&5
5589+  echo "$as_me:8946: \$? = $ac_status" >&5
5590   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
5591-  { (eval echo "$as_me:8617: \"$ac_try\"") >&5
5592+  { (eval echo "$as_me:8948: \"$ac_try\"") >&5
5593   (eval $ac_try) 2>&5
5594   ac_status=$?
5595-  echo "$as_me:8620: \$? = $ac_status" >&5
5596+  echo "$as_me:8951: \$? = $ac_status" >&5
5597   (exit $ac_status); }; }; then
5598
5599 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
5600@@ -8635,7 +8966,7 @@
5601 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
5602
5603 fi
5604-echo "$as_me:8638: result: $cf_cv_link_funcs" >&5
5605+echo "$as_me:8969: result: $cf_cv_link_funcs" >&5
5606 echo "${ECHO_T}$cf_cv_link_funcs" >&6
5607 	test "$ac_cv_func_link"    = yes &&
5608 cat >>confdefs.h <<\EOF
5609@@ -8655,7 +8986,7 @@
5610 # soft links (symbolic links) are useful for some systems where hard links do
5611 # not work, or to make it simpler to copy terminfo trees around.
5612 if test "x$ac_cv_func_symlink" = xyes ; then
5613-	echo "$as_me:8658: checking if tic should use symbolic links" >&5
5614+	echo "$as_me:8989: checking if tic should use symbolic links" >&5
5615 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
5616
5617 # Check whether --enable-symlinks or --disable-symlinks was given.
5618@@ -8665,21 +8996,21 @@
5619 else
5620   with_symlinks=no
5621 fi;
5622-	echo "$as_me:8668: result: $with_symlinks" >&5
5623+	echo "$as_me:8999: result: $with_symlinks" >&5
5624 echo "${ECHO_T}$with_symlinks" >&6
5625 fi
5626
5627 # If we have hard links and did not choose to use soft links instead, there is
5628 # no reason to make this choice optional - use the hard links.
5629 if test "$with_symlinks" = no ; then
5630-	echo "$as_me:8675: checking if tic should use hard links" >&5
5631+	echo "$as_me:9006: checking if tic should use hard links" >&5
5632 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
5633 	if test "x$ac_cv_func_link" = xyes ; then
5634 		with_links=yes
5635 	else
5636 		with_links=no
5637 	fi
5638-	echo "$as_me:8682: result: $with_links" >&5
5639+	echo "$as_me:9013: result: $with_links" >&5
5640 echo "${ECHO_T}$with_links" >&6
5641 fi
5642
5643@@ -8694,7 +9025,7 @@
5644 EOF
5645
5646 ###   use option --enable-broken-linker to force on use of broken-linker support
5647-echo "$as_me:8697: checking if you want broken-linker support code" >&5
5648+echo "$as_me:9028: checking if you want broken-linker support code" >&5
5649 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
5650
5651 # Check whether --enable-broken_linker or --disable-broken_linker was given.
5652@@ -8704,7 +9035,7 @@
5653 else
5654   with_broken_linker=${BROKEN_LINKER:-no}
5655 fi;
5656-echo "$as_me:8707: result: $with_broken_linker" >&5
5657+echo "$as_me:9038: result: $with_broken_linker" >&5
5658 echo "${ECHO_T}$with_broken_linker" >&6
5659
5660 BROKEN_LINKER=0
5661@@ -8726,14 +9057,14 @@
5662 		BROKEN_LINKER=1
5663 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
5664
5665-echo "${as_me:-configure}:8729: testing cygwin linker is broken anyway ..." 1>&5
5666+echo "${as_me:-configure}:9060: testing cygwin linker is broken anyway ..." 1>&5
5667
5668 		;;
5669 	esac
5670 fi
5671
5672 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
5673-echo "$as_me:8736: checking if tputs should process BSD-style prefix padding" >&5
5674+echo "$as_me:9067: checking if tputs should process BSD-style prefix padding" >&5
5675 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
5676
5677 # Check whether --enable-bsdpad or --disable-bsdpad was given.
5678@@ -8743,7 +9074,7 @@
5679 else
5680   with_bsdpad=no
5681 fi;
5682-echo "$as_me:8746: result: $with_bsdpad" >&5
5683+echo "$as_me:9077: result: $with_bsdpad" >&5
5684 echo "${ECHO_T}$with_bsdpad" >&6
5685 test "x$with_bsdpad" = xyes &&
5686 cat >>confdefs.h <<\EOF
5687@@ -8762,14 +9093,14 @@
5688 # Check to define _XOPEN_SOURCE "automatically"
5689 CPPFLAGS_before_XOPEN="$CPPFLAGS"
5690
5691-echo "$as_me:8765: checking if the POSIX test-macros are already defined" >&5
5692+echo "$as_me:9096: checking if the POSIX test-macros are already defined" >&5
5693 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6
5694 if test "${cf_cv_posix_visible+set}" = set; then
5695   echo $ECHO_N "(cached) $ECHO_C" >&6
5696 else
5697
5698 cat >conftest.$ac_ext <<_ACEOF
5699-#line 8772 "configure"
5700+#line 9103 "configure"
5701 #include "confdefs.h"
5702 #include <stdio.h>
5703 int
5704@@ -8788,16 +9119,16 @@
5705 }
5706 _ACEOF
5707 rm -f conftest.$ac_objext
5708-if { (eval echo "$as_me:8791: \"$ac_compile\"") >&5
5709+if { (eval echo "$as_me:9122: \"$ac_compile\"") >&5
5710   (eval $ac_compile) 2>&5
5711   ac_status=$?
5712-  echo "$as_me:8794: \$? = $ac_status" >&5
5713+  echo "$as_me:9125: \$? = $ac_status" >&5
5714   (exit $ac_status); } &&
5715          { ac_try='test -s conftest.$ac_objext'
5716-  { (eval echo "$as_me:8797: \"$ac_try\"") >&5
5717+  { (eval echo "$as_me:9128: \"$ac_try\"") >&5
5718   (eval $ac_try) 2>&5
5719   ac_status=$?
5720-  echo "$as_me:8800: \$? = $ac_status" >&5
5721+  echo "$as_me:9131: \$? = $ac_status" >&5
5722   (exit $ac_status); }; }; then
5723   cf_cv_posix_visible=no
5724 else
5725@@ -8808,7 +9139,7 @@
5726 rm -f conftest.$ac_objext conftest.$ac_ext
5727
5728 fi
5729-echo "$as_me:8811: result: $cf_cv_posix_visible" >&5
5730+echo "$as_me:9142: result: $cf_cv_posix_visible" >&5
5731 echo "${ECHO_T}$cf_cv_posix_visible" >&6
5732
5733 if test "$cf_cv_posix_visible" = no; then
5734@@ -8853,14 +9184,14 @@
5735
5736 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
5737
5738-echo "$as_me:8856: checking if this is the GNU C library" >&5
5739+echo "$as_me:9187: checking if this is the GNU C library" >&5
5740 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6
5741 if test "${cf_cv_gnu_library+set}" = set; then
5742   echo $ECHO_N "(cached) $ECHO_C" >&6
5743 else
5744
5745 cat >conftest.$ac_ext <<_ACEOF
5746-#line 8863 "configure"
5747+#line 9194 "configure"
5748 #include "confdefs.h"
5749 #include <sys/types.h>
5750 int
5751@@ -8879,16 +9210,16 @@
5752 }
5753 _ACEOF
5754 rm -f conftest.$ac_objext
5755-if { (eval echo "$as_me:8882: \"$ac_compile\"") >&5
5756+if { (eval echo "$as_me:9213: \"$ac_compile\"") >&5
5757   (eval $ac_compile) 2>&5
5758   ac_status=$?
5759-  echo "$as_me:8885: \$? = $ac_status" >&5
5760+  echo "$as_me:9216: \$? = $ac_status" >&5
5761   (exit $ac_status); } &&
5762          { ac_try='test -s conftest.$ac_objext'
5763-  { (eval echo "$as_me:8888: \"$ac_try\"") >&5
5764+  { (eval echo "$as_me:9219: \"$ac_try\"") >&5
5765   (eval $ac_try) 2>&5
5766   ac_status=$?
5767-  echo "$as_me:8891: \$? = $ac_status" >&5
5768+  echo "$as_me:9222: \$? = $ac_status" >&5
5769   (exit $ac_status); }; }; then
5770   cf_cv_gnu_library=yes
5771 else
5772@@ -8899,7 +9230,7 @@
5773 rm -f conftest.$ac_objext conftest.$ac_ext
5774
5775 fi
5776-echo "$as_me:8902: result: $cf_cv_gnu_library" >&5
5777+echo "$as_me:9233: result: $cf_cv_gnu_library" >&5
5778 echo "${ECHO_T}$cf_cv_gnu_library" >&6
5779
5780 if test x$cf_cv_gnu_library = xyes; then
5781@@ -8907,7 +9238,7 @@
5782 	# With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
5783 	# was changed to help a little.  newlib incorporated the change about 4
5784 	# years later.
5785-	echo "$as_me:8910: checking if _DEFAULT_SOURCE can be used as a basis" >&5
5786+	echo "$as_me:9241: checking if _DEFAULT_SOURCE can be used as a basis" >&5
5787 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6
5788 if test "${cf_cv_gnu_library_219+set}" = set; then
5789   echo $ECHO_N "(cached) $ECHO_C" >&6
5790@@ -8919,7 +9250,7 @@
5791 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
5792
5793 		cat >conftest.$ac_ext <<_ACEOF
5794-#line 8922 "configure"
5795+#line 9253 "configure"
5796 #include "confdefs.h"
5797 #include <sys/types.h>
5798 int
5799@@ -8938,16 +9269,16 @@
5800 }
5801 _ACEOF
5802 rm -f conftest.$ac_objext
5803-if { (eval echo "$as_me:8941: \"$ac_compile\"") >&5
5804+if { (eval echo "$as_me:9272: \"$ac_compile\"") >&5
5805   (eval $ac_compile) 2>&5
5806   ac_status=$?
5807-  echo "$as_me:8944: \$? = $ac_status" >&5
5808+  echo "$as_me:9275: \$? = $ac_status" >&5
5809   (exit $ac_status); } &&
5810          { ac_try='test -s conftest.$ac_objext'
5811-  { (eval echo "$as_me:8947: \"$ac_try\"") >&5
5812+  { (eval echo "$as_me:9278: \"$ac_try\"") >&5
5813   (eval $ac_try) 2>&5
5814   ac_status=$?
5815-  echo "$as_me:8950: \$? = $ac_status" >&5
5816+  echo "$as_me:9281: \$? = $ac_status" >&5
5817   (exit $ac_status); }; }; then
5818   cf_cv_gnu_library_219=yes
5819 else
5820@@ -8959,12 +9290,12 @@
5821 		CPPFLAGS="$cf_save"
5822
5823 fi
5824-echo "$as_me:8962: result: $cf_cv_gnu_library_219" >&5
5825+echo "$as_me:9293: result: $cf_cv_gnu_library_219" >&5
5826 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6
5827
5828 	if test "x$cf_cv_gnu_library_219" = xyes; then
5829 		cf_save="$CPPFLAGS"
5830-		echo "$as_me:8967: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
5831+		echo "$as_me:9298: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
5832 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6
5833 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then
5834   echo $ECHO_N "(cached) $ECHO_C" >&6
5835@@ -9069,7 +9400,7 @@
5836 fi
5837
5838 			cat >conftest.$ac_ext <<_ACEOF
5839-#line 9072 "configure"
5840+#line 9403 "configure"
5841 #include "confdefs.h"
5842
5843 				#include <limits.h>
5844@@ -9089,16 +9420,16 @@
5845 }
5846 _ACEOF
5847 rm -f conftest.$ac_objext
5848-if { (eval echo "$as_me:9092: \"$ac_compile\"") >&5
5849+if { (eval echo "$as_me:9423: \"$ac_compile\"") >&5
5850   (eval $ac_compile) 2>&5
5851   ac_status=$?
5852-  echo "$as_me:9095: \$? = $ac_status" >&5
5853+  echo "$as_me:9426: \$? = $ac_status" >&5
5854   (exit $ac_status); } &&
5855          { ac_try='test -s conftest.$ac_objext'
5856-  { (eval echo "$as_me:9098: \"$ac_try\"") >&5
5857+  { (eval echo "$as_me:9429: \"$ac_try\"") >&5
5858   (eval $ac_try) 2>&5
5859   ac_status=$?
5860-  echo "$as_me:9101: \$? = $ac_status" >&5
5861+  echo "$as_me:9432: \$? = $ac_status" >&5
5862   (exit $ac_status); }; }; then
5863   cf_cv_gnu_dftsrc_219=yes
5864 else
5865@@ -9109,7 +9440,7 @@
5866 rm -f conftest.$ac_objext conftest.$ac_ext
5867
5868 fi
5869-echo "$as_me:9112: result: $cf_cv_gnu_dftsrc_219" >&5
5870+echo "$as_me:9443: result: $cf_cv_gnu_dftsrc_219" >&5
5871 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
5872 		test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
5873 	else
5874@@ -9118,14 +9449,14 @@
5875
5876 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
5877
5878-		echo "$as_me:9121: checking if we must define _GNU_SOURCE" >&5
5879+		echo "$as_me:9452: checking if we must define _GNU_SOURCE" >&5
5880 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
5881 if test "${cf_cv_gnu_source+set}" = set; then
5882   echo $ECHO_N "(cached) $ECHO_C" >&6
5883 else
5884
5885 		cat >conftest.$ac_ext <<_ACEOF
5886-#line 9128 "configure"
5887+#line 9459 "configure"
5888 #include "confdefs.h"
5889 #include <sys/types.h>
5890 int
5891@@ -9140,16 +9471,16 @@
5892 }
5893 _ACEOF
5894 rm -f conftest.$ac_objext
5895-if { (eval echo "$as_me:9143: \"$ac_compile\"") >&5
5896+if { (eval echo "$as_me:9474: \"$ac_compile\"") >&5
5897   (eval $ac_compile) 2>&5
5898   ac_status=$?
5899-  echo "$as_me:9146: \$? = $ac_status" >&5
5900+  echo "$as_me:9477: \$? = $ac_status" >&5
5901   (exit $ac_status); } &&
5902          { ac_try='test -s conftest.$ac_objext'
5903-  { (eval echo "$as_me:9149: \"$ac_try\"") >&5
5904+  { (eval echo "$as_me:9480: \"$ac_try\"") >&5
5905   (eval $ac_try) 2>&5
5906   ac_status=$?
5907-  echo "$as_me:9152: \$? = $ac_status" >&5
5908+  echo "$as_me:9483: \$? = $ac_status" >&5
5909   (exit $ac_status); }; }; then
5910   cf_cv_gnu_source=no
5911 else
5912@@ -9256,7 +9587,7 @@
5913 fi
5914
5915 			 cat >conftest.$ac_ext <<_ACEOF
5916-#line 9259 "configure"
5917+#line 9590 "configure"
5918 #include "confdefs.h"
5919 #include <sys/types.h>
5920 int
5921@@ -9271,16 +9602,16 @@
5922 }
5923 _ACEOF
5924 rm -f conftest.$ac_objext
5925-if { (eval echo "$as_me:9274: \"$ac_compile\"") >&5
5926+if { (eval echo "$as_me:9605: \"$ac_compile\"") >&5
5927   (eval $ac_compile) 2>&5
5928   ac_status=$?
5929-  echo "$as_me:9277: \$? = $ac_status" >&5
5930+  echo "$as_me:9608: \$? = $ac_status" >&5
5931   (exit $ac_status); } &&
5932          { ac_try='test -s conftest.$ac_objext'
5933-  { (eval echo "$as_me:9280: \"$ac_try\"") >&5
5934+  { (eval echo "$as_me:9611: \"$ac_try\"") >&5
5935   (eval $ac_try) 2>&5
5936   ac_status=$?
5937-  echo "$as_me:9283: \$? = $ac_status" >&5
5938+  echo "$as_me:9614: \$? = $ac_status" >&5
5939   (exit $ac_status); }; }; then
5940   cf_cv_gnu_source=no
5941 else
5942@@ -9295,12 +9626,12 @@
5943 rm -f conftest.$ac_objext conftest.$ac_ext
5944
5945 fi
5946-echo "$as_me:9298: result: $cf_cv_gnu_source" >&5
5947+echo "$as_me:9629: result: $cf_cv_gnu_source" >&5
5948 echo "${ECHO_T}$cf_cv_gnu_source" >&6
5949
5950 		if test "$cf_cv_gnu_source" = yes
5951 		then
5952-		echo "$as_me:9303: checking if we should also define _DEFAULT_SOURCE" >&5
5953+		echo "$as_me:9634: checking if we should also define _DEFAULT_SOURCE" >&5
5954 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
5955 if test "${cf_cv_default_source+set}" = set; then
5956   echo $ECHO_N "(cached) $ECHO_C" >&6
5957@@ -9310,7 +9641,7 @@
5958 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
5959
5960 			cat >conftest.$ac_ext <<_ACEOF
5961-#line 9313 "configure"
5962+#line 9644 "configure"
5963 #include "confdefs.h"
5964 #include <sys/types.h>
5965 int
5966@@ -9325,16 +9656,16 @@
5967 }
5968 _ACEOF
5969 rm -f conftest.$ac_objext
5970-if { (eval echo "$as_me:9328: \"$ac_compile\"") >&5
5971+if { (eval echo "$as_me:9659: \"$ac_compile\"") >&5
5972   (eval $ac_compile) 2>&5
5973   ac_status=$?
5974-  echo "$as_me:9331: \$? = $ac_status" >&5
5975+  echo "$as_me:9662: \$? = $ac_status" >&5
5976   (exit $ac_status); } &&
5977          { ac_try='test -s conftest.$ac_objext'
5978-  { (eval echo "$as_me:9334: \"$ac_try\"") >&5
5979+  { (eval echo "$as_me:9665: \"$ac_try\"") >&5
5980   (eval $ac_try) 2>&5
5981   ac_status=$?
5982-  echo "$as_me:9337: \$? = $ac_status" >&5
5983+  echo "$as_me:9668: \$? = $ac_status" >&5
5984   (exit $ac_status); }; }; then
5985   cf_cv_default_source=no
5986 else
5987@@ -9345,7 +9676,7 @@
5988 rm -f conftest.$ac_objext conftest.$ac_ext
5989
5990 fi
5991-echo "$as_me:9348: result: $cf_cv_default_source" >&5
5992+echo "$as_me:9679: result: $cf_cv_default_source" >&5
5993 echo "${ECHO_T}$cf_cv_default_source" >&6
5994 			if test "$cf_cv_default_source" = yes
5995 			then
5996@@ -9382,16 +9713,16 @@
5997 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
5998 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
5999
6000-echo "$as_me:9385: checking if we should define _POSIX_C_SOURCE" >&5
6001+echo "$as_me:9716: checking if we should define _POSIX_C_SOURCE" >&5
6002 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
6003 if test "${cf_cv_posix_c_source+set}" = set; then
6004   echo $ECHO_N "(cached) $ECHO_C" >&6
6005 else
6006
6007-echo "${as_me:-configure}:9391: testing if the symbol is already defined go no further ..." 1>&5
6008+echo "${as_me:-configure}:9722: testing if the symbol is already defined go no further ..." 1>&5
6009
6010 	cat >conftest.$ac_ext <<_ACEOF
6011-#line 9394 "configure"
6012+#line 9725 "configure"
6013 #include "confdefs.h"
6014 #include <sys/types.h>
6015 int
6016@@ -9406,16 +9737,16 @@
6017 }
6018 _ACEOF
6019 rm -f conftest.$ac_objext
6020-if { (eval echo "$as_me:9409: \"$ac_compile\"") >&5
6021+if { (eval echo "$as_me:9740: \"$ac_compile\"") >&5
6022   (eval $ac_compile) 2>&5
6023   ac_status=$?
6024-  echo "$as_me:9412: \$? = $ac_status" >&5
6025+  echo "$as_me:9743: \$? = $ac_status" >&5
6026   (exit $ac_status); } &&
6027          { ac_try='test -s conftest.$ac_objext'
6028-  { (eval echo "$as_me:9415: \"$ac_try\"") >&5
6029+  { (eval echo "$as_me:9746: \"$ac_try\"") >&5
6030   (eval $ac_try) 2>&5
6031   ac_status=$?
6032-  echo "$as_me:9418: \$? = $ac_status" >&5
6033+  echo "$as_me:9749: \$? = $ac_status" >&5
6034   (exit $ac_status); }; }; then
6035   cf_cv_posix_c_source=no
6036 else
6037@@ -9436,7 +9767,7 @@
6038 	 esac
6039 	 if test "$cf_want_posix_source" = yes ; then
6040 		cat >conftest.$ac_ext <<_ACEOF
6041-#line 9439 "configure"
6042+#line 9770 "configure"
6043 #include "confdefs.h"
6044 #include <sys/types.h>
6045 int
6046@@ -9451,16 +9782,16 @@
6047 }
6048 _ACEOF
6049 rm -f conftest.$ac_objext
6050-if { (eval echo "$as_me:9454: \"$ac_compile\"") >&5
6051+if { (eval echo "$as_me:9785: \"$ac_compile\"") >&5
6052   (eval $ac_compile) 2>&5
6053   ac_status=$?
6054-  echo "$as_me:9457: \$? = $ac_status" >&5
6055+  echo "$as_me:9788: \$? = $ac_status" >&5
6056   (exit $ac_status); } &&
6057          { ac_try='test -s conftest.$ac_objext'
6058-  { (eval echo "$as_me:9460: \"$ac_try\"") >&5
6059+  { (eval echo "$as_me:9791: \"$ac_try\"") >&5
6060   (eval $ac_try) 2>&5
6061   ac_status=$?
6062-  echo "$as_me:9463: \$? = $ac_status" >&5
6063+  echo "$as_me:9794: \$? = $ac_status" >&5
6064   (exit $ac_status); }; }; then
6065   :
6066 else
6067@@ -9471,7 +9802,7 @@
6068 rm -f conftest.$ac_objext conftest.$ac_ext
6069 	 fi
6070
6071-echo "${as_me:-configure}:9474: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
6072+echo "${as_me:-configure}:9805: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
6073
6074 	 CFLAGS="$cf_trim_CFLAGS"
6075 	 CPPFLAGS="$cf_trim_CPPFLAGS"
6076@@ -9479,10 +9810,10 @@
6077 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
6078 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
6079
6080-echo "${as_me:-configure}:9482: testing if the second compile does not leave our definition intact error ..." 1>&5
6081+echo "${as_me:-configure}:9813: testing if the second compile does not leave our definition intact error ..." 1>&5
6082
6083 	 cat >conftest.$ac_ext <<_ACEOF
6084-#line 9485 "configure"
6085+#line 9816 "configure"
6086 #include "confdefs.h"
6087 #include <sys/types.h>
6088 int
6089@@ -9497,16 +9828,16 @@
6090 }
6091 _ACEOF
6092 rm -f conftest.$ac_objext
6093-if { (eval echo "$as_me:9500: \"$ac_compile\"") >&5
6094+if { (eval echo "$as_me:9831: \"$ac_compile\"") >&5
6095   (eval $ac_compile) 2>&5
6096   ac_status=$?
6097-  echo "$as_me:9503: \$? = $ac_status" >&5
6098+  echo "$as_me:9834: \$? = $ac_status" >&5
6099   (exit $ac_status); } &&
6100          { ac_try='test -s conftest.$ac_objext'
6101-  { (eval echo "$as_me:9506: \"$ac_try\"") >&5
6102+  { (eval echo "$as_me:9837: \"$ac_try\"") >&5
6103   (eval $ac_try) 2>&5
6104   ac_status=$?
6105-  echo "$as_me:9509: \$? = $ac_status" >&5
6106+  echo "$as_me:9840: \$? = $ac_status" >&5
6107   (exit $ac_status); }; }; then
6108   :
6109 else
6110@@ -9522,7 +9853,7 @@
6111 rm -f conftest.$ac_objext conftest.$ac_ext
6112
6113 fi
6114-echo "$as_me:9525: result: $cf_cv_posix_c_source" >&5
6115+echo "$as_me:9856: result: $cf_cv_posix_c_source" >&5
6116 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
6117
6118 if test "$cf_cv_posix_c_source" != no ; then
6119@@ -9662,14 +9993,14 @@
6120 	;;
6121 (*)
6122
6123-echo "$as_me:9665: checking if we should define _XOPEN_SOURCE" >&5
6124+echo "$as_me:9996: checking if we should define _XOPEN_SOURCE" >&5
6125 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
6126 if test "${cf_cv_xopen_source+set}" = set; then
6127   echo $ECHO_N "(cached) $ECHO_C" >&6
6128 else
6129
6130 	cat >conftest.$ac_ext <<_ACEOF
6131-#line 9672 "configure"
6132+#line 10003 "configure"
6133 #include "confdefs.h"
6134
6135 #include <stdlib.h>
6136@@ -9688,16 +10019,16 @@
6137 }
6138 _ACEOF
6139 rm -f conftest.$ac_objext
6140-if { (eval echo "$as_me:9691: \"$ac_compile\"") >&5
6141+if { (eval echo "$as_me:10022: \"$ac_compile\"") >&5
6142   (eval $ac_compile) 2>&5
6143   ac_status=$?
6144-  echo "$as_me:9694: \$? = $ac_status" >&5
6145+  echo "$as_me:10025: \$? = $ac_status" >&5
6146   (exit $ac_status); } &&
6147          { ac_try='test -s conftest.$ac_objext'
6148-  { (eval echo "$as_me:9697: \"$ac_try\"") >&5
6149+  { (eval echo "$as_me:10028: \"$ac_try\"") >&5
6150   (eval $ac_try) 2>&5
6151   ac_status=$?
6152-  echo "$as_me:9700: \$? = $ac_status" >&5
6153+  echo "$as_me:10031: \$? = $ac_status" >&5
6154   (exit $ac_status); }; }; then
6155   cf_cv_xopen_source=no
6156 else
6157@@ -9709,7 +10040,7 @@
6158 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
6159
6160 	 cat >conftest.$ac_ext <<_ACEOF
6161-#line 9712 "configure"
6162+#line 10043 "configure"
6163 #include "confdefs.h"
6164
6165 #include <stdlib.h>
6166@@ -9728,16 +10059,16 @@
6167 }
6168 _ACEOF
6169 rm -f conftest.$ac_objext
6170-if { (eval echo "$as_me:9731: \"$ac_compile\"") >&5
6171+if { (eval echo "$as_me:10062: \"$ac_compile\"") >&5
6172   (eval $ac_compile) 2>&5
6173   ac_status=$?
6174-  echo "$as_me:9734: \$? = $ac_status" >&5
6175+  echo "$as_me:10065: \$? = $ac_status" >&5
6176   (exit $ac_status); } &&
6177          { ac_try='test -s conftest.$ac_objext'
6178-  { (eval echo "$as_me:9737: \"$ac_try\"") >&5
6179+  { (eval echo "$as_me:10068: \"$ac_try\"") >&5
6180   (eval $ac_try) 2>&5
6181   ac_status=$?
6182-  echo "$as_me:9740: \$? = $ac_status" >&5
6183+  echo "$as_me:10071: \$? = $ac_status" >&5
6184   (exit $ac_status); }; }; then
6185   cf_cv_xopen_source=no
6186 else
6187@@ -9752,7 +10083,7 @@
6188 rm -f conftest.$ac_objext conftest.$ac_ext
6189
6190 fi
6191-echo "$as_me:9755: result: $cf_cv_xopen_source" >&5
6192+echo "$as_me:10086: result: $cf_cv_xopen_source" >&5
6193 echo "${ECHO_T}$cf_cv_xopen_source" >&6
6194
6195 if test "$cf_cv_xopen_source" != no ; then
6196@@ -9882,16 +10213,16 @@
6197 	sed	-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?[ 	]/ /g' \
6198 		-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ 	]*\)\?$//g'`
6199
6200-echo "$as_me:9885: checking if we should define _POSIX_C_SOURCE" >&5
6201+echo "$as_me:10216: checking if we should define _POSIX_C_SOURCE" >&5
6202 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
6203 if test "${cf_cv_posix_c_source+set}" = set; then
6204   echo $ECHO_N "(cached) $ECHO_C" >&6
6205 else
6206
6207-echo "${as_me:-configure}:9891: testing if the symbol is already defined go no further ..." 1>&5
6208+echo "${as_me:-configure}:10222: testing if the symbol is already defined go no further ..." 1>&5
6209
6210 	cat >conftest.$ac_ext <<_ACEOF
6211-#line 9894 "configure"
6212+#line 10225 "configure"
6213 #include "confdefs.h"
6214 #include <sys/types.h>
6215 int
6216@@ -9906,16 +10237,16 @@
6217 }
6218 _ACEOF
6219 rm -f conftest.$ac_objext
6220-if { (eval echo "$as_me:9909: \"$ac_compile\"") >&5
6221+if { (eval echo "$as_me:10240: \"$ac_compile\"") >&5
6222   (eval $ac_compile) 2>&5
6223   ac_status=$?
6224-  echo "$as_me:9912: \$? = $ac_status" >&5
6225+  echo "$as_me:10243: \$? = $ac_status" >&5
6226   (exit $ac_status); } &&
6227          { ac_try='test -s conftest.$ac_objext'
6228-  { (eval echo "$as_me:9915: \"$ac_try\"") >&5
6229+  { (eval echo "$as_me:10246: \"$ac_try\"") >&5
6230   (eval $ac_try) 2>&5
6231   ac_status=$?
6232-  echo "$as_me:9918: \$? = $ac_status" >&5
6233+  echo "$as_me:10249: \$? = $ac_status" >&5
6234   (exit $ac_status); }; }; then
6235   cf_cv_posix_c_source=no
6236 else
6237@@ -9936,7 +10267,7 @@
6238 	 esac
6239 	 if test "$cf_want_posix_source" = yes ; then
6240 		cat >conftest.$ac_ext <<_ACEOF
6241-#line 9939 "configure"
6242+#line 10270 "configure"
6243 #include "confdefs.h"
6244 #include <sys/types.h>
6245 int
6246@@ -9951,16 +10282,16 @@
6247 }
6248 _ACEOF
6249 rm -f conftest.$ac_objext
6250-if { (eval echo "$as_me:9954: \"$ac_compile\"") >&5
6251+if { (eval echo "$as_me:10285: \"$ac_compile\"") >&5
6252   (eval $ac_compile) 2>&5
6253   ac_status=$?
6254-  echo "$as_me:9957: \$? = $ac_status" >&5
6255+  echo "$as_me:10288: \$? = $ac_status" >&5
6256   (exit $ac_status); } &&
6257          { ac_try='test -s conftest.$ac_objext'
6258-  { (eval echo "$as_me:9960: \"$ac_try\"") >&5
6259+  { (eval echo "$as_me:10291: \"$ac_try\"") >&5
6260   (eval $ac_try) 2>&5
6261   ac_status=$?
6262-  echo "$as_me:9963: \$? = $ac_status" >&5
6263+  echo "$as_me:10294: \$? = $ac_status" >&5
6264   (exit $ac_status); }; }; then
6265   :
6266 else
6267@@ -9971,7 +10302,7 @@
6268 rm -f conftest.$ac_objext conftest.$ac_ext
6269 	 fi
6270
6271-echo "${as_me:-configure}:9974: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
6272+echo "${as_me:-configure}:10305: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
6273
6274 	 CFLAGS="$cf_trim_CFLAGS"
6275 	 CPPFLAGS="$cf_trim_CPPFLAGS"
6276@@ -9979,10 +10310,10 @@
6277 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
6278 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
6279
6280-echo "${as_me:-configure}:9982: testing if the second compile does not leave our definition intact error ..." 1>&5
6281+echo "${as_me:-configure}:10313: testing if the second compile does not leave our definition intact error ..." 1>&5
6282
6283 	 cat >conftest.$ac_ext <<_ACEOF
6284-#line 9985 "configure"
6285+#line 10316 "configure"
6286 #include "confdefs.h"
6287 #include <sys/types.h>
6288 int
6289@@ -9997,16 +10328,16 @@
6290 }
6291 _ACEOF
6292 rm -f conftest.$ac_objext
6293-if { (eval echo "$as_me:10000: \"$ac_compile\"") >&5
6294+if { (eval echo "$as_me:10331: \"$ac_compile\"") >&5
6295   (eval $ac_compile) 2>&5
6296   ac_status=$?
6297-  echo "$as_me:10003: \$? = $ac_status" >&5
6298+  echo "$as_me:10334: \$? = $ac_status" >&5
6299   (exit $ac_status); } &&
6300          { ac_try='test -s conftest.$ac_objext'
6301-  { (eval echo "$as_me:10006: \"$ac_try\"") >&5
6302+  { (eval echo "$as_me:10337: \"$ac_try\"") >&5
6303   (eval $ac_try) 2>&5
6304   ac_status=$?
6305-  echo "$as_me:10009: \$? = $ac_status" >&5
6306+  echo "$as_me:10340: \$? = $ac_status" >&5
6307   (exit $ac_status); }; }; then
6308   :
6309 else
6310@@ -10022,7 +10353,7 @@
6311 rm -f conftest.$ac_objext conftest.$ac_ext
6312
6313 fi
6314-echo "$as_me:10025: result: $cf_cv_posix_c_source" >&5
6315+echo "$as_me:10356: result: $cf_cv_posix_c_source" >&5
6316 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
6317
6318 if test "$cf_cv_posix_c_source" != no ; then
6319@@ -10216,7 +10547,7 @@
6320 if test -n "$cf_new_cflags" ; then
6321 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
6322
6323-echo "${as_me:-configure}:10219: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
6324+echo "${as_me:-configure}:10550: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
6325
6326 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
6327 	CFLAGS="${CFLAGS}$cf_new_cflags"
6328@@ -10226,7 +10557,7 @@
6329 if test -n "$cf_new_cppflags" ; then
6330 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
6331
6332-echo "${as_me:-configure}:10229: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
6333+echo "${as_me:-configure}:10560: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
6334
6335 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
6336 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
6337@@ -10236,7 +10567,7 @@
6338 if test -n "$cf_new_extra_cppflags" ; then
6339 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
6340
6341-echo "${as_me:-configure}:10239: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
6342+echo "${as_me:-configure}:10570: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
6343
6344 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
6345 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
6346@@ -10246,10 +10577,10 @@
6347 fi
6348
6349 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
6350-	echo "$as_me:10249: checking if _XOPEN_SOURCE really is set" >&5
6351+	echo "$as_me:10580: checking if _XOPEN_SOURCE really is set" >&5
6352 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
6353 	cat >conftest.$ac_ext <<_ACEOF
6354-#line 10252 "configure"
6355+#line 10583 "configure"
6356 #include "confdefs.h"
6357 #include <stdlib.h>
6358 int
6359@@ -10264,16 +10595,16 @@
6360 }
6361 _ACEOF
6362 rm -f conftest.$ac_objext
6363-if { (eval echo "$as_me:10267: \"$ac_compile\"") >&5
6364+if { (eval echo "$as_me:10598: \"$ac_compile\"") >&5
6365   (eval $ac_compile) 2>&5
6366   ac_status=$?
6367-  echo "$as_me:10270: \$? = $ac_status" >&5
6368+  echo "$as_me:10601: \$? = $ac_status" >&5
6369   (exit $ac_status); } &&
6370          { ac_try='test -s conftest.$ac_objext'
6371-  { (eval echo "$as_me:10273: \"$ac_try\"") >&5
6372+  { (eval echo "$as_me:10604: \"$ac_try\"") >&5
6373   (eval $ac_try) 2>&5
6374   ac_status=$?
6375-  echo "$as_me:10276: \$? = $ac_status" >&5
6376+  echo "$as_me:10607: \$? = $ac_status" >&5
6377   (exit $ac_status); }; }; then
6378   cf_XOPEN_SOURCE_set=yes
6379 else
6380@@ -10282,12 +10613,12 @@
6381 cf_XOPEN_SOURCE_set=no
6382 fi
6383 rm -f conftest.$ac_objext conftest.$ac_ext
6384-	echo "$as_me:10285: result: $cf_XOPEN_SOURCE_set" >&5
6385+	echo "$as_me:10616: result: $cf_XOPEN_SOURCE_set" >&5
6386 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
6387 	if test $cf_XOPEN_SOURCE_set = yes
6388 	then
6389 		cat >conftest.$ac_ext <<_ACEOF
6390-#line 10290 "configure"
6391+#line 10621 "configure"
6392 #include "confdefs.h"
6393 #include <stdlib.h>
6394 int
6395@@ -10302,16 +10633,16 @@
6396 }
6397 _ACEOF
6398 rm -f conftest.$ac_objext
6399-if { (eval echo "$as_me:10305: \"$ac_compile\"") >&5
6400+if { (eval echo "$as_me:10636: \"$ac_compile\"") >&5
6401   (eval $ac_compile) 2>&5
6402   ac_status=$?
6403-  echo "$as_me:10308: \$? = $ac_status" >&5
6404+  echo "$as_me:10639: \$? = $ac_status" >&5
6405   (exit $ac_status); } &&
6406          { ac_try='test -s conftest.$ac_objext'
6407-  { (eval echo "$as_me:10311: \"$ac_try\"") >&5
6408+  { (eval echo "$as_me:10642: \"$ac_try\"") >&5
6409   (eval $ac_try) 2>&5
6410   ac_status=$?
6411-  echo "$as_me:10314: \$? = $ac_status" >&5
6412+  echo "$as_me:10645: \$? = $ac_status" >&5
6413   (exit $ac_status); }; }; then
6414   cf_XOPEN_SOURCE_set_ok=yes
6415 else
6416@@ -10322,19 +10653,19 @@
6417 rm -f conftest.$ac_objext conftest.$ac_ext
6418 		if test $cf_XOPEN_SOURCE_set_ok = no
6419 		then
6420-			{ echo "$as_me:10325: WARNING: _XOPEN_SOURCE is lower than requested" >&5
6421+			{ echo "$as_me:10656: WARNING: _XOPEN_SOURCE is lower than requested" >&5
6422 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
6423 		fi
6424 	else
6425
6426-echo "$as_me:10330: checking if we should define _XOPEN_SOURCE" >&5
6427+echo "$as_me:10661: checking if we should define _XOPEN_SOURCE" >&5
6428 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
6429 if test "${cf_cv_xopen_source+set}" = set; then
6430   echo $ECHO_N "(cached) $ECHO_C" >&6
6431 else
6432
6433 	cat >conftest.$ac_ext <<_ACEOF
6434-#line 10337 "configure"
6435+#line 10668 "configure"
6436 #include "confdefs.h"
6437
6438 #include <stdlib.h>
6439@@ -10353,16 +10684,16 @@
6440 }
6441 _ACEOF
6442 rm -f conftest.$ac_objext
6443-if { (eval echo "$as_me:10356: \"$ac_compile\"") >&5
6444+if { (eval echo "$as_me:10687: \"$ac_compile\"") >&5
6445   (eval $ac_compile) 2>&5
6446   ac_status=$?
6447-  echo "$as_me:10359: \$? = $ac_status" >&5
6448+  echo "$as_me:10690: \$? = $ac_status" >&5
6449   (exit $ac_status); } &&
6450          { ac_try='test -s conftest.$ac_objext'
6451-  { (eval echo "$as_me:10362: \"$ac_try\"") >&5
6452+  { (eval echo "$as_me:10693: \"$ac_try\"") >&5
6453   (eval $ac_try) 2>&5
6454   ac_status=$?
6455-  echo "$as_me:10365: \$? = $ac_status" >&5
6456+  echo "$as_me:10696: \$? = $ac_status" >&5
6457   (exit $ac_status); }; }; then
6458   cf_cv_xopen_source=no
6459 else
6460@@ -10374,7 +10705,7 @@
6461 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
6462
6463 	 cat >conftest.$ac_ext <<_ACEOF
6464-#line 10377 "configure"
6465+#line 10708 "configure"
6466 #include "confdefs.h"
6467
6468 #include <stdlib.h>
6469@@ -10393,16 +10724,16 @@
6470 }
6471 _ACEOF
6472 rm -f conftest.$ac_objext
6473-if { (eval echo "$as_me:10396: \"$ac_compile\"") >&5
6474+if { (eval echo "$as_me:10727: \"$ac_compile\"") >&5
6475   (eval $ac_compile) 2>&5
6476   ac_status=$?
6477-  echo "$as_me:10399: \$? = $ac_status" >&5
6478+  echo "$as_me:10730: \$? = $ac_status" >&5
6479   (exit $ac_status); } &&
6480          { ac_try='test -s conftest.$ac_objext'
6481-  { (eval echo "$as_me:10402: \"$ac_try\"") >&5
6482+  { (eval echo "$as_me:10733: \"$ac_try\"") >&5
6483   (eval $ac_try) 2>&5
6484   ac_status=$?
6485-  echo "$as_me:10405: \$? = $ac_status" >&5
6486+  echo "$as_me:10736: \$? = $ac_status" >&5
6487   (exit $ac_status); }; }; then
6488   cf_cv_xopen_source=no
6489 else
6490@@ -10417,7 +10748,7 @@
6491 rm -f conftest.$ac_objext conftest.$ac_ext
6492
6493 fi
6494-echo "$as_me:10420: result: $cf_cv_xopen_source" >&5
6495+echo "$as_me:10751: result: $cf_cv_xopen_source" >&5
6496 echo "${ECHO_T}$cf_cv_xopen_source" >&6
6497
6498 if test "$cf_cv_xopen_source" != no ; then
6499@@ -10540,14 +10871,14 @@
6500
6501 # Work around breakage on OS X
6502
6503-echo "$as_me:10543: checking if SIGWINCH is defined" >&5
6504+echo "$as_me:10874: checking if SIGWINCH is defined" >&5
6505 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
6506 if test "${cf_cv_define_sigwinch+set}" = set; then
6507   echo $ECHO_N "(cached) $ECHO_C" >&6
6508 else
6509
6510 	cat >conftest.$ac_ext <<_ACEOF
6511-#line 10550 "configure"
6512+#line 10881 "configure"
6513 #include "confdefs.h"
6514
6515 #include <sys/types.h>
6516@@ -10562,23 +10893,23 @@
6517 }
6518 _ACEOF
6519 rm -f conftest.$ac_objext
6520-if { (eval echo "$as_me:10565: \"$ac_compile\"") >&5
6521+if { (eval echo "$as_me:10896: \"$ac_compile\"") >&5
6522   (eval $ac_compile) 2>&5
6523   ac_status=$?
6524-  echo "$as_me:10568: \$? = $ac_status" >&5
6525+  echo "$as_me:10899: \$? = $ac_status" >&5
6526   (exit $ac_status); } &&
6527          { ac_try='test -s conftest.$ac_objext'
6528-  { (eval echo "$as_me:10571: \"$ac_try\"") >&5
6529+  { (eval echo "$as_me:10902: \"$ac_try\"") >&5
6530   (eval $ac_try) 2>&5
6531   ac_status=$?
6532-  echo "$as_me:10574: \$? = $ac_status" >&5
6533+  echo "$as_me:10905: \$? = $ac_status" >&5
6534   (exit $ac_status); }; }; then
6535   cf_cv_define_sigwinch=yes
6536 else
6537   echo "$as_me: failed program was:" >&5
6538 cat conftest.$ac_ext >&5
6539 cat >conftest.$ac_ext <<_ACEOF
6540-#line 10581 "configure"
6541+#line 10912 "configure"
6542 #include "confdefs.h"
6543
6544 #undef _XOPEN_SOURCE
6545@@ -10596,16 +10927,16 @@
6546 }
6547 _ACEOF
6548 rm -f conftest.$ac_objext
6549-if { (eval echo "$as_me:10599: \"$ac_compile\"") >&5
6550+if { (eval echo "$as_me:10930: \"$ac_compile\"") >&5
6551   (eval $ac_compile) 2>&5
6552   ac_status=$?
6553-  echo "$as_me:10602: \$? = $ac_status" >&5
6554+  echo "$as_me:10933: \$? = $ac_status" >&5
6555   (exit $ac_status); } &&
6556          { ac_try='test -s conftest.$ac_objext'
6557-  { (eval echo "$as_me:10605: \"$ac_try\"") >&5
6558+  { (eval echo "$as_me:10936: \"$ac_try\"") >&5
6559   (eval $ac_try) 2>&5
6560   ac_status=$?
6561-  echo "$as_me:10608: \$? = $ac_status" >&5
6562+  echo "$as_me:10939: \$? = $ac_status" >&5
6563   (exit $ac_status); }; }; then
6564   cf_cv_define_sigwinch=maybe
6565 else
6566@@ -10619,11 +10950,11 @@
6567 rm -f conftest.$ac_objext conftest.$ac_ext
6568
6569 fi
6570-echo "$as_me:10622: result: $cf_cv_define_sigwinch" >&5
6571+echo "$as_me:10953: result: $cf_cv_define_sigwinch" >&5
6572 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
6573
6574 if test "$cf_cv_define_sigwinch" = maybe ; then
6575-echo "$as_me:10626: checking for actual SIGWINCH definition" >&5
6576+echo "$as_me:10957: checking for actual SIGWINCH definition" >&5
6577 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
6578 if test "${cf_cv_fixup_sigwinch+set}" = set; then
6579   echo $ECHO_N "(cached) $ECHO_C" >&6
6580@@ -10634,7 +10965,7 @@
6581 while test $cf_sigwinch != 1
6582 do
6583 	cat >conftest.$ac_ext <<_ACEOF
6584-#line 10637 "configure"
6585+#line 10968 "configure"
6586 #include "confdefs.h"
6587
6588 #undef _XOPEN_SOURCE
6589@@ -10656,16 +10987,16 @@
6590 }
6591 _ACEOF
6592 rm -f conftest.$ac_objext
6593-if { (eval echo "$as_me:10659: \"$ac_compile\"") >&5
6594+if { (eval echo "$as_me:10990: \"$ac_compile\"") >&5
6595   (eval $ac_compile) 2>&5
6596   ac_status=$?
6597-  echo "$as_me:10662: \$? = $ac_status" >&5
6598+  echo "$as_me:10993: \$? = $ac_status" >&5
6599   (exit $ac_status); } &&
6600          { ac_try='test -s conftest.$ac_objext'
6601-  { (eval echo "$as_me:10665: \"$ac_try\"") >&5
6602+  { (eval echo "$as_me:10996: \"$ac_try\"") >&5
6603   (eval $ac_try) 2>&5
6604   ac_status=$?
6605-  echo "$as_me:10668: \$? = $ac_status" >&5
6606+  echo "$as_me:10999: \$? = $ac_status" >&5
6607   (exit $ac_status); }; }; then
6608   cf_cv_fixup_sigwinch=$cf_sigwinch
6609 	 break
6610@@ -10679,7 +11010,7 @@
6611 done
6612
6613 fi
6614-echo "$as_me:10682: result: $cf_cv_fixup_sigwinch" >&5
6615+echo "$as_me:11013: result: $cf_cv_fixup_sigwinch" >&5
6616 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
6617
6618 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
6619@@ -10689,13 +11020,13 @@
6620
6621 # Checks for CODESET support.
6622
6623-echo "$as_me:10692: checking for nl_langinfo and CODESET" >&5
6624+echo "$as_me:11023: checking for nl_langinfo and CODESET" >&5
6625 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
6626 if test "${am_cv_langinfo_codeset+set}" = set; then
6627   echo $ECHO_N "(cached) $ECHO_C" >&6
6628 else
6629   cat >conftest.$ac_ext <<_ACEOF
6630-#line 10698 "configure"
6631+#line 11029 "configure"
6632 #include "confdefs.h"
6633 #include <langinfo.h>
6634 int
6635@@ -10707,16 +11038,16 @@
6636 }
6637 _ACEOF
6638 rm -f conftest.$ac_objext conftest$ac_exeext
6639-if { (eval echo "$as_me:10710: \"$ac_link\"") >&5
6640+if { (eval echo "$as_me:11041: \"$ac_link\"") >&5
6641   (eval $ac_link) 2>&5
6642   ac_status=$?
6643-  echo "$as_me:10713: \$? = $ac_status" >&5
6644+  echo "$as_me:11044: \$? = $ac_status" >&5
6645   (exit $ac_status); } &&
6646          { ac_try='test -s conftest$ac_exeext'
6647-  { (eval echo "$as_me:10716: \"$ac_try\"") >&5
6648+  { (eval echo "$as_me:11047: \"$ac_try\"") >&5
6649   (eval $ac_try) 2>&5
6650   ac_status=$?
6651-  echo "$as_me:10719: \$? = $ac_status" >&5
6652+  echo "$as_me:11050: \$? = $ac_status" >&5
6653   (exit $ac_status); }; }; then
6654   am_cv_langinfo_codeset=yes
6655 else
6656@@ -10727,7 +11058,7 @@
6657 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6658
6659 fi
6660-echo "$as_me:10730: result: $am_cv_langinfo_codeset" >&5
6661+echo "$as_me:11061: result: $am_cv_langinfo_codeset" >&5
6662 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
6663 	if test $am_cv_langinfo_codeset = yes; then
6664
6665@@ -10741,7 +11072,7 @@
6666 NCURSES_OK_WCHAR_T=
6667 NCURSES_OK_WINT_T=
6668
6669-echo "$as_me:10744: checking if you want wide-character code" >&5
6670+echo "$as_me:11075: checking if you want wide-character code" >&5
6671 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
6672
6673 # Check whether --enable-widec or --disable-widec was given.
6674@@ -10751,7 +11082,7 @@
6675 else
6676   with_widec=no
6677 fi;
6678-echo "$as_me:10754: result: $with_widec" >&5
6679+echo "$as_me:11085: result: $with_widec" >&5
6680 echo "${ECHO_T}$with_widec" >&6
6681
6682 NCURSES_WCWIDTH_GRAPHICS=1
6683@@ -10775,23 +11106,23 @@
6684
6685 do
6686 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
6687-echo "$as_me:10778: checking for $ac_header" >&5
6688+echo "$as_me:11109: checking for $ac_header" >&5
6689 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
6690 if eval "test \"\${$as_ac_Header+set}\" = set"; then
6691   echo $ECHO_N "(cached) $ECHO_C" >&6
6692 else
6693   cat >conftest.$ac_ext <<_ACEOF
6694-#line 10784 "configure"
6695+#line 11115 "configure"
6696 #include "confdefs.h"
6697 #include <$ac_header>
6698 _ACEOF
6699-if { (eval echo "$as_me:10788: \"$ac_cpp conftest.$ac_ext\"") >&5
6700+if { (eval echo "$as_me:11119: \"$ac_cpp conftest.$ac_ext\"") >&5
6701   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
6702   ac_status=$?
6703   egrep -v '^ *\+' conftest.er1 >conftest.err
6704   rm -f conftest.er1
6705   cat conftest.err >&5
6706-  echo "$as_me:10794: \$? = $ac_status" >&5
6707+  echo "$as_me:11125: \$? = $ac_status" >&5
6708   (exit $ac_status); } >/dev/null; then
6709   if test -s conftest.err; then
6710     ac_cpp_err=$ac_c_preproc_warn_flag
6711@@ -10810,7 +11141,7 @@
6712 fi
6713 rm -f conftest.err conftest.$ac_ext
6714 fi
6715-echo "$as_me:10813: result: `eval echo '${'$as_ac_Header'}'`" >&5
6716+echo "$as_me:11144: result: `eval echo '${'$as_ac_Header'}'`" >&5
6717 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
6718 if test `eval echo '${'$as_ac_Header'}'` = yes; then
6719   cat >>confdefs.h <<EOF
6720@@ -10820,14 +11151,14 @@
6721 fi
6722 done
6723
6724-echo "$as_me:10823: checking if wchar.h can be used as is" >&5
6725+echo "$as_me:11154: checking if wchar.h can be used as is" >&5
6726 echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6
6727 if test "${cf_cv_wchar_h_okay+set}" = set; then
6728   echo $ECHO_N "(cached) $ECHO_C" >&6
6729 else
6730
6731 cat >conftest.$ac_ext <<_ACEOF
6732-#line 10830 "configure"
6733+#line 11161 "configure"
6734 #include "confdefs.h"
6735
6736 #include <stdlib.h>
6737@@ -10849,16 +11180,16 @@
6738 }
6739 _ACEOF
6740 rm -f conftest.$ac_objext
6741-if { (eval echo "$as_me:10852: \"$ac_compile\"") >&5
6742+if { (eval echo "$as_me:11183: \"$ac_compile\"") >&5
6743   (eval $ac_compile) 2>&5
6744   ac_status=$?
6745-  echo "$as_me:10855: \$? = $ac_status" >&5
6746+  echo "$as_me:11186: \$? = $ac_status" >&5
6747   (exit $ac_status); } &&
6748          { ac_try='test -s conftest.$ac_objext'
6749-  { (eval echo "$as_me:10858: \"$ac_try\"") >&5
6750+  { (eval echo "$as_me:11189: \"$ac_try\"") >&5
6751   (eval $ac_try) 2>&5
6752   ac_status=$?
6753-  echo "$as_me:10861: \$? = $ac_status" >&5
6754+  echo "$as_me:11192: \$? = $ac_status" >&5
6755   (exit $ac_status); }; }; then
6756   cf_cv_wchar_h_okay=yes
6757 else
6758@@ -10868,16 +11199,16 @@
6759 fi
6760 rm -f conftest.$ac_objext conftest.$ac_ext
6761 fi
6762-echo "$as_me:10871: result: $cf_cv_wchar_h_okay" >&5
6763+echo "$as_me:11202: result: $cf_cv_wchar_h_okay" >&5
6764 echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6
6765
6766 if test $cf_cv_wchar_h_okay = no
6767 then
6768
6769-echo "$as_me:10877: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
6770+echo "$as_me:11208: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
6771 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
6772 cat >conftest.$ac_ext <<_ACEOF
6773-#line 10880 "configure"
6774+#line 11211 "configure"
6775 #include "confdefs.h"
6776 #include <sys/types.h>
6777
6778@@ -10893,16 +11224,16 @@
6779 }
6780 _ACEOF
6781 rm -f conftest.$ac_objext
6782-if { (eval echo "$as_me:10896: \"$ac_compile\"") >&5
6783+if { (eval echo "$as_me:11227: \"$ac_compile\"") >&5
6784   (eval $ac_compile) 2>&5
6785   ac_status=$?
6786-  echo "$as_me:10899: \$? = $ac_status" >&5
6787+  echo "$as_me:11230: \$? = $ac_status" >&5
6788   (exit $ac_status); } &&
6789          { ac_try='test -s conftest.$ac_objext'
6790-  { (eval echo "$as_me:10902: \"$ac_try\"") >&5
6791+  { (eval echo "$as_me:11233: \"$ac_try\"") >&5
6792   (eval $ac_try) 2>&5
6793   ac_status=$?
6794-  echo "$as_me:10905: \$? = $ac_status" >&5
6795+  echo "$as_me:11236: \$? = $ac_status" >&5
6796   (exit $ac_status); }; }; then
6797   cf_result=no
6798 else
6799@@ -10911,16 +11242,16 @@
6800 cf_result=yes
6801 fi
6802 rm -f conftest.$ac_objext conftest.$ac_ext
6803-echo "$as_me:10914: result: $cf_result" >&5
6804+echo "$as_me:11245: result: $cf_result" >&5
6805 echo "${ECHO_T}$cf_result" >&6
6806
6807 if test "$cf_result" = yes ; then
6808 	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
6809 elif test "x" != "x" ; then
6810-	echo "$as_me:10920: checking checking for compatible value versus " >&5
6811+	echo "$as_me:11251: checking checking for compatible value versus " >&5
6812 echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
6813 	cat >conftest.$ac_ext <<_ACEOF
6814-#line 10923 "configure"
6815+#line 11254 "configure"
6816 #include "confdefs.h"
6817 #include <sys/types.h>
6818
6819@@ -10936,16 +11267,16 @@
6820 }
6821 _ACEOF
6822 rm -f conftest.$ac_objext
6823-if { (eval echo "$as_me:10939: \"$ac_compile\"") >&5
6824+if { (eval echo "$as_me:11270: \"$ac_compile\"") >&5
6825   (eval $ac_compile) 2>&5
6826   ac_status=$?
6827-  echo "$as_me:10942: \$? = $ac_status" >&5
6828+  echo "$as_me:11273: \$? = $ac_status" >&5
6829   (exit $ac_status); } &&
6830          { ac_try='test -s conftest.$ac_objext'
6831-  { (eval echo "$as_me:10945: \"$ac_try\"") >&5
6832+  { (eval echo "$as_me:11276: \"$ac_try\"") >&5
6833   (eval $ac_try) 2>&5
6834   ac_status=$?
6835-  echo "$as_me:10948: \$? = $ac_status" >&5
6836+  echo "$as_me:11279: \$? = $ac_status" >&5
6837   (exit $ac_status); }; }; then
6838   cf_result=yes
6839 else
6840@@ -10954,7 +11285,7 @@
6841 cf_result=no
6842 fi
6843 rm -f conftest.$ac_objext conftest.$ac_ext
6844-	echo "$as_me:10957: result: $cf_result" >&5
6845+	echo "$as_me:11288: result: $cf_result" >&5
6846 echo "${ECHO_T}$cf_result" >&6
6847 	if test "$cf_result" = no ; then
6848 		# perhaps we can override it - try...
6849@@ -10964,7 +11295,7 @@
6850
6851 fi
6852
6853-echo "$as_me:10967: checking if wcwidth agrees graphics are single-width" >&5
6854+echo "$as_me:11298: checking if wcwidth agrees graphics are single-width" >&5
6855 echo $ECHO_N "checking if wcwidth agrees graphics are single-width... $ECHO_C" >&6
6856 if test "${cf_cv_wcwidth_graphics+set}" = set; then
6857   echo $ECHO_N "(cached) $ECHO_C" >&6
6858@@ -11035,7 +11366,7 @@
6859   cf_cv_wcwidth_graphics=unknown
6860 else
6861   cat >conftest.$ac_ext <<_ACEOF
6862-#line 11038 "configure"
6863+#line 11369 "configure"
6864 #include "confdefs.h"
6865
6866 #include <locale.h>
6867@@ -11079,15 +11410,15 @@
6868
6869 _ACEOF
6870 rm -f conftest$ac_exeext
6871-if { (eval echo "$as_me:11082: \"$ac_link\"") >&5
6872+if { (eval echo "$as_me:11413: \"$ac_link\"") >&5
6873   (eval $ac_link) 2>&5
6874   ac_status=$?
6875-  echo "$as_me:11085: \$? = $ac_status" >&5
6876+  echo "$as_me:11416: \$? = $ac_status" >&5
6877   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
6878-  { (eval echo "$as_me:11087: \"$ac_try\"") >&5
6879+  { (eval echo "$as_me:11418: \"$ac_try\"") >&5
6880   (eval $ac_try) 2>&5
6881   ac_status=$?
6882-  echo "$as_me:11090: \$? = $ac_status" >&5
6883+  echo "$as_me:11421: \$? = $ac_status" >&5
6884   (exit $ac_status); }; }; then
6885   cf_cv_wcwidth_graphics=yes
6886 else
6887@@ -11100,7 +11431,7 @@
6888 fi
6889
6890 fi
6891-echo "$as_me:11103: result: $cf_cv_wcwidth_graphics" >&5
6892+echo "$as_me:11434: result: $cf_cv_wcwidth_graphics" >&5
6893 echo "${ECHO_T}$cf_cv_wcwidth_graphics" >&6
6894
6895 	test "$cf_cv_wcwidth_graphics" = no && NCURSES_WCWIDTH_GRAPHICS=0
6896@@ -11111,13 +11442,13 @@
6897 for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs
6898 do
6899 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
6900-echo "$as_me:11114: checking for $ac_func" >&5
6901+echo "$as_me:11445: checking for $ac_func" >&5
6902 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
6903 if eval "test \"\${$as_ac_var+set}\" = set"; then
6904   echo $ECHO_N "(cached) $ECHO_C" >&6
6905 else
6906   cat >conftest.$ac_ext <<_ACEOF
6907-#line 11120 "configure"
6908+#line 11451 "configure"
6909 #include "confdefs.h"
6910 #define $ac_func autoconf_temporary
6911 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
6912@@ -11148,16 +11479,16 @@
6913 }
6914 _ACEOF
6915 rm -f conftest.$ac_objext conftest$ac_exeext
6916-if { (eval echo "$as_me:11151: \"$ac_link\"") >&5
6917+if { (eval echo "$as_me:11482: \"$ac_link\"") >&5
6918   (eval $ac_link) 2>&5
6919   ac_status=$?
6920-  echo "$as_me:11154: \$? = $ac_status" >&5
6921+  echo "$as_me:11485: \$? = $ac_status" >&5
6922   (exit $ac_status); } &&
6923          { ac_try='test -s conftest$ac_exeext'
6924-  { (eval echo "$as_me:11157: \"$ac_try\"") >&5
6925+  { (eval echo "$as_me:11488: \"$ac_try\"") >&5
6926   (eval $ac_try) 2>&5
6927   ac_status=$?
6928-  echo "$as_me:11160: \$? = $ac_status" >&5
6929+  echo "$as_me:11491: \$? = $ac_status" >&5
6930   (exit $ac_status); }; }; then
6931   eval "$as_ac_var=yes"
6932 else
6933@@ -11167,7 +11498,7 @@
6934 fi
6935 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6936 fi
6937-echo "$as_me:11170: result: `eval echo '${'$as_ac_var'}'`" >&5
6938+echo "$as_me:11501: result: `eval echo '${'$as_ac_var'}'`" >&5
6939 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
6940 if test `eval echo '${'$as_ac_var'}'` = yes; then
6941   cat >>confdefs.h <<EOF
6942@@ -11179,7 +11510,7 @@
6943
6944 	if test "x$ac_cv_func_putwc" != xyes ; then
6945
6946-echo "$as_me:11182: checking for multibyte character support" >&5
6947+echo "$as_me:11513: checking for multibyte character support" >&5
6948 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
6949 if test "${cf_cv_utf8_lib+set}" = set; then
6950   echo $ECHO_N "(cached) $ECHO_C" >&6
6951@@ -11187,7 +11518,7 @@
6952
6953 	cf_save_LIBS="$LIBS"
6954 	cat >conftest.$ac_ext <<_ACEOF
6955-#line 11190 "configure"
6956+#line 11521 "configure"
6957 #include "confdefs.h"
6958
6959 #include <stdlib.h>
6960@@ -11200,16 +11531,16 @@
6961 }
6962 _ACEOF
6963 rm -f conftest.$ac_objext conftest$ac_exeext
6964-if { (eval echo "$as_me:11203: \"$ac_link\"") >&5
6965+if { (eval echo "$as_me:11534: \"$ac_link\"") >&5
6966   (eval $ac_link) 2>&5
6967   ac_status=$?
6968-  echo "$as_me:11206: \$? = $ac_status" >&5
6969+  echo "$as_me:11537: \$? = $ac_status" >&5
6970   (exit $ac_status); } &&
6971          { ac_try='test -s conftest$ac_exeext'
6972-  { (eval echo "$as_me:11209: \"$ac_try\"") >&5
6973+  { (eval echo "$as_me:11540: \"$ac_try\"") >&5
6974   (eval $ac_try) 2>&5
6975   ac_status=$?
6976-  echo "$as_me:11212: \$? = $ac_status" >&5
6977+  echo "$as_me:11543: \$? = $ac_status" >&5
6978   (exit $ac_status); }; }; then
6979   cf_cv_utf8_lib=yes
6980 else
6981@@ -11221,12 +11552,12 @@
6982 cf_cv_header_path_utf8=
6983 cf_cv_library_path_utf8=
6984
6985-echo "${as_me:-configure}:11224: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
6986+echo "${as_me:-configure}:11555: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
6987
6988 cf_save_LIBS="$LIBS"
6989
6990 cat >conftest.$ac_ext <<_ACEOF
6991-#line 11229 "configure"
6992+#line 11560 "configure"
6993 #include "confdefs.h"
6994
6995 #include <libutf8.h>
6996@@ -11239,16 +11570,16 @@
6997 }
6998 _ACEOF
6999 rm -f conftest.$ac_objext conftest$ac_exeext
7000-if { (eval echo "$as_me:11242: \"$ac_link\"") >&5
7001+if { (eval echo "$as_me:11573: \"$ac_link\"") >&5
7002   (eval $ac_link) 2>&5
7003   ac_status=$?
7004-  echo "$as_me:11245: \$? = $ac_status" >&5
7005+  echo "$as_me:11576: \$? = $ac_status" >&5
7006   (exit $ac_status); } &&
7007          { ac_try='test -s conftest$ac_exeext'
7008-  { (eval echo "$as_me:11248: \"$ac_try\"") >&5
7009+  { (eval echo "$as_me:11579: \"$ac_try\"") >&5
7010   (eval $ac_try) 2>&5
7011   ac_status=$?
7012-  echo "$as_me:11251: \$? = $ac_status" >&5
7013+  echo "$as_me:11582: \$? = $ac_status" >&5
7014   (exit $ac_status); }; }; then
7015
7016 	cf_cv_find_linkage_utf8=yes
7017@@ -11262,7 +11593,7 @@
7018 LIBS="-lutf8  $cf_save_LIBS"
7019
7020 cat >conftest.$ac_ext <<_ACEOF
7021-#line 11265 "configure"
7022+#line 11596 "configure"
7023 #include "confdefs.h"
7024
7025 #include <libutf8.h>
7026@@ -11275,16 +11606,16 @@
7027 }
7028 _ACEOF
7029 rm -f conftest.$ac_objext conftest$ac_exeext
7030-if { (eval echo "$as_me:11278: \"$ac_link\"") >&5
7031+if { (eval echo "$as_me:11609: \"$ac_link\"") >&5
7032   (eval $ac_link) 2>&5
7033   ac_status=$?
7034-  echo "$as_me:11281: \$? = $ac_status" >&5
7035+  echo "$as_me:11612: \$? = $ac_status" >&5
7036   (exit $ac_status); } &&
7037          { ac_try='test -s conftest$ac_exeext'
7038-  { (eval echo "$as_me:11284: \"$ac_try\"") >&5
7039+  { (eval echo "$as_me:11615: \"$ac_try\"") >&5
7040   (eval $ac_try) 2>&5
7041   ac_status=$?
7042-  echo "$as_me:11287: \$? = $ac_status" >&5
7043+  echo "$as_me:11618: \$? = $ac_status" >&5
7044   (exit $ac_status); }; }; then
7045
7046 	cf_cv_find_linkage_utf8=yes
7047@@ -11301,9 +11632,9 @@
7048
7049 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
7050
7051-echo "${as_me:-configure}:11304: testing find linkage for utf8 library ..." 1>&5
7052+echo "${as_me:-configure}:11635: testing find linkage for utf8 library ..." 1>&5
7053
7054-echo "${as_me:-configure}:11306: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
7055+echo "${as_me:-configure}:11637: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
7056
7057 	cf_save_CPPFLAGS="$CPPFLAGS"
7058 	cf_test_CPPFLAGS="$CPPFLAGS"
7059@@ -11394,7 +11725,7 @@
7060 		if test -d $cf_cv_header_path_utf8 ; then
7061 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
7062
7063-echo "${as_me:-configure}:11397: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
7064+echo "${as_me:-configure}:11728: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
7065
7066 			CPPFLAGS="$cf_save_CPPFLAGS"
7067
7068@@ -11402,7 +11733,7 @@
7069 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
7070
7071 			cat >conftest.$ac_ext <<_ACEOF
7072-#line 11405 "configure"
7073+#line 11736 "configure"
7074 #include "confdefs.h"
7075
7076 #include <libutf8.h>
7077@@ -11415,21 +11746,21 @@
7078 }
7079 _ACEOF
7080 rm -f conftest.$ac_objext
7081-if { (eval echo "$as_me:11418: \"$ac_compile\"") >&5
7082+if { (eval echo "$as_me:11749: \"$ac_compile\"") >&5
7083   (eval $ac_compile) 2>&5
7084   ac_status=$?
7085-  echo "$as_me:11421: \$? = $ac_status" >&5
7086+  echo "$as_me:11752: \$? = $ac_status" >&5
7087   (exit $ac_status); } &&
7088          { ac_try='test -s conftest.$ac_objext'
7089-  { (eval echo "$as_me:11424: \"$ac_try\"") >&5
7090+  { (eval echo "$as_me:11755: \"$ac_try\"") >&5
7091   (eval $ac_try) 2>&5
7092   ac_status=$?
7093-  echo "$as_me:11427: \$? = $ac_status" >&5
7094+  echo "$as_me:11758: \$? = $ac_status" >&5
7095   (exit $ac_status); }; }; then
7096
7097 				test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
7098
7099-echo "${as_me:-configure}:11432: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
7100+echo "${as_me:-configure}:11763: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
7101
7102 				cf_cv_find_linkage_utf8=maybe
7103 				cf_test_CPPFLAGS="$CPPFLAGS"
7104@@ -11447,7 +11778,7 @@
7105
7106 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
7107
7108-echo "${as_me:-configure}:11450: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
7109+echo "${as_me:-configure}:11781: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
7110
7111 		cf_save_LIBS="$LIBS"
7112 		cf_save_LDFLAGS="$LDFLAGS"
7113@@ -11522,13 +11853,13 @@
7114 				if test -d $cf_cv_library_path_utf8 ; then
7115 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
7116
7117-echo "${as_me:-configure}:11525: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
7118+echo "${as_me:-configure}:11856: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
7119
7120 					CPPFLAGS="$cf_test_CPPFLAGS"
7121 					LIBS="-lutf8  $cf_save_LIBS"
7122 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
7123 					cat >conftest.$ac_ext <<_ACEOF
7124-#line 11531 "configure"
7125+#line 11862 "configure"
7126 #include "confdefs.h"
7127
7128 #include <libutf8.h>
7129@@ -11541,21 +11872,21 @@
7130 }
7131 _ACEOF
7132 rm -f conftest.$ac_objext conftest$ac_exeext
7133-if { (eval echo "$as_me:11544: \"$ac_link\"") >&5
7134+if { (eval echo "$as_me:11875: \"$ac_link\"") >&5
7135   (eval $ac_link) 2>&5
7136   ac_status=$?
7137-  echo "$as_me:11547: \$? = $ac_status" >&5
7138+  echo "$as_me:11878: \$? = $ac_status" >&5
7139   (exit $ac_status); } &&
7140          { ac_try='test -s conftest$ac_exeext'
7141-  { (eval echo "$as_me:11550: \"$ac_try\"") >&5
7142+  { (eval echo "$as_me:11881: \"$ac_try\"") >&5
7143   (eval $ac_try) 2>&5
7144   ac_status=$?
7145-  echo "$as_me:11553: \$? = $ac_status" >&5
7146+  echo "$as_me:11884: \$? = $ac_status" >&5
7147   (exit $ac_status); }; }; then
7148
7149 					test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
7150
7151-echo "${as_me:-configure}:11558: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
7152+echo "${as_me:-configure}:11889: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
7153
7154 					cf_cv_find_linkage_utf8=yes
7155 					cf_cv_library_file_utf8="-lutf8"
7156@@ -11597,7 +11928,7 @@
7157 fi
7158 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
7159 fi
7160-echo "$as_me:11600: result: $cf_cv_utf8_lib" >&5
7161+echo "$as_me:11931: result: $cf_cv_utf8_lib" >&5
7162 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
7163
7164 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
7165@@ -11635,7 +11966,7 @@
7166 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
7167
7168 			  cat >conftest.$ac_ext <<_ACEOF
7169-#line 11638 "configure"
7170+#line 11969 "configure"
7171 #include "confdefs.h"
7172 #include <stdio.h>
7173 int
7174@@ -11647,16 +11978,16 @@
7175 }
7176 _ACEOF
7177 rm -f conftest.$ac_objext
7178-if { (eval echo "$as_me:11650: \"$ac_compile\"") >&5
7179+if { (eval echo "$as_me:11981: \"$ac_compile\"") >&5
7180   (eval $ac_compile) 2>&5
7181   ac_status=$?
7182-  echo "$as_me:11653: \$? = $ac_status" >&5
7183+  echo "$as_me:11984: \$? = $ac_status" >&5
7184   (exit $ac_status); } &&
7185          { ac_try='test -s conftest.$ac_objext'
7186-  { (eval echo "$as_me:11656: \"$ac_try\"") >&5
7187+  { (eval echo "$as_me:11987: \"$ac_try\"") >&5
7188   (eval $ac_try) 2>&5
7189   ac_status=$?
7190-  echo "$as_me:11659: \$? = $ac_status" >&5
7191+  echo "$as_me:11990: \$? = $ac_status" >&5
7192   (exit $ac_status); }; }; then
7193   :
7194 else
7195@@ -11673,7 +12004,7 @@
7196 		if test "$cf_have_incdir" = no ; then
7197 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
7198
7199-echo "${as_me:-configure}:11676: testing adding $cf_add_incdir to include-path ..." 1>&5
7200+echo "${as_me:-configure}:12007: testing adding $cf_add_incdir to include-path ..." 1>&5
7201
7202 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
7203
7204@@ -11709,7 +12040,7 @@
7205 			if test "$cf_have_libdir" = no ; then
7206 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
7207
7208-echo "${as_me:-configure}:11712: testing adding $cf_add_libdir to library-path ..." 1>&5
7209+echo "${as_me:-configure}:12043: testing adding $cf_add_libdir to library-path ..." 1>&5
7210
7211 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
7212 			fi
7213@@ -11741,14 +12072,14 @@
7214 	fi
7215
7216 # This is needed on Tru64 5.0 to declare mbstate_t
7217-echo "$as_me:11744: checking if we must include wchar.h to declare mbstate_t" >&5
7218+echo "$as_me:12075: checking if we must include wchar.h to declare mbstate_t" >&5
7219 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
7220 if test "${cf_cv_mbstate_t+set}" = set; then
7221   echo $ECHO_N "(cached) $ECHO_C" >&6
7222 else
7223
7224 cat >conftest.$ac_ext <<_ACEOF
7225-#line 11751 "configure"
7226+#line 12082 "configure"
7227 #include "confdefs.h"
7228
7229 #include <stdlib.h>
7230@@ -11766,23 +12097,23 @@
7231 }
7232 _ACEOF
7233 rm -f conftest.$ac_objext
7234-if { (eval echo "$as_me:11769: \"$ac_compile\"") >&5
7235+if { (eval echo "$as_me:12100: \"$ac_compile\"") >&5
7236   (eval $ac_compile) 2>&5
7237   ac_status=$?
7238-  echo "$as_me:11772: \$? = $ac_status" >&5
7239+  echo "$as_me:12103: \$? = $ac_status" >&5
7240   (exit $ac_status); } &&
7241          { ac_try='test -s conftest.$ac_objext'
7242-  { (eval echo "$as_me:11775: \"$ac_try\"") >&5
7243+  { (eval echo "$as_me:12106: \"$ac_try\"") >&5
7244   (eval $ac_try) 2>&5
7245   ac_status=$?
7246-  echo "$as_me:11778: \$? = $ac_status" >&5
7247+  echo "$as_me:12109: \$? = $ac_status" >&5
7248   (exit $ac_status); }; }; then
7249   cf_cv_mbstate_t=no
7250 else
7251   echo "$as_me: failed program was:" >&5
7252 cat conftest.$ac_ext >&5
7253 cat >conftest.$ac_ext <<_ACEOF
7254-#line 11785 "configure"
7255+#line 12116 "configure"
7256 #include "confdefs.h"
7257
7258 #include <stdlib.h>
7259@@ -11801,16 +12132,16 @@
7260 }
7261 _ACEOF
7262 rm -f conftest.$ac_objext
7263-if { (eval echo "$as_me:11804: \"$ac_compile\"") >&5
7264+if { (eval echo "$as_me:12135: \"$ac_compile\"") >&5
7265   (eval $ac_compile) 2>&5
7266   ac_status=$?
7267-  echo "$as_me:11807: \$? = $ac_status" >&5
7268+  echo "$as_me:12138: \$? = $ac_status" >&5
7269   (exit $ac_status); } &&
7270          { ac_try='test -s conftest.$ac_objext'
7271-  { (eval echo "$as_me:11810: \"$ac_try\"") >&5
7272+  { (eval echo "$as_me:12141: \"$ac_try\"") >&5
7273   (eval $ac_try) 2>&5
7274   ac_status=$?
7275-  echo "$as_me:11813: \$? = $ac_status" >&5
7276+  echo "$as_me:12144: \$? = $ac_status" >&5
7277   (exit $ac_status); }; }; then
7278   cf_cv_mbstate_t=yes
7279 else
7280@@ -11822,7 +12153,7 @@
7281 fi
7282 rm -f conftest.$ac_objext conftest.$ac_ext
7283 fi
7284-echo "$as_me:11825: result: $cf_cv_mbstate_t" >&5
7285+echo "$as_me:12156: result: $cf_cv_mbstate_t" >&5
7286 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
7287
7288 if test "$cf_cv_mbstate_t" = yes ; then
7289@@ -11840,14 +12171,14 @@
7290 fi
7291
7292 # This is needed on Tru64 5.0 to declare wchar_t
7293-echo "$as_me:11843: checking if we must include wchar.h to declare wchar_t" >&5
7294+echo "$as_me:12174: checking if we must include wchar.h to declare wchar_t" >&5
7295 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
7296 if test "${cf_cv_wchar_t+set}" = set; then
7297   echo $ECHO_N "(cached) $ECHO_C" >&6
7298 else
7299
7300 cat >conftest.$ac_ext <<_ACEOF
7301-#line 11850 "configure"
7302+#line 12181 "configure"
7303 #include "confdefs.h"
7304
7305 #include <stdlib.h>
7306@@ -11865,23 +12196,23 @@
7307 }
7308 _ACEOF
7309 rm -f conftest.$ac_objext
7310-if { (eval echo "$as_me:11868: \"$ac_compile\"") >&5
7311+if { (eval echo "$as_me:12199: \"$ac_compile\"") >&5
7312   (eval $ac_compile) 2>&5
7313   ac_status=$?
7314-  echo "$as_me:11871: \$? = $ac_status" >&5
7315+  echo "$as_me:12202: \$? = $ac_status" >&5
7316   (exit $ac_status); } &&
7317          { ac_try='test -s conftest.$ac_objext'
7318-  { (eval echo "$as_me:11874: \"$ac_try\"") >&5
7319+  { (eval echo "$as_me:12205: \"$ac_try\"") >&5
7320   (eval $ac_try) 2>&5
7321   ac_status=$?
7322-  echo "$as_me:11877: \$? = $ac_status" >&5
7323+  echo "$as_me:12208: \$? = $ac_status" >&5
7324   (exit $ac_status); }; }; then
7325   cf_cv_wchar_t=no
7326 else
7327   echo "$as_me: failed program was:" >&5
7328 cat conftest.$ac_ext >&5
7329 cat >conftest.$ac_ext <<_ACEOF
7330-#line 11884 "configure"
7331+#line 12215 "configure"
7332 #include "confdefs.h"
7333
7334 #include <stdlib.h>
7335@@ -11900,16 +12231,16 @@
7336 }
7337 _ACEOF
7338 rm -f conftest.$ac_objext
7339-if { (eval echo "$as_me:11903: \"$ac_compile\"") >&5
7340+if { (eval echo "$as_me:12234: \"$ac_compile\"") >&5
7341   (eval $ac_compile) 2>&5
7342   ac_status=$?
7343-  echo "$as_me:11906: \$? = $ac_status" >&5
7344+  echo "$as_me:12237: \$? = $ac_status" >&5
7345   (exit $ac_status); } &&
7346          { ac_try='test -s conftest.$ac_objext'
7347-  { (eval echo "$as_me:11909: \"$ac_try\"") >&5
7348+  { (eval echo "$as_me:12240: \"$ac_try\"") >&5
7349   (eval $ac_try) 2>&5
7350   ac_status=$?
7351-  echo "$as_me:11912: \$? = $ac_status" >&5
7352+  echo "$as_me:12243: \$? = $ac_status" >&5
7353   (exit $ac_status); }; }; then
7354   cf_cv_wchar_t=yes
7355 else
7356@@ -11921,7 +12252,7 @@
7357 fi
7358 rm -f conftest.$ac_objext conftest.$ac_ext
7359 fi
7360-echo "$as_me:11924: result: $cf_cv_wchar_t" >&5
7361+echo "$as_me:12255: result: $cf_cv_wchar_t" >&5
7362 echo "${ECHO_T}$cf_cv_wchar_t" >&6
7363
7364 if test "$cf_cv_wchar_t" = yes ; then
7365@@ -11944,14 +12275,14 @@
7366 fi
7367
7368 # This is needed on Tru64 5.0 to declare wint_t
7369-echo "$as_me:11947: checking if we must include wchar.h to declare wint_t" >&5
7370+echo "$as_me:12278: checking if we must include wchar.h to declare wint_t" >&5
7371 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
7372 if test "${cf_cv_wint_t+set}" = set; then
7373   echo $ECHO_N "(cached) $ECHO_C" >&6
7374 else
7375
7376 cat >conftest.$ac_ext <<_ACEOF
7377-#line 11954 "configure"
7378+#line 12285 "configure"
7379 #include "confdefs.h"
7380
7381 #include <stdlib.h>
7382@@ -11969,23 +12300,23 @@
7383 }
7384 _ACEOF
7385 rm -f conftest.$ac_objext
7386-if { (eval echo "$as_me:11972: \"$ac_compile\"") >&5
7387+if { (eval echo "$as_me:12303: \"$ac_compile\"") >&5
7388   (eval $ac_compile) 2>&5
7389   ac_status=$?
7390-  echo "$as_me:11975: \$? = $ac_status" >&5
7391+  echo "$as_me:12306: \$? = $ac_status" >&5
7392   (exit $ac_status); } &&
7393          { ac_try='test -s conftest.$ac_objext'
7394-  { (eval echo "$as_me:11978: \"$ac_try\"") >&5
7395+  { (eval echo "$as_me:12309: \"$ac_try\"") >&5
7396   (eval $ac_try) 2>&5
7397   ac_status=$?
7398-  echo "$as_me:11981: \$? = $ac_status" >&5
7399+  echo "$as_me:12312: \$? = $ac_status" >&5
7400   (exit $ac_status); }; }; then
7401   cf_cv_wint_t=no
7402 else
7403   echo "$as_me: failed program was:" >&5
7404 cat conftest.$ac_ext >&5
7405 cat >conftest.$ac_ext <<_ACEOF
7406-#line 11988 "configure"
7407+#line 12319 "configure"
7408 #include "confdefs.h"
7409
7410 #include <stdlib.h>
7411@@ -12004,16 +12335,16 @@
7412 }
7413 _ACEOF
7414 rm -f conftest.$ac_objext
7415-if { (eval echo "$as_me:12007: \"$ac_compile\"") >&5
7416+if { (eval echo "$as_me:12338: \"$ac_compile\"") >&5
7417   (eval $ac_compile) 2>&5
7418   ac_status=$?
7419-  echo "$as_me:12010: \$? = $ac_status" >&5
7420+  echo "$as_me:12341: \$? = $ac_status" >&5
7421   (exit $ac_status); } &&
7422          { ac_try='test -s conftest.$ac_objext'
7423-  { (eval echo "$as_me:12013: \"$ac_try\"") >&5
7424+  { (eval echo "$as_me:12344: \"$ac_try\"") >&5
7425   (eval $ac_try) 2>&5
7426   ac_status=$?
7427-  echo "$as_me:12016: \$? = $ac_status" >&5
7428+  echo "$as_me:12347: \$? = $ac_status" >&5
7429   (exit $ac_status); }; }; then
7430   cf_cv_wint_t=yes
7431 else
7432@@ -12025,7 +12356,7 @@
7433 fi
7434 rm -f conftest.$ac_objext conftest.$ac_ext
7435 fi
7436-echo "$as_me:12028: result: $cf_cv_wint_t" >&5
7437+echo "$as_me:12359: result: $cf_cv_wint_t" >&5
7438 echo "${ECHO_T}$cf_cv_wint_t" >&6
7439
7440 if test "$cf_cv_wint_t" = yes ; then
7441@@ -12057,7 +12388,7 @@
7442 fi
7443
7444 ###   use option --disable-lp64 to allow long chtype
7445-echo "$as_me:12060: checking whether to enable _LP64 definition in curses.h" >&5
7446+echo "$as_me:12391: checking whether to enable _LP64 definition in curses.h" >&5
7447 echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
7448
7449 # Check whether --enable-lp64 or --disable-lp64 was given.
7450@@ -12067,7 +12398,7 @@
7451 else
7452   with_lp64=$cf_dft_with_lp64
7453 fi;
7454-echo "$as_me:12070: result: $with_lp64" >&5
7455+echo "$as_me:12401: result: $with_lp64" >&5
7456 echo "${ECHO_T}$with_lp64" >&6
7457
7458 if test "x$with_lp64" = xyes ; then
7459@@ -12083,7 +12414,7 @@
7460 fi;
7461 if test "$enable_largefile" != no; then
7462
7463-  echo "$as_me:12086: checking for special C compiler options needed for large files" >&5
7464+  echo "$as_me:12417: checking for special C compiler options needed for large files" >&5
7465 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
7466 if test "${ac_cv_sys_largefile_CC+set}" = set; then
7467   echo $ECHO_N "(cached) $ECHO_C" >&6
7468@@ -12095,7 +12426,7 @@
7469      	 # IRIX 6.2 and later do not support large files by default,
7470      	 # so use the C compiler's -n32 option if that helps.
7471          cat >conftest.$ac_ext <<_ACEOF
7472-#line 12098 "configure"
7473+#line 12429 "configure"
7474 #include "confdefs.h"
7475 #include <sys/types.h>
7476  /* Check that off_t can represent 2**63 - 1 correctly.
7477@@ -12115,16 +12446,16 @@
7478 }
7479 _ACEOF
7480      	 rm -f conftest.$ac_objext
7481-if { (eval echo "$as_me:12118: \"$ac_compile\"") >&5
7482+if { (eval echo "$as_me:12449: \"$ac_compile\"") >&5
7483   (eval $ac_compile) 2>&5
7484   ac_status=$?
7485-  echo "$as_me:12121: \$? = $ac_status" >&5
7486+  echo "$as_me:12452: \$? = $ac_status" >&5
7487   (exit $ac_status); } &&
7488          { ac_try='test -s conftest.$ac_objext'
7489-  { (eval echo "$as_me:12124: \"$ac_try\"") >&5
7490+  { (eval echo "$as_me:12455: \"$ac_try\"") >&5
7491   (eval $ac_try) 2>&5
7492   ac_status=$?
7493-  echo "$as_me:12127: \$? = $ac_status" >&5
7494+  echo "$as_me:12458: \$? = $ac_status" >&5
7495   (exit $ac_status); }; }; then
7496   break
7497 else
7498@@ -12134,16 +12465,16 @@
7499 rm -f conftest.$ac_objext
7500      	 CC="$CC -n32"
7501      	 rm -f conftest.$ac_objext
7502-if { (eval echo "$as_me:12137: \"$ac_compile\"") >&5
7503+if { (eval echo "$as_me:12468: \"$ac_compile\"") >&5
7504   (eval $ac_compile) 2>&5
7505   ac_status=$?
7506-  echo "$as_me:12140: \$? = $ac_status" >&5
7507+  echo "$as_me:12471: \$? = $ac_status" >&5
7508   (exit $ac_status); } &&
7509          { ac_try='test -s conftest.$ac_objext'
7510-  { (eval echo "$as_me:12143: \"$ac_try\"") >&5
7511+  { (eval echo "$as_me:12474: \"$ac_try\"") >&5
7512   (eval $ac_try) 2>&5
7513   ac_status=$?
7514-  echo "$as_me:12146: \$? = $ac_status" >&5
7515+  echo "$as_me:12477: \$? = $ac_status" >&5
7516   (exit $ac_status); }; }; then
7517   ac_cv_sys_largefile_CC=' -n32'; break
7518 else
7519@@ -12157,13 +12488,13 @@
7520        rm -f conftest.$ac_ext
7521     fi
7522 fi
7523-echo "$as_me:12160: result: $ac_cv_sys_largefile_CC" >&5
7524+echo "$as_me:12491: result: $ac_cv_sys_largefile_CC" >&5
7525 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
7526   if test "$ac_cv_sys_largefile_CC" != no; then
7527     CC=$CC$ac_cv_sys_largefile_CC
7528   fi
7529
7530-  echo "$as_me:12166: checking for _FILE_OFFSET_BITS value needed for large files" >&5
7531+  echo "$as_me:12497: checking for _FILE_OFFSET_BITS value needed for large files" >&5
7532 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
7533 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
7534   echo $ECHO_N "(cached) $ECHO_C" >&6
7535@@ -12171,7 +12502,7 @@
7536   while :; do
7537   ac_cv_sys_file_offset_bits=no
7538   cat >conftest.$ac_ext <<_ACEOF
7539-#line 12174 "configure"
7540+#line 12505 "configure"
7541 #include "confdefs.h"
7542 #include <sys/types.h>
7543  /* Check that off_t can represent 2**63 - 1 correctly.
7544@@ -12191,16 +12522,16 @@
7545 }
7546 _ACEOF
7547 rm -f conftest.$ac_objext
7548-if { (eval echo "$as_me:12194: \"$ac_compile\"") >&5
7549+if { (eval echo "$as_me:12525: \"$ac_compile\"") >&5
7550   (eval $ac_compile) 2>&5
7551   ac_status=$?
7552-  echo "$as_me:12197: \$? = $ac_status" >&5
7553+  echo "$as_me:12528: \$? = $ac_status" >&5
7554   (exit $ac_status); } &&
7555          { ac_try='test -s conftest.$ac_objext'
7556-  { (eval echo "$as_me:12200: \"$ac_try\"") >&5
7557+  { (eval echo "$as_me:12531: \"$ac_try\"") >&5
7558   (eval $ac_try) 2>&5
7559   ac_status=$?
7560-  echo "$as_me:12203: \$? = $ac_status" >&5
7561+  echo "$as_me:12534: \$? = $ac_status" >&5
7562   (exit $ac_status); }; }; then
7563   break
7564 else
7565@@ -12209,7 +12540,7 @@
7566 fi
7567 rm -f conftest.$ac_objext conftest.$ac_ext
7568   cat >conftest.$ac_ext <<_ACEOF
7569-#line 12212 "configure"
7570+#line 12543 "configure"
7571 #include "confdefs.h"
7572 #define _FILE_OFFSET_BITS 64
7573 #include <sys/types.h>
7574@@ -12230,16 +12561,16 @@
7575 }
7576 _ACEOF
7577 rm -f conftest.$ac_objext
7578-if { (eval echo "$as_me:12233: \"$ac_compile\"") >&5
7579+if { (eval echo "$as_me:12564: \"$ac_compile\"") >&5
7580   (eval $ac_compile) 2>&5
7581   ac_status=$?
7582-  echo "$as_me:12236: \$? = $ac_status" >&5
7583+  echo "$as_me:12567: \$? = $ac_status" >&5
7584   (exit $ac_status); } &&
7585          { ac_try='test -s conftest.$ac_objext'
7586-  { (eval echo "$as_me:12239: \"$ac_try\"") >&5
7587+  { (eval echo "$as_me:12570: \"$ac_try\"") >&5
7588   (eval $ac_try) 2>&5
7589   ac_status=$?
7590-  echo "$as_me:12242: \$? = $ac_status" >&5
7591+  echo "$as_me:12573: \$? = $ac_status" >&5
7592   (exit $ac_status); }; }; then
7593   ac_cv_sys_file_offset_bits=64; break
7594 else
7595@@ -12250,7 +12581,7 @@
7596   break
7597 done
7598 fi
7599-echo "$as_me:12253: result: $ac_cv_sys_file_offset_bits" >&5
7600+echo "$as_me:12584: result: $ac_cv_sys_file_offset_bits" >&5
7601 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
7602 if test "$ac_cv_sys_file_offset_bits" != no; then
7603
7604@@ -12260,7 +12591,7 @@
7605
7606 fi
7607 rm -rf conftest*
7608-  echo "$as_me:12263: checking for _LARGE_FILES value needed for large files" >&5
7609+  echo "$as_me:12594: checking for _LARGE_FILES value needed for large files" >&5
7610 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
7611 if test "${ac_cv_sys_large_files+set}" = set; then
7612   echo $ECHO_N "(cached) $ECHO_C" >&6
7613@@ -12268,7 +12599,7 @@
7614   while :; do
7615   ac_cv_sys_large_files=no
7616   cat >conftest.$ac_ext <<_ACEOF
7617-#line 12271 "configure"
7618+#line 12602 "configure"
7619 #include "confdefs.h"
7620 #include <sys/types.h>
7621  /* Check that off_t can represent 2**63 - 1 correctly.
7622@@ -12288,16 +12619,16 @@
7623 }
7624 _ACEOF
7625 rm -f conftest.$ac_objext
7626-if { (eval echo "$as_me:12291: \"$ac_compile\"") >&5
7627+if { (eval echo "$as_me:12622: \"$ac_compile\"") >&5
7628   (eval $ac_compile) 2>&5
7629   ac_status=$?
7630-  echo "$as_me:12294: \$? = $ac_status" >&5
7631+  echo "$as_me:12625: \$? = $ac_status" >&5
7632   (exit $ac_status); } &&
7633          { ac_try='test -s conftest.$ac_objext'
7634-  { (eval echo "$as_me:12297: \"$ac_try\"") >&5
7635+  { (eval echo "$as_me:12628: \"$ac_try\"") >&5
7636   (eval $ac_try) 2>&5
7637   ac_status=$?
7638-  echo "$as_me:12300: \$? = $ac_status" >&5
7639+  echo "$as_me:12631: \$? = $ac_status" >&5
7640   (exit $ac_status); }; }; then
7641   break
7642 else
7643@@ -12306,7 +12637,7 @@
7644 fi
7645 rm -f conftest.$ac_objext conftest.$ac_ext
7646   cat >conftest.$ac_ext <<_ACEOF
7647-#line 12309 "configure"
7648+#line 12640 "configure"
7649 #include "confdefs.h"
7650 #define _LARGE_FILES 1
7651 #include <sys/types.h>
7652@@ -12327,16 +12658,16 @@
7653 }
7654 _ACEOF
7655 rm -f conftest.$ac_objext
7656-if { (eval echo "$as_me:12330: \"$ac_compile\"") >&5
7657+if { (eval echo "$as_me:12661: \"$ac_compile\"") >&5
7658   (eval $ac_compile) 2>&5
7659   ac_status=$?
7660-  echo "$as_me:12333: \$? = $ac_status" >&5
7661+  echo "$as_me:12664: \$? = $ac_status" >&5
7662   (exit $ac_status); } &&
7663          { ac_try='test -s conftest.$ac_objext'
7664-  { (eval echo "$as_me:12336: \"$ac_try\"") >&5
7665+  { (eval echo "$as_me:12667: \"$ac_try\"") >&5
7666   (eval $ac_try) 2>&5
7667   ac_status=$?
7668-  echo "$as_me:12339: \$? = $ac_status" >&5
7669+  echo "$as_me:12670: \$? = $ac_status" >&5
7670   (exit $ac_status); }; }; then
7671   ac_cv_sys_large_files=1; break
7672 else
7673@@ -12347,7 +12678,7 @@
7674   break
7675 done
7676 fi
7677-echo "$as_me:12350: result: $ac_cv_sys_large_files" >&5
7678+echo "$as_me:12681: result: $ac_cv_sys_large_files" >&5
7679 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
7680 if test "$ac_cv_sys_large_files" != no; then
7681
7682@@ -12360,7 +12691,7 @@
7683 fi
7684
7685 	if test "$enable_largefile" != no ; then
7686-	echo "$as_me:12363: checking for _LARGEFILE_SOURCE value needed for large files" >&5
7687+	echo "$as_me:12694: checking for _LARGEFILE_SOURCE value needed for large files" >&5
7688 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
7689 if test "${ac_cv_sys_largefile_source+set}" = set; then
7690   echo $ECHO_N "(cached) $ECHO_C" >&6
7691@@ -12368,7 +12699,7 @@
7692   while :; do
7693   ac_cv_sys_largefile_source=no
7694   cat >conftest.$ac_ext <<_ACEOF
7695-#line 12371 "configure"
7696+#line 12702 "configure"
7697 #include "confdefs.h"
7698 #include <stdio.h>
7699 int
7700@@ -12380,16 +12711,16 @@
7701 }
7702 _ACEOF
7703 rm -f conftest.$ac_objext
7704-if { (eval echo "$as_me:12383: \"$ac_compile\"") >&5
7705+if { (eval echo "$as_me:12714: \"$ac_compile\"") >&5
7706   (eval $ac_compile) 2>&5
7707   ac_status=$?
7708-  echo "$as_me:12386: \$? = $ac_status" >&5
7709+  echo "$as_me:12717: \$? = $ac_status" >&5
7710   (exit $ac_status); } &&
7711          { ac_try='test -s conftest.$ac_objext'
7712-  { (eval echo "$as_me:12389: \"$ac_try\"") >&5
7713+  { (eval echo "$as_me:12720: \"$ac_try\"") >&5
7714   (eval $ac_try) 2>&5
7715   ac_status=$?
7716-  echo "$as_me:12392: \$? = $ac_status" >&5
7717+  echo "$as_me:12723: \$? = $ac_status" >&5
7718   (exit $ac_status); }; }; then
7719   break
7720 else
7721@@ -12398,7 +12729,7 @@
7722 fi
7723 rm -f conftest.$ac_objext conftest.$ac_ext
7724   cat >conftest.$ac_ext <<_ACEOF
7725-#line 12401 "configure"
7726+#line 12732 "configure"
7727 #include "confdefs.h"
7728 #define _LARGEFILE_SOURCE 1
7729 #include <stdio.h>
7730@@ -12411,16 +12742,16 @@
7731 }
7732 _ACEOF
7733 rm -f conftest.$ac_objext
7734-if { (eval echo "$as_me:12414: \"$ac_compile\"") >&5
7735+if { (eval echo "$as_me:12745: \"$ac_compile\"") >&5
7736   (eval $ac_compile) 2>&5
7737   ac_status=$?
7738-  echo "$as_me:12417: \$? = $ac_status" >&5
7739+  echo "$as_me:12748: \$? = $ac_status" >&5
7740   (exit $ac_status); } &&
7741          { ac_try='test -s conftest.$ac_objext'
7742-  { (eval echo "$as_me:12420: \"$ac_try\"") >&5
7743+  { (eval echo "$as_me:12751: \"$ac_try\"") >&5
7744   (eval $ac_try) 2>&5
7745   ac_status=$?
7746-  echo "$as_me:12423: \$? = $ac_status" >&5
7747+  echo "$as_me:12754: \$? = $ac_status" >&5
7748   (exit $ac_status); }; }; then
7749   ac_cv_sys_largefile_source=1; break
7750 else
7751@@ -12431,7 +12762,7 @@
7752   break
7753 done
7754 fi
7755-echo "$as_me:12434: result: $ac_cv_sys_largefile_source" >&5
7756+echo "$as_me:12765: result: $ac_cv_sys_largefile_source" >&5
7757 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
7758 if test "$ac_cv_sys_largefile_source" != no; then
7759
7760@@ -12445,13 +12776,13 @@
7761 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
7762 # in glibc 2.1.3, but that breaks too many other things.
7763 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
7764-echo "$as_me:12448: checking for fseeko" >&5
7765+echo "$as_me:12779: checking for fseeko" >&5
7766 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
7767 if test "${ac_cv_func_fseeko+set}" = set; then
7768   echo $ECHO_N "(cached) $ECHO_C" >&6
7769 else
7770   cat >conftest.$ac_ext <<_ACEOF
7771-#line 12454 "configure"
7772+#line 12785 "configure"
7773 #include "confdefs.h"
7774 #include <stdio.h>
7775 int
7776@@ -12463,16 +12794,16 @@
7777 }
7778 _ACEOF
7779 rm -f conftest.$ac_objext conftest$ac_exeext
7780-if { (eval echo "$as_me:12466: \"$ac_link\"") >&5
7781+if { (eval echo "$as_me:12797: \"$ac_link\"") >&5
7782   (eval $ac_link) 2>&5
7783   ac_status=$?
7784-  echo "$as_me:12469: \$? = $ac_status" >&5
7785+  echo "$as_me:12800: \$? = $ac_status" >&5
7786   (exit $ac_status); } &&
7787          { ac_try='test -s conftest$ac_exeext'
7788-  { (eval echo "$as_me:12472: \"$ac_try\"") >&5
7789+  { (eval echo "$as_me:12803: \"$ac_try\"") >&5
7790   (eval $ac_try) 2>&5
7791   ac_status=$?
7792-  echo "$as_me:12475: \$? = $ac_status" >&5
7793+  echo "$as_me:12806: \$? = $ac_status" >&5
7794   (exit $ac_status); }; }; then
7795   ac_cv_func_fseeko=yes
7796 else
7797@@ -12482,7 +12813,7 @@
7798 fi
7799 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
7800 fi
7801-echo "$as_me:12485: result: $ac_cv_func_fseeko" >&5
7802+echo "$as_me:12816: result: $ac_cv_func_fseeko" >&5
7803 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
7804 if test $ac_cv_func_fseeko = yes; then
7805
7806@@ -12521,14 +12852,14 @@
7807
7808 	fi
7809
7810-	echo "$as_me:12524: checking whether to use struct dirent64" >&5
7811+	echo "$as_me:12855: checking whether to use struct dirent64" >&5
7812 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
7813 if test "${cf_cv_struct_dirent64+set}" = set; then
7814   echo $ECHO_N "(cached) $ECHO_C" >&6
7815 else
7816
7817 		cat >conftest.$ac_ext <<_ACEOF
7818-#line 12531 "configure"
7819+#line 12862 "configure"
7820 #include "confdefs.h"
7821
7822 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
7823@@ -12550,16 +12881,16 @@
7824 }
7825 _ACEOF
7826 rm -f conftest.$ac_objext
7827-if { (eval echo "$as_me:12553: \"$ac_compile\"") >&5
7828+if { (eval echo "$as_me:12884: \"$ac_compile\"") >&5
7829   (eval $ac_compile) 2>&5
7830   ac_status=$?
7831-  echo "$as_me:12556: \$? = $ac_status" >&5
7832+  echo "$as_me:12887: \$? = $ac_status" >&5
7833   (exit $ac_status); } &&
7834          { ac_try='test -s conftest.$ac_objext'
7835-  { (eval echo "$as_me:12559: \"$ac_try\"") >&5
7836+  { (eval echo "$as_me:12890: \"$ac_try\"") >&5
7837   (eval $ac_try) 2>&5
7838   ac_status=$?
7839-  echo "$as_me:12562: \$? = $ac_status" >&5
7840+  echo "$as_me:12893: \$? = $ac_status" >&5
7841   (exit $ac_status); }; }; then
7842   cf_cv_struct_dirent64=yes
7843 else
7844@@ -12570,7 +12901,7 @@
7845 rm -f conftest.$ac_objext conftest.$ac_ext
7846
7847 fi
7848-echo "$as_me:12573: result: $cf_cv_struct_dirent64" >&5
7849+echo "$as_me:12904: result: $cf_cv_struct_dirent64" >&5
7850 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
7851 	test "$cf_cv_struct_dirent64" = yes &&
7852 cat >>confdefs.h <<\EOF
7853@@ -12580,7 +12911,7 @@
7854 	fi
7855
7856 ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
7857-echo "$as_me:12583: checking if you want tparm not to use X/Open fixed-parameter list" >&5
7858+echo "$as_me:12914: checking if you want tparm not to use X/Open fixed-parameter list" >&5
7859 echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
7860
7861 # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
7862@@ -12590,14 +12921,14 @@
7863 else
7864   with_tparm_varargs=yes
7865 fi;
7866-echo "$as_me:12593: result: $with_tparm_varargs" >&5
7867+echo "$as_me:12924: result: $with_tparm_varargs" >&5
7868 echo "${ECHO_T}$with_tparm_varargs" >&6
7869 NCURSES_TPARM_VARARGS=0
7870 test "x$with_tparm_varargs" = xyes && NCURSES_TPARM_VARARGS=1
7871
7872 ###   use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw
7873 if test "$with_ticlib" != no ; then
7874-echo "$as_me:12600: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
7875+echo "$as_me:12931: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5
7876 echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6
7877
7878 # Check whether --enable-tic-depends or --disable-tic-depends was given.
7879@@ -12607,14 +12938,14 @@
7880 else
7881   with_tic_depends=yes
7882 fi;
7883-echo "$as_me:12610: result: $with_tic_depends" >&5
7884+echo "$as_me:12941: result: $with_tic_depends" >&5
7885 echo "${ECHO_T}$with_tic_depends" >&6
7886 else
7887 	with_tic_depends=no
7888 fi
7889
7890 ###   use option --disable-wattr-macros to suppress wattr* macros from curses.h
7891-echo "$as_me:12617: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
7892+echo "$as_me:12948: checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition" >&5
7893 echo $ECHO_N "checking if you want to suppress wattr* macros to help with ncurses5/ncurses6 transition... $ECHO_C" >&6
7894
7895 # Check whether --enable-wattr-macros or --disable-wattr-macros was given.
7896@@ -12626,15 +12957,15 @@
7897 fi;
7898 if [ "x$with_wattr_macros" != xyes ]; then
7899 	NCURSES_WATTR_MACROS=0
7900-	echo "$as_me:12629: result: yes" >&5
7901+	echo "$as_me:12960: result: yes" >&5
7902 echo "${ECHO_T}yes" >&6
7903 else
7904 	NCURSES_WATTR_MACROS=1
7905-	echo "$as_me:12633: result: no" >&5
7906+	echo "$as_me:12964: result: no" >&5
7907 echo "${ECHO_T}no" >&6
7908 fi
7909
7910-echo "$as_me:12637: checking for X11 rgb file" >&5
7911+echo "$as_me:12968: checking for X11 rgb file" >&5
7912 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
7913
7914 # Check whether --with-x11-rgb or --without-x11-rgb was given.
7915@@ -12698,7 +13029,7 @@
7916 	cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
7917 	;;
7918 (*)
7919-	{ { echo "$as_me:12701: error: expected a pathname, not \"$cf_path\"" >&5
7920+	{ { echo "$as_me:13032: error: expected a pathname, not \"$cf_path\"" >&5
7921 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
7922    { (exit 1); exit 1; }; }
7923 	;;
7924@@ -12706,7 +13037,7 @@
7925
7926 fi
7927
7928-echo "$as_me:12709: result: $RGB_PATH" >&5
7929+echo "$as_me:13040: result: $RGB_PATH" >&5
7930 echo "${ECHO_T}$RGB_PATH" >&6
7931
7932 cat >>confdefs.h <<EOF
7933@@ -12720,7 +13051,7 @@
7934 fi
7935
7936 ###   use option --with-bool to override bool's type
7937-echo "$as_me:12723: checking for type of bool" >&5
7938+echo "$as_me:13054: checking for type of bool" >&5
7939 echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
7940
7941 # Check whether --with-bool or --without-bool was given.
7942@@ -12730,10 +13061,10 @@
7943 else
7944   NCURSES_BOOL=auto
7945 fi;
7946-echo "$as_me:12733: result: $NCURSES_BOOL" >&5
7947+echo "$as_me:13064: result: $NCURSES_BOOL" >&5
7948 echo "${ECHO_T}$NCURSES_BOOL" >&6
7949
7950-echo "$as_me:12736: checking for alternate terminal capabilities file" >&5
7951+echo "$as_me:13067: checking for alternate terminal capabilities file" >&5
7952 echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
7953
7954 # Check whether --with-caps or --without-caps was given.
7955@@ -12744,11 +13075,11 @@
7956   TERMINFO_CAPS=Caps
7957 fi;
7958 test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
7959-echo "$as_me:12747: result: $TERMINFO_CAPS" >&5
7960+echo "$as_me:13078: result: $TERMINFO_CAPS" >&5
7961 echo "${ECHO_T}$TERMINFO_CAPS" >&6
7962
7963 ###   use option --with-chtype to override chtype's type
7964-echo "$as_me:12751: checking for type of chtype" >&5
7965+echo "$as_me:13082: checking for type of chtype" >&5
7966 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
7967
7968 # Check whether --with-chtype or --without-chtype was given.
7969@@ -12758,11 +13089,11 @@
7970 else
7971   NCURSES_CHTYPE=$cf_dft_chtype
7972 fi;
7973-echo "$as_me:12761: result: $NCURSES_CHTYPE" >&5
7974+echo "$as_me:13092: result: $NCURSES_CHTYPE" >&5
7975 echo "${ECHO_T}$NCURSES_CHTYPE" >&6
7976
7977 ###   use option --with-ospeed to override ospeed's type
7978-echo "$as_me:12765: checking for type of ospeed" >&5
7979+echo "$as_me:13096: checking for type of ospeed" >&5
7980 echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
7981
7982 # Check whether --with-ospeed or --without-ospeed was given.
7983@@ -12772,11 +13103,11 @@
7984 else
7985   NCURSES_OSPEED=short
7986 fi;
7987-echo "$as_me:12775: result: $NCURSES_OSPEED" >&5
7988+echo "$as_me:13106: result: $NCURSES_OSPEED" >&5
7989 echo "${ECHO_T}$NCURSES_OSPEED" >&6
7990
7991 ###   use option --with-mmask-t to override mmask_t's type
7992-echo "$as_me:12779: checking for type of mmask_t" >&5
7993+echo "$as_me:13110: checking for type of mmask_t" >&5
7994 echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
7995
7996 # Check whether --with-mmask-t or --without-mmask-t was given.
7997@@ -12786,11 +13117,11 @@
7998 else
7999   NCURSES_MMASK_T=$cf_dft_mmask_t
8000 fi;
8001-echo "$as_me:12789: result: $NCURSES_MMASK_T" >&5
8002+echo "$as_me:13120: result: $NCURSES_MMASK_T" >&5
8003 echo "${ECHO_T}$NCURSES_MMASK_T" >&6
8004
8005 ###   use option --with-ccharw-max to override CCHARW_MAX size
8006-echo "$as_me:12793: checking for size CCHARW_MAX" >&5
8007+echo "$as_me:13124: checking for size CCHARW_MAX" >&5
8008 echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6
8009
8010 # Check whether --with-ccharw-max or --without-ccharw-max was given.
8011@@ -12800,16 +13131,16 @@
8012 else
8013   NCURSES_CCHARW_MAX=5
8014 fi;
8015-echo "$as_me:12803: result: $NCURSES_CCHARW_MAX" >&5
8016+echo "$as_me:13134: result: $NCURSES_CCHARW_MAX" >&5
8017 echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6
8018
8019-echo "$as_me:12806: checking for ANSI C header files" >&5
8020+echo "$as_me:13137: checking for ANSI C header files" >&5
8021 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
8022 if test "${ac_cv_header_stdc+set}" = set; then
8023   echo $ECHO_N "(cached) $ECHO_C" >&6
8024 else
8025   cat >conftest.$ac_ext <<_ACEOF
8026-#line 12812 "configure"
8027+#line 13143 "configure"
8028 #include "confdefs.h"
8029 #include <stdlib.h>
8030 #include <stdarg.h>
8031@@ -12817,13 +13148,13 @@
8032 #include <float.h>
8033
8034 _ACEOF
8035-if { (eval echo "$as_me:12820: \"$ac_cpp conftest.$ac_ext\"") >&5
8036+if { (eval echo "$as_me:13151: \"$ac_cpp conftest.$ac_ext\"") >&5
8037   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8038   ac_status=$?
8039   egrep -v '^ *\+' conftest.er1 >conftest.err
8040   rm -f conftest.er1
8041   cat conftest.err >&5
8042-  echo "$as_me:12826: \$? = $ac_status" >&5
8043+  echo "$as_me:13157: \$? = $ac_status" >&5
8044   (exit $ac_status); } >/dev/null; then
8045   if test -s conftest.err; then
8046     ac_cpp_err=$ac_c_preproc_warn_flag
8047@@ -12845,7 +13176,7 @@
8048 if test $ac_cv_header_stdc = yes; then
8049   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
8050   cat >conftest.$ac_ext <<_ACEOF
8051-#line 12848 "configure"
8052+#line 13179 "configure"
8053 #include "confdefs.h"
8054 #include <string.h>
8055
8056@@ -12863,7 +13194,7 @@
8057 if test $ac_cv_header_stdc = yes; then
8058   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
8059   cat >conftest.$ac_ext <<_ACEOF
8060-#line 12866 "configure"
8061+#line 13197 "configure"
8062 #include "confdefs.h"
8063 #include <stdlib.h>
8064
8065@@ -12884,7 +13215,7 @@
8066   :
8067 else
8068   cat >conftest.$ac_ext <<_ACEOF
8069-#line 12887 "configure"
8070+#line 13218 "configure"
8071 #include "confdefs.h"
8072 #include <ctype.h>
8073 #if ((' ' & 0x0FF) == 0x020)
8074@@ -12910,15 +13241,15 @@
8075 }
8076 _ACEOF
8077 rm -f conftest$ac_exeext
8078-if { (eval echo "$as_me:12913: \"$ac_link\"") >&5
8079+if { (eval echo "$as_me:13244: \"$ac_link\"") >&5
8080   (eval $ac_link) 2>&5
8081   ac_status=$?
8082-  echo "$as_me:12916: \$? = $ac_status" >&5
8083+  echo "$as_me:13247: \$? = $ac_status" >&5
8084   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
8085-  { (eval echo "$as_me:12918: \"$ac_try\"") >&5
8086+  { (eval echo "$as_me:13249: \"$ac_try\"") >&5
8087   (eval $ac_try) 2>&5
8088   ac_status=$?
8089-  echo "$as_me:12921: \$? = $ac_status" >&5
8090+  echo "$as_me:13252: \$? = $ac_status" >&5
8091   (exit $ac_status); }; }; then
8092   :
8093 else
8094@@ -12931,7 +13262,7 @@
8095 fi
8096 fi
8097 fi
8098-echo "$as_me:12934: result: $ac_cv_header_stdc" >&5
8099+echo "$as_me:13265: result: $ac_cv_header_stdc" >&5
8100 echo "${ECHO_T}$ac_cv_header_stdc" >&6
8101 if test $ac_cv_header_stdc = yes; then
8102
8103@@ -12947,28 +13278,28 @@
8104                   inttypes.h stdint.h unistd.h
8105 do
8106 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
8107-echo "$as_me:12950: checking for $ac_header" >&5
8108+echo "$as_me:13281: checking for $ac_header" >&5
8109 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
8110 if eval "test \"\${$as_ac_Header+set}\" = set"; then
8111   echo $ECHO_N "(cached) $ECHO_C" >&6
8112 else
8113   cat >conftest.$ac_ext <<_ACEOF
8114-#line 12956 "configure"
8115+#line 13287 "configure"
8116 #include "confdefs.h"
8117 $ac_includes_default
8118 #include <$ac_header>
8119 _ACEOF
8120 rm -f conftest.$ac_objext
8121-if { (eval echo "$as_me:12962: \"$ac_compile\"") >&5
8122+if { (eval echo "$as_me:13293: \"$ac_compile\"") >&5
8123   (eval $ac_compile) 2>&5
8124   ac_status=$?
8125-  echo "$as_me:12965: \$? = $ac_status" >&5
8126+  echo "$as_me:13296: \$? = $ac_status" >&5
8127   (exit $ac_status); } &&
8128          { ac_try='test -s conftest.$ac_objext'
8129-  { (eval echo "$as_me:12968: \"$ac_try\"") >&5
8130+  { (eval echo "$as_me:13299: \"$ac_try\"") >&5
8131   (eval $ac_try) 2>&5
8132   ac_status=$?
8133-  echo "$as_me:12971: \$? = $ac_status" >&5
8134+  echo "$as_me:13302: \$? = $ac_status" >&5
8135   (exit $ac_status); }; }; then
8136   eval "$as_ac_Header=yes"
8137 else
8138@@ -12978,7 +13309,7 @@
8139 fi
8140 rm -f conftest.$ac_objext conftest.$ac_ext
8141 fi
8142-echo "$as_me:12981: result: `eval echo '${'$as_ac_Header'}'`" >&5
8143+echo "$as_me:13312: result: `eval echo '${'$as_ac_Header'}'`" >&5
8144 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
8145 if test `eval echo '${'$as_ac_Header'}'` = yes; then
8146   cat >>confdefs.h <<EOF
8147@@ -12988,13 +13319,13 @@
8148 fi
8149 done
8150
8151-echo "$as_me:12991: checking for signed char" >&5
8152+echo "$as_me:13322: checking for signed char" >&5
8153 echo $ECHO_N "checking for signed char... $ECHO_C" >&6
8154 if test "${ac_cv_type_signed_char+set}" = set; then
8155   echo $ECHO_N "(cached) $ECHO_C" >&6
8156 else
8157   cat >conftest.$ac_ext <<_ACEOF
8158-#line 12997 "configure"
8159+#line 13328 "configure"
8160 #include "confdefs.h"
8161 $ac_includes_default
8162 int
8163@@ -13009,16 +13340,16 @@
8164 }
8165 _ACEOF
8166 rm -f conftest.$ac_objext
8167-if { (eval echo "$as_me:13012: \"$ac_compile\"") >&5
8168+if { (eval echo "$as_me:13343: \"$ac_compile\"") >&5
8169   (eval $ac_compile) 2>&5
8170   ac_status=$?
8171-  echo "$as_me:13015: \$? = $ac_status" >&5
8172+  echo "$as_me:13346: \$? = $ac_status" >&5
8173   (exit $ac_status); } &&
8174          { ac_try='test -s conftest.$ac_objext'
8175-  { (eval echo "$as_me:13018: \"$ac_try\"") >&5
8176+  { (eval echo "$as_me:13349: \"$ac_try\"") >&5
8177   (eval $ac_try) 2>&5
8178   ac_status=$?
8179-  echo "$as_me:13021: \$? = $ac_status" >&5
8180+  echo "$as_me:13352: \$? = $ac_status" >&5
8181   (exit $ac_status); }; }; then
8182   ac_cv_type_signed_char=yes
8183 else
8184@@ -13028,10 +13359,10 @@
8185 fi
8186 rm -f conftest.$ac_objext conftest.$ac_ext
8187 fi
8188-echo "$as_me:13031: result: $ac_cv_type_signed_char" >&5
8189+echo "$as_me:13362: result: $ac_cv_type_signed_char" >&5
8190 echo "${ECHO_T}$ac_cv_type_signed_char" >&6
8191
8192-echo "$as_me:13034: checking size of signed char" >&5
8193+echo "$as_me:13365: checking size of signed char" >&5
8194 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
8195 if test "${ac_cv_sizeof_signed_char+set}" = set; then
8196   echo $ECHO_N "(cached) $ECHO_C" >&6
8197@@ -13040,7 +13371,7 @@
8198   if test "$cross_compiling" = yes; then
8199   # Depending upon the size, compute the lo and hi bounds.
8200 cat >conftest.$ac_ext <<_ACEOF
8201-#line 13043 "configure"
8202+#line 13374 "configure"
8203 #include "confdefs.h"
8204 $ac_includes_default
8205 int
8206@@ -13052,21 +13383,21 @@
8207 }
8208 _ACEOF
8209 rm -f conftest.$ac_objext
8210-if { (eval echo "$as_me:13055: \"$ac_compile\"") >&5
8211+if { (eval echo "$as_me:13386: \"$ac_compile\"") >&5
8212   (eval $ac_compile) 2>&5
8213   ac_status=$?
8214-  echo "$as_me:13058: \$? = $ac_status" >&5
8215+  echo "$as_me:13389: \$? = $ac_status" >&5
8216   (exit $ac_status); } &&
8217          { ac_try='test -s conftest.$ac_objext'
8218-  { (eval echo "$as_me:13061: \"$ac_try\"") >&5
8219+  { (eval echo "$as_me:13392: \"$ac_try\"") >&5
8220   (eval $ac_try) 2>&5
8221   ac_status=$?
8222-  echo "$as_me:13064: \$? = $ac_status" >&5
8223+  echo "$as_me:13395: \$? = $ac_status" >&5
8224   (exit $ac_status); }; }; then
8225   ac_lo=0 ac_mid=0
8226   while :; do
8227     cat >conftest.$ac_ext <<_ACEOF
8228-#line 13069 "configure"
8229+#line 13400 "configure"
8230 #include "confdefs.h"
8231 $ac_includes_default
8232 int
8233@@ -13078,16 +13409,16 @@
8234 }
8235 _ACEOF
8236 rm -f conftest.$ac_objext
8237-if { (eval echo "$as_me:13081: \"$ac_compile\"") >&5
8238+if { (eval echo "$as_me:13412: \"$ac_compile\"") >&5
8239   (eval $ac_compile) 2>&5
8240   ac_status=$?
8241-  echo "$as_me:13084: \$? = $ac_status" >&5
8242+  echo "$as_me:13415: \$? = $ac_status" >&5
8243   (exit $ac_status); } &&
8244          { ac_try='test -s conftest.$ac_objext'
8245-  { (eval echo "$as_me:13087: \"$ac_try\"") >&5
8246+  { (eval echo "$as_me:13418: \"$ac_try\"") >&5
8247   (eval $ac_try) 2>&5
8248   ac_status=$?
8249-  echo "$as_me:13090: \$? = $ac_status" >&5
8250+  echo "$as_me:13421: \$? = $ac_status" >&5
8251   (exit $ac_status); }; }; then
8252   ac_hi=$ac_mid; break
8253 else
8254@@ -13103,7 +13434,7 @@
8255 ac_hi=-1 ac_mid=-1
8256   while :; do
8257     cat >conftest.$ac_ext <<_ACEOF
8258-#line 13106 "configure"
8259+#line 13437 "configure"
8260 #include "confdefs.h"
8261 $ac_includes_default
8262 int
8263@@ -13115,16 +13446,16 @@
8264 }
8265 _ACEOF
8266 rm -f conftest.$ac_objext
8267-if { (eval echo "$as_me:13118: \"$ac_compile\"") >&5
8268+if { (eval echo "$as_me:13449: \"$ac_compile\"") >&5
8269   (eval $ac_compile) 2>&5
8270   ac_status=$?
8271-  echo "$as_me:13121: \$? = $ac_status" >&5
8272+  echo "$as_me:13452: \$? = $ac_status" >&5
8273   (exit $ac_status); } &&
8274          { ac_try='test -s conftest.$ac_objext'
8275-  { (eval echo "$as_me:13124: \"$ac_try\"") >&5
8276+  { (eval echo "$as_me:13455: \"$ac_try\"") >&5
8277   (eval $ac_try) 2>&5
8278   ac_status=$?
8279-  echo "$as_me:13127: \$? = $ac_status" >&5
8280+  echo "$as_me:13458: \$? = $ac_status" >&5
8281   (exit $ac_status); }; }; then
8282   ac_lo=$ac_mid; break
8283 else
8284@@ -13140,7 +13471,7 @@
8285 while test "x$ac_lo" != "x$ac_hi"; do
8286   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
8287   cat >conftest.$ac_ext <<_ACEOF
8288-#line 13143 "configure"
8289+#line 13474 "configure"
8290 #include "confdefs.h"
8291 $ac_includes_default
8292 int
8293@@ -13152,16 +13483,16 @@
8294 }
8295 _ACEOF
8296 rm -f conftest.$ac_objext
8297-if { (eval echo "$as_me:13155: \"$ac_compile\"") >&5
8298+if { (eval echo "$as_me:13486: \"$ac_compile\"") >&5
8299   (eval $ac_compile) 2>&5
8300   ac_status=$?
8301-  echo "$as_me:13158: \$? = $ac_status" >&5
8302+  echo "$as_me:13489: \$? = $ac_status" >&5
8303   (exit $ac_status); } &&
8304          { ac_try='test -s conftest.$ac_objext'
8305-  { (eval echo "$as_me:13161: \"$ac_try\"") >&5
8306+  { (eval echo "$as_me:13492: \"$ac_try\"") >&5
8307   (eval $ac_try) 2>&5
8308   ac_status=$?
8309-  echo "$as_me:13164: \$? = $ac_status" >&5
8310+  echo "$as_me:13495: \$? = $ac_status" >&5
8311   (exit $ac_status); }; }; then
8312   ac_hi=$ac_mid
8313 else
8314@@ -13174,12 +13505,12 @@
8315 ac_cv_sizeof_signed_char=$ac_lo
8316 else
8317   if test "$cross_compiling" = yes; then
8318-  { { echo "$as_me:13177: error: cannot run test program while cross compiling" >&5
8319+  { { echo "$as_me:13508: error: cannot run test program while cross compiling" >&5
8320 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
8321    { (exit 1); exit 1; }; }
8322 else
8323   cat >conftest.$ac_ext <<_ACEOF
8324-#line 13182 "configure"
8325+#line 13513 "configure"
8326 #include "confdefs.h"
8327 $ac_includes_default
8328 int
8329@@ -13195,15 +13526,15 @@
8330 }
8331 _ACEOF
8332 rm -f conftest$ac_exeext
8333-if { (eval echo "$as_me:13198: \"$ac_link\"") >&5
8334+if { (eval echo "$as_me:13529: \"$ac_link\"") >&5
8335   (eval $ac_link) 2>&5
8336   ac_status=$?
8337-  echo "$as_me:13201: \$? = $ac_status" >&5
8338+  echo "$as_me:13532: \$? = $ac_status" >&5
8339   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
8340-  { (eval echo "$as_me:13203: \"$ac_try\"") >&5
8341+  { (eval echo "$as_me:13534: \"$ac_try\"") >&5
8342   (eval $ac_try) 2>&5
8343   ac_status=$?
8344-  echo "$as_me:13206: \$? = $ac_status" >&5
8345+  echo "$as_me:13537: \$? = $ac_status" >&5
8346   (exit $ac_status); }; }; then
8347   ac_cv_sizeof_signed_char=`cat conftest.val`
8348 else
8349@@ -13219,7 +13550,7 @@
8350   ac_cv_sizeof_signed_char=0
8351 fi
8352 fi
8353-echo "$as_me:13222: result: $ac_cv_sizeof_signed_char" >&5
8354+echo "$as_me:13553: result: $ac_cv_sizeof_signed_char" >&5
8355 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
8356 cat >>confdefs.h <<EOF
8357 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
8358@@ -13230,7 +13561,7 @@
8359 else
8360 	NCURSES_SBOOL="char"
8361 fi
8362-echo "$as_me:13233: checking if you want to use signed Boolean array in term.h" >&5
8363+echo "$as_me:13564: checking if you want to use signed Boolean array in term.h" >&5
8364 echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
8365
8366 # Check whether --enable-signed-char or --disable-signed-char was given.
8367@@ -13240,12 +13571,12 @@
8368 else
8369   with_signed_char=no
8370 fi;
8371-echo "$as_me:13243: result: $with_signed_char" >&5
8372+echo "$as_me:13574: result: $with_signed_char" >&5
8373 echo "${ECHO_T}$with_signed_char" >&6
8374 test "x$with_signed_char" != xyes && NCURSES_SBOOL="char"
8375
8376 ###   use option --with-tparm-arg to override tparm's argument type
8377-echo "$as_me:13248: checking for type of tparm args" >&5
8378+echo "$as_me:13579: checking for type of tparm args" >&5
8379 echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6
8380
8381 # Check whether --with-tparm-arg or --without-tparm-arg was given.
8382@@ -13255,11 +13586,11 @@
8383 else
8384   NCURSES_TPARM_ARG=$cf_dft_tparm_arg
8385 fi;
8386-echo "$as_me:13258: result: $NCURSES_TPARM_ARG" >&5
8387+echo "$as_me:13589: result: $NCURSES_TPARM_ARG" >&5
8388 echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6
8389
8390 ### Enable compiling-in rcs id's
8391-echo "$as_me:13262: checking if RCS identifiers should be compiled-in" >&5
8392+echo "$as_me:13593: checking if RCS identifiers should be compiled-in" >&5
8393 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
8394
8395 # Check whether --with-rcs-ids or --without-rcs-ids was given.
8396@@ -13269,7 +13600,7 @@
8397 else
8398   with_rcs_ids=no
8399 fi;
8400-echo "$as_me:13272: result: $with_rcs_ids" >&5
8401+echo "$as_me:13603: result: $with_rcs_ids" >&5
8402 echo "${ECHO_T}$with_rcs_ids" >&6
8403 test "x$with_rcs_ids" = xyes &&
8404 cat >>confdefs.h <<\EOF
8405@@ -13278,7 +13609,7 @@
8406
8407 ###############################################################################
8408
8409-echo "$as_me:13281: checking format of man-pages" >&5
8410+echo "$as_me:13612: checking format of man-pages" >&5
8411 echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
8412
8413 # Check whether --with-manpage-format or --without-manpage-format was given.
8414@@ -13367,14 +13698,14 @@
8415 	;;
8416 esac
8417
8418-echo "$as_me:13370: result: $MANPAGE_FORMAT" >&5
8419+echo "$as_me:13701: result: $MANPAGE_FORMAT" >&5
8420 echo "${ECHO_T}$MANPAGE_FORMAT" >&6
8421 if test -n "$cf_unknown" ; then
8422-	{ echo "$as_me:13373: WARNING: Unexpected manpage-format $cf_unknown" >&5
8423+	{ echo "$as_me:13704: WARNING: Unexpected manpage-format $cf_unknown" >&5
8424 echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
8425 fi
8426
8427-echo "$as_me:13377: checking for manpage renaming" >&5
8428+echo "$as_me:13708: checking for manpage renaming" >&5
8429 echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
8430
8431 # Check whether --with-manpage-renames or --without-manpage-renames was given.
8432@@ -13402,7 +13733,7 @@
8433 	if test -f $srcdir/man/$MANPAGE_RENAMES ; then
8434 		MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
8435 	elif test ! -f $MANPAGE_RENAMES ; then
8436-		{ { echo "$as_me:13405: error: not a filename: $MANPAGE_RENAMES" >&5
8437+		{ { echo "$as_me:13736: error: not a filename: $MANPAGE_RENAMES" >&5
8438 echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
8439    { (exit 1); exit 1; }; }
8440 	fi
8441@@ -13416,10 +13747,10 @@
8442 	fi
8443 fi
8444
8445-echo "$as_me:13419: result: $MANPAGE_RENAMES" >&5
8446+echo "$as_me:13750: result: $MANPAGE_RENAMES" >&5
8447 echo "${ECHO_T}$MANPAGE_RENAMES" >&6
8448
8449-echo "$as_me:13422: checking if manpage aliases will be installed" >&5
8450+echo "$as_me:13753: checking if manpage aliases will be installed" >&5
8451 echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
8452
8453 # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
8454@@ -13430,7 +13761,7 @@
8455   MANPAGE_ALIASES=yes
8456 fi;
8457
8458-echo "$as_me:13433: result: $MANPAGE_ALIASES" >&5
8459+echo "$as_me:13764: result: $MANPAGE_ALIASES" >&5
8460 echo "${ECHO_T}$MANPAGE_ALIASES" >&6
8461
8462 case "x$LN_S" in
8463@@ -13444,7 +13775,7 @@
8464
8465 MANPAGE_SYMLINKS=no
8466 if test "$MANPAGE_ALIASES" = yes ; then
8467-echo "$as_me:13447: checking if manpage symlinks should be used" >&5
8468+echo "$as_me:13778: checking if manpage symlinks should be used" >&5
8469 echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
8470
8471 # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
8472@@ -13457,17 +13788,17 @@
8473
8474 if test "$$cf_use_symlinks" = no; then
8475 if test "$MANPAGE_SYMLINKS" = yes ; then
8476-	{ echo "$as_me:13460: WARNING: cannot make symlinks" >&5
8477+	{ echo "$as_me:13791: WARNING: cannot make symlinks" >&5
8478 echo "$as_me: WARNING: cannot make symlinks" >&2;}
8479 	MANPAGE_SYMLINKS=no
8480 fi
8481 fi
8482
8483-echo "$as_me:13466: result: $MANPAGE_SYMLINKS" >&5
8484+echo "$as_me:13797: result: $MANPAGE_SYMLINKS" >&5
8485 echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
8486 fi
8487
8488-echo "$as_me:13470: checking for manpage tbl" >&5
8489+echo "$as_me:13801: checking for manpage tbl" >&5
8490 echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
8491
8492 # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
8493@@ -13478,7 +13809,7 @@
8494   MANPAGE_TBL=no
8495 fi;
8496
8497-echo "$as_me:13481: result: $MANPAGE_TBL" >&5
8498+echo "$as_me:13812: result: $MANPAGE_TBL" >&5
8499 echo "${ECHO_T}$MANPAGE_TBL" >&6
8500
8501 if test "$prefix" = "NONE" ; then
8502@@ -13811,7 +14142,7 @@
8503 ###############################################################################
8504
8505 ### Note that some functions (such as const) are normally disabled anyway.
8506-echo "$as_me:13814: checking if you want to build with function extensions" >&5
8507+echo "$as_me:14145: checking if you want to build with function extensions" >&5
8508 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
8509
8510 # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
8511@@ -13821,7 +14152,7 @@
8512 else
8513   with_ext_funcs=yes
8514 fi;
8515-echo "$as_me:13824: result: $with_ext_funcs" >&5
8516+echo "$as_me:14155: result: $with_ext_funcs" >&5
8517 echo "${ECHO_T}$with_ext_funcs" >&6
8518 if test "x$with_ext_funcs" = xyes ; then
8519 	NCURSES_EXT_FUNCS=1
8520@@ -13881,7 +14212,7 @@
8521 	GENERATED_EXT_FUNCS=
8522 fi
8523
8524-echo "$as_me:13884: checking if you want to build with SCREEN extensions" >&5
8525+echo "$as_me:14215: checking if you want to build with SCREEN extensions" >&5
8526 echo $ECHO_N "checking if you want to build with SCREEN extensions... $ECHO_C" >&6
8527
8528 # Check whether --enable-sp-funcs or --disable-sp-funcs was given.
8529@@ -13891,7 +14222,7 @@
8530 else
8531   with_sp_funcs=$cf_dft_ext_spfuncs
8532 fi;
8533-echo "$as_me:13894: result: $with_sp_funcs" >&5
8534+echo "$as_me:14225: result: $with_sp_funcs" >&5
8535 echo "${ECHO_T}$with_sp_funcs" >&6
8536 if test "x$with_sp_funcs" = xyes ; then
8537 	NCURSES_SP_FUNCS=1
8538@@ -13910,7 +14241,7 @@
8539 	GENERATED_SP_FUNCS=
8540 fi
8541
8542-echo "$as_me:13913: checking if you want to build with terminal-driver" >&5
8543+echo "$as_me:14244: checking if you want to build with terminal-driver" >&5
8544 echo $ECHO_N "checking if you want to build with terminal-driver... $ECHO_C" >&6
8545
8546 # Check whether --enable-term-driver or --disable-term-driver was given.
8547@@ -13920,7 +14251,7 @@
8548 else
8549   with_term_driver=no
8550 fi;
8551-echo "$as_me:13923: result: $with_term_driver" >&5
8552+echo "$as_me:14254: result: $with_term_driver" >&5
8553 echo "${ECHO_T}$with_term_driver" >&6
8554 if test "x$with_term_driver" = xyes ; then
8555
8556@@ -13929,19 +14260,19 @@
8557 EOF
8558
8559 	if test "x$with_termlib" != xno ; then
8560-		{ { echo "$as_me:13932: error: The term-driver option conflicts with the termlib option" >&5
8561+		{ { echo "$as_me:14263: error: The term-driver option conflicts with the termlib option" >&5
8562 echo "$as_me: error: The term-driver option conflicts with the termlib option" >&2;}
8563    { (exit 1); exit 1; }; }
8564 	fi
8565 	if test "x$with_sp_funcs" != xyes ; then
8566-		{ { echo "$as_me:13937: error: The term-driver option relies upon sp-funcs" >&5
8567+		{ { echo "$as_me:14268: error: The term-driver option relies upon sp-funcs" >&5
8568 echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;}
8569    { (exit 1); exit 1; }; }
8570 	fi
8571 fi
8572
8573 ###   use option --enable-const to turn on use of const beyond that in XSI.
8574-echo "$as_me:13944: checking for extended use of const keyword" >&5
8575+echo "$as_me:14275: checking for extended use of const keyword" >&5
8576 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
8577
8578 # Check whether --enable-const or --disable-const was given.
8579@@ -13951,7 +14282,7 @@
8580 else
8581   with_ext_const=$cf_dft_ext_const
8582 fi;
8583-echo "$as_me:13954: result: $with_ext_const" >&5
8584+echo "$as_me:14285: result: $with_ext_const" >&5
8585 echo "${ECHO_T}$with_ext_const" >&6
8586 NCURSES_CONST='/*nothing*/'
8587 if test "x$with_ext_const" = xyes ; then
8588@@ -13959,7 +14290,7 @@
8589 fi
8590
8591 ###   use option --enable-ext-colors to turn on use of colors beyond 16.
8592-echo "$as_me:13962: checking if you want to use extended colors" >&5
8593+echo "$as_me:14293: checking if you want to use extended colors" >&5
8594 echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
8595
8596 # Check whether --enable-ext-colors or --disable-ext-colors was given.
8597@@ -13969,12 +14300,12 @@
8598 else
8599   with_ext_colors=$cf_dft_ext_colors
8600 fi;
8601-echo "$as_me:13972: result: $with_ext_colors" >&5
8602+echo "$as_me:14303: result: $with_ext_colors" >&5
8603 echo "${ECHO_T}$with_ext_colors" >&6
8604 NCURSES_EXT_COLORS=0
8605 if test "x$with_ext_colors" = xyes ; then
8606 	if test "x$with_widec" != xyes ; then
8607-		{ echo "$as_me:13977: WARNING: This option applies only to wide-character library" >&5
8608+		{ echo "$as_me:14308: WARNING: This option applies only to wide-character library" >&5
8609 echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
8610 	else
8611 		# cannot be ABI 5 since it changes sizeof(cchar_t)
8612@@ -13984,7 +14315,7 @@
8613 	(5.*)
8614 		cf_cv_rel_version=6.0
8615 		cf_cv_abi_version=6
8616-		{ echo "$as_me:13987: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
8617+		{ echo "$as_me:14318: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
8618 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
8619 		;;
8620 	esac
8621@@ -14012,7 +14343,7 @@
8622 fi
8623
8624 ###   use option --enable-ext-mouse to modify coding to support 5-button mice
8625-echo "$as_me:14015: checking if you want to use extended mouse encoding" >&5
8626+echo "$as_me:14346: checking if you want to use extended mouse encoding" >&5
8627 echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
8628
8629 # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
8630@@ -14022,7 +14353,7 @@
8631 else
8632   with_ext_mouse=$cf_dft_ext_mouse
8633 fi;
8634-echo "$as_me:14025: result: $with_ext_mouse" >&5
8635+echo "$as_me:14356: result: $with_ext_mouse" >&5
8636 echo "${ECHO_T}$with_ext_mouse" >&6
8637 NCURSES_MOUSE_VERSION=1
8638 if test "x$with_ext_mouse" = xyes ; then
8639@@ -14033,7 +14364,7 @@
8640 	(5.*)
8641 		cf_cv_rel_version=6.0
8642 		cf_cv_abi_version=6
8643-		{ echo "$as_me:14036: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
8644+		{ echo "$as_me:14367: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
8645 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
8646 		;;
8647 	esac
8648@@ -14042,7 +14373,7 @@
8649 fi
8650
8651 ###   use option --enable-ext-putwin to turn on extended screendumps
8652-echo "$as_me:14045: checking if you want to use extended putwin/screendump" >&5
8653+echo "$as_me:14376: checking if you want to use extended putwin/screendump" >&5
8654 echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6
8655
8656 # Check whether --enable-ext-putwin or --disable-ext-putwin was given.
8657@@ -14052,7 +14383,7 @@
8658 else
8659   with_ext_putwin=$cf_dft_ext_putwin
8660 fi;
8661-echo "$as_me:14055: result: $with_ext_putwin" >&5
8662+echo "$as_me:14386: result: $with_ext_putwin" >&5
8663 echo "${ECHO_T}$with_ext_putwin" >&6
8664 if test "x$with_ext_putwin" = xyes ; then
8665
8666@@ -14062,7 +14393,7 @@
8667
8668 fi
8669
8670-echo "$as_me:14065: checking if you want \$NCURSES_NO_PADDING code" >&5
8671+echo "$as_me:14396: checking if you want \$NCURSES_NO_PADDING code" >&5
8672 echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
8673
8674 # Check whether --enable-no-padding or --disable-no-padding was given.
8675@@ -14072,7 +14403,7 @@
8676 else
8677   with_no_padding=$with_ext_funcs
8678 fi;
8679-echo "$as_me:14075: result: $with_no_padding" >&5
8680+echo "$as_me:14406: result: $with_no_padding" >&5
8681 echo "${ECHO_T}$with_no_padding" >&6
8682 test "x$with_no_padding" = xyes &&
8683 cat >>confdefs.h <<\EOF
8684@@ -14080,7 +14411,7 @@
8685 EOF
8686
8687 ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
8688-echo "$as_me:14083: checking if you want SIGWINCH handler" >&5
8689+echo "$as_me:14414: checking if you want SIGWINCH handler" >&5
8690 echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
8691
8692 # Check whether --enable-sigwinch or --disable-sigwinch was given.
8693@@ -14090,7 +14421,7 @@
8694 else
8695   with_sigwinch=$with_ext_funcs
8696 fi;
8697-echo "$as_me:14093: result: $with_sigwinch" >&5
8698+echo "$as_me:14424: result: $with_sigwinch" >&5
8699 echo "${ECHO_T}$with_sigwinch" >&6
8700 test "x$with_sigwinch" = xyes &&
8701 cat >>confdefs.h <<\EOF
8702@@ -14098,7 +14429,7 @@
8703 EOF
8704
8705 ###   use option --enable-tcap-names to allow user to define new capabilities
8706-echo "$as_me:14101: checking if you want user-definable terminal capabilities like termcap" >&5
8707+echo "$as_me:14432: checking if you want user-definable terminal capabilities like termcap" >&5
8708 echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
8709
8710 # Check whether --enable-tcap-names or --disable-tcap-names was given.
8711@@ -14108,14 +14439,14 @@
8712 else
8713   with_tcap_names=$with_ext_funcs
8714 fi;
8715-echo "$as_me:14111: result: $with_tcap_names" >&5
8716+echo "$as_me:14442: result: $with_tcap_names" >&5
8717 echo "${ECHO_T}$with_tcap_names" >&6
8718 NCURSES_XNAMES=0
8719 test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
8720
8721 ##############################################################################
8722
8723-echo "$as_me:14118: checking if you want to link with the pthread library" >&5
8724+echo "$as_me:14449: checking if you want to link with the pthread library" >&5
8725 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
8726
8727 # Check whether --with-pthread or --without-pthread was given.
8728@@ -14125,27 +14456,27 @@
8729 else
8730   with_pthread=no
8731 fi;
8732-echo "$as_me:14128: result: $with_pthread" >&5
8733+echo "$as_me:14459: result: $with_pthread" >&5
8734 echo "${ECHO_T}$with_pthread" >&6
8735
8736 if test "$with_pthread" != no ; then
8737-	echo "$as_me:14132: checking for pthread.h" >&5
8738+	echo "$as_me:14463: checking for pthread.h" >&5
8739 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
8740 if test "${ac_cv_header_pthread_h+set}" = set; then
8741   echo $ECHO_N "(cached) $ECHO_C" >&6
8742 else
8743   cat >conftest.$ac_ext <<_ACEOF
8744-#line 14138 "configure"
8745+#line 14469 "configure"
8746 #include "confdefs.h"
8747 #include <pthread.h>
8748 _ACEOF
8749-if { (eval echo "$as_me:14142: \"$ac_cpp conftest.$ac_ext\"") >&5
8750+if { (eval echo "$as_me:14473: \"$ac_cpp conftest.$ac_ext\"") >&5
8751   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8752   ac_status=$?
8753   egrep -v '^ *\+' conftest.er1 >conftest.err
8754   rm -f conftest.er1
8755   cat conftest.err >&5
8756-  echo "$as_me:14148: \$? = $ac_status" >&5
8757+  echo "$as_me:14479: \$? = $ac_status" >&5
8758   (exit $ac_status); } >/dev/null; then
8759   if test -s conftest.err; then
8760     ac_cpp_err=$ac_c_preproc_warn_flag
8761@@ -14164,7 +14495,7 @@
8762 fi
8763 rm -f conftest.err conftest.$ac_ext
8764 fi
8765-echo "$as_me:14167: result: $ac_cv_header_pthread_h" >&5
8766+echo "$as_me:14498: result: $ac_cv_header_pthread_h" >&5
8767 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
8768 if test $ac_cv_header_pthread_h = yes; then
8769
8770@@ -14174,7 +14505,7 @@
8771
8772 	for cf_lib_pthread in pthread c_r
8773 	do
8774-	    echo "$as_me:14177: checking if we can link with the $cf_lib_pthread library" >&5
8775+	    echo "$as_me:14508: checking if we can link with the $cf_lib_pthread library" >&5
8776 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6
8777 	    cf_save_LIBS="$LIBS"
8778
8779@@ -14195,7 +14526,7 @@
8780 LIBS="$cf_add_libs"
8781
8782 	    cat >conftest.$ac_ext <<_ACEOF
8783-#line 14198 "configure"
8784+#line 14529 "configure"
8785 #include "confdefs.h"
8786
8787 #include <pthread.h>
8788@@ -14212,16 +14543,16 @@
8789 }
8790 _ACEOF
8791 rm -f conftest.$ac_objext conftest$ac_exeext
8792-if { (eval echo "$as_me:14215: \"$ac_link\"") >&5
8793+if { (eval echo "$as_me:14546: \"$ac_link\"") >&5
8794   (eval $ac_link) 2>&5
8795   ac_status=$?
8796-  echo "$as_me:14218: \$? = $ac_status" >&5
8797+  echo "$as_me:14549: \$? = $ac_status" >&5
8798   (exit $ac_status); } &&
8799          { ac_try='test -s conftest$ac_exeext'
8800-  { (eval echo "$as_me:14221: \"$ac_try\"") >&5
8801+  { (eval echo "$as_me:14552: \"$ac_try\"") >&5
8802   (eval $ac_try) 2>&5
8803   ac_status=$?
8804-  echo "$as_me:14224: \$? = $ac_status" >&5
8805+  echo "$as_me:14555: \$? = $ac_status" >&5
8806   (exit $ac_status); }; }; then
8807   with_pthread=yes
8808 else
8809@@ -14231,7 +14562,7 @@
8810 fi
8811 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8812 	    LIBS="$cf_save_LIBS"
8813-	    echo "$as_me:14234: result: $with_pthread" >&5
8814+	    echo "$as_me:14565: result: $with_pthread" >&5
8815 echo "${ECHO_T}$with_pthread" >&6
8816 	    test "$with_pthread" = yes && break
8817 	done
8818@@ -14259,7 +14590,7 @@
8819 EOF
8820
8821 	else
8822-	    { { echo "$as_me:14262: error: Cannot link with pthread library" >&5
8823+	    { { echo "$as_me:14593: error: Cannot link with pthread library" >&5
8824 echo "$as_me: error: Cannot link with pthread library" >&2;}
8825    { (exit 1); exit 1; }; }
8826 	fi
8827@@ -14269,13 +14600,13 @@
8828 fi
8829
8830 if test "x$with_pthread" != xno; then
8831-	echo "$as_me:14272: checking for pthread_kill" >&5
8832+	echo "$as_me:14603: checking for pthread_kill" >&5
8833 echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6
8834 if test "${ac_cv_func_pthread_kill+set}" = set; then
8835   echo $ECHO_N "(cached) $ECHO_C" >&6
8836 else
8837   cat >conftest.$ac_ext <<_ACEOF
8838-#line 14278 "configure"
8839+#line 14609 "configure"
8840 #include "confdefs.h"
8841 #define pthread_kill autoconf_temporary
8842 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
8843@@ -14306,16 +14637,16 @@
8844 }
8845 _ACEOF
8846 rm -f conftest.$ac_objext conftest$ac_exeext
8847-if { (eval echo "$as_me:14309: \"$ac_link\"") >&5
8848+if { (eval echo "$as_me:14640: \"$ac_link\"") >&5
8849   (eval $ac_link) 2>&5
8850   ac_status=$?
8851-  echo "$as_me:14312: \$? = $ac_status" >&5
8852+  echo "$as_me:14643: \$? = $ac_status" >&5
8853   (exit $ac_status); } &&
8854          { ac_try='test -s conftest$ac_exeext'
8855-  { (eval echo "$as_me:14315: \"$ac_try\"") >&5
8856+  { (eval echo "$as_me:14646: \"$ac_try\"") >&5
8857   (eval $ac_try) 2>&5
8858   ac_status=$?
8859-  echo "$as_me:14318: \$? = $ac_status" >&5
8860+  echo "$as_me:14649: \$? = $ac_status" >&5
8861   (exit $ac_status); }; }; then
8862   ac_cv_func_pthread_kill=yes
8863 else
8864@@ -14325,11 +14656,11 @@
8865 fi
8866 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8867 fi
8868-echo "$as_me:14328: result: $ac_cv_func_pthread_kill" >&5
8869+echo "$as_me:14659: result: $ac_cv_func_pthread_kill" >&5
8870 echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6
8871 if test $ac_cv_func_pthread_kill = yes; then
8872
8873-		echo "$as_me:14332: checking if you want to allow EINTR in wgetch with pthreads" >&5
8874+		echo "$as_me:14663: checking if you want to allow EINTR in wgetch with pthreads" >&5
8875 echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6
8876
8877 # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given.
8878@@ -14339,7 +14670,7 @@
8879 else
8880   use_pthreads_eintr=no
8881 fi;
8882-		echo "$as_me:14342: result: $use_pthreads_eintr" >&5
8883+		echo "$as_me:14673: result: $use_pthreads_eintr" >&5
8884 echo "${ECHO_T}$use_pthreads_eintr" >&6
8885 		if test "x$use_pthreads_eintr" = xyes ; then
8886
8887@@ -14350,7 +14681,7 @@
8888 		fi
8889 fi
8890
8891-	echo "$as_me:14353: checking if you want to use weak-symbols for pthreads" >&5
8892+	echo "$as_me:14684: checking if you want to use weak-symbols for pthreads" >&5
8893 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6
8894
8895 # Check whether --enable-weak-symbols or --disable-weak-symbols was given.
8896@@ -14360,18 +14691,18 @@
8897 else
8898   use_weak_symbols=no
8899 fi;
8900-	echo "$as_me:14363: result: $use_weak_symbols" >&5
8901+	echo "$as_me:14694: result: $use_weak_symbols" >&5
8902 echo "${ECHO_T}$use_weak_symbols" >&6
8903 	if test "x$use_weak_symbols" = xyes ; then
8904
8905-echo "$as_me:14367: checking if $CC supports weak symbols" >&5
8906+echo "$as_me:14698: checking if $CC supports weak symbols" >&5
8907 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6
8908 if test "${cf_cv_weak_symbols+set}" = set; then
8909   echo $ECHO_N "(cached) $ECHO_C" >&6
8910 else
8911
8912 cat >conftest.$ac_ext <<_ACEOF
8913-#line 14374 "configure"
8914+#line 14705 "configure"
8915 #include "confdefs.h"
8916
8917 #include <stdio.h>
8918@@ -14397,16 +14728,16 @@
8919 }
8920 _ACEOF
8921 rm -f conftest.$ac_objext
8922-if { (eval echo "$as_me:14400: \"$ac_compile\"") >&5
8923+if { (eval echo "$as_me:14731: \"$ac_compile\"") >&5
8924   (eval $ac_compile) 2>&5
8925   ac_status=$?
8926-  echo "$as_me:14403: \$? = $ac_status" >&5
8927+  echo "$as_me:14734: \$? = $ac_status" >&5
8928   (exit $ac_status); } &&
8929          { ac_try='test -s conftest.$ac_objext'
8930-  { (eval echo "$as_me:14406: \"$ac_try\"") >&5
8931+  { (eval echo "$as_me:14737: \"$ac_try\"") >&5
8932   (eval $ac_try) 2>&5
8933   ac_status=$?
8934-  echo "$as_me:14409: \$? = $ac_status" >&5
8935+  echo "$as_me:14740: \$? = $ac_status" >&5
8936   (exit $ac_status); }; }; then
8937   cf_cv_weak_symbols=yes
8938 else
8939@@ -14417,7 +14748,7 @@
8940 rm -f conftest.$ac_objext conftest.$ac_ext
8941
8942 fi
8943-echo "$as_me:14420: result: $cf_cv_weak_symbols" >&5
8944+echo "$as_me:14751: result: $cf_cv_weak_symbols" >&5
8945 echo "${ECHO_T}$cf_cv_weak_symbols" >&6
8946
8947 	else
8948@@ -14467,7 +14798,7 @@
8949 # opaque outside of that, so there is no --enable-opaque option.  We can use
8950 # this option without --with-pthreads, but this will be always set for
8951 # pthreads.
8952-echo "$as_me:14470: checking if you want reentrant code" >&5
8953+echo "$as_me:14801: checking if you want reentrant code" >&5
8954 echo $ECHO_N "checking if you want reentrant code... $ECHO_C" >&6
8955
8956 # Check whether --enable-reentrant or --disable-reentrant was given.
8957@@ -14477,7 +14808,7 @@
8958 else
8959   with_reentrant=no
8960 fi;
8961-echo "$as_me:14480: result: $with_reentrant" >&5
8962+echo "$as_me:14811: result: $with_reentrant" >&5
8963 echo "${ECHO_T}$with_reentrant" >&6
8964 if test "x$with_reentrant" = xyes ; then
8965 	cf_cv_enable_reentrant=1
8966@@ -14565,7 +14896,7 @@
8967 	(5.*)
8968 		cf_cv_rel_version=6.0
8969 		cf_cv_abi_version=6
8970-		{ echo "$as_me:14568: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
8971+		{ echo "$as_me:14899: WARNING: overriding ABI version to $cf_cv_abi_version" >&5
8972 echo "$as_me: WARNING: overriding ABI version to $cf_cv_abi_version" >&2;}
8973 		;;
8974 	esac
8975@@ -14577,7 +14908,7 @@
8976 	NCURSES_SIZE_T=short
8977 fi
8978
8979-echo "$as_me:14580: checking if you want opaque curses-library structures" >&5
8980+echo "$as_me:14911: checking if you want opaque curses-library structures" >&5
8981 echo $ECHO_N "checking if you want opaque curses-library structures... $ECHO_C" >&6
8982
8983 # Check whether --enable-opaque-curses or --disable-opaque-curses was given.
8984@@ -14599,16 +14930,16 @@
8985 	 test "$cf_cv_enable_reentrant" = 1 || enable_opaque_curses=no
8986
8987 fi;
8988-echo "$as_me:14602: result: $enable_opaque_curses" >&5
8989+echo "$as_me:14933: result: $enable_opaque_curses" >&5
8990 echo "${ECHO_T}$enable_opaque_curses" >&6
8991
8992 test "$cf_cv_enable_reentrant" = 1 && \
8993 test "$enable_opaque_curses" = no && \
8994-{ { echo "$as_me:14607: error: reentrant configuration requires opaque library" >&5
8995+{ { echo "$as_me:14938: error: reentrant configuration requires opaque library" >&5
8996 echo "$as_me: error: reentrant configuration requires opaque library" >&2;}
8997    { (exit 1); exit 1; }; }
8998
8999-echo "$as_me:14611: checking if you want opaque form-library structures" >&5
9000+echo "$as_me:14942: checking if you want opaque form-library structures" >&5
9001 echo $ECHO_N "checking if you want opaque form-library structures... $ECHO_C" >&6
9002
9003 # Check whether --enable-opaque-form or --disable-opaque-form was given.
9004@@ -14618,10 +14949,10 @@
9005 else
9006   enable_opaque_form=no
9007 fi;
9008-echo "$as_me:14621: result: $enable_opaque_form" >&5
9009+echo "$as_me:14952: result: $enable_opaque_form" >&5
9010 echo "${ECHO_T}$enable_opaque_form" >&6
9011
9012-echo "$as_me:14624: checking if you want opaque menu-library structures" >&5
9013+echo "$as_me:14955: checking if you want opaque menu-library structures" >&5
9014 echo $ECHO_N "checking if you want opaque menu-library structures... $ECHO_C" >&6
9015
9016 # Check whether --enable-opaque-menu or --disable-opaque-menu was given.
9017@@ -14631,10 +14962,10 @@
9018 else
9019   enable_opaque_menu=no
9020 fi;
9021-echo "$as_me:14634: result: $enable_opaque_menu" >&5
9022+echo "$as_me:14965: result: $enable_opaque_menu" >&5
9023 echo "${ECHO_T}$enable_opaque_menu" >&6
9024
9025-echo "$as_me:14637: checking if you want opaque panel-library structures" >&5
9026+echo "$as_me:14968: checking if you want opaque panel-library structures" >&5
9027 echo $ECHO_N "checking if you want opaque panel-library structures... $ECHO_C" >&6
9028
9029 # Check whether --enable-opaque-panel or --disable-opaque-panel was given.
9030@@ -14644,7 +14975,7 @@
9031 else
9032   enable_opaque_panel=no
9033 fi;
9034-echo "$as_me:14647: result: $enable_opaque_panel" >&5
9035+echo "$as_me:14978: result: $enable_opaque_panel" >&5
9036 echo "${ECHO_T}$enable_opaque_panel" >&6
9037
9038 NCURSES_OPAQUE=0;		test "$enable_opaque_curses" = yes && NCURSES_OPAQUE=1
9039@@ -14654,7 +14985,7 @@
9040
9041 ### Allow using a different wrap-prefix
9042 if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then
9043-	echo "$as_me:14657: checking for prefix used to wrap public variables" >&5
9044+	echo "$as_me:14988: checking for prefix used to wrap public variables" >&5
9045 echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6
9046
9047 # Check whether --with-wrap-prefix or --without-wrap-prefix was given.
9048@@ -14664,7 +14995,7 @@
9049 else
9050   NCURSES_WRAP_PREFIX=_nc_
9051 fi;
9052-	echo "$as_me:14667: result: $NCURSES_WRAP_PREFIX" >&5
9053+	echo "$as_me:14998: result: $NCURSES_WRAP_PREFIX" >&5
9054 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6
9055 else
9056 	NCURSES_WRAP_PREFIX=_nc_
9057@@ -14677,7 +15008,7 @@
9058 ###############################################################################
9059 # These options are relatively safe to experiment with.
9060
9061-echo "$as_me:14680: checking if you want all development code" >&5
9062+echo "$as_me:15011: checking if you want all development code" >&5
9063 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
9064
9065 # Check whether --with-develop or --without-develop was given.
9066@@ -14687,11 +15018,11 @@
9067 else
9068   with_develop=no
9069 fi;
9070-echo "$as_me:14690: result: $with_develop" >&5
9071+echo "$as_me:15021: result: $with_develop" >&5
9072 echo "${ECHO_T}$with_develop" >&6
9073
9074 ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
9075-echo "$as_me:14694: checking if you want hard-tabs code" >&5
9076+echo "$as_me:15025: checking if you want hard-tabs code" >&5
9077 echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
9078
9079 # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
9080@@ -14701,7 +15032,7 @@
9081 else
9082   enable_hard_tabs=$with_develop
9083 fi;
9084-echo "$as_me:14704: result: $enable_hard_tabs" >&5
9085+echo "$as_me:15035: result: $enable_hard_tabs" >&5
9086 echo "${ECHO_T}$enable_hard_tabs" >&6
9087 test "x$enable_hard_tabs" = xyes &&
9088 cat >>confdefs.h <<\EOF
9089@@ -14709,7 +15040,7 @@
9090 EOF
9091
9092 ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
9093-echo "$as_me:14712: checking if you want limited support for xmc" >&5
9094+echo "$as_me:15043: checking if you want limited support for xmc" >&5
9095 echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
9096
9097 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
9098@@ -14719,7 +15050,7 @@
9099 else
9100   enable_xmc_glitch=$with_develop
9101 fi;
9102-echo "$as_me:14722: result: $enable_xmc_glitch" >&5
9103+echo "$as_me:15053: result: $enable_xmc_glitch" >&5
9104 echo "${ECHO_T}$enable_xmc_glitch" >&6
9105 test "x$enable_xmc_glitch" = xyes &&
9106 cat >>confdefs.h <<\EOF
9107@@ -14729,7 +15060,7 @@
9108 ###############################################################################
9109 # These are just experimental, probably should not be in a package:
9110
9111-echo "$as_me:14732: checking if you do not want to assume colors are white-on-black" >&5
9112+echo "$as_me:15063: checking if you do not want to assume colors are white-on-black" >&5
9113 echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
9114
9115 # Check whether --enable-assumed-color or --disable-assumed-color was given.
9116@@ -14739,7 +15070,7 @@
9117 else
9118   with_assumed_color=yes
9119 fi;
9120-echo "$as_me:14742: result: $with_assumed_color" >&5
9121+echo "$as_me:15073: result: $with_assumed_color" >&5
9122 echo "${ECHO_T}$with_assumed_color" >&6
9123 test "x$with_assumed_color" = xyes &&
9124 cat >>confdefs.h <<\EOF
9125@@ -14747,7 +15078,7 @@
9126 EOF
9127
9128 ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
9129-echo "$as_me:14750: checking if you want hashmap scrolling-optimization code" >&5
9130+echo "$as_me:15081: checking if you want hashmap scrolling-optimization code" >&5
9131 echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
9132
9133 # Check whether --enable-hashmap or --disable-hashmap was given.
9134@@ -14757,7 +15088,7 @@
9135 else
9136   with_hashmap=yes
9137 fi;
9138-echo "$as_me:14760: result: $with_hashmap" >&5
9139+echo "$as_me:15091: result: $with_hashmap" >&5
9140 echo "${ECHO_T}$with_hashmap" >&6
9141 test "x$with_hashmap" = xyes &&
9142 cat >>confdefs.h <<\EOF
9143@@ -14765,7 +15096,7 @@
9144 EOF
9145
9146 ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
9147-echo "$as_me:14768: checking if you want colorfgbg code" >&5
9148+echo "$as_me:15099: checking if you want colorfgbg code" >&5
9149 echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
9150
9151 # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
9152@@ -14775,7 +15106,7 @@
9153 else
9154   with_colorfgbg=no
9155 fi;
9156-echo "$as_me:14778: result: $with_colorfgbg" >&5
9157+echo "$as_me:15109: result: $with_colorfgbg" >&5
9158 echo "${ECHO_T}$with_colorfgbg" >&6
9159 test "x$with_colorfgbg" = xyes &&
9160 cat >>confdefs.h <<\EOF
9161@@ -14783,7 +15114,7 @@
9162 EOF
9163
9164 ###   use option --enable-interop to turn on use of bindings used for interop
9165-echo "$as_me:14786: checking if you want interop bindings" >&5
9166+echo "$as_me:15117: checking if you want interop bindings" >&5
9167 echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6
9168
9169 # Check whether --enable-interop or --disable-interop was given.
9170@@ -14793,13 +15124,13 @@
9171 else
9172   with_exp_interop=$cf_dft_interop
9173 fi;
9174-echo "$as_me:14796: result: $with_exp_interop" >&5
9175+echo "$as_me:15127: result: $with_exp_interop" >&5
9176 echo "${ECHO_T}$with_exp_interop" >&6
9177
9178 NCURSES_INTEROP_FUNCS=0
9179 test "x$with_exp_interop" = xyes && NCURSES_INTEROP_FUNCS=1
9180
9181-echo "$as_me:14802: checking if you want experimental safe-sprintf code" >&5
9182+echo "$as_me:15133: checking if you want experimental safe-sprintf code" >&5
9183 echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
9184
9185 # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
9186@@ -14809,13 +15140,13 @@
9187 else
9188   with_safe_sprintf=no
9189 fi;
9190-echo "$as_me:14812: result: $with_safe_sprintf" >&5
9191+echo "$as_me:15143: result: $with_safe_sprintf" >&5
9192 echo "${ECHO_T}$with_safe_sprintf" >&6
9193
9194 ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
9195 # when hashmap is used scroll hints are useless
9196 if test "$with_hashmap" = no ; then
9197-echo "$as_me:14818: checking if you want to experiment without scrolling-hints code" >&5
9198+echo "$as_me:15149: checking if you want to experiment without scrolling-hints code" >&5
9199 echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
9200
9201 # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
9202@@ -14825,7 +15156,7 @@
9203 else
9204   with_scroll_hints=yes
9205 fi;
9206-echo "$as_me:14828: result: $with_scroll_hints" >&5
9207+echo "$as_me:15159: result: $with_scroll_hints" >&5
9208 echo "${ECHO_T}$with_scroll_hints" >&6
9209 test "x$with_scroll_hints" = xyes &&
9210 cat >>confdefs.h <<\EOF
9211@@ -14834,7 +15165,7 @@
9212
9213 fi
9214
9215-echo "$as_me:14837: checking if you want wgetch-events code" >&5
9216+echo "$as_me:15168: checking if you want wgetch-events code" >&5
9217 echo $ECHO_N "checking if you want wgetch-events code... $ECHO_C" >&6
9218
9219 # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
9220@@ -14844,7 +15175,7 @@
9221 else
9222   with_wgetch_events=no
9223 fi;
9224-echo "$as_me:14847: result: $with_wgetch_events" >&5
9225+echo "$as_me:15178: result: $with_wgetch_events" >&5
9226 echo "${ECHO_T}$with_wgetch_events" >&6
9227 test "x$with_wgetch_events" = xyes &&
9228 cat >>confdefs.h <<\EOF
9229@@ -14855,7 +15186,7 @@
9230
9231 ###	use option --disable-echo to suppress full display compiling commands
9232
9233-echo "$as_me:14858: checking if you want to see long compiling messages" >&5
9234+echo "$as_me:15189: checking if you want to see long compiling messages" >&5
9235 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
9236
9237 # Check whether --enable-echo or --disable-echo was given.
9238@@ -14889,7 +15220,7 @@
9239 	ECHO_CC=''
9240
9241 fi;
9242-echo "$as_me:14892: result: $enableval" >&5
9243+echo "$as_me:15223: result: $enableval" >&5
9244 echo "${ECHO_T}$enableval" >&6
9245
9246 if test "x$enable_echo" = xyes; then
9247@@ -14902,7 +15233,7 @@
9248
9249 # --disable-stripping is used for debugging
9250
9251-echo "$as_me:14905: checking if you want to install stripped executables" >&5
9252+echo "$as_me:15236: checking if you want to install stripped executables" >&5
9253 echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6
9254
9255 # Check whether --enable-stripping or --disable-stripping was given.
9256@@ -14919,7 +15250,7 @@
9257 	with_stripping=yes
9258
9259 fi;
9260-echo "$as_me:14922: result: $with_stripping" >&5
9261+echo "$as_me:15253: result: $with_stripping" >&5
9262 echo "${ECHO_T}$with_stripping" >&6
9263
9264 if test "$with_stripping" = yes
9265@@ -14930,7 +15261,7 @@
9266 fi
9267
9268 : ${INSTALL:=install}
9269-echo "$as_me:14933: checking if install accepts -p option" >&5
9270+echo "$as_me:15264: checking if install accepts -p option" >&5
9271 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6
9272 if test "${cf_cv_install_p+set}" = set; then
9273   echo $ECHO_N "(cached) $ECHO_C" >&6
9274@@ -14961,10 +15292,10 @@
9275 	rm -rf conftest*
9276
9277 fi
9278-echo "$as_me:14964: result: $cf_cv_install_p" >&5
9279+echo "$as_me:15295: result: $cf_cv_install_p" >&5
9280 echo "${ECHO_T}$cf_cv_install_p" >&6
9281
9282-echo "$as_me:14967: checking if install needs to be told about ownership" >&5
9283+echo "$as_me:15298: checking if install needs to be told about ownership" >&5
9284 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6
9285 case `$ac_config_guess` in
9286 (*minix)
9287@@ -14975,7 +15306,7 @@
9288 	;;
9289 esac
9290
9291-echo "$as_me:14978: result: $with_install_o" >&5
9292+echo "$as_me:15309: result: $with_install_o" >&5
9293 echo "${ECHO_T}$with_install_o" >&6
9294 if test "x$with_install_o" = xyes
9295 then
9296@@ -14999,7 +15330,7 @@
9297 fi
9298
9299 ###	use option --enable-warnings to turn on all gcc warnings
9300-echo "$as_me:15002: checking if you want to see compiler warnings" >&5
9301+echo "$as_me:15333: checking if you want to see compiler warnings" >&5
9302 echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
9303
9304 # Check whether --enable-warnings or --disable-warnings was given.
9305@@ -15007,7 +15338,7 @@
9306   enableval="$enable_warnings"
9307   with_warnings=$enableval
9308 fi;
9309-echo "$as_me:15010: result: $with_warnings" >&5
9310+echo "$as_me:15341: result: $with_warnings" >&5
9311 echo "${ECHO_T}$with_warnings" >&6
9312
9313 if test "x$with_warnings" = "xyes"; then
9314@@ -15019,12 +15350,12 @@
9315 if test "$GCC" = yes ; then
9316 	case $host_os in
9317 	(linux*|gnu*)
9318-		echo "$as_me:15022: checking if this is really Intel C compiler" >&5
9319+		echo "$as_me:15353: checking if this is really Intel C compiler" >&5
9320 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
9321 		cf_save_CFLAGS="$CFLAGS"
9322 		CFLAGS="$CFLAGS -no-gcc"
9323 		cat >conftest.$ac_ext <<_ACEOF
9324-#line 15027 "configure"
9325+#line 15358 "configure"
9326 #include "confdefs.h"
9327
9328 int
9329@@ -15041,16 +15372,16 @@
9330 }
9331 _ACEOF
9332 rm -f conftest.$ac_objext
9333-if { (eval echo "$as_me:15044: \"$ac_compile\"") >&5
9334+if { (eval echo "$as_me:15375: \"$ac_compile\"") >&5
9335   (eval $ac_compile) 2>&5
9336   ac_status=$?
9337-  echo "$as_me:15047: \$? = $ac_status" >&5
9338+  echo "$as_me:15378: \$? = $ac_status" >&5
9339   (exit $ac_status); } &&
9340          { ac_try='test -s conftest.$ac_objext'
9341-  { (eval echo "$as_me:15050: \"$ac_try\"") >&5
9342+  { (eval echo "$as_me:15381: \"$ac_try\"") >&5
9343   (eval $ac_try) 2>&5
9344   ac_status=$?
9345-  echo "$as_me:15053: \$? = $ac_status" >&5
9346+  echo "$as_me:15384: \$? = $ac_status" >&5
9347   (exit $ac_status); }; }; then
9348   INTEL_COMPILER=yes
9349 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
9350@@ -15061,7 +15392,7 @@
9351 fi
9352 rm -f conftest.$ac_objext conftest.$ac_ext
9353 		CFLAGS="$cf_save_CFLAGS"
9354-		echo "$as_me:15064: result: $INTEL_COMPILER" >&5
9355+		echo "$as_me:15395: result: $INTEL_COMPILER" >&5
9356 echo "${ECHO_T}$INTEL_COMPILER" >&6
9357 		;;
9358 	esac
9359@@ -15070,12 +15401,12 @@
9360 CLANG_COMPILER=no
9361
9362 if test "$GCC" = yes ; then
9363-	echo "$as_me:15073: checking if this is really Clang C compiler" >&5
9364+	echo "$as_me:15404: checking if this is really Clang C compiler" >&5
9365 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
9366 	cf_save_CFLAGS="$CFLAGS"
9367 	CFLAGS="$CFLAGS -Qunused-arguments"
9368 	cat >conftest.$ac_ext <<_ACEOF
9369-#line 15078 "configure"
9370+#line 15409 "configure"
9371 #include "confdefs.h"
9372
9373 int
9374@@ -15092,16 +15423,16 @@
9375 }
9376 _ACEOF
9377 rm -f conftest.$ac_objext
9378-if { (eval echo "$as_me:15095: \"$ac_compile\"") >&5
9379+if { (eval echo "$as_me:15426: \"$ac_compile\"") >&5
9380   (eval $ac_compile) 2>&5
9381   ac_status=$?
9382-  echo "$as_me:15098: \$? = $ac_status" >&5
9383+  echo "$as_me:15429: \$? = $ac_status" >&5
9384   (exit $ac_status); } &&
9385          { ac_try='test -s conftest.$ac_objext'
9386-  { (eval echo "$as_me:15101: \"$ac_try\"") >&5
9387+  { (eval echo "$as_me:15432: \"$ac_try\"") >&5
9388   (eval $ac_try) 2>&5
9389   ac_status=$?
9390-  echo "$as_me:15104: \$? = $ac_status" >&5
9391+  echo "$as_me:15435: \$? = $ac_status" >&5
9392   (exit $ac_status); }; }; then
9393   CLANG_COMPILER=yes
9394 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
9395@@ -15112,13 +15443,13 @@
9396 fi
9397 rm -f conftest.$ac_objext conftest.$ac_ext
9398 	CFLAGS="$cf_save_CFLAGS"
9399-	echo "$as_me:15115: result: $CLANG_COMPILER" >&5
9400+	echo "$as_me:15446: result: $CLANG_COMPILER" >&5
9401 echo "${ECHO_T}$CLANG_COMPILER" >&6
9402 fi
9403
9404 if test "x$have_x" = xyes; then
9405 cat >conftest.$ac_ext <<_ACEOF
9406-#line 15121 "configure"
9407+#line 15452 "configure"
9408 #include "confdefs.h"
9409
9410 #include <stdlib.h>
9411@@ -15133,26 +15464,26 @@
9412 }
9413 _ACEOF
9414 rm -f conftest.$ac_objext
9415-if { (eval echo "$as_me:15136: \"$ac_compile\"") >&5
9416+if { (eval echo "$as_me:15467: \"$ac_compile\"") >&5
9417   (eval $ac_compile) 2>&5
9418   ac_status=$?
9419-  echo "$as_me:15139: \$? = $ac_status" >&5
9420+  echo "$as_me:15470: \$? = $ac_status" >&5
9421   (exit $ac_status); } &&
9422          { ac_try='test -s conftest.$ac_objext'
9423-  { (eval echo "$as_me:15142: \"$ac_try\"") >&5
9424+  { (eval echo "$as_me:15473: \"$ac_try\"") >&5
9425   (eval $ac_try) 2>&5
9426   ac_status=$?
9427-  echo "$as_me:15145: \$? = $ac_status" >&5
9428+  echo "$as_me:15476: \$? = $ac_status" >&5
9429   (exit $ac_status); }; }; then
9430
9431-echo "$as_me:15148: checking for X11/Xt const-feature" >&5
9432+echo "$as_me:15479: checking for X11/Xt const-feature" >&5
9433 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6
9434 if test "${cf_cv_const_x_string+set}" = set; then
9435   echo $ECHO_N "(cached) $ECHO_C" >&6
9436 else
9437
9438 	cat >conftest.$ac_ext <<_ACEOF
9439-#line 15155 "configure"
9440+#line 15486 "configure"
9441 #include "confdefs.h"
9442
9443 #define _CONST_X_STRING	/* X11R7.8 (perhaps) */
9444@@ -15169,16 +15500,16 @@
9445 }
9446 _ACEOF
9447 rm -f conftest.$ac_objext
9448-if { (eval echo "$as_me:15172: \"$ac_compile\"") >&5
9449+if { (eval echo "$as_me:15503: \"$ac_compile\"") >&5
9450   (eval $ac_compile) 2>&5
9451   ac_status=$?
9452-  echo "$as_me:15175: \$? = $ac_status" >&5
9453+  echo "$as_me:15506: \$? = $ac_status" >&5
9454   (exit $ac_status); } &&
9455          { ac_try='test -s conftest.$ac_objext'
9456-  { (eval echo "$as_me:15178: \"$ac_try\"") >&5
9457+  { (eval echo "$as_me:15509: \"$ac_try\"") >&5
9458   (eval $ac_try) 2>&5
9459   ac_status=$?
9460-  echo "$as_me:15181: \$? = $ac_status" >&5
9461+  echo "$as_me:15512: \$? = $ac_status" >&5
9462   (exit $ac_status); }; }; then
9463
9464 			cf_cv_const_x_string=no
9465@@ -15193,7 +15524,7 @@
9466 rm -f conftest.$ac_objext conftest.$ac_ext
9467
9468 fi
9469-echo "$as_me:15196: result: $cf_cv_const_x_string" >&5
9470+echo "$as_me:15527: result: $cf_cv_const_x_string" >&5
9471 echo "${ECHO_T}$cf_cv_const_x_string" >&6
9472
9473 case $cf_cv_const_x_string in
9474@@ -15218,7 +15549,7 @@
9475 rm -f conftest.$ac_objext conftest.$ac_ext
9476  fi
9477 cat > conftest.$ac_ext <<EOF
9478-#line 15221 "${as_me:-configure}"
9479+#line 15552 "${as_me:-configure}"
9480 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
9481 EOF
9482 if test "$INTEL_COMPILER" = yes
9483@@ -15234,7 +15565,7 @@
9484 # remark #981: operands are evaluated in unspecified order
9485 # warning #279: controlling expression is constant
9486
9487-	{ echo "$as_me:15237: checking for $CC warning options..." >&5
9488+	{ echo "$as_me:15568: checking for $CC warning options..." >&5
9489 echo "$as_me: checking for $CC warning options..." >&6;}
9490 	cf_save_CFLAGS="$CFLAGS"
9491 	EXTRA_CFLAGS="-Wall"
9492@@ -15250,12 +15581,12 @@
9493 		wd981
9494 	do
9495 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
9496-		if { (eval echo "$as_me:15253: \"$ac_compile\"") >&5
9497+		if { (eval echo "$as_me:15584: \"$ac_compile\"") >&5
9498   (eval $ac_compile) 2>&5
9499   ac_status=$?
9500-  echo "$as_me:15256: \$? = $ac_status" >&5
9501+  echo "$as_me:15587: \$? = $ac_status" >&5
9502   (exit $ac_status); }; then
9503-			test -n "$verbose" && echo "$as_me:15258: result: ... -$cf_opt" >&5
9504+			test -n "$verbose" && echo "$as_me:15589: result: ... -$cf_opt" >&5
9505 echo "${ECHO_T}... -$cf_opt" >&6
9506 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
9507 		fi
9508@@ -15263,7 +15594,7 @@
9509 	CFLAGS="$cf_save_CFLAGS"
9510 elif test "$GCC" = yes
9511 then
9512-	{ echo "$as_me:15266: checking for $CC warning options..." >&5
9513+	{ echo "$as_me:15597: checking for $CC warning options..." >&5
9514 echo "$as_me: checking for $CC warning options..." >&6;}
9515 	cf_save_CFLAGS="$CFLAGS"
9516 	EXTRA_CFLAGS=
9517@@ -15287,12 +15618,12 @@
9518 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum
9519 	do
9520 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
9521-		if { (eval echo "$as_me:15290: \"$ac_compile\"") >&5
9522+		if { (eval echo "$as_me:15621: \"$ac_compile\"") >&5
9523   (eval $ac_compile) 2>&5
9524   ac_status=$?
9525-  echo "$as_me:15293: \$? = $ac_status" >&5
9526+  echo "$as_me:15624: \$? = $ac_status" >&5
9527   (exit $ac_status); }; then
9528-			test -n "$verbose" && echo "$as_me:15295: result: ... -$cf_opt" >&5
9529+			test -n "$verbose" && echo "$as_me:15626: result: ... -$cf_opt" >&5
9530 echo "${ECHO_T}... -$cf_opt" >&6
9531 			case $cf_opt in
9532 			(Winline)
9533@@ -15300,7 +15631,7 @@
9534 				([34].*)
9535 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
9536
9537-echo "${as_me:-configure}:15303: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
9538+echo "${as_me:-configure}:15634: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
9539
9540 					continue;;
9541 				esac
9542@@ -15310,7 +15641,7 @@
9543 				([12].*)
9544 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
9545
9546-echo "${as_me:-configure}:15313: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
9547+echo "${as_me:-configure}:15644: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
9548
9549 					continue;;
9550 				esac
9551@@ -15330,12 +15661,12 @@
9552 if test "$GCC" = yes ; then
9553 	case $host_os in
9554 	(linux*|gnu*)
9555-		echo "$as_me:15333: checking if this is really Intel C++ compiler" >&5
9556+		echo "$as_me:15664: checking if this is really Intel C++ compiler" >&5
9557 echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
9558 		cf_save_CFLAGS="$CXXFLAGS"
9559 		CXXFLAGS="$CXXFLAGS -no-gcc"
9560 		cat >conftest.$ac_ext <<_ACEOF
9561-#line 15338 "configure"
9562+#line 15669 "configure"
9563 #include "confdefs.h"
9564
9565 int
9566@@ -15352,16 +15683,16 @@
9567 }
9568 _ACEOF
9569 rm -f conftest.$ac_objext
9570-if { (eval echo "$as_me:15355: \"$ac_compile\"") >&5
9571+if { (eval echo "$as_me:15686: \"$ac_compile\"") >&5
9572   (eval $ac_compile) 2>&5
9573   ac_status=$?
9574-  echo "$as_me:15358: \$? = $ac_status" >&5
9575+  echo "$as_me:15689: \$? = $ac_status" >&5
9576   (exit $ac_status); } &&
9577          { ac_try='test -s conftest.$ac_objext'
9578-  { (eval echo "$as_me:15361: \"$ac_try\"") >&5
9579+  { (eval echo "$as_me:15692: \"$ac_try\"") >&5
9580   (eval $ac_try) 2>&5
9581   ac_status=$?
9582-  echo "$as_me:15364: \$? = $ac_status" >&5
9583+  echo "$as_me:15695: \$? = $ac_status" >&5
9584   (exit $ac_status); }; }; then
9585   INTEL_CPLUSPLUS=yes
9586 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
9587@@ -15372,7 +15703,7 @@
9588 fi
9589 rm -f conftest.$ac_objext conftest.$ac_ext
9590 		CXXFLAGS="$cf_save_CFLAGS"
9591-		echo "$as_me:15375: result: $INTEL_CPLUSPLUS" >&5
9592+		echo "$as_me:15706: result: $INTEL_CPLUSPLUS" >&5
9593 echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
9594 		;;
9595 	esac
9596@@ -15381,12 +15712,12 @@
9597 CLANG_CPLUSPLUS=no
9598
9599 if test "$GCC" = yes ; then
9600-	echo "$as_me:15384: checking if this is really Clang C++ compiler" >&5
9601+	echo "$as_me:15715: checking if this is really Clang C++ compiler" >&5
9602 echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6
9603 	cf_save_CFLAGS="$CXXFLAGS"
9604 	CXXFLAGS="$CXXFLAGS -Qunused-arguments"
9605 	cat >conftest.$ac_ext <<_ACEOF
9606-#line 15389 "configure"
9607+#line 15720 "configure"
9608 #include "confdefs.h"
9609
9610 int
9611@@ -15403,16 +15734,16 @@
9612 }
9613 _ACEOF
9614 rm -f conftest.$ac_objext
9615-if { (eval echo "$as_me:15406: \"$ac_compile\"") >&5
9616+if { (eval echo "$as_me:15737: \"$ac_compile\"") >&5
9617   (eval $ac_compile) 2>&5
9618   ac_status=$?
9619-  echo "$as_me:15409: \$? = $ac_status" >&5
9620+  echo "$as_me:15740: \$? = $ac_status" >&5
9621   (exit $ac_status); } &&
9622          { ac_try='test -s conftest.$ac_objext'
9623-  { (eval echo "$as_me:15412: \"$ac_try\"") >&5
9624+  { (eval echo "$as_me:15743: \"$ac_try\"") >&5
9625   (eval $ac_try) 2>&5
9626   ac_status=$?
9627-  echo "$as_me:15415: \$? = $ac_status" >&5
9628+  echo "$as_me:15746: \$? = $ac_status" >&5
9629   (exit $ac_status); }; }; then
9630   CLANG_CPLUSPLUS=yes
9631 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
9632@@ -15423,7 +15754,7 @@
9633 fi
9634 rm -f conftest.$ac_objext conftest.$ac_ext
9635 	CXXFLAGS="$cf_save_CFLAGS"
9636-	echo "$as_me:15426: result: $CLANG_CPLUSPLUS" >&5
9637+	echo "$as_me:15757: result: $CLANG_CPLUSPLUS" >&5
9638 echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6
9639 fi
9640
9641@@ -15435,7 +15766,7 @@
9642 ac_main_return=return
9643
9644 cat > conftest.$ac_ext <<EOF
9645-#line 15438 "configure"
9646+#line 15769 "configure"
9647 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
9648 EOF
9649
9650@@ -15453,7 +15784,7 @@
9651 # remark #981: operands are evaluated in unspecified order
9652 # warning #269: invalid format string conversion
9653
9654-	{ echo "$as_me:15456: checking for $CC warning options..." >&5
9655+	{ echo "$as_me:15787: checking for $CC warning options..." >&5
9656 echo "$as_me: checking for $CC warning options..." >&6;}
9657 	cf_save_CXXFLAGS="$CXXFLAGS"
9658 	EXTRA_CXXFLAGS="-Wall"
9659@@ -15470,12 +15801,12 @@
9660 		wd981
9661 	do
9662 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
9663-		if { (eval echo "$as_me:15473: \"$ac_compile\"") >&5
9664+		if { (eval echo "$as_me:15804: \"$ac_compile\"") >&5
9665   (eval $ac_compile) 2>&5
9666   ac_status=$?
9667-  echo "$as_me:15476: \$? = $ac_status" >&5
9668+  echo "$as_me:15807: \$? = $ac_status" >&5
9669   (exit $ac_status); }; then
9670-			test -n "$verbose" && echo "$as_me:15478: result: ... -$cf_opt" >&5
9671+			test -n "$verbose" && echo "$as_me:15809: result: ... -$cf_opt" >&5
9672 echo "${ECHO_T}... -$cf_opt" >&6
9673 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
9674 		fi
9675@@ -15484,7 +15815,7 @@
9676
9677 elif test "$GXX" = yes
9678 then
9679-	{ echo "$as_me:15487: checking for $CXX warning options..." >&5
9680+	{ echo "$as_me:15818: checking for $CXX warning options..." >&5
9681 echo "$as_me: checking for $CXX warning options..." >&6;}
9682 	cf_save_CXXFLAGS="$CXXFLAGS"
9683 	EXTRA_CXXFLAGS="-W -Wall"
9684@@ -15514,16 +15845,16 @@
9685 		Wundef $cf_gxx_extra_warnings Wno-unused
9686 	do
9687 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
9688-		if { (eval echo "$as_me:15517: \"$ac_compile\"") >&5
9689+		if { (eval echo "$as_me:15848: \"$ac_compile\"") >&5
9690   (eval $ac_compile) 2>&5
9691   ac_status=$?
9692-  echo "$as_me:15520: \$? = $ac_status" >&5
9693+  echo "$as_me:15851: \$? = $ac_status" >&5
9694   (exit $ac_status); }; then
9695-			test -n "$verbose" && echo "$as_me:15522: result: ... -$cf_opt" >&5
9696+			test -n "$verbose" && echo "$as_me:15853: result: ... -$cf_opt" >&5
9697 echo "${ECHO_T}... -$cf_opt" >&6
9698 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
9699 		else
9700-			test -n "$verbose" && echo "$as_me:15526: result: ... no -$cf_opt" >&5
9701+			test -n "$verbose" && echo "$as_me:15857: result: ... no -$cf_opt" >&5
9702 echo "${ECHO_T}... no -$cf_opt" >&6
9703 		fi
9704 	done
9705@@ -15559,10 +15890,10 @@
9706 EOF
9707 if test "$GCC" = yes
9708 then
9709-	{ echo "$as_me:15562: checking for $CC __attribute__ directives..." >&5
9710+	{ echo "$as_me:15893: checking for $CC __attribute__ directives..." >&5
9711 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
9712 cat > conftest.$ac_ext <<EOF
9713-#line 15565 "${as_me:-configure}"
9714+#line 15896 "${as_me:-configure}"
9715 #include "confdefs.h"
9716 #include "conftest.h"
9717 #include "conftest.i"
9718@@ -15611,12 +15942,12 @@
9719 			;;
9720 		esac
9721
9722-		if { (eval echo "$as_me:15614: \"$ac_compile\"") >&5
9723+		if { (eval echo "$as_me:15945: \"$ac_compile\"") >&5
9724   (eval $ac_compile) 2>&5
9725   ac_status=$?
9726-  echo "$as_me:15617: \$? = $ac_status" >&5
9727+  echo "$as_me:15948: \$? = $ac_status" >&5
9728   (exit $ac_status); }; then
9729-			test -n "$verbose" && echo "$as_me:15619: result: ... $cf_attribute" >&5
9730+			test -n "$verbose" && echo "$as_me:15950: result: ... $cf_attribute" >&5
9731 echo "${ECHO_T}... $cf_attribute" >&6
9732 			cat conftest.h >>confdefs.h
9733 			case $cf_attribute in
9734@@ -15675,7 +16006,7 @@
9735 rm -rf conftest*
9736 fi
9737
9738-echo "$as_me:15678: checking if you want to work around bogus compiler/loader warnings" >&5
9739+echo "$as_me:16009: checking if you want to work around bogus compiler/loader warnings" >&5
9740 echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6
9741
9742 # Check whether --enable-string-hacks or --disable-string-hacks was given.
9743@@ -15685,7 +16016,7 @@
9744 else
9745   with_string_hacks=no
9746 fi;
9747-echo "$as_me:15688: result: $with_string_hacks" >&5
9748+echo "$as_me:16019: result: $with_string_hacks" >&5
9749 echo "${ECHO_T}$with_string_hacks" >&6
9750
9751 if test "x$with_string_hacks" = "xyes"; then
9752@@ -15694,15 +16025,15 @@
9753 #define USE_STRING_HACKS 1
9754 EOF
9755
9756-	{ echo "$as_me:15697: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
9757+	{ echo "$as_me:16028: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5
9758 echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;}
9759-	echo "$as_me:15699: checking for strlcat" >&5
9760+	echo "$as_me:16030: checking for strlcat" >&5
9761 echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
9762 if test "${ac_cv_func_strlcat+set}" = set; then
9763   echo $ECHO_N "(cached) $ECHO_C" >&6
9764 else
9765   cat >conftest.$ac_ext <<_ACEOF
9766-#line 15705 "configure"
9767+#line 16036 "configure"
9768 #include "confdefs.h"
9769 #define strlcat autoconf_temporary
9770 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
9771@@ -15733,16 +16064,16 @@
9772 }
9773 _ACEOF
9774 rm -f conftest.$ac_objext conftest$ac_exeext
9775-if { (eval echo "$as_me:15736: \"$ac_link\"") >&5
9776+if { (eval echo "$as_me:16067: \"$ac_link\"") >&5
9777   (eval $ac_link) 2>&5
9778   ac_status=$?
9779-  echo "$as_me:15739: \$? = $ac_status" >&5
9780+  echo "$as_me:16070: \$? = $ac_status" >&5
9781   (exit $ac_status); } &&
9782          { ac_try='test -s conftest$ac_exeext'
9783-  { (eval echo "$as_me:15742: \"$ac_try\"") >&5
9784+  { (eval echo "$as_me:16073: \"$ac_try\"") >&5
9785   (eval $ac_try) 2>&5
9786   ac_status=$?
9787-  echo "$as_me:15745: \$? = $ac_status" >&5
9788+  echo "$as_me:16076: \$? = $ac_status" >&5
9789   (exit $ac_status); }; }; then
9790   ac_cv_func_strlcat=yes
9791 else
9792@@ -15752,7 +16083,7 @@
9793 fi
9794 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9795 fi
9796-echo "$as_me:15755: result: $ac_cv_func_strlcat" >&5
9797+echo "$as_me:16086: result: $ac_cv_func_strlcat" >&5
9798 echo "${ECHO_T}$ac_cv_func_strlcat" >&6
9799 if test $ac_cv_func_strlcat = yes; then
9800
9801@@ -15762,7 +16093,7 @@
9802
9803 else
9804
9805-		echo "$as_me:15765: checking for strlcat in -lbsd" >&5
9806+		echo "$as_me:16096: checking for strlcat in -lbsd" >&5
9807 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6
9808 if test "${ac_cv_lib_bsd_strlcat+set}" = set; then
9809   echo $ECHO_N "(cached) $ECHO_C" >&6
9810@@ -15770,7 +16101,7 @@
9811   ac_check_lib_save_LIBS=$LIBS
9812 LIBS="-lbsd  $LIBS"
9813 cat >conftest.$ac_ext <<_ACEOF
9814-#line 15773 "configure"
9815+#line 16104 "configure"
9816 #include "confdefs.h"
9817
9818 /* Override any gcc2 internal prototype to avoid an error.  */
9819@@ -15789,16 +16120,16 @@
9820 }
9821 _ACEOF
9822 rm -f conftest.$ac_objext conftest$ac_exeext
9823-if { (eval echo "$as_me:15792: \"$ac_link\"") >&5
9824+if { (eval echo "$as_me:16123: \"$ac_link\"") >&5
9825   (eval $ac_link) 2>&5
9826   ac_status=$?
9827-  echo "$as_me:15795: \$? = $ac_status" >&5
9828+  echo "$as_me:16126: \$? = $ac_status" >&5
9829   (exit $ac_status); } &&
9830          { ac_try='test -s conftest$ac_exeext'
9831-  { (eval echo "$as_me:15798: \"$ac_try\"") >&5
9832+  { (eval echo "$as_me:16129: \"$ac_try\"") >&5
9833   (eval $ac_try) 2>&5
9834   ac_status=$?
9835-  echo "$as_me:15801: \$? = $ac_status" >&5
9836+  echo "$as_me:16132: \$? = $ac_status" >&5
9837   (exit $ac_status); }; }; then
9838   ac_cv_lib_bsd_strlcat=yes
9839 else
9840@@ -15809,7 +16140,7 @@
9841 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9842 LIBS=$ac_check_lib_save_LIBS
9843 fi
9844-echo "$as_me:15812: result: $ac_cv_lib_bsd_strlcat" >&5
9845+echo "$as_me:16143: result: $ac_cv_lib_bsd_strlcat" >&5
9846 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6
9847 if test $ac_cv_lib_bsd_strlcat = yes; then
9848
9849@@ -15832,23 +16163,23 @@
9850 for ac_header in bsd/string.h
9851 do
9852 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
9853-echo "$as_me:15835: checking for $ac_header" >&5
9854+echo "$as_me:16166: checking for $ac_header" >&5
9855 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
9856 if eval "test \"\${$as_ac_Header+set}\" = set"; then
9857   echo $ECHO_N "(cached) $ECHO_C" >&6
9858 else
9859   cat >conftest.$ac_ext <<_ACEOF
9860-#line 15841 "configure"
9861+#line 16172 "configure"
9862 #include "confdefs.h"
9863 #include <$ac_header>
9864 _ACEOF
9865-if { (eval echo "$as_me:15845: \"$ac_cpp conftest.$ac_ext\"") >&5
9866+if { (eval echo "$as_me:16176: \"$ac_cpp conftest.$ac_ext\"") >&5
9867   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
9868   ac_status=$?
9869   egrep -v '^ *\+' conftest.er1 >conftest.err
9870   rm -f conftest.er1
9871   cat conftest.err >&5
9872-  echo "$as_me:15851: \$? = $ac_status" >&5
9873+  echo "$as_me:16182: \$? = $ac_status" >&5
9874   (exit $ac_status); } >/dev/null; then
9875   if test -s conftest.err; then
9876     ac_cpp_err=$ac_c_preproc_warn_flag
9877@@ -15867,7 +16198,7 @@
9878 fi
9879 rm -f conftest.err conftest.$ac_ext
9880 fi
9881-echo "$as_me:15870: result: `eval echo '${'$as_ac_Header'}'`" >&5
9882+echo "$as_me:16201: result: `eval echo '${'$as_ac_Header'}'`" >&5
9883 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
9884 if test `eval echo '${'$as_ac_Header'}'` = yes; then
9885   cat >>confdefs.h <<EOF
9886@@ -15888,13 +16219,13 @@
9887 for ac_func in strlcpy snprintf
9888 do
9889 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
9890-echo "$as_me:15891: checking for $ac_func" >&5
9891+echo "$as_me:16222: checking for $ac_func" >&5
9892 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
9893 if eval "test \"\${$as_ac_var+set}\" = set"; then
9894   echo $ECHO_N "(cached) $ECHO_C" >&6
9895 else
9896   cat >conftest.$ac_ext <<_ACEOF
9897-#line 15897 "configure"
9898+#line 16228 "configure"
9899 #include "confdefs.h"
9900 #define $ac_func autoconf_temporary
9901 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
9902@@ -15925,16 +16256,16 @@
9903 }
9904 _ACEOF
9905 rm -f conftest.$ac_objext conftest$ac_exeext
9906-if { (eval echo "$as_me:15928: \"$ac_link\"") >&5
9907+if { (eval echo "$as_me:16259: \"$ac_link\"") >&5
9908   (eval $ac_link) 2>&5
9909   ac_status=$?
9910-  echo "$as_me:15931: \$? = $ac_status" >&5
9911+  echo "$as_me:16262: \$? = $ac_status" >&5
9912   (exit $ac_status); } &&
9913          { ac_try='test -s conftest$ac_exeext'
9914-  { (eval echo "$as_me:15934: \"$ac_try\"") >&5
9915+  { (eval echo "$as_me:16265: \"$ac_try\"") >&5
9916   (eval $ac_try) 2>&5
9917   ac_status=$?
9918-  echo "$as_me:15937: \$? = $ac_status" >&5
9919+  echo "$as_me:16268: \$? = $ac_status" >&5
9920   (exit $ac_status); }; }; then
9921   eval "$as_ac_var=yes"
9922 else
9923@@ -15944,7 +16275,7 @@
9924 fi
9925 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9926 fi
9927-echo "$as_me:15947: result: `eval echo '${'$as_ac_var'}'`" >&5
9928+echo "$as_me:16278: result: `eval echo '${'$as_ac_var'}'`" >&5
9929 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
9930 if test `eval echo '${'$as_ac_var'}'` = yes; then
9931   cat >>confdefs.h <<EOF
9932@@ -15957,7 +16288,7 @@
9933 fi
9934
9935 ###	use option --enable-assertions to turn on generation of assertion code
9936-echo "$as_me:15960: checking if you want to enable runtime assertions" >&5
9937+echo "$as_me:16291: checking if you want to enable runtime assertions" >&5
9938 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
9939
9940 # Check whether --enable-assertions or --disable-assertions was given.
9941@@ -15967,7 +16298,7 @@
9942 else
9943   with_assertions=no
9944 fi;
9945-echo "$as_me:15970: result: $with_assertions" >&5
9946+echo "$as_me:16301: result: $with_assertions" >&5
9947 echo "${ECHO_T}$with_assertions" >&6
9948 if test -n "$GCC"
9949 then
9950@@ -15983,7 +16314,7 @@
9951
9952 ###	use option --disable-leaks to suppress "permanent" leaks, for testing
9953
9954-echo "$as_me:15986: checking if you want to use dmalloc for testing" >&5
9955+echo "$as_me:16317: checking if you want to use dmalloc for testing" >&5
9956 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
9957
9958 # Check whether --with-dmalloc or --without-dmalloc was given.
9959@@ -16000,7 +16331,7 @@
9960 else
9961   with_dmalloc=
9962 fi;
9963-echo "$as_me:16003: result: ${with_dmalloc:-no}" >&5
9964+echo "$as_me:16334: result: ${with_dmalloc:-no}" >&5
9965 echo "${ECHO_T}${with_dmalloc:-no}" >&6
9966
9967 case .$with_cflags in
9968@@ -16114,23 +16445,23 @@
9969 esac
9970
9971 if test "$with_dmalloc" = yes ; then
9972-	echo "$as_me:16117: checking for dmalloc.h" >&5
9973+	echo "$as_me:16448: checking for dmalloc.h" >&5
9974 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
9975 if test "${ac_cv_header_dmalloc_h+set}" = set; then
9976   echo $ECHO_N "(cached) $ECHO_C" >&6
9977 else
9978   cat >conftest.$ac_ext <<_ACEOF
9979-#line 16123 "configure"
9980+#line 16454 "configure"
9981 #include "confdefs.h"
9982 #include <dmalloc.h>
9983 _ACEOF
9984-if { (eval echo "$as_me:16127: \"$ac_cpp conftest.$ac_ext\"") >&5
9985+if { (eval echo "$as_me:16458: \"$ac_cpp conftest.$ac_ext\"") >&5
9986   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
9987   ac_status=$?
9988   egrep -v '^ *\+' conftest.er1 >conftest.err
9989   rm -f conftest.er1
9990   cat conftest.err >&5
9991-  echo "$as_me:16133: \$? = $ac_status" >&5
9992+  echo "$as_me:16464: \$? = $ac_status" >&5
9993   (exit $ac_status); } >/dev/null; then
9994   if test -s conftest.err; then
9995     ac_cpp_err=$ac_c_preproc_warn_flag
9996@@ -16149,11 +16480,11 @@
9997 fi
9998 rm -f conftest.err conftest.$ac_ext
9999 fi
10000-echo "$as_me:16152: result: $ac_cv_header_dmalloc_h" >&5
10001+echo "$as_me:16483: result: $ac_cv_header_dmalloc_h" >&5
10002 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
10003 if test $ac_cv_header_dmalloc_h = yes; then
10004
10005-echo "$as_me:16156: checking for dmalloc_debug in -ldmalloc" >&5
10006+echo "$as_me:16487: checking for dmalloc_debug in -ldmalloc" >&5
10007 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
10008 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
10009   echo $ECHO_N "(cached) $ECHO_C" >&6
10010@@ -16161,7 +16492,7 @@
10011   ac_check_lib_save_LIBS=$LIBS
10012 LIBS="-ldmalloc  $LIBS"
10013 cat >conftest.$ac_ext <<_ACEOF
10014-#line 16164 "configure"
10015+#line 16495 "configure"
10016 #include "confdefs.h"
10017
10018 /* Override any gcc2 internal prototype to avoid an error.  */
10019@@ -16180,16 +16511,16 @@
10020 }
10021 _ACEOF
10022 rm -f conftest.$ac_objext conftest$ac_exeext
10023-if { (eval echo "$as_me:16183: \"$ac_link\"") >&5
10024+if { (eval echo "$as_me:16514: \"$ac_link\"") >&5
10025   (eval $ac_link) 2>&5
10026   ac_status=$?
10027-  echo "$as_me:16186: \$? = $ac_status" >&5
10028+  echo "$as_me:16517: \$? = $ac_status" >&5
10029   (exit $ac_status); } &&
10030          { ac_try='test -s conftest$ac_exeext'
10031-  { (eval echo "$as_me:16189: \"$ac_try\"") >&5
10032+  { (eval echo "$as_me:16520: \"$ac_try\"") >&5
10033   (eval $ac_try) 2>&5
10034   ac_status=$?
10035-  echo "$as_me:16192: \$? = $ac_status" >&5
10036+  echo "$as_me:16523: \$? = $ac_status" >&5
10037   (exit $ac_status); }; }; then
10038   ac_cv_lib_dmalloc_dmalloc_debug=yes
10039 else
10040@@ -16200,7 +16531,7 @@
10041 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10042 LIBS=$ac_check_lib_save_LIBS
10043 fi
10044-echo "$as_me:16203: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
10045+echo "$as_me:16534: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
10046 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
10047 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
10048   cat >>confdefs.h <<EOF
10049@@ -16215,7 +16546,7 @@
10050
10051 fi
10052
10053-echo "$as_me:16218: checking if you want to use dbmalloc for testing" >&5
10054+echo "$as_me:16549: checking if you want to use dbmalloc for testing" >&5
10055 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
10056
10057 # Check whether --with-dbmalloc or --without-dbmalloc was given.
10058@@ -16232,7 +16563,7 @@
10059 else
10060   with_dbmalloc=
10061 fi;
10062-echo "$as_me:16235: result: ${with_dbmalloc:-no}" >&5
10063+echo "$as_me:16566: result: ${with_dbmalloc:-no}" >&5
10064 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
10065
10066 case .$with_cflags in
10067@@ -16346,23 +16677,23 @@
10068 esac
10069
10070 if test "$with_dbmalloc" = yes ; then
10071-	echo "$as_me:16349: checking for dbmalloc.h" >&5
10072+	echo "$as_me:16680: checking for dbmalloc.h" >&5
10073 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
10074 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
10075   echo $ECHO_N "(cached) $ECHO_C" >&6
10076 else
10077   cat >conftest.$ac_ext <<_ACEOF
10078-#line 16355 "configure"
10079+#line 16686 "configure"
10080 #include "confdefs.h"
10081 #include <dbmalloc.h>
10082 _ACEOF
10083-if { (eval echo "$as_me:16359: \"$ac_cpp conftest.$ac_ext\"") >&5
10084+if { (eval echo "$as_me:16690: \"$ac_cpp conftest.$ac_ext\"") >&5
10085   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
10086   ac_status=$?
10087   egrep -v '^ *\+' conftest.er1 >conftest.err
10088   rm -f conftest.er1
10089   cat conftest.err >&5
10090-  echo "$as_me:16365: \$? = $ac_status" >&5
10091+  echo "$as_me:16696: \$? = $ac_status" >&5
10092   (exit $ac_status); } >/dev/null; then
10093   if test -s conftest.err; then
10094     ac_cpp_err=$ac_c_preproc_warn_flag
10095@@ -16381,11 +16712,11 @@
10096 fi
10097 rm -f conftest.err conftest.$ac_ext
10098 fi
10099-echo "$as_me:16384: result: $ac_cv_header_dbmalloc_h" >&5
10100+echo "$as_me:16715: result: $ac_cv_header_dbmalloc_h" >&5
10101 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
10102 if test $ac_cv_header_dbmalloc_h = yes; then
10103
10104-echo "$as_me:16388: checking for debug_malloc in -ldbmalloc" >&5
10105+echo "$as_me:16719: checking for debug_malloc in -ldbmalloc" >&5
10106 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
10107 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
10108   echo $ECHO_N "(cached) $ECHO_C" >&6
10109@@ -16393,7 +16724,7 @@
10110   ac_check_lib_save_LIBS=$LIBS
10111 LIBS="-ldbmalloc  $LIBS"
10112 cat >conftest.$ac_ext <<_ACEOF
10113-#line 16396 "configure"
10114+#line 16727 "configure"
10115 #include "confdefs.h"
10116
10117 /* Override any gcc2 internal prototype to avoid an error.  */
10118@@ -16412,16 +16743,16 @@
10119 }
10120 _ACEOF
10121 rm -f conftest.$ac_objext conftest$ac_exeext
10122-if { (eval echo "$as_me:16415: \"$ac_link\"") >&5
10123+if { (eval echo "$as_me:16746: \"$ac_link\"") >&5
10124   (eval $ac_link) 2>&5
10125   ac_status=$?
10126-  echo "$as_me:16418: \$? = $ac_status" >&5
10127+  echo "$as_me:16749: \$? = $ac_status" >&5
10128   (exit $ac_status); } &&
10129          { ac_try='test -s conftest$ac_exeext'
10130-  { (eval echo "$as_me:16421: \"$ac_try\"") >&5
10131+  { (eval echo "$as_me:16752: \"$ac_try\"") >&5
10132   (eval $ac_try) 2>&5
10133   ac_status=$?
10134-  echo "$as_me:16424: \$? = $ac_status" >&5
10135+  echo "$as_me:16755: \$? = $ac_status" >&5
10136   (exit $ac_status); }; }; then
10137   ac_cv_lib_dbmalloc_debug_malloc=yes
10138 else
10139@@ -16432,7 +16763,7 @@
10140 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10141 LIBS=$ac_check_lib_save_LIBS
10142 fi
10143-echo "$as_me:16435: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
10144+echo "$as_me:16766: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
10145 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
10146 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
10147   cat >>confdefs.h <<EOF
10148@@ -16447,7 +16778,7 @@
10149
10150 fi
10151
10152-echo "$as_me:16450: checking if you want to use valgrind for testing" >&5
10153+echo "$as_me:16781: checking if you want to use valgrind for testing" >&5
10154 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
10155
10156 # Check whether --with-valgrind or --without-valgrind was given.
10157@@ -16464,7 +16795,7 @@
10158 else
10159   with_valgrind=
10160 fi;
10161-echo "$as_me:16467: result: ${with_valgrind:-no}" >&5
10162+echo "$as_me:16798: result: ${with_valgrind:-no}" >&5
10163 echo "${ECHO_T}${with_valgrind:-no}" >&6
10164
10165 case .$with_cflags in
10166@@ -16577,7 +16908,7 @@
10167 	;;
10168 esac
10169
10170-echo "$as_me:16580: checking if you want to perform memory-leak testing" >&5
10171+echo "$as_me:16911: checking if you want to perform memory-leak testing" >&5
10172 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
10173
10174 # Check whether --enable-leaks or --disable-leaks was given.
10175@@ -16587,7 +16918,7 @@
10176 else
10177   : ${with_no_leaks:=no}
10178 fi;
10179-echo "$as_me:16590: result: $with_no_leaks" >&5
10180+echo "$as_me:16921: result: $with_no_leaks" >&5
10181 echo "${ECHO_T}$with_no_leaks" >&6
10182
10183 if test "$with_no_leaks" = yes ; then
10184@@ -16639,7 +16970,7 @@
10185 	;;
10186 esac
10187
10188-echo "$as_me:16642: checking whether to add trace feature to all models" >&5
10189+echo "$as_me:16973: checking whether to add trace feature to all models" >&5
10190 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
10191
10192 # Check whether --with-trace or --without-trace was given.
10193@@ -16649,7 +16980,7 @@
10194 else
10195   cf_with_trace=$cf_all_traces
10196 fi;
10197-echo "$as_me:16652: result: $cf_with_trace" >&5
10198+echo "$as_me:16983: result: $cf_with_trace" >&5
10199 echo "${ECHO_T}$cf_with_trace" >&6
10200
10201 if test "x$cf_with_trace" = xyes ; then
10202@@ -16763,7 +17094,7 @@
10203 	ADA_TRACE=FALSE
10204 fi
10205
10206-echo "$as_me:16766: checking if we want to use GNAT projects" >&5
10207+echo "$as_me:17097: checking if we want to use GNAT projects" >&5
10208 echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6
10209
10210 # Check whether --enable-gnat-projects or --disable-gnat-projects was given.
10211@@ -16780,7 +17111,7 @@
10212 	enable_gnat_projects=yes
10213
10214 fi;
10215-echo "$as_me:16783: result: $enable_gnat_projects" >&5
10216+echo "$as_me:17114: result: $enable_gnat_projects" >&5
10217 echo "${ECHO_T}$enable_gnat_projects" >&6
10218
10219 ###	Checks for libraries.
10220@@ -16790,13 +17121,13 @@
10221 	LIBS=" -lpsapi $LIBS"
10222 	;;
10223 (*)
10224-echo "$as_me:16793: checking for gettimeofday" >&5
10225+echo "$as_me:17124: checking for gettimeofday" >&5
10226 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
10227 if test "${ac_cv_func_gettimeofday+set}" = set; then
10228   echo $ECHO_N "(cached) $ECHO_C" >&6
10229 else
10230   cat >conftest.$ac_ext <<_ACEOF
10231-#line 16799 "configure"
10232+#line 17130 "configure"
10233 #include "confdefs.h"
10234 #define gettimeofday autoconf_temporary
10235 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
10236@@ -16827,16 +17158,16 @@
10237 }
10238 _ACEOF
10239 rm -f conftest.$ac_objext conftest$ac_exeext
10240-if { (eval echo "$as_me:16830: \"$ac_link\"") >&5
10241+if { (eval echo "$as_me:17161: \"$ac_link\"") >&5
10242   (eval $ac_link) 2>&5
10243   ac_status=$?
10244-  echo "$as_me:16833: \$? = $ac_status" >&5
10245+  echo "$as_me:17164: \$? = $ac_status" >&5
10246   (exit $ac_status); } &&
10247          { ac_try='test -s conftest$ac_exeext'
10248-  { (eval echo "$as_me:16836: \"$ac_try\"") >&5
10249+  { (eval echo "$as_me:17167: \"$ac_try\"") >&5
10250   (eval $ac_try) 2>&5
10251   ac_status=$?
10252-  echo "$as_me:16839: \$? = $ac_status" >&5
10253+  echo "$as_me:17170: \$? = $ac_status" >&5
10254   (exit $ac_status); }; }; then
10255   ac_cv_func_gettimeofday=yes
10256 else
10257@@ -16846,7 +17177,7 @@
10258 fi
10259 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10260 fi
10261-echo "$as_me:16849: result: $ac_cv_func_gettimeofday" >&5
10262+echo "$as_me:17180: result: $ac_cv_func_gettimeofday" >&5
10263 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
10264 if test $ac_cv_func_gettimeofday = yes; then
10265
10266@@ -16856,7 +17187,7 @@
10267
10268 else
10269
10270-echo "$as_me:16859: checking for gettimeofday in -lbsd" >&5
10271+echo "$as_me:17190: checking for gettimeofday in -lbsd" >&5
10272 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
10273 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
10274   echo $ECHO_N "(cached) $ECHO_C" >&6
10275@@ -16864,7 +17195,7 @@
10276   ac_check_lib_save_LIBS=$LIBS
10277 LIBS="-lbsd  $LIBS"
10278 cat >conftest.$ac_ext <<_ACEOF
10279-#line 16867 "configure"
10280+#line 17198 "configure"
10281 #include "confdefs.h"
10282
10283 /* Override any gcc2 internal prototype to avoid an error.  */
10284@@ -16883,16 +17214,16 @@
10285 }
10286 _ACEOF
10287 rm -f conftest.$ac_objext conftest$ac_exeext
10288-if { (eval echo "$as_me:16886: \"$ac_link\"") >&5
10289+if { (eval echo "$as_me:17217: \"$ac_link\"") >&5
10290   (eval $ac_link) 2>&5
10291   ac_status=$?
10292-  echo "$as_me:16889: \$? = $ac_status" >&5
10293+  echo "$as_me:17220: \$? = $ac_status" >&5
10294   (exit $ac_status); } &&
10295          { ac_try='test -s conftest$ac_exeext'
10296-  { (eval echo "$as_me:16892: \"$ac_try\"") >&5
10297+  { (eval echo "$as_me:17223: \"$ac_try\"") >&5
10298   (eval $ac_try) 2>&5
10299   ac_status=$?
10300-  echo "$as_me:16895: \$? = $ac_status" >&5
10301+  echo "$as_me:17226: \$? = $ac_status" >&5
10302   (exit $ac_status); }; }; then
10303   ac_cv_lib_bsd_gettimeofday=yes
10304 else
10305@@ -16903,7 +17234,7 @@
10306 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10307 LIBS=$ac_check_lib_save_LIBS
10308 fi
10309-echo "$as_me:16906: result: $ac_cv_lib_bsd_gettimeofday" >&5
10310+echo "$as_me:17237: result: $ac_cv_lib_bsd_gettimeofday" >&5
10311 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
10312 if test $ac_cv_lib_bsd_gettimeofday = yes; then
10313
10314@@ -16933,14 +17264,14 @@
10315 	;;
10316 esac
10317
10318-echo "$as_me:16936: checking if -lm needed for math functions" >&5
10319+echo "$as_me:17267: checking if -lm needed for math functions" >&5
10320 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
10321 if test "${cf_cv_need_libm+set}" = set; then
10322   echo $ECHO_N "(cached) $ECHO_C" >&6
10323 else
10324
10325 	cat >conftest.$ac_ext <<_ACEOF
10326-#line 16943 "configure"
10327+#line 17274 "configure"
10328 #include "confdefs.h"
10329
10330 	#include <stdio.h>
10331@@ -16956,16 +17287,16 @@
10332 }
10333 _ACEOF
10334 rm -f conftest.$ac_objext conftest$ac_exeext
10335-if { (eval echo "$as_me:16959: \"$ac_link\"") >&5
10336+if { (eval echo "$as_me:17290: \"$ac_link\"") >&5
10337   (eval $ac_link) 2>&5
10338   ac_status=$?
10339-  echo "$as_me:16962: \$? = $ac_status" >&5
10340+  echo "$as_me:17293: \$? = $ac_status" >&5
10341   (exit $ac_status); } &&
10342          { ac_try='test -s conftest$ac_exeext'
10343-  { (eval echo "$as_me:16965: \"$ac_try\"") >&5
10344+  { (eval echo "$as_me:17296: \"$ac_try\"") >&5
10345   (eval $ac_try) 2>&5
10346   ac_status=$?
10347-  echo "$as_me:16968: \$? = $ac_status" >&5
10348+  echo "$as_me:17299: \$? = $ac_status" >&5
10349   (exit $ac_status); }; }; then
10350   cf_cv_need_libm=no
10351 else
10352@@ -16975,7 +17306,7 @@
10353 fi
10354 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10355 fi
10356-echo "$as_me:16978: result: $cf_cv_need_libm" >&5
10357+echo "$as_me:17309: result: $cf_cv_need_libm" >&5
10358 echo "${ECHO_T}$cf_cv_need_libm" >&6
10359 if test "$cf_cv_need_libm" = yes
10360 then
10361@@ -16983,13 +17314,13 @@
10362 fi
10363
10364 ###	Checks for header files.
10365-echo "$as_me:16986: checking for ANSI C header files" >&5
10366+echo "$as_me:17317: checking for ANSI C header files" >&5
10367 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
10368 if test "${ac_cv_header_stdc+set}" = set; then
10369   echo $ECHO_N "(cached) $ECHO_C" >&6
10370 else
10371   cat >conftest.$ac_ext <<_ACEOF
10372-#line 16992 "configure"
10373+#line 17323 "configure"
10374 #include "confdefs.h"
10375 #include <stdlib.h>
10376 #include <stdarg.h>
10377@@ -16997,13 +17328,13 @@
10378 #include <float.h>
10379
10380 _ACEOF
10381-if { (eval echo "$as_me:17000: \"$ac_cpp conftest.$ac_ext\"") >&5
10382+if { (eval echo "$as_me:17331: \"$ac_cpp conftest.$ac_ext\"") >&5
10383   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
10384   ac_status=$?
10385   egrep -v '^ *\+' conftest.er1 >conftest.err
10386   rm -f conftest.er1
10387   cat conftest.err >&5
10388-  echo "$as_me:17006: \$? = $ac_status" >&5
10389+  echo "$as_me:17337: \$? = $ac_status" >&5
10390   (exit $ac_status); } >/dev/null; then
10391   if test -s conftest.err; then
10392     ac_cpp_err=$ac_c_preproc_warn_flag
10393@@ -17025,7 +17356,7 @@
10394 if test $ac_cv_header_stdc = yes; then
10395   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
10396   cat >conftest.$ac_ext <<_ACEOF
10397-#line 17028 "configure"
10398+#line 17359 "configure"
10399 #include "confdefs.h"
10400 #include <string.h>
10401
10402@@ -17043,7 +17374,7 @@
10403 if test $ac_cv_header_stdc = yes; then
10404   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
10405   cat >conftest.$ac_ext <<_ACEOF
10406-#line 17046 "configure"
10407+#line 17377 "configure"
10408 #include "confdefs.h"
10409 #include <stdlib.h>
10410
10411@@ -17064,7 +17395,7 @@
10412   :
10413 else
10414   cat >conftest.$ac_ext <<_ACEOF
10415-#line 17067 "configure"
10416+#line 17398 "configure"
10417 #include "confdefs.h"
10418 #include <ctype.h>
10419 #if ((' ' & 0x0FF) == 0x020)
10420@@ -17090,15 +17421,15 @@
10421 }
10422 _ACEOF
10423 rm -f conftest$ac_exeext
10424-if { (eval echo "$as_me:17093: \"$ac_link\"") >&5
10425+if { (eval echo "$as_me:17424: \"$ac_link\"") >&5
10426   (eval $ac_link) 2>&5
10427   ac_status=$?
10428-  echo "$as_me:17096: \$? = $ac_status" >&5
10429+  echo "$as_me:17427: \$? = $ac_status" >&5
10430   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
10431-  { (eval echo "$as_me:17098: \"$ac_try\"") >&5
10432+  { (eval echo "$as_me:17429: \"$ac_try\"") >&5
10433   (eval $ac_try) 2>&5
10434   ac_status=$?
10435-  echo "$as_me:17101: \$? = $ac_status" >&5
10436+  echo "$as_me:17432: \$? = $ac_status" >&5
10437   (exit $ac_status); }; }; then
10438   :
10439 else
10440@@ -17111,7 +17442,7 @@
10441 fi
10442 fi
10443 fi
10444-echo "$as_me:17114: result: $ac_cv_header_stdc" >&5
10445+echo "$as_me:17445: result: $ac_cv_header_stdc" >&5
10446 echo "${ECHO_T}$ac_cv_header_stdc" >&6
10447 if test $ac_cv_header_stdc = yes; then
10448
10449@@ -17124,13 +17455,13 @@
10450 ac_header_dirent=no
10451 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
10452   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
10453-echo "$as_me:17127: checking for $ac_hdr that defines DIR" >&5
10454+echo "$as_me:17458: checking for $ac_hdr that defines DIR" >&5
10455 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
10456 if eval "test \"\${$as_ac_Header+set}\" = set"; then
10457   echo $ECHO_N "(cached) $ECHO_C" >&6
10458 else
10459   cat >conftest.$ac_ext <<_ACEOF
10460-#line 17133 "configure"
10461+#line 17464 "configure"
10462 #include "confdefs.h"
10463 #include <sys/types.h>
10464 #include <$ac_hdr>
10465@@ -17145,16 +17476,16 @@
10466 }
10467 _ACEOF
10468 rm -f conftest.$ac_objext
10469-if { (eval echo "$as_me:17148: \"$ac_compile\"") >&5
10470+if { (eval echo "$as_me:17479: \"$ac_compile\"") >&5
10471   (eval $ac_compile) 2>&5
10472   ac_status=$?
10473-  echo "$as_me:17151: \$? = $ac_status" >&5
10474+  echo "$as_me:17482: \$? = $ac_status" >&5
10475   (exit $ac_status); } &&
10476          { ac_try='test -s conftest.$ac_objext'
10477-  { (eval echo "$as_me:17154: \"$ac_try\"") >&5
10478+  { (eval echo "$as_me:17485: \"$ac_try\"") >&5
10479   (eval $ac_try) 2>&5
10480   ac_status=$?
10481-  echo "$as_me:17157: \$? = $ac_status" >&5
10482+  echo "$as_me:17488: \$? = $ac_status" >&5
10483   (exit $ac_status); }; }; then
10484   eval "$as_ac_Header=yes"
10485 else
10486@@ -17164,7 +17495,7 @@
10487 fi
10488 rm -f conftest.$ac_objext conftest.$ac_ext
10489 fi
10490-echo "$as_me:17167: result: `eval echo '${'$as_ac_Header'}'`" >&5
10491+echo "$as_me:17498: result: `eval echo '${'$as_ac_Header'}'`" >&5
10492 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
10493 if test `eval echo '${'$as_ac_Header'}'` = yes; then
10494   cat >>confdefs.h <<EOF
10495@@ -17177,7 +17508,7 @@
10496 done
10497 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
10498 if test $ac_header_dirent = dirent.h; then
10499-  echo "$as_me:17180: checking for opendir in -ldir" >&5
10500+  echo "$as_me:17511: checking for opendir in -ldir" >&5
10501 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
10502 if test "${ac_cv_lib_dir_opendir+set}" = set; then
10503   echo $ECHO_N "(cached) $ECHO_C" >&6
10504@@ -17185,7 +17516,7 @@
10505   ac_check_lib_save_LIBS=$LIBS
10506 LIBS="-ldir  $LIBS"
10507 cat >conftest.$ac_ext <<_ACEOF
10508-#line 17188 "configure"
10509+#line 17519 "configure"
10510 #include "confdefs.h"
10511
10512 /* Override any gcc2 internal prototype to avoid an error.  */
10513@@ -17204,16 +17535,16 @@
10514 }
10515 _ACEOF
10516 rm -f conftest.$ac_objext conftest$ac_exeext
10517-if { (eval echo "$as_me:17207: \"$ac_link\"") >&5
10518+if { (eval echo "$as_me:17538: \"$ac_link\"") >&5
10519   (eval $ac_link) 2>&5
10520   ac_status=$?
10521-  echo "$as_me:17210: \$? = $ac_status" >&5
10522+  echo "$as_me:17541: \$? = $ac_status" >&5
10523   (exit $ac_status); } &&
10524          { ac_try='test -s conftest$ac_exeext'
10525-  { (eval echo "$as_me:17213: \"$ac_try\"") >&5
10526+  { (eval echo "$as_me:17544: \"$ac_try\"") >&5
10527   (eval $ac_try) 2>&5
10528   ac_status=$?
10529-  echo "$as_me:17216: \$? = $ac_status" >&5
10530+  echo "$as_me:17547: \$? = $ac_status" >&5
10531   (exit $ac_status); }; }; then
10532   ac_cv_lib_dir_opendir=yes
10533 else
10534@@ -17224,14 +17555,14 @@
10535 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10536 LIBS=$ac_check_lib_save_LIBS
10537 fi
10538-echo "$as_me:17227: result: $ac_cv_lib_dir_opendir" >&5
10539+echo "$as_me:17558: result: $ac_cv_lib_dir_opendir" >&5
10540 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
10541 if test $ac_cv_lib_dir_opendir = yes; then
10542   LIBS="$LIBS -ldir"
10543 fi
10544
10545 else
10546-  echo "$as_me:17234: checking for opendir in -lx" >&5
10547+  echo "$as_me:17565: checking for opendir in -lx" >&5
10548 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
10549 if test "${ac_cv_lib_x_opendir+set}" = set; then
10550   echo $ECHO_N "(cached) $ECHO_C" >&6
10551@@ -17239,7 +17570,7 @@
10552   ac_check_lib_save_LIBS=$LIBS
10553 LIBS="-lx  $LIBS"
10554 cat >conftest.$ac_ext <<_ACEOF
10555-#line 17242 "configure"
10556+#line 17573 "configure"
10557 #include "confdefs.h"
10558
10559 /* Override any gcc2 internal prototype to avoid an error.  */
10560@@ -17258,16 +17589,16 @@
10561 }
10562 _ACEOF
10563 rm -f conftest.$ac_objext conftest$ac_exeext
10564-if { (eval echo "$as_me:17261: \"$ac_link\"") >&5
10565+if { (eval echo "$as_me:17592: \"$ac_link\"") >&5
10566   (eval $ac_link) 2>&5
10567   ac_status=$?
10568-  echo "$as_me:17264: \$? = $ac_status" >&5
10569+  echo "$as_me:17595: \$? = $ac_status" >&5
10570   (exit $ac_status); } &&
10571          { ac_try='test -s conftest$ac_exeext'
10572-  { (eval echo "$as_me:17267: \"$ac_try\"") >&5
10573+  { (eval echo "$as_me:17598: \"$ac_try\"") >&5
10574   (eval $ac_try) 2>&5
10575   ac_status=$?
10576-  echo "$as_me:17270: \$? = $ac_status" >&5
10577+  echo "$as_me:17601: \$? = $ac_status" >&5
10578   (exit $ac_status); }; }; then
10579   ac_cv_lib_x_opendir=yes
10580 else
10581@@ -17278,7 +17609,7 @@
10582 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10583 LIBS=$ac_check_lib_save_LIBS
10584 fi
10585-echo "$as_me:17281: result: $ac_cv_lib_x_opendir" >&5
10586+echo "$as_me:17612: result: $ac_cv_lib_x_opendir" >&5
10587 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
10588 if test $ac_cv_lib_x_opendir = yes; then
10589   LIBS="$LIBS -lx"
10590@@ -17286,13 +17617,13 @@
10591
10592 fi
10593
10594-echo "$as_me:17289: checking whether time.h and sys/time.h may both be included" >&5
10595+echo "$as_me:17620: checking whether time.h and sys/time.h may both be included" >&5
10596 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
10597 if test "${ac_cv_header_time+set}" = set; then
10598   echo $ECHO_N "(cached) $ECHO_C" >&6
10599 else
10600   cat >conftest.$ac_ext <<_ACEOF
10601-#line 17295 "configure"
10602+#line 17626 "configure"
10603 #include "confdefs.h"
10604 #include <sys/types.h>
10605 #include <sys/time.h>
10606@@ -17308,16 +17639,16 @@
10607 }
10608 _ACEOF
10609 rm -f conftest.$ac_objext
10610-if { (eval echo "$as_me:17311: \"$ac_compile\"") >&5
10611+if { (eval echo "$as_me:17642: \"$ac_compile\"") >&5
10612   (eval $ac_compile) 2>&5
10613   ac_status=$?
10614-  echo "$as_me:17314: \$? = $ac_status" >&5
10615+  echo "$as_me:17645: \$? = $ac_status" >&5
10616   (exit $ac_status); } &&
10617          { ac_try='test -s conftest.$ac_objext'
10618-  { (eval echo "$as_me:17317: \"$ac_try\"") >&5
10619+  { (eval echo "$as_me:17648: \"$ac_try\"") >&5
10620   (eval $ac_try) 2>&5
10621   ac_status=$?
10622-  echo "$as_me:17320: \$? = $ac_status" >&5
10623+  echo "$as_me:17651: \$? = $ac_status" >&5
10624   (exit $ac_status); }; }; then
10625   ac_cv_header_time=yes
10626 else
10627@@ -17327,7 +17658,7 @@
10628 fi
10629 rm -f conftest.$ac_objext conftest.$ac_ext
10630 fi
10631-echo "$as_me:17330: result: $ac_cv_header_time" >&5
10632+echo "$as_me:17661: result: $ac_cv_header_time" >&5
10633 echo "${ECHO_T}$ac_cv_header_time" >&6
10634 if test $ac_cv_header_time = yes; then
10635
10636@@ -17346,13 +17677,13 @@
10637 	;;
10638 esac
10639
10640-echo "$as_me:17349: checking for regcomp" >&5
10641+echo "$as_me:17680: checking for regcomp" >&5
10642 echo $ECHO_N "checking for regcomp... $ECHO_C" >&6
10643 if test "${ac_cv_func_regcomp+set}" = set; then
10644   echo $ECHO_N "(cached) $ECHO_C" >&6
10645 else
10646   cat >conftest.$ac_ext <<_ACEOF
10647-#line 17355 "configure"
10648+#line 17686 "configure"
10649 #include "confdefs.h"
10650 #define regcomp autoconf_temporary
10651 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
10652@@ -17383,16 +17714,16 @@
10653 }
10654 _ACEOF
10655 rm -f conftest.$ac_objext conftest$ac_exeext
10656-if { (eval echo "$as_me:17386: \"$ac_link\"") >&5
10657+if { (eval echo "$as_me:17717: \"$ac_link\"") >&5
10658   (eval $ac_link) 2>&5
10659   ac_status=$?
10660-  echo "$as_me:17389: \$? = $ac_status" >&5
10661+  echo "$as_me:17720: \$? = $ac_status" >&5
10662   (exit $ac_status); } &&
10663          { ac_try='test -s conftest$ac_exeext'
10664-  { (eval echo "$as_me:17392: \"$ac_try\"") >&5
10665+  { (eval echo "$as_me:17723: \"$ac_try\"") >&5
10666   (eval $ac_try) 2>&5
10667   ac_status=$?
10668-  echo "$as_me:17395: \$? = $ac_status" >&5
10669+  echo "$as_me:17726: \$? = $ac_status" >&5
10670   (exit $ac_status); }; }; then
10671   ac_cv_func_regcomp=yes
10672 else
10673@@ -17402,7 +17733,7 @@
10674 fi
10675 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10676 fi
10677-echo "$as_me:17405: result: $ac_cv_func_regcomp" >&5
10678+echo "$as_me:17736: result: $ac_cv_func_regcomp" >&5
10679 echo "${ECHO_T}$ac_cv_func_regcomp" >&6
10680 if test $ac_cv_func_regcomp = yes; then
10681   cf_regex_func=regcomp
10682@@ -17411,7 +17742,7 @@
10683 	for cf_regex_lib in $cf_regex_libs
10684 	do
10685 		as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh`
10686-echo "$as_me:17414: checking for regcomp in -l$cf_regex_lib" >&5
10687+echo "$as_me:17745: checking for regcomp in -l$cf_regex_lib" >&5
10688 echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6
10689 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
10690   echo $ECHO_N "(cached) $ECHO_C" >&6
10691@@ -17419,7 +17750,7 @@
10692   ac_check_lib_save_LIBS=$LIBS
10693 LIBS="-l$cf_regex_lib  $LIBS"
10694 cat >conftest.$ac_ext <<_ACEOF
10695-#line 17422 "configure"
10696+#line 17753 "configure"
10697 #include "confdefs.h"
10698
10699 /* Override any gcc2 internal prototype to avoid an error.  */
10700@@ -17438,16 +17769,16 @@
10701 }
10702 _ACEOF
10703 rm -f conftest.$ac_objext conftest$ac_exeext
10704-if { (eval echo "$as_me:17441: \"$ac_link\"") >&5
10705+if { (eval echo "$as_me:17772: \"$ac_link\"") >&5
10706   (eval $ac_link) 2>&5
10707   ac_status=$?
10708-  echo "$as_me:17444: \$? = $ac_status" >&5
10709+  echo "$as_me:17775: \$? = $ac_status" >&5
10710   (exit $ac_status); } &&
10711          { ac_try='test -s conftest$ac_exeext'
10712-  { (eval echo "$as_me:17447: \"$ac_try\"") >&5
10713+  { (eval echo "$as_me:17778: \"$ac_try\"") >&5
10714   (eval $ac_try) 2>&5
10715   ac_status=$?
10716-  echo "$as_me:17450: \$? = $ac_status" >&5
10717+  echo "$as_me:17781: \$? = $ac_status" >&5
10718   (exit $ac_status); }; }; then
10719   eval "$as_ac_Lib=yes"
10720 else
10721@@ -17458,7 +17789,7 @@
10722 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10723 LIBS=$ac_check_lib_save_LIBS
10724 fi
10725-echo "$as_me:17461: result: `eval echo '${'$as_ac_Lib'}'`" >&5
10726+echo "$as_me:17792: result: `eval echo '${'$as_ac_Lib'}'`" >&5
10727 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
10728 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
10729
10730@@ -17487,13 +17818,13 @@
10731 fi
10732
10733 if test "$cf_regex_func" = no ; then
10734-	echo "$as_me:17490: checking for compile" >&5
10735+	echo "$as_me:17821: checking for compile" >&5
10736 echo $ECHO_N "checking for compile... $ECHO_C" >&6
10737 if test "${ac_cv_func_compile+set}" = set; then
10738   echo $ECHO_N "(cached) $ECHO_C" >&6
10739 else
10740   cat >conftest.$ac_ext <<_ACEOF
10741-#line 17496 "configure"
10742+#line 17827 "configure"
10743 #include "confdefs.h"
10744 #define compile autoconf_temporary
10745 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
10746@@ -17524,16 +17855,16 @@
10747 }
10748 _ACEOF
10749 rm -f conftest.$ac_objext conftest$ac_exeext
10750-if { (eval echo "$as_me:17527: \"$ac_link\"") >&5
10751+if { (eval echo "$as_me:17858: \"$ac_link\"") >&5
10752   (eval $ac_link) 2>&5
10753   ac_status=$?
10754-  echo "$as_me:17530: \$? = $ac_status" >&5
10755+  echo "$as_me:17861: \$? = $ac_status" >&5
10756   (exit $ac_status); } &&
10757          { ac_try='test -s conftest$ac_exeext'
10758-  { (eval echo "$as_me:17533: \"$ac_try\"") >&5
10759+  { (eval echo "$as_me:17864: \"$ac_try\"") >&5
10760   (eval $ac_try) 2>&5
10761   ac_status=$?
10762-  echo "$as_me:17536: \$? = $ac_status" >&5
10763+  echo "$as_me:17867: \$? = $ac_status" >&5
10764   (exit $ac_status); }; }; then
10765   ac_cv_func_compile=yes
10766 else
10767@@ -17543,13 +17874,13 @@
10768 fi
10769 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10770 fi
10771-echo "$as_me:17546: result: $ac_cv_func_compile" >&5
10772+echo "$as_me:17877: result: $ac_cv_func_compile" >&5
10773 echo "${ECHO_T}$ac_cv_func_compile" >&6
10774 if test $ac_cv_func_compile = yes; then
10775   cf_regex_func=compile
10776 else
10777
10778-		echo "$as_me:17552: checking for compile in -lgen" >&5
10779+		echo "$as_me:17883: checking for compile in -lgen" >&5
10780 echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6
10781 if test "${ac_cv_lib_gen_compile+set}" = set; then
10782   echo $ECHO_N "(cached) $ECHO_C" >&6
10783@@ -17557,7 +17888,7 @@
10784   ac_check_lib_save_LIBS=$LIBS
10785 LIBS="-lgen  $LIBS"
10786 cat >conftest.$ac_ext <<_ACEOF
10787-#line 17560 "configure"
10788+#line 17891 "configure"
10789 #include "confdefs.h"
10790
10791 /* Override any gcc2 internal prototype to avoid an error.  */
10792@@ -17576,16 +17907,16 @@
10793 }
10794 _ACEOF
10795 rm -f conftest.$ac_objext conftest$ac_exeext
10796-if { (eval echo "$as_me:17579: \"$ac_link\"") >&5
10797+if { (eval echo "$as_me:17910: \"$ac_link\"") >&5
10798   (eval $ac_link) 2>&5
10799   ac_status=$?
10800-  echo "$as_me:17582: \$? = $ac_status" >&5
10801+  echo "$as_me:17913: \$? = $ac_status" >&5
10802   (exit $ac_status); } &&
10803          { ac_try='test -s conftest$ac_exeext'
10804-  { (eval echo "$as_me:17585: \"$ac_try\"") >&5
10805+  { (eval echo "$as_me:17916: \"$ac_try\"") >&5
10806   (eval $ac_try) 2>&5
10807   ac_status=$?
10808-  echo "$as_me:17588: \$? = $ac_status" >&5
10809+  echo "$as_me:17919: \$? = $ac_status" >&5
10810   (exit $ac_status); }; }; then
10811   ac_cv_lib_gen_compile=yes
10812 else
10813@@ -17596,7 +17927,7 @@
10814 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10815 LIBS=$ac_check_lib_save_LIBS
10816 fi
10817-echo "$as_me:17599: result: $ac_cv_lib_gen_compile" >&5
10818+echo "$as_me:17930: result: $ac_cv_lib_gen_compile" >&5
10819 echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6
10820 if test $ac_cv_lib_gen_compile = yes; then
10821
10822@@ -17624,11 +17955,11 @@
10823 fi
10824
10825 if test "$cf_regex_func" = no ; then
10826-	{ echo "$as_me:17627: WARNING: cannot find regular expression library" >&5
10827+	{ echo "$as_me:17958: WARNING: cannot find regular expression library" >&5
10828 echo "$as_me: WARNING: cannot find regular expression library" >&2;}
10829 fi
10830
10831-echo "$as_me:17631: checking for regular-expression headers" >&5
10832+echo "$as_me:17962: checking for regular-expression headers" >&5
10833 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
10834 if test "${cf_cv_regex_hdrs+set}" = set; then
10835   echo $ECHO_N "(cached) $ECHO_C" >&6
10836@@ -17640,7 +17971,7 @@
10837 	for cf_regex_hdr in regexp.h regexpr.h
10838 	do
10839 		cat >conftest.$ac_ext <<_ACEOF
10840-#line 17643 "configure"
10841+#line 17974 "configure"
10842 #include "confdefs.h"
10843 #include <$cf_regex_hdr>
10844 int
10845@@ -17655,16 +17986,16 @@
10846 }
10847 _ACEOF
10848 rm -f conftest.$ac_objext conftest$ac_exeext
10849-if { (eval echo "$as_me:17658: \"$ac_link\"") >&5
10850+if { (eval echo "$as_me:17989: \"$ac_link\"") >&5
10851   (eval $ac_link) 2>&5
10852   ac_status=$?
10853-  echo "$as_me:17661: \$? = $ac_status" >&5
10854+  echo "$as_me:17992: \$? = $ac_status" >&5
10855   (exit $ac_status); } &&
10856          { ac_try='test -s conftest$ac_exeext'
10857-  { (eval echo "$as_me:17664: \"$ac_try\"") >&5
10858+  { (eval echo "$as_me:17995: \"$ac_try\"") >&5
10859   (eval $ac_try) 2>&5
10860   ac_status=$?
10861-  echo "$as_me:17667: \$? = $ac_status" >&5
10862+  echo "$as_me:17998: \$? = $ac_status" >&5
10863   (exit $ac_status); }; }; then
10864
10865 			cf_cv_regex_hdrs=$cf_regex_hdr
10866@@ -17681,7 +18012,7 @@
10867 	for cf_regex_hdr in regex.h
10868 	do
10869 		cat >conftest.$ac_ext <<_ACEOF
10870-#line 17684 "configure"
10871+#line 18015 "configure"
10872 #include "confdefs.h"
10873 #include <sys/types.h>
10874 #include <$cf_regex_hdr>
10875@@ -17699,16 +18030,16 @@
10876 }
10877 _ACEOF
10878 rm -f conftest.$ac_objext conftest$ac_exeext
10879-if { (eval echo "$as_me:17702: \"$ac_link\"") >&5
10880+if { (eval echo "$as_me:18033: \"$ac_link\"") >&5
10881   (eval $ac_link) 2>&5
10882   ac_status=$?
10883-  echo "$as_me:17705: \$? = $ac_status" >&5
10884+  echo "$as_me:18036: \$? = $ac_status" >&5
10885   (exit $ac_status); } &&
10886          { ac_try='test -s conftest$ac_exeext'
10887-  { (eval echo "$as_me:17708: \"$ac_try\"") >&5
10888+  { (eval echo "$as_me:18039: \"$ac_try\"") >&5
10889   (eval $ac_try) 2>&5
10890   ac_status=$?
10891-  echo "$as_me:17711: \$? = $ac_status" >&5
10892+  echo "$as_me:18042: \$? = $ac_status" >&5
10893   (exit $ac_status); }; }; then
10894
10895 			cf_cv_regex_hdrs=$cf_regex_hdr
10896@@ -17724,11 +18055,11 @@
10897 esac
10898
10899 fi
10900-echo "$as_me:17727: result: $cf_cv_regex_hdrs" >&5
10901+echo "$as_me:18058: result: $cf_cv_regex_hdrs" >&5
10902 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6
10903
10904 case $cf_cv_regex_hdrs in
10905-	(no)		{ echo "$as_me:17731: WARNING: no regular expression header found" >&5
10906+	(no)		{ echo "$as_me:18062: WARNING: no regular expression header found" >&5
10907 echo "$as_me: WARNING: no regular expression header found" >&2;} ;;
10908 	(regex.h)
10909 cat >>confdefs.h <<\EOF
10910@@ -17767,23 +18098,23 @@
10911
10912 do
10913 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
10914-echo "$as_me:17770: checking for $ac_header" >&5
10915+echo "$as_me:18101: checking for $ac_header" >&5
10916 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
10917 if eval "test \"\${$as_ac_Header+set}\" = set"; then
10918   echo $ECHO_N "(cached) $ECHO_C" >&6
10919 else
10920   cat >conftest.$ac_ext <<_ACEOF
10921-#line 17776 "configure"
10922+#line 18107 "configure"
10923 #include "confdefs.h"
10924 #include <$ac_header>
10925 _ACEOF
10926-if { (eval echo "$as_me:17780: \"$ac_cpp conftest.$ac_ext\"") >&5
10927+if { (eval echo "$as_me:18111: \"$ac_cpp conftest.$ac_ext\"") >&5
10928   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
10929   ac_status=$?
10930   egrep -v '^ *\+' conftest.er1 >conftest.err
10931   rm -f conftest.er1
10932   cat conftest.err >&5
10933-  echo "$as_me:17786: \$? = $ac_status" >&5
10934+  echo "$as_me:18117: \$? = $ac_status" >&5
10935   (exit $ac_status); } >/dev/null; then
10936   if test -s conftest.err; then
10937     ac_cpp_err=$ac_c_preproc_warn_flag
10938@@ -17802,7 +18133,7 @@
10939 fi
10940 rm -f conftest.err conftest.$ac_ext
10941 fi
10942-echo "$as_me:17805: result: `eval echo '${'$as_ac_Header'}'`" >&5
10943+echo "$as_me:18136: result: `eval echo '${'$as_ac_Header'}'`" >&5
10944 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
10945 if test `eval echo '${'$as_ac_Header'}'` = yes; then
10946   cat >>confdefs.h <<EOF
10947@@ -17815,23 +18146,23 @@
10948 for ac_header in unistd.h getopt.h
10949 do
10950 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
10951-echo "$as_me:17818: checking for $ac_header" >&5
10952+echo "$as_me:18149: checking for $ac_header" >&5
10953 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
10954 if eval "test \"\${$as_ac_Header+set}\" = set"; then
10955   echo $ECHO_N "(cached) $ECHO_C" >&6
10956 else
10957   cat >conftest.$ac_ext <<_ACEOF
10958-#line 17824 "configure"
10959+#line 18155 "configure"
10960 #include "confdefs.h"
10961 #include <$ac_header>
10962 _ACEOF
10963-if { (eval echo "$as_me:17828: \"$ac_cpp conftest.$ac_ext\"") >&5
10964+if { (eval echo "$as_me:18159: \"$ac_cpp conftest.$ac_ext\"") >&5
10965   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
10966   ac_status=$?
10967   egrep -v '^ *\+' conftest.er1 >conftest.err
10968   rm -f conftest.er1
10969   cat conftest.err >&5
10970-  echo "$as_me:17834: \$? = $ac_status" >&5
10971+  echo "$as_me:18165: \$? = $ac_status" >&5
10972   (exit $ac_status); } >/dev/null; then
10973   if test -s conftest.err; then
10974     ac_cpp_err=$ac_c_preproc_warn_flag
10975@@ -17850,7 +18181,7 @@
10976 fi
10977 rm -f conftest.err conftest.$ac_ext
10978 fi
10979-echo "$as_me:17853: result: `eval echo '${'$as_ac_Header'}'`" >&5
10980+echo "$as_me:18184: result: `eval echo '${'$as_ac_Header'}'`" >&5
10981 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
10982 if test `eval echo '${'$as_ac_Header'}'` = yes; then
10983   cat >>confdefs.h <<EOF
10984@@ -17860,7 +18191,7 @@
10985 fi
10986 done
10987
10988-echo "$as_me:17863: checking for header declaring getopt variables" >&5
10989+echo "$as_me:18194: checking for header declaring getopt variables" >&5
10990 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
10991 if test "${cf_cv_getopt_header+set}" = set; then
10992   echo $ECHO_N "(cached) $ECHO_C" >&6
10993@@ -17870,7 +18201,7 @@
10994 for cf_header in stdio.h stdlib.h unistd.h getopt.h
10995 do
10996 cat >conftest.$ac_ext <<_ACEOF
10997-#line 17873 "configure"
10998+#line 18204 "configure"
10999 #include "confdefs.h"
11000
11001 #include <$cf_header>
11002@@ -17883,16 +18214,16 @@
11003 }
11004 _ACEOF
11005 rm -f conftest.$ac_objext
11006-if { (eval echo "$as_me:17886: \"$ac_compile\"") >&5
11007+if { (eval echo "$as_me:18217: \"$ac_compile\"") >&5
11008   (eval $ac_compile) 2>&5
11009   ac_status=$?
11010-  echo "$as_me:17889: \$? = $ac_status" >&5
11011+  echo "$as_me:18220: \$? = $ac_status" >&5
11012   (exit $ac_status); } &&
11013          { ac_try='test -s conftest.$ac_objext'
11014-  { (eval echo "$as_me:17892: \"$ac_try\"") >&5
11015+  { (eval echo "$as_me:18223: \"$ac_try\"") >&5
11016   (eval $ac_try) 2>&5
11017   ac_status=$?
11018-  echo "$as_me:17895: \$? = $ac_status" >&5
11019+  echo "$as_me:18226: \$? = $ac_status" >&5
11020   (exit $ac_status); }; }; then
11021   cf_cv_getopt_header=$cf_header
11022  break
11023@@ -17904,7 +18235,7 @@
11024 done
11025
11026 fi
11027-echo "$as_me:17907: result: $cf_cv_getopt_header" >&5
11028+echo "$as_me:18238: result: $cf_cv_getopt_header" >&5
11029 echo "${ECHO_T}$cf_cv_getopt_header" >&6
11030 if test $cf_cv_getopt_header != none ; then
11031
11032@@ -17921,14 +18252,14 @@
11033
11034 fi
11035
11036-echo "$as_me:17924: checking if external environ is declared" >&5
11037+echo "$as_me:18255: checking if external environ is declared" >&5
11038 echo $ECHO_N "checking if external environ is declared... $ECHO_C" >&6
11039 if test "${cf_cv_dcl_environ+set}" = set; then
11040   echo $ECHO_N "(cached) $ECHO_C" >&6
11041 else
11042
11043     cat >conftest.$ac_ext <<_ACEOF
11044-#line 17931 "configure"
11045+#line 18262 "configure"
11046 #include "confdefs.h"
11047
11048 #ifdef HAVE_STDLIB_H
11049@@ -17944,16 +18275,16 @@
11050 }
11051 _ACEOF
11052 rm -f conftest.$ac_objext
11053-if { (eval echo "$as_me:17947: \"$ac_compile\"") >&5
11054+if { (eval echo "$as_me:18278: \"$ac_compile\"") >&5
11055   (eval $ac_compile) 2>&5
11056   ac_status=$?
11057-  echo "$as_me:17950: \$? = $ac_status" >&5
11058+  echo "$as_me:18281: \$? = $ac_status" >&5
11059   (exit $ac_status); } &&
11060          { ac_try='test -s conftest.$ac_objext'
11061-  { (eval echo "$as_me:17953: \"$ac_try\"") >&5
11062+  { (eval echo "$as_me:18284: \"$ac_try\"") >&5
11063   (eval $ac_try) 2>&5
11064   ac_status=$?
11065-  echo "$as_me:17956: \$? = $ac_status" >&5
11066+  echo "$as_me:18287: \$? = $ac_status" >&5
11067   (exit $ac_status); }; }; then
11068   cf_cv_dcl_environ=yes
11069 else
11070@@ -17964,7 +18295,7 @@
11071 rm -f conftest.$ac_objext conftest.$ac_ext
11072
11073 fi
11074-echo "$as_me:17967: result: $cf_cv_dcl_environ" >&5
11075+echo "$as_me:18298: result: $cf_cv_dcl_environ" >&5
11076 echo "${ECHO_T}$cf_cv_dcl_environ" >&6
11077
11078 if test "$cf_cv_dcl_environ" = no ; then
11079@@ -17979,14 +18310,14 @@
11080
11081 # It's possible (for near-UNIX clones) that the data doesn't exist
11082
11083-echo "$as_me:17982: checking if external environ exists" >&5
11084+echo "$as_me:18313: checking if external environ exists" >&5
11085 echo $ECHO_N "checking if external environ exists... $ECHO_C" >&6
11086 if test "${cf_cv_have_environ+set}" = set; then
11087   echo $ECHO_N "(cached) $ECHO_C" >&6
11088 else
11089
11090 	cat >conftest.$ac_ext <<_ACEOF
11091-#line 17989 "configure"
11092+#line 18320 "configure"
11093 #include "confdefs.h"
11094
11095 #undef environ
11096@@ -18001,16 +18332,16 @@
11097 }
11098 _ACEOF
11099 rm -f conftest.$ac_objext conftest$ac_exeext
11100-if { (eval echo "$as_me:18004: \"$ac_link\"") >&5
11101+if { (eval echo "$as_me:18335: \"$ac_link\"") >&5
11102   (eval $ac_link) 2>&5
11103   ac_status=$?
11104-  echo "$as_me:18007: \$? = $ac_status" >&5
11105+  echo "$as_me:18338: \$? = $ac_status" >&5
11106   (exit $ac_status); } &&
11107          { ac_try='test -s conftest$ac_exeext'
11108-  { (eval echo "$as_me:18010: \"$ac_try\"") >&5
11109+  { (eval echo "$as_me:18341: \"$ac_try\"") >&5
11110   (eval $ac_try) 2>&5
11111   ac_status=$?
11112-  echo "$as_me:18013: \$? = $ac_status" >&5
11113+  echo "$as_me:18344: \$? = $ac_status" >&5
11114   (exit $ac_status); }; }; then
11115   cf_cv_have_environ=yes
11116 else
11117@@ -18021,7 +18352,7 @@
11118 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11119
11120 fi
11121-echo "$as_me:18024: result: $cf_cv_have_environ" >&5
11122+echo "$as_me:18355: result: $cf_cv_have_environ" >&5
11123 echo "${ECHO_T}$cf_cv_have_environ" >&6
11124
11125 if test "$cf_cv_have_environ" = yes ; then
11126@@ -18034,13 +18365,13 @@
11127
11128 fi
11129
11130-echo "$as_me:18037: checking for getenv" >&5
11131+echo "$as_me:18368: checking for getenv" >&5
11132 echo $ECHO_N "checking for getenv... $ECHO_C" >&6
11133 if test "${ac_cv_func_getenv+set}" = set; then
11134   echo $ECHO_N "(cached) $ECHO_C" >&6
11135 else
11136   cat >conftest.$ac_ext <<_ACEOF
11137-#line 18043 "configure"
11138+#line 18374 "configure"
11139 #include "confdefs.h"
11140 #define getenv autoconf_temporary
11141 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
11142@@ -18071,16 +18402,16 @@
11143 }
11144 _ACEOF
11145 rm -f conftest.$ac_objext conftest$ac_exeext
11146-if { (eval echo "$as_me:18074: \"$ac_link\"") >&5
11147+if { (eval echo "$as_me:18405: \"$ac_link\"") >&5
11148   (eval $ac_link) 2>&5
11149   ac_status=$?
11150-  echo "$as_me:18077: \$? = $ac_status" >&5
11151+  echo "$as_me:18408: \$? = $ac_status" >&5
11152   (exit $ac_status); } &&
11153          { ac_try='test -s conftest$ac_exeext'
11154-  { (eval echo "$as_me:18080: \"$ac_try\"") >&5
11155+  { (eval echo "$as_me:18411: \"$ac_try\"") >&5
11156   (eval $ac_try) 2>&5
11157   ac_status=$?
11158-  echo "$as_me:18083: \$? = $ac_status" >&5
11159+  echo "$as_me:18414: \$? = $ac_status" >&5
11160   (exit $ac_status); }; }; then
11161   ac_cv_func_getenv=yes
11162 else
11163@@ -18090,19 +18421,19 @@
11164 fi
11165 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11166 fi
11167-echo "$as_me:18093: result: $ac_cv_func_getenv" >&5
11168+echo "$as_me:18424: result: $ac_cv_func_getenv" >&5
11169 echo "${ECHO_T}$ac_cv_func_getenv" >&6
11170
11171 for ac_func in putenv setenv strdup
11172 do
11173 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
11174-echo "$as_me:18099: checking for $ac_func" >&5
11175+echo "$as_me:18430: checking for $ac_func" >&5
11176 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
11177 if eval "test \"\${$as_ac_var+set}\" = set"; then
11178   echo $ECHO_N "(cached) $ECHO_C" >&6
11179 else
11180   cat >conftest.$ac_ext <<_ACEOF
11181-#line 18105 "configure"
11182+#line 18436 "configure"
11183 #include "confdefs.h"
11184 #define $ac_func autoconf_temporary
11185 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
11186@@ -18133,16 +18464,16 @@
11187 }
11188 _ACEOF
11189 rm -f conftest.$ac_objext conftest$ac_exeext
11190-if { (eval echo "$as_me:18136: \"$ac_link\"") >&5
11191+if { (eval echo "$as_me:18467: \"$ac_link\"") >&5
11192   (eval $ac_link) 2>&5
11193   ac_status=$?
11194-  echo "$as_me:18139: \$? = $ac_status" >&5
11195+  echo "$as_me:18470: \$? = $ac_status" >&5
11196   (exit $ac_status); } &&
11197          { ac_try='test -s conftest$ac_exeext'
11198-  { (eval echo "$as_me:18142: \"$ac_try\"") >&5
11199+  { (eval echo "$as_me:18473: \"$ac_try\"") >&5
11200   (eval $ac_try) 2>&5
11201   ac_status=$?
11202-  echo "$as_me:18145: \$? = $ac_status" >&5
11203+  echo "$as_me:18476: \$? = $ac_status" >&5
11204   (exit $ac_status); }; }; then
11205   eval "$as_ac_var=yes"
11206 else
11207@@ -18152,7 +18483,7 @@
11208 fi
11209 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11210 fi
11211-echo "$as_me:18155: result: `eval echo '${'$as_ac_var'}'`" >&5
11212+echo "$as_me:18486: result: `eval echo '${'$as_ac_var'}'`" >&5
11213 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
11214 if test `eval echo '${'$as_ac_var'}'` = yes; then
11215   cat >>confdefs.h <<EOF
11216@@ -18162,7 +18493,7 @@
11217 fi
11218 done
11219
11220-echo "$as_me:18165: checking if getenv returns consistent values" >&5
11221+echo "$as_me:18496: checking if getenv returns consistent values" >&5
11222 echo $ECHO_N "checking if getenv returns consistent values... $ECHO_C" >&6
11223 if test "${cf_cv_consistent_getenv+set}" = set; then
11224   echo $ECHO_N "(cached) $ECHO_C" >&6
11225@@ -18172,7 +18503,7 @@
11226   cf_cv_consistent_getenv=unknown
11227 else
11228   cat >conftest.$ac_ext <<_ACEOF
11229-#line 18175 "configure"
11230+#line 18506 "configure"
11231 #include "confdefs.h"
11232
11233 #include <stdlib.h>
11234@@ -18281,15 +18612,15 @@
11235
11236 _ACEOF
11237 rm -f conftest$ac_exeext
11238-if { (eval echo "$as_me:18284: \"$ac_link\"") >&5
11239+if { (eval echo "$as_me:18615: \"$ac_link\"") >&5
11240   (eval $ac_link) 2>&5
11241   ac_status=$?
11242-  echo "$as_me:18287: \$? = $ac_status" >&5
11243+  echo "$as_me:18618: \$? = $ac_status" >&5
11244   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11245-  { (eval echo "$as_me:18289: \"$ac_try\"") >&5
11246+  { (eval echo "$as_me:18620: \"$ac_try\"") >&5
11247   (eval $ac_try) 2>&5
11248   ac_status=$?
11249-  echo "$as_me:18292: \$? = $ac_status" >&5
11250+  echo "$as_me:18623: \$? = $ac_status" >&5
11251   (exit $ac_status); }; }; then
11252   cf_cv_consistent_getenv=yes
11253 else
11254@@ -18302,7 +18633,7 @@
11255 fi
11256
11257 fi
11258-echo "$as_me:18305: result: $cf_cv_consistent_getenv" >&5
11259+echo "$as_me:18636: result: $cf_cv_consistent_getenv" >&5
11260 echo "${ECHO_T}$cf_cv_consistent_getenv" >&6
11261
11262 if test "x$cf_cv_consistent_getenv" = xno
11263@@ -18317,7 +18648,7 @@
11264 if test "x$cf_cv_consistent_getenv" = xno && \
11265 	test "x$cf_with_trace" = xyes
11266 then
11267-	{ echo "$as_me:18320: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
11268+	{ echo "$as_me:18651: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&5
11269 echo "$as_me: WARNING: The NCURSES_TRACE environment variable is not supported with this configuration" >&2;}
11270 fi
11271
11272@@ -18325,7 +18656,7 @@
11273 # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
11274 if test "x$ISC" = xyes ; then
11275
11276-echo "$as_me:18328: checking for main in -lcposix" >&5
11277+echo "$as_me:18659: checking for main in -lcposix" >&5
11278 echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
11279 if test "${ac_cv_lib_cposix_main+set}" = set; then
11280   echo $ECHO_N "(cached) $ECHO_C" >&6
11281@@ -18333,7 +18664,7 @@
11282   ac_check_lib_save_LIBS=$LIBS
11283 LIBS="-lcposix  $LIBS"
11284 cat >conftest.$ac_ext <<_ACEOF
11285-#line 18336 "configure"
11286+#line 18667 "configure"
11287 #include "confdefs.h"
11288
11289 int
11290@@ -18345,16 +18676,16 @@
11291 }
11292 _ACEOF
11293 rm -f conftest.$ac_objext conftest$ac_exeext
11294-if { (eval echo "$as_me:18348: \"$ac_link\"") >&5
11295+if { (eval echo "$as_me:18679: \"$ac_link\"") >&5
11296   (eval $ac_link) 2>&5
11297   ac_status=$?
11298-  echo "$as_me:18351: \$? = $ac_status" >&5
11299+  echo "$as_me:18682: \$? = $ac_status" >&5
11300   (exit $ac_status); } &&
11301          { ac_try='test -s conftest$ac_exeext'
11302-  { (eval echo "$as_me:18354: \"$ac_try\"") >&5
11303+  { (eval echo "$as_me:18685: \"$ac_try\"") >&5
11304   (eval $ac_try) 2>&5
11305   ac_status=$?
11306-  echo "$as_me:18357: \$? = $ac_status" >&5
11307+  echo "$as_me:18688: \$? = $ac_status" >&5
11308   (exit $ac_status); }; }; then
11309   ac_cv_lib_cposix_main=yes
11310 else
11311@@ -18365,7 +18696,7 @@
11312 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11313 LIBS=$ac_check_lib_save_LIBS
11314 fi
11315-echo "$as_me:18368: result: $ac_cv_lib_cposix_main" >&5
11316+echo "$as_me:18699: result: $ac_cv_lib_cposix_main" >&5
11317 echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
11318 if test $ac_cv_lib_cposix_main = yes; then
11319   cat >>confdefs.h <<EOF
11320@@ -18376,7 +18707,7 @@
11321
11322 fi
11323
11324-	echo "$as_me:18379: checking for bzero in -linet" >&5
11325+	echo "$as_me:18710: checking for bzero in -linet" >&5
11326 echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
11327 if test "${ac_cv_lib_inet_bzero+set}" = set; then
11328   echo $ECHO_N "(cached) $ECHO_C" >&6
11329@@ -18384,7 +18715,7 @@
11330   ac_check_lib_save_LIBS=$LIBS
11331 LIBS="-linet  $LIBS"
11332 cat >conftest.$ac_ext <<_ACEOF
11333-#line 18387 "configure"
11334+#line 18718 "configure"
11335 #include "confdefs.h"
11336
11337 /* Override any gcc2 internal prototype to avoid an error.  */
11338@@ -18403,16 +18734,16 @@
11339 }
11340 _ACEOF
11341 rm -f conftest.$ac_objext conftest$ac_exeext
11342-if { (eval echo "$as_me:18406: \"$ac_link\"") >&5
11343+if { (eval echo "$as_me:18737: \"$ac_link\"") >&5
11344   (eval $ac_link) 2>&5
11345   ac_status=$?
11346-  echo "$as_me:18409: \$? = $ac_status" >&5
11347+  echo "$as_me:18740: \$? = $ac_status" >&5
11348   (exit $ac_status); } &&
11349          { ac_try='test -s conftest$ac_exeext'
11350-  { (eval echo "$as_me:18412: \"$ac_try\"") >&5
11351+  { (eval echo "$as_me:18743: \"$ac_try\"") >&5
11352   (eval $ac_try) 2>&5
11353   ac_status=$?
11354-  echo "$as_me:18415: \$? = $ac_status" >&5
11355+  echo "$as_me:18746: \$? = $ac_status" >&5
11356   (exit $ac_status); }; }; then
11357   ac_cv_lib_inet_bzero=yes
11358 else
11359@@ -18423,7 +18754,7 @@
11360 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11361 LIBS=$ac_check_lib_save_LIBS
11362 fi
11363-echo "$as_me:18426: result: $ac_cv_lib_inet_bzero" >&5
11364+echo "$as_me:18757: result: $ac_cv_lib_inet_bzero" >&5
11365 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
11366 if test $ac_cv_lib_inet_bzero = yes; then
11367
11368@@ -18446,14 +18777,14 @@
11369 fi
11370 fi
11371
11372-echo "$as_me:18449: checking if sys/time.h works with sys/select.h" >&5
11373+echo "$as_me:18780: checking if sys/time.h works with sys/select.h" >&5
11374 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
11375 if test "${cf_cv_sys_time_select+set}" = set; then
11376   echo $ECHO_N "(cached) $ECHO_C" >&6
11377 else
11378
11379 cat >conftest.$ac_ext <<_ACEOF
11380-#line 18456 "configure"
11381+#line 18787 "configure"
11382 #include "confdefs.h"
11383
11384 #include <sys/types.h>
11385@@ -18473,16 +18804,16 @@
11386 }
11387 _ACEOF
11388 rm -f conftest.$ac_objext
11389-if { (eval echo "$as_me:18476: \"$ac_compile\"") >&5
11390+if { (eval echo "$as_me:18807: \"$ac_compile\"") >&5
11391   (eval $ac_compile) 2>&5
11392   ac_status=$?
11393-  echo "$as_me:18479: \$? = $ac_status" >&5
11394+  echo "$as_me:18810: \$? = $ac_status" >&5
11395   (exit $ac_status); } &&
11396          { ac_try='test -s conftest.$ac_objext'
11397-  { (eval echo "$as_me:18482: \"$ac_try\"") >&5
11398+  { (eval echo "$as_me:18813: \"$ac_try\"") >&5
11399   (eval $ac_try) 2>&5
11400   ac_status=$?
11401-  echo "$as_me:18485: \$? = $ac_status" >&5
11402+  echo "$as_me:18816: \$? = $ac_status" >&5
11403   (exit $ac_status); }; }; then
11404   cf_cv_sys_time_select=yes
11405 else
11406@@ -18494,7 +18825,7 @@
11407
11408 fi
11409
11410-echo "$as_me:18497: result: $cf_cv_sys_time_select" >&5
11411+echo "$as_me:18828: result: $cf_cv_sys_time_select" >&5
11412 echo "${ECHO_T}$cf_cv_sys_time_select" >&6
11413 test "$cf_cv_sys_time_select" = yes &&
11414 cat >>confdefs.h <<\EOF
11415@@ -18509,13 +18840,13 @@
11416 ac_compiler_gnu=$ac_cv_c_compiler_gnu
11417 ac_main_return=return
11418
11419-echo "$as_me:18512: checking for an ANSI C-conforming const" >&5
11420+echo "$as_me:18843: checking for an ANSI C-conforming const" >&5
11421 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
11422 if test "${ac_cv_c_const+set}" = set; then
11423   echo $ECHO_N "(cached) $ECHO_C" >&6
11424 else
11425   cat >conftest.$ac_ext <<_ACEOF
11426-#line 18518 "configure"
11427+#line 18849 "configure"
11428 #include "confdefs.h"
11429
11430 int
11431@@ -18573,16 +18904,16 @@
11432 }
11433 _ACEOF
11434 rm -f conftest.$ac_objext
11435-if { (eval echo "$as_me:18576: \"$ac_compile\"") >&5
11436+if { (eval echo "$as_me:18907: \"$ac_compile\"") >&5
11437   (eval $ac_compile) 2>&5
11438   ac_status=$?
11439-  echo "$as_me:18579: \$? = $ac_status" >&5
11440+  echo "$as_me:18910: \$? = $ac_status" >&5
11441   (exit $ac_status); } &&
11442          { ac_try='test -s conftest.$ac_objext'
11443-  { (eval echo "$as_me:18582: \"$ac_try\"") >&5
11444+  { (eval echo "$as_me:18913: \"$ac_try\"") >&5
11445   (eval $ac_try) 2>&5
11446   ac_status=$?
11447-  echo "$as_me:18585: \$? = $ac_status" >&5
11448+  echo "$as_me:18916: \$? = $ac_status" >&5
11449   (exit $ac_status); }; }; then
11450   ac_cv_c_const=yes
11451 else
11452@@ -18592,7 +18923,7 @@
11453 fi
11454 rm -f conftest.$ac_objext conftest.$ac_ext
11455 fi
11456-echo "$as_me:18595: result: $ac_cv_c_const" >&5
11457+echo "$as_me:18926: result: $ac_cv_c_const" >&5
11458 echo "${ECHO_T}$ac_cv_c_const" >&6
11459 if test $ac_cv_c_const = no; then
11460
11461@@ -18602,7 +18933,7 @@
11462
11463 fi
11464
11465-echo "$as_me:18605: checking for inline" >&5
11466+echo "$as_me:18936: checking for inline" >&5
11467 echo $ECHO_N "checking for inline... $ECHO_C" >&6
11468 if test "${ac_cv_c_inline+set}" = set; then
11469   echo $ECHO_N "(cached) $ECHO_C" >&6
11470@@ -18610,7 +18941,7 @@
11471   ac_cv_c_inline=no
11472 for ac_kw in inline __inline__ __inline; do
11473   cat >conftest.$ac_ext <<_ACEOF
11474-#line 18613 "configure"
11475+#line 18944 "configure"
11476 #include "confdefs.h"
11477 #ifndef __cplusplus
11478 static $ac_kw int static_foo () {return 0; }
11479@@ -18619,16 +18950,16 @@
11480
11481 _ACEOF
11482 rm -f conftest.$ac_objext
11483-if { (eval echo "$as_me:18622: \"$ac_compile\"") >&5
11484+if { (eval echo "$as_me:18953: \"$ac_compile\"") >&5
11485   (eval $ac_compile) 2>&5
11486   ac_status=$?
11487-  echo "$as_me:18625: \$? = $ac_status" >&5
11488+  echo "$as_me:18956: \$? = $ac_status" >&5
11489   (exit $ac_status); } &&
11490          { ac_try='test -s conftest.$ac_objext'
11491-  { (eval echo "$as_me:18628: \"$ac_try\"") >&5
11492+  { (eval echo "$as_me:18959: \"$ac_try\"") >&5
11493   (eval $ac_try) 2>&5
11494   ac_status=$?
11495-  echo "$as_me:18631: \$? = $ac_status" >&5
11496+  echo "$as_me:18962: \$? = $ac_status" >&5
11497   (exit $ac_status); }; }; then
11498   ac_cv_c_inline=$ac_kw; break
11499 else
11500@@ -18639,7 +18970,7 @@
11501 done
11502
11503 fi
11504-echo "$as_me:18642: result: $ac_cv_c_inline" >&5
11505+echo "$as_me:18973: result: $ac_cv_c_inline" >&5
11506 echo "${ECHO_T}$ac_cv_c_inline" >&6
11507 case $ac_cv_c_inline in
11508   inline | yes) ;;
11509@@ -18665,7 +18996,7 @@
11510 		:
11511 	elif test "$GCC" = yes
11512 	then
11513-		echo "$as_me:18668: checking if $CC supports options to tune inlining" >&5
11514+		echo "$as_me:18999: checking if $CC supports options to tune inlining" >&5
11515 echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6
11516 if test "${cf_cv_gcc_inline+set}" = set; then
11517   echo $ECHO_N "(cached) $ECHO_C" >&6
11518@@ -18674,7 +19005,7 @@
11519 		cf_save_CFLAGS=$CFLAGS
11520 		CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
11521 		cat >conftest.$ac_ext <<_ACEOF
11522-#line 18677 "configure"
11523+#line 19008 "configure"
11524 #include "confdefs.h"
11525 inline int foo(void) { return 1; }
11526 int
11527@@ -18686,16 +19017,16 @@
11528 }
11529 _ACEOF
11530 rm -f conftest.$ac_objext
11531-if { (eval echo "$as_me:18689: \"$ac_compile\"") >&5
11532+if { (eval echo "$as_me:19020: \"$ac_compile\"") >&5
11533   (eval $ac_compile) 2>&5
11534   ac_status=$?
11535-  echo "$as_me:18692: \$? = $ac_status" >&5
11536+  echo "$as_me:19023: \$? = $ac_status" >&5
11537   (exit $ac_status); } &&
11538          { ac_try='test -s conftest.$ac_objext'
11539-  { (eval echo "$as_me:18695: \"$ac_try\"") >&5
11540+  { (eval echo "$as_me:19026: \"$ac_try\"") >&5
11541   (eval $ac_try) 2>&5
11542   ac_status=$?
11543-  echo "$as_me:18698: \$? = $ac_status" >&5
11544+  echo "$as_me:19029: \$? = $ac_status" >&5
11545   (exit $ac_status); }; }; then
11546   cf_cv_gcc_inline=yes
11547 else
11548@@ -18707,7 +19038,7 @@
11549 		CFLAGS=$cf_save_CFLAGS
11550
11551 fi
11552-echo "$as_me:18710: result: $cf_cv_gcc_inline" >&5
11553+echo "$as_me:19041: result: $cf_cv_gcc_inline" >&5
11554 echo "${ECHO_T}$cf_cv_gcc_inline" >&6
11555 		if test "$cf_cv_gcc_inline" = yes ; then
11556
11557@@ -18813,7 +19144,7 @@
11558 	fi
11559 fi
11560
11561-echo "$as_me:18816: checking for signal global datatype" >&5
11562+echo "$as_me:19147: checking for signal global datatype" >&5
11563 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
11564 if test "${cf_cv_sig_atomic_t+set}" = set; then
11565   echo $ECHO_N "(cached) $ECHO_C" >&6
11566@@ -18825,7 +19156,7 @@
11567 		"int"
11568 	do
11569 	cat >conftest.$ac_ext <<_ACEOF
11570-#line 18828 "configure"
11571+#line 19159 "configure"
11572 #include "confdefs.h"
11573
11574 #include <sys/types.h>
11575@@ -18848,16 +19179,16 @@
11576 }
11577 _ACEOF
11578 rm -f conftest.$ac_objext
11579-if { (eval echo "$as_me:18851: \"$ac_compile\"") >&5
11580+if { (eval echo "$as_me:19182: \"$ac_compile\"") >&5
11581   (eval $ac_compile) 2>&5
11582   ac_status=$?
11583-  echo "$as_me:18854: \$? = $ac_status" >&5
11584+  echo "$as_me:19185: \$? = $ac_status" >&5
11585   (exit $ac_status); } &&
11586          { ac_try='test -s conftest.$ac_objext'
11587-  { (eval echo "$as_me:18857: \"$ac_try\"") >&5
11588+  { (eval echo "$as_me:19188: \"$ac_try\"") >&5
11589   (eval $ac_try) 2>&5
11590   ac_status=$?
11591-  echo "$as_me:18860: \$? = $ac_status" >&5
11592+  echo "$as_me:19191: \$? = $ac_status" >&5
11593   (exit $ac_status); }; }; then
11594   cf_cv_sig_atomic_t=$cf_type
11595 else
11596@@ -18871,7 +19202,7 @@
11597
11598 fi
11599
11600-echo "$as_me:18874: result: $cf_cv_sig_atomic_t" >&5
11601+echo "$as_me:19205: result: $cf_cv_sig_atomic_t" >&5
11602 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
11603 test "$cf_cv_sig_atomic_t" != no &&
11604 cat >>confdefs.h <<EOF
11605@@ -18880,7 +19211,7 @@
11606
11607 if test $NCURSES_CHTYPE = auto ; then
11608
11609-echo "$as_me:18883: checking for type of chtype" >&5
11610+echo "$as_me:19214: checking for type of chtype" >&5
11611 echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
11612 if test "${cf_cv_typeof_chtype+set}" = set; then
11613   echo $ECHO_N "(cached) $ECHO_C" >&6
11614@@ -18890,7 +19221,7 @@
11615   cf_cv_typeof_chtype=long
11616 else
11617   cat >conftest.$ac_ext <<_ACEOF
11618-#line 18893 "configure"
11619+#line 19224 "configure"
11620 #include "confdefs.h"
11621
11622 #define WANT_BITS 31
11623@@ -18925,15 +19256,15 @@
11624
11625 _ACEOF
11626 rm -f conftest$ac_exeext
11627-if { (eval echo "$as_me:18928: \"$ac_link\"") >&5
11628+if { (eval echo "$as_me:19259: \"$ac_link\"") >&5
11629   (eval $ac_link) 2>&5
11630   ac_status=$?
11631-  echo "$as_me:18931: \$? = $ac_status" >&5
11632+  echo "$as_me:19262: \$? = $ac_status" >&5
11633   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11634-  { (eval echo "$as_me:18933: \"$ac_try\"") >&5
11635+  { (eval echo "$as_me:19264: \"$ac_try\"") >&5
11636   (eval $ac_try) 2>&5
11637   ac_status=$?
11638-  echo "$as_me:18936: \$? = $ac_status" >&5
11639+  echo "$as_me:19267: \$? = $ac_status" >&5
11640   (exit $ac_status); }; }; then
11641   cf_cv_typeof_chtype=`cat cf_test.out`
11642 else
11643@@ -18948,7 +19279,7 @@
11644
11645 fi
11646
11647-echo "$as_me:18951: result: $cf_cv_typeof_chtype" >&5
11648+echo "$as_me:19282: result: $cf_cv_typeof_chtype" >&5
11649 echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
11650
11651 cat >>confdefs.h <<EOF
11652@@ -18960,14 +19291,14 @@
11653 fi
11654 test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
11655
11656-echo "$as_me:18963: checking if unsigned literals are legal" >&5
11657+echo "$as_me:19294: checking if unsigned literals are legal" >&5
11658 echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
11659 if test "${cf_cv_unsigned_literals+set}" = set; then
11660   echo $ECHO_N "(cached) $ECHO_C" >&6
11661 else
11662
11663 	cat >conftest.$ac_ext <<_ACEOF
11664-#line 18970 "configure"
11665+#line 19301 "configure"
11666 #include "confdefs.h"
11667
11668 int
11669@@ -18979,16 +19310,16 @@
11670 }
11671 _ACEOF
11672 rm -f conftest.$ac_objext
11673-if { (eval echo "$as_me:18982: \"$ac_compile\"") >&5
11674+if { (eval echo "$as_me:19313: \"$ac_compile\"") >&5
11675   (eval $ac_compile) 2>&5
11676   ac_status=$?
11677-  echo "$as_me:18985: \$? = $ac_status" >&5
11678+  echo "$as_me:19316: \$? = $ac_status" >&5
11679   (exit $ac_status); } &&
11680          { ac_try='test -s conftest.$ac_objext'
11681-  { (eval echo "$as_me:18988: \"$ac_try\"") >&5
11682+  { (eval echo "$as_me:19319: \"$ac_try\"") >&5
11683   (eval $ac_try) 2>&5
11684   ac_status=$?
11685-  echo "$as_me:18991: \$? = $ac_status" >&5
11686+  echo "$as_me:19322: \$? = $ac_status" >&5
11687   (exit $ac_status); }; }; then
11688   cf_cv_unsigned_literals=yes
11689 else
11690@@ -19000,7 +19331,7 @@
11691
11692 fi
11693
11694-echo "$as_me:19003: result: $cf_cv_unsigned_literals" >&5
11695+echo "$as_me:19334: result: $cf_cv_unsigned_literals" >&5
11696 echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
11697
11698 cf_cv_1UL="1"
11699@@ -19016,14 +19347,14 @@
11700
11701 ###	Checks for external-data
11702
11703-echo "$as_me:19019: checking if external errno is declared" >&5
11704+echo "$as_me:19350: checking if external errno is declared" >&5
11705 echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
11706 if test "${cf_cv_dcl_errno+set}" = set; then
11707   echo $ECHO_N "(cached) $ECHO_C" >&6
11708 else
11709
11710 	cat >conftest.$ac_ext <<_ACEOF
11711-#line 19026 "configure"
11712+#line 19357 "configure"
11713 #include "confdefs.h"
11714
11715 #ifdef HAVE_STDLIB_H
11716@@ -19041,16 +19372,16 @@
11717 }
11718 _ACEOF
11719 rm -f conftest.$ac_objext
11720-if { (eval echo "$as_me:19044: \"$ac_compile\"") >&5
11721+if { (eval echo "$as_me:19375: \"$ac_compile\"") >&5
11722   (eval $ac_compile) 2>&5
11723   ac_status=$?
11724-  echo "$as_me:19047: \$? = $ac_status" >&5
11725+  echo "$as_me:19378: \$? = $ac_status" >&5
11726   (exit $ac_status); } &&
11727          { ac_try='test -s conftest.$ac_objext'
11728-  { (eval echo "$as_me:19050: \"$ac_try\"") >&5
11729+  { (eval echo "$as_me:19381: \"$ac_try\"") >&5
11730   (eval $ac_try) 2>&5
11731   ac_status=$?
11732-  echo "$as_me:19053: \$? = $ac_status" >&5
11733+  echo "$as_me:19384: \$? = $ac_status" >&5
11734   (exit $ac_status); }; }; then
11735   cf_cv_dcl_errno=yes
11736 else
11737@@ -19061,7 +19392,7 @@
11738 rm -f conftest.$ac_objext conftest.$ac_ext
11739
11740 fi
11741-echo "$as_me:19064: result: $cf_cv_dcl_errno" >&5
11742+echo "$as_me:19395: result: $cf_cv_dcl_errno" >&5
11743 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
11744
11745 if test "$cf_cv_dcl_errno" = no ; then
11746@@ -19076,14 +19407,14 @@
11747
11748 # It's possible (for near-UNIX clones) that the data doesn't exist
11749
11750-echo "$as_me:19079: checking if external errno exists" >&5
11751+echo "$as_me:19410: checking if external errno exists" >&5
11752 echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
11753 if test "${cf_cv_have_errno+set}" = set; then
11754   echo $ECHO_N "(cached) $ECHO_C" >&6
11755 else
11756
11757 	cat >conftest.$ac_ext <<_ACEOF
11758-#line 19086 "configure"
11759+#line 19417 "configure"
11760 #include "confdefs.h"
11761
11762 #undef errno
11763@@ -19098,16 +19429,16 @@
11764 }
11765 _ACEOF
11766 rm -f conftest.$ac_objext conftest$ac_exeext
11767-if { (eval echo "$as_me:19101: \"$ac_link\"") >&5
11768+if { (eval echo "$as_me:19432: \"$ac_link\"") >&5
11769   (eval $ac_link) 2>&5
11770   ac_status=$?
11771-  echo "$as_me:19104: \$? = $ac_status" >&5
11772+  echo "$as_me:19435: \$? = $ac_status" >&5
11773   (exit $ac_status); } &&
11774          { ac_try='test -s conftest$ac_exeext'
11775-  { (eval echo "$as_me:19107: \"$ac_try\"") >&5
11776+  { (eval echo "$as_me:19438: \"$ac_try\"") >&5
11777   (eval $ac_try) 2>&5
11778   ac_status=$?
11779-  echo "$as_me:19110: \$? = $ac_status" >&5
11780+  echo "$as_me:19441: \$? = $ac_status" >&5
11781   (exit $ac_status); }; }; then
11782   cf_cv_have_errno=yes
11783 else
11784@@ -19118,7 +19449,7 @@
11785 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11786
11787 fi
11788-echo "$as_me:19121: result: $cf_cv_have_errno" >&5
11789+echo "$as_me:19452: result: $cf_cv_have_errno" >&5
11790 echo "${ECHO_T}$cf_cv_have_errno" >&6
11791
11792 if test "$cf_cv_have_errno" = yes ; then
11793@@ -19131,7 +19462,7 @@
11794
11795 fi
11796
11797-echo "$as_me:19134: checking if data-only library module links" >&5
11798+echo "$as_me:19465: checking if data-only library module links" >&5
11799 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
11800 if test "${cf_cv_link_dataonly+set}" = set; then
11801   echo $ECHO_N "(cached) $ECHO_C" >&6
11802@@ -19139,20 +19470,20 @@
11803
11804 	rm -f conftest.a
11805 	cat >conftest.$ac_ext <<EOF
11806-#line 19142 "configure"
11807+#line 19473 "configure"
11808 int	testdata[3] = { 123, 456, 789 };
11809 EOF
11810-	if { (eval echo "$as_me:19145: \"$ac_compile\"") >&5
11811+	if { (eval echo "$as_me:19476: \"$ac_compile\"") >&5
11812   (eval $ac_compile) 2>&5
11813   ac_status=$?
11814-  echo "$as_me:19148: \$? = $ac_status" >&5
11815+  echo "$as_me:19479: \$? = $ac_status" >&5
11816   (exit $ac_status); } ; then
11817 		mv conftest.o data.o && \
11818 		( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null
11819 	fi
11820 	rm -f conftest.$ac_ext data.o
11821 	cat >conftest.$ac_ext <<EOF
11822-#line 19155 "configure"
11823+#line 19486 "configure"
11824 int	testfunc(void)
11825 {
11826 #if defined(NeXT)
11827@@ -19165,10 +19496,10 @@
11828 #endif
11829 }
11830 EOF
11831-	if { (eval echo "$as_me:19168: \"$ac_compile\"") >&5
11832+	if { (eval echo "$as_me:19499: \"$ac_compile\"") >&5
11833   (eval $ac_compile) 2>&5
11834   ac_status=$?
11835-  echo "$as_me:19171: \$? = $ac_status" >&5
11836+  echo "$as_me:19502: \$? = $ac_status" >&5
11837   (exit $ac_status); }; then
11838 		mv conftest.o func.o && \
11839 		( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null
11840@@ -19181,7 +19512,7 @@
11841   cf_cv_link_dataonly=unknown
11842 else
11843   cat >conftest.$ac_ext <<_ACEOF
11844-#line 19184 "configure"
11845+#line 19515 "configure"
11846 #include "confdefs.h"
11847
11848 	int main(void)
11849@@ -19192,15 +19523,15 @@
11850
11851 _ACEOF
11852 rm -f conftest$ac_exeext
11853-if { (eval echo "$as_me:19195: \"$ac_link\"") >&5
11854+if { (eval echo "$as_me:19526: \"$ac_link\"") >&5
11855   (eval $ac_link) 2>&5
11856   ac_status=$?
11857-  echo "$as_me:19198: \$? = $ac_status" >&5
11858+  echo "$as_me:19529: \$? = $ac_status" >&5
11859   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
11860-  { (eval echo "$as_me:19200: \"$ac_try\"") >&5
11861+  { (eval echo "$as_me:19531: \"$ac_try\"") >&5
11862   (eval $ac_try) 2>&5
11863   ac_status=$?
11864-  echo "$as_me:19203: \$? = $ac_status" >&5
11865+  echo "$as_me:19534: \$? = $ac_status" >&5
11866   (exit $ac_status); }; }; then
11867   cf_cv_link_dataonly=yes
11868 else
11869@@ -19215,7 +19546,7 @@
11870
11871 fi
11872
11873-echo "$as_me:19218: result: $cf_cv_link_dataonly" >&5
11874+echo "$as_me:19549: result: $cf_cv_link_dataonly" >&5
11875 echo "${ECHO_T}$cf_cv_link_dataonly" >&6
11876
11877 if test "$cf_cv_link_dataonly" = no ; then
11878@@ -19257,13 +19588,13 @@
11879
11880 do
11881 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
11882-echo "$as_me:19260: checking for $ac_func" >&5
11883+echo "$as_me:19591: checking for $ac_func" >&5
11884 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
11885 if eval "test \"\${$as_ac_var+set}\" = set"; then
11886   echo $ECHO_N "(cached) $ECHO_C" >&6
11887 else
11888   cat >conftest.$ac_ext <<_ACEOF
11889-#line 19266 "configure"
11890+#line 19597 "configure"
11891 #include "confdefs.h"
11892 #define $ac_func autoconf_temporary
11893 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
11894@@ -19294,16 +19625,16 @@
11895 }
11896 _ACEOF
11897 rm -f conftest.$ac_objext conftest$ac_exeext
11898-if { (eval echo "$as_me:19297: \"$ac_link\"") >&5
11899+if { (eval echo "$as_me:19628: \"$ac_link\"") >&5
11900   (eval $ac_link) 2>&5
11901   ac_status=$?
11902-  echo "$as_me:19300: \$? = $ac_status" >&5
11903+  echo "$as_me:19631: \$? = $ac_status" >&5
11904   (exit $ac_status); } &&
11905          { ac_try='test -s conftest$ac_exeext'
11906-  { (eval echo "$as_me:19303: \"$ac_try\"") >&5
11907+  { (eval echo "$as_me:19634: \"$ac_try\"") >&5
11908   (eval $ac_try) 2>&5
11909   ac_status=$?
11910-  echo "$as_me:19306: \$? = $ac_status" >&5
11911+  echo "$as_me:19637: \$? = $ac_status" >&5
11912   (exit $ac_status); }; }; then
11913   eval "$as_ac_var=yes"
11914 else
11915@@ -19313,7 +19644,7 @@
11916 fi
11917 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11918 fi
11919-echo "$as_me:19316: result: `eval echo '${'$as_ac_var'}'`" >&5
11920+echo "$as_me:19647: result: `eval echo '${'$as_ac_var'}'`" >&5
11921 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
11922 if test `eval echo '${'$as_ac_var'}'` = yes; then
11923   cat >>confdefs.h <<EOF
11924@@ -19325,7 +19656,7 @@
11925
11926 if test "x$ac_cv_func_getopt" = xno && \
11927    test "x$cf_with_progs$cf_with_tests" != xnono; then
11928-	{ { echo "$as_me:19328: error: getopt is required for building programs" >&5
11929+	{ { echo "$as_me:19659: error: getopt is required for building programs" >&5
11930 echo "$as_me: error: getopt is required for building programs" >&2;}
11931    { (exit 1); exit 1; }; }
11932 fi
11933@@ -19334,7 +19665,7 @@
11934 then
11935 	if test "x$ac_cv_func_vsnprintf" = xyes
11936 	then
11937-		{ echo "$as_me:19337: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
11938+		{ echo "$as_me:19668: WARNING: will use vsnprintf instead of safe-sprintf option" >&5
11939 echo "$as_me: WARNING: will use vsnprintf instead of safe-sprintf option" >&2;}
11940 	else
11941
11942@@ -19347,14 +19678,14 @@
11943
11944 if test "x$with_getcap" = "xyes" ; then
11945
11946-echo "$as_me:19350: checking for terminal-capability database functions" >&5
11947+echo "$as_me:19681: checking for terminal-capability database functions" >&5
11948 echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
11949 if test "${cf_cv_cgetent+set}" = set; then
11950   echo $ECHO_N "(cached) $ECHO_C" >&6
11951 else
11952
11953 cat >conftest.$ac_ext <<_ACEOF
11954-#line 19357 "configure"
11955+#line 19688 "configure"
11956 #include "confdefs.h"
11957
11958 #include <stdlib.h>
11959@@ -19374,16 +19705,16 @@
11960 }
11961 _ACEOF
11962 rm -f conftest.$ac_objext conftest$ac_exeext
11963-if { (eval echo "$as_me:19377: \"$ac_link\"") >&5
11964+if { (eval echo "$as_me:19708: \"$ac_link\"") >&5
11965   (eval $ac_link) 2>&5
11966   ac_status=$?
11967-  echo "$as_me:19380: \$? = $ac_status" >&5
11968+  echo "$as_me:19711: \$? = $ac_status" >&5
11969   (exit $ac_status); } &&
11970          { ac_try='test -s conftest$ac_exeext'
11971-  { (eval echo "$as_me:19383: \"$ac_try\"") >&5
11972+  { (eval echo "$as_me:19714: \"$ac_try\"") >&5
11973   (eval $ac_try) 2>&5
11974   ac_status=$?
11975-  echo "$as_me:19386: \$? = $ac_status" >&5
11976+  echo "$as_me:19717: \$? = $ac_status" >&5
11977   (exit $ac_status); }; }; then
11978   cf_cv_cgetent=yes
11979 else
11980@@ -19394,7 +19725,7 @@
11981 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11982
11983 fi
11984-echo "$as_me:19397: result: $cf_cv_cgetent" >&5
11985+echo "$as_me:19728: result: $cf_cv_cgetent" >&5
11986 echo "${ECHO_T}$cf_cv_cgetent" >&6
11987
11988 if test "$cf_cv_cgetent" = yes
11989@@ -19404,14 +19735,14 @@
11990 #define HAVE_BSD_CGETENT 1
11991 EOF
11992
11993-echo "$as_me:19407: checking if cgetent uses const parameter" >&5
11994+echo "$as_me:19738: checking if cgetent uses const parameter" >&5
11995 echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6
11996 if test "${cf_cv_cgetent_const+set}" = set; then
11997   echo $ECHO_N "(cached) $ECHO_C" >&6
11998 else
11999
12000 cat >conftest.$ac_ext <<_ACEOF
12001-#line 19414 "configure"
12002+#line 19745 "configure"
12003 #include "confdefs.h"
12004
12005 #pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
12006@@ -19434,16 +19765,16 @@
12007 }
12008 _ACEOF
12009 rm -f conftest.$ac_objext conftest$ac_exeext
12010-if { (eval echo "$as_me:19437: \"$ac_link\"") >&5
12011+if { (eval echo "$as_me:19768: \"$ac_link\"") >&5
12012   (eval $ac_link) 2>&5
12013   ac_status=$?
12014-  echo "$as_me:19440: \$? = $ac_status" >&5
12015+  echo "$as_me:19771: \$? = $ac_status" >&5
12016   (exit $ac_status); } &&
12017          { ac_try='test -s conftest$ac_exeext'
12018-  { (eval echo "$as_me:19443: \"$ac_try\"") >&5
12019+  { (eval echo "$as_me:19774: \"$ac_try\"") >&5
12020   (eval $ac_try) 2>&5
12021   ac_status=$?
12022-  echo "$as_me:19446: \$? = $ac_status" >&5
12023+  echo "$as_me:19777: \$? = $ac_status" >&5
12024   (exit $ac_status); }; }; then
12025   cf_cv_cgetent_const=yes
12026 else
12027@@ -19454,7 +19785,7 @@
12028 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
12029
12030 fi
12031-echo "$as_me:19457: result: $cf_cv_cgetent_const" >&5
12032+echo "$as_me:19788: result: $cf_cv_cgetent_const" >&5
12033 echo "${ECHO_T}$cf_cv_cgetent_const" >&6
12034 	if test "$cf_cv_cgetent_const" = yes
12035 	then
12036@@ -19468,14 +19799,14 @@
12037
12038 fi
12039
12040-echo "$as_me:19471: checking for isascii" >&5
12041+echo "$as_me:19802: checking for isascii" >&5
12042 echo $ECHO_N "checking for isascii... $ECHO_C" >&6
12043 if test "${cf_cv_have_isascii+set}" = set; then
12044   echo $ECHO_N "(cached) $ECHO_C" >&6
12045 else
12046
12047 	cat >conftest.$ac_ext <<_ACEOF
12048-#line 19478 "configure"
12049+#line 19809 "configure"
12050 #include "confdefs.h"
12051 #include <ctype.h>
12052 int
12053@@ -19487,16 +19818,16 @@
12054 }
12055 _ACEOF
12056 rm -f conftest.$ac_objext conftest$ac_exeext
12057-if { (eval echo "$as_me:19490: \"$ac_link\"") >&5
12058+if { (eval echo "$as_me:19821: \"$ac_link\"") >&5
12059   (eval $ac_link) 2>&5
12060   ac_status=$?
12061-  echo "$as_me:19493: \$? = $ac_status" >&5
12062+  echo "$as_me:19824: \$? = $ac_status" >&5
12063   (exit $ac_status); } &&
12064          { ac_try='test -s conftest$ac_exeext'
12065-  { (eval echo "$as_me:19496: \"$ac_try\"") >&5
12066+  { (eval echo "$as_me:19827: \"$ac_try\"") >&5
12067   (eval $ac_try) 2>&5
12068   ac_status=$?
12069-  echo "$as_me:19499: \$? = $ac_status" >&5
12070+  echo "$as_me:19830: \$? = $ac_status" >&5
12071   (exit $ac_status); }; }; then
12072   cf_cv_have_isascii=yes
12073 else
12074@@ -19507,7 +19838,7 @@
12075 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
12076
12077 fi
12078-echo "$as_me:19510: result: $cf_cv_have_isascii" >&5
12079+echo "$as_me:19841: result: $cf_cv_have_isascii" >&5
12080 echo "${ECHO_T}$cf_cv_have_isascii" >&6
12081 test "$cf_cv_have_isascii" = yes &&
12082 cat >>confdefs.h <<\EOF
12083@@ -19515,10 +19846,10 @@
12084 EOF
12085
12086 if test "$ac_cv_func_sigaction" = yes; then
12087-echo "$as_me:19518: checking whether sigaction needs _POSIX_SOURCE" >&5
12088+echo "$as_me:19849: checking whether sigaction needs _POSIX_SOURCE" >&5
12089 echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
12090 cat >conftest.$ac_ext <<_ACEOF
12091-#line 19521 "configure"
12092+#line 19852 "configure"
12093 #include "confdefs.h"
12094
12095 #include <sys/types.h>
12096@@ -19532,16 +19863,16 @@
12097 }
12098 _ACEOF
12099 rm -f conftest.$ac_objext
12100-if { (eval echo "$as_me:19535: \"$ac_compile\"") >&5
12101+if { (eval echo "$as_me:19866: \"$ac_compile\"") >&5
12102   (eval $ac_compile) 2>&5
12103   ac_status=$?
12104-  echo "$as_me:19538: \$? = $ac_status" >&5
12105+  echo "$as_me:19869: \$? = $ac_status" >&5
12106   (exit $ac_status); } &&
12107          { ac_try='test -s conftest.$ac_objext'
12108-  { (eval echo "$as_me:19541: \"$ac_try\"") >&5
12109+  { (eval echo "$as_me:19872: \"$ac_try\"") >&5
12110   (eval $ac_try) 2>&5
12111   ac_status=$?
12112-  echo "$as_me:19544: \$? = $ac_status" >&5
12113+  echo "$as_me:19875: \$? = $ac_status" >&5
12114   (exit $ac_status); }; }; then
12115   sigact_bad=no
12116 else
12117@@ -19549,7 +19880,7 @@
12118 cat conftest.$ac_ext >&5
12119
12120 cat >conftest.$ac_ext <<_ACEOF
12121-#line 19552 "configure"
12122+#line 19883 "configure"
12123 #include "confdefs.h"
12124
12125 #define _POSIX_SOURCE
12126@@ -19564,16 +19895,16 @@
12127 }
12128 _ACEOF
12129 rm -f conftest.$ac_objext
12130-if { (eval echo "$as_me:19567: \"$ac_compile\"") >&5
12131+if { (eval echo "$as_me:19898: \"$ac_compile\"") >&5
12132   (eval $ac_compile) 2>&5
12133   ac_status=$?
12134-  echo "$as_me:19570: \$? = $ac_status" >&5
12135+  echo "$as_me:19901: \$? = $ac_status" >&5
12136   (exit $ac_status); } &&
12137          { ac_try='test -s conftest.$ac_objext'
12138-  { (eval echo "$as_me:19573: \"$ac_try\"") >&5
12139+  { (eval echo "$as_me:19904: \"$ac_try\"") >&5
12140   (eval $ac_try) 2>&5
12141   ac_status=$?
12142-  echo "$as_me:19576: \$? = $ac_status" >&5
12143+  echo "$as_me:19907: \$? = $ac_status" >&5
12144   (exit $ac_status); }; }; then
12145   sigact_bad=yes
12146
12147@@ -19589,11 +19920,11 @@
12148 rm -f conftest.$ac_objext conftest.$ac_ext
12149 fi
12150 rm -f conftest.$ac_objext conftest.$ac_ext
12151-echo "$as_me:19592: result: $sigact_bad" >&5
12152+echo "$as_me:19923: result: $sigact_bad" >&5
12153 echo "${ECHO_T}$sigact_bad" >&6
12154 fi
12155
12156-echo "$as_me:19596: checking if nanosleep really works" >&5
12157+echo "$as_me:19927: checking if nanosleep really works" >&5
12158 echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
12159 if test "${cf_cv_func_nanosleep+set}" = set; then
12160   echo $ECHO_N "(cached) $ECHO_C" >&6
12161@@ -19603,7 +19934,7 @@
12162   cf_cv_func_nanosleep=unknown
12163 else
12164   cat >conftest.$ac_ext <<_ACEOF
12165-#line 19606 "configure"
12166+#line 19937 "configure"
12167 #include "confdefs.h"
12168
12169 #include <stdio.h>
12170@@ -19628,15 +19959,15 @@
12171
12172 _ACEOF
12173 rm -f conftest$ac_exeext
12174-if { (eval echo "$as_me:19631: \"$ac_link\"") >&5
12175+if { (eval echo "$as_me:19962: \"$ac_link\"") >&5
12176   (eval $ac_link) 2>&5
12177   ac_status=$?
12178-  echo "$as_me:19634: \$? = $ac_status" >&5
12179+  echo "$as_me:19965: \$? = $ac_status" >&5
12180   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
12181-  { (eval echo "$as_me:19636: \"$ac_try\"") >&5
12182+  { (eval echo "$as_me:19967: \"$ac_try\"") >&5
12183   (eval $ac_try) 2>&5
12184   ac_status=$?
12185-  echo "$as_me:19639: \$? = $ac_status" >&5
12186+  echo "$as_me:19970: \$? = $ac_status" >&5
12187   (exit $ac_status); }; }; then
12188   cf_cv_func_nanosleep=yes
12189 else
12190@@ -19648,7 +19979,7 @@
12191 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
12192 fi
12193 fi
12194-echo "$as_me:19651: result: $cf_cv_func_nanosleep" >&5
12195+echo "$as_me:19982: result: $cf_cv_func_nanosleep" >&5
12196 echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
12197
12198 test "$cf_cv_func_nanosleep" = "yes" &&
12199@@ -19665,23 +19996,23 @@
12200
12201 do
12202 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
12203-echo "$as_me:19668: checking for $ac_header" >&5
12204+echo "$as_me:19999: checking for $ac_header" >&5
12205 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
12206 if eval "test \"\${$as_ac_Header+set}\" = set"; then
12207   echo $ECHO_N "(cached) $ECHO_C" >&6
12208 else
12209   cat >conftest.$ac_ext <<_ACEOF
12210-#line 19674 "configure"
12211+#line 20005 "configure"
12212 #include "confdefs.h"
12213 #include <$ac_header>
12214 _ACEOF
12215-if { (eval echo "$as_me:19678: \"$ac_cpp conftest.$ac_ext\"") >&5
12216+if { (eval echo "$as_me:20009: \"$ac_cpp conftest.$ac_ext\"") >&5
12217   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12218   ac_status=$?
12219   egrep -v '^ *\+' conftest.er1 >conftest.err
12220   rm -f conftest.er1
12221   cat conftest.err >&5
12222-  echo "$as_me:19684: \$? = $ac_status" >&5
12223+  echo "$as_me:20015: \$? = $ac_status" >&5
12224   (exit $ac_status); } >/dev/null; then
12225   if test -s conftest.err; then
12226     ac_cpp_err=$ac_c_preproc_warn_flag
12227@@ -19700,7 +20031,7 @@
12228 fi
12229 rm -f conftest.err conftest.$ac_ext
12230 fi
12231-echo "$as_me:19703: result: `eval echo '${'$as_ac_Header'}'`" >&5
12232+echo "$as_me:20034: result: `eval echo '${'$as_ac_Header'}'`" >&5
12233 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
12234 if test `eval echo '${'$as_ac_Header'}'` = yes; then
12235   cat >>confdefs.h <<EOF
12236@@ -19717,10 +20048,10 @@
12237 	(*)	termios_bad=maybe ;;
12238 	esac
12239 	if test "$termios_bad" = maybe ; then
12240-	echo "$as_me:19720: checking whether termios.h needs _POSIX_SOURCE" >&5
12241+	echo "$as_me:20051: checking whether termios.h needs _POSIX_SOURCE" >&5
12242 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
12243 	cat >conftest.$ac_ext <<_ACEOF
12244-#line 19723 "configure"
12245+#line 20054 "configure"
12246 #include "confdefs.h"
12247 #include <termios.h>
12248 int
12249@@ -19732,16 +20063,16 @@
12250 }
12251 _ACEOF
12252 rm -f conftest.$ac_objext
12253-if { (eval echo "$as_me:19735: \"$ac_compile\"") >&5
12254+if { (eval echo "$as_me:20066: \"$ac_compile\"") >&5
12255   (eval $ac_compile) 2>&5
12256   ac_status=$?
12257-  echo "$as_me:19738: \$? = $ac_status" >&5
12258+  echo "$as_me:20069: \$? = $ac_status" >&5
12259   (exit $ac_status); } &&
12260          { ac_try='test -s conftest.$ac_objext'
12261-  { (eval echo "$as_me:19741: \"$ac_try\"") >&5
12262+  { (eval echo "$as_me:20072: \"$ac_try\"") >&5
12263   (eval $ac_try) 2>&5
12264   ac_status=$?
12265-  echo "$as_me:19744: \$? = $ac_status" >&5
12266+  echo "$as_me:20075: \$? = $ac_status" >&5
12267   (exit $ac_status); }; }; then
12268   termios_bad=no
12269 else
12270@@ -19749,7 +20080,7 @@
12271 cat conftest.$ac_ext >&5
12272
12273 		cat >conftest.$ac_ext <<_ACEOF
12274-#line 19752 "configure"
12275+#line 20083 "configure"
12276 #include "confdefs.h"
12277
12278 #define _POSIX_SOURCE
12279@@ -19763,16 +20094,16 @@
12280 }
12281 _ACEOF
12282 rm -f conftest.$ac_objext
12283-if { (eval echo "$as_me:19766: \"$ac_compile\"") >&5
12284+if { (eval echo "$as_me:20097: \"$ac_compile\"") >&5
12285   (eval $ac_compile) 2>&5
12286   ac_status=$?
12287-  echo "$as_me:19769: \$? = $ac_status" >&5
12288+  echo "$as_me:20100: \$? = $ac_status" >&5
12289   (exit $ac_status); } &&
12290          { ac_try='test -s conftest.$ac_objext'
12291-  { (eval echo "$as_me:19772: \"$ac_try\"") >&5
12292+  { (eval echo "$as_me:20103: \"$ac_try\"") >&5
12293   (eval $ac_try) 2>&5
12294   ac_status=$?
12295-  echo "$as_me:19775: \$? = $ac_status" >&5
12296+  echo "$as_me:20106: \$? = $ac_status" >&5
12297   (exit $ac_status); }; }; then
12298   termios_bad=unknown
12299 else
12300@@ -19788,19 +20119,19 @@
12301
12302 fi
12303 rm -f conftest.$ac_objext conftest.$ac_ext
12304-	echo "$as_me:19791: result: $termios_bad" >&5
12305+	echo "$as_me:20122: result: $termios_bad" >&5
12306 echo "${ECHO_T}$termios_bad" >&6
12307 	fi
12308 fi
12309
12310-echo "$as_me:19796: checking for tcgetattr" >&5
12311+echo "$as_me:20127: checking for tcgetattr" >&5
12312 echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
12313 if test "${cf_cv_have_tcgetattr+set}" = set; then
12314   echo $ECHO_N "(cached) $ECHO_C" >&6
12315 else
12316
12317 cat >conftest.$ac_ext <<_ACEOF
12318-#line 19803 "configure"
12319+#line 20134 "configure"
12320 #include "confdefs.h"
12321
12322 #include <sys/types.h>
12323@@ -19828,16 +20159,16 @@
12324 }
12325 _ACEOF
12326 rm -f conftest.$ac_objext conftest$ac_exeext
12327-if { (eval echo "$as_me:19831: \"$ac_link\"") >&5
12328+if { (eval echo "$as_me:20162: \"$ac_link\"") >&5
12329   (eval $ac_link) 2>&5
12330   ac_status=$?
12331-  echo "$as_me:19834: \$? = $ac_status" >&5
12332+  echo "$as_me:20165: \$? = $ac_status" >&5
12333   (exit $ac_status); } &&
12334          { ac_try='test -s conftest$ac_exeext'
12335-  { (eval echo "$as_me:19837: \"$ac_try\"") >&5
12336+  { (eval echo "$as_me:20168: \"$ac_try\"") >&5
12337   (eval $ac_try) 2>&5
12338   ac_status=$?
12339-  echo "$as_me:19840: \$? = $ac_status" >&5
12340+  echo "$as_me:20171: \$? = $ac_status" >&5
12341   (exit $ac_status); }; }; then
12342   cf_cv_have_tcgetattr=yes
12343 else
12344@@ -19847,21 +20178,21 @@
12345 fi
12346 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
12347 fi
12348-echo "$as_me:19850: result: $cf_cv_have_tcgetattr" >&5
12349+echo "$as_me:20181: result: $cf_cv_have_tcgetattr" >&5
12350 echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
12351 test "$cf_cv_have_tcgetattr" = yes &&
12352 cat >>confdefs.h <<\EOF
12353 #define HAVE_TCGETATTR 1
12354 EOF
12355
12356-echo "$as_me:19857: checking for vsscanf function or workaround" >&5
12357+echo "$as_me:20188: checking for vsscanf function or workaround" >&5
12358 echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
12359 if test "${cf_cv_func_vsscanf+set}" = set; then
12360   echo $ECHO_N "(cached) $ECHO_C" >&6
12361 else
12362
12363 cat >conftest.$ac_ext <<_ACEOF
12364-#line 19864 "configure"
12365+#line 20195 "configure"
12366 #include "confdefs.h"
12367
12368 #include <stdarg.h>
12369@@ -19877,16 +20208,16 @@
12370 }
12371 _ACEOF
12372 rm -f conftest.$ac_objext conftest$ac_exeext
12373-if { (eval echo "$as_me:19880: \"$ac_link\"") >&5
12374+if { (eval echo "$as_me:20211: \"$ac_link\"") >&5
12375   (eval $ac_link) 2>&5
12376   ac_status=$?
12377-  echo "$as_me:19883: \$? = $ac_status" >&5
12378+  echo "$as_me:20214: \$? = $ac_status" >&5
12379   (exit $ac_status); } &&
12380          { ac_try='test -s conftest$ac_exeext'
12381-  { (eval echo "$as_me:19886: \"$ac_try\"") >&5
12382+  { (eval echo "$as_me:20217: \"$ac_try\"") >&5
12383   (eval $ac_try) 2>&5
12384   ac_status=$?
12385-  echo "$as_me:19889: \$? = $ac_status" >&5
12386+  echo "$as_me:20220: \$? = $ac_status" >&5
12387   (exit $ac_status); }; }; then
12388   cf_cv_func_vsscanf=vsscanf
12389 else
12390@@ -19894,7 +20225,7 @@
12391 cat conftest.$ac_ext >&5
12392
12393 cat >conftest.$ac_ext <<_ACEOF
12394-#line 19897 "configure"
12395+#line 20228 "configure"
12396 #include "confdefs.h"
12397
12398 #include <stdarg.h>
12399@@ -19916,16 +20247,16 @@
12400 }
12401 _ACEOF
12402 rm -f conftest.$ac_objext conftest$ac_exeext
12403-if { (eval echo "$as_me:19919: \"$ac_link\"") >&5
12404+if { (eval echo "$as_me:20250: \"$ac_link\"") >&5
12405   (eval $ac_link) 2>&5
12406   ac_status=$?
12407-  echo "$as_me:19922: \$? = $ac_status" >&5
12408+  echo "$as_me:20253: \$? = $ac_status" >&5
12409   (exit $ac_status); } &&
12410          { ac_try='test -s conftest$ac_exeext'
12411-  { (eval echo "$as_me:19925: \"$ac_try\"") >&5
12412+  { (eval echo "$as_me:20256: \"$ac_try\"") >&5
12413   (eval $ac_try) 2>&5
12414   ac_status=$?
12415-  echo "$as_me:19928: \$? = $ac_status" >&5
12416+  echo "$as_me:20259: \$? = $ac_status" >&5
12417   (exit $ac_status); }; }; then
12418   cf_cv_func_vsscanf=vfscanf
12419 else
12420@@ -19933,7 +20264,7 @@
12421 cat conftest.$ac_ext >&5
12422
12423 cat >conftest.$ac_ext <<_ACEOF
12424-#line 19936 "configure"
12425+#line 20267 "configure"
12426 #include "confdefs.h"
12427
12428 #include <stdarg.h>
12429@@ -19955,16 +20286,16 @@
12430 }
12431 _ACEOF
12432 rm -f conftest.$ac_objext conftest$ac_exeext
12433-if { (eval echo "$as_me:19958: \"$ac_link\"") >&5
12434+if { (eval echo "$as_me:20289: \"$ac_link\"") >&5
12435   (eval $ac_link) 2>&5
12436   ac_status=$?
12437-  echo "$as_me:19961: \$? = $ac_status" >&5
12438+  echo "$as_me:20292: \$? = $ac_status" >&5
12439   (exit $ac_status); } &&
12440          { ac_try='test -s conftest$ac_exeext'
12441-  { (eval echo "$as_me:19964: \"$ac_try\"") >&5
12442+  { (eval echo "$as_me:20295: \"$ac_try\"") >&5
12443   (eval $ac_try) 2>&5
12444   ac_status=$?
12445-  echo "$as_me:19967: \$? = $ac_status" >&5
12446+  echo "$as_me:20298: \$? = $ac_status" >&5
12447   (exit $ac_status); }; }; then
12448   cf_cv_func_vsscanf=_doscan
12449 else
12450@@ -19979,7 +20310,7 @@
12451 fi
12452 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
12453 fi
12454-echo "$as_me:19982: result: $cf_cv_func_vsscanf" >&5
12455+echo "$as_me:20313: result: $cf_cv_func_vsscanf" >&5
12456 echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
12457
12458 case $cf_cv_func_vsscanf in
12459@@ -20005,23 +20336,23 @@
12460
12461 do
12462 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
12463-echo "$as_me:20008: checking for $ac_header" >&5
12464+echo "$as_me:20339: checking for $ac_header" >&5
12465 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
12466 if eval "test \"\${$as_ac_Header+set}\" = set"; then
12467   echo $ECHO_N "(cached) $ECHO_C" >&6
12468 else
12469   cat >conftest.$ac_ext <<_ACEOF
12470-#line 20014 "configure"
12471+#line 20345 "configure"
12472 #include "confdefs.h"
12473 #include <$ac_header>
12474 _ACEOF
12475-if { (eval echo "$as_me:20018: \"$ac_cpp conftest.$ac_ext\"") >&5
12476+if { (eval echo "$as_me:20349: \"$ac_cpp conftest.$ac_ext\"") >&5
12477   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
12478   ac_status=$?
12479   egrep -v '^ *\+' conftest.er1 >conftest.err
12480   rm -f conftest.er1
12481   cat conftest.err >&5
12482-  echo "$as_me:20024: \$? = $ac_status" >&5
12483+  echo "$as_me:20355: \$? = $ac_status" >&5
12484   (exit $ac_status); } >/dev/null; then
12485   if test -s conftest.err; then
12486     ac_cpp_err=$ac_c_preproc_warn_flag
12487@@ -20040,7 +20371,7 @@
12488 fi
12489 rm -f conftest.err conftest.$ac_ext
12490 fi
12491-echo "$as_me:20043: result: `eval echo '${'$as_ac_Header'}'`" >&5
12492+echo "$as_me:20374: result: `eval echo '${'$as_ac_Header'}'`" >&5
12493 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
12494 if test `eval echo '${'$as_ac_Header'}'` = yes; then
12495   cat >>confdefs.h <<EOF
12496@@ -20050,7 +20381,7 @@
12497 fi
12498 done
12499
12500-echo "$as_me:20053: checking for working mkstemp" >&5
12501+echo "$as_me:20384: checking for working mkstemp" >&5
12502 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
12503 if test "${cf_cv_func_mkstemp+set}" = set; then
12504   echo $ECHO_N "(cached) $ECHO_C" >&6
12505@@ -20061,7 +20392,7 @@
12506   cf_cv_func_mkstemp=maybe
12507 else
12508   cat >conftest.$ac_ext <<_ACEOF
12509-#line 20064 "configure"
12510+#line 20395 "configure"
12511 #include "confdefs.h"
12512
12513 #include <sys/types.h>
12514@@ -20102,15 +20433,15 @@
12515
12516 _ACEOF
12517 rm -f conftest$ac_exeext
12518-if { (eval echo "$as_me:20105: \"$ac_link\"") >&5
12519+if { (eval echo "$as_me:20436: \"$ac_link\"") >&5
12520   (eval $ac_link) 2>&5
12521   ac_status=$?
12522-  echo "$as_me:20108: \$? = $ac_status" >&5
12523+  echo "$as_me:20439: \$? = $ac_status" >&5
12524   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
12525-  { (eval echo "$as_me:20110: \"$ac_try\"") >&5
12526+  { (eval echo "$as_me:20441: \"$ac_try\"") >&5
12527   (eval $ac_try) 2>&5
12528   ac_status=$?
12529-  echo "$as_me:20113: \$? = $ac_status" >&5
12530+  echo "$as_me:20444: \$? = $ac_status" >&5
12531   (exit $ac_status); }; }; then
12532   cf_cv_func_mkstemp=yes
12533
12534@@ -20125,16 +20456,16 @@
12535 fi
12536
12537 fi
12538-echo "$as_me:20128: result: $cf_cv_func_mkstemp" >&5
12539+echo "$as_me:20459: result: $cf_cv_func_mkstemp" >&5
12540 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
12541 if test "x$cf_cv_func_mkstemp" = xmaybe ; then
12542-	echo "$as_me:20131: checking for mkstemp" >&5
12543+	echo "$as_me:20462: checking for mkstemp" >&5
12544 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
12545 if test "${ac_cv_func_mkstemp+set}" = set; then
12546   echo $ECHO_N "(cached) $ECHO_C" >&6
12547 else
12548   cat >conftest.$ac_ext <<_ACEOF
12549-#line 20137 "configure"
12550+#line 20468 "configure"
12551 #include "confdefs.h"
12552 #define mkstemp autoconf_temporary
12553 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
12554@@ -20165,16 +20496,16 @@
12555 }
12556 _ACEOF
12557 rm -f conftest.$ac_objext conftest$ac_exeext
12558-if { (eval echo "$as_me:20168: \"$ac_link\"") >&5
12559+if { (eval echo "$as_me:20499: \"$ac_link\"") >&5
12560   (eval $ac_link) 2>&5
12561   ac_status=$?
12562-  echo "$as_me:20171: \$? = $ac_status" >&5
12563+  echo "$as_me:20502: \$? = $ac_status" >&5
12564   (exit $ac_status); } &&
12565          { ac_try='test -s conftest$ac_exeext'
12566-  { (eval echo "$as_me:20174: \"$ac_try\"") >&5
12567+  { (eval echo "$as_me:20505: \"$ac_try\"") >&5
12568   (eval $ac_try) 2>&5
12569   ac_status=$?
12570-  echo "$as_me:20177: \$? = $ac_status" >&5
12571+  echo "$as_me:20508: \$? = $ac_status" >&5
12572   (exit $ac_status); }; }; then
12573   ac_cv_func_mkstemp=yes
12574 else
12575@@ -20184,7 +20515,7 @@
12576 fi
12577 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
12578 fi
12579-echo "$as_me:20187: result: $ac_cv_func_mkstemp" >&5
12580+echo "$as_me:20518: result: $ac_cv_func_mkstemp" >&5
12581 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
12582
12583 fi
12584@@ -20205,21 +20536,21 @@
12585 fi
12586
12587 if test "x$cross_compiling" = xyes ; then
12588-	{ echo "$as_me:20208: WARNING: cross compiling: assume setvbuf params not reversed" >&5
12589+	{ echo "$as_me:20539: WARNING: cross compiling: assume setvbuf params not reversed" >&5
12590 echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
12591 else
12592-	echo "$as_me:20211: checking whether setvbuf arguments are reversed" >&5
12593+	echo "$as_me:20542: checking whether setvbuf arguments are reversed" >&5
12594 echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
12595 if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
12596   echo $ECHO_N "(cached) $ECHO_C" >&6
12597 else
12598   if test "$cross_compiling" = yes; then
12599-  { { echo "$as_me:20217: error: cannot run test program while cross compiling" >&5
12600+  { { echo "$as_me:20548: error: cannot run test program while cross compiling" >&5
12601 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
12602    { (exit 1); exit 1; }; }
12603 else
12604   cat >conftest.$ac_ext <<_ACEOF
12605-#line 20222 "configure"
12606+#line 20553 "configure"
12607 #include "confdefs.h"
12608 #include <stdio.h>
12609 /* If setvbuf has the reversed format, exit 0. */
12610@@ -20236,15 +20567,15 @@
12611 }
12612 _ACEOF
12613 rm -f conftest$ac_exeext
12614-if { (eval echo "$as_me:20239: \"$ac_link\"") >&5
12615+if { (eval echo "$as_me:20570: \"$ac_link\"") >&5
12616   (eval $ac_link) 2>&5
12617   ac_status=$?
12618-  echo "$as_me:20242: \$? = $ac_status" >&5
12619+  echo "$as_me:20573: \$? = $ac_status" >&5
12620   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
12621-  { (eval echo "$as_me:20244: \"$ac_try\"") >&5
12622+  { (eval echo "$as_me:20575: \"$ac_try\"") >&5
12623   (eval $ac_try) 2>&5
12624   ac_status=$?
12625-  echo "$as_me:20247: \$? = $ac_status" >&5
12626+  echo "$as_me:20578: \$? = $ac_status" >&5
12627   (exit $ac_status); }; }; then
12628   ac_cv_func_setvbuf_reversed=yes
12629 else
12630@@ -20257,7 +20588,7 @@
12631 fi
12632 rm -f core core.* *.core
12633 fi
12634-echo "$as_me:20260: result: $ac_cv_func_setvbuf_reversed" >&5
12635+echo "$as_me:20591: result: $ac_cv_func_setvbuf_reversed" >&5
12636 echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
12637 if test $ac_cv_func_setvbuf_reversed = yes; then
12638
12639@@ -20268,13 +20599,13 @@
12640 fi
12641
12642 fi
12643-echo "$as_me:20271: checking for intptr_t" >&5
12644+echo "$as_me:20602: checking for intptr_t" >&5
12645 echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
12646 if test "${ac_cv_type_intptr_t+set}" = set; then
12647   echo $ECHO_N "(cached) $ECHO_C" >&6
12648 else
12649   cat >conftest.$ac_ext <<_ACEOF
12650-#line 20277 "configure"
12651+#line 20608 "configure"
12652 #include "confdefs.h"
12653 $ac_includes_default
12654 int
12655@@ -20289,16 +20620,16 @@
12656 }
12657 _ACEOF
12658 rm -f conftest.$ac_objext
12659-if { (eval echo "$as_me:20292: \"$ac_compile\"") >&5
12660+if { (eval echo "$as_me:20623: \"$ac_compile\"") >&5
12661   (eval $ac_compile) 2>&5
12662   ac_status=$?
12663-  echo "$as_me:20295: \$? = $ac_status" >&5
12664+  echo "$as_me:20626: \$? = $ac_status" >&5
12665   (exit $ac_status); } &&
12666          { ac_try='test -s conftest.$ac_objext'
12667-  { (eval echo "$as_me:20298: \"$ac_try\"") >&5
12668+  { (eval echo "$as_me:20629: \"$ac_try\"") >&5
12669   (eval $ac_try) 2>&5
12670   ac_status=$?
12671-  echo "$as_me:20301: \$? = $ac_status" >&5
12672+  echo "$as_me:20632: \$? = $ac_status" >&5
12673   (exit $ac_status); }; }; then
12674   ac_cv_type_intptr_t=yes
12675 else
12676@@ -20308,7 +20639,7 @@
12677 fi
12678 rm -f conftest.$ac_objext conftest.$ac_ext
12679 fi
12680-echo "$as_me:20311: result: $ac_cv_type_intptr_t" >&5
12681+echo "$as_me:20642: result: $ac_cv_type_intptr_t" >&5
12682 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
12683 if test $ac_cv_type_intptr_t = yes; then
12684   :
12685@@ -20320,13 +20651,13 @@
12686
12687 fi
12688
12689-echo "$as_me:20323: checking for ssize_t" >&5
12690+echo "$as_me:20654: checking for ssize_t" >&5
12691 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
12692 if test "${ac_cv_type_ssize_t+set}" = set; then
12693   echo $ECHO_N "(cached) $ECHO_C" >&6
12694 else
12695   cat >conftest.$ac_ext <<_ACEOF
12696-#line 20329 "configure"
12697+#line 20660 "configure"
12698 #include "confdefs.h"
12699 $ac_includes_default
12700 int
12701@@ -20341,16 +20672,16 @@
12702 }
12703 _ACEOF
12704 rm -f conftest.$ac_objext
12705-if { (eval echo "$as_me:20344: \"$ac_compile\"") >&5
12706+if { (eval echo "$as_me:20675: \"$ac_compile\"") >&5
12707   (eval $ac_compile) 2>&5
12708   ac_status=$?
12709-  echo "$as_me:20347: \$? = $ac_status" >&5
12710+  echo "$as_me:20678: \$? = $ac_status" >&5
12711   (exit $ac_status); } &&
12712          { ac_try='test -s conftest.$ac_objext'
12713-  { (eval echo "$as_me:20350: \"$ac_try\"") >&5
12714+  { (eval echo "$as_me:20681: \"$ac_try\"") >&5
12715   (eval $ac_try) 2>&5
12716   ac_status=$?
12717-  echo "$as_me:20353: \$? = $ac_status" >&5
12718+  echo "$as_me:20684: \$? = $ac_status" >&5
12719   (exit $ac_status); }; }; then
12720   ac_cv_type_ssize_t=yes
12721 else
12722@@ -20360,7 +20691,7 @@
12723 fi
12724 rm -f conftest.$ac_objext conftest.$ac_ext
12725 fi
12726-echo "$as_me:20363: result: $ac_cv_type_ssize_t" >&5
12727+echo "$as_me:20694: result: $ac_cv_type_ssize_t" >&5
12728 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
12729 if test $ac_cv_type_ssize_t = yes; then
12730   :
12731@@ -20372,14 +20703,14 @@
12732
12733 fi
12734
12735-echo "$as_me:20375: checking for type sigaction_t" >&5
12736+echo "$as_me:20706: checking for type sigaction_t" >&5
12737 echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
12738 if test "${cf_cv_type_sigaction+set}" = set; then
12739   echo $ECHO_N "(cached) $ECHO_C" >&6
12740 else
12741
12742 	cat >conftest.$ac_ext <<_ACEOF
12743-#line 20382 "configure"
12744+#line 20713 "configure"
12745 #include "confdefs.h"
12746
12747 #include <signal.h>
12748@@ -20392,16 +20723,16 @@
12749 }
12750 _ACEOF
12751 rm -f conftest.$ac_objext
12752-if { (eval echo "$as_me:20395: \"$ac_compile\"") >&5
12753+if { (eval echo "$as_me:20726: \"$ac_compile\"") >&5
12754   (eval $ac_compile) 2>&5
12755   ac_status=$?
12756-  echo "$as_me:20398: \$? = $ac_status" >&5
12757+  echo "$as_me:20729: \$? = $ac_status" >&5
12758   (exit $ac_status); } &&
12759          { ac_try='test -s conftest.$ac_objext'
12760-  { (eval echo "$as_me:20401: \"$ac_try\"") >&5
12761+  { (eval echo "$as_me:20732: \"$ac_try\"") >&5
12762   (eval $ac_try) 2>&5
12763   ac_status=$?
12764-  echo "$as_me:20404: \$? = $ac_status" >&5
12765+  echo "$as_me:20735: \$? = $ac_status" >&5
12766   (exit $ac_status); }; }; then
12767   cf_cv_type_sigaction=yes
12768 else
12769@@ -20412,14 +20743,14 @@
12770 rm -f conftest.$ac_objext conftest.$ac_ext
12771 fi
12772
12773-echo "$as_me:20415: result: $cf_cv_type_sigaction" >&5
12774+echo "$as_me:20746: result: $cf_cv_type_sigaction" >&5
12775 echo "${ECHO_T}$cf_cv_type_sigaction" >&6
12776 test "$cf_cv_type_sigaction" = yes &&
12777 cat >>confdefs.h <<\EOF
12778 #define HAVE_TYPE_SIGACTION 1
12779 EOF
12780
12781-echo "$as_me:20422: checking declaration of size-change" >&5
12782+echo "$as_me:20753: checking declaration of size-change" >&5
12783 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
12784 if test "${cf_cv_sizechange+set}" = set; then
12785   echo $ECHO_N "(cached) $ECHO_C" >&6
12786@@ -20440,7 +20771,7 @@
12787
12788 	fi
12789 	cat >conftest.$ac_ext <<_ACEOF
12790-#line 20443 "configure"
12791+#line 20774 "configure"
12792 #include "confdefs.h"
12793 #include <sys/types.h>
12794 #ifdef HAVE_TERMIOS_H
12795@@ -20486,16 +20817,16 @@
12796 }
12797 _ACEOF
12798 rm -f conftest.$ac_objext
12799-if { (eval echo "$as_me:20489: \"$ac_compile\"") >&5
12800+if { (eval echo "$as_me:20820: \"$ac_compile\"") >&5
12801   (eval $ac_compile) 2>&5
12802   ac_status=$?
12803-  echo "$as_me:20492: \$? = $ac_status" >&5
12804+  echo "$as_me:20823: \$? = $ac_status" >&5
12805   (exit $ac_status); } &&
12806          { ac_try='test -s conftest.$ac_objext'
12807-  { (eval echo "$as_me:20495: \"$ac_try\"") >&5
12808+  { (eval echo "$as_me:20826: \"$ac_try\"") >&5
12809   (eval $ac_try) 2>&5
12810   ac_status=$?
12811-  echo "$as_me:20498: \$? = $ac_status" >&5
12812+  echo "$as_me:20829: \$? = $ac_status" >&5
12813   (exit $ac_status); }; }; then
12814   cf_cv_sizechange=yes
12815 else
12816@@ -20514,7 +20845,7 @@
12817 done
12818
12819 fi
12820-echo "$as_me:20517: result: $cf_cv_sizechange" >&5
12821+echo "$as_me:20848: result: $cf_cv_sizechange" >&5
12822 echo "${ECHO_T}$cf_cv_sizechange" >&6
12823 if test "$cf_cv_sizechange" != no ; then
12824
12825@@ -20532,13 +20863,13 @@
12826 	esac
12827 fi
12828
12829-echo "$as_me:20535: checking for memmove" >&5
12830+echo "$as_me:20866: checking for memmove" >&5
12831 echo $ECHO_N "checking for memmove... $ECHO_C" >&6
12832 if test "${ac_cv_func_memmove+set}" = set; then
12833   echo $ECHO_N "(cached) $ECHO_C" >&6
12834 else
12835   cat >conftest.$ac_ext <<_ACEOF
12836-#line 20541 "configure"
12837+#line 20872 "configure"
12838 #include "confdefs.h"
12839 #define memmove autoconf_temporary
12840 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
12841@@ -20569,16 +20900,16 @@
12842 }
12843 _ACEOF
12844 rm -f conftest.$ac_objext conftest$ac_exeext
12845-if { (eval echo "$as_me:20572: \"$ac_link\"") >&5
12846+if { (eval echo "$as_me:20903: \"$ac_link\"") >&5
12847   (eval $ac_link) 2>&5
12848   ac_status=$?
12849-  echo "$as_me:20575: \$? = $ac_status" >&5
12850+  echo "$as_me:20906: \$? = $ac_status" >&5
12851   (exit $ac_status); } &&
12852          { ac_try='test -s conftest$ac_exeext'
12853-  { (eval echo "$as_me:20578: \"$ac_try\"") >&5
12854+  { (eval echo "$as_me:20909: \"$ac_try\"") >&5
12855   (eval $ac_try) 2>&5
12856   ac_status=$?
12857-  echo "$as_me:20581: \$? = $ac_status" >&5
12858+  echo "$as_me:20912: \$? = $ac_status" >&5
12859   (exit $ac_status); }; }; then
12860   ac_cv_func_memmove=yes
12861 else
12862@@ -20588,19 +20919,19 @@
12863 fi
12864 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
12865 fi
12866-echo "$as_me:20591: result: $ac_cv_func_memmove" >&5
12867+echo "$as_me:20922: result: $ac_cv_func_memmove" >&5
12868 echo "${ECHO_T}$ac_cv_func_memmove" >&6
12869 if test $ac_cv_func_memmove = yes; then
12870   :
12871 else
12872
12873-echo "$as_me:20597: checking for bcopy" >&5
12874+echo "$as_me:20928: checking for bcopy" >&5
12875 echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
12876 if test "${ac_cv_func_bcopy+set}" = set; then
12877   echo $ECHO_N "(cached) $ECHO_C" >&6
12878 else
12879   cat >conftest.$ac_ext <<_ACEOF
12880-#line 20603 "configure"
12881+#line 20934 "configure"
12882 #include "confdefs.h"
12883 #define bcopy autoconf_temporary
12884 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
12885@@ -20631,16 +20962,16 @@
12886 }
12887 _ACEOF
12888 rm -f conftest.$ac_objext conftest$ac_exeext
12889-if { (eval echo "$as_me:20634: \"$ac_link\"") >&5
12890+if { (eval echo "$as_me:20965: \"$ac_link\"") >&5
12891   (eval $ac_link) 2>&5
12892   ac_status=$?
12893-  echo "$as_me:20637: \$? = $ac_status" >&5
12894+  echo "$as_me:20968: \$? = $ac_status" >&5
12895   (exit $ac_status); } &&
12896          { ac_try='test -s conftest$ac_exeext'
12897-  { (eval echo "$as_me:20640: \"$ac_try\"") >&5
12898+  { (eval echo "$as_me:20971: \"$ac_try\"") >&5
12899   (eval $ac_try) 2>&5
12900   ac_status=$?
12901-  echo "$as_me:20643: \$? = $ac_status" >&5
12902+  echo "$as_me:20974: \$? = $ac_status" >&5
12903   (exit $ac_status); }; }; then
12904   ac_cv_func_bcopy=yes
12905 else
12906@@ -20650,11 +20981,11 @@
12907 fi
12908 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
12909 fi
12910-echo "$as_me:20653: result: $ac_cv_func_bcopy" >&5
12911+echo "$as_me:20984: result: $ac_cv_func_bcopy" >&5
12912 echo "${ECHO_T}$ac_cv_func_bcopy" >&6
12913 if test $ac_cv_func_bcopy = yes; then
12914
12915-	echo "$as_me:20657: checking if bcopy does overlapping moves" >&5
12916+	echo "$as_me:20988: checking if bcopy does overlapping moves" >&5
12917 echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
12918 if test "${cf_cv_good_bcopy+set}" = set; then
12919   echo $ECHO_N "(cached) $ECHO_C" >&6
12920@@ -20664,7 +20995,7 @@
12921   cf_cv_good_bcopy=unknown
12922 else
12923   cat >conftest.$ac_ext <<_ACEOF
12924-#line 20667 "configure"
12925+#line 20998 "configure"
12926 #include "confdefs.h"
12927
12928 int main(void) {
12929@@ -20678,15 +21009,15 @@
12930
12931 _ACEOF
12932 rm -f conftest$ac_exeext
12933-if { (eval echo "$as_me:20681: \"$ac_link\"") >&5
12934+if { (eval echo "$as_me:21012: \"$ac_link\"") >&5
12935   (eval $ac_link) 2>&5
12936   ac_status=$?
12937-  echo "$as_me:20684: \$? = $ac_status" >&5
12938+  echo "$as_me:21015: \$? = $ac_status" >&5
12939   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
12940-  { (eval echo "$as_me:20686: \"$ac_try\"") >&5
12941+  { (eval echo "$as_me:21017: \"$ac_try\"") >&5
12942   (eval $ac_try) 2>&5
12943   ac_status=$?
12944-  echo "$as_me:20689: \$? = $ac_status" >&5
12945+  echo "$as_me:21020: \$? = $ac_status" >&5
12946   (exit $ac_status); }; }; then
12947   cf_cv_good_bcopy=yes
12948 else
12949@@ -20699,7 +21030,7 @@
12950 fi
12951
12952 fi
12953-echo "$as_me:20702: result: $cf_cv_good_bcopy" >&5
12954+echo "$as_me:21033: result: $cf_cv_good_bcopy" >&5
12955 echo "${ECHO_T}$cf_cv_good_bcopy" >&6
12956
12957 else
12958@@ -20726,13 +21057,13 @@
12959 for ac_func in posix_openpt
12960 do
12961 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
12962-echo "$as_me:20729: checking for $ac_func" >&5
12963+echo "$as_me:21060: checking for $ac_func" >&5
12964 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
12965 if eval "test \"\${$as_ac_var+set}\" = set"; then
12966   echo $ECHO_N "(cached) $ECHO_C" >&6
12967 else
12968   cat >conftest.$ac_ext <<_ACEOF
12969-#line 20735 "configure"
12970+#line 21066 "configure"
12971 #include "confdefs.h"
12972 #define $ac_func autoconf_temporary
12973 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
12974@@ -20763,16 +21094,16 @@
12975 }
12976 _ACEOF
12977 rm -f conftest.$ac_objext conftest$ac_exeext
12978-if { (eval echo "$as_me:20766: \"$ac_link\"") >&5
12979+if { (eval echo "$as_me:21097: \"$ac_link\"") >&5
12980   (eval $ac_link) 2>&5
12981   ac_status=$?
12982-  echo "$as_me:20769: \$? = $ac_status" >&5
12983+  echo "$as_me:21100: \$? = $ac_status" >&5
12984   (exit $ac_status); } &&
12985          { ac_try='test -s conftest$ac_exeext'
12986-  { (eval echo "$as_me:20772: \"$ac_try\"") >&5
12987+  { (eval echo "$as_me:21103: \"$ac_try\"") >&5
12988   (eval $ac_try) 2>&5
12989   ac_status=$?
12990-  echo "$as_me:20775: \$? = $ac_status" >&5
12991+  echo "$as_me:21106: \$? = $ac_status" >&5
12992   (exit $ac_status); }; }; then
12993   eval "$as_ac_var=yes"
12994 else
12995@@ -20782,7 +21113,7 @@
12996 fi
12997 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
12998 fi
12999-echo "$as_me:20785: result: `eval echo '${'$as_ac_var'}'`" >&5
13000+echo "$as_me:21116: result: `eval echo '${'$as_ac_var'}'`" >&5
13001 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
13002 if test `eval echo '${'$as_ac_var'}'` = yes; then
13003   cat >>confdefs.h <<EOF
13004@@ -20792,7 +21123,7 @@
13005 fi
13006 done
13007  }
13008-echo "$as_me:20795: checking if poll really works" >&5
13009+echo "$as_me:21126: checking if poll really works" >&5
13010 echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
13011 if test "${cf_cv_working_poll+set}" = set; then
13012   echo $ECHO_N "(cached) $ECHO_C" >&6
13013@@ -20802,7 +21133,7 @@
13014   cf_cv_working_poll=unknown
13015 else
13016   cat >conftest.$ac_ext <<_ACEOF
13017-#line 20805 "configure"
13018+#line 21136 "configure"
13019 #include "confdefs.h"
13020
13021 #include <stdlib.h>
13022@@ -20854,15 +21185,15 @@
13023 }
13024 _ACEOF
13025 rm -f conftest$ac_exeext
13026-if { (eval echo "$as_me:20857: \"$ac_link\"") >&5
13027+if { (eval echo "$as_me:21188: \"$ac_link\"") >&5
13028   (eval $ac_link) 2>&5
13029   ac_status=$?
13030-  echo "$as_me:20860: \$? = $ac_status" >&5
13031+  echo "$as_me:21191: \$? = $ac_status" >&5
13032   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
13033-  { (eval echo "$as_me:20862: \"$ac_try\"") >&5
13034+  { (eval echo "$as_me:21193: \"$ac_try\"") >&5
13035   (eval $ac_try) 2>&5
13036   ac_status=$?
13037-  echo "$as_me:20865: \$? = $ac_status" >&5
13038+  echo "$as_me:21196: \$? = $ac_status" >&5
13039   (exit $ac_status); }; }; then
13040   cf_cv_working_poll=yes
13041 else
13042@@ -20874,21 +21205,21 @@
13043 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
13044 fi
13045 fi
13046-echo "$as_me:20877: result: $cf_cv_working_poll" >&5
13047+echo "$as_me:21208: result: $cf_cv_working_poll" >&5
13048 echo "${ECHO_T}$cf_cv_working_poll" >&6
13049 test "$cf_cv_working_poll" = "yes" &&
13050 cat >>confdefs.h <<\EOF
13051 #define HAVE_WORKING_POLL 1
13052 EOF
13053
13054-echo "$as_me:20884: checking for va_copy" >&5
13055+echo "$as_me:21215: checking for va_copy" >&5
13056 echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
13057 if test "${cf_cv_have_va_copy+set}" = set; then
13058   echo $ECHO_N "(cached) $ECHO_C" >&6
13059 else
13060
13061 cat >conftest.$ac_ext <<_ACEOF
13062-#line 20891 "configure"
13063+#line 21222 "configure"
13064 #include "confdefs.h"
13065
13066 #include <stdarg.h>
13067@@ -20905,16 +21236,16 @@
13068 }
13069 _ACEOF
13070 rm -f conftest.$ac_objext conftest$ac_exeext
13071-if { (eval echo "$as_me:20908: \"$ac_link\"") >&5
13072+if { (eval echo "$as_me:21239: \"$ac_link\"") >&5
13073   (eval $ac_link) 2>&5
13074   ac_status=$?
13075-  echo "$as_me:20911: \$? = $ac_status" >&5
13076+  echo "$as_me:21242: \$? = $ac_status" >&5
13077   (exit $ac_status); } &&
13078          { ac_try='test -s conftest$ac_exeext'
13079-  { (eval echo "$as_me:20914: \"$ac_try\"") >&5
13080+  { (eval echo "$as_me:21245: \"$ac_try\"") >&5
13081   (eval $ac_try) 2>&5
13082   ac_status=$?
13083-  echo "$as_me:20917: \$? = $ac_status" >&5
13084+  echo "$as_me:21248: \$? = $ac_status" >&5
13085   (exit $ac_status); }; }; then
13086   cf_cv_have_va_copy=yes
13087 else
13088@@ -20924,7 +21255,7 @@
13089 fi
13090 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
13091 fi
13092-echo "$as_me:20927: result: $cf_cv_have_va_copy" >&5
13093+echo "$as_me:21258: result: $cf_cv_have_va_copy" >&5
13094 echo "${ECHO_T}$cf_cv_have_va_copy" >&6
13095
13096 if test "$cf_cv_have_va_copy" = yes;
13097@@ -20936,14 +21267,14 @@
13098
13099 else # !cf_cv_have_va_copy
13100
13101-echo "$as_me:20939: checking for __va_copy" >&5
13102+echo "$as_me:21270: checking for __va_copy" >&5
13103 echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
13104 if test "${cf_cv_have___va_copy+set}" = set; then
13105   echo $ECHO_N "(cached) $ECHO_C" >&6
13106 else
13107
13108 cat >conftest.$ac_ext <<_ACEOF
13109-#line 20946 "configure"
13110+#line 21277 "configure"
13111 #include "confdefs.h"
13112
13113 #include <stdarg.h>
13114@@ -20960,16 +21291,16 @@
13115 }
13116 _ACEOF
13117 rm -f conftest.$ac_objext conftest$ac_exeext
13118-if { (eval echo "$as_me:20963: \"$ac_link\"") >&5
13119+if { (eval echo "$as_me:21294: \"$ac_link\"") >&5
13120   (eval $ac_link) 2>&5
13121   ac_status=$?
13122-  echo "$as_me:20966: \$? = $ac_status" >&5
13123+  echo "$as_me:21297: \$? = $ac_status" >&5
13124   (exit $ac_status); } &&
13125          { ac_try='test -s conftest$ac_exeext'
13126-  { (eval echo "$as_me:20969: \"$ac_try\"") >&5
13127+  { (eval echo "$as_me:21300: \"$ac_try\"") >&5
13128   (eval $ac_try) 2>&5
13129   ac_status=$?
13130-  echo "$as_me:20972: \$? = $ac_status" >&5
13131+  echo "$as_me:21303: \$? = $ac_status" >&5
13132   (exit $ac_status); }; }; then
13133   cf_cv_have___va_copy=yes
13134 else
13135@@ -20979,7 +21310,7 @@
13136 fi
13137 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
13138 fi
13139-echo "$as_me:20982: result: $cf_cv_have___va_copy" >&5
13140+echo "$as_me:21313: result: $cf_cv_have___va_copy" >&5
13141 echo "${ECHO_T}$cf_cv_have___va_copy" >&6
13142
13143 if test "$cf_cv_have___va_copy" = yes
13144@@ -20991,14 +21322,14 @@
13145
13146 else # !cf_cv_have___va_copy
13147
13148-echo "$as_me:20994: checking for __builtin_va_copy" >&5
13149+echo "$as_me:21325: checking for __builtin_va_copy" >&5
13150 echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6
13151 if test "${cf_cv_have___builtin_va_copy+set}" = set; then
13152   echo $ECHO_N "(cached) $ECHO_C" >&6
13153 else
13154
13155 cat >conftest.$ac_ext <<_ACEOF
13156-#line 21001 "configure"
13157+#line 21332 "configure"
13158 #include "confdefs.h"
13159
13160 #include <stdarg.h>
13161@@ -21015,16 +21346,16 @@
13162 }
13163 _ACEOF
13164 rm -f conftest.$ac_objext conftest$ac_exeext
13165-if { (eval echo "$as_me:21018: \"$ac_link\"") >&5
13166+if { (eval echo "$as_me:21349: \"$ac_link\"") >&5
13167   (eval $ac_link) 2>&5
13168   ac_status=$?
13169-  echo "$as_me:21021: \$? = $ac_status" >&5
13170+  echo "$as_me:21352: \$? = $ac_status" >&5
13171   (exit $ac_status); } &&
13172          { ac_try='test -s conftest$ac_exeext'
13173-  { (eval echo "$as_me:21024: \"$ac_try\"") >&5
13174+  { (eval echo "$as_me:21355: \"$ac_try\"") >&5
13175   (eval $ac_try) 2>&5
13176   ac_status=$?
13177-  echo "$as_me:21027: \$? = $ac_status" >&5
13178+  echo "$as_me:21358: \$? = $ac_status" >&5
13179   (exit $ac_status); }; }; then
13180   cf_cv_have___builtin_va_copy=yes
13181 else
13182@@ -21034,7 +21365,7 @@
13183 fi
13184 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
13185 fi
13186-echo "$as_me:21037: result: $cf_cv_have___builtin_va_copy" >&5
13187+echo "$as_me:21368: result: $cf_cv_have___builtin_va_copy" >&5
13188 echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6
13189
13190 test "$cf_cv_have___builtin_va_copy" = yes &&
13191@@ -21052,14 +21383,14 @@
13192 	;;
13193
13194 (*)
13195-	echo "$as_me:21055: checking if we can simply copy va_list" >&5
13196+	echo "$as_me:21386: checking if we can simply copy va_list" >&5
13197 echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6
13198 if test "${cf_cv_pointer_va_list+set}" = set; then
13199   echo $ECHO_N "(cached) $ECHO_C" >&6
13200 else
13201
13202 cat >conftest.$ac_ext <<_ACEOF
13203-#line 21062 "configure"
13204+#line 21393 "configure"
13205 #include "confdefs.h"
13206
13207 #include <stdarg.h>
13208@@ -21076,16 +21407,16 @@
13209 }
13210 _ACEOF
13211 rm -f conftest.$ac_objext conftest$ac_exeext
13212-if { (eval echo "$as_me:21079: \"$ac_link\"") >&5
13213+if { (eval echo "$as_me:21410: \"$ac_link\"") >&5
13214   (eval $ac_link) 2>&5
13215   ac_status=$?
13216-  echo "$as_me:21082: \$? = $ac_status" >&5
13217+  echo "$as_me:21413: \$? = $ac_status" >&5
13218   (exit $ac_status); } &&
13219          { ac_try='test -s conftest$ac_exeext'
13220-  { (eval echo "$as_me:21085: \"$ac_try\"") >&5
13221+  { (eval echo "$as_me:21416: \"$ac_try\"") >&5
13222   (eval $ac_try) 2>&5
13223   ac_status=$?
13224-  echo "$as_me:21088: \$? = $ac_status" >&5
13225+  echo "$as_me:21419: \$? = $ac_status" >&5
13226   (exit $ac_status); }; }; then
13227   cf_cv_pointer_va_list=yes
13228 else
13229@@ -21095,19 +21426,19 @@
13230 fi
13231 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
13232 fi
13233-echo "$as_me:21098: result: $cf_cv_pointer_va_list" >&5
13234+echo "$as_me:21429: result: $cf_cv_pointer_va_list" >&5
13235 echo "${ECHO_T}$cf_cv_pointer_va_list" >&6
13236
13237 	if test "$cf_cv_pointer_va_list" = no
13238 	then
13239-		echo "$as_me:21103: checking if we can copy va_list indirectly" >&5
13240+		echo "$as_me:21434: checking if we can copy va_list indirectly" >&5
13241 echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6
13242 if test "${cf_cv_array_va_list+set}" = set; then
13243   echo $ECHO_N "(cached) $ECHO_C" >&6
13244 else
13245
13246 cat >conftest.$ac_ext <<_ACEOF
13247-#line 21110 "configure"
13248+#line 21441 "configure"
13249 #include "confdefs.h"
13250
13251 #include <stdarg.h>
13252@@ -21124,16 +21455,16 @@
13253 }
13254 _ACEOF
13255 rm -f conftest.$ac_objext conftest$ac_exeext
13256-if { (eval echo "$as_me:21127: \"$ac_link\"") >&5
13257+if { (eval echo "$as_me:21458: \"$ac_link\"") >&5
13258   (eval $ac_link) 2>&5
13259   ac_status=$?
13260-  echo "$as_me:21130: \$? = $ac_status" >&5
13261+  echo "$as_me:21461: \$? = $ac_status" >&5
13262   (exit $ac_status); } &&
13263          { ac_try='test -s conftest$ac_exeext'
13264-  { (eval echo "$as_me:21133: \"$ac_try\"") >&5
13265+  { (eval echo "$as_me:21464: \"$ac_try\"") >&5
13266   (eval $ac_try) 2>&5
13267   ac_status=$?
13268-  echo "$as_me:21136: \$? = $ac_status" >&5
13269+  echo "$as_me:21467: \$? = $ac_status" >&5
13270   (exit $ac_status); }; }; then
13271   cf_cv_array_va_list=yes
13272 else
13273@@ -21143,7 +21474,7 @@
13274 fi
13275 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
13276 fi
13277-echo "$as_me:21146: result: $cf_cv_array_va_list" >&5
13278+echo "$as_me:21477: result: $cf_cv_array_va_list" >&5
13279 echo "${ECHO_T}$cf_cv_array_va_list" >&6
13280 		test "$cf_cv_array_va_list" = yes &&
13281 cat >>confdefs.h <<\EOF
13282@@ -21154,13 +21485,13 @@
13283 	;;
13284 esac
13285
13286-echo "$as_me:21157: checking for pid_t" >&5
13287+echo "$as_me:21488: checking for pid_t" >&5
13288 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
13289 if test "${ac_cv_type_pid_t+set}" = set; then
13290   echo $ECHO_N "(cached) $ECHO_C" >&6
13291 else
13292   cat >conftest.$ac_ext <<_ACEOF
13293-#line 21163 "configure"
13294+#line 21494 "configure"
13295 #include "confdefs.h"
13296 $ac_includes_default
13297 int
13298@@ -21175,16 +21506,16 @@
13299 }
13300 _ACEOF
13301 rm -f conftest.$ac_objext
13302-if { (eval echo "$as_me:21178: \"$ac_compile\"") >&5
13303+if { (eval echo "$as_me:21509: \"$ac_compile\"") >&5
13304   (eval $ac_compile) 2>&5
13305   ac_status=$?
13306-  echo "$as_me:21181: \$? = $ac_status" >&5
13307+  echo "$as_me:21512: \$? = $ac_status" >&5
13308   (exit $ac_status); } &&
13309          { ac_try='test -s conftest.$ac_objext'
13310-  { (eval echo "$as_me:21184: \"$ac_try\"") >&5
13311+  { (eval echo "$as_me:21515: \"$ac_try\"") >&5
13312   (eval $ac_try) 2>&5
13313   ac_status=$?
13314-  echo "$as_me:21187: \$? = $ac_status" >&5
13315+  echo "$as_me:21518: \$? = $ac_status" >&5
13316   (exit $ac_status); }; }; then
13317   ac_cv_type_pid_t=yes
13318 else
13319@@ -21194,7 +21525,7 @@
13320 fi
13321 rm -f conftest.$ac_objext conftest.$ac_ext
13322 fi
13323-echo "$as_me:21197: result: $ac_cv_type_pid_t" >&5
13324+echo "$as_me:21528: result: $ac_cv_type_pid_t" >&5
13325 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
13326 if test $ac_cv_type_pid_t = yes; then
13327   :
13328@@ -21209,23 +21540,23 @@
13329 for ac_header in unistd.h vfork.h
13330 do
13331 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
13332-echo "$as_me:21212: checking for $ac_header" >&5
13333+echo "$as_me:21543: checking for $ac_header" >&5
13334 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
13335 if eval "test \"\${$as_ac_Header+set}\" = set"; then
13336   echo $ECHO_N "(cached) $ECHO_C" >&6
13337 else
13338   cat >conftest.$ac_ext <<_ACEOF
13339-#line 21218 "configure"
13340+#line 21549 "configure"
13341 #include "confdefs.h"
13342 #include <$ac_header>
13343 _ACEOF
13344-if { (eval echo "$as_me:21222: \"$ac_cpp conftest.$ac_ext\"") >&5
13345+if { (eval echo "$as_me:21553: \"$ac_cpp conftest.$ac_ext\"") >&5
13346   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
13347   ac_status=$?
13348   egrep -v '^ *\+' conftest.er1 >conftest.err
13349   rm -f conftest.er1
13350   cat conftest.err >&5
13351-  echo "$as_me:21228: \$? = $ac_status" >&5
13352+  echo "$as_me:21559: \$? = $ac_status" >&5
13353   (exit $ac_status); } >/dev/null; then
13354   if test -s conftest.err; then
13355     ac_cpp_err=$ac_c_preproc_warn_flag
13356@@ -21244,7 +21575,7 @@
13357 fi
13358 rm -f conftest.err conftest.$ac_ext
13359 fi
13360-echo "$as_me:21247: result: `eval echo '${'$as_ac_Header'}'`" >&5
13361+echo "$as_me:21578: result: `eval echo '${'$as_ac_Header'}'`" >&5
13362 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
13363 if test `eval echo '${'$as_ac_Header'}'` = yes; then
13364   cat >>confdefs.h <<EOF
13365@@ -21257,13 +21588,13 @@
13366 for ac_func in fork vfork
13367 do
13368 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
13369-echo "$as_me:21260: checking for $ac_func" >&5
13370+echo "$as_me:21591: checking for $ac_func" >&5
13371 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
13372 if eval "test \"\${$as_ac_var+set}\" = set"; then
13373   echo $ECHO_N "(cached) $ECHO_C" >&6
13374 else
13375   cat >conftest.$ac_ext <<_ACEOF
13376-#line 21266 "configure"
13377+#line 21597 "configure"
13378 #include "confdefs.h"
13379 #define $ac_func autoconf_temporary
13380 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
13381@@ -21294,16 +21625,16 @@
13382 }
13383 _ACEOF
13384 rm -f conftest.$ac_objext conftest$ac_exeext
13385-if { (eval echo "$as_me:21297: \"$ac_link\"") >&5
13386+if { (eval echo "$as_me:21628: \"$ac_link\"") >&5
13387   (eval $ac_link) 2>&5
13388   ac_status=$?
13389-  echo "$as_me:21300: \$? = $ac_status" >&5
13390+  echo "$as_me:21631: \$? = $ac_status" >&5
13391   (exit $ac_status); } &&
13392          { ac_try='test -s conftest$ac_exeext'
13393-  { (eval echo "$as_me:21303: \"$ac_try\"") >&5
13394+  { (eval echo "$as_me:21634: \"$ac_try\"") >&5
13395   (eval $ac_try) 2>&5
13396   ac_status=$?
13397-  echo "$as_me:21306: \$? = $ac_status" >&5
13398+  echo "$as_me:21637: \$? = $ac_status" >&5
13399   (exit $ac_status); }; }; then
13400   eval "$as_ac_var=yes"
13401 else
13402@@ -21313,7 +21644,7 @@
13403 fi
13404 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
13405 fi
13406-echo "$as_me:21316: result: `eval echo '${'$as_ac_var'}'`" >&5
13407+echo "$as_me:21647: result: `eval echo '${'$as_ac_var'}'`" >&5
13408 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
13409 if test `eval echo '${'$as_ac_var'}'` = yes; then
13410   cat >>confdefs.h <<EOF
13411@@ -21325,7 +21656,7 @@
13412
13413 ac_cv_func_fork_works=$ac_cv_func_fork
13414 if test "x$ac_cv_func_fork" = xyes; then
13415-  echo "$as_me:21328: checking for working fork" >&5
13416+  echo "$as_me:21659: checking for working fork" >&5
13417 echo $ECHO_N "checking for working fork... $ECHO_C" >&6
13418 if test "${ac_cv_func_fork_works+set}" = set; then
13419   echo $ECHO_N "(cached) $ECHO_C" >&6
13420@@ -21348,15 +21679,15 @@
13421       }
13422 _ACEOF
13423 rm -f conftest$ac_exeext
13424-if { (eval echo "$as_me:21351: \"$ac_link\"") >&5
13425+if { (eval echo "$as_me:21682: \"$ac_link\"") >&5
13426   (eval $ac_link) 2>&5
13427   ac_status=$?
13428-  echo "$as_me:21354: \$? = $ac_status" >&5
13429+  echo "$as_me:21685: \$? = $ac_status" >&5
13430   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
13431-  { (eval echo "$as_me:21356: \"$ac_try\"") >&5
13432+  { (eval echo "$as_me:21687: \"$ac_try\"") >&5
13433   (eval $ac_try) 2>&5
13434   ac_status=$?
13435-  echo "$as_me:21359: \$? = $ac_status" >&5
13436+  echo "$as_me:21690: \$? = $ac_status" >&5
13437   (exit $ac_status); }; }; then
13438   ac_cv_func_fork_works=yes
13439 else
13440@@ -21368,7 +21699,7 @@
13441 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
13442 fi
13443 fi
13444-echo "$as_me:21371: result: $ac_cv_func_fork_works" >&5
13445+echo "$as_me:21702: result: $ac_cv_func_fork_works" >&5
13446 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
13447
13448 fi
13449@@ -21382,12 +21713,12 @@
13450       ac_cv_func_fork_works=yes
13451       ;;
13452   esac
13453-  { echo "$as_me:21385: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
13454+  { echo "$as_me:21716: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
13455 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
13456 fi
13457 ac_cv_func_vfork_works=$ac_cv_func_vfork
13458 if test "x$ac_cv_func_vfork" = xyes; then
13459-  echo "$as_me:21390: checking for working vfork" >&5
13460+  echo "$as_me:21721: checking for working vfork" >&5
13461 echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
13462 if test "${ac_cv_func_vfork_works+set}" = set; then
13463   echo $ECHO_N "(cached) $ECHO_C" >&6
13464@@ -21396,7 +21727,7 @@
13465   ac_cv_func_vfork_works=cross
13466 else
13467   cat >conftest.$ac_ext <<_ACEOF
13468-#line 21399 "configure"
13469+#line 21730 "configure"
13470 #include "confdefs.h"
13471 /* Thanks to Paul Eggert for this test.  */
13472 #include <stdio.h>
13473@@ -21493,15 +21824,15 @@
13474 }
13475 _ACEOF
13476 rm -f conftest$ac_exeext
13477-if { (eval echo "$as_me:21496: \"$ac_link\"") >&5
13478+if { (eval echo "$as_me:21827: \"$ac_link\"") >&5
13479   (eval $ac_link) 2>&5
13480   ac_status=$?
13481-  echo "$as_me:21499: \$? = $ac_status" >&5
13482+  echo "$as_me:21830: \$? = $ac_status" >&5
13483   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
13484-  { (eval echo "$as_me:21501: \"$ac_try\"") >&5
13485+  { (eval echo "$as_me:21832: \"$ac_try\"") >&5
13486   (eval $ac_try) 2>&5
13487   ac_status=$?
13488-  echo "$as_me:21504: \$? = $ac_status" >&5
13489+  echo "$as_me:21835: \$? = $ac_status" >&5
13490   (exit $ac_status); }; }; then
13491   ac_cv_func_vfork_works=yes
13492 else
13493@@ -21513,13 +21844,13 @@
13494 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
13495 fi
13496 fi
13497-echo "$as_me:21516: result: $ac_cv_func_vfork_works" >&5
13498+echo "$as_me:21847: result: $ac_cv_func_vfork_works" >&5
13499 echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
13500
13501 fi;
13502 if test "x$ac_cv_func_fork_works" = xcross; then
13503   ac_cv_func_vfork_works=ac_cv_func_vfork
13504-  { echo "$as_me:21522: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
13505+  { echo "$as_me:21853: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
13506 echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
13507 fi
13508
13509@@ -21544,7 +21875,7 @@
13510
13511 fi
13512
13513-echo "$as_me:21547: checking if fopen accepts explicit binary mode" >&5
13514+echo "$as_me:21878: checking if fopen accepts explicit binary mode" >&5
13515 echo $ECHO_N "checking if fopen accepts explicit binary mode... $ECHO_C" >&6
13516 if test "${cf_cv_fopen_bin_r+set}" = set; then
13517   echo $ECHO_N "(cached) $ECHO_C" >&6
13518@@ -21554,7 +21885,7 @@
13519   cf_cv_fopen_bin_r=unknown
13520 else
13521   cat >conftest.$ac_ext <<_ACEOF
13522-#line 21557 "configure"
13523+#line 21888 "configure"
13524 #include "confdefs.h"
13525
13526 #include <stdio.h>
13527@@ -21587,15 +21918,15 @@
13528
13529 _ACEOF
13530 rm -f conftest$ac_exeext
13531-if { (eval echo "$as_me:21590: \"$ac_link\"") >&5
13532+if { (eval echo "$as_me:21921: \"$ac_link\"") >&5
13533   (eval $ac_link) 2>&5
13534   ac_status=$?
13535-  echo "$as_me:21593: \$? = $ac_status" >&5
13536+  echo "$as_me:21924: \$? = $ac_status" >&5
13537   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
13538-  { (eval echo "$as_me:21595: \"$ac_try\"") >&5
13539+  { (eval echo "$as_me:21926: \"$ac_try\"") >&5
13540   (eval $ac_try) 2>&5
13541   ac_status=$?
13542-  echo "$as_me:21598: \$? = $ac_status" >&5
13543+  echo "$as_me:21929: \$? = $ac_status" >&5
13544   (exit $ac_status); }; }; then
13545   cf_cv_fopen_bin_r=yes
13546 else
13547@@ -21608,7 +21939,7 @@
13548 fi
13549
13550 fi
13551-echo "$as_me:21611: result: $cf_cv_fopen_bin_r" >&5
13552+echo "$as_me:21942: result: $cf_cv_fopen_bin_r" >&5
13553 echo "${ECHO_T}$cf_cv_fopen_bin_r" >&6
13554 test "x$cf_cv_fopen_bin_r" != xno && cat >>confdefs.h <<\EOF
13555 #define USE_FOPEN_BIN_R 1
13556@@ -21616,7 +21947,7 @@
13557
13558 # special check for test/ditto.c
13559
13560-echo "$as_me:21619: checking for openpty in -lutil" >&5
13561+echo "$as_me:21950: checking for openpty in -lutil" >&5
13562 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
13563 if test "${ac_cv_lib_util_openpty+set}" = set; then
13564   echo $ECHO_N "(cached) $ECHO_C" >&6
13565@@ -21624,7 +21955,7 @@
13566   ac_check_lib_save_LIBS=$LIBS
13567 LIBS="-lutil  $LIBS"
13568 cat >conftest.$ac_ext <<_ACEOF
13569-#line 21627 "configure"
13570+#line 21958 "configure"
13571 #include "confdefs.h"
13572
13573 /* Override any gcc2 internal prototype to avoid an error.  */
13574@@ -21643,16 +21974,16 @@
13575 }
13576 _ACEOF
13577 rm -f conftest.$ac_objext conftest$ac_exeext
13578-if { (eval echo "$as_me:21646: \"$ac_link\"") >&5
13579+if { (eval echo "$as_me:21977: \"$ac_link\"") >&5
13580   (eval $ac_link) 2>&5
13581   ac_status=$?
13582-  echo "$as_me:21649: \$? = $ac_status" >&5
13583+  echo "$as_me:21980: \$? = $ac_status" >&5
13584   (exit $ac_status); } &&
13585          { ac_try='test -s conftest$ac_exeext'
13586-  { (eval echo "$as_me:21652: \"$ac_try\"") >&5
13587+  { (eval echo "$as_me:21983: \"$ac_try\"") >&5
13588   (eval $ac_try) 2>&5
13589   ac_status=$?
13590-  echo "$as_me:21655: \$? = $ac_status" >&5
13591+  echo "$as_me:21986: \$? = $ac_status" >&5
13592   (exit $ac_status); }; }; then
13593   ac_cv_lib_util_openpty=yes
13594 else
13595@@ -21663,7 +21994,7 @@
13596 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
13597 LIBS=$ac_check_lib_save_LIBS
13598 fi
13599-echo "$as_me:21666: result: $ac_cv_lib_util_openpty" >&5
13600+echo "$as_me:21997: result: $ac_cv_lib_util_openpty" >&5
13601 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
13602 if test $ac_cv_lib_util_openpty = yes; then
13603   cf_cv_lib_util=yes
13604@@ -21671,7 +22002,7 @@
13605   cf_cv_lib_util=no
13606 fi
13607
13608-echo "$as_me:21674: checking for openpty header" >&5
13609+echo "$as_me:22005: checking for openpty header" >&5
13610 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
13611 if test "${cf_cv_func_openpty+set}" = set; then
13612   echo $ECHO_N "(cached) $ECHO_C" >&6
13613@@ -21698,7 +22029,7 @@
13614 	for cf_header in pty.h libutil.h util.h
13615 	do
13616 	cat >conftest.$ac_ext <<_ACEOF
13617-#line 21701 "configure"
13618+#line 22032 "configure"
13619 #include "confdefs.h"
13620
13621 #include <$cf_header>
13622@@ -21715,16 +22046,16 @@
13623 }
13624 _ACEOF
13625 rm -f conftest.$ac_objext conftest$ac_exeext
13626-if { (eval echo "$as_me:21718: \"$ac_link\"") >&5
13627+if { (eval echo "$as_me:22049: \"$ac_link\"") >&5
13628   (eval $ac_link) 2>&5
13629   ac_status=$?
13630-  echo "$as_me:21721: \$? = $ac_status" >&5
13631+  echo "$as_me:22052: \$? = $ac_status" >&5
13632   (exit $ac_status); } &&
13633          { ac_try='test -s conftest$ac_exeext'
13634-  { (eval echo "$as_me:21724: \"$ac_try\"") >&5
13635+  { (eval echo "$as_me:22055: \"$ac_try\"") >&5
13636   (eval $ac_try) 2>&5
13637   ac_status=$?
13638-  echo "$as_me:21727: \$? = $ac_status" >&5
13639+  echo "$as_me:22058: \$? = $ac_status" >&5
13640   (exit $ac_status); }; }; then
13641
13642 		cf_cv_func_openpty=$cf_header
13643@@ -21742,7 +22073,7 @@
13644 	LIBS="$cf_save_LIBS"
13645
13646 fi
13647-echo "$as_me:21745: result: $cf_cv_func_openpty" >&5
13648+echo "$as_me:22076: result: $cf_cv_func_openpty" >&5
13649 echo "${ECHO_T}$cf_cv_func_openpty" >&6
13650
13651 if test "$cf_cv_func_openpty" != no ; then
13652@@ -21815,7 +22146,7 @@
13653 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
13654
13655 			  cat >conftest.$ac_ext <<_ACEOF
13656-#line 21818 "configure"
13657+#line 22149 "configure"
13658 #include "confdefs.h"
13659 #include <stdio.h>
13660 int
13661@@ -21827,16 +22158,16 @@
13662 }
13663 _ACEOF
13664 rm -f conftest.$ac_objext
13665-if { (eval echo "$as_me:21830: \"$ac_compile\"") >&5
13666+if { (eval echo "$as_me:22161: \"$ac_compile\"") >&5
13667   (eval $ac_compile) 2>&5
13668   ac_status=$?
13669-  echo "$as_me:21833: \$? = $ac_status" >&5
13670+  echo "$as_me:22164: \$? = $ac_status" >&5
13671   (exit $ac_status); } &&
13672          { ac_try='test -s conftest.$ac_objext'
13673-  { (eval echo "$as_me:21836: \"$ac_try\"") >&5
13674+  { (eval echo "$as_me:22167: \"$ac_try\"") >&5
13675   (eval $ac_try) 2>&5
13676   ac_status=$?
13677-  echo "$as_me:21839: \$? = $ac_status" >&5
13678+  echo "$as_me:22170: \$? = $ac_status" >&5
13679   (exit $ac_status); }; }; then
13680   :
13681 else
13682@@ -21853,7 +22184,7 @@
13683 		if test "$cf_have_incdir" = no ; then
13684 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
13685
13686-echo "${as_me:-configure}:21856: testing adding $cf_add_incdir to include-path ..." 1>&5
13687+echo "${as_me:-configure}:22187: testing adding $cf_add_incdir to include-path ..." 1>&5
13688
13689 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
13690
13691@@ -21889,7 +22220,7 @@
13692 			if test "$cf_have_libdir" = no ; then
13693 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
13694
13695-echo "${as_me:-configure}:21892: testing adding $cf_add_libdir to library-path ..." 1>&5
13696+echo "${as_me:-configure}:22223: testing adding $cf_add_libdir to library-path ..." 1>&5
13697
13698 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
13699 			fi
13700@@ -21900,7 +22231,7 @@
13701 	else
13702 		case "$with_hashed_db" in
13703 		(./*|../*|/*)
13704-			{ echo "$as_me:21903: WARNING: no such directory $with_hashed_db" >&5
13705+			{ echo "$as_me:22234: WARNING: no such directory $with_hashed_db" >&5
13706 echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;}
13707 			;;
13708 		(*)
13709@@ -21972,7 +22303,7 @@
13710 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
13711
13712 			  cat >conftest.$ac_ext <<_ACEOF
13713-#line 21975 "configure"
13714+#line 22306 "configure"
13715 #include "confdefs.h"
13716 #include <stdio.h>
13717 int
13718@@ -21984,16 +22315,16 @@
13719 }
13720 _ACEOF
13721 rm -f conftest.$ac_objext
13722-if { (eval echo "$as_me:21987: \"$ac_compile\"") >&5
13723+if { (eval echo "$as_me:22318: \"$ac_compile\"") >&5
13724   (eval $ac_compile) 2>&5
13725   ac_status=$?
13726-  echo "$as_me:21990: \$? = $ac_status" >&5
13727+  echo "$as_me:22321: \$? = $ac_status" >&5
13728   (exit $ac_status); } &&
13729          { ac_try='test -s conftest.$ac_objext'
13730-  { (eval echo "$as_me:21993: \"$ac_try\"") >&5
13731+  { (eval echo "$as_me:22324: \"$ac_try\"") >&5
13732   (eval $ac_try) 2>&5
13733   ac_status=$?
13734-  echo "$as_me:21996: \$? = $ac_status" >&5
13735+  echo "$as_me:22327: \$? = $ac_status" >&5
13736   (exit $ac_status); }; }; then
13737   :
13738 else
13739@@ -22010,7 +22341,7 @@
13740 		if test "$cf_have_incdir" = no ; then
13741 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
13742
13743-echo "${as_me:-configure}:22013: testing adding $cf_add_incdir to include-path ..." 1>&5
13744+echo "${as_me:-configure}:22344: testing adding $cf_add_incdir to include-path ..." 1>&5
13745
13746 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
13747
13748@@ -22090,7 +22421,7 @@
13749 			if test "$cf_have_libdir" = no ; then
13750 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
13751
13752-echo "${as_me:-configure}:22093: testing adding $cf_add_libdir to library-path ..." 1>&5
13753+echo "${as_me:-configure}:22424: testing adding $cf_add_libdir to library-path ..." 1>&5
13754
13755 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
13756 			fi
13757@@ -22107,23 +22438,23 @@
13758 	fi
13759 esac
13760
13761-echo "$as_me:22110: checking for db.h" >&5
13762+echo "$as_me:22441: checking for db.h" >&5
13763 echo $ECHO_N "checking for db.h... $ECHO_C" >&6
13764 if test "${ac_cv_header_db_h+set}" = set; then
13765   echo $ECHO_N "(cached) $ECHO_C" >&6
13766 else
13767   cat >conftest.$ac_ext <<_ACEOF
13768-#line 22116 "configure"
13769+#line 22447 "configure"
13770 #include "confdefs.h"
13771 #include <db.h>
13772 _ACEOF
13773-if { (eval echo "$as_me:22120: \"$ac_cpp conftest.$ac_ext\"") >&5
13774+if { (eval echo "$as_me:22451: \"$ac_cpp conftest.$ac_ext\"") >&5
13775   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
13776   ac_status=$?
13777   egrep -v '^ *\+' conftest.er1 >conftest.err
13778   rm -f conftest.er1
13779   cat conftest.err >&5
13780-  echo "$as_me:22126: \$? = $ac_status" >&5
13781+  echo "$as_me:22457: \$? = $ac_status" >&5
13782   (exit $ac_status); } >/dev/null; then
13783   if test -s conftest.err; then
13784     ac_cpp_err=$ac_c_preproc_warn_flag
13785@@ -22142,11 +22473,11 @@
13786 fi
13787 rm -f conftest.err conftest.$ac_ext
13788 fi
13789-echo "$as_me:22145: result: $ac_cv_header_db_h" >&5
13790+echo "$as_me:22476: result: $ac_cv_header_db_h" >&5
13791 echo "${ECHO_T}$ac_cv_header_db_h" >&6
13792 if test $ac_cv_header_db_h = yes; then
13793
13794-echo "$as_me:22149: checking for version of db" >&5
13795+echo "$as_me:22480: checking for version of db" >&5
13796 echo $ECHO_N "checking for version of db... $ECHO_C" >&6
13797 if test "${cf_cv_hashed_db_version+set}" = set; then
13798   echo $ECHO_N "(cached) $ECHO_C" >&6
13799@@ -22157,10 +22488,10 @@
13800 for cf_db_version in 1 2 3 4 5 6
13801 do
13802
13803-echo "${as_me:-configure}:22160: testing checking for db version $cf_db_version ..." 1>&5
13804+echo "${as_me:-configure}:22491: testing checking for db version $cf_db_version ..." 1>&5
13805
13806 	cat >conftest.$ac_ext <<_ACEOF
13807-#line 22163 "configure"
13808+#line 22494 "configure"
13809 #include "confdefs.h"
13810
13811 $ac_includes_default
13812@@ -22190,16 +22521,16 @@
13813 }
13814 _ACEOF
13815 rm -f conftest.$ac_objext
13816-if { (eval echo "$as_me:22193: \"$ac_compile\"") >&5
13817+if { (eval echo "$as_me:22524: \"$ac_compile\"") >&5
13818   (eval $ac_compile) 2>&5
13819   ac_status=$?
13820-  echo "$as_me:22196: \$? = $ac_status" >&5
13821+  echo "$as_me:22527: \$? = $ac_status" >&5
13822   (exit $ac_status); } &&
13823          { ac_try='test -s conftest.$ac_objext'
13824-  { (eval echo "$as_me:22199: \"$ac_try\"") >&5
13825+  { (eval echo "$as_me:22530: \"$ac_try\"") >&5
13826   (eval $ac_try) 2>&5
13827   ac_status=$?
13828-  echo "$as_me:22202: \$? = $ac_status" >&5
13829+  echo "$as_me:22533: \$? = $ac_status" >&5
13830   (exit $ac_status); }; }; then
13831
13832 	cf_cv_hashed_db_version=$cf_db_version
13833@@ -22213,16 +22544,16 @@
13834 done
13835
13836 fi
13837-echo "$as_me:22216: result: $cf_cv_hashed_db_version" >&5
13838+echo "$as_me:22547: result: $cf_cv_hashed_db_version" >&5
13839 echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
13840
13841 if test "$cf_cv_hashed_db_version" = unknown ; then
13842-	{ { echo "$as_me:22220: error: Cannot determine version of db" >&5
13843+	{ { echo "$as_me:22551: error: Cannot determine version of db" >&5
13844 echo "$as_me: error: Cannot determine version of db" >&2;}
13845    { (exit 1); exit 1; }; }
13846 else
13847
13848-echo "$as_me:22225: checking for db libraries" >&5
13849+echo "$as_me:22556: checking for db libraries" >&5
13850 echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
13851 if test "${cf_cv_hashed_db_libs+set}" = set; then
13852   echo $ECHO_N "(cached) $ECHO_C" >&6
13853@@ -22252,10 +22583,10 @@
13854
13855 	fi
13856
13857-echo "${as_me:-configure}:22255: testing checking for library "$cf_db_libs" ..." 1>&5
13858+echo "${as_me:-configure}:22586: testing checking for library "$cf_db_libs" ..." 1>&5
13859
13860 	cat >conftest.$ac_ext <<_ACEOF
13861-#line 22258 "configure"
13862+#line 22589 "configure"
13863 #include "confdefs.h"
13864
13865 $ac_includes_default
13866@@ -22310,16 +22641,16 @@
13867 }
13868 _ACEOF
13869 rm -f conftest.$ac_objext conftest$ac_exeext
13870-if { (eval echo "$as_me:22313: \"$ac_link\"") >&5
13871+if { (eval echo "$as_me:22644: \"$ac_link\"") >&5
13872   (eval $ac_link) 2>&5
13873   ac_status=$?
13874-  echo "$as_me:22316: \$? = $ac_status" >&5
13875+  echo "$as_me:22647: \$? = $ac_status" >&5
13876   (exit $ac_status); } &&
13877          { ac_try='test -s conftest$ac_exeext'
13878-  { (eval echo "$as_me:22319: \"$ac_try\"") >&5
13879+  { (eval echo "$as_me:22650: \"$ac_try\"") >&5
13880   (eval $ac_try) 2>&5
13881   ac_status=$?
13882-  echo "$as_me:22322: \$? = $ac_status" >&5
13883+  echo "$as_me:22653: \$? = $ac_status" >&5
13884   (exit $ac_status); }; }; then
13885
13886 	if test -n "$cf_db_libs" ; then
13887@@ -22339,11 +22670,11 @@
13888 done
13889
13890 fi
13891-echo "$as_me:22342: result: $cf_cv_hashed_db_libs" >&5
13892+echo "$as_me:22673: result: $cf_cv_hashed_db_libs" >&5
13893 echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
13894
13895 	if test "$cf_cv_hashed_db_libs" = unknown ; then
13896-		{ { echo "$as_me:22346: error: Cannot determine library for db" >&5
13897+		{ { echo "$as_me:22677: error: Cannot determine library for db" >&5
13898 echo "$as_me: error: Cannot determine library for db" >&2;}
13899    { (exit 1); exit 1; }; }
13900 	elif test "$cf_cv_hashed_db_libs" != default ; then
13901@@ -22369,7 +22700,7 @@
13902
13903 else
13904
13905-	{ { echo "$as_me:22372: error: Cannot find db.h" >&5
13906+	{ { echo "$as_me:22703: error: Cannot find db.h" >&5
13907 echo "$as_me: error: Cannot find db.h" >&2;}
13908    { (exit 1); exit 1; }; }
13909
13910@@ -22384,7 +22715,7 @@
13911
13912 # Just in case, check if the C compiler has a bool type.
13913
13914-echo "$as_me:22387: checking if we should include stdbool.h" >&5
13915+echo "$as_me:22718: checking if we should include stdbool.h" >&5
13916 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
13917
13918 if test "${cf_cv_header_stdbool_h+set}" = set; then
13919@@ -22392,7 +22723,7 @@
13920 else
13921
13922 	cat >conftest.$ac_ext <<_ACEOF
13923-#line 22395 "configure"
13924+#line 22726 "configure"
13925 #include "confdefs.h"
13926
13927 int
13928@@ -22404,23 +22735,23 @@
13929 }
13930 _ACEOF
13931 rm -f conftest.$ac_objext
13932-if { (eval echo "$as_me:22407: \"$ac_compile\"") >&5
13933+if { (eval echo "$as_me:22738: \"$ac_compile\"") >&5
13934   (eval $ac_compile) 2>&5
13935   ac_status=$?
13936-  echo "$as_me:22410: \$? = $ac_status" >&5
13937+  echo "$as_me:22741: \$? = $ac_status" >&5
13938   (exit $ac_status); } &&
13939          { ac_try='test -s conftest.$ac_objext'
13940-  { (eval echo "$as_me:22413: \"$ac_try\"") >&5
13941+  { (eval echo "$as_me:22744: \"$ac_try\"") >&5
13942   (eval $ac_try) 2>&5
13943   ac_status=$?
13944-  echo "$as_me:22416: \$? = $ac_status" >&5
13945+  echo "$as_me:22747: \$? = $ac_status" >&5
13946   (exit $ac_status); }; }; then
13947   cf_cv_header_stdbool_h=0
13948 else
13949   echo "$as_me: failed program was:" >&5
13950 cat conftest.$ac_ext >&5
13951 cat >conftest.$ac_ext <<_ACEOF
13952-#line 22423 "configure"
13953+#line 22754 "configure"
13954 #include "confdefs.h"
13955
13956 #ifndef __BEOS__
13957@@ -22436,16 +22767,16 @@
13958 }
13959 _ACEOF
13960 rm -f conftest.$ac_objext
13961-if { (eval echo "$as_me:22439: \"$ac_compile\"") >&5
13962+if { (eval echo "$as_me:22770: \"$ac_compile\"") >&5
13963   (eval $ac_compile) 2>&5
13964   ac_status=$?
13965-  echo "$as_me:22442: \$? = $ac_status" >&5
13966+  echo "$as_me:22773: \$? = $ac_status" >&5
13967   (exit $ac_status); } &&
13968          { ac_try='test -s conftest.$ac_objext'
13969-  { (eval echo "$as_me:22445: \"$ac_try\"") >&5
13970+  { (eval echo "$as_me:22776: \"$ac_try\"") >&5
13971   (eval $ac_try) 2>&5
13972   ac_status=$?
13973-  echo "$as_me:22448: \$? = $ac_status" >&5
13974+  echo "$as_me:22779: \$? = $ac_status" >&5
13975   (exit $ac_status); }; }; then
13976   cf_cv_header_stdbool_h=1
13977 else
13978@@ -22459,13 +22790,13 @@
13979 fi
13980
13981 if test "$cf_cv_header_stdbool_h" = 1
13982-then	echo "$as_me:22462: result: yes" >&5
13983+then	echo "$as_me:22793: result: yes" >&5
13984 echo "${ECHO_T}yes" >&6
13985-else	echo "$as_me:22464: result: no" >&5
13986+else	echo "$as_me:22795: result: no" >&5
13987 echo "${ECHO_T}no" >&6
13988 fi
13989
13990-echo "$as_me:22468: checking for builtin bool type" >&5
13991+echo "$as_me:22799: checking for builtin bool type" >&5
13992 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
13993
13994 if test "${cf_cv_cc_bool_type+set}" = set; then
13995@@ -22473,7 +22804,7 @@
13996 else
13997
13998 	cat >conftest.$ac_ext <<_ACEOF
13999-#line 22476 "configure"
14000+#line 22807 "configure"
14001 #include "confdefs.h"
14002
14003 #include <stdio.h>
14004@@ -22488,16 +22819,16 @@
14005 }
14006 _ACEOF
14007 rm -f conftest.$ac_objext
14008-if { (eval echo "$as_me:22491: \"$ac_compile\"") >&5
14009+if { (eval echo "$as_me:22822: \"$ac_compile\"") >&5
14010   (eval $ac_compile) 2>&5
14011   ac_status=$?
14012-  echo "$as_me:22494: \$? = $ac_status" >&5
14013+  echo "$as_me:22825: \$? = $ac_status" >&5
14014   (exit $ac_status); } &&
14015          { ac_try='test -s conftest.$ac_objext'
14016-  { (eval echo "$as_me:22497: \"$ac_try\"") >&5
14017+  { (eval echo "$as_me:22828: \"$ac_try\"") >&5
14018   (eval $ac_try) 2>&5
14019   ac_status=$?
14020-  echo "$as_me:22500: \$? = $ac_status" >&5
14021+  echo "$as_me:22831: \$? = $ac_status" >&5
14022   (exit $ac_status); }; }; then
14023   cf_cv_cc_bool_type=1
14024 else
14025@@ -22510,9 +22841,9 @@
14026 fi
14027
14028 if test "$cf_cv_cc_bool_type" = 1
14029-then	echo "$as_me:22513: result: yes" >&5
14030+then	echo "$as_me:22844: result: yes" >&5
14031 echo "${ECHO_T}yes" >&6
14032-else	echo "$as_me:22515: result: no" >&5
14033+else	echo "$as_me:22846: result: no" >&5
14034 echo "${ECHO_T}no" >&6
14035 fi
14036
14037@@ -22529,10 +22860,10 @@
14038
14039 	cf_save="$LIBS"
14040 	LIBS="$LIBS $CXXLIBS"
14041-	echo "$as_me:22532: checking if we already have C++ library" >&5
14042+	echo "$as_me:22863: checking if we already have C++ library" >&5
14043 echo $ECHO_N "checking if we already have C++ library... $ECHO_C" >&6
14044 	cat >conftest.$ac_ext <<_ACEOF
14045-#line 22535 "configure"
14046+#line 22866 "configure"
14047 #include "confdefs.h"
14048
14049 			#include <iostream>
14050@@ -22546,16 +22877,16 @@
14051 }
14052 _ACEOF
14053 rm -f conftest.$ac_objext conftest$ac_exeext
14054-if { (eval echo "$as_me:22549: \"$ac_link\"") >&5
14055+if { (eval echo "$as_me:22880: \"$ac_link\"") >&5
14056   (eval $ac_link) 2>&5
14057   ac_status=$?
14058-  echo "$as_me:22552: \$? = $ac_status" >&5
14059+  echo "$as_me:22883: \$? = $ac_status" >&5
14060   (exit $ac_status); } &&
14061          { ac_try='test -s conftest$ac_exeext'
14062-  { (eval echo "$as_me:22555: \"$ac_try\"") >&5
14063+  { (eval echo "$as_me:22886: \"$ac_try\"") >&5
14064   (eval $ac_try) 2>&5
14065   ac_status=$?
14066-  echo "$as_me:22558: \$? = $ac_status" >&5
14067+  echo "$as_me:22889: \$? = $ac_status" >&5
14068   (exit $ac_status); }; }; then
14069   cf_have_libstdcpp=yes
14070 else
14071@@ -22564,7 +22895,7 @@
14072 cf_have_libstdcpp=no
14073 fi
14074 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
14075-	echo "$as_me:22567: result: $cf_have_libstdcpp" >&5
14076+	echo "$as_me:22898: result: $cf_have_libstdcpp" >&5
14077 echo "${ECHO_T}$cf_have_libstdcpp" >&6
14078 	LIBS="$cf_save"
14079
14080@@ -22583,7 +22914,7 @@
14081 			;;
14082 		esac
14083
14084-		echo "$as_me:22586: checking for library $cf_stdcpp_libname" >&5
14085+		echo "$as_me:22917: checking for library $cf_stdcpp_libname" >&5
14086 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
14087 if test "${cf_cv_libstdcpp+set}" = set; then
14088   echo $ECHO_N "(cached) $ECHO_C" >&6
14089@@ -22609,7 +22940,7 @@
14090 LIBS="$cf_add_libs"
14091
14092 		cat >conftest.$ac_ext <<_ACEOF
14093-#line 22612 "configure"
14094+#line 22943 "configure"
14095 #include "confdefs.h"
14096
14097 				#include <iostream>
14098@@ -22623,16 +22954,16 @@
14099 }
14100 _ACEOF
14101 rm -f conftest.$ac_objext conftest$ac_exeext
14102-if { (eval echo "$as_me:22626: \"$ac_link\"") >&5
14103+if { (eval echo "$as_me:22957: \"$ac_link\"") >&5
14104   (eval $ac_link) 2>&5
14105   ac_status=$?
14106-  echo "$as_me:22629: \$? = $ac_status" >&5
14107+  echo "$as_me:22960: \$? = $ac_status" >&5
14108   (exit $ac_status); } &&
14109          { ac_try='test -s conftest$ac_exeext'
14110-  { (eval echo "$as_me:22632: \"$ac_try\"") >&5
14111+  { (eval echo "$as_me:22963: \"$ac_try\"") >&5
14112   (eval $ac_try) 2>&5
14113   ac_status=$?
14114-  echo "$as_me:22635: \$? = $ac_status" >&5
14115+  echo "$as_me:22966: \$? = $ac_status" >&5
14116   (exit $ac_status); }; }; then
14117   cf_cv_libstdcpp=yes
14118 else
14119@@ -22644,7 +22975,7 @@
14120 			LIBS="$cf_save"
14121
14122 fi
14123-echo "$as_me:22647: result: $cf_cv_libstdcpp" >&5
14124+echo "$as_me:22978: result: $cf_cv_libstdcpp" >&5
14125 echo "${ECHO_T}$cf_cv_libstdcpp" >&6
14126 		test "$cf_cv_libstdcpp" = yes && {
14127 cf_add_libs="-l$cf_stdcpp_libname"
14128@@ -22666,7 +22997,7 @@
14129 	fi
14130 fi
14131
14132-	echo "$as_me:22669: checking whether $CXX understands -c and -o together" >&5
14133+	echo "$as_me:23000: checking whether $CXX understands -c and -o together" >&5
14134 echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
14135 if test "${cf_cv_prog_CXX_c_o+set}" = set; then
14136   echo $ECHO_N "(cached) $ECHO_C" >&6
14137@@ -22681,15 +23012,15 @@
14138 # We do the test twice because some compilers refuse to overwrite an
14139 # existing .o file with -o, though they will create one.
14140 ac_try='$CXX $CXXFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
14141-if { (eval echo "$as_me:22684: \"$ac_try\"") >&5
14142+if { (eval echo "$as_me:23015: \"$ac_try\"") >&5
14143   (eval $ac_try) 2>&5
14144   ac_status=$?
14145-  echo "$as_me:22687: \$? = $ac_status" >&5
14146+  echo "$as_me:23018: \$? = $ac_status" >&5
14147   (exit $ac_status); } &&
14148-  test -f conftest2.$ac_objext && { (eval echo "$as_me:22689: \"$ac_try\"") >&5
14149+  test -f conftest2.$ac_objext && { (eval echo "$as_me:23020: \"$ac_try\"") >&5
14150   (eval $ac_try) 2>&5
14151   ac_status=$?
14152-  echo "$as_me:22692: \$? = $ac_status" >&5
14153+  echo "$as_me:23023: \$? = $ac_status" >&5
14154   (exit $ac_status); };
14155 then
14156   eval cf_cv_prog_CXX_c_o=yes
14157@@ -22700,10 +23031,10 @@
14158
14159 fi
14160 if test $cf_cv_prog_CXX_c_o = yes; then
14161-  echo "$as_me:22703: result: yes" >&5
14162+  echo "$as_me:23034: result: yes" >&5
14163 echo "${ECHO_T}yes" >&6
14164 else
14165-  echo "$as_me:22706: result: no" >&5
14166+  echo "$as_me:23037: result: no" >&5
14167 echo "${ECHO_T}no" >&6
14168 fi
14169
14170@@ -22723,7 +23054,7 @@
14171 	;;
14172 esac
14173 if test "$GXX" = yes; then
14174-	echo "$as_me:22726: checking for lib$cf_gpp_libname" >&5
14175+	echo "$as_me:23057: checking for lib$cf_gpp_libname" >&5
14176 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
14177 	cf_save="$LIBS"
14178
14179@@ -22744,7 +23075,7 @@
14180 LIBS="$cf_add_libs"
14181
14182 	cat >conftest.$ac_ext <<_ACEOF
14183-#line 22747 "configure"
14184+#line 23078 "configure"
14185 #include "confdefs.h"
14186
14187 #include <$cf_gpp_libname/builtin.h>
14188@@ -22758,16 +23089,16 @@
14189 }
14190 _ACEOF
14191 rm -f conftest.$ac_objext conftest$ac_exeext
14192-if { (eval echo "$as_me:22761: \"$ac_link\"") >&5
14193+if { (eval echo "$as_me:23092: \"$ac_link\"") >&5
14194   (eval $ac_link) 2>&5
14195   ac_status=$?
14196-  echo "$as_me:22764: \$? = $ac_status" >&5
14197+  echo "$as_me:23095: \$? = $ac_status" >&5
14198   (exit $ac_status); } &&
14199          { ac_try='test -s conftest$ac_exeext'
14200-  { (eval echo "$as_me:22767: \"$ac_try\"") >&5
14201+  { (eval echo "$as_me:23098: \"$ac_try\"") >&5
14202   (eval $ac_try) 2>&5
14203   ac_status=$?
14204-  echo "$as_me:22770: \$? = $ac_status" >&5
14205+  echo "$as_me:23101: \$? = $ac_status" >&5
14206   (exit $ac_status); }; }; then
14207   cf_cxx_library=yes
14208
14209@@ -22804,7 +23135,7 @@
14210   echo "$as_me: failed program was:" >&5
14211 cat conftest.$ac_ext >&5
14212 cat >conftest.$ac_ext <<_ACEOF
14213-#line 22807 "configure"
14214+#line 23138 "configure"
14215 #include "confdefs.h"
14216
14217 #include <builtin.h>
14218@@ -22818,16 +23149,16 @@
14219 }
14220 _ACEOF
14221 rm -f conftest.$ac_objext conftest$ac_exeext
14222-if { (eval echo "$as_me:22821: \"$ac_link\"") >&5
14223+if { (eval echo "$as_me:23152: \"$ac_link\"") >&5
14224   (eval $ac_link) 2>&5
14225   ac_status=$?
14226-  echo "$as_me:22824: \$? = $ac_status" >&5
14227+  echo "$as_me:23155: \$? = $ac_status" >&5
14228   (exit $ac_status); } &&
14229          { ac_try='test -s conftest$ac_exeext'
14230-  { (eval echo "$as_me:22827: \"$ac_try\"") >&5
14231+  { (eval echo "$as_me:23158: \"$ac_try\"") >&5
14232   (eval $ac_try) 2>&5
14233   ac_status=$?
14234-  echo "$as_me:22830: \$? = $ac_status" >&5
14235+  echo "$as_me:23161: \$? = $ac_status" >&5
14236   (exit $ac_status); }; }; then
14237   cf_cxx_library=yes
14238
14239@@ -22860,7 +23191,7 @@
14240 fi
14241 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
14242 	LIBS="$cf_save"
14243-	echo "$as_me:22863: result: $cf_cxx_library" >&5
14244+	echo "$as_me:23194: result: $cf_cxx_library" >&5
14245 echo "${ECHO_T}$cf_cxx_library" >&6
14246 fi
14247
14248@@ -22876,7 +23207,7 @@
14249 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
14250 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
14251 ac_main_return=return
14252-echo "$as_me:22879: checking how to run the C++ preprocessor" >&5
14253+echo "$as_me:23210: checking how to run the C++ preprocessor" >&5
14254 echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
14255 if test -z "$CXXCPP"; then
14256   if test "${ac_cv_prog_CXXCPP+set}" = set; then
14257@@ -22893,18 +23224,18 @@
14258   # On the NeXT, cc -E runs the code through the compiler's parser,
14259   # not just through cpp. "Syntax error" is here to catch this case.
14260   cat >conftest.$ac_ext <<_ACEOF
14261-#line 22896 "configure"
14262+#line 23227 "configure"
14263 #include "confdefs.h"
14264 #include <assert.h>
14265                      Syntax error
14266 _ACEOF
14267-if { (eval echo "$as_me:22901: \"$ac_cpp conftest.$ac_ext\"") >&5
14268+if { (eval echo "$as_me:23232: \"$ac_cpp conftest.$ac_ext\"") >&5
14269   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
14270   ac_status=$?
14271   egrep -v '^ *\+' conftest.er1 >conftest.err
14272   rm -f conftest.er1
14273   cat conftest.err >&5
14274-  echo "$as_me:22907: \$? = $ac_status" >&5
14275+  echo "$as_me:23238: \$? = $ac_status" >&5
14276   (exit $ac_status); } >/dev/null; then
14277   if test -s conftest.err; then
14278     ac_cpp_err=$ac_cxx_preproc_warn_flag
14279@@ -22927,17 +23258,17 @@
14280   # OK, works on sane cases.  Now check whether non-existent headers
14281   # can be detected and how.
14282   cat >conftest.$ac_ext <<_ACEOF
14283-#line 22930 "configure"
14284+#line 23261 "configure"
14285 #include "confdefs.h"
14286 #include <ac_nonexistent.h>
14287 _ACEOF
14288-if { (eval echo "$as_me:22934: \"$ac_cpp conftest.$ac_ext\"") >&5
14289+if { (eval echo "$as_me:23265: \"$ac_cpp conftest.$ac_ext\"") >&5
14290   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
14291   ac_status=$?
14292   egrep -v '^ *\+' conftest.er1 >conftest.err
14293   rm -f conftest.er1
14294   cat conftest.err >&5
14295-  echo "$as_me:22940: \$? = $ac_status" >&5
14296+  echo "$as_me:23271: \$? = $ac_status" >&5
14297   (exit $ac_status); } >/dev/null; then
14298   if test -s conftest.err; then
14299     ac_cpp_err=$ac_cxx_preproc_warn_flag
14300@@ -22974,7 +23305,7 @@
14301 else
14302   ac_cv_prog_CXXCPP=$CXXCPP
14303 fi
14304-echo "$as_me:22977: result: $CXXCPP" >&5
14305+echo "$as_me:23308: result: $CXXCPP" >&5
14306 echo "${ECHO_T}$CXXCPP" >&6
14307 ac_preproc_ok=false
14308 for ac_cxx_preproc_warn_flag in '' yes
14309@@ -22984,18 +23315,18 @@
14310   # On the NeXT, cc -E runs the code through the compiler's parser,
14311   # not just through cpp. "Syntax error" is here to catch this case.
14312   cat >conftest.$ac_ext <<_ACEOF
14313-#line 22987 "configure"
14314+#line 23318 "configure"
14315 #include "confdefs.h"
14316 #include <assert.h>
14317                      Syntax error
14318 _ACEOF
14319-if { (eval echo "$as_me:22992: \"$ac_cpp conftest.$ac_ext\"") >&5
14320+if { (eval echo "$as_me:23323: \"$ac_cpp conftest.$ac_ext\"") >&5
14321   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
14322   ac_status=$?
14323   egrep -v '^ *\+' conftest.er1 >conftest.err
14324   rm -f conftest.er1
14325   cat conftest.err >&5
14326-  echo "$as_me:22998: \$? = $ac_status" >&5
14327+  echo "$as_me:23329: \$? = $ac_status" >&5
14328   (exit $ac_status); } >/dev/null; then
14329   if test -s conftest.err; then
14330     ac_cpp_err=$ac_cxx_preproc_warn_flag
14331@@ -23018,17 +23349,17 @@
14332   # OK, works on sane cases.  Now check whether non-existent headers
14333   # can be detected and how.
14334   cat >conftest.$ac_ext <<_ACEOF
14335-#line 23021 "configure"
14336+#line 23352 "configure"
14337 #include "confdefs.h"
14338 #include <ac_nonexistent.h>
14339 _ACEOF
14340-if { (eval echo "$as_me:23025: \"$ac_cpp conftest.$ac_ext\"") >&5
14341+if { (eval echo "$as_me:23356: \"$ac_cpp conftest.$ac_ext\"") >&5
14342   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
14343   ac_status=$?
14344   egrep -v '^ *\+' conftest.er1 >conftest.err
14345   rm -f conftest.er1
14346   cat conftest.err >&5
14347-  echo "$as_me:23031: \$? = $ac_status" >&5
14348+  echo "$as_me:23362: \$? = $ac_status" >&5
14349   (exit $ac_status); } >/dev/null; then
14350   if test -s conftest.err; then
14351     ac_cpp_err=$ac_cxx_preproc_warn_flag
14352@@ -23056,7 +23387,7 @@
14353 if $ac_preproc_ok; then
14354   :
14355 else
14356-  { { echo "$as_me:23059: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
14357+  { { echo "$as_me:23390: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
14358 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
14359    { (exit 1); exit 1; }; }
14360 fi
14361@@ -23071,23 +23402,23 @@
14362 for ac_header in typeinfo
14363 do
14364 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
14365-echo "$as_me:23074: checking for $ac_header" >&5
14366+echo "$as_me:23405: checking for $ac_header" >&5
14367 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
14368 if eval "test \"\${$as_ac_Header+set}\" = set"; then
14369   echo $ECHO_N "(cached) $ECHO_C" >&6
14370 else
14371   cat >conftest.$ac_ext <<_ACEOF
14372-#line 23080 "configure"
14373+#line 23411 "configure"
14374 #include "confdefs.h"
14375 #include <$ac_header>
14376 _ACEOF
14377-if { (eval echo "$as_me:23084: \"$ac_cpp conftest.$ac_ext\"") >&5
14378+if { (eval echo "$as_me:23415: \"$ac_cpp conftest.$ac_ext\"") >&5
14379   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
14380   ac_status=$?
14381   egrep -v '^ *\+' conftest.er1 >conftest.err
14382   rm -f conftest.er1
14383   cat conftest.err >&5
14384-  echo "$as_me:23090: \$? = $ac_status" >&5
14385+  echo "$as_me:23421: \$? = $ac_status" >&5
14386   (exit $ac_status); } >/dev/null; then
14387   if test -s conftest.err; then
14388     ac_cpp_err=$ac_cxx_preproc_warn_flag
14389@@ -23106,7 +23437,7 @@
14390 fi
14391 rm -f conftest.err conftest.$ac_ext
14392 fi
14393-echo "$as_me:23109: result: `eval echo '${'$as_ac_Header'}'`" >&5
14394+echo "$as_me:23440: result: `eval echo '${'$as_ac_Header'}'`" >&5
14395 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
14396 if test `eval echo '${'$as_ac_Header'}'` = yes; then
14397   cat >>confdefs.h <<EOF
14398@@ -23119,23 +23450,23 @@
14399 for ac_header in iostream
14400 do
14401 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
14402-echo "$as_me:23122: checking for $ac_header" >&5
14403+echo "$as_me:23453: checking for $ac_header" >&5
14404 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
14405 if eval "test \"\${$as_ac_Header+set}\" = set"; then
14406   echo $ECHO_N "(cached) $ECHO_C" >&6
14407 else
14408   cat >conftest.$ac_ext <<_ACEOF
14409-#line 23128 "configure"
14410+#line 23459 "configure"
14411 #include "confdefs.h"
14412 #include <$ac_header>
14413 _ACEOF
14414-if { (eval echo "$as_me:23132: \"$ac_cpp conftest.$ac_ext\"") >&5
14415+if { (eval echo "$as_me:23463: \"$ac_cpp conftest.$ac_ext\"") >&5
14416   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
14417   ac_status=$?
14418   egrep -v '^ *\+' conftest.er1 >conftest.err
14419   rm -f conftest.er1
14420   cat conftest.err >&5
14421-  echo "$as_me:23138: \$? = $ac_status" >&5
14422+  echo "$as_me:23469: \$? = $ac_status" >&5
14423   (exit $ac_status); } >/dev/null; then
14424   if test -s conftest.err; then
14425     ac_cpp_err=$ac_cxx_preproc_warn_flag
14426@@ -23154,7 +23485,7 @@
14427 fi
14428 rm -f conftest.err conftest.$ac_ext
14429 fi
14430-echo "$as_me:23157: result: `eval echo '${'$as_ac_Header'}'`" >&5
14431+echo "$as_me:23488: result: `eval echo '${'$as_ac_Header'}'`" >&5
14432 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
14433 if test `eval echo '${'$as_ac_Header'}'` = yes; then
14434   cat >>confdefs.h <<EOF
14435@@ -23165,10 +23496,10 @@
14436 done
14437
14438 if test x"$ac_cv_header_iostream" = xyes ; then
14439-	echo "$as_me:23168: checking if iostream uses std-namespace" >&5
14440+	echo "$as_me:23499: checking if iostream uses std-namespace" >&5
14441 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
14442 	cat >conftest.$ac_ext <<_ACEOF
14443-#line 23171 "configure"
14444+#line 23502 "configure"
14445 #include "confdefs.h"
14446
14447 #include <iostream>
14448@@ -23185,16 +23516,16 @@
14449 }
14450 _ACEOF
14451 rm -f conftest.$ac_objext
14452-if { (eval echo "$as_me:23188: \"$ac_compile\"") >&5
14453+if { (eval echo "$as_me:23519: \"$ac_compile\"") >&5
14454   (eval $ac_compile) 2>&5
14455   ac_status=$?
14456-  echo "$as_me:23191: \$? = $ac_status" >&5
14457+  echo "$as_me:23522: \$? = $ac_status" >&5
14458   (exit $ac_status); } &&
14459          { ac_try='test -s conftest.$ac_objext'
14460-  { (eval echo "$as_me:23194: \"$ac_try\"") >&5
14461+  { (eval echo "$as_me:23525: \"$ac_try\"") >&5
14462   (eval $ac_try) 2>&5
14463   ac_status=$?
14464-  echo "$as_me:23197: \$? = $ac_status" >&5
14465+  echo "$as_me:23528: \$? = $ac_status" >&5
14466   (exit $ac_status); }; }; then
14467   cf_iostream_namespace=yes
14468 else
14469@@ -23203,7 +23534,7 @@
14470 cf_iostream_namespace=no
14471 fi
14472 rm -f conftest.$ac_objext conftest.$ac_ext
14473-	echo "$as_me:23206: result: $cf_iostream_namespace" >&5
14474+	echo "$as_me:23537: result: $cf_iostream_namespace" >&5
14475 echo "${ECHO_T}$cf_iostream_namespace" >&6
14476 	if test "$cf_iostream_namespace" = yes ; then
14477
14478@@ -23214,7 +23545,7 @@
14479 	fi
14480 fi
14481
14482-echo "$as_me:23217: checking if we should include stdbool.h" >&5
14483+echo "$as_me:23548: checking if we should include stdbool.h" >&5
14484 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
14485
14486 if test "${cf_cv_header_stdbool_h+set}" = set; then
14487@@ -23222,7 +23553,7 @@
14488 else
14489
14490 	cat >conftest.$ac_ext <<_ACEOF
14491-#line 23225 "configure"
14492+#line 23556 "configure"
14493 #include "confdefs.h"
14494
14495 int
14496@@ -23234,23 +23565,23 @@
14497 }
14498 _ACEOF
14499 rm -f conftest.$ac_objext
14500-if { (eval echo "$as_me:23237: \"$ac_compile\"") >&5
14501+if { (eval echo "$as_me:23568: \"$ac_compile\"") >&5
14502   (eval $ac_compile) 2>&5
14503   ac_status=$?
14504-  echo "$as_me:23240: \$? = $ac_status" >&5
14505+  echo "$as_me:23571: \$? = $ac_status" >&5
14506   (exit $ac_status); } &&
14507          { ac_try='test -s conftest.$ac_objext'
14508-  { (eval echo "$as_me:23243: \"$ac_try\"") >&5
14509+  { (eval echo "$as_me:23574: \"$ac_try\"") >&5
14510   (eval $ac_try) 2>&5
14511   ac_status=$?
14512-  echo "$as_me:23246: \$? = $ac_status" >&5
14513+  echo "$as_me:23577: \$? = $ac_status" >&5
14514   (exit $ac_status); }; }; then
14515   cf_cv_header_stdbool_h=0
14516 else
14517   echo "$as_me: failed program was:" >&5
14518 cat conftest.$ac_ext >&5
14519 cat >conftest.$ac_ext <<_ACEOF
14520-#line 23253 "configure"
14521+#line 23584 "configure"
14522 #include "confdefs.h"
14523
14524 #ifndef __BEOS__
14525@@ -23266,16 +23597,16 @@
14526 }
14527 _ACEOF
14528 rm -f conftest.$ac_objext
14529-if { (eval echo "$as_me:23269: \"$ac_compile\"") >&5
14530+if { (eval echo "$as_me:23600: \"$ac_compile\"") >&5
14531   (eval $ac_compile) 2>&5
14532   ac_status=$?
14533-  echo "$as_me:23272: \$? = $ac_status" >&5
14534+  echo "$as_me:23603: \$? = $ac_status" >&5
14535   (exit $ac_status); } &&
14536          { ac_try='test -s conftest.$ac_objext'
14537-  { (eval echo "$as_me:23275: \"$ac_try\"") >&5
14538+  { (eval echo "$as_me:23606: \"$ac_try\"") >&5
14539   (eval $ac_try) 2>&5
14540   ac_status=$?
14541-  echo "$as_me:23278: \$? = $ac_status" >&5
14542+  echo "$as_me:23609: \$? = $ac_status" >&5
14543   (exit $ac_status); }; }; then
14544   cf_cv_header_stdbool_h=1
14545 else
14546@@ -23289,13 +23620,13 @@
14547 fi
14548
14549 if test "$cf_cv_header_stdbool_h" = 1
14550-then	echo "$as_me:23292: result: yes" >&5
14551+then	echo "$as_me:23623: result: yes" >&5
14552 echo "${ECHO_T}yes" >&6
14553-else	echo "$as_me:23294: result: no" >&5
14554+else	echo "$as_me:23625: result: no" >&5
14555 echo "${ECHO_T}no" >&6
14556 fi
14557
14558-echo "$as_me:23298: checking for builtin bool type" >&5
14559+echo "$as_me:23629: checking for builtin bool type" >&5
14560 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
14561
14562 if test "${cf_cv_builtin_bool+set}" = set; then
14563@@ -23303,7 +23634,7 @@
14564 else
14565
14566 	cat >conftest.$ac_ext <<_ACEOF
14567-#line 23306 "configure"
14568+#line 23637 "configure"
14569 #include "confdefs.h"
14570
14571 #include <stdio.h>
14572@@ -23318,16 +23649,16 @@
14573 }
14574 _ACEOF
14575 rm -f conftest.$ac_objext
14576-if { (eval echo "$as_me:23321: \"$ac_compile\"") >&5
14577+if { (eval echo "$as_me:23652: \"$ac_compile\"") >&5
14578   (eval $ac_compile) 2>&5
14579   ac_status=$?
14580-  echo "$as_me:23324: \$? = $ac_status" >&5
14581+  echo "$as_me:23655: \$? = $ac_status" >&5
14582   (exit $ac_status); } &&
14583          { ac_try='test -s conftest.$ac_objext'
14584-  { (eval echo "$as_me:23327: \"$ac_try\"") >&5
14585+  { (eval echo "$as_me:23658: \"$ac_try\"") >&5
14586   (eval $ac_try) 2>&5
14587   ac_status=$?
14588-  echo "$as_me:23330: \$? = $ac_status" >&5
14589+  echo "$as_me:23661: \$? = $ac_status" >&5
14590   (exit $ac_status); }; }; then
14591   cf_cv_builtin_bool=1
14592 else
14593@@ -23340,13 +23671,13 @@
14594 fi
14595
14596 if test "$cf_cv_builtin_bool" = 1
14597-then	echo "$as_me:23343: result: yes" >&5
14598+then	echo "$as_me:23674: result: yes" >&5
14599 echo "${ECHO_T}yes" >&6
14600-else	echo "$as_me:23345: result: no" >&5
14601+else	echo "$as_me:23676: result: no" >&5
14602 echo "${ECHO_T}no" >&6
14603 fi
14604
14605-echo "$as_me:23349: checking for size of bool" >&5
14606+echo "$as_me:23680: checking for size of bool" >&5
14607 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
14608 if test "${cf_cv_type_of_bool+set}" = set; then
14609   echo $ECHO_N "(cached) $ECHO_C" >&6
14610@@ -23357,7 +23688,7 @@
14611   cf_cv_type_of_bool=unknown
14612 else
14613   cat >conftest.$ac_ext <<_ACEOF
14614-#line 23360 "configure"
14615+#line 23691 "configure"
14616 #include "confdefs.h"
14617
14618 #include <stdlib.h>
14619@@ -23399,15 +23730,15 @@
14620
14621 _ACEOF
14622 rm -f conftest$ac_exeext
14623-if { (eval echo "$as_me:23402: \"$ac_link\"") >&5
14624+if { (eval echo "$as_me:23733: \"$ac_link\"") >&5
14625   (eval $ac_link) 2>&5
14626   ac_status=$?
14627-  echo "$as_me:23405: \$? = $ac_status" >&5
14628+  echo "$as_me:23736: \$? = $ac_status" >&5
14629   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
14630-  { (eval echo "$as_me:23407: \"$ac_try\"") >&5
14631+  { (eval echo "$as_me:23738: \"$ac_try\"") >&5
14632   (eval $ac_try) 2>&5
14633   ac_status=$?
14634-  echo "$as_me:23410: \$? = $ac_status" >&5
14635+  echo "$as_me:23741: \$? = $ac_status" >&5
14636   (exit $ac_status); }; }; then
14637   cf_cv_type_of_bool=`cat cf_test.out`
14638 		 if test -z "$cf_cv_type_of_bool"; then
14639@@ -23425,18 +23756,18 @@
14640 fi
14641
14642 	rm -f cf_test.out
14643-echo "$as_me:23428: result: $cf_cv_type_of_bool" >&5
14644+echo "$as_me:23759: result: $cf_cv_type_of_bool" >&5
14645 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
14646 if test "$cf_cv_type_of_bool" = unknown ; then
14647 	case .$NCURSES_BOOL in
14648 	(.auto|.) NCURSES_BOOL=unsigned;;
14649 	esac
14650-	{ echo "$as_me:23434: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
14651+	{ echo "$as_me:23765: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
14652 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
14653 	cf_cv_type_of_bool=$NCURSES_BOOL
14654 fi
14655
14656-echo "$as_me:23439: checking for special defines needed for etip.h" >&5
14657+echo "$as_me:23770: checking for special defines needed for etip.h" >&5
14658 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
14659 cf_save_CXXFLAGS="$CXXFLAGS"
14660 cf_result="none"
14661@@ -23454,7 +23785,7 @@
14662 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
14663 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
14664 cat >conftest.$ac_ext <<_ACEOF
14665-#line 23457 "configure"
14666+#line 23788 "configure"
14667 #include "confdefs.h"
14668
14669 #include <etip.h.in>
14670@@ -23468,16 +23799,16 @@
14671 }
14672 _ACEOF
14673 rm -f conftest.$ac_objext
14674-if { (eval echo "$as_me:23471: \"$ac_compile\"") >&5
14675+if { (eval echo "$as_me:23802: \"$ac_compile\"") >&5
14676   (eval $ac_compile) 2>&5
14677   ac_status=$?
14678-  echo "$as_me:23474: \$? = $ac_status" >&5
14679+  echo "$as_me:23805: \$? = $ac_status" >&5
14680   (exit $ac_status); } &&
14681          { ac_try='test -s conftest.$ac_objext'
14682-  { (eval echo "$as_me:23477: \"$ac_try\"") >&5
14683+  { (eval echo "$as_me:23808: \"$ac_try\"") >&5
14684   (eval $ac_try) 2>&5
14685   ac_status=$?
14686-  echo "$as_me:23480: \$? = $ac_status" >&5
14687+  echo "$as_me:23811: \$? = $ac_status" >&5
14688   (exit $ac_status); }; }; then
14689
14690 	test -n "$cf_math" && cat >>confdefs.h <<EOF
14691@@ -23498,12 +23829,12 @@
14692 rm -f conftest.$ac_objext conftest.$ac_ext
14693 done
14694 done
14695-echo "$as_me:23501: result: $cf_result" >&5
14696+echo "$as_me:23832: result: $cf_result" >&5
14697 echo "${ECHO_T}$cf_result" >&6
14698 CXXFLAGS="$cf_save_CXXFLAGS"
14699
14700 if test -n "$CXX"; then
14701-echo "$as_me:23506: checking if $CXX accepts parameter initialization" >&5
14702+echo "$as_me:23837: checking if $CXX accepts parameter initialization" >&5
14703 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
14704 if test "${cf_cv_cpp_param_init+set}" = set; then
14705   echo $ECHO_N "(cached) $ECHO_C" >&6
14706@@ -23520,7 +23851,7 @@
14707   cf_cv_cpp_param_init=unknown
14708 else
14709   cat >conftest.$ac_ext <<_ACEOF
14710-#line 23523 "configure"
14711+#line 23854 "configure"
14712 #include "confdefs.h"
14713
14714 class TEST {
14715@@ -23539,15 +23870,15 @@
14716
14717 _ACEOF
14718 rm -f conftest$ac_exeext
14719-if { (eval echo "$as_me:23542: \"$ac_link\"") >&5
14720+if { (eval echo "$as_me:23873: \"$ac_link\"") >&5
14721   (eval $ac_link) 2>&5
14722   ac_status=$?
14723-  echo "$as_me:23545: \$? = $ac_status" >&5
14724+  echo "$as_me:23876: \$? = $ac_status" >&5
14725   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
14726-  { (eval echo "$as_me:23547: \"$ac_try\"") >&5
14727+  { (eval echo "$as_me:23878: \"$ac_try\"") >&5
14728   (eval $ac_try) 2>&5
14729   ac_status=$?
14730-  echo "$as_me:23550: \$? = $ac_status" >&5
14731+  echo "$as_me:23881: \$? = $ac_status" >&5
14732   (exit $ac_status); }; }; then
14733   cf_cv_cpp_param_init=yes
14734 else
14735@@ -23566,7 +23897,7 @@
14736 ac_main_return=return
14737
14738 fi
14739-echo "$as_me:23569: result: $cf_cv_cpp_param_init" >&5
14740+echo "$as_me:23900: result: $cf_cv_cpp_param_init" >&5
14741 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
14742 fi
14743 test "$cf_cv_cpp_param_init" = yes &&
14744@@ -23576,7 +23907,7 @@
14745
14746 if test -n "$CXX"; then
14747
14748-echo "$as_me:23579: checking if $CXX accepts static_cast" >&5
14749+echo "$as_me:23910: checking if $CXX accepts static_cast" >&5
14750 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
14751 if test "${cf_cv_cpp_static_cast+set}" = set; then
14752   echo $ECHO_N "(cached) $ECHO_C" >&6
14753@@ -23590,7 +23921,7 @@
14754 ac_main_return=return
14755
14756 	cat >conftest.$ac_ext <<_ACEOF
14757-#line 23593 "configure"
14758+#line 23924 "configure"
14759 #include "confdefs.h"
14760
14761 class NCursesPanel
14762@@ -23634,16 +23965,16 @@
14763 }
14764 _ACEOF
14765 rm -f conftest.$ac_objext
14766-if { (eval echo "$as_me:23637: \"$ac_compile\"") >&5
14767+if { (eval echo "$as_me:23968: \"$ac_compile\"") >&5
14768   (eval $ac_compile) 2>&5
14769   ac_status=$?
14770-  echo "$as_me:23640: \$? = $ac_status" >&5
14771+  echo "$as_me:23971: \$? = $ac_status" >&5
14772   (exit $ac_status); } &&
14773          { ac_try='test -s conftest.$ac_objext'
14774-  { (eval echo "$as_me:23643: \"$ac_try\"") >&5
14775+  { (eval echo "$as_me:23974: \"$ac_try\"") >&5
14776   (eval $ac_try) 2>&5
14777   ac_status=$?
14778-  echo "$as_me:23646: \$? = $ac_status" >&5
14779+  echo "$as_me:23977: \$? = $ac_status" >&5
14780   (exit $ac_status); }; }; then
14781   cf_cv_cpp_static_cast=yes
14782 else
14783@@ -23661,7 +23992,7 @@
14784 ac_main_return=return
14785
14786 fi
14787-echo "$as_me:23664: result: $cf_cv_cpp_static_cast" >&5
14788+echo "$as_me:23995: result: $cf_cv_cpp_static_cast" >&5
14789 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
14790
14791 fi
14792@@ -23710,7 +24041,7 @@
14793 	else
14794 		if test "$cf_cv_header_stdbool_h" = 1 ; then
14795
14796-echo "$as_me:23713: checking for size of bool" >&5
14797+echo "$as_me:24044: checking for size of bool" >&5
14798 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
14799 if test "${cf_cv_type_of_bool+set}" = set; then
14800   echo $ECHO_N "(cached) $ECHO_C" >&6
14801@@ -23721,7 +24052,7 @@
14802   cf_cv_type_of_bool=unknown
14803 else
14804   cat >conftest.$ac_ext <<_ACEOF
14805-#line 23724 "configure"
14806+#line 24055 "configure"
14807 #include "confdefs.h"
14808
14809 #include <stdlib.h>
14810@@ -23763,15 +24094,15 @@
14811
14812 _ACEOF
14813 rm -f conftest$ac_exeext
14814-if { (eval echo "$as_me:23766: \"$ac_link\"") >&5
14815+if { (eval echo "$as_me:24097: \"$ac_link\"") >&5
14816   (eval $ac_link) 2>&5
14817   ac_status=$?
14818-  echo "$as_me:23769: \$? = $ac_status" >&5
14819+  echo "$as_me:24100: \$? = $ac_status" >&5
14820   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
14821-  { (eval echo "$as_me:23771: \"$ac_try\"") >&5
14822+  { (eval echo "$as_me:24102: \"$ac_try\"") >&5
14823   (eval $ac_try) 2>&5
14824   ac_status=$?
14825-  echo "$as_me:23774: \$? = $ac_status" >&5
14826+  echo "$as_me:24105: \$? = $ac_status" >&5
14827   (exit $ac_status); }; }; then
14828   cf_cv_type_of_bool=`cat cf_test.out`
14829 		 if test -z "$cf_cv_type_of_bool"; then
14830@@ -23789,25 +24120,25 @@
14831 fi
14832
14833 	rm -f cf_test.out
14834-echo "$as_me:23792: result: $cf_cv_type_of_bool" >&5
14835+echo "$as_me:24123: result: $cf_cv_type_of_bool" >&5
14836 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
14837 if test "$cf_cv_type_of_bool" = unknown ; then
14838 	case .$NCURSES_BOOL in
14839 	(.auto|.) NCURSES_BOOL=unsigned;;
14840 	esac
14841-	{ echo "$as_me:23798: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
14842+	{ echo "$as_me:24129: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
14843 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
14844 	cf_cv_type_of_bool=$NCURSES_BOOL
14845 fi
14846
14847 		else
14848-			echo "$as_me:23804: checking for fallback type of bool" >&5
14849+			echo "$as_me:24135: checking for fallback type of bool" >&5
14850 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
14851 			case "$host_cpu" in
14852 			(i?86)	cf_cv_type_of_bool=char	;;
14853 			(*)	cf_cv_type_of_bool=int	;;
14854 			esac
14855-			echo "$as_me:23810: result: $cf_cv_type_of_bool" >&5
14856+			echo "$as_me:24141: result: $cf_cv_type_of_bool" >&5
14857 echo "${ECHO_T}$cf_cv_type_of_bool" >&6
14858 		fi
14859 	fi
14860@@ -23836,7 +24167,7 @@
14861
14862 	if test "$cf_with_ada" != "no" ; then
14863 		if test "$with_libtool" != "no"; then
14864-			{ echo "$as_me:23839: WARNING: libtool does not support Ada - disabling feature" >&5
14865+			{ echo "$as_me:24170: WARNING: libtool does not support Ada - disabling feature" >&5
14866 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
14867 			cf_with_ada=no
14868 		fi
14869@@ -23848,7 +24179,7 @@
14870 cf_ada_config="#"
14871 # Extract the first word of "$cf_ada_make", so it can be a program name with args.
14872 set dummy $cf_ada_make; ac_word=$2
14873-echo "$as_me:23851: checking for $ac_word" >&5
14874+echo "$as_me:24182: checking for $ac_word" >&5
14875 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
14876 if test "${ac_cv_prog_gnatmake_exists+set}" = set; then
14877   echo $ECHO_N "(cached) $ECHO_C" >&6
14878@@ -23863,7 +24194,7 @@
14879   test -z "$ac_dir" && ac_dir=.
14880   $as_executable_p "$ac_dir/$ac_word" || continue
14881 ac_cv_prog_gnatmake_exists="yes"
14882-echo "$as_me:23866: found $ac_dir/$ac_word" >&5
14883+echo "$as_me:24197: found $ac_dir/$ac_word" >&5
14884 break
14885 done
14886
14887@@ -23872,10 +24203,10 @@
14888 fi
14889 gnatmake_exists=$ac_cv_prog_gnatmake_exists
14890 if test -n "$gnatmake_exists"; then
14891-  echo "$as_me:23875: result: $gnatmake_exists" >&5
14892+  echo "$as_me:24206: result: $gnatmake_exists" >&5
14893 echo "${ECHO_T}$gnatmake_exists" >&6
14894 else
14895-  echo "$as_me:23878: result: no" >&5
14896+  echo "$as_me:24209: result: no" >&5
14897 echo "${ECHO_T}no" >&6
14898 fi
14899
14900@@ -23885,7 +24216,7 @@
14901 else
14902 	# Extract the first word of "gprconfig", so it can be a program name with args.
14903 set dummy gprconfig; ac_word=$2
14904-echo "$as_me:23888: checking for $ac_word" >&5
14905+echo "$as_me:24219: checking for $ac_word" >&5
14906 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
14907 if test "${ac_cv_prog_gprconfig_exists+set}" = set; then
14908   echo $ECHO_N "(cached) $ECHO_C" >&6
14909@@ -23900,7 +24231,7 @@
14910   test -z "$ac_dir" && ac_dir=.
14911   $as_executable_p "$ac_dir/$ac_word" || continue
14912 ac_cv_prog_gprconfig_exists="yes"
14913-echo "$as_me:23903: found $ac_dir/$ac_word" >&5
14914+echo "$as_me:24234: found $ac_dir/$ac_word" >&5
14915 break
14916 done
14917
14918@@ -23909,10 +24240,10 @@
14919 fi
14920 gprconfig_exists=$ac_cv_prog_gprconfig_exists
14921 if test -n "$gprconfig_exists"; then
14922-  echo "$as_me:23912: result: $gprconfig_exists" >&5
14923+  echo "$as_me:24243: result: $gprconfig_exists" >&5
14924 echo "${ECHO_T}$gprconfig_exists" >&6
14925 else
14926-  echo "$as_me:23915: result: no" >&5
14927+  echo "$as_me:24246: result: no" >&5
14928 echo "${ECHO_T}no" >&6
14929 fi
14930
14931@@ -23925,7 +24256,7 @@
14932 			cd conftest.src
14933 			for cf_gprconfig in Ada C
14934 			do
14935-				echo "$as_me:23928: checking for gprconfig name for $cf_gprconfig" >&5
14936+				echo "$as_me:24259: checking for gprconfig name for $cf_gprconfig" >&5
14937 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6
14938 				if test $cf_gprconfig = C
14939 				then
14940@@ -23944,10 +24275,10 @@
14941 				if test -n "$cf_gprconfig_value"
14942 				then
14943 					eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value
14944-					echo "$as_me:23947: result: $cf_gprconfig_value" >&5
14945+					echo "$as_me:24278: result: $cf_gprconfig_value" >&5
14946 echo "${ECHO_T}$cf_gprconfig_value" >&6
14947 				else
14948-					echo "$as_me:23950: result: missing" >&5
14949+					echo "$as_me:24281: result: missing" >&5
14950 echo "${ECHO_T}missing" >&6
14951 					cf_ada_config="#"
14952 					break
14953@@ -23963,12 +24294,12 @@
14954 	if test "x$cf_ada_config" != "x#"
14955 	then
14956
14957-echo "$as_me:23966: checking for gnat version" >&5
14958+echo "$as_me:24297: checking for gnat version" >&5
14959 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
14960 cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
14961 	grep '[0-9].[0-9][0-9]*' |\
14962 	sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
14963-echo "$as_me:23971: result: $cf_gnat_version" >&5
14964+echo "$as_me:24302: result: $cf_gnat_version" >&5
14965 echo "${ECHO_T}$cf_gnat_version" >&6
14966
14967 case $cf_gnat_version in
14968@@ -23976,7 +24307,7 @@
14969 	cf_cv_prog_gnat_correct=yes
14970 	;;
14971 (*)
14972-	{ echo "$as_me:23979: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
14973+	{ echo "$as_me:24310: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
14974 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
14975 	cf_cv_prog_gnat_correct=no
14976 	;;
14977@@ -23984,7 +24315,7 @@
14978
14979 		# Extract the first word of "m4", so it can be a program name with args.
14980 set dummy m4; ac_word=$2
14981-echo "$as_me:23987: checking for $ac_word" >&5
14982+echo "$as_me:24318: checking for $ac_word" >&5
14983 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
14984 if test "${ac_cv_prog_M4_exists+set}" = set; then
14985   echo $ECHO_N "(cached) $ECHO_C" >&6
14986@@ -23999,7 +24330,7 @@
14987   test -z "$ac_dir" && ac_dir=.
14988   $as_executable_p "$ac_dir/$ac_word" || continue
14989 ac_cv_prog_M4_exists="yes"
14990-echo "$as_me:24002: found $ac_dir/$ac_word" >&5
14991+echo "$as_me:24333: found $ac_dir/$ac_word" >&5
14992 break
14993 done
14994
14995@@ -24008,10 +24339,10 @@
14996 fi
14997 M4_exists=$ac_cv_prog_M4_exists
14998 if test -n "$M4_exists"; then
14999-  echo "$as_me:24011: result: $M4_exists" >&5
15000+  echo "$as_me:24342: result: $M4_exists" >&5
15001 echo "${ECHO_T}$M4_exists" >&6
15002 else
15003-  echo "$as_me:24014: result: no" >&5
15004+  echo "$as_me:24345: result: no" >&5
15005 echo "${ECHO_T}no" >&6
15006 fi
15007
15008@@ -24020,7 +24351,7 @@
15009 			echo Ada95 binding required program m4 not found. Ada95 binding disabled.
15010 		fi
15011 		if test "$cf_cv_prog_gnat_correct" = yes; then
15012-			echo "$as_me:24023: checking if GNAT works" >&5
15013+			echo "$as_me:24354: checking if GNAT works" >&5
15014 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
15015
15016 rm -rf conftest* *~conftest*
15017@@ -24048,7 +24379,7 @@
15018 fi
15019 rm -rf conftest* *~conftest*
15020
15021-			echo "$as_me:24051: result: $cf_cv_prog_gnat_correct" >&5
15022+			echo "$as_me:24382: result: $cf_cv_prog_gnat_correct" >&5
15023 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
15024 		fi
15025 	else
15026@@ -24060,7 +24391,7 @@
15027
15028  	ADAFLAGS="$ADAFLAGS -gnatpn"
15029
15030-	echo "$as_me:24063: checking optimization options for ADAFLAGS" >&5
15031+	echo "$as_me:24394: checking optimization options for ADAFLAGS" >&5
15032 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6
15033 	case "$CFLAGS" in
15034 	(*-g*)
15035@@ -24077,10 +24408,10 @@
15036
15037 		;;
15038 	esac
15039-	echo "$as_me:24080: result: $ADAFLAGS" >&5
15040+	echo "$as_me:24411: result: $ADAFLAGS" >&5
15041 echo "${ECHO_T}$ADAFLAGS" >&6
15042
15043-echo "$as_me:24083: checking if GNATPREP supports -T option" >&5
15044+echo "$as_me:24414: checking if GNATPREP supports -T option" >&5
15045 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6
15046 if test "${cf_cv_gnatprep_opt_t+set}" = set; then
15047   echo $ECHO_N "(cached) $ECHO_C" >&6
15048@@ -24090,11 +24421,11 @@
15049 gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
15050
15051 fi
15052-echo "$as_me:24093: result: $cf_cv_gnatprep_opt_t" >&5
15053+echo "$as_me:24424: result: $cf_cv_gnatprep_opt_t" >&5
15054 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6
15055 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
15056
15057-echo "$as_me:24097: checking if GNAT supports generics" >&5
15058+echo "$as_me:24428: checking if GNAT supports generics" >&5
15059 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
15060 case $cf_gnat_version in
15061 (3.[1-9]*|[4-9].*)
15062@@ -24104,7 +24435,7 @@
15063 	cf_gnat_generics=no
15064 	;;
15065 esac
15066-echo "$as_me:24107: result: $cf_gnat_generics" >&5
15067+echo "$as_me:24438: result: $cf_gnat_generics" >&5
15068 echo "${ECHO_T}$cf_gnat_generics" >&6
15069
15070 if test "$cf_gnat_generics" = yes
15071@@ -24116,7 +24447,7 @@
15072 	cf_generic_objects=
15073 fi
15074
15075-echo "$as_me:24119: checking if GNAT supports SIGINT" >&5
15076+echo "$as_me:24450: checking if GNAT supports SIGINT" >&5
15077 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
15078 if test "${cf_cv_gnat_sigint+set}" = set; then
15079   echo $ECHO_N "(cached) $ECHO_C" >&6
15080@@ -24164,7 +24495,7 @@
15081 rm -rf conftest* *~conftest*
15082
15083 fi
15084-echo "$as_me:24167: result: $cf_cv_gnat_sigint" >&5
15085+echo "$as_me:24498: result: $cf_cv_gnat_sigint" >&5
15086 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
15087
15088 if test $cf_cv_gnat_sigint = yes ; then
15089@@ -24177,7 +24508,7 @@
15090 cf_gnat_projects=no
15091
15092 if test "$enable_gnat_projects" != no ; then
15093-echo "$as_me:24180: checking if GNAT supports project files" >&5
15094+echo "$as_me:24511: checking if GNAT supports project files" >&5
15095 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
15096 case $cf_gnat_version in
15097 (3.[0-9]*)
15098@@ -24240,15 +24571,15 @@
15099 	esac
15100 	;;
15101 esac
15102-echo "$as_me:24243: result: $cf_gnat_projects" >&5
15103+echo "$as_me:24574: result: $cf_gnat_projects" >&5
15104 echo "${ECHO_T}$cf_gnat_projects" >&6
15105 fi # enable_gnat_projects
15106
15107 if test $cf_gnat_projects = yes
15108 then
15109-	echo "$as_me:24249: checking if GNAT supports libraries" >&5
15110+	echo "$as_me:24580: checking if GNAT supports libraries" >&5
15111 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
15112-	echo "$as_me:24251: result: $cf_gnat_libraries" >&5
15113+	echo "$as_me:24582: result: $cf_gnat_libraries" >&5
15114 echo "${ECHO_T}$cf_gnat_libraries" >&6
15115 fi
15116
15117@@ -24268,7 +24599,7 @@
15118 	USE_GNAT_LIBRARIES="#"
15119 fi
15120
15121-echo "$as_me:24271: checking for ada-compiler" >&5
15122+echo "$as_me:24602: checking for ada-compiler" >&5
15123 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
15124
15125 # Check whether --with-ada-compiler or --without-ada-compiler was given.
15126@@ -24279,12 +24610,12 @@
15127   cf_ada_compiler=gnatmake
15128 fi;
15129
15130-echo "$as_me:24282: result: $cf_ada_compiler" >&5
15131+echo "$as_me:24613: result: $cf_ada_compiler" >&5
15132 echo "${ECHO_T}$cf_ada_compiler" >&6
15133
15134 			cf_ada_package=terminal_interface
15135
15136-echo "$as_me:24287: checking for ada-include" >&5
15137+echo "$as_me:24618: checking for ada-include" >&5
15138 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
15139
15140 # Check whether --with-ada-include or --without-ada-include was given.
15141@@ -24320,7 +24651,7 @@
15142 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
15143 	;;
15144 (*)
15145-	{ { echo "$as_me:24323: error: expected a pathname, not \"$withval\"" >&5
15146+	{ { echo "$as_me:24654: error: expected a pathname, not \"$withval\"" >&5
15147 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
15148    { (exit 1); exit 1; }; }
15149 	;;
15150@@ -24329,10 +24660,10 @@
15151 fi
15152 eval ADA_INCLUDE="$withval"
15153
15154-echo "$as_me:24332: result: $ADA_INCLUDE" >&5
15155+echo "$as_me:24663: result: $ADA_INCLUDE" >&5
15156 echo "${ECHO_T}$ADA_INCLUDE" >&6
15157
15158-echo "$as_me:24335: checking for ada-objects" >&5
15159+echo "$as_me:24666: checking for ada-objects" >&5
15160 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
15161
15162 # Check whether --with-ada-objects or --without-ada-objects was given.
15163@@ -24368,7 +24699,7 @@
15164 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
15165 	;;
15166 (*)
15167-	{ { echo "$as_me:24371: error: expected a pathname, not \"$withval\"" >&5
15168+	{ { echo "$as_me:24702: error: expected a pathname, not \"$withval\"" >&5
15169 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
15170    { (exit 1); exit 1; }; }
15171 	;;
15172@@ -24377,10 +24708,10 @@
15173 fi
15174 eval ADA_OBJECTS="$withval"
15175
15176-echo "$as_me:24380: result: $ADA_OBJECTS" >&5
15177+echo "$as_me:24711: result: $ADA_OBJECTS" >&5
15178 echo "${ECHO_T}$ADA_OBJECTS" >&6
15179
15180-echo "$as_me:24383: checking if an Ada95 shared-library should be built" >&5
15181+echo "$as_me:24714: checking if an Ada95 shared-library should be built" >&5
15182 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
15183
15184 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
15185@@ -24390,14 +24721,14 @@
15186 else
15187   with_ada_sharedlib=no
15188 fi;
15189-echo "$as_me:24393: result: $with_ada_sharedlib" >&5
15190+echo "$as_me:24724: result: $with_ada_sharedlib" >&5
15191 echo "${ECHO_T}$with_ada_sharedlib" >&6
15192
15193 if test "x$with_ada_sharedlib" != xno
15194 then
15195 	if test "x$cf_gnat_projects" != xyes
15196 	then
15197-		{ echo "$as_me:24400: WARNING: disabling shared-library since GNAT projects are not supported" >&5
15198+		{ echo "$as_me:24731: WARNING: disabling shared-library since GNAT projects are not supported" >&5
15199 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;}
15200 		with_ada_sharedlib=no
15201 	fi
15202@@ -24423,13 +24754,13 @@
15203
15204 # do this "late" to avoid conflict with header-checks
15205 if test "x$with_widec" = xyes ; then
15206-	echo "$as_me:24426: checking for wchar_t" >&5
15207+	echo "$as_me:24757: checking for wchar_t" >&5
15208 echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
15209 if test "${ac_cv_type_wchar_t+set}" = set; then
15210   echo $ECHO_N "(cached) $ECHO_C" >&6
15211 else
15212   cat >conftest.$ac_ext <<_ACEOF
15213-#line 24432 "configure"
15214+#line 24763 "configure"
15215 #include "confdefs.h"
15216 $ac_includes_default
15217 int
15218@@ -24444,16 +24775,16 @@
15219 }
15220 _ACEOF
15221 rm -f conftest.$ac_objext
15222-if { (eval echo "$as_me:24447: \"$ac_compile\"") >&5
15223+if { (eval echo "$as_me:24778: \"$ac_compile\"") >&5
15224   (eval $ac_compile) 2>&5
15225   ac_status=$?
15226-  echo "$as_me:24450: \$? = $ac_status" >&5
15227+  echo "$as_me:24781: \$? = $ac_status" >&5
15228   (exit $ac_status); } &&
15229          { ac_try='test -s conftest.$ac_objext'
15230-  { (eval echo "$as_me:24453: \"$ac_try\"") >&5
15231+  { (eval echo "$as_me:24784: \"$ac_try\"") >&5
15232   (eval $ac_try) 2>&5
15233   ac_status=$?
15234-  echo "$as_me:24456: \$? = $ac_status" >&5
15235+  echo "$as_me:24787: \$? = $ac_status" >&5
15236   (exit $ac_status); }; }; then
15237   ac_cv_type_wchar_t=yes
15238 else
15239@@ -24463,10 +24794,10 @@
15240 fi
15241 rm -f conftest.$ac_objext conftest.$ac_ext
15242 fi
15243-echo "$as_me:24466: result: $ac_cv_type_wchar_t" >&5
15244+echo "$as_me:24797: result: $ac_cv_type_wchar_t" >&5
15245 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6
15246
15247-echo "$as_me:24469: checking size of wchar_t" >&5
15248+echo "$as_me:24800: checking size of wchar_t" >&5
15249 echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6
15250 if test "${ac_cv_sizeof_wchar_t+set}" = set; then
15251   echo $ECHO_N "(cached) $ECHO_C" >&6
15252@@ -24475,7 +24806,7 @@
15253   if test "$cross_compiling" = yes; then
15254   # Depending upon the size, compute the lo and hi bounds.
15255 cat >conftest.$ac_ext <<_ACEOF
15256-#line 24478 "configure"
15257+#line 24809 "configure"
15258 #include "confdefs.h"
15259 $ac_includes_default
15260 int
15261@@ -24487,21 +24818,21 @@
15262 }
15263 _ACEOF
15264 rm -f conftest.$ac_objext
15265-if { (eval echo "$as_me:24490: \"$ac_compile\"") >&5
15266+if { (eval echo "$as_me:24821: \"$ac_compile\"") >&5
15267   (eval $ac_compile) 2>&5
15268   ac_status=$?
15269-  echo "$as_me:24493: \$? = $ac_status" >&5
15270+  echo "$as_me:24824: \$? = $ac_status" >&5
15271   (exit $ac_status); } &&
15272          { ac_try='test -s conftest.$ac_objext'
15273-  { (eval echo "$as_me:24496: \"$ac_try\"") >&5
15274+  { (eval echo "$as_me:24827: \"$ac_try\"") >&5
15275   (eval $ac_try) 2>&5
15276   ac_status=$?
15277-  echo "$as_me:24499: \$? = $ac_status" >&5
15278+  echo "$as_me:24830: \$? = $ac_status" >&5
15279   (exit $ac_status); }; }; then
15280   ac_lo=0 ac_mid=0
15281   while :; do
15282     cat >conftest.$ac_ext <<_ACEOF
15283-#line 24504 "configure"
15284+#line 24835 "configure"
15285 #include "confdefs.h"
15286 $ac_includes_default
15287 int
15288@@ -24513,16 +24844,16 @@
15289 }
15290 _ACEOF
15291 rm -f conftest.$ac_objext
15292-if { (eval echo "$as_me:24516: \"$ac_compile\"") >&5
15293+if { (eval echo "$as_me:24847: \"$ac_compile\"") >&5
15294   (eval $ac_compile) 2>&5
15295   ac_status=$?
15296-  echo "$as_me:24519: \$? = $ac_status" >&5
15297+  echo "$as_me:24850: \$? = $ac_status" >&5
15298   (exit $ac_status); } &&
15299          { ac_try='test -s conftest.$ac_objext'
15300-  { (eval echo "$as_me:24522: \"$ac_try\"") >&5
15301+  { (eval echo "$as_me:24853: \"$ac_try\"") >&5
15302   (eval $ac_try) 2>&5
15303   ac_status=$?
15304-  echo "$as_me:24525: \$? = $ac_status" >&5
15305+  echo "$as_me:24856: \$? = $ac_status" >&5
15306   (exit $ac_status); }; }; then
15307   ac_hi=$ac_mid; break
15308 else
15309@@ -24538,7 +24869,7 @@
15310 ac_hi=-1 ac_mid=-1
15311   while :; do
15312     cat >conftest.$ac_ext <<_ACEOF
15313-#line 24541 "configure"
15314+#line 24872 "configure"
15315 #include "confdefs.h"
15316 $ac_includes_default
15317 int
15318@@ -24550,16 +24881,16 @@
15319 }
15320 _ACEOF
15321 rm -f conftest.$ac_objext
15322-if { (eval echo "$as_me:24553: \"$ac_compile\"") >&5
15323+if { (eval echo "$as_me:24884: \"$ac_compile\"") >&5
15324   (eval $ac_compile) 2>&5
15325   ac_status=$?
15326-  echo "$as_me:24556: \$? = $ac_status" >&5
15327+  echo "$as_me:24887: \$? = $ac_status" >&5
15328   (exit $ac_status); } &&
15329          { ac_try='test -s conftest.$ac_objext'
15330-  { (eval echo "$as_me:24559: \"$ac_try\"") >&5
15331+  { (eval echo "$as_me:24890: \"$ac_try\"") >&5
15332   (eval $ac_try) 2>&5
15333   ac_status=$?
15334-  echo "$as_me:24562: \$? = $ac_status" >&5
15335+  echo "$as_me:24893: \$? = $ac_status" >&5
15336   (exit $ac_status); }; }; then
15337   ac_lo=$ac_mid; break
15338 else
15339@@ -24575,7 +24906,7 @@
15340 while test "x$ac_lo" != "x$ac_hi"; do
15341   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
15342   cat >conftest.$ac_ext <<_ACEOF
15343-#line 24578 "configure"
15344+#line 24909 "configure"
15345 #include "confdefs.h"
15346 $ac_includes_default
15347 int
15348@@ -24587,16 +24918,16 @@
15349 }
15350 _ACEOF
15351 rm -f conftest.$ac_objext
15352-if { (eval echo "$as_me:24590: \"$ac_compile\"") >&5
15353+if { (eval echo "$as_me:24921: \"$ac_compile\"") >&5
15354   (eval $ac_compile) 2>&5
15355   ac_status=$?
15356-  echo "$as_me:24593: \$? = $ac_status" >&5
15357+  echo "$as_me:24924: \$? = $ac_status" >&5
15358   (exit $ac_status); } &&
15359          { ac_try='test -s conftest.$ac_objext'
15360-  { (eval echo "$as_me:24596: \"$ac_try\"") >&5
15361+  { (eval echo "$as_me:24927: \"$ac_try\"") >&5
15362   (eval $ac_try) 2>&5
15363   ac_status=$?
15364-  echo "$as_me:24599: \$? = $ac_status" >&5
15365+  echo "$as_me:24930: \$? = $ac_status" >&5
15366   (exit $ac_status); }; }; then
15367   ac_hi=$ac_mid
15368 else
15369@@ -24609,12 +24940,12 @@
15370 ac_cv_sizeof_wchar_t=$ac_lo
15371 else
15372   if test "$cross_compiling" = yes; then
15373-  { { echo "$as_me:24612: error: cannot run test program while cross compiling" >&5
15374+  { { echo "$as_me:24943: error: cannot run test program while cross compiling" >&5
15375 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
15376    { (exit 1); exit 1; }; }
15377 else
15378   cat >conftest.$ac_ext <<_ACEOF
15379-#line 24617 "configure"
15380+#line 24948 "configure"
15381 #include "confdefs.h"
15382 $ac_includes_default
15383 int
15384@@ -24630,15 +24961,15 @@
15385 }
15386 _ACEOF
15387 rm -f conftest$ac_exeext
15388-if { (eval echo "$as_me:24633: \"$ac_link\"") >&5
15389+if { (eval echo "$as_me:24964: \"$ac_link\"") >&5
15390   (eval $ac_link) 2>&5
15391   ac_status=$?
15392-  echo "$as_me:24636: \$? = $ac_status" >&5
15393+  echo "$as_me:24967: \$? = $ac_status" >&5
15394   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
15395-  { (eval echo "$as_me:24638: \"$ac_try\"") >&5
15396+  { (eval echo "$as_me:24969: \"$ac_try\"") >&5
15397   (eval $ac_try) 2>&5
15398   ac_status=$?
15399-  echo "$as_me:24641: \$? = $ac_status" >&5
15400+  echo "$as_me:24972: \$? = $ac_status" >&5
15401   (exit $ac_status); }; }; then
15402   ac_cv_sizeof_wchar_t=`cat conftest.val`
15403 else
15404@@ -24654,7 +24985,7 @@
15405   ac_cv_sizeof_wchar_t=0
15406 fi
15407 fi
15408-echo "$as_me:24657: result: $ac_cv_sizeof_wchar_t" >&5
15409+echo "$as_me:24988: result: $ac_cv_sizeof_wchar_t" >&5
15410 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6
15411 cat >>confdefs.h <<EOF
15412 #define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
15413@@ -24672,7 +25003,7 @@
15414 ### chooses to split module lists into libraries.
15415 ###
15416 ### (see CF_LIB_RULES).
15417-echo "$as_me:24675: checking for library subsets" >&5
15418+echo "$as_me:25006: checking for library subsets" >&5
15419 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
15420 LIB_SUBSETS=
15421
15422@@ -24714,7 +25045,7 @@
15423 test "x$with_widec"     = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
15424 test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
15425
15426-echo "$as_me:24717: result: $LIB_SUBSETS" >&5
15427+echo "$as_me:25048: result: $LIB_SUBSETS" >&5
15428 echo "${ECHO_T}$LIB_SUBSETS" >&6
15429
15430 ### Construct the list of include-directories to be generated
15431@@ -24745,7 +25076,7 @@
15432 fi
15433
15434 ### Build up pieces for makefile rules
15435-echo "$as_me:24748: checking default library suffix" >&5
15436+echo "$as_me:25079: checking default library suffix" >&5
15437 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
15438
15439 	case $DFT_LWR_MODEL in
15440@@ -24756,10 +25087,10 @@
15441 	(shared)  DFT_ARG_SUFFIX=''   ;;
15442 	esac
15443 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
15444-echo "$as_me:24759: result: $DFT_ARG_SUFFIX" >&5
15445+echo "$as_me:25090: result: $DFT_ARG_SUFFIX" >&5
15446 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
15447
15448-echo "$as_me:24762: checking default library-dependency suffix" >&5
15449+echo "$as_me:25093: checking default library-dependency suffix" >&5
15450 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
15451
15452 	case X$DFT_LWR_MODEL in
15453@@ -24817,10 +25148,10 @@
15454 		DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}"
15455 		DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}"
15456 	fi
15457-echo "$as_me:24820: result: $DFT_DEP_SUFFIX" >&5
15458+echo "$as_me:25151: result: $DFT_DEP_SUFFIX" >&5
15459 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
15460
15461-echo "$as_me:24823: checking default object directory" >&5
15462+echo "$as_me:25154: checking default object directory" >&5
15463 echo $ECHO_N "checking default object directory... $ECHO_C" >&6
15464
15465 	case $DFT_LWR_MODEL in
15466@@ -24836,11 +25167,11 @@
15467 			DFT_OBJ_SUBDIR='obj_s' ;;
15468 		esac
15469 	esac
15470-echo "$as_me:24839: result: $DFT_OBJ_SUBDIR" >&5
15471+echo "$as_me:25170: result: $DFT_OBJ_SUBDIR" >&5
15472 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
15473
15474 if test "x$cf_with_cxx" = xyes ; then
15475-echo "$as_me:24843: checking c++ library-dependency suffix" >&5
15476+echo "$as_me:25174: checking c++ library-dependency suffix" >&5
15477 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
15478 if test "$with_libtool" != "no"; then
15479 	# libtool thinks it can make c++ shared libraries (perhaps only g++)
15480@@ -24908,7 +25239,7 @@
15481 	fi
15482
15483 fi
15484-echo "$as_me:24911: result: $CXX_LIB_SUFFIX" >&5
15485+echo "$as_me:25242: result: $CXX_LIB_SUFFIX" >&5
15486 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
15487
15488 fi
15489@@ -25084,19 +25415,19 @@
15490
15491 if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
15492 then
15493-	echo "$as_me:25087: checking if linker supports switching between static/dynamic" >&5
15494+	echo "$as_me:25418: checking if linker supports switching between static/dynamic" >&5
15495 echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
15496
15497 	rm -f libconftest.a
15498 	cat >conftest.$ac_ext <<EOF
15499-#line 25092 "configure"
15500+#line 25423 "configure"
15501 #include <stdio.h>
15502 int cf_ldflags_static(FILE *fp) { return fflush(fp); }
15503 EOF
15504-	if { (eval echo "$as_me:25096: \"$ac_compile\"") >&5
15505+	if { (eval echo "$as_me:25427: \"$ac_compile\"") >&5
15506   (eval $ac_compile) 2>&5
15507   ac_status=$?
15508-  echo "$as_me:25099: \$? = $ac_status" >&5
15509+  echo "$as_me:25430: \$? = $ac_status" >&5
15510   (exit $ac_status); } ; then
15511 		( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
15512 		( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
15513@@ -25107,10 +25438,10 @@
15514
15515 	LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
15516 	cat >conftest.$ac_ext <<_ACEOF
15517-#line 25110 "configure"
15518+#line 25441 "configure"
15519 #include "confdefs.h"
15520
15521-#line 25113 "configure"
15522+#line 25444 "configure"
15523 #include <stdio.h>
15524 int cf_ldflags_static(FILE *fp);
15525
15526@@ -25125,16 +25456,16 @@
15527 }
15528 _ACEOF
15529 rm -f conftest.$ac_objext conftest$ac_exeext
15530-if { (eval echo "$as_me:25128: \"$ac_link\"") >&5
15531+if { (eval echo "$as_me:25459: \"$ac_link\"") >&5
15532   (eval $ac_link) 2>&5
15533   ac_status=$?
15534-  echo "$as_me:25131: \$? = $ac_status" >&5
15535+  echo "$as_me:25462: \$? = $ac_status" >&5
15536   (exit $ac_status); } &&
15537          { ac_try='test -s conftest$ac_exeext'
15538-  { (eval echo "$as_me:25134: \"$ac_try\"") >&5
15539+  { (eval echo "$as_me:25465: \"$ac_try\"") >&5
15540   (eval $ac_try) 2>&5
15541   ac_status=$?
15542-  echo "$as_me:25137: \$? = $ac_status" >&5
15543+  echo "$as_me:25468: \$? = $ac_status" >&5
15544   (exit $ac_status); }; }; then
15545
15546 	# some linkers simply ignore the -dynamic
15547@@ -25157,7 +25488,7 @@
15548 	rm -f libconftest.*
15549 	LIBS="$cf_save_LIBS"
15550
15551-	echo "$as_me:25160: result: $cf_ldflags_static" >&5
15552+	echo "$as_me:25491: result: $cf_ldflags_static" >&5
15553 echo "${ECHO_T}$cf_ldflags_static" >&6
15554
15555 	if test $cf_ldflags_static != yes
15556@@ -25173,7 +25504,7 @@
15557 	;;
15558 esac
15559
15560-echo "$as_me:25176: checking where we will install curses.h" >&5
15561+echo "$as_me:25507: checking where we will install curses.h" >&5
15562 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
15563
15564 includesubdir=
15565@@ -25183,7 +25514,7 @@
15566 then
15567 	includesubdir="/ncurses${USE_LIB_SUFFIX}"
15568 fi
15569-echo "$as_me:25186: result: ${includedir}${includesubdir}" >&5
15570+echo "$as_me:25517: result: ${includedir}${includesubdir}" >&5
15571 echo "${ECHO_T}${includedir}${includesubdir}" >&6
15572
15573 ### Resolve a conflict between normal and wide-curses by forcing applications
15574@@ -25191,7 +25522,7 @@
15575 if test "$with_overwrite" != no ; then
15576 if test "$NCURSES_LIBUTF8" = 1 ; then
15577 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
15578-	{ echo "$as_me:25194: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
15579+	{ echo "$as_me:25525: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
15580 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
15581 fi
15582 fi
15583@@ -25209,7 +25540,7 @@
15584 ### Construct the list of subdirectories for which we'll customize makefiles
15585 ### with the appropriate compile-rules.
15586
15587-echo "$as_me:25212: checking for src modules" >&5
15588+echo "$as_me:25543: checking for src modules" >&5
15589 echo $ECHO_N "checking for src modules... $ECHO_C" >&6
15590
15591 # dependencies and linker-arguments for test-programs
15592@@ -25274,7 +25605,7 @@
15593 		fi
15594 	fi
15595 done
15596-echo "$as_me:25277: result: $cf_cv_src_modules" >&5
15597+echo "$as_me:25608: result: $cf_cv_src_modules" >&5
15598 echo "${ECHO_T}$cf_cv_src_modules" >&6
15599
15600 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
15601@@ -25509,53 +25840,6 @@
15602 SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in"
15603 fi
15604
15605-# Extract the first word of "tic", so it can be a program name with args.
15606-set dummy tic; ac_word=$2
15607-echo "$as_me:25514: checking for $ac_word" >&5
15608-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
15609-if test "${ac_cv_path_TIC_PATH+set}" = set; then
15610-  echo $ECHO_N "(cached) $ECHO_C" >&6
15611-else
15612-  case $TIC_PATH in
15613-  [\\/]* | ?:[\\/]*)
15614-  ac_cv_path_TIC_PATH="$TIC_PATH" # Let the user override the test with a path.
15615-  ;;
15616-  *)
15617-  ac_save_IFS=$IFS; IFS=$ac_path_separator
15618-ac_dummy="$PATH:/usr/local/ncurses/bin"
15619-for ac_dir in $ac_dummy; do
15620-  IFS=$ac_save_IFS
15621-  test -z "$ac_dir" && ac_dir=.
15622-  if $as_executable_p "$ac_dir/$ac_word"; then
15623-   ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
15624-   echo "$as_me:25531: found $ac_dir/$ac_word" >&5
15625-   break
15626-fi
15627-done
15628-
15629-  test -z "$ac_cv_path_TIC_PATH" && ac_cv_path_TIC_PATH="unknown"
15630-  ;;
15631-esac
15632-fi
15633-TIC_PATH=$ac_cv_path_TIC_PATH
15634-
15635-if test -n "$TIC_PATH"; then
15636-  echo "$as_me:25543: result: $TIC_PATH" >&5
15637-echo "${ECHO_T}$TIC_PATH" >&6
15638-else
15639-  echo "$as_me:25546: result: no" >&5
15640-echo "${ECHO_T}no" >&6
15641-fi
15642-
15643-if test -n "$FALLBACK_LIST"
15644-then
15645-	if test "$TIC_PATH" = unknown
15646-	then
15647-		{ echo "$as_me:25554: WARNING: no tic program found for fallbacks" >&5
15648-echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
15649-	fi
15650-fi
15651-
15652 if test "x$cf_with_tests" != xno ; then
15653 	MAKE_TESTS=
15654 else
15655@@ -25587,7 +25871,7 @@
15656 	(*-D_XOPEN_SOURCE_EXTENDED*)
15657 		test -n "$verbose" && echo "	moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6
15658
15659-echo "${as_me:-configure}:25590: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
15660+echo "${as_me:-configure}:25874: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5
15661
15662 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
15663 		CPPFLAGS=`echo "x$CPPFLAGS" | sed -e  's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
15664@@ -25598,7 +25882,7 @@
15665
15666 # Help to automatically enable the extended curses features when using either
15667 # the *-config or the ".pc" files by adding defines.
15668-echo "$as_me:25601: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
15669+echo "$as_me:25885: checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script" >&5
15670 echo $ECHO_N "checking for defines to add to ncurses${USE_CFG_SUFFIX}-config script... $ECHO_C" >&6
15671 PKG_CFLAGS=
15672 for cf_loop1 in $CPPFLAGS_after_XOPEN
15673@@ -25614,7 +25898,7 @@
15674 	done
15675 	test "$cf_found" = no && PKG_CFLAGS="$PKG_CFLAGS $cf_loop1"
15676 done
15677-echo "$as_me:25617: result: $PKG_CFLAGS" >&5
15678+echo "$as_me:25901: result: $PKG_CFLAGS" >&5
15679 echo "${ECHO_T}$PKG_CFLAGS" >&6
15680
15681 # AC_CHECK_SIZEOF demands a literal parameter, no variables.  So we do this.
15682@@ -25677,7 +25961,7 @@
15683 	cf_filter_syms=$cf_dft_filter_syms
15684 	test -n "$verbose" && echo "	will map symbols to ABI=$cf_cv_abi_version" 1>&6
15685
15686-echo "${as_me:-configure}:25680: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
15687+echo "${as_me:-configure}:25964: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5
15688
15689 fi
15690
15691@@ -25787,7 +26071,7 @@
15692 : ${CONFIG_STATUS=./config.status}
15693 ac_clean_files_save=$ac_clean_files
15694 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
15695-{ echo "$as_me:25790: creating $CONFIG_STATUS" >&5
15696+{ echo "$as_me:26074: creating $CONFIG_STATUS" >&5
15697 echo "$as_me: creating $CONFIG_STATUS" >&6;}
15698 cat >$CONFIG_STATUS <<_ACEOF
15699 #! $SHELL
15700@@ -25963,7 +26247,7 @@
15701     echo "$ac_cs_version"; exit 0 ;;
15702   --he | --h)
15703     # Conflict between --help and --header
15704-    { { echo "$as_me:25966: error: ambiguous option: $1
15705+    { { echo "$as_me:26250: error: ambiguous option: $1
15706 Try \`$0 --help' for more information." >&5
15707 echo "$as_me: error: ambiguous option: $1
15708 Try \`$0 --help' for more information." >&2;}
15709@@ -25982,7 +26266,7 @@
15710     ac_need_defaults=false;;
15711
15712   # This is an error.
15713-  -*) { { echo "$as_me:25985: error: unrecognized option: $1
15714+  -*) { { echo "$as_me:26269: error: unrecognized option: $1
15715 Try \`$0 --help' for more information." >&5
15716 echo "$as_me: error: unrecognized option: $1
15717 Try \`$0 --help' for more information." >&2;}
15718@@ -26102,7 +26386,7 @@
15719   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
15720   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
15721   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
15722-  *) { { echo "$as_me:26105: error: invalid argument: $ac_config_target" >&5
15723+  *) { { echo "$as_me:26389: error: invalid argument: $ac_config_target" >&5
15724 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
15725    { (exit 1); exit 1; }; };;
15726   esac
15727@@ -26313,6 +26597,8 @@
15728 s,@NCURSES_USE_DATABASE@,$NCURSES_USE_DATABASE,;t t
15729 s,@FALLBACK_LIST@,$FALLBACK_LIST,;t t
15730 s,@USE_FALLBACKS@,$USE_FALLBACKS,;t t
15731+s,@TIC@,$TIC,;t t
15732+s,@INFOCMP@,$INFOCMP,;t t
15733 s,@WHICH_XTERM@,$WHICH_XTERM,;t t
15734 s,@XTERM_KBS@,$XTERM_KBS,;t t
15735 s,@TERMINFO_DIRS@,$TERMINFO_DIRS,;t t
15736@@ -26448,7 +26734,6 @@
15737 s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t
15738 s,@HAVE_TERMIOS_H@,$HAVE_TERMIOS_H,;t t
15739 s,@cross_compiling@,$cross_compiling,;t t
15740-s,@TIC_PATH@,$TIC_PATH,;t t
15741 s,@MAKE_TESTS@,$MAKE_TESTS,;t t
15742 s,@ADAHTML_DIR@,$ADAHTML_DIR,;t t
15743 s,@PANEL_NAME@,$PANEL_NAME,;t t
15744@@ -26596,7 +26881,7 @@
15745   esac
15746
15747   if test x"$ac_file" != x-; then
15748-    { echo "$as_me:26599: creating $ac_file" >&5
15749+    { echo "$as_me:26884: creating $ac_file" >&5
15750 echo "$as_me: creating $ac_file" >&6;}
15751     rm -f "$ac_file"
15752   fi
15753@@ -26614,7 +26899,7 @@
15754       -) echo $tmp/stdin ;;
15755       [\\/$]*)
15756          # Absolute (can't be DOS-style, as IFS=:)
15757-         test -f "$f" || { { echo "$as_me:26617: error: cannot find input file: $f" >&5
15758+         test -f "$f" || { { echo "$as_me:26902: error: cannot find input file: $f" >&5
15759 echo "$as_me: error: cannot find input file: $f" >&2;}
15760    { (exit 1); exit 1; }; }
15761          echo $f;;
15762@@ -26627,7 +26912,7 @@
15763            echo $srcdir/$f
15764          else
15765            # /dev/null tree
15766-           { { echo "$as_me:26630: error: cannot find input file: $f" >&5
15767+           { { echo "$as_me:26915: error: cannot find input file: $f" >&5
15768 echo "$as_me: error: cannot find input file: $f" >&2;}
15769    { (exit 1); exit 1; }; }
15770          fi;;
15771@@ -26643,7 +26928,7 @@
15772       if test -n "$ac_seen"; then
15773         ac_used=`grep '@datarootdir@' $ac_item`
15774         if test -z "$ac_used"; then
15775-          { echo "$as_me:26646: WARNING: datarootdir was used implicitly but not set:
15776+          { echo "$as_me:26931: WARNING: datarootdir was used implicitly but not set:
15777 $ac_seen" >&5
15778 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
15779 $ac_seen" >&2;}
15780@@ -26652,7 +26937,7 @@
15781       fi
15782       ac_seen=`grep '${datarootdir}' $ac_item`
15783       if test -n "$ac_seen"; then
15784-        { echo "$as_me:26655: WARNING: datarootdir was used explicitly but not set:
15785+        { echo "$as_me:26940: WARNING: datarootdir was used explicitly but not set:
15786 $ac_seen" >&5
15787 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
15788 $ac_seen" >&2;}
15789@@ -26689,7 +26974,7 @@
15790             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
15791             if test -z "$ac_init"; then
15792               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
15793-              { echo "$as_me:26692: WARNING: Variable $ac_name is used but was not set:
15794+              { echo "$as_me:26977: WARNING: Variable $ac_name is used but was not set:
15795 $ac_seen" >&5
15796 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
15797 $ac_seen" >&2;}
15798@@ -26700,7 +26985,7 @@
15799     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
15800     if test -s $tmp/out; then
15801       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
15802-      { echo "$as_me:26703: WARNING: Some variables may not be substituted:
15803+      { echo "$as_me:26988: WARNING: Some variables may not be substituted:
15804 $ac_seen" >&5
15805 echo "$as_me: WARNING: Some variables may not be substituted:
15806 $ac_seen" >&2;}
15807@@ -26749,7 +27034,7 @@
15808   * )   ac_file_in=$ac_file.in ;;
15809   esac
15810
15811-  test x"$ac_file" != x- && { echo "$as_me:26752: creating $ac_file" >&5
15812+  test x"$ac_file" != x- && { echo "$as_me:27037: creating $ac_file" >&5
15813 echo "$as_me: creating $ac_file" >&6;}
15814
15815   # First look for the input files in the build tree, otherwise in the
15816@@ -26760,7 +27045,7 @@
15817       -) echo $tmp/stdin ;;
15818       [\\/$]*)
15819          # Absolute (can't be DOS-style, as IFS=:)
15820-         test -f "$f" || { { echo "$as_me:26763: error: cannot find input file: $f" >&5
15821+         test -f "$f" || { { echo "$as_me:27048: error: cannot find input file: $f" >&5
15822 echo "$as_me: error: cannot find input file: $f" >&2;}
15823    { (exit 1); exit 1; }; }
15824          echo $f;;
15825@@ -26773,7 +27058,7 @@
15826            echo $srcdir/$f
15827          else
15828            # /dev/null tree
15829-           { { echo "$as_me:26776: error: cannot find input file: $f" >&5
15830+           { { echo "$as_me:27061: error: cannot find input file: $f" >&5
15831 echo "$as_me: error: cannot find input file: $f" >&2;}
15832    { (exit 1); exit 1; }; }
15833          fi;;
15834@@ -26831,7 +27116,7 @@
15835   rm -f $tmp/in
15836   if test x"$ac_file" != x-; then
15837     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
15838-      { echo "$as_me:26834: $ac_file is unchanged" >&5
15839+      { echo "$as_me:27119: $ac_file is unchanged" >&5
15840 echo "$as_me: $ac_file is unchanged" >&6;}
15841     else
15842       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
15843@@ -27176,7 +27461,7 @@
15844 				(cygdll|msysdll|mingw)
15845 					test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "	overriding CXX_MODEL to SHARED" 1>&6
15846
15847-echo "${as_me:-configure}:27179: testing overriding CXX_MODEL to SHARED ..." 1>&5
15848+echo "${as_me:-configure}:27464: testing overriding CXX_MODEL to SHARED ..." 1>&5
15849
15850 					with_shared_cxx=yes
15851 					;;
15852Index: configure.in
15853Prereq:  1.682
15854--- ncurses-6.1-20190623+/configure.in	2019-06-23 21:26:48.000000000 +0000
15855+++ ncurses-6.1-20190630/configure.in	2019-06-30 15:21:02.000000000 +0000
15856@@ -28,14 +28,14 @@
15857 dnl
15858 dnl Author: Thomas E. Dickey 1995-on
15859 dnl
15860-dnl $Id: configure.in,v 1.682 2019/06/23 21:26:48 tom Exp $
15861+dnl $Id: configure.in,v 1.688 2019/06/30 15:21:02 tom Exp $
15862 dnl Process this file with autoconf to produce a configure script.
15863 dnl
15864 dnl See https://invisible-island.net/autoconf/ for additional information.
15865 dnl
15866 dnl ---------------------------------------------------------------------------
15867 AC_PREREQ(2.52.20170501)
15868-AC_REVISION($Revision: 1.682 $)
15869+AC_REVISION($Revision: 1.688 $)
15870 AC_INIT(ncurses/base/lib_initscr.c)
15871 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
15872
15873@@ -629,6 +629,22 @@
15874 AC_SUBST(FALLBACK_LIST)
15875 AC_SUBST(USE_FALLBACKS)
15876
15877+# The fallback feature in ncurses relies upon tic/infocmp outside the build
15878+# tree for generating the terminal descriptions that will be compiled into the
15879+# library.  If your toolchain is old, it may not handle current terminal
15880+# databases.  Use configure-options to point to the tools which will be used,
15881+# rather than the first ones found on the $PATH.
15882+if test -n "$FALLBACK_LIST"
15883+then
15884+	CF_WITH_PATH_PROG(TIC,     tic,     [for fallbacks], $PATH:/usr/local/ncurses/bin)
15885+	CF_WITH_PATH_PROG(INFOCMP, infocmp, [for fallbacks], $PATH:/usr/local/ncurses/bin)
15886+else
15887+	: ${TIC:=tic}
15888+	: ${INFOCMP:=infocmp}
15889+fi
15890+AC_SUBST(TIC)
15891+AC_SUBST(INFOCMP)
15892+
15893 AC_MSG_CHECKING(if you want modern xterm or antique)
15894 AC_ARG_WITH(xterm-new,
15895 	[  --without-xterm-new     specify if xterm terminfo should be old version],
15896@@ -2221,16 +2237,6 @@
15897 fi
15898 AC_SUBST(cross_compiling)
15899
15900-AC_PATH_PROG(TIC_PATH,tic,unknown,$PATH:/usr/local/ncurses/bin)
15901-if test -n "$FALLBACK_LIST"
15902-then
15903-	if test "$TIC_PATH" = unknown
15904-	then
15905-		AC_MSG_WARN(no tic program found for fallbacks)
15906-	fi
15907-fi
15908-AC_SUBST(TIC_PATH)
15909-
15910 if test "x$cf_with_tests" != xno ; then
15911 	MAKE_TESTS=
15912 else
15913Index: dist.mk
15914Prereq:  1.1290
15915--- ncurses-6.1-20190623+/dist.mk	2019-06-23 15:31:40.000000000 +0000
15916+++ ncurses-6.1-20190630/dist.mk	2019-06-30 01:30:19.000000000 +0000
15917@@ -25,7 +25,7 @@
15918 # use or other dealings in this Software without prior written               #
15919 # authorization.                                                             #
15920 ##############################################################################
15921-# $Id: dist.mk,v 1.1290 2019/06/23 15:31:40 tom Exp $
15922+# $Id: dist.mk,v 1.1292 2019/06/30 01:30:19 tom Exp $
15923 # Makefile for creating ncurses distributions.
15924 #
15925 # This only needs to be used directly as a makefile by developers, but
15926@@ -37,7 +37,7 @@
15927 # These define the major/minor/patch versions of ncurses.
15928 NCURSES_MAJOR = 6
15929 NCURSES_MINOR = 1
15930-NCURSES_PATCH = 20190623
15931+NCURSES_PATCH = 20190630
15932
15933 # We don't append the patch to the version, since this only applies to releases
15934 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
15935Index: misc/run_tic.in
15936Prereq:  1.35
15937--- ncurses-6.1-20190623+/misc/run_tic.in	2017-10-24 00:16:22.000000000 +0000
15938+++ ncurses-6.1-20190630/misc/run_tic.in	2019-06-30 16:29:23.000000000 +0000
15939@@ -1,7 +1,7 @@
15940 #!@SHELL@
15941-# $Id: run_tic.in,v 1.35 2017/10/24 00:16:22 tom Exp $
15942+# $Id: run_tic.in,v 1.36 2019/06/30 16:29:23 tom Exp $
15943 ##############################################################################
15944-# Copyright (c) 1998-2012,2017 Free Software Foundation, Inc.                #
15945+# Copyright (c) 1998-2017,2019 Free Software Foundation, Inc.                #
15946 #                                                                            #
15947 # Permission is hereby granted, free of charge, to any person obtaining a    #
15948 # copy of this software and associated documentation files (the "Software"), #
15949@@ -50,7 +50,7 @@
15950 : ${srcdir:=@srcdir@}
15951 : ${datarootdir:=@datarootdir@}
15952 : ${datadir:=@datadir@}
15953-: ${TIC_PATH:=@TIC_PATH@}
15954+: ${TIC_PATH:=@TIC@}
15955 : ${ticdir:=@TERMINFO@}
15956 : ${source:=@TERMINFO_SRC@}
15957 : ${LN_S:="@LN_S@"}
15958Index: misc/terminfo.src
15959--- ncurses-6.1-20190623+/misc/terminfo.src	2019-06-09 20:01:43.000000000 +0000
15960+++ ncurses-6.1-20190630/misc/terminfo.src	2019-06-30 20:05:21.000000000 +0000
15961@@ -6,8 +6,8 @@
15962 # Report bugs and new terminal descriptions to
15963 #	bug-ncurses@gnu.org
15964 #
15965-#	$Revision: 1.742 $
15966-#	$Date: 2019/06/09 20:01:43 $
15967+#	$Revision: 1.749 $
15968+#	$Date: 2019/06/30 20:05:21 $
15969 #
15970 # The original header is preserved below for reference.  It is noted that there
15971 # is a "newer" version which differs in some cosmetic details (but actually
15972@@ -495,9 +495,8 @@
15973 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[1A,
15974 	dch=\E[%p1%dP, dispc=\E=%p1%dg, ech=\E[%p1%dX,
15975 	hpa=\E[%i%p1%dG, hts=\EH, ich=\E[%p1%d@, ich1=\E[@,
15976-	il=\E[%p1%dL, indn=\E[%p1%dS, rc=\E7, rin=\E[%p1%dT,
15977-	rmam=\E[?7l, sc=\E7, smam=\E[?7h, tbc=\E[g,
15978-	vpa=\E[%i%p1%dd,
15979+	il=\E[%p1%dL, rc=\E7, rmam=\E[?7l, sc=\E7, smam=\E[?7h,
15980+	tbc=\E[g, vpa=\E[%i%p1%dd, use=ecma+index,
15981
15982 #### ANSI/ECMA-48 terminals and terminal emulators
15983 #
15984@@ -612,12 +611,11 @@
15985 	cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC,
15986 	cuu=\E[%p1%dA, dch=\E[%p1%dP, dl=\E[%p1%dM,
15987 	ech=\E[%p1%dX, el1=\E[1K, hpa=\E[%i%p1%dG, ht=\E[I,
15988-	ich=\E[%p1%d@, il=\E[%p1%dL, indn=\E[%p1%dS, kbs=^H,
15989-	kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
15990-	kich1=\E[L, mc4=\E[4i, mc5=\E[5i, nel=\r\E[S,
15991-	rep=%p1%c\E[%p2%{1}%-%db, rin=\E[%p1%dT, s0ds=\E(B,
15992-	s1ds=\E)B, s2ds=\E*B, s3ds=\E+B, tbc=\E[3g,
15993-	vpa=\E[%i%p1%dd, use=pcansi-m,
15994+	ich=\E[%p1%d@, il=\E[%p1%dL, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
15995+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kich1=\E[L, mc4=\E[4i,
15996+	mc5=\E[5i, nel=\r\E[S, rep=%p1%c\E[%p2%{1}%-%db,
15997+	s0ds=\E(B, s1ds=\E)B, s2ds=\E*B, s3ds=\E+B, tbc=\E[3g,
15998+	vpa=\E[%i%p1%dd, use=ecma+index, use=pcansi-m,
15999
16000 ansi+enq|ncurses extension for ANSI ENQ,
16001 	u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?%[;0123456789]c,
16002@@ -1195,10 +1193,10 @@
16003 	     \263y\363z\362{\343|\330}\234~\376,
16004 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
16005 	el1=\E[1K, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ich1=\E[@,
16006-	indn=\E[%p1%dS, invis=\E[8m, nel=\EE, rin=\E[%p1%dT,
16007+	invis=\E[8m, nel=\EE,
16008 	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;
16009 	    2%;%?%p6%t;1%;%?%p7%t;8%;m,
16010-	use=mach,
16011+	use=ecma+index, use=mach,
16012
16013 mach-gnu-color|Mach Console with ANSI color,
16014 	colors#8, pairs#64,
16015@@ -1245,24 +1243,23 @@
16016 	dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M,
16017 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, flash=\Eg,
16018 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
16019-	il=\E[%p1%dL, il1=\E[L, ind=\E[S, indn=\E[%p1%dS,
16020-	invis=\E[8m, kb2=\E[G, kbs=^?, kcbt=\E[Z, kcub1=\EOD,
16021-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~,
16022-	kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
16023-	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
16024-	kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
16025-	kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf5=\E[15~,
16026-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
16027+	il=\E[%p1%dL, il1=\E[L, ind=\E[S, invis=\E[8m, kb2=\E[G,
16028+	kbs=^?, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
16029+	kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
16030+	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
16031+	kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
16032+	kf19=\E[33~, kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS,
16033+	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
16034 	khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
16035 	kspd=^Z, nel=\r\n, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\E[T,
16036-	rin=\E[%p1%dT, rmacs=\E[10m, rmir=\E[4l, rmso=\E[27m,
16037-	rmul=\E[24m, rs1=\EM\E[?1000l, sc=\E7, setab=\E[4%p1%dm,
16038+	rmacs=\E[10m, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
16039+	rs1=\EM\E[?1000l, sc=\E7, setab=\E[4%p1%dm,
16040 	setaf=\E[3%p1%dm,
16041 	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;
16042 	    2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
16043 	sgr0=\E[0m, smacs=\E[11m, smir=\E[4h, smso=\E[7m,
16044 	smul=\E[4m, vpa=\E[%i%p1%dd, grbom=\E[>1l, gsbom=\E[>1h,
16045-	use=ecma+italics,
16046+	use=ecma+index, use=ecma+italics,
16047
16048 #### QNX
16049 #
16050@@ -1377,7 +1374,7 @@
16051 	el=\E[K, el1=\E[1K\E[X, flash=\E[?5h$<200>\E[?5l,
16052 	fsl=\E[?6h\E8, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH,
16053 	ich=\E[%p1%d@, ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L,
16054-	ind=\E[S, indn=\E[%p1%dS, invis=\E[9m,
16055+	ind=\E[S, invis=\E[9m,
16056 	is2=\E>\E[?1l\E[?7h\E[0;10;39;49m, is3=\E(B\E)0,
16057 	kBEG=\ENn, kCAN=\E[s, kCMD=\E[t, kCPY=\ENs, kCRT=\ENt,
16058 	kDL=\ENv, kEXT=\ENw, kFND=\ENx, kHLP=\ENy, kHOM=\E[h,
16059@@ -1401,9 +1398,9 @@
16060 	kopt=\ENk, kpp=\E[V, kref=\ENl, kres=\ENp, krfr=\ENg,
16061 	kri=\E[b, krpl=\ENr, krst=\ENj, ksav=\ENq, kslt=\E[T,
16062 	ktbc=\ENd, kund=\ENu, ll=\E[99H, nel=\EE, op=\E[39;49m,
16063-	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\E[T,
16064-	rin=\E[%p1%dT, rmacs=^O, rmam=\E[?7l, rmso=\E[27m,
16065-	rmul=\E[24m, rs1=\017\E[?7h\E[0;39;49m$<2>\E>\E[?1l,
16066+	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\E[T, rmacs=^O,
16067+	rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m,
16068+	rs1=\017\E[?7h\E[0;39;49m$<2>\E>\E[?1l,
16069 	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
16070 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
16071 	     %=%t3%e%p1%d%;m,
16072@@ -1413,7 +1410,7 @@
16073 	    %|%t;7%;%?%p7%t;9%;m%?%p9%t\016%e\017%;,
16074 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smso=\E[7m,
16075 	smul=\E[4m, tbc=\E[3g,
16076-	tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH,
16077+	tsl=\E7\E1;24r\E[?6l\E[25;%i%p1%dH, use=ecma+index,
16078 #
16079 qansi|QNX ansi with console writes,
16080 	daisy, xhpa, use=qansi-g,
16081@@ -1475,23 +1472,23 @@
16082 	dch1=\E[P, dispc=\E[=%p1%dg, dl=\E[%p1%dM, dl1=\E[M,
16083 	ed=\E[m\E[J, el=\E[m\E[K, el1=\E[1K, home=\E[H, ht=^I,
16084 	hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L,
16085-	ind=\E[S, indn=\E[%p1%dS, invis=\E[8m, kbeg=\E[E, kbs=^H,
16086-	kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
16087-	kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W,
16088-	kf12=\E[X, kf13=\E[Y, kf15=\E[a, kf16=\E[b, kf17=\E[c,
16089-	kf18=\E[d, kf19=\E[e, kf2=\E[N, kf20=\E[f, kf21=\E[g,
16090-	kf22=\E[h, kf23=\E[i, kf24=\E[j, kf25=\E[k, kf26=\E[l,
16091-	kf27=\E[m, kf28=\E[n, kf29=\E[o, kf3=\E[O, kf30=\E[p,
16092-	kf31=\E[q, kf32=\E[r, kf33=\E[s, kf34=\E[t, kf35=\E[u,
16093-	kf36=\E[v, kf37=\E[w, kf38=\E[x, kf39=\E[y, kf4=\E[P,
16094-	kf40=\E[z, kf41=\E[@, kf42=\E[[, kf43=\E[\\, kf44=\E[],
16095-	kf45=\E[\^, kf46=\E[_, kf47=\E[`, kf48=\E[{, kf5=\E[Q,
16096-	kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H,
16097-	kich1=\E[L, knp=\E[G, kpp=\E[I, op=\E[0;37;40m, rc=\E8,
16098-	rev=\E[7m, ri=\E[T, rin=\E[%p1%dT, rmacs=\E[10m,
16099-	rmam=\E[?7l, rmso=\E[m, rmul=\E[m, sc=\E7,
16100-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[0;10m,
16101-	smacs=\E[12m, smam=\E[?7h, smso=\E[7m, smul=\E[4m,
16102+	ind=\E[S, invis=\E[8m, kbeg=\E[E, kbs=^H, kcbt=\E[Z,
16103+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?,
16104+	kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W, kf12=\E[X,
16105+	kf13=\E[Y, kf15=\E[a, kf16=\E[b, kf17=\E[c, kf18=\E[d,
16106+	kf19=\E[e, kf2=\E[N, kf20=\E[f, kf21=\E[g, kf22=\E[h,
16107+	kf23=\E[i, kf24=\E[j, kf25=\E[k, kf26=\E[l, kf27=\E[m,
16108+	kf28=\E[n, kf29=\E[o, kf3=\E[O, kf30=\E[p, kf31=\E[q,
16109+	kf32=\E[r, kf33=\E[s, kf34=\E[t, kf35=\E[u, kf36=\E[v,
16110+	kf37=\E[w, kf38=\E[x, kf39=\E[y, kf4=\E[P, kf40=\E[z,
16111+	kf41=\E[@, kf42=\E[[, kf43=\E[\\, kf44=\E[], kf45=\E[\^,
16112+	kf46=\E[_, kf47=\E[`, kf48=\E[{, kf5=\E[Q, kf6=\E[R,
16113+	kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H, kich1=\E[L,
16114+	knp=\E[G, kpp=\E[I, op=\E[0;37;40m, rc=\E8, rev=\E[7m,
16115+	ri=\E[T, rmacs=\E[10m, rmam=\E[?7l, rmso=\E[m, rmul=\E[m,
16116+	sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
16117+	sgr0=\E[0;10m, smacs=\E[12m, smam=\E[?7h, smso=\E[7m,
16118+	smul=\E[4m, use=ecma+index,
16119 scoansi-new|SCO Extended ANSI standard crt (5.0.6),
16120 	km,
16121 	civis=\E[=0c, cnorm=\E[=1c, csr=\E[%i%p1%d;%p2%dr,
16122@@ -1674,18 +1671,19 @@
16123 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
16124 	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J,
16125 	el=\E[K, el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
16126-	il=\E[%p1%dL, il1=\E[L, ind=\ED, indn=\E[%p1%dS,
16127+	il=\E[%p1%dL, il1=\E[L, ind=\ED,
16128 	is1=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, kbs=^?,
16129 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
16130 	kdch1=\E[3~, kf1=\E[17~, kf2=\E[18~, kf3=\E[19~,
16131 	kf4=\E[20~, kf5=\E[21~, kf6=\E[23~, kf7=\E[24~, kf8=\E[25~,
16132 	khome=\E[1~, kich1=\E[2~, kll=\E[4~, knp=\E[6~, kpp=\E[5~,
16133 	nel=\EE, rc=\E8, rev=\E[7m, rf=/usr/share/tabset/vt100,
16134-	ri=\EM, rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
16135+	ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
16136 	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
16137 	rs1=\Ec\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
16138 	sgr0=\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
16139 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
16140+	use=ecma+index,
16141
16142 #	NetBSD/FreeBSD vt220 terminal emulator console (pc keyboard & monitor)
16143 #	termcap entries for pure VT220-Emulation and 25, 28, 35, 40, 43 and
16144@@ -1890,15 +1888,15 @@
16145 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[30;1m, dl=\E[%p1%dM,
16146 	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
16147 	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@,
16148-	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
16149-	indn=\E[%p1%dS, kb2=\E[E, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
16150-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?, kend=\E[F,
16151-	kf1=\E[M, kf10=\E[V, kf11=\E[W, kf12=\E[X, kf2=\E[N,
16152-	kf3=\E[O, kf4=\E[P, kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T,
16153-	kf9=\E[U, khome=\E[H, kich1=\E[L, knp=\E[G, kpp=\E[I,
16154-	nel=\E[E, op=\E[x, rc=\E8, rev=\E[7m, ri=\E[T, rin=\E[%p1%dT,
16155-	rmso=\E[m, rs2=\E[x\E[m\Ec, sc=\E7, setb=\E[4%p1%dm,
16156-	setf=\E[3%p1%dm, sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd,
16157+	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S, kb2=\E[E,
16158+	kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
16159+	kcuu1=\E[A, kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V,
16160+	kf11=\E[W, kf12=\E[X, kf2=\E[N, kf3=\E[O, kf4=\E[P, kf5=\E[Q,
16161+	kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H,
16162+	kich1=\E[L, knp=\E[G, kpp=\E[I, nel=\E[E, op=\E[x, rc=\E8,
16163+	rev=\E[7m, ri=\E[T, rmso=\E[m, rs2=\E[x\E[m\Ec, sc=\E7,
16164+	setb=\E[4%p1%dm, setf=\E[3%p1%dm, sgr0=\E[m, smso=\E[7m,
16165+	vpa=\E[%i%p1%dd, use=ecma+index,
16166
16167 #### FreeBSD console entries
16168 #
16169@@ -1939,25 +1937,25 @@
16170 	cvvis=\E[=1C, dch=\E[%p1%dP, dch1=\E[P, dim=\E[30;1m,
16171 	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
16172 	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich=\E[%p1%d@,
16173-	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
16174-	indn=\E[%p1%dS, kb2=\E[E, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
16175-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?, kend=\E[F,
16176-	kf1=\E[M, kf10=\E[V, kf11=\E[W, kf12=\E[X, kf13=\E[Y,
16177-	kf14=\E[Z, kf15=\E[a, kf16=\E[b, kf17=\E[c, kf18=\E[d,
16178-	kf19=\E[e, kf2=\E[N, kf20=\E[f, kf21=\E[g, kf22=\E[h,
16179-	kf23=\E[i, kf24=\E[j, kf25=\E[k, kf26=\E[l, kf27=\E[m,
16180-	kf28=\E[n, kf29=\E[o, kf3=\E[O, kf30=\E[p, kf31=\E[q,
16181-	kf32=\E[r, kf33=\E[s, kf34=\E[t, kf35=\E[u, kf36=\E[v,
16182-	kf37=\E[w, kf38=\E[x, kf39=\E[y, kf4=\E[P, kf40=\E[z,
16183-	kf41=\E[@, kf42=\E[[, kf43=\E[\\, kf44=\E[], kf45=\E[\^,
16184-	kf46=\E[_, kf47=\E[`, kf48=\E[{, kf5=\E[Q, kf6=\E[R,
16185-	kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H, kich1=\E[L,
16186-	knp=\E[G, kpp=\E[I, nel=\E[E, op=\E[x, rc=\E8, rev=\E[7m,
16187-	ri=\E[T, rin=\E[%p1%dT, rmso=\E[m, rs2=\E[x\E[m\Ec, sc=\E7,
16188-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
16189+	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S, kb2=\E[E,
16190+	kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
16191+	kcuu1=\E[A, kdch1=^?, kend=\E[F, kf1=\E[M, kf10=\E[V,
16192+	kf11=\E[W, kf12=\E[X, kf13=\E[Y, kf14=\E[Z, kf15=\E[a,
16193+	kf16=\E[b, kf17=\E[c, kf18=\E[d, kf19=\E[e, kf2=\E[N,
16194+	kf20=\E[f, kf21=\E[g, kf22=\E[h, kf23=\E[i, kf24=\E[j,
16195+	kf25=\E[k, kf26=\E[l, kf27=\E[m, kf28=\E[n, kf29=\E[o,
16196+	kf3=\E[O, kf30=\E[p, kf31=\E[q, kf32=\E[r, kf33=\E[s,
16197+	kf34=\E[t, kf35=\E[u, kf36=\E[v, kf37=\E[w, kf38=\E[x,
16198+	kf39=\E[y, kf4=\E[P, kf40=\E[z, kf41=\E[@, kf42=\E[[,
16199+	kf43=\E[\\, kf44=\E[], kf45=\E[\^, kf46=\E[_, kf47=\E[`,
16200+	kf48=\E[{, kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U,
16201+	khome=\E[H, kich1=\E[L, knp=\E[G, kpp=\E[I, nel=\E[E,
16202+	op=\E[x, rc=\E8, rev=\E[7m, ri=\E[T, rmso=\E[m,
16203+	rs2=\E[x\E[m\Ec, sc=\E7, setab=\E[4%p1%dm,
16204+	setaf=\E[3%p1%dm,
16205 	sgr=\E[0%?%p1%t;2;7%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;30;1%;%?
16206 	    %p6%t;1%;m,
16207-	sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd,
16208+	sgr0=\E[m, smso=\E[7m, vpa=\E[%i%p1%dd, use=ecma+index,
16209 cons25|ansis|ansi80x25|freebsd console (25-line ansi mode),
16210 	acsc=-\030.^Y0\333`\004a\260f\370g\361h\261i\025j\331k\277l
16211 	     \332m\300n\305q\304t\303u\264v\301w\302x\263y\363z\362~
16212@@ -3537,14 +3535,14 @@
16213 # 2018/01/21: found xterm+sm+1006 did not work with version 3.1.5
16214 # 2018/05/19: xterm+sm+1006 seems to work with 3.1.6beta -TD
16215 iTerm2.app|iterm2|terminal emulator for Mac OS X,
16216-	blink=\E[5m, cbt=\E[Z, dim=\E[2m, indn=\E[%p1%dS,
16217-	kEND=\E[1;2F, kHOM=\E[1;2H, ka1@, ka3@, kb2@, kc1@, kc3@, kent@,
16218-	kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S,
16219-	kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ,
16220-	kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
16221-	kf23=\E[23;2~, kf24=\E[24;2~, kind=\E[1;2B, kri=\E[1;2A,
16222-	nel=\EE, op=\E[39;49m, rin=\E[%p1%dT, rmso=\E[27m,
16223-	rmul=\E[24m, rs2=\E[!p\E[?3;4l\E[4l\E>\E[?1000l,
16224+	blink=\E[5m, cbt=\E[Z, dim=\E[2m, kEND=\E[1;2F,
16225+	kHOM=\E[1;2H, ka1@, ka3@, kb2@, kc1@, kc3@, kent@, kf13=\E[1;2P,
16226+	kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S, kf17=\E[15;2~,
16227+	kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~,
16228+	kf21=\E[20;2~, kf22=\E[21;2~, kf23=\E[23;2~,
16229+	kf24=\E[24;2~, kind=\E[1;2B, kri=\E[1;2A, nel=\EE,
16230+	op=\E[39;49m, rmso=\E[27m, rmul=\E[24m,
16231+	rs2=\E[!p\E[?3;4l\E[4l\E>\E[?1000l,
16232 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
16233 	    %p5%t;2%;m%?%p9%t\016%e\017%;,
16234 	kDN3=\E\E[B, kDN4=\E[1;10B, kDN5=\E[1;5B, kDN6=\E[1;6B,
16235@@ -3555,8 +3553,8 @@
16236 	kLFT5=\E[1;5D, kLFT6=\E[1;6D, kNXT3=\E\E[6~,
16237 	kPRV3=\E\E[5~, kRIT3=\E\E[C, kRIT4=\E[1;10C,
16238 	kRIT5=\E[1;5C, kRIT6=\E[1;6C, kUP3=\E\E[A, kUP4=\E[1;10A,
16239-	kUP5=\E[1;5A, kUP6=\E[1;6A, use=xterm+alt+title,
16240-	use=ecma+italics, use=iterm,
16241+	kUP5=\E[1;5A, kUP6=\E[1;6A, use=ecma+index,
16242+	use=xterm+alt+title, use=ecma+italics, use=iterm,
16243
16244 # xnuppc - Darwin PowerPC Console (a.k.a. "darwin")
16245 #
16246@@ -3882,7 +3880,7 @@
16247 	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
16248 	el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l,
16249 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, il=\E[%p1%dL,
16250-	il1=\E[L, ind=\n, indn=\E[%p1%dS,
16251+	il1=\E[L, ind=\n,
16252 	initc=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/
16253 	      %02x%p4%{255}%*%{1000}%/%02x,
16254 	is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>\E]R,
16255@@ -3890,10 +3888,9 @@
16256 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
16257 	kdch1=\E[3~, kend=\E[4~, khome=\E[1~, kich1=\E[2~,
16258 	kind=\E[B, knp=\E[6~, kpp=\E[5~, kri=\E[A, kspd=^Z, nel=\r\n,
16259-	oc=\E]R, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
16260-	rin=\E[%p1%dT, rmacs=^O, rmam=\E[?7l, rmcup=\E[2J\E[?47l,
16261-	rmir=\E[4l, rmkx=\E[?1l\E>, rmpch=\E[10m, rmso=\E[27m,
16262-	rmul=\E[24m,
16263+	oc=\E]R, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
16264+	rmam=\E[?7l, rmcup=\E[2J\E[?47l, rmir=\E[4l,
16265+	rmkx=\E[?1l\E>, rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m,
16266 	rs2=\E<\E["p\E[50;6"p\Ec\E[?3l\E]R\E[?1000l,
16267 	s0ds=\E[10m, s1ds=\E[11m, s2ds=\E[12m, sc=\E7,
16268 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
16269@@ -3902,8 +3899,8 @@
16270 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E[?47h,
16271 	smir=\E[4h, smkx=\E[?1h\E=, smpch=\E[11m, smso=\E[7m,
16272 	smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, E3=\E[3J,
16273-	use=xterm+sm+1006, use=putty+fnkeys, use=vt102+enq,
16274-	use=xterm+sl,
16275+	use=ecma+index, use=xterm+sm+1006, use=putty+fnkeys,
16276+	use=vt102+enq, use=xterm+sl,
16277 vt100-putty|Reset PuTTY to pure vt100,
16278 	rs2=\E<\E["p\Ec\E[?3l\E]R\E[40"p\E[61"p\E[50;1;2"p,
16279 	use=vt100,
16280@@ -4160,6 +4157,8 @@
16281 teraterm|Tera Term,
16282 	use=teraterm4.97,
16283
16284+#### Command prompt
16285+
16286 # Tested with WinNT 4.0, the telnet application assumes the screensize is
16287 # 25x80.  This entry uses the 'Terminal' font, to get line-drawing characters.
16288 #
16289@@ -4224,6 +4223,79 @@
16290 ms-vt-utf8|vt-utf8|UTF-8 flavor of vt100+,
16291 	use=ms-vt100+,
16292
16293+# Windows 10 1903
16294+# Version 0.2.1715.0
16295+# The task manager shows this as "OpenConsole.exe", which differs
16296+# from the "Windows Command Processor" used for the command-prompt.
16297+#
16298+# The settings dialog does not work (unless the end user expects to open
16299+# profiles.json in Visual Studio).  There is no documentation, of course.
16300+#
16301+# Testing via an ssh connection, using openssh:
16302+# - the program sets TERM to cygwin if the tab is set to PowerShell,
16303+#   and to xterm-256color if "Legacy".  However, in the latter, more tests
16304+#   fail in vttest, which does not pay attention to TERM.
16305+# vttest:
16306+# - menu 1 (tests for cursor movement) misbehaves like command-prompt
16307+# - does not flush response to primary DA, leaving a ^M on the end when
16308+#   The PowerShell tab is used.  Both the "Legacy" tab and the command-prompt
16309+#   work properly in this test.
16310+# - in the generic VT100 tests, there are problems with character sets.
16311+# - outside of the generic VT100 tests, the program does poorly because most
16312+#   of the features are missing.
16313+# - ECH does not work properly
16314+# - a few generic xterm features are supported (set window title), but
16315+#   others are missing (such as the mouse).
16316+# - the cursor visible/invisible works in the PowerShell tab, not in "Legacy"
16317+# tack:
16318+# - blink, dim, bold, invis, protect do not work
16319+# - bce works (but per vttest, with ED, EL, not BCE)
16320+# - does not support keypad application mode
16321+# - implements most of the xterm modified keys; sometimes modifiers are ignored
16322+#   or simply incorrect
16323+# - sends escape+key rather than implementing meta mode
16324+# other:
16325+# - color palette cannot be altered
16326+ms-terminal|Windows10 terminal,
16327+	npc,
16328+	rmkx=\E[?1l, rmm@, smkx=\E[?1h, smm@, use=xterm+256setaf,
16329+	use=xterm+pcfkeys, use=xterm-basic,
16330+
16331+#### Visual Studio
16332+# Visual Studio Code 1.35.1
16333+#
16334+# This sets TERM to xterm-256color, which is a little more successful than
16335+# Windows Terminal.
16336+#
16337+# vttest:
16338+# - menu 1 (cursor movement) has problems with wrapping
16339+# - claims to be a VT100 with AVO, but copies xterm #276's secondary response
16340+# - menu 8 (insert/delete char/line) has problem with delete-character
16341+# - like Windows Terminal, fails the ECH test: neither supports DECALN
16342+#   However, the bce test with ECH works.
16343+# - does not support keypad application mode
16344+# - supports most xterm mode controls (except DEC Locator Events)
16345+# - REP, SL/SL do not work, but SD/SU work.
16346+# - the alternate-screen tests fail because it does not support DECALN
16347+# - window modify/report is not supported
16348+# - supports some VT320 presentation reports
16349+# tack:
16350+# - does not support blinking text
16351+# - implements most of the xterm modified keys, with some exceptions:
16352+#   - pageup/pagedown do not send escapes
16353+#   - alt cursor left/right send escape-b and escape-f
16354+# - sends UTF-8 like xterm for meta mode
16355+# other:
16356+# - mouse mode is not reset by reset-sequence
16357+# - supports italics and dim, but not cross-out or double-underline
16358+# - color-palette cannot be changed
16359+vscode|Visual Studio Code terminal,
16360+	npc,
16361+	kcbt=\E[Z, rmkx=\E[?1l, smkx=\E[?1h, use=xterm+256setaf,
16362+	use=ecma+index, use=xterm+sm+1006, use=xterm+pcfkeys,
16363+	use=xterm-basic, use=xterm-basic,
16364+vscode-direct|Visual Studio Code with direct-colors,
16365+	use=xterm+indirect, use=vscode,
16366
16367 ######## X TERMINAL EMULATORS
16368 #### XTERM
16369@@ -4392,10 +4464,10 @@
16370 	kf38=\EO6Q, kf39=\EO6R, kf40=\EO6S, kf41=\E[15;6~,
16371 	kf42=\E[17;6~, kf43=\E[18;6~, kf44=\E[19;6~,
16372 	kf45=\E[20;6~, kf46=\E[21;6~, kf47=\E[23;6~,
16373-	kf48=\E[24;6~, khome=\EOH, rmcup=\E[?1049l,
16374+	kf48=\E[24;6~, khome=\EOH,
16375 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?
16376 	    %p9%t\016%e\017%;,
16377-	smcup=\E[?1049h, use=xterm-xf86-v333,
16378+	use=xterm+alt1049, use=xterm-xf86-v333,
16379
16380 # This version was released in XFree86 4.3.
16381 xterm-xf86-v43|xterm terminal emulator (XFree86 4.3 Window System),
16382@@ -4408,8 +4480,8 @@
16383
16384 # This version was released in XFree86 4.4.
16385 xterm-xf86-v44|xterm terminal emulator (XFree86 4.4 Window System),
16386-	cnorm=\E[?12l\E[?25h, cvvis=\E[?12;25h, indn=\E[%p1%dS,
16387-	rin=\E[%p1%dT, use=xterm-xf86-v43,
16388+	cnorm=\E[?12l\E[?25h, cvvis=\E[?12;25h, use=ecma+index,
16389+	use=xterm-xf86-v43,
16390
16391 xterm-xfree86|xterm terminal emulator (XFree86),
16392 	use=xterm-xf86-v44,
16393@@ -4417,10 +4489,10 @@
16394 # This version reflects the current xterm features.
16395 xterm-new|modern xterm terminal emulator,
16396 	npc,
16397-	indn=\E[%p1%dS, kcbt=\E[Z, kent=\EOM, rin=\E[%p1%dT,
16398-	use=ansi+rep, use=ecma+strikeout, use=xterm+keypad,
16399-	use=vt420+lrmm, use=xterm+sm+1006, use=xterm+pcfkeys,
16400-	use=xterm+tmux, use=xterm-basic,
16401+	kcbt=\E[Z, kent=\EOM, use=ecma+index, use=ansi+rep,
16402+	use=ecma+strikeout, use=xterm+keypad, use=vt420+lrmm,
16403+	use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux,
16404+	use=xterm-basic,
16405
16406 # This fragment is for people who cannot agree on what the backspace key
16407 # should send.
16408@@ -5472,7 +5544,7 @@
16409 vte-2014|VTE 0.35.1,
16410 	ncv@,
16411 	cbt=\E[Z, el1=\E[1K, flash=\E[?5h$<100/>\E[?5l,
16412-	ich=\E[%p1%d@, indn=\E[%p1%dS, kent=\EOM, rin=\E[%p1%dT,
16413+	ich=\E[%p1%d@, kent=\EOM, use=ecma+index,
16414 	use=xterm+sm+1006, use=xterm+pcfkeys, use=vte-2012,
16415
16416 # As of January 2018, this was the  most recent release,
16417@@ -5536,19 +5608,19 @@
16418 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
16419 	dch=\E[%p1%dP, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
16420 	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
16421-	ht=^I, hts=\EH, ind=\n, indn=\E[%p1%dS, invis=\E[8m,
16422+	ht=^I, hts=\EH, ind=\n, invis=\E[8m,
16423 	is2=\E[!p\E[?3;4l\E[4l\E>, kb2=\EOE, kbs=^?, kcbt=\E[Z,
16424-	kent=\EOM, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM,
16425-	rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l,
16426-	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
16427-	rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7,
16428+	kent=\EOM, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B,
16429+	rmam=\E[?7l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
16430+	rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7,
16431 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
16432 	    %t;7%;%?%p7%t;8%;m,
16433-	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smcup=\E[?1049h,
16434-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
16435-	vpa=\E[%i%p1%dd, use=ansi+idc, use=ansi+idl,
16436-	use=ansi+enq, use=ecma+italics, use=xterm+256color,
16437-	use=ecma+color, use=xterm+pcfkeys, use=xterm+sl-twm,
16438+	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smkx=\E[?1h\E=,
16439+	smso=\E[7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
16440+	use=xterm+alt1049, use=ecma+index, use=ansi+idc,
16441+	use=ansi+idl, use=ansi+enq, use=ecma+italics,
16442+	use=xterm+256color, use=ecma+color, use=xterm+pcfkeys,
16443+	use=xterm+sl-twm,
16444
16445 #### Other GNOME
16446 # Multi-Gnome-Terminal 1.6.2
16447@@ -5556,7 +5628,7 @@
16448 # This does not use VTE, and does have different behavior (compare xfce and
16449 # gnome).
16450 mgt|Multi GNOME Terminal,
16451-	indn=\E[%p1%dS, rin=\E[%p1%dT, use=xterm-xf86-v333,
16452+	use=ecma+index, use=xterm-xf86-v333,
16453
16454 #### KDE
16455 # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce
16456@@ -5620,16 +5692,16 @@
16457 	ncv@,
16458 	bel@, blink=\E[5m, civis=\E[?25l, cnorm=\E[?25h, dim=\E[2m,
16459 	ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l,
16460-	hpa=\E[%i%p1%dG, indn=\E[%p1%dS, invis=\E[8m, kbs=^?,
16461-	kdch1=\E[3~, kend=\E[4~, kf1@, kf10@, kf11@, kf12@, kf13@, kf14@,
16462-	kf15@, kf16@, kf17@, kf18@, kf19@, kf2@, kf20@, kf3@, kf4@, kf5@, kf6@,
16463-	kf7@, kf8@, kf9@, kfnd@, khome=\E[1~, kslt@, rin=\E[%p1%dT,
16464-	rmam=\E[?7l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
16465+	hpa=\E[%i%p1%dG, invis=\E[8m, kbs=^?, kdch1=\E[3~,
16466+	kend=\E[4~, kf1@, kf10@, kf11@, kf12@, kf13@, kf14@, kf15@, kf16@,
16467+	kf17@, kf18@, kf19@, kf2@, kf20@, kf3@, kf4@, kf5@, kf6@, kf7@, kf8@,
16468+	kf9@, kfnd@, khome=\E[1~, kslt@, rmam=\E[?7l, rmso=\E[27m,
16469+	rmul=\E[24m, rs1=\Ec,
16470 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?25h,
16471 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
16472 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
16473 	sgr0=\E[0m\017, smam=\E[?7h, vpa=\E[%i%p1%dd,
16474-	use=xterm+sm+1006, use=ecma+strikeout,
16475+	use=ecma+index, use=xterm+sm+1006, use=ecma+strikeout,
16476 	use=ecma+italics, use=ecma+color, use=xterm-r6,
16477
16478 # The keytab feature was introduced in 0.9.12 (February 2000) with "linux" and
16479@@ -5785,23 +5857,24 @@
16480 	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
16481 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=,
16482 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
16483-	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS,
16484+	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
16485 	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^?,
16486 	kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
16487 	kdch1=\E[3~, kend=\EOF, kent=\EOM, kfnd=\E[1~, khome=\EOH,
16488 	kich1=\E[2~, kind=\EO1;2B, kmous=\E[M, knp=\E[6~,
16489 	kpp=\E[5~, kri=\EO1;2A, kslt=\E[4~, mc0=\E[i, nel=\EE,
16490-	op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rin=\E[%p1%dT,
16491-	rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l, rmir=\E[4l,
16492-	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
16493+	op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B,
16494+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
16495+	rmul=\E[24m, rs1=\Ec,
16496 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l,
16497 	sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
16498 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e
16499 	    \E(B%;,
16500-	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smcup=\E[?1049h,
16501-	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
16502-	tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c,
16503-	vpa=\E[%i%p1%dd, use=mlterm+pcfkeys, use=xterm+r6f2,
16504+	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
16505+	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
16506+	u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c,
16507+	vpa=\E[%i%p1%dd, use=xterm+alt1049, use=ecma+index,
16508+	use=mlterm+pcfkeys, use=xterm+r6f2,
16509
16510 # The insert/delete/home/end keys do not respond to modifiers because mlterm
16511 # looks in its termcap to decide which string to send.  If it used terminfo
16512@@ -6298,14 +6371,13 @@
16513 	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
16514 	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J,
16515 	el=\E[K, home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich1=,
16516-	il=\E[%p1%dL, il1=\E[L, ind=\E[S, indn=\E[%p1%dS,
16517-	invis=\E[8m, is2=\E)0\017, kbs=^H, nel=\EE, rev=\E[7m,
16518-	ri=\E[T, rin=\E[%p1%dT, rmacs=^O, rmir=\E[4l, rmso=\E[27m,
16519-	rmul=\E[24m,
16520+	il=\E[%p1%dL, il1=\E[L, ind=\E[S, invis=\E[8m,
16521+	is2=\E)0\017, kbs=^H, nel=\EE, rev=\E[7m, ri=\E[T, rmacs=^O,
16522+	rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
16523 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
16524 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
16525 	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smso=\E[7m,
16526-	smul=\E[4m, vpa=\E[%i%p1%dd,
16527+	smul=\E[4m, vpa=\E[%i%p1%dd, use=ecma+index,
16528 # mterm normally sets $TERM to "mterm"
16529 mterm|mouse-sun|Der Mouse term,
16530 	am, bw, mir,
16531@@ -6329,23 +6401,22 @@
16532 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM,
16533 	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, enacs=\E(B\E)0,
16534 	home=\E[H, hpa=\E[%i%p1%d`, ht=^I, ich1=, il=\E[%p1%dL,
16535-	il1=\E[L, ind=\E[S, indn=\E[%p1%dS, invis=\E[8m,
16536-	is2=\E)0\E[r\017, kbs=^H, kcub1=\EOD, kcud1=\EOB,
16537-	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kf1=\E[11~,
16538-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
16539-	kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~,
16540-	kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, kf20=\E[34~,
16541-	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
16542-	kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~, kich1=\E[2~, knp=\E[6~,
16543-	kpp=\E[5~, kslt=\E[4~, nel=\EE, op=\E[0m, rc=\E8, rev=\E[7m,
16544-	ri=\E[T, rin=\E[%p1%dT, rmacs=^O, rmam=\E[?7l, rmir=\E[4l,
16545-	rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, sc=\E7,
16546-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
16547+	il1=\E[L, ind=\E[S, invis=\E[8m, is2=\E)0\E[r\017, kbs=^H,
16548+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
16549+	kdch1=\E[3~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
16550+	kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf15=\E[28~,
16551+	kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
16552+	kf2=\E[12~, kf20=\E[34~, kf3=\E[13~, kf4=\E[14~,
16553+	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
16554+	kfnd=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, kslt=\E[4~,
16555+	nel=\EE, op=\E[0m, rc=\E8, rev=\E[7m, ri=\E[T, rmacs=^O,
16556+	rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
16557+	rmul=\E[24m, sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
16558 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
16559 	    %p5%t;2%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
16560 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
16561 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, u6=\E[%i%d;%dR,
16562-	u7=\E[6n, vpa=\E[%i%p1%dd,
16563+	u7=\E[6n, vpa=\E[%i%p1%dd, use=ecma+index,
16564
16565 #### VWM
16566 # http://vwm.sourceforge.net/
16567@@ -6368,12 +6439,12 @@
16568 	kf12=\E[23~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E,
16569 	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
16570 	khome=\E[1~, knp=\E[6~, kpp=\E[5~, rev=\E[7m, rmacs=\E[10m,
16571-	rmam=\E[?7l, rmcup=\E[?1049l, rs1=\E[H\E[J\E[m\Ec,
16572-	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
16573+	rmam=\E[?7l, rs1=\E[H\E[J\E[m\Ec, setab=\E[4%p1%dm,
16574+	setaf=\E[3%p1%dm,
16575 	sgr=\E[0;10%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5
16576 	    %t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
16577-	sgr0=\E[0;10m, smacs=\E[11m, smam=\E[?7h,
16578-	smcup=\E[?1049h, smso=\E[3m, smul=\E[4m,
16579+	sgr0=\E[0;10m, smacs=\E[11m, smam=\E[?7h, smso=\E[3m,
16580+	smul=\E[4m, use=xterm+alt1049,
16581
16582 #### MGR
16583 #
16584@@ -6480,16 +6551,16 @@
16585 	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
16586 	enacs=\E)0, flash=\E[?5h$<100/>\E[?5l, fsl=^G, home=\E[H,
16587 	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
16588-	il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS,
16589-	invis=\E[8m, is2=\E[4l\E>\E[?1034l, kDC=\E[3;2~,
16590-	kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~, kLFT=\E[1;2D,
16591-	kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\E[1;2C, ka1=\E[1~,
16592-	ka3=\E[5~, kb2=\EOu, kbs=^?, kc1=\E[4~, kc3=\E[6~, kcbt=\E[Z,
16593-	kclr=\E[3;5~, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
16594-	kcuu1=\EOA, kdch1=\E[3~, kdl1=\E[3;2~, ked=\E[1;5F,
16595-	kel=\E[1;2F, kend=\E[4~, kent=\EOM, kf1=\EOP, kf10=\E[21~,
16596-	kf11=\E[23~, kf12=\E[24~, kf13=\E[1;2P, kf14=\E[1;2Q,
16597-	kf15=\E[1;2R, kf16=\E[1;2S, kf17=\E[15;2~, kf18=\E[17;2~,
16598+	il=\E[%p1%dL, il1=\E[L, ind=\n, invis=\E[8m,
16599+	is2=\E[4l\E>\E[?1034l, kDC=\E[3;2~, kEND=\E[1;2F,
16600+	kHOM=\E[1;2H, kIC=\E[2;2~, kLFT=\E[1;2D, kNXT=\E[6;2~,
16601+	kPRV=\E[5;2~, kRIT=\E[1;2C, ka1=\E[1~, ka3=\E[5~, kb2=\EOu,
16602+	kbs=^?, kc1=\E[4~, kc3=\E[6~, kcbt=\E[Z, kclr=\E[3;5~,
16603+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
16604+	kdch1=\E[3~, kdl1=\E[3;2~, ked=\E[1;5F, kel=\E[1;2F,
16605+	kend=\E[4~, kent=\EOM, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
16606+	kf12=\E[24~, kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R,
16607+	kf16=\E[1;2S, kf17=\E[15;2~, kf18=\E[17;2~,
16608 	kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~,
16609 	kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~,
16610 	kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[1;5R, kf28=\E[1;5S,
16611@@ -6508,20 +6579,20 @@
16612 	kil1=\E[2;5~, kind=\E[1;2B, kmous=\E[M, knp=\E[6~,
16613 	kpp=\E[5~, kri=\E[1;2A, krmir=\E[2;2~, mc0=\E[i, mc4=\E[4i,
16614 	mc5=\E[5i, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
16615-	rmacs=\E(B, rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>,
16616-	rmso=\E[27m, rmul=\E[24m, rs1=\Ec, rs2=\E[4l\E>\E[?1034l,
16617-	sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
16618+	rmacs=\E(B, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
16619+	rmul=\E[24m, rs1=\Ec, rs2=\E[4l\E>\E[?1034l, sc=\E7,
16620+	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
16621 	setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
16622 	     %=%t3%e%p1%d%;m,
16623 	setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
16624 	     %=%t3%e%p1%d%;m,
16625 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
16626 	    %t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
16627-	sgr0=\E[0m, smacs=\E(0, smcup=\E[?1049h, smir=\E[4h,
16628-	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
16629-	u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c,
16630-	vpa=\E[%i%p1%dd, Se=\E[2 q, Ss=\E[%p1%d q, use=xterm+sl,
16631-	use=ecma+italics,
16632+	sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smkx=\E[?1h\E=,
16633+	smso=\E[7m, smul=\E[4m, tbc=\E[3g, u6=\E[%i%d;%dR,
16634+	u7=\E[6n, u8=\E[?1;2c, u9=\E[c, vpa=\E[%i%p1%dd, Se=\E[2 q,
16635+	Ss=\E[%p1%d q, use=ecma+index, use=xterm+alt1049,
16636+	use=xterm+sl, use=ecma+italics,
16637 #
16638 # st-0.1.1
16639 #
16640@@ -6551,17 +6622,18 @@
16641 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
16642 	dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
16643 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
16644-	il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS, kbs=^?,
16645-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
16646-	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
16647-	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
16648-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
16649+	il=\E[%p1%dL, il1=\E[L, ind=\n, kbs=^?, kcub1=\E[D,
16650+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~,
16651+	kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~,
16652+	kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~,
16653+	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
16654 	khome=\E[1~, knp=\E[6~, kpp=\E[5~, op=\E[37;40m, rc=\E8,
16655 	rev=\E[7m, rmacs=\E(B, rmso=\E[m, rmul=\E[m, sc=\E7,
16656 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
16657 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
16658 	    %t;7%;m,
16659 	sgr0=\E[0m, smacs=\E(0, smso=\E[7m, smul=\E[4m,
16660+	use=ecma+index,
16661 st-16color|stterm-16color|simpleterm with 16-colors,
16662 	use=ibm+16color, use=st,
16663 # 256 colors "works", but when running xterm's test-scripts, some garbage is
16664@@ -6645,9 +6717,10 @@
16665 #	CBT, CHT, HPR, CNL,CPL, VPR do not work
16666 #
16667 # removed the cancel for "hs", removed cbt, invis, corrected sgr -TD
16668+# use xterm+256setaf, etc -TD
16669 terminator|Terminator no line wrap,
16670 	bce, eo, mir, msgr, xenl, xon,
16671-	colors#0x100, cols#80, it#8, lines#24, lm#0, pairs#0x10000,
16672+	cols#80, it#8, lines#24, lm#0,
16673 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
16674 	bold=\E[1m, civis=\E[?25l, clear=\E[H\E[2J,
16675 	cnorm=\E[?25h, cr=\r, csr=\E[%i%p1%d;%p2%dr,
16676@@ -6657,24 +6730,23 @@
16677 	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
16678 	el1=\E[1K, enacs=\E(B\E)0, flash=^G, home=\E[H,
16679 	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L,
16680-	ind=\n, indn=\E[%p1%dS, is1=\E[?47l\E=\E[?1l,
16681+	ind=\n, is1=\E[?47l\E=\E[?1l,
16682 	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^?,
16683 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
16684 	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
16685 	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
16686 	kf15=\E[28~, kf16=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
16687 	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
16688-	khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
16689-	op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rin=\E[%p1%dT,
16690-	ritm=\E[23m, rmacs=\E(B, rmcup=\E[?1049l, rmir=\E[4l,
16691-	rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
16692-	rs2=\E[!p\E[?3;4l\E[4l\E>, s0ds=\E(B, s1ds=\E(0, sc=\E7,
16693-	setab=\E[48;5;%p1%dm, setaf=\E[38;5;%p1%dm,
16694+	khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, rc=\E8,
16695+	rev=\E[7m, ri=\EM, rmacs=\E(B, rmir=\E[4l, rmso=\E[27m,
16696+	rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>,
16697+	s0ds=\E(B, s1ds=\E(0, sc=\E7,
16698 	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p5%t;2%;%?%p1%p3%|%t;7
16699 	    %;m%?%p9%t\E(0%e\E(B%;,
16700-	sgr0=\E[m\E(B, sitm=\E[3m, smacs=\E(0, smcup=\E[?1049h,
16701-	smir=\E[4h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
16702-	tsl=\E]2;%p1, vpa=\E[%i%p1%dd, use=xterm+sl-twm,
16703+	sgr0=\E[m\E(B, smacs=\E(0, smir=\E[4h, smso=\E[7m,
16704+	smul=\E[4m, tbc=\E[3g, tsl=\E]2;%p1, vpa=\E[%i%p1%dd,
16705+	use=ecma+italics, use=ecma+index, use=xterm+256setaf,
16706+	use=xterm+sl-twm, use=xterm+alt1049,
16707
16708 #### TERMINOLOGY
16709 # https://www.enlightenment.org/about-terminology
16710@@ -6819,8 +6891,8 @@
16711 # removed ecma+strikeout, not implemented -TD
16712 alacritty+common|base fragment for alacritty,
16713 	npc,
16714-	ech@, indn=\E[%p1%dS, kb2=\EOE, kbs=^H, kcbt=\E[Z, kent=\EOM,
16715-	rin=\E[%p1%dT, Se=\E[0 q, use=xterm-basic, use=xterm+app,
16716+	ech@, kb2=\EOE, kbs=^H, kcbt=\E[Z, kent=\EOM, Se=\E[0 q,
16717+	use=ecma+index, use=xterm-basic, use=xterm+app,
16718 	use=ansi+rep, use=xterm+sm+1006, use=xterm+tmux,
16719 	use=ecma+italics, use=xterm+pce2, use=xterm+pcc2,
16720 	use=xterm+pcf2,
16721@@ -6917,28 +6989,28 @@
16722 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
16723 	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
16724 	ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
16725-	ind=\n, indn=\E[%p1%dS, kbs=^?, kcbt=\E[Z, kcub1=\EOD,
16726-	kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\EOF,
16727-	kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
16728-	kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S,
16729-	kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ,
16730-	kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
16731-	kf23=\E[23;2~, kf24=\E[24;2~, kf25=\E[1;5P, kf26=\E[1;5Q,
16732-	kf27=\E[1;5R, kf28=\E[1;5S, kf29=\E[15;5~, kf3=\EOR,
16733-	kf30=\E[17;5~, kf31=\E[18;5~, kf32=\E[19;5~,
16734-	kf33=\E[20;5~, kf34=\E[21;5~, kf35=\E[23;5~,
16735-	kf36=\E[24;5~, kf4=\EOS, kf5=\E[15~, kf6=\E[17~,
16736-	kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\EOH,
16737-	kich1=\E[2~, kind=\E[1;2B, kmous=\E[M, knp=\E[6~,
16738-	kpp=\E[5~, kri=\E[1;2A, op=\E[39;49m, rc=\E8, rev=\E[7m,
16739-	ri=\EM, rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
16740+	ind=\n, kbs=^?, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
16741+	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\EOF, kf1=\EOP,
16742+	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[1;2P,
16743+	kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S, kf17=\E[15;2~,
16744+	kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~,
16745+	kf21=\E[20;2~, kf22=\E[21;2~, kf23=\E[23;2~,
16746+	kf24=\E[24;2~, kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[1;5R,
16747+	kf28=\E[1;5S, kf29=\E[15;5~, kf3=\EOR, kf30=\E[17;5~,
16748+	kf31=\E[18;5~, kf32=\E[19;5~, kf33=\E[20;5~,
16749+	kf34=\E[21;5~, kf35=\E[23;5~, kf36=\E[24;5~, kf4=\EOS,
16750+	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
16751+	khome=\EOH, kich1=\E[2~, kind=\E[1;2B, kmous=\E[M,
16752+	knp=\E[6~, kpp=\E[5~, kri=\E[1;2A, op=\E[39;49m, rc=\E8,
16753+	rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
16754 	rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, sc=\E7,
16755 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
16756 	    %t;7%;;m,
16757 	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
16758 	smkx=\E[?1h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
16759-	vpa=\E[%i%p1%dd, use=xterm+sl-twm, use=xterm+pce2,
16760-	use=xterm+pcc2, use=ecma+italics, use=xterm+alt1049,
16761+	vpa=\E[%i%p1%dd, use=ecma+index, use=xterm+sl-twm,
16762+	use=xterm+pce2, use=xterm+pcc2, use=ecma+italics,
16763+	use=xterm+alt1049,
16764
16765 ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
16766 #
16767@@ -7104,20 +7176,20 @@
16768 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
16769 	enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG,
16770 	ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
16771-	ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^H, kcbt=\E[Z,
16772-	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
16773-	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
16774-	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
16775-	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
16776-	khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
16777-	nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
16778-	rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m,
16779+	ind=\n, is2=\E)0, kbs=^H, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
16780+	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP,
16781+	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR,
16782+	kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
16783+	kf9=\E[20~, khome=\E[1~, kich1=\E[2~, kmous=\E[M,
16784+	knp=\E[6~, kpp=\E[5~, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
16785+	rmacs=^O, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m,
16786 	rmul=\E[24m, rs2=\Ec\E[?1000l\E[?25h, sc=\E7,
16787 	sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;
16788 	    5%;%?%p5%t;2%;m%?%p9%t\016%e\017%;,
16789-	sgr0=\E[m\017, smacs=^N, smcup=\E[?1049h, smir=\E[4h,
16790-	smkx=\E[?1h\E=, smso=\E[3m, smul=\E[4m, tbc=\E[3g,
16791-	vpa=\E[%i%p1%dd, E0=\E(B, S0=\E(%p1%c, use=ecma+color,
16792+	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=,
16793+	smso=\E[3m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
16794+	E0=\E(B, S0=\E(%p1%c, use=ecma+index, use=xterm+alt1049,
16795+	use=ecma+color,
16796 # The bce and status-line entries are from screen 3.9.13 (and require some
16797 # changes to .screenrc).
16798 screen-bce|VT 100/ANSI X3.64 virtual terminal with bce,
16799@@ -8307,18 +8379,18 @@
16800 	cvvis=\E[2v, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
16801 	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
16802 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
16803-	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
16804-	indn=\E[%p1%dS, invis=\E[8m, kbs=^H, kcub1=\E[D,
16805-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~,
16806-	kend=\E[4~, kf1=\E[[A, kf10=\E[21~, kf11=\E[23~,
16807-	kf12=\E[24~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E,
16808-	kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
16809+	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S, invis=\E[8m,
16810+	kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
16811+	kdch1=\E[3~, kend=\E[4~, kf1=\E[[A, kf10=\E[21~,
16812+	kf11=\E[23~, kf12=\E[24~, kf2=\E[[B, kf3=\E[[C, kf4=\E[[D,
16813+	kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
16814 	khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, nel=\r\n,
16815-	op=\E[37;40m, rev=\E[7m, ri=\E[T, rin=\E[%p1%dT, rmso=\E[m,
16816+	op=\E[37;40m, rev=\E[7m, ri=\E[T, rmso=\E[m,
16817 	setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
16818 	sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%e;25%;%?
16819 	    %p6%t;1%;%?%p7%t;8%;m,
16820 	sgr0=\E[m, smso=\E[7m, smul=\E[4m, vpa=\E[%i%p1%dd,
16821+	use=ecma+index,
16822
16823 djgpp203|Entry for DJGPP 2.03,
16824 	OTbs, am,
16825@@ -8336,14 +8408,14 @@
16826 	cuu1=\E[A, cvvis=\E[2v, dch=\E[%p1%dP, dch1=\E[P,
16827 	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
16828 	home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
16829-	il1=\E[L, ind=\E[S, indn=\E[%p1%dS, invis=\E[8m, kbs=^H,
16830-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
16831-	kdch1=\E[3~, kf0=\E[21~, kf1=\E[[A, kf10=\E[21~, kf2=\E[[B,
16832-	kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~,
16833-	kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~,
16834-	kll=\E[4~, knp=\E[6~, kpp=\E[5~, nel=\r\n, rev=\E[7m,
16835-	ri=\E[T, rin=\E[%p1%dT, rmso=\E[m, setab=\E[4%p1%dm,
16836-	setaf=\E[3%p1%dm, sgr0=\E[m, smso=\E[7m, smul=\E[4m,
16837+	il1=\E[L, ind=\E[S, invis=\E[8m, kbs=^H, kcub1=\E[D,
16838+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~,
16839+	kf0=\E[21~, kf1=\E[[A, kf10=\E[21~, kf2=\E[[B, kf3=\E[[C,
16840+	kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
16841+	kf9=\E[20~, khome=\E[1~, kich1=\E[2~, kll=\E[4~, knp=\E[6~,
16842+	kpp=\E[5~, nel=\r\n, rev=\E[7m, ri=\E[T, rmso=\E[m,
16843+	setab=\E[4%p1%dm, setaf=\E[3%p1%dm, sgr0=\E[m,
16844+	smso=\E[7m, smul=\E[4m, use=ecma+index,
16845
16846 #### U/Win
16847
16848@@ -8466,26 +8538,25 @@
16849 	cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA,
16850 	cuu1=\E[A, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
16851 	home=\E[H, ht=^I, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
16852-	indn=\E[%p1%dS, kLFT=\EF\^, kRIT=\EF$, kbs=^H, kcbt=\E[Z,
16853-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?,
16854-	kend=\E[U, kf0=\EFA, kf1=\EF1, kf10=\EFA, kf11=\EFB,
16855-	kf12=\EFC, kf13=\EFD, kf14=\EFE, kf15=\EFF, kf16=\EFG,
16856-	kf17=\EFH, kf18=\EFI, kf19=\EFJ, kf2=\EF2, kf20=\EFK,
16857-	kf21=\EFL, kf22=\EFM, kf23=\EFN, kf24=\EFO, kf25=\EFP,
16858-	kf26=\EFQ, kf27=\EFR, kf28=\EFS, kf29=\EFT, kf3=\EF3,
16859-	kf30=\EFU, kf31=\EFV, kf32=\EFW, kf33=\EFX, kf34=\EFY,
16860-	kf35=\EFZ, kf36=\EFa, kf37=\EFb, kf38=\EFc, kf39=\EFd,
16861-	kf4=\EF4, kf40=\EFe, kf41=\EFf, kf42=\EFg, kf43=\EFh,
16862-	kf44=\EFi, kf45=\EFj, kf46=\EFk, kf47=\EFm, kf48=\EFn,
16863-	kf49=\EFo, kf5=\EF5, kf50=\EFp, kf51=\EFq, kf52=\EFr,
16864-	kf53=\EFs, kf54=\EFt, kf55=\EFu, kf56=\EFv, kf57=\EFw,
16865-	kf58=\EFx, kf59=\EFy, kf6=\EF6, kf60=\EFz, kf7=\EF7,
16866-	kf8=\EF8, kf9=\EF9, khome=\E[H, kich1=\E[L, kind=\EF+,
16867-	kll=\E[U, knp=\E[T, kpp=\E[S, kri=\EF-, ll=\E[U, nel=\r\n,
16868-	op=\E[m, rc=\E[u, rev=\E[7m, ri=\E[T, rin=\E[%p1%dT,
16869-	rmcup=\E[2b\E[u\r\E[K, rmso=\E[m, rmul=\E[m, rs1=\Ec,
16870-	sc=\E[s, sgr0=\E[0m, smcup=\E[s\E[1b, smso=\E[7m,
16871-	smul=\E[4m, use=klone+color,
16872+	kLFT=\EF\^, kRIT=\EF$, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
16873+	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=^?, kend=\E[U,
16874+	kf0=\EFA, kf1=\EF1, kf10=\EFA, kf11=\EFB, kf12=\EFC,
16875+	kf13=\EFD, kf14=\EFE, kf15=\EFF, kf16=\EFG, kf17=\EFH,
16876+	kf18=\EFI, kf19=\EFJ, kf2=\EF2, kf20=\EFK, kf21=\EFL,
16877+	kf22=\EFM, kf23=\EFN, kf24=\EFO, kf25=\EFP, kf26=\EFQ,
16878+	kf27=\EFR, kf28=\EFS, kf29=\EFT, kf3=\EF3, kf30=\EFU,
16879+	kf31=\EFV, kf32=\EFW, kf33=\EFX, kf34=\EFY, kf35=\EFZ,
16880+	kf36=\EFa, kf37=\EFb, kf38=\EFc, kf39=\EFd, kf4=\EF4,
16881+	kf40=\EFe, kf41=\EFf, kf42=\EFg, kf43=\EFh, kf44=\EFi,
16882+	kf45=\EFj, kf46=\EFk, kf47=\EFm, kf48=\EFn, kf49=\EFo,
16883+	kf5=\EF5, kf50=\EFp, kf51=\EFq, kf52=\EFr, kf53=\EFs,
16884+	kf54=\EFt, kf55=\EFu, kf56=\EFv, kf57=\EFw, kf58=\EFx,
16885+	kf59=\EFy, kf6=\EF6, kf60=\EFz, kf7=\EF7, kf8=\EF8, kf9=\EF9,
16886+	khome=\E[H, kich1=\E[L, kind=\EF+, kll=\E[U, knp=\E[T,
16887+	kpp=\E[S, kri=\EF-, ll=\E[U, nel=\r\n, op=\E[m, rc=\E[u,
16888+	rev=\E[7m, ri=\E[T, rmcup=\E[2b\E[u\r\E[K, rmso=\E[m,
16889+	rmul=\E[m, rs1=\Ec, sc=\E[s, sgr0=\E[0m, smcup=\E[s\E[1b,
16890+	smso=\E[7m, smul=\E[4m, use=ecma+index, use=klone+color,
16891
16892 opennt-35|ntconsole-35|OpenNT-term35 compatible with color,
16893 	lines#35, use=opennt,
16894@@ -10852,8 +10923,7 @@
16895 	dl=\E[%p1%dM, dl1=\ER, dsl=\E_30\r, ech=\E[%p1%d@, ed=\EY,
16896 	el=\ET, flash=\Eb$<15>\Ed, fsl=\r, home=^^, ht=^I, hts=\E1,
16897 	ich=\E[%p1%d@, if=/usr/share/tabset/stdcrt,
16898-	il=\E[%p1%dL, il1=\EE, ind=\n, indn=\E[%p1%dS, invis=\EG1,
16899-	ip=$<3>,
16900+	il=\E[%p1%dL, il1=\EE, ind=\n, invis=\EG1, ip=$<3>,
16901 	is1=\E"\E%\E'\E(\EG@\EO\EX\E[=5l\E[=6l\E[=7h\Ed\Er,
16902 	is2=\EF2\EG0\E\\L, is3=\E<\E[=4l\E[=8h, kHOM=\E\s\s\s,
16903 	kbs=^H, kcbt=\EI, kcub1=^H, kcud1=^V, kcuf1=^L, kcuu1=^K,
16904@@ -10866,10 +10936,10 @@
16905 	pfx=\E|%p1%{48}%+%c1%p2%s\031,
16906 	pln=\E_%p1%{63}%+%c%p2%s\r, prot=\E&,
16907 	rep=\E[%p2%db%p1%c, rev=\EG4,
16908-	rf=/usr/share/tabset/stdcrt, ri=\Ej, rin=\E[%p1%dT,
16909-	rmacs=\E%%, rmam=\E[=7l, rmcup=\E.3\Er\E[1;25r\E[25;0H,
16910-	rmdc=\0, rmir=\Er, rmln=\E[4;1v, rmso=\EG0, rmul=\EG0,
16911-	rmxon=^N, rs1=\EC\EDF\E[0;0v\E[8;1v\E[=65l,
16912+	rf=/usr/share/tabset/stdcrt, ri=\Ej, rmacs=\E%%,
16913+	rmam=\E[=7l, rmcup=\E.3\Er\E[1;25r\E[25;0H, rmdc=\0,
16914+	rmir=\Er, rmln=\E[4;1v, rmso=\EG0, rmul=\EG0, rmxon=^N,
16915+	rs1=\EC\EDF\E[0;0v\E[8;1v\E[=65l,
16916 	rs2=\E.b\E[10;20v\E[14;1v\E[3;0v\E[7;0v\E[=11.h\E[=12.h\E[=1
16917 	    3.h\E[=14.h\E[=15l\E[=20h\E[=60l\E[=61h\E[=9l\E[=10l\E[=
16918 	    21l\E[=23l\E[=3l\E_40\E_50\En\Ew\Ee\s\Ex0\0\0\Ex1\0\0
16919@@ -10881,7 +10951,7 @@
16920 	    %p9%t\E$%e\E%%%;,
16921 	sgr0=\EG0\E%, smacs=\E$, smam=\E=7h, smcup=\E.2, smdc=\Er,
16922 	smir=\Eq, smln=\E[4;2v, smso=\EGt, smul=\EG8, smxon=^O,
16923-	tbc=\E3, tsl=\E[4;1v\E_30, uc=\EG8\EG0,
16924+	tbc=\E3, tsl=\E[4;1v\E_30, uc=\EG8\EG0, use=ecma+index,
16925
16926 #### Visual (vi)
16927 #
16928@@ -13071,16 +13141,15 @@
16929 	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\EP,
16930 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[0K, home=\E[H,
16931 	hpa=\E[%p1%dG, ht=^I, hts=\E1, ich=\E[%p1%d@, ich1=\E\^,
16932-	il=\E[%p1%dL, il1=\EL, ind=\n, indn=\E[%p1%dS,
16933-	is1=\Ec\E[?7h, is2=\E[m\E[1;24r, kbs=^H, kcbt=\EO,
16934-	kclr=\E[2J, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
16935-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU,
16936-	kf7=\EOV, kf8=\EOW, khome=\E[H, kll=\E[24;1H, ll=\E[24H,
16937-	nel=\r\n, rc=\E8, rev=\E[7m, ri=\ET, rin=\E[%p1%dT,
16938-	rmacs=\E(B, rmam=\E[?7l, rmso=\E[m, rmul=\E[m,
16939-	rs2=\Ec\E[?3l\E[2;0y, sc=\E7, sgr0=\E[m\E(B, smacs=\E(0,
16940-	smam=\E[?7h, smso=\E[5m, smul=\E[4m, tbc=\E[3g,
16941-	vpa=\E[%p1%dd,
16942+	il=\E[%p1%dL, il1=\EL, ind=\n, is1=\Ec\E[?7h,
16943+	is2=\E[m\E[1;24r, kbs=^H, kcbt=\EO, kclr=\E[2J, kcub1=\ED,
16944+	kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kf1=\EOP, kf2=\EOQ,
16945+	kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
16946+	khome=\E[H, kll=\E[24;1H, ll=\E[24H, nel=\r\n, rc=\E8,
16947+	rev=\E[7m, ri=\ET, rmacs=\E(B, rmam=\E[?7l, rmso=\E[m,
16948+	rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, sc=\E7, sgr0=\E[m\E(B,
16949+	smacs=\E(0, smam=\E[?7h, smso=\E[5m, smul=\E[4m, tbc=\E[3g,
16950+	vpa=\E[%p1%dd, use=ecma+index,
16951
16952 # Terminfo entry for the AT&T 510 A Personal Terminal
16953 # Function keys 9 - 16 are available only after the
16954@@ -13136,24 +13205,24 @@
16955 	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[0J, el=\E[0K,
16956 	el1=\E[1K, enacs=\E(B\E)1, ff=^L, home=\E[H,
16957 	hpa=\E[%p1%{1}%+%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
16958-	il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS,
16959-	invis=\E[8m, is1=\E(B\E)1\E[5;0|, is3=\E[21;1|\212,
16960-	kLFT=\E[u, kRIT=\E[v, kbs=^H, kcbt=\E[Z, kcub1=\E[D,
16961-	kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOm, kf10=\EOd,
16962-	kf11=\EOe, kf12=\EOf, kf13=\EOg, kf14=\EOh, kf15=\EOi,
16963-	kf16=\EOj, kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe, kf6=\ENf,
16964-	kf7=\ENh, kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T, ll=\E#2,
16965-	mc0=\E[0i, mc4=\E[?8i, mc5=\E[?4i, mgc=\E\:, nel=\EE,
16966+	il=\E[%p1%dL, il1=\E[L, ind=\n, invis=\E[8m,
16967+	is1=\E(B\E)1\E[5;0|, is3=\E[21;1|\212, kLFT=\E[u,
16968+	kRIT=\E[v, kbs=^H, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B,
16969+	kcuf1=\E[C, kcuu1=\E[A, kf1=\EOm, kf10=\EOd, kf11=\EOe,
16970+	kf12=\EOf, kf13=\EOg, kf14=\EOh, kf15=\EOi, kf16=\EOj,
16971+	kf2=\EOV, kf3=\EOu, kf4=\ENj, kf5=\ENe, kf6=\ENf, kf7=\ENh,
16972+	kf8=\E[H, kf9=\EOc, kind=\E[S, kri=\E[T, ll=\E#2, mc0=\E[0i,
16973+	mc4=\E[?8i, mc5=\E[?4i, mgc=\E\:, nel=\EE,
16974 	pln=\E[%p1%dp%p2%:-16s, rc=\E8,
16975-	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM,
16976-	rin=\E[%p1%dT, rmacs=^O, rmir=\E[4l, rmkx=\E[19;0|,
16977-	rmln=\E<, rmso=\E[m, rmul=\E[m, rmxon=\E[29;1|,
16978-	rs2=\E[5;0|, sc=\E7,
16979+	rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM, rmacs=^O,
16980+	rmir=\E[4l, rmkx=\E[19;0|, rmln=\E<, rmso=\E[m, rmul=\E[m,
16981+	rmxon=\E[29;1|, rs2=\E[5;0|, sc=\E7,
16982 	sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6
16983 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
16984 	sgr0=\E[m\017, smacs=^N, smgl=\E4, smgr=\E5, smir=\E[4h,
16985 	smkx=\E[19;1|, smln=\E?, smso=\E[7m, smul=\E[4m,
16986 	smxon=\E[29;0|, tbc=\E[3g, vpa=\E[%p1%{1}%+%dd,
16987+	use=ecma+index,
16988
16989 # (att500: I merged this with the att513 entry, att500 just used att513 -- esr)
16990 att500|att513|AT&T 513 using page mode,
16991@@ -13260,10 +13329,9 @@
16992 	cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
16993 	dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
16994 	home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL,
16995-	il1=\E[L, ind=\n, indn=\E[%p1%dS, kbs=^H, kclr=\E[2J,
16996-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, khome=\E[H,
16997-	kll=\E[70;1H, nel=\r\n, rc=\E8, ri=\E[T, rin=\E[%p1%dT,
16998-	rs1=\Ec, sc=\E7,
16999+	il1=\E[L, ind=\n, kbs=^H, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B,
17000+	kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, kll=\E[70;1H, nel=\r\n,
17001+	rc=\E8, ri=\E[T, rs1=\Ec, sc=\E7, use=ecma+index,
17002
17003 # 5620 terminfo  (2.0 or later ROMS with char attributes)
17004 # The following SET-UP modes are assumed for normal operation:
17005@@ -13284,12 +13352,12 @@
17006 	cud1=\E[B, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A,
17007 	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM,
17008 	dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, ich=\E[%p1%d@,
17009-	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
17010-	indn=\E[%p1%dS, kbs=^H, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B,
17011-	kcuf1=\E[C, kcuu1=\E[A, khome=\E[H, kll=\E[70;1H, nel=\n,
17012+	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S, kbs=^H,
17013+	kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
17014+	khome=\E[H, kll=\E[70;1H, nel=\n,
17015 	pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8, rev=\E[7m, ri=\E[T,
17016-	rin=\E[%p1%dT, rmso=\E[0m, rmul=\E[0m, rs1=\Ec, sc=\E7,
17017-	sgr0=\E[0m, smso=\E[7m, smul=\E[4m,
17018+	rmso=\E[0m, rmul=\E[0m, rs1=\Ec, sc=\E7, sgr0=\E[0m,
17019+	smso=\E[7m, smul=\E[4m, use=ecma+index,
17020 att5620-24|tty5620-24|dmd-24|teletype dmd 5620 in a 24x80 layer,
17021 	lines#24, use=att5620,
17022 att5620-34|tty5620-34|dmd-34|teletype dmd 5620 in a 34x80 layer,
17023@@ -13370,7 +13438,7 @@
17024 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
17025 	flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H, ht=^I,
17026 	ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED,
17027-	indn=\E[%p1%dS, invis=\E[8m,
17028+	invis=\E[8m,
17029 	is1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h\E(B\E)0,
17030 	is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ @, kRIT=\E[ A, kbs=^H,
17031 	kcbt=\E[Z, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
17032@@ -13381,12 +13449,13 @@
17033 	nel=\EE,
17034 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s,
17035 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m,
17036-	ri=\EM, rin=\E[%p1%dT, rmacs=^O, rmam=\E[?7l, rmir=\E[4l,
17037-	rmln=\E[2p, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l, sc=\E7,
17038+	ri=\EM, rmacs=^O, rmam=\E[?7l, rmir=\E[4l, rmln=\E[2p,
17039+	rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l, sc=\E7,
17040 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
17041 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
17042 	sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
17043 	smln=\E[p, smso=\E[7m, smul=\E[4m, tsl=\E7\E[25;%i%p1%dx,
17044+	use=ecma+index,
17045 att610-w|AT&T 610; 132 column; 98key keyboard,
17046 	cols#132, wsl#132,
17047 	is1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h,
17048@@ -13445,7 +13514,7 @@
17049 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
17050 	flash=\E[?5h$<200>\E[?5l, fsl=\E8, home=\E[H, ht=^I,
17051 	ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED,
17052-	indn=\E[%p1%dS, invis=\E[8m,
17053+	invis=\E[8m,
17054 	is1=\E[8;0|\E[?3;4;5;13;15l\E[13;20l\E[?7h\E[12h,
17055 	is2=\E[m\017, is3=\E(B\E)0, kLFT=\E[ A, kRIT=\E[ @, kbs=^H,
17056 	kcbt=\E[Z, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
17057@@ -13462,14 +13531,13 @@
17058 	mc4=\E[?4i, mc5=\E[?5i, nel=\EE,
17059 	pfx=\E[%p1%d;%p2%l%02dq   F%p1%1d           %p2%s,
17060 	pln=\E[%p1%d;0;0;0q%p2%:-16.16s, rc=\E8, rev=\E[7m,
17061-	ri=\EM, rin=\E[%p1%dT, rmacs=\E(B\017, rmam=\E[?7l,
17062-	rmir=\E[4l, rmln=\E[2p, rmso=\E[m, rmul=\E[m,
17063-	rs2=\Ec\E[?3l, sc=\E7,
17064+	ri=\EM, rmacs=\E(B\017, rmam=\E[?7l, rmir=\E[4l,
17065+	rmln=\E[2p, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l, sc=\E7,
17066 	sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1
17067 	    %|%t;7%;%?%p7%t;8%;m%?%p9%t\E)0\016%e\E(B\017%;,
17068 	sgr0=\E[m\E(B\017, smacs=\E)0\016, smam=\E[?7h,
17069 	smir=\E[4h, smln=\E[p, smso=\E[7m, smul=\E[4m,
17070-	tsl=\E7\E[25;%i%p1%dx,
17071+	tsl=\E7\E[25;%i%p1%dx, use=ecma+index,
17072 att620-w|AT&T 620; 132 column; 98key keyboard,
17073 	cols#132, wsl#132,
17074 	is1=\E[8;0|\E[?4;5;13;15l\E[13;20l\E[?3;7h\E[12h,
17075@@ -13516,19 +13584,19 @@
17076 	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
17077 	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
17078 	el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@, ich1=\E[@,
17079-	il=\E[%p1%dL, il1=\E[L, ind=\ED, indn=\E[%p1%dS, is2=\E[m,
17080-	kbs=^H, kcbt=\E[Z, kclr=\E[2J, kcub1=\E[D, kcud1=\E[B,
17081-	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kdl1=\E[M, kent=\r,
17082-	kf10=\ENp, kf11=\ENq, kf12=\ENr, kf13=\ENs, kf14=\ENt,
17083-	kf15=\ENu, kf16=\ENv, kf17=\ENw, kf18=\ENx, kf19=\ENy,
17084-	kf20=\ENz, kf21=\EN{, kf22=\EN|, kf23=\EN}, kf24=\EN~,
17085-	kf9=\ENo, khome=\E[H, kich1=\E[@, kil1=\E[L, mc4=\E[?4i,
17086-	mc5=\E[?5i, nel=\r\n, pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8,
17087-	rev=\E[7m, ri=\EM, rin=\E[%p1%dT, rmir=\E[4l, rmso=\E[m,
17088-	rmul=\E[m, rs2=\Ec, sc=\E7,
17089+	il=\E[%p1%dL, il1=\E[L, ind=\ED, is2=\E[m, kbs=^H, kcbt=\E[Z,
17090+	kclr=\E[2J, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
17091+	kdch1=\E[P, kdl1=\E[M, kent=\r, kf10=\ENp, kf11=\ENq,
17092+	kf12=\ENr, kf13=\ENs, kf14=\ENt, kf15=\ENu, kf16=\ENv,
17093+	kf17=\ENw, kf18=\ENx, kf19=\ENy, kf20=\ENz, kf21=\EN{,
17094+	kf22=\EN|, kf23=\EN}, kf24=\EN~, kf9=\ENo, khome=\E[H,
17095+	kich1=\E[@, kil1=\E[L, mc4=\E[?4i, mc5=\E[?5i, nel=\r\n,
17096+	pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8, rev=\E[7m, ri=\EM,
17097+	rmir=\E[4l, rmso=\E[m, rmul=\E[m, rs2=\Ec, sc=\E7,
17098 	sgr=\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%p4%|%t;7
17099 	    %;m,
17100 	sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
17101+	use=ecma+index,
17102 att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines,
17103 	lines#24, use=att630,
17104
17105@@ -14632,16 +14700,16 @@
17106 	cvvis=\E[3;5v, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
17107 	dl1=\E[M, ed=\E[J, el=\E[K, flash=\E[?5l$<200/>\E[?5h,
17108 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
17109-	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS,
17110+	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\n,
17111 	is2=\E<\E>\E[?1l\E[?3l\E[?4l\E[?5h\E[?7h\E[?8h\E[3g\E[>5g\E(
17112 	    B\E[m\E[20l\E[1;24r\E[24;1H,
17113 	kbs=^?, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
17114 	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\EE, rc=\E8,
17115-	rev=\E[7m, ri=\EM, rin=\E[%p1%dT, rmcup=, rmir=\E[4l,
17116-	rmso=\E[m, rmul=\E[m, rs1=\Ec\E[?7h\E[>5g, sc=\E7,
17117-	sgr0=\E[m, smcup=\E[>5g\E[?7h\E[?5h, smir=\E[4h,
17118-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, u6=\E[%i%p1%d;%p2%dR,
17119-	u7=\E[6n, u8=\E[?6c, u9=\E[c,
17120+	rev=\E[7m, ri=\EM, rmcup=, rmir=\E[4l, rmso=\E[m, rmul=\E[m,
17121+	rs1=\Ec\E[?7h\E[>5g, sc=\E7, sgr0=\E[m,
17122+	smcup=\E[>5g\E[?7h\E[?5h, smir=\E[4h, smso=\E[7m,
17123+	smul=\E[4m, tbc=\E[3g, u6=\E[%i%p1%d;%p2%dR, u7=\E[6n,
17124+	u8=\E[?6c, u9=\E[c, use=ecma+index,
17125 cit101e-n|CIT-101e w/o am,
17126 	am@,
17127 	cvvis=\E[?1l\E[?4l\E[?7l, kbs=^H, kcub1=^H, kcud1=\n,
17128@@ -16945,25 +17013,25 @@
17129 	cuu=\E[%p1%dA, cuu1=\E[A, dch1=\E[P, dl=\E[%p1%dM,
17130 	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H,
17131 	hpa=\E[%i%p1%dG, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
17132-	indn=\E[%p1%dS, invis=\E[8m, is2=\Ec, kbs=^H, kcbt=\E[Z,
17133-	kclr=\E[144q, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
17134-	kcuu1=\E[A, kdch1=\E[P, ked=\E[148q, kel=\E[142q,
17135-	kend=\E[146q, kf1=\E[001q, kf10=\E[010q, kf11=\E[011q,
17136-	kf12=\E[012q, kf13=\E[013q, kf14=\E[014q, kf15=\E[015q,
17137-	kf16=\E[016q, kf17=\E[017q, kf18=\E[018q, kf19=\E[019q,
17138-	kf2=\E[002q, kf20=\E[020q, kf21=\E[021q, kf22=\E[022q,
17139-	kf23=\E[023q, kf24=\E[024q, kf25=\E[025q, kf26=\E[026q,
17140-	kf27=\E[027q, kf28=\E[028q, kf29=\E[029q, kf3=\E[003q,
17141-	kf30=\E[030q, kf31=\E[031q, kf32=\E[032q, kf33=\E[033q,
17142-	kf34=\E[034q, kf35=\E[035q, kf36=\E[036q, kf4=\E[004q,
17143-	kf5=\E[005q, kf6=\E[006q, kf7=\E[007q, kf8=\E[008q,
17144-	kf9=\E[009q, khome=\E[H, kich1=\E[139q, kil1=\E[140q,
17145-	kind=\E[151q, knp=\E[154q, kpp=\E[150q, kri=\E[155q,
17146-	krmir=\E[4l, rev=\E[7m, ri=\E[T, rin=\E[%p1%dT, rmir=\E[4l,
17147-	rmso=\E[m, rmul=\E[m, rs2=\Ec,
17148+	invis=\E[8m, is2=\Ec, kbs=^H, kcbt=\E[Z, kclr=\E[144q,
17149+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P,
17150+	ked=\E[148q, kel=\E[142q, kend=\E[146q, kf1=\E[001q,
17151+	kf10=\E[010q, kf11=\E[011q, kf12=\E[012q, kf13=\E[013q,
17152+	kf14=\E[014q, kf15=\E[015q, kf16=\E[016q, kf17=\E[017q,
17153+	kf18=\E[018q, kf19=\E[019q, kf2=\E[002q, kf20=\E[020q,
17154+	kf21=\E[021q, kf22=\E[022q, kf23=\E[023q, kf24=\E[024q,
17155+	kf25=\E[025q, kf26=\E[026q, kf27=\E[027q, kf28=\E[028q,
17156+	kf29=\E[029q, kf3=\E[003q, kf30=\E[030q, kf31=\E[031q,
17157+	kf32=\E[032q, kf33=\E[033q, kf34=\E[034q, kf35=\E[035q,
17158+	kf36=\E[036q, kf4=\E[004q, kf5=\E[005q, kf6=\E[006q,
17159+	kf7=\E[007q, kf8=\E[008q, kf9=\E[009q, khome=\E[H,
17160+	kich1=\E[139q, kil1=\E[140q, kind=\E[151q, knp=\E[154q,
17161+	kpp=\E[150q, kri=\E[155q, krmir=\E[4l, rev=\E[7m, ri=\E[T,
17162+	rmir=\E[4l, rmso=\E[m, rmul=\E[m, rs2=\Ec,
17163 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
17164 	    %;%?%p7%t;8%;m,
17165 	sgr0=\E[0m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
17166+	use=ecma+index,
17167
17168 ibmaed|IBM Experimental display,
17169 	OTbs, am, eo, msgr,
17170@@ -17110,26 +17178,26 @@
17171 	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
17172 	dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[2J, el=\E[0K,
17173 	home=\E[H, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, il=\E[%p1%dL,
17174-	il1=\E[L, ind=\ED, indn=\E[%p1%dS, invis=\E[8m, is2=\Ec,
17175-	kbs=^H, kcbt=\E[Z, kclr=\E[144q, kcub1=\E[D, kcud1=\E[B,
17176-	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, ked=\E[148q,
17177-	kel=\E[142q, kend=\E[146q, kf1=\E[001q, kf10=\E[010q,
17178-	kf11=\E[011q, kf12=\E[012q, kf13=\E[013q, kf14=\E[014q,
17179-	kf15=\E[015q, kf16=\E[016q, kf17=\E[017q, kf18=\E[018q,
17180-	kf19=\E[019q, kf2=\E[002q, kf20=\E[020q, kf21=\E[021q,
17181-	kf22=\E[022q, kf23=\E[023q, kf24=\E[024q, kf25=\E[025q,
17182-	kf26=\E[026q, kf27=\E[027q, kf28=\E[028q, kf29=\E[029q,
17183-	kf3=\E[003q, kf30=\E[030q, kf31=\E[031q, kf32=\E[032q,
17184-	kf33=\E[033q, kf34=\E[034q, kf35=\E[035q, kf36=\E[036q,
17185-	kf4=\E[004q, kf5=\E[005q, kf6=\E[006q, kf7=\E[007q,
17186-	kf8=\E[008q, kf9=\E[009q, khome=\E[H, kich1=\E[139q,
17187-	kil1=\E[140q, kind=\E[151q, knp=\E[154q, kpp=\E[150q,
17188-	kri=\E[155q, krmir=\E[4l, rev=\E[7m, ri=\EL, rin=\E[%p1%dT,
17189-	rmacs=\E(B, rmir=\E[4l, rmso=\E[0m, rmul=\E[0m, rs2=\Ec,
17190+	il1=\E[L, ind=\ED, invis=\E[8m, is2=\Ec, kbs=^H, kcbt=\E[Z,
17191+	kclr=\E[144q, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
17192+	kcuu1=\E[A, kdch1=\E[P, ked=\E[148q, kel=\E[142q,
17193+	kend=\E[146q, kf1=\E[001q, kf10=\E[010q, kf11=\E[011q,
17194+	kf12=\E[012q, kf13=\E[013q, kf14=\E[014q, kf15=\E[015q,
17195+	kf16=\E[016q, kf17=\E[017q, kf18=\E[018q, kf19=\E[019q,
17196+	kf2=\E[002q, kf20=\E[020q, kf21=\E[021q, kf22=\E[022q,
17197+	kf23=\E[023q, kf24=\E[024q, kf25=\E[025q, kf26=\E[026q,
17198+	kf27=\E[027q, kf28=\E[028q, kf29=\E[029q, kf3=\E[003q,
17199+	kf30=\E[030q, kf31=\E[031q, kf32=\E[032q, kf33=\E[033q,
17200+	kf34=\E[034q, kf35=\E[035q, kf36=\E[036q, kf4=\E[004q,
17201+	kf5=\E[005q, kf6=\E[006q, kf7=\E[007q, kf8=\E[008q,
17202+	kf9=\E[009q, khome=\E[H, kich1=\E[139q, kil1=\E[140q,
17203+	kind=\E[151q, knp=\E[154q, kpp=\E[150q, kri=\E[155q,
17204+	krmir=\E[4l, rev=\E[7m, ri=\EL, rmacs=\E(B, rmir=\E[4l,
17205+	rmso=\E[0m, rmul=\E[0m, rs2=\Ec,
17206 	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1
17207 	    %;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
17208 	sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smso=\E[7m, smul=\E[4m,
17209-	tbc=\E[3g,
17210+	tbc=\E[3g, use=ecma+index,
17211 # "Megapel" refers to the display adapter, which was used with the IBM RT
17212 # aka IBM 6150.
17213 ibm5081|hft|IBM Megapel Color display,
17214@@ -19201,18 +19269,19 @@
17215 	cuu=\E[%p1%dA, cuu1=\EM, cvvis=\E%!0\ETD70\E%!1,
17216 	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
17217 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\EH,
17218-	il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS, is2=\E%!1,
17219-	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
17220-	kf0=\EOA, kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ,
17221-	kf6=\EOR, kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5,
17222-	lf5=F6, lf6=F8, ll=\E[30;H, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
17223-	rin=\E[%p1%dT, rmacs=^O, rmcup=\E%!0\ELBH=\E%!1,
17224-	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
17225+	il=\E[%p1%dL, il1=\E[L, ind=\n, is2=\E%!1, kbs=^H,
17226+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOA,
17227+	kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ, kf6=\EOR,
17228+	kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5, lf5=F6, lf6=F8,
17229+	ll=\E[30;H, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
17230+	rmcup=\E%!0\ELBH=\E%!1, rmir=\E[4l, rmkx=\E[?1l\E>,
17231+	rmso=\E[m, rmul=\E[m,
17232 	rs2=\030\E%!0\EKC\E\014\EKR0\EKF0\ENM0\ELBH=\ETF8000010F40
17233 	    \ELI100\ELLA>\ELM0\EKE0\ENF1\EKS0\END0\E%!1\Ec\E[?3;5l
17234 	    \E[?7;8h\E[r\E[m\E>,
17235 	sc=\E7, sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h,
17236 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
17237+	use=ecma+index,
17238
17239 #
17240 # Tektronix 4106/4107/4109 from BRL
17241@@ -19247,18 +19316,19 @@
17242 	cuu=\E[%p1%dA, cuu1=\EM, cvvis=\E%!0\ETD70\E%!1,
17243 	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
17244 	ech=\E[%p1%dX, ed=\E[J, el=\E[K, home=\E[H, ht=^I, hts=\EH,
17245-	il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS, is2=\E%!1,
17246-	kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
17247-	kf0=\EOA, kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ,
17248-	kf6=\EOR, kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5,
17249-	lf5=F6, lf6=F8, ll=\E[32;H, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
17250-	rin=\E[%p1%dT, rmacs=^O, rmcup=\E%!0\ELBH=\E%!1,
17251-	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, rmul=\E[m,
17252+	il=\E[%p1%dL, il1=\E[L, ind=\n, is2=\E%!1, kbs=^H,
17253+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOA,
17254+	kf1=\EOB, kf2=\EOC, kf3=\EOD, kf4=\EOP, kf5=\EOQ, kf6=\EOR,
17255+	kf7=\EOS, lf0=F1, lf1=F2, lf2=F3, lf3=F4, lf4=F5, lf5=F6, lf6=F8,
17256+	ll=\E[32;H, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
17257+	rmcup=\E%!0\ELBH=\E%!1, rmir=\E[4l, rmkx=\E[?1l\E>,
17258+	rmso=\E[m, rmul=\E[m,
17259 	rs1=\030\E%!0\EKC\E\014\EKR0\EKF0\ENM0\ELBH=\ETF8000010F40
17260 	    \ELI100\ELLB0\ELM0\EKE0\ENF1\EKS0\END0\ERE0\E%!1\Ec\E[?3
17261 	    ;5l\E[?7;8h\E[r\E[m\E>,
17262 	sc=\E7, sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h,
17263 	smkx=\E[?1h\E=, smso=\E[7;42m, smul=\E[4m, tbc=\E[3g,
17264+	use=ecma+index,
17265
17266 # Tektronix 4107/4109 interpret 4 modes using "\E%!" followed by a code:
17267 # 0 selects Tek mode, i.e., \E%!0
17268@@ -19972,12 +20042,12 @@
17269 	cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
17270 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H,
17271 	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=\E[S,
17272-	indn=\E[%p1%dS, invis=\E[8m, is2=\E[20l, kbs=^H,
17273-	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\E[9~,
17274-	kf1=\E[0~, kf2=\E[1~, kf3=\E[2~, kf4=\E[3~, kf5=\E[4~,
17275-	kf6=\E[5~, kf7=\E[6~, kf8=\E[7~, kf9=\E[8~, rev=\E[7m,
17276-	ri=\E[T, rin=\E[%p1%dT, rmacs=^O, rmso=\E[m, rmul=\E[m,
17277-	rs1=\Ec, sgr0=\E[m, smacs=^N, smso=\E[7m, smul=\E[4m,
17278+	invis=\E[8m, is2=\E[20l, kbs=^H, kcub1=\E[D, kcud1=\E[B,
17279+	kcuf1=\E[C, kcuu1=\E[A, kf0=\E[9~, kf1=\E[0~, kf2=\E[1~,
17280+	kf3=\E[2~, kf4=\E[3~, kf5=\E[4~, kf6=\E[5~, kf7=\E[6~,
17281+	kf8=\E[7~, kf9=\E[8~, rev=\E[7m, ri=\E[T, rmacs=^O,
17282+	rmso=\E[m, rmul=\E[m, rs1=\Ec, sgr0=\E[m, smacs=^N,
17283+	smso=\E[7m, smul=\E[4m, use=ecma+index,
17284
17285 # From: Hans Verkuil <hans@wyst.hobby.nl>, 4 Dec 1995
17286 # (amiga: added empty <acsc> to suppress a warning.
17287@@ -20027,20 +20097,20 @@
17288 	cvvis=\E[>?6h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
17289 	dl=\E[%p1%dM, dl1=\E[1M, ed=\E[J, el=\E[K, flash=^G,
17290 	ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[1L, ind=\ED,
17291-	indn=\E[%p1%dS, invis=\E8m,
17292+	invis=\E8m,
17293 	is2=\E[>?2;18l\E[>?26;?6;20;>?15;?7;>?22;>?8h,
17294 	kbs=^H, kcbt=\233Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C,
17295 	kcuu1=\E[A, kdch1=^?, kf0=\E[9~, kf1=\E[0~, kf2=\E[1~,
17296 	kf3=\E[2~, kf4=\E[3~, kf5=\E[4~, kf6=\E[5~, kf7=\E[6~,
17297 	kf8=\E[7~, kf9=\E[8~, khlp=\E[?~, khome=\E[44~, kll=\E[45~,
17298 	kmous=\E[M, knp=\E[42~, kpp=\E[41~, nel=\EE, oc=\E[0m,
17299-	rev=\E[7m, ri=\EM, rin=\E[%p1%dT, rmcup=\E[?7h\E[r\E[J,
17300-	rmkx=\E[?1l, rmso=\E[21m, rmul=\E[24m, rs1=\Ec,
17301+	rev=\E[7m, ri=\EM, rmcup=\E[?7h\E[r\E[J, rmkx=\E[?1l,
17302+	rmso=\E[21m, rmul=\E[24m, rs1=\Ec,
17303 	rs2=\E[>?2;18l\E[>?26;?6;20;>?15;?7;>?22;>?8h,
17304 	setab=\E[%?%p1%{8}%>%t%'F'%p1%+%d%e4%p1%d%;m,
17305 	setaf=\E[%?%p1%{8}%>%t%'2'%p1%+%d%e3%p1%d%;m,
17306 	sgr0=\E[0m\017\E[30;85;>15m, smcup=\E[?7h, smkx=\E[?1h,
17307-	smso=\E[1m, smul=\E[4m,
17308+	smso=\E[1m, smul=\E[4m, use=ecma+index,
17309
17310 # MorphOS on Genesi Pegasos
17311 # By Pavel Fedin <sonic_amiga@rambler.ru>
17312@@ -20684,29 +20754,29 @@
17313
17314 putty-m1|Putty Minitel 1 "like" Couleurs,
17315 	hs,
17316-	dim@, dsl=\E]2;\007, fsl=^G, indn=\E[%p1%dS, kf1=\E[11~,
17317-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
17318-	rin=\E[%p1%dT, rmcup=\E[2J\E[?47l\E8, rmul=\E[24m,
17319-	smcup=\E7\E[?47h, smul=\E[4m, tsl=\E]2;, .E3=\E[300S,
17320-	.WS=\E[8;%d;%dt, Z0=\E[?3h, Z1=\E[?3l, use=linux-m1,
17321+	dim@, dsl=\E]2;\007, fsl=^G, kf1=\E[11~, kf2=\E[12~,
17322+	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
17323+	rmcup=\E[2J\E[?47l\E8, rmul=\E[24m, smcup=\E7\E[?47h,
17324+	smul=\E[4m, tsl=\E]2;, .E3=\E[300S, .WS=\E[8;%d;%dt,
17325+	Z0=\E[?3h, Z1=\E[?3l, use=ecma+index, use=linux-m1,
17326
17327 putty-m1b|Putty Minitel 1B "like" Monochrome (Gris/Blanc/Noir),
17328 	hs,
17329-	dim@, dsl=\E]2;\007, fsl=^G, indn=\E[%p1%dS, kf1=\E[11~,
17330-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
17331-	rin=\E[%p1%dT, rmcup=\E[2J\E[?47l\E8, rmul=\E[24m,
17332-	smcup=\E7\E[?47h, smul=\E[4m, tsl=\E]2;, .E3=\E[300S,
17333-	.WS=\E[8;%d;%dt, Z0=\E[?3h, Z1=\E[?3l, use=linux-m1b,
17334+	dim@, dsl=\E]2;\007, fsl=^G, kf1=\E[11~, kf2=\E[12~,
17335+	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
17336+	rmcup=\E[2J\E[?47l\E8, rmul=\E[24m, smcup=\E7\E[?47h,
17337+	smul=\E[4m, tsl=\E]2;, .E3=\E[300S, .WS=\E[8;%d;%dt,
17338+	Z0=\E[?3h, Z1=\E[?3l, use=ecma+index, use=linux-m1b,
17339
17340 putty-m2|Putty Minitel 2 "like" Couleurs (Vert/Blanc/Noir),
17341 	hs,
17342 	acsc=``aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{
17343 	     {||}}~~,
17344-	dim@, dsl=\E]2;\007, fsl=^G, indn=\E[%p1%dS, kf1=\E[11~,
17345-	kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
17346-	rin=\E[%p1%dT, rmcup=\E[2J\E[?47l\E8, rmul=\E[24m,
17347-	smcup=\E7\E[?47h, smul=\E[4m, tsl=\E]2;, .E3=\E[300S,
17348-	.WS=\E[8;%d;%dt, Z0=\E[?3h, Z1=\E[?3l, use=linux-m2,
17349+	dim@, dsl=\E]2;\007, fsl=^G, kf1=\E[11~, kf2=\E[12~,
17350+	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
17351+	rmcup=\E[2J\E[?47l\E8, rmul=\E[24m, smcup=\E7\E[?47h,
17352+	smul=\E[4m, tsl=\E]2;, .E3=\E[300S, .WS=\E[8;%d;%dt,
17353+	Z0=\E[?3h, Z1=\E[?3l, use=ecma+index, use=linux-m2,
17354
17355
17356 screen.putty-m1|Putty m1 specific for screen,
17357@@ -22702,19 +22772,19 @@
17358 	cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
17359 	dl=\E[%p1%dM, dl1=\E[1M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
17360 	home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
17361-	ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L, ind=\E[S,
17362-	indn=\E[%p1%dS, invis=\E[9m, is2=\E[0;10;39m, kbs=^H,
17363-	kcbt=^], kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
17364-	kdch1=\E[P, kend=\E[Y, kf1=\EOP, kf10=\EOY, kf11=\EOZ,
17365-	kf12=\EOA, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU,
17366-	kf7=\EOV, kf8=\EOW, kf9=\EOX, khome=\E[H, kich1=\E[@,
17367-	knp=\E[U, kpp=\E[V, krmir=\E0, nel=\r\E[S, rc=\E8, rev=\E[7m,
17368-	ri=\E[T, rin=\E[%p1%dT, rmacs=\E[10m, rmso=\E[m, rmul=\E[m,
17369-	sc=\E7,
17370+	ich1=\E[1@, il=\E[%p1%dL, il1=\E[1L, ind=\E[S, invis=\E[9m,
17371+	is2=\E[0;10;39m, kbs=^H, kcbt=^], kcub1=\E[D, kcud1=\E[B,
17372+	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[P, kend=\E[Y, kf1=\EOP,
17373+	kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf2=\EOQ, kf3=\EOR,
17374+	kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX,
17375+	khome=\E[H, kich1=\E[@, knp=\E[U, kpp=\E[V, krmir=\E0,
17376+	nel=\r\E[S, rc=\E8, rev=\E[7m, ri=\E[T, rmacs=\E[10m,
17377+	rmso=\E[m, rmul=\E[m, sc=\E7,
17378 	sgr=\E[10m\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t;
17379 	    2%;%?%p6%t;1%;%?%p9%t;12%e;10%;%?%p7%t;9%;m,
17380 	sgr0=\E[0;10m, smacs=\E[12m, smso=\E[7m, smul=\E[4m,
17381-	tbc=\E[3g, vpa=\E[%i%p1%dd, use=klone+color,
17382+	tbc=\E[3g, vpa=\E[%i%p1%dd, use=ecma+index,
17383+	use=klone+color,
17384 # (pc6300plus: removed ":KM=/usr/lib/ua/kmap.s5:"; renamed BO/EE/CI/CV -- esr)
17385 pc6300plus|AT&T 6300 plus,
17386 	OTbs, am, xon,
17387@@ -26207,4 +26277,9 @@
17388 #	+ comment-out some user-defined capabilities in mintty+common to allow
17389 #	  builds with existing releases 5.9-6.1 -TD
17390 #
17391+# 2019-06-30
17392+#	+ add ms-terminal -TD
17393+#	+ add vscode, vscode-direct -TD
17394+#	+ use ecma+index in screen, st -TD
17395+#
17396 ######## SHANTIH!  SHANTIH!  SHANTIH!
17397Index: ncurses/Makefile.in
17398Prereq:  1.161
17399--- ncurses-6.1-20190623+/ncurses/Makefile.in	2019-05-11 14:15:21.000000000 +0000
17400+++ ncurses-6.1-20190630/ncurses/Makefile.in	2019-06-30 14:57:27.000000000 +0000
17401@@ -1,4 +1,4 @@
17402-# $Id: Makefile.in,v 1.161 2019/05/11 14:15:21 tom Exp $
17403+# $Id: Makefile.in,v 1.163 2019/06/30 14:57:27 tom Exp $
17404 ##############################################################################
17405 # Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.                #
17406 #                                                                            #
17407@@ -159,7 +159,8 @@
17408
17409 TERMINFO	= @TERMINFO@
17410 TERMINFO_SRC	= @TERMINFO_SRC@
17411-TIC_PATH	= @TIC_PATH@
17412+TIC_PATH	= @TIC@
17413+INFOCMP_PATH	= @INFOCMP@
17414
17415 AUTO_SRC = \
17416 	./codes.c \
17417@@ -221,7 +222,7 @@
17418 ../lib : ; mkdir $@
17419
17420 ./fallback.c : $(tinfo)/MKfallback.sh
17421-	$(SHELL) -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(FALLBACK_LIST) >$@
17422+	$(SHELL) -e $(tinfo)/MKfallback.sh $(TERMINFO) $(TERMINFO_SRC) $(TIC_PATH) $(INFOCMP_PATH) $(FALLBACK_LIST) >$@
17423
17424 ./lib_gen.c : $(base)/MKlib_gen.sh ../include/curses.h
17425 	$(SHELL) -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" generated <../include/curses.h >$@
17426Index: ncurses/tinfo/MKfallback.sh
17427Prereq:  1.21
17428--- ncurses-6.1-20190623+/ncurses/tinfo/MKfallback.sh	2017-04-12 00:50:50.000000000 +0000
17429+++ ncurses-6.1-20190630/ncurses/tinfo/MKfallback.sh	2019-06-30 10:44:15.000000000 +0000
17430@@ -1,6 +1,6 @@
17431 #!/bin/sh
17432 ##############################################################################
17433-# Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.                #
17434+# Copyright (c) 1998-2017,2019 Free Software Foundation, Inc.                #
17435 #                                                                            #
17436 # Permission is hereby granted, free of charge, to any person obtaining a    #
17437 # copy of this software and associated documentation files (the "Software"), #
17438@@ -26,7 +26,7 @@
17439 # use or other dealings in this Software without prior written               #
17440 # authorization.                                                             #
17441 ##############################################################################
17442-# $Id: MKfallback.sh,v 1.21 2017/04/12 00:50:50 tom Exp $
17443+# $Id: MKfallback.sh,v 1.22 2019/06/30 10:44:15 tom Exp $
17444 #
17445 # MKfallback.sh -- create fallback table for entry reads
17446 #
17447@@ -45,6 +45,9 @@
17448 tic_path=$1
17449 shift
17450
17451+infocmp_path=$1
17452+shift
17453+
17454 case $tic_path in #(vi
17455 /*)
17456 	tic_head=`echo "$tic_path" | sed -e 's,/[^/]*$,,'`
17457@@ -89,7 +92,7 @@
17458 	for x in $*
17459 	do
17460 		echo "/* $x */"
17461-		infocmp -E $x | sed -e 's/\<short\>/NCURSES_INT2/g'
17462+		$infocmp_path -E $x | sed -e 's/\<short\>/NCURSES_INT2/g'
17463 	done
17464
17465 	cat <<EOF
17466@@ -100,7 +103,7 @@
17467 	for x in $*
17468 	do
17469 		echo "$comma /* $x */"
17470-		infocmp -e $x
17471+		$infocmp_path -e $x
17472 		comma=","
17473 	done
17474
17475Index: ncurses/tinfo/write_entry.c
17476Prereq:  1.113
17477--- ncurses-6.1-20190623+/ncurses/tinfo/write_entry.c	2019-03-23 23:47:16.000000000 +0000
17478+++ ncurses-6.1-20190630/ncurses/tinfo/write_entry.c	2019-06-29 23:07:18.000000000 +0000
17479@@ -50,7 +50,7 @@
17480 #define TRACE_NUM(n)		/* nothing */
17481 #endif
17482
17483-MODULE_ID("$Id: write_entry.c,v 1.113 2019/03/23 23:47:16 tom Exp $")
17484+MODULE_ID("$Id: write_entry.c,v 1.114 2019/06/29 23:07:18 tom Exp $")
17485
17486 static int total_written;
17487 static int total_parts;
17488@@ -405,7 +405,7 @@
17489
17490     _nc_SPRINTF(filename, _nc_SLIMIT(sizeof(filename))
17491 		LEAF_FMT "/%.*s", UChar(first_name[0]),
17492-		(int) (sizeof(filename) - LEAF_LEN - 2),
17493+		(int) (sizeof(filename) - (LEAF_LEN + 2)),
17494 		first_name);
17495
17496     if (saved)
17497@@ -466,7 +466,8 @@
17498
17499 	check_writeable(ptr[0]);
17500 	_nc_SPRINTF(linkname, _nc_SLIMIT(sizeof(linkname))
17501-		    LEAF_FMT "/%.*s", ptr[0], (int) sizeof(linkname) - 3, ptr);
17502+		    LEAF_FMT "/%.*s", ptr[0],
17503+		    (int) sizeof(linkname) - (2 + LEAF_LEN), ptr);
17504
17505 	if (strcmp(filename, linkname) == 0) {
17506 	    _nc_warning("self-synonym ignored");
17507Index: package/debian-mingw/changelog
17508--- ncurses-6.1-20190623+/package/debian-mingw/changelog	2019-06-23 15:31:40.000000000 +0000
17509+++ ncurses-6.1-20190630/package/debian-mingw/changelog	2019-06-30 01:30:19.000000000 +0000
17510@@ -1,8 +1,8 @@
17511-ncurses6 (6.1+20190623) unstable; urgency=low
17512+ncurses6 (6.1+20190630) unstable; urgency=low
17513
17514   * latest weekly patch
17515
17516- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 23 Jun 2019 11:31:40 -0400
17517+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 29 Jun 2019 21:29:49 -0400
17518
17519 ncurses6 (5.9-20131005) unstable; urgency=low
17520
17521Index: package/debian-mingw/rules
17522--- ncurses-6.1-20190623+/package/debian-mingw/rules	2018-02-10 18:25:00.000000000 +0000
17523+++ ncurses-6.1-20190630/package/debian-mingw/rules	2019-06-30 16:00:26.000000000 +0000
17524@@ -50,6 +50,8 @@
17525 	--with-cxx-shared \
17526 	--with-develop \
17527 	--with-fallbacks=unknown,rxvt \
17528+	--with-tic-path=/usr/bin/tic$(MY_ABI) \
17529+	--with-infocmp-path=/usr/bin/infocmp$(MY_ABI) \
17530 	--with-shared \
17531 	--with-trace \
17532 	--with-xterm-kbs=DEL \
17533Index: package/debian-mingw64/changelog
17534--- ncurses-6.1-20190623+/package/debian-mingw64/changelog	2019-06-23 15:31:40.000000000 +0000
17535+++ ncurses-6.1-20190630/package/debian-mingw64/changelog	2019-06-30 01:30:19.000000000 +0000
17536@@ -1,8 +1,8 @@
17537-ncurses6 (6.1+20190623) unstable; urgency=low
17538+ncurses6 (6.1+20190630) unstable; urgency=low
17539
17540   * latest weekly patch
17541
17542- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 23 Jun 2019 11:31:40 -0400
17543+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 29 Jun 2019 21:29:49 -0400
17544
17545 ncurses6 (5.9-20131005) unstable; urgency=low
17546
17547Index: package/debian-mingw64/rules
17548--- ncurses-6.1-20190623+/package/debian-mingw64/rules	2018-02-10 18:25:00.000000000 +0000
17549+++ ncurses-6.1-20190630/package/debian-mingw64/rules	2019-06-30 16:00:48.000000000 +0000
17550@@ -50,6 +50,8 @@
17551 	--with-cxx-shared \
17552 	--with-develop \
17553 	--with-fallbacks=unknown,rxvt \
17554+	--with-tic-path=/usr/bin/tic$(MY_ABI) \
17555+	--with-infocmp-path=/usr/bin/infocmp$(MY_ABI) \
17556 	--with-shared \
17557 	--with-trace \
17558 	--with-xterm-kbs=DEL \
17559Index: package/debian/changelog
17560--- ncurses-6.1-20190623+/package/debian/changelog	2019-06-23 15:31:40.000000000 +0000
17561+++ ncurses-6.1-20190630/package/debian/changelog	2019-06-30 01:30:19.000000000 +0000
17562@@ -1,8 +1,8 @@
17563-ncurses6 (6.1+20190623) unstable; urgency=low
17564+ncurses6 (6.1+20190630) unstable; urgency=low
17565
17566   * latest weekly patch
17567
17568- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 23 Jun 2019 11:31:40 -0400
17569+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 29 Jun 2019 21:29:49 -0400
17570
17571 ncurses6 (5.9-20120608) unstable; urgency=low
17572
17573Index: package/mingw-ncurses.nsi
17574Prereq:  1.336
17575--- ncurses-6.1-20190623+/package/mingw-ncurses.nsi	2019-06-23 15:31:40.000000000 +0000
17576+++ ncurses-6.1-20190630/package/mingw-ncurses.nsi	2019-06-30 01:30:19.000000000 +0000
17577@@ -1,4 +1,4 @@
17578-; $Id: mingw-ncurses.nsi,v 1.336 2019/06/23 15:31:40 tom Exp $
17579+; $Id: mingw-ncurses.nsi,v 1.338 2019/06/30 01:30:19 tom Exp $
17580
17581 ; TODO add examples
17582 ; TODO bump ABI to 6
17583@@ -10,7 +10,7 @@
17584 !define VERSION_MAJOR "6"
17585 !define VERSION_MINOR "1"
17586 !define VERSION_YYYY  "2019"
17587-!define VERSION_MMDD  "0623"
17588+!define VERSION_MMDD  "0630"
17589 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
17590
17591 !define MY_ABI   "5"
17592Index: package/mingw-ncurses.spec
17593--- ncurses-6.1-20190623+/package/mingw-ncurses.spec	2019-06-23 15:31:40.000000000 +0000
17594+++ ncurses-6.1-20190630/package/mingw-ncurses.spec	2019-06-30 18:34:07.000000000 +0000
17595@@ -3,7 +3,7 @@
17596 Summary: shared libraries for terminal handling
17597 Name: mingw32-ncurses6
17598 Version: 6.1
17599-Release: 20190623
17600+Release: 20190630
17601 License: X11
17602 Group: Development/Libraries
17603 Source: ncurses-%{version}-%{release}.tgz
17604@@ -68,6 +68,8 @@
17605 	--with-cxx-shared \\\
17606 	--with-develop \\\
17607 	--with-fallbacks=unknown,xterm \\\
17608+	--with-tic-path=/usr/bin/tic${MY_ABI} \\\
17609+	--with-infocmp-path=/usr/bin/infocmp${MY_ABI} \\\
17610 	--with-install-prefix=$RPM_BUILD_ROOT \\\
17611 	--with-pc-suffix=%{MY_ABI} \\\
17612 	--with-pcre2 \\\
17613@@ -145,6 +147,9 @@
17614
17615 %changelog
17616
17617+* Sun Jun 30 2019 Thomas E. Dickey
17618+- use tic-path and infocmp-path options for fallbacks
17619+
17620 * Sat Feb 10 2018 Thomas E. Dickey
17621 - add several development features
17622
17623Index: package/ncurses.spec
17624--- ncurses-6.1-20190623+/package/ncurses.spec	2019-06-23 15:31:40.000000000 +0000
17625+++ ncurses-6.1-20190630/package/ncurses.spec	2019-06-30 01:30:19.000000000 +0000
17626@@ -1,7 +1,7 @@
17627 Summary: shared libraries for terminal handling
17628 Name: ncurses6
17629 Version: 6.1
17630-Release: 20190623
17631+Release: 20190630
17632 License: X11
17633 Group: Development/Libraries
17634 Source: ncurses-%{version}-%{release}.tgz
17635Index: package/ncursest.spec
17636--- ncurses-6.1-20190623+/package/ncursest.spec	2019-06-23 15:31:40.000000000 +0000
17637+++ ncurses-6.1-20190630/package/ncursest.spec	2019-06-30 01:30:19.000000000 +0000
17638@@ -1,7 +1,7 @@
17639 Summary: Curses library with POSIX thread support.
17640 Name: ncursest6
17641 Version: 6.1
17642-Release: 20190623
17643+Release: 20190630
17644 License: X11
17645 Group: Development/Libraries
17646 Source: ncurses-%{version}-%{release}.tgz
17647Index: progs/tic.c
17648Prereq:  1.276
17649--- ncurses-6.1-20190623+/progs/tic.c	2019-05-10 21:00:25.000000000 +0000
17650+++ ncurses-6.1-20190630/progs/tic.c	2019-06-29 23:23:22.000000000 +0000
17651@@ -48,7 +48,7 @@
17652 #include <parametrized.h>
17653 #include <transform.h>
17654
17655-MODULE_ID("$Id: tic.c,v 1.276 2019/05/10 21:00:25 tom Exp $")
17656+MODULE_ID("$Id: tic.c,v 1.277 2019/06/29 23:23:22 tom Exp $")
17657
17658 #define STDIN_NAME "<stdin>"
17659
17660@@ -2931,6 +2931,11 @@
17661     check_screen(tp);
17662
17663     /*
17664+     * These are probably both or none.
17665+     */
17666+    PAIRED(parm_index, parm_rindex);
17667+
17668+    /*
17669      * These may be mismatched because the terminal description relies on
17670      * restoring the cursor visibility by resetting it.
17671      */
17672