1# ncurses 6.1 - patch 20190831 - 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-20190831.patch.gz
14# patch by Thomas E. Dickey <dickey@invisible-island.net>
15# created  Sun Sep  1 00:58:56 UTC 2019
16# ------------------------------------------------------------------------------
17# Ada95/configure                  |   46 -
18# Ada95/configure.in               |   12
19# Ada95/gen/Makefile.in            |    4
20# Ada95/src/Makefile.in            |    9
21# Ada95/src/library-cfg.sh         |   31
22# NEWS                             |    7
23# VERSION                          |    2
24# configure                        |    8
25# dist.mk                          |    4
26# package/debian-mingw/changelog   |    4
27# package/debian-mingw64/changelog |    4
28# package/debian/changelog         |    4
29# package/mingw-ncurses.nsi        |    4
30# package/mingw-ncurses.spec       |    2
31# package/ncurses.spec             |    2
32# package/ncursest.spec            |    2
33# test/configure                   | 1620 ++++++++++++++++++-------------------
34# test/demo_panels.c               |    4
35# test/ncurses.c                   |    2
36# 19 files changed, 904 insertions(+), 867 deletions(-)
37# ------------------------------------------------------------------------------
38Index: Ada95/configure
39--- ncurses-6.1-20190824+/Ada95/configure	2019-01-01 01:46:17.000000000 +0000
40+++ ncurses-6.1-20190831/Ada95/configure	2019-08-31 21:40:31.000000000 +0000
41@@ -1,7 +1,7 @@
42 #! /bin/sh
43-# From configure.in Revision: 1.68 .
44+# From configure.in Revision: 1.71 .
45 # Guess values for system-dependent variables and create Makefiles.
46-# Generated by Autoconf 2.52.20181006.
47+# Generated by Autoconf 2.52.20190828.
48 #
49 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
50 # Free Software Foundation, Inc.
51@@ -817,7 +817,7 @@
52 running configure, to aid debugging if configure makes a mistake.
53
54 It was created by $as_me, which was
55-generated by GNU Autoconf 2.52.20181006.  Invocation command line was
56+generated by GNU Autoconf 2.52.20190828.  Invocation command line was
57
58   $ $0 $@
59
60@@ -16304,6 +16304,10 @@
61 	esac
62 fi
63
64+USE_ARG_SUFFIX=${DFT_ARG_SUFFIX}
65+
66+USE_LIB_SUFFIX=${DFT_ARG_SUFFIX}
67+
68 USE_CFG_SUFFIX=${DFT_ARG_SUFFIX}
69
70 ### Construct the list of subdirectories for which we'll customize makefiles
71@@ -16526,7 +16530,7 @@
72 : ${CONFIG_STATUS=./config.status}
73 ac_clean_files_save=$ac_clean_files
74 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
75-{ echo "$as_me:16529: creating $CONFIG_STATUS" >&5
76+{ echo "$as_me:16533: creating $CONFIG_STATUS" >&5
77 echo "$as_me: creating $CONFIG_STATUS" >&6;}
78 cat >$CONFIG_STATUS <<_ACEOF
79 #! $SHELL
80@@ -16658,7 +16662,7 @@
81 cat >>$CONFIG_STATUS <<EOF
82 ac_cs_version="\\
83 config.status
84-configured by $0, generated by GNU Autoconf 2.52.20181006,
85+configured by $0, generated by GNU Autoconf 2.52.20190828,
86   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
87
88 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
89@@ -16702,7 +16706,7 @@
90     echo "$ac_cs_version"; exit 0 ;;
91   --he | --h)
92     # Conflict between --help and --header
93-    { { echo "$as_me:16705: error: ambiguous option: $1
94+    { { echo "$as_me:16709: error: ambiguous option: $1
95 Try \`$0 --help' for more information." >&5
96 echo "$as_me: error: ambiguous option: $1
97 Try \`$0 --help' for more information." >&2;}
98@@ -16721,7 +16725,7 @@
99     ac_need_defaults=false;;
100
101   # This is an error.
102-  -*) { { echo "$as_me:16724: error: unrecognized option: $1
103+  -*) { { echo "$as_me:16728: error: unrecognized option: $1
104 Try \`$0 --help' for more information." >&5
105 echo "$as_me: error: unrecognized option: $1
106 Try \`$0 --help' for more information." >&2;}
107@@ -16740,7 +16744,7 @@
108 ## Running config.status.  ##
109 ## ----------------------- ##
110
111-This file was extended by $as_me 2.52.20181006, executed with
112+This file was extended by $as_me 2.52.20190828, executed with
113   CONFIG_FILES    = $CONFIG_FILES
114   CONFIG_HEADERS  = $CONFIG_HEADERS
115   CONFIG_LINKS    = $CONFIG_LINKS
116@@ -16792,7 +16796,7 @@
117   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
118   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
119   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
120-  *) { { echo "$as_me:16795: error: invalid argument: $ac_config_target" >&5
121+  *) { { echo "$as_me:16799: error: invalid argument: $ac_config_target" >&5
122 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
123    { (exit 1); exit 1; }; };;
124   esac
125@@ -17001,6 +17005,8 @@
126 s,@DFT_ARG_SUFFIX@,$DFT_ARG_SUFFIX,;t t
127 s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t
128 s,@DFT_OBJ_SUBDIR@,$DFT_OBJ_SUBDIR,;t t
129+s,@USE_ARG_SUFFIX@,$USE_ARG_SUFFIX,;t t
130+s,@USE_LIB_SUFFIX@,$USE_LIB_SUFFIX,;t t
131 s,@USE_CFG_SUFFIX@,$USE_CFG_SUFFIX,;t t
132 s,@TEST_ARG2@,$TEST_ARG2,;t t
133 s,@TEST_LIBS2@,$TEST_LIBS2,;t t
134@@ -17142,7 +17148,7 @@
135   esac
136
137   if test x"$ac_file" != x-; then
138-    { echo "$as_me:17145: creating $ac_file" >&5
139+    { echo "$as_me:17151: creating $ac_file" >&5
140 echo "$as_me: creating $ac_file" >&6;}
141     rm -f "$ac_file"
142   fi
143@@ -17160,7 +17166,7 @@
144       -) echo $tmp/stdin ;;
145       [\\/$]*)
146          # Absolute (can't be DOS-style, as IFS=:)
147-         test -f "$f" || { { echo "$as_me:17163: error: cannot find input file: $f" >&5
148+         test -f "$f" || { { echo "$as_me:17169: error: cannot find input file: $f" >&5
149 echo "$as_me: error: cannot find input file: $f" >&2;}
150    { (exit 1); exit 1; }; }
151          echo $f;;
152@@ -17173,7 +17179,7 @@
153            echo $srcdir/$f
154          else
155            # /dev/null tree
156-           { { echo "$as_me:17176: error: cannot find input file: $f" >&5
157+           { { echo "$as_me:17182: error: cannot find input file: $f" >&5
158 echo "$as_me: error: cannot find input file: $f" >&2;}
159    { (exit 1); exit 1; }; }
160          fi;;
161@@ -17189,7 +17195,7 @@
162       if test -n "$ac_seen"; then
163         ac_used=`grep '@datarootdir@' $ac_item`
164         if test -z "$ac_used"; then
165-          { echo "$as_me:17192: WARNING: datarootdir was used implicitly but not set:
166+          { echo "$as_me:17198: WARNING: datarootdir was used implicitly but not set:
167 $ac_seen" >&5
168 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
169 $ac_seen" >&2;}
170@@ -17198,7 +17204,7 @@
171       fi
172       ac_seen=`grep '${datarootdir}' $ac_item`
173       if test -n "$ac_seen"; then
174-        { echo "$as_me:17201: WARNING: datarootdir was used explicitly but not set:
175+        { echo "$as_me:17207: WARNING: datarootdir was used explicitly but not set:
176 $ac_seen" >&5
177 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
178 $ac_seen" >&2;}
179@@ -17235,7 +17241,7 @@
180             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
181             if test -z "$ac_init"; then
182               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
183-              { echo "$as_me:17238: WARNING: Variable $ac_name is used but was not set:
184+              { echo "$as_me:17244: WARNING: Variable $ac_name is used but was not set:
185 $ac_seen" >&5
186 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
187 $ac_seen" >&2;}
188@@ -17246,7 +17252,7 @@
189     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
190     if test -s $tmp/out; then
191       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
192-      { echo "$as_me:17249: WARNING: Some variables may not be substituted:
193+      { echo "$as_me:17255: WARNING: Some variables may not be substituted:
194 $ac_seen" >&5
195 echo "$as_me: WARNING: Some variables may not be substituted:
196 $ac_seen" >&2;}
197@@ -17295,7 +17301,7 @@
198   * )   ac_file_in=$ac_file.in ;;
199   esac
200
201-  test x"$ac_file" != x- && { echo "$as_me:17298: creating $ac_file" >&5
202+  test x"$ac_file" != x- && { echo "$as_me:17304: creating $ac_file" >&5
203 echo "$as_me: creating $ac_file" >&6;}
204
205   # First look for the input files in the build tree, otherwise in the
206@@ -17306,7 +17312,7 @@
207       -) echo $tmp/stdin ;;
208       [\\/$]*)
209          # Absolute (can't be DOS-style, as IFS=:)
210-         test -f "$f" || { { echo "$as_me:17309: error: cannot find input file: $f" >&5
211+         test -f "$f" || { { echo "$as_me:17315: error: cannot find input file: $f" >&5
212 echo "$as_me: error: cannot find input file: $f" >&2;}
213    { (exit 1); exit 1; }; }
214          echo $f;;
215@@ -17319,7 +17325,7 @@
216            echo $srcdir/$f
217          else
218            # /dev/null tree
219-           { { echo "$as_me:17322: error: cannot find input file: $f" >&5
220+           { { echo "$as_me:17328: error: cannot find input file: $f" >&5
221 echo "$as_me: error: cannot find input file: $f" >&2;}
222    { (exit 1); exit 1; }; }
223          fi;;
224@@ -17377,7 +17383,7 @@
225   rm -f $tmp/in
226   if test x"$ac_file" != x-; then
227     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
228-      { echo "$as_me:17380: $ac_file is unchanged" >&5
229+      { echo "$as_me:17386: $ac_file is unchanged" >&5
230 echo "$as_me: $ac_file is unchanged" >&6;}
231     else
232       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
233Index: Ada95/configure.in
234Prereq:  1.68
235--- ncurses-6.1-20190824+/Ada95/configure.in	2018-11-10 22:08:09.000000000 +0000
236+++ ncurses-6.1-20190831/Ada95/configure.in	2019-08-31 21:16:49.000000000 +0000
237@@ -1,5 +1,5 @@
238 dnl***************************************************************************
239-dnl Copyright (c) 2010-2016,2018 Free Software Foundation, Inc.              *
240+dnl Copyright (c) 2010-2018,2019 Free Software Foundation, Inc.              *
241 dnl                                                                          *
242 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
243 dnl copy of this software and associated documentation files (the            *
244@@ -28,14 +28,14 @@
245 dnl
246 dnl Author: Thomas E. Dickey
247 dnl
248-dnl $Id: configure.in,v 1.68 2018/11/10 22:08:09 tom Exp $
249+dnl $Id: configure.in,v 1.71 2019/08/31 21:16:49 tom Exp $
250 dnl Process this file with autoconf to produce a configure script.
251 dnl
252 dnl See https://invisible-island.net/autoconf/ for additional information.
253 dnl
254 dnl ---------------------------------------------------------------------------
255 AC_PREREQ(2.52.20030208)
256-AC_REVISION($Revision: 1.68 $)
257+AC_REVISION($Revision: 1.71 $)
258 AC_INIT(gen/gen.c)
259 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
260
261@@ -545,6 +545,12 @@
262 	esac
263 fi
264
265+USE_ARG_SUFFIX=${DFT_ARG_SUFFIX}
266+AC_SUBST(USE_ARG_SUFFIX)
267+
268+USE_LIB_SUFFIX=${DFT_ARG_SUFFIX}
269+AC_SUBST(USE_LIB_SUFFIX)
270+
271 USE_CFG_SUFFIX=${DFT_ARG_SUFFIX}
272 AC_SUBST(USE_CFG_SUFFIX)
273
274Index: Ada95/gen/Makefile.in
275Prereq:  1.88
276--- ncurses-6.1-20190824+/Ada95/gen/Makefile.in	2019-03-16 21:43:34.000000000 +0000
277+++ ncurses-6.1-20190831/Ada95/gen/Makefile.in	2019-08-31 15:44:14.000000000 +0000
278@@ -28,7 +28,7 @@
279 #
280 #  Author:  Juergen Pfeifer, 1996
281 #
282-#  $Id: Makefile.in,v 1.88 2019/03/16 21:43:34 tom Exp $
283+#  $Id: Makefile.in,v 1.89 2019/08/31 15:44:14 tom Exp $
284 #
285 .SUFFIXES:
286
287@@ -98,7 +98,7 @@
288 WRAPPER		= @NCURSES_SHLIB2@
289
290 PROG_GENERATE	= ./generate$x
291-GENERATE	= $(PROG_GENERATE) '@DFT_ARG_SUFFIX@'
292+GENERATE	= $(PROG_GENERATE) '@USE_ARG_SUFFIX@'
293 DEL_ADAMODE	= sed -e '/^\-\-\ \ \-\*\-\ ada\ \-\*\-.*/d'
294
295 GNATHTML	= `type -p gnathtml || type -p gnathtml.pl 2>/dev/null`
296Index: Ada95/src/Makefile.in
297Prereq:  1.83
298--- ncurses-6.1-20190824+/Ada95/src/Makefile.in	2018-11-10 21:53:33.000000000 +0000
299+++ ncurses-6.1-20190831/Ada95/src/Makefile.in	2019-08-31 15:32:01.000000000 +0000
300@@ -1,5 +1,5 @@
301 ##############################################################################
302-# Copyright (c) 1998-2016,2018 Free Software Foundation, Inc.                #
303+# Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.                #
304 #                                                                            #
305 # Permission is hereby granted, free of charge, to any person obtaining a    #
306 # copy of this software and associated documentation files (the "Software"), #
307@@ -28,7 +28,7 @@
308 #
309 #  Author:  Juergen Pfeifer, 1996
310 #
311-#  $Id: Makefile.in,v 1.83 2018/11/10 21:53:33 tom Exp $
312+#  $Id: Makefile.in,v 1.84 2019/08/31 15:32:01 tom Exp $
313 #
314 .SUFFIXES:
315
316@@ -56,6 +56,7 @@
317
318 INSTALL		= @INSTALL@ @INSTALL_OPT_O@
319 INSTALL_LIB	= @INSTALL@ @INSTALL_LIB@
320+USE_LIB_SUFFIX	= @USE_LIB_SUFFIX@
321
322 AR		= @AR@
323 ARFLAGS		= @ARFLAGS@
324@@ -272,7 +273,7 @@
325 @USE_GNAT_PROJECTS@		$(STATIC_DIRS)
326 @USE_GNAT_PROJECTS@	@cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@
327 @USE_GNAT_PROJECTS@	-rm -f $(GNAT_PROJECT)
328-@USE_GNAT_PROJECTS@	$(SHELL) $(srcdir)/library-cfg.sh static $(srcdir)/library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT)
329+@USE_GNAT_PROJECTS@	$(SHELL) $(srcdir)/library-cfg.sh static "$(USE_LIB_SUFFIX)" $(srcdir)/library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT)
330 @USE_GNAT_PROJECTS@	@echo "Using GNAT Project:"
331 @USE_GNAT_PROJECTS@	@-$(SHELL) -c "diff -u $(srcdir)/library.gpr $(GNAT_PROJECT); exit 0"
332 @USE_GNAT_PROJECTS@	$(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static
333@@ -310,7 +311,7 @@
334 @MAKE_ADA_SHAREDLIB@	cp $(SHARED_OBJS) $(BUILD_DIR)/dynamic-obj/
335 @MAKE_ADA_SHAREDLIB@	@cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@
336 @MAKE_ADA_SHAREDLIB@	-rm -f $(GNAT_PROJECT)
337-@MAKE_ADA_SHAREDLIB@	$(SHELL) $(srcdir)/library-cfg.sh dynamic $(srcdir)/library.gpr $(CFLAGS_SHARED) >$(GNAT_PROJECT)
338+@MAKE_ADA_SHAREDLIB@	$(SHELL) $(srcdir)/library-cfg.sh dynamic "$(USE_LIB_SUFFIX)" $(srcdir)/library.gpr $(CFLAGS_SHARED) >$(GNAT_PROJECT)
339 @MAKE_ADA_SHAREDLIB@	@echo "Making Ada shared-lib:"
340 @MAKE_ADA_SHAREDLIB@	@-$(SHELL) -c "diff -u $(srcdir)/library.gpr $(GNAT_PROJECT); exit 0"
341 @MAKE_ADA_SHAREDLIB@	$(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=dynamic
342Index: Ada95/src/library-cfg.sh
343Prereq:  1.4
344--- ncurses-6.1-20190824+/Ada95/src/library-cfg.sh	2018-11-10 22:58:52.000000000 +0000
345+++ ncurses-6.1-20190831/Ada95/src/library-cfg.sh	2019-08-31 15:32:51.000000000 +0000
346@@ -1,6 +1,6 @@
347 #!/bin/sh
348 ##############################################################################
349-# Copyright (c) 2016,2018 Free Software Foundation, Inc.                     #
350+# Copyright (c) 2016-2018,2019 Free Software Foundation, Inc.                #
351 #                                                                            #
352 # Permission is hereby granted, free of charge, to any person obtaining a    #
353 # copy of this software and associated documentation files (the "Software"), #
354@@ -27,7 +27,7 @@
355 # authorization.                                                             #
356 ##############################################################################
357 #
358-# $Id: library-cfg.sh,v 1.4 2018/11/10 22:58:52 tom Exp $
359+# $Id: library-cfg.sh,v 1.5 2019/08/31 15:32:51 tom Exp $
360 #
361 # Work around incompatible behavior introduced with gnat6, which causes
362 # gnatmake to attempt to compile all of the C objects which might be part of
363@@ -35,6 +35,8 @@
364 # by making a copy of the project file with that information filled in).
365 model=$1
366 shift 1
367+suffix=$1
368+shift 1
369 input=$1
370 shift 1
371 param=
372@@ -55,9 +57,22 @@
373 SHARE="-- "
374 test "x$model" = "xdynamic" && SHARE=
375
376-sed \
377-	-e '/for Library_Options use /s,-- ,'"$SHARE"',' \
378-	-e '/for Default_Switches ("C") use/s,-- ,,' \
379-	-e '/for Default_Switches ("C") use/s% use .*'%" use($param);"% \
380-	$input
381-exit 0
382+SCRIPT=library-cfg.tmp
383+cat >$SCRIPT <<EOF
384+/for Library_Options use /{
385+	s,-- ,$SHARE,
386+	s,-lform,-lform$suffix,g
387+	s,-lmenu,-lmenu$suffix,g
388+	s,-lpanel,-lpanel$suffix,g
389+	s,-lncurses,-lncurses$suffix,g
390+}
391+/for Default_Switches ("C") use/{
392+	s,-- ,,
393+	s% use .*% use($param);%
394+}
395+EOF
396+
397+sed -f $SCRIPT $input
398+rc=$?
399+rm -f $SCRIPT
400+exit $?
401Index: NEWS
402Prereq:  1.3366
403--- ncurses-6.1-20190824+/NEWS	2019-08-24 23:16:29.000000000 +0000
404+++ ncurses-6.1-20190831/NEWS	2019-08-31 15:56:04.000000000 +0000
405@@ -25,7 +25,7 @@
406 -- sale, use or other dealings in this Software without prior written        --
407 -- authorization.                                                            --
408 -------------------------------------------------------------------------------
409--- $Id: NEWS,v 1.3366 2019/08/24 23:16:29 tom Exp $
410+-- $Id: NEWS,v 1.3368 2019/08/31 15:56:04 tom Exp $
411 -------------------------------------------------------------------------------
412
413 This is a log of changes that ncurses has gone through since Zeyd started
414@@ -45,6 +45,11 @@
415 Changes through 1.9.9e did not credit all contributions;
416 it is not possible to add this information.
417
418+20190831
419+	+ build-fixes for configuration using --program-suffix with Ada95,
420+	  noticed with MacOS but applicable to other platforms without
421+	  libpanelw, etc.
422+
423 20190824
424 	+ fix some cppcheck warnings, mostly style, in ncurses test-programs.
425
426Index: VERSION
427--- ncurses-6.1-20190824+/VERSION	2019-08-24 13:12:23.000000000 +0000
428+++ ncurses-6.1-20190831/VERSION	2019-08-31 13:43:44.000000000 +0000
429@@ -1 +1 @@
430-5:0:10	6.1	20190824
431+5:0:10	6.1	20190831
432Index: configure
433--- ncurses-6.1-20190824+/configure	2019-06-30 15:34:11.000000000 +0000
434+++ ncurses-6.1-20190831/configure	2019-08-31 16:35:35.000000000 +0000
435@@ -1,7 +1,7 @@
436 #! /bin/sh
437 # From configure.in Revision: 1.688 .
438 # Guess values for system-dependent variables and create Makefiles.
439-# Generated by Autoconf 2.52.20181006.
440+# Generated by Autoconf 2.52.20190828.
441 #
442 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
443 # Free Software Foundation, Inc.
444@@ -931,7 +931,7 @@
445 running configure, to aid debugging if configure makes a mistake.
446
447 It was created by $as_me, which was
448-generated by GNU Autoconf 2.52.20181006.  Invocation command line was
449+generated by GNU Autoconf 2.52.20190828.  Invocation command line was
450
451   $ $0 $@
452
453@@ -26203,7 +26203,7 @@
454 cat >>$CONFIG_STATUS <<EOF
455 ac_cs_version="\\
456 config.status
457-configured by $0, generated by GNU Autoconf 2.52.20181006,
458+configured by $0, generated by GNU Autoconf 2.52.20190828,
459   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
460
461 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
462@@ -26285,7 +26285,7 @@
463 ## Running config.status.  ##
464 ## ----------------------- ##
465
466-This file was extended by $as_me 2.52.20181006, executed with
467+This file was extended by $as_me 2.52.20190828, executed with
468   CONFIG_FILES    = $CONFIG_FILES
469   CONFIG_HEADERS  = $CONFIG_HEADERS
470   CONFIG_LINKS    = $CONFIG_LINKS
471Index: dist.mk
472Prereq:  1.1302
473--- ncurses-6.1-20190824+/dist.mk	2019-08-24 13:12:23.000000000 +0000
474+++ ncurses-6.1-20190831/dist.mk	2019-08-31 13:43:44.000000000 +0000
475@@ -25,7 +25,7 @@
476 # use or other dealings in this Software without prior written               #
477 # authorization.                                                             #
478 ##############################################################################
479-# $Id: dist.mk,v 1.1302 2019/08/24 13:12:23 tom Exp $
480+# $Id: dist.mk,v 1.1303 2019/08/31 13:43:44 tom Exp $
481 # Makefile for creating ncurses distributions.
482 #
483 # This only needs to be used directly as a makefile by developers, but
484@@ -37,7 +37,7 @@
485 # These define the major/minor/patch versions of ncurses.
486 NCURSES_MAJOR = 6
487 NCURSES_MINOR = 1
488-NCURSES_PATCH = 20190824
489+NCURSES_PATCH = 20190831
490
491 # We don't append the patch to the version, since this only applies to releases
492 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
493Index: package/debian-mingw/changelog
494--- ncurses-6.1-20190824+/package/debian-mingw/changelog	2019-08-24 13:12:23.000000000 +0000
495+++ ncurses-6.1-20190831/package/debian-mingw/changelog	2019-08-31 13:43:44.000000000 +0000
496@@ -1,8 +1,8 @@
497-ncurses6 (6.1+20190824) unstable; urgency=low
498+ncurses6 (6.1+20190831) unstable; urgency=low
499
500   * latest weekly patch
501
502- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Aug 2019 09:12:23 -0400
503+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 31 Aug 2019 09:43:44 -0400
504
505 ncurses6 (5.9-20131005) unstable; urgency=low
506
507Index: package/debian-mingw64/changelog
508--- ncurses-6.1-20190824+/package/debian-mingw64/changelog	2019-08-24 13:12:23.000000000 +0000
509+++ ncurses-6.1-20190831/package/debian-mingw64/changelog	2019-08-31 13:43:44.000000000 +0000
510@@ -1,8 +1,8 @@
511-ncurses6 (6.1+20190824) unstable; urgency=low
512+ncurses6 (6.1+20190831) unstable; urgency=low
513
514   * latest weekly patch
515
516- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Aug 2019 09:12:23 -0400
517+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 31 Aug 2019 09:43:44 -0400
518
519 ncurses6 (5.9-20131005) unstable; urgency=low
520
521Index: package/debian/changelog
522--- ncurses-6.1-20190824+/package/debian/changelog	2019-08-24 13:12:23.000000000 +0000
523+++ ncurses-6.1-20190831/package/debian/changelog	2019-08-31 13:43:44.000000000 +0000
524@@ -1,8 +1,8 @@
525-ncurses6 (6.1+20190824) unstable; urgency=low
526+ncurses6 (6.1+20190831) unstable; urgency=low
527
528   * latest weekly patch
529
530- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 24 Aug 2019 09:12:23 -0400
531+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 31 Aug 2019 09:43:44 -0400
532
533 ncurses6 (5.9-20120608) unstable; urgency=low
534
535Index: package/mingw-ncurses.nsi
536Prereq:  1.348
537--- ncurses-6.1-20190824+/package/mingw-ncurses.nsi	2019-08-24 13:12:23.000000000 +0000
538+++ ncurses-6.1-20190831/package/mingw-ncurses.nsi	2019-08-31 13:43:44.000000000 +0000
539@@ -1,4 +1,4 @@
540-; $Id: mingw-ncurses.nsi,v 1.348 2019/08/24 13:12:23 tom Exp $
541+; $Id: mingw-ncurses.nsi,v 1.349 2019/08/31 13:43:44 tom Exp $
542
543 ; TODO add examples
544 ; TODO bump ABI to 6
545@@ -10,7 +10,7 @@
546 !define VERSION_MAJOR "6"
547 !define VERSION_MINOR "1"
548 !define VERSION_YYYY  "2019"
549-!define VERSION_MMDD  "0824"
550+!define VERSION_MMDD  "0831"
551 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
552
553 !define MY_ABI   "5"
554Index: package/mingw-ncurses.spec
555--- ncurses-6.1-20190824+/package/mingw-ncurses.spec	2019-08-24 13:12:23.000000000 +0000
556+++ ncurses-6.1-20190831/package/mingw-ncurses.spec	2019-08-31 13:43:44.000000000 +0000
557@@ -3,7 +3,7 @@
558 Summary: shared libraries for terminal handling
559 Name: mingw32-ncurses6
560 Version: 6.1
561-Release: 20190824
562+Release: 20190831
563 License: X11
564 Group: Development/Libraries
565 Source: ncurses-%{version}-%{release}.tgz
566Index: package/ncurses.spec
567--- ncurses-6.1-20190824+/package/ncurses.spec	2019-08-24 13:12:23.000000000 +0000
568+++ ncurses-6.1-20190831/package/ncurses.spec	2019-08-31 13:43:44.000000000 +0000
569@@ -1,7 +1,7 @@
570 Summary: shared libraries for terminal handling
571 Name: ncurses6
572 Version: 6.1
573-Release: 20190824
574+Release: 20190831
575 License: X11
576 Group: Development/Libraries
577 Source: ncurses-%{version}-%{release}.tgz
578Index: package/ncursest.spec
579--- ncurses-6.1-20190824+/package/ncursest.spec	2019-08-24 13:12:23.000000000 +0000
580+++ ncurses-6.1-20190831/package/ncursest.spec	2019-08-31 13:43:44.000000000 +0000
581@@ -1,7 +1,7 @@
582 Summary: Curses library with POSIX thread support.
583 Name: ncursest6
584 Version: 6.1
585-Release: 20190824
586+Release: 20190831
587 License: X11
588 Group: Development/Libraries
589 Source: ncurses-%{version}-%{release}.tgz
590Index: test/configure
591--- ncurses-6.1-20190824+/test/configure	2019-04-13 22:56:11.000000000 +0000
592+++ ncurses-6.1-20190831/test/configure	2019-08-31 16:35:56.000000000 +0000
593@@ -1,6 +1,6 @@
594 #! /bin/sh
595 # Guess values for system-dependent variables and create Makefiles.
596-# Generated by Autoconf 2.52.20181006.
597+# Generated by Autoconf 2.52.20190828.
598 #
599 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
600 # Free Software Foundation, Inc.
601@@ -765,7 +765,7 @@
602 running configure, to aid debugging if configure makes a mistake.
603
604 It was created by $as_me, which was
605-generated by GNU Autoconf 2.52.20181006.  Invocation command line was
606+generated by GNU Autoconf 2.52.20190828.  Invocation command line was
607
608   $ $0 $@
609
610@@ -11143,21 +11143,25 @@
611 # Check X11 before X11Rn because it is often a symlink to the current release.
612 ac_x_header_dirs='
613 /usr/X11/include
614+/usr/X11R7/include
615 /usr/X11R6/include
616 /usr/X11R5/include
617 /usr/X11R4/include
618
619 /usr/include/X11
620+/usr/include/X11R7
621 /usr/include/X11R6
622 /usr/include/X11R5
623 /usr/include/X11R4
624
625 /usr/local/X11/include
626+/usr/local/X11R7/include
627 /usr/local/X11R6/include
628 /usr/local/X11R5/include
629 /usr/local/X11R4/include
630
631 /usr/local/include/X11
632+/usr/local/include/X11R7
633 /usr/local/include/X11R6
634 /usr/local/include/X11R5
635 /usr/local/include/X11R4
636@@ -11180,17 +11184,17 @@
637   # Guess where to find include files, by looking for Intrinsic.h.
638   # First, try using that file with no special directory specified.
639   cat >conftest.$ac_ext <<_ACEOF
640-#line 11183 "configure"
641+#line 11187 "configure"
642 #include "confdefs.h"
643 #include <X11/Intrinsic.h>
644 _ACEOF
645-if { (eval echo "$as_me:11187: \"$ac_cpp conftest.$ac_ext\"") >&5
646+if { (eval echo "$as_me:11191: \"$ac_cpp conftest.$ac_ext\"") >&5
647   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
648   ac_status=$?
649   egrep -v '^ *\+' conftest.er1 >conftest.err
650   rm -f conftest.er1
651   cat conftest.err >&5
652-  echo "$as_me:11193: \$? = $ac_status" >&5
653+  echo "$as_me:11197: \$? = $ac_status" >&5
654   (exit $ac_status); } >/dev/null; then
655   if test -s conftest.err; then
656     ac_cpp_err=$ac_c_preproc_warn_flag
657@@ -11223,7 +11227,7 @@
658   ac_save_LIBS=$LIBS
659   LIBS="-lXt $LIBS"
660   cat >conftest.$ac_ext <<_ACEOF
661-#line 11226 "configure"
662+#line 11230 "configure"
663 #include "confdefs.h"
664 #include <X11/Intrinsic.h>
665 int
666@@ -11235,16 +11239,16 @@
667 }
668 _ACEOF
669 rm -f conftest.$ac_objext conftest$ac_exeext
670-if { (eval echo "$as_me:11238: \"$ac_link\"") >&5
671+if { (eval echo "$as_me:11242: \"$ac_link\"") >&5
672   (eval $ac_link) 2>&5
673   ac_status=$?
674-  echo "$as_me:11241: \$? = $ac_status" >&5
675+  echo "$as_me:11245: \$? = $ac_status" >&5
676   (exit $ac_status); } &&
677          { ac_try='test -s conftest$ac_exeext'
678-  { (eval echo "$as_me:11244: \"$ac_try\"") >&5
679+  { (eval echo "$as_me:11248: \"$ac_try\"") >&5
680   (eval $ac_try) 2>&5
681   ac_status=$?
682-  echo "$as_me:11247: \$? = $ac_status" >&5
683+  echo "$as_me:11251: \$? = $ac_status" >&5
684   (exit $ac_status); }; }; then
685   LIBS=$ac_save_LIBS
686 # We can link X programs with no special library path.
687@@ -11282,7 +11286,7 @@
688 fi # $with_x != no
689
690 if test "$have_x" != yes; then
691-  echo "$as_me:11285: result: $have_x" >&5
692+  echo "$as_me:11289: result: $have_x" >&5
693 echo "${ECHO_T}$have_x" >&6
694   no_x=yes
695 else
696@@ -11292,7 +11296,7 @@
697   # Update the cache value to reflect the command line values.
698   ac_cv_have_x="have_x=yes \
699 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
700-  echo "$as_me:11295: result: libraries $x_libraries, headers $x_includes" >&5
701+  echo "$as_me:11299: result: libraries $x_libraries, headers $x_includes" >&5
702 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
703 fi
704
705@@ -11316,11 +11320,11 @@
706     # others require no space.  Words are not sufficient . . . .
707     case `(uname -sr) 2>/dev/null` in
708     "SunOS 5"*)
709-      echo "$as_me:11319: checking whether -R must be followed by a space" >&5
710+      echo "$as_me:11323: checking whether -R must be followed by a space" >&5
711 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
712       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
713       cat >conftest.$ac_ext <<_ACEOF
714-#line 11323 "configure"
715+#line 11327 "configure"
716 #include "confdefs.h"
717
718 int
719@@ -11332,16 +11336,16 @@
720 }
721 _ACEOF
722 rm -f conftest.$ac_objext conftest$ac_exeext
723-if { (eval echo "$as_me:11335: \"$ac_link\"") >&5
724+if { (eval echo "$as_me:11339: \"$ac_link\"") >&5
725   (eval $ac_link) 2>&5
726   ac_status=$?
727-  echo "$as_me:11338: \$? = $ac_status" >&5
728+  echo "$as_me:11342: \$? = $ac_status" >&5
729   (exit $ac_status); } &&
730          { ac_try='test -s conftest$ac_exeext'
731-  { (eval echo "$as_me:11341: \"$ac_try\"") >&5
732+  { (eval echo "$as_me:11345: \"$ac_try\"") >&5
733   (eval $ac_try) 2>&5
734   ac_status=$?
735-  echo "$as_me:11344: \$? = $ac_status" >&5
736+  echo "$as_me:11348: \$? = $ac_status" >&5
737   (exit $ac_status); }; }; then
738   ac_R_nospace=yes
739 else
740@@ -11351,13 +11355,13 @@
741 fi
742 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
743       if test $ac_R_nospace = yes; then
744-	echo "$as_me:11354: result: no" >&5
745+	echo "$as_me:11358: result: no" >&5
746 echo "${ECHO_T}no" >&6
747 	X_LIBS="$X_LIBS -R$x_libraries"
748       else
749 	LIBS="$ac_xsave_LIBS -R $x_libraries"
750 	cat >conftest.$ac_ext <<_ACEOF
751-#line 11360 "configure"
752+#line 11364 "configure"
753 #include "confdefs.h"
754
755 int
756@@ -11369,16 +11373,16 @@
757 }
758 _ACEOF
759 rm -f conftest.$ac_objext conftest$ac_exeext
760-if { (eval echo "$as_me:11372: \"$ac_link\"") >&5
761+if { (eval echo "$as_me:11376: \"$ac_link\"") >&5
762   (eval $ac_link) 2>&5
763   ac_status=$?
764-  echo "$as_me:11375: \$? = $ac_status" >&5
765+  echo "$as_me:11379: \$? = $ac_status" >&5
766   (exit $ac_status); } &&
767          { ac_try='test -s conftest$ac_exeext'
768-  { (eval echo "$as_me:11378: \"$ac_try\"") >&5
769+  { (eval echo "$as_me:11382: \"$ac_try\"") >&5
770   (eval $ac_try) 2>&5
771   ac_status=$?
772-  echo "$as_me:11381: \$? = $ac_status" >&5
773+  echo "$as_me:11385: \$? = $ac_status" >&5
774   (exit $ac_status); }; }; then
775   ac_R_space=yes
776 else
777@@ -11388,11 +11392,11 @@
778 fi
779 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
780 	if test $ac_R_space = yes; then
781-	  echo "$as_me:11391: result: yes" >&5
782+	  echo "$as_me:11395: result: yes" >&5
783 echo "${ECHO_T}yes" >&6
784 	  X_LIBS="$X_LIBS -R $x_libraries"
785 	else
786-	  echo "$as_me:11395: result: neither works" >&5
787+	  echo "$as_me:11399: result: neither works" >&5
788 echo "${ECHO_T}neither works" >&6
789 	fi
790       fi
791@@ -11412,7 +11416,7 @@
792     # the Alpha needs dnet_stub (dnet does not exist).
793     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
794     cat >conftest.$ac_ext <<_ACEOF
795-#line 11415 "configure"
796+#line 11419 "configure"
797 #include "confdefs.h"
798
799 /* Override any gcc2 internal prototype to avoid an error.  */
800@@ -11431,22 +11435,22 @@
801 }
802 _ACEOF
803 rm -f conftest.$ac_objext conftest$ac_exeext
804-if { (eval echo "$as_me:11434: \"$ac_link\"") >&5
805+if { (eval echo "$as_me:11438: \"$ac_link\"") >&5
806   (eval $ac_link) 2>&5
807   ac_status=$?
808-  echo "$as_me:11437: \$? = $ac_status" >&5
809+  echo "$as_me:11441: \$? = $ac_status" >&5
810   (exit $ac_status); } &&
811          { ac_try='test -s conftest$ac_exeext'
812-  { (eval echo "$as_me:11440: \"$ac_try\"") >&5
813+  { (eval echo "$as_me:11444: \"$ac_try\"") >&5
814   (eval $ac_try) 2>&5
815   ac_status=$?
816-  echo "$as_me:11443: \$? = $ac_status" >&5
817+  echo "$as_me:11447: \$? = $ac_status" >&5
818   (exit $ac_status); }; }; then
819   :
820 else
821   echo "$as_me: failed program was:" >&5
822 cat conftest.$ac_ext >&5
823-echo "$as_me:11449: checking for dnet_ntoa in -ldnet" >&5
824+echo "$as_me:11453: checking for dnet_ntoa in -ldnet" >&5
825 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
826 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
827   echo $ECHO_N "(cached) $ECHO_C" >&6
828@@ -11454,7 +11458,7 @@
829   ac_check_lib_save_LIBS=$LIBS
830 LIBS="-ldnet  $LIBS"
831 cat >conftest.$ac_ext <<_ACEOF
832-#line 11457 "configure"
833+#line 11461 "configure"
834 #include "confdefs.h"
835
836 /* Override any gcc2 internal prototype to avoid an error.  */
837@@ -11473,16 +11477,16 @@
838 }
839 _ACEOF
840 rm -f conftest.$ac_objext conftest$ac_exeext
841-if { (eval echo "$as_me:11476: \"$ac_link\"") >&5
842+if { (eval echo "$as_me:11480: \"$ac_link\"") >&5
843   (eval $ac_link) 2>&5
844   ac_status=$?
845-  echo "$as_me:11479: \$? = $ac_status" >&5
846+  echo "$as_me:11483: \$? = $ac_status" >&5
847   (exit $ac_status); } &&
848          { ac_try='test -s conftest$ac_exeext'
849-  { (eval echo "$as_me:11482: \"$ac_try\"") >&5
850+  { (eval echo "$as_me:11486: \"$ac_try\"") >&5
851   (eval $ac_try) 2>&5
852   ac_status=$?
853-  echo "$as_me:11485: \$? = $ac_status" >&5
854+  echo "$as_me:11489: \$? = $ac_status" >&5
855   (exit $ac_status); }; }; then
856   ac_cv_lib_dnet_dnet_ntoa=yes
857 else
858@@ -11493,14 +11497,14 @@
859 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
860 LIBS=$ac_check_lib_save_LIBS
861 fi
862-echo "$as_me:11496: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
863+echo "$as_me:11500: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
864 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
865 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
866   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
867 fi
868
869     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
870-      echo "$as_me:11503: checking for dnet_ntoa in -ldnet_stub" >&5
871+      echo "$as_me:11507: checking for dnet_ntoa in -ldnet_stub" >&5
872 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
873 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
874   echo $ECHO_N "(cached) $ECHO_C" >&6
875@@ -11508,7 +11512,7 @@
876   ac_check_lib_save_LIBS=$LIBS
877 LIBS="-ldnet_stub  $LIBS"
878 cat >conftest.$ac_ext <<_ACEOF
879-#line 11511 "configure"
880+#line 11515 "configure"
881 #include "confdefs.h"
882
883 /* Override any gcc2 internal prototype to avoid an error.  */
884@@ -11527,16 +11531,16 @@
885 }
886 _ACEOF
887 rm -f conftest.$ac_objext conftest$ac_exeext
888-if { (eval echo "$as_me:11530: \"$ac_link\"") >&5
889+if { (eval echo "$as_me:11534: \"$ac_link\"") >&5
890   (eval $ac_link) 2>&5
891   ac_status=$?
892-  echo "$as_me:11533: \$? = $ac_status" >&5
893+  echo "$as_me:11537: \$? = $ac_status" >&5
894   (exit $ac_status); } &&
895          { ac_try='test -s conftest$ac_exeext'
896-  { (eval echo "$as_me:11536: \"$ac_try\"") >&5
897+  { (eval echo "$as_me:11540: \"$ac_try\"") >&5
898   (eval $ac_try) 2>&5
899   ac_status=$?
900-  echo "$as_me:11539: \$? = $ac_status" >&5
901+  echo "$as_me:11543: \$? = $ac_status" >&5
902   (exit $ac_status); }; }; then
903   ac_cv_lib_dnet_stub_dnet_ntoa=yes
904 else
905@@ -11547,7 +11551,7 @@
906 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
907 LIBS=$ac_check_lib_save_LIBS
908 fi
909-echo "$as_me:11550: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
910+echo "$as_me:11554: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
911 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
912 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
913   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
914@@ -11566,13 +11570,13 @@
915     # on Irix 5.2, according to T.E. Dickey.
916     # The functions gethostbyname, getservbyname, and inet_addr are
917     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
918-    echo "$as_me:11569: checking for gethostbyname" >&5
919+    echo "$as_me:11573: checking for gethostbyname" >&5
920 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
921 if test "${ac_cv_func_gethostbyname+set}" = set; then
922   echo $ECHO_N "(cached) $ECHO_C" >&6
923 else
924   cat >conftest.$ac_ext <<_ACEOF
925-#line 11575 "configure"
926+#line 11579 "configure"
927 #include "confdefs.h"
928 #define gethostbyname autoconf_temporary
929 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
930@@ -11603,16 +11607,16 @@
931 }
932 _ACEOF
933 rm -f conftest.$ac_objext conftest$ac_exeext
934-if { (eval echo "$as_me:11606: \"$ac_link\"") >&5
935+if { (eval echo "$as_me:11610: \"$ac_link\"") >&5
936   (eval $ac_link) 2>&5
937   ac_status=$?
938-  echo "$as_me:11609: \$? = $ac_status" >&5
939+  echo "$as_me:11613: \$? = $ac_status" >&5
940   (exit $ac_status); } &&
941          { ac_try='test -s conftest$ac_exeext'
942-  { (eval echo "$as_me:11612: \"$ac_try\"") >&5
943+  { (eval echo "$as_me:11616: \"$ac_try\"") >&5
944   (eval $ac_try) 2>&5
945   ac_status=$?
946-  echo "$as_me:11615: \$? = $ac_status" >&5
947+  echo "$as_me:11619: \$? = $ac_status" >&5
948   (exit $ac_status); }; }; then
949   ac_cv_func_gethostbyname=yes
950 else
951@@ -11622,11 +11626,11 @@
952 fi
953 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
954 fi
955-echo "$as_me:11625: result: $ac_cv_func_gethostbyname" >&5
956+echo "$as_me:11629: result: $ac_cv_func_gethostbyname" >&5
957 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
958
959     if test $ac_cv_func_gethostbyname = no; then
960-      echo "$as_me:11629: checking for gethostbyname in -lnsl" >&5
961+      echo "$as_me:11633: checking for gethostbyname in -lnsl" >&5
962 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
963 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
964   echo $ECHO_N "(cached) $ECHO_C" >&6
965@@ -11634,7 +11638,7 @@
966   ac_check_lib_save_LIBS=$LIBS
967 LIBS="-lnsl  $LIBS"
968 cat >conftest.$ac_ext <<_ACEOF
969-#line 11637 "configure"
970+#line 11641 "configure"
971 #include "confdefs.h"
972
973 /* Override any gcc2 internal prototype to avoid an error.  */
974@@ -11653,16 +11657,16 @@
975 }
976 _ACEOF
977 rm -f conftest.$ac_objext conftest$ac_exeext
978-if { (eval echo "$as_me:11656: \"$ac_link\"") >&5
979+if { (eval echo "$as_me:11660: \"$ac_link\"") >&5
980   (eval $ac_link) 2>&5
981   ac_status=$?
982-  echo "$as_me:11659: \$? = $ac_status" >&5
983+  echo "$as_me:11663: \$? = $ac_status" >&5
984   (exit $ac_status); } &&
985          { ac_try='test -s conftest$ac_exeext'
986-  { (eval echo "$as_me:11662: \"$ac_try\"") >&5
987+  { (eval echo "$as_me:11666: \"$ac_try\"") >&5
988   (eval $ac_try) 2>&5
989   ac_status=$?
990-  echo "$as_me:11665: \$? = $ac_status" >&5
991+  echo "$as_me:11669: \$? = $ac_status" >&5
992   (exit $ac_status); }; }; then
993   ac_cv_lib_nsl_gethostbyname=yes
994 else
995@@ -11673,14 +11677,14 @@
996 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
997 LIBS=$ac_check_lib_save_LIBS
998 fi
999-echo "$as_me:11676: result: $ac_cv_lib_nsl_gethostbyname" >&5
1000+echo "$as_me:11680: result: $ac_cv_lib_nsl_gethostbyname" >&5
1001 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
1002 if test $ac_cv_lib_nsl_gethostbyname = yes; then
1003   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
1004 fi
1005
1006       if test $ac_cv_lib_nsl_gethostbyname = no; then
1007-        echo "$as_me:11683: checking for gethostbyname in -lbsd" >&5
1008+        echo "$as_me:11687: checking for gethostbyname in -lbsd" >&5
1009 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
1010 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
1011   echo $ECHO_N "(cached) $ECHO_C" >&6
1012@@ -11688,7 +11692,7 @@
1013   ac_check_lib_save_LIBS=$LIBS
1014 LIBS="-lbsd  $LIBS"
1015 cat >conftest.$ac_ext <<_ACEOF
1016-#line 11691 "configure"
1017+#line 11695 "configure"
1018 #include "confdefs.h"
1019
1020 /* Override any gcc2 internal prototype to avoid an error.  */
1021@@ -11707,16 +11711,16 @@
1022 }
1023 _ACEOF
1024 rm -f conftest.$ac_objext conftest$ac_exeext
1025-if { (eval echo "$as_me:11710: \"$ac_link\"") >&5
1026+if { (eval echo "$as_me:11714: \"$ac_link\"") >&5
1027   (eval $ac_link) 2>&5
1028   ac_status=$?
1029-  echo "$as_me:11713: \$? = $ac_status" >&5
1030+  echo "$as_me:11717: \$? = $ac_status" >&5
1031   (exit $ac_status); } &&
1032          { ac_try='test -s conftest$ac_exeext'
1033-  { (eval echo "$as_me:11716: \"$ac_try\"") >&5
1034+  { (eval echo "$as_me:11720: \"$ac_try\"") >&5
1035   (eval $ac_try) 2>&5
1036   ac_status=$?
1037-  echo "$as_me:11719: \$? = $ac_status" >&5
1038+  echo "$as_me:11723: \$? = $ac_status" >&5
1039   (exit $ac_status); }; }; then
1040   ac_cv_lib_bsd_gethostbyname=yes
1041 else
1042@@ -11727,7 +11731,7 @@
1043 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1044 LIBS=$ac_check_lib_save_LIBS
1045 fi
1046-echo "$as_me:11730: result: $ac_cv_lib_bsd_gethostbyname" >&5
1047+echo "$as_me:11734: result: $ac_cv_lib_bsd_gethostbyname" >&5
1048 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
1049 if test $ac_cv_lib_bsd_gethostbyname = yes; then
1050   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
1051@@ -11743,13 +11747,13 @@
1052     # variants that don't use the nameserver (or something).  -lsocket
1053     # must be given before -lnsl if both are needed.  We assume that
1054     # if connect needs -lnsl, so does gethostbyname.
1055-    echo "$as_me:11746: checking for connect" >&5
1056+    echo "$as_me:11750: checking for connect" >&5
1057 echo $ECHO_N "checking for connect... $ECHO_C" >&6
1058 if test "${ac_cv_func_connect+set}" = set; then
1059   echo $ECHO_N "(cached) $ECHO_C" >&6
1060 else
1061   cat >conftest.$ac_ext <<_ACEOF
1062-#line 11752 "configure"
1063+#line 11756 "configure"
1064 #include "confdefs.h"
1065 #define connect autoconf_temporary
1066 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
1067@@ -11780,16 +11784,16 @@
1068 }
1069 _ACEOF
1070 rm -f conftest.$ac_objext conftest$ac_exeext
1071-if { (eval echo "$as_me:11783: \"$ac_link\"") >&5
1072+if { (eval echo "$as_me:11787: \"$ac_link\"") >&5
1073   (eval $ac_link) 2>&5
1074   ac_status=$?
1075-  echo "$as_me:11786: \$? = $ac_status" >&5
1076+  echo "$as_me:11790: \$? = $ac_status" >&5
1077   (exit $ac_status); } &&
1078          { ac_try='test -s conftest$ac_exeext'
1079-  { (eval echo "$as_me:11789: \"$ac_try\"") >&5
1080+  { (eval echo "$as_me:11793: \"$ac_try\"") >&5
1081   (eval $ac_try) 2>&5
1082   ac_status=$?
1083-  echo "$as_me:11792: \$? = $ac_status" >&5
1084+  echo "$as_me:11796: \$? = $ac_status" >&5
1085   (exit $ac_status); }; }; then
1086   ac_cv_func_connect=yes
1087 else
1088@@ -11799,11 +11803,11 @@
1089 fi
1090 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1091 fi
1092-echo "$as_me:11802: result: $ac_cv_func_connect" >&5
1093+echo "$as_me:11806: result: $ac_cv_func_connect" >&5
1094 echo "${ECHO_T}$ac_cv_func_connect" >&6
1095
1096     if test $ac_cv_func_connect = no; then
1097-      echo "$as_me:11806: checking for connect in -lsocket" >&5
1098+      echo "$as_me:11810: checking for connect in -lsocket" >&5
1099 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
1100 if test "${ac_cv_lib_socket_connect+set}" = set; then
1101   echo $ECHO_N "(cached) $ECHO_C" >&6
1102@@ -11811,7 +11815,7 @@
1103   ac_check_lib_save_LIBS=$LIBS
1104 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
1105 cat >conftest.$ac_ext <<_ACEOF
1106-#line 11814 "configure"
1107+#line 11818 "configure"
1108 #include "confdefs.h"
1109
1110 /* Override any gcc2 internal prototype to avoid an error.  */
1111@@ -11830,16 +11834,16 @@
1112 }
1113 _ACEOF
1114 rm -f conftest.$ac_objext conftest$ac_exeext
1115-if { (eval echo "$as_me:11833: \"$ac_link\"") >&5
1116+if { (eval echo "$as_me:11837: \"$ac_link\"") >&5
1117   (eval $ac_link) 2>&5
1118   ac_status=$?
1119-  echo "$as_me:11836: \$? = $ac_status" >&5
1120+  echo "$as_me:11840: \$? = $ac_status" >&5
1121   (exit $ac_status); } &&
1122          { ac_try='test -s conftest$ac_exeext'
1123-  { (eval echo "$as_me:11839: \"$ac_try\"") >&5
1124+  { (eval echo "$as_me:11843: \"$ac_try\"") >&5
1125   (eval $ac_try) 2>&5
1126   ac_status=$?
1127-  echo "$as_me:11842: \$? = $ac_status" >&5
1128+  echo "$as_me:11846: \$? = $ac_status" >&5
1129   (exit $ac_status); }; }; then
1130   ac_cv_lib_socket_connect=yes
1131 else
1132@@ -11850,7 +11854,7 @@
1133 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1134 LIBS=$ac_check_lib_save_LIBS
1135 fi
1136-echo "$as_me:11853: result: $ac_cv_lib_socket_connect" >&5
1137+echo "$as_me:11857: result: $ac_cv_lib_socket_connect" >&5
1138 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
1139 if test $ac_cv_lib_socket_connect = yes; then
1140   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
1141@@ -11859,13 +11863,13 @@
1142     fi
1143
1144     # Guillermo Gomez says -lposix is necessary on A/UX.
1145-    echo "$as_me:11862: checking for remove" >&5
1146+    echo "$as_me:11866: checking for remove" >&5
1147 echo $ECHO_N "checking for remove... $ECHO_C" >&6
1148 if test "${ac_cv_func_remove+set}" = set; then
1149   echo $ECHO_N "(cached) $ECHO_C" >&6
1150 else
1151   cat >conftest.$ac_ext <<_ACEOF
1152-#line 11868 "configure"
1153+#line 11872 "configure"
1154 #include "confdefs.h"
1155 #define remove autoconf_temporary
1156 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
1157@@ -11896,16 +11900,16 @@
1158 }
1159 _ACEOF
1160 rm -f conftest.$ac_objext conftest$ac_exeext
1161-if { (eval echo "$as_me:11899: \"$ac_link\"") >&5
1162+if { (eval echo "$as_me:11903: \"$ac_link\"") >&5
1163   (eval $ac_link) 2>&5
1164   ac_status=$?
1165-  echo "$as_me:11902: \$? = $ac_status" >&5
1166+  echo "$as_me:11906: \$? = $ac_status" >&5
1167   (exit $ac_status); } &&
1168          { ac_try='test -s conftest$ac_exeext'
1169-  { (eval echo "$as_me:11905: \"$ac_try\"") >&5
1170+  { (eval echo "$as_me:11909: \"$ac_try\"") >&5
1171   (eval $ac_try) 2>&5
1172   ac_status=$?
1173-  echo "$as_me:11908: \$? = $ac_status" >&5
1174+  echo "$as_me:11912: \$? = $ac_status" >&5
1175   (exit $ac_status); }; }; then
1176   ac_cv_func_remove=yes
1177 else
1178@@ -11915,11 +11919,11 @@
1179 fi
1180 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1181 fi
1182-echo "$as_me:11918: result: $ac_cv_func_remove" >&5
1183+echo "$as_me:11922: result: $ac_cv_func_remove" >&5
1184 echo "${ECHO_T}$ac_cv_func_remove" >&6
1185
1186     if test $ac_cv_func_remove = no; then
1187-      echo "$as_me:11922: checking for remove in -lposix" >&5
1188+      echo "$as_me:11926: checking for remove in -lposix" >&5
1189 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
1190 if test "${ac_cv_lib_posix_remove+set}" = set; then
1191   echo $ECHO_N "(cached) $ECHO_C" >&6
1192@@ -11927,7 +11931,7 @@
1193   ac_check_lib_save_LIBS=$LIBS
1194 LIBS="-lposix  $LIBS"
1195 cat >conftest.$ac_ext <<_ACEOF
1196-#line 11930 "configure"
1197+#line 11934 "configure"
1198 #include "confdefs.h"
1199
1200 /* Override any gcc2 internal prototype to avoid an error.  */
1201@@ -11946,16 +11950,16 @@
1202 }
1203 _ACEOF
1204 rm -f conftest.$ac_objext conftest$ac_exeext
1205-if { (eval echo "$as_me:11949: \"$ac_link\"") >&5
1206+if { (eval echo "$as_me:11953: \"$ac_link\"") >&5
1207   (eval $ac_link) 2>&5
1208   ac_status=$?
1209-  echo "$as_me:11952: \$? = $ac_status" >&5
1210+  echo "$as_me:11956: \$? = $ac_status" >&5
1211   (exit $ac_status); } &&
1212          { ac_try='test -s conftest$ac_exeext'
1213-  { (eval echo "$as_me:11955: \"$ac_try\"") >&5
1214+  { (eval echo "$as_me:11959: \"$ac_try\"") >&5
1215   (eval $ac_try) 2>&5
1216   ac_status=$?
1217-  echo "$as_me:11958: \$? = $ac_status" >&5
1218+  echo "$as_me:11962: \$? = $ac_status" >&5
1219   (exit $ac_status); }; }; then
1220   ac_cv_lib_posix_remove=yes
1221 else
1222@@ -11966,7 +11970,7 @@
1223 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1224 LIBS=$ac_check_lib_save_LIBS
1225 fi
1226-echo "$as_me:11969: result: $ac_cv_lib_posix_remove" >&5
1227+echo "$as_me:11973: result: $ac_cv_lib_posix_remove" >&5
1228 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
1229 if test $ac_cv_lib_posix_remove = yes; then
1230   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
1231@@ -11975,13 +11979,13 @@
1232     fi
1233
1234     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
1235-    echo "$as_me:11978: checking for shmat" >&5
1236+    echo "$as_me:11982: checking for shmat" >&5
1237 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
1238 if test "${ac_cv_func_shmat+set}" = set; then
1239   echo $ECHO_N "(cached) $ECHO_C" >&6
1240 else
1241   cat >conftest.$ac_ext <<_ACEOF
1242-#line 11984 "configure"
1243+#line 11988 "configure"
1244 #include "confdefs.h"
1245 #define shmat autoconf_temporary
1246 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
1247@@ -12012,16 +12016,16 @@
1248 }
1249 _ACEOF
1250 rm -f conftest.$ac_objext conftest$ac_exeext
1251-if { (eval echo "$as_me:12015: \"$ac_link\"") >&5
1252+if { (eval echo "$as_me:12019: \"$ac_link\"") >&5
1253   (eval $ac_link) 2>&5
1254   ac_status=$?
1255-  echo "$as_me:12018: \$? = $ac_status" >&5
1256+  echo "$as_me:12022: \$? = $ac_status" >&5
1257   (exit $ac_status); } &&
1258          { ac_try='test -s conftest$ac_exeext'
1259-  { (eval echo "$as_me:12021: \"$ac_try\"") >&5
1260+  { (eval echo "$as_me:12025: \"$ac_try\"") >&5
1261   (eval $ac_try) 2>&5
1262   ac_status=$?
1263-  echo "$as_me:12024: \$? = $ac_status" >&5
1264+  echo "$as_me:12028: \$? = $ac_status" >&5
1265   (exit $ac_status); }; }; then
1266   ac_cv_func_shmat=yes
1267 else
1268@@ -12031,11 +12035,11 @@
1269 fi
1270 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1271 fi
1272-echo "$as_me:12034: result: $ac_cv_func_shmat" >&5
1273+echo "$as_me:12038: result: $ac_cv_func_shmat" >&5
1274 echo "${ECHO_T}$ac_cv_func_shmat" >&6
1275
1276     if test $ac_cv_func_shmat = no; then
1277-      echo "$as_me:12038: checking for shmat in -lipc" >&5
1278+      echo "$as_me:12042: checking for shmat in -lipc" >&5
1279 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
1280 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
1281   echo $ECHO_N "(cached) $ECHO_C" >&6
1282@@ -12043,7 +12047,7 @@
1283   ac_check_lib_save_LIBS=$LIBS
1284 LIBS="-lipc  $LIBS"
1285 cat >conftest.$ac_ext <<_ACEOF
1286-#line 12046 "configure"
1287+#line 12050 "configure"
1288 #include "confdefs.h"
1289
1290 /* Override any gcc2 internal prototype to avoid an error.  */
1291@@ -12062,16 +12066,16 @@
1292 }
1293 _ACEOF
1294 rm -f conftest.$ac_objext conftest$ac_exeext
1295-if { (eval echo "$as_me:12065: \"$ac_link\"") >&5
1296+if { (eval echo "$as_me:12069: \"$ac_link\"") >&5
1297   (eval $ac_link) 2>&5
1298   ac_status=$?
1299-  echo "$as_me:12068: \$? = $ac_status" >&5
1300+  echo "$as_me:12072: \$? = $ac_status" >&5
1301   (exit $ac_status); } &&
1302          { ac_try='test -s conftest$ac_exeext'
1303-  { (eval echo "$as_me:12071: \"$ac_try\"") >&5
1304+  { (eval echo "$as_me:12075: \"$ac_try\"") >&5
1305   (eval $ac_try) 2>&5
1306   ac_status=$?
1307-  echo "$as_me:12074: \$? = $ac_status" >&5
1308+  echo "$as_me:12078: \$? = $ac_status" >&5
1309   (exit $ac_status); }; }; then
1310   ac_cv_lib_ipc_shmat=yes
1311 else
1312@@ -12082,7 +12086,7 @@
1313 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1314 LIBS=$ac_check_lib_save_LIBS
1315 fi
1316-echo "$as_me:12085: result: $ac_cv_lib_ipc_shmat" >&5
1317+echo "$as_me:12089: result: $ac_cv_lib_ipc_shmat" >&5
1318 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
1319 if test $ac_cv_lib_ipc_shmat = yes; then
1320   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
1321@@ -12100,7 +12104,7 @@
1322   # These have to be linked with before -lX11, unlike the other
1323   # libraries we check for below, so use a different variable.
1324   # John Interrante, Karl Berry
1325-  echo "$as_me:12103: checking for IceConnectionNumber in -lICE" >&5
1326+  echo "$as_me:12107: checking for IceConnectionNumber in -lICE" >&5
1327 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
1328 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
1329   echo $ECHO_N "(cached) $ECHO_C" >&6
1330@@ -12108,7 +12112,7 @@
1331   ac_check_lib_save_LIBS=$LIBS
1332 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
1333 cat >conftest.$ac_ext <<_ACEOF
1334-#line 12111 "configure"
1335+#line 12115 "configure"
1336 #include "confdefs.h"
1337
1338 /* Override any gcc2 internal prototype to avoid an error.  */
1339@@ -12127,16 +12131,16 @@
1340 }
1341 _ACEOF
1342 rm -f conftest.$ac_objext conftest$ac_exeext
1343-if { (eval echo "$as_me:12130: \"$ac_link\"") >&5
1344+if { (eval echo "$as_me:12134: \"$ac_link\"") >&5
1345   (eval $ac_link) 2>&5
1346   ac_status=$?
1347-  echo "$as_me:12133: \$? = $ac_status" >&5
1348+  echo "$as_me:12137: \$? = $ac_status" >&5
1349   (exit $ac_status); } &&
1350          { ac_try='test -s conftest$ac_exeext'
1351-  { (eval echo "$as_me:12136: \"$ac_try\"") >&5
1352+  { (eval echo "$as_me:12140: \"$ac_try\"") >&5
1353   (eval $ac_try) 2>&5
1354   ac_status=$?
1355-  echo "$as_me:12139: \$? = $ac_status" >&5
1356+  echo "$as_me:12143: \$? = $ac_status" >&5
1357   (exit $ac_status); }; }; then
1358   ac_cv_lib_ICE_IceConnectionNumber=yes
1359 else
1360@@ -12147,7 +12151,7 @@
1361 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1362 LIBS=$ac_check_lib_save_LIBS
1363 fi
1364-echo "$as_me:12150: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
1365+echo "$as_me:12154: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
1366 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
1367 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
1368   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
1369@@ -12159,7 +12163,7 @@
1370
1371 cf_x_athena=${cf_x_athena:-Xaw}
1372
1373-echo "$as_me:12162: checking if you want to link with Xaw 3d library" >&5
1374+echo "$as_me:12166: checking if you want to link with Xaw 3d library" >&5
1375 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
1376 withval=
1377
1378@@ -12170,14 +12174,14 @@
1379 fi;
1380 if test "$withval" = yes ; then
1381 	cf_x_athena=Xaw3d
1382-	echo "$as_me:12173: result: yes" >&5
1383+	echo "$as_me:12177: result: yes" >&5
1384 echo "${ECHO_T}yes" >&6
1385 else
1386-	echo "$as_me:12176: result: no" >&5
1387+	echo "$as_me:12180: result: no" >&5
1388 echo "${ECHO_T}no" >&6
1389 fi
1390
1391-echo "$as_me:12180: checking if you want to link with Xaw 3d xft library" >&5
1392+echo "$as_me:12184: checking if you want to link with Xaw 3d xft library" >&5
1393 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
1394 withval=
1395
1396@@ -12188,14 +12192,14 @@
1397 fi;
1398 if test "$withval" = yes ; then
1399 	cf_x_athena=Xaw3dxft
1400-	echo "$as_me:12191: result: yes" >&5
1401+	echo "$as_me:12195: result: yes" >&5
1402 echo "${ECHO_T}yes" >&6
1403 else
1404-	echo "$as_me:12194: result: no" >&5
1405+	echo "$as_me:12198: result: no" >&5
1406 echo "${ECHO_T}no" >&6
1407 fi
1408
1409-echo "$as_me:12198: checking if you want to link with neXT Athena library" >&5
1410+echo "$as_me:12202: checking if you want to link with neXT Athena library" >&5
1411 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
1412 withval=
1413
1414@@ -12206,14 +12210,14 @@
1415 fi;
1416 if test "$withval" = yes ; then
1417 	cf_x_athena=neXtaw
1418-	echo "$as_me:12209: result: yes" >&5
1419+	echo "$as_me:12213: result: yes" >&5
1420 echo "${ECHO_T}yes" >&6
1421 else
1422-	echo "$as_me:12212: result: no" >&5
1423+	echo "$as_me:12216: result: no" >&5
1424 echo "${ECHO_T}no" >&6
1425 fi
1426
1427-echo "$as_me:12216: checking if you want to link with Athena-Plus library" >&5
1428+echo "$as_me:12220: checking if you want to link with Athena-Plus library" >&5
1429 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
1430 withval=
1431
1432@@ -12224,10 +12228,10 @@
1433 fi;
1434 if test "$withval" = yes ; then
1435 	cf_x_athena=XawPlus
1436-	echo "$as_me:12227: result: yes" >&5
1437+	echo "$as_me:12231: result: yes" >&5
1438 echo "${ECHO_T}yes" >&6
1439 else
1440-	echo "$as_me:12230: result: no" >&5
1441+	echo "$as_me:12234: result: no" >&5
1442 echo "${ECHO_T}no" >&6
1443 fi
1444
1445@@ -12247,17 +12251,17 @@
1446 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
1447 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
1448
1449-echo "${as_me:-configure}:12250: testing found package $cf_athena_pkg ..." 1>&5
1450+echo "${as_me:-configure}:12254: testing found package $cf_athena_pkg ..." 1>&5
1451
1452 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
1453 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   $cf_athena_pkg 2>/dev/null`"
1454 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
1455
1456-echo "${as_me:-configure}:12256: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1457+echo "${as_me:-configure}:12260: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1458
1459 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
1460
1461-echo "${as_me:-configure}:12260: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
1462+echo "${as_me:-configure}:12264: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
1463
1464 cf_fix_cppflags=no
1465 cf_new_cflags=
1466@@ -12388,20 +12392,20 @@
1467 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
1468 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
1469
1470-echo "${as_me:-configure}:12391: testing ..trimmed $LIBS ..." 1>&5
1471+echo "${as_me:-configure}:12395: testing ..trimmed $LIBS ..." 1>&5
1472
1473 			;;
1474 		esac
1475 	done
1476
1477-echo "$as_me:12397: checking for usable $cf_x_athena/Xmu package" >&5
1478+echo "$as_me:12401: checking for usable $cf_x_athena/Xmu package" >&5
1479 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
1480 if test "${cf_cv_xaw_compat+set}" = set; then
1481   echo $ECHO_N "(cached) $ECHO_C" >&6
1482 else
1483
1484 cat >conftest.$ac_ext <<_ACEOF
1485-#line 12404 "configure"
1486+#line 12408 "configure"
1487 #include "confdefs.h"
1488
1489 #include <X11/Xmu/CharSet.h>
1490@@ -12417,16 +12421,16 @@
1491 }
1492 _ACEOF
1493 rm -f conftest.$ac_objext conftest$ac_exeext
1494-if { (eval echo "$as_me:12420: \"$ac_link\"") >&5
1495+if { (eval echo "$as_me:12424: \"$ac_link\"") >&5
1496   (eval $ac_link) 2>&5
1497   ac_status=$?
1498-  echo "$as_me:12423: \$? = $ac_status" >&5
1499+  echo "$as_me:12427: \$? = $ac_status" >&5
1500   (exit $ac_status); } &&
1501          { ac_try='test -s conftest$ac_exeext'
1502-  { (eval echo "$as_me:12426: \"$ac_try\"") >&5
1503+  { (eval echo "$as_me:12430: \"$ac_try\"") >&5
1504   (eval $ac_try) 2>&5
1505   ac_status=$?
1506-  echo "$as_me:12429: \$? = $ac_status" >&5
1507+  echo "$as_me:12433: \$? = $ac_status" >&5
1508   (exit $ac_status); }; }; then
1509   cf_cv_xaw_compat=yes
1510 else
1511@@ -12436,7 +12440,7 @@
1512 fi
1513 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1514 fi
1515-echo "$as_me:12439: result: $cf_cv_xaw_compat" >&5
1516+echo "$as_me:12443: result: $cf_cv_xaw_compat" >&5
1517 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
1518
1519 			if test "$cf_cv_xaw_compat" = no
1520@@ -12448,7 +12452,7 @@
1521 				(*)
1522 					test -n "$verbose" && echo "	work around broken package" 1>&6
1523
1524-echo "${as_me:-configure}:12451: testing work around broken package ..." 1>&5
1525+echo "${as_me:-configure}:12455: testing work around broken package ..." 1>&5
1526
1527 					cf_save_xmu="$LIBS"
1528 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
1529@@ -12456,17 +12460,17 @@
1530 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
1531 	test -n "$verbose" && echo "	found package xmu" 1>&6
1532
1533-echo "${as_me:-configure}:12459: testing found package xmu ..." 1>&5
1534+echo "${as_me:-configure}:12463: testing found package xmu ..." 1>&5
1535
1536 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
1537 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xmu 2>/dev/null`"
1538 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
1539
1540-echo "${as_me:-configure}:12465: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1541+echo "${as_me:-configure}:12469: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1542
1543 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
1544
1545-echo "${as_me:-configure}:12469: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
1546+echo "${as_me:-configure}:12473: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
1547
1548 cf_fix_cppflags=no
1549 cf_new_cflags=
1550@@ -12586,12 +12590,12 @@
1551
1552 test -n "$verbose" && echo "	...before $LIBS" 1>&6
1553
1554-echo "${as_me:-configure}:12589: testing ...before $LIBS ..." 1>&5
1555+echo "${as_me:-configure}:12593: testing ...before $LIBS ..." 1>&5
1556
1557 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
1558 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
1559
1560-echo "${as_me:-configure}:12594: testing ...after  $LIBS ..." 1>&5
1561+echo "${as_me:-configure}:12598: testing ...after  $LIBS ..." 1>&5
1562
1563 else
1564 	cf_pkgconfig_incs=
1565@@ -12599,12 +12603,12 @@
1566
1567 test -n "$verbose" && echo "	...before $LIBS" 1>&6
1568
1569-echo "${as_me:-configure}:12602: testing ...before $LIBS ..." 1>&5
1570+echo "${as_me:-configure}:12606: testing ...before $LIBS ..." 1>&5
1571
1572 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
1573 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
1574
1575-echo "${as_me:-configure}:12607: testing ...after  $LIBS ..." 1>&5
1576+echo "${as_me:-configure}:12611: testing ...after  $LIBS ..." 1>&5
1577
1578 fi
1579
1580@@ -12615,7 +12619,7 @@
1581 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
1582 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
1583
1584-echo "${as_me:-configure}:12618: testing ..trimmed $LIBS ..." 1>&5
1585+echo "${as_me:-configure}:12622: testing ..trimmed $LIBS ..." 1>&5
1586
1587 			;;
1588 		esac
1589@@ -12640,17 +12644,17 @@
1590 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
1591 	test -n "$verbose" && echo "	found package Xext" 1>&6
1592
1593-echo "${as_me:-configure}:12643: testing found package Xext ..." 1>&5
1594+echo "${as_me:-configure}:12647: testing found package Xext ..." 1>&5
1595
1596 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
1597 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   Xext 2>/dev/null`"
1598 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
1599
1600-echo "${as_me:-configure}:12649: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1601+echo "${as_me:-configure}:12653: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1602
1603 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
1604
1605-echo "${as_me:-configure}:12653: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
1606+echo "${as_me:-configure}:12657: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
1607
1608 cf_fix_cppflags=no
1609 cf_new_cflags=
1610@@ -12771,7 +12775,7 @@
1611 	cf_pkgconfig_incs=
1612 	cf_pkgconfig_libs=
1613
1614-	echo "$as_me:12774: checking for XextCreateExtension in -lXext" >&5
1615+	echo "$as_me:12778: checking for XextCreateExtension in -lXext" >&5
1616 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
1617 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
1618   echo $ECHO_N "(cached) $ECHO_C" >&6
1619@@ -12779,7 +12783,7 @@
1620   ac_check_lib_save_LIBS=$LIBS
1621 LIBS="-lXext  $LIBS"
1622 cat >conftest.$ac_ext <<_ACEOF
1623-#line 12782 "configure"
1624+#line 12786 "configure"
1625 #include "confdefs.h"
1626
1627 /* Override any gcc2 internal prototype to avoid an error.  */
1628@@ -12798,16 +12802,16 @@
1629 }
1630 _ACEOF
1631 rm -f conftest.$ac_objext conftest$ac_exeext
1632-if { (eval echo "$as_me:12801: \"$ac_link\"") >&5
1633+if { (eval echo "$as_me:12805: \"$ac_link\"") >&5
1634   (eval $ac_link) 2>&5
1635   ac_status=$?
1636-  echo "$as_me:12804: \$? = $ac_status" >&5
1637+  echo "$as_me:12808: \$? = $ac_status" >&5
1638   (exit $ac_status); } &&
1639          { ac_try='test -s conftest$ac_exeext'
1640-  { (eval echo "$as_me:12807: \"$ac_try\"") >&5
1641+  { (eval echo "$as_me:12811: \"$ac_try\"") >&5
1642   (eval $ac_try) 2>&5
1643   ac_status=$?
1644-  echo "$as_me:12810: \$? = $ac_status" >&5
1645+  echo "$as_me:12814: \$? = $ac_status" >&5
1646   (exit $ac_status); }; }; then
1647   ac_cv_lib_Xext_XextCreateExtension=yes
1648 else
1649@@ -12818,7 +12822,7 @@
1650 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1651 LIBS=$ac_check_lib_save_LIBS
1652 fi
1653-echo "$as_me:12821: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
1654+echo "$as_me:12825: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
1655 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
1656 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
1657
1658@@ -12854,17 +12858,17 @@
1659 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
1660 	test -n "$verbose" && echo "	found package x11" 1>&6
1661
1662-echo "${as_me:-configure}:12857: testing found package x11 ..." 1>&5
1663+echo "${as_me:-configure}:12861: testing found package x11 ..." 1>&5
1664
1665 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
1666 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
1667 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
1668
1669-echo "${as_me:-configure}:12863: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1670+echo "${as_me:-configure}:12867: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1671
1672 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
1673
1674-echo "${as_me:-configure}:12867: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
1675+echo "${as_me:-configure}:12871: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
1676
1677 cf_fix_cppflags=no
1678 cf_new_cflags=
1679@@ -12984,24 +12988,24 @@
1680 else
1681 	cf_pkgconfig_incs=
1682 	cf_pkgconfig_libs=
1683-	{ echo "$as_me:12987: WARNING: unable to find X11 library" >&5
1684+	{ echo "$as_me:12991: WARNING: unable to find X11 library" >&5
1685 echo "$as_me: WARNING: unable to find X11 library" >&2;}
1686 fi
1687
1688 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
1689 	test -n "$verbose" && echo "	found package ice" 1>&6
1690
1691-echo "${as_me:-configure}:12994: testing found package ice ..." 1>&5
1692+echo "${as_me:-configure}:12998: testing found package ice ..." 1>&5
1693
1694 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
1695 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
1696 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
1697
1698-echo "${as_me:-configure}:13000: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1699+echo "${as_me:-configure}:13004: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1700
1701 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
1702
1703-echo "${as_me:-configure}:13004: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
1704+echo "${as_me:-configure}:13008: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
1705
1706 cf_fix_cppflags=no
1707 cf_new_cflags=
1708@@ -13121,24 +13125,24 @@
1709 else
1710 	cf_pkgconfig_incs=
1711 	cf_pkgconfig_libs=
1712-	{ echo "$as_me:13124: WARNING: unable to find ICE library" >&5
1713+	{ echo "$as_me:13128: WARNING: unable to find ICE library" >&5
1714 echo "$as_me: WARNING: unable to find ICE library" >&2;}
1715 fi
1716
1717 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
1718 	test -n "$verbose" && echo "	found package sm" 1>&6
1719
1720-echo "${as_me:-configure}:13131: testing found package sm ..." 1>&5
1721+echo "${as_me:-configure}:13135: testing found package sm ..." 1>&5
1722
1723 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
1724 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
1725 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
1726
1727-echo "${as_me:-configure}:13137: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1728+echo "${as_me:-configure}:13141: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1729
1730 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
1731
1732-echo "${as_me:-configure}:13141: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
1733+echo "${as_me:-configure}:13145: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
1734
1735 cf_fix_cppflags=no
1736 cf_new_cflags=
1737@@ -13258,24 +13262,24 @@
1738 else
1739 	cf_pkgconfig_incs=
1740 	cf_pkgconfig_libs=
1741-	{ echo "$as_me:13261: WARNING: unable to find SM library" >&5
1742+	{ echo "$as_me:13265: WARNING: unable to find SM library" >&5
1743 echo "$as_me: WARNING: unable to find SM library" >&2;}
1744 fi
1745
1746 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
1747 	test -n "$verbose" && echo "	found package xt" 1>&6
1748
1749-echo "${as_me:-configure}:13268: testing found package xt ..." 1>&5
1750+echo "${as_me:-configure}:13272: testing found package xt ..." 1>&5
1751
1752 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
1753 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
1754 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
1755
1756-echo "${as_me:-configure}:13274: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1757+echo "${as_me:-configure}:13278: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1758
1759 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
1760
1761-echo "${as_me:-configure}:13278: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
1762+echo "${as_me:-configure}:13282: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
1763
1764 cf_fix_cppflags=no
1765 cf_new_cflags=
1766@@ -13395,7 +13399,7 @@
1767 else
1768 	cf_pkgconfig_incs=
1769 	cf_pkgconfig_libs=
1770-	{ echo "$as_me:13398: WARNING: unable to find Xt library" >&5
1771+	{ echo "$as_me:13402: WARNING: unable to find Xt library" >&5
1772 echo "$as_me: WARNING: unable to find Xt library" >&2;}
1773 fi
1774
1775@@ -13406,17 +13410,17 @@
1776 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
1777 	test -n "$verbose" && echo "	found package xt" 1>&6
1778
1779-echo "${as_me:-configure}:13409: testing found package xt ..." 1>&5
1780+echo "${as_me:-configure}:13413: testing found package xt ..." 1>&5
1781
1782 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
1783 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
1784 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
1785
1786-echo "${as_me:-configure}:13415: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1787+echo "${as_me:-configure}:13419: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1788
1789 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
1790
1791-echo "${as_me:-configure}:13419: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
1792+echo "${as_me:-configure}:13423: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
1793
1794 cf_fix_cppflags=no
1795 cf_new_cflags=
1796@@ -13537,14 +13541,14 @@
1797 		;;
1798 	(*)
1799 # we have an "xt" package, but it may omit Xt's dependency on X11
1800-echo "$as_me:13540: checking for usable X dependency" >&5
1801+echo "$as_me:13544: checking for usable X dependency" >&5
1802 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
1803 if test "${cf_cv_xt_x11_compat+set}" = set; then
1804   echo $ECHO_N "(cached) $ECHO_C" >&6
1805 else
1806
1807 cat >conftest.$ac_ext <<_ACEOF
1808-#line 13547 "configure"
1809+#line 13551 "configure"
1810 #include "confdefs.h"
1811
1812 #include <X11/Xlib.h>
1813@@ -13563,16 +13567,16 @@
1814 }
1815 _ACEOF
1816 rm -f conftest.$ac_objext conftest$ac_exeext
1817-if { (eval echo "$as_me:13566: \"$ac_link\"") >&5
1818+if { (eval echo "$as_me:13570: \"$ac_link\"") >&5
1819   (eval $ac_link) 2>&5
1820   ac_status=$?
1821-  echo "$as_me:13569: \$? = $ac_status" >&5
1822+  echo "$as_me:13573: \$? = $ac_status" >&5
1823   (exit $ac_status); } &&
1824          { ac_try='test -s conftest$ac_exeext'
1825-  { (eval echo "$as_me:13572: \"$ac_try\"") >&5
1826+  { (eval echo "$as_me:13576: \"$ac_try\"") >&5
1827   (eval $ac_try) 2>&5
1828   ac_status=$?
1829-  echo "$as_me:13575: \$? = $ac_status" >&5
1830+  echo "$as_me:13579: \$? = $ac_status" >&5
1831   (exit $ac_status); }; }; then
1832   cf_cv_xt_x11_compat=yes
1833 else
1834@@ -13582,30 +13586,30 @@
1835 fi
1836 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1837 fi
1838-echo "$as_me:13585: result: $cf_cv_xt_x11_compat" >&5
1839+echo "$as_me:13589: result: $cf_cv_xt_x11_compat" >&5
1840 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
1841 		if test "$cf_cv_xt_x11_compat" = no
1842 		then
1843 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
1844
1845-echo "${as_me:-configure}:13591: testing work around broken X11 dependency ..." 1>&5
1846+echo "${as_me:-configure}:13595: testing work around broken X11 dependency ..." 1>&5
1847
1848 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
1849
1850 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
1851 	test -n "$verbose" && echo "	found package x11" 1>&6
1852
1853-echo "${as_me:-configure}:13598: testing found package x11 ..." 1>&5
1854+echo "${as_me:-configure}:13602: testing found package x11 ..." 1>&5
1855
1856 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
1857 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
1858 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
1859
1860-echo "${as_me:-configure}:13604: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1861+echo "${as_me:-configure}:13608: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1862
1863 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
1864
1865-echo "${as_me:-configure}:13608: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
1866+echo "${as_me:-configure}:13612: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
1867
1868 cf_fix_cppflags=no
1869 cf_new_cflags=
1870@@ -13728,12 +13732,12 @@
1871
1872 test -n "$verbose" && echo "	...before $LIBS" 1>&6
1873
1874-echo "${as_me:-configure}:13731: testing ...before $LIBS ..." 1>&5
1875+echo "${as_me:-configure}:13735: testing ...before $LIBS ..." 1>&5
1876
1877 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
1878 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
1879
1880-echo "${as_me:-configure}:13736: testing ...after  $LIBS ..." 1>&5
1881+echo "${as_me:-configure}:13740: testing ...after  $LIBS ..." 1>&5
1882
1883 fi
1884
1885@@ -13741,14 +13745,14 @@
1886 		;;
1887 	esac
1888
1889-echo "$as_me:13744: checking for usable X Toolkit package" >&5
1890+echo "$as_me:13748: checking for usable X Toolkit package" >&5
1891 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
1892 if test "${cf_cv_xt_ice_compat+set}" = set; then
1893   echo $ECHO_N "(cached) $ECHO_C" >&6
1894 else
1895
1896 cat >conftest.$ac_ext <<_ACEOF
1897-#line 13751 "configure"
1898+#line 13755 "configure"
1899 #include "confdefs.h"
1900
1901 #include <X11/Shell.h>
1902@@ -13763,16 +13767,16 @@
1903 }
1904 _ACEOF
1905 rm -f conftest.$ac_objext conftest$ac_exeext
1906-if { (eval echo "$as_me:13766: \"$ac_link\"") >&5
1907+if { (eval echo "$as_me:13770: \"$ac_link\"") >&5
1908   (eval $ac_link) 2>&5
1909   ac_status=$?
1910-  echo "$as_me:13769: \$? = $ac_status" >&5
1911+  echo "$as_me:13773: \$? = $ac_status" >&5
1912   (exit $ac_status); } &&
1913          { ac_try='test -s conftest$ac_exeext'
1914-  { (eval echo "$as_me:13772: \"$ac_try\"") >&5
1915+  { (eval echo "$as_me:13776: \"$ac_try\"") >&5
1916   (eval $ac_try) 2>&5
1917   ac_status=$?
1918-  echo "$as_me:13775: \$? = $ac_status" >&5
1919+  echo "$as_me:13779: \$? = $ac_status" >&5
1920   (exit $ac_status); }; }; then
1921   cf_cv_xt_ice_compat=yes
1922 else
1923@@ -13782,7 +13786,7 @@
1924 fi
1925 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1926 fi
1927-echo "$as_me:13785: result: $cf_cv_xt_ice_compat" >&5
1928+echo "$as_me:13789: result: $cf_cv_xt_ice_compat" >&5
1929 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
1930
1931 	if test "$cf_cv_xt_ice_compat" = no
1932@@ -13796,22 +13800,22 @@
1933 			(*)
1934 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
1935
1936-echo "${as_me:-configure}:13799: testing work around broken ICE dependency ..." 1>&5
1937+echo "${as_me:-configure}:13803: testing work around broken ICE dependency ..." 1>&5
1938
1939 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
1940 	test -n "$verbose" && echo "	found package ice" 1>&6
1941
1942-echo "${as_me:-configure}:13804: testing found package ice ..." 1>&5
1943+echo "${as_me:-configure}:13808: testing found package ice ..." 1>&5
1944
1945 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
1946 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
1947 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
1948
1949-echo "${as_me:-configure}:13810: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1950+echo "${as_me:-configure}:13814: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1951
1952 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
1953
1954-echo "${as_me:-configure}:13814: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
1955+echo "${as_me:-configure}:13818: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
1956
1957 cf_fix_cppflags=no
1958 cf_new_cflags=
1959@@ -13930,17 +13934,17 @@
1960 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
1961 	test -n "$verbose" && echo "	found package sm" 1>&6
1962
1963-echo "${as_me:-configure}:13933: testing found package sm ..." 1>&5
1964+echo "${as_me:-configure}:13937: testing found package sm ..." 1>&5
1965
1966 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
1967 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
1968 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
1969
1970-echo "${as_me:-configure}:13939: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1971+echo "${as_me:-configure}:13943: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
1972
1973 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
1974
1975-echo "${as_me:-configure}:13943: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
1976+echo "${as_me:-configure}:13947: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
1977
1978 cf_fix_cppflags=no
1979 cf_new_cflags=
1980@@ -14069,12 +14073,12 @@
1981
1982 test -n "$verbose" && echo "	...before $LIBS" 1>&6
1983
1984-echo "${as_me:-configure}:14072: testing ...before $LIBS ..." 1>&5
1985+echo "${as_me:-configure}:14076: testing ...before $LIBS ..." 1>&5
1986
1987 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
1988 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
1989
1990-echo "${as_me:-configure}:14077: testing ...after  $LIBS ..." 1>&5
1991+echo "${as_me:-configure}:14081: testing ...after  $LIBS ..." 1>&5
1992
1993 fi
1994
1995@@ -14094,7 +14098,7 @@
1996
1997 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
1998
1999-echo "${as_me:-configure}:14097: testing checking additions to CFLAGS ..." 1>&5
2000+echo "${as_me:-configure}:14101: testing checking additions to CFLAGS ..." 1>&5
2001
2002 cf_check_cflags="$CFLAGS"
2003 cf_check_cppflags="$CPPFLAGS"
2004@@ -14179,7 +14183,7 @@
2005 if test -n "$cf_new_cflags" ; then
2006 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
2007
2008-echo "${as_me:-configure}:14182: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
2009+echo "${as_me:-configure}:14186: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
2010
2011 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
2012 	CFLAGS="${CFLAGS}$cf_new_cflags"
2013@@ -14189,7 +14193,7 @@
2014 if test -n "$cf_new_cppflags" ; then
2015 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
2016
2017-echo "${as_me:-configure}:14192: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
2018+echo "${as_me:-configure}:14196: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
2019
2020 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
2021 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
2022@@ -14199,7 +14203,7 @@
2023 if test -n "$cf_new_extra_cppflags" ; then
2024 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
2025
2026-echo "${as_me:-configure}:14202: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
2027+echo "${as_me:-configure}:14206: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
2028
2029 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
2030 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
2031@@ -14208,7 +14212,7 @@
2032
2033 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
2034 cat >conftest.$ac_ext <<_ACEOF
2035-#line 14211 "configure"
2036+#line 14215 "configure"
2037 #include "confdefs.h"
2038 #include <stdio.h>
2039 int
2040@@ -14220,16 +14224,16 @@
2041 }
2042 _ACEOF
2043 rm -f conftest.$ac_objext conftest$ac_exeext
2044-if { (eval echo "$as_me:14223: \"$ac_link\"") >&5
2045+if { (eval echo "$as_me:14227: \"$ac_link\"") >&5
2046   (eval $ac_link) 2>&5
2047   ac_status=$?
2048-  echo "$as_me:14226: \$? = $ac_status" >&5
2049+  echo "$as_me:14230: \$? = $ac_status" >&5
2050   (exit $ac_status); } &&
2051          { ac_try='test -s conftest$ac_exeext'
2052-  { (eval echo "$as_me:14229: \"$ac_try\"") >&5
2053+  { (eval echo "$as_me:14233: \"$ac_try\"") >&5
2054   (eval $ac_try) 2>&5
2055   ac_status=$?
2056-  echo "$as_me:14232: \$? = $ac_status" >&5
2057+  echo "$as_me:14236: \$? = $ac_status" >&5
2058   (exit $ac_status); }; }; then
2059   :
2060 else
2061@@ -14237,12 +14241,12 @@
2062 cat conftest.$ac_ext >&5
2063 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
2064
2065-echo "${as_me:-configure}:14240: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
2066+echo "${as_me:-configure}:14244: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
2067
2068 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
2069 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
2070
2071-echo "${as_me:-configure}:14245: testing but keeping change to \$CPPFLAGS ..." 1>&5
2072+echo "${as_me:-configure}:14249: testing but keeping change to \$CPPFLAGS ..." 1>&5
2073
2074 	 fi
2075 	 CFLAGS="$cf_check_flags"
2076@@ -14250,13 +14254,13 @@
2077 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2078 fi
2079
2080-	echo "$as_me:14253: checking for XOpenDisplay" >&5
2081+	echo "$as_me:14257: checking for XOpenDisplay" >&5
2082 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
2083 if test "${ac_cv_func_XOpenDisplay+set}" = set; then
2084   echo $ECHO_N "(cached) $ECHO_C" >&6
2085 else
2086   cat >conftest.$ac_ext <<_ACEOF
2087-#line 14259 "configure"
2088+#line 14263 "configure"
2089 #include "confdefs.h"
2090 #define XOpenDisplay autoconf_temporary
2091 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
2092@@ -14287,16 +14291,16 @@
2093 }
2094 _ACEOF
2095 rm -f conftest.$ac_objext conftest$ac_exeext
2096-if { (eval echo "$as_me:14290: \"$ac_link\"") >&5
2097+if { (eval echo "$as_me:14294: \"$ac_link\"") >&5
2098   (eval $ac_link) 2>&5
2099   ac_status=$?
2100-  echo "$as_me:14293: \$? = $ac_status" >&5
2101+  echo "$as_me:14297: \$? = $ac_status" >&5
2102   (exit $ac_status); } &&
2103          { ac_try='test -s conftest$ac_exeext'
2104-  { (eval echo "$as_me:14296: \"$ac_try\"") >&5
2105+  { (eval echo "$as_me:14300: \"$ac_try\"") >&5
2106   (eval $ac_try) 2>&5
2107   ac_status=$?
2108-  echo "$as_me:14299: \$? = $ac_status" >&5
2109+  echo "$as_me:14303: \$? = $ac_status" >&5
2110   (exit $ac_status); }; }; then
2111   ac_cv_func_XOpenDisplay=yes
2112 else
2113@@ -14306,13 +14310,13 @@
2114 fi
2115 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2116 fi
2117-echo "$as_me:14309: result: $ac_cv_func_XOpenDisplay" >&5
2118+echo "$as_me:14313: result: $ac_cv_func_XOpenDisplay" >&5
2119 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
2120 if test $ac_cv_func_XOpenDisplay = yes; then
2121   :
2122 else
2123
2124-	echo "$as_me:14315: checking for XOpenDisplay in -lX11" >&5
2125+	echo "$as_me:14319: checking for XOpenDisplay in -lX11" >&5
2126 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
2127 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
2128   echo $ECHO_N "(cached) $ECHO_C" >&6
2129@@ -14320,7 +14324,7 @@
2130   ac_check_lib_save_LIBS=$LIBS
2131 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
2132 cat >conftest.$ac_ext <<_ACEOF
2133-#line 14323 "configure"
2134+#line 14327 "configure"
2135 #include "confdefs.h"
2136
2137 /* Override any gcc2 internal prototype to avoid an error.  */
2138@@ -14339,16 +14343,16 @@
2139 }
2140 _ACEOF
2141 rm -f conftest.$ac_objext conftest$ac_exeext
2142-if { (eval echo "$as_me:14342: \"$ac_link\"") >&5
2143+if { (eval echo "$as_me:14346: \"$ac_link\"") >&5
2144   (eval $ac_link) 2>&5
2145   ac_status=$?
2146-  echo "$as_me:14345: \$? = $ac_status" >&5
2147+  echo "$as_me:14349: \$? = $ac_status" >&5
2148   (exit $ac_status); } &&
2149          { ac_try='test -s conftest$ac_exeext'
2150-  { (eval echo "$as_me:14348: \"$ac_try\"") >&5
2151+  { (eval echo "$as_me:14352: \"$ac_try\"") >&5
2152   (eval $ac_try) 2>&5
2153   ac_status=$?
2154-  echo "$as_me:14351: \$? = $ac_status" >&5
2155+  echo "$as_me:14355: \$? = $ac_status" >&5
2156   (exit $ac_status); }; }; then
2157   ac_cv_lib_X11_XOpenDisplay=yes
2158 else
2159@@ -14359,7 +14363,7 @@
2160 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2161 LIBS=$ac_check_lib_save_LIBS
2162 fi
2163-echo "$as_me:14362: result: $ac_cv_lib_X11_XOpenDisplay" >&5
2164+echo "$as_me:14366: result: $ac_cv_lib_X11_XOpenDisplay" >&5
2165 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
2166 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
2167
2168@@ -14383,13 +14387,13 @@
2169
2170 fi
2171
2172-	echo "$as_me:14386: checking for XtAppInitialize" >&5
2173+	echo "$as_me:14390: checking for XtAppInitialize" >&5
2174 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
2175 if test "${ac_cv_func_XtAppInitialize+set}" = set; then
2176   echo $ECHO_N "(cached) $ECHO_C" >&6
2177 else
2178   cat >conftest.$ac_ext <<_ACEOF
2179-#line 14392 "configure"
2180+#line 14396 "configure"
2181 #include "confdefs.h"
2182 #define XtAppInitialize autoconf_temporary
2183 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
2184@@ -14420,16 +14424,16 @@
2185 }
2186 _ACEOF
2187 rm -f conftest.$ac_objext conftest$ac_exeext
2188-if { (eval echo "$as_me:14423: \"$ac_link\"") >&5
2189+if { (eval echo "$as_me:14427: \"$ac_link\"") >&5
2190   (eval $ac_link) 2>&5
2191   ac_status=$?
2192-  echo "$as_me:14426: \$? = $ac_status" >&5
2193+  echo "$as_me:14430: \$? = $ac_status" >&5
2194   (exit $ac_status); } &&
2195          { ac_try='test -s conftest$ac_exeext'
2196-  { (eval echo "$as_me:14429: \"$ac_try\"") >&5
2197+  { (eval echo "$as_me:14433: \"$ac_try\"") >&5
2198   (eval $ac_try) 2>&5
2199   ac_status=$?
2200-  echo "$as_me:14432: \$? = $ac_status" >&5
2201+  echo "$as_me:14436: \$? = $ac_status" >&5
2202   (exit $ac_status); }; }; then
2203   ac_cv_func_XtAppInitialize=yes
2204 else
2205@@ -14439,13 +14443,13 @@
2206 fi
2207 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2208 fi
2209-echo "$as_me:14442: result: $ac_cv_func_XtAppInitialize" >&5
2210+echo "$as_me:14446: result: $ac_cv_func_XtAppInitialize" >&5
2211 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
2212 if test $ac_cv_func_XtAppInitialize = yes; then
2213   :
2214 else
2215
2216-	echo "$as_me:14448: checking for XtAppInitialize in -lXt" >&5
2217+	echo "$as_me:14452: checking for XtAppInitialize in -lXt" >&5
2218 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
2219 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
2220   echo $ECHO_N "(cached) $ECHO_C" >&6
2221@@ -14453,7 +14457,7 @@
2222   ac_check_lib_save_LIBS=$LIBS
2223 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
2224 cat >conftest.$ac_ext <<_ACEOF
2225-#line 14456 "configure"
2226+#line 14460 "configure"
2227 #include "confdefs.h"
2228
2229 /* Override any gcc2 internal prototype to avoid an error.  */
2230@@ -14472,16 +14476,16 @@
2231 }
2232 _ACEOF
2233 rm -f conftest.$ac_objext conftest$ac_exeext
2234-if { (eval echo "$as_me:14475: \"$ac_link\"") >&5
2235+if { (eval echo "$as_me:14479: \"$ac_link\"") >&5
2236   (eval $ac_link) 2>&5
2237   ac_status=$?
2238-  echo "$as_me:14478: \$? = $ac_status" >&5
2239+  echo "$as_me:14482: \$? = $ac_status" >&5
2240   (exit $ac_status); } &&
2241          { ac_try='test -s conftest$ac_exeext'
2242-  { (eval echo "$as_me:14481: \"$ac_try\"") >&5
2243+  { (eval echo "$as_me:14485: \"$ac_try\"") >&5
2244   (eval $ac_try) 2>&5
2245   ac_status=$?
2246-  echo "$as_me:14484: \$? = $ac_status" >&5
2247+  echo "$as_me:14488: \$? = $ac_status" >&5
2248   (exit $ac_status); }; }; then
2249   ac_cv_lib_Xt_XtAppInitialize=yes
2250 else
2251@@ -14492,7 +14496,7 @@
2252 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2253 LIBS=$ac_check_lib_save_LIBS
2254 fi
2255-echo "$as_me:14495: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
2256+echo "$as_me:14499: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
2257 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
2258 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
2259
2260@@ -14509,7 +14513,7 @@
2261 fi
2262
2263 if test $cf_have_X_LIBS = no ; then
2264-	{ echo "$as_me:14512: WARNING: Unable to successfully link X Toolkit library (-lXt) with
2265+	{ echo "$as_me:14516: WARNING: Unable to successfully link X Toolkit library (-lXt) with
2266 test program.  You will have to check and add the proper libraries by hand
2267 to makefile." >&5
2268 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
2269@@ -14535,14 +14539,14 @@
2270 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
2271 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
2272
2273-			echo "$as_me:14538: checking for $cf_test in $cf_path" >&5
2274+			echo "$as_me:14542: checking for $cf_test in $cf_path" >&5
2275 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
2276 		else
2277-			echo "$as_me:14541: checking for $cf_test" >&5
2278+			echo "$as_me:14545: checking for $cf_test" >&5
2279 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
2280 		fi
2281 		cat >conftest.$ac_ext <<_ACEOF
2282-#line 14545 "configure"
2283+#line 14549 "configure"
2284 #include "confdefs.h"
2285
2286 #include <X11/Intrinsic.h>
2287@@ -14556,16 +14560,16 @@
2288 }
2289 _ACEOF
2290 rm -f conftest.$ac_objext
2291-if { (eval echo "$as_me:14559: \"$ac_compile\"") >&5
2292+if { (eval echo "$as_me:14563: \"$ac_compile\"") >&5
2293   (eval $ac_compile) 2>&5
2294   ac_status=$?
2295-  echo "$as_me:14562: \$? = $ac_status" >&5
2296+  echo "$as_me:14566: \$? = $ac_status" >&5
2297   (exit $ac_status); } &&
2298          { ac_try='test -s conftest.$ac_objext'
2299-  { (eval echo "$as_me:14565: \"$ac_try\"") >&5
2300+  { (eval echo "$as_me:14569: \"$ac_try\"") >&5
2301   (eval $ac_try) 2>&5
2302   ac_status=$?
2303-  echo "$as_me:14568: \$? = $ac_status" >&5
2304+  echo "$as_me:14572: \$? = $ac_status" >&5
2305   (exit $ac_status); }; }; then
2306   cf_result=yes
2307 else
2308@@ -14574,7 +14578,7 @@
2309 cf_result=no
2310 fi
2311 rm -f conftest.$ac_objext conftest.$ac_ext
2312-		echo "$as_me:14577: result: $cf_result" >&5
2313+		echo "$as_me:14581: result: $cf_result" >&5
2314 echo "${ECHO_T}$cf_result" >&6
2315 		if test "$cf_result" = yes ; then
2316 			cf_x_athena_inc=$cf_path
2317@@ -14586,7 +14590,7 @@
2318 done
2319
2320 if test -z "$cf_x_athena_inc" ; then
2321-	{ echo "$as_me:14589: WARNING: Unable to successfully find Athena header files with test program" >&5
2322+	{ echo "$as_me:14593: WARNING: Unable to successfully find Athena header files with test program" >&5
2323 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
2324 elif test "$cf_x_athena_inc" != default ; then
2325
2326@@ -14635,7 +14639,7 @@
2327 done
2328 LIBS="$cf_add_libs"
2329
2330-				echo "$as_me:14638: checking for $cf_libs in $cf_path" >&5
2331+				echo "$as_me:14642: checking for $cf_libs in $cf_path" >&5
2332 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
2333 			else
2334
2335@@ -14655,11 +14659,11 @@
2336 done
2337 LIBS="$cf_add_libs"
2338
2339-				echo "$as_me:14658: checking for $cf_test in $cf_libs" >&5
2340+				echo "$as_me:14662: checking for $cf_test in $cf_libs" >&5
2341 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
2342 			fi
2343 			cat >conftest.$ac_ext <<_ACEOF
2344-#line 14662 "configure"
2345+#line 14666 "configure"
2346 #include "confdefs.h"
2347
2348 #include <X11/Intrinsic.h>
2349@@ -14675,16 +14679,16 @@
2350 }
2351 _ACEOF
2352 rm -f conftest.$ac_objext conftest$ac_exeext
2353-if { (eval echo "$as_me:14678: \"$ac_link\"") >&5
2354+if { (eval echo "$as_me:14682: \"$ac_link\"") >&5
2355   (eval $ac_link) 2>&5
2356   ac_status=$?
2357-  echo "$as_me:14681: \$? = $ac_status" >&5
2358+  echo "$as_me:14685: \$? = $ac_status" >&5
2359   (exit $ac_status); } &&
2360          { ac_try='test -s conftest$ac_exeext'
2361-  { (eval echo "$as_me:14684: \"$ac_try\"") >&5
2362+  { (eval echo "$as_me:14688: \"$ac_try\"") >&5
2363   (eval $ac_try) 2>&5
2364   ac_status=$?
2365-  echo "$as_me:14687: \$? = $ac_status" >&5
2366+  echo "$as_me:14691: \$? = $ac_status" >&5
2367   (exit $ac_status); }; }; then
2368   cf_result=yes
2369 else
2370@@ -14693,7 +14697,7 @@
2371 cf_result=no
2372 fi
2373 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2374-			echo "$as_me:14696: result: $cf_result" >&5
2375+			echo "$as_me:14700: result: $cf_result" >&5
2376 echo "${ECHO_T}$cf_result" >&6
2377 			if test "$cf_result" = yes ; then
2378 				cf_x_athena_lib="$cf_libs"
2379@@ -14707,7 +14711,7 @@
2380 done
2381
2382 if test -z "$cf_x_athena_lib" ; then
2383-	{ { echo "$as_me:14710: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
2384+	{ { echo "$as_me:14714: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
2385 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
2386    { (exit 1); exit 1; }; }
2387 fi
2388@@ -14725,7 +14729,7 @@
2389   do
2390     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2391 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
2392-echo "$as_me:14728: checking for $ac_word" >&5
2393+echo "$as_me:14732: checking for $ac_word" >&5
2394 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2395 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
2396   echo $ECHO_N "(cached) $ECHO_C" >&6
2397@@ -14740,7 +14744,7 @@
2398   test -z "$ac_dir" && ac_dir=.
2399   $as_executable_p "$ac_dir/$ac_word" || continue
2400 ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
2401-echo "$as_me:14743: found $ac_dir/$ac_word" >&5
2402+echo "$as_me:14747: found $ac_dir/$ac_word" >&5
2403 break
2404 done
2405
2406@@ -14748,10 +14752,10 @@
2407 fi
2408 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
2409 if test -n "$XCURSES_CONFIG"; then
2410-  echo "$as_me:14751: result: $XCURSES_CONFIG" >&5
2411+  echo "$as_me:14755: result: $XCURSES_CONFIG" >&5
2412 echo "${ECHO_T}$XCURSES_CONFIG" >&6
2413 else
2414-  echo "$as_me:14754: result: no" >&5
2415+  echo "$as_me:14758: result: no" >&5
2416 echo "${ECHO_T}no" >&6
2417 fi
2418
2419@@ -14764,7 +14768,7 @@
2420 do
2421   # Extract the first word of "$ac_prog", so it can be a program name with args.
2422 set dummy $ac_prog; ac_word=$2
2423-echo "$as_me:14767: checking for $ac_word" >&5
2424+echo "$as_me:14771: checking for $ac_word" >&5
2425 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2426 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
2427   echo $ECHO_N "(cached) $ECHO_C" >&6
2428@@ -14779,7 +14783,7 @@
2429   test -z "$ac_dir" && ac_dir=.
2430   $as_executable_p "$ac_dir/$ac_word" || continue
2431 ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
2432-echo "$as_me:14782: found $ac_dir/$ac_word" >&5
2433+echo "$as_me:14786: found $ac_dir/$ac_word" >&5
2434 break
2435 done
2436
2437@@ -14787,10 +14791,10 @@
2438 fi
2439 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
2440 if test -n "$ac_ct_XCURSES_CONFIG"; then
2441-  echo "$as_me:14790: result: $ac_ct_XCURSES_CONFIG" >&5
2442+  echo "$as_me:14794: result: $ac_ct_XCURSES_CONFIG" >&5
2443 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
2444 else
2445-  echo "$as_me:14793: result: no" >&5
2446+  echo "$as_me:14797: result: no" >&5
2447 echo "${ECHO_T}no" >&6
2448 fi
2449
2450@@ -14925,7 +14929,7 @@
2451
2452 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
2453
2454-echo "${as_me:-configure}:14928: testing checking additions to CFLAGS ..." 1>&5
2455+echo "${as_me:-configure}:14932: testing checking additions to CFLAGS ..." 1>&5
2456
2457 cf_check_cflags="$CFLAGS"
2458 cf_check_cppflags="$CPPFLAGS"
2459@@ -15010,7 +15014,7 @@
2460 if test -n "$cf_new_cflags" ; then
2461 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
2462
2463-echo "${as_me:-configure}:15013: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
2464+echo "${as_me:-configure}:15017: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
2465
2466 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
2467 	CFLAGS="${CFLAGS}$cf_new_cflags"
2468@@ -15020,7 +15024,7 @@
2469 if test -n "$cf_new_cppflags" ; then
2470 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
2471
2472-echo "${as_me:-configure}:15023: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
2473+echo "${as_me:-configure}:15027: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
2474
2475 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
2476 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
2477@@ -15030,7 +15034,7 @@
2478 if test -n "$cf_new_extra_cppflags" ; then
2479 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
2480
2481-echo "${as_me:-configure}:15033: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
2482+echo "${as_me:-configure}:15037: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
2483
2484 	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
2485 	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
2486@@ -15039,7 +15043,7 @@
2487
2488 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
2489 cat >conftest.$ac_ext <<_ACEOF
2490-#line 15042 "configure"
2491+#line 15046 "configure"
2492 #include "confdefs.h"
2493 #include <stdio.h>
2494 int
2495@@ -15051,16 +15055,16 @@
2496 }
2497 _ACEOF
2498 rm -f conftest.$ac_objext conftest$ac_exeext
2499-if { (eval echo "$as_me:15054: \"$ac_link\"") >&5
2500+if { (eval echo "$as_me:15058: \"$ac_link\"") >&5
2501   (eval $ac_link) 2>&5
2502   ac_status=$?
2503-  echo "$as_me:15057: \$? = $ac_status" >&5
2504+  echo "$as_me:15061: \$? = $ac_status" >&5
2505   (exit $ac_status); } &&
2506          { ac_try='test -s conftest$ac_exeext'
2507-  { (eval echo "$as_me:15060: \"$ac_try\"") >&5
2508+  { (eval echo "$as_me:15064: \"$ac_try\"") >&5
2509   (eval $ac_try) 2>&5
2510   ac_status=$?
2511-  echo "$as_me:15063: \$? = $ac_status" >&5
2512+  echo "$as_me:15067: \$? = $ac_status" >&5
2513   (exit $ac_status); }; }; then
2514   :
2515 else
2516@@ -15068,12 +15072,12 @@
2517 cat conftest.$ac_ext >&5
2518 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
2519
2520-echo "${as_me:-configure}:15071: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
2521+echo "${as_me:-configure}:15075: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
2522
2523 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
2524 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
2525
2526-echo "${as_me:-configure}:15076: testing but keeping change to \$CPPFLAGS ..." 1>&5
2527+echo "${as_me:-configure}:15080: testing but keeping change to \$CPPFLAGS ..." 1>&5
2528
2529 	 fi
2530 	 CFLAGS="$cf_check_flags"
2531@@ -15081,7 +15085,7 @@
2532 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2533 fi
2534
2535-echo "$as_me:15084: checking for XOpenDisplay in -lX11" >&5
2536+echo "$as_me:15088: checking for XOpenDisplay in -lX11" >&5
2537 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
2538 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
2539   echo $ECHO_N "(cached) $ECHO_C" >&6
2540@@ -15089,7 +15093,7 @@
2541   ac_check_lib_save_LIBS=$LIBS
2542 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
2543 cat >conftest.$ac_ext <<_ACEOF
2544-#line 15092 "configure"
2545+#line 15096 "configure"
2546 #include "confdefs.h"
2547
2548 /* Override any gcc2 internal prototype to avoid an error.  */
2549@@ -15108,16 +15112,16 @@
2550 }
2551 _ACEOF
2552 rm -f conftest.$ac_objext conftest$ac_exeext
2553-if { (eval echo "$as_me:15111: \"$ac_link\"") >&5
2554+if { (eval echo "$as_me:15115: \"$ac_link\"") >&5
2555   (eval $ac_link) 2>&5
2556   ac_status=$?
2557-  echo "$as_me:15114: \$? = $ac_status" >&5
2558+  echo "$as_me:15118: \$? = $ac_status" >&5
2559   (exit $ac_status); } &&
2560          { ac_try='test -s conftest$ac_exeext'
2561-  { (eval echo "$as_me:15117: \"$ac_try\"") >&5
2562+  { (eval echo "$as_me:15121: \"$ac_try\"") >&5
2563   (eval $ac_try) 2>&5
2564   ac_status=$?
2565-  echo "$as_me:15120: \$? = $ac_status" >&5
2566+  echo "$as_me:15124: \$? = $ac_status" >&5
2567   (exit $ac_status); }; }; then
2568   ac_cv_lib_X11_XOpenDisplay=yes
2569 else
2570@@ -15128,7 +15132,7 @@
2571 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2572 LIBS=$ac_check_lib_save_LIBS
2573 fi
2574-echo "$as_me:15131: result: $ac_cv_lib_X11_XOpenDisplay" >&5
2575+echo "$as_me:15135: result: $ac_cv_lib_X11_XOpenDisplay" >&5
2576 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
2577 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
2578
2579@@ -15150,7 +15154,7 @@
2580
2581 fi
2582
2583-echo "$as_me:15153: checking for XCurses library" >&5
2584+echo "$as_me:15157: checking for XCurses library" >&5
2585 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
2586 if test "${cf_cv_lib_XCurses+set}" = set; then
2587   echo $ECHO_N "(cached) $ECHO_C" >&6
2588@@ -15173,7 +15177,7 @@
2589 LIBS="$cf_add_libs"
2590
2591 cat >conftest.$ac_ext <<_ACEOF
2592-#line 15176 "configure"
2593+#line 15180 "configure"
2594 #include "confdefs.h"
2595
2596 #include <xcurses.h>
2597@@ -15188,16 +15192,16 @@
2598 }
2599 _ACEOF
2600 rm -f conftest.$ac_objext conftest$ac_exeext
2601-if { (eval echo "$as_me:15191: \"$ac_link\"") >&5
2602+if { (eval echo "$as_me:15195: \"$ac_link\"") >&5
2603   (eval $ac_link) 2>&5
2604   ac_status=$?
2605-  echo "$as_me:15194: \$? = $ac_status" >&5
2606+  echo "$as_me:15198: \$? = $ac_status" >&5
2607   (exit $ac_status); } &&
2608          { ac_try='test -s conftest$ac_exeext'
2609-  { (eval echo "$as_me:15197: \"$ac_try\"") >&5
2610+  { (eval echo "$as_me:15201: \"$ac_try\"") >&5
2611   (eval $ac_try) 2>&5
2612   ac_status=$?
2613-  echo "$as_me:15200: \$? = $ac_status" >&5
2614+  echo "$as_me:15204: \$? = $ac_status" >&5
2615   (exit $ac_status); }; }; then
2616   cf_cv_lib_XCurses=yes
2617 else
2618@@ -15208,7 +15212,7 @@
2619 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2620
2621 fi
2622-echo "$as_me:15211: result: $cf_cv_lib_XCurses" >&5
2623+echo "$as_me:15215: result: $cf_cv_lib_XCurses" >&5
2624 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
2625
2626 fi
2627@@ -15223,23 +15227,23 @@
2628 #define XCURSES 1
2629 EOF
2630
2631-	echo "$as_me:15226: checking for xcurses.h" >&5
2632+	echo "$as_me:15230: checking for xcurses.h" >&5
2633 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
2634 if test "${ac_cv_header_xcurses_h+set}" = set; then
2635   echo $ECHO_N "(cached) $ECHO_C" >&6
2636 else
2637   cat >conftest.$ac_ext <<_ACEOF
2638-#line 15232 "configure"
2639+#line 15236 "configure"
2640 #include "confdefs.h"
2641 #include <xcurses.h>
2642 _ACEOF
2643-if { (eval echo "$as_me:15236: \"$ac_cpp conftest.$ac_ext\"") >&5
2644+if { (eval echo "$as_me:15240: \"$ac_cpp conftest.$ac_ext\"") >&5
2645   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
2646   ac_status=$?
2647   egrep -v '^ *\+' conftest.er1 >conftest.err
2648   rm -f conftest.er1
2649   cat conftest.err >&5
2650-  echo "$as_me:15242: \$? = $ac_status" >&5
2651+  echo "$as_me:15246: \$? = $ac_status" >&5
2652   (exit $ac_status); } >/dev/null; then
2653   if test -s conftest.err; then
2654     ac_cpp_err=$ac_c_preproc_warn_flag
2655@@ -15258,7 +15262,7 @@
2656 fi
2657 rm -f conftest.err conftest.$ac_ext
2658 fi
2659-echo "$as_me:15261: result: $ac_cv_header_xcurses_h" >&5
2660+echo "$as_me:15265: result: $ac_cv_header_xcurses_h" >&5
2661 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
2662 if test $ac_cv_header_xcurses_h = yes; then
2663
2664@@ -15269,14 +15273,14 @@
2665 fi
2666
2667 else
2668-	{ { echo "$as_me:15272: error: Cannot link with XCurses" >&5
2669+	{ { echo "$as_me:15276: error: Cannot link with XCurses" >&5
2670 echo "$as_me: error: Cannot link with XCurses" >&2;}
2671    { (exit 1); exit 1; }; }
2672 fi
2673
2674 	;;
2675 (*)
2676-	{ { echo "$as_me:15279: error: unexpected screen-value: $cf_cv_screen" >&5
2677+	{ { echo "$as_me:15283: error: unexpected screen-value: $cf_cv_screen" >&5
2678 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;}
2679    { (exit 1); exit 1; }; }
2680 	;;
2681@@ -15284,7 +15288,7 @@
2682
2683 : ${cf_nculib_root:=$cf_cv_screen}
2684 as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh`
2685-echo "$as_me:15287: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
2686+echo "$as_me:15291: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5
2687 echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6
2688 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
2689   echo $ECHO_N "(cached) $ECHO_C" >&6
2690@@ -15292,7 +15296,7 @@
2691   ac_check_lib_save_LIBS=$LIBS
2692 LIBS="-l$cf_nculib_root  $LIBS"
2693 cat >conftest.$ac_ext <<_ACEOF
2694-#line 15295 "configure"
2695+#line 15299 "configure"
2696 #include "confdefs.h"
2697
2698 /* Override any gcc2 internal prototype to avoid an error.  */
2699@@ -15311,16 +15315,16 @@
2700 }
2701 _ACEOF
2702 rm -f conftest.$ac_objext conftest$ac_exeext
2703-if { (eval echo "$as_me:15314: \"$ac_link\"") >&5
2704+if { (eval echo "$as_me:15318: \"$ac_link\"") >&5
2705   (eval $ac_link) 2>&5
2706   ac_status=$?
2707-  echo "$as_me:15317: \$? = $ac_status" >&5
2708+  echo "$as_me:15321: \$? = $ac_status" >&5
2709   (exit $ac_status); } &&
2710          { ac_try='test -s conftest$ac_exeext'
2711-  { (eval echo "$as_me:15320: \"$ac_try\"") >&5
2712+  { (eval echo "$as_me:15324: \"$ac_try\"") >&5
2713   (eval $ac_try) 2>&5
2714   ac_status=$?
2715-  echo "$as_me:15323: \$? = $ac_status" >&5
2716+  echo "$as_me:15327: \$? = $ac_status" >&5
2717   (exit $ac_status); }; }; then
2718   eval "$as_ac_Lib=yes"
2719 else
2720@@ -15331,7 +15335,7 @@
2721 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2722 LIBS=$ac_check_lib_save_LIBS
2723 fi
2724-echo "$as_me:15334: result: `eval echo '${'$as_ac_Lib'}'`" >&5
2725+echo "$as_me:15338: result: `eval echo '${'$as_ac_Lib'}'`" >&5
2726 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
2727 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
2728   cf_cv_ncurses_pthreads=yes
2729@@ -15366,7 +15370,7 @@
2730 	;;
2731 esac
2732
2733-echo "$as_me:15369: checking for X11 rgb file" >&5
2734+echo "$as_me:15373: checking for X11 rgb file" >&5
2735 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6
2736
2737 # Check whether --with-x11-rgb or --without-x11-rgb was given.
2738@@ -15430,7 +15434,7 @@
2739 	cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%`
2740 	;;
2741 (*)
2742-	{ { echo "$as_me:15433: error: expected a pathname, not \"$cf_path\"" >&5
2743+	{ { echo "$as_me:15437: error: expected a pathname, not \"$cf_path\"" >&5
2744 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;}
2745    { (exit 1); exit 1; }; }
2746 	;;
2747@@ -15438,7 +15442,7 @@
2748
2749 fi
2750
2751-echo "$as_me:15441: result: $RGB_PATH" >&5
2752+echo "$as_me:15445: result: $RGB_PATH" >&5
2753 echo "${ECHO_T}$RGB_PATH" >&6
2754
2755 cat >>confdefs.h <<EOF
2756@@ -15479,7 +15483,7 @@
2757 	;;
2758 esac
2759
2760-echo "$as_me:15482: checking if you want to check for panel functions" >&5
2761+echo "$as_me:15486: checking if you want to check for panel functions" >&5
2762 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6
2763
2764 # Check whether --enable-panel or --disable-panel was given.
2765@@ -15496,7 +15500,7 @@
2766 	cf_enable_panel=$cf_default_panel
2767
2768 fi;
2769-echo "$as_me:15499: result: $cf_enable_panel" >&5
2770+echo "$as_me:15503: result: $cf_enable_panel" >&5
2771 echo "${ECHO_T}$cf_enable_panel" >&6
2772 if test $cf_enable_panel = yes
2773 then
2774@@ -15507,13 +15511,13 @@
2775 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
2776 	:
2777 elif test "x${PKG_CONFIG:=none}" != xnone; then
2778-	echo "$as_me:15510: checking pkg-config for panel$cf_cv_libtype" >&5
2779+	echo "$as_me:15514: checking pkg-config for panel$cf_cv_libtype" >&5
2780 echo $ECHO_N "checking pkg-config for panel$cf_cv_libtype... $ECHO_C" >&6
2781 	if "$PKG_CONFIG" --exists panel$cf_cv_libtype ; then
2782-		echo "$as_me:15513: result: yes" >&5
2783+		echo "$as_me:15517: result: yes" >&5
2784 echo "${ECHO_T}yes" >&6
2785
2786-		echo "$as_me:15516: checking if the panel$cf_cv_libtype package files work" >&5
2787+		echo "$as_me:15520: checking if the panel$cf_cv_libtype package files work" >&5
2788 echo $ECHO_N "checking if the panel$cf_cv_libtype package files work... $ECHO_C" >&6
2789
2790 		cf_save_CPPFLAGS="$CPPFLAGS"
2791@@ -15634,7 +15638,7 @@
2792 LIBS="$cf_add_libs"
2793
2794 		cat >conftest.$ac_ext <<_ACEOF
2795-#line 15637 "configure"
2796+#line 15641 "configure"
2797 #include "confdefs.h"
2798 #include <panel.h>
2799 int
2800@@ -15646,37 +15650,37 @@
2801 }
2802 _ACEOF
2803 rm -f conftest.$ac_objext conftest$ac_exeext
2804-if { (eval echo "$as_me:15649: \"$ac_link\"") >&5
2805+if { (eval echo "$as_me:15653: \"$ac_link\"") >&5
2806   (eval $ac_link) 2>&5
2807   ac_status=$?
2808-  echo "$as_me:15652: \$? = $ac_status" >&5
2809+  echo "$as_me:15656: \$? = $ac_status" >&5
2810   (exit $ac_status); } &&
2811          { ac_try='test -s conftest$ac_exeext'
2812-  { (eval echo "$as_me:15655: \"$ac_try\"") >&5
2813+  { (eval echo "$as_me:15659: \"$ac_try\"") >&5
2814   (eval $ac_try) 2>&5
2815   ac_status=$?
2816-  echo "$as_me:15658: \$? = $ac_status" >&5
2817+  echo "$as_me:15662: \$? = $ac_status" >&5
2818   (exit $ac_status); }; }; then
2819   if test "$cross_compiling" = yes; then
2820   cf_have_curses_lib=maybe
2821 else
2822   cat >conftest.$ac_ext <<_ACEOF
2823-#line 15664 "configure"
2824+#line 15668 "configure"
2825 #include "confdefs.h"
2826 #include <panel.h>
2827 				int main(void)
2828 				{ (void) new_panel ( 0 ); return 0; }
2829 _ACEOF
2830 rm -f conftest$ac_exeext
2831-if { (eval echo "$as_me:15671: \"$ac_link\"") >&5
2832+if { (eval echo "$as_me:15675: \"$ac_link\"") >&5
2833   (eval $ac_link) 2>&5
2834   ac_status=$?
2835-  echo "$as_me:15674: \$? = $ac_status" >&5
2836+  echo "$as_me:15678: \$? = $ac_status" >&5
2837   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
2838-  { (eval echo "$as_me:15676: \"$ac_try\"") >&5
2839+  { (eval echo "$as_me:15680: \"$ac_try\"") >&5
2840   (eval $ac_try) 2>&5
2841   ac_status=$?
2842-  echo "$as_me:15679: \$? = $ac_status" >&5
2843+  echo "$as_me:15683: \$? = $ac_status" >&5
2844   (exit $ac_status); }; }; then
2845   cf_have_curses_lib=yes
2846 else
2847@@ -15693,7 +15697,7 @@
2848 cf_have_curses_lib=no
2849 fi
2850 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2851-		echo "$as_me:15696: result: $cf_have_curses_lib" >&5
2852+		echo "$as_me:15700: result: $cf_have_curses_lib" >&5
2853 echo "${ECHO_T}$cf_have_curses_lib" >&6
2854 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
2855 		if test "$cf_have_curses_lib" != "yes"
2856@@ -15713,7 +15717,7 @@
2857 fi
2858 if test "$cf_have_curses_lib" = no; then
2859 	as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh`
2860-echo "$as_me:15716: checking for new_panel in -lpanel$cf_cv_libtype" >&5
2861+echo "$as_me:15720: checking for new_panel in -lpanel$cf_cv_libtype" >&5
2862 echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6
2863 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
2864   echo $ECHO_N "(cached) $ECHO_C" >&6
2865@@ -15721,7 +15725,7 @@
2866   ac_check_lib_save_LIBS=$LIBS
2867 LIBS="-lpanel$cf_cv_libtype  $LIBS"
2868 cat >conftest.$ac_ext <<_ACEOF
2869-#line 15724 "configure"
2870+#line 15728 "configure"
2871 #include "confdefs.h"
2872
2873 /* Override any gcc2 internal prototype to avoid an error.  */
2874@@ -15740,16 +15744,16 @@
2875 }
2876 _ACEOF
2877 rm -f conftest.$ac_objext conftest$ac_exeext
2878-if { (eval echo "$as_me:15743: \"$ac_link\"") >&5
2879+if { (eval echo "$as_me:15747: \"$ac_link\"") >&5
2880   (eval $ac_link) 2>&5
2881   ac_status=$?
2882-  echo "$as_me:15746: \$? = $ac_status" >&5
2883+  echo "$as_me:15750: \$? = $ac_status" >&5
2884   (exit $ac_status); } &&
2885          { ac_try='test -s conftest$ac_exeext'
2886-  { (eval echo "$as_me:15749: \"$ac_try\"") >&5
2887+  { (eval echo "$as_me:15753: \"$ac_try\"") >&5
2888   (eval $ac_try) 2>&5
2889   ac_status=$?
2890-  echo "$as_me:15752: \$? = $ac_status" >&5
2891+  echo "$as_me:15756: \$? = $ac_status" >&5
2892   (exit $ac_status); }; }; then
2893   eval "$as_ac_Lib=yes"
2894 else
2895@@ -15760,7 +15764,7 @@
2896 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
2897 LIBS=$ac_check_lib_save_LIBS
2898 fi
2899-echo "$as_me:15763: result: `eval echo '${'$as_ac_Lib'}'`" >&5
2900+echo "$as_me:15767: result: `eval echo '${'$as_ac_Lib'}'`" >&5
2901 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
2902 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
2903
2904@@ -15793,7 +15797,7 @@
2905 	cf_curses_headers="$cf_curses_headers panel.h"
2906 fi
2907
2908-echo "$as_me:15796: checking if you want to check for menu functions" >&5
2909+echo "$as_me:15800: checking if you want to check for menu functions" >&5
2910 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6
2911
2912 # Check whether --enable-menu or --disable-menu was given.
2913@@ -15810,7 +15814,7 @@
2914 	cf_enable_menu=$cf_default_menu
2915
2916 fi;
2917-echo "$as_me:15813: result: $cf_enable_menu" >&5
2918+echo "$as_me:15817: result: $cf_enable_menu" >&5
2919 echo "${ECHO_T}$cf_enable_menu" >&6
2920 if test $cf_enable_menu = yes
2921 then
2922@@ -15819,14 +15823,14 @@
2923 		;;
2924 	(curses*)
2925
2926-echo "$as_me:15822: checking for NetBSD menu.h" >&5
2927+echo "$as_me:15826: checking for NetBSD menu.h" >&5
2928 echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6
2929 if test "${cf_cv_netbsd_menu_h+set}" = set; then
2930   echo $ECHO_N "(cached) $ECHO_C" >&6
2931 else
2932
2933 cat >conftest.$ac_ext <<_ACEOF
2934-#line 15829 "configure"
2935+#line 15833 "configure"
2936 #include "confdefs.h"
2937
2938 #include <${cf_cv_ncurses_header:-curses.h}>
2939@@ -15844,16 +15848,16 @@
2940 }
2941 _ACEOF
2942 rm -f conftest.$ac_objext
2943-if { (eval echo "$as_me:15847: \"$ac_compile\"") >&5
2944+if { (eval echo "$as_me:15851: \"$ac_compile\"") >&5
2945   (eval $ac_compile) 2>&5
2946   ac_status=$?
2947-  echo "$as_me:15850: \$? = $ac_status" >&5
2948+  echo "$as_me:15854: \$? = $ac_status" >&5
2949   (exit $ac_status); } &&
2950          { ac_try='test -s conftest.$ac_objext'
2951-  { (eval echo "$as_me:15853: \"$ac_try\"") >&5
2952+  { (eval echo "$as_me:15857: \"$ac_try\"") >&5
2953   (eval $ac_try) 2>&5
2954   ac_status=$?
2955-  echo "$as_me:15856: \$? = $ac_status" >&5
2956+  echo "$as_me:15860: \$? = $ac_status" >&5
2957   (exit $ac_status); }; }; then
2958   cf_cv_netbsd_menu_h=yes
2959
2960@@ -15865,7 +15869,7 @@
2961 rm -f conftest.$ac_objext conftest.$ac_ext
2962
2963 fi
2964-echo "$as_me:15868: result: $cf_cv_netbsd_menu_h" >&5
2965+echo "$as_me:15872: result: $cf_cv_netbsd_menu_h" >&5
2966 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6
2967
2968 test "$cf_cv_netbsd_menu_h" = yes &&
2969@@ -15882,13 +15886,13 @@
2970 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
2971 	:
2972 elif test "x${PKG_CONFIG:=none}" != xnone; then
2973-	echo "$as_me:15885: checking pkg-config for menu$cf_cv_libtype" >&5
2974+	echo "$as_me:15889: checking pkg-config for menu$cf_cv_libtype" >&5
2975 echo $ECHO_N "checking pkg-config for menu$cf_cv_libtype... $ECHO_C" >&6
2976 	if "$PKG_CONFIG" --exists menu$cf_cv_libtype ; then
2977-		echo "$as_me:15888: result: yes" >&5
2978+		echo "$as_me:15892: result: yes" >&5
2979 echo "${ECHO_T}yes" >&6
2980
2981-		echo "$as_me:15891: checking if the menu$cf_cv_libtype package files work" >&5
2982+		echo "$as_me:15895: checking if the menu$cf_cv_libtype package files work" >&5
2983 echo $ECHO_N "checking if the menu$cf_cv_libtype package files work... $ECHO_C" >&6
2984
2985 		cf_save_CPPFLAGS="$CPPFLAGS"
2986@@ -16009,7 +16013,7 @@
2987 LIBS="$cf_add_libs"
2988
2989 		cat >conftest.$ac_ext <<_ACEOF
2990-#line 16012 "configure"
2991+#line 16016 "configure"
2992 #include "confdefs.h"
2993 #include <menu.h>
2994 int
2995@@ -16021,37 +16025,37 @@
2996 }
2997 _ACEOF
2998 rm -f conftest.$ac_objext conftest$ac_exeext
2999-if { (eval echo "$as_me:16024: \"$ac_link\"") >&5
3000+if { (eval echo "$as_me:16028: \"$ac_link\"") >&5
3001   (eval $ac_link) 2>&5
3002   ac_status=$?
3003-  echo "$as_me:16027: \$? = $ac_status" >&5
3004+  echo "$as_me:16031: \$? = $ac_status" >&5
3005   (exit $ac_status); } &&
3006          { ac_try='test -s conftest$ac_exeext'
3007-  { (eval echo "$as_me:16030: \"$ac_try\"") >&5
3008+  { (eval echo "$as_me:16034: \"$ac_try\"") >&5
3009   (eval $ac_try) 2>&5
3010   ac_status=$?
3011-  echo "$as_me:16033: \$? = $ac_status" >&5
3012+  echo "$as_me:16037: \$? = $ac_status" >&5
3013   (exit $ac_status); }; }; then
3014   if test "$cross_compiling" = yes; then
3015   cf_have_curses_lib=maybe
3016 else
3017   cat >conftest.$ac_ext <<_ACEOF
3018-#line 16039 "configure"
3019+#line 16043 "configure"
3020 #include "confdefs.h"
3021 #include <menu.h>
3022 				int main(void)
3023 				{ (void) menu_driver ( 0,0 ); return 0; }
3024 _ACEOF
3025 rm -f conftest$ac_exeext
3026-if { (eval echo "$as_me:16046: \"$ac_link\"") >&5
3027+if { (eval echo "$as_me:16050: \"$ac_link\"") >&5
3028   (eval $ac_link) 2>&5
3029   ac_status=$?
3030-  echo "$as_me:16049: \$? = $ac_status" >&5
3031+  echo "$as_me:16053: \$? = $ac_status" >&5
3032   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
3033-  { (eval echo "$as_me:16051: \"$ac_try\"") >&5
3034+  { (eval echo "$as_me:16055: \"$ac_try\"") >&5
3035   (eval $ac_try) 2>&5
3036   ac_status=$?
3037-  echo "$as_me:16054: \$? = $ac_status" >&5
3038+  echo "$as_me:16058: \$? = $ac_status" >&5
3039   (exit $ac_status); }; }; then
3040   cf_have_curses_lib=yes
3041 else
3042@@ -16068,7 +16072,7 @@
3043 cf_have_curses_lib=no
3044 fi
3045 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3046-		echo "$as_me:16071: result: $cf_have_curses_lib" >&5
3047+		echo "$as_me:16075: result: $cf_have_curses_lib" >&5
3048 echo "${ECHO_T}$cf_have_curses_lib" >&6
3049 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
3050 		if test "$cf_have_curses_lib" != "yes"
3051@@ -16088,7 +16092,7 @@
3052 fi
3053 if test "$cf_have_curses_lib" = no; then
3054 	as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh`
3055-echo "$as_me:16091: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
3056+echo "$as_me:16095: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
3057 echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6
3058 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
3059   echo $ECHO_N "(cached) $ECHO_C" >&6
3060@@ -16096,7 +16100,7 @@
3061   ac_check_lib_save_LIBS=$LIBS
3062 LIBS="-lmenu$cf_cv_libtype  $LIBS"
3063 cat >conftest.$ac_ext <<_ACEOF
3064-#line 16099 "configure"
3065+#line 16103 "configure"
3066 #include "confdefs.h"
3067
3068 /* Override any gcc2 internal prototype to avoid an error.  */
3069@@ -16115,16 +16119,16 @@
3070 }
3071 _ACEOF
3072 rm -f conftest.$ac_objext conftest$ac_exeext
3073-if { (eval echo "$as_me:16118: \"$ac_link\"") >&5
3074+if { (eval echo "$as_me:16122: \"$ac_link\"") >&5
3075   (eval $ac_link) 2>&5
3076   ac_status=$?
3077-  echo "$as_me:16121: \$? = $ac_status" >&5
3078+  echo "$as_me:16125: \$? = $ac_status" >&5
3079   (exit $ac_status); } &&
3080          { ac_try='test -s conftest$ac_exeext'
3081-  { (eval echo "$as_me:16124: \"$ac_try\"") >&5
3082+  { (eval echo "$as_me:16128: \"$ac_try\"") >&5
3083   (eval $ac_try) 2>&5
3084   ac_status=$?
3085-  echo "$as_me:16127: \$? = $ac_status" >&5
3086+  echo "$as_me:16131: \$? = $ac_status" >&5
3087   (exit $ac_status); }; }; then
3088   eval "$as_ac_Lib=yes"
3089 else
3090@@ -16135,7 +16139,7 @@
3091 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3092 LIBS=$ac_check_lib_save_LIBS
3093 fi
3094-echo "$as_me:16138: result: `eval echo '${'$as_ac_Lib'}'`" >&5
3095+echo "$as_me:16142: result: `eval echo '${'$as_ac_Lib'}'`" >&5
3096 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
3097 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
3098
3099@@ -16168,7 +16172,7 @@
3100 	cf_curses_headers="$cf_curses_headers menu.h"
3101 fi
3102
3103-echo "$as_me:16171: checking if you want to check for form functions" >&5
3104+echo "$as_me:16175: checking if you want to check for form functions" >&5
3105 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6
3106
3107 # Check whether --enable-form or --disable-form was given.
3108@@ -16185,7 +16189,7 @@
3109 	cf_enable_form=$cf_default_form
3110
3111 fi;
3112-echo "$as_me:16188: result: $cf_enable_form" >&5
3113+echo "$as_me:16192: result: $cf_enable_form" >&5
3114 echo "${ECHO_T}$cf_enable_form" >&6
3115 if test $cf_enable_form = yes
3116 then
3117@@ -16194,14 +16198,14 @@
3118 		;;
3119 	(curses*)
3120
3121-echo "$as_me:16197: checking for NetBSD form.h" >&5
3122+echo "$as_me:16201: checking for NetBSD form.h" >&5
3123 echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6
3124 if test "${cf_cv_netbsd_form_h+set}" = set; then
3125   echo $ECHO_N "(cached) $ECHO_C" >&6
3126 else
3127
3128 cat >conftest.$ac_ext <<_ACEOF
3129-#line 16204 "configure"
3130+#line 16208 "configure"
3131 #include "confdefs.h"
3132
3133 #include <${cf_cv_ncurses_header:-curses.h}>
3134@@ -16220,16 +16224,16 @@
3135 }
3136 _ACEOF
3137 rm -f conftest.$ac_objext
3138-if { (eval echo "$as_me:16223: \"$ac_compile\"") >&5
3139+if { (eval echo "$as_me:16227: \"$ac_compile\"") >&5
3140   (eval $ac_compile) 2>&5
3141   ac_status=$?
3142-  echo "$as_me:16226: \$? = $ac_status" >&5
3143+  echo "$as_me:16230: \$? = $ac_status" >&5
3144   (exit $ac_status); } &&
3145          { ac_try='test -s conftest.$ac_objext'
3146-  { (eval echo "$as_me:16229: \"$ac_try\"") >&5
3147+  { (eval echo "$as_me:16233: \"$ac_try\"") >&5
3148   (eval $ac_try) 2>&5
3149   ac_status=$?
3150-  echo "$as_me:16232: \$? = $ac_status" >&5
3151+  echo "$as_me:16236: \$? = $ac_status" >&5
3152   (exit $ac_status); }; }; then
3153   cf_cv_netbsd_form_h=yes
3154
3155@@ -16241,7 +16245,7 @@
3156 rm -f conftest.$ac_objext conftest.$ac_ext
3157
3158 fi
3159-echo "$as_me:16244: result: $cf_cv_netbsd_form_h" >&5
3160+echo "$as_me:16248: result: $cf_cv_netbsd_form_h" >&5
3161 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6
3162
3163 test "$cf_cv_netbsd_form_h" = yes &&
3164@@ -16258,13 +16262,13 @@
3165 if test "x${NCURSES_CONFIG_PKG}" = xnone; then
3166 	:
3167 elif test "x${PKG_CONFIG:=none}" != xnone; then
3168-	echo "$as_me:16261: checking pkg-config for form$cf_cv_libtype" >&5
3169+	echo "$as_me:16265: checking pkg-config for form$cf_cv_libtype" >&5
3170 echo $ECHO_N "checking pkg-config for form$cf_cv_libtype... $ECHO_C" >&6
3171 	if "$PKG_CONFIG" --exists form$cf_cv_libtype ; then
3172-		echo "$as_me:16264: result: yes" >&5
3173+		echo "$as_me:16268: result: yes" >&5
3174 echo "${ECHO_T}yes" >&6
3175
3176-		echo "$as_me:16267: checking if the form$cf_cv_libtype package files work" >&5
3177+		echo "$as_me:16271: checking if the form$cf_cv_libtype package files work" >&5
3178 echo $ECHO_N "checking if the form$cf_cv_libtype package files work... $ECHO_C" >&6
3179
3180 		cf_save_CPPFLAGS="$CPPFLAGS"
3181@@ -16385,7 +16389,7 @@
3182 LIBS="$cf_add_libs"
3183
3184 		cat >conftest.$ac_ext <<_ACEOF
3185-#line 16388 "configure"
3186+#line 16392 "configure"
3187 #include "confdefs.h"
3188 #include <form.h>
3189 int
3190@@ -16397,37 +16401,37 @@
3191 }
3192 _ACEOF
3193 rm -f conftest.$ac_objext conftest$ac_exeext
3194-if { (eval echo "$as_me:16400: \"$ac_link\"") >&5
3195+if { (eval echo "$as_me:16404: \"$ac_link\"") >&5
3196   (eval $ac_link) 2>&5
3197   ac_status=$?
3198-  echo "$as_me:16403: \$? = $ac_status" >&5
3199+  echo "$as_me:16407: \$? = $ac_status" >&5
3200   (exit $ac_status); } &&
3201          { ac_try='test -s conftest$ac_exeext'
3202-  { (eval echo "$as_me:16406: \"$ac_try\"") >&5
3203+  { (eval echo "$as_me:16410: \"$ac_try\"") >&5
3204   (eval $ac_try) 2>&5
3205   ac_status=$?
3206-  echo "$as_me:16409: \$? = $ac_status" >&5
3207+  echo "$as_me:16413: \$? = $ac_status" >&5
3208   (exit $ac_status); }; }; then
3209   if test "$cross_compiling" = yes; then
3210   cf_have_curses_lib=maybe
3211 else
3212   cat >conftest.$ac_ext <<_ACEOF
3213-#line 16415 "configure"
3214+#line 16419 "configure"
3215 #include "confdefs.h"
3216 #include <form.h>
3217 				int main(void)
3218 				{ (void) form_driver ( 0,0 ); return 0; }
3219 _ACEOF
3220 rm -f conftest$ac_exeext
3221-if { (eval echo "$as_me:16422: \"$ac_link\"") >&5
3222+if { (eval echo "$as_me:16426: \"$ac_link\"") >&5
3223   (eval $ac_link) 2>&5
3224   ac_status=$?
3225-  echo "$as_me:16425: \$? = $ac_status" >&5
3226+  echo "$as_me:16429: \$? = $ac_status" >&5
3227   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
3228-  { (eval echo "$as_me:16427: \"$ac_try\"") >&5
3229+  { (eval echo "$as_me:16431: \"$ac_try\"") >&5
3230   (eval $ac_try) 2>&5
3231   ac_status=$?
3232-  echo "$as_me:16430: \$? = $ac_status" >&5
3233+  echo "$as_me:16434: \$? = $ac_status" >&5
3234   (exit $ac_status); }; }; then
3235   cf_have_curses_lib=yes
3236 else
3237@@ -16444,7 +16448,7 @@
3238 cf_have_curses_lib=no
3239 fi
3240 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3241-		echo "$as_me:16447: result: $cf_have_curses_lib" >&5
3242+		echo "$as_me:16451: result: $cf_have_curses_lib" >&5
3243 echo "${ECHO_T}$cf_have_curses_lib" >&6
3244 		test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes
3245 		if test "$cf_have_curses_lib" != "yes"
3246@@ -16464,7 +16468,7 @@
3247 fi
3248 if test "$cf_have_curses_lib" = no; then
3249 	as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh`
3250-echo "$as_me:16467: checking for form_driver in -lform$cf_cv_libtype" >&5
3251+echo "$as_me:16471: checking for form_driver in -lform$cf_cv_libtype" >&5
3252 echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6
3253 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
3254   echo $ECHO_N "(cached) $ECHO_C" >&6
3255@@ -16472,7 +16476,7 @@
3256   ac_check_lib_save_LIBS=$LIBS
3257 LIBS="-lform$cf_cv_libtype  $LIBS"
3258 cat >conftest.$ac_ext <<_ACEOF
3259-#line 16475 "configure"
3260+#line 16479 "configure"
3261 #include "confdefs.h"
3262
3263 /* Override any gcc2 internal prototype to avoid an error.  */
3264@@ -16491,16 +16495,16 @@
3265 }
3266 _ACEOF
3267 rm -f conftest.$ac_objext conftest$ac_exeext
3268-if { (eval echo "$as_me:16494: \"$ac_link\"") >&5
3269+if { (eval echo "$as_me:16498: \"$ac_link\"") >&5
3270   (eval $ac_link) 2>&5
3271   ac_status=$?
3272-  echo "$as_me:16497: \$? = $ac_status" >&5
3273+  echo "$as_me:16501: \$? = $ac_status" >&5
3274   (exit $ac_status); } &&
3275          { ac_try='test -s conftest$ac_exeext'
3276-  { (eval echo "$as_me:16500: \"$ac_try\"") >&5
3277+  { (eval echo "$as_me:16504: \"$ac_try\"") >&5
3278   (eval $ac_try) 2>&5
3279   ac_status=$?
3280-  echo "$as_me:16503: \$? = $ac_status" >&5
3281+  echo "$as_me:16507: \$? = $ac_status" >&5
3282   (exit $ac_status); }; }; then
3283   eval "$as_ac_Lib=yes"
3284 else
3285@@ -16511,7 +16515,7 @@
3286 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3287 LIBS=$ac_check_lib_save_LIBS
3288 fi
3289-echo "$as_me:16514: result: `eval echo '${'$as_ac_Lib'}'`" >&5
3290+echo "$as_me:16518: result: `eval echo '${'$as_ac_Lib'}'`" >&5
3291 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
3292 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
3293
3294@@ -16549,23 +16553,23 @@
3295 for ac_header in $cf_curses_headers
3296 do
3297 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
3298-echo "$as_me:16552: checking for $ac_header" >&5
3299+echo "$as_me:16556: checking for $ac_header" >&5
3300 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
3301 if eval "test \"\${$as_ac_Header+set}\" = set"; then
3302   echo $ECHO_N "(cached) $ECHO_C" >&6
3303 else
3304   cat >conftest.$ac_ext <<_ACEOF
3305-#line 16558 "configure"
3306+#line 16562 "configure"
3307 #include "confdefs.h"
3308 #include <$ac_header>
3309 _ACEOF
3310-if { (eval echo "$as_me:16562: \"$ac_cpp conftest.$ac_ext\"") >&5
3311+if { (eval echo "$as_me:16566: \"$ac_cpp conftest.$ac_ext\"") >&5
3312   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
3313   ac_status=$?
3314   egrep -v '^ *\+' conftest.er1 >conftest.err
3315   rm -f conftest.er1
3316   cat conftest.err >&5
3317-  echo "$as_me:16568: \$? = $ac_status" >&5
3318+  echo "$as_me:16572: \$? = $ac_status" >&5
3319   (exit $ac_status); } >/dev/null; then
3320   if test -s conftest.err; then
3321     ac_cpp_err=$ac_c_preproc_warn_flag
3322@@ -16584,7 +16588,7 @@
3323 fi
3324 rm -f conftest.err conftest.$ac_ext
3325 fi
3326-echo "$as_me:16587: result: `eval echo '${'$as_ac_Header'}'`" >&5
3327+echo "$as_me:16591: result: `eval echo '${'$as_ac_Header'}'`" >&5
3328 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
3329 if test `eval echo '${'$as_ac_Header'}'` = yes; then
3330   cat >>confdefs.h <<EOF
3331@@ -16594,13 +16598,13 @@
3332 fi
3333 done
3334
3335-echo "$as_me:16597: checking for ANSI C header files" >&5
3336+echo "$as_me:16601: checking for ANSI C header files" >&5
3337 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
3338 if test "${ac_cv_header_stdc+set}" = set; then
3339   echo $ECHO_N "(cached) $ECHO_C" >&6
3340 else
3341   cat >conftest.$ac_ext <<_ACEOF
3342-#line 16603 "configure"
3343+#line 16607 "configure"
3344 #include "confdefs.h"
3345 #include <stdlib.h>
3346 #include <stdarg.h>
3347@@ -16608,13 +16612,13 @@
3348 #include <float.h>
3349
3350 _ACEOF
3351-if { (eval echo "$as_me:16611: \"$ac_cpp conftest.$ac_ext\"") >&5
3352+if { (eval echo "$as_me:16615: \"$ac_cpp conftest.$ac_ext\"") >&5
3353   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
3354   ac_status=$?
3355   egrep -v '^ *\+' conftest.er1 >conftest.err
3356   rm -f conftest.er1
3357   cat conftest.err >&5
3358-  echo "$as_me:16617: \$? = $ac_status" >&5
3359+  echo "$as_me:16621: \$? = $ac_status" >&5
3360   (exit $ac_status); } >/dev/null; then
3361   if test -s conftest.err; then
3362     ac_cpp_err=$ac_c_preproc_warn_flag
3363@@ -16636,7 +16640,7 @@
3364 if test $ac_cv_header_stdc = yes; then
3365   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
3366   cat >conftest.$ac_ext <<_ACEOF
3367-#line 16639 "configure"
3368+#line 16643 "configure"
3369 #include "confdefs.h"
3370 #include <string.h>
3371
3372@@ -16654,7 +16658,7 @@
3373 if test $ac_cv_header_stdc = yes; then
3374   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
3375   cat >conftest.$ac_ext <<_ACEOF
3376-#line 16657 "configure"
3377+#line 16661 "configure"
3378 #include "confdefs.h"
3379 #include <stdlib.h>
3380
3381@@ -16675,7 +16679,7 @@
3382   :
3383 else
3384   cat >conftest.$ac_ext <<_ACEOF
3385-#line 16678 "configure"
3386+#line 16682 "configure"
3387 #include "confdefs.h"
3388 #include <ctype.h>
3389 #if ((' ' & 0x0FF) == 0x020)
3390@@ -16701,15 +16705,15 @@
3391 }
3392 _ACEOF
3393 rm -f conftest$ac_exeext
3394-if { (eval echo "$as_me:16704: \"$ac_link\"") >&5
3395+if { (eval echo "$as_me:16708: \"$ac_link\"") >&5
3396   (eval $ac_link) 2>&5
3397   ac_status=$?
3398-  echo "$as_me:16707: \$? = $ac_status" >&5
3399+  echo "$as_me:16711: \$? = $ac_status" >&5
3400   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
3401-  { (eval echo "$as_me:16709: \"$ac_try\"") >&5
3402+  { (eval echo "$as_me:16713: \"$ac_try\"") >&5
3403   (eval $ac_try) 2>&5
3404   ac_status=$?
3405-  echo "$as_me:16712: \$? = $ac_status" >&5
3406+  echo "$as_me:16716: \$? = $ac_status" >&5
3407   (exit $ac_status); }; }; then
3408   :
3409 else
3410@@ -16722,7 +16726,7 @@
3411 fi
3412 fi
3413 fi
3414-echo "$as_me:16725: result: $ac_cv_header_stdc" >&5
3415+echo "$as_me:16729: result: $ac_cv_header_stdc" >&5
3416 echo "${ECHO_T}$ac_cv_header_stdc" >&6
3417 if test $ac_cv_header_stdc = yes; then
3418
3419@@ -16732,13 +16736,13 @@
3420
3421 fi
3422
3423-echo "$as_me:16735: checking whether time.h and sys/time.h may both be included" >&5
3424+echo "$as_me:16739: checking whether time.h and sys/time.h may both be included" >&5
3425 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
3426 if test "${ac_cv_header_time+set}" = set; then
3427   echo $ECHO_N "(cached) $ECHO_C" >&6
3428 else
3429   cat >conftest.$ac_ext <<_ACEOF
3430-#line 16741 "configure"
3431+#line 16745 "configure"
3432 #include "confdefs.h"
3433 #include <sys/types.h>
3434 #include <sys/time.h>
3435@@ -16754,16 +16758,16 @@
3436 }
3437 _ACEOF
3438 rm -f conftest.$ac_objext
3439-if { (eval echo "$as_me:16757: \"$ac_compile\"") >&5
3440+if { (eval echo "$as_me:16761: \"$ac_compile\"") >&5
3441   (eval $ac_compile) 2>&5
3442   ac_status=$?
3443-  echo "$as_me:16760: \$? = $ac_status" >&5
3444+  echo "$as_me:16764: \$? = $ac_status" >&5
3445   (exit $ac_status); } &&
3446          { ac_try='test -s conftest.$ac_objext'
3447-  { (eval echo "$as_me:16763: \"$ac_try\"") >&5
3448+  { (eval echo "$as_me:16767: \"$ac_try\"") >&5
3449   (eval $ac_try) 2>&5
3450   ac_status=$?
3451-  echo "$as_me:16766: \$? = $ac_status" >&5
3452+  echo "$as_me:16770: \$? = $ac_status" >&5
3453   (exit $ac_status); }; }; then
3454   ac_cv_header_time=yes
3455 else
3456@@ -16773,7 +16777,7 @@
3457 fi
3458 rm -f conftest.$ac_objext conftest.$ac_ext
3459 fi
3460-echo "$as_me:16776: result: $ac_cv_header_time" >&5
3461+echo "$as_me:16780: result: $ac_cv_header_time" >&5
3462 echo "${ECHO_T}$ac_cv_header_time" >&6
3463 if test $ac_cv_header_time = yes; then
3464
3465@@ -16797,23 +16801,23 @@
3466
3467 do
3468 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
3469-echo "$as_me:16800: checking for $ac_header" >&5
3470+echo "$as_me:16804: checking for $ac_header" >&5
3471 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
3472 if eval "test \"\${$as_ac_Header+set}\" = set"; then
3473   echo $ECHO_N "(cached) $ECHO_C" >&6
3474 else
3475   cat >conftest.$ac_ext <<_ACEOF
3476-#line 16806 "configure"
3477+#line 16810 "configure"
3478 #include "confdefs.h"
3479 #include <$ac_header>
3480 _ACEOF
3481-if { (eval echo "$as_me:16810: \"$ac_cpp conftest.$ac_ext\"") >&5
3482+if { (eval echo "$as_me:16814: \"$ac_cpp conftest.$ac_ext\"") >&5
3483   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
3484   ac_status=$?
3485   egrep -v '^ *\+' conftest.er1 >conftest.err
3486   rm -f conftest.er1
3487   cat conftest.err >&5
3488-  echo "$as_me:16816: \$? = $ac_status" >&5
3489+  echo "$as_me:16820: \$? = $ac_status" >&5
3490   (exit $ac_status); } >/dev/null; then
3491   if test -s conftest.err; then
3492     ac_cpp_err=$ac_c_preproc_warn_flag
3493@@ -16832,7 +16836,7 @@
3494 fi
3495 rm -f conftest.err conftest.$ac_ext
3496 fi
3497-echo "$as_me:16835: result: `eval echo '${'$as_ac_Header'}'`" >&5
3498+echo "$as_me:16839: result: `eval echo '${'$as_ac_Header'}'`" >&5
3499 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
3500 if test `eval echo '${'$as_ac_Header'}'` = yes; then
3501   cat >>confdefs.h <<EOF
3502@@ -16845,23 +16849,23 @@
3503 for ac_header in unistd.h getopt.h
3504 do
3505 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
3506-echo "$as_me:16848: checking for $ac_header" >&5
3507+echo "$as_me:16852: checking for $ac_header" >&5
3508 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
3509 if eval "test \"\${$as_ac_Header+set}\" = set"; then
3510   echo $ECHO_N "(cached) $ECHO_C" >&6
3511 else
3512   cat >conftest.$ac_ext <<_ACEOF
3513-#line 16854 "configure"
3514+#line 16858 "configure"
3515 #include "confdefs.h"
3516 #include <$ac_header>
3517 _ACEOF
3518-if { (eval echo "$as_me:16858: \"$ac_cpp conftest.$ac_ext\"") >&5
3519+if { (eval echo "$as_me:16862: \"$ac_cpp conftest.$ac_ext\"") >&5
3520   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
3521   ac_status=$?
3522   egrep -v '^ *\+' conftest.er1 >conftest.err
3523   rm -f conftest.er1
3524   cat conftest.err >&5
3525-  echo "$as_me:16864: \$? = $ac_status" >&5
3526+  echo "$as_me:16868: \$? = $ac_status" >&5
3527   (exit $ac_status); } >/dev/null; then
3528   if test -s conftest.err; then
3529     ac_cpp_err=$ac_c_preproc_warn_flag
3530@@ -16880,7 +16884,7 @@
3531 fi
3532 rm -f conftest.err conftest.$ac_ext
3533 fi
3534-echo "$as_me:16883: result: `eval echo '${'$as_ac_Header'}'`" >&5
3535+echo "$as_me:16887: result: `eval echo '${'$as_ac_Header'}'`" >&5
3536 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
3537 if test `eval echo '${'$as_ac_Header'}'` = yes; then
3538   cat >>confdefs.h <<EOF
3539@@ -16890,7 +16894,7 @@
3540 fi
3541 done
3542
3543-echo "$as_me:16893: checking for header declaring getopt variables" >&5
3544+echo "$as_me:16897: checking for header declaring getopt variables" >&5
3545 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6
3546 if test "${cf_cv_getopt_header+set}" = set; then
3547   echo $ECHO_N "(cached) $ECHO_C" >&6
3548@@ -16900,7 +16904,7 @@
3549 for cf_header in stdio.h stdlib.h unistd.h getopt.h
3550 do
3551 cat >conftest.$ac_ext <<_ACEOF
3552-#line 16903 "configure"
3553+#line 16907 "configure"
3554 #include "confdefs.h"
3555
3556 #include <$cf_header>
3557@@ -16913,16 +16917,16 @@
3558 }
3559 _ACEOF
3560 rm -f conftest.$ac_objext
3561-if { (eval echo "$as_me:16916: \"$ac_compile\"") >&5
3562+if { (eval echo "$as_me:16920: \"$ac_compile\"") >&5
3563   (eval $ac_compile) 2>&5
3564   ac_status=$?
3565-  echo "$as_me:16919: \$? = $ac_status" >&5
3566+  echo "$as_me:16923: \$? = $ac_status" >&5
3567   (exit $ac_status); } &&
3568          { ac_try='test -s conftest.$ac_objext'
3569-  { (eval echo "$as_me:16922: \"$ac_try\"") >&5
3570+  { (eval echo "$as_me:16926: \"$ac_try\"") >&5
3571   (eval $ac_try) 2>&5
3572   ac_status=$?
3573-  echo "$as_me:16925: \$? = $ac_status" >&5
3574+  echo "$as_me:16929: \$? = $ac_status" >&5
3575   (exit $ac_status); }; }; then
3576   cf_cv_getopt_header=$cf_header
3577  break
3578@@ -16934,7 +16938,7 @@
3579 done
3580
3581 fi
3582-echo "$as_me:16937: result: $cf_cv_getopt_header" >&5
3583+echo "$as_me:16941: result: $cf_cv_getopt_header" >&5
3584 echo "${ECHO_T}$cf_cv_getopt_header" >&6
3585 if test $cf_cv_getopt_header != none ; then
3586
3587@@ -16959,13 +16963,13 @@
3588
3589 do
3590 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
3591-echo "$as_me:16962: checking for $ac_func" >&5
3592+echo "$as_me:16966: checking for $ac_func" >&5
3593 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
3594 if eval "test \"\${$as_ac_var+set}\" = set"; then
3595   echo $ECHO_N "(cached) $ECHO_C" >&6
3596 else
3597   cat >conftest.$ac_ext <<_ACEOF
3598-#line 16968 "configure"
3599+#line 16972 "configure"
3600 #include "confdefs.h"
3601 #define $ac_func autoconf_temporary
3602 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
3603@@ -16996,16 +17000,16 @@
3604 }
3605 _ACEOF
3606 rm -f conftest.$ac_objext conftest$ac_exeext
3607-if { (eval echo "$as_me:16999: \"$ac_link\"") >&5
3608+if { (eval echo "$as_me:17003: \"$ac_link\"") >&5
3609   (eval $ac_link) 2>&5
3610   ac_status=$?
3611-  echo "$as_me:17002: \$? = $ac_status" >&5
3612+  echo "$as_me:17006: \$? = $ac_status" >&5
3613   (exit $ac_status); } &&
3614          { ac_try='test -s conftest$ac_exeext'
3615-  { (eval echo "$as_me:17005: \"$ac_try\"") >&5
3616+  { (eval echo "$as_me:17009: \"$ac_try\"") >&5
3617   (eval $ac_try) 2>&5
3618   ac_status=$?
3619-  echo "$as_me:17008: \$? = $ac_status" >&5
3620+  echo "$as_me:17012: \$? = $ac_status" >&5
3621   (exit $ac_status); }; }; then
3622   eval "$as_ac_var=yes"
3623 else
3624@@ -17015,7 +17019,7 @@
3625 fi
3626 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3627 fi
3628-echo "$as_me:17018: result: `eval echo '${'$as_ac_var'}'`" >&5
3629+echo "$as_me:17022: result: `eval echo '${'$as_ac_var'}'`" >&5
3630 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
3631 if test `eval echo '${'$as_ac_var'}'` = yes; then
3632   cat >>confdefs.h <<EOF
3633@@ -17026,14 +17030,14 @@
3634 done
3635
3636 # use a compile-check to work with ncurses*-config and subdirectory includes
3637-echo "$as_me:17029: checking if we can use termcap.h" >&5
3638+echo "$as_me:17033: checking if we can use termcap.h" >&5
3639 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6
3640 if test "${cf_cv_have_termcap_h+set}" = set; then
3641   echo $ECHO_N "(cached) $ECHO_C" >&6
3642 else
3643
3644 	cat >conftest.$ac_ext <<_ACEOF
3645-#line 17036 "configure"
3646+#line 17040 "configure"
3647 #include "confdefs.h"
3648
3649 #include <curses.h>
3650@@ -17054,16 +17058,16 @@
3651 }
3652 _ACEOF
3653 rm -f conftest.$ac_objext
3654-if { (eval echo "$as_me:17057: \"$ac_compile\"") >&5
3655+if { (eval echo "$as_me:17061: \"$ac_compile\"") >&5
3656   (eval $ac_compile) 2>&5
3657   ac_status=$?
3658-  echo "$as_me:17060: \$? = $ac_status" >&5
3659+  echo "$as_me:17064: \$? = $ac_status" >&5
3660   (exit $ac_status); } &&
3661          { ac_try='test -s conftest.$ac_objext'
3662-  { (eval echo "$as_me:17063: \"$ac_try\"") >&5
3663+  { (eval echo "$as_me:17067: \"$ac_try\"") >&5
3664   (eval $ac_try) 2>&5
3665   ac_status=$?
3666-  echo "$as_me:17066: \$? = $ac_status" >&5
3667+  echo "$as_me:17070: \$? = $ac_status" >&5
3668   (exit $ac_status); }; }; then
3669   cf_cv_have_termcap_h=yes
3670 else
3671@@ -17073,7 +17077,7 @@
3672 fi
3673 rm -f conftest.$ac_objext conftest.$ac_ext
3674 fi
3675-echo "$as_me:17076: result: $cf_cv_have_termcap_h" >&5
3676+echo "$as_me:17080: result: $cf_cv_have_termcap_h" >&5
3677 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6
3678 if test "x$cf_cv_have_termcap_h" = xyes
3679 then
3680@@ -17082,14 +17086,14 @@
3681 EOF
3682
3683 else
3684-echo "$as_me:17085: checking if we can use ncurses/termcap.h" >&5
3685+echo "$as_me:17089: checking if we can use ncurses/termcap.h" >&5
3686 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6
3687 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then
3688   echo $ECHO_N "(cached) $ECHO_C" >&6
3689 else
3690
3691 	cat >conftest.$ac_ext <<_ACEOF
3692-#line 17092 "configure"
3693+#line 17096 "configure"
3694 #include "confdefs.h"
3695
3696 #include <ncurses/curses.h>
3697@@ -17110,16 +17114,16 @@
3698 }
3699 _ACEOF
3700 rm -f conftest.$ac_objext
3701-if { (eval echo "$as_me:17113: \"$ac_compile\"") >&5
3702+if { (eval echo "$as_me:17117: \"$ac_compile\"") >&5
3703   (eval $ac_compile) 2>&5
3704   ac_status=$?
3705-  echo "$as_me:17116: \$? = $ac_status" >&5
3706+  echo "$as_me:17120: \$? = $ac_status" >&5
3707   (exit $ac_status); } &&
3708          { ac_try='test -s conftest.$ac_objext'
3709-  { (eval echo "$as_me:17119: \"$ac_try\"") >&5
3710+  { (eval echo "$as_me:17123: \"$ac_try\"") >&5
3711   (eval $ac_try) 2>&5
3712   ac_status=$?
3713-  echo "$as_me:17122: \$? = $ac_status" >&5
3714+  echo "$as_me:17126: \$? = $ac_status" >&5
3715   (exit $ac_status); }; }; then
3716   cf_cv_have_ncurses_termcap_h=yes
3717 else
3718@@ -17129,7 +17133,7 @@
3719 fi
3720 rm -f conftest.$ac_objext conftest.$ac_ext
3721 fi
3722-echo "$as_me:17132: result: $cf_cv_have_ncurses_termcap_h" >&5
3723+echo "$as_me:17136: result: $cf_cv_have_ncurses_termcap_h" >&5
3724 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6
3725 test "x$cf_cv_have_ncurses_termcap_h" = xyes && cat >>confdefs.h <<\EOF
3726 #define HAVE_NCURSES_TERMCAP_H 1
3727@@ -17138,7 +17142,7 @@
3728 fi
3729
3730 if test "x$ac_cv_func_getopt" = xno; then
3731-	{ { echo "$as_me:17141: error: getopt is required for building programs" >&5
3732+	{ { echo "$as_me:17145: error: getopt is required for building programs" >&5
3733 echo "$as_me: error: getopt is required for building programs" >&2;}
3734    { (exit 1); exit 1; }; }
3735 fi
3736@@ -17157,13 +17161,13 @@
3737
3738 do
3739 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
3740-echo "$as_me:17160: checking for $ac_func" >&5
3741+echo "$as_me:17164: checking for $ac_func" >&5
3742 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
3743 if eval "test \"\${$as_ac_var+set}\" = set"; then
3744   echo $ECHO_N "(cached) $ECHO_C" >&6
3745 else
3746   cat >conftest.$ac_ext <<_ACEOF
3747-#line 17166 "configure"
3748+#line 17170 "configure"
3749 #include "confdefs.h"
3750 #define $ac_func autoconf_temporary
3751 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
3752@@ -17194,16 +17198,16 @@
3753 }
3754 _ACEOF
3755 rm -f conftest.$ac_objext conftest$ac_exeext
3756-if { (eval echo "$as_me:17197: \"$ac_link\"") >&5
3757+if { (eval echo "$as_me:17201: \"$ac_link\"") >&5
3758   (eval $ac_link) 2>&5
3759   ac_status=$?
3760-  echo "$as_me:17200: \$? = $ac_status" >&5
3761+  echo "$as_me:17204: \$? = $ac_status" >&5
3762   (exit $ac_status); } &&
3763          { ac_try='test -s conftest$ac_exeext'
3764-  { (eval echo "$as_me:17203: \"$ac_try\"") >&5
3765+  { (eval echo "$as_me:17207: \"$ac_try\"") >&5
3766   (eval $ac_try) 2>&5
3767   ac_status=$?
3768-  echo "$as_me:17206: \$? = $ac_status" >&5
3769+  echo "$as_me:17210: \$? = $ac_status" >&5
3770   (exit $ac_status); }; }; then
3771   eval "$as_ac_var=yes"
3772 else
3773@@ -17213,7 +17217,7 @@
3774 fi
3775 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3776 fi
3777-echo "$as_me:17216: result: `eval echo '${'$as_ac_var'}'`" >&5
3778+echo "$as_me:17220: result: `eval echo '${'$as_ac_var'}'`" >&5
3779 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
3780 if test `eval echo '${'$as_ac_var'}'` = yes; then
3781   cat >>confdefs.h <<EOF
3782@@ -17225,7 +17229,7 @@
3783
3784 fi
3785
3786-echo "$as_me:17228: checking definition to turn on extended curses functions" >&5
3787+echo "$as_me:17232: checking definition to turn on extended curses functions" >&5
3788 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
3789 if test "${cf_cv_need_xopen_extension+set}" = set; then
3790   echo $ECHO_N "(cached) $ECHO_C" >&6
3791@@ -17233,7 +17237,7 @@
3792
3793 cf_cv_need_xopen_extension=unknown
3794 cat >conftest.$ac_ext <<_ACEOF
3795-#line 17236 "configure"
3796+#line 17240 "configure"
3797 #include "confdefs.h"
3798
3799 #include <stdlib.h>
3800@@ -17259,16 +17263,16 @@
3801 }
3802 _ACEOF
3803 rm -f conftest.$ac_objext conftest$ac_exeext
3804-if { (eval echo "$as_me:17262: \"$ac_link\"") >&5
3805+if { (eval echo "$as_me:17266: \"$ac_link\"") >&5
3806   (eval $ac_link) 2>&5
3807   ac_status=$?
3808-  echo "$as_me:17265: \$? = $ac_status" >&5
3809+  echo "$as_me:17269: \$? = $ac_status" >&5
3810   (exit $ac_status); } &&
3811          { ac_try='test -s conftest$ac_exeext'
3812-  { (eval echo "$as_me:17268: \"$ac_try\"") >&5
3813+  { (eval echo "$as_me:17272: \"$ac_try\"") >&5
3814   (eval $ac_try) 2>&5
3815   ac_status=$?
3816-  echo "$as_me:17271: \$? = $ac_status" >&5
3817+  echo "$as_me:17275: \$? = $ac_status" >&5
3818   (exit $ac_status); }; }; then
3819   cf_cv_need_xopen_extension=none
3820 else
3821@@ -17278,7 +17282,7 @@
3822 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
3823 	do
3824 		cat >conftest.$ac_ext <<_ACEOF
3825-#line 17281 "configure"
3826+#line 17285 "configure"
3827 #include "confdefs.h"
3828
3829 #define $cf_try_xopen_extension 1
3830@@ -17300,16 +17304,16 @@
3831 }
3832 _ACEOF
3833 rm -f conftest.$ac_objext conftest$ac_exeext
3834-if { (eval echo "$as_me:17303: \"$ac_link\"") >&5
3835+if { (eval echo "$as_me:17307: \"$ac_link\"") >&5
3836   (eval $ac_link) 2>&5
3837   ac_status=$?
3838-  echo "$as_me:17306: \$? = $ac_status" >&5
3839+  echo "$as_me:17310: \$? = $ac_status" >&5
3840   (exit $ac_status); } &&
3841          { ac_try='test -s conftest$ac_exeext'
3842-  { (eval echo "$as_me:17309: \"$ac_try\"") >&5
3843+  { (eval echo "$as_me:17313: \"$ac_try\"") >&5
3844   (eval $ac_try) 2>&5
3845   ac_status=$?
3846-  echo "$as_me:17312: \$? = $ac_status" >&5
3847+  echo "$as_me:17316: \$? = $ac_status" >&5
3848   (exit $ac_status); }; }; then
3849   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
3850 else
3851@@ -17323,7 +17327,7 @@
3852 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3853
3854 fi
3855-echo "$as_me:17326: result: $cf_cv_need_xopen_extension" >&5
3856+echo "$as_me:17330: result: $cf_cv_need_xopen_extension" >&5
3857 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
3858
3859 case $cf_cv_need_xopen_extension in
3860@@ -17335,7 +17339,7 @@
3861 	;;
3862 esac
3863
3864-echo "$as_me:17338: checking for term.h" >&5
3865+echo "$as_me:17342: checking for term.h" >&5
3866 echo $ECHO_N "checking for term.h... $ECHO_C" >&6
3867 if test "${cf_cv_term_header+set}" = set; then
3868   echo $ECHO_N "(cached) $ECHO_C" >&6
3869@@ -17356,7 +17360,7 @@
3870 for cf_header in $cf_header_list
3871 do
3872 	cat >conftest.$ac_ext <<_ACEOF
3873-#line 17359 "configure"
3874+#line 17363 "configure"
3875 #include "confdefs.h"
3876
3877 #include <${cf_cv_ncurses_header:-curses.h}>
3878@@ -17370,16 +17374,16 @@
3879 }
3880 _ACEOF
3881 rm -f conftest.$ac_objext
3882-if { (eval echo "$as_me:17373: \"$ac_compile\"") >&5
3883+if { (eval echo "$as_me:17377: \"$ac_compile\"") >&5
3884   (eval $ac_compile) 2>&5
3885   ac_status=$?
3886-  echo "$as_me:17376: \$? = $ac_status" >&5
3887+  echo "$as_me:17380: \$? = $ac_status" >&5
3888   (exit $ac_status); } &&
3889          { ac_try='test -s conftest.$ac_objext'
3890-  { (eval echo "$as_me:17379: \"$ac_try\"") >&5
3891+  { (eval echo "$as_me:17383: \"$ac_try\"") >&5
3892   (eval $ac_try) 2>&5
3893   ac_status=$?
3894-  echo "$as_me:17382: \$? = $ac_status" >&5
3895+  echo "$as_me:17386: \$? = $ac_status" >&5
3896   (exit $ac_status); }; }; then
3897   cf_cv_term_header=$cf_header
3898 	 break
3899@@ -17398,7 +17402,7 @@
3900 	for cf_header in ncurses/term.h ncursesw/term.h
3901 	do
3902 		cat >conftest.$ac_ext <<_ACEOF
3903-#line 17401 "configure"
3904+#line 17405 "configure"
3905 #include "confdefs.h"
3906
3907 #include <${cf_cv_ncurses_header:-curses.h}>
3908@@ -17416,16 +17420,16 @@
3909 }
3910 _ACEOF
3911 rm -f conftest.$ac_objext
3912-if { (eval echo "$as_me:17419: \"$ac_compile\"") >&5
3913+if { (eval echo "$as_me:17423: \"$ac_compile\"") >&5
3914   (eval $ac_compile) 2>&5
3915   ac_status=$?
3916-  echo "$as_me:17422: \$? = $ac_status" >&5
3917+  echo "$as_me:17426: \$? = $ac_status" >&5
3918   (exit $ac_status); } &&
3919          { ac_try='test -s conftest.$ac_objext'
3920-  { (eval echo "$as_me:17425: \"$ac_try\"") >&5
3921+  { (eval echo "$as_me:17429: \"$ac_try\"") >&5
3922   (eval $ac_try) 2>&5
3923   ac_status=$?
3924-  echo "$as_me:17428: \$? = $ac_status" >&5
3925+  echo "$as_me:17432: \$? = $ac_status" >&5
3926   (exit $ac_status); }; }; then
3927   cf_cv_term_header=$cf_header
3928 			 break
3929@@ -17440,7 +17444,7 @@
3930 esac
3931
3932 fi
3933-echo "$as_me:17443: result: $cf_cv_term_header" >&5
3934+echo "$as_me:17447: result: $cf_cv_term_header" >&5
3935 echo "${ECHO_T}$cf_cv_term_header" >&6
3936
3937 case $cf_cv_term_header in
3938@@ -17467,7 +17471,7 @@
3939 	;;
3940 esac
3941
3942-echo "$as_me:17470: checking for unctrl.h" >&5
3943+echo "$as_me:17474: checking for unctrl.h" >&5
3944 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
3945 if test "${cf_cv_unctrl_header+set}" = set; then
3946   echo $ECHO_N "(cached) $ECHO_C" >&6
3947@@ -17488,7 +17492,7 @@
3948 for cf_header in $cf_header_list
3949 do
3950 	cat >conftest.$ac_ext <<_ACEOF
3951-#line 17491 "configure"
3952+#line 17495 "configure"
3953 #include "confdefs.h"
3954
3955 #include <${cf_cv_ncurses_header:-curses.h}>
3956@@ -17502,16 +17506,16 @@
3957 }
3958 _ACEOF
3959 rm -f conftest.$ac_objext
3960-if { (eval echo "$as_me:17505: \"$ac_compile\"") >&5
3961+if { (eval echo "$as_me:17509: \"$ac_compile\"") >&5
3962   (eval $ac_compile) 2>&5
3963   ac_status=$?
3964-  echo "$as_me:17508: \$? = $ac_status" >&5
3965+  echo "$as_me:17512: \$? = $ac_status" >&5
3966   (exit $ac_status); } &&
3967          { ac_try='test -s conftest.$ac_objext'
3968-  { (eval echo "$as_me:17511: \"$ac_try\"") >&5
3969+  { (eval echo "$as_me:17515: \"$ac_try\"") >&5
3970   (eval $ac_try) 2>&5
3971   ac_status=$?
3972-  echo "$as_me:17514: \$? = $ac_status" >&5
3973+  echo "$as_me:17518: \$? = $ac_status" >&5
3974   (exit $ac_status); }; }; then
3975   cf_cv_unctrl_header=$cf_header
3976 	 break
3977@@ -17524,12 +17528,12 @@
3978 done
3979
3980 fi
3981-echo "$as_me:17527: result: $cf_cv_unctrl_header" >&5
3982+echo "$as_me:17531: result: $cf_cv_unctrl_header" >&5
3983 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
3984
3985 case $cf_cv_unctrl_header in
3986 (no)
3987-	{ echo "$as_me:17532: WARNING: unctrl.h header not found" >&5
3988+	{ echo "$as_me:17536: WARNING: unctrl.h header not found" >&5
3989 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
3990 	;;
3991 esac
3992@@ -17618,10 +17622,10 @@
3993
3994 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
3995
3996-	echo "$as_me:17621: checking for ${cf_func}" >&5
3997+	echo "$as_me:17625: checking for ${cf_func}" >&5
3998 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
3999
4000-echo "${as_me:-configure}:17624: testing ${cf_func} ..." 1>&5
4001+echo "${as_me:-configure}:17628: testing ${cf_func} ..." 1>&5
4002
4003 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
4004   echo $ECHO_N "(cached) $ECHO_C" >&6
4005@@ -17630,7 +17634,7 @@
4006 		eval cf_result='$ac_cv_func_'$cf_func
4007 		if test ".$cf_result" != ".no"; then
4008 			cat >conftest.$ac_ext <<_ACEOF
4009-#line 17633 "configure"
4010+#line 17637 "configure"
4011 #include "confdefs.h"
4012
4013 #ifdef HAVE_XCURSES
4014@@ -17663,16 +17667,16 @@
4015 }
4016 _ACEOF
4017 rm -f conftest.$ac_objext conftest$ac_exeext
4018-if { (eval echo "$as_me:17666: \"$ac_link\"") >&5
4019+if { (eval echo "$as_me:17670: \"$ac_link\"") >&5
4020   (eval $ac_link) 2>&5
4021   ac_status=$?
4022-  echo "$as_me:17669: \$? = $ac_status" >&5
4023+  echo "$as_me:17673: \$? = $ac_status" >&5
4024   (exit $ac_status); } &&
4025          { ac_try='test -s conftest$ac_exeext'
4026-  { (eval echo "$as_me:17672: \"$ac_try\"") >&5
4027+  { (eval echo "$as_me:17676: \"$ac_try\"") >&5
4028   (eval $ac_try) 2>&5
4029   ac_status=$?
4030-  echo "$as_me:17675: \$? = $ac_status" >&5
4031+  echo "$as_me:17679: \$? = $ac_status" >&5
4032   (exit $ac_status); }; }; then
4033   cf_result=yes
4034 else
4035@@ -17688,7 +17692,7 @@
4036
4037 	# use the computed/retrieved cache-value:
4038 	eval 'cf_result=$cf_cv_func_'$cf_func
4039-	echo "$as_me:17691: result: $cf_result" >&5
4040+	echo "$as_me:17695: result: $cf_result" >&5
4041 echo "${ECHO_T}$cf_result" >&6
4042 	if test $cf_result != no; then
4043 		cat >>confdefs.h <<EOF
4044@@ -17703,10 +17707,10 @@
4045
4046 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
4047
4048-	echo "$as_me:17706: checking for ${cf_func}" >&5
4049+	echo "$as_me:17710: checking for ${cf_func}" >&5
4050 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
4051
4052-echo "${as_me:-configure}:17709: testing ${cf_func} ..." 1>&5
4053+echo "${as_me:-configure}:17713: testing ${cf_func} ..." 1>&5
4054
4055 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
4056   echo $ECHO_N "(cached) $ECHO_C" >&6
4057@@ -17715,7 +17719,7 @@
4058 		eval cf_result='$ac_cv_func_'$cf_func
4059 		if test ".$cf_result" != ".no"; then
4060 			cat >conftest.$ac_ext <<_ACEOF
4061-#line 17718 "configure"
4062+#line 17722 "configure"
4063 #include "confdefs.h"
4064
4065 #ifdef HAVE_XCURSES
4066@@ -17748,16 +17752,16 @@
4067 }
4068 _ACEOF
4069 rm -f conftest.$ac_objext conftest$ac_exeext
4070-if { (eval echo "$as_me:17751: \"$ac_link\"") >&5
4071+if { (eval echo "$as_me:17755: \"$ac_link\"") >&5
4072   (eval $ac_link) 2>&5
4073   ac_status=$?
4074-  echo "$as_me:17754: \$? = $ac_status" >&5
4075+  echo "$as_me:17758: \$? = $ac_status" >&5
4076   (exit $ac_status); } &&
4077          { ac_try='test -s conftest$ac_exeext'
4078-  { (eval echo "$as_me:17757: \"$ac_try\"") >&5
4079+  { (eval echo "$as_me:17761: \"$ac_try\"") >&5
4080   (eval $ac_try) 2>&5
4081   ac_status=$?
4082-  echo "$as_me:17760: \$? = $ac_status" >&5
4083+  echo "$as_me:17764: \$? = $ac_status" >&5
4084   (exit $ac_status); }; }; then
4085   cf_result=yes
4086 else
4087@@ -17773,7 +17777,7 @@
4088
4089 	# use the computed/retrieved cache-value:
4090 	eval 'cf_result=$cf_cv_func_'$cf_func
4091-	echo "$as_me:17776: result: $cf_result" >&5
4092+	echo "$as_me:17780: result: $cf_result" >&5
4093 echo "${ECHO_T}$cf_result" >&6
4094 	if test $cf_result != no; then
4095 		cat >>confdefs.h <<EOF
4096@@ -17797,7 +17801,7 @@
4097 				cf_return="return value"
4098 			fi
4099 			cat >conftest.$ac_ext <<_ACEOF
4100-#line 17800 "configure"
4101+#line 17804 "configure"
4102 #include "confdefs.h"
4103
4104 #include <${cf_cv_ncurses_header:-curses.h}>
4105@@ -17817,21 +17821,21 @@
4106 }
4107 _ACEOF
4108 rm -f conftest.$ac_objext
4109-if { (eval echo "$as_me:17820: \"$ac_compile\"") >&5
4110+if { (eval echo "$as_me:17824: \"$ac_compile\"") >&5
4111   (eval $ac_compile) 2>&5
4112   ac_status=$?
4113-  echo "$as_me:17823: \$? = $ac_status" >&5
4114+  echo "$as_me:17827: \$? = $ac_status" >&5
4115   (exit $ac_status); } &&
4116          { ac_try='test -s conftest.$ac_objext'
4117-  { (eval echo "$as_me:17826: \"$ac_try\"") >&5
4118+  { (eval echo "$as_me:17830: \"$ac_try\"") >&5
4119   (eval $ac_try) 2>&5
4120   ac_status=$?
4121-  echo "$as_me:17829: \$? = $ac_status" >&5
4122+  echo "$as_me:17833: \$? = $ac_status" >&5
4123   (exit $ac_status); }; }; then
4124
4125 		test -n "$verbose" && echo "	prototype $cf_ret func($cf_arg value)" 1>&6
4126
4127-echo "${as_me:-configure}:17834: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
4128+echo "${as_me:-configure}:17838: testing prototype $cf_ret func($cf_arg value) ..." 1>&5
4129
4130 		cat >>confdefs.h <<EOF
4131 #define TPUTS_ARG               $cf_arg
4132@@ -17851,14 +17855,14 @@
4133 	done
4134 fi
4135
4136-echo "$as_me:17854: checking for ncurses extended functions" >&5
4137+echo "$as_me:17858: checking for ncurses extended functions" >&5
4138 echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6
4139 if test "${cf_cv_ncurses_ext_funcs+set}" = set; then
4140   echo $ECHO_N "(cached) $ECHO_C" >&6
4141 else
4142
4143 cat >conftest.$ac_ext <<_ACEOF
4144-#line 17861 "configure"
4145+#line 17865 "configure"
4146 #include "confdefs.h"
4147
4148 #include <${cf_cv_ncurses_header:-curses.h}>
4149@@ -17873,16 +17877,16 @@
4150 }
4151 _ACEOF
4152 rm -f conftest.$ac_objext
4153-if { (eval echo "$as_me:17876: \"$ac_compile\"") >&5
4154+if { (eval echo "$as_me:17880: \"$ac_compile\"") >&5
4155   (eval $ac_compile) 2>&5
4156   ac_status=$?
4157-  echo "$as_me:17879: \$? = $ac_status" >&5
4158+  echo "$as_me:17883: \$? = $ac_status" >&5
4159   (exit $ac_status); } &&
4160          { ac_try='test -s conftest.$ac_objext'
4161-  { (eval echo "$as_me:17882: \"$ac_try\"") >&5
4162+  { (eval echo "$as_me:17886: \"$ac_try\"") >&5
4163   (eval $ac_try) 2>&5
4164   ac_status=$?
4165-  echo "$as_me:17885: \$? = $ac_status" >&5
4166+  echo "$as_me:17889: \$? = $ac_status" >&5
4167   (exit $ac_status); }; }; then
4168   cf_cv_ncurses_ext_funcs=defined
4169 else
4170@@ -17890,7 +17894,7 @@
4171 cat conftest.$ac_ext >&5
4172
4173 cat >conftest.$ac_ext <<_ACEOF
4174-#line 17893 "configure"
4175+#line 17897 "configure"
4176 #include "confdefs.h"
4177
4178 #include <${cf_cv_ncurses_header:-curses.h}>
4179@@ -17915,16 +17919,16 @@
4180 }
4181 _ACEOF
4182 rm -f conftest.$ac_objext conftest$ac_exeext
4183-if { (eval echo "$as_me:17918: \"$ac_link\"") >&5
4184+if { (eval echo "$as_me:17922: \"$ac_link\"") >&5
4185   (eval $ac_link) 2>&5
4186   ac_status=$?
4187-  echo "$as_me:17921: \$? = $ac_status" >&5
4188+  echo "$as_me:17925: \$? = $ac_status" >&5
4189   (exit $ac_status); } &&
4190          { ac_try='test -s conftest$ac_exeext'
4191-  { (eval echo "$as_me:17924: \"$ac_try\"") >&5
4192+  { (eval echo "$as_me:17928: \"$ac_try\"") >&5
4193   (eval $ac_try) 2>&5
4194   ac_status=$?
4195-  echo "$as_me:17927: \$? = $ac_status" >&5
4196+  echo "$as_me:17931: \$? = $ac_status" >&5
4197   (exit $ac_status); }; }; then
4198   cf_cv_ncurses_ext_funcs=yes
4199 else
4200@@ -17938,7 +17942,7 @@
4201 rm -f conftest.$ac_objext conftest.$ac_ext
4202
4203 fi
4204-echo "$as_me:17941: result: $cf_cv_ncurses_ext_funcs" >&5
4205+echo "$as_me:17945: result: $cf_cv_ncurses_ext_funcs" >&5
4206 echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6
4207 test "$cf_cv_ncurses_ext_funcs" = yes &&
4208 cat >>confdefs.h <<\EOF
4209@@ -17952,11 +17956,11 @@
4210 	if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno
4211 	then
4212 		cf_define_xpg5=no
4213-		echo "$as_me:17955: checking if _XPG5 should be defined to enable wide-characters" >&5
4214+		echo "$as_me:17959: checking if _XPG5 should be defined to enable wide-characters" >&5
4215 echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6
4216
4217 		cat >conftest.$ac_ext <<_ACEOF
4218-#line 17959 "configure"
4219+#line 17963 "configure"
4220 #include "confdefs.h"
4221
4222 #include <${cf_cv_ncurses_header:-curses.h}>
4223@@ -17969,16 +17973,16 @@
4224 }
4225 _ACEOF
4226 rm -f conftest.$ac_objext
4227-if { (eval echo "$as_me:17972: \"$ac_compile\"") >&5
4228+if { (eval echo "$as_me:17976: \"$ac_compile\"") >&5
4229   (eval $ac_compile) 2>&5
4230   ac_status=$?
4231-  echo "$as_me:17975: \$? = $ac_status" >&5
4232+  echo "$as_me:17979: \$? = $ac_status" >&5
4233   (exit $ac_status); } &&
4234          { ac_try='test -s conftest.$ac_objext'
4235-  { (eval echo "$as_me:17978: \"$ac_try\"") >&5
4236+  { (eval echo "$as_me:17982: \"$ac_try\"") >&5
4237   (eval $ac_try) 2>&5
4238   ac_status=$?
4239-  echo "$as_me:17981: \$? = $ac_status" >&5
4240+  echo "$as_me:17985: \$? = $ac_status" >&5
4241   (exit $ac_status); }; }; then
4242   :
4243 else
4244@@ -17987,7 +17991,7 @@
4245 cf_save_cppflags="$CPPFLAGS"
4246 			 CPPFLAGS="$CPPFLAGS -D_XPG5"
4247 			 cat >conftest.$ac_ext <<_ACEOF
4248-#line 17990 "configure"
4249+#line 17994 "configure"
4250 #include "confdefs.h"
4251
4252 #include <${cf_cv_ncurses_header:-curses.h}>
4253@@ -18000,16 +18004,16 @@
4254 }
4255 _ACEOF
4256 rm -f conftest.$ac_objext
4257-if { (eval echo "$as_me:18003: \"$ac_compile\"") >&5
4258+if { (eval echo "$as_me:18007: \"$ac_compile\"") >&5
4259   (eval $ac_compile) 2>&5
4260   ac_status=$?
4261-  echo "$as_me:18006: \$? = $ac_status" >&5
4262+  echo "$as_me:18010: \$? = $ac_status" >&5
4263   (exit $ac_status); } &&
4264          { ac_try='test -s conftest.$ac_objext'
4265-  { (eval echo "$as_me:18009: \"$ac_try\"") >&5
4266+  { (eval echo "$as_me:18013: \"$ac_try\"") >&5
4267   (eval $ac_try) 2>&5
4268   ac_status=$?
4269-  echo "$as_me:18012: \$? = $ac_status" >&5
4270+  echo "$as_me:18016: \$? = $ac_status" >&5
4271   (exit $ac_status); }; }; then
4272   cf_define_xpg5=yes
4273 else
4274@@ -18020,7 +18024,7 @@
4275 			 CPPFLAGS="$cf_save_cppflags"
4276 fi
4277 rm -f conftest.$ac_objext conftest.$ac_ext
4278-		echo "$as_me:18023: result: $cf_define_xpg5" >&5
4279+		echo "$as_me:18027: result: $cf_define_xpg5" >&5
4280 echo "${ECHO_T}$cf_define_xpg5" >&6
4281
4282 		if test "$cf_define_xpg5" = yes
4283@@ -18029,14 +18033,14 @@
4284 		fi
4285 	fi
4286
4287-	echo "$as_me:18032: checking for wide-character functions" >&5
4288+	echo "$as_me:18036: checking for wide-character functions" >&5
4289 echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6
4290 if test "${cf_cv_widechar_funcs+set}" = set; then
4291   echo $ECHO_N "(cached) $ECHO_C" >&6
4292 else
4293
4294 	cat >conftest.$ac_ext <<_ACEOF
4295-#line 18039 "configure"
4296+#line 18043 "configure"
4297 #include "confdefs.h"
4298
4299 #include <${cf_cv_ncurses_header:-curses.h}>
4300@@ -18053,16 +18057,16 @@
4301 }
4302 _ACEOF
4303 rm -f conftest.$ac_objext conftest$ac_exeext
4304-if { (eval echo "$as_me:18056: \"$ac_link\"") >&5
4305+if { (eval echo "$as_me:18060: \"$ac_link\"") >&5
4306   (eval $ac_link) 2>&5
4307   ac_status=$?
4308-  echo "$as_me:18059: \$? = $ac_status" >&5
4309+  echo "$as_me:18063: \$? = $ac_status" >&5
4310   (exit $ac_status); } &&
4311          { ac_try='test -s conftest$ac_exeext'
4312-  { (eval echo "$as_me:18062: \"$ac_try\"") >&5
4313+  { (eval echo "$as_me:18066: \"$ac_try\"") >&5
4314   (eval $ac_try) 2>&5
4315   ac_status=$?
4316-  echo "$as_me:18065: \$? = $ac_status" >&5
4317+  echo "$as_me:18069: \$? = $ac_status" >&5
4318   (exit $ac_status); }; }; then
4319   cf_cv_widechar_funcs=yes
4320 else
4321@@ -18073,7 +18077,7 @@
4322 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4323
4324 fi
4325-echo "$as_me:18076: result: $cf_cv_widechar_funcs" >&5
4326+echo "$as_me:18080: result: $cf_cv_widechar_funcs" >&5
4327 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6
4328 	if test "$cf_cv_widechar_funcs" != no ; then
4329
4330@@ -18094,14 +18098,14 @@
4331
4332 fi
4333
4334-echo "$as_me:18097: checking if $cf_cv_screen library uses pthreads" >&5
4335+echo "$as_me:18101: checking if $cf_cv_screen library uses pthreads" >&5
4336 echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6
4337 if test "${cf_cv_use_pthreads+set}" = set; then
4338   echo $ECHO_N "(cached) $ECHO_C" >&6
4339 else
4340
4341 cat >conftest.$ac_ext <<_ACEOF
4342-#line 18104 "configure"
4343+#line 18108 "configure"
4344 #include "confdefs.h"
4345
4346 #include <${cf_cv_ncurses_header:-curses.h}>
4347@@ -18119,16 +18123,16 @@
4348 }
4349 _ACEOF
4350 rm -f conftest.$ac_objext conftest$ac_exeext
4351-if { (eval echo "$as_me:18122: \"$ac_link\"") >&5
4352+if { (eval echo "$as_me:18126: \"$ac_link\"") >&5
4353   (eval $ac_link) 2>&5
4354   ac_status=$?
4355-  echo "$as_me:18125: \$? = $ac_status" >&5
4356+  echo "$as_me:18129: \$? = $ac_status" >&5
4357   (exit $ac_status); } &&
4358          { ac_try='test -s conftest$ac_exeext'
4359-  { (eval echo "$as_me:18128: \"$ac_try\"") >&5
4360+  { (eval echo "$as_me:18132: \"$ac_try\"") >&5
4361   (eval $ac_try) 2>&5
4362   ac_status=$?
4363-  echo "$as_me:18131: \$? = $ac_status" >&5
4364+  echo "$as_me:18135: \$? = $ac_status" >&5
4365   (exit $ac_status); }; }; then
4366   cf_cv_use_pthreads=yes
4367 else
4368@@ -18139,20 +18143,20 @@
4369 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4370
4371 fi
4372-echo "$as_me:18142: result: $cf_cv_use_pthreads" >&5
4373+echo "$as_me:18146: result: $cf_cv_use_pthreads" >&5
4374 echo "${ECHO_T}$cf_cv_use_pthreads" >&6
4375 test $cf_cv_use_pthreads = yes && cat >>confdefs.h <<\EOF
4376 #define USE_PTHREADS 1
4377 EOF
4378
4379-echo "$as_me:18148: checking if sys/time.h works with sys/select.h" >&5
4380+echo "$as_me:18152: checking if sys/time.h works with sys/select.h" >&5
4381 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
4382 if test "${cf_cv_sys_time_select+set}" = set; then
4383   echo $ECHO_N "(cached) $ECHO_C" >&6
4384 else
4385
4386 cat >conftest.$ac_ext <<_ACEOF
4387-#line 18155 "configure"
4388+#line 18159 "configure"
4389 #include "confdefs.h"
4390
4391 #include <sys/types.h>
4392@@ -18172,16 +18176,16 @@
4393 }
4394 _ACEOF
4395 rm -f conftest.$ac_objext
4396-if { (eval echo "$as_me:18175: \"$ac_compile\"") >&5
4397+if { (eval echo "$as_me:18179: \"$ac_compile\"") >&5
4398   (eval $ac_compile) 2>&5
4399   ac_status=$?
4400-  echo "$as_me:18178: \$? = $ac_status" >&5
4401+  echo "$as_me:18182: \$? = $ac_status" >&5
4402   (exit $ac_status); } &&
4403          { ac_try='test -s conftest.$ac_objext'
4404-  { (eval echo "$as_me:18181: \"$ac_try\"") >&5
4405+  { (eval echo "$as_me:18185: \"$ac_try\"") >&5
4406   (eval $ac_try) 2>&5
4407   ac_status=$?
4408-  echo "$as_me:18184: \$? = $ac_status" >&5
4409+  echo "$as_me:18188: \$? = $ac_status" >&5
4410   (exit $ac_status); }; }; then
4411   cf_cv_sys_time_select=yes
4412 else
4413@@ -18193,7 +18197,7 @@
4414
4415 fi
4416
4417-echo "$as_me:18196: result: $cf_cv_sys_time_select" >&5
4418+echo "$as_me:18200: result: $cf_cv_sys_time_select" >&5
4419 echo "${ECHO_T}$cf_cv_sys_time_select" >&6
4420 test "$cf_cv_sys_time_select" = yes &&
4421 cat >>confdefs.h <<\EOF
4422@@ -18202,7 +18206,7 @@
4423
4424 # special check for test/ditto.c
4425
4426-echo "$as_me:18205: checking for openpty in -lutil" >&5
4427+echo "$as_me:18209: checking for openpty in -lutil" >&5
4428 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
4429 if test "${ac_cv_lib_util_openpty+set}" = set; then
4430   echo $ECHO_N "(cached) $ECHO_C" >&6
4431@@ -18210,7 +18214,7 @@
4432   ac_check_lib_save_LIBS=$LIBS
4433 LIBS="-lutil  $LIBS"
4434 cat >conftest.$ac_ext <<_ACEOF
4435-#line 18213 "configure"
4436+#line 18217 "configure"
4437 #include "confdefs.h"
4438
4439 /* Override any gcc2 internal prototype to avoid an error.  */
4440@@ -18229,16 +18233,16 @@
4441 }
4442 _ACEOF
4443 rm -f conftest.$ac_objext conftest$ac_exeext
4444-if { (eval echo "$as_me:18232: \"$ac_link\"") >&5
4445+if { (eval echo "$as_me:18236: \"$ac_link\"") >&5
4446   (eval $ac_link) 2>&5
4447   ac_status=$?
4448-  echo "$as_me:18235: \$? = $ac_status" >&5
4449+  echo "$as_me:18239: \$? = $ac_status" >&5
4450   (exit $ac_status); } &&
4451          { ac_try='test -s conftest$ac_exeext'
4452-  { (eval echo "$as_me:18238: \"$ac_try\"") >&5
4453+  { (eval echo "$as_me:18242: \"$ac_try\"") >&5
4454   (eval $ac_try) 2>&5
4455   ac_status=$?
4456-  echo "$as_me:18241: \$? = $ac_status" >&5
4457+  echo "$as_me:18245: \$? = $ac_status" >&5
4458   (exit $ac_status); }; }; then
4459   ac_cv_lib_util_openpty=yes
4460 else
4461@@ -18249,7 +18253,7 @@
4462 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4463 LIBS=$ac_check_lib_save_LIBS
4464 fi
4465-echo "$as_me:18252: result: $ac_cv_lib_util_openpty" >&5
4466+echo "$as_me:18256: result: $ac_cv_lib_util_openpty" >&5
4467 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
4468 if test $ac_cv_lib_util_openpty = yes; then
4469   cf_cv_lib_util=yes
4470@@ -18257,7 +18261,7 @@
4471   cf_cv_lib_util=no
4472 fi
4473
4474-echo "$as_me:18260: checking for openpty header" >&5
4475+echo "$as_me:18264: checking for openpty header" >&5
4476 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
4477 if test "${cf_cv_func_openpty+set}" = set; then
4478   echo $ECHO_N "(cached) $ECHO_C" >&6
4479@@ -18284,7 +18288,7 @@
4480 	for cf_header in pty.h libutil.h util.h
4481 	do
4482 	cat >conftest.$ac_ext <<_ACEOF
4483-#line 18287 "configure"
4484+#line 18291 "configure"
4485 #include "confdefs.h"
4486
4487 #include <$cf_header>
4488@@ -18301,16 +18305,16 @@
4489 }
4490 _ACEOF
4491 rm -f conftest.$ac_objext conftest$ac_exeext
4492-if { (eval echo "$as_me:18304: \"$ac_link\"") >&5
4493+if { (eval echo "$as_me:18308: \"$ac_link\"") >&5
4494   (eval $ac_link) 2>&5
4495   ac_status=$?
4496-  echo "$as_me:18307: \$? = $ac_status" >&5
4497+  echo "$as_me:18311: \$? = $ac_status" >&5
4498   (exit $ac_status); } &&
4499          { ac_try='test -s conftest$ac_exeext'
4500-  { (eval echo "$as_me:18310: \"$ac_try\"") >&5
4501+  { (eval echo "$as_me:18314: \"$ac_try\"") >&5
4502   (eval $ac_try) 2>&5
4503   ac_status=$?
4504-  echo "$as_me:18313: \$? = $ac_status" >&5
4505+  echo "$as_me:18317: \$? = $ac_status" >&5
4506   (exit $ac_status); }; }; then
4507
4508 		cf_cv_func_openpty=$cf_header
4509@@ -18328,7 +18332,7 @@
4510 	LIBS="$cf_save_LIBS"
4511
4512 fi
4513-echo "$as_me:18331: result: $cf_cv_func_openpty" >&5
4514+echo "$as_me:18335: result: $cf_cv_func_openpty" >&5
4515 echo "${ECHO_T}$cf_cv_func_openpty" >&6
4516
4517 if test "$cf_cv_func_openpty" != no ; then
4518@@ -18362,7 +18366,7 @@
4519 	fi
4520 fi
4521
4522-echo "$as_me:18365: checking for function curses_version" >&5
4523+echo "$as_me:18369: checking for function curses_version" >&5
4524 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
4525 if test "${cf_cv_func_curses_version+set}" = set; then
4526   echo $ECHO_N "(cached) $ECHO_C" >&6
4527@@ -18372,7 +18376,7 @@
4528   cf_cv_func_curses_version=unknown
4529 else
4530   cat >conftest.$ac_ext <<_ACEOF
4531-#line 18375 "configure"
4532+#line 18379 "configure"
4533 #include "confdefs.h"
4534
4535 #include <${cf_cv_ncurses_header:-curses.h}>
4536@@ -18385,15 +18389,15 @@
4537
4538 _ACEOF
4539 rm -f conftest$ac_exeext
4540-if { (eval echo "$as_me:18388: \"$ac_link\"") >&5
4541+if { (eval echo "$as_me:18392: \"$ac_link\"") >&5
4542   (eval $ac_link) 2>&5
4543   ac_status=$?
4544-  echo "$as_me:18391: \$? = $ac_status" >&5
4545+  echo "$as_me:18395: \$? = $ac_status" >&5
4546   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
4547-  { (eval echo "$as_me:18393: \"$ac_try\"") >&5
4548+  { (eval echo "$as_me:18397: \"$ac_try\"") >&5
4549   (eval $ac_try) 2>&5
4550   ac_status=$?
4551-  echo "$as_me:18396: \$? = $ac_status" >&5
4552+  echo "$as_me:18400: \$? = $ac_status" >&5
4553   (exit $ac_status); }; }; then
4554   cf_cv_func_curses_version=yes
4555
4556@@ -18408,14 +18412,14 @@
4557 fi
4558 rm -f core
4559 fi
4560-echo "$as_me:18411: result: $cf_cv_func_curses_version" >&5
4561+echo "$as_me:18415: result: $cf_cv_func_curses_version" >&5
4562 echo "${ECHO_T}$cf_cv_func_curses_version" >&6
4563 test "$cf_cv_func_curses_version" = yes &&
4564 cat >>confdefs.h <<\EOF
4565 #define HAVE_CURSES_VERSION 1
4566 EOF
4567
4568-echo "$as_me:18418: checking for alternate character set array" >&5
4569+echo "$as_me:18422: checking for alternate character set array" >&5
4570 echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6
4571 if test "${cf_cv_curses_acs_map+set}" = set; then
4572   echo $ECHO_N "(cached) $ECHO_C" >&6
4573@@ -18425,7 +18429,7 @@
4574 for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map
4575 do
4576 cat >conftest.$ac_ext <<_ACEOF
4577-#line 18428 "configure"
4578+#line 18432 "configure"
4579 #include "confdefs.h"
4580
4581 #include <${cf_cv_ncurses_header:-curses.h}>
4582@@ -18441,16 +18445,16 @@
4583 }
4584 _ACEOF
4585 rm -f conftest.$ac_objext conftest$ac_exeext
4586-if { (eval echo "$as_me:18444: \"$ac_link\"") >&5
4587+if { (eval echo "$as_me:18448: \"$ac_link\"") >&5
4588   (eval $ac_link) 2>&5
4589   ac_status=$?
4590-  echo "$as_me:18447: \$? = $ac_status" >&5
4591+  echo "$as_me:18451: \$? = $ac_status" >&5
4592   (exit $ac_status); } &&
4593          { ac_try='test -s conftest$ac_exeext'
4594-  { (eval echo "$as_me:18450: \"$ac_try\"") >&5
4595+  { (eval echo "$as_me:18454: \"$ac_try\"") >&5
4596   (eval $ac_try) 2>&5
4597   ac_status=$?
4598-  echo "$as_me:18453: \$? = $ac_status" >&5
4599+  echo "$as_me:18457: \$? = $ac_status" >&5
4600   (exit $ac_status); }; }; then
4601   cf_cv_curses_acs_map=$name; break
4602 else
4603@@ -18461,7 +18465,7 @@
4604 done
4605
4606 fi
4607-echo "$as_me:18464: result: $cf_cv_curses_acs_map" >&5
4608+echo "$as_me:18468: result: $cf_cv_curses_acs_map" >&5
4609 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6
4610
4611 test "$cf_cv_curses_acs_map" != unknown &&
4612@@ -18471,7 +18475,7 @@
4613
4614 if test "$cf_enable_widec" = yes; then
4615
4616-echo "$as_me:18474: checking for wide alternate character set array" >&5
4617+echo "$as_me:18478: checking for wide alternate character set array" >&5
4618 echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6
4619 if test "${cf_cv_curses_wacs_map+set}" = set; then
4620   echo $ECHO_N "(cached) $ECHO_C" >&6
4621@@ -18481,7 +18485,7 @@
4622 	for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char
4623 	do
4624 	cat >conftest.$ac_ext <<_ACEOF
4625-#line 18484 "configure"
4626+#line 18488 "configure"
4627 #include "confdefs.h"
4628
4629 #ifndef _XOPEN_SOURCE_EXTENDED
4630@@ -18497,16 +18501,16 @@
4631 }
4632 _ACEOF
4633 rm -f conftest.$ac_objext conftest$ac_exeext
4634-if { (eval echo "$as_me:18500: \"$ac_link\"") >&5
4635+if { (eval echo "$as_me:18504: \"$ac_link\"") >&5
4636   (eval $ac_link) 2>&5
4637   ac_status=$?
4638-  echo "$as_me:18503: \$? = $ac_status" >&5
4639+  echo "$as_me:18507: \$? = $ac_status" >&5
4640   (exit $ac_status); } &&
4641          { ac_try='test -s conftest$ac_exeext'
4642-  { (eval echo "$as_me:18506: \"$ac_try\"") >&5
4643+  { (eval echo "$as_me:18510: \"$ac_try\"") >&5
4644   (eval $ac_try) 2>&5
4645   ac_status=$?
4646-  echo "$as_me:18509: \$? = $ac_status" >&5
4647+  echo "$as_me:18513: \$? = $ac_status" >&5
4648   (exit $ac_status); }; }; then
4649   cf_cv_curses_wacs_map=$name
4650 	 break
4651@@ -18517,7 +18521,7 @@
4652 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4653 	done
4654 fi
4655-echo "$as_me:18520: result: $cf_cv_curses_wacs_map" >&5
4656+echo "$as_me:18524: result: $cf_cv_curses_wacs_map" >&5
4657 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6
4658
4659 test "$cf_cv_curses_wacs_map" != unknown &&
4660@@ -18525,7 +18529,7 @@
4661 #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map
4662 EOF
4663
4664-echo "$as_me:18528: checking for wide alternate character constants" >&5
4665+echo "$as_me:18532: checking for wide alternate character constants" >&5
4666 echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6
4667 if test "${cf_cv_curses_wacs_symbols+set}" = set; then
4668   echo $ECHO_N "(cached) $ECHO_C" >&6
4669@@ -18535,7 +18539,7 @@
4670 if test "$cf_cv_curses_wacs_map" != unknown
4671 then
4672 	cat >conftest.$ac_ext <<_ACEOF
4673-#line 18538 "configure"
4674+#line 18542 "configure"
4675 #include "confdefs.h"
4676
4677 #ifndef _XOPEN_SOURCE_EXTENDED
4678@@ -18552,16 +18556,16 @@
4679 }
4680 _ACEOF
4681 rm -f conftest.$ac_objext conftest$ac_exeext
4682-if { (eval echo "$as_me:18555: \"$ac_link\"") >&5
4683+if { (eval echo "$as_me:18559: \"$ac_link\"") >&5
4684   (eval $ac_link) 2>&5
4685   ac_status=$?
4686-  echo "$as_me:18558: \$? = $ac_status" >&5
4687+  echo "$as_me:18562: \$? = $ac_status" >&5
4688   (exit $ac_status); } &&
4689          { ac_try='test -s conftest$ac_exeext'
4690-  { (eval echo "$as_me:18561: \"$ac_try\"") >&5
4691+  { (eval echo "$as_me:18565: \"$ac_try\"") >&5
4692   (eval $ac_try) 2>&5
4693   ac_status=$?
4694-  echo "$as_me:18564: \$? = $ac_status" >&5
4695+  echo "$as_me:18568: \$? = $ac_status" >&5
4696   (exit $ac_status); }; }; then
4697   cf_cv_curses_wacs_symbols=yes
4698 else
4699@@ -18571,7 +18575,7 @@
4700 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4701 else
4702 	cat >conftest.$ac_ext <<_ACEOF
4703-#line 18574 "configure"
4704+#line 18578 "configure"
4705 #include "confdefs.h"
4706
4707 #ifndef _XOPEN_SOURCE_EXTENDED
4708@@ -18587,16 +18591,16 @@
4709 }
4710 _ACEOF
4711 rm -f conftest.$ac_objext conftest$ac_exeext
4712-if { (eval echo "$as_me:18590: \"$ac_link\"") >&5
4713+if { (eval echo "$as_me:18594: \"$ac_link\"") >&5
4714   (eval $ac_link) 2>&5
4715   ac_status=$?
4716-  echo "$as_me:18593: \$? = $ac_status" >&5
4717+  echo "$as_me:18597: \$? = $ac_status" >&5
4718   (exit $ac_status); } &&
4719          { ac_try='test -s conftest$ac_exeext'
4720-  { (eval echo "$as_me:18596: \"$ac_try\"") >&5
4721+  { (eval echo "$as_me:18600: \"$ac_try\"") >&5
4722   (eval $ac_try) 2>&5
4723   ac_status=$?
4724-  echo "$as_me:18599: \$? = $ac_status" >&5
4725+  echo "$as_me:18603: \$? = $ac_status" >&5
4726   (exit $ac_status); }; }; then
4727   cf_cv_curses_wacs_symbols=yes
4728 else
4729@@ -18607,7 +18611,7 @@
4730 fi
4731
4732 fi
4733-echo "$as_me:18610: result: $cf_cv_curses_wacs_symbols" >&5
4734+echo "$as_me:18614: result: $cf_cv_curses_wacs_symbols" >&5
4735 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6
4736
4737 test "$cf_cv_curses_wacs_symbols" != no &&
4738@@ -18617,10 +18621,10 @@
4739
4740 fi
4741
4742-echo "$as_me:18620: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
4743+echo "$as_me:18624: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5
4744 echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
4745 cat >conftest.$ac_ext <<_ACEOF
4746-#line 18623 "configure"
4747+#line 18627 "configure"
4748 #include "confdefs.h"
4749
4750 #ifndef _XOPEN_SOURCE_EXTENDED
4751@@ -18638,16 +18642,16 @@
4752 }
4753 _ACEOF
4754 rm -f conftest.$ac_objext
4755-if { (eval echo "$as_me:18641: \"$ac_compile\"") >&5
4756+if { (eval echo "$as_me:18645: \"$ac_compile\"") >&5
4757   (eval $ac_compile) 2>&5
4758   ac_status=$?
4759-  echo "$as_me:18644: \$? = $ac_status" >&5
4760+  echo "$as_me:18648: \$? = $ac_status" >&5
4761   (exit $ac_status); } &&
4762          { ac_try='test -s conftest.$ac_objext'
4763-  { (eval echo "$as_me:18647: \"$ac_try\"") >&5
4764+  { (eval echo "$as_me:18651: \"$ac_try\"") >&5
4765   (eval $ac_try) 2>&5
4766   ac_status=$?
4767-  echo "$as_me:18650: \$? = $ac_status" >&5
4768+  echo "$as_me:18654: \$? = $ac_status" >&5
4769   (exit $ac_status); }; }; then
4770   cf_result=yes
4771 else
4772@@ -18656,7 +18660,7 @@
4773 cf_result=no
4774 fi
4775 rm -f conftest.$ac_objext conftest.$ac_ext
4776-echo "$as_me:18659: result: $cf_result" >&5
4777+echo "$as_me:18663: result: $cf_result" >&5
4778 echo "${ECHO_T}$cf_result" >&6
4779 if test $cf_result = yes ; then
4780
4781@@ -18677,14 +18681,14 @@
4782 if test "$cf_enable_widec" = yes; then
4783
4784 # This is needed on Tru64 5.0 to declare mbstate_t
4785-echo "$as_me:18680: checking if we must include wchar.h to declare mbstate_t" >&5
4786+echo "$as_me:18684: checking if we must include wchar.h to declare mbstate_t" >&5
4787 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
4788 if test "${cf_cv_mbstate_t+set}" = set; then
4789   echo $ECHO_N "(cached) $ECHO_C" >&6
4790 else
4791
4792 cat >conftest.$ac_ext <<_ACEOF
4793-#line 18687 "configure"
4794+#line 18691 "configure"
4795 #include "confdefs.h"
4796
4797 #include <stdlib.h>
4798@@ -18702,23 +18706,23 @@
4799 }
4800 _ACEOF
4801 rm -f conftest.$ac_objext
4802-if { (eval echo "$as_me:18705: \"$ac_compile\"") >&5
4803+if { (eval echo "$as_me:18709: \"$ac_compile\"") >&5
4804   (eval $ac_compile) 2>&5
4805   ac_status=$?
4806-  echo "$as_me:18708: \$? = $ac_status" >&5
4807+  echo "$as_me:18712: \$? = $ac_status" >&5
4808   (exit $ac_status); } &&
4809          { ac_try='test -s conftest.$ac_objext'
4810-  { (eval echo "$as_me:18711: \"$ac_try\"") >&5
4811+  { (eval echo "$as_me:18715: \"$ac_try\"") >&5
4812   (eval $ac_try) 2>&5
4813   ac_status=$?
4814-  echo "$as_me:18714: \$? = $ac_status" >&5
4815+  echo "$as_me:18718: \$? = $ac_status" >&5
4816   (exit $ac_status); }; }; then
4817   cf_cv_mbstate_t=no
4818 else
4819   echo "$as_me: failed program was:" >&5
4820 cat conftest.$ac_ext >&5
4821 cat >conftest.$ac_ext <<_ACEOF
4822-#line 18721 "configure"
4823+#line 18725 "configure"
4824 #include "confdefs.h"
4825
4826 #include <stdlib.h>
4827@@ -18737,16 +18741,16 @@
4828 }
4829 _ACEOF
4830 rm -f conftest.$ac_objext
4831-if { (eval echo "$as_me:18740: \"$ac_compile\"") >&5
4832+if { (eval echo "$as_me:18744: \"$ac_compile\"") >&5
4833   (eval $ac_compile) 2>&5
4834   ac_status=$?
4835-  echo "$as_me:18743: \$? = $ac_status" >&5
4836+  echo "$as_me:18747: \$? = $ac_status" >&5
4837   (exit $ac_status); } &&
4838          { ac_try='test -s conftest.$ac_objext'
4839-  { (eval echo "$as_me:18746: \"$ac_try\"") >&5
4840+  { (eval echo "$as_me:18750: \"$ac_try\"") >&5
4841   (eval $ac_try) 2>&5
4842   ac_status=$?
4843-  echo "$as_me:18749: \$? = $ac_status" >&5
4844+  echo "$as_me:18753: \$? = $ac_status" >&5
4845   (exit $ac_status); }; }; then
4846   cf_cv_mbstate_t=yes
4847 else
4848@@ -18758,7 +18762,7 @@
4849 fi
4850 rm -f conftest.$ac_objext conftest.$ac_ext
4851 fi
4852-echo "$as_me:18761: result: $cf_cv_mbstate_t" >&5
4853+echo "$as_me:18765: result: $cf_cv_mbstate_t" >&5
4854 echo "${ECHO_T}$cf_cv_mbstate_t" >&6
4855
4856 if test "$cf_cv_mbstate_t" = yes ; then
4857@@ -18781,14 +18785,14 @@
4858 fi
4859
4860 # This is needed on Tru64 5.0 to declare wchar_t
4861-echo "$as_me:18784: checking if we must include wchar.h to declare wchar_t" >&5
4862+echo "$as_me:18788: checking if we must include wchar.h to declare wchar_t" >&5
4863 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
4864 if test "${cf_cv_wchar_t+set}" = set; then
4865   echo $ECHO_N "(cached) $ECHO_C" >&6
4866 else
4867
4868 cat >conftest.$ac_ext <<_ACEOF
4869-#line 18791 "configure"
4870+#line 18795 "configure"
4871 #include "confdefs.h"
4872
4873 #include <stdlib.h>
4874@@ -18806,23 +18810,23 @@
4875 }
4876 _ACEOF
4877 rm -f conftest.$ac_objext
4878-if { (eval echo "$as_me:18809: \"$ac_compile\"") >&5
4879+if { (eval echo "$as_me:18813: \"$ac_compile\"") >&5
4880   (eval $ac_compile) 2>&5
4881   ac_status=$?
4882-  echo "$as_me:18812: \$? = $ac_status" >&5
4883+  echo "$as_me:18816: \$? = $ac_status" >&5
4884   (exit $ac_status); } &&
4885          { ac_try='test -s conftest.$ac_objext'
4886-  { (eval echo "$as_me:18815: \"$ac_try\"") >&5
4887+  { (eval echo "$as_me:18819: \"$ac_try\"") >&5
4888   (eval $ac_try) 2>&5
4889   ac_status=$?
4890-  echo "$as_me:18818: \$? = $ac_status" >&5
4891+  echo "$as_me:18822: \$? = $ac_status" >&5
4892   (exit $ac_status); }; }; then
4893   cf_cv_wchar_t=no
4894 else
4895   echo "$as_me: failed program was:" >&5
4896 cat conftest.$ac_ext >&5
4897 cat >conftest.$ac_ext <<_ACEOF
4898-#line 18825 "configure"
4899+#line 18829 "configure"
4900 #include "confdefs.h"
4901
4902 #include <stdlib.h>
4903@@ -18841,16 +18845,16 @@
4904 }
4905 _ACEOF
4906 rm -f conftest.$ac_objext
4907-if { (eval echo "$as_me:18844: \"$ac_compile\"") >&5
4908+if { (eval echo "$as_me:18848: \"$ac_compile\"") >&5
4909   (eval $ac_compile) 2>&5
4910   ac_status=$?
4911-  echo "$as_me:18847: \$? = $ac_status" >&5
4912+  echo "$as_me:18851: \$? = $ac_status" >&5
4913   (exit $ac_status); } &&
4914          { ac_try='test -s conftest.$ac_objext'
4915-  { (eval echo "$as_me:18850: \"$ac_try\"") >&5
4916+  { (eval echo "$as_me:18854: \"$ac_try\"") >&5
4917   (eval $ac_try) 2>&5
4918   ac_status=$?
4919-  echo "$as_me:18853: \$? = $ac_status" >&5
4920+  echo "$as_me:18857: \$? = $ac_status" >&5
4921   (exit $ac_status); }; }; then
4922   cf_cv_wchar_t=yes
4923 else
4924@@ -18862,7 +18866,7 @@
4925 fi
4926 rm -f conftest.$ac_objext conftest.$ac_ext
4927 fi
4928-echo "$as_me:18865: result: $cf_cv_wchar_t" >&5
4929+echo "$as_me:18869: result: $cf_cv_wchar_t" >&5
4930 echo "${ECHO_T}$cf_cv_wchar_t" >&6
4931
4932 if test "$cf_cv_wchar_t" = yes ; then
4933@@ -18885,14 +18889,14 @@
4934 fi
4935
4936 # This is needed on Tru64 5.0 to declare wint_t
4937-echo "$as_me:18888: checking if we must include wchar.h to declare wint_t" >&5
4938+echo "$as_me:18892: checking if we must include wchar.h to declare wint_t" >&5
4939 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
4940 if test "${cf_cv_wint_t+set}" = set; then
4941   echo $ECHO_N "(cached) $ECHO_C" >&6
4942 else
4943
4944 cat >conftest.$ac_ext <<_ACEOF
4945-#line 18895 "configure"
4946+#line 18899 "configure"
4947 #include "confdefs.h"
4948
4949 #include <stdlib.h>
4950@@ -18910,23 +18914,23 @@
4951 }
4952 _ACEOF
4953 rm -f conftest.$ac_objext
4954-if { (eval echo "$as_me:18913: \"$ac_compile\"") >&5
4955+if { (eval echo "$as_me:18917: \"$ac_compile\"") >&5
4956   (eval $ac_compile) 2>&5
4957   ac_status=$?
4958-  echo "$as_me:18916: \$? = $ac_status" >&5
4959+  echo "$as_me:18920: \$? = $ac_status" >&5
4960   (exit $ac_status); } &&
4961          { ac_try='test -s conftest.$ac_objext'
4962-  { (eval echo "$as_me:18919: \"$ac_try\"") >&5
4963+  { (eval echo "$as_me:18923: \"$ac_try\"") >&5
4964   (eval $ac_try) 2>&5
4965   ac_status=$?
4966-  echo "$as_me:18922: \$? = $ac_status" >&5
4967+  echo "$as_me:18926: \$? = $ac_status" >&5
4968   (exit $ac_status); }; }; then
4969   cf_cv_wint_t=no
4970 else
4971   echo "$as_me: failed program was:" >&5
4972 cat conftest.$ac_ext >&5
4973 cat >conftest.$ac_ext <<_ACEOF
4974-#line 18929 "configure"
4975+#line 18933 "configure"
4976 #include "confdefs.h"
4977
4978 #include <stdlib.h>
4979@@ -18945,16 +18949,16 @@
4980 }
4981 _ACEOF
4982 rm -f conftest.$ac_objext
4983-if { (eval echo "$as_me:18948: \"$ac_compile\"") >&5
4984+if { (eval echo "$as_me:18952: \"$ac_compile\"") >&5
4985   (eval $ac_compile) 2>&5
4986   ac_status=$?
4987-  echo "$as_me:18951: \$? = $ac_status" >&5
4988+  echo "$as_me:18955: \$? = $ac_status" >&5
4989   (exit $ac_status); } &&
4990          { ac_try='test -s conftest.$ac_objext'
4991-  { (eval echo "$as_me:18954: \"$ac_try\"") >&5
4992+  { (eval echo "$as_me:18958: \"$ac_try\"") >&5
4993   (eval $ac_try) 2>&5
4994   ac_status=$?
4995-  echo "$as_me:18957: \$? = $ac_status" >&5
4996+  echo "$as_me:18961: \$? = $ac_status" >&5
4997   (exit $ac_status); }; }; then
4998   cf_cv_wint_t=yes
4999 else
5000@@ -18966,7 +18970,7 @@
5001 fi
5002 rm -f conftest.$ac_objext conftest.$ac_ext
5003 fi
5004-echo "$as_me:18969: result: $cf_cv_wint_t" >&5
5005+echo "$as_me:18973: result: $cf_cv_wint_t" >&5
5006 echo "${ECHO_T}$cf_cv_wint_t" >&6
5007
5008 if test "$cf_cv_wint_t" = yes ; then
5009@@ -18990,10 +18994,10 @@
5010
5011 	if test "$NCURSES_OK_MBSTATE_T" = 0 ; then
5012
5013-echo "$as_me:18993: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
5014+echo "$as_me:18997: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5
5015 echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
5016 cat >conftest.$ac_ext <<_ACEOF
5017-#line 18996 "configure"
5018+#line 19000 "configure"
5019 #include "confdefs.h"
5020
5021 #ifndef _XOPEN_SOURCE_EXTENDED
5022@@ -19011,16 +19015,16 @@
5023 }
5024 _ACEOF
5025 rm -f conftest.$ac_objext
5026-if { (eval echo "$as_me:19014: \"$ac_compile\"") >&5
5027+if { (eval echo "$as_me:19018: \"$ac_compile\"") >&5
5028   (eval $ac_compile) 2>&5
5029   ac_status=$?
5030-  echo "$as_me:19017: \$? = $ac_status" >&5
5031+  echo "$as_me:19021: \$? = $ac_status" >&5
5032   (exit $ac_status); } &&
5033          { ac_try='test -s conftest.$ac_objext'
5034-  { (eval echo "$as_me:19020: \"$ac_try\"") >&5
5035+  { (eval echo "$as_me:19024: \"$ac_try\"") >&5
5036   (eval $ac_try) 2>&5
5037   ac_status=$?
5038-  echo "$as_me:19023: \$? = $ac_status" >&5
5039+  echo "$as_me:19027: \$? = $ac_status" >&5
5040   (exit $ac_status); }; }; then
5041   cf_result=yes
5042 else
5043@@ -19029,7 +19033,7 @@
5044 cf_result=no
5045 fi
5046 rm -f conftest.$ac_objext conftest.$ac_ext
5047-echo "$as_me:19032: result: $cf_result" >&5
5048+echo "$as_me:19036: result: $cf_result" >&5
5049 echo "${ECHO_T}$cf_result" >&6
5050 if test $cf_result = yes ; then
5051
5052@@ -19051,10 +19055,10 @@
5053
5054 	if test "$NCURSES_OK_WCHAR_T" = 0 ; then
5055
5056-echo "$as_me:19054: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
5057+echo "$as_me:19058: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5
5058 echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
5059 cat >conftest.$ac_ext <<_ACEOF
5060-#line 19057 "configure"
5061+#line 19061 "configure"
5062 #include "confdefs.h"
5063
5064 #ifndef _XOPEN_SOURCE_EXTENDED
5065@@ -19072,16 +19076,16 @@
5066 }
5067 _ACEOF
5068 rm -f conftest.$ac_objext
5069-if { (eval echo "$as_me:19075: \"$ac_compile\"") >&5
5070+if { (eval echo "$as_me:19079: \"$ac_compile\"") >&5
5071   (eval $ac_compile) 2>&5
5072   ac_status=$?
5073-  echo "$as_me:19078: \$? = $ac_status" >&5
5074+  echo "$as_me:19082: \$? = $ac_status" >&5
5075   (exit $ac_status); } &&
5076          { ac_try='test -s conftest.$ac_objext'
5077-  { (eval echo "$as_me:19081: \"$ac_try\"") >&5
5078+  { (eval echo "$as_me:19085: \"$ac_try\"") >&5
5079   (eval $ac_try) 2>&5
5080   ac_status=$?
5081-  echo "$as_me:19084: \$? = $ac_status" >&5
5082+  echo "$as_me:19088: \$? = $ac_status" >&5
5083   (exit $ac_status); }; }; then
5084   cf_result=yes
5085 else
5086@@ -19090,7 +19094,7 @@
5087 cf_result=no
5088 fi
5089 rm -f conftest.$ac_objext conftest.$ac_ext
5090-echo "$as_me:19093: result: $cf_result" >&5
5091+echo "$as_me:19097: result: $cf_result" >&5
5092 echo "${ECHO_T}$cf_result" >&6
5093 if test $cf_result = yes ; then
5094
5095@@ -19112,10 +19116,10 @@
5096
5097 	if test "$NCURSES_OK_WINT_T" = 0 ; then
5098
5099-echo "$as_me:19115: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
5100+echo "$as_me:19119: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5
5101 echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
5102 cat >conftest.$ac_ext <<_ACEOF
5103-#line 19118 "configure"
5104+#line 19122 "configure"
5105 #include "confdefs.h"
5106
5107 #ifndef _XOPEN_SOURCE_EXTENDED
5108@@ -19133,16 +19137,16 @@
5109 }
5110 _ACEOF
5111 rm -f conftest.$ac_objext
5112-if { (eval echo "$as_me:19136: \"$ac_compile\"") >&5
5113+if { (eval echo "$as_me:19140: \"$ac_compile\"") >&5
5114   (eval $ac_compile) 2>&5
5115   ac_status=$?
5116-  echo "$as_me:19139: \$? = $ac_status" >&5
5117+  echo "$as_me:19143: \$? = $ac_status" >&5
5118   (exit $ac_status); } &&
5119          { ac_try='test -s conftest.$ac_objext'
5120-  { (eval echo "$as_me:19142: \"$ac_try\"") >&5
5121+  { (eval echo "$as_me:19146: \"$ac_try\"") >&5
5122   (eval $ac_try) 2>&5
5123   ac_status=$?
5124-  echo "$as_me:19145: \$? = $ac_status" >&5
5125+  echo "$as_me:19149: \$? = $ac_status" >&5
5126   (exit $ac_status); }; }; then
5127   cf_result=yes
5128 else
5129@@ -19151,7 +19155,7 @@
5130 cf_result=no
5131 fi
5132 rm -f conftest.$ac_objext conftest.$ac_ext
5133-echo "$as_me:19154: result: $cf_result" >&5
5134+echo "$as_me:19158: result: $cf_result" >&5
5135 echo "${ECHO_T}$cf_result" >&6
5136 if test $cf_result = yes ; then
5137
5138@@ -19180,11 +19184,11 @@
5139 boolfnames \
5140 ttytype
5141 do
5142-echo "$as_me:19183: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
5143+echo "$as_me:19187: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5
5144 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6
5145
5146 cat >conftest.$ac_ext <<_ACEOF
5147-#line 19187 "configure"
5148+#line 19191 "configure"
5149 #include "confdefs.h"
5150
5151 #ifdef HAVE_XCURSES
5152@@ -19212,16 +19216,16 @@
5153 }
5154 _ACEOF
5155 rm -f conftest.$ac_objext
5156-if { (eval echo "$as_me:19215: \"$ac_compile\"") >&5
5157+if { (eval echo "$as_me:19219: \"$ac_compile\"") >&5
5158   (eval $ac_compile) 2>&5
5159   ac_status=$?
5160-  echo "$as_me:19218: \$? = $ac_status" >&5
5161+  echo "$as_me:19222: \$? = $ac_status" >&5
5162   (exit $ac_status); } &&
5163          { ac_try='test -s conftest.$ac_objext'
5164-  { (eval echo "$as_me:19221: \"$ac_try\"") >&5
5165+  { (eval echo "$as_me:19225: \"$ac_try\"") >&5
5166   (eval $ac_try) 2>&5
5167   ac_status=$?
5168-  echo "$as_me:19224: \$? = $ac_status" >&5
5169+  echo "$as_me:19228: \$? = $ac_status" >&5
5170   (exit $ac_status); }; }; then
5171   cf_result=yes
5172
5173@@ -19231,7 +19235,7 @@
5174 cf_result=no
5175 fi
5176 rm -f conftest.$ac_objext conftest.$ac_ext
5177-echo "$as_me:19234: result: $cf_result" >&5
5178+echo "$as_me:19238: result: $cf_result" >&5
5179 echo "${ECHO_T}$cf_result" >&6
5180
5181 if test $cf_result = yes ; then
5182@@ -19243,14 +19247,14 @@
5183 EOF
5184
5185 else
5186-	echo "$as_me:19246: checking for data $cf_data in library" >&5
5187+	echo "$as_me:19250: checking for data $cf_data in library" >&5
5188 echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6
5189 	# BSD linkers insist on making weak linkage, but resolve at runtime.
5190 	if test "$cross_compiling" = yes; then
5191
5192 	# cross-compiling
5193 	cat >conftest.$ac_ext <<_ACEOF
5194-#line 19253 "configure"
5195+#line 19257 "configure"
5196 #include "confdefs.h"
5197
5198 #ifdef HAVE_XCURSES
5199@@ -19283,16 +19287,16 @@
5200 }
5201 _ACEOF
5202 rm -f conftest.$ac_objext conftest$ac_exeext
5203-if { (eval echo "$as_me:19286: \"$ac_link\"") >&5
5204+if { (eval echo "$as_me:19290: \"$ac_link\"") >&5
5205   (eval $ac_link) 2>&5
5206   ac_status=$?
5207-  echo "$as_me:19289: \$? = $ac_status" >&5
5208+  echo "$as_me:19293: \$? = $ac_status" >&5
5209   (exit $ac_status); } &&
5210          { ac_try='test -s conftest$ac_exeext'
5211-  { (eval echo "$as_me:19292: \"$ac_try\"") >&5
5212+  { (eval echo "$as_me:19296: \"$ac_try\"") >&5
5213   (eval $ac_try) 2>&5
5214   ac_status=$?
5215-  echo "$as_me:19295: \$? = $ac_status" >&5
5216+  echo "$as_me:19299: \$? = $ac_status" >&5
5217   (exit $ac_status); }; }; then
5218   cf_result=yes
5219 else
5220@@ -19304,7 +19308,7 @@
5221
5222 else
5223   cat >conftest.$ac_ext <<_ACEOF
5224-#line 19307 "configure"
5225+#line 19311 "configure"
5226 #include "confdefs.h"
5227
5228 #ifdef HAVE_XCURSES
5229@@ -19330,15 +19334,15 @@
5230 }
5231 _ACEOF
5232 rm -f conftest$ac_exeext
5233-if { (eval echo "$as_me:19333: \"$ac_link\"") >&5
5234+if { (eval echo "$as_me:19337: \"$ac_link\"") >&5
5235   (eval $ac_link) 2>&5
5236   ac_status=$?
5237-  echo "$as_me:19336: \$? = $ac_status" >&5
5238+  echo "$as_me:19340: \$? = $ac_status" >&5
5239   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
5240-  { (eval echo "$as_me:19338: \"$ac_try\"") >&5
5241+  { (eval echo "$as_me:19342: \"$ac_try\"") >&5
5242   (eval $ac_try) 2>&5
5243   ac_status=$?
5244-  echo "$as_me:19341: \$? = $ac_status" >&5
5245+  echo "$as_me:19345: \$? = $ac_status" >&5
5246   (exit $ac_status); }; }; then
5247   cf_result=yes
5248
5249@@ -19350,7 +19354,7 @@
5250 fi
5251 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
5252 fi
5253-	echo "$as_me:19353: result: $cf_result" >&5
5254+	echo "$as_me:19357: result: $cf_result" >&5
5255 echo "${ECHO_T}$cf_result" >&6
5256 	if test $cf_result = yes ; then
5257
5258@@ -19367,7 +19371,7 @@
5259
5260 if ( test "$GCC" = yes || test "$GXX" = yes )
5261 then
5262-echo "$as_me:19370: checking if you want to turn on gcc warnings" >&5
5263+echo "$as_me:19374: checking if you want to turn on gcc warnings" >&5
5264 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
5265
5266 # Check whether --enable-warnings or --disable-warnings was given.
5267@@ -19384,7 +19388,7 @@
5268 	with_warnings=no
5269
5270 fi;
5271-echo "$as_me:19387: result: $with_warnings" >&5
5272+echo "$as_me:19391: result: $with_warnings" >&5
5273 echo "${ECHO_T}$with_warnings" >&6
5274 if test "$with_warnings" = "yes"
5275 then
5276@@ -19407,10 +19411,10 @@
5277 EOF
5278 if test "$GCC" = yes
5279 then
5280-	{ echo "$as_me:19410: checking for $CC __attribute__ directives..." >&5
5281+	{ echo "$as_me:19414: checking for $CC __attribute__ directives..." >&5
5282 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
5283 cat > conftest.$ac_ext <<EOF
5284-#line 19413 "${as_me:-configure}"
5285+#line 19417 "${as_me:-configure}"
5286 #include "confdefs.h"
5287 #include "conftest.h"
5288 #include "conftest.i"
5289@@ -19459,12 +19463,12 @@
5290 			;;
5291 		esac
5292
5293-		if { (eval echo "$as_me:19462: \"$ac_compile\"") >&5
5294+		if { (eval echo "$as_me:19466: \"$ac_compile\"") >&5
5295   (eval $ac_compile) 2>&5
5296   ac_status=$?
5297-  echo "$as_me:19465: \$? = $ac_status" >&5
5298+  echo "$as_me:19469: \$? = $ac_status" >&5
5299   (exit $ac_status); }; then
5300-			test -n "$verbose" && echo "$as_me:19467: result: ... $cf_attribute" >&5
5301+			test -n "$verbose" && echo "$as_me:19471: result: ... $cf_attribute" >&5
5302 echo "${ECHO_T}... $cf_attribute" >&6
5303 			cat conftest.h >>confdefs.h
5304 			case $cf_attribute in
5305@@ -19528,12 +19532,12 @@
5306 if test "$GCC" = yes ; then
5307 	case $host_os in
5308 	(linux*|gnu*)
5309-		echo "$as_me:19531: checking if this is really Intel C compiler" >&5
5310+		echo "$as_me:19535: checking if this is really Intel C compiler" >&5
5311 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
5312 		cf_save_CFLAGS="$CFLAGS"
5313 		CFLAGS="$CFLAGS -no-gcc"
5314 		cat >conftest.$ac_ext <<_ACEOF
5315-#line 19536 "configure"
5316+#line 19540 "configure"
5317 #include "confdefs.h"
5318
5319 int
5320@@ -19550,16 +19554,16 @@
5321 }
5322 _ACEOF
5323 rm -f conftest.$ac_objext
5324-if { (eval echo "$as_me:19553: \"$ac_compile\"") >&5
5325+if { (eval echo "$as_me:19557: \"$ac_compile\"") >&5
5326   (eval $ac_compile) 2>&5
5327   ac_status=$?
5328-  echo "$as_me:19556: \$? = $ac_status" >&5
5329+  echo "$as_me:19560: \$? = $ac_status" >&5
5330   (exit $ac_status); } &&
5331          { ac_try='test -s conftest.$ac_objext'
5332-  { (eval echo "$as_me:19559: \"$ac_try\"") >&5
5333+  { (eval echo "$as_me:19563: \"$ac_try\"") >&5
5334   (eval $ac_try) 2>&5
5335   ac_status=$?
5336-  echo "$as_me:19562: \$? = $ac_status" >&5
5337+  echo "$as_me:19566: \$? = $ac_status" >&5
5338   (exit $ac_status); }; }; then
5339   INTEL_COMPILER=yes
5340 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
5341@@ -19570,7 +19574,7 @@
5342 fi
5343 rm -f conftest.$ac_objext conftest.$ac_ext
5344 		CFLAGS="$cf_save_CFLAGS"
5345-		echo "$as_me:19573: result: $INTEL_COMPILER" >&5
5346+		echo "$as_me:19577: result: $INTEL_COMPILER" >&5
5347 echo "${ECHO_T}$INTEL_COMPILER" >&6
5348 		;;
5349 	esac
5350@@ -19579,12 +19583,12 @@
5351 CLANG_COMPILER=no
5352
5353 if test "$GCC" = yes ; then
5354-	echo "$as_me:19582: checking if this is really Clang C compiler" >&5
5355+	echo "$as_me:19586: checking if this is really Clang C compiler" >&5
5356 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
5357 	cf_save_CFLAGS="$CFLAGS"
5358 	CFLAGS="$CFLAGS -Qunused-arguments"
5359 	cat >conftest.$ac_ext <<_ACEOF
5360-#line 19587 "configure"
5361+#line 19591 "configure"
5362 #include "confdefs.h"
5363
5364 int
5365@@ -19601,16 +19605,16 @@
5366 }
5367 _ACEOF
5368 rm -f conftest.$ac_objext
5369-if { (eval echo "$as_me:19604: \"$ac_compile\"") >&5
5370+if { (eval echo "$as_me:19608: \"$ac_compile\"") >&5
5371   (eval $ac_compile) 2>&5
5372   ac_status=$?
5373-  echo "$as_me:19607: \$? = $ac_status" >&5
5374+  echo "$as_me:19611: \$? = $ac_status" >&5
5375   (exit $ac_status); } &&
5376          { ac_try='test -s conftest.$ac_objext'
5377-  { (eval echo "$as_me:19610: \"$ac_try\"") >&5
5378+  { (eval echo "$as_me:19614: \"$ac_try\"") >&5
5379   (eval $ac_try) 2>&5
5380   ac_status=$?
5381-  echo "$as_me:19613: \$? = $ac_status" >&5
5382+  echo "$as_me:19617: \$? = $ac_status" >&5
5383   (exit $ac_status); }; }; then
5384   CLANG_COMPILER=yes
5385 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
5386@@ -19621,12 +19625,12 @@
5387 fi
5388 rm -f conftest.$ac_objext conftest.$ac_ext
5389 	CFLAGS="$cf_save_CFLAGS"
5390-	echo "$as_me:19624: result: $CLANG_COMPILER" >&5
5391+	echo "$as_me:19628: result: $CLANG_COMPILER" >&5
5392 echo "${ECHO_T}$CLANG_COMPILER" >&6
5393 fi
5394
5395 cat > conftest.$ac_ext <<EOF
5396-#line 19629 "${as_me:-configure}"
5397+#line 19633 "${as_me:-configure}"
5398 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
5399 EOF
5400
5401@@ -19643,7 +19647,7 @@
5402 # remark #981: operands are evaluated in unspecified order
5403 # warning #279: controlling expression is constant
5404
5405-	{ echo "$as_me:19646: checking for $CC warning options..." >&5
5406+	{ echo "$as_me:19650: checking for $CC warning options..." >&5
5407 echo "$as_me: checking for $CC warning options..." >&6;}
5408 	cf_save_CFLAGS="$CFLAGS"
5409 	EXTRA_CFLAGS="-Wall"
5410@@ -19659,12 +19663,12 @@
5411 		wd981
5412 	do
5413 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
5414-		if { (eval echo "$as_me:19662: \"$ac_compile\"") >&5
5415+		if { (eval echo "$as_me:19666: \"$ac_compile\"") >&5
5416   (eval $ac_compile) 2>&5
5417   ac_status=$?
5418-  echo "$as_me:19665: \$? = $ac_status" >&5
5419+  echo "$as_me:19669: \$? = $ac_status" >&5
5420   (exit $ac_status); }; then
5421-			test -n "$verbose" && echo "$as_me:19667: result: ... -$cf_opt" >&5
5422+			test -n "$verbose" && echo "$as_me:19671: result: ... -$cf_opt" >&5
5423 echo "${ECHO_T}... -$cf_opt" >&6
5424 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
5425 		fi
5426@@ -19673,7 +19677,7 @@
5427
5428 elif test "$GCC" = yes
5429 then
5430-	{ echo "$as_me:19676: checking for $CC warning options..." >&5
5431+	{ echo "$as_me:19680: checking for $CC warning options..." >&5
5432 echo "$as_me: checking for $CC warning options..." >&6;}
5433 	cf_save_CFLAGS="$CFLAGS"
5434 	EXTRA_CFLAGS=
5435@@ -19697,12 +19701,12 @@
5436 		Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas
5437 	do
5438 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
5439-		if { (eval echo "$as_me:19700: \"$ac_compile\"") >&5
5440+		if { (eval echo "$as_me:19704: \"$ac_compile\"") >&5
5441   (eval $ac_compile) 2>&5
5442   ac_status=$?
5443-  echo "$as_me:19703: \$? = $ac_status" >&5
5444+  echo "$as_me:19707: \$? = $ac_status" >&5
5445   (exit $ac_status); }; then
5446-			test -n "$verbose" && echo "$as_me:19705: result: ... -$cf_opt" >&5
5447+			test -n "$verbose" && echo "$as_me:19709: result: ... -$cf_opt" >&5
5448 echo "${ECHO_T}... -$cf_opt" >&6
5449 			case $cf_opt in
5450 			(Wcast-qual)
5451@@ -19716,7 +19720,7 @@
5452 				([34].*)
5453 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
5454
5455-echo "${as_me:-configure}:19719: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
5456+echo "${as_me:-configure}:19723: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
5457
5458 					continue;;
5459 				esac
5460@@ -19726,7 +19730,7 @@
5461 				([12].*)
5462 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
5463
5464-echo "${as_me:-configure}:19729: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
5465+echo "${as_me:-configure}:19733: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
5466
5467 					continue;;
5468 				esac
5469@@ -19742,7 +19746,7 @@
5470 fi
5471 fi
5472
5473-echo "$as_me:19745: checking if you want to use dmalloc for testing" >&5
5474+echo "$as_me:19749: checking if you want to use dmalloc for testing" >&5
5475 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
5476
5477 # Check whether --with-dmalloc or --without-dmalloc was given.
5478@@ -19759,7 +19763,7 @@
5479 else
5480   with_dmalloc=
5481 fi;
5482-echo "$as_me:19762: result: ${with_dmalloc:-no}" >&5
5483+echo "$as_me:19766: result: ${with_dmalloc:-no}" >&5
5484 echo "${ECHO_T}${with_dmalloc:-no}" >&6
5485
5486 case .$with_cflags in
5487@@ -19873,23 +19877,23 @@
5488 esac
5489
5490 if test "$with_dmalloc" = yes ; then
5491-	echo "$as_me:19876: checking for dmalloc.h" >&5
5492+	echo "$as_me:19880: checking for dmalloc.h" >&5
5493 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
5494 if test "${ac_cv_header_dmalloc_h+set}" = set; then
5495   echo $ECHO_N "(cached) $ECHO_C" >&6
5496 else
5497   cat >conftest.$ac_ext <<_ACEOF
5498-#line 19882 "configure"
5499+#line 19886 "configure"
5500 #include "confdefs.h"
5501 #include <dmalloc.h>
5502 _ACEOF
5503-if { (eval echo "$as_me:19886: \"$ac_cpp conftest.$ac_ext\"") >&5
5504+if { (eval echo "$as_me:19890: \"$ac_cpp conftest.$ac_ext\"") >&5
5505   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
5506   ac_status=$?
5507   egrep -v '^ *\+' conftest.er1 >conftest.err
5508   rm -f conftest.er1
5509   cat conftest.err >&5
5510-  echo "$as_me:19892: \$? = $ac_status" >&5
5511+  echo "$as_me:19896: \$? = $ac_status" >&5
5512   (exit $ac_status); } >/dev/null; then
5513   if test -s conftest.err; then
5514     ac_cpp_err=$ac_c_preproc_warn_flag
5515@@ -19908,11 +19912,11 @@
5516 fi
5517 rm -f conftest.err conftest.$ac_ext
5518 fi
5519-echo "$as_me:19911: result: $ac_cv_header_dmalloc_h" >&5
5520+echo "$as_me:19915: result: $ac_cv_header_dmalloc_h" >&5
5521 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
5522 if test $ac_cv_header_dmalloc_h = yes; then
5523
5524-echo "$as_me:19915: checking for dmalloc_debug in -ldmalloc" >&5
5525+echo "$as_me:19919: checking for dmalloc_debug in -ldmalloc" >&5
5526 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
5527 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
5528   echo $ECHO_N "(cached) $ECHO_C" >&6
5529@@ -19920,7 +19924,7 @@
5530   ac_check_lib_save_LIBS=$LIBS
5531 LIBS="-ldmalloc  $LIBS"
5532 cat >conftest.$ac_ext <<_ACEOF
5533-#line 19923 "configure"
5534+#line 19927 "configure"
5535 #include "confdefs.h"
5536
5537 /* Override any gcc2 internal prototype to avoid an error.  */
5538@@ -19939,16 +19943,16 @@
5539 }
5540 _ACEOF
5541 rm -f conftest.$ac_objext conftest$ac_exeext
5542-if { (eval echo "$as_me:19942: \"$ac_link\"") >&5
5543+if { (eval echo "$as_me:19946: \"$ac_link\"") >&5
5544   (eval $ac_link) 2>&5
5545   ac_status=$?
5546-  echo "$as_me:19945: \$? = $ac_status" >&5
5547+  echo "$as_me:19949: \$? = $ac_status" >&5
5548   (exit $ac_status); } &&
5549          { ac_try='test -s conftest$ac_exeext'
5550-  { (eval echo "$as_me:19948: \"$ac_try\"") >&5
5551+  { (eval echo "$as_me:19952: \"$ac_try\"") >&5
5552   (eval $ac_try) 2>&5
5553   ac_status=$?
5554-  echo "$as_me:19951: \$? = $ac_status" >&5
5555+  echo "$as_me:19955: \$? = $ac_status" >&5
5556   (exit $ac_status); }; }; then
5557   ac_cv_lib_dmalloc_dmalloc_debug=yes
5558 else
5559@@ -19959,7 +19963,7 @@
5560 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5561 LIBS=$ac_check_lib_save_LIBS
5562 fi
5563-echo "$as_me:19962: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
5564+echo "$as_me:19966: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
5565 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
5566 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
5567   cat >>confdefs.h <<EOF
5568@@ -19974,7 +19978,7 @@
5569
5570 fi
5571
5572-echo "$as_me:19977: checking if you want to use dbmalloc for testing" >&5
5573+echo "$as_me:19981: checking if you want to use dbmalloc for testing" >&5
5574 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
5575
5576 # Check whether --with-dbmalloc or --without-dbmalloc was given.
5577@@ -19991,7 +19995,7 @@
5578 else
5579   with_dbmalloc=
5580 fi;
5581-echo "$as_me:19994: result: ${with_dbmalloc:-no}" >&5
5582+echo "$as_me:19998: result: ${with_dbmalloc:-no}" >&5
5583 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
5584
5585 case .$with_cflags in
5586@@ -20105,23 +20109,23 @@
5587 esac
5588
5589 if test "$with_dbmalloc" = yes ; then
5590-	echo "$as_me:20108: checking for dbmalloc.h" >&5
5591+	echo "$as_me:20112: checking for dbmalloc.h" >&5
5592 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
5593 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
5594   echo $ECHO_N "(cached) $ECHO_C" >&6
5595 else
5596   cat >conftest.$ac_ext <<_ACEOF
5597-#line 20114 "configure"
5598+#line 20118 "configure"
5599 #include "confdefs.h"
5600 #include <dbmalloc.h>
5601 _ACEOF
5602-if { (eval echo "$as_me:20118: \"$ac_cpp conftest.$ac_ext\"") >&5
5603+if { (eval echo "$as_me:20122: \"$ac_cpp conftest.$ac_ext\"") >&5
5604   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
5605   ac_status=$?
5606   egrep -v '^ *\+' conftest.er1 >conftest.err
5607   rm -f conftest.er1
5608   cat conftest.err >&5
5609-  echo "$as_me:20124: \$? = $ac_status" >&5
5610+  echo "$as_me:20128: \$? = $ac_status" >&5
5611   (exit $ac_status); } >/dev/null; then
5612   if test -s conftest.err; then
5613     ac_cpp_err=$ac_c_preproc_warn_flag
5614@@ -20140,11 +20144,11 @@
5615 fi
5616 rm -f conftest.err conftest.$ac_ext
5617 fi
5618-echo "$as_me:20143: result: $ac_cv_header_dbmalloc_h" >&5
5619+echo "$as_me:20147: result: $ac_cv_header_dbmalloc_h" >&5
5620 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
5621 if test $ac_cv_header_dbmalloc_h = yes; then
5622
5623-echo "$as_me:20147: checking for debug_malloc in -ldbmalloc" >&5
5624+echo "$as_me:20151: checking for debug_malloc in -ldbmalloc" >&5
5625 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
5626 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
5627   echo $ECHO_N "(cached) $ECHO_C" >&6
5628@@ -20152,7 +20156,7 @@
5629   ac_check_lib_save_LIBS=$LIBS
5630 LIBS="-ldbmalloc  $LIBS"
5631 cat >conftest.$ac_ext <<_ACEOF
5632-#line 20155 "configure"
5633+#line 20159 "configure"
5634 #include "confdefs.h"
5635
5636 /* Override any gcc2 internal prototype to avoid an error.  */
5637@@ -20171,16 +20175,16 @@
5638 }
5639 _ACEOF
5640 rm -f conftest.$ac_objext conftest$ac_exeext
5641-if { (eval echo "$as_me:20174: \"$ac_link\"") >&5
5642+if { (eval echo "$as_me:20178: \"$ac_link\"") >&5
5643   (eval $ac_link) 2>&5
5644   ac_status=$?
5645-  echo "$as_me:20177: \$? = $ac_status" >&5
5646+  echo "$as_me:20181: \$? = $ac_status" >&5
5647   (exit $ac_status); } &&
5648          { ac_try='test -s conftest$ac_exeext'
5649-  { (eval echo "$as_me:20180: \"$ac_try\"") >&5
5650+  { (eval echo "$as_me:20184: \"$ac_try\"") >&5
5651   (eval $ac_try) 2>&5
5652   ac_status=$?
5653-  echo "$as_me:20183: \$? = $ac_status" >&5
5654+  echo "$as_me:20187: \$? = $ac_status" >&5
5655   (exit $ac_status); }; }; then
5656   ac_cv_lib_dbmalloc_debug_malloc=yes
5657 else
5658@@ -20191,7 +20195,7 @@
5659 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5660 LIBS=$ac_check_lib_save_LIBS
5661 fi
5662-echo "$as_me:20194: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
5663+echo "$as_me:20198: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
5664 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
5665 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
5666   cat >>confdefs.h <<EOF
5667@@ -20206,7 +20210,7 @@
5668
5669 fi
5670
5671-echo "$as_me:20209: checking if you want to use valgrind for testing" >&5
5672+echo "$as_me:20213: checking if you want to use valgrind for testing" >&5
5673 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
5674
5675 # Check whether --with-valgrind or --without-valgrind was given.
5676@@ -20223,7 +20227,7 @@
5677 else
5678   with_valgrind=
5679 fi;
5680-echo "$as_me:20226: result: ${with_valgrind:-no}" >&5
5681+echo "$as_me:20230: result: ${with_valgrind:-no}" >&5
5682 echo "${ECHO_T}${with_valgrind:-no}" >&6
5683
5684 case .$with_cflags in
5685@@ -20336,7 +20340,7 @@
5686 	;;
5687 esac
5688
5689-echo "$as_me:20339: checking if you want to perform memory-leak testing" >&5
5690+echo "$as_me:20343: checking if you want to perform memory-leak testing" >&5
5691 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
5692
5693 # Check whether --enable-leaks or --disable-leaks was given.
5694@@ -20346,7 +20350,7 @@
5695 else
5696   : ${with_no_leaks:=no}
5697 fi;
5698-echo "$as_me:20349: result: $with_no_leaks" >&5
5699+echo "$as_me:20353: result: $with_no_leaks" >&5
5700 echo "${ECHO_T}$with_no_leaks" >&6
5701
5702 if test "$with_no_leaks" = yes ; then
5703@@ -20364,7 +20368,7 @@
5704 LD_RPATH_OPT=
5705 if test "x$cf_cv_enable_rpath" != xno
5706 then
5707-	echo "$as_me:20367: checking for an rpath option" >&5
5708+	echo "$as_me:20371: checking for an rpath option" >&5
5709 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
5710 	case $cf_cv_system_name in
5711 	(irix*)
5712@@ -20395,12 +20399,12 @@
5713 	(*)
5714 		;;
5715 	esac
5716-	echo "$as_me:20398: result: $LD_RPATH_OPT" >&5
5717+	echo "$as_me:20402: result: $LD_RPATH_OPT" >&5
5718 echo "${ECHO_T}$LD_RPATH_OPT" >&6
5719
5720 	case "x$LD_RPATH_OPT" in
5721 	(x-R*)
5722-		echo "$as_me:20403: checking if we need a space after rpath option" >&5
5723+		echo "$as_me:20407: checking if we need a space after rpath option" >&5
5724 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
5725 		cf_save_LIBS="$LIBS"
5726
5727@@ -20421,7 +20425,7 @@
5728 LIBS="$cf_add_libs"
5729
5730 		cat >conftest.$ac_ext <<_ACEOF
5731-#line 20424 "configure"
5732+#line 20428 "configure"
5733 #include "confdefs.h"
5734
5735 int
5736@@ -20433,16 +20437,16 @@
5737 }
5738 _ACEOF
5739 rm -f conftest.$ac_objext conftest$ac_exeext
5740-if { (eval echo "$as_me:20436: \"$ac_link\"") >&5
5741+if { (eval echo "$as_me:20440: \"$ac_link\"") >&5
5742   (eval $ac_link) 2>&5
5743   ac_status=$?
5744-  echo "$as_me:20439: \$? = $ac_status" >&5
5745+  echo "$as_me:20443: \$? = $ac_status" >&5
5746   (exit $ac_status); } &&
5747          { ac_try='test -s conftest$ac_exeext'
5748-  { (eval echo "$as_me:20442: \"$ac_try\"") >&5
5749+  { (eval echo "$as_me:20446: \"$ac_try\"") >&5
5750   (eval $ac_try) 2>&5
5751   ac_status=$?
5752-  echo "$as_me:20445: \$? = $ac_status" >&5
5753+  echo "$as_me:20449: \$? = $ac_status" >&5
5754   (exit $ac_status); }; }; then
5755   cf_rpath_space=no
5756 else
5757@@ -20452,14 +20456,14 @@
5758 fi
5759 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
5760 		LIBS="$cf_save_LIBS"
5761-		echo "$as_me:20455: result: $cf_rpath_space" >&5
5762+		echo "$as_me:20459: result: $cf_rpath_space" >&5
5763 echo "${ECHO_T}$cf_rpath_space" >&6
5764 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
5765 		;;
5766 	esac
5767 fi
5768
5769-echo "$as_me:20462: checking if rpath-hack should be disabled" >&5
5770+echo "$as_me:20466: checking if rpath-hack should be disabled" >&5
5771 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
5772
5773 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
5774@@ -20476,21 +20480,21 @@
5775 	cf_disable_rpath_hack=no
5776
5777 fi;
5778-echo "$as_me:20479: result: $cf_disable_rpath_hack" >&5
5779+echo "$as_me:20483: result: $cf_disable_rpath_hack" >&5
5780 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
5781 if test "$cf_disable_rpath_hack" = no ; then
5782
5783-echo "$as_me:20483: checking for updated LDFLAGS" >&5
5784+echo "$as_me:20487: checking for updated LDFLAGS" >&5
5785 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
5786 if test -n "$LD_RPATH_OPT" ; then
5787-	echo "$as_me:20486: result: maybe" >&5
5788+	echo "$as_me:20490: result: maybe" >&5
5789 echo "${ECHO_T}maybe" >&6
5790
5791 	for ac_prog in ldd
5792 do
5793   # Extract the first word of "$ac_prog", so it can be a program name with args.
5794 set dummy $ac_prog; ac_word=$2
5795-echo "$as_me:20493: checking for $ac_word" >&5
5796+echo "$as_me:20497: checking for $ac_word" >&5
5797 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5798 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
5799   echo $ECHO_N "(cached) $ECHO_C" >&6
5800@@ -20505,7 +20509,7 @@
5801   test -z "$ac_dir" && ac_dir=.
5802   $as_executable_p "$ac_dir/$ac_word" || continue
5803 ac_cv_prog_cf_ldd_prog="$ac_prog"
5804-echo "$as_me:20508: found $ac_dir/$ac_word" >&5
5805+echo "$as_me:20512: found $ac_dir/$ac_word" >&5
5806 break
5807 done
5808
5809@@ -20513,10 +20517,10 @@
5810 fi
5811 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
5812 if test -n "$cf_ldd_prog"; then
5813-  echo "$as_me:20516: result: $cf_ldd_prog" >&5
5814+  echo "$as_me:20520: result: $cf_ldd_prog" >&5
5815 echo "${ECHO_T}$cf_ldd_prog" >&6
5816 else
5817-  echo "$as_me:20519: result: no" >&5
5818+  echo "$as_me:20523: result: no" >&5
5819 echo "${ECHO_T}no" >&6
5820 fi
5821
5822@@ -20530,7 +20534,7 @@
5823 		cf_rpath_oops=
5824
5825 cat >conftest.$ac_ext <<_ACEOF
5826-#line 20533 "configure"
5827+#line 20537 "configure"
5828 #include "confdefs.h"
5829 #include <stdio.h>
5830 int
5831@@ -20542,16 +20546,16 @@
5832 }
5833 _ACEOF
5834 rm -f conftest.$ac_objext conftest$ac_exeext
5835-if { (eval echo "$as_me:20545: \"$ac_link\"") >&5
5836+if { (eval echo "$as_me:20549: \"$ac_link\"") >&5
5837   (eval $ac_link) 2>&5
5838   ac_status=$?
5839-  echo "$as_me:20548: \$? = $ac_status" >&5
5840+  echo "$as_me:20552: \$? = $ac_status" >&5
5841   (exit $ac_status); } &&
5842          { ac_try='test -s conftest$ac_exeext'
5843-  { (eval echo "$as_me:20551: \"$ac_try\"") >&5
5844+  { (eval echo "$as_me:20555: \"$ac_try\"") >&5
5845   (eval $ac_try) 2>&5
5846   ac_status=$?
5847-  echo "$as_me:20554: \$? = $ac_status" >&5
5848+  echo "$as_me:20558: \$? = $ac_status" >&5
5849   (exit $ac_status); }; }; then
5850   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
5851 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
5852@@ -20579,7 +20583,7 @@
5853 					then
5854 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
5855
5856-echo "${as_me:-configure}:20582: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
5857+echo "${as_me:-configure}:20586: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
5858
5859 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
5860 						break
5861@@ -20591,11 +20595,11 @@
5862
5863 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
5864
5865-echo "${as_me:-configure}:20594: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
5866+echo "${as_me:-configure}:20598: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
5867
5868 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
5869
5870-echo "${as_me:-configure}:20598: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
5871+echo "${as_me:-configure}:20602: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
5872
5873 cf_rpath_dst=
5874 for cf_rpath_src in $LDFLAGS
5875@@ -20632,7 +20636,7 @@
5876 			then
5877 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
5878
5879-echo "${as_me:-configure}:20635: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
5880+echo "${as_me:-configure}:20639: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
5881
5882 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
5883 			fi
5884@@ -20645,11 +20649,11 @@
5885
5886 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
5887
5888-echo "${as_me:-configure}:20648: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
5889+echo "${as_me:-configure}:20652: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
5890
5891 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
5892
5893-echo "${as_me:-configure}:20652: testing ...checking LIBS $LIBS ..." 1>&5
5894+echo "${as_me:-configure}:20656: testing ...checking LIBS $LIBS ..." 1>&5
5895
5896 cf_rpath_dst=
5897 for cf_rpath_src in $LIBS
5898@@ -20686,7 +20690,7 @@
5899 			then
5900 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
5901
5902-echo "${as_me:-configure}:20689: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
5903+echo "${as_me:-configure}:20693: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
5904
5905 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
5906 			fi
5907@@ -20699,14 +20703,14 @@
5908
5909 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
5910
5911-echo "${as_me:-configure}:20702: testing ...checked LIBS $LIBS ..." 1>&5
5912+echo "${as_me:-configure}:20706: testing ...checked LIBS $LIBS ..." 1>&5
5913
5914 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
5915
5916-echo "${as_me:-configure}:20706: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
5917+echo "${as_me:-configure}:20710: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
5918
5919 else
5920-	echo "$as_me:20709: result: no" >&5
5921+	echo "$as_me:20713: result: no" >&5
5922 echo "${ECHO_T}no" >&6
5923 fi
5924
5925@@ -20796,7 +20800,7 @@
5926 : ${CONFIG_STATUS=./config.status}
5927 ac_clean_files_save=$ac_clean_files
5928 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
5929-{ echo "$as_me:20799: creating $CONFIG_STATUS" >&5
5930+{ echo "$as_me:20803: creating $CONFIG_STATUS" >&5
5931 echo "$as_me: creating $CONFIG_STATUS" >&6;}
5932 cat >$CONFIG_STATUS <<_ACEOF
5933 #! $SHELL
5934@@ -20928,7 +20932,7 @@
5935 cat >>$CONFIG_STATUS <<EOF
5936 ac_cs_version="\\
5937 config.status
5938-configured by $0, generated by GNU Autoconf 2.52.20181006,
5939+configured by $0, generated by GNU Autoconf 2.52.20190828,
5940   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
5941
5942 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
5943@@ -20972,7 +20976,7 @@
5944     echo "$ac_cs_version"; exit 0 ;;
5945   --he | --h)
5946     # Conflict between --help and --header
5947-    { { echo "$as_me:20975: error: ambiguous option: $1
5948+    { { echo "$as_me:20979: error: ambiguous option: $1
5949 Try \`$0 --help' for more information." >&5
5950 echo "$as_me: error: ambiguous option: $1
5951 Try \`$0 --help' for more information." >&2;}
5952@@ -20991,7 +20995,7 @@
5953     ac_need_defaults=false;;
5954
5955   # This is an error.
5956-  -*) { { echo "$as_me:20994: error: unrecognized option: $1
5957+  -*) { { echo "$as_me:20998: error: unrecognized option: $1
5958 Try \`$0 --help' for more information." >&5
5959 echo "$as_me: error: unrecognized option: $1
5960 Try \`$0 --help' for more information." >&2;}
5961@@ -21010,7 +21014,7 @@
5962 ## Running config.status.  ##
5963 ## ----------------------- ##
5964
5965-This file was extended by $as_me 2.52.20181006, executed with
5966+This file was extended by $as_me 2.52.20190828, executed with
5967   CONFIG_FILES    = $CONFIG_FILES
5968   CONFIG_HEADERS  = $CONFIG_HEADERS
5969   CONFIG_LINKS    = $CONFIG_LINKS
5970@@ -21041,7 +21045,7 @@
5971   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
5972   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
5973   "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
5974-  *) { { echo "$as_me:21044: error: invalid argument: $ac_config_target" >&5
5975+  *) { { echo "$as_me:21048: error: invalid argument: $ac_config_target" >&5
5976 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
5977    { (exit 1); exit 1; }; };;
5978   esac
5979@@ -21337,7 +21341,7 @@
5980   esac
5981
5982   if test x"$ac_file" != x-; then
5983-    { echo "$as_me:21340: creating $ac_file" >&5
5984+    { echo "$as_me:21344: creating $ac_file" >&5
5985 echo "$as_me: creating $ac_file" >&6;}
5986     rm -f "$ac_file"
5987   fi
5988@@ -21355,7 +21359,7 @@
5989       -) echo $tmp/stdin ;;
5990       [\\/$]*)
5991          # Absolute (can't be DOS-style, as IFS=:)
5992-         test -f "$f" || { { echo "$as_me:21358: error: cannot find input file: $f" >&5
5993+         test -f "$f" || { { echo "$as_me:21362: error: cannot find input file: $f" >&5
5994 echo "$as_me: error: cannot find input file: $f" >&2;}
5995    { (exit 1); exit 1; }; }
5996          echo $f;;
5997@@ -21368,7 +21372,7 @@
5998            echo $srcdir/$f
5999          else
6000            # /dev/null tree
6001-           { { echo "$as_me:21371: error: cannot find input file: $f" >&5
6002+           { { echo "$as_me:21375: error: cannot find input file: $f" >&5
6003 echo "$as_me: error: cannot find input file: $f" >&2;}
6004    { (exit 1); exit 1; }; }
6005          fi;;
6006@@ -21384,7 +21388,7 @@
6007       if test -n "$ac_seen"; then
6008         ac_used=`grep '@datarootdir@' $ac_item`
6009         if test -z "$ac_used"; then
6010-          { echo "$as_me:21387: WARNING: datarootdir was used implicitly but not set:
6011+          { echo "$as_me:21391: WARNING: datarootdir was used implicitly but not set:
6012 $ac_seen" >&5
6013 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
6014 $ac_seen" >&2;}
6015@@ -21393,7 +21397,7 @@
6016       fi
6017       ac_seen=`grep '${datarootdir}' $ac_item`
6018       if test -n "$ac_seen"; then
6019-        { echo "$as_me:21396: WARNING: datarootdir was used explicitly but not set:
6020+        { echo "$as_me:21400: WARNING: datarootdir was used explicitly but not set:
6021 $ac_seen" >&5
6022 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
6023 $ac_seen" >&2;}
6024@@ -21430,7 +21434,7 @@
6025             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
6026             if test -z "$ac_init"; then
6027               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
6028-              { echo "$as_me:21433: WARNING: Variable $ac_name is used but was not set:
6029+              { echo "$as_me:21437: WARNING: Variable $ac_name is used but was not set:
6030 $ac_seen" >&5
6031 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
6032 $ac_seen" >&2;}
6033@@ -21441,7 +21445,7 @@
6034     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
6035     if test -s $tmp/out; then
6036       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
6037-      { echo "$as_me:21444: WARNING: Some variables may not be substituted:
6038+      { echo "$as_me:21448: WARNING: Some variables may not be substituted:
6039 $ac_seen" >&5
6040 echo "$as_me: WARNING: Some variables may not be substituted:
6041 $ac_seen" >&2;}
6042@@ -21490,7 +21494,7 @@
6043   * )   ac_file_in=$ac_file.in ;;
6044   esac
6045
6046-  test x"$ac_file" != x- && { echo "$as_me:21493: creating $ac_file" >&5
6047+  test x"$ac_file" != x- && { echo "$as_me:21497: creating $ac_file" >&5
6048 echo "$as_me: creating $ac_file" >&6;}
6049
6050   # First look for the input files in the build tree, otherwise in the
6051@@ -21501,7 +21505,7 @@
6052       -) echo $tmp/stdin ;;
6053       [\\/$]*)
6054          # Absolute (can't be DOS-style, as IFS=:)
6055-         test -f "$f" || { { echo "$as_me:21504: error: cannot find input file: $f" >&5
6056+         test -f "$f" || { { echo "$as_me:21508: error: cannot find input file: $f" >&5
6057 echo "$as_me: error: cannot find input file: $f" >&2;}
6058    { (exit 1); exit 1; }; }
6059          echo $f;;
6060@@ -21514,7 +21518,7 @@
6061            echo $srcdir/$f
6062          else
6063            # /dev/null tree
6064-           { { echo "$as_me:21517: error: cannot find input file: $f" >&5
6065+           { { echo "$as_me:21521: error: cannot find input file: $f" >&5
6066 echo "$as_me: error: cannot find input file: $f" >&2;}
6067    { (exit 1); exit 1; }; }
6068          fi;;
6069@@ -21572,7 +21576,7 @@
6070   rm -f $tmp/in
6071   if test x"$ac_file" != x-; then
6072     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
6073-      { echo "$as_me:21575: $ac_file is unchanged" >&5
6074+      { echo "$as_me:21579: $ac_file is unchanged" >&5
6075 echo "$as_me: $ac_file is unchanged" >&6;}
6076     else
6077       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
6078Index: test/demo_panels.c
6079Prereq:  1.43
6080--- ncurses-6.1-20190824+/test/demo_panels.c	2019-08-24 23:11:01.000000000 +0000
6081+++ ncurses-6.1-20190831/test/demo_panels.c	2019-08-31 23:24:11.000000000 +0000
6082@@ -204,7 +204,7 @@
6083 {
6084     WINDOW *win;
6085     PANEL *pan = 0;
6086-    char *userdata = typeMalloc(char, 5);
6087+    char *userdata = typeMalloc(char, 6);
6088
6089     if ((win = newwin(rows, cols, tly, tlx)) != 0) {
6090 	keypad(win, TRUE);
6091@@ -222,7 +222,7 @@
6092 	    wbkgdset(win, A_BOLD | ' ');
6093 	}
6094     }
6095-    _nc_SPRINTF(userdata, _nc_SLIMIT(3) "p%d", color % 8);
6096+    _nc_SPRINTF(userdata, _nc_SLIMIT(4) "p%d", color % 8);
6097     set_panel_userptr(pan, (NCURSES_CONST void *) userdata);
6098     return pan;
6099 }
6100Index: test/ncurses.c
6101Prereq:  1.517
6102--- ncurses-6.1-20190824+/test/ncurses.c	2019-08-24 23:09:03.000000000 +0000
6103+++ ncurses-6.1-20190831/test/ncurses.c	2019-08-31 23:22:40.000000000 +0000
6104@@ -6222,10 +6222,10 @@
6105 tracetrace(unsigned tlevel)
6106 {
6107     static char *buf;
6108+    static size_t need = 12;
6109     int n;
6110
6111     if (buf == 0) {
6112-	static size_t need = 12;
6113 	for (n = 0; t_tbl[n].name != 0; n++)
6114 	    need += strlen(t_tbl[n].name) + 2;
6115 	buf = typeMalloc(char, need);
6116